From fedora-extras-commits at redhat.com Thu Dec 1 01:18:31 2005 From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64)) Date: Wed, 30 Nov 2005 20:18:31 -0500 Subject: web/html/About/Projects docs.php,1.1,1.2 Message-ID: <200512010119.jB11J1QB017616@cvs-int.fedora.redhat.com> Author: nman64 Update of /cvs/fedora/web/html/About/Projects In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17584/html/About/Projects Modified Files: docs.php Log Message: First round of edits to new revamp Index: docs.php =================================================================== RCS file: /cvs/fedora/web/html/About/Projects/docs.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- docs.php 29 Nov 2005 17:30:30 -0000 1.1 +++ docs.php 1 Dec 2005 01:18:28 -0000 1.2 @@ -34,11 +34,11 @@ writers can contribute documentation about a specific topic without having to worry about how it fits into a manual or how it flows with other topics. Since the documents are for the - $PROJECT_NAME;, they only need to describe how to perform + $PROJECT_NAME, they only need to describe how to perform tasks on $RELEASE_NAME.

The project maintains some useful pages on the Fedora Project + href=\"http://fedoraproject.org/wiki/\">Fedora Project Wiki:

From fedora-extras-commits at redhat.com Thu Dec 1 01:18:37 2005 From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64)) Date: Wed, 30 Nov 2005 20:18:37 -0500 Subject: web/html/Contribute index.php,1.1,1.2 Message-ID: <200512010119.jB11J71t017620@cvs-int.fedora.redhat.com> Author: nman64 Update of /cvs/fedora/web/html/Contribute In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17584/html/Contribute Modified Files: index.php Log Message: First round of edits to new revamp Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/Contribute/index.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.php 29 Nov 2005 17:32:30 -0000 1.1 +++ index.php 1 Dec 2005 01:18:35 -0000 1.2 @@ -15,7 +15,7 @@

- Hundreds of individuals worldwide contribute directly to the success of Fedora projects. Contributing to the community is the best way of learning about the community. Fedora sponsors a number of community projects, which provide participation opportunities for people of all backgrounds. + Hundreds of individuals worldwide contribute directly to the success of the Fedora Project. Contributing is the best way of learning about the community. The Fedora Project is made up of a number of community projects, which provide participation opportunities for people of all backgrounds.

Fedora Extras Project

@@ -36,7 +36,7 @@

To read more about how to contribute to Fedora Documentation, visit the - Fedora Documentation Project page. + Fedora Documentation Project page.

Fedora Translation Project

@@ -59,9 +59,15 @@

To read more about how to become a Fedora Ambassador, please visit the - Fedora Ambassadors Project wiki. + Fedora Ambassadors Project wiki.

+ +

Other Projects

+ +

+ For information on other Fedora projects, see the Projects wiki page. +

displayFooter('$Date$'); From fedora-extras-commits at redhat.com Thu Dec 1 03:16:46 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 30 Nov 2005 22:16:46 -0500 Subject: extras-buildsys/common AuthedXMLRPCServer.py, 1.6.4.1, 1.6.4.2 XMLRPCServerProxy.py, 1.5.4.1, 1.5.4.2 Message-ID: <200512010317.jB13HkjG021059@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20987/common Modified Files: Tag: STABLE_0_4 AuthedXMLRPCServer.py XMLRPCServerProxy.py Log Message: Make the test a bit more informative Index: AuthedXMLRPCServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -u -r1.6.4.1 -r1.6.4.2 --- AuthedXMLRPCServer.py 24 Nov 2005 22:32:02 -0000 1.6.4.1 +++ AuthedXMLRPCServer.py 1 Dec 2005 03:16:43 -0000 1.6.4.2 @@ -103,10 +103,10 @@ ########################################################### class ReqHandler: - def ping(self): + def ping(self, callerid, trynum): authinfo = get_authinfo() - print "AUTHINFO: %s" % authinfo - return "pong" + print "AUTHINFO(%d / %d): %s" % (callerid, trynum, authinfo) + return "pong %d / %d" % (num, trynum) class TestServer(AuthedSSLXMLRPCServer): """ @@ -119,8 +119,7 @@ def auth_cb(self, request, client_address): import random peer_cert = request.get_peer_certificate() - email = peer_cert.get_subject().countryName - return "AUTH: %s - %d" % (email, random.randint(1, 100)) + return peer_cert.get_subject().emailAddress if __name__ == '__main__': Index: XMLRPCServerProxy.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v retrieving revision 1.5.4.1 retrieving revision 1.5.4.2 diff -u -r1.5.4.1 -r1.5.4.2 --- XMLRPCServerProxy.py 24 Nov 2005 22:32:02 -0000 1.5.4.1 +++ XMLRPCServerProxy.py 1 Dec 2005 03:16:43 -0000 1.5.4.2 @@ -64,8 +64,9 @@ _lock = threading.Lock() class TestClient(threading.Thread): - def __init__(self, certs): + def __init__(self, certs, num): self.server = PlgXMLRPCServerProxy("https://127.0.0.1:8886", certs, timeout=20) + self.num = i threading.Thread.__init__(self) def run(self): @@ -74,7 +75,8 @@ i = 0 while i < 5: # _lock.acquire() - print self.server.ping() + reply = self.server.ping(self.num, i) + print "TRY(%d / %d): %s" % (self.num, i, reply) time.sleep(0.05) # _lock.release() i = i + 1 @@ -92,7 +94,7 @@ i = 100 while i > 0: - t = TestClient(certs) + t = TestClient(certs, i) print "Created thread %d." % i t.start() i = i - 1 From fedora-extras-commits at redhat.com Thu Dec 1 03:17:17 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 30 Nov 2005 22:17:17 -0500 Subject: extras-buildsys ChangeLog,1.155,1.156 Message-ID: <200512010317.jB13HloX021062@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21008 Modified Files: ChangeLog Log Message: Make the test a bit more informative Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- ChangeLog 29 Nov 2005 06:41:40 -0000 1.155 +++ ChangeLog 1 Dec 2005 03:17:15 -0000 1.156 @@ -1,5 +1,10 @@ 2005-11-29 Dan Williams + * Add an option in the server config file to disable + depsolving + +2005-11-29 Dan Williams + * Add a traceback server that listens on a Unix socket and writes backtraces for all threads to it. Disabled by default. From fedora-extras-commits at redhat.com Thu Dec 1 03:17:22 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 30 Nov 2005 22:17:22 -0500 Subject: extras-buildsys/common AuthedXMLRPCServer.py, 1.7, 1.8 XMLRPCServerProxy.py, 1.6, 1.7 Message-ID: <200512010317.jB13Hq96021066@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21008/common Modified Files: AuthedXMLRPCServer.py XMLRPCServerProxy.py Log Message: Make the test a bit more informative Index: AuthedXMLRPCServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- AuthedXMLRPCServer.py 25 Nov 2005 04:45:07 -0000 1.7 +++ AuthedXMLRPCServer.py 1 Dec 2005 03:17:20 -0000 1.8 @@ -103,10 +103,10 @@ ########################################################### class ReqHandler: - def ping(self): + def ping(self, callerid, trynum): authinfo = get_authinfo() - print "AUTHINFO: %s" % authinfo - return "pong" + print "AUTHINFO(%d / %d): %s" % (callerid, trynum, authinfo) + return "pong %d / %d" % (num, trynum) class TestServer(AuthedSSLXMLRPCServer): """ @@ -119,8 +119,7 @@ def auth_cb(self, request, client_address): import random peer_cert = request.get_peer_certificate() - email = peer_cert.get_subject().countryName - return "AUTH: %s - %d" % (email, random.randint(1, 100)) + return peer_cert.get_subject().emailAddress if __name__ == '__main__': Index: XMLRPCServerProxy.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- XMLRPCServerProxy.py 25 Nov 2005 04:45:07 -0000 1.6 +++ XMLRPCServerProxy.py 1 Dec 2005 03:17:20 -0000 1.7 @@ -64,8 +64,9 @@ _lock = threading.Lock() class TestClient(threading.Thread): - def __init__(self, certs): + def __init__(self, certs, num): self.server = PlgXMLRPCServerProxy("https://127.0.0.1:8886", certs, timeout=20) + self.num = i threading.Thread.__init__(self) def run(self): @@ -74,7 +75,8 @@ i = 0 while i < 5: # _lock.acquire() - print self.server.ping() + reply = self.server.ping(self.num, i) + print "TRY(%d / %d): %s" % (self.num, i, reply) time.sleep(0.05) # _lock.release() i = i + 1 @@ -92,7 +94,7 @@ i = 100 while i > 0: - t = TestClient(certs) + t = TestClient(certs, i) print "Created thread %d." % i t.start() i = i - 1 From fedora-extras-commits at redhat.com Thu Dec 1 03:17:28 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 30 Nov 2005 22:17:28 -0500 Subject: extras-buildsys/server Config.py, 1.11, 1.12 PackageJob.py, 1.39, 1.40 Repo.py, 1.20, 1.21 Message-ID: <200512010317.jB13Hwk7021071@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21008/server Modified Files: Config.py PackageJob.py Repo.py Log Message: Make the test a bit more informative Index: Config.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Config.py 26 Nov 2005 06:10:22 -0000 1.11 +++ Config.py 1 Dec 2005 03:17:25 -0000 1.12 @@ -95,6 +95,8 @@ def save_default_config(self, filename=None): self.add_section("General") self.set_option("General", "hostname", "localhost") + self.set_option("General", "traceback_server", "no") + self.set_option("General", "depsolve_jobs", "yes") self.add_section("Directories") self.set_option("Directories", "server_work_dir", "/rpmbuild",) Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- PackageJob.py 29 Nov 2005 06:41:51 -0000 1.39 +++ PackageJob.py 1 Dec 2005 03:17:26 -0000 1.40 @@ -154,8 +154,11 @@ self._result_dir = None self._srpm_path = None self._srpm_http_path = None + self._depsolve_dir = None self._last_depsolve_error = None + self._depsolve_first_try = False + self.repofiles = {} self.archjobs = {} self._archjobs_lock = threading.Lock() @@ -404,10 +407,14 @@ """ % (self._source, pkg_arches, allowed_arches) raise PrepError(msg) - self._set_cur_stage('depsolve_wait') - log("%s (%s): Requesting depsolve..." % (self.uid, self.package)) - self._repo.request_depsolve(self, first_try=True) - return True # sleep until the Repo wakes us up for depsolve + if self._server_cfg.get_bool("General", "depsolve_jobs"): + self._set_cur_stage('depsolve_wait') + log("%s (%s): Requesting depsolve..." % (self.uid, self.package)) + self._repo.request_depsolve(self, first_try=True) + return True # sleep until the Repo wakes us up for depsolve + else: + # Don't depsolve, just queue archjobs and wait + return self._prepare_and_wait() def _write_yum_conf(self, arch): # Figure out which mock config file it is, and write out it's yum.conf @@ -492,7 +499,8 @@ del base, srpm return success - def start_depsolve(self): + def start_depsolve(self, first_try=False): + self._depsolve_first_try = first_try self._set_cur_stage('depsolve') self.wake() @@ -530,9 +538,11 @@ log("%s (%s): Starting depsolve for arches: %s." % (self.uid, self.package, archlist)) + failed_arch = None for arch in archlist: if self._arch_deps_solved(arch) == False: unsolved_deps = True + failed_arch = arch break self._archjobs_lock.release() @@ -540,6 +550,15 @@ self._repo.notify_depsolve_done(self) if unsolved_deps == True: + # Notify the queuer of the job that it's failed the first depsolve + if self._depsolve_first_try: + subject = 'Dependency Problem: %d - %s on %s' % (self.uid, self.name, self._target_str) + sender = self._server_cfg.get_str("Email", "email_from") + msg = """This job failed its initial dependency test. The build server will +periodically try to build the job for the next 8 hours. +Error on %s: %s""" % (failed_arch, self._last_depsolve_error) + EmailUtils.email_result(sender, self.username, msg, subject) + # Go to sleep until the repo changes self._set_cur_stage('depsolve_wait') self._repo.request_depsolve(self, first_try=False) @@ -552,7 +571,10 @@ shutil.rmtree(self._depsolve_dir, ignore_errors=True) self._depsolve_dir = None - # Queue up the archjobs + return self._prepare_and_wait() + + def _prepare_and_wait(self): + # Make some directories we need work_dir = self._server_cfg.get_str("Directories", "server_work_dir") self._result_dir = self._make_stage_dir(work_dir) for arch in self.archjobs.keys(): @@ -570,6 +592,7 @@ if self.use_cvs == True: shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) + # Queue up archjobs self._set_cur_stage('waiting') self._request_arch_jobs() return False Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Repo.py 29 Nov 2005 06:41:51 -0000 1.20 +++ Repo.py 1 Dec 2005 03:17:26 -0000 1.21 @@ -133,7 +133,7 @@ archjob.repo_unlocked_callback() self._repo_unlock_lock.release() - def _start_depsolves_for_queue(self, queue, max_jobs): + def _start_depsolves_for_queue(self, queue, max_jobs, first_try=False): num = 0 for job in queue: if queue[job]: @@ -146,7 +146,7 @@ break if not queue[job]: queue[job] = True - job.start_depsolve() + job.start_depsolve(first_try) available = available - 1 def _start_waiting_depsolves(self, repo_changed=False): @@ -161,11 +161,11 @@ max_again_depsolves = self.MAX_DEPSOLVE_JOBS / 2 max_immediate_depsolves = self.MAX_DEPSOLVE_JOBS / 2 - self._start_depsolves_for_queue(self._depsolve_immediate_queue, max_immediate_depsolves) + self._start_depsolves_for_queue(self._depsolve_immediate_queue, max_immediate_depsolves, first_try=True) # Only fire off non-first-try depsolves if the repo has changed if repo_changed: - self._start_depsolves_for_queue(self._depsolve_again_queue, max_again_depsolves) + self._start_depsolves_for_queue(self._depsolve_again_queue, max_again_depsolves, first_try=False) self._depsolve_again_lock.release() self._depsolve_immediate_lock.release() From fedora-extras-commits at redhat.com Thu Dec 1 03:21:01 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 30 Nov 2005 22:21:01 -0500 Subject: extras-buildsys/common AuthedXMLRPCServer.py,1.8,1.9 Message-ID: <200512010321.jB13LWev021140@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21118/common Modified Files: AuthedXMLRPCServer.py Log Message: small fix Index: AuthedXMLRPCServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- AuthedXMLRPCServer.py 1 Dec 2005 03:17:20 -0000 1.8 +++ AuthedXMLRPCServer.py 1 Dec 2005 03:20:59 -0000 1.9 @@ -106,7 +106,7 @@ def ping(self, callerid, trynum): authinfo = get_authinfo() print "AUTHINFO(%d / %d): %s" % (callerid, trynum, authinfo) - return "pong %d / %d" % (num, trynum) + return "pong %d / %d" % (callerid, trynum) class TestServer(AuthedSSLXMLRPCServer): """ From fedora-extras-commits at redhat.com Thu Dec 1 03:20:34 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 30 Nov 2005 22:20:34 -0500 Subject: extras-buildsys/common AuthedXMLRPCServer.py,1.6.4.2,1.6.4.3 Message-ID: <200512010321.jB13LYUQ021143@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21093/common Modified Files: Tag: STABLE_0_4 AuthedXMLRPCServer.py Log Message: Small fix Index: AuthedXMLRPCServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v retrieving revision 1.6.4.2 retrieving revision 1.6.4.3 diff -u -r1.6.4.2 -r1.6.4.3 --- AuthedXMLRPCServer.py 1 Dec 2005 03:16:43 -0000 1.6.4.2 +++ AuthedXMLRPCServer.py 1 Dec 2005 03:20:32 -0000 1.6.4.3 @@ -106,7 +106,7 @@ def ping(self, callerid, trynum): authinfo = get_authinfo() print "AUTHINFO(%d / %d): %s" % (callerid, trynum, authinfo) - return "pong %d / %d" % (num, trynum) + return "pong %d / %d" % (callerid, trynum) class TestServer(AuthedSSLXMLRPCServer): """ From fedora-extras-commits at redhat.com Thu Dec 1 03:36:07 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 30 Nov 2005 22:36:07 -0500 Subject: rpms/krecipes/FC-3 .cvsignore, 1.2, 1.3 krecipes.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200512010336.jB13acB3021223@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21202 Modified Files: .cvsignore krecipes.spec sources Log Message: Update to 0.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/krecipes/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Jul 2005 17:23:12 -0000 1.2 +++ .cvsignore 1 Dec 2005 03:36:05 -0000 1.3 @@ -1 +1 @@ -krecipes-0.8.1.tar.gz +krecipes-0.9.tar.gz Index: krecipes.spec =================================================================== RCS file: /cvs/extras/rpms/krecipes/FC-3/krecipes.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- krecipes.spec 23 Oct 2005 05:05:28 -0000 1.4 +++ krecipes.spec 1 Dec 2005 03:36:05 -0000 1.5 @@ -1,6 +1,6 @@ Name: krecipes -Version: 0.8.1 -Release: 3%{?dist} +Version: 0.9 +Release: 1%{?dist} Summary: Application to manage recipes and shopping-lists Group: Applications/Productivity @@ -79,6 +79,8 @@ %changelog +* Wed Nov 11 2005 Dennis Gilmore - 0.9-1 +- update to 0.9 * Sat Oct 20 2005 Dennis Gilmore - 0.8.1-3%{?dist} - add BuildRequires desktop-file-utils http://fedoraproject.org/wiki/QAChecklist - add %post and %postun scriptlets to notify of new icons per Index: sources =================================================================== RCS file: /cvs/extras/rpms/krecipes/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Jul 2005 17:23:12 -0000 1.2 +++ sources 1 Dec 2005 03:36:05 -0000 1.3 @@ -1 +1 @@ -f9049384bad2139f049b9b4eadd7239a krecipes-0.8.1.tar.gz +ee1a1463946c63788ff8eeea302a7506 krecipes-0.9.tar.gz From fedora-extras-commits at redhat.com Thu Dec 1 03:37:55 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 30 Nov 2005 22:37:55 -0500 Subject: rpms/krecipes/FC-4 .cvsignore, 1.2, 1.3 krecipes.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200512010338.jB13cPZX021294@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21273 Modified Files: .cvsignore krecipes.spec sources Log Message: Update to 0.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/krecipes/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Jul 2005 17:23:12 -0000 1.2 +++ .cvsignore 1 Dec 2005 03:37:53 -0000 1.3 @@ -1 +1 @@ -krecipes-0.8.1.tar.gz +krecipes-0.9.tar.gz Index: krecipes.spec =================================================================== RCS file: /cvs/extras/rpms/krecipes/FC-4/krecipes.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- krecipes.spec 23 Oct 2005 05:06:01 -0000 1.4 +++ krecipes.spec 1 Dec 2005 03:37:53 -0000 1.5 @@ -1,6 +1,6 @@ Name: krecipes -Version: 0.8.1 -Release: 3%{?dist} +Version: 0.9 +Release: 1%{?dist} Summary: Application to manage recipes and shopping-lists Group: Applications/Productivity @@ -79,6 +79,8 @@ %changelog +* Wed Nov 11 2005 Dennis Gilmore - 0.9-1 +- update to 0.9 * Sat Oct 20 2005 Dennis Gilmore - 0.8.1-3%{?dist} - add BuildRequires desktop-file-utils http://fedoraproject.org/wiki/QAChecklist - add %post and %postun scriptlets to notify of new icons per Index: sources =================================================================== RCS file: /cvs/extras/rpms/krecipes/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Jul 2005 17:23:12 -0000 1.2 +++ sources 1 Dec 2005 03:37:53 -0000 1.3 @@ -1 +1 @@ -f9049384bad2139f049b9b4eadd7239a krecipes-0.8.1.tar.gz +ee1a1463946c63788ff8eeea302a7506 krecipes-0.9.tar.gz From fedora-extras-commits at redhat.com Thu Dec 1 03:39:06 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 30 Nov 2005 22:39:06 -0500 Subject: rpms/krecipes/devel .cvsignore, 1.2, 1.3 krecipes.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200512010339.jB13da2S021365@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21344 Modified Files: .cvsignore krecipes.spec sources Log Message: Update to 0.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Jul 2005 17:23:12 -0000 1.2 +++ .cvsignore 1 Dec 2005 03:39:04 -0000 1.3 @@ -1 +1 @@ -krecipes-0.8.1.tar.gz +krecipes-0.9.tar.gz Index: krecipes.spec =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/krecipes.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- krecipes.spec 23 Oct 2005 05:06:07 -0000 1.4 +++ krecipes.spec 1 Dec 2005 03:39:04 -0000 1.5 @@ -1,6 +1,6 @@ Name: krecipes -Version: 0.8.1 -Release: 3%{?dist} +Version: 0.9 +Release: 1%{?dist} Summary: Application to manage recipes and shopping-lists Group: Applications/Productivity @@ -79,6 +79,8 @@ %changelog +* Wed Nov 11 2005 Dennis Gilmore - 0.9-1 +- update to 0.9 * Sat Oct 20 2005 Dennis Gilmore - 0.8.1-3%{?dist} - add BuildRequires desktop-file-utils http://fedoraproject.org/wiki/QAChecklist - add %post and %postun scriptlets to notify of new icons per Index: sources =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Jul 2005 17:23:12 -0000 1.2 +++ sources 1 Dec 2005 03:39:04 -0000 1.3 @@ -1 +1 @@ -f9049384bad2139f049b9b4eadd7239a krecipes-0.8.1.tar.gz +ee1a1463946c63788ff8eeea302a7506 krecipes-0.9.tar.gz From fedora-extras-commits at redhat.com Thu Dec 1 03:59:17 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 30 Nov 2005 22:59:17 -0500 Subject: rpms/krecipes/FC-3 krecipes.spec,1.5,1.6 Message-ID: <200512010359.jB13xmEV021476@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21459 Modified Files: krecipes.spec Log Message: Fixes Index: krecipes.spec =================================================================== RCS file: /cvs/extras/rpms/krecipes/FC-3/krecipes.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- krecipes.spec 1 Dec 2005 03:36:05 -0000 1.5 +++ krecipes.spec 1 Dec 2005 03:59:15 -0000 1.6 @@ -46,7 +46,6 @@ --add-category=Qt \ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/krecipes.desktop - ## File lists # locale's %find_lang %{name} || touch %{name}.lang @@ -64,9 +63,11 @@ %post touch --no-create %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : %postun touch --no-create %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : %files -f %{name}.lang @@ -76,9 +77,12 @@ %{_datadir}/applications/fedora-krecipes.desktop %{_datadir}/apps/krecipes %{_datadir}/icons/hicolor/*/apps/* - +%{_datadir}/icons/crystalsvg/*/mimetypes/krecipes_file.png +%{_datadir}/mimelnk/*/*.desktop %changelog +* Wed Nov 11 2005 Dennis Gilmore - 0.9-2 +- fix missing files * Wed Nov 11 2005 Dennis Gilmore - 0.9-1 - update to 0.9 * Sat Oct 20 2005 Dennis Gilmore - 0.8.1-3%{?dist} From fedora-extras-commits at redhat.com Thu Dec 1 04:03:35 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 30 Nov 2005 23:03:35 -0500 Subject: rpms/krecipes/FC-3 krecipes.spec,1.6,1.7 Message-ID: <200512010404.jB1445Ho023068@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23049 Modified Files: krecipes.spec Log Message: Really fix Index: krecipes.spec =================================================================== RCS file: /cvs/extras/rpms/krecipes/FC-3/krecipes.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- krecipes.spec 1 Dec 2005 03:59:15 -0000 1.6 +++ krecipes.spec 1 Dec 2005 04:03:33 -0000 1.7 @@ -1,6 +1,6 @@ Name: krecipes Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Application to manage recipes and shopping-lists Group: Applications/Productivity From fedora-extras-commits at redhat.com Thu Dec 1 04:05:25 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 30 Nov 2005 23:05:25 -0500 Subject: rpms/krecipes/FC-4 krecipes.spec,1.5,1.6 Message-ID: <200512010405.jB145uXb023129@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23110 Modified Files: krecipes.spec Log Message: Fixes for missing files :) Index: krecipes.spec =================================================================== RCS file: /cvs/extras/rpms/krecipes/FC-4/krecipes.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- krecipes.spec 1 Dec 2005 03:37:53 -0000 1.5 +++ krecipes.spec 1 Dec 2005 04:05:23 -0000 1.6 @@ -1,6 +1,6 @@ Name: krecipes Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Application to manage recipes and shopping-lists Group: Applications/Productivity @@ -46,7 +46,6 @@ --add-category=Qt \ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/krecipes.desktop - ## File lists # locale's %find_lang %{name} || touch %{name}.lang @@ -64,9 +63,11 @@ %post touch --no-create %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : %postun touch --no-create %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : %files -f %{name}.lang @@ -76,9 +77,12 @@ %{_datadir}/applications/fedora-krecipes.desktop %{_datadir}/apps/krecipes %{_datadir}/icons/hicolor/*/apps/* - +%{_datadir}/icons/crystalsvg/*/mimetypes/krecipes_file.png +%{_datadir}/mimelnk/*/*.desktop %changelog +* Wed Nov 11 2005 Dennis Gilmore - 0.9-2 +- fix missing files * Wed Nov 11 2005 Dennis Gilmore - 0.9-1 - update to 0.9 * Sat Oct 20 2005 Dennis Gilmore - 0.8.1-3%{?dist} From fedora-extras-commits at redhat.com Thu Dec 1 04:07:20 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 30 Nov 2005 23:07:20 -0500 Subject: rpms/krecipes/devel krecipes.spec,1.5,1.6 Message-ID: <200512010407.jB147oQm023190@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23172 Modified Files: krecipes.spec Log Message: Fix missing files Index: krecipes.spec =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/krecipes.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- krecipes.spec 1 Dec 2005 03:39:04 -0000 1.5 +++ krecipes.spec 1 Dec 2005 04:07:18 -0000 1.6 @@ -1,6 +1,6 @@ Name: krecipes Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Application to manage recipes and shopping-lists Group: Applications/Productivity @@ -46,7 +46,6 @@ --add-category=Qt \ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/krecipes.desktop - ## File lists # locale's %find_lang %{name} || touch %{name}.lang @@ -64,9 +63,11 @@ %post touch --no-create %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : %postun touch --no-create %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : %files -f %{name}.lang @@ -76,9 +77,12 @@ %{_datadir}/applications/fedora-krecipes.desktop %{_datadir}/apps/krecipes %{_datadir}/icons/hicolor/*/apps/* - +%{_datadir}/icons/crystalsvg/*/mimetypes/krecipes_file.png +%{_datadir}/mimelnk/*/*.desktop %changelog +* Wed Nov 11 2005 Dennis Gilmore - 0.9-2 +- fix missing files * Wed Nov 11 2005 Dennis Gilmore - 0.9-1 - update to 0.9 * Sat Oct 20 2005 Dennis Gilmore - 0.8.1-3%{?dist} From fedora-extras-commits at redhat.com Thu Dec 1 04:18:26 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 30 Nov 2005 23:18:26 -0500 Subject: extras-buildsys/common XMLRPCServerProxy.py,1.7,1.8 Message-ID: <200512010419.jB14JREC023322@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23288/common Modified Files: XMLRPCServerProxy.py Log Message: More test fixups Index: XMLRPCServerProxy.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- XMLRPCServerProxy.py 1 Dec 2005 03:17:20 -0000 1.7 +++ XMLRPCServerProxy.py 1 Dec 2005 04:18:24 -0000 1.8 @@ -58,10 +58,14 @@ import threading import time import random +import OpenSSL +import socket client_start = False -_lock = threading.Lock() +threadlist_lock = threading.Lock() +threadlist = {} +timed_out = 0 class TestClient(threading.Thread): def __init__(self, certs, num): @@ -74,12 +78,22 @@ time.sleep(0.05) i = 0 while i < 5: -# _lock.acquire() - reply = self.server.ping(self.num, i) + reply = None + try: + reply = self.server.ping(self.num, i) + except OpenSSL.SSL.Error, e: + reply = "OpenSSL Error (%s)" % e + except socket.timeout, e: + reply = "Socket timeout (%s)" % e + threadlist_lock.acquire() + timed_out = timed_out + 1 + threadlist_lock.release() print "TRY(%d / %d): %s" % (self.num, i, reply) time.sleep(0.05) -# _lock.release() i = i + 1 + threadlist_lock.acquire() + del threadlist[self] + threadlist_lock.release() if __name__ == '__main__': @@ -95,6 +109,7 @@ i = 100 while i > 0: t = TestClient(certs, i) + threadlist[t] = None print "Created thread %d." % i t.start() i = i - 1 @@ -105,6 +120,11 @@ while True: try: time.sleep(0.25) + threadlist_lock.acquire() + if len(threadlist) == 0: + break + threadlist_lock.release() except KeyboardInterrupt: os._exit(0) + print "All done. (%d timed out)" % timed_out From fedora-extras-commits at redhat.com Thu Dec 1 04:18:57 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 30 Nov 2005 23:18:57 -0500 Subject: extras-buildsys/common XMLRPCServerProxy.py,1.5.4.2,1.5.4.3 Message-ID: <200512010419.jB14JR7D023325@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23292/common Modified Files: Tag: STABLE_0_4 XMLRPCServerProxy.py Log Message: More test fixups Index: XMLRPCServerProxy.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v retrieving revision 1.5.4.2 retrieving revision 1.5.4.3 diff -u -r1.5.4.2 -r1.5.4.3 --- XMLRPCServerProxy.py 1 Dec 2005 03:16:43 -0000 1.5.4.2 +++ XMLRPCServerProxy.py 1 Dec 2005 04:18:55 -0000 1.5.4.3 @@ -58,10 +58,14 @@ import threading import time import random +import OpenSSL +import socket client_start = False -_lock = threading.Lock() +threadlist_lock = threading.Lock() +threadlist = {} +timed_out = 0 class TestClient(threading.Thread): def __init__(self, certs, num): @@ -74,12 +78,22 @@ time.sleep(0.05) i = 0 while i < 5: -# _lock.acquire() - reply = self.server.ping(self.num, i) + reply = None + try: + reply = self.server.ping(self.num, i) + except OpenSSL.SSL.Error, e: + reply = "OpenSSL Error (%s)" % e + except socket.timeout, e: + reply = "Socket timeout (%s)" % e + threadlist_lock.acquire() + timed_out = timed_out + 1 + threadlist_lock.release() print "TRY(%d / %d): %s" % (self.num, i, reply) time.sleep(0.05) -# _lock.release() i = i + 1 + threadlist_lock.acquire() + del threadlist[self] + threadlist_lock.release() if __name__ == '__main__': @@ -95,6 +109,7 @@ i = 100 while i > 0: t = TestClient(certs, i) + threadlist[t] = None print "Created thread %d." % i t.start() i = i - 1 @@ -105,6 +120,11 @@ while True: try: time.sleep(0.25) + threadlist_lock.acquire() + if len(threadlist) == 0: + break + threadlist_lock.release() except KeyboardInterrupt: os._exit(0) + print "All done. (%d timed out)" % timed_out From fedora-extras-commits at redhat.com Thu Dec 1 08:26:05 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 1 Dec 2005 03:26:05 -0500 Subject: rpms/cernlib/devel cernlib.spec,1.3,1.4 Message-ID: <200512010826.jB18QZmB030126@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30109 Modified Files: cernlib.spec Log Message: Bump release to rebuild now that keywords are not expanded. Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cernlib.spec 30 Nov 2005 22:01:01 -0000 1.3 +++ cernlib.spec 1 Dec 2005 08:26:03 -0000 1.4 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 5%{?dist} +Release: 6%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -688,7 +688,7 @@ %doc debian/debhelper/zftp.README.debian %changelog -* Tue Nov 29 2005 Patrice Dumas - 2005-5 +* Tue Nov 29 2005 Patrice Dumas - 2005-6 - update with newer debian patchset for cernlib, fix licence issues - don't use the include.tar.gz source, instead get include files from the source files From fedora-extras-commits at redhat.com Thu Dec 1 10:05:50 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 1 Dec 2005 05:05:50 -0500 Subject: rpms/xemacs/devel xemacs-21.4.17-utf8-fonts.patch, 1.1, 1.2 xemacs.spec, 1.15, 1.16 Message-ID: <200512011006.jB1A6NKQ001552@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1519 Modified Files: xemacs-21.4.17-utf8-fonts.patch xemacs.spec Log Message: * Wed Nov 30 2005 Ville Skytt?? - 21.4.17-7 - Require ISO-8859-1 fonts (Alexandre Oliva, #174617). - Make popup dialog font the intended one even without ISO-8859 fonts. - BuildRequire xmkmf to get X defines during build. - Move editclient.sh to docs. xemacs-21.4.17-utf8-fonts.patch: Index: xemacs-21.4.17-utf8-fonts.patch =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/xemacs-21.4.17-utf8-fonts.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xemacs-21.4.17-utf8-fonts.patch 27 Nov 2005 22:34:13 -0000 1.1 +++ xemacs-21.4.17-utf8-fonts.patch 1 Dec 2005 10:05:26 -0000 1.2 @@ -23,3 +23,12 @@ ! Gui elements share this font ! +@@ -229,7 +229,7 @@ + ! Some people use 12-point anyway because you get more text, but + ! there's no purpose at all in doing this for dialog boxes. + +-*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-* ++*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-* + + ! Dialog box translations. + ! ======================= Index: xemacs.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- xemacs.spec 27 Nov 2005 22:34:13 -0000 1.15 +++ xemacs.spec 1 Dec 2005 10:05:26 -0000 1.16 @@ -8,7 +8,7 @@ Name: xemacs Version: 21.4.17 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -63,6 +63,7 @@ BuildRequires: neXtaw-devel %endif # xaw3d %endif # gtk +BuildRequires: xmkmf BuildRequires: libXau-devel # TODO: verify these build deps wrt gtk/xaw3d builds BuildRequires: xorg-x11-xbitmaps @@ -70,6 +71,8 @@ BuildRequires: libXpm-devel Requires: xemacs-sumo >= 20050118-2 Requires: xemacs-common = %{version}-%{release} +Requires: xorg-x11-fonts-ISO8859-1-75dpi +Requires: xorg-x11-fonts-ISO8859-1-100dpi %description XEmacs is a highly customizable open source text editor and @@ -335,8 +338,8 @@ # clean up "junk" (TODO: there's much more!) cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/etc -rm -r aliases.ksh BETA check_cygwin_setup.sh CODING-STANDARDS InstallGuide \ - sparcworks tests xemacs-fe.sh XKeysymDB *.sco *.1 +rm -r aliases.ksh BETA *.sh CODING-STANDARDS InstallGuide \ + sparcworks tests XKeysymDB *.sco *.1 cd - # separate files @@ -420,6 +423,7 @@ %defattr(-,root,root,-) %doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release %doc etc/NEWS etc/MAILINGLISTS BUGS README.packages etc/TUTORIAL +%doc etc/editclient.sh %{_bindir}/ellcc %{_bindir}/etags.xemacs %{_bindir}/gnuattach @@ -446,6 +450,12 @@ %changelog +* Wed Nov 30 2005 Ville Skytt?? - 21.4.17-7 +- Require ISO-8859-1 fonts (Alexandre Oliva, #174617). +- Make popup dialog font the intended one even without ISO-8859 fonts. +- BuildRequire xmkmf to get X defines during build. +- Move editclient.sh to docs. + * Mon Nov 28 2005 Ville Skytt?? - 21.4.17-6 - More modular X.Org fixes (Xauth for gnuclient, menubar font tweak). - Re-enable Canna and FreeWnn (bug introduced in 21.4.17-5). From fedora-extras-commits at redhat.com Thu Dec 1 10:36:33 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 1 Dec 2005 05:36:33 -0500 Subject: rpms/fyre/devel fyre-cluster.init,1.2,1.3 fyre.spec,1.10,1.11 Message-ID: <200512011037.jB1Ab3UV001715@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fyre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1686 Modified Files: fyre-cluster.init fyre.spec Log Message: Fix NLS in initscript Index: fyre-cluster.init =================================================================== RCS file: /cvs/extras/rpms/fyre/devel/fyre-cluster.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fyre-cluster.init 8 Jul 2005 16:44:06 -0000 1.2 +++ fyre-cluster.init 1 Dec 2005 10:36:31 -0000 1.3 @@ -13,6 +13,8 @@ # Source function library. . /etc/init.d/functions +prog="fyre" + . /etc/sysconfig/fyre ARGS= @@ -26,7 +28,7 @@ fi start() { - echo -n "Starting fyre: " + echo -n $"Starting $prog: " daemon fyre -r $ARGS --pidfile /var/run/fyre.pid echo touch /var/lock/subsys/fyre-cluster @@ -34,7 +36,7 @@ } stop() { - echo -n "Shutting down fyre: " + echo -n $"Stopping $prog: " killproc fyre echo rm -f /var/lock/subsys/fyre-cluster Index: fyre.spec =================================================================== RCS file: /cvs/extras/rpms/fyre/devel/fyre.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fyre.spec 19 Aug 2005 02:51:09 -0000 1.10 +++ fyre.spec 1 Dec 2005 10:36:31 -0000 1.11 @@ -1,6 +1,6 @@ Name: fyre Version: 1.0.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A tool for creating artwork from chaotic functions Group: Amusements/Graphics @@ -75,6 +75,9 @@ %config(noreplace) %{_sysconfdir}/sysconfig/fyre %changelog +* Thu Dec 1 2005 Ignacio Vazquez-Abrams 1.0.0-11 +- Fix NLS in initscript + * Thu Aug 18 2005 Ignacio Vazquez-Abrams 1.0.0-10 - Rebuild for new Cairo From fedora-extras-commits at redhat.com Thu Dec 1 10:54:38 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 1 Dec 2005 05:54:38 -0500 Subject: rpms/fyre/FC-3 fyre-cluster.init,1.2,1.3 fyre.spec,1.8,1.9 Message-ID: <200512011055.jB1At8fu001787@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fyre/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1752/FC-3 Modified Files: fyre-cluster.init fyre.spec Log Message: Add NLS to initscript Index: fyre-cluster.init =================================================================== RCS file: /cvs/extras/rpms/fyre/FC-3/fyre-cluster.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fyre-cluster.init 8 Jul 2005 16:44:01 -0000 1.2 +++ fyre-cluster.init 1 Dec 2005 10:54:36 -0000 1.3 @@ -13,6 +13,8 @@ # Source function library. . /etc/init.d/functions +prog="fyre" + . /etc/sysconfig/fyre ARGS= @@ -26,7 +28,7 @@ fi start() { - echo -n "Starting fyre: " + echo -n $"Starting $prog: " daemon fyre -r $ARGS --pidfile /var/run/fyre.pid echo touch /var/lock/subsys/fyre-cluster @@ -34,7 +36,7 @@ } stop() { - echo -n "Shutting down fyre: " + echo -n $"Stopping $prog: " killproc fyre echo rm -f /var/lock/subsys/fyre-cluster Index: fyre.spec =================================================================== RCS file: /cvs/extras/rpms/fyre/FC-3/fyre.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fyre.spec 8 Jul 2005 16:44:01 -0000 1.8 +++ fyre.spec 1 Dec 2005 10:54:36 -0000 1.9 @@ -1,6 +1,6 @@ Name: fyre Version: 1.0.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A tool for creating artwork from chaotic functions Group: Amusements/Graphics @@ -75,6 +75,9 @@ %config(noreplace) %{_sysconfdir}/sysconfig/fyre %changelog +* Thu Dec 1 2005 Ignacio Vazquez-Abrams 1.0.0-10 +- Fix NLS in initscript + * Fri Jul 8 2005 Ignacio Vazquez-Abrams 1.0.0-9 - Added restart definition to initscript (#161008) From fedora-extras-commits at redhat.com Thu Dec 1 10:54:44 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 1 Dec 2005 05:54:44 -0500 Subject: rpms/fyre/FC-4 fyre-cluster.init,1.2,1.3 fyre.spec,1.9,1.10 Message-ID: <200512011055.jB1AtE8X001791@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fyre/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1752/FC-4 Modified Files: fyre-cluster.init fyre.spec Log Message: Add NLS to initscript Index: fyre-cluster.init =================================================================== RCS file: /cvs/extras/rpms/fyre/FC-4/fyre-cluster.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fyre-cluster.init 8 Jul 2005 16:44:01 -0000 1.2 +++ fyre-cluster.init 1 Dec 2005 10:54:42 -0000 1.3 @@ -13,6 +13,8 @@ # Source function library. . /etc/init.d/functions +prog="fyre" + . /etc/sysconfig/fyre ARGS= @@ -26,7 +28,7 @@ fi start() { - echo -n "Starting fyre: " + echo -n $"Starting $prog: " daemon fyre -r $ARGS --pidfile /var/run/fyre.pid echo touch /var/lock/subsys/fyre-cluster @@ -34,7 +36,7 @@ } stop() { - echo -n "Shutting down fyre: " + echo -n $"Stopping $prog: " killproc fyre echo rm -f /var/lock/subsys/fyre-cluster Index: fyre.spec =================================================================== RCS file: /cvs/extras/rpms/fyre/FC-4/fyre.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fyre.spec 8 Jul 2005 16:44:01 -0000 1.9 +++ fyre.spec 1 Dec 2005 10:54:42 -0000 1.10 @@ -1,6 +1,6 @@ Name: fyre Version: 1.0.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A tool for creating artwork from chaotic functions Group: Amusements/Graphics @@ -75,6 +75,9 @@ %config(noreplace) %{_sysconfdir}/sysconfig/fyre %changelog +* Thu Dec 1 2005 Ignacio Vazquez-Abrams 1.0.0-10 +- Fix NLS in initscript + * Fri Jul 8 2005 Ignacio Vazquez-Abrams 1.0.0-9 - Added restart definition to initscript (#161008) From fedora-extras-commits at redhat.com Thu Dec 1 11:29:05 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Thu, 1 Dec 2005 06:29:05 -0500 Subject: rpms/mod_security/FC-4 .cvsignore, 1.3, 1.4 mod_security.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200512011129.jB1BTZuX003578@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3551 Modified Files: .cvsignore mod_security.spec sources Log Message: * Thu Dec 1 2005 Michael Fleming 1.9.1-1 - New release 1.9.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Nov 2005 08:41:38 -0000 1.3 +++ .cvsignore 1 Dec 2005 11:29:03 -0000 1.4 @@ -1 +1 @@ -modsecurity-apache-1.9.tar.gz +modsecurity-apache-1.9.1.tar.gz Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-4/mod_security.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_security.spec 22 Nov 2005 08:41:38 -0000 1.4 +++ mod_security.spec 1 Dec 2005 11:29:03 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Security module for the Apache HTTP Server Name: mod_security -Version: 1.9 +Version: 1.9.1 Release: 1%{?dist} License: GPL URL: http://www.modsecurity.org/ @@ -40,6 +40,9 @@ %config(noreplace) /etc/httpd/conf.d/mod_security.conf %changelog +* Thu Dec 1 2005 Michael Fleming 1.9.1-1 +- New release 1.9.1 + * Wed Nov 9 2005 Michael Fleming 1.9-1 - New stable upstream release 1.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Nov 2005 08:41:38 -0000 1.3 +++ sources 1 Dec 2005 11:29:03 -0000 1.4 @@ -1 +1 @@ -4685b3d6127f2ab1aef71ed0c80ebcbc modsecurity-apache-1.9.tar.gz +d648ba26b1dba708a06344072bea984c modsecurity-apache-1.9.1.tar.gz From fedora-extras-commits at redhat.com Thu Dec 1 11:31:54 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Thu, 1 Dec 2005 06:31:54 -0500 Subject: rpms/mod_security/FC-3 mod_security.spec,1.7,1.8 sources,1.3,1.4 Message-ID: <200512011132.jB1BWPgX003616@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3596 Modified Files: mod_security.spec sources Log Message: * Thu Dec 1 2005 Michael Fleming 1.9.1-1 - New release 1.9.1 Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-3/mod_security.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_security.spec 22 Nov 2005 11:46:13 -0000 1.7 +++ mod_security.spec 1 Dec 2005 11:31:52 -0000 1.8 @@ -1,6 +1,6 @@ Summary: Security module for the Apache HTTP Server Name: mod_security -Version: 1.9 +Version: 1.9.1 Release: 1%{?dist} License: GPL URL: http://www.modsecurity.org/ @@ -40,6 +40,9 @@ %config(noreplace) /etc/httpd/conf.d/mod_security.conf %changelog +* Thu Dec 1 2005 Michael Fleming 1.9.1-1 +- New release 1.9.1 + * Wed Nov 9 2005 Michael Fleming 1.9-1 - New stable upstream release 1.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Nov 2005 11:46:13 -0000 1.3 +++ sources 1 Dec 2005 11:31:52 -0000 1.4 @@ -1 +1 @@ -4685b3d6127f2ab1aef71ed0c80ebcbc modsecurity-apache-1.9.tar.gz +d648ba26b1dba708a06344072bea984c modsecurity-apache-1.9.1.tar.gz From fedora-extras-commits at redhat.com Thu Dec 1 11:33:00 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Thu, 1 Dec 2005 06:33:00 -0500 Subject: rpms/mod_security/devel mod_security.spec,1.7,1.8 sources,1.3,1.4 Message-ID: <200512011133.jB1BXUDo003650@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3628 Modified Files: mod_security.spec sources Log Message: * Thu Dec 1 2005 Michael Fleming 1.9.1-1 - New release 1.9.1 Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_security.spec 22 Nov 2005 08:39:23 -0000 1.7 +++ mod_security.spec 1 Dec 2005 11:32:58 -0000 1.8 @@ -1,6 +1,6 @@ Summary: Security module for the Apache HTTP Server Name: mod_security -Version: 1.9 +Version: 1.9.1 Release: 1%{?dist} License: GPL URL: http://www.modsecurity.org/ @@ -40,6 +40,9 @@ %config(noreplace) /etc/httpd/conf.d/mod_security.conf %changelog +* Thu Dec 1 2005 Michael Fleming 1.9.1-1 +- New release 1.9.1 + * Wed Nov 9 2005 Michael Fleming 1.9-1 - New stable upstream release 1.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Nov 2005 08:39:23 -0000 1.3 +++ sources 1 Dec 2005 11:32:58 -0000 1.4 @@ -1 +1 @@ -4685b3d6127f2ab1aef71ed0c80ebcbc modsecurity-apache-1.9.tar.gz +d648ba26b1dba708a06344072bea984c modsecurity-apache-1.9.1.tar.gz From fedora-extras-commits at redhat.com Thu Dec 1 11:39:49 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 1 Dec 2005 06:39:49 -0500 Subject: rpms/scim-anthy/FC-3 .cvsignore, 1.6, 1.7 scim-anthy.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200512011140.jB1BeJVE003858@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3837 Modified Files: .cvsignore scim-anthy.spec sources Log Message: * Thu Dec 1 2005 Akira TAGOH - 0.8.0-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 Oct 2005 09:54:10 -0000 1.6 +++ .cvsignore 1 Dec 2005 11:39:47 -0000 1.7 @@ -1,2 +1,3 @@ scim-anthy-0.6.1.tar.gz scim-anthy-0.7.1.tar.gz +scim-anthy-0.8.0.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- scim-anthy.spec 17 Oct 2005 09:54:10 -0000 1.14 +++ scim-anthy.spec 1 Dec 2005 11:39:47 -0000 1.15 @@ -1,5 +1,5 @@ Name: scim-anthy -Version: 0.7.1 +Version: 0.8.0 Release: 1%{?dist} License: GPL @@ -46,6 +46,9 @@ %changelog +* Thu Dec 1 2005 Akira TAGOH - 0.8.0-1 +- New upstream release. + * Mon Oct 17 2005 Akira TAGOH - 0.7.1-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 Oct 2005 09:54:10 -0000 1.7 +++ sources 1 Dec 2005 11:39:47 -0000 1.8 @@ -1 +1 @@ -c0cc77402b8c9aa1fc0525398ef1cb90 scim-anthy-0.7.1.tar.gz +869df30ecbbbfe43b0758f3b074ed0c9 scim-anthy-0.8.0.tar.gz From fedora-extras-commits at redhat.com Thu Dec 1 11:48:43 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 1 Dec 2005 06:48:43 -0500 Subject: rpms/scim-anthy/FC-4 .cvsignore, 1.7, 1.8 scim-anthy.spec, 1.21, 1.22 sources, 1.9, 1.10 Message-ID: <200512011149.jB1BnDLV003953@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3932 Modified Files: .cvsignore scim-anthy.spec sources Log Message: * Thu Dec 1 2005 Akira TAGOH - 0.8.0-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 17 Oct 2005 09:57:50 -0000 1.7 +++ .cvsignore 1 Dec 2005 11:48:41 -0000 1.8 @@ -1,2 +1,3 @@ scim-anthy-0.6.1.tar.gz scim-anthy-0.7.1.tar.gz +scim-anthy-0.8.0.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- scim-anthy.spec 17 Oct 2005 09:57:50 -0000 1.21 +++ scim-anthy.spec 1 Dec 2005 11:48:41 -0000 1.22 @@ -1,5 +1,5 @@ Name: scim-anthy -Version: 0.7.1 +Version: 0.8.0 Release: 1%{?dist} License: GPL @@ -46,6 +46,9 @@ %changelog +* Thu Dec 1 2005 Akira TAGOH - 0.8.0-1 +- New upstream release. + * Mon Oct 17 2005 Akira TAGOH - 0.7.1-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 17 Oct 2005 09:57:50 -0000 1.9 +++ sources 1 Dec 2005 11:48:41 -0000 1.10 @@ -1 +1 @@ -c0cc77402b8c9aa1fc0525398ef1cb90 scim-anthy-0.7.1.tar.gz +869df30ecbbbfe43b0758f3b074ed0c9 scim-anthy-0.8.0.tar.gz From fedora-extras-commits at redhat.com Thu Dec 1 13:17:23 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 1 Dec 2005 08:17:23 -0500 Subject: rpms/deskbar-applet/devel deskbar-applet.spec, 1.8, 1.9 fedorabz.py, 1.2, 1.3 Message-ID: <200512011317.jB1DHrS6007493@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7474 Modified Files: deskbar-applet.spec fedorabz.py Log Message: Fixed bugs in Fedora BZ handler Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- deskbar-applet.spec 27 Nov 2005 06:27:07 -0000 1.8 +++ deskbar-applet.spec 1 Dec 2005 13:17:21 -0000 1.9 @@ -3,7 +3,7 @@ Name: deskbar-applet Version: 0.8.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet @@ -60,6 +60,9 @@ %{_datadir}/pixmaps/%{name}.png %changelog +* Thu Dec 1 2005 Ignacio Vazquez-Abrams 0.8.5-2 +- Fixed bugs in Fedora BZ handler + * Sun Nov 27 2005 Ignacio Vazquez-Abrams 0.8.5-1 - Upstream update Index: fedorabz.py =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/fedorabz.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedorabz.py 27 Nov 2005 06:27:07 -0000 1.2 +++ fedorabz.py 1 Dec 2005 13:17:21 -0000 1.3 @@ -2,6 +2,7 @@ import deskbar, deskbar.indexer import deskbar.handler +import gnomevfs HANDLERS = { "FedoraBZHandler" : { @@ -31,4 +32,4 @@ def query(self, query, max=5): if query.isdigit(): - return [FedorabzMatch(self, query)] + return [FedoraBZMatch(self, query)] From fedora-extras-commits at redhat.com Thu Dec 1 13:28:36 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 1 Dec 2005 08:28:36 -0500 Subject: rpms/keychain/FC-4 .cvsignore, 1.2, 1.3 README.Fedora, 1.1, 1.2 keychain-manpage.patch, 1.1, 1.2 keychain.csh, 1.2, 1.3 keychain.sh, 1.2, 1.3 keychain.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200512011329.jB1DT7xc007592@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/keychain/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7542/FC-4 Modified Files: .cvsignore README.Fedora keychain-manpage.patch keychain.csh keychain.sh keychain.spec sources Log Message: * Sat Nov 26 2005 Ville Skytt?? - 2.6.1-1 - Update to 2.6.1. - Invoke keychain with --noask in opt-in scripts in non-interactive shells to fix scp'ing to an opt-in enabled account for which keychain hasn't run. - Make opt-in config work the same way with zsh as with other shells. - Replace tweaks in manpage patch with more generic instructions. - Make profile.d snippets non-executable (#35714). - Preserve timestamps of installed files, other cosmetics. (See #174262 for more info.) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Aug 2005 02:55:43 -0000 1.2 +++ .cvsignore 1 Dec 2005 13:28:34 -0000 1.3 @@ -1 +1 @@ -keychain-2.5.5.tar.bz2 +keychain-2.6.1.tar.bz2 Index: README.Fedora =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-4/README.Fedora,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.Fedora 5 Aug 2005 02:55:43 -0000 1.1 +++ README.Fedora 1 Dec 2005 13:28:34 -0000 1.2 @@ -7,9 +7,8 @@ different options are documented in keychain(1). Installed from Fedora Extras keychain can be easily activated by simply -touching an empty ~/.keychainrc file when using either bash, sh, ksh, csh or -tcsh. zsh shell users will have to add a `/etc/profile.d/keychain.sh' call to -their ~/.zlogin file. +touching an empty ~/.keychainrc file when using either bash, sh, ksh, zsh, +csh or tcsh. This will let the user's shell invoke a default setup of keychain where it loads all user's ssh keys from ~/.ssh/ to an ssh-agent process. gpg keys are not loaded by default as the necessary gpg-agent is not part of the Fedora keychain-manpage.patch: Index: keychain-manpage.patch =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-4/keychain-manpage.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- keychain-manpage.patch 5 Aug 2005 02:55:43 -0000 1.1 +++ keychain-manpage.patch 1 Dec 2005 13:28:34 -0000 1.2 @@ -1,79 +1,36 @@ -diff -Naru keychain-2.5.0.orig/keychain.1 keychain-2.5.0/keychain.1 ---- keychain-2.5.0.orig/keychain.1 2005-01-08 04:02:36.000000000 +0200 -+++ keychain-2.5.0/keychain.1 2005-01-08 13:49:25.542402807 +0200 -@@ -291,9 +291,11 @@ +--- keychain-2.6.1/keychain.1~ 2005-10-10 22:40:23.000000000 +0300 ++++ keychain-2.6.1/keychain.1 2005-11-26 16:56:14.000000000 +0200 +@@ -303,8 +303,13 @@ + Show version information. .SH "EXAMPLES" .IX Header "EXAMPLES" - This snippet would work in .bash_profile (for bash) or .zlogin (for --zsh) to load two ssh keys and one gpg key: -+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID -+0123ABCD): +-This snippet should work in any shell to load two ssh keys and one gpg +-key: ++Note that the examples below assume that keychain is available on the ++machine they're run. If you're using them in your login profile snippets ++that are shared between systems, it may be a good idea to protect their ++invocation by first checking if keychain is indeed available. ++.PP ++This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa) ++and one gpg key (key id 0123ABCD): .PP - .Vb 5 -+\& which keychain &>/dev/null && \e - \& keychain id_rsa id_dsa 0123ABCD - \& [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \e - \& source $HOME/.keychain/$HOSTNAME-sh -@@ -305,6 +307,7 @@ - \&.profile: - .PP - .Vb 6 -+\& which keychain >/dev/null 2>/dev/null && \e - \& keychain id_rsa id_dsa 0123ABCD - \& host=`uname -n` - \& [ -f $HOME/.keychain/$host-sh ] && \e -@@ -316,6 +319,7 @@ - This snippet would work in .login for tcsh: - .PP - .Vb 7 -+\& which keychain >& /dev/null && \e - \& keychain id_rsa id_dsa 0123ABCD - \& if (-f $HOME/.keychain/$HOST-csh) then - \& source $HOME/.keychain/$HOST-csh -@@ -328,6 +332,7 @@ - This snippet would work in .login for csh: - .PP - .Vb 8 -+\& which keychain >& /dev/null && \e - \& keychain id_rsa id_dsa 0123ABCD - \& host=`uname -n` - \& if (-f $HOME/.keychain/$host-csh) then -diff -Naru keychain-2.5.0.orig/keychain.pod keychain-2.5.0/keychain.pod ---- keychain-2.5.0.orig/keychain.pod 2005-01-08 04:02:36.000000000 +0200 -+++ keychain-2.5.0/keychain.pod 2005-01-08 13:49:44.002694389 +0200 -@@ -193,8 +193,10 @@ - =head1 EXAMPLES + .Vb 1 + \& eval `keychain --eval id_rsa id_dsa 0123ABCD` +--- keychain-2.6.1/keychain.pod~ 2005-10-10 22:40:23.000000000 +0300 ++++ keychain-2.6.1/keychain.pod 2005-11-26 16:57:25.000000000 +0200 +@@ -207,8 +207,13 @@ - This snippet would work in .bash_profile (for bash) or .zlogin (for --zsh) to load two ssh keys and one gpg key: -+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID -+0123ABCD): - -+ which keychain &>/dev/null && \ - keychain id_rsa id_dsa 0123ABCD - [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \ - source $HOME/.keychain/$HOSTNAME-sh -@@ -204,6 +206,7 @@ - For other Bourne-compatible shells such as sh, you can use this in - .profile: - -+ which keychain >/dev/null 2>/dev/null && \ - keychain id_rsa id_dsa 0123ABCD - host=`uname -n` - [ -f $HOME/.keychain/$host-sh ] && \ -@@ -213,6 +216,7 @@ - - This snippet would work in .login for tcsh: + =head1 EXAMPLES -+ which keychain >& /dev/null && \ - keychain id_rsa id_dsa 0123ABCD - if (-f $HOME/.keychain/$HOST-csh) then - source $HOME/.keychain/$HOST-csh -@@ -223,6 +227,7 @@ +-This snippet should work in any shell to load two ssh keys and one gpg +-key: ++Note that the examples below assume that keychain is available on the ++machine they're run. If you're using them in your login profile snippets ++that are shared between systems, it may be a good idea to protect their ++invocation by first checking if keychain is indeed available. ++ ++This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa) ++and one gpg key (key id 0123ABCD): - This snippet would work in .login for csh: + eval `keychain --eval id_rsa id_dsa 0123ABCD` -+ which keychain >& /dev/null && \ - keychain id_rsa id_dsa 0123ABCD - host=`uname -n` - if (-f $HOME/.keychain/$host-csh) then Index: keychain.csh =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-4/keychain.csh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- keychain.csh 16 Aug 2005 20:55:11 -0000 1.2 +++ keychain.csh 1 Dec 2005 13:28:34 -0000 1.3 @@ -10,10 +10,13 @@ if (! $?KCHOPTS) then set KCHOPTS = "--quiet" endif + if (! $?prompt) then + set KCHOPTS = ( $KCHOPTS --noask ) + endif if (! $?SSHKEYS) then set SSHKEYS = `grep -l -e '[DRS]S[AH] PRIVATE KEY' $HOME/.ssh/*` endif - if (! $?GPGKEYS ) then + if (! $?GPGKEYS) then set GPGKEYS = "" endif Index: keychain.sh =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-4/keychain.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- keychain.sh 16 Aug 2005 20:55:11 -0000 1.2 +++ keychain.sh 1 Dec 2005 13:28:34 -0000 1.3 @@ -7,11 +7,19 @@ . $HOME/.keychainrc [ -n "$KCHOPTS" ] || KCHOPTS="--quiet" + case $- in + *i*) ;; + *) KCHOPTS="$KCHOPTS --noask" ;; + esac [ -n "$SSHKEYS" ] || SSHKEYS=`grep -l -e '[DRS]S[AH] PRIVATE KEY' \ $HOME/.ssh/*` [ -n "$GPGKEYS" ] || GPGKEYS="" - keychain $KCHOPTS $SSHKEYS $GPGKEYS + if [ -n "$ZSH_VERSION" ] ; then + keychain ${=KCHOPTS} ${=SSHKEYS} ${=GPGKEYS} + else + keychain $KCHOPTS $SSHKEYS $GPGKEYS + fi HOST=`uname -n` [ -f $HOME/.keychain/$HOST-sh ] && \ Index: keychain.spec =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-4/keychain.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- keychain.spec 10 Sep 2005 15:57:00 -0000 1.3 +++ keychain.spec 1 Dec 2005 13:28:34 -0000 1.4 @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG -Version: 2.5.5 -Release: 2%{?dist} +Version: 2.6.1 +Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://www.gentoo.org/proj/en/keychain/ @@ -31,11 +31,11 @@ mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_mandir}/man1 -install -m 755 keychain %{buildroot}%{_bindir}/keychain -install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh -install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh -install -m 644 keychain.1 %{buildroot}%{_mandir}/man1 -install -m 644 %{SOURCE3} README.Fedora +install -pm 755 keychain %{buildroot}%{_bindir}/keychain +install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh +install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh +install -pm 644 keychain.1 %{buildroot}%{_mandir}/man1 +install -pm 644 %{SOURCE3} README.Fedora %clean rm -rf %{buildroot} @@ -43,12 +43,21 @@ %files %defattr(-,root,root) %doc COPYING ChangeLog README README.Fedora -%doc %{_mandir}/man1/keychain.1.gz -%{_bindir}/keychain %config(noreplace) %{_sysconfdir}/profile.d/keychain.sh %config(noreplace) %{_sysconfdir}/profile.d/keychain.csh +%{_bindir}/keychain +%{_mandir}/man1/keychain.1* %changelog +* Sat Nov 26 2005 Ville Skytt?? - 2.6.1-1 +- Update to 2.6.1. +- Invoke keychain with --noask in opt-in scripts in non-interactive shells + to fix scp'ing to an opt-in enabled account for which keychain hasn't run. +- Make opt-in config work the same way with zsh as with other shells. +- Replace tweaks in manpage patch with more generic instructions. +- Make profile.d snippets non-executable (#35714). +- Preserve timestamps of installed files, other cosmetics. + * Tue Aug 16 2005 Alexander Dalloz - 2.5.5-2 - Added test for homedir mismatch in opt-in scripts, covering `sudo -s' (reported by Ville Skytt??). Index: sources =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Aug 2005 02:55:43 -0000 1.2 +++ sources 1 Dec 2005 13:28:34 -0000 1.3 @@ -1 +1 @@ -3afa5ce32a5c57e43caac82db3396aac keychain-2.5.5.tar.bz2 +408caf4fe29cd88d5684410ef896c33d keychain-2.6.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Dec 1 13:28:42 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 1 Dec 2005 08:28:42 -0500 Subject: rpms/keychain/devel .cvsignore, 1.2, 1.3 README.Fedora, 1.1, 1.2 keychain-manpage.patch, 1.1, 1.2 keychain.csh, 1.2, 1.3 keychain.sh, 1.2, 1.3 keychain.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200512011329.jB1DTCuY007604@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/keychain/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7542/devel Modified Files: .cvsignore README.Fedora keychain-manpage.patch keychain.csh keychain.sh keychain.spec sources Log Message: * Sat Nov 26 2005 Ville Skytt?? - 2.6.1-1 - Update to 2.6.1. - Invoke keychain with --noask in opt-in scripts in non-interactive shells to fix scp'ing to an opt-in enabled account for which keychain hasn't run. - Make opt-in config work the same way with zsh as with other shells. - Replace tweaks in manpage patch with more generic instructions. - Make profile.d snippets non-executable (#35714). - Preserve timestamps of installed files, other cosmetics. (See #174262 for more info.) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Aug 2005 02:55:43 -0000 1.2 +++ .cvsignore 1 Dec 2005 13:28:40 -0000 1.3 @@ -1 +1 @@ -keychain-2.5.5.tar.bz2 +keychain-2.6.1.tar.bz2 Index: README.Fedora =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/README.Fedora,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.Fedora 5 Aug 2005 02:55:43 -0000 1.1 +++ README.Fedora 1 Dec 2005 13:28:40 -0000 1.2 @@ -7,9 +7,8 @@ different options are documented in keychain(1). Installed from Fedora Extras keychain can be easily activated by simply -touching an empty ~/.keychainrc file when using either bash, sh, ksh, csh or -tcsh. zsh shell users will have to add a `/etc/profile.d/keychain.sh' call to -their ~/.zlogin file. +touching an empty ~/.keychainrc file when using either bash, sh, ksh, zsh, +csh or tcsh. This will let the user's shell invoke a default setup of keychain where it loads all user's ssh keys from ~/.ssh/ to an ssh-agent process. gpg keys are not loaded by default as the necessary gpg-agent is not part of the Fedora keychain-manpage.patch: Index: keychain-manpage.patch =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/keychain-manpage.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- keychain-manpage.patch 5 Aug 2005 02:55:43 -0000 1.1 +++ keychain-manpage.patch 1 Dec 2005 13:28:40 -0000 1.2 @@ -1,79 +1,36 @@ -diff -Naru keychain-2.5.0.orig/keychain.1 keychain-2.5.0/keychain.1 ---- keychain-2.5.0.orig/keychain.1 2005-01-08 04:02:36.000000000 +0200 -+++ keychain-2.5.0/keychain.1 2005-01-08 13:49:25.542402807 +0200 -@@ -291,9 +291,11 @@ +--- keychain-2.6.1/keychain.1~ 2005-10-10 22:40:23.000000000 +0300 ++++ keychain-2.6.1/keychain.1 2005-11-26 16:56:14.000000000 +0200 +@@ -303,8 +303,13 @@ + Show version information. .SH "EXAMPLES" .IX Header "EXAMPLES" - This snippet would work in .bash_profile (for bash) or .zlogin (for --zsh) to load two ssh keys and one gpg key: -+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID -+0123ABCD): +-This snippet should work in any shell to load two ssh keys and one gpg +-key: ++Note that the examples below assume that keychain is available on the ++machine they're run. If you're using them in your login profile snippets ++that are shared between systems, it may be a good idea to protect their ++invocation by first checking if keychain is indeed available. ++.PP ++This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa) ++and one gpg key (key id 0123ABCD): .PP - .Vb 5 -+\& which keychain &>/dev/null && \e - \& keychain id_rsa id_dsa 0123ABCD - \& [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \e - \& source $HOME/.keychain/$HOSTNAME-sh -@@ -305,6 +307,7 @@ - \&.profile: - .PP - .Vb 6 -+\& which keychain >/dev/null 2>/dev/null && \e - \& keychain id_rsa id_dsa 0123ABCD - \& host=`uname -n` - \& [ -f $HOME/.keychain/$host-sh ] && \e -@@ -316,6 +319,7 @@ - This snippet would work in .login for tcsh: - .PP - .Vb 7 -+\& which keychain >& /dev/null && \e - \& keychain id_rsa id_dsa 0123ABCD - \& if (-f $HOME/.keychain/$HOST-csh) then - \& source $HOME/.keychain/$HOST-csh -@@ -328,6 +332,7 @@ - This snippet would work in .login for csh: - .PP - .Vb 8 -+\& which keychain >& /dev/null && \e - \& keychain id_rsa id_dsa 0123ABCD - \& host=`uname -n` - \& if (-f $HOME/.keychain/$host-csh) then -diff -Naru keychain-2.5.0.orig/keychain.pod keychain-2.5.0/keychain.pod ---- keychain-2.5.0.orig/keychain.pod 2005-01-08 04:02:36.000000000 +0200 -+++ keychain-2.5.0/keychain.pod 2005-01-08 13:49:44.002694389 +0200 -@@ -193,8 +193,10 @@ - =head1 EXAMPLES + .Vb 1 + \& eval `keychain --eval id_rsa id_dsa 0123ABCD` +--- keychain-2.6.1/keychain.pod~ 2005-10-10 22:40:23.000000000 +0300 ++++ keychain-2.6.1/keychain.pod 2005-11-26 16:57:25.000000000 +0200 +@@ -207,8 +207,13 @@ - This snippet would work in .bash_profile (for bash) or .zlogin (for --zsh) to load two ssh keys and one gpg key: -+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID -+0123ABCD): - -+ which keychain &>/dev/null && \ - keychain id_rsa id_dsa 0123ABCD - [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \ - source $HOME/.keychain/$HOSTNAME-sh -@@ -204,6 +206,7 @@ - For other Bourne-compatible shells such as sh, you can use this in - .profile: - -+ which keychain >/dev/null 2>/dev/null && \ - keychain id_rsa id_dsa 0123ABCD - host=`uname -n` - [ -f $HOME/.keychain/$host-sh ] && \ -@@ -213,6 +216,7 @@ - - This snippet would work in .login for tcsh: + =head1 EXAMPLES -+ which keychain >& /dev/null && \ - keychain id_rsa id_dsa 0123ABCD - if (-f $HOME/.keychain/$HOST-csh) then - source $HOME/.keychain/$HOST-csh -@@ -223,6 +227,7 @@ +-This snippet should work in any shell to load two ssh keys and one gpg +-key: ++Note that the examples below assume that keychain is available on the ++machine they're run. If you're using them in your login profile snippets ++that are shared between systems, it may be a good idea to protect their ++invocation by first checking if keychain is indeed available. ++ ++This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa) ++and one gpg key (key id 0123ABCD): - This snippet would work in .login for csh: + eval `keychain --eval id_rsa id_dsa 0123ABCD` -+ which keychain >& /dev/null && \ - keychain id_rsa id_dsa 0123ABCD - host=`uname -n` - if (-f $HOME/.keychain/$host-csh) then Index: keychain.csh =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/keychain.csh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- keychain.csh 16 Aug 2005 20:55:11 -0000 1.2 +++ keychain.csh 1 Dec 2005 13:28:40 -0000 1.3 @@ -10,10 +10,13 @@ if (! $?KCHOPTS) then set KCHOPTS = "--quiet" endif + if (! $?prompt) then + set KCHOPTS = ( $KCHOPTS --noask ) + endif if (! $?SSHKEYS) then set SSHKEYS = `grep -l -e '[DRS]S[AH] PRIVATE KEY' $HOME/.ssh/*` endif - if (! $?GPGKEYS ) then + if (! $?GPGKEYS) then set GPGKEYS = "" endif Index: keychain.sh =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/keychain.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- keychain.sh 16 Aug 2005 20:55:11 -0000 1.2 +++ keychain.sh 1 Dec 2005 13:28:40 -0000 1.3 @@ -7,11 +7,19 @@ . $HOME/.keychainrc [ -n "$KCHOPTS" ] || KCHOPTS="--quiet" + case $- in + *i*) ;; + *) KCHOPTS="$KCHOPTS --noask" ;; + esac [ -n "$SSHKEYS" ] || SSHKEYS=`grep -l -e '[DRS]S[AH] PRIVATE KEY' \ $HOME/.ssh/*` [ -n "$GPGKEYS" ] || GPGKEYS="" - keychain $KCHOPTS $SSHKEYS $GPGKEYS + if [ -n "$ZSH_VERSION" ] ; then + keychain ${=KCHOPTS} ${=SSHKEYS} ${=GPGKEYS} + else + keychain $KCHOPTS $SSHKEYS $GPGKEYS + fi HOST=`uname -n` [ -f $HOME/.keychain/$HOST-sh ] && \ Index: keychain.spec =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/keychain.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- keychain.spec 10 Sep 2005 15:57:01 -0000 1.3 +++ keychain.spec 1 Dec 2005 13:28:40 -0000 1.4 @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG -Version: 2.5.5 -Release: 2%{?dist} +Version: 2.6.1 +Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://www.gentoo.org/proj/en/keychain/ @@ -31,11 +31,11 @@ mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_mandir}/man1 -install -m 755 keychain %{buildroot}%{_bindir}/keychain -install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh -install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh -install -m 644 keychain.1 %{buildroot}%{_mandir}/man1 -install -m 644 %{SOURCE3} README.Fedora +install -pm 755 keychain %{buildroot}%{_bindir}/keychain +install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh +install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh +install -pm 644 keychain.1 %{buildroot}%{_mandir}/man1 +install -pm 644 %{SOURCE3} README.Fedora %clean rm -rf %{buildroot} @@ -43,12 +43,21 @@ %files %defattr(-,root,root) %doc COPYING ChangeLog README README.Fedora -%doc %{_mandir}/man1/keychain.1.gz -%{_bindir}/keychain %config(noreplace) %{_sysconfdir}/profile.d/keychain.sh %config(noreplace) %{_sysconfdir}/profile.d/keychain.csh +%{_bindir}/keychain +%{_mandir}/man1/keychain.1* %changelog +* Sat Nov 26 2005 Ville Skytt?? - 2.6.1-1 +- Update to 2.6.1. +- Invoke keychain with --noask in opt-in scripts in non-interactive shells + to fix scp'ing to an opt-in enabled account for which keychain hasn't run. +- Make opt-in config work the same way with zsh as with other shells. +- Replace tweaks in manpage patch with more generic instructions. +- Make profile.d snippets non-executable (#35714). +- Preserve timestamps of installed files, other cosmetics. + * Tue Aug 16 2005 Alexander Dalloz - 2.5.5-2 - Added test for homedir mismatch in opt-in scripts, covering `sudo -s' (reported by Ville Skytt??). Index: sources =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Aug 2005 02:55:43 -0000 1.2 +++ sources 1 Dec 2005 13:28:40 -0000 1.3 @@ -1 +1 @@ -3afa5ce32a5c57e43caac82db3396aac keychain-2.5.5.tar.bz2 +408caf4fe29cd88d5684410ef896c33d keychain-2.6.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Dec 1 14:45:04 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 1 Dec 2005 09:45:04 -0500 Subject: rpms/octave/devel octave-2.9.4-x86_64.patch, NONE, 1.1 octave.spec, 1.24, 1.25 Message-ID: <200512011445.jB1EjYNw009525@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9505 Modified Files: octave.spec Added Files: octave-2.9.4-x86_64.patch Log Message: Add x86_64 patch. octave-2.9.4-x86_64.patch: --- NEW FILE octave-2.9.4-x86_64.patch --- --- octave-2.9.4/src/DLD-FUNCTIONS/spchol.cc.orig 2005-11-11 10:44:05.000000000 -0700 +++ octave-2.9.4/src/DLD-FUNCTIONS/spchol.cc 2005-11-30 15:41:35.000000000 -0700 @@ -609,7 +609,11 @@ for (octave_idx_type k = 0 ; k < n ; k++) { // get the kth row of L and store in the columns of L +#ifdef IDX_TYPE_LONG + cholmod_l_row_subtree (A1, A2, k, Parent, R, cm) ; +#else cholmod_row_subtree (A1, A2, k, Parent, R, cm) ; +#endif for (octave_idx_type p = 0 ; p < Rp [1] ; p++) L.xridx (W [Ri [p]]++) = k ; Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- octave.spec 12 Nov 2005 06:02:28 -0000 1.24 +++ octave.spec 1 Dec 2005 14:45:02 -0000 1.25 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -8,6 +8,7 @@ License: GPL Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2 Patch0: octave-2.9.4-header.patch +Patch1: octave-2.9.4-x86_64.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -51,6 +52,7 @@ %prep %setup -q %patch0 -p0 +%patch1 -p0 ./autogen.sh @@ -63,7 +65,8 @@ CPPFLAGS=-I%{_includedir}/glpk \ CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" ./configure %enable64 \ --enable-shared=yes --enable-lite-kernel --enable-static=no \ - --prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir} + --prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir} \ + --mandir=%{_mandir} make %{?_smp_mflags} @@ -72,7 +75,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT rm -f doc/interpreter/munge-texi doc/interpreter/*.o strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct @@ -82,7 +85,6 @@ perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/ls-R perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_datadir}/%{name}/ls-R -perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/%{version}/oct/*/PKG_ADD # XXX Nuke unpackaged files @@ -129,6 +131,9 @@ %changelog +* Thu Dec 1 2005 Quentin Spencer 2.9.4-2 +- Patch to enable compilation on x86_64. + * Fri Nov 11 2005 Quentin Spencer 2.9.4-1 - New upstream release. - Patch to make sure all headers are included in -devel. From fedora-extras-commits at redhat.com Thu Dec 1 14:46:40 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 1 Dec 2005 09:46:40 -0500 Subject: rpms/cernlib/devel 705-patch-paw_motif-paw-Imakefiles.dpatch, 1.1, 1.2 Message-ID: <200512011447.jB1ElA5s009591@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9536 Modified Files: 705-patch-paw_motif-paw-Imakefiles.dpatch Log Message: build in mathlib before building pawlib to have a shared library for linking. Index: 705-patch-paw_motif-paw-Imakefiles.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/705-patch-paw_motif-paw-Imakefiles.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 705-patch-paw_motif-paw-Imakefiles.dpatch 30 Nov 2005 22:01:01 -0000 1.1 +++ 705-patch-paw_motif-paw-Imakefiles.dpatch 1 Dec 2005 14:46:38 -0000 1.2 @@ -13,7 +13,7 @@ -LIBDIRS= kernlib packlib code_motif pawlib graflib mathlib geant321 mclibs phtools -+LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools ++LIBDIRS= kernlib packlib code_motif graflib mathlib pawlib paw_motif geant321 mclibs phtools SUBDIRS= $(LIBDIRS) patchy cfortran From fedora-extras-commits at redhat.com Thu Dec 1 14:47:57 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 1 Dec 2005 09:47:57 -0500 Subject: rpms/cernlib/devel cernlib.spec,1.4,1.5 Message-ID: <200512011448.jB1EmRbP009614@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9597 Modified Files: cernlib.spec Log Message: Bump version to recompile Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cernlib.spec 1 Dec 2005 08:26:03 -0000 1.4 +++ cernlib.spec 1 Dec 2005 14:47:54 -0000 1.5 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 6%{?dist} +Release: 6%{?dist}.1 Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -688,7 +688,7 @@ %doc debian/debhelper/zftp.README.debian %changelog -* Tue Nov 29 2005 Patrice Dumas - 2005-6 +* Tue Nov 29 2005 Patrice Dumas - 2005-6.1 - update with newer debian patchset for cernlib, fix licence issues - don't use the include.tar.gz source, instead get include files from the source files From fedora-extras-commits at redhat.com Thu Dec 1 14:57:46 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 1 Dec 2005 09:57:46 -0500 Subject: rpms/octave/devel octave-2.9.4-x86_64.patch, 1.1, 1.2 octave.spec, 1.25, 1.26 Message-ID: <200512011458.jB1EwGue009734@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9684 Modified Files: octave-2.9.4-x86_64.patch octave.spec Log Message: Make sure patch applies before building. octave-2.9.4-x86_64.patch: Index: octave-2.9.4-x86_64.patch =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave-2.9.4-x86_64.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- octave-2.9.4-x86_64.patch 1 Dec 2005 14:45:02 -0000 1.1 +++ octave-2.9.4-x86_64.patch 1 Dec 2005 14:57:44 -0000 1.2 @@ -1,5 +1,5 @@ ---- octave-2.9.4/src/DLD-FUNCTIONS/spchol.cc.orig 2005-11-11 10:44:05.000000000 -0700 -+++ octave-2.9.4/src/DLD-FUNCTIONS/spchol.cc 2005-11-30 15:41:35.000000000 -0700 +--- src/DLD-FUNCTIONS/spchol.cc.orig 2005-11-11 10:44:05.000000000 -0700 ++++ src/DLD-FUNCTIONS/spchol.cc 2005-11-30 15:41:35.000000000 -0700 @@ -609,7 +609,11 @@ for (octave_idx_type k = 0 ; k < n ; k++) { Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- octave.spec 1 Dec 2005 14:45:02 -0000 1.25 +++ octave.spec 1 Dec 2005 14:57:44 -0000 1.26 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -131,6 +131,9 @@ %changelog +* Thu Dec 1 2005 Quentin Spencer 2.9.4-3 +- Make sure patch applies correctly before building! + * Thu Dec 1 2005 Quentin Spencer 2.9.4-2 - Patch to enable compilation on x86_64. From fedora-extras-commits at redhat.com Thu Dec 1 15:10:32 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 1 Dec 2005 10:10:32 -0500 Subject: rpms/gc/FC-4 gc.spec,1.12,1.13 Message-ID: <200512011510.jB1FAWme011405@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gc/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11371/FC-4 Modified Files: gc.spec Log Message: Summary: C++ Garbage Collector Name: gc Version: 6.6 Release: 4%{?dist} Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # force no undefined symbols (#166344) Patch1: gc-6.6-no-undefined.patch BuildRequires: libtool BuildRequires: automake Provides: libgc = %{version}-%{release} %description The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage collecting replacement for C malloc or C++ new. %package devel Summary: Libraries and header files for %{name} development Group: Development/Libraries Requires: %{name} = %{version}-%{release} Provides: libgc-devel = %{version}-%{release} %description devel Libraries and header files for %{name} development. %prep %setup -q -n %{name}%{version} %patch1 -p1 -b .no-undefined cp -f %{_datadir}/aclocal/libtool.m4 . libtoolize --copy --force aclocal automake autoconf #autoheader %build %configure \ --disable-static \ --enable-cplusplus \ --enable-threads=posix \ %ifarch %{ix86} --enable-parallel-mark %endif make %{?_smp_mflags} %check || : make check %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT install -p -D -m644 doc/gc.man $RPM_BUILD_ROOT%{_mandir}/man3/gc.3 ## Unpackaged files rm -rf $RPM_BUILD_ROOT%{_datadir}/gc rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc doc/README doc/README.changes doc/README.contributors %doc doc/README.environment doc/README.linux %{_libdir}/lib*.so.* %files devel %defattr(-,root,root) %doc doc/*.html %{_includedir}/* %{_libdir}/lib*.so %{_mandir}/man?/* %changelog * Thu Dec 01 2005 Rex Dieter 6.6-4 - Provides: libgc(-devel) * Wed Sep 14 2005 Rex Dieter 6.6-3 - no-undefined patch, libtool madness (#166344) * Mon Sep 12 2005 Rex Dieter 6.6-2 - drop opendl patch (doesn't appear to be needed anymore) * Fri Sep 09 2005 Rex Dieter 6.6-1 - 6.6 * Wed May 25 2005 Rex Dieter 6.5-1 - 6.5 * Fri Apr 7 2005 Michael Schwendt - rebuilt * Wed Jan 26 2005 Rex Dieter 0:6.4-2 - --enable-threads unconditionally - --enable-parallel-mark only on %%ix86 (#144681) * Mon Jan 10 2005 Rex Dieter 0:6.4-1 - 6.4 - update opendl patch * Fri Jul 09 2004 Rex Dieter 0:6.3-0.fdr.1 - 6.3(final) * Tue Jun 01 2004 Rex Dieter 0:6.3-0.fdr.0.4.alpha6 - dlopen patch * Wed May 26 2004 Rex Dieter 0:6.3-0.fdr.0.3.alpha6 - explictly --enable-threads ('n friends) * Tue May 25 2004 Rex Dieter 0:6.3-0.fdr.0.2.alpha6 - 6.3alpha6 - --disable-static - --enable-parallel-mark * Wed Dec 17 2003 Rex Dieter 0:6.3-0.fdr.0.1.alpha2 - 6.3alpha2 * Thu Oct 02 2003 Rex Dieter 0:6.2-0.fdr.3 - OK, put manpage in man3. * Thu Oct 02 2003 Rex Dieter 0:6.2-0.fdr.2 - drop manpage pending feedback from developer. * Tue Sep 30 2003 Rex Dieter 0:6.2-0.fdr.1 - fix manpage location - remove .la file (it appears unnecessary after all, thanks to opendl patch) - remove cvs tag from description - touchup -devel desc/summary. - macro update to support Fedora Core * Thu Sep 11 2003 Rex Dieter 0:6.2-0.fdr.0 - 6.2 release. - update license (BSD) - Consider building with: --enable-parallel-mark (for now, no). Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/FC-4/gc.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gc.spec 16 Sep 2005 17:49:26 -0000 1.12 +++ gc.spec 1 Dec 2005 15:10:29 -0000 1.13 @@ -1,19 +1,21 @@ -# $Id$ Summary: C++ Garbage Collector Name: gc Version: 6.6 -Release: 3%{?dist} +Release: 4%{?dist} Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ -Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz +Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # force no undefined symbols (#166344) Patch1: gc-6.6-no-undefined.patch -BuildRequires: libtool automake autoconf +BuildRequires: libtool +BuildRequires: automake + +Provides: libgc = %{version}-%{release} %description @@ -24,6 +26,7 @@ Summary: Libraries and header files for %{name} development Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Provides: libgc-devel = %{version}-%{release} %description devel Libraries and header files for %{name} development. @@ -94,6 +97,9 @@ %changelog +* Thu Dec 01 2005 Rex Dieter 6.6-4 +- Provides: libgc(-devel) + * Wed Sep 14 2005 Rex Dieter 6.6-3 - no-undefined patch, libtool madness (#166344) From fedora-extras-commits at redhat.com Thu Dec 1 15:10:05 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 1 Dec 2005 10:10:05 -0500 Subject: rpms/gc/FC-3 gc.spec,1.11,1.12 Message-ID: <200512011510.jB1FA5H8011385@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gc/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11371/FC-3 Modified Files: gc.spec Log Message: Summary: C++ Garbage Collector Name: gc Version: 6.6 Release: 4%{?dist} Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # force no undefined symbols (#166344) Patch1: gc-6.6-no-undefined.patch BuildRequires: libtool BuildRequires: automake Provides: libgc = %{version}-%{release} %description The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage collecting replacement for C malloc or C++ new. %package devel Summary: Libraries and header files for %{name} development Group: Development/Libraries Requires: %{name} = %{version}-%{release} Provides: libgc-devel = %{version}-%{release} %description devel Libraries and header files for %{name} development. %prep %setup -q -n %{name}%{version} %patch1 -p1 -b .no-undefined cp -f %{_datadir}/aclocal/libtool.m4 . libtoolize --copy --force aclocal automake autoconf #autoheader %build %configure \ --disable-static \ --enable-cplusplus \ --enable-threads=posix \ %ifarch %{ix86} --enable-parallel-mark %endif make %{?_smp_mflags} %check || : make check %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT install -p -D -m644 doc/gc.man $RPM_BUILD_ROOT%{_mandir}/man3/gc.3 ## Unpackaged files rm -rf $RPM_BUILD_ROOT%{_datadir}/gc rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc doc/README doc/README.changes doc/README.contributors %doc doc/README.environment doc/README.linux %{_libdir}/lib*.so.* %files devel %defattr(-,root,root) %doc doc/*.html %{_includedir}/* %{_libdir}/lib*.so %{_mandir}/man?/* %changelog * Thu Dec 01 2005 Rex Dieter 6.6-4 - Provides: libgc(-devel) * Wed Sep 14 2005 Rex Dieter 6.6-3 - no-undefined patch, libtool madness (#166344) * Mon Sep 12 2005 Rex Dieter 6.6-2 - drop opendl patch (doesn't appear to be needed anymore) * Fri Sep 09 2005 Rex Dieter 6.6-1 - 6.6 * Wed May 25 2005 Rex Dieter 6.5-1 - 6.5 * Fri Apr 7 2005 Michael Schwendt - rebuilt * Wed Jan 26 2005 Rex Dieter 0:6.4-2 - --enable-threads unconditionally - --enable-parallel-mark only on %%ix86 (#144681) * Mon Jan 10 2005 Rex Dieter 0:6.4-1 - 6.4 - update opendl patch * Fri Jul 09 2004 Rex Dieter 0:6.3-0.fdr.1 - 6.3(final) * Tue Jun 01 2004 Rex Dieter 0:6.3-0.fdr.0.4.alpha6 - dlopen patch * Wed May 26 2004 Rex Dieter 0:6.3-0.fdr.0.3.alpha6 - explictly --enable-threads ('n friends) * Tue May 25 2004 Rex Dieter 0:6.3-0.fdr.0.2.alpha6 - 6.3alpha6 - --disable-static - --enable-parallel-mark * Wed Dec 17 2003 Rex Dieter 0:6.3-0.fdr.0.1.alpha2 - 6.3alpha2 * Thu Oct 02 2003 Rex Dieter 0:6.2-0.fdr.3 - OK, put manpage in man3. * Thu Oct 02 2003 Rex Dieter 0:6.2-0.fdr.2 - drop manpage pending feedback from developer. * Tue Sep 30 2003 Rex Dieter 0:6.2-0.fdr.1 - fix manpage location - remove .la file (it appears unnecessary after all, thanks to opendl patch) - remove cvs tag from description - touchup -devel desc/summary. - macro update to support Fedora Core * Thu Sep 11 2003 Rex Dieter 0:6.2-0.fdr.0 - 6.2 release. - update license (BSD) - Consider building with: --enable-parallel-mark (for now, no). Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/FC-3/gc.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gc.spec 1 Nov 2005 12:42:03 -0000 1.11 +++ gc.spec 1 Dec 2005 15:10:03 -0000 1.12 @@ -1,19 +1,21 @@ -# $Id$ Summary: C++ Garbage Collector Name: gc Version: 6.6 -Release: 3%{?dist}.1 +Release: 4%{?dist} Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ -Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz +Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # force no undefined symbols (#166344) Patch1: gc-6.6-no-undefined.patch -BuildRequires: libtool automake autoconf +BuildRequires: libtool +BuildRequires: automake + +Provides: libgc = %{version}-%{release} %description @@ -24,6 +26,7 @@ Summary: Libraries and header files for %{name} development Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Provides: libgc-devel = %{version}-%{release} %description devel Libraries and header files for %{name} development. @@ -94,6 +97,9 @@ %changelog +* Thu Dec 01 2005 Rex Dieter 6.6-4 +- Provides: libgc(-devel) + * Wed Sep 14 2005 Rex Dieter 6.6-3 - no-undefined patch, libtool madness (#166344) From fedora-extras-commits at redhat.com Thu Dec 1 15:10:38 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 1 Dec 2005 10:10:38 -0500 Subject: rpms/gc/devel gc.spec,1.13,1.14 Message-ID: <200512011510.jB1FAcYO011423@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11371/devel Modified Files: gc.spec Log Message: Summary: C++ Garbage Collector Name: gc Version: 6.6 Release: 4%{?dist} Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # force no undefined symbols (#166344) Patch1: gc-6.6-no-undefined.patch BuildRequires: libtool BuildRequires: automake Provides: libgc = %{version}-%{release} %description The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage collecting replacement for C malloc or C++ new. %package devel Summary: Libraries and header files for %{name} development Group: Development/Libraries Requires: %{name} = %{version}-%{release} Provides: libgc-devel = %{version}-%{release} %description devel Libraries and header files for %{name} development. %prep %setup -q -n %{name}%{version} %patch1 -p1 -b .no-undefined cp -f %{_datadir}/aclocal/libtool.m4 . libtoolize --copy --force aclocal automake autoconf #autoheader %build %configure \ --disable-static \ --enable-cplusplus \ --enable-threads=posix \ %ifarch %{ix86} --enable-parallel-mark %endif make %{?_smp_mflags} %check || : make check %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT install -p -D -m644 doc/gc.man $RPM_BUILD_ROOT%{_mandir}/man3/gc.3 ## Unpackaged files rm -rf $RPM_BUILD_ROOT%{_datadir}/gc rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc doc/README doc/README.changes doc/README.contributors %doc doc/README.environment doc/README.linux %{_libdir}/lib*.so.* %files devel %defattr(-,root,root) %doc doc/*.html %{_includedir}/* %{_libdir}/lib*.so %{_mandir}/man?/* %changelog * Thu Dec 01 2005 Rex Dieter 6.6-4 - Provides: libgc(-devel) * Wed Sep 14 2005 Rex Dieter 6.6-3 - no-undefined patch, libtool madness (#166344) * Mon Sep 12 2005 Rex Dieter 6.6-2 - drop opendl patch (doesn't appear to be needed anymore) * Fri Sep 09 2005 Rex Dieter 6.6-1 - 6.6 * Wed May 25 2005 Rex Dieter 6.5-1 - 6.5 * Fri Apr 7 2005 Michael Schwendt - rebuilt * Wed Jan 26 2005 Rex Dieter 0:6.4-2 - --enable-threads unconditionally - --enable-parallel-mark only on %%ix86 (#144681) * Mon Jan 10 2005 Rex Dieter 0:6.4-1 - 6.4 - update opendl patch * Fri Jul 09 2004 Rex Dieter 0:6.3-0.fdr.1 - 6.3(final) * Tue Jun 01 2004 Rex Dieter 0:6.3-0.fdr.0.4.alpha6 - dlopen patch * Wed May 26 2004 Rex Dieter 0:6.3-0.fdr.0.3.alpha6 - explictly --enable-threads ('n friends) * Tue May 25 2004 Rex Dieter 0:6.3-0.fdr.0.2.alpha6 - 6.3alpha6 - --disable-static - --enable-parallel-mark * Wed Dec 17 2003 Rex Dieter 0:6.3-0.fdr.0.1.alpha2 - 6.3alpha2 * Thu Oct 02 2003 Rex Dieter 0:6.2-0.fdr.3 - OK, put manpage in man3. * Thu Oct 02 2003 Rex Dieter 0:6.2-0.fdr.2 - drop manpage pending feedback from developer. * Tue Sep 30 2003 Rex Dieter 0:6.2-0.fdr.1 - fix manpage location - remove .la file (it appears unnecessary after all, thanks to opendl patch) - remove cvs tag from description - touchup -devel desc/summary. - macro update to support Fedora Core * Thu Sep 11 2003 Rex Dieter 0:6.2-0.fdr.0 - 6.2 release. - update license (BSD) - Consider building with: --enable-parallel-mark (for now, no). Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gc.spec 16 Sep 2005 16:07:48 -0000 1.13 +++ gc.spec 1 Dec 2005 15:10:35 -0000 1.14 @@ -1,19 +1,21 @@ -# $Id$ Summary: C++ Garbage Collector Name: gc Version: 6.6 -Release: 3%{?dist} +Release: 4%{?dist} Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ -Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz +Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # force no undefined symbols (#166344) Patch1: gc-6.6-no-undefined.patch -BuildRequires: libtool automake autoconf +BuildRequires: libtool +BuildRequires: automake + +Provides: libgc = %{version}-%{release} %description @@ -24,6 +26,7 @@ Summary: Libraries and header files for %{name} development Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Provides: libgc-devel = %{version}-%{release} %description devel Libraries and header files for %{name} development. @@ -94,6 +97,9 @@ %changelog +* Thu Dec 01 2005 Rex Dieter 6.6-4 +- Provides: libgc(-devel) + * Wed Sep 14 2005 Rex Dieter 6.6-3 - no-undefined patch, libtool madness (#166344) From fedora-extras-commits at redhat.com Thu Dec 1 15:20:33 2005 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Thu, 1 Dec 2005 10:20:33 -0500 Subject: rpms/digikam/devel .cvsignore, 1.2, 1.3 digikam.spec, 1.3, 1.4 sources, 1.2, 1.3 digikam-0.7.4-64bit-typo.patch, 1.1, NONE Message-ID: <200512011521.jB1FL3i6011555@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/extras/rpms/digikam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11534 Modified Files: .cvsignore digikam.spec sources Removed Files: digikam-0.7.4-64bit-typo.patch Log Message: - Add description about digikamimageplugins and kipi-plugins - Remove 64 bit patch, applied upstream - Update to version 0.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/digikam/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Sep 2005 10:23:34 -0000 1.2 +++ .cvsignore 1 Dec 2005 15:20:30 -0000 1.3 @@ -1 +1,2 @@ digikam-0.7.4.tar.bz2 +digikam-0.8.0.tar.bz2 Index: digikam.spec =================================================================== RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- digikam.spec 22 Oct 2005 20:50:46 -0000 1.3 +++ digikam.spec 1 Dec 2005 15:20:30 -0000 1.4 @@ -1,17 +1,16 @@ Name: digikam -Version: 0.7.4 -Release: 4%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia License: GPL URL: http://www.digikam.org/ Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Patch0: digikam-0.7.4-64bit-typo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0 -BuildRequires: libkexif-devel >= 0.2 libkipi-devel >= 0.1 desktop-file-utils +BuildRequires: gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2 +BuildRequires: libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils BuildRequires: gettext Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -24,7 +23,8 @@ digital camera, preview the images and download and/or delete them. digiKam buildin image editor makes the common photo correction a simple task. -The image editor is extensible via plugins. +The image editor is extensible via plugins, install the digikamimageplugins +and/or kipi-plugins packages to use them. %package devel Summary: Development files for %{name} @@ -37,7 +37,6 @@ %prep %setup -q -%patch0 -p1 -b 64bit-typo.patch %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -95,7 +94,7 @@ %files -f %name.lang %defattr(-, root, root) -%doc AUTHORS ChangeLog COPYING HACKING README +%doc AUTHORS ChangeLog COPYING HACKING README TODO %{_bindir}/* %{_libdir}/libdigikam.so.* %{_libdir}/kde3/digikamimageplugin_core.la @@ -116,6 +115,11 @@ %{_libdir}/libdigikam.so %changelog +* 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 - Exclude libdigikam.la (bug #171503) Index: sources =================================================================== RCS file: /cvs/extras/rpms/digikam/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2005 10:23:34 -0000 1.2 +++ sources 1 Dec 2005 15:20:30 -0000 1.3 @@ -1 +1 @@ -3df53700ff78caca60cab4ea4116c7c5 digikam-0.7.4.tar.bz2 +9a0eaf4cb8e10d082b54b920a6244890 digikam-0.8.0.tar.bz2 --- digikam-0.7.4-64bit-typo.patch DELETED --- From fedora-extras-commits at redhat.com Thu Dec 1 15:58:17 2005 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Thu, 1 Dec 2005 10:58:17 -0500 Subject: rpms/digikam/FC-3 .cvsignore, 1.2, 1.3 digikam.spec, 1.3, 1.4 sources, 1.2, 1.3 digikam-0.7.4-64bit-typo.patch, 1.1, NONE Message-ID: <200512011558.jB1Fwlxg011952@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/extras/rpms/digikam/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11928 Modified Files: .cvsignore digikam.spec sources Removed Files: digikam-0.7.4-64bit-typo.patch Log Message: - Add description about digikamimageplugins and kipi-plugins - Remove 64 bit patch, applied upstream - Update to version 0.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/digikam/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Sep 2005 10:23:34 -0000 1.2 +++ .cvsignore 1 Dec 2005 15:58:15 -0000 1.3 @@ -1 +1,2 @@ digikam-0.7.4.tar.bz2 +digikam-0.8.0.tar.bz2 Index: digikam.spec =================================================================== RCS file: /cvs/extras/rpms/digikam/FC-3/digikam.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- digikam.spec 22 Oct 2005 20:22:12 -0000 1.3 +++ digikam.spec 1 Dec 2005 15:58:15 -0000 1.4 @@ -1,17 +1,16 @@ Name: digikam -Version: 0.7.4 -Release: 4%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia License: GPL URL: http://www.digikam.org/ Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Patch0: digikam-0.7.4-64bit-typo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0 -BuildRequires: libkexif-devel >= 0.2 libkipi-devel >= 0.1 desktop-file-utils +BuildRequires: gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2 +BuildRequires: libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils BuildRequires: gettext Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -24,7 +23,8 @@ digital camera, preview the images and download and/or delete them. digiKam buildin image editor makes the common photo correction a simple task. -The image editor is extensible via plugins. +The image editor is extensible via plugins, install the digikamimageplugins +and/or kipi-plugins packages to use them. %package devel Summary: Development files for %{name} @@ -37,7 +37,6 @@ %prep %setup -q -%patch0 -p1 -b 64bit-typo.patch %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -95,7 +94,7 @@ %files -f %name.lang %defattr(-, root, root) -%doc AUTHORS ChangeLog COPYING HACKING README +%doc AUTHORS ChangeLog COPYING HACKING README TODO %{_bindir}/* %{_libdir}/libdigikam.so.* %{_libdir}/kde3/digikamimageplugin_core.la @@ -116,6 +115,11 @@ %{_libdir}/libdigikam.so %changelog +* 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 - Exclude libdigikam.la (bug #171503) Index: sources =================================================================== RCS file: /cvs/extras/rpms/digikam/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2005 10:23:34 -0000 1.2 +++ sources 1 Dec 2005 15:58:15 -0000 1.3 @@ -1 +1 @@ -3df53700ff78caca60cab4ea4116c7c5 digikam-0.7.4.tar.bz2 +9a0eaf4cb8e10d082b54b920a6244890 digikam-0.8.0.tar.bz2 --- digikam-0.7.4-64bit-typo.patch DELETED --- From fedora-extras-commits at redhat.com Thu Dec 1 16:05:51 2005 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Thu, 1 Dec 2005 11:05:51 -0500 Subject: rpms/digikam/FC-4 .cvsignore, 1.2, 1.3 digikam.spec, 1.3, 1.4 sources, 1.2, 1.3 digikam-0.7.4-64bit-typo.patch, 1.1, NONE Message-ID: <200512011606.jB1G6MjC013620@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/extras/rpms/digikam/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13586 Modified Files: .cvsignore digikam.spec sources Removed Files: digikam-0.7.4-64bit-typo.patch Log Message: - Add description about digikamimageplugins and kipi-plugins - Remove 64 bit patch, applied upstream - Update to version 0.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/digikam/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Sep 2005 10:23:34 -0000 1.2 +++ .cvsignore 1 Dec 2005 16:05:48 -0000 1.3 @@ -1 +1,2 @@ digikam-0.7.4.tar.bz2 +digikam-0.8.0.tar.bz2 Index: digikam.spec =================================================================== RCS file: /cvs/extras/rpms/digikam/FC-4/digikam.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- digikam.spec 22 Oct 2005 20:36:08 -0000 1.3 +++ digikam.spec 1 Dec 2005 16:05:48 -0000 1.4 @@ -1,17 +1,16 @@ Name: digikam -Version: 0.7.4 -Release: 4%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia License: GPL URL: http://www.digikam.org/ Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Patch0: digikam-0.7.4-64bit-typo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0 -BuildRequires: libkexif-devel >= 0.2 libkipi-devel >= 0.1 desktop-file-utils +BuildRequires: gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2 +BuildRequires: libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils BuildRequires: gettext Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -24,7 +23,8 @@ digital camera, preview the images and download and/or delete them. digiKam buildin image editor makes the common photo correction a simple task. -The image editor is extensible via plugins. +The image editor is extensible via plugins, install the digikamimageplugins +and/or kipi-plugins packages to use them. %package devel Summary: Development files for %{name} @@ -37,7 +37,6 @@ %prep %setup -q -%patch0 -p1 -b 64bit-typo.patch %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -95,7 +94,7 @@ %files -f %name.lang %defattr(-, root, root) -%doc AUTHORS ChangeLog COPYING HACKING README +%doc AUTHORS ChangeLog COPYING HACKING README TODO %{_bindir}/* %{_libdir}/libdigikam.so.* %{_libdir}/kde3/digikamimageplugin_core.la @@ -116,6 +115,11 @@ %{_libdir}/libdigikam.so %changelog +* 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 - Exclude libdigikam.la (bug #171503) Index: sources =================================================================== RCS file: /cvs/extras/rpms/digikam/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2005 10:23:34 -0000 1.2 +++ sources 1 Dec 2005 16:05:49 -0000 1.3 @@ -1 +1 @@ -3df53700ff78caca60cab4ea4116c7c5 digikam-0.7.4.tar.bz2 +9a0eaf4cb8e10d082b54b920a6244890 digikam-0.8.0.tar.bz2 --- digikam-0.7.4-64bit-typo.patch DELETED --- From fedora-extras-commits at redhat.com Thu Dec 1 16:25:02 2005 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Thu, 1 Dec 2005 11:25:02 -0500 Subject: rpms/digikam/FC-3 digikam-0.7.4-64bit-typo.patch, 1.2, 1.3 .cvsignore, 1.3, 1.4 digikam.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200512011625.jB1GPWBZ013955@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/extras/rpms/digikam/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13917 Modified Files: .cvsignore digikam.spec sources Added Files: digikam-0.7.4-64bit-typo.patch Log Message: No future releases until SQLite >= 3.0.0 won't appear in FE. digikam-0.7.4-64bit-typo.patch: Index: digikam-0.7.4-64bit-typo.patch =================================================================== RCS file: digikam-0.7.4-64bit-typo.patch diff -N digikam-0.7.4-64bit-typo.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ digikam-0.7.4-64bit-typo.patch 1 Dec 2005 16:25:00 -0000 1.3 @@ -0,0 +1,11 @@ +--- digikam-0.7.4/digikam/sqlite/sqliteInt.h-orig 2005-08-21 05:20:42.000000000 +0200 ++++ digikam-0.7.4/digikam/sqlite/sqliteInt.h 2005-09-17 15:44:54.000000000 +0200 +@@ -115,7 +115,7 @@ + # define INTPTR_TYPE int + # else + # define INTPTR_TYPE long long +-#warning "WARNING: Compiling sqlite for a Big Endian Platform." ++#warning "WARNING: Compiling sqlite for a 64 bit Platform." + #warning "WARNING: If you know this isn't true, please file a bugreport." + # endif + #endif Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/digikam/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Dec 2005 15:58:15 -0000 1.3 +++ .cvsignore 1 Dec 2005 16:25:00 -0000 1.4 @@ -1,2 +1 @@ digikam-0.7.4.tar.bz2 -digikam-0.8.0.tar.bz2 Index: digikam.spec =================================================================== RCS file: /cvs/extras/rpms/digikam/FC-3/digikam.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- digikam.spec 1 Dec 2005 15:58:15 -0000 1.4 +++ digikam.spec 1 Dec 2005 16:25:00 -0000 1.5 @@ -1,16 +1,17 @@ Name: digikam -Version: 0.8.0 -Release: 1%{?dist} +Version: 0.7.4 +Release: 4%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia License: GPL URL: http://www.digikam.org/ Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Patch0: digikam-0.7.4-64bit-typo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2 -BuildRequires: libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils +BuildRequires: gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0 +BuildRequires: libkexif-devel >= 0.2 libkipi-devel >= 0.1 desktop-file-utils BuildRequires: gettext Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -23,8 +24,7 @@ digital camera, preview the images and download and/or delete them. digiKam buildin image editor makes the common photo correction a simple task. -The image editor is extensible via plugins, install the digikamimageplugins -and/or kipi-plugins packages to use them. +The image editor is extensible via plugins. %package devel Summary: Development files for %{name} @@ -37,6 +37,7 @@ %prep %setup -q +%patch0 -p1 -b 64bit-typo.patch %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -94,7 +95,7 @@ %files -f %name.lang %defattr(-, root, root) -%doc AUTHORS ChangeLog COPYING HACKING README TODO +%doc AUTHORS ChangeLog COPYING HACKING README %{_bindir}/* %{_libdir}/libdigikam.so.* %{_libdir}/kde3/digikamimageplugin_core.la @@ -115,11 +116,6 @@ %{_libdir}/libdigikam.so %changelog -* 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 - Exclude libdigikam.la (bug #171503) Index: sources =================================================================== RCS file: /cvs/extras/rpms/digikam/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Dec 2005 15:58:15 -0000 1.3 +++ sources 1 Dec 2005 16:25:00 -0000 1.4 @@ -1 +1 @@ -9a0eaf4cb8e10d082b54b920a6244890 digikam-0.8.0.tar.bz2 +3df53700ff78caca60cab4ea4116c7c5 digikam-0.7.4.tar.bz2 From fedora-extras-commits at redhat.com Thu Dec 1 18:12:17 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Thu, 1 Dec 2005 13:12:17 -0500 Subject: web/html index.php,1.17,1.18 Message-ID: <200512011812.jB1ICm57017691@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17669 Modified Files: index.php Log Message: The latest version of this page is actually version 1.17, but I am putting up this page with latest news on FDS 1.0 being released and a note that the site is being updated. To avoid confusion, we likely want to do a minor edit to 1.17 and commit it again before tagging it LIVE, to help avoid confusion as to what is truly the latest. Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/index.php,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- index.php 29 Nov 2005 17:30:19 -0000 1.17 +++ index.php 1 Dec 2005 18:12:15 -0000 1.18 @@ -12,22 +12,132 @@

-Fedora Core is a free operating system that offers the best combination of stable and cutting-edge software that exists in the free software world. + is an open source project sponsored by +Red Hat and supported by the Fedora community. It is also a proving ground +for new technology that may eventually make its way into Red Hat products. +It is not a supported product of Red Hat, Inc.

-Download Fedora Core 4 now. +To learn more about the process, refer to About, +the Objectives, +and the FAQs.

-Documentation for Fedora is available. +
+ +

Fedora Directory Server 1.0 Release [01 Dec 2005]

+ +

+ FDS 1.0 is past the hurdles and released into the wild. Read more + about this amazing milestone in the history of open source directory + servers on the FDS + Wiki.

+
+ +

Latest Fedora News

+

-Fedora is always looking for contributors. + [01 Dec 2005] fedora.redhat.com update in progress
+ This site is in the process of undergoing a content refresh and + facelift. Sorry for the cruft whilst we are editing. Expect + changes here soon.

+

+ [06 Oct 2005] FUDCon London, 2005 (formerly FUDCon + III)
+ FUDCon is the conference/summit that focuses on the Fedora Project + and all things that go along with it. For more information, visit + the FUDCon + webpages. +

+

+ [13 Jun 2005] Fedora Core 4 (Stentz) now available
+ Fedora Core 4 is now available + from Red Hat and at distinguished mirror sites near you, and is also + available in the torrent. + Fedora Core is available for x86-64, i386, and ppc/ppc64. Please file bugs via + Bugzilla, Product Fedora Core, Version 4, + so that they are noticed and appropriately classified. Discuss this release on + fedora-list. +

+

+ [02 Jun 2005] Fedora participates in the Summer Of Code
+ The Fedora Project is proud to participate in Google's + Summer Of Code. For + ideas on some of the projects Fedora is looking to sponsor, please see + the Fedora Project Wiki. +

+ [01 Jun 2005] Fedora Directory Server announced
+ The Fedora Directory Server is a robust, scalable open-source server + designed to manage large directories of users and resources. It is based + on an open-systems server protocol called the Lightweight Directory Access + Protocol (LDAP). For more information, go to + the project website. +

+ [10 May 2005] Fedora Core 4 test 3 now available
+ The third test release of Fedora Core 4 + is now available. New features in FC4 + test 3 include GNOME 2.10, KDE 3.4, and a preview of GCC 4.0. PowerPC is + also supported. Download it from the torrent. File bugs in + bugzilla against Fedora + Core, version fc4test3. Discuss this release on + fedora-test-list. +

+

+ [03 May 2005] Endorsement of fedoraforum.org
+ The Fedora Project now endorses + fedoraforum.org as its end-user + forum of choice. Read more about the other available + discussion forums. +

+

+ [21 Apr 2005] FUDCon 2 Announced
+ FUDCon 2, the second gathering + of Fedora Users and Developers, will be held at LinuxTag in Karlsruhe, + Germany on the 24th and 25th of June. +

+

+ [15 Apr 2005] Fedora Core 2 moves to Legacy Project
+ The Fedora Steering Committee announces the + transfer of Fedora Core 2 to the + Fedora Legacy Project. + For more information on the Fedora Legacy Project, or if you wish to join + the team please see http://fedoralegacy.org/. +

+

+ [01 Mar 2005] Announcing the Fedora Extras Project
+ The Fedora Extras Project has been + established to create high-quality software to augment software available in + Fedora Core. +

+ +
+ +

Fedora Core Release Schedule

-Questions about Fedora? Look for answers here. + The Fedora Project announces a new major release of Fedora Core every + four to six months. The current release schedule is available + here. +

+ +

Red Hat Enterprise Linux

+ +

+ is one of the sources +for new technologies and enhancements that may be incorporated +into Red Hat Enterprise Linux in the future. Red Hat Enterprise +Linux is the solution that provides a robust, stable operating system +supported by Red Hat, Inc. and a wide variety of independent +software vendors (ISVs). For production use, support, service +level agreements (SLAs), and ISV support, we proudly ask that +you look at Red +Hat Enterprise Linux. +

From fedora-extras-commits at redhat.com Thu Dec 1 18:43:38 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Dec 2005 13:43:38 -0500 Subject: extras-buildsys ChangeLog,1.126.2.25,1.126.2.26 Message-ID: <200512011844.jB1Ii8gL017971@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17932 Modified Files: Tag: STABLE_0_4 ChangeLog Log Message: 2005-12-01 Dan Williams Patch from Rudolf Kastl #rh174573#: * etc/plague-server.init etc/plague-builder.init - Add nls support to initscripts - initscript cleanups Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.126.2.25 retrieving revision 1.126.2.26 diff -u -r1.126.2.25 -r1.126.2.26 --- ChangeLog 29 Nov 2005 06:36:31 -0000 1.126.2.25 +++ ChangeLog 1 Dec 2005 18:43:36 -0000 1.126.2.26 @@ -1,3 +1,11 @@ +2005-12-01 Dan Williams + + Patch from Rudolf Kastl #rh174573#: + * etc/plague-server.init + etc/plague-builder.init + - Add nls support to initscripts + - initscript cleanups + 2005-11-29 Dan Williams * Add a traceback server that listens on a Unix socket From fedora-extras-commits at redhat.com Thu Dec 1 18:43:44 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Dec 2005 13:43:44 -0500 Subject: extras-buildsys/etc plague-builder.init, 1.7, 1.7.2.1 plague-server.init, 1.2, 1.2.2.1 Message-ID: <200512011844.jB1IiE9A017975@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17932/etc Modified Files: Tag: STABLE_0_4 plague-builder.init plague-server.init Log Message: 2005-12-01 Dan Williams Patch from Rudolf Kastl #rh174573#: * etc/plague-server.init etc/plague-builder.init - Add nls support to initscripts - initscript cleanups Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -r1.7 -r1.7.2.1 --- plague-builder.init 31 Aug 2005 19:29:21 -0000 1.7 +++ plague-builder.init 1 Dec 2005 18:43:41 -0000 1.7.2.1 @@ -13,20 +13,28 @@ # Source function library. . /etc/init.d/functions +prog="plague-builder" + +if [ -f /etc/sysconfig/plague-builder ]; then . /etc/sysconfig/plague-builder +fi start() { - echo -n "Starting plague-builder: " + if [ ! -f /var/lock/subsys/plague-builder ]; then + echo -n $"Starting $prog: " daemon plague-builder -c $CONFIG -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log echo touch /var/lock/subsys/plague-builder return 0 + fi } stop() { - echo -n "Shutting down plague-builder: " + if test "x`pidof plague-builder`" != x; then + echo -n $"Stopping $prog: " killproc plague-builder echo + fi rm -f /var/lock/subsys/plague-builder return 0 } Index: plague-server.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- plague-server.init 15 Aug 2005 03:18:19 -0000 1.2 +++ plague-server.init 1 Dec 2005 18:43:41 -0000 1.2.2.1 @@ -13,20 +13,28 @@ # Source function library. . /etc/init.d/functions +prog="plague-server" + +if [ -f /etc/sysconfig/plague-server ]; then . /etc/sysconfig/plague-server +fi start() { - echo -n "Starting plague-server: " + if [ ! -f /var/lock/subsys/plague-server ]; then + echo -n $"Starting $prog: " daemon plague-server -c $CONFIG -d -p /var/run/plague-server.pid -l /var/log/plague-server.log echo touch /var/lock/subsys/plague-server return 0 + fi } stop() { - echo -n "Shutting down plague-server: " + if test "x`pidof plague-server`" != x; then + echo -n $"Stopping $prog: " killproc plague-server echo + fi rm -f /var/lock/subsys/plague-server return 0 } From fedora-extras-commits at redhat.com Thu Dec 1 18:44:56 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Dec 2005 13:44:56 -0500 Subject: extras-buildsys/etc plague-builder.init, 1.7, 1.8 plague-server.init, 1.2, 1.3 Message-ID: <200512011844.jB1IiuG0018023@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17988/etc Modified Files: plague-builder.init plague-server.init Log Message: 2005-12-01 Dan Williams Patch from Rudolf Kastl #rh174573#: * etc/plague-server.init etc/plague-builder.init - Add nls support to initscripts - initscript cleanups Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- plague-builder.init 31 Aug 2005 19:29:21 -0000 1.7 +++ plague-builder.init 1 Dec 2005 18:44:54 -0000 1.8 @@ -13,20 +13,28 @@ # Source function library. . /etc/init.d/functions +prog="plague-builder" + +if [ -f /etc/sysconfig/plague-builder ]; then . /etc/sysconfig/plague-builder +fi start() { - echo -n "Starting plague-builder: " + if [ ! -f /var/lock/subsys/plague-builder ]; then + echo -n $"Starting $prog: " daemon plague-builder -c $CONFIG -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log echo touch /var/lock/subsys/plague-builder return 0 + fi } stop() { - echo -n "Shutting down plague-builder: " + if test "x`pidof plague-builder`" != x; then + echo -n $"Stopping $prog: " killproc plague-builder echo + fi rm -f /var/lock/subsys/plague-builder return 0 } Index: plague-server.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plague-server.init 15 Aug 2005 03:18:19 -0000 1.2 +++ plague-server.init 1 Dec 2005 18:44:54 -0000 1.3 @@ -13,20 +13,28 @@ # Source function library. . /etc/init.d/functions +prog="plague-server" + +if [ -f /etc/sysconfig/plague-server ]; then . /etc/sysconfig/plague-server +fi start() { - echo -n "Starting plague-server: " + if [ ! -f /var/lock/subsys/plague-server ]; then + echo -n $"Starting $prog: " daemon plague-server -c $CONFIG -d -p /var/run/plague-server.pid -l /var/log/plague-server.log echo touch /var/lock/subsys/plague-server return 0 + fi } stop() { - echo -n "Shutting down plague-server: " + if test "x`pidof plague-server`" != x; then + echo -n $"Stopping $prog: " killproc plague-server echo + fi rm -f /var/lock/subsys/plague-server return 0 } From fedora-extras-commits at redhat.com Thu Dec 1 18:44:51 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 1 Dec 2005 13:44:51 -0500 Subject: extras-buildsys ChangeLog,1.156,1.157 Message-ID: <200512011845.jB1IjM0o018033@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17988 Modified Files: ChangeLog Log Message: 2005-12-01 Dan Williams Patch from Rudolf Kastl #rh174573#: * etc/plague-server.init etc/plague-builder.init - Add nls support to initscripts - initscript cleanups Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- ChangeLog 1 Dec 2005 03:17:15 -0000 1.156 +++ ChangeLog 1 Dec 2005 18:44:48 -0000 1.157 @@ -1,3 +1,11 @@ +2005-12-01 Dan Williams + + Patch from Rudolf Kastl #rh174573#: + * etc/plague-server.init + etc/plague-builder.init + - Add nls support to initscripts + - initscript cleanups + 2005-11-29 Dan Williams * Add an option in the server config file to disable From fedora-extras-commits at redhat.com Thu Dec 1 19:16:57 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 1 Dec 2005 14:16:57 -0500 Subject: rpms/baobab/FC-4 .cvsignore, 1.4, 1.5 baobab.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200512011917.jB1JHSDK019849@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/baobab/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19811/FC-4 Modified Files: .cvsignore baobab.spec sources Log Message: update to 2.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Nov 2005 20:18:38 -0000 1.4 +++ .cvsignore 1 Dec 2005 19:16:55 -0000 1.5 @@ -1 +1 @@ -baobab-1.3.1.tar.gz +baobab-2.2.0.tar.gz Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- baobab.spec 12 Nov 2005 20:18:38 -0000 1.4 +++ baobab.spec 1 Dec 2005 19:16:55 -0000 1.5 @@ -1,12 +1,12 @@ Name: baobab -Version: 1.3.1 +Version: 2.2.0 Release: 1%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System License: GPL URL: http://www.marzocca.net/linux/baobab.html -Source0: http://www.marzocca.net/linux/downloads/baobab-1.3.1.tar.gz +Source0: http://www.marzocca.net/linux/downloads/baobab-2.2.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 @@ -25,7 +25,7 @@ %prep %setup -q - +sed -i 's/GNOME_CANVAS_REQUIRED=2.10.2/GNOME_CANVAS_REQUIRED=2.10.0/' configure %build %configure @@ -53,10 +53,14 @@ %{_bindir}/%{name} %{_datadir}/applications/*-%{name}.desktop %{_datadir}/pixmaps/%{name}.png -%{_datadir}/pixmaps/%{name}/ +%{_datadir}/%{name}/ %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Dec 01 2005 Thorsten Leemhuis - 2.2.0-1 +- Update to 2.2.0 +- Still works with older GNOME_CANVAS so drop requires in configure slightly + * Sat Nov 12 2005 Thorsten Leemhuis - 1.3.1-1 - Update to 1.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Nov 2005 20:18:38 -0000 1.4 +++ sources 1 Dec 2005 19:16:55 -0000 1.5 @@ -1 +1 @@ -38faf53cc6de0cd50606935877685733 baobab-1.3.1.tar.gz +8ea3c8c67a27e6f0be14744adc2c17c7 baobab-2.2.0.tar.gz From fedora-extras-commits at redhat.com Thu Dec 1 19:17:03 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 1 Dec 2005 14:17:03 -0500 Subject: rpms/baobab/devel .cvsignore, 1.4, 1.5 baobab.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200512011917.jB1JHXWA019854@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/baobab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19811/devel Modified Files: .cvsignore baobab.spec sources Log Message: update to 2.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Nov 2005 20:12:03 -0000 1.4 +++ .cvsignore 1 Dec 2005 19:17:01 -0000 1.5 @@ -1 +1 @@ -baobab-1.3.1.tar.gz +baobab-2.2.0.tar.gz Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- baobab.spec 12 Nov 2005 20:12:03 -0000 1.4 +++ baobab.spec 1 Dec 2005 19:17:01 -0000 1.5 @@ -1,12 +1,12 @@ Name: baobab -Version: 1.3.1 +Version: 2.2.0 Release: 1%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System License: GPL URL: http://www.marzocca.net/linux/baobab.html -Source0: http://www.marzocca.net/linux/downloads/baobab-1.3.1.tar.gz +Source0: http://www.marzocca.net/linux/downloads/baobab-2.2.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 @@ -26,7 +26,6 @@ %prep %setup -q - %build %configure make %{?_smp_mflags} @@ -53,10 +52,13 @@ %{_bindir}/%{name} %{_datadir}/applications/*-%{name}.desktop %{_datadir}/pixmaps/%{name}.png -%{_datadir}/pixmaps/%{name}/ +%{_datadir}/%{name}/ %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Dec 01 2005 Thorsten Leemhuis - 2.2.0-1 +- Update to 2.2.0 + * Sat Nov 12 2005 Thorsten Leemhuis - 1.3.1-1 - Update to 1.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Nov 2005 20:12:03 -0000 1.4 +++ sources 1 Dec 2005 19:17:01 -0000 1.5 @@ -1 +1 @@ -38faf53cc6de0cd50606935877685733 baobab-1.3.1.tar.gz +8ea3c8c67a27e6f0be14744adc2c17c7 baobab-2.2.0.tar.gz From fedora-extras-commits at redhat.com Thu Dec 1 19:40:28 2005 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Thu, 1 Dec 2005 14:40:28 -0500 Subject: rpms/ghdl/devel ghdl.spec,1.1,1.2 Message-ID: <200512011940.jB1Jex1H020057@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20040 Modified Files: ghdl.spec Log Message: ExcludeArchs Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ghdl.spec 29 Nov 2005 11:19:29 -0000 1.1 +++ ghdl.spec 1 Dec 2005 19:40:26 -0000 1.2 @@ -4,7 +4,7 @@ Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.21 -Release: 0.24svn.1 +Release: 0.24svn.2%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -19,6 +19,11 @@ BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo Requires(post): /sbin/install-info Requires(preun): /sbin/install-info +# gcc-gnat missing on ppc: Bug 174720 +# mock does not install glibc-devel.i386 on x86_64, therefore +# gcc -m32 fails, therefore the package does not build under +# mock/plague on x86_64: Bug 174731 +ExcludeArch: ppc x86_64 # Make sure we don't use clashing namespaces %define _vendor fedora_ghdl @@ -170,6 +175,10 @@ %{_libexecdir}/gcc/ %changelog +* Thu Dec 1 2005 Thomas Sailer - 0.21-0.24svn.2 +- Exclude ppc because gcc-gnat is missing +- Exclude x86_64 because of mock build issues + * Fri Nov 25 2005 Thomas Sailer - 0.21-0.24svn.1 - update to SVN rev 24 - remove additional files to fix x86_64 build From fedora-extras-commits at redhat.com Thu Dec 1 19:53:41 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 1 Dec 2005 14:53:41 -0500 Subject: rpms/gnupg2/devel gpg-agent-shutdown.sh, NONE, 1.1 gpg-agent-startup.sh, NONE, 1.1 gnupg2.spec, 1.22, 1.23 Message-ID: <200512011954.jB1JsB8r020280@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20261 Modified Files: gnupg2.spec Added Files: gpg-agent-shutdown.sh gpg-agent-startup.sh Log Message: * Thu Dec 01 2005 Rex Dieter 1.9.19-4 - include gpg-agent-(startup|shutdown) scripts (#136533) - BR: libksba-devel >= 1.9.12 ***** Error reading new file: [Errno 2] No such file or directory: 'gpg-agent-shutdown.sh' ***** Error reading new file: [Errno 2] No such file or directory: 'gpg-agent-startup.sh' Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gnupg2.spec 30 Nov 2005 17:19:56 -0000 1.22 +++ gnupg2.spec 1 Dec 2005 19:53:39 -0000 1.23 @@ -14,6 +14,12 @@ Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig URL: http://www.gnupg.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# omit broken x86_64 build +# ExcludeArch: x86_64 + +# enable auto-startup/shutdown of gpg-agent +Source10: gpg-agent-startup.sh +Source11: gpg-agent-shutdown.sh Patch1: gnupg-1.9.18-lvalue.patch Patch2: gnupg-1.9.16-testverbose.patch @@ -26,12 +32,12 @@ BuildRequires: libassuan-devel >= 0.6.10 BuildRequires: libgcrypt-devel => 1.2.0 BuildRequires: libgpg-error-devel => 1.0 -#ifarch x86_64 +%ifarch x86_64 # Hard-code libksba-0.9.11 for now (x86_64 'make check' fails) -#BuildRequires: libksba-devel = 0.9.11 -#else +BuildRequires: libksba-devel = 0.9.11 +%else BuildRequires: libksba-devel >= 0.9.12 -#endif +%endif BuildRequires: gettext BuildRequires: openldap-devel @@ -68,10 +74,9 @@ %patch1 -p1 -b .lvalue #patch2 -p1 -b .testverbose -#ifarch x86_64 -#sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac -#sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure -#endif +%ifarch x86_64 +sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure +%endif sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c @@ -87,6 +92,8 @@ %check ||: +# Allows for better debugability +echo "--debug-allow-core-dumps" >> tests/gpgsm.conf %ifarch x86_64 # Expect one failure (reported upstream) make check ||: @@ -100,6 +107,11 @@ make install DESTDIR=$RPM_BUILD_ROOT +# enable auto-startup/shutdown of gpg-agent +mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown} +install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/env/ +install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{_prefix}/shutdown/ + %find_lang %{name} ## Unpackaged files @@ -135,6 +147,9 @@ %{_libdir}/gnupg/ %{_libexecdir}/* %{_infodir}/* +# Own dirs until someone else does (filesystem,kdebase?) +%{_prefix}/env/ +%{_prefix}/shutdown/ %clean @@ -142,8 +157,9 @@ %changelog -* Wed Nov 30 2005 Rex Dieter 1.9.19-4 -- cleanup, remove hacks +* Thu Dec 01 2005 Rex Dieter 1.9.19-4 +- include gpg-agent-(startup|shutdown) scripts (#136533) +- BR: libksba-devel >= 1.9.12 * Wed Nov 30 2005 Rex Dieter 1.9.19-3 - BR: libksba-devel >= 1.9.13 From fedora-extras-commits at redhat.com Thu Dec 1 20:02:27 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 1 Dec 2005 15:02:27 -0500 Subject: rpms/gnupg2/devel gnupg2.spec,1.23,1.24 Message-ID: <200512012002.jB1K2vvE021981@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21962 Modified Files: gnupg2.spec Log Message: drop usage of unavailable libksba-0.9.11 Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gnupg2.spec 1 Dec 2005 19:53:39 -0000 1.23 +++ gnupg2.spec 1 Dec 2005 20:02:24 -0000 1.24 @@ -32,12 +32,12 @@ BuildRequires: libassuan-devel >= 0.6.10 BuildRequires: libgcrypt-devel => 1.2.0 BuildRequires: libgpg-error-devel => 1.0 -%ifarch x86_64 +#ifarch x86_64 # Hard-code libksba-0.9.11 for now (x86_64 'make check' fails) -BuildRequires: libksba-devel = 0.9.11 -%else +#BuildRequires: libksba-devel = 0.9.11 +#else BuildRequires: libksba-devel >= 0.9.12 -%endif +#endif BuildRequires: gettext BuildRequires: openldap-devel @@ -72,7 +72,7 @@ %setup -q -n gnupg-%{version} %patch1 -p1 -b .lvalue -#patch2 -p1 -b .testverbose +%patch2 -p1 -b .testverbose %ifarch x86_64 sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure @@ -157,7 +157,7 @@ %changelog -* Thu Dec 01 2005 Rex Dieter 1.9.19-4 +* Thu Dec 01 2005 Rex Dieter 1.9.19-5 - include gpg-agent-(startup|shutdown) scripts (#136533) - BR: libksba-devel >= 1.9.12 From fedora-extras-commits at redhat.com Thu Dec 1 20:10:31 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 1 Dec 2005 15:10:31 -0500 Subject: rpms/gnupg2/devel gnupg2.spec,1.24,1.25 Message-ID: <200512012011.jB1KB9DA022115@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22029 Modified Files: gnupg2.spec Log Message: Release++ Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gnupg2.spec 1 Dec 2005 20:02:24 -0000 1.24 +++ gnupg2.spec 1 Dec 2005 20:10:26 -0000 1.25 @@ -7,7 +7,7 @@ Summary: GNU utility for secure communication and data storage Name: gnupg2 Version: 1.9.19 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 From fedora-extras-commits at redhat.com Thu Dec 1 20:25:18 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 1 Dec 2005 15:25:18 -0500 Subject: rpms/gnupg2/devel gnupg2.spec,1.25,1.26 Message-ID: <200512012025.jB1KPmp6022231@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22214 Modified Files: gnupg2.spec Log Message: %%check: fix gpgsm.conf Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- gnupg2.spec 1 Dec 2005 20:10:26 -0000 1.25 +++ gnupg2.spec 1 Dec 2005 20:25:16 -0000 1.26 @@ -7,7 +7,7 @@ Summary: GNU utility for secure communication and data storage Name: gnupg2 Version: 1.9.19 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 @@ -93,7 +93,7 @@ %check ||: # Allows for better debugability -echo "--debug-allow-core-dumps" >> tests/gpgsm.conf +echo "debug-allow-core-dumps" >> tests/gpgsm.conf %ifarch x86_64 # Expect one failure (reported upstream) make check ||: @@ -157,7 +157,7 @@ %changelog -* Thu Dec 01 2005 Rex Dieter 1.9.19-5 +* Thu Dec 01 2005 Rex Dieter 1.9.19-6 - include gpg-agent-(startup|shutdown) scripts (#136533) - BR: libksba-devel >= 1.9.12 From fedora-extras-commits at redhat.com Thu Dec 1 20:37:39 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 1 Dec 2005 15:37:39 -0500 Subject: rpms/gnupg2/devel gnupg2.spec,1.26,1.27 Message-ID: <200512012038.jB1Kc9JJ022338@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22283 Modified Files: gnupg2.spec Log Message: disable gpgsm.conf munging, doesn't work Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- gnupg2.spec 1 Dec 2005 20:25:16 -0000 1.26 +++ gnupg2.spec 1 Dec 2005 20:37:37 -0000 1.27 @@ -7,7 +7,7 @@ Summary: GNU utility for secure communication and data storage Name: gnupg2 Version: 1.9.19 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 @@ -92,8 +92,8 @@ %check ||: -# Allows for better debugability -echo "debug-allow-core-dumps" >> tests/gpgsm.conf +# Allows for better debugability (doesn't work, fixme) +# echo "debug-allow-core-dumps" >> tests/gpgsm.conf %ifarch x86_64 # Expect one failure (reported upstream) make check ||: @@ -157,7 +157,7 @@ %changelog -* Thu Dec 01 2005 Rex Dieter 1.9.19-6 +* Thu Dec 01 2005 Rex Dieter 1.9.19-7 - include gpg-agent-(startup|shutdown) scripts (#136533) - BR: libksba-devel >= 1.9.12 From fedora-extras-commits at redhat.com Thu Dec 1 20:59:15 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 1 Dec 2005 15:59:15 -0500 Subject: rpms/gnupg2/devel gnupg2.spec,1.27,1.28 Message-ID: <200512012059.jB1KxlYV022444@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22404 Modified Files: gnupg2.spec Log Message: I guess we can expect 'make check' failures (for now) Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gnupg2.spec 1 Dec 2005 20:37:37 -0000 1.27 +++ gnupg2.spec 1 Dec 2005 20:59:12 -0000 1.28 @@ -92,14 +92,10 @@ %check ||: -# Allows for better debugability (doesn't work, fixme) +## Allows for better debugability (doesn't work, fixme) # echo "debug-allow-core-dumps" >> tests/gpgsm.conf -%ifarch x86_64 -# Expect one failure (reported upstream) -make check ||: -%else -make check -%endif +# (sometimes?) expect one failure (reported upstream) +#make check ||: %install From fedora-extras-commits at redhat.com Thu Dec 1 21:01:51 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 1 Dec 2005 16:01:51 -0500 Subject: rpms/gnupg2/devel gnupg2.spec,1.28,1.29 Message-ID: <200512012102.jB1L2MoV024048@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24027 Modified Files: gnupg2.spec Log Message: Release++ Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- gnupg2.spec 1 Dec 2005 20:59:12 -0000 1.28 +++ gnupg2.spec 1 Dec 2005 21:01:48 -0000 1.29 @@ -7,7 +7,7 @@ Summary: GNU utility for secure communication and data storage Name: gnupg2 Version: 1.9.19 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 @@ -153,9 +153,10 @@ %changelog -* Thu Dec 01 2005 Rex Dieter 1.9.19-7 +* Thu Dec 01 2005 Rex Dieter 1.9.19-8 - include gpg-agent-(startup|shutdown) scripts (#136533) - BR: libksba-devel >= 1.9.12 +- %%check: be permissive about failures (for now) * Wed Nov 30 2005 Rex Dieter 1.9.19-3 - BR: libksba-devel >= 1.9.13 From fedora-extras-commits at redhat.com Thu Dec 1 21:10:12 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 1 Dec 2005 16:10:12 -0500 Subject: rpms/digikamimageplugins/FC-4 .cvsignore, 1.2, 1.3 digikamimageplugins.spec, 1.8, 1.9 sources, 1.2, 1.3 Message-ID: <200512012110.jB1LAhNb024170@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/digikamimageplugins/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24123/FC-4 Modified Files: .cvsignore digikamimageplugins.spec sources Log Message: * Thu Dec 01 2005 Rex Dieter 0.8.0-1 - 0.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/digikamimageplugins/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Oct 2005 20:21:44 -0000 1.2 +++ .cvsignore 1 Dec 2005 21:10:10 -0000 1.3 @@ -1 +1 @@ -digikamimageplugins-0.7.4.tar.bz2 +digikamimageplugins-0.8.0.tar.bz2 Index: digikamimageplugins.spec =================================================================== RCS file: /cvs/extras/rpms/digikamimageplugins/FC-4/digikamimageplugins.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- digikamimageplugins.spec 10 Nov 2005 18:51:16 -0000 1.8 +++ digikamimageplugins.spec 1 Dec 2005 21:10:10 -0000 1.9 @@ -1,13 +1,13 @@ Name: digikamimageplugins Summary: Plugins for Digikam -Version: 0.7.4 -Release: 10%{?dist} +Version: 0.8.0 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://extragear.kde.org/apps/digikamimageplugins/ -Source: http://dl.sourceforge.net/sourceforge/digikam/digikamimageplugins-0.7.4.tar.bz2 +Source: http://dl.sourceforge.net/sourceforge/digikam/digikamimageplugins-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: digikamplugins < %{version} @@ -17,7 +17,7 @@ BuildRequires: kdelibs-devel >= 6:3.4 BuildRequires: digikam-devel = %{version} -Requires: digikam = %{version} +Requires: digikam >= %{version} Requires: ImageMagick @@ -102,7 +102,6 @@ done fi - cat *.lang > %{name}.list @@ -130,9 +129,17 @@ %changelog -* Thu Nov 10 2005 Rex Dieter 0.7.4-10 +* Thu Dec 01 2005 Rex Dieter 0.8.0-1 +- 0.8.0 + +* Thu Nov 10 2005 Rex Dieter 0.8.0-0.1.rc +- 0.8.0-rc + +* Thu Nov 10 2005 Rex Dieter 0.7.4-11 - abs->relative symlinks - simplify configure + +* Fri Nov 04 2005 Rex Dieter 0.7.4-10 - Req/BR: digikam = %%version * Fri Oct 28 2005 Rex Dieter 0.7.4-9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/digikamimageplugins/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Oct 2005 20:21:44 -0000 1.2 +++ sources 1 Dec 2005 21:10:10 -0000 1.3 @@ -1 +1 @@ -5ea3c0dd6e6f1eb99211e75d0bf17d3d digikamimageplugins-0.7.4.tar.bz2 +6670e0411dbf71ec9faeee087fc4f79a digikamimageplugins-0.8.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Dec 1 21:10:18 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 1 Dec 2005 16:10:18 -0500 Subject: rpms/digikamimageplugins/devel .cvsignore, 1.2, 1.3 digikamimageplugins.spec, 1.10, 1.11 sources, 1.2, 1.3 Message-ID: <200512012110.jB1LAmGD024188@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/digikamimageplugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24123/devel Modified Files: .cvsignore digikamimageplugins.spec sources Log Message: * Thu Dec 01 2005 Rex Dieter 0.8.0-1 - 0.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/digikamimageplugins/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Oct 2005 20:21:44 -0000 1.2 +++ .cvsignore 1 Dec 2005 21:10:16 -0000 1.3 @@ -1 +1 @@ -digikamimageplugins-0.7.4.tar.bz2 +digikamimageplugins-0.8.0.tar.bz2 Index: digikamimageplugins.spec =================================================================== RCS file: /cvs/extras/rpms/digikamimageplugins/devel/digikamimageplugins.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- digikamimageplugins.spec 10 Nov 2005 18:51:21 -0000 1.10 +++ digikamimageplugins.spec 1 Dec 2005 21:10:16 -0000 1.11 @@ -1,13 +1,13 @@ Name: digikamimageplugins Summary: Plugins for Digikam -Version: 0.7.4 -Release: 10%{?dist} +Version: 0.8.0 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://extragear.kde.org/apps/digikamimageplugins/ -Source: http://dl.sourceforge.net/sourceforge/digikam/digikamimageplugins-0.7.4.tar.bz2 +Source: http://dl.sourceforge.net/sourceforge/digikam/digikamimageplugins-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: digikamplugins < %{version} @@ -17,7 +17,7 @@ BuildRequires: kdelibs-devel >= 6:3.4 BuildRequires: digikam-devel = %{version} -Requires: digikam = %{version} +Requires: digikam >= %{version} Requires: ImageMagick @@ -102,7 +102,6 @@ done fi - cat *.lang > %{name}.list @@ -130,9 +129,17 @@ %changelog -* Thu Nov 10 2005 Rex Dieter 0.7.4-10 +* Thu Dec 01 2005 Rex Dieter 0.8.0-1 +- 0.8.0 + +* Thu Nov 10 2005 Rex Dieter 0.8.0-0.1.rc +- 0.8.0-rc + +* Thu Nov 10 2005 Rex Dieter 0.7.4-11 - abs->relative symlinks - simplify configure + +* Fri Nov 04 2005 Rex Dieter 0.7.4-10 - Req/BR: digikam = %%version * Fri Oct 28 2005 Rex Dieter 0.7.4-9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/digikamimageplugins/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Oct 2005 20:21:44 -0000 1.2 +++ sources 1 Dec 2005 21:10:16 -0000 1.3 @@ -1 +1 @@ -5ea3c0dd6e6f1eb99211e75d0bf17d3d digikamimageplugins-0.7.4.tar.bz2 +6670e0411dbf71ec9faeee087fc4f79a digikamimageplugins-0.8.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Dec 1 22:02:42 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Thu, 1 Dec 2005 17:02:42 -0500 Subject: web/html/download vendors.list,1.7,1.8 Message-ID: <200512012203.jB1M3vcx026106@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26089 Modified Files: vendors.list Log Message: add computefree Index: vendors.list =================================================================== RCS file: /cvs/fedora/web/html/download/vendors.list,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- vendors.list 18 Nov 2005 08:40:46 -0000 1.7 +++ vendors.list 1 Dec 2005 22:02:40 -0000 1.8 @@ -14,6 +14,8 @@ CompraLinux (Spain only)::3 CDs or 6 CDs::13.92 euro or 24.36 euro +ComputeFree::CDs::$10.99 - 12.99 + Copyleft Solutions::4 CDs or 1 DVD::Rs 400 or Rs 200 cosaslibres.com::3 CDs or 6 CDs::25000 Pesos or 48000 Pesos @@ -77,3 +79,4 @@ Terrassol Tecnologia::3 CDs::45,00 reais TheLinuxStore.ca::CDs or DVD::7.97 - 9.97 CAD$ + From fedora-extras-commits at redhat.com Thu Dec 1 22:40:21 2005 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 1 Dec 2005 17:40:21 -0500 Subject: fedora-security/audit fc4,1.98,1.99 fc5,1.10,1.11 Message-ID: <200512012240.jB1MeqSM026244@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26225 Modified Files: fc4 fc5 Log Message: Note CVE-2005-3962, a perl format string integer overflow issue Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- fc4 29 Nov 2005 15:48:06 -0000 1.98 +++ fc4 1 Dec 2005 22:40:19 -0000 1.99 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2005-3962 backport (perl) [since FEDORA-2005-1113] CVE-2005-3858 version (kernel, fixed 2.6.13) [since FEDORA-2005-949] CVE-2005-3857 VULNERABLE (kernel, fixed 2.6.15) CVE-2005-3848 version (kernel, fixed 2.6.13) [since FEDORA-2005-949] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fc5 29 Nov 2005 15:48:06 -0000 1.10 +++ fc5 1 Dec 2005 22:40:19 -0000 1.11 @@ -12,6 +12,7 @@ ** are items that need attention +CVE-2005-3962 VULNERABLE (perl) CVE-2005-3858 version (kernel, fixed 2.6.13) CVE-2005-3857 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1-git3 CVE-2005-3848 version (kernel, fixed 2.6.13) From fedora-extras-commits at redhat.com Fri Dec 2 09:57:43 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Dec 2005 04:57:43 -0500 Subject: rpms/cernlib/devel 705-patch-paw_motif-paw-Imakefiles.dpatch, 1.2, 1.3 802-create-shared-libraries.dpatch, 1.1, 1.2 cernlib.spec, 1.5, 1.6 cernlib_2005.05.09.dfsg-1.diff, 1.1, 1.2 Message-ID: <200512020958.jB29wDvt014695@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14663 Modified Files: 705-patch-paw_motif-paw-Imakefiles.dpatch 802-create-shared-libraries.dpatch cernlib.spec cernlib_2005.05.09.dfsg-1.diff Log Message: - use updated beta debian patchset - remove the BSD in the licence because there is no library nor binary under a BSD licence and someone could get the idea that there is some dual BSD/GPL licenced binaries or libraries. The LGPL is kept because of cfortran The directory reordering in toplevel Imakefile is now done in patch 802 and not 705 Index: 705-patch-paw_motif-paw-Imakefiles.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/705-patch-paw_motif-paw-Imakefiles.dpatch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 705-patch-paw_motif-paw-Imakefiles.dpatch 1 Dec 2005 14:46:38 -0000 1.2 +++ 705-patch-paw_motif-paw-Imakefiles.dpatch 2 Dec 2005 09:57:41 -0000 1.3 @@ -13,7 +13,7 @@ -LIBDIRS= kernlib packlib code_motif pawlib graflib mathlib geant321 mclibs phtools -+LIBDIRS= kernlib packlib code_motif graflib mathlib pawlib paw_motif geant321 mclibs phtools ++LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools SUBDIRS= $(LIBDIRS) patchy cfortran Index: 802-create-shared-libraries.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/802-create-shared-libraries.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 802-create-shared-libraries.dpatch 30 Nov 2005 22:01:01 -0000 1.1 +++ 802-create-shared-libraries.dpatch 2 Dec 2005 09:57:41 -0000 1.2 @@ -6,8 +6,17 @@ @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile ---- cernlib-2005.05.09.dfsg~/src/Imakefile 2005-11-29 17:06:14.683891311 +0000 -+++ cernlib-2005.05.09.dfsg/src/Imakefile 2005-11-29 17:06:50.910248135 +0000 +--- cernlib-2005.05.09.dfsg~/src/Imakefile 2005-12-01 15:19:24.191267776 +0000 ++++ cernlib-2005.05.09.dfsg/src/Imakefile 2005-12-01 15:20:10.310483251 +0000 +@@ -2,7 +2,7 @@ + #define PassCDebugFlags + + +-LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools ++LIBDIRS= kernlib packlib mathlib graflib code_motif mclibs phtools pawlib paw_motif geant321 + + SUBDIRS= $(LIBDIRS) patchy cfortran + @@ -15,6 +15,7 @@ #endif @@ -17,16 +26,16 @@ INCLUDEDIRS= $(LIBDIRS) cfortran diff -urNad cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile cernlib-2005.05.09.dfsg/src/code_motif/Imakefile ---- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile 2005-11-29 17:06:14.555918310 +0000 -+++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile 2005-11-29 17:06:21.953357641 +0000 +--- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile 2005-12-01 15:19:24.062295137 +0000 ++++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile 2005-12-01 15:19:31.186783665 +0000 @@ -31,3 +31,4 @@ SubdirLibraryTarget(packlib-lesstif,NullParameter) InstallLibrary(packlib-lesstif,$(CERN_LIBDIR)) +InstallSharedLibrary(packlib-lesstif,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR)) diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile ---- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile 2005-11-29 17:06:13.317179648 +0000 -+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile 2005-11-29 17:06:21.953357641 +0000 +--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile 2005-12-01 15:19:23.018516575 +0000 ++++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile 2005-12-01 15:19:31.186783665 +0000 @@ -26,6 +26,7 @@ InstallLibrary(geant321,$(CERN_LIBDIR)) @@ -37,7 +46,7 @@ /* diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile --- cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile 1996-12-19 14:19:18.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile 2005-11-29 17:06:21.953357641 +0000 ++++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile 2005-12-01 15:19:31.186783665 +0000 @@ -10,6 +10,7 @@ SubdirLibraryTarget(geant321_parallel,NullParameter) @@ -48,7 +57,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/Imakefile cernlib-2005.05.09.dfsg/src/graflib/Imakefile --- cernlib-2005.05.09.dfsg~/src/graflib/Imakefile 2001-12-11 15:06:28.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile 2005-11-29 17:06:21.953357641 +0000 ++++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile 2005-12-01 15:19:31.186783665 +0000 @@ -11,9 +11,12 @@ SubdirLibraryTarget(graflib,$(LIBDIRS)) @@ -66,7 +75,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile --- cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile 1997-09-02 13:34:47.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile 2005-11-29 17:06:21.967354688 +0000 ++++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile 2005-12-01 15:19:31.186783665 +0000 @@ -13,6 +13,7 @@ SubdirLibraryTarget(grafX11,$(LIBDIRS)) @@ -77,7 +86,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/Imakefile --- cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile 2002-04-26 14:37:20.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile 2005-11-29 17:06:21.967354688 +0000 ++++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile 2005-12-01 15:19:31.187783453 +0000 @@ -14,6 +14,7 @@ InstallLibrary(kernlib,$(CERN_LIBDIR)) @@ -87,8 +96,8 @@ test:: LibraryTargetName(kernlib) diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/Imakefile ---- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile 2005-11-29 17:06:14.498930333 +0000 -+++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile 2005-11-29 17:06:21.968354477 +0000 +--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile 2005-12-01 15:19:24.005307227 +0000 ++++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile 2005-12-01 15:19:31.187783453 +0000 @@ -19,6 +19,7 @@ SubdirLibraryTarget(mathlib,$(LIBDIRS)) @@ -98,8 +107,8 @@ InstallIncludeSubdirs($(LIBDIRS)) diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/Imakefile ---- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile 2005-11-29 17:06:12.812286166 +0000 -+++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile 2005-11-29 17:06:21.968354477 +0000 +--- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile 2005-12-01 15:19:22.512623901 +0000 ++++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile 2005-12-01 15:19:31.187783453 +0000 @@ -13,6 +13,7 @@ TestSubdirs($(LIBDIRS)) @@ -110,7 +119,7 @@ INCLUDEDIRS= cojets eurodec herwig isajet pdf diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile --- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile 1996-05-06 20:06:50.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile 2005-11-29 17:06:21.968354477 +0000 ++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile 2005-12-01 15:19:31.187783453 +0000 @@ -12,6 +12,7 @@ SubdirLibraryTarget(cojets,$(LIBDIRS)) @@ -121,7 +130,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile --- cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile 1996-05-06 20:06:55.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile 2005-11-29 17:06:21.968354477 +0000 ++++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile 2005-12-01 15:19:31.187783453 +0000 @@ -12,6 +12,7 @@ SubdirLibraryTarget(eurodec,$(LIBDIRS)) @@ -132,7 +141,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile --- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile 1997-01-06 17:06:41.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile 2005-11-29 17:06:21.968354477 +0000 ++++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile 2005-12-01 15:19:31.187783453 +0000 @@ -10,6 +10,7 @@ InstallLibrary(herwig59,$(CERN_LIBDIR)) @@ -143,7 +152,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile --- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile 2001-10-08 14:03:02.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile 2005-11-29 17:06:21.968354477 +0000 ++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile 2005-12-01 15:19:31.187783453 +0000 @@ -12,6 +12,7 @@ SubdirLibraryTarget(isajet758,$(LIBDIRS)) @@ -154,7 +163,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile --- cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile 2000-05-29 14:49:59.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile 2005-11-29 17:06:21.969354266 +0000 ++++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile 2005-12-01 15:19:31.188783241 +0000 @@ -15,6 +15,7 @@ SubdirLibraryTarget(pdflib804,spdf npdf) @@ -165,7 +174,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile --- cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile 1999-03-26 10:52:23.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile 2005-11-29 17:06:21.969354266 +0000 ++++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile 2005-12-01 15:19:31.188783241 +0000 @@ -15,6 +15,7 @@ SubdirLibraryTarget(photos202,code) @@ -175,8 +184,8 @@ TestSubdirs(test) diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/Imakefile cernlib-2005.05.09.dfsg/src/packlib/Imakefile ---- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile 2005-11-29 17:06:14.373956699 +0000 -+++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile 2005-11-29 17:06:21.969354266 +0000 +--- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile 2005-12-01 15:19:23.885332680 +0000 ++++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile 2005-12-01 15:19:31.188783241 +0000 @@ -14,6 +14,7 @@ InstallLibrary(packlib,$(CERN_LIBDIR)) @@ -186,8 +195,8 @@ TestSubdirs($(LIBDIRS)) diff -urNad cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile ---- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile 2005-11-29 17:06:14.684891100 +0000 -+++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile 2005-11-29 17:06:21.969354266 +0000 +--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile 2005-12-01 15:19:24.192267563 +0000 ++++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile 2005-12-01 15:19:31.188783241 +0000 @@ -30,4 +30,5 @@ SubdirLibraryTarget(pawlib-lesstif,$(LIBDIRS)) @@ -196,7 +205,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/Imakefile --- cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile 1996-10-01 14:12:23.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile 2005-11-29 17:06:21.969354266 +0000 ++++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile 2005-12-01 15:19:31.188783241 +0000 @@ -11,6 +11,7 @@ SubdirLibraryTarget(pawlib,$(LIBDIRS)) @@ -207,7 +216,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/Imakefile cernlib-2005.05.09.dfsg/src/phtools/Imakefile --- cernlib-2005.05.09.dfsg~/src/phtools/Imakefile 1996-11-14 16:44:33.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile 2005-11-29 17:06:21.970354056 +0000 ++++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile 2005-12-01 15:19:31.189783029 +0000 @@ -11,7 +11,7 @@ SubdirLibraryTarget(phtools,$(LIBDIRS)) Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cernlib.spec 1 Dec 2005 14:47:54 -0000 1.5 +++ cernlib.spec 2 Dec 2005 09:57:41 -0000 1.6 @@ -1,11 +1,11 @@ Name: cernlib Version: 2005 -Release: 6%{?dist}.1 +Release: 7%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. # http://borex.princeton.edu/~kmccarty/faq.html#44 -License: GPL/LGPL/BSD +License: GPL/LGPL URL: http://cernlib.web.cern.ch/cernlib/ # mandrake #BuildRequires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel @@ -688,6 +688,13 @@ %doc debian/debhelper/zftp.README.debian %changelog +* Fri Dec 2 2005 Patrice Dumas - 2005-7 +- use updated beta debian patchset +- remove the BSD in the licence because there is no library nor binary + under a BSD licence and someone could get the idea that there is + some dual BSD/GPL licenced binaries or libraries. The LGPL is kept + because of cfortran + * Tue Nov 29 2005 Patrice Dumas - 2005-6.1 - update with newer debian patchset for cernlib, fix licence issues - don't use the include.tar.gz source, instead get include files from cernlib_2005.05.09.dfsg-1.diff: Index: cernlib_2005.05.09.dfsg-1.diff =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/cernlib_2005.05.09.dfsg-1.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cernlib_2005.05.09.dfsg-1.diff 30 Nov 2005 22:01:01 -0000 1.1 +++ cernlib_2005.05.09.dfsg-1.diff 2 Dec 2005 09:57:41 -0000 1.2 @@ -2744,13 +2744,15 @@ +-/* $Id$ +- * +- * $Log$ -+- * Revision 1.1 2005/11/30 22:01:01 pertusus -+- * - update with newer debian patchset for cernlib, fix licence issues -+- * - don't use the include.tar.gz source, instead get include files from -+- * the source files -+- * - build shared libraries -+- * - simplify the scripts modifications -+- * - add BuildRequires: libXau-devel to workaround #173530 ++- * Revision 1.2 2005/12/02 09:57:41 pertusus ++- * - use updated beta debian patchset ++- * - remove the BSD in the licence because there is no library nor binary ++- * under a BSD licence and someone could get the idea that there is ++- * some dual BSD/GPL licenced binaries or libraries. The LGPL is kept ++- * because of cfortran ++- * ++- * The directory reordering in toplevel Imakefile is now done in patch 802 ++- * and not 705 +- * +- * Revision 1.5 2004/10/05 15:54:40 mclareni +- * Add configuration file linux-lp64 for Linux 64-bit pointer systems like AMD Opteron and Intel IA64. @@ -6217,7 +6219,7 @@ + #endif --- cernlib-2005.05.09.dfsg.orig/debian/patches/802-create-shared-libraries.dpatch +++ cernlib-2005.05.09.dfsg/debian/patches/802-create-shared-libraries.dpatch -@@ -0,0 +1,219 @@ +@@ -0,0 +1,228 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 802-create-shared-libraries.dpatch by +## @@ -6226,8 +6228,17 @@ + + at DPATCH@ +diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile -+--- cernlib-2005.05.09.dfsg~/src/Imakefile 2005-11-29 17:06:14.683891311 +0000 -++++ cernlib-2005.05.09.dfsg/src/Imakefile 2005-11-29 17:06:50.910248135 +0000 ++--- cernlib-2005.05.09.dfsg~/src/Imakefile 2005-12-01 15:19:24.191267776 +0000 +++++ cernlib-2005.05.09.dfsg/src/Imakefile 2005-12-01 15:20:10.310483251 +0000 ++@@ -2,7 +2,7 @@ ++ #define PassCDebugFlags ++ ++ ++-LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools +++LIBDIRS= kernlib packlib mathlib graflib code_motif mclibs phtools pawlib paw_motif geant321 ++ ++ SUBDIRS= $(LIBDIRS) patchy cfortran ++ +@@ -15,6 +15,7 @@ + #endif + @@ -6237,16 +6248,16 @@ + INCLUDEDIRS= $(LIBDIRS) cfortran + +diff -urNad cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile cernlib-2005.05.09.dfsg/src/code_motif/Imakefile -+--- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile 2005-11-29 17:06:14.555918310 +0000 -++++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile 2005-11-29 17:06:21.953357641 +0000 ++--- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile 2005-12-01 15:19:24.062295137 +0000 +++++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile 2005-12-01 15:19:31.186783665 +0000 +@@ -31,3 +31,4 @@ + SubdirLibraryTarget(packlib-lesstif,NullParameter) + + InstallLibrary(packlib-lesstif,$(CERN_LIBDIR)) ++InstallSharedLibrary(packlib-lesstif,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR)) +diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile -+--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile 2005-11-29 17:06:13.317179648 +0000 -++++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile 2005-11-29 17:06:21.953357641 +0000 ++--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile 2005-12-01 15:19:23.018516575 +0000 +++++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile 2005-12-01 15:19:31.186783665 +0000 +@@ -26,6 +26,7 @@ + + InstallLibrary(geant321,$(CERN_LIBDIR)) @@ -6257,7 +6268,7 @@ + /* +diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile +--- cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile 1996-12-19 14:19:18.000000000 +0000 -++++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile 2005-11-29 17:06:21.953357641 +0000 +++++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile 2005-12-01 15:19:31.186783665 +0000 +@@ -10,6 +10,7 @@ + SubdirLibraryTarget(geant321_parallel,NullParameter) + @@ -6268,7 +6279,7 @@ + +diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/Imakefile cernlib-2005.05.09.dfsg/src/graflib/Imakefile +--- cernlib-2005.05.09.dfsg~/src/graflib/Imakefile 2001-12-11 15:06:28.000000000 +0000 -++++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile 2005-11-29 17:06:21.953357641 +0000 +++++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile 2005-12-01 15:19:31.186783665 +0000 +@@ -11,9 +11,12 @@ + + SubdirLibraryTarget(graflib,$(LIBDIRS)) @@ -6286,7 +6297,7 @@ + +diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile +--- cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile 1997-09-02 13:34:47.000000000 +0000 -++++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile 2005-11-29 17:06:21.967354688 +0000 +++++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile 2005-12-01 15:19:31.186783665 +0000 +@@ -13,6 +13,7 @@ + SubdirLibraryTarget(grafX11,$(LIBDIRS)) + @@ -6297,7 +6308,7 @@ + +diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/Imakefile +--- cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile 2002-04-26 14:37:20.000000000 +0000 -++++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile 2005-11-29 17:06:21.967354688 +0000 +++++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile 2005-12-01 15:19:31.187783453 +0000 +@@ -14,6 +14,7 @@ + + InstallLibrary(kernlib,$(CERN_LIBDIR)) @@ -6307,8 +6318,8 @@ + test:: LibraryTargetName(kernlib) + +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/Imakefile -+--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile 2005-11-29 17:06:14.498930333 +0000 -++++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile 2005-11-29 17:06:21.968354477 +0000 ++--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile 2005-12-01 15:19:24.005307227 +0000 +++++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile 2005-12-01 15:19:31.187783453 +0000 +@@ -19,6 +19,7 @@ + SubdirLibraryTarget(mathlib,$(LIBDIRS)) + @@ -6318,8 +6329,8 @@ + InstallIncludeSubdirs($(LIBDIRS)) + +diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/Imakefile -+--- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile 2005-11-29 17:06:12.812286166 +0000 -++++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile 2005-11-29 17:06:21.968354477 +0000 ++--- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile 2005-12-01 15:19:22.512623901 +0000 +++++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile 2005-12-01 15:19:31.187783453 +0000 +@@ -13,6 +13,7 @@ + TestSubdirs($(LIBDIRS)) + @@ -6330,7 +6341,7 @@ + INCLUDEDIRS= cojets eurodec herwig isajet pdf +diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile 1996-05-06 20:06:50.000000000 +0000 -++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile 2005-11-29 17:06:21.968354477 +0000 +++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile 2005-12-01 15:19:31.187783453 +0000 +@@ -12,6 +12,7 @@ + SubdirLibraryTarget(cojets,$(LIBDIRS)) + @@ -6341,7 +6352,7 @@ + +diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile 1996-05-06 20:06:55.000000000 +0000 -++++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile 2005-11-29 17:06:21.968354477 +0000 +++++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile 2005-12-01 15:19:31.187783453 +0000 +@@ -12,6 +12,7 @@ + SubdirLibraryTarget(eurodec,$(LIBDIRS)) + @@ -6352,7 +6363,7 @@ + +diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile 1997-01-06 17:06:41.000000000 +0000 -++++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile 2005-11-29 17:06:21.968354477 +0000 +++++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile 2005-12-01 15:19:31.187783453 +0000 +@@ -10,6 +10,7 @@ + + InstallLibrary(herwig59,$(CERN_LIBDIR)) @@ -6363,7 +6374,7 @@ + +diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile 2001-10-08 14:03:02.000000000 +0000 -++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile 2005-11-29 17:06:21.968354477 +0000 +++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile 2005-12-01 15:19:31.187783453 +0000 +@@ -12,6 +12,7 @@ + SubdirLibraryTarget(isajet758,$(LIBDIRS)) + @@ -6374,7 +6385,7 @@ + +diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile 2000-05-29 14:49:59.000000000 +0000 -++++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile 2005-11-29 17:06:21.969354266 +0000 +++++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile 2005-12-01 15:19:31.188783241 +0000 +@@ -15,6 +15,7 @@ + SubdirLibraryTarget(pdflib804,spdf npdf) + @@ -6385,7 +6396,7 @@ + +diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile 1999-03-26 10:52:23.000000000 +0000 -++++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile 2005-11-29 17:06:21.969354266 +0000 +++++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile 2005-12-01 15:19:31.188783241 +0000 +@@ -15,6 +15,7 @@ + SubdirLibraryTarget(photos202,code) + @@ -6395,8 +6406,8 @@ + TestSubdirs(test) + +diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/Imakefile cernlib-2005.05.09.dfsg/src/packlib/Imakefile -+--- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile 2005-11-29 17:06:14.373956699 +0000 -++++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile 2005-11-29 17:06:21.969354266 +0000 ++--- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile 2005-12-01 15:19:23.885332680 +0000 +++++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile 2005-12-01 15:19:31.188783241 +0000 +@@ -14,6 +14,7 @@ + + InstallLibrary(packlib,$(CERN_LIBDIR)) @@ -6406,8 +6417,8 @@ + TestSubdirs($(LIBDIRS)) + +diff -urNad cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile -+--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile 2005-11-29 17:06:14.684891100 +0000 -++++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile 2005-11-29 17:06:21.969354266 +0000 ++--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile 2005-12-01 15:19:24.192267563 +0000 +++++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile 2005-12-01 15:19:31.188783241 +0000 +@@ -30,4 +30,5 @@ + SubdirLibraryTarget(pawlib-lesstif,$(LIBDIRS)) + @@ -6416,7 +6427,7 @@ + +diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/Imakefile +--- cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile 1996-10-01 14:12:23.000000000 +0000 -++++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile 2005-11-29 17:06:21.969354266 +0000 +++++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile 2005-12-01 15:19:31.188783241 +0000 +@@ -11,6 +11,7 @@ + SubdirLibraryTarget(pawlib,$(LIBDIRS)) + @@ -6427,7 +6438,7 @@ + +diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/Imakefile cernlib-2005.05.09.dfsg/src/phtools/Imakefile +--- cernlib-2005.05.09.dfsg~/src/phtools/Imakefile 1996-11-14 16:44:33.000000000 +0000 -++++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile 2005-11-29 17:06:21.970354056 +0000 +++++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile 2005-12-01 15:19:31.189783029 +0000 +@@ -11,7 +11,7 @@ + SubdirLibraryTarget(phtools,$(LIBDIRS)) + @@ -6762,13 +6773,15 @@ + /* $Id$ + * + * $Log$ -+ * Revision 1.1 2005/11/30 22:01:01 pertusus -+ * - update with newer debian patchset for cernlib, fix licence issues -+ * - don't use the include.tar.gz source, instead get include files from -+ * the source files -+ * - build shared libraries -+ * - simplify the scripts modifications -+ * - add BuildRequires: libXau-devel to workaround #173530 ++ * Revision 1.2 2005/12/02 09:57:41 pertusus ++ * - use updated beta debian patchset ++ * - remove the BSD in the licence because there is no library nor binary ++ * under a BSD licence and someone could get the idea that there is ++ * some dual BSD/GPL licenced binaries or libraries. The LGPL is kept ++ * because of cfortran ++ * ++ * The directory reordering in toplevel Imakefile is now done in patch 802 ++ * and not 705 + * +diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.68wCAR/cernlib-2005.05.09/src/config/MacOSX.cf +--- cernlib-2005.05.09/src/config/MacOSX.cf 2005-06-10 14:34:58.142950664 -0400 @@ -7684,13 +7697,15 @@ + /* $Id$ + * + * $Log$ -+ * Revision 1.1 2005/11/30 22:01:01 pertusus -+ * - update with newer debian patchset for cernlib, fix licence issues -+ * - don't use the include.tar.gz source, instead get include files from -+ * the source files -+ * - build shared libraries -+ * - simplify the scripts modifications -+ * - add BuildRequires: libXau-devel to workaround #173530 ++ * Revision 1.2 2005/12/02 09:57:41 pertusus ++ * - use updated beta debian patchset ++ * - remove the BSD in the licence because there is no library nor binary ++ * under a BSD licence and someone could get the idea that there is ++ * some dual BSD/GPL licenced binaries or libraries. The LGPL is kept ++ * because of cfortran ++ * ++ * The directory reordering in toplevel Imakefile is now done in patch 802 ++ * and not 705 + * +diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.68wCAR/cernlib-2005.05.09/src/config/MacOSX.cf +--- cernlib-2005.05.09/src/config/MacOSX.cf 2005-06-10 14:34:58.142950664 -0400 @@ -9890,7 +9905,7 @@ + SYSGMOTIF="-lXm -lXt /usr/lib/X11/libX11.r" ;; --- cernlib-2005.05.09.dfsg.orig/debian/add-ons/Makefile +++ cernlib-2005.05.09.dfsg/debian/add-ons/Makefile -@@ -0,0 +1,520 @@ +@@ -0,0 +1,518 @@ +# Variables for installation directories, conforming to GNU standards +prefix = /usr/local +exec_prefix = $(prefix) @@ -10091,8 +10106,6 @@ +# build programs +cernlib-programs: + set -e ; \ -+ rm -f $(CVSCOSRC)/pawlib/paw/programs/comis && \ -+ ln -sf ../../comis/comis $(CVSCOSRC)/pawlib/paw/programs/comis ; \ + for package in $(BIN_PACKAGES) ; do \ + if [ -d $(CVSCOSRC)/$$package ] ; then \ + cd $(CERN_BUILDDIR)/$$package && $(MAKE) \ @@ -11162,12 +11175,14 @@ + --- cernlib-2005.05.09.dfsg.orig/debian/add-ons/scripts/findsym +++ cernlib-2005.05.09.dfsg/debian/add-ons/scripts/findsym -@@ -0,0 +1,52 @@ +@@ -0,0 +1,54 @@ +#!/bin/bash + +# find where a symbol is defined -+# argument 1: "has" == provides a symbol, -+# "needs" == requires a symbol ++# argument 1: "has" == what object provides a given symbol? ++# "needs" == what object requires a given symbol? ++# "requiredby" == what symbols are required by an object ++# providing a given symbol? +# argument 2: the symbol to search for +# argument 3: directory to search in ("." if omitted) + @@ -11217,13 +11232,13 @@ + --- cernlib-2005.05.09.dfsg.orig/debian/add-ons/scripts/README +++ cernlib-2005.05.09.dfsg/debian/add-ons/scripts/README -@@ -0,0 +1,44 @@ +@@ -0,0 +1,58 @@ +Nothing in this directory is needed for compiling or building packages. +It's just a few simple scripts that make my life easier when trying to debug +library dependencies. + -+makedeplist -+----------- ++makedeplist (no arguments) ++-------------------------- + +When run in the top-level cernlib source directory after a compilation (note +that DEB_BUILD_OPTIONS must have been set to "nostrip"), this script will @@ -11248,18 +11263,32 @@ +If you want to include non-Cernlib libraries in the output, symlink to them +from the shlib directory, e.g. shlib/libX11.so -> /usr/X11R6/lib/libX11.so + -+findsym -+------- ++findsym {has|needs|requiredby} [ ] ++------------------------------------------------------- + +This script will find needed symbols recursively in any .o, .a, or .so files in +a directory. "findsym has " searches for object files that provide a +given symbol. "findsym needs " searches for object files that have the -+symbol undefined. An optional third argument specifies the starting directory ++symbol undefined. "findsym requiredby " prints a list of symbols ++needed by object files that define the given symbol; this command works best ++with object files or shared libs. ++ ++An optional third argument specifies the starting directory +("." by default). Thus, seeing that the file + libdeps/libpacklib-lesstif.not-in-cernlib.txt +contains (among others) the symbol XBell, we run (using an ingenious guess for -+the starting directory) "findsym has XBell /usr/X11R6/lib" to determine that -+this is found in libX11.so. ++the starting directory) "./findsym has XBell /usr/X11R6/lib" to determine that ++this symbol is found in libX11.so. ++ ++libcomp ++------------------------- ++ ++This script compares the symbols exported by two dynamic libraries that are ++supposed to be different versions of the same library. Any symbols in the ++first-specified library that are not present in the second-specified library, ++or have a different size, are noted. The intent is to check for preservation ++of ABI compatibility. ++ + +--Kevin McCarty --- cernlib-2005.05.09.dfsg.orig/debian/add-ons/scripts/makedeplist @@ -11356,11 +11385,12 @@ +exit 0 --- cernlib-2005.05.09.dfsg.orig/debian/add-ons/scripts/libcomp +++ cernlib-2005.05.09.dfsg/debian/add-ons/scripts/libcomp -@@ -0,0 +1,33 @@ +@@ -0,0 +1,34 @@ +#!/bin/bash + +# libcomp - Script to check whether the size of library symbols has +# changed between versions. For checking ABI compatibility. ++# Requires the "bc" and "binutils" packages to be installed. + +# Arguments: $1 - old library; $2 - new library + @@ -11663,13 +11693,15 @@ +.\"* $Id$ +.\"* +.\"* $Log$ -+.\"* Revision 1.1 2005/11/30 22:01:01 pertusus -+.\"* - update with newer debian patchset for cernlib, fix licence issues -+.\"* - don't use the include.tar.gz source, instead get include files from -+.\"* the source files -+.\"* - build shared libraries -+.\"* - simplify the scripts modifications -+.\"* - add BuildRequires: libXau-devel to workaround #173530 ++.\"* Revision 1.2 2005/12/02 09:57:41 pertusus ++.\"* - use updated beta debian patchset ++.\"* - remove the BSD in the licence because there is no library nor binary ++.\"* under a BSD licence and someone could get the idea that there is ++.\"* some dual BSD/GPL licenced binaries or libraries. The LGPL is kept ++.\"* because of cfortran ++.\"* ++.\"* The directory reordering in toplevel Imakefile is now done in patch 802 ++.\"* and not 705 +.\"* +.\"* Revision 1.3 2000/10/24 07:29:51 couet +.\"* - PAW web pages URL updated @@ -13408,7 +13440,7 @@ +pawlib/sigma/sigma --- cernlib-2005.05.09.dfsg.orig/debian/changelog +++ cernlib-2005.05.09.dfsg/debian/changelog -@@ -0,0 +1,1334 @@ +@@ -0,0 +1,1336 @@ +cernlib (2005.05.09.dfsg-1) unstable; urgency=low + + * Removed the directories src/geant321/peanut and src/geant321/block, @@ -13433,9 +13465,9 @@ + binary packages: geant321, libgeant321-2, libgeant321-2-dev. + + * Some additional changes to existing patches suggested by Patrice Dumas -+ : ++ in the process of creating Cernlib RPMs: + - patch 102: Add src/mathlib/gen/d/old506.F to the list of files to -+ compile without optimization. ++ compile without optimization; it breaks g77 3.2 otherwise. + - patch 207: Have COMIS create temporary shared library files with g77, + not gcc. (Resync patch 315.) + - patch 210: Change to . @@ -13444,8 +13476,10 @@ + in src/packlib/kernlib/kerngen/ccgen/lenocc.c ; it isn't + clear that the C version is 64-bit safe. + - patch 800: Use "$(FCLINK)" to create shared libs, not "gcc". -+ - patch 802: For consistency, add InstallSharedLibSubdirs to top-level -+ Imakefile, even though not used in the Debian package build. ++ - patch 802: Fixes to the top-level Imakefile, even though it isn't used ++ in the Debian package build. For consistency, add ++ InstallSharedLibSubdirs(), and re-order the directory build ++ order to match that in debian/add-ons/Makefile. + - patch 804: #include "comis/mdpool.h" or .inc consistently, using a new + dpatch shell script 804-link-to-comis-includes.sh to link + src/pawlib/comis/comis into src/include/. @@ -13474,7 +13508,7 @@ + - Spanish: C??sar G??mez Mart??n (closes: #334390) + - Swedish: Daniel Nylander (closes: #332334) + -+ -- Kevin B. McCarty Tue, 29 Nov 2005 17:41:54 +0000 ++ -- Kevin B. McCarty Thu, 1 Dec 2005 15:14:27 +0000 + +cernlib (2005.05.09-4) unstable; urgency=low + From fedora-extras-commits at redhat.com Fri Dec 2 14:07:54 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Dec 2005 09:07:54 -0500 Subject: rpms/intuitively - New directory Message-ID: <200512021407.jB2E7s8r023394@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/intuitively In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23385/intuitively Log Message: Directory /cvs/extras/rpms/intuitively added to the repository From fedora-extras-commits at redhat.com Fri Dec 2 14:08:15 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Dec 2005 09:08:15 -0500 Subject: rpms/intuitively/devel - New directory Message-ID: <200512021408.jB2E8FdX023409@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/intuitively/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23385/intuitively/devel Log Message: Directory /cvs/extras/rpms/intuitively/devel added to the repository From fedora-extras-commits at redhat.com Fri Dec 2 14:08:55 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Dec 2005 09:08:55 -0500 Subject: rpms/intuitively Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200512021408.jB2E8t6i023446@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/intuitively In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23433 Added Files: Makefile import.log Log Message: Setup of module intuitively --- NEW FILE Makefile --- # Top level Makefile for module intuitively all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Dec 2 14:09:17 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Dec 2005 09:09:17 -0500 Subject: rpms/intuitively/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200512021409.jB2E9HdU023464@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/intuitively/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23433/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module intuitively --- NEW 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 Dec 2 14:10:35 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Dec 2005 09:10:35 -0500 Subject: rpms/intuitively import.log,1.1,1.2 Message-ID: <200512021410.jB2EAZkq023534@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/intuitively In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23500 Modified Files: import.log Log Message: auto-import intuitively-0.7-6 on branch devel from intuitively-0.7-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/intuitively/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Dec 2005 14:08:53 -0000 1.1 +++ import.log 2 Dec 2005 14:10:14 -0000 1.2 @@ -0,0 +1 @@ +intuitively-0_7-6:HEAD:intuitively-0.7-6.src.rpm:1133532561 From fedora-extras-commits at redhat.com Fri Dec 2 14:10:32 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Dec 2005 09:10:32 -0500 Subject: rpms/intuitively/devel intuitively.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200512021411.jB2EBLPL023540@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/intuitively/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23500/devel Modified Files: .cvsignore sources Added Files: intuitively.spec Log Message: auto-import intuitively-0.7-6 on branch devel from intuitively-0.7-6.src.rpm --- NEW FILE intuitively.spec --- Summary: Automatic IP detection utility Name: intuitively Version: 0.7 Release: 6 URL: http://home.samfundet.no/~tfheen/intuitively.html Source0: http://ftp.debian.org/debian/pool/main/i/intuitively/intuitively_%{version}.orig.tar.gz License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libnet-devel >= 1.1.1, libpcap, docbook-utils, flex Group: System Environment/Base %description "intuitively" is an utility to locate current network address via arp requests and perform heavy reconfigurations based on its findings. "intuitively" is intended for laptop users or people who use their machines in different networks all the time. It is meant to be run from the PCMCIA network initialization scripts or the command line. %prep %setup -q -n %{name}-%{version} sed -i 's:/usr/share/intuitively:/some/path/to:' doc/intuitively.conf.dist %build %configure make %{?_smp_mflags} # re-create man pages (it has a gabage due to wrong docbook2man invoking) pushd doc docbook2man intuitively.sgml docbook2man intuitively.conf.sgml popd %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/intuitively %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/intuitively.conf %{_mandir}/*/* %doc README COPYING AUTHORS NEWS doc/intuitively.conf.dist %changelog * Mon Nov 28 2005 Patrice Dumas 0.7-6 - all changes are from Dmitry Butskoy - use a sed one-liner instead of Patch1 - use %{name} and some wildcards for %files - properly recreate man pages - pass sysconfdir to make instead of patching Makefile.in * Mon Aug 15 2005 Patrice Dumas 0.7-4 - Buildrequires flex, libnet-devel - (noreplace) for config - replace /usr/share by /opt in example config file - no make clean, use smp_mflags * Mon Aug 15 2005 Patrice Dumas 0.7-3 - use the right url * Fri Aug 12 2005 Patrice Dumas 0.7-1 - update * Sat Mar 20 2004 Patrice Dumas 0.6-0.fdr.1 - Update using fedora spec file * Fri Jun 14 2002 Dumas Patrice - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/intuitively/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Dec 2005 14:09:15 -0000 1.1 +++ .cvsignore 2 Dec 2005 14:10:25 -0000 1.2 @@ -0,0 +1 @@ +intuitively_0.7.orig.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/intuitively/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Dec 2005 14:09:15 -0000 1.1 +++ sources 2 Dec 2005 14:10:25 -0000 1.2 @@ -0,0 +1 @@ +047b7d9071422bb60b6e52425f7eb1aa intuitively_0.7.orig.tar.gz From fedora-extras-commits at redhat.com Fri Dec 2 14:18:37 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Dec 2005 09:18:37 -0500 Subject: rpms/intuitively/devel intuitively.spec,1.1,1.2 Message-ID: <200512021419.jB2EJ7ON023629@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/intuitively/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23612 Modified Files: intuitively.spec Log Message: add dist tag Index: intuitively.spec =================================================================== RCS file: /cvs/extras/rpms/intuitively/devel/intuitively.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- intuitively.spec 2 Dec 2005 14:10:25 -0000 1.1 +++ intuitively.spec 2 Dec 2005 14:18:35 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Automatic IP detection utility Name: intuitively Version: 0.7 -Release: 6 +Release: 6%{?dist} URL: http://home.samfundet.no/~tfheen/intuitively.html Source0: http://ftp.debian.org/debian/pool/main/i/intuitively/intuitively_%{version}.orig.tar.gz License: GPL From fedora-extras-commits at redhat.com Fri Dec 2 14:54:53 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 2 Dec 2005 09:54:53 -0500 Subject: rpms/scim-skk/FC-4 .cvsignore, 1.3, 1.4 scim-skk.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200512021455.jB2EtNXg023816@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23791 Modified Files: .cvsignore scim-skk.spec sources Log Message: update to 0.5.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Nov 2005 13:17:04 -0000 1.3 +++ .cvsignore 2 Dec 2005 14:54:50 -0000 1.4 @@ -1 +1 @@ -scim-skk-0.4.0.tar.gz +scim-skk-0.5.0.tar.gz Index: scim-skk.spec =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-skk.spec 1 Nov 2005 13:17:04 -0000 1.6 +++ scim-skk.spec 2 Dec 2005 14:54:50 -0000 1.7 @@ -1,5 +1,5 @@ Name: scim-skk -Version: 0.4.0 +Version: 0.5.0 Release: 1%{?dist} Summary: SCIM IMEngine module for skk @@ -50,7 +50,10 @@ %changelog -* Tue Dec 1 2005 Ryo Diairki - 0.4.0-1 +* Fri Dec 2 2005 Ryo Dairiki - 0.4.0-1 +- update to 0.5.0 + +* Tue Nov 1 2005 Ryo Diairki - 0.4.0-1 - update to 0.4.0 * Fri Oct 7 2005 Ryo Dairiki - 0.3.0-5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Nov 2005 13:17:04 -0000 1.3 +++ sources 2 Dec 2005 14:54:50 -0000 1.4 @@ -1 +1 @@ -0d5ee7f39aef2b926e1a4907da00c0c9 scim-skk-0.4.0.tar.gz +37467db3142c5ae980a1bf67c6f422e9 scim-skk-0.5.0.tar.gz From fedora-extras-commits at redhat.com Fri Dec 2 14:57:20 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 2 Dec 2005 09:57:20 -0500 Subject: rpms/scim-skk/FC-3 scim-skk.spec,1.6,1.7 Message-ID: <200512021457.jB2EvoqU023876@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23847 Modified Files: scim-skk.spec Log Message: update to 0.5.0 Index: scim-skk.spec =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-skk.spec 1 Nov 2005 13:11:23 -0000 1.6 +++ scim-skk.spec 2 Dec 2005 14:57:18 -0000 1.7 @@ -1,5 +1,5 @@ Name: scim-skk -Version: 0.4.0 +Version: 0.5.0 Release: 1%{?dist} Summary: SCIM IMEngine module for skk @@ -50,7 +50,10 @@ %changelog -* Tue Dec 1 2005 Ryo Diairki - 0.4.0-1 +* Fri Dec 2 2005 Ryo Dairiki - 0.4.0-1 +- update to 0.5.0 + +* Tue Nov 1 2005 Ryo Diairki - 0.4.0-1 - update to 0.4.0 * Fri Oct 7 2005 Ryo Dairiki - 0.3.0-5 From fedora-extras-commits at redhat.com Fri Dec 2 14:58:22 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 2 Dec 2005 09:58:22 -0500 Subject: rpms/scim-skk/devel scim-skk.spec,1.6,1.7 Message-ID: <200512021458.jB2EwqRW023929@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23895 Modified Files: scim-skk.spec Log Message: update to 0.5.0 Index: scim-skk.spec =================================================================== RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-skk.spec 1 Nov 2005 13:20:14 -0000 1.6 +++ scim-skk.spec 2 Dec 2005 14:58:20 -0000 1.7 @@ -1,5 +1,5 @@ Name: scim-skk -Version: 0.4.0 +Version: 0.5.0 Release: 1%{?dist} Summary: SCIM IMEngine module for skk @@ -50,7 +50,10 @@ %changelog -* Tue Dec 1 2005 Ryo Diairki - 0.4.0-1 +* Fri Dec 2 2005 Ryo Dairiki - 0.4.0-1 +- update to 0.5.0 + +* Tue Nov 1 2005 Ryo Diairki - 0.4.0-1 - update to 0.4.0 * Fri Oct 7 2005 Ryo Dairiki - 0.3.0-5 From fedora-extras-commits at redhat.com Fri Dec 2 15:00:16 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 2 Dec 2005 10:00:16 -0500 Subject: rpms/scim-skk/devel no-dictionary.diff,1.1,NONE Message-ID: <200512021500.jB2F0GBj023972@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23945 Removed Files: no-dictionary.diff Log Message: remove the patch already included into the upstream --- no-dictionary.diff DELETED --- From fedora-extras-commits at redhat.com Fri Dec 2 15:12:21 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 2 Dec 2005 10:12:21 -0500 Subject: rpms/scim-skk/devel sources,1.3,1.4 Message-ID: <200512021512.jB2FCp1o025715@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25698 Modified Files: sources Log Message: update source Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-skk/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Nov 2005 13:20:14 -0000 1.3 +++ sources 2 Dec 2005 15:12:19 -0000 1.4 @@ -1 +1 @@ -0d5ee7f39aef2b926e1a4907da00c0c9 scim-skk-0.4.0.tar.gz +37467db3142c5ae980a1bf67c6f422e9 scim-skk-0.5.0.tar.gz From fedora-extras-commits at redhat.com Fri Dec 2 15:16:02 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 2 Dec 2005 10:16:02 -0500 Subject: rpms/scim-skk/FC-3 sources,1.3,1.4 Message-ID: <200512021516.jB2FGW8Y025775@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25758 Modified Files: sources Log Message: update "source" Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Nov 2005 13:11:23 -0000 1.3 +++ sources 2 Dec 2005 15:15:59 -0000 1.4 @@ -1 +1 @@ -0d5ee7f39aef2b926e1a4907da00c0c9 scim-skk-0.4.0.tar.gz +37467db3142c5ae980a1bf67c6f422e9 scim-skk-0.5.0.tar.gz From fedora-extras-commits at redhat.com Fri Dec 2 15:24:34 2005 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 2 Dec 2005 10:24:34 -0500 Subject: owners owners.list,1.429,1.430 Message-ID: <200512021525.jB2FP4m5025849@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25832 Modified Files: owners.list Log Message: add intuitively Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.429 retrieving revision 1.430 diff -u -r1.429 -r1.430 --- owners.list 30 Nov 2005 03:15:34 -0000 1.429 +++ owners.list 2 Dec 2005 15:24:32 -0000 1.430 @@ -387,6 +387,7 @@ Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|inkscape|A vector-based drawing program using SVG|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|iozone|A file system performance analysis tool|nhorman at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ip-sentinel|Tool to prevent unauthorized usage of IP addresses|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Dec 2 16:24:14 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 2 Dec 2005 11:24:14 -0500 Subject: rpms/tklib - New directory Message-ID: <200512021624.jB2GOEV3027977@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tklib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27968/tklib Log Message: Directory /cvs/extras/rpms/tklib added to the repository From fedora-extras-commits at redhat.com Fri Dec 2 16:24:20 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 2 Dec 2005 11:24:20 -0500 Subject: rpms/tklib/devel - New directory Message-ID: <200512021624.jB2GOKhj027992@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tklib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27968/tklib/devel Log Message: Directory /cvs/extras/rpms/tklib/devel added to the repository From fedora-extras-commits at redhat.com Fri Dec 2 16:24:37 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 2 Dec 2005 11:24:37 -0500 Subject: rpms/tklib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200512021624.jB2GObHD028046@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tklib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28013/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tklib --- NEW 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 Dec 2 16:24:31 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 2 Dec 2005 11:24:31 -0500 Subject: rpms/tklib Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200512021624.jB2GOVJa028026@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tklib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28013 Added Files: Makefile import.log Log Message: Setup of module tklib --- NEW FILE Makefile --- # Top level Makefile for module tklib all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Dec 2 16:25:08 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 2 Dec 2005 11:25:08 -0500 Subject: rpms/tklib import.log,1.1,1.2 Message-ID: <200512021625.jB2GPcVv028121@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tklib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28084 Modified Files: import.log Log Message: auto-import tklib-0.4.1-3 on branch devel from tklib-0.4.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tklib/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Dec 2005 16:24:29 -0000 1.1 +++ import.log 2 Dec 2005 16:25:06 -0000 1.2 @@ -0,0 +1 @@ +tklib-0_4_1-3:HEAD:tklib-0.4.1-3.src.rpm:1133540702 From fedora-extras-commits at redhat.com Fri Dec 2 16:25:13 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 2 Dec 2005 11:25:13 -0500 Subject: rpms/tklib/devel tklib-0.4.1-makecheck.patch, NONE, 1.1 tklib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200512021625.jB2GPh9H028125@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tklib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28084/devel Modified Files: .cvsignore sources Added Files: tklib-0.4.1-makecheck.patch tklib.spec Log Message: auto-import tklib-0.4.1-3 on branch devel from tklib-0.4.1-3.src.rpm tklib-0.4.1-makecheck.patch: --- NEW FILE tklib-0.4.1-makecheck.patch --- diff -Naur tklib-0.4.1/sak.tcl tklib-0.4.1.new/sak.tcl --- tklib-0.4.1/sak.tcl 2005-11-02 11:31:11.000000000 -0800 +++ tklib-0.4.1.new/sak.tcl 2005-12-01 10:37:37.000000000 -0800 @@ -884,7 +884,7 @@ } foreach p [lsort [array names pp]] { if {![info exists ip($p)]} { - puts " Provided, not indexed: [format "%-*s | %s" $maxl $p $::pf($p)]" + puts " Provided, not indexed: [format "%-*s | %s" $maxl $p $pp($p)]" } } foreach p [lsort [array names ip]] { --- NEW FILE tklib.spec --- Summary: Collection of widgets and other packages for Tk Name: tklib Version: 0.4.1 Release: 3%{?dist} License: BSD Group: Development/Libraries Source: http://download.sourceforge.net/tcllib/tklib-0.4.1.tar.gz Patch0: tklib-0.4.1-makecheck.patch URL: http://tcllib.sourceforge.net/ BuildArch: noarch Requires: tk >= 0:8.3.1 tcllib BuildRequires: tk >= 0:8.3.1 tcllib BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This package is intended to be a collection of Tcl packages that provide Tk utility functions and widgets useful to a large collection of Tcl/Tk programmers. %prep %setup -q %patch0 -p1 # Remove some execute permission bits on files that aren't executable # to suppress some rpmlint warnings. chmod a-x modules/plotchart/*.tcl chmod a-x modules/swaplist/*.tcl %build # Override the setting for 'libdir'. If this isn't done then the # platform-independent script files will get installed in a platform-specific # directory (such as /usr/lib or /usr/lib64). %configure --libdir=%{_datadir} # Don't bother running 'make' because there's nothing to build. %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %check make check %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc PACKAGES README README-0.4.txt ChangeLog license.terms %{_datadir}/tklib* %{_mandir}/*/* %changelog * Fri Dec 2 2005 Wart 0.4.1-3 - Minor specfile improvements. * Thu Dec 1 2005 Wart 0.4.1-2 - Add check stage after the install, as well as a patch to the check script included in the package. * Sun Nov 27 2005 Wart 0.4.1-1 - Initial spec file. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tklib/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Dec 2005 16:24:35 -0000 1.1 +++ .cvsignore 2 Dec 2005 16:25:11 -0000 1.2 @@ -0,0 +1 @@ +tklib-0.4.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tklib/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Dec 2005 16:24:35 -0000 1.1 +++ sources 2 Dec 2005 16:25:11 -0000 1.2 @@ -0,0 +1 @@ +4b6919112bc2b9bd816120a8210170b5 tklib-0.4.1.tar.gz From fedora-extras-commits at redhat.com Fri Dec 2 16:27:53 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 2 Dec 2005 11:27:53 -0500 Subject: owners owners.list,1.430,1.431 Message-ID: <200512021628.jB2GSNhE028184@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28164 Modified Files: owners.list Log Message: Added entry for tklib Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.430 retrieving revision 1.431 diff -u -r1.430 -r1.431 --- owners.list 2 Dec 2005 15:24:32 -0000 1.430 +++ owners.list 2 Dec 2005 16:27:51 -0000 1.431 @@ -1141,6 +1141,7 @@ Fedora Extras|tinyerp|Open Source ERP Client|dan at danny.cz|extras-qa at fedoraproject.org|tcallawa at redhat.com Fedora Extras|tiobench|Threaded I/O benchmark|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org| +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|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Dec 2 16:40:13 2005 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Fri, 2 Dec 2005 11:40:13 -0500 Subject: rpms/ghdl/devel ghdl.spec,1.2,1.3 Message-ID: <200512021640.jB2GehHc028361@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28344 Modified Files: ghdl.spec Log Message: do not ExcludeArch x86_64, just disable multilibbing Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ghdl.spec 1 Dec 2005 19:40:26 -0000 1.2 +++ ghdl.spec 2 Dec 2005 16:40:11 -0000 1.3 @@ -4,7 +4,7 @@ Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.21 -Release: 0.24svn.2%{?dist} +Release: 0.24svn.3%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -21,9 +21,7 @@ Requires(preun): /sbin/install-info # gcc-gnat missing on ppc: Bug 174720 # mock does not install glibc-devel.i386 on x86_64, therefore -# gcc -m32 fails, therefore the package does not build under -# mock/plague on x86_64: Bug 174731 -ExcludeArch: ppc x86_64 +ExcludeArch: ppc # Make sure we don't use clashing namespaces %define _vendor fedora_ghdl @@ -74,6 +72,9 @@ -e 's/-fstack-protector//g ' \ -e 's/--param=ssp-buffer-size=[0-9]*//g') +# gcc -m32 fails, so we disable multilibbing. +# so far multilib isn't very valuable, as the VHDL libraries aren't multilibbed +# either; Bug 174731 export CFLAGS="$OPT_FLAGS" export XCFLAGS="$OPT_FLAGS" export TCFLAGS="$OPT_FLAGS" @@ -94,6 +95,7 @@ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --enable-languages=vhdl \ + --disable-multilib \ %ifarch sparc --host=%{gcc_target_platform} \ --build=%{gcc_target_platform} \ From fedora-extras-commits at redhat.com Fri Dec 2 20:37:35 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Dec 2005 15:37:35 -0500 Subject: rpms/syslog-ng/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 syslog-ng.spec, 1.6, 1.7 Message-ID: <200512022038.jB2Kc5fh003187@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3149/FC-3 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Sync with devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 May 2005 17:34:30 -0000 1.3 +++ .cvsignore 2 Dec 2005 20:37:32 -0000 1.4 @@ -1 +1 @@ -syslog-ng-1.6.8.tar.gz +syslog-ng-1.6.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 May 2005 17:34:30 -0000 1.3 +++ sources 2 Dec 2005 20:37:32 -0000 1.4 @@ -1 +1 @@ -ffbad7e8e6dcbe385820b8ffba23b622 syslog-ng-1.6.8.tar.gz +5280a86b4f5c25b2ba157c8cea302cf0 syslog-ng-1.6.9.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-3/syslog-ng.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- syslog-ng.spec 22 Jun 2005 00:30:17 -0000 1.6 +++ syslog-ng.spec 2 Dec 2005 20:37:32 -0000 1.7 @@ -2,20 +2,20 @@ %define sbindir /sbin Name: syslog-ng -Version: 1.6.8 -Release: 2%{?dist} +Version: 1.6.9 +Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons License: GPL Url: http://www.balabit.com/products/syslog_ng/ -Source0: http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.8.tar.gz +Source0: http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-%{version}.tar.gz Source1: syslog.log Patch0: syslog-ng-1.6.7-init.patch Patch1: syslog-ng-1.6.7-logrotate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libol-devel >= 0.3.16 +BuildConflicts: libol-devel < 0.3.17 BuildRequires: flex, tcp_wrappers, which # Requires sed v3.95 (command line option -i) Requires: logrotate, sed >= 3.95 @@ -48,6 +48,7 @@ %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl chmod a-x contrib/syslog2ng +mv libol-0.3.17/ChangeLog ChangeLog.libol %build %configure \ @@ -106,6 +107,7 @@ %doc doc/*.demo doc/*.sample %doc contrib/syslog-ng.conf.doc %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl +%doc ChangeLog.libol %{sbindir}/syslog-ng %{_initrddir}/syslog-ng %dir %{_sysconfdir}/%{name} @@ -117,6 +119,14 @@ %changelog +* Wed Nov 30 2005 Jose Pedro Oliveira - 1.6.9-1 +- Build conflict statement + (see: https://lists.balabit.hu/pipermail/syslog-ng/2005-June/007630.html) + +* Wed Nov 23 2005 Jose Pedro Oliveira - 1.6.9-0 +- Update to 1.6.9. +- The libol support library is now included in the syslog-ng tarball. + * Wed Jun 22 2005 Jose Pedro Oliveira - 1.6.8-2 - BuildRequire which, since it's not part of the default buildgroup (Konstantin Ryabitsev). From fedora-extras-commits at redhat.com Fri Dec 2 20:37:40 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Dec 2005 15:37:40 -0500 Subject: rpms/syslog-ng/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 syslog-ng.spec, 1.6, 1.7 Message-ID: <200512022038.jB2KcBhr003192@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3149/FC-4 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Sync with devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 May 2005 17:34:30 -0000 1.3 +++ .cvsignore 2 Dec 2005 20:37:38 -0000 1.4 @@ -1 +1 @@ -syslog-ng-1.6.8.tar.gz +syslog-ng-1.6.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 May 2005 17:34:30 -0000 1.3 +++ sources 2 Dec 2005 20:37:38 -0000 1.4 @@ -1 +1 @@ -ffbad7e8e6dcbe385820b8ffba23b622 syslog-ng-1.6.8.tar.gz +5280a86b4f5c25b2ba157c8cea302cf0 syslog-ng-1.6.9.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/syslog-ng.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- syslog-ng.spec 22 Jun 2005 00:30:16 -0000 1.6 +++ syslog-ng.spec 2 Dec 2005 20:37:38 -0000 1.7 @@ -2,20 +2,20 @@ %define sbindir /sbin Name: syslog-ng -Version: 1.6.8 -Release: 2%{?dist} +Version: 1.6.9 +Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons License: GPL Url: http://www.balabit.com/products/syslog_ng/ -Source0: http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.8.tar.gz +Source0: http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-%{version}.tar.gz Source1: syslog.log Patch0: syslog-ng-1.6.7-init.patch Patch1: syslog-ng-1.6.7-logrotate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libol-devel >= 0.3.16 +BuildConflicts: libol-devel < 0.3.17 BuildRequires: flex, tcp_wrappers, which # Requires sed v3.95 (command line option -i) Requires: logrotate, sed >= 3.95 @@ -48,6 +48,7 @@ %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl chmod a-x contrib/syslog2ng +mv libol-0.3.17/ChangeLog ChangeLog.libol %build %configure \ @@ -106,6 +107,7 @@ %doc doc/*.demo doc/*.sample %doc contrib/syslog-ng.conf.doc %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl +%doc ChangeLog.libol %{sbindir}/syslog-ng %{_initrddir}/syslog-ng %dir %{_sysconfdir}/%{name} @@ -117,6 +119,14 @@ %changelog +* Wed Nov 30 2005 Jose Pedro Oliveira - 1.6.9-1 +- Build conflict statement + (see: https://lists.balabit.hu/pipermail/syslog-ng/2005-June/007630.html) + +* Wed Nov 23 2005 Jose Pedro Oliveira - 1.6.9-0 +- Update to 1.6.9. +- The libol support library is now included in the syslog-ng tarball. + * Wed Jun 22 2005 Jose Pedro Oliveira - 1.6.8-2 - BuildRequire which, since it's not part of the default buildgroup (Konstantin Ryabitsev). From fedora-extras-commits at redhat.com Fri Dec 2 20:59:15 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Dec 2005 15:59:15 -0500 Subject: rpms/perl-DBD-SQLite/FC-3 .cvsignore, 1.3, 1.4 perl-DBD-SQLite.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200512022059.jB2Kxj2j003433@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-SQLite/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3370/FC-3 Modified Files: .cvsignore perl-DBD-SQLite.spec sources Log Message: Update to 1.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Jul 2005 18:48:36 -0000 1.3 +++ .cvsignore 2 Dec 2005 20:59:13 -0000 1.4 @@ -1 +1 @@ -DBD-SQLite-1.09.tar.gz +DBD-SQLite-1.11.tar.gz Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-3/perl-DBD-SQLite.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-DBD-SQLite.spec 29 Jul 2005 18:48:36 -0000 1.3 +++ perl-DBD-SQLite.spec 2 Dec 2005 20:59:13 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-DBD-SQLite -Version: 1.09 -Release: 2%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries @@ -46,7 +46,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -63,6 +63,12 @@ %changelog +* Fri Dec 2 2005 Jose Pedro Oliveira - 1.11-1 +- Update to 1.11. + +* Fri Dec 2 2005 Jose Pedro Oliveira - 1.10-1 +- Update to 1.10. + * Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-2 - Build requirement added: sqlite-devel. - Doc file added: Changes. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Jul 2005 18:48:36 -0000 1.3 +++ sources 2 Dec 2005 20:59:13 -0000 1.4 @@ -1 +1 @@ -02cde1aba9cc2d8474666d8258d8256d DBD-SQLite-1.09.tar.gz +7f22d8789245047343e114e655571022 DBD-SQLite-1.11.tar.gz From fedora-extras-commits at redhat.com Fri Dec 2 20:59:20 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Dec 2005 15:59:20 -0500 Subject: rpms/perl-DBD-SQLite/FC-4 .cvsignore, 1.3, 1.4 perl-DBD-SQLite.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200512022059.jB2Kxohp003438@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-SQLite/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3370/FC-4 Modified Files: .cvsignore perl-DBD-SQLite.spec sources Log Message: Update to 1.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Jul 2005 18:48:36 -0000 1.3 +++ .cvsignore 2 Dec 2005 20:59:18 -0000 1.4 @@ -1 +1 @@ -DBD-SQLite-1.09.tar.gz +DBD-SQLite-1.11.tar.gz Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-4/perl-DBD-SQLite.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-DBD-SQLite.spec 29 Jul 2005 18:48:36 -0000 1.3 +++ perl-DBD-SQLite.spec 2 Dec 2005 20:59:18 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-DBD-SQLite -Version: 1.09 -Release: 2%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries @@ -46,7 +46,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -63,6 +63,12 @@ %changelog +* Fri Dec 2 2005 Jose Pedro Oliveira - 1.11-1 +- Update to 1.11. + +* Fri Dec 2 2005 Jose Pedro Oliveira - 1.10-1 +- Update to 1.10. + * Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-2 - Build requirement added: sqlite-devel. - Doc file added: Changes. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Jul 2005 18:48:36 -0000 1.3 +++ sources 2 Dec 2005 20:59:18 -0000 1.4 @@ -1 +1 @@ -02cde1aba9cc2d8474666d8258d8256d DBD-SQLite-1.09.tar.gz +7f22d8789245047343e114e655571022 DBD-SQLite-1.11.tar.gz From fedora-extras-commits at redhat.com Fri Dec 2 20:59:26 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 2 Dec 2005 15:59:26 -0500 Subject: rpms/perl-DBD-SQLite/devel .cvsignore, 1.3, 1.4 perl-DBD-SQLite.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200512022059.jB2KxuQh003443@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-SQLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3370/devel Modified Files: .cvsignore perl-DBD-SQLite.spec sources Log Message: Update to 1.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Jul 2005 17:53:17 -0000 1.3 +++ .cvsignore 2 Dec 2005 20:59:23 -0000 1.4 @@ -1 +1 @@ -DBD-SQLite-1.09.tar.gz +DBD-SQLite-1.11.tar.gz Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-DBD-SQLite.spec 29 Jul 2005 18:22:34 -0000 1.5 +++ perl-DBD-SQLite.spec 2 Dec 2005 20:59:23 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-DBD-SQLite -Version: 1.09 -Release: 2%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries @@ -46,7 +46,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -63,6 +63,12 @@ %changelog +* Fri Dec 2 2005 Jose Pedro Oliveira - 1.11-1 +- Update to 1.11. + +* Fri Dec 2 2005 Jose Pedro Oliveira - 1.10-1 +- Update to 1.10. + * Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-2 - Build requirement added: sqlite-devel. - Doc file added: Changes. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Jul 2005 17:53:17 -0000 1.3 +++ sources 2 Dec 2005 20:59:23 -0000 1.4 @@ -1 +1 @@ -02cde1aba9cc2d8474666d8258d8256d DBD-SQLite-1.09.tar.gz +7f22d8789245047343e114e655571022 DBD-SQLite-1.11.tar.gz From fedora-extras-commits at redhat.com Fri Dec 2 22:48:28 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 2 Dec 2005 17:48:28 -0500 Subject: rpms/check/FC-3 check.spec,1.2,1.3 Message-ID: <200512022248.jB2Mmwho007317@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/check/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7255/FC-3 Modified Files: check.spec Log Message: Fix bz 174313 with -fPIC Index: check.spec =================================================================== RCS file: /cvs/extras/rpms/check/FC-3/check.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- check.spec 17 Sep 2005 13:17:06 -0000 1.2 +++ check.spec 2 Dec 2005 22:48:26 -0000 1.3 @@ -1,6 +1,6 @@ Name: check Version: 0.9.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A unit test framework for C Source0: http://download.sourceforge.net/check/%{name}-%{version}.tar.gz Group: Development/Tools @@ -8,6 +8,7 @@ URL: http://check.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: docbook-utils +Patch0: check-0.9.2-fPIC.patch %description Check is a unit test framework for C. It features a simple interface for @@ -30,6 +31,7 @@ %prep %setup -q +%patch0 -p1 %build %configure @@ -50,6 +52,9 @@ %{_datadir}/aclocal/check.m4 %changelog +* Fri Dec 2 2005 Tom "spot" Callaway 0.9.2-3 +- enabled -fPIC to resolve bz 174313 + * Sat Sep 17 2005 Tom "spot" Callaway 0.9.2-2 - get rid of the so file (not needed) - only make devel package From fedora-extras-commits at redhat.com Fri Dec 2 22:48:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 2 Dec 2005 17:48:34 -0500 Subject: rpms/check/FC-4 check.spec,1.2,1.3 Message-ID: <200512022249.jB2Mn4pe007320@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/check/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7255/FC-4 Modified Files: check.spec Log Message: Fix bz 174313 with -fPIC Index: check.spec =================================================================== RCS file: /cvs/extras/rpms/check/FC-4/check.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- check.spec 17 Sep 2005 13:17:07 -0000 1.2 +++ check.spec 2 Dec 2005 22:48:32 -0000 1.3 @@ -1,6 +1,6 @@ Name: check Version: 0.9.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A unit test framework for C Source0: http://download.sourceforge.net/check/%{name}-%{version}.tar.gz Group: Development/Tools @@ -8,6 +8,7 @@ URL: http://check.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: docbook-utils +Patch0: check-0.9.2-fPIC.patch %description Check is a unit test framework for C. It features a simple interface for @@ -30,6 +31,7 @@ %prep %setup -q +%patch0 -p1 %build %configure @@ -50,6 +52,9 @@ %{_datadir}/aclocal/check.m4 %changelog +* Fri Dec 2 2005 Tom "spot" Callaway 0.9.2-3 +- enabled -fPIC to resolve bz 174313 + * Sat Sep 17 2005 Tom "spot" Callaway 0.9.2-2 - get rid of the so file (not needed) - only make devel package From fedora-extras-commits at redhat.com Fri Dec 2 22:48:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 2 Dec 2005 17:48:39 -0500 Subject: rpms/check/devel check.spec,1.2,1.3 Message-ID: <200512022249.jB2Mn9CK007323@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/check/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7255/devel Modified Files: check.spec Log Message: Fix bz 174313 with -fPIC Index: check.spec =================================================================== RCS file: /cvs/extras/rpms/check/devel/check.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- check.spec 17 Sep 2005 13:17:13 -0000 1.2 +++ check.spec 2 Dec 2005 22:48:37 -0000 1.3 @@ -1,6 +1,6 @@ Name: check Version: 0.9.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A unit test framework for C Source0: http://download.sourceforge.net/check/%{name}-%{version}.tar.gz Group: Development/Tools @@ -8,6 +8,7 @@ URL: http://check.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: docbook-utils +Patch0: check-0.9.2-fPIC.patch %description Check is a unit test framework for C. It features a simple interface for @@ -30,6 +31,7 @@ %prep %setup -q +%patch0 -p1 %build %configure @@ -50,6 +52,9 @@ %{_datadir}/aclocal/check.m4 %changelog +* Fri Dec 2 2005 Tom "spot" Callaway 0.9.2-3 +- enabled -fPIC to resolve bz 174313 + * Sat Sep 17 2005 Tom "spot" Callaway 0.9.2-2 - get rid of the so file (not needed) - only make devel package From fedora-extras-commits at redhat.com Fri Dec 2 22:58:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 2 Dec 2005 17:58:26 -0500 Subject: rpms/gambas/FC-3 gambas.spec,1.10,1.11 Message-ID: <200512022258.jB2MwunL007528@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7471/FC-3 Modified Files: gambas.spec Log Message: Fix description to resolve bz 173998 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/gambas.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gambas.spec 18 Nov 2005 16:37:20 -0000 1.10 +++ gambas.spec 2 Dec 2005 22:58:24 -0000 1.11 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.13 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -36,14 +36,10 @@ Provides: %{name} = %{version}-%{release} Obsoletes: %{name} - %description runtime Gambas is a free development environment based on a Basic interpreter -with object extensions, like Visual Basic (but it is NOT a clone !). -With Gambas, you can quickly design your program GUI, access MySQL or -PostgreSQL databases, pilot KDE applications with DCOP, translate your -program into many languages, create network applications easily, and so -on... +with object extensions, like Visual Basic. This package contains the +runtime components necessary to run programs designed in gambas. %package ide Summary: Development environment for gambas @@ -71,8 +67,10 @@ Provides: %{name}-examples = %{version}-%{release} %description ide -The gambas-runtime package contains the complete Gambas Development -Environment, with the database manager, the help files, and all components. +The gambas-ide package contains the complete Gambas Development +Environment, with the database manager, the help files, and all +components. This is what you want to install if you want to +create new programs with Gambas. %package gb-compress Summary: Gambas component package for net @@ -414,6 +412,9 @@ %{_datadir}/gambas/info/gb.xml.libxml.xslt.* %changelog +* Fri Dec 2 2005 Tom "spot" Callaway 1.0.13-3 +- fix description to resolve bugzilla 173998 + * Fri Nov 18 2005 Tom "spot" Callaway 1.0.13-2 - BR: curl-devel, SDL_mixer-devel From fedora-extras-commits at redhat.com Fri Dec 2 22:58:31 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 2 Dec 2005 17:58:31 -0500 Subject: rpms/gambas/FC-4 gambas.spec,1.10,1.11 Message-ID: <200512022259.jB2Mx1BD007531@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7471/FC-4 Modified Files: gambas.spec Log Message: Fix description to resolve bz 173998 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/gambas.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gambas.spec 18 Nov 2005 16:37:25 -0000 1.10 +++ gambas.spec 2 Dec 2005 22:58:29 -0000 1.11 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.13 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -36,14 +36,10 @@ Provides: %{name} = %{version}-%{release} Obsoletes: %{name} - %description runtime Gambas is a free development environment based on a Basic interpreter -with object extensions, like Visual Basic (but it is NOT a clone !). -With Gambas, you can quickly design your program GUI, access MySQL or -PostgreSQL databases, pilot KDE applications with DCOP, translate your -program into many languages, create network applications easily, and so -on... +with object extensions, like Visual Basic. This package contains the +runtime components necessary to run programs designed in gambas. %package ide Summary: Development environment for gambas @@ -71,8 +67,10 @@ Provides: %{name}-examples = %{version}-%{release} %description ide -The gambas-runtime package contains the complete Gambas Development -Environment, with the database manager, the help files, and all components. +The gambas-ide package contains the complete Gambas Development +Environment, with the database manager, the help files, and all +components. This is what you want to install if you want to +create new programs with Gambas. %package gb-compress Summary: Gambas component package for net @@ -414,6 +412,9 @@ %{_datadir}/gambas/info/gb.xml.libxml.xslt.* %changelog +* Fri Dec 2 2005 Tom "spot" Callaway 1.0.13-3 +- fix description to resolve bugzilla 173998 + * Fri Nov 18 2005 Tom "spot" Callaway 1.0.13-2 - BR: curl-devel, SDL_mixer-devel From fedora-extras-commits at redhat.com Fri Dec 2 22:58:37 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 2 Dec 2005 17:58:37 -0500 Subject: rpms/gambas/devel gambas.spec,1.10,1.11 Message-ID: <200512022259.jB2Mx8s5007534@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7471/devel Modified Files: gambas.spec Log Message: Fix description to resolve bz 173998 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gambas.spec 18 Nov 2005 16:37:31 -0000 1.10 +++ gambas.spec 2 Dec 2005 22:58:34 -0000 1.11 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.13 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -36,14 +36,10 @@ Provides: %{name} = %{version}-%{release} Obsoletes: %{name} - %description runtime Gambas is a free development environment based on a Basic interpreter -with object extensions, like Visual Basic (but it is NOT a clone !). -With Gambas, you can quickly design your program GUI, access MySQL or -PostgreSQL databases, pilot KDE applications with DCOP, translate your -program into many languages, create network applications easily, and so -on... +with object extensions, like Visual Basic. This package contains the +runtime components necessary to run programs designed in gambas. %package ide Summary: Development environment for gambas @@ -71,8 +67,10 @@ Provides: %{name}-examples = %{version}-%{release} %description ide -The gambas-runtime package contains the complete Gambas Development -Environment, with the database manager, the help files, and all components. +The gambas-ide package contains the complete Gambas Development +Environment, with the database manager, the help files, and all +components. This is what you want to install if you want to +create new programs with Gambas. %package gb-compress Summary: Gambas component package for net @@ -414,6 +412,9 @@ %{_datadir}/gambas/info/gb.xml.libxml.xslt.* %changelog +* Fri Dec 2 2005 Tom "spot" Callaway 1.0.13-3 +- fix description to resolve bugzilla 173998 + * Fri Nov 18 2005 Tom "spot" Callaway 1.0.13-2 - BR: curl-devel, SDL_mixer-devel From fedora-extras-commits at redhat.com Fri Dec 2 23:08:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 2 Dec 2005 18:08:42 -0500 Subject: common tobuild,1.2236,1.2237 Message-ID: <200512022309.jB2N9CIW009323@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9306 Modified Files: tobuild Log Message: request build of rpms/gambas/FC-3 gambas-1_0_13-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2236 retrieving revision 1.2237 diff -u -r1.2236 -r1.2237 --- tobuild 16 Nov 2005 21:35:14 -0000 1.2236 +++ tobuild 2 Dec 2005 23:08:38 -0000 1.2237 @@ -47,3 +47,4 @@ dwmw2 rpms/exim/devel exim-4_54-4_fc4 devel shahms rpms/bazaar/devel bazaar-1_4_2-3_fc5 devel orion rpms/hdf5/devel hdf5-1_6_4-6_fc5 devel +spot rpms/gambas/FC-3 gambas-1_0_13-3_fc3 fc3 From fedora-extras-commits at redhat.com Fri Dec 2 23:10:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 2 Dec 2005 18:10:39 -0500 Subject: common tobuild,1.2237,1.2238 Message-ID: <200512022311.jB2NB9C5009389@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9350 Modified Files: tobuild Log Message: request build of rpms/gambas/FC-4 gambas-1_0_13-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2237 retrieving revision 1.2238 diff -u -r1.2237 -r1.2238 --- tobuild 2 Dec 2005 23:08:38 -0000 1.2237 +++ tobuild 2 Dec 2005 23:10:16 -0000 1.2238 @@ -48,3 +48,4 @@ shahms rpms/bazaar/devel bazaar-1_4_2-3_fc5 devel orion rpms/hdf5/devel hdf5-1_6_4-6_fc5 devel spot rpms/gambas/FC-3 gambas-1_0_13-3_fc3 fc3 +spot rpms/gambas/FC-4 gambas-1_0_13-3_fc4 fc4 From fedora-extras-commits at redhat.com Fri Dec 2 23:11:20 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 2 Dec 2005 18:11:20 -0500 Subject: common tobuild,1.2238,1.2239 Message-ID: <200512022311.jB2NBotR009424@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9405 Modified Files: tobuild Log Message: request build of rpms/gambas/devel gambas-1_0_13-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2238 retrieving revision 1.2239 diff -u -r1.2238 -r1.2239 --- tobuild 2 Dec 2005 23:10:16 -0000 1.2238 +++ tobuild 2 Dec 2005 23:11:18 -0000 1.2239 @@ -49,3 +49,4 @@ orion rpms/hdf5/devel hdf5-1_6_4-6_fc5 devel spot rpms/gambas/FC-3 gambas-1_0_13-3_fc3 fc3 spot rpms/gambas/FC-4 gambas-1_0_13-3_fc4 fc4 +spot rpms/gambas/devel gambas-1_0_13-3_fc5 devel From fedora-extras-commits at redhat.com Sat Dec 3 00:03:50 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 2 Dec 2005 19:03:50 -0500 Subject: common tobuild,1.2239,1.2240 Message-ID: <200512030004.jB304Sdg011178@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11161 Modified Files: tobuild Log Message: request build of rpms/gambas/FC-3 gambas-1_0_13-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2239 retrieving revision 1.2240 diff -u -r1.2239 -r1.2240 --- tobuild 2 Dec 2005 23:11:18 -0000 1.2239 +++ tobuild 3 Dec 2005 00:03:48 -0000 1.2240 @@ -50,3 +50,4 @@ spot rpms/gambas/FC-3 gambas-1_0_13-3_fc3 fc3 spot rpms/gambas/FC-4 gambas-1_0_13-3_fc4 fc4 spot rpms/gambas/devel gambas-1_0_13-3_fc5 devel +spot rpms/gambas/FC-3 gambas-1_0_13-3_fc3 fc3 From fedora-extras-commits at redhat.com Sat Dec 3 00:05:17 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 2 Dec 2005 19:05:17 -0500 Subject: common tobuild,1.2240,1.2241 Message-ID: <200512030006.jB3067KX011218@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11199 Modified Files: tobuild Log Message: request build of rpms/gambas/FC-4 gambas-1_0_13-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2240 retrieving revision 1.2241 diff -u -r1.2240 -r1.2241 --- tobuild 3 Dec 2005 00:03:48 -0000 1.2240 +++ tobuild 3 Dec 2005 00:05:15 -0000 1.2241 @@ -51,3 +51,4 @@ spot rpms/gambas/FC-4 gambas-1_0_13-3_fc4 fc4 spot rpms/gambas/devel gambas-1_0_13-3_fc5 devel spot rpms/gambas/FC-3 gambas-1_0_13-3_fc3 fc3 +spot rpms/gambas/FC-4 gambas-1_0_13-3_fc4 fc4 From fedora-extras-commits at redhat.com Sat Dec 3 00:07:05 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 2 Dec 2005 19:07:05 -0500 Subject: common tobuild,1.2241,1.2242 Message-ID: <200512030007.jB307tT4011255@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11238 Modified Files: tobuild Log Message: request build of rpms/gambas/devel gambas-1_0_13-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2241 retrieving revision 1.2242 diff -u -r1.2241 -r1.2242 --- tobuild 3 Dec 2005 00:05:15 -0000 1.2241 +++ tobuild 3 Dec 2005 00:07:03 -0000 1.2242 @@ -52,3 +52,4 @@ spot rpms/gambas/devel gambas-1_0_13-3_fc5 devel spot rpms/gambas/FC-3 gambas-1_0_13-3_fc3 fc3 spot rpms/gambas/FC-4 gambas-1_0_13-3_fc4 fc4 +spot rpms/gambas/devel gambas-1_0_13-3_fc5 devel From fedora-extras-commits at redhat.com Sat Dec 3 01:02:59 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 2 Dec 2005 20:02:59 -0500 Subject: rpms/scim-skk/FC-3 gtkComboBox.patch, NONE, 1.1 scim-skk.spec, 1.7, 1.8 Message-ID: <200512030103.jB313UKi013097@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13074 Modified Files: scim-skk.spec Added Files: gtkComboBox.patch Log Message: add a patch for gtk-2.4 gtkComboBox.patch: --- NEW FILE gtkComboBox.patch --- --- src/scim_skk_setup_dictionaries.cpp.orig 2005-11-11 20:07:42.000000000 +0900 +++ src/scim_skk_setup_dictionaries.cpp 2005-12-03 09:56:11.000000000 +0900 @@ -30,6 +30,8 @@ #include "scim_skk_intl.h" +#define gtk_combo_box_get_active_text n_gtk_combo_box_get_active_text + using namespace scim; namespace scim_skk { @@ -91,6 +93,18 @@ static GtkWidget *__combo_box_dict_types = NULL; +// There is no gtk_combo_box_get_active_text for gtk 2.4 + +static const gchar *gtk_combo_box_get_active_text(GtkComboBox *combo) { + gint index = gtk_combo_box_get_active(combo); + if (index != -1) { + return __dict_type_names[index].data(); + } else { + return NULL; + } +} + +// static void file_selection_clicked_cb (GtkButton *button, @@ -123,7 +137,7 @@ dict_type_changed_cb (GtkComboBox *combo, gpointer userdata) { - gchar *typetext = gtk_combo_box_get_active_text(combo); + const gchar *typetext = gtk_combo_box_get_active_text(combo); for (int i = 0; __dict_type_names[i] != ""; i++) { if (__dict_type_names[i] == typetext) { gtk_widget_show_all(__widgets_dicts[i].widget); Index: scim-skk.spec =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim-skk.spec 2 Dec 2005 14:57:18 -0000 1.7 +++ scim-skk.spec 3 Dec 2005 01:02:57 -0000 1.8 @@ -7,6 +7,7 @@ License: GPL URL: http://scim-imengine.sourceforge.jp/ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz +Patch0: gtkComboBox.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: scim skkdic @@ -18,6 +19,7 @@ %prep %setup -q +%patch0 -p0 %build @@ -52,6 +54,7 @@ %changelog * Fri Dec 2 2005 Ryo Dairiki - 0.4.0-1 - update to 0.5.0 +- patch for gtk-2.4; There is no gtk_combo_box_get_active_text for gtk-2.4 * Tue Nov 1 2005 Ryo Diairki - 0.4.0-1 - update to 0.4.0 From fedora-extras-commits at redhat.com Sat Dec 3 14:29:51 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 3 Dec 2005 09:29:51 -0500 Subject: rpms/athcool/FC-4 athcool.spec,1.2,1.3 Message-ID: <200512031430.jB3EULXq004685@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/athcool/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4648/FC-4 Modified Files: athcool.spec Log Message: Fix broken debuginfo package (Ville Skytt??, #174881) Index: athcool.spec =================================================================== RCS file: /cvs/extras/rpms/athcool/FC-4/athcool.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- athcool.spec 11 Aug 2005 08:49:20 -0000 1.2 +++ athcool.spec 3 Dec 2005 14:29:49 -0000 1.3 @@ -1,6 +1,6 @@ Name: athcool Version: 0.3.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Enables/disables Powersaving mode for AMD processors Group: System Environment/Daemons @@ -43,8 +43,11 @@ If you met those problems, you should not use athcool. Please use athcool AT YOUR OWN RISK. + %prep %setup -q +sed -i -e 's/install -s/install/' Makefile + %build make \ @@ -85,7 +88,11 @@ %{_mandir}/man8/%{name}.8* %{_sbindir}/%{name} + %changelog +* Sat Dec 3 2005 Dawid Gajownik - 0.3.11-3 +- Fix broken debuginfo package (Ville Skytt??, #174881) + * Wed Aug 10 2005 Dawid Gajownik - 0.3.11-2 - Correct Summary field. From fedora-extras-commits at redhat.com Sat Dec 3 14:29:57 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 3 Dec 2005 09:29:57 -0500 Subject: rpms/athcool/devel athcool.spec,1.2,1.3 Message-ID: <200512031430.jB3EURdL004693@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/athcool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4648/devel Modified Files: athcool.spec Log Message: Fix broken debuginfo package (Ville Skytt??, #174881) Index: athcool.spec =================================================================== RCS file: /cvs/extras/rpms/athcool/devel/athcool.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- athcool.spec 11 Aug 2005 08:49:20 -0000 1.2 +++ athcool.spec 3 Dec 2005 14:29:55 -0000 1.3 @@ -1,6 +1,6 @@ Name: athcool Version: 0.3.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Enables/disables Powersaving mode for AMD processors Group: System Environment/Daemons @@ -43,8 +43,11 @@ If you met those problems, you should not use athcool. Please use athcool AT YOUR OWN RISK. + %prep %setup -q +sed -i -e 's/install -s/install/' Makefile + %build make \ @@ -85,7 +88,11 @@ %{_mandir}/man8/%{name}.8* %{_sbindir}/%{name} + %changelog +* Sat Dec 3 2005 Dawid Gajownik - 0.3.11-3 +- Fix broken debuginfo package (Ville Skytt??, #174881) + * Wed Aug 10 2005 Dawid Gajownik - 0.3.11-2 - Correct Summary field. From fedora-extras-commits at redhat.com Sun Dec 4 02:56:15 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sat, 3 Dec 2005 21:56:15 -0500 Subject: rpms/python-kid/FC-4 .cvsignore, 1.6, 1.7 python-kid.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200512040256.jB42ujVf025926@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25885/FC-4 Modified Files: .cvsignore python-kid.spec sources Log Message: Version 0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Nov 2005 01:50:37 -0000 1.6 +++ .cvsignore 4 Dec 2005 02:56:13 -0000 1.7 @@ -1,2 +1,2 @@ -kid-0.7.1.tar.gz -kid-0.7.1-setuptools.patch +kid-0.8.tar.gz +kid-0.8-setuptools.patch Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-4/python-kid.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-kid.spec 12 Nov 2005 01:50:37 -0000 1.5 +++ python-kid.spec 4 Dec 2005 02:56:13 -0000 1.6 @@ -1,15 +1,15 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-kid -Version: 0.7.1 -Release: 2%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing License: MIT URL: http://www.lesscode.org/projects/kid Source0: http://lesscode.org/dist/kid/kid-%{version}.tar.gz -Patch0: kid-0.7.1-setuptools.patch +Patch0: kid-0.8-setuptools.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -54,6 +54,9 @@ %changelog +* Fri Dec 02 2005 Konstantin Ryabitsev - 0.8-1 +- Version 0.8 + * Fri Nov 11 2005 Konstantin Ryabitsev - 0.7.1-2 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Nov 2005 01:50:37 -0000 1.6 +++ sources 4 Dec 2005 02:56:13 -0000 1.7 @@ -1,2 +1,2 @@ -9e8bdad66c964655a7ab0b84969444f3 kid-0.7.1.tar.gz -3f5a5f0452c9862adb8739b16ab0349e kid-0.7.1-setuptools.patch +3ebc1df08ceb636fb5102fc3a1f6448e kid-0.8.tar.gz +ac863126ee6df21bd1f5e95210cef018 kid-0.8-setuptools.patch From fedora-extras-commits at redhat.com Sun Dec 4 02:56:20 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sat, 3 Dec 2005 21:56:20 -0500 Subject: rpms/python-kid/devel .cvsignore, 1.6, 1.7 python-kid.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200512040256.jB42uqXC025931@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25885/devel Modified Files: .cvsignore python-kid.spec sources Log Message: Version 0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-kid/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Nov 2005 01:49:17 -0000 1.6 +++ .cvsignore 4 Dec 2005 02:56:18 -0000 1.7 @@ -1,2 +1,2 @@ -kid-0.7.1.tar.gz -kid-0.7.1-setuptools.patch +kid-0.8.tar.gz +kid-0.8-setuptools.patch Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/devel/python-kid.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-kid.spec 12 Nov 2005 01:49:17 -0000 1.5 +++ python-kid.spec 4 Dec 2005 02:56:18 -0000 1.6 @@ -1,15 +1,15 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-kid -Version: 0.7.1 -Release: 2%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing License: MIT URL: http://www.lesscode.org/projects/kid Source0: http://lesscode.org/dist/kid/kid-%{version}.tar.gz -Patch0: kid-0.7.1-setuptools.patch +Patch0: kid-0.8-setuptools.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -54,6 +54,9 @@ %changelog +* Fri Dec 02 2005 Konstantin Ryabitsev - 0.8-1 +- Version 0.8 + * Fri Nov 11 2005 Konstantin Ryabitsev - 0.7.1-2 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-kid/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Nov 2005 01:49:17 -0000 1.6 +++ sources 4 Dec 2005 02:56:18 -0000 1.7 @@ -1,2 +1,2 @@ -9e8bdad66c964655a7ab0b84969444f3 kid-0.7.1.tar.gz -3f5a5f0452c9862adb8739b16ab0349e kid-0.7.1-setuptools.patch +3ebc1df08ceb636fb5102fc3a1f6448e kid-0.8.tar.gz +ac863126ee6df21bd1f5e95210cef018 kid-0.8-setuptools.patch From fedora-extras-commits at redhat.com Sun Dec 4 04:29:36 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 3 Dec 2005 23:29:36 -0500 Subject: rpms/krecipes/devel krecipes.spec,1.6,1.7 Message-ID: <200512040430.jB44U6Rk029340@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29323 Modified Files: krecipes.spec Log Message: Fixes for BR and new patch Index: krecipes.spec =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/krecipes.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- krecipes.spec 1 Dec 2005 04:07:18 -0000 1.6 +++ krecipes.spec 4 Dec 2005 04:29:34 -0000 1.7 @@ -1,6 +1,6 @@ Name: krecipes Version: 0.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Application to manage recipes and shopping-lists Group: Applications/Productivity @@ -9,10 +9,11 @@ Source0: http://download.sourceforge.net/krecipes/krecipes-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel > 3.1, sqlite-devel, desktop-file-utils +BuildRequires: kdelibs-devel > 3.1, sqlite-devel, desktop-file-utils, libacl-devel Requires: kdebase >= 3.1 patch0: krecipes-gcc4.patch +patch1: krecipes-X11.patch %description Krecipes is a program that lets you to manage your recipes, create @@ -23,6 +24,10 @@ %prep %setup -q %patch0 -p1 -b .gcc4 +# autoconf tools check for X is a file in libXt-devel and Xt lib +# we dont use or link against libXt so rather than adding an extra +# BuildRequires I patched configure to look for something thats there +%patch1 -p1 -b .X11 %build @@ -81,9 +86,11 @@ %{_datadir}/mimelnk/*/*.desktop %changelog -* Wed Nov 11 2005 Dennis Gilmore - 0.9-2 +* Sat Dec 03 2005 Dennis Gilmore - 0.9-3 +- fix BuildRequies for libacl and add patch for X check. +* Wed Nov 30 2005 Dennis Gilmore - 0.9-2 - fix missing files -* Wed Nov 11 2005 Dennis Gilmore - 0.9-1 +* Wed Nov 30 2005 Dennis Gilmore - 0.9-1 - update to 0.9 * Sat Oct 20 2005 Dennis Gilmore - 0.8.1-3%{?dist} - add BuildRequires desktop-file-utils http://fedoraproject.org/wiki/QAChecklist From fedora-extras-commits at redhat.com Sun Dec 4 04:32:48 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 3 Dec 2005 23:32:48 -0500 Subject: rpms/krecipes/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200512040433.jB44XIT9029372@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29353 Modified Files: .cvsignore sources Log Message: upload patch to change X check Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Dec 2005 03:39:04 -0000 1.3 +++ .cvsignore 4 Dec 2005 04:32:46 -0000 1.4 @@ -1 +1,2 @@ krecipes-0.9.tar.gz +krecipes-X11.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Dec 2005 03:39:04 -0000 1.3 +++ sources 4 Dec 2005 04:32:46 -0000 1.4 @@ -1 +1,2 @@ ee1a1463946c63788ff8eeea302a7506 krecipes-0.9.tar.gz +67e68fc70f7ff67235a7a36affa7af6d krecipes-X11.patch From fedora-extras-commits at redhat.com Sun Dec 4 09:39:26 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 4 Dec 2005 04:39:26 -0500 Subject: rpms/liferea/devel liferea.spec,1.22,1.23 Message-ID: <200512040939.jB49dusN009278@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9257 Modified Files: liferea.spec Log Message: * Sun Dec 04 2005 Luke Macken - 1.0-0.3.rc4 - Rebuild against dbus 0.60 Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- liferea.spec 19 Nov 2005 01:04:12 -0000 1.22 +++ liferea.spec 4 Dec 2005 09:39:23 -0000 1.23 @@ -2,7 +2,7 @@ Name: liferea Version: 1.0 -Release: 0.2.rc4%{?dist} +Release: 0.3.rc4%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -92,6 +92,9 @@ %changelog +* Sun Dec 04 2005 Luke Macken - 1.0-0.3.rc4 +- Rebuild against dbus 0.60 + * Fri Nov 18 2005 Brian Pepple - 1.0-0.2.rc4 - Update tp 1.0-RC4. From fedora-extras-commits at redhat.com Sun Dec 4 11:28:44 2005 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Dec 2005 06:28:44 -0500 Subject: rpms/initng - New directory Message-ID: <200512041128.jB4BSifh012674@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12665/initng Log Message: Directory /cvs/extras/rpms/initng added to the repository From fedora-extras-commits at redhat.com Sun Dec 4 11:28:49 2005 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Dec 2005 06:28:49 -0500 Subject: rpms/initng/devel - New directory Message-ID: <200512041128.jB4BSnPx012689@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12665/initng/devel Log Message: Directory /cvs/extras/rpms/initng/devel added to the repository From fedora-extras-commits at redhat.com Sun Dec 4 11:29:06 2005 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Dec 2005 06:29:06 -0500 Subject: rpms/initng Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200512041129.jB4BT6oE012727@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12714 Added Files: Makefile import.log Log Message: Setup of module initng --- NEW FILE Makefile --- # Top level Makefile for module initng all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Dec 4 11:29:12 2005 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Dec 2005 06:29:12 -0500 Subject: rpms/initng/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200512041129.jB4BTChJ012747@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12714/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module initng --- NEW 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 Dec 4 11:30:15 2005 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Dec 2005 06:30:15 -0500 Subject: rpms/initng import.log,1.1,1.2 Message-ID: <200512041130.jB4BUjcC012835@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12797 Modified Files: import.log Log Message: auto-import initng-0.4.7-1 on branch devel from initng-0.4.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/initng/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Dec 2005 11:29:04 -0000 1.1 +++ import.log 4 Dec 2005 11:30:13 -0000 1.2 @@ -0,0 +1 @@ +initng-0_4_7-1:HEAD:initng-0.4.7-1.src.rpm:1133695804 From fedora-extras-commits at redhat.com Sun Dec 4 11:30:20 2005 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Dec 2005 06:30:20 -0500 Subject: rpms/initng/devel initng.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200512041130.jB4BUK7k012828@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12797/devel Modified Files: .cvsignore sources Added Files: initng.spec Log Message: auto-import initng-0.4.7-1 on branch devel from initng-0.4.7-1.src.rpm --- NEW FILE initng.spec --- Summary: Programs which control basic system processes Name: initng Version: 0.4.7 Release: 1%{?dist} License: GPL URL: http://initng.thinktux.net Group: System Environment/Base Source0: http://initng.thinktux.net/download/v0.4/initng-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: filesystem >= 2.2.4-1 %description Initng is a full replacement of the old and in many ways deprecated sysvinit tool. It is designed with speed in mind, doing as much as possible asynchronously. In other words: It will boot your unix-system much faster, and give you more control and statistics over your system. %package ifplugd Summary: Ifplugd support for initng Group: System Environment/Base Requires: %{name} = %{version} Requires: ifplugd %description ifplugd This package contains the files needed to add ifplugd support to initng. When an interface is plugged or unplugged, the networking will be restarted appropriately. %prep %setup -q %build %configure --libdir=/%{_lib} --sbindir=/sbin --disable-rpath make %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install rm -rf %{buildroot}/%{_sysconfdir}/hotplug/net.agent rm -rf %{buildroot}/sbin/killall5 rm -rf %{buildroot}/%{_sysconfdir}/pcmcia/network rm -rf %{buildroot}/%{_sysconfdir}/initng/system.runlevel rm -rf %{buildroot}/%{_sysconfdir}/initng/default.runlevel mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version} mv %{buildroot}%{_datadir}/doc/initng/* %{buildroot}/%{_docdir}/%{name}-%{version}/ cp -a COPYING AUTHORS CODING_STANDARDS FAQ NEWS README TODO \ %{buildroot}/%{_docdir}/%{name}-%{version}/ mv %{buildroot}%{_sbindir}/* %{buildroot}/sbin/ %post if [ $1 = 1 -a -f /boot/grub/grub.conf -a -x /sbin/grubby ]; then grep initng /boot/grub/grub.conf >/dev/null if [ $? -ne 0 ]; then cp /boot/grub/grub.conf /boot/grub/grub.conf.bak defaultkpath=`grubby --default-kernel` defaultinitrd=`grubby --info=$defaultkpath | grep initrd` grubby --add-kernel=$defaultkpath --copy-default --args="init=/sbin/initng" --title="initng boot" --$defaultinitrd fi fi if [ ! -f /%{_sysconfdir}/initng/system.runlevel ] && [ ! -f /%{_sysconfdir}/initng/default.runlevel ]; then /sbin/gen_system_runlevel >/dev/null 2>&1 || : fi /sbin/ldconfig exit 0 %clean rm -rf %{buildroot} %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc %{_docdir}/%{name}-%{version} %config(noreplace) %{_sysconfdir}/initng /sbin/system_off /sbin/ng-update /sbin/killalli5 /sbin/initng /sbin/ngc /sbin/ngdc /sbin/install_service /sbin/gen_system_runlevel /sbin/shutdown_script /sbin/ngcupdown /sbin/wpa_cli.action /sbin/initng-segfault /%{_lib}/libinitng.* /%{_lib}/initng %{_mandir}/*/* %files ifplugd %defattr(-,root,root) %{_sysconfdir}/ifplugd/action.d/ngcupdown /sbin/ifplugd.action %changelog * Thu Dec 01 2005 Daniel Malmgren 0.4.7-1 - New upstream version * Tue Nov 29 2005 Daniel Malmgren 0.4.6-2 - Some really small changes * Tue Nov 29 2005 Daniel Malmgren 0.4.6-1 - New upstream version - Fixes to gen_system_runlevel is now upstreams, skip our patch and my own ugly script - Don't ship runlevel files, generate them in %post instead * Mon Nov 28 2005 Daniel Malmgren 0.4.4-7 - Split out the default services script from spec file - Remove glibc and bash dependencies - Remove mkinitrd dependencies, check if grubby exists in %post instead * Sun Nov 27 2005 Daniel Malmgren 0.4.4-6 - added crude functionaly for enabling the same services that are enabled in SysVinit * Tue Nov 22 2005 Aurelien Bompard 0.4.4-5 - split ifplugd support in a separate package * Tue Nov 22 2005 Daniel Malmgren 0.4.4-4 - Some really small fixes here and there * Tue Nov 22 2005 Aurelien Bompard 0.4.4-3 - fix docs dir - remove define _prefix / (commenting it is not enough) - depend on ifplugd * Tue Nov 22 2005 Daniel Malmgren - 0.4.4-2 - Don't depend on SysVinit anymore. Only reason for that was that we needed killall5, but we have our own killalli5 now - remove _prefix /, shouldn't be needed anymore, right? - Hopefully fixed the location of the installed docfiles * Sun Nov 20 2005 Daniel Malmgren - 0.4.4-1 - New upstream version - Fixed rpath problems - Renamed default_runlevels.patch to initng-default-runlevel.patch - Small fixes in the %files - Added /sbin/killalli5 * Fri Nov 18 2005 Daniel Malmgren - 0.4.0-7 - Ship more %doc files * Fri Nov 18 2005 Daniel Malmgren - 0.4.0-6 - Run ldconfig on updates as well - Don't ship /etc/pcmcia/network which conflicts with pcmcia-cs package - Remove fedora-release build requirement - Changed all occurences of /lib into %{_lib} * Thu Nov 17 2005 Chris Chabot - 0.4.0-5 - Added ldconfig to post and postrun - reconstructed patch from bug #173459 and enabled in spec file * Thu Nov 17 2005 Daniel Malmgren - 0.4.0-4 - Removed all echos from %post - Changed "-disable-rpath" to "--disable-rpath" (which however doesn't seem to work anyway) * Thu Nov 17 2005 Chris Chabot - 0.4.0-3 - Cleaned up '-' in changelog - New upstream version - Modified Source to Source0, and changed to download URL - Changed BuildRoot to fedora adviced/standard format - Changed setup to setup -q - Modified to use {_sysconfdir} and {_datadir} - Temporary disabled %Patch0, not included in source & can't find in download dir - added if [ $1 = 1 ] to %post * Tue Nov 08 2005 Daniel Malmgren - 0.4.0-2 - Ok, I'll stop playing with dependencies. Glibc requirements now just 2.3. * Tue Nov 08 2005 Daniel Malmgren - 0.4.0-1 - New upstream version * Sat Nov 05 2005 Daniel Malmgren - 0.3.5-2 - Added %post script using Grubby to add initng to grub.conf if it's not already there * Sat Nov 05 2005 Daniel Malmgren - 0.3.5-1 - New upstream version - Changes to which services are in default runlevel * Sun Oct 30 2005 Daniel Malmgren - 0.3.4-1 - New upstream version - Don't install the killall5 program which conflicts with SysVinit * Sun Oct 16 2005 Daniel Malmgren - 0.3.3-1 - New upstream version - Refined the %files-section a bit * Tue Oct 11 2005 Daniel Malmgren - 0.3.2-2 - Changes to try to make package compatible with Fedora guidelines * Sun Oct 09 2005 Daniel Malmgren - 0.3.2-1 - New upstream version - Added /sbin/initng-segfault * Sat Oct 08 2005 Daniel Malmgren - 0.3.1-1 - New upstream version * Tue Sep 27 2005 Daniel Malmgren - 0.3.0-1 - New upstream version * Tue Sep 27 2005 Daniel Malmgren - 0.2.5-1 - New upstream version - Fix the coldplug issue properly * Fri Sep 23 2005 Daniel Malmgren - 0.2.3-1 - New upstream version * Mon Sep 05 2005 Daniel Malmgren - 0.2.0-1 - New upstream version - Fix files that appeared/disappeared in this version - Install doc files at the correct location * Sat Aug 27 2005 Daniel Malmgren - 0.1.9-1 - New upstream version - Removed /etc/initng/conf and /etc/initng/plugin from installation - Added new files /sbin/shutdown_script and /sbin/test_pidfile - Remove xfs again, as I can't seem to get it working right anyway * Sun Aug 14 2005 Daniel Malmgren - 0.1.8-2 - Removed /etc/hotplug/net.agent which conflicts with hotplug package - Add xfs to default runlevel * Sun Aug 14 2005 Daniel Malmgren - 0.1.8-1 - New upstream version - Rename gen_system_runlevel.sh to gen_system_runlevel * Sun Aug 07 2005 Daniel Malmgren > - 0.1.7-1 - First spec that really creates a rpm. Use at own risk! Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/initng/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Dec 2005 11:29:10 -0000 1.1 +++ .cvsignore 4 Dec 2005 11:30:18 -0000 1.2 @@ -0,0 +1 @@ +initng-0.4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/initng/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Dec 2005 11:29:10 -0000 1.1 +++ sources 4 Dec 2005 11:30:18 -0000 1.2 @@ -0,0 +1 @@ +1801fe5e4643b7b9f12492475fc8ebb6 initng-0.4.7.tar.gz From fedora-extras-commits at redhat.com Sun Dec 4 11:35:01 2005 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Dec 2005 06:35:01 -0500 Subject: owners owners.list,1.431,1.432 Message-ID: <200512041135.jB4BZVA8012894@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12875/owners Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.431 retrieving revision 1.432 diff -u -r1.431 -r1.432 --- owners.list 2 Dec 2005 16:27:51 -0000 1.431 +++ owners.list 4 Dec 2005 11:34:58 -0000 1.432 @@ -385,6 +385,7 @@ Fedora Extras|iiimf-le-simplehangul|Romanized Korean Hangul language engine for IIIMF|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| +Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org| Fedora Extras|inkscape|A vector-based drawing program using SVG|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Dec 4 11:41:03 2005 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Dec 2005 06:41:03 -0500 Subject: rpms/initng/devel initng.spec,1.1,1.2 Message-ID: <200512041141.jB4BfXv1012955@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12938 Modified Files: initng.spec Log Message: Index: initng.spec =================================================================== RCS file: /cvs/extras/rpms/initng/devel/initng.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- initng.spec 4 Dec 2005 11:30:18 -0000 1.1 +++ initng.spec 4 Dec 2005 11:41:01 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Programs which control basic system processes Name: initng Version: 0.4.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://initng.thinktux.net Group: System Environment/Base @@ -53,6 +53,10 @@ if [ $? -ne 0 ]; then cp /boot/grub/grub.conf /boot/grub/grub.conf.bak defaultkpath=`grubby --default-kernel` + if test -n $defaultkpath && test -f "/boot/vmlinuz-"`uname -r` + then + defaultkpath="/boot/vmlinuz-"`uname -r` + fi defaultinitrd=`grubby --info=$defaultkpath | grep initrd` grubby --add-kernel=$defaultkpath --copy-default --args="init=/sbin/initng" --title="initng boot" --$defaultinitrd fi @@ -94,6 +98,9 @@ /sbin/ifplugd.action %changelog +* Sun Dec 04 2005 Adel Gadllah 0.4.7-2 +- Fixed case where default entry in grub is not a linuxkernel + * Thu Dec 01 2005 Daniel Malmgren 0.4.7-1 - New upstream version From fedora-extras-commits at redhat.com Sun Dec 4 11:45:09 2005 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Dec 2005 06:45:09 -0500 Subject: rpms/initng/devel initng.spec,1.2,1.3 Message-ID: <200512041145.jB4Bjd4c013017@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12998 Modified Files: initng.spec Log Message: Index: initng.spec =================================================================== RCS file: /cvs/extras/rpms/initng/devel/initng.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- initng.spec 4 Dec 2005 11:41:01 -0000 1.2 +++ initng.spec 4 Dec 2005 11:45:07 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Programs which control basic system processes Name: initng Version: 0.4.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://initng.thinktux.net Group: System Environment/Base @@ -98,6 +98,9 @@ /sbin/ifplugd.action %changelog +* Sun Dec 04 2005 Daniel Malmgren 0.4.7-3 +- First version released to Fedora extras + * Sun Dec 04 2005 Adel Gadllah 0.4.7-2 - Fixed case where default entry in grub is not a linuxkernel From fedora-extras-commits at redhat.com Sun Dec 4 11:55:30 2005 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Sun, 4 Dec 2005 06:55:30 -0500 Subject: rpms/balsa/devel .cvsignore, 1.7, 1.8 balsa.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200512041156.jB4Bu0x9013097@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/balsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13076 Modified Files: .cvsignore balsa.spec sources Log Message: upload 2.3.7. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 23 Oct 2005 19:55:11 -0000 1.7 +++ .cvsignore 4 Dec 2005 11:55:28 -0000 1.8 @@ -1,2 +1,2 @@ -gmime-2.1.14.tar.bz2 -balsa-2.3.6.tar.bz2 +gmime-2.1.17.tar.bz2 +balsa-2.3.7.tar.bz2 Index: balsa.spec =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- balsa.spec 23 Oct 2005 19:55:11 -0000 1.10 +++ balsa.spec 4 Dec 2005 11:55:28 -0000 1.11 @@ -1,8 +1,8 @@ -%define gmimever 2.1.14 +%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 Name: balsa -Version: 2.3.6 +Version: 2.3.7 Release: 1%{?dist} Summary: Mail Client @@ -102,6 +102,9 @@ %changelog +* Sun Dec 4 2005 Pawel Salek - 2.3.7-1 +- update to upstream version 2.3.7. Use gmime-2.1.17 + * Wed Oct 23 2005 Pawel Salek - 2.3.6-1 - update to upstream version 2.3.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 23 Oct 2005 19:55:11 -0000 1.7 +++ sources 4 Dec 2005 11:55:28 -0000 1.8 @@ -1,2 +1,2 @@ -ee1c2d0c1f76ae113f0dd70893bbacf4 gmime-2.1.14.tar.bz2 -5a90dce6a7942e02dacb1e69872d6ea2 balsa-2.3.6.tar.bz2 +4be55ee55e4b3966bd51fadbf5fb323b gmime-2.1.17.tar.bz2 +d50a439a8b8c2be99e3b0108d5d6073e balsa-2.3.7.tar.bz2 From fedora-extras-commits at redhat.com Sun Dec 4 12:02:35 2005 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Sun, 4 Dec 2005 07:02:35 -0500 Subject: common tobuild,1.2242,1.2243 Message-ID: <200512041203.jB4C35eq014723@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14706 Modified Files: tobuild Log Message: request build of rpms/balsa/devel balsa-2_3_7-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2242 retrieving revision 1.2243 diff -u -r1.2242 -r1.2243 --- tobuild 3 Dec 2005 00:07:03 -0000 1.2242 +++ tobuild 4 Dec 2005 12:02:32 -0000 1.2243 @@ -53,3 +53,4 @@ spot rpms/gambas/FC-3 gambas-1_0_13-3_fc3 fc3 spot rpms/gambas/FC-4 gambas-1_0_13-3_fc4 fc4 spot rpms/gambas/devel gambas-1_0_13-3_fc5 devel +pawsa rpms/balsa/devel balsa-2_3_7-1_fc5 devel From fedora-extras-commits at redhat.com Sun Dec 4 12:12:09 2005 From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm)) Date: Sun, 4 Dec 2005 07:12:09 -0500 Subject: rpms/initng/devel initng.spec,1.3,1.4 Message-ID: <200512041212.jB4CCdqi014796@cvs-int.fedora.redhat.com> Author: danielm Update of /cvs/extras/rpms/initng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14779 Modified Files: initng.spec Log Message: Index: initng.spec =================================================================== RCS file: /cvs/extras/rpms/initng/devel/initng.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- initng.spec 4 Dec 2005 11:45:07 -0000 1.3 +++ initng.spec 4 Dec 2005 12:12:07 -0000 1.4 @@ -1,13 +1,14 @@ Summary: Programs which control basic system processes Name: initng Version: 0.4.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL URL: http://initng.thinktux.net Group: System Environment/Base Source0: http://initng.thinktux.net/download/v0.4/initng-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: filesystem >= 2.2.4-1 +BuildRequires: device-mapper >= 1.01 %description Initng is a full replacement of the old and in many ways deprecated sysvinit @@ -98,6 +99,9 @@ /sbin/ifplugd.action %changelog +* Sun Dec 04 2005 Daniel Malmgren 0.4.7-4 +- Add build requirement on device-mapper, see if this helps building on x86_64... + * Sun Dec 04 2005 Daniel Malmgren 0.4.7-3 - First version released to Fedora extras From fedora-extras-commits at redhat.com Sun Dec 4 12:37:03 2005 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Sun, 4 Dec 2005 07:37:03 -0500 Subject: rpms/libesmtp/FC-4 .cvsignore, 1.2, 1.3 libesmtp.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200512041237.jB4CbXgw014921@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/libesmtp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14900 Modified Files: .cvsignore libesmtp.spec sources Log Message: - fix #173332 following Patrice Dumas's patches. - fix crashes on certificates with subjectAltName extension. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libesmtp/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Jun 2005 21:08:03 -0000 1.2 +++ .cvsignore 4 Dec 2005 12:37:01 -0000 1.3 @@ -1 +1,3 @@ libesmtp-1.0.3r1.tar.bz2 +libesmtp-ssl.patch +COPYING.LGPL Index: libesmtp.spec =================================================================== RCS file: /cvs/extras/rpms/libesmtp/FC-4/libesmtp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libesmtp.spec 12 Jun 2005 21:08:03 -0000 1.1 +++ libesmtp.spec 4 Dec 2005 12:37:01 -0000 1.2 @@ -3,11 +3,13 @@ Summary: SMTP client library Name: libesmtp Version: 1.0.3r1 -Release: 3 +Release: 4 License: LGPL Group: System Environment/Libraries Source: http://www.stafford.uklinux.net/libesmtp/%{name}-%{version}.tar.bz2 +Source1: COPYING.LGPL Patch1: libesmtp-build.patch +Patch2: libesmtp-ssl.patch URL: http://www.stafford.uklinux.net/libesmtp/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel pkgconfig automake libtool @@ -22,7 +24,8 @@ %package devel Summary: Headers and development libraries for libESMTP Group: Development/Libraries -Requires: %{name} = %{version} +License: LGPL/GPL +Requires: %{name} = %{version}-%{release}, openssl-devel %description devel LibESMTP is a library to manage posting (or submission of) electronic @@ -35,6 +38,8 @@ %prep %setup -q %patch1 -p1 -b .build +%patch2 -p1 -b .ssl +cp %{SOURCE1} . %build #we run auto* because the distributed configure script is inferior. @@ -52,7 +57,7 @@ %configure --with-auth-plugin-dir=%{plugindir} --enable-pthreads \ --enable-require-all-recipients --enable-debug \ --enable-etrn -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -68,19 +73,24 @@ %postun -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc AUTHORS COPYING COPYING.GPL NEWS Notes README +%defattr(-,root,root,-) +%doc AUTHORS COPYING.LGPL NEWS Notes README %{_libdir}/libesmtp.so.* %{plugindir} %files devel -%defattr(-,root,root) +%defattr(-,root,root,-) +%doc examples COPYING.GPL %{_bindir}/libesmtp-config %{_prefix}/include/* %{_libdir}/libesmtp.so %{_libdir}/libesmtp.a %changelog +* Sun Dec 4 2005 Pawel Salek - 1.0.3r1-4 +- fix #173332 following Patrice Dumas's patches. +- fix crashes on certificates with subjectAltName extension. + * Sun Jun 12 2005 Pawel Salek - 1.0.3r1-3 - Add libesmtp-build.patch - fix building under FC4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libesmtp/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Jun 2005 21:08:03 -0000 1.2 +++ sources 4 Dec 2005 12:37:01 -0000 1.3 @@ -1 +1,3 @@ c07aa79293aa36298626fe5e68d6bfba libesmtp-1.0.3r1.tar.bz2 +f018f16cbebc56490d2c3c18a23d3113 libesmtp-ssl.patch +a6f89e2100d9b6cdffcea4f398e37343 COPYING.LGPL From fedora-extras-commits at redhat.com Sun Dec 4 12:45:58 2005 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Sun, 4 Dec 2005 07:45:58 -0500 Subject: rpms/libesmtp/devel .cvsignore, 1.3, 1.4 libesmtp.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200512041246.jB4CkSC9015000@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/libesmtp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14973 Modified Files: .cvsignore libesmtp.spec sources Log Message: - Fix bug 173332 completely, including licence issues. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libesmtp/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Oct 2005 19:07:25 -0000 1.3 +++ .cvsignore 4 Dec 2005 12:45:56 -0000 1.4 @@ -1,2 +1,3 @@ libesmtp-1.0.3r1.tar.bz2 libesmtp-ssl.patch +COPYING.LGPL Index: libesmtp.spec =================================================================== RCS file: /cvs/extras/rpms/libesmtp/devel/libesmtp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libesmtp.spec 17 Nov 2005 21:03:45 -0000 1.4 +++ libesmtp.spec 4 Dec 2005 12:45:56 -0000 1.5 @@ -3,10 +3,11 @@ Summary: SMTP client library Name: libesmtp Version: 1.0.3r1 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPL Group: System Environment/Libraries Source: http://www.stafford.uklinux.net/libesmtp/%{name}-%{version}.tar.bz2 +Source1: COPYING.LGPL Patch1: libesmtp-build.patch Patch2: libesmtp-ssl.patch URL: http://www.stafford.uklinux.net/libesmtp/ @@ -23,6 +24,7 @@ %package devel Summary: Headers and development libraries for libESMTP Group: Development/Libraries +License: LGPL/GPL Requires: %{name} = %{version}-%{release}, openssl-devel %description devel @@ -37,6 +39,7 @@ %setup -q %patch1 -p1 -b .build %patch2 -p1 -b .ssl +cp %{SOURCE1} . %build #we run auto* because the distributed configure script is inferior. @@ -54,7 +57,7 @@ %configure --with-auth-plugin-dir=%{plugindir} --enable-pthreads \ --enable-require-all-recipients --enable-debug \ --enable-etrn -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -70,19 +73,23 @@ %postun -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc AUTHORS COPYING COPYING.GPL NEWS Notes README +%defattr(-,root,root,-) +%doc AUTHORS COPYING.LGPL NEWS Notes README %{_libdir}/libesmtp.so.* %{plugindir} %files devel -%defattr(-,root,root) +%defattr(-,root,root,-) +%doc examples COPYING.GPL %{_bindir}/libesmtp-config %{_prefix}/include/* %{_libdir}/libesmtp.so %{_libdir}/libesmtp.a %changelog +* Sun Dec 4 2005 Pawel Salek - 1.0.3r1-7 +- Fix bug 173332 completely, including licence issues. + * Thu Nov 17 2005 Pawel Salek - 1.0.3r1-6 - fix #173332. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libesmtp/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Oct 2005 19:07:25 -0000 1.3 +++ sources 4 Dec 2005 12:45:56 -0000 1.4 @@ -1,2 +1,3 @@ c07aa79293aa36298626fe5e68d6bfba libesmtp-1.0.3r1.tar.bz2 f018f16cbebc56490d2c3c18a23d3113 libesmtp-ssl.patch +a6f89e2100d9b6cdffcea4f398e37343 COPYING.LGPL From fedora-extras-commits at redhat.com Sun Dec 4 12:56:30 2005 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Sun, 4 Dec 2005 07:56:30 -0500 Subject: rpms/balsa/FC-4 .cvsignore, 1.4, 1.5 balsa.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200512041257.jB4Cv0Ql015177@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/balsa/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15156 Modified Files: .cvsignore balsa.spec sources Log Message: update to 2.3.7. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/balsa/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Jun 2005 08:12:03 -0000 1.4 +++ .cvsignore 4 Dec 2005 12:56:28 -0000 1.5 @@ -1,2 +1,2 @@ -balsa-2.3.3.tar.bz2 -gmime-2.1.14.tar.bz2 +gmime-2.1.17.tar.bz2 +balsa-2.3.7.tar.bz2 Index: balsa.spec =================================================================== RCS file: /cvs/extras/rpms/balsa/FC-4/balsa.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- balsa.spec 19 Oct 2005 20:21:31 -0000 1.5 +++ balsa.spec 4 Dec 2005 12:56:28 -0000 1.6 @@ -1,9 +1,9 @@ -%define gmimever 2.1.14 +%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 Name: balsa -Version: 2.3.3 -Release: 2%{?dist} +Version: 2.3.7 +Release: 1%{?dist} Summary: Balsa Mail Client Group: Applications/Internet @@ -14,7 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libesmtp >= 1.0.3 -Requires: scrollkeeper +Requires(post): scrollkeeper +Requires(postun): scrollkeeper BuildRequires: scrollkeeper BuildRequires: libesmtp-devel >= 1.0.3 BuildRequires: aspell-devel @@ -63,12 +64,21 @@ rm -rf "$RPM_BUILD_ROOT" %post -which scrollkeeper-update>/dev/null 2>&1 && scrollkeeper-update +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : + +/bin/touch --no-create %{_datadir}/icons/hicolor +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 -which scrollkeeper-update>/dev/null 2>&1 && scrollkeeper-update +scrollkeeper-update -q || : -# no need to update cache - it will be removed. +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files -f %{name}.lang %defattr(-,root,root,-) @@ -90,6 +100,12 @@ %changelog +* Sun Dec 4 2005 Pawel Salek - 2.3.7-1 +- update to upstream version 2.3.7. + +* Mon Oct 24 2005 Pawel Salek - 2.3.6-1 +- update to upstream version 2.3.6. + * Wed Oct 19 2005 Pawel Salek - 2.3.3-2 - bump the release up to fix "make tag" problem. Index: sources =================================================================== RCS file: /cvs/extras/rpms/balsa/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Jun 2005 08:12:03 -0000 1.4 +++ sources 4 Dec 2005 12:56:28 -0000 1.5 @@ -1,2 +1,2 @@ -ac43ab8ca5ccc6782daac21e370b8605 balsa-2.3.3.tar.bz2 -ee1c2d0c1f76ae113f0dd70893bbacf4 gmime-2.1.14.tar.bz2 +4be55ee55e4b3966bd51fadbf5fb323b gmime-2.1.17.tar.bz2 +d50a439a8b8c2be99e3b0108d5d6073e balsa-2.3.7.tar.bz2 From fedora-extras-commits at redhat.com Sun Dec 4 13:01:38 2005 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Sun, 4 Dec 2005 08:01:38 -0500 Subject: rpms/balsa/FC-4 balsa.spec,1.6,1.7 Message-ID: <200512041302.jB4D2R0O016818@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/balsa/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15274 Modified Files: balsa.spec Log Message: bump the release number - 2.3.7-1 cannot be built. Index: balsa.spec =================================================================== RCS file: /cvs/extras/rpms/balsa/FC-4/balsa.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- balsa.spec 4 Dec 2005 12:56:28 -0000 1.6 +++ balsa.spec 4 Dec 2005 13:01:36 -0000 1.7 @@ -3,7 +3,7 @@ Name: balsa Version: 2.3.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Balsa Mail Client Group: Applications/Internet From fedora-extras-commits at redhat.com Sun Dec 4 14:16:37 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 4 Dec 2005 09:16:37 -0500 Subject: rpms/gossip/devel gossip.spec,1.7,1.8 Message-ID: <200512041417.jB4EH7Tn018565@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18548 Modified Files: gossip.spec Log Message: * Fri Dec 2 2005 Brian Pepple - 0.9-6 - Rebuild for new dbus. Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gossip.spec 31 Aug 2005 19:16:37 -0000 1.7 +++ gossip.spec 4 Dec 2005 14:16:34 -0000 1.8 @@ -2,7 +2,7 @@ Name: gossip Version: 0.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Gnome Jabber Client Group: Applications/Communications @@ -99,6 +99,9 @@ %changelog +* Fri Dec 2 2005 Brian Pepple - 0.9-6 +- Rebuild for new dbus. + * Wed Aug 31 2005 Brian Pepple - 0.9-5 - Add missing COPYING file to docs. From fedora-extras-commits at redhat.com Sun Dec 4 15:18:41 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 4 Dec 2005 10:18:41 -0500 Subject: rpms/freeciv/devel freeciv.spec,1.17,1.18 Message-ID: <200512041519.jB4FJCIx020333@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20304 Modified Files: freeciv.spec Log Message: * Sun Dec 4 2005 Brian Pepple - 2.0.7-4 - Rebuild for new bind. Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- freeciv.spec 6 Nov 2005 15:23:59 -0000 1.17 +++ freeciv.spec 4 Dec 2005 15:18:39 -0000 1.18 @@ -1,6 +1,6 @@ Name: freeciv Version: 2.0.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games @@ -90,6 +90,9 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Sun Dec 4 2005 Brian Pepple - 2.0.7-4 +- Rebuild for new bind. + * Sun Nov 6 2005 Brian Pepple - 2.0.7-3 - Update to 2.0.7. - Modify desktop patch for upstream fixes. From fedora-extras-commits at redhat.com Sun Dec 4 18:23:54 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 4 Dec 2005 13:23:54 -0500 Subject: rpms/lrmi/devel lrmi-0.9-asm.patch,NONE,1.1 lrmi.spec,1.6,1.7 Message-ID: <200512041824.jB4IOOcD025551@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lrmi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25529 Modified Files: lrmi.spec Added Files: lrmi-0.9-asm.patch Log Message: * Sun Dec 4 2005 Ville Skytt?? - 0.9-2 - Fix build with new binutils. lrmi-0.9-asm.patch: --- NEW FILE lrmi-0.9-asm.patch --- --- lrmi.c~ 2005-09-01 09:43:52.000000000 +0300 +++ lrmi.c 2005-11-10 21:41:22.000000000 +0200 @@ -781,11 +781,11 @@ // FIXME: may apply this to BSD equivalents? sigfillset(&all_sigs); sigprocmask(SIG_SETMASK, &all_sigs, &old_sigs); - asm volatile ("movl %%gs, %0" : "=rm" (old_gs)); - asm volatile ("movl %%fs, %0" : "=rm" (old_fs)); + asm volatile ("mov %%gs, %0" : "=rm" (old_gs)); + asm volatile ("mov %%fs, %0" : "=rm" (old_fs)); vret = lrmi_vm86(&context.vm); - asm volatile ("movl %0, %%gs" :: "rm" (old_gs)); - asm volatile ("movl %0, %%fs" :: "rm" (old_fs)); + asm volatile ("mov %0, %%gs" :: "rm" (old_gs)); + asm volatile ("mov %0, %%fs" :: "rm" (old_fs)); sigprocmask(SIG_SETMASK, &old_sigs, NULL); if (VM86_TYPE(vret) == VM86_INTx) { Index: lrmi.spec =================================================================== RCS file: /cvs/extras/rpms/lrmi/devel/lrmi.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lrmi.spec 10 Nov 2005 17:57:01 -0000 1.6 +++ lrmi.spec 4 Dec 2005 18:23:51 -0000 1.7 @@ -1,6 +1,6 @@ Name: lrmi Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for calling real mode BIOS routines Group: System Environment/Libraries @@ -8,6 +8,7 @@ URL: http://sourceforge.net/projects/lrmi/ Source0: http://download.sourceforge.net/lrmi/%{name}-%{version}.tar.gz Patch0: %{name}-0.9-build.patch +Patch1: %{name}-0.9-asm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} @@ -36,6 +37,7 @@ %prep %setup -q %patch0 +%patch1 %build @@ -75,6 +77,9 @@ %changelog +* Sun Dec 4 2005 Ville Skytt?? - 0.9-2 +- Fix build with new binutils. + * Wed Nov 9 2005 Ville Skytt?? - 0.9-1 - 0.9, patches mostly applied/obsoleted upstream. - Don't ship static libraries. From fedora-extras-commits at redhat.com Sun Dec 4 22:44:56 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 4 Dec 2005 17:44:56 -0500 Subject: rpms/krecipes/devel .cvsignore, 1.4, 1.5 krecipes.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200512042245.jB4MjQ0v032614@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32591 Modified Files: .cvsignore krecipes.spec sources Log Message: update to 0.9.1 fixes bug with creation of new mysql databses Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Dec 2005 04:32:46 -0000 1.4 +++ .cvsignore 4 Dec 2005 22:44:54 -0000 1.5 @@ -1,2 +1 @@ -krecipes-0.9.tar.gz -krecipes-X11.patch +krecipes-0.9.1.tar.gz Index: krecipes.spec =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/krecipes.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- krecipes.spec 4 Dec 2005 04:29:34 -0000 1.7 +++ krecipes.spec 4 Dec 2005 22:44:54 -0000 1.8 @@ -1,6 +1,6 @@ Name: krecipes -Version: 0.9 -Release: 3%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Application to manage recipes and shopping-lists Group: Applications/Productivity @@ -86,6 +86,8 @@ %{_datadir}/mimelnk/*/*.desktop %changelog +* Sun Dec 04 2005 Dennis Gilmore - 0.9.1-1 +- update to 0.9.1 this fixes a bug in mysql database creation * Sat Dec 03 2005 Dennis Gilmore - 0.9-3 - fix BuildRequies for libacl and add patch for X check. * Wed Nov 30 2005 Dennis Gilmore - 0.9-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Dec 2005 04:32:46 -0000 1.4 +++ sources 4 Dec 2005 22:44:54 -0000 1.5 @@ -1,2 +1 @@ -ee1a1463946c63788ff8eeea302a7506 krecipes-0.9.tar.gz -67e68fc70f7ff67235a7a36affa7af6d krecipes-X11.patch +7414fd5210561801ba04ee3dad6561d9 krecipes-0.9.1.tar.gz From fedora-extras-commits at redhat.com Sun Dec 4 22:46:52 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 4 Dec 2005 17:46:52 -0500 Subject: rpms/krecipes/FC-4 .cvsignore, 1.3, 1.4 krecipes.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200512042247.jB4MlNVH032647@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32626 Modified Files: .cvsignore krecipes.spec sources Log Message: Update to 0.9.1 this release fixes a bug in new mysql databse creation Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/krecipes/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Dec 2005 03:37:53 -0000 1.3 +++ .cvsignore 4 Dec 2005 22:46:50 -0000 1.4 @@ -1 +1 @@ -krecipes-0.9.tar.gz +krecipes-0.9.1.tar.gz Index: krecipes.spec =================================================================== RCS file: /cvs/extras/rpms/krecipes/FC-4/krecipes.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- krecipes.spec 1 Dec 2005 04:05:23 -0000 1.6 +++ krecipes.spec 4 Dec 2005 22:46:50 -0000 1.7 @@ -1,6 +1,6 @@ Name: krecipes -Version: 0.9 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Application to manage recipes and shopping-lists Group: Applications/Productivity @@ -9,7 +9,7 @@ Source0: http://download.sourceforge.net/krecipes/krecipes-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel > 3.1, sqlite-devel, desktop-file-utils +BuildRequires: kdelibs-devel > 3.1, sqlite-devel, desktop-file-utils, libacl-devel Requires: kdebase >= 3.1 patch0: krecipes-gcc4.patch @@ -81,9 +81,11 @@ %{_datadir}/mimelnk/*/*.desktop %changelog -* Wed Nov 11 2005 Dennis Gilmore - 0.9-2 +* Sun Dec 04 2005 Dennis Gilmore - 0.9.1-1 +- Update to 0.9.1 fixes bug in creation of new mysql databses +* Wed Nov 30 2005 Dennis Gilmore - 0.9-2 - fix missing files -* Wed Nov 11 2005 Dennis Gilmore - 0.9-1 +* Wed Nov 30 2005 Dennis Gilmore - 0.9-1 - update to 0.9 * Sat Oct 20 2005 Dennis Gilmore - 0.8.1-3%{?dist} - add BuildRequires desktop-file-utils http://fedoraproject.org/wiki/QAChecklist Index: sources =================================================================== RCS file: /cvs/extras/rpms/krecipes/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Dec 2005 03:37:53 -0000 1.3 +++ sources 4 Dec 2005 22:46:50 -0000 1.4 @@ -1 +1 @@ -ee1a1463946c63788ff8eeea302a7506 krecipes-0.9.tar.gz +7414fd5210561801ba04ee3dad6561d9 krecipes-0.9.1.tar.gz From fedora-extras-commits at redhat.com Sun Dec 4 23:04:46 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 4 Dec 2005 18:04:46 -0500 Subject: owners owners.list,1.432,1.433 Message-ID: <200512042305.jB4N5Hka001853@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1836 Modified Files: owners.list Log Message: update email address to the one I actually use Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.432 retrieving revision 1.433 diff -u -r1.432 -r1.433 --- owners.list 4 Dec 2005 11:34:58 -0000 1.432 +++ owners.list 4 Dec 2005 23:04:44 -0000 1.433 @@ -117,7 +117,7 @@ Fedora Extras|cppunit|C++ unit testing framework|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| -Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at dgilmore.net|extras-qa at fedoraproject.org| +Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ctrlproxy|IRC server with multiserver support|dwmw2 at infradead.org|extras-qa at fedoraproject.org| Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org| @@ -309,7 +309,7 @@ Fedora Extras|gpa|Graphical user interface for GnuPG|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|gparted|Gnome Partition Editor|dakingun at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gperiodic|Program for browsing the periodic table|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org| -Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at dgilmore.net|extras-qa at fedoraproject.org| +Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|gpgme|GnuPG Made Easy|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gpredict|Real-time satellite tracking and orbit prediction program|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|gpsim|A simulator for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| @@ -433,12 +433,12 @@ Fedora Extras|kompose|Provides a full screen view of all open windows|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|konversation|An easy to use irc client for KDE|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|kover|WYSIWYG CD cover printer with CDDB support|adrian at lisas.de|extras-qa at fedoraproject.org| -Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|dennis at dgilmore.net|extras-qa at fedoraproject.org| +Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|krecipes|Application to manage recipes and shopping-lists|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|krusader|An advanced twin-panel (commander-style) file-manager for KDE|mgarski at post.pl|extras-qa at fedoraproject.org| Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|ksensors|An lm_sensors frontend for KDE|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|ktrack|Satellite prediction software for KDE|dennis at dgilmore.net|extras-qa at fedoraproject.org| +Fedora Extras|ktrack|Satellite prediction software for KDE|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|kxdocker|A Mac OSX style docker|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kxdocker-resources|Plugins, Sounds, and Themes for kxdocker|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kyum|Graphical User Frontend (GUI) for yum|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Dec 4 23:23:58 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 4 Dec 2005 18:23:58 -0500 Subject: rpms/psi/devel .cvsignore, 1.5, 1.6 psi.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200512042324.jB4NOSrG002072@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/psi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2051 Modified Files: .cvsignore psi.spec sources Log Message: - update to 0.10-test3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/psi/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Jan 2005 21:11:58 -0000 1.5 +++ .cvsignore 4 Dec 2005 23:23:56 -0000 1.6 @@ -1,19 +1,5 @@ -psi_ca.qm.bz2 -psi_cs.qm.bz2 -psi_el.qm.bz2 -psi_es.qm.bz2 -psi_it.qm.bz2 -psi_mk.qm.bz2 -psi_se.qm.bz2 -psi-0.9.3.tar.bz2 -psi_de.qm.bz2 -psi_ee.qm.bz2 -psi_et.qm.bz2 -psi_fi.qm.bz2 -psi_fr.qm.bz2 -psi_nl.qm.bz2 -psi_pl.qm.bz2 -psi_ru.qm.bz2 -psi_sk.qm.bz2 -psi_sw.qm.bz2 -psi_zh.qm.bz2 +emoticons-0.9.3.tar.gz +psi-0.10-test3.tar.bz2 +psi-lang-packs-0.9.3.tar.gz +rostericons-0.9.3.tar.gz +systemicons-0.9.3.tar.gz Index: psi.spec =================================================================== RCS file: /cvs/extras/rpms/psi/devel/psi.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- psi.spec 2 Jun 2005 16:02:30 -0000 1.12 +++ psi.spec 4 Dec 2005 23:23:56 -0000 1.13 @@ -2,22 +2,21 @@ %{!?_without_kde:%define with_kde 1} Name: psi -Version: 0.9.3 -Release: 4%{?dist} -Summary: Jabber client using Qt 3 +Version: 0.10 +Release: 0.2.test3%{?dist} +Summary: Jabber client based on Qt License: GPL Group: Applications/Internet URL: http://psi.affinix.com/ -Source0: http://dl.sf.net/psi/psi-0.9.3.tar.bz2 +#Source0: http://people.ex.ac.uk/kismith/psi/psi-0.10-test2.tar.bz2 +Source0: http://dl.sf.net/psi/psi-0.10-test3.tar.bz2 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 +#Patch2: psi-0.9.2-mach-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel >= 1:3.1.1 -BuildRequires: XFree86-devel BuildRequires: zlib-devel BuildRequires: desktop-file-utils BuildRequires: qca-devel @@ -29,49 +28,13 @@ Requires: gnupg # Language packs -Source50: psi_pl.qm.bz2 -#Source51: psi_sr.qm.bz2 -Source52: psi_fr.qm.bz2 -#Source53: psi_eo.qm.bz2 -#Source54: psi_sr at Latn.qm.bz2 -Source55: psi_fi.qm.bz2 -Source56: psi_cs.qm.bz2 -Source57: psi_ru.qm.bz2 -Source58: psi_de.qm.bz2 -Source59: psi_es.qm.bz2 -Source60: psi_mk.qm.bz2 -Source61: psi_nl.qm.bz2 -Source62: psi_sk.qm.bz2 -Source63: psi_el.qm.bz2 -Source64: psi_it.qm.bz2 -Source65: psi_se.qm.bz2 -Source66: psi_ca.qm.bz2 -Source67: psi_zh.qm.bz2 -Source68: psi_sw.qm.bz2 -Source69: psi_ee.qm.bz2 -Source70: psi_et.qm.bz2 - -# Emoticonsets -Source100: Chibi.jisp -Source101: KMess-Cartoon-1.0.jisp -Source102: shinyicons.jisp -Source103: yahoo_messenger.jisp -Source104: kreativ_squareheads.jisp -Source105: tlen.pl-3.73.jisp -Source106: apple_ichat-1.0.jisp -Source107: trill-extra-symbols.jisp -Source108: trill-extra-smileys.jisp -Source109: Ninja.jisp -Source110: webmessenger.jisp - -# Rostericonsets -Source130: weather.jisp -Source131: icqG.jisp -Source132: gaduGaduG.jisp -Source133: http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_roster.jisp +Source10: psi-lang-packs-0.9.3.tar.gz + +# Iconsets +Source11: emoticons-0.9.3.tar.gz +Source12: rostericons-0.9.3.tar.gz +Source13: systemicons-0.9.3.tar.gz -# System iconsets -Source160: http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_system.jisp %description @@ -109,12 +72,11 @@ %prep -%setup -q +%setup -q -n psi-%{version}-test3 # (ugly) hack to enable debuginfo subrpm %patch1 -p1 -b .strip # needed to build with mach -%patch2 -p1 -b .mach-build -%patch3 -p1 -b .gcc4 +#%patch2 -p1 -b .mach-build %build @@ -131,12 +93,11 @@ --qtdir=$QTDIR # Fix build for FC1 -make qmake -install -m 755 %{SOURCE2} src/uic-wrapper -sed -i 's|\$(QTDIR)/bin/uic|./uic-wrapper|' src/Makefile +#make qmake +#install -m 755 %{SOURCE2} src/uic-wrapper +#sed -i 's|\$(QTDIR)/bin/uic|./uic-wrapper|' src/Makefile make %{?_smp_mflags} -#lrelease psi.pro %install @@ -144,78 +105,52 @@ export INSTALL_ROOT=$RPM_BUILD_ROOT make install -#rm -f $RPM_BUILD_ROOT%{_datadir}/%name/{README,COPYING} cp -p libpsi/iconset/ICONSET-HOWTO $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/ # Install language packs -%__bzip2 -dck %{SOURCE50} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_pl.qm -#%__bzip2 -dck %{SOURCE51} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sr.qm -%__bzip2 -dck %{SOURCE52} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fr.qm -#%__bzip2 -dck %{SOURCE53} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_eo.qm -#%__bzip2 -dck %{SOURCE54} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sr at Latn.qm -%__bzip2 -dck %{SOURCE55} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fi.qm -%__bzip2 -dck %{SOURCE56} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_cs.qm -%__bzip2 -dck %{SOURCE57} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ru.qm -%__bzip2 -dck %{SOURCE58} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_de.qm -%__bzip2 -dck %{SOURCE59} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_es.qm -%__bzip2 -dck %{SOURCE60} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_mk.qm -%__bzip2 -dck %{SOURCE61} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_nl.qm -%__bzip2 -dck %{SOURCE62} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sk.qm -%__bzip2 -dck %{SOURCE63} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_el.qm -%__bzip2 -dck %{SOURCE64} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_it.qm -%__bzip2 -dck %{SOURCE65} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_se.qm -%__bzip2 -dck %{SOURCE66} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ca.qm -%__bzip2 -dck %{SOURCE67} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_zh.qm -%__bzip2 -dck %{SOURCE68} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sw.qm -%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ee.qm -%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_et.qm +tar -xzpf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/%name/ ## Install iconsets -install -p %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ -install -p %{SOURCE101} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ -install -p %{SOURCE102} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ -install -p %{SOURCE103} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ -install -p %{SOURCE104} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ -install -p %{SOURCE105} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ -install -p %{SOURCE106} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ -install -p %{SOURCE107} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ -install -p %{SOURCE108} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ -install -p %{SOURCE109} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ -install -p %{SOURCE110} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ - -install -p %{SOURCE130} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ -install -p %{SOURCE131} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ -install -p %{SOURCE132} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ -install -p %{SOURCE133} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ +tar -xzpf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/ +tar -xzpf %{SOURCE12} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/ +tar -xzpf %{SOURCE13} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/ -install -p %{SOURCE160} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/ # Menu -perl -pi -e 's/Icon=psi/Icon=psi.png/' $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop +#perl -pi -e 's/Icon=psi/Icon=psi.png/' $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications\ - --add-category Application\ - --add-category X-Fedora\ - --add-category Network\ - --delete-original\ - $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop - -# icon -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -ln -s ../icons/hicolor/48x48/apps/psi.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%name.png + --dir $RPM_BUILD_ROOT%{_datadir}/applications\ + --add-category Application\ + --add-category X-Fedora\ + --delete-original\ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT + +%post +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + + %files %defattr(0644,root,root,0755) +# Needed by psi for the help dialog #%doc README COPYING libpsi/iconset/ICONSET-HOWTO %attr(0755,root,root) %{_bindir}/psi %{_datadir}/%{name} %_datadir/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/%name.png -%{_datadir}/pixmaps/%name.png %exclude %{_datadir}/%{name}/*.qm %exclude %{_datadir}/%{name}/iconsets/*/*.jisp @@ -230,6 +165,18 @@ %changelog +* Thu Nov 03 2005 Aurelien Bompard 0.10-0.2.test3 +- version 0.10 test3 + +* Sat Oct 15 2005 Aurelien Bompard 0.10-0.2.test2 +- version 0.10 test2 +- drop patch 3 (applied upstream) +- drop icon symlink (useless) + +* Thu Aug 25 2005 Aurelien Bompard 0.10-0.1.test1 +- version 0.10 test1 +- spec cleanups + * Wed Jun 1 2005 Michael Schwendt - 0.9.3-4 - patch it for 64-bit/GCC 4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/psi/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Jan 2005 05:27:23 -0000 1.6 +++ sources 4 Dec 2005 23:23:56 -0000 1.7 @@ -1,35 +1,5 @@ -1689645b1e2bf181c6fc2d68f070cf0d psi_ca.qm.bz2 -69f88fc4768d963bed4cd3ebfbb75a28 psi_cs.qm.bz2 -da61ff1ec70cf90357d78f6c81d0ad86 psi_el.qm.bz2 -c831c0924c363e8bac42aab577f6982d psi_es.qm.bz2 -022996fd1f35f26a777f07d667071421 psi_it.qm.bz2 -3e1ac01eaf5451f1b1d0968b2f911983 psi_mk.qm.bz2 -8cc619e6752d6c4db5093eca5d458f0a psi_se.qm.bz2 -d20f3bb530235a246bc2d92308089744 psi-0.9.3.tar.bz2 -52611e036dd0b7cb2ecadcf16eeb9632 psi_de.qm.bz2 -2e19193ebcfd59f80badf011714a2c82 psi_ee.qm.bz2 -2e19193ebcfd59f80badf011714a2c82 psi_et.qm.bz2 -74053f86b57bd74be4b2866dd02b730d psi_fi.qm.bz2 -dd8f83f3c3fc1c20d094f6570acaad4b psi_fr.qm.bz2 -a0cc2e82074a2be17c5ad0004747ac43 psi_nl.qm.bz2 -d3418d4383e47f37f7fedbbc9591db6c psi_pl.qm.bz2 -5e701ee8f56b01c65f3097f5ba13f63c psi_ru.qm.bz2 -784e291e51e4746b602e182ab9ec3ac2 psi_sk.qm.bz2 -a5570c823cfbe33ee602110b89cf4e16 psi_sw.qm.bz2 -38629928c813dc54fc04b38de5e6dcee psi_zh.qm.bz2 -259f0351152852d8091b092440557bab apple_ichat-1.0.jisp -6d98db4a5fab3c5909a422d983ed336f Chibi.jisp -14f8bdbea1873b2972d56726c4c011cf crystal_roster.jisp -ee56b25a85ec3ddef64339e177f7028d crystal_system.jisp -a4aada51bbf57c17c2bfda5ba52717ec gaduGaduG.jisp -9d8b4be36909c235657d61698846aee1 icqG.jisp -459d5feae7cf05210f10ffd8df9ac93f KMess-Cartoon-1.0.jisp -f1760382d3aea32199aeb7303493a9ea kreativ_squareheads.jisp -cbe6f581bf32a2cb56e8bf5871db639d Ninja.jisp -9ec2c600f390dc725e4793383ff50ec2 shinyicons.jisp -099c70f9ca25623c89e3ba5b44af2e6d tlen.pl-3.73.jisp -6a3065d33b072e15decbfb3673028df6 trill-extra-smileys.jisp -b743f3f65dfe526b6d730044031d5c78 trill-extra-symbols.jisp -be98902383c572fd3cd6876a6940a73e weather.jisp -0a2ce25ab4506d563bf65da372c9f8f4 webmessenger.jisp -747a785fdaae8dc5a5ee78a3253035ab yahoo_messenger.jisp +0310084bf278d59831e4cac863e9060e emoticons-0.9.3.tar.gz +6de947394d0e6a34dbf73694476ab129 psi-0.10-test3.tar.bz2 +57864bcb92feda6525cfade29f12c713 psi-lang-packs-0.9.3.tar.gz +79ade28d67356a4bdd57c850cc2ed6c8 rostericons-0.9.3.tar.gz +a359e33b1f2a8a80066771ebfbf4a916 systemicons-0.9.3.tar.gz From fedora-extras-commits at redhat.com Mon Dec 5 04:53:23 2005 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 4 Dec 2005 23:53:23 -0500 Subject: rpms/galeon/devel galeon.spec,1.13,1.14 Message-ID: <200512050453.jB54rr2u011898@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11878 Modified Files: galeon.spec Log Message: - Fixed preun script, was removing schemas after update. - Removed galeon-config-tool. Now using well-known Fedora scriptlets. - Added scripts Requires Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- galeon.spec 30 Nov 2005 07:49:13 -0000 1.13 +++ galeon.spec 5 Dec 2005 04:53:20 -0000 1.14 @@ -1,13 +1,12 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ Source0: http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -Requires: scrollkeeper Requires: mozilla = 37:1.7.12 BuildRequires: gettext mozilla-nspr-devel desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 @@ -19,6 +18,13 @@ %ifarch x86_64 BuildRequires: autoconf automake libtool intltool %endif +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils +Requires(pre): GConf2 +Requires(post): GConf2 +Requires(preun): GConf2 +Requires(post): scrollkeeper +Requires(postun): scrollkeeper %description Galeon is a web browser built around Gecko (Mozilla's rendering @@ -38,7 +44,8 @@ %build %configure \ --disable-nautilus-view \ - --disable-werror + --disable-werror \ + --disable-schemas-install make %{?_smp_mflags} @@ -47,6 +54,7 @@ make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_datadir}/applications/galeon.desktop +rm -f $RPM_BUILD_ROOT%{_bindir}/galeon-config-tool # Overriding galeon *bluecurve* icon perl -pi -e 's|Icon=.+|Icon=%{_datadir}/pixmaps/galeon.png|g' galeon.desktop desktop-file-install --vendor fedora \ @@ -63,23 +71,26 @@ %clean rm -rf $RPM_BUILD_ROOT - %post -%{_bindir}/galeon-config-tool --fix-gconf-permissions -%{_bindir}/galeon-config-tool --pkg-install-schemas -scrollkeeper-update||: -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : +update-desktop-database > /dev/null 2>&1 || : + +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule \ + %{_sysconfdir}/gconf/schemas/galeon.schemas > /dev/null || : +killall -HUP gconfd-2 || : %preun -if [ "$1" = "1" ] ; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/galeon.schemas >/dev/null -fi||: +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/galeon.schemas > /dev/null || : + killall -HUP gconfd-2 || : +fi %postun -scrollkeeper-update||: -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +scrollkeeper-update -q || : +update-desktop-database > /dev/null 2>&1 || : %files -f galeon-2.0.lang @@ -88,7 +99,6 @@ %config %{_sysconfdir}/gconf/schemas/galeon.schemas %config %{_sysconfdir}/sound/events/galeon.soundlist %{_bindir}/galeon -%{_bindir}/galeon-config-tool %{_mandir}/man1/galeon.1* %{_datadir}/galeon %{_datadir}/gnome/help/galeon @@ -103,6 +113,11 @@ %changelog +* Sun Dec 4 2005 Denis Leroy - 2.0.0-2 +- Fixed preun script, was removing schemas after update. +- Removed galeon-config-tool. Now using well-known Fedora scriptlets. +- Added scripts Requires + * Mon Nov 28 2005 Denis Leroy - 2.0.0-1 - Update to 2.0.0 From fedora-extras-commits at redhat.com Mon Dec 5 11:28:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 5 Dec 2005 06:28:48 -0500 Subject: rpms/xemacs/devel xemacs-21.4.18-utf8-fonts.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xemacs.spec, 1.16, 1.17 xemacs-21-cursor.patch, 1.1, NONE xemacs-21.4.17-innerbuf.patch, 1.1, NONE xemacs-21.4.17-utf8-fonts.patch, 1.2, NONE Message-ID: <200512051129.jB5BTIba024340@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24307 Modified Files: .cvsignore sources xemacs.spec Added Files: xemacs-21.4.18-utf8-fonts.patch Removed Files: xemacs-21-cursor.patch xemacs-21.4.17-innerbuf.patch xemacs-21.4.17-utf8-fonts.patch Log Message: * Sun Dec 4 2005 Ville Skytt?? - 21.4.18-2 - 21.4.18, innerbuf and cursor patches applied upstream. xemacs-21.4.18-utf8-fonts.patch: --- NEW FILE xemacs-21.4.18-utf8-fonts.patch --- --- xemacs-21.4.18/etc/Emacs.ad~ 2002-12-12 08:21:12.000000000 +0200 +++ xemacs-21.4.18/etc/Emacs.ad 2005-12-04 18:07:07.000000000 +0200 @@ -198,20 +198,22 @@ ! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ ! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0 ! -*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* -*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* +*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* +*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ -*-*-*-*-*-*-*-120-*-iso10646-1, \ -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ - -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 + -*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \ + -*-*-*-*-*-*-*-120-*-*-* *popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ -*-*-*-*-*-*-*-120-*-iso10646-1, \ -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ - -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 + -*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \ + -*-*-*-*-*-*-*-120-*-*-* ! Gui elements share this font ! -Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-* +Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-* ! Font in the Motif dialog boxes. ! (Motif uses `fontList' while most other things use `font' - if you don't @@ -227,7 +229,7 @@ ! Some people use 12-point anyway because you get more text, but ! there's no purpose at all in doing this for dialog boxes. -*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-* +*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-* ! Dialog box translations. ! ======================= Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Mar 2005 22:11:36 -0000 1.2 +++ .cvsignore 5 Dec 2005 11:28:45 -0000 1.3 @@ -1 +1 @@ -xemacs-21.4.17.tar.bz2 +xemacs-21.4.18.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Mar 2005 22:11:36 -0000 1.2 +++ sources 5 Dec 2005 11:28:45 -0000 1.3 @@ -1 +1 @@ -a207e106138c085711160855d78b72a2 xemacs-21.4.17.tar.bz2 +08c99ff915564a122a3a44df2264669c xemacs-21.4.18.tar.bz2 Index: xemacs.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xemacs.spec 1 Dec 2005 10:05:26 -0000 1.16 +++ xemacs.spec 5 Dec 2005 11:28:45 -0000 1.17 @@ -7,8 +7,8 @@ %define exectop %{_libdir}/xemacs-%{version} Name: xemacs -Version: 21.4.17 -Release: 7%{?dist} +Version: 21.4.18 +Release: 2%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -22,16 +22,14 @@ Source22: delprevline.py Source23: dotxemacs-init.el Source24: default.el -Patch0: xemacs-21.4.17-innerbuf.patch Patch1: xemacs-21.4.17-x-paths.patch -Patch5: xemacs-21-cursor.patch Patch10: xemacs-21.4.10-find-paths-pkgdir.patch Patch11: movemail-mktemp.patch Patch14: menubar-games.patch Patch15: xemacs-21.4.12-find-paths-libexec-lib64.patch Patch16: xemacs-21.4.12-mk-nochk-features.patch Patch18: xemacs-21.4.13-dump-paths-lispdir.patch -Patch19: xemacs-21.4.17-utf8-fonts.patch +Patch19: xemacs-21.4.18-utf8-fonts.patch Patch21: xemacs-debian-docdir-dump.patch Patch23: xemacs-no-expdyn-ia64-106744.patch Patch24: xemacs-21.4.15-wnnfix-128362.patch @@ -40,6 +38,7 @@ BuildRequires: autoconf213 BuildRequires: python BuildRequires: sed >= 3.95 +BuildRequires: texinfo BuildRequires: ncurses-devel BuildRequires: gpm-devel BuildRequires: pam-devel @@ -152,7 +151,6 @@ %patch1 -p1 # make find-paths.el look in datadir -rm lisp/find-paths.elc %patch10 -p1 # fix "libexec" on multilib %ifarch x86_64 s390x @@ -162,13 +160,10 @@ %patch14 -p1 # make lisp dir and mule-lisp dir be the source lisp dirs (not in datadir) %patch18 -p1 -rm lisp/dump-paths.elc sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el ## non-lisp patches ## -%patch0 -p1 -b .innerbuf -%patch5 -p1 -b .cursor # movemail %patch11 -p1 -b .mkstemp # skip redundant check-features @@ -450,6 +445,9 @@ %changelog +* Sun Dec 4 2005 Ville Skytt?? - 21.4.18-2 +- 21.4.18, innerbuf and cursor patches applied upstream. + * Wed Nov 30 2005 Ville Skytt?? - 21.4.17-7 - Require ISO-8859-1 fonts (Alexandre Oliva, #174617). - Make popup dialog font the intended one even without ISO-8859 fonts. --- xemacs-21-cursor.patch DELETED --- --- xemacs-21.4.17-innerbuf.patch DELETED --- --- xemacs-21.4.17-utf8-fonts.patch DELETED --- From fedora-extras-commits at redhat.com Mon Dec 5 12:49:35 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 5 Dec 2005 07:49:35 -0500 Subject: rpms/krecipes/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200512051250.jB5Co5uY026200@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26181 Modified Files: .cvsignore sources Log Message: Upload new patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Dec 2005 22:44:54 -0000 1.5 +++ .cvsignore 5 Dec 2005 12:49:33 -0000 1.6 @@ -1 +1,2 @@ krecipes-0.9.1.tar.gz +krecipes-X11.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Dec 2005 22:44:54 -0000 1.5 +++ sources 5 Dec 2005 12:49:33 -0000 1.6 @@ -1 +1,2 @@ 7414fd5210561801ba04ee3dad6561d9 krecipes-0.9.1.tar.gz +67e68fc70f7ff67235a7a36affa7af6d krecipes-X11.patch From fedora-extras-commits at redhat.com Mon Dec 5 12:53:56 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Mon, 5 Dec 2005 07:53:56 -0500 Subject: rpms/krecipes/devel krecipes.spec,1.8,1.9 Message-ID: <200512051254.jB5CsRS9026255@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26238 Modified Files: krecipes.spec Log Message: Update build because i tagged and didnt have patch uploaded Index: krecipes.spec =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/krecipes.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- krecipes.spec 4 Dec 2005 22:44:54 -0000 1.8 +++ krecipes.spec 5 Dec 2005 12:53:54 -0000 1.9 @@ -1,6 +1,6 @@ Name: krecipes Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Application to manage recipes and shopping-lists Group: Applications/Productivity @@ -86,6 +86,8 @@ %{_datadir}/mimelnk/*/*.desktop %changelog +* Mon Dec 05 2005 Dennis Gilmore - 0.9.1-2 +- retag because patch wasnt uploaded * Sun Dec 04 2005 Dennis Gilmore - 0.9.1-1 - update to 0.9.1 this fixes a bug in mysql database creation * Sat Dec 03 2005 Dennis Gilmore - 0.9-3 From fedora-extras-commits at redhat.com Mon Dec 5 13:40:18 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Mon, 5 Dec 2005 08:40:18 -0500 Subject: rpms/perl-Locale-Maketext-Lexicon/devel .cvsignore, 1.3, 1.4 perl-Locale-Maketext-Lexicon.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200512051340.jB5Dem6Z028005@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27981 Modified Files: .cvsignore perl-Locale-Maketext-Lexicon.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Nov 2005 08:44:51 -0000 1.3 +++ .cvsignore 5 Dec 2005 13:40:16 -0000 1.4 @@ -1 +1 @@ -Locale-Maketext-Lexicon-0.50.tar.gz +Locale-Maketext-Lexicon-0.53.tar.gz Index: perl-Locale-Maketext-Lexicon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Locale-Maketext-Lexicon.spec 13 Nov 2005 08:44:51 -0000 1.3 +++ perl-Locale-Maketext-Lexicon.spec 5 Dec 2005 13:40:16 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-Locale-Maketext-Lexicon -Version: 0.50 +Version: 0.53 Release: 1%{?dist} Summary: Extract translatable strings from source License: GPL or Artistic @@ -55,6 +55,9 @@ %{_mandir}/man3/* %changelog +* Sun Dec 05 2005 Ralf Corsepius - 0.53-1 +- Upstream update. + * Sun Nov 13 2005 Ralf Corsepius - 0.50-1 - Upsteam update. - Add docs to %%doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Nov 2005 08:44:51 -0000 1.3 +++ sources 5 Dec 2005 13:40:16 -0000 1.4 @@ -1 +1 @@ -6e387db5b65bcd59b8335ff1e6910d55 Locale-Maketext-Lexicon-0.50.tar.gz +c1bce07646a0d9bcd8a56a60235b63ec Locale-Maketext-Lexicon-0.53.tar.gz From fedora-extras-commits at redhat.com Mon Dec 5 13:43:55 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Mon, 5 Dec 2005 08:43:55 -0500 Subject: rpms/perl-Locale-Maketext-Lexicon/devel perl-Locale-Maketext-Lexicon.spec, 1.4, 1.5 Message-ID: <200512051344.jB5DiQDq028069@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28052 Modified Files: perl-Locale-Maketext-Lexicon.spec Log Message: Fix typo. Index: perl-Locale-Maketext-Lexicon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Locale-Maketext-Lexicon.spec 5 Dec 2005 13:40:16 -0000 1.4 +++ perl-Locale-Maketext-Lexicon.spec 5 Dec 2005 13:43:53 -0000 1.5 @@ -55,7 +55,7 @@ %{_mandir}/man3/* %changelog -* Sun Dec 05 2005 Ralf Corsepius - 0.53-1 +* Mon Dec 05 2005 Ralf Corsepius - 0.53-1 - Upstream update. * Sun Nov 13 2005 Ralf Corsepius - 0.50-1 From fedora-extras-commits at redhat.com Mon Dec 5 14:04:21 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Mon, 5 Dec 2005 09:04:21 -0500 Subject: rpms/perl-Locale-Maketext-Lexicon/FC-4 .cvsignore, 1.3, 1.4 perl-Locale-Maketext-Lexicon.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200512051404.jB5E4pXJ029714@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29693 Modified Files: .cvsignore perl-Locale-Maketext-Lexicon.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Nov 2005 08:49:10 -0000 1.3 +++ .cvsignore 5 Dec 2005 14:03:58 -0000 1.4 @@ -1 +1 @@ -Locale-Maketext-Lexicon-0.50.tar.gz +Locale-Maketext-Lexicon-0.53.tar.gz Index: perl-Locale-Maketext-Lexicon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4/perl-Locale-Maketext-Lexicon.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Locale-Maketext-Lexicon.spec 13 Nov 2005 08:49:10 -0000 1.3 +++ perl-Locale-Maketext-Lexicon.spec 5 Dec 2005 14:03:58 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-Locale-Maketext-Lexicon -Version: 0.50 +Version: 0.53 Release: 1%{?dist} Summary: Extract translatable strings from source License: GPL or Artistic @@ -55,6 +55,9 @@ %{_mandir}/man3/* %changelog +* Mon Dec 05 2005 Ralf Corsepius - 0.53-1 +- Upstream update. + * Sun Nov 13 2005 Ralf Corsepius - 0.50-1 - Upsteam update. - Add docs to %%doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Nov 2005 08:49:10 -0000 1.3 +++ sources 5 Dec 2005 14:03:58 -0000 1.4 @@ -1 +1 @@ -6e387db5b65bcd59b8335ff1e6910d55 Locale-Maketext-Lexicon-0.50.tar.gz +c1bce07646a0d9bcd8a56a60235b63ec Locale-Maketext-Lexicon-0.53.tar.gz From fedora-extras-commits at redhat.com Mon Dec 5 14:16:45 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Mon, 5 Dec 2005 09:16:45 -0500 Subject: rpms/perl-DBIx-SearchBuilder/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200512051417.jB5EHF5O029862@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29843 Modified Files: .cvsignore sources Log Message: Remove 1.35 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Nov 2005 06:48:44 -0000 1.3 +++ .cvsignore 5 Dec 2005 14:16:43 -0000 1.4 @@ -1,3 +1,3 @@ DBIx-SearchBuilder-1.27.tar.gz DBIx-SearchBuilder-1.33.tar.gz -DBIx-SearchBuilder-1.35.tar.gz +DBIx-SearchBuilder-1.36.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Nov 2005 06:48:44 -0000 1.3 +++ sources 5 Dec 2005 14:16:43 -0000 1.4 @@ -1,3 +1,3 @@ b3bc442e5e447e8a02417c417cff7371 DBIx-SearchBuilder-1.27.tar.gz f9a11fe46b311d783a53d3c04a3d9246 DBIx-SearchBuilder-1.33.tar.gz -16d8a5a722426f261b7384a0c5afc246 DBIx-SearchBuilder-1.35.tar.gz +bef0e6a1affb4ad79bcf52205ca793a3 DBIx-SearchBuilder-1.36.tar.gz From fedora-extras-commits at redhat.com Mon Dec 5 14:33:00 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Mon, 5 Dec 2005 09:33:00 -0500 Subject: rpms/perl-DBIx-DBSchema/devel .cvsignore, 1.2, 1.3 perl-DBIx-DBSchema.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200512051433.jB5EXVNk031012@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-DBIx-DBSchema/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30945 Modified Files: .cvsignore perl-DBIx-DBSchema.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Nov 2005 07:24:42 -0000 1.2 +++ .cvsignore 5 Dec 2005 14:32:58 -0000 1.3 @@ -1 +1 @@ -DBIx-DBSchema-0.27.tar.gz +DBIx-DBSchema-0.28.tar.gz Index: perl-DBIx-DBSchema.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/devel/perl-DBIx-DBSchema.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DBIx-DBSchema.spec 6 Nov 2005 07:28:52 -0000 1.2 +++ perl-DBIx-DBSchema.spec 5 Dec 2005 14:32:58 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-DBIx-DBSchema -Version: 0.27 -Release: 2%{?dist} +Version: 0.28 +Release: 1%{?dist} Summary: Database-independent schema objects Group: Development/Libraries @@ -63,6 +63,9 @@ %changelog +* Mon Dec 05 2005 Ralf Cors??pius - 0.28-1 +- Upstream update. + * Sun Nov 06 2005 Ralf Cors??pius - 0.27-2 - Change URL (PR #170384, Paul Howard). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Nov 2005 07:24:42 -0000 1.2 +++ sources 5 Dec 2005 14:32:58 -0000 1.3 @@ -1 +1 @@ -9a609e0c227192373672d03dffb859f0 DBIx-DBSchema-0.27.tar.gz +5f7486e3c6ffc2191f9b1bd3b1ea7053 DBIx-DBSchema-0.28.tar.gz From fedora-extras-commits at redhat.com Mon Dec 5 14:37:51 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Mon, 5 Dec 2005 09:37:51 -0500 Subject: rpms/perl-DBIx-DBSchema/FC-4 .cvsignore, 1.2, 1.3 perl-DBIx-DBSchema.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200512051438.jB5EcLBu031491@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31424 Modified Files: .cvsignore perl-DBIx-DBSchema.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Nov 2005 07:24:42 -0000 1.2 +++ .cvsignore 5 Dec 2005 14:37:49 -0000 1.3 @@ -1 +1 @@ -DBIx-DBSchema-0.27.tar.gz +DBIx-DBSchema-0.28.tar.gz Index: perl-DBIx-DBSchema.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4/perl-DBIx-DBSchema.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DBIx-DBSchema.spec 6 Nov 2005 07:28:52 -0000 1.2 +++ perl-DBIx-DBSchema.spec 5 Dec 2005 14:37:49 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-DBIx-DBSchema -Version: 0.27 -Release: 2%{?dist} +Version: 0.28 +Release: 1%{?dist} Summary: Database-independent schema objects Group: Development/Libraries @@ -63,6 +63,9 @@ %changelog +* Mon Dec 05 2005 Ralf Cors??pius - 0.28-1 +- Upstream update. + * Sun Nov 06 2005 Ralf Cors??pius - 0.27-2 - Change URL (PR #170384, Paul Howard). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Nov 2005 07:24:42 -0000 1.2 +++ sources 5 Dec 2005 14:37:49 -0000 1.3 @@ -1 +1 @@ -9a609e0c227192373672d03dffb859f0 DBIx-DBSchema-0.27.tar.gz +5f7486e3c6ffc2191f9b1bd3b1ea7053 DBIx-DBSchema-0.28.tar.gz From fedora-extras-commits at redhat.com Mon Dec 5 14:44:42 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 5 Dec 2005 09:44:42 -0500 Subject: rpms/gnupg2/FC-4 gnupg2.spec,1.14,1.15 Message-ID: <200512051445.jB5EjC4w031713@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31694 Modified Files: gnupg2.spec Log Message: * Thu Dec 01 2005 Rex Dieter 1.9.19-8 - include gpg-agent-(startup|shutdown) scripts (#136533) - BR: libksba-devel >= 1.9.12 - %check: be permissive about failures (for now) Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-4/gnupg2.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gnupg2.spec 31 Oct 2005 16:20:45 -0000 1.14 +++ gnupg2.spec 5 Dec 2005 14:44:40 -0000 1.15 @@ -7,13 +7,19 @@ Summary: GNU utility for secure communication and data storage Name: gnupg2 Version: 1.9.19 -Release: 2%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig URL: http://www.gnupg.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# omit broken x86_64 build +# ExcludeArch: x86_64 + +# enable auto-startup/shutdown of gpg-agent +Source10: gpg-agent-startup.sh +Source11: gpg-agent-shutdown.sh Patch1: gnupg-1.9.18-lvalue.patch Patch2: gnupg-1.9.16-testverbose.patch @@ -26,12 +32,12 @@ BuildRequires: libassuan-devel >= 0.6.10 BuildRequires: libgcrypt-devel => 1.2.0 BuildRequires: libgpg-error-devel => 1.0 -%ifarch x86_64 -# Hard-code libksba-0.9.11 for now (x86_64 issues) -BuildRequires: libksba-devel = 0.9.11 -%else -BuildRequires: libksba-devel >= 0.9.11 -%endif +#ifarch x86_64 +# Hard-code libksba-0.9.11 for now (x86_64 'make check' fails) +#BuildRequires: libksba-devel = 0.9.11 +#else +BuildRequires: libksba-devel >= 0.9.12 +#endif BuildRequires: gettext BuildRequires: openldap-devel @@ -44,7 +50,6 @@ Requires: pinentry >= 0.7.1 -# Should these be versioned? -- Rex Provides: gpg Provides: openpgp @@ -69,20 +74,15 @@ %patch1 -p1 -b .lvalue %patch2 -p1 -b .testverbose - -#ifarch x86_64 -sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac -sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure -#endif +%ifarch x86_64 +sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure +%endif sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c %build -%{!?_without_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS} -%{!?_without_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG} - %configure \ --disable-dependency-tracking \ --disable-rpath \ @@ -91,8 +91,11 @@ make %{?_smp_mflags} -%check || : -make check +%check ||: +## Allows for better debugability (doesn't work, fixme) +# echo "debug-allow-core-dumps" >> tests/gpgsm.conf +# (sometimes?) expect one failure (reported upstream) +#make check ||: %install @@ -100,6 +103,11 @@ make install DESTDIR=$RPM_BUILD_ROOT +# enable auto-startup/shutdown of gpg-agent +mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown} +install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/env/ +install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{_prefix}/shutdown/ + %find_lang %{name} ## Unpackaged files @@ -122,7 +130,6 @@ #attr(4755,root,root) %{_bindir}/gpg2 %{_bindir}/gpg2 %{_bindir}/gpgv2 -%{_datadir}/gnupg %{_bindir}/gpg-connect-agent %{_bindir}/gpg-agent %{_bindir}/gpgconf @@ -132,9 +139,13 @@ %{_bindir}/scdaemon %{_bindir}/watchgnupg %{_sbindir}/* -%{_libdir}/gnupg +%{_datadir}/gnupg/ +%{_libdir}/gnupg/ %{_libexecdir}/* %{_infodir}/* +# Own dirs until someone else does (filesystem,kdebase?) +%{_prefix}/env/ +%{_prefix}/shutdown/ %clean @@ -142,22 +153,30 @@ %changelog -* Tue Oct 11 2005 Rex Dieter - 1.9.19-2 +* Thu Dec 01 2005 Rex Dieter 1.9.19-8 +- include gpg-agent-(startup|shutdown) scripts (#136533) +- BR: libksba-devel >= 1.9.12 +- %%check: be permissive about failures (for now) + +* Wed Nov 30 2005 Rex Dieter 1.9.19-3 +- BR: libksba-devel >= 1.9.13 + +* Tue Oct 11 2005 Rex Dieter 1.9.19-2 - back to BR: libksba-devel = 1.9.11 -* Tue Oct 11 2005 Rex Dieter - 1.9.19-1 +* Tue Oct 11 2005 Rex Dieter 1.9.19-1 - 1.9.19 -* Fri Aug 26 2005 Rex Dieter - 1.9.18-9 +* Fri Aug 26 2005 Rex Dieter 1.9.18-9 - configure: NEED_KSBA_VERSION=0.9.12 -> 0.9.11 -* Fri Aug 26 2005 Rex Dieter - 1.9.18-7 +* Fri Aug 26 2005 Rex Dieter 1.9.18-7 - re-enable 'make check', rebuild against (older) libksba-0.9.11 -* Tue Aug 9 2005 Rex Dieter - 1.9.18-6 +* Tue Aug 9 2005 Rex Dieter 1.9.18-6 - don't 'make check' by default (regular builds pass, but FC4/5+plague fails) -* Mon Aug 8 2005 Rex Dieter - 1.9.18-5 +* Mon Aug 8 2005 Rex Dieter 1.9.18-5 - 1.9.18 - drop pth patch (--enable-gpg build fixed) - update description (from README) From fedora-extras-commits at redhat.com Mon Dec 5 14:46:54 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 5 Dec 2005 09:46:54 -0500 Subject: rpms/gnupg2/FC-4 gpg-agent-shutdown.sh, NONE, 1.1 gpg-agent-startup.sh, NONE, 1.1 Message-ID: <200512051446.jB5Eks1s031742@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31730 Added Files: gpg-agent-shutdown.sh gpg-agent-startup.sh Log Message: import gpg-agent scripts ***** Error reading new file: [Errno 2] No such file or directory: 'gpg-agent-shutdown.sh' ***** Error reading new file: [Errno 2] No such file or directory: 'gpg-agent-startup.sh' From fedora-extras-commits at redhat.com Mon Dec 5 14:48:14 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 5 Dec 2005 09:48:14 -0500 Subject: rpms/libksba/FC-4 .cvsignore, 1.6, 1.7 libksba.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200512051448.jB5EmiwC031818@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libksba/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31763 Modified Files: .cvsignore libksba.spec sources Log Message: * Wed Nov 30 2005 Rex Dieter 0.9.13-2 - remove hacks - drop self Obsoletes - 0.9.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Aug 2005 20:52:51 -0000 1.6 +++ .cvsignore 5 Dec 2005 14:48:12 -0000 1.7 @@ -1,2 +1,2 @@ -libksba-0.9.12.tar.bz2 -libksba-0.9.12.tar.bz2.sig +libksba-0.9.13.tar.bz2 +libksba-0.9.13.tar.bz2.sig Index: libksba.spec =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-4/libksba.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libksba.spec 8 Aug 2005 20:12:05 -0000 1.11 +++ libksba.spec 5 Dec 2005 14:48:12 -0000 1.12 @@ -1,7 +1,7 @@ Summary: X.509 library Name: libksba -Version: 0.9.12 -Release: 1%{?dist} +Version: 0.9.13 +Release: 2%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.gnupg.org/ @@ -17,8 +17,8 @@ CMS protocols. %package devel -Summary: Development headers and libraries for %{name} -Group: Development/Libraries +Summary: Development headers and libraries for %{name} +Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -38,7 +38,7 @@ make %{?_smp_mflags} -%check || : +%check ||: make check @@ -75,7 +75,7 @@ %files devel %defattr(-,root,root,-) -%{_bindir}/* +%{_bindir}/*-config %{_libdir}/lib*.so %{_includedir}/* %{_datadir}/aclocal/* @@ -83,6 +83,20 @@ %changelog +* Wed Nov 30 2005 Rex Dieter 0.9.13-2 +- remove hacks +- drop self Obsoletes + +* Wed Nov 30 2005 Rex Dieter 0.9.13-1 +- 0.9.13 + +* Fri Aug 26 2005 Rex Dieter 0.9.11-3 +- botched Obsoletes good, let's try again. + +* Fri Aug 26 2005 Rex Dieter 0.9.11-2 +- revert to 0.9.11 (0.9.12 makes gnupg2 fail on x86_64) using Obsoletes + to avoid Epoch or other ugly means. + * Mon Aug 8 2005 Rex Dieter 0.9.12-1 - 0.9.12 - --disable-static Index: sources =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Aug 2005 20:52:51 -0000 1.6 +++ sources 5 Dec 2005 14:48:12 -0000 1.7 @@ -1,2 +1,2 @@ -4d40a09134c5a0d2dcc6416f9abdcc98 libksba-0.9.12.tar.bz2 -9465c78bcdac0ea609cf37c2275a54af libksba-0.9.12.tar.bz2.sig +102154db88898d71e9f51b4e149e811c libksba-0.9.13.tar.bz2 +3964fe9798ff1636de60c27ea042e340 libksba-0.9.13.tar.bz2.sig From fedora-extras-commits at redhat.com Mon Dec 5 14:49:35 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 5 Dec 2005 09:49:35 -0500 Subject: rpms/libksba/FC-3 .cvsignore, 1.5, 1.6 libksba.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200512051450.jB5Eo5bw031859@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libksba/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31838/FC-3 Modified Files: .cvsignore libksba.spec sources Log Message: * Wed Nov 30 2005 Rex Dieter 0.9.13-2 - remove hacks - drop self Obsoletes - 0.9.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Aug 2005 20:53:35 -0000 1.5 +++ .cvsignore 5 Dec 2005 14:49:33 -0000 1.6 @@ -1,2 +1,2 @@ -libksba-0.9.12.tar.bz2 -libksba-0.9.12.tar.bz2.sig +libksba-0.9.13.tar.bz2 +libksba-0.9.13.tar.bz2.sig Index: libksba.spec =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-3/libksba.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libksba.spec 8 Aug 2005 20:10:38 -0000 1.7 +++ libksba.spec 5 Dec 2005 14:49:33 -0000 1.8 @@ -1,7 +1,7 @@ Summary: X.509 library Name: libksba -Version: 0.9.12 -Release: 1%{?dist} +Version: 0.9.13 +Release: 2%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.gnupg.org/ @@ -17,8 +17,8 @@ CMS protocols. %package devel -Summary: Development headers and libraries for %{name} -Group: Development/Libraries +Summary: Development headers and libraries for %{name} +Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -38,7 +38,7 @@ make %{?_smp_mflags} -%check || : +%check ||: make check @@ -75,7 +75,7 @@ %files devel %defattr(-,root,root,-) -%{_bindir}/* +%{_bindir}/*-config %{_libdir}/lib*.so %{_includedir}/* %{_datadir}/aclocal/* @@ -83,6 +83,20 @@ %changelog +* Wed Nov 30 2005 Rex Dieter 0.9.13-2 +- remove hacks +- drop self Obsoletes + +* Wed Nov 30 2005 Rex Dieter 0.9.13-1 +- 0.9.13 + +* Fri Aug 26 2005 Rex Dieter 0.9.11-3 +- botched Obsoletes good, let's try again. + +* Fri Aug 26 2005 Rex Dieter 0.9.11-2 +- revert to 0.9.11 (0.9.12 makes gnupg2 fail on x86_64) using Obsoletes + to avoid Epoch or other ugly means. + * Mon Aug 8 2005 Rex Dieter 0.9.12-1 - 0.9.12 - --disable-static Index: sources =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Aug 2005 20:53:35 -0000 1.5 +++ sources 5 Dec 2005 14:49:33 -0000 1.6 @@ -1,2 +1,2 @@ -4d40a09134c5a0d2dcc6416f9abdcc98 libksba-0.9.12.tar.bz2 -9465c78bcdac0ea609cf37c2275a54af libksba-0.9.12.tar.bz2.sig +102154db88898d71e9f51b4e149e811c libksba-0.9.13.tar.bz2 +3964fe9798ff1636de60c27ea042e340 libksba-0.9.13.tar.bz2.sig From fedora-extras-commits at redhat.com Mon Dec 5 14:59:41 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 5 Dec 2005 09:59:41 -0500 Subject: rpms/sbcl/devel sbcl-0.9.6-permissive.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sbcl.spec, 1.30, 1.31 sources, 1.6, 1.7 Message-ID: <200512051500.jB5F0CoQ032039@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32006 Modified Files: .cvsignore sbcl.spec sources Added Files: sbcl-0.9.6-permissive.patch Log Message: * Mon Nov 28 2005 Rex Dieter 0.9.7-1 - 0.9.7 sbcl-0.9.6-permissive.patch: --- NEW FILE sbcl-0.9.6-permissive.patch --- --- sbcl-0.9.6/make-target-contrib.sh.permissive 2005-09-21 10:00:33.000000000 -0500 +++ sbcl-0.9.6/make-target-contrib.sh 2005-10-27 15:02:04.000000000 -0500 @@ -51,7 +51,7 @@ for i in contrib/*; do test -d $i && test -f $i/Makefile || continue; # export INSTALL_DIR=$SBCL_HOME/`basename $i ` - test -f $i/test-passed && rm $i/test-passed + # test -f $i/test-passed && rm $i/test-passed $GNUMAKE -C $i test && touch $i/test-passed done Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 27 Oct 2005 16:17:11 -0000 1.6 +++ .cvsignore 5 Dec 2005 14:59:39 -0000 1.7 @@ -3,3 +3,4 @@ sbcl-0.9.5-source.tar.bz2 sbcl-0.9.5-x86-linux-binary.tar.bz2 sbcl-0.9.6-source.tar.bz2 +sbcl-0.9.7-source.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sbcl.spec 27 Oct 2005 18:46:20 -0000 1.30 +++ sbcl.spec 5 Dec 2005 14:59:39 -0000 1.31 @@ -5,12 +5,15 @@ #define min_bootstrap 1 # define to enable verbose build for debugging -#define verbose 1 +%define sbcl_verbose 1 + +# shell to use +%define sbcl_shell /bin/bash -x Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.6 -Release: 4%{?dist} +Version: 0.9.7 +Release: 1%{?dist} License: BSD/MIT Group: Development/Languages @@ -62,6 +65,8 @@ Patch4: sbcl-0.9.4-LIB_DIR.patch Patch5: sbcl-0.9.5-make-config-fix.patch Patch6: sbcl-0.9.5-verbose-build.patch +# Allow override of contrib test failure(s) +Patch7: sbcl-0.9.6-permissive.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -91,7 +96,8 @@ %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR %patch5 -p1 -b .make-config-fix -%{?verbose:%patch6 -p1 -b .verbose-build} +%{?sbcl_verbose:%patch6 -p1 -b .verbose-build} +%patch7 -p1 -b .permissive # Enable sb-thread %ifarch %{ix86} x86_64 @@ -107,7 +113,7 @@ %if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap pushd sbcl-*-linux -INSTALL_ROOT=`pwd`/../sbcl-bootstrap sh %{?verbose:-x} ./install.sh +INSTALL_ROOT=`pwd`/../sbcl-bootstrap %{?sbcl_shell} ./install.sh popd %endif @@ -129,11 +135,18 @@ #%{__cc} -o my_setarch %{optflags} %{SOURCE100} #define my_setarch ./my_setarch +# WORKAROUND sb-posix STAT.2, STAT.4 test failures (fc3/fc4 only, fc5 passes?) +# at least until a better solution is found +# http://bugzilla.redhat.com/bugzilla/169506 +touch contrib/sb-posix/test-passed + # trick contrib/ modules to use optflags too export EXTRA_CFLAGS="$CFLAGS" export DEFAULT_SBCL_HOME=%{_libdir}/sbcl %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}} -%{?setarch} %{?my_setarch} sh %{?verbose:-x} ./make.sh %{?bootstrap} +%{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap} + + # docs %if "%{?min_bootstrap}" == "%{nil}" @@ -146,13 +159,13 @@ # http://bugzilla.redhat.com/bugzilla/169506 SB_POSIX=%{_libdir}/sbcl/sb-posix if [ ! -d $RPM_BUILD_ROOT${SB_POSIX} ]; then - echo "%SB_POSIX awol!" + echo "${SB_POSIX} awol!" exit 1 fi pushd tests # Only x86 builds are expected to pass all # Don't worry about thread.impure failure(s), threading is optional anyway. -%{?setarch} sh ./run-tests.sh ||: +%{?setarch} %{?sbcl_shell} ./run-tests.sh ||: popd @@ -164,7 +177,7 @@ unset SBCL_HOME export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} -sh %{?verbose:-x} ./install.sh +%{?sbcl_shell} ./install.sh ## Unpackaged files rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl @@ -172,8 +185,8 @@ # CVS crud find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f -# 'test-passed' files from %%check (leave these in, for now -- Rex) -# find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f +# 'test-passed' files from %%check +find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -vf %if "%{?min_bootstrap}" == "%{nil}" @@ -213,6 +226,12 @@ %changelog +* Mon Nov 28 2005 Rex Dieter 0.9.7-1 +- 0.9.7 + +* Thu Oct 27 2005 Rex Dieter 0.9.6-5 +- override (bogus/mock-induced) sb-posix test failure(s). + * Thu Oct 27 2005 Rex Dieter 0.9.6-4 - drop -D_FILE_OFFSET_BITS=64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 27 Oct 2005 16:17:11 -0000 1.6 +++ sources 5 Dec 2005 14:59:39 -0000 1.7 @@ -1,4 +1,4 @@ 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 cb01b462b517889723eeaf63b5474c70 sbcl-0.9.5-x86-linux-binary.tar.bz2 -5e94122e73bc59c1411ff93fee948bfb sbcl-0.9.6-source.tar.bz2 +d5e5e4ae500f12b7523989222cb4cc88 sbcl-0.9.7-source.tar.bz2 From fedora-extras-commits at redhat.com Mon Dec 5 15:16:55 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 5 Dec 2005 10:16:55 -0500 Subject: rpms/gnupg2/FC-3 gpg-agent-shutdown.sh, NONE, 1.1 gpg-agent-startup.sh, NONE, 1.1 gnupg2.spec, 1.9, 1.10 Message-ID: <200512051517.jB5FHQYA001247@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1228 Modified Files: gnupg2.spec Added Files: gpg-agent-shutdown.sh gpg-agent-startup.sh Log Message: * Thu Dec 01 2005 Rex Dieter 1.9.19-8 - include gpg-agent-(startup|shutdown) scripts (#136533) - BR: libksba-devel >= 1.9.12 - %check: be permissive about failures (for now) - 1.9.19 ***** Error reading new file: [Errno 2] No such file or directory: 'gpg-agent-shutdown.sh' ***** Error reading new file: [Errno 2] No such file or directory: 'gpg-agent-startup.sh' Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-3/gnupg2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnupg2.spec 31 Oct 2005 16:22:47 -0000 1.9 +++ gnupg2.spec 5 Dec 2005 15:16:53 -0000 1.10 @@ -7,13 +7,19 @@ Summary: GNU utility for secure communication and data storage Name: gnupg2 Version: 1.9.19 -Release: 2%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig URL: http://www.gnupg.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# omit broken x86_64 build +# ExcludeArch: x86_64 + +# enable auto-startup/shutdown of gpg-agent +Source10: gpg-agent-startup.sh +Source11: gpg-agent-shutdown.sh Patch1: gnupg-1.9.18-lvalue.patch Patch2: gnupg-1.9.16-testverbose.patch @@ -26,12 +32,12 @@ BuildRequires: libassuan-devel >= 0.6.10 BuildRequires: libgcrypt-devel => 1.2.0 BuildRequires: libgpg-error-devel => 1.0 -%ifarch x86_64 -# Hard-code libksba-0.9.11 for now (x86_64 issues) -BuildRequires: libksba-devel = 0.9.11 -%else -BuildRequires: libksba-devel >= 0.9.11 -%endif +#ifarch x86_64 +# Hard-code libksba-0.9.11 for now (x86_64 'make check' fails) +#BuildRequires: libksba-devel = 0.9.11 +#else +BuildRequires: libksba-devel >= 0.9.12 +#endif BuildRequires: gettext BuildRequires: openldap-devel @@ -44,7 +50,6 @@ Requires: pinentry >= 0.7.1 -# Should these be versioned? -- Rex Provides: gpg Provides: openpgp @@ -69,20 +74,15 @@ %patch1 -p1 -b .lvalue %patch2 -p1 -b .testverbose - -#ifarch x86_64 -sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac -sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure -#endif +%ifarch x86_64 +sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure +%endif sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c %build -%{!?_without_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS} -%{!?_without_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG} - %configure \ --disable-dependency-tracking \ --disable-rpath \ @@ -91,8 +91,11 @@ make %{?_smp_mflags} -%check || : -make check +%check ||: +## Allows for better debugability (doesn't work, fixme) +# echo "debug-allow-core-dumps" >> tests/gpgsm.conf +# (sometimes?) expect one failure (reported upstream) +#make check ||: %install @@ -100,6 +103,11 @@ make install DESTDIR=$RPM_BUILD_ROOT +# enable auto-startup/shutdown of gpg-agent +mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown} +install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/env/ +install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{_prefix}/shutdown/ + %find_lang %{name} ## Unpackaged files @@ -122,7 +130,6 @@ #attr(4755,root,root) %{_bindir}/gpg2 %{_bindir}/gpg2 %{_bindir}/gpgv2 -%{_datadir}/gnupg %{_bindir}/gpg-connect-agent %{_bindir}/gpg-agent %{_bindir}/gpgconf @@ -132,9 +139,13 @@ %{_bindir}/scdaemon %{_bindir}/watchgnupg %{_sbindir}/* -%{_libdir}/gnupg +%{_datadir}/gnupg/ +%{_libdir}/gnupg/ %{_libexecdir}/* %{_infodir}/* +# Own dirs until someone else does (filesystem,kdebase?) +%{_prefix}/env/ +%{_prefix}/shutdown/ %clean @@ -142,22 +153,30 @@ %changelog -* Tue Oct 11 2005 Rex Dieter - 1.9.19-2 +* Thu Dec 01 2005 Rex Dieter 1.9.19-8 +- include gpg-agent-(startup|shutdown) scripts (#136533) +- BR: libksba-devel >= 1.9.12 +- %%check: be permissive about failures (for now) + +* Wed Nov 30 2005 Rex Dieter 1.9.19-3 +- BR: libksba-devel >= 1.9.13 + +* Tue Oct 11 2005 Rex Dieter 1.9.19-2 - back to BR: libksba-devel = 1.9.11 -* Tue Oct 11 2005 Rex Dieter - 1.9.19-1 +* Tue Oct 11 2005 Rex Dieter 1.9.19-1 - 1.9.19 -* Fri Aug 26 2005 Rex Dieter - 1.9.18-9 +* Fri Aug 26 2005 Rex Dieter 1.9.18-9 - configure: NEED_KSBA_VERSION=0.9.12 -> 0.9.11 -* Fri Aug 26 2005 Rex Dieter - 1.9.18-7 +* Fri Aug 26 2005 Rex Dieter 1.9.18-7 - re-enable 'make check', rebuild against (older) libksba-0.9.11 -* Tue Aug 9 2005 Rex Dieter - 1.9.18-6 +* Tue Aug 9 2005 Rex Dieter 1.9.18-6 - don't 'make check' by default (regular builds pass, but FC4/5+plague fails) -* Mon Aug 8 2005 Rex Dieter - 1.9.18-5 +* Mon Aug 8 2005 Rex Dieter 1.9.18-5 - 1.9.18 - drop pth patch (--enable-gpg build fixed) - update description (from README) From fedora-extras-commits at redhat.com Mon Dec 5 15:33:25 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 5 Dec 2005 10:33:25 -0500 Subject: rpms/sbcl/FC-4 .cvsignore, 1.5, 1.6 sbcl.spec, 1.29, 1.30 sources, 1.5, 1.6 Message-ID: <200512051533.jB5FXt4V001333@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1312 Modified Files: .cvsignore sbcl.spec sources Log Message: * Mon Nov 28 2005 Rex Dieter 0.9.7-1 - 0.9.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Oct 2005 17:34:33 -0000 1.5 +++ .cvsignore 5 Dec 2005 15:33:23 -0000 1.6 @@ -3,3 +3,4 @@ sbcl-0.9.5-source.tar.bz2 sbcl-0.9.5-x86-linux-binary.tar.bz2 sbcl-0.9.6-source.tar.bz2 +sbcl-0.9.7-source.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sbcl.spec 27 Oct 2005 20:14:29 -0000 1.29 +++ sbcl.spec 5 Dec 2005 15:33:23 -0000 1.30 @@ -5,12 +5,15 @@ #define min_bootstrap 1 # define to enable verbose build for debugging -#define verbose 1 +%define sbcl_verbose 1 + +# shell to use +%define sbcl_shell /bin/bash -x Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.6 -Release: 5%{?dist} +Version: 0.9.7 +Release: 1%{?dist} License: BSD/MIT Group: Development/Languages @@ -93,7 +96,7 @@ %patch3 -p1 -b .optflags %patch4 -p1 -b .LIB_DIR %patch5 -p1 -b .make-config-fix -%{?verbose:%patch6 -p1 -b .verbose-build} +%{?sbcl_verbose:%patch6 -p1 -b .verbose-build} %patch7 -p1 -b .permissive # Enable sb-thread @@ -110,7 +113,7 @@ %if "%{?sbcl_bootstrap_src}" != "%{nil}" mkdir sbcl-bootstrap pushd sbcl-*-linux -INSTALL_ROOT=`pwd`/../sbcl-bootstrap sh %{?verbose:-x} ./install.sh +INSTALL_ROOT=`pwd`/../sbcl-bootstrap %{?sbcl_shell} ./install.sh popd %endif @@ -141,7 +144,7 @@ export EXTRA_CFLAGS="$CFLAGS" export DEFAULT_SBCL_HOME=%{_libdir}/sbcl %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}} -%{?setarch} %{?my_setarch} sh %{?verbose:-x} ./make.sh %{?bootstrap} +%{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap} @@ -162,7 +165,7 @@ pushd tests # Only x86 builds are expected to pass all # Don't worry about thread.impure failure(s), threading is optional anyway. -%{?setarch} sh ./run-tests.sh ||: +%{?setarch} %{?sbcl_shell} ./run-tests.sh ||: popd @@ -174,7 +177,7 @@ unset SBCL_HOME export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} -sh %{?verbose:-x} ./install.sh +%{?sbcl_shell} ./install.sh ## Unpackaged files rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl @@ -182,8 +185,8 @@ # CVS crud find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f -# 'test-passed' files from %%check (leave these in, for now -- Rex) -# find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f +# 'test-passed' files from %%check +find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -vf %if "%{?min_bootstrap}" == "%{nil}" @@ -223,8 +226,11 @@ %changelog +* Mon Nov 28 2005 Rex Dieter 0.9.7-1 +- 0.9.7 + * Thu Oct 27 2005 Rex Dieter 0.9.6-5 -- override friggen sb-posix test failure(s). +- override (bogus/mock-induced) sb-posix test failure(s). * Thu Oct 27 2005 Rex Dieter 0.9.6-4 - drop -D_FILE_OFFSET_BITS=64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Oct 2005 17:34:33 -0000 1.5 +++ sources 5 Dec 2005 15:33:23 -0000 1.6 @@ -1,4 +1,4 @@ 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2 cb01b462b517889723eeaf63b5474c70 sbcl-0.9.5-x86-linux-binary.tar.bz2 -5e94122e73bc59c1411ff93fee948bfb sbcl-0.9.6-source.tar.bz2 +d5e5e4ae500f12b7523989222cb4cc88 sbcl-0.9.7-source.tar.bz2 From fedora-extras-commits at redhat.com Mon Dec 5 16:19:48 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 5 Dec 2005 11:19:48 -0500 Subject: common tobuild,1.2243,1.2244 Message-ID: <200512051620.jB5GKIBN003017@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3000 Modified Files: tobuild Log Message: request build of rpms/gambas/FC-3 gambas-1_0_13-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2243 retrieving revision 1.2244 diff -u -r1.2243 -r1.2244 --- tobuild 4 Dec 2005 12:02:32 -0000 1.2243 +++ tobuild 5 Dec 2005 16:19:46 -0000 1.2244 @@ -54,3 +54,4 @@ spot rpms/gambas/FC-4 gambas-1_0_13-3_fc4 fc4 spot rpms/gambas/devel gambas-1_0_13-3_fc5 devel pawsa rpms/balsa/devel balsa-2_3_7-1_fc5 devel +spot rpms/gambas/FC-3 gambas-1_0_13-3_fc3 fc3 From fedora-extras-commits at redhat.com Mon Dec 5 17:17:34 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Mon, 5 Dec 2005 12:17:34 -0500 Subject: rpms/deskbar-applet/FC-3 deskbar-applet.spec,1.3,1.4 Message-ID: <200512051718.jB5HI5cH004838@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/deskbar-applet/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4821 Modified Files: deskbar-applet.spec Log Message: Updated Source0 URL (#161670) Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/FC-3/deskbar-applet.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- deskbar-applet.spec 19 Mar 2005 17:52:45 -0000 1.3 +++ deskbar-applet.spec 5 Dec 2005 17:17:32 -0000 1.4 @@ -1,11 +1,11 @@ Name: deskbar-applet Version: 0.2 -Release: 3 +Release: 4 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://prdownloads.sourceforge.net/browserbookapp/deskbar-applet-0.2.tar.gz +Source0: http://dl.sourceforge.net/browserbookapp/deskbar-applet-0.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf BuildArch: noarch @@ -43,6 +43,9 @@ %{_libdir}/bonobo/servers/DeskbarApplet.server %changelog +* Mon Dec 5 2005 Ignacio Vazquez-Abrams 0.2-4 +- Updated Source0 URL (#161670) + * Sat Mar 19 2005 Ignacio Vazquez-Abrams 0.2-3 - %% From fedora-extras-commits at redhat.com Mon Dec 5 17:27:07 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 5 Dec 2005 12:27:07 -0500 Subject: rpms/xemacs/devel xemacs.spec,1.17,1.18 Message-ID: <200512051727.jB5HRbiK004895@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4878 Modified Files: xemacs.spec Log Message: * Mon Dec 5 2005 Ville Skytt?? - Fix typo in -info summary. - Point to main man page for xemacs-nox. Index: xemacs.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xemacs.spec 5 Dec 2005 11:28:45 -0000 1.17 +++ xemacs.spec 5 Dec 2005 17:27:05 -0000 1.18 @@ -127,7 +127,7 @@ interest when developing or debugging XEmacs itself. %package info -Summary: XEmacs documemtation in GNU texinfo format +Summary: XEmacs documentation in GNU texinfo format Group: Documentation Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -271,6 +271,8 @@ mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \ docdir=$RPM_BUILD_ROOT%{exectop}/doc/ install -Dpm 644 etc/xemacs-ja.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/xemacs.1 +echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1 +echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/ja/man1/xemacs-nox.1 # install nox files install -pm 755 src/xemacs-nox-%{version} $RPM_BUILD_ROOT%{_bindir} @@ -432,8 +434,8 @@ %{_mandir}/man1/etags.xemacs.1* %{_mandir}/man1/gnuattach.1* %{_mandir}/man1/gnudoit.1* -%{_mandir}/man1/xemacs.1* -%lang(ja) %{_mandir}/ja/man1/xemacs.1* +%{_mandir}/man1/xemacs*.1* +%lang(ja) %{_mandir}/ja/man1/xemacs*.1* %dir %{_localstatedir}/lock/xemacs/ %files el -f el-files @@ -445,6 +447,10 @@ %changelog +* Mon Dec 5 2005 Ville Skytt?? +- Fix typo in -info summary. +- Point to main man page for xemacs-nox. + * Sun Dec 4 2005 Ville Skytt?? - 21.4.18-2 - 21.4.18, innerbuf and cursor patches applied upstream. From fedora-extras-commits at redhat.com Mon Dec 5 17:30:57 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 5 Dec 2005 12:30:57 -0500 Subject: rpms/xemacs/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xemacs.desktop, 1.1, 1.2 xemacs.spec, 1.3, 1.4 xemacs-21-cursor.patch, 1.1, NONE xemacs-21.4.17-innerbuf.patch, 1.1, NONE Message-ID: <200512051731.jB5HVRrK004937@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4913 Modified Files: .cvsignore sources xemacs.desktop xemacs.spec Removed Files: xemacs-21-cursor.patch xemacs-21.4.17-innerbuf.patch Log Message: * Mon Dec 5 2005 Ville Skytt?? - 21.4.18-1 - 21.4.18, innerbuf and cursor patches applied upstream. - Move icon to icons/hicolor and to the main package. - Move man pages to subpackages where the things they document are. - Point to main man page for xemacs-nox. - Improve subpackage summaries. - Use desktop-file-install for installing the desktop entry, fix up X-* categories, update desktop database at post (un)install time. - Really mark default init files as %config. - Mark config files as noreplace. - Make sure scriptlet errors won't break upgrades. - Don't own %{_bindir} in -common. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xemacs/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Mar 2005 22:11:36 -0000 1.2 +++ .cvsignore 5 Dec 2005 17:30:55 -0000 1.3 @@ -1 +1 @@ -xemacs-21.4.17.tar.bz2 +xemacs-21.4.18.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xemacs/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Mar 2005 22:11:36 -0000 1.2 +++ sources 5 Dec 2005 17:30:55 -0000 1.3 @@ -1 +1 @@ -a207e106138c085711160855d78b72a2 xemacs-21.4.17.tar.bz2 +08c99ff915564a122a3a44df2264669c xemacs-21.4.18.tar.bz2 Index: xemacs.desktop =================================================================== RCS file: /cvs/extras/rpms/xemacs/FC-4/xemacs.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xemacs.desktop 1 Mar 2005 22:11:36 -0000 1.1 +++ xemacs.desktop 5 Dec 2005 17:30:55 -0000 1.2 @@ -29,6 +29,6 @@ Icon=xemacs Type=Application Terminal=false -Categories=Application;Development;TextEditor;X-Red-Hat-Extra; +Categories=Application;Development;TextEditor; Encoding=UTF-8 StartupWMClass=Emacs Index: xemacs.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs/FC-4/xemacs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xemacs.spec 5 May 2005 19:24:59 -0000 1.3 +++ xemacs.spec 5 Dec 2005 17:30:55 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Different version of Emacs Name: xemacs -Version: 21.4.17 -Release: 3 +Version: 21.4.18 +Release: 1%{?dist} License: GPL Group: Applications/Editors Source0: ftp://ftp.xemacs.org/xemacs-21.4/xemacs-%{version}.tar.bz2 @@ -12,8 +12,6 @@ Source22: delprevline.py Source23: dotxemacs-init.el Source24: default.el -Patch0: xemacs-21.4.17-innerbuf.patch -Patch5: xemacs-21-cursor.patch Patch10: xemacs-21.4.10-find-paths-pkgdir.patch Patch11: movemail-mktemp.patch Patch14: menubar-games.patch @@ -26,7 +24,7 @@ Patch24: xemacs-21.4.15-wnnfix-128362.patch URL: http://www.xemacs.org/ Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: perl python autoconf213 +BuildRequires: perl python autoconf213 texinfo desktop-file-utils BuildRequires: XFree86-devel ncurses-devel gpm-devel BuildRequires: pam-devel zlib-devel libjpeg-devel glibc-devel compface BuildRequires: libpng-devel libtiff-devel Canna-devel @@ -47,7 +45,7 @@ This package contains xemacs built for X Windows with MULE support. %package common -Summary: The byte-compiled lisp files and other common files for XEmacs. +Summary: Byte-compiled lisp files and other common files for XEmacs Group: Applications/Editors PreReq: %{_sbindir}/alternatives @@ -62,7 +60,7 @@ This package contains byte-compiled lisp and other common files for XEmacs. %package nox -Summary: A different version of Emacs built without X Windows Support. +Summary: Different version of Emacs built without X Windows support Group: Applications/Editors # Note: no xemacs-sumo dependency here, we need -nox to build the sumo package. Requires: xemacs-common = %{version}-%{release} @@ -78,8 +76,8 @@ This package contains XEmacs built without X Windows support. %package el -Summary: The .el source files for XEmacs. -Group: Applications/Editors +Summary: Emacs lisp source files for XEmacs +Group: Development/Libraries %description el XEmacs is a highly customizable open source text editor and @@ -89,11 +87,12 @@ user interface support and an open software development model, similar to Linux. -This package contains the lisp source files for XEmacs. +This package contains the lisp source files for XEmacs mainly of +interest when developing or debugging XEmacs itself. %package info -Summary: Information files for XEmacs. -Group: Applications/Editors +Summary: XEmacs documentation in GNU texinfo format +Group: Documentation PreReq: /sbin/install-info %description info @@ -104,7 +103,7 @@ user interface support and an open software development model, similar to Linux. -This package contains the XEmacs manuals in info format. +This package contains XEmacs documentation in GNU texinfo format. %define pkgdir %{_datadir}/xemacs @@ -116,7 +115,6 @@ ## Lisp patches ## # make find-paths.el look in datadir -rm lisp/find-paths.elc %patch10 -p1 # fix "libexec" on multilib %ifarch x86_64 s390x @@ -126,12 +124,9 @@ %patch14 -p1 # make lisp dir and mule-lisp dir be the source lisp dirs (not in datadir) %patch18 -p1 -rm lisp/dump-paths.elc sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el ## non-Lisp patches ## -%patch0 -p1 -b .innerbuf -%patch5 -p1 -b .cursor # movemail %patch11 -p1 -b .mkstemp # skip redundant check-features @@ -230,6 +225,7 @@ # make docdir mkdir -p %buildroot%{exectop}/doc %makeinstall mandir=%buildroot%{_mandir}/man1 docdir=%buildroot%{exectop}/doc/ +echo ".so man1/xemacs.1" > %buildroot%{_mandir}/man1/xemacs-nox.1 # install nox files mkdir -p %buildroot%{exectop}/doc-nox @@ -253,8 +249,12 @@ rm -f %buildroot%{_infodir}/standards* rm -f %buildroot%{_infodir}/termcap* -install -m 755 -d %buildroot%{_datadir}/applications -install -m 644 %SOURCE6 %buildroot%{_datadir}/applications/net-xemacs.desktop +desktop-file-install \ + --vendor=fedora \ + --mode=644 \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category=X-Fedora \ + %{SOURCE6} # Lockdir mkdir -p %buildroot%{_localstatedir}/lock/xemacs @@ -271,7 +271,8 @@ install -m 0644 %SOURCE23 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el # icon -install -Dpm 644 %{SOURCE1} %buildroot%{_datadir}/pixmaps/xemacs.png +install -Dpm 644 %{SOURCE1} \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png # Make sure nothing is 0400 chmod -R a+rX %buildroot%{_prefix} @@ -291,7 +292,7 @@ # remove buildroot prefix from files sed -i -e "s|%buildroot||" *.files # make site-packages lisp files config files -perl -pe 's|^(.+/site-packages/lisp/.+)$|%%config $1|' base-el-not-bytecomped.files +perl -pi -e 's|^(.+/site-packages/lisp/.+)$|%%config(noreplace) $1|' base-el-not-bytecomped.files # combine the file lists cat base-*.files dir.files >> base-files cat el-*.files dir.files >> el-files @@ -302,8 +303,16 @@ rm -rf %buildroot +%post +gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : +update-desktop-database -q %{_datadir}/applications 2>/dev/null || : + +%postun +gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : +update-desktop-database -q %{_datadir}/applications 2>/dev/null || : + %post common -alternatives --install %{_bindir}/etags etags %{_bindir}/etags.xemacs 40 +alternatives --install %{_bindir}/etags etags %{_bindir}/etags.xemacs 40 || : %preun common if [ "$1" = 0 ]; then @@ -312,13 +321,13 @@ %post info for file in xemacs cl internals lispref new-users-guide; do - /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir + /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir || : done %preun info if [ "$1" = "0" ]; then for file in xemacs cl internals lispref new-users-guide; do - /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir || : done fi @@ -327,10 +336,14 @@ %defattr(-, root, root) %{_bindir}/xemacs %{_bindir}/xemacs-%{version} +# gnuclient, gnuserv need X libs, so not in -common %{_bindir}/gnuclient %{exectop}/*/gnuserv %{exectop}/doc -%{_datadir}/applications/* +%{_datadir}/applications/*-%{name}.desktop +%{_datadir}/icons/hicolor/48x48/apps/xemacs.png +%{_mandir}/man1/gnuclient.1* +%{_mandir}/man1/gnuserv.1* %files nox %defattr(-, root, root) @@ -343,17 +356,19 @@ %doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release %doc etc/NEWS etc/MAILINGLISTS BUGS README.packages %doc etc/TUTORIAL -%exclude %{_bindir}/xemacs* -# needs X libs -%exclude %{_bindir}/gnuclient -%{_bindir} +%{_bindir}/ellcc +%{_bindir}/etags.xemacs +%{_bindir}/gnuattach +%{_bindir}/gnudoit +%{_bindir}/ootags %exclude %{exectop}/doc* # needs X libs %exclude %{exectop}/*/gnuserv %{exectop} -%{_datadir}/pixmaps/xemacs.png -%config %{_sysconfdir}/skel/.xemacs -%{_mandir}/*/* +%config(noreplace) %{_sysconfdir}/skel/.xemacs +%{_mandir}/man1/gnuattach.1* +%{_mandir}/man1/gnudoit.1* +%{_mandir}/man1/xemacs*.1* %attr(1777, root, root) %{_localstatedir}/lock/xemacs %files el -f el-files @@ -365,6 +380,19 @@ %changelog +* Mon Dec 5 2005 Ville Skytt?? - 21.4.18-1 +- 21.4.18, innerbuf and cursor patches applied upstream. +- Move icon to icons/hicolor and to the main package. +- Move man pages to subpackages where the things they document are. +- Point to main man page for xemacs-nox. +- Improve subpackage summaries. +- Use desktop-file-install for installing the desktop entry, fix up X-* + categories, update desktop database at post (un)install time. +- Really mark default init files as %%config. +- Mark config files as noreplace. +- Make sure scriptlet errors won't break upgrades. +- Don't own %%{_bindir} in -common. + * Thu May 5 2005 Ville Skytt?? - 21.4.17-3 - Avoid stack corruption in open-network-stream when built with gcc4 (Enrico Scholz, #154112). --- xemacs-21-cursor.patch DELETED --- --- xemacs-21.4.17-innerbuf.patch DELETED --- From fedora-extras-commits at redhat.com Mon Dec 5 17:54:25 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 5 Dec 2005 12:54:25 -0500 Subject: rpms/tclxml - New directory Message-ID: <200512051754.jB5HsPQW005101@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclxml In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5092/tclxml Log Message: Directory /cvs/extras/rpms/tclxml added to the repository From fedora-extras-commits at redhat.com Mon Dec 5 17:54:30 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 5 Dec 2005 12:54:30 -0500 Subject: rpms/tclxml/devel - New directory Message-ID: <200512051754.jB5HsUiX005116@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclxml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5092/tclxml/devel Log Message: Directory /cvs/extras/rpms/tclxml/devel added to the repository From fedora-extras-commits at redhat.com Mon Dec 5 17:54:53 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 5 Dec 2005 12:54:53 -0500 Subject: rpms/tclxml Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200512051754.jB5HsrGZ005150@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclxml In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5137 Added Files: Makefile import.log Log Message: Setup of module tclxml --- NEW FILE Makefile --- # Top level Makefile for module tclxml all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Dec 5 17:54:58 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 5 Dec 2005 12:54:58 -0500 Subject: rpms/tclxml/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200512051754.jB5HswtD005168@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclxml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5137/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tclxml --- NEW 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 Dec 5 17:56:30 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 5 Dec 2005 12:56:30 -0500 Subject: rpms/tclxml import.log,1.1,1.2 Message-ID: <200512051757.jB5Hv1FY005246@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclxml In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5208 Modified Files: import.log Log Message: auto-import tclxml-3.1-1 on branch devel from tclxml-3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tclxml/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Dec 2005 17:54:51 -0000 1.1 +++ import.log 5 Dec 2005 17:56:28 -0000 1.2 @@ -0,0 +1 @@ +tclxml-3_1-1:HEAD:tclxml-3.1-1.src.rpm:1133805358 From fedora-extras-commits at redhat.com Mon Dec 5 17:56:37 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 5 Dec 2005 12:56:37 -0500 Subject: rpms/tclxml/devel tclxml.patch, NONE, 1.1 tclxml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200512051756.jB5HubBv005239@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclxml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5208/devel Modified Files: .cvsignore sources Added Files: tclxml.patch tclxml.spec Log Message: auto-import tclxml-3.1-1 on branch devel from tclxml-3.1-1.src.rpm tclxml.patch: --- NEW FILE tclxml.patch --- diff -Naur --exclude '*.swp' tclxml-3.1/configure tclxml-3.1.new/configure --- tclxml-3.1/configure 2005-11-03 22:26:33.000000000 -0800 +++ tclxml-3.1.new/configure 2005-11-26 23:47:56.000000000 -0800 @@ -1530,7 +1530,8 @@ # 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` \ diff -Naur --exclude '*.swp' tclxml-3.1/expat/configure tclxml-3.1.new/expat/configure --- tclxml-3.1/expat/configure 2004-08-14 00:41:11.000000000 -0700 +++ tclxml-3.1.new/expat/configure 2005-11-26 23:50:36.000000000 -0800 @@ -1532,7 +1532,8 @@ # 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` \ diff -Naur --exclude '*.swp' tclxml-3.1/expat/Makefile.in tclxml-3.1.new/expat/Makefile.in --- tclxml-3.1/expat/Makefile.in 2002-10-09 14:17:21.000000000 -0700 +++ tclxml-3.1.new/expat/Makefile.in 2005-11-27 12:46:23.000000000 -0800 @@ -173,6 +173,7 @@ SHARED_BUILD = @SHARED_BUILD@ INCLUDES = @TCL_INCLUDES@ \ + -I$(srcdir)/../include \ -I$(srcdir)/xmltok \ -I$(srcdir)/xmlparse \ -I$(srcdir)/xmlwf diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/configure tclxml-3.1.new/libxml2/configure --- tclxml-3.1/libxml2/configure 2005-11-03 22:26:52.000000000 -0800 +++ tclxml-3.1.new/libxml2/configure 2005-11-26 23:55:32.000000000 -0800 @@ -1540,7 +1540,8 @@ # 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` \ @@ -5468,7 +5469,9 @@ for d in \ $with_xml2lib \ $exec_prefix/lib \ + $libdir \ /usr/lib \ + /usr/lib64 \ /usr/local/lib do if test -f "$d/libxml2.so" ; then diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/configure.in tclxml-3.1.new/libxml2/configure.in --- tclxml-3.1/libxml2/configure.in 2004-08-14 00:41:11.000000000 -0700 +++ tclxml-3.1.new/libxml2/configure.in 2005-11-26 23:54:28.000000000 -0800 @@ -247,7 +247,9 @@ for d in \ $with_xml2lib \ $exec_prefix/lib \ + $libdir \ /usr/lib \ + /usr/lib64 \ /usr/local/lib do if test -f "$d/libxml2.so" ; then diff -Naur --exclude '*.swp' tclxml-3.1/tclconfig/tcl.m4 tclxml-3.1.new/tclconfig/tcl.m4 --- tclxml-3.1/tclconfig/tcl.m4 2003-12-03 12:06:35.000000000 -0800 +++ tclxml-3.1.new/tclconfig/tcl.m4 2005-11-27 11:58:42.000000000 -0800 @@ -73,10 +73,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 --- NEW FILE tclxml.spec --- Summary: TclXML is a package that provides XML parsing for the Tcl scripting language Name: tclxml Version: 3.1 Release: 1%{?dist} License: BSD Group: Development/Libraries URL: http://tclxml.sourceforge.net/ Source: http://dl.sf.net/tclxml/tclxml-3.1.tar.gz Patch0: tclxml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcl tcl-devel libxml2-devel expat-devel Requires: tcl tcllib %description TclXML is a package that provides XML parsing for the Tcl scripting language. It has three implementations of XML parsers: one written purely in Tcl and wrappers for the expat and Gnome libxml2 C libraries. %package expat Summary: The Tcl xml parser built with the expat xml parser Group: Development/Libraries Requires: tclxml = %{version} %description expat TclXML is a package that provides optimized XML parsing for the Tcl scripting language. This implementation is built against the expat XML parser. %package libxml2 Summary: The Tcl xml parser built with the libxml2 xml parser Group: Development/Libraries Requires: tclxml = %{version} %description libxml2 TclXML is a package that provides optimized XML parsing for the Tcl scripting language. This implementation is built against the libxml2 xml parser. %package devel Summary: Development files for the tclxml packages Group: Development/Libraries Requires: tclxml = %{version} %description devel Development header files for the tclxml packages. This includes the header files for the base, expat, and libxml2 subpackages. %prep %setup -q %patch0 -p1 # Clean up rpmlint warning about line endings on # one of the documentation files. %{__sed} -i 's/\r//' doc/README.xml # Remove execute permission bits on the source files to # clean up rpmlint warnings. chmod a-x README ChangeLog chmod a-x include/tclxml/tclxml.h chmod a-x expat/xmltok/*.c chmod a-x expat/xmltok/*.h chmod a-x expat/xmlwf/*.h chmod a-x expat/xmlwf/*.c chmod a-x expat/xmlparse/*.h chmod a-x expat/xmlparse/*.c chmod a-x libxml2/*.c chmod a-x tclexpat.c chmod a-x tclxml.c #autoreconf #cd expat #autoreconf #cd ../libxml2 #autoreconf %build %configure make %{?_smp_mflags} cd expat %configure --with-Tclxml=.. make %{?_smp_mflags} cd ../libxml2 %configure --with-Tclxml=.. make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT cd expat make install DESTDIR=$RPM_BUILD_ROOT cd ../libxml2 make install DESTDIR=$RPM_BUILD_ROOT # Remove the following header files which really don't need # to be installed. They conflict with headers from # libwww-devel rm -f $RPM_BUILD_ROOT/usr/include/xmlparse.h rm -f $RPM_BUILD_ROOT/usr/include/xmltok.h rm -f $RPM_BUILD_ROOT/usr/include/xmlrole.h %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %{_libdir}/Tclxml%{version}/*.so %{_libdir}/Tclxml%{version}/*.tcl %doc LICENSE ANNOUNCE ChangeLog README RELNOTES %doc doc/* %files expat %defattr(-,root,root) %{_libdir}/Tclexpat%{version} %files libxml2 %defattr(-,root,root) %{_libdir}/TclXML_libxml2%{version} %files devel %defattr(-,root,root) %{_includedir}/* %{_libdir}/TclxmlConfig.sh %{_libdir}/Tclxml%{version}/*.a %changelog * Sat Nov 26 2005 Wart - 3.1-1 - Update to new upstream sources. * Sat Nov 26 2005 Wart - 3.0-3 - Remove dependency on dos2unix with clever sed command. * Fri Nov 25 2005 Wart - 3.0-2 - Fix file permissions to clean up rpmlint warnings. - Add BR: dos2unix to remove DOS line endings on a documentation file. - Other minor fixes to clean up rpmlint warnings. * Fri Jun 17 2005 Wart - 3.0-1 - Updated spec file to conform to Fedora Core 4 standards. - Move autoreconf from the build to the prep stage. * Tue Jan 18 2005 Wart - 3.0-0.fdr.5 - Fix typo in version string for subpackage dependencies. - Don't include the .a library in the base package. * Fri Nov 5 2004 Wart - 3.0-0.fdr.4 - Add epoch to version dependencies in spec file. - Added additional doc files. * Thu Nov 4 2004 Wart - 3.0-0.fdr.3 - enable building on x86_64 * Thu Nov 4 2004 Wart - 3.0-0.fdr.2 - Clean up rpmlint warnings. * Thu Nov 4 2004 Wart - 3.0-0.fdr.1 - Added Fedora-style spec file. - Allow building generic RPMs from the Makefile. - Fix VPATH problems with newer versions of autoconf tools. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tclxml/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Dec 2005 17:54:56 -0000 1.1 +++ .cvsignore 5 Dec 2005 17:56:35 -0000 1.2 @@ -0,0 +1 @@ +tclxml-3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tclxml/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Dec 2005 17:54:56 -0000 1.1 +++ sources 5 Dec 2005 17:56:35 -0000 1.2 @@ -0,0 +1 @@ +35de63a4ceba7a6fdb85dd1a62f2e881 tclxml-3.1.tar.gz From fedora-extras-commits at redhat.com Mon Dec 5 18:15:10 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 5 Dec 2005 13:15:10 -0500 Subject: owners owners.list,1.433,1.434 Message-ID: <200512051815.jB5IFeQ4006974@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6955 Modified Files: owners.list Log Message: Added tclxml Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.433 retrieving revision 1.434 diff -u -r1.433 -r1.434 --- owners.list 4 Dec 2005 23:04:44 -0000 1.433 +++ owners.list 5 Dec 2005 18:15:07 -0000 1.434 @@ -1114,6 +1114,7 @@ Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org| +Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|tetex-arabtex|The ArabTeX package for TeX/LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Dec 5 21:11:15 2005 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Mon, 5 Dec 2005 16:11:15 -0500 Subject: rpms/ghdl/FC-4 ghdl.spec,1.3,1.4 Message-ID: <200512052111.jB5LBiB2012671@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12617 Modified Files: ghdl.spec Log Message: add forgotten changelog entry Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/FC-4/ghdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ghdl.spec 2 Dec 2005 16:40:11 -0000 1.3 +++ ghdl.spec 5 Dec 2005 21:11:11 -0000 1.4 @@ -177,6 +177,9 @@ %{_libexecdir}/gcc/ %changelog +* Mon Dec 5 2005 Thomas Sailer - 0.21-0.24svn.3 +- disable multilib and remove exclude of x86_64 + * Thu Dec 1 2005 Thomas Sailer - 0.21-0.24svn.2 - Exclude ppc because gcc-gnat is missing - Exclude x86_64 because of mock build issues From fedora-extras-commits at redhat.com Mon Dec 5 21:24:33 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 5 Dec 2005 16:24:33 -0500 Subject: rpms/gossip/devel gossip.spec,1.8,1.9 Message-ID: <200512052125.jB5LP3q9012774@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12757 Modified Files: gossip.spec Log Message: * Mon Dec 5 2005 Brian Pepple - 0.9-7 - Add BR for libXScrnSaver-devel, libXt-devel & xorg-x11-proto-devel. Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gossip.spec 4 Dec 2005 14:16:34 -0000 1.8 +++ gossip.spec 5 Dec 2005 21:24:31 -0000 1.9 @@ -2,7 +2,7 @@ Name: gossip Version: 0.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Gnome Jabber Client Group: Applications/Communications @@ -19,6 +19,9 @@ BuildRequires: libxslt-devel BuildRequires: libxml2-devel BuildRequires: libgcrypt-devel +BuildRequires: libXScrnSaver-devel +BuildRequires: libXt-devel +BuildRequires: xorg-x11-proto-devel BuildRequires: desktop-file-utils BuildRequires: aspell-devel BuildRequires: gettext @@ -99,6 +102,9 @@ %changelog +* Mon Dec 5 2005 Brian Pepple - 0.9-7 +- Add BR for libXScrnSaver-devel, libXt-devel & xorg-x11-proto-devel. + * Fri Dec 2 2005 Brian Pepple - 0.9-6 - Rebuild for new dbus. From fedora-extras-commits at redhat.com Mon Dec 5 22:06:59 2005 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 5 Dec 2005 17:06:59 -0500 Subject: rpms/nmh/FC-4 nmh.spec,1.8,1.9 Message-ID: <200512052207.jB5M7TS6014541@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/extras/rpms/nmh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14494/FC-4 Modified Files: nmh.spec Log Message: Add a buildrequires on /bin/vi to make the build process happy. Index: nmh.spec =================================================================== RCS file: /cvs/extras/rpms/nmh/FC-4/nmh.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nmh.spec 10 Nov 2005 21:16:23 -0000 1.8 +++ nmh.spec 5 Dec 2005 22:06:57 -0000 1.9 @@ -1,6 +1,6 @@ Name: nmh Version: 1.1 -Release: 11.fc4 +Release: 12.fc4 Summary: A capable mail handling system with a command line interface. Group: Applications/Internet @@ -13,7 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtermcap-devel BuildRequires: db4-devel -BuildRequires: sendmail +BuildRequires: /usr/sbin/sendmail +BuildRequires: /bin/vi %description Nmh is an email system based on the MH email system and is intended to @@ -65,6 +66,10 @@ %doc docs/TODO docs/README* COPYRIGHT %changelog +* Mon Dec 05 2005 Josh Bressers 0:1.1-12.fc4 +- Add a buildrequires on /bin/vi +- Modify the sendmail buildrequires to use /usr/sbin/sendmail + * Thu Nov 10 2005 Josh Bressers 0:1.1-11.fc4 - Add a sendmail buildrequires to make spost work properly From fedora-extras-commits at redhat.com Mon Dec 5 22:07:05 2005 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 5 Dec 2005 17:07:05 -0500 Subject: rpms/nmh/devel nmh.spec,1.8,1.9 Message-ID: <200512052207.jB5M7Z89014544@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/extras/rpms/nmh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14494/devel Modified Files: nmh.spec Log Message: Add a buildrequires on /bin/vi to make the build process happy. Index: nmh.spec =================================================================== RCS file: /cvs/extras/rpms/nmh/devel/nmh.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nmh.spec 10 Nov 2005 21:16:29 -0000 1.8 +++ nmh.spec 5 Dec 2005 22:07:03 -0000 1.9 @@ -1,6 +1,6 @@ Name: nmh Version: 1.1 -Release: 11.fc5 +Release: 12.fc5 Summary: A capable mail handling system with a command line interface. Group: Applications/Internet @@ -13,7 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtermcap-devel BuildRequires: db4-devel -BuildRequires: sendmail +BuildRequires: /usr/sbin/sendmail +BuildRequires: /bin/vi %description Nmh is an email system based on the MH email system and is intended to @@ -65,6 +66,10 @@ %doc docs/TODO docs/README* COPYRIGHT %changelog +* Mon Dec 05 2005 Josh Bressers 0:1.1-12.fc5 +- Add a buildrequires on /bin/vi +- Modify the sendmail buildrequires to use /usr/sbin/sendmail + * Thu Nov 10 2005 Josh Bressers 0:1.1-11.fc5 - Add a sendmail buildrequires to make spost work properly From fedora-extras-commits at redhat.com Mon Dec 5 22:06:52 2005 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 5 Dec 2005 17:06:52 -0500 Subject: rpms/nmh/FC-3 nmh.spec,1.8,1.9 Message-ID: <200512052208.jB5M82kl014547@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/extras/rpms/nmh/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14494/FC-3 Modified Files: nmh.spec Log Message: Add a buildrequires on /bin/vi to make the build process happy. Index: nmh.spec =================================================================== RCS file: /cvs/extras/rpms/nmh/FC-3/nmh.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nmh.spec 10 Nov 2005 21:16:18 -0000 1.8 +++ nmh.spec 5 Dec 2005 22:06:49 -0000 1.9 @@ -1,6 +1,6 @@ Name: nmh Version: 1.1 -Release: 11.fc3 +Release: 12.fc3 Summary: A capable mail handling system with a command line interface. Group: Applications/Internet @@ -13,7 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtermcap-devel BuildRequires: db4-devel -BuildRequires: sendmail +BuildRequires: /usr/sbin/sendmail +BuildRequires: /bin/vi %description Nmh is an email system based on the MH email system and is intended to @@ -65,6 +66,10 @@ %doc docs/TODO docs/README* COPYRIGHT %changelog +* Mon Dec 05 2005 Josh Bressers 0:1.1-12.fc3 +- Add a buildrequires on /bin/vi +- Modify the sendmail buildrequires to use /usr/sbin/sendmail + * Thu Nov 10 2005 Josh Bressers 0:1.1-11.fc3 - Add a sendmail buildrequires to make spost work properly From fedora-extras-commits at redhat.com Mon Dec 5 23:33:36 2005 From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64)) Date: Mon, 5 Dec 2005 18:33:36 -0500 Subject: web/html/Download vendors.list,1.1,1.2 Message-ID: <200512052334.jB5NY6wn016482@cvs-int.fedora.redhat.com> Author: nman64 Update of /cvs/fedora/web/html/Download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16462/Download Modified Files: vendors.list Log Message: Latest vendors.list in new location Index: vendors.list =================================================================== RCS file: /cvs/fedora/web/html/Download/vendors.list,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vendors.list 29 Nov 2005 17:32:36 -0000 1.1 +++ vendors.list 5 Dec 2005 23:33:34 -0000 1.2 @@ -14,11 +14,15 @@ CompraLinux (Spain only)::3 CDs or 6 CDs::13.92 euro or 24.36 euro +ComputeFree::CDs::$10.99 - 12.99 + +Copyleft Solutions::4 CDs or 1 DVD::Rs 400 or Rs 200 + cosaslibres.com::3 CDs or 6 CDs::25000 Pesos or 48000 Pesos -Custom Web Pages::3 CDs or 6 CDs::$12 or $20 +Custom Web Pages::3 CDs or 6 CDs::$12 or $20 -delinuxspecialist.nl::4 CDs or 7 CDs or DVD Set::8.95 euro or 11.95 euro or 14.95 euro +delinuxspecialist.nl::4 CDs or 7 CDs or DVD Set::8.95 euro or 11.95 euro or 14.95 euro Dr. Hinner EDV, Germany::3 CDs::18 euro @@ -32,7 +36,7 @@ Galuna, Romania::3 CDs::3 euro -EEXI, Hellenic Association of Internet Users (Greece & Cyprus)::3 CDs or 1 DVD::10 euros or 15 euros +EEXI, Hellenic Association of Internet Users (Greece & Cyprus)::3 CDs or 1 DVD::10 euros or 15 euros KoalaSoft Organization::3 CDs or 6 CDs::15 euro or 30 euro (Italy only) @@ -75,3 +79,4 @@ Terrassol Tecnologia::3 CDs::45,00 reais TheLinuxStore.ca::CDs or DVD::7.97 - 9.97 CAD$ + From fedora-extras-commits at redhat.com Mon Dec 5 23:59:16 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Mon, 5 Dec 2005 18:59:16 -0500 Subject: rpms/ortp/devel ortp-0.7.1-Werror.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 ortp.spec, 1.4, 1.5 sources, 1.2, 1.3 ortp-0.7.0-Werror.patch, 1.1, NONE Message-ID: <200512052359.jB5Nxk4A016614@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/ortp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16588 Modified Files: .cvsignore ortp.spec sources Added Files: ortp-0.7.1-Werror.patch Removed Files: ortp-0.7.0-Werror.patch Log Message: Upstream update ortp-0.7.1-Werror.patch: --- NEW FILE ortp-0.7.1-Werror.patch --- --- ortp-0.7.1/configure.Werror 2005-12-04 07:17:34.000000000 -0500 +++ ortp-0.7.1/configure 2005-12-04 07:18:05.000000000 -0500 @@ -2071,10 +2071,6 @@ echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -if test "$GCC" = "yes" ; -then - CFLAGS="$CFLAGS -Werror " -fi fi; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ortp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Nov 2005 20:10:53 -0000 1.2 +++ .cvsignore 5 Dec 2005 23:59:14 -0000 1.3 @@ -1 +1 @@ -ortp-0.7.0.tar.gz +ortp-0.7.1.tar.gz Index: ortp.spec =================================================================== RCS file: /cvs/extras/rpms/ortp/devel/ortp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ortp.spec 30 Nov 2005 14:23:14 -0000 1.4 +++ ortp.spec 5 Dec 2005 23:59:14 -0000 1.5 @@ -1,13 +1,13 @@ Name: ortp -Version: 0.7.0 -Release: 6%{?dist} +Version: 0.7.1 +Release: 1%{?dist} Summary: A C library implementing the RTP protocol (RFC3550) Group: System Environment/Libraries License: LGPL URL: http://www.linphone.org/ortp/ Source0: http://www.linphone.org/ortp/sources/%{name}-%{version}.tar.gz -Patch0: ortp-0.7.0-Werror.patch +Patch0: ortp-0.7.1-Werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= 2.0.0 @@ -52,6 +52,9 @@ %doc %{_datadir}/gtk-doc/html/%{name} %changelog +* Sat Dec 3 2005 Ignacio Vazquez-Abrams 0.7.1-1 +- Upstream update + * Wed Nov 30 2005 Ignacio Vazquez-Abrams 0.7.0-6 - Fix a typo in Requires on -devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/ortp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Nov 2005 20:10:53 -0000 1.2 +++ sources 5 Dec 2005 23:59:14 -0000 1.3 @@ -1 +1 @@ -4a8e1873e15b076698a82d5249e3992d ortp-0.7.0.tar.gz +e69ba3f5a2ac76e3b6117826d0c536b2 ortp-0.7.1.tar.gz --- ortp-0.7.0-Werror.patch DELETED --- From fedora-extras-commits at redhat.com Tue Dec 6 00:17:41 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Mon, 5 Dec 2005 19:17:41 -0500 Subject: rpms/linphone/devel linphone-1.1.0-Werror.patch, NONE, 1.1 linphone-1.1.0-ortp.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 linphone.spec, 1.13, 1.14 sources, 1.3, 1.4 linphone-1.0.1-ortp.patch, 1.1, NONE Message-ID: <200512060017.jB60HfMD018257@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/linphone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18229 Modified Files: .cvsignore linphone.spec sources Added Files: linphone-1.1.0-Werror.patch linphone-1.1.0-ortp.patch Removed Files: linphone-1.0.1-ortp.patch Log Message: Upstream update linphone-1.1.0-Werror.patch: --- NEW FILE linphone-1.1.0-Werror.patch --- --- linphone-1.1.0/configure.Werror 2005-12-05 17:54:55.000000000 -0500 +++ linphone-1.1.0/configure 2005-12-05 17:55:13.000000000 -0500 @@ -23816,10 +23816,6 @@ ;; esac -if test "$GCC" = "yes" ; then - STRICT_OPTIONS="-Wall -Werror" -fi - # Check whether --with-realprefix or --without-realprefix was given. linphone-1.1.0-ortp.patch: --- NEW FILE linphone-1.1.0-ortp.patch --- --- linphone-1.1.0/gnome/Makefile.in.ortp 2005-08-24 18:45:55.000000000 -0400 +++ linphone-1.1.0/gnome/Makefile.in 2005-12-05 17:14:02.000000000 -0500 @@ -343,8 +343,7 @@ @BUILD_GNOME_TRUE at INCLUDES = \ @BUILD_GNOME_TRUE@ -I$(top_srcdir)\ @BUILD_GNOME_TRUE@ -I$(top_srcdir)/intl \ - at BUILD_GNOME_TRUE@ -I$(top_srcdir)/oRTP/src \ - at BUILD_GNOME_TRUE@ -I$(top_srcdir)/oRTP/ \ + at BUILD_GNOME_TRUE@ -I$(includedir)/ortp/ \ @BUILD_GNOME_TRUE@ -I$(top_srcdir)/mediastreamer \ @BUILD_GNOME_TRUE@ -I$(top_srcdir)/speex/libspeex \ @BUILD_GNOME_TRUE@ -I$(top_srcdir)/coreapi \ --- linphone-1.1.0/coreapi/Makefile.in.ortp 2005-08-24 18:45:54.000000000 -0400 +++ linphone-1.1.0/coreapi/Makefile.in 2005-12-05 17:14:02.000000000 -0500 @@ -292,8 +292,7 @@ INCLUDES = \ -I$(top_srcdir)\ -I$(top_srcdir)/exosip\ - -I$(top_srcdir)/oRTP/include \ - -I$(top_srcdir)/oRTP/ \ + -I$(includedir)/ortp/ \ -I$(top_srcdir)/mediastreamer \ $(SPEEX_CFLAGS) \ -I$(osip_prefix)/include/ --- linphone-1.1.0/Makefile.in.ortp 2005-08-24 18:45:54.000000000 -0400 +++ linphone-1.1.0/Makefile.in 2005-12-05 17:14:02.000000000 -0500 @@ -62,7 +62,7 @@ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \ +DIST_SUBDIRS = m4 support pixmaps po ipkg gsmlib lpc10-1.5 \ win32acm mediastreamer mediastreamer2 media_api exosip coreapi \ console gnome share developer-docs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -277,7 +277,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @BUILD_TRUESPEECH_TRUE at WIN32ACM_DIR = win32acm -SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \ +SUBDIRS = m4 support pixmaps po ipkg gsmlib lpc10-1.5 \ $(WIN32ACM_DIR) mediastreamer mediastreamer2\ media_api exosip coreapi console gnome share developer-docs --- linphone-1.1.0/console/Makefile.in.ortp 2005-08-24 18:45:54.000000000 -0400 +++ linphone-1.1.0/console/Makefile.in 2005-12-05 17:14:02.000000000 -0500 @@ -284,8 +284,7 @@ -I$(top_srcdir)/coreapi\ -I$(top_srcdir)/osipua/\ -I$(top_srcdir)/osipua/src \ - -I$(top_srcdir)/oRTP/include \ - -I$(top_srcdir)/oRTP/ \ + -I$(includedir)/ortp/ \ -I$(top_srcdir)/mediastreamer \ $(SPEEX_CFLAGS)\ -I$(osip_prefix)/include \ --- linphone-1.1.0/mediastreamer/Makefile.in.ortp 2005-08-24 18:45:56.000000000 -0400 +++ linphone-1.1.0/mediastreamer/Makefile.in 2005-12-05 17:14:02.000000000 -0500 @@ -68,7 +68,7 @@ @BUILD_TRUESPEECH_TRUE at am__DEPENDENCIES_3 = ../win32acm/libwin32acm.a libmediastreamer_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \ - ../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @@ -356,6 +356,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ +ORTP_LIBS = -lortp OSIP_CFLAGS = @OSIP_CFLAGS@ OSIP_LIBS = @OSIP_LIBS@ PACKAGE = @PACKAGE@ @@ -494,7 +495,7 @@ libmediastreamer_la_LIBADD = $(GLIB_LIBS) \ ../gsmlib/libgsm.la \ ../lpc10-1.5/liblpc10.la \ - ../oRTP/src/libortp.la \ + $(ORTP_LIBS) \ $(JACK_LIBS)\ $(SAMPLERATE_LIBS)\ $(SUPPORTLIB) \ @@ -559,8 +560,7 @@ INCLUDES = -I$(top_srcdir) \ -I$(top_srcdir)/mediastreamer \ - -I$(top_srcdir)/oRTP/include \ - -I$(top_srcdir)/oRTP \ + -I$(includedir)/ortp \ -I$(top_srcdir)/gsmlib \ -I$(top_srcdir)/lpc10-1.5 \ $(SPEEX_CFLAGS) \ --- linphone-1.1.0/mediastreamer2/Makefile.in.ortp 2005-08-24 18:45:57.000000000 -0400 +++ linphone-1.1.0/mediastreamer2/Makefile.in 2005-12-05 17:14:02.000000000 -0500 @@ -55,7 +55,7 @@ @BUILD_UGLIB_TRUE@ $(top_builddir)/support/libuglib.la libmediastreamer2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \ - ../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libmediastreamer2_la_OBJECTS = msfilter.lo msAlawdec.lo \ @@ -216,6 +216,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ +ORTP_LIBS = -lortp OSIP_CFLAGS = @OSIP_CFLAGS@ OSIP_LIBS = @OSIP_LIBS@ PACKAGE = @PACKAGE@ @@ -316,7 +317,7 @@ libmediastreamer2_la_LIBADD = $(GLIB_LIBS) \ ../gsmlib/libgsm.la \ ../lpc10-1.5/liblpc10.la \ - ../oRTP/src/libortp.la \ + $(ORTP_LIBS) \ $(JACK_LIBS)\ $(SUPPORTLIB) \ $(ALSA_LIBS) \ @@ -325,8 +326,7 @@ AM_CFLAGS = $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(TRUESPEECH_CFLAGS) $(IPV6_CFLAGS) INCLUDES = -I$(top_srcdir) \ -I$(top_srcdir)/mediastreamer2 \ - -I$(top_srcdir)/oRTP/include \ - -I$(top_srcdir)/oRTP \ + -I$(includedir)/ortp \ -I$(top_srcdir)/gsmlib \ -I$(top_srcdir)/lpc10-1.5 \ $(SPEEX_CFLAGS) --- linphone-1.1.0/media_api/Makefile.in.ortp 2005-08-24 18:45:56.000000000 -0400 +++ linphone-1.1.0/media_api/Makefile.in 2005-12-05 17:14:02.000000000 -0500 @@ -302,8 +302,7 @@ INCLUDES = -I$(top_srcdir)/mediastreamer \ -I$(top_srcdir)/speex \ -I$(top_srcdir)/gsmlib \ - -I$(top_srcdir)/oRTP \ - -I$(top_srcdir)/oRTP/src \ + -I$(includedir)/ortp \ -I$(top_srcdir)/lpc10-1.5 \ -I$(top_srcdir)/ffmpeg --- linphone-1.1.0/configure.ortp 2005-08-24 18:37:04.000000000 -0400 +++ linphone-1.1.0/configure 2005-12-05 17:17:37.000000000 -0500 @@ -462,8 +462,6 @@ #if HAVE_UNISTD_H # include #endif" - -ac_subdirs_all="$ac_subdirs_all oRTP" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBLINPHONE_SO_VERSION LINPHONE_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RU! LE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ac_pt_PKG_CONFIG LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS LIBGTK_CFLAGS LIBGTK_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS STRICT_OPTIONS IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE JACK_CFLAGS JACK_LI! BS SAMPLERATE_CFLAGS SAMPLERATE_LIBS osip_prefix OSIP_CFLAGS O! SIP_LI EXOSIP_CFLAGS EXOSIP_LIBS SPEEX_CFLAGS SPEEX_LIBS ILBC_CFLAGS ILBC_LIBS ${NAME}_CFLAGS ${NAME}_LIBS VIDEO_CFLAGS VIDEO_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_UGLIB_TRUE BUILD_UGLIB_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE BUILD_SPEEX_TRUE BUILD_SPEEX_FALSE ARMBUILD_TRUE ARMBUILD_FALSE BUILD_VIDEO_TRUE BUILD_VIDEO_FALSE ALSA_LIBS subdirs HTML_DIR GTK_DOC_CFLAGS GTK_DOC_LIBS ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE have_db2html ENABLE_MANUAL_TRUE ENABLE_MANUAL_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -29745,9 +29743,6 @@ -subdirs="$subdirs oRTP" - - ################################################## # Check for gtk-doc. ################################################## Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/linphone/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Mar 2005 19:32:18 -0000 1.3 +++ .cvsignore 6 Dec 2005 00:17:38 -0000 1.4 @@ -1 +1 @@ -linphone-1.0.1.tar.gz +linphone-1.1.0.tar.gz Index: linphone.spec =================================================================== RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- linphone.spec 30 Nov 2005 15:13:33 -0000 1.13 +++ linphone.spec 6 Dec 2005 00:17:38 -0000 1.14 @@ -1,15 +1,16 @@ Name: linphone -Version: 1.0.1 -Release: 5%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Phone anywhere in the whole world by using the Internet Group: Applications/Communications License: GPL URL: http://www.linphone.org/?lang=us&rubrique=1 -Source0: http://simon.morlat.free.fr/download/1.0.x/source/linphone-1.0.1.tar.gz +Source0: http://simon.morlat.free.fr/download/1.1.x/source/%{name}-%{version}.tar.gz Patch: linphone-1.0.1-pkgconfig.patch Patch1: linphone-1.0.1-desktop.patch -Patch2: linphone-1.0.1-ortp.patch +Patch2: linphone-1.1.0-ortp.patch +Patch3: linphone-1.1.0-Werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel @@ -45,6 +46,7 @@ %patch -p 1 -b .pkgconfig %patch1 -p 1 -b .old %patch2 -p 1 -b .ortp +%patch3 -p 1 -b .Werror rm -r oRTP %build @@ -97,6 +99,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Dec 5 2005 Ignacio Vazquez-Abrams 1.1.0-1 +- Upstream update + * Wed Nov 30 2005 Ignacio Vazquez-Abrams 1.0.1-5 - Remove ortp documentation for -devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/linphone/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Mar 2005 19:32:18 -0000 1.3 +++ sources 6 Dec 2005 00:17:38 -0000 1.4 @@ -1 +1 @@ -d65f977dd6512b7725fcb2e2c9713e65 linphone-1.0.1.tar.gz +9f164b41c76ef1caca164909dea199a1 linphone-1.1.0.tar.gz --- linphone-1.0.1-ortp.patch DELETED --- From fedora-extras-commits at redhat.com Tue Dec 6 00:36:11 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Mon, 5 Dec 2005 19:36:11 -0500 Subject: rpms/linphone/devel linphone.spec,1.14,1.15 Message-ID: <200512060036.jB60afVf018421@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/linphone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18404 Modified Files: linphone.spec Log Message: Added version on ortp-devel Index: linphone.spec =================================================================== RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- linphone.spec 6 Dec 2005 00:17:38 -0000 1.14 +++ linphone.spec 6 Dec 2005 00:36:09 -0000 1.15 @@ -1,6 +1,6 @@ Name: linphone Version: 1.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Phone anywhere in the whole world by using the Internet Group: Applications/Communications @@ -15,7 +15,7 @@ BuildRequires: gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel BuildRequires: libosip2-devel speex-devel gettext desktop-file-utils -BuildRequires: ortp-devel +BuildRequires: ortp-devel >= 0.7.1 %description Linphone is mostly sip compliant. It works successfully with these @@ -99,6 +99,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Dec 5 2005 Ignacio Vazquez-Abrams 1.1.0-2 +- Added version on ortp-devel + * Mon Dec 5 2005 Ignacio Vazquez-Abrams 1.1.0-1 - Upstream update From fedora-extras-commits at redhat.com Tue Dec 6 02:56:31 2005 From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme)) Date: Mon, 5 Dec 2005 21:56:31 -0500 Subject: rpms/fortune-firefly/FC-3 firefly, 1.3, 1.4 fortune-firefly.spec, 1.2, 1.3 Message-ID: <200512060257.jB62v16I022110@cvs-int.fedora.redhat.com> Author: meme Update of /cvs/extras/rpms/fortune-firefly/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22059/FC-3 Modified Files: firefly fortune-firefly.spec Log Message: Latest version Index: firefly =================================================================== RCS file: /cvs/extras/rpms/fortune-firefly/FC-3/firefly,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- firefly 12 Oct 2005 23:39:12 -0000 1.3 +++ firefly 6 Dec 2005 02:56:29 -0000 1.4 @@ -1892,7 +1892,7 @@ Simon: "It was either that or the National Anthem. Reports vary." % -Jayne: "Saint Jane, it's got a ring to it!" +Jayne: "Saint Jayne, it's got a ring to it!" Book: "I'm just trying to remember how many miracles you've performed." @@ -2340,13 +2340,13 @@ Wash: "Fine!" % -Jayne: "Jayne'll be worth something if you run into trouble, but don't trust +Mal: "Jayne'll be worth something if you run into trouble, but don't trust him, and don't let him take over. You're paid up through the end of the month, this is still your ship." Inara: "Mal..." -Jayne: "As far as your security deposit goes, that I might have to owe you. " +Mal: "As far as your security deposit goes, that I might have to owe you. " % Mal: "If it's Alliance trouble you got, you might want to consider another @@ -2572,6 +2572,7 @@ % Atherton: "Well, get ready to starve! I'll see to it you never work again. + Inara: Actually, that's not how it works. You see, you've earned yourself a black mark in the client registry. No Companion is going to contact with you ever again." @@ -2849,7 +2850,7 @@ operation in the galaxy, and you put them in a room with a psychic." % -Operative: "I certain older civilized cultures, when men failed as +Operative: "In certain older civilized cultures, when men failed as completely as you have, they would throw themselves on their swords." Dr. Mathias: "Well, unfortunately, I forgot to bring a sword..." @@ -2893,7 +2894,7 @@ Jayne (whining): "Explode? I don't wanna explode!" % -Mal: "I thought you said it would hold for another week." +Mal: "You told me the entry couplings would hold for another week!" Kaylee: "That was six months ago, cap'n." @@ -2955,7 +2956,7 @@ Mal: "Well, you don't want it to look like you just gave up." % -Mal: "We mean to be theiving here, but what we are after is not yours. So +Mal: "We mean to be thieving here, but what we are after is not yours. So let's have no undue fuss." % @@ -3051,7 +3052,7 @@ Jayne (interrupting the "safe words" that make River fall asleep): "Well don't say it!!!" -Wash: "It only works on her, Jayne." +Zoe: "It only works on her, Jayne." Jayne: "Oh. Well, now I know that." @@ -3240,7 +3241,7 @@ % Simon: "We'll get off. River and I will get off and..." -Zoe: "Nobody's saying that." +Kaylee: "Nobody's saying that." Wash: "Nobody besides Jayne is saying that." @@ -3513,6 +3514,13 @@ [Ed: There's mandatory candy?] % +Mal: "Hello, little one. You know your part in this?" + +River: (beat) "Do you?" + +Mal: "It's what I do, darlin'." (sighing) "It's what I do." + +% --Package Maintainers note--: If your favorite Firefly quote is not in here, or you can help correct/expand a quote from "Serenity", please drop me a line at meme at daughtersoftiresias.org. Index: fortune-firefly.spec =================================================================== RCS file: /cvs/extras/rpms/fortune-firefly/FC-3/fortune-firefly.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fortune-firefly.spec 12 Oct 2005 23:39:12 -0000 1.2 +++ fortune-firefly.spec 6 Dec 2005 02:56:29 -0000 1.3 @@ -1,6 +1,6 @@ Name: fortune-firefly -Version: 2.0 -Release: 1 +Version: 2.0.1 +Release: 1%{?dist} Summary: Quotes from the TV series "Firefly" Group: Amusements/Games @@ -49,6 +49,13 @@ %changelog +* Mon Dec 05 2005 Karen Pease - 2.0.1 +- Incorporated some typo corrections from Zack Elan (zackelan at gmail.com) +- Changed the versioning style + +* Wed Oct 12 2005 Karen Pease - 2.0.3 +- Fixed some quotes, added one more. + * Wed Oct 12 2005 Karen Pease - 2.0 - Someone who wanted to remain anonymous graciously offered his time to correct Serenity quotes using a Visual Companion, which contains the From fedora-extras-commits at redhat.com Tue Dec 6 02:56:36 2005 From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme)) Date: Mon, 5 Dec 2005 21:56:36 -0500 Subject: rpms/fortune-firefly/FC-4 firefly, 1.3, 1.4 fortune-firefly.spec, 1.3, 1.4 Message-ID: <200512060257.jB62v6h2022118@cvs-int.fedora.redhat.com> Author: meme Update of /cvs/extras/rpms/fortune-firefly/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22059/FC-4 Modified Files: firefly fortune-firefly.spec Log Message: Latest version Index: firefly =================================================================== RCS file: /cvs/extras/rpms/fortune-firefly/FC-4/firefly,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- firefly 12 Oct 2005 23:39:13 -0000 1.3 +++ firefly 6 Dec 2005 02:56:34 -0000 1.4 @@ -1892,7 +1892,7 @@ Simon: "It was either that or the National Anthem. Reports vary." % -Jayne: "Saint Jane, it's got a ring to it!" +Jayne: "Saint Jayne, it's got a ring to it!" Book: "I'm just trying to remember how many miracles you've performed." @@ -2340,13 +2340,13 @@ Wash: "Fine!" % -Jayne: "Jayne'll be worth something if you run into trouble, but don't trust +Mal: "Jayne'll be worth something if you run into trouble, but don't trust him, and don't let him take over. You're paid up through the end of the month, this is still your ship." Inara: "Mal..." -Jayne: "As far as your security deposit goes, that I might have to owe you. " +Mal: "As far as your security deposit goes, that I might have to owe you. " % Mal: "If it's Alliance trouble you got, you might want to consider another @@ -2572,6 +2572,7 @@ % Atherton: "Well, get ready to starve! I'll see to it you never work again. + Inara: Actually, that's not how it works. You see, you've earned yourself a black mark in the client registry. No Companion is going to contact with you ever again." @@ -2849,7 +2850,7 @@ operation in the galaxy, and you put them in a room with a psychic." % -Operative: "I certain older civilized cultures, when men failed as +Operative: "In certain older civilized cultures, when men failed as completely as you have, they would throw themselves on their swords." Dr. Mathias: "Well, unfortunately, I forgot to bring a sword..." @@ -2893,7 +2894,7 @@ Jayne (whining): "Explode? I don't wanna explode!" % -Mal: "I thought you said it would hold for another week." +Mal: "You told me the entry couplings would hold for another week!" Kaylee: "That was six months ago, cap'n." @@ -2955,7 +2956,7 @@ Mal: "Well, you don't want it to look like you just gave up." % -Mal: "We mean to be theiving here, but what we are after is not yours. So +Mal: "We mean to be thieving here, but what we are after is not yours. So let's have no undue fuss." % @@ -3051,7 +3052,7 @@ Jayne (interrupting the "safe words" that make River fall asleep): "Well don't say it!!!" -Wash: "It only works on her, Jayne." +Zoe: "It only works on her, Jayne." Jayne: "Oh. Well, now I know that." @@ -3240,7 +3241,7 @@ % Simon: "We'll get off. River and I will get off and..." -Zoe: "Nobody's saying that." +Kaylee: "Nobody's saying that." Wash: "Nobody besides Jayne is saying that." @@ -3513,6 +3514,13 @@ [Ed: There's mandatory candy?] % +Mal: "Hello, little one. You know your part in this?" + +River: (beat) "Do you?" + +Mal: "It's what I do, darlin'." (sighing) "It's what I do." + +% --Package Maintainers note--: If your favorite Firefly quote is not in here, or you can help correct/expand a quote from "Serenity", please drop me a line at meme at daughtersoftiresias.org. Index: fortune-firefly.spec =================================================================== RCS file: /cvs/extras/rpms/fortune-firefly/FC-4/fortune-firefly.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fortune-firefly.spec 12 Oct 2005 23:39:13 -0000 1.3 +++ fortune-firefly.spec 6 Dec 2005 02:56:34 -0000 1.4 @@ -1,6 +1,6 @@ Name: fortune-firefly -Version: 2.0 -Release: 2 +Version: 2.0.1 +Release: 1%{?dist} Summary: Quotes from the TV series "Firefly" Group: Amusements/Games @@ -49,6 +49,13 @@ %changelog +* Mon Dec 05 2005 Karen Pease - 2.0.1 +- Incorporated some typo corrections from Zack Elan (zackelan at gmail.com) +- Changed the versioning style + +* Wed Oct 12 2005 Karen Pease - 2.0.3 +- Fixed some quotes, added one more. + * Wed Oct 12 2005 Karen Pease - 2.0 - Someone who wanted to remain anonymous graciously offered his time to correct Serenity quotes using a Visual Companion, which contains the From fedora-extras-commits at redhat.com Tue Dec 6 02:56:42 2005 From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme)) Date: Mon, 5 Dec 2005 21:56:42 -0500 Subject: rpms/fortune-firefly/devel firefly, 1.4, 1.5 fortune-firefly.spec, 1.6, 1.7 Message-ID: <200512060257.jB62vC7N022122@cvs-int.fedora.redhat.com> Author: meme Update of /cvs/extras/rpms/fortune-firefly/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22059/devel Modified Files: firefly fortune-firefly.spec Log Message: Latest version Index: firefly =================================================================== RCS file: /cvs/extras/rpms/fortune-firefly/devel/firefly,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- firefly 13 Oct 2005 03:01:04 -0000 1.4 +++ firefly 6 Dec 2005 02:56:40 -0000 1.5 @@ -1892,7 +1892,7 @@ Simon: "It was either that or the National Anthem. Reports vary." % -Jayne: "Saint Jane, it's got a ring to it!" +Jayne: "Saint Jayne, it's got a ring to it!" Book: "I'm just trying to remember how many miracles you've performed." @@ -2340,13 +2340,13 @@ Wash: "Fine!" % -Jayne: "Jayne'll be worth something if you run into trouble, but don't trust +Mal: "Jayne'll be worth something if you run into trouble, but don't trust him, and don't let him take over. You're paid up through the end of the month, this is still your ship." Inara: "Mal..." -Jayne: "As far as your security deposit goes, that I might have to owe you. " +Mal: "As far as your security deposit goes, that I might have to owe you. " % Mal: "If it's Alliance trouble you got, you might want to consider another @@ -2572,6 +2572,7 @@ % Atherton: "Well, get ready to starve! I'll see to it you never work again. + Inara: Actually, that's not how it works. You see, you've earned yourself a black mark in the client registry. No Companion is going to contact with you ever again." Index: fortune-firefly.spec =================================================================== RCS file: /cvs/extras/rpms/fortune-firefly/devel/fortune-firefly.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fortune-firefly.spec 13 Oct 2005 03:01:05 -0000 1.6 +++ fortune-firefly.spec 6 Dec 2005 02:56:40 -0000 1.7 @@ -1,6 +1,6 @@ Name: fortune-firefly -Version: 2.0 -Release: 4 +Version: 2.0.1 +Release: 1%{?dist} Summary: Quotes from the TV series "Firefly" Group: Amusements/Games @@ -49,6 +49,10 @@ %changelog +* Mon Dec 05 2005 Karen Pease - 2.0.1 +- Incorporated some typo corrections from Zack Elan (zackelan at gmail.com) +- Changed the versioning style + * Wed Oct 12 2005 Karen Pease - 2.0.3 - Fixed some quotes, added one more. From fedora-extras-commits at redhat.com Tue Dec 6 05:03:14 2005 From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64)) Date: Tue, 6 Dec 2005 00:03:14 -0500 Subject: web/html/Download vendors.list,1.2,1.3 Message-ID: <200512060504.jB654FCT027241@cvs-int.fedora.redhat.com> Author: nman64 Update of /cvs/fedora/web/html/Download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27208/html/Download Modified Files: vendors.list Log Message: Add LinPro to vendors list Index: vendors.list =================================================================== RCS file: /cvs/fedora/web/html/Download/vendors.list,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vendors.list 5 Dec 2005 23:33:34 -0000 1.2 +++ vendors.list 6 Dec 2005 05:03:06 -0000 1.3 @@ -46,6 +46,8 @@ LinCD::4 CDs or 1 DVD::$7.96 or $2.99 +LinPro::4 CDs or 1 DVD::107.10 CZK or 95 CZK + LinuxBazar (India only)::3 CDs::INR 100 + shipping LinuxElectrons::3 CDs 1 DVD::$7 or $9 From fedora-extras-commits at redhat.com Tue Dec 6 05:03:45 2005 From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64)) Date: Tue, 6 Dec 2005 00:03:45 -0500 Subject: web/html/download vendors.list,1.8,1.9 Message-ID: <200512060504.jB654F4l027242@cvs-int.fedora.redhat.com> Author: nman64 Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27208/html/download Modified Files: vendors.list Log Message: Add LinPro to vendors list Index: vendors.list =================================================================== RCS file: /cvs/fedora/web/html/download/vendors.list,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- vendors.list 1 Dec 2005 22:02:40 -0000 1.8 +++ vendors.list 6 Dec 2005 05:03:43 -0000 1.9 @@ -46,6 +46,8 @@ LinCD::4 CDs or 1 DVD::$7.96 or $2.99 +LinPro::4 CDs or 1 DVD::107.10 CZK or 95 CZK + LinuxBazar (India only)::3 CDs::INR 100 + shipping LinuxElectrons::3 CDs 1 DVD::$7 or $9 From fedora-extras-commits at redhat.com Tue Dec 6 05:11:14 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 6 Dec 2005 00:11:14 -0500 Subject: web/include navigation.inc,1.14,1.15 Message-ID: <200512060511.jB65BiRb027308@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27291 Modified Files: navigation.inc Log Message: Crufty links to docs found their way into the navigation.inc, replaced with useful links. Index: navigation.inc =================================================================== RCS file: /cvs/fedora/web/include/navigation.inc,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- navigation.inc 29 Nov 2005 17:36:14 -0000 1.14 +++ navigation.inc 6 Dec 2005 05:11:11 -0000 1.15 @@ -16,9 +16,10 @@ "News"=>array("uri"=>"/News/"), "Documentation"=>array("uri"=>"/docs/","sub"=>array( "Release Notes"=>array("uri"=>"/docs/release-notes/"), + "Installation Guide"=>array("uri"=>"/docs/fedora-install-guide-en/"), + "Managing Software With Yum"=>array("uri"=>"/docs/yum/index.php"), "Jargon Buster"=>array("uri"=>"/docs/jargon-buster/"), "SELinux FAQ"=>array("uri"=>"/docs/selinux-faq/"), - "Keeping Up to Date"=>array("uri"=>"/docs/updates/"), "Developer's Guide"=>array("uri"=>"/docs/developers-guide/"), "Documentation Guide"=>array("uri"=>"/docs/documentation-guide/"), )), From fedora-extras-commits at redhat.com Tue Dec 6 06:46:37 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 6 Dec 2005 01:46:37 -0500 Subject: web/html/About FAQ.php,NONE,1.1 Message-ID: <200512060646.jB66kbg2029085@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/About In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29074 Added Files: FAQ.php Log Message: I'm hoping gdk forgot to add this to the repo, otherwise this content needs a refresh and the links do, too. I'm putting this in a placeholder to avoid 404 errors. ***** Error reading new file: [Errno 2] No such file or directory: 'FAQ.php' From fedora-extras-commits at redhat.com Tue Dec 6 06:53:21 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 6 Dec 2005 01:53:21 -0500 Subject: web/html/About/legal index.php,NONE,1.1 Message-ID: <200512060653.jB66rL1a029195@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/About/legal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/About/legal Added Files: index.php Log Message: I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content. I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more. Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up. ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Tue Dec 6 06:53:09 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 6 Dec 2005 01:53:09 -0500 Subject: web/html/About/Projects/translations translation-faq.php,1.1,1.2 Message-ID: <200512060654.jB66sAtc029330@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/About/Projects/translations In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/About/Projects/translations Modified Files: translation-faq.php Log Message: I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content. I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more. Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up. Index: translation-faq.php =================================================================== RCS file: /cvs/fedora/web/html/About/Projects/translations/translation-faq.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- translation-faq.php 29 Nov 2005 17:31:07 -0000 1.1 +++ translation-faq.php 6 Dec 2005 06:53:07 -0000 1.2 @@ -18,24 +18,24 @@

Q: Does the Fedora Project need translators?

-Yes. We welcome everyone's contribution. You can contribute as a translator, a proof reader or a locale maintainer. +Yes. We welcome everyone's contribution. You can contribute as a translator, a proof reader, or a locale maintainer.

Q: How can I become a translator?

-To become a translator, you need to register for a cvs account at the sign up page. +To become a translator, you need to register for a CVS account at the sign up page. If there is an existing fedora translator's mailing list for your locale, you need to join that mailing list too.

-

Q: I use Windows operating system, can I still participate?

+

Q: I use a Microsoft Windows operating system, can I still participate?

-Yes you can, however, you need to be able to manage ssh and cvs on your current operating system. +Yes you can, however, you need to be able to manage ssh and CVS on your current operating system.

Q: What sort of the files do we translate?

-There are two types of translation: software interface and documentation. Both types of files are in PO format. Currently only software interface type of files are available for translation. Once the documentation files are available, it will be announced via fedora translation project mailing list. +There are two types of translation: software interface and documentation. Both types of files are in PO format. Currently only software interface type of files are available for translation through the Web-based translation tools. Documentation translation currently requires direct CVS access through the Fedora Documentation Project, refer to the wiki at DocsProject/Translation for more information.

Q: Where do I get the files to translate?

-The files are stored in CVS. You need to "check out" the files from CVS. Refer to the CVS FAQ for more information. +The files are stored in CVS. You need to check out the files from CVS. Refer to the CVS FAQ for more information.

Q: Is there any translation guide for the Fedora Project?

@@ -43,11 +43,11 @@

Q: How can I request to have a mailing list set up for my locale?

-If there are 5 or more people are contributing to the translation of a locale, a mailing list dedicated to that locale can be set up. You may find your fellow contributors and request new mailing list from the fedora translation project mailing list. +If there are 5 or more people who are contributing to the translation of a locale, a mailing list dedicated to that locale can be set up. You may find your fellow contributors and request a new mailing list from the fedora translation project mailing list.

Q: There are no existing po files for my locale. How can I add the new locale?

-Send your request to fedora translation project mailing list, you will be notified when the initial files are created and ready for translation. +Send your request to the fedora translation project mailing list, you will be notified when the initial files are created and ready for translation.

Q: How do I get my new locale enabled for installs?

@@ -58,60 +58,59 @@

  1. Close all instances of the programs that use the .po file
  2. Go to the directory that contains the file and then run : -
    	$ msgfmt your_locale.po -o package_name.mo 
+
    $ msgfmt your_locale.po -o package_name.mo
  3. Make a backup copy of the file /usr/share/locale/your_locale/LC_MESSAGES/package_name.mo
  4. Copy the new file in the catalog directory: -
    -$	cp package_name.mo /usr/share/locale/your_locale/LC_MESSAGES/.
+
    $ cp package_name.mo /usr/share/locale/your_locale/LC_MESSAGES/
    5. -
  5. Run the program and your translation will be there.
    6. +
  6. Run the program and your translation should be in use.
-

Q: Will the newest po file automatically be included in the next distribuited rpm package?

+

Q: Is the newest po file automatically be included in the next distribuited rpm package?

-The answer is "yes" if the newest po file is commited to cvs before the final build of the rpm package. However, this is not an automated process at this stage. The best way to ensure your translation is included in the release is to adhere the translation freeze date, as outlined on Fedora schedule page. +The answer is "yes" if the newest po file is commited to CVS before the final build of the software package (RPM). However, this is not an automated process at this stage. The best way to ensure your translation is included in the release is to adhere to the translation freeze date, as outlined on Fedora schedule page.

-

Q: What should I do if my translations is not included in the distributed rpm package?

+

Q: What should I do if my translations is not included in the distributed package?

-File a bug report against that package on bugzilla, providing detailed information such as your locale, the version of the po file etc. +File a bug report against that package on bugzilla, providing detailed information such as your locale, the version of the po file, and so forth.

-

CVS FAQ

+

CVS FAQ

Q: How can I get a CVS account?

To get a CVS account, you need to register as a translator at the sign up page.

-

Q: How do I generate the ssh keys required for cvs account?

-

Issue the command "ssh-keygen -t dsa" in a terminal, accepting the default location ~/.ssh/. Your public key will be ~/.ssh/id_dsa.pub. You need to copy and paste the content of that file into the registration page. +

Q: How do I generate the ssh keys required for CVS account?

+

Issue the command "ssh-keygen -t dsa" in a terminal, accepting the default location ~/.ssh/. Your newly created public key is at ~/.ssh/id_dsa.pub. You need to copy and paste the content of that file into the registration page.

Q: I forgot the password to my ssh keys, what should I do?

You need to generate another set of ssh keys and email i18n at redhat.com with your login name and the new public key to get your account information updated.

-

Q: I have a working account, How do I ceckout the files from cvs server?

+

Q: I have a working account, how do I checkout the files from the CVS server?

-Open a terminal and issue following commands: +Open a terminal and issue the following commands: 

 $ export CVS_RSH=ssh
-$ export CVSROOT=:ext:@i18n.redhat.com:/usr/local/CVS
+$ export CVSROOT=:ext:USERNAME@i18n.redhat.com:/usr/local/CVS
 $ cvs -z9 co translate

Q: What is the CVSROOT to check out the translation files?

-CVSROOT=:ext:@i18n.redhat.com:/usr/local/CVS +CVSROOT=:ext:USERNAME@i18n.redhat.com:/usr/local/CVS

-

Q: I get timeout error when connecting to cvs, what should I check first?

+

Q: I get a timeout error when connecting to CVS, what should I check first?

-You need to check if you have specified "export CVS_RSH=ssh" when trying to connect to cvs server. +You need to check if you have specified "export CVS_RSH=ssh" when trying to connect to the CVS server.

-

Q: I get "permission denied" error when connecting to cvs, what should I do?

+

Q: I get a "permission denied" error when connecting to CVS, what should I do?

-You need to first make sure that your cvs account has been approved. If you have an active cvs account but still get "permission denied" error, email i18n at redhat.com with your current ssh key file (~/.ssh/id_dsa.pub) as attachment. +First, make sure that your CVS account has been approved. If you have an active CVS account but still get the "permission denied" error, email i18n at redhat.com with your current ssh key file (~/.ssh/id_dsa.pub) as an attachment.

-

Q: I have done the initial checkout from the cvs server. What should I do if I want the latest version?

+

Q: I have done the initial checkout from the CVS server. What should I do if I want the latest version?

Open a terminal, change to your "translate" directory, issue the following command: 

@@ -122,47 +121,47 @@
 

 Open a terminal, change to the directory containing the po file, issue the following command:
 
-$ cvs -f commit -l -m ''some message you want to record in the log'
+$ cvs -f commit -l -m "some message you want to record in the log"
 
 

-
 Q: Can I add files to cvs? 

+
 Q: Can I add files to CVS? 

 

-No. If you need to add new po files to any package, send your completed translation to i18n.redhat.com for cvs addition.
+No. If you need to add new po files to any package, send your completed translation to i18n.redhat.com for CVS addition.
 

 

 
 Status Page FAQ 

 
 Q: How do I see the translation status of my locale? 

 

-Go to the status page, select your language from the drop down list, then press Show Status button.
+Go to the status page, select your language from the drop down list, then press the Show Status button.
 

-
 Q: What does the "availability" field of each package mean? 

+
 Q: What does the Availability field of each package mean? 

 

-Availability field indicates the different translation status of the file.
+The Availability field indicates the different translation status of the file.
 

 
    
-
  •  Finished: The translation is finished. Anyone with cvs access to that locale is able to review and make changes to the file. 
    • 
-
  •  QA: The file is translated and waiting to be QA'ed by the package maintainer. 
    • 
-
  •  Take: The translation is not complete and is available. Anyone with cvs access to that locale is able to take the translation task. 
    • 
-
  •  Assigned: The file is currently being translated by another person. Only the assigned translator is able to commit the changes to that file. 
    • 
+
  •  Finished: The translation is finished. Anyone with CVS access to that locale is able to review and make changes to the file. 
    • 
+
  •  QA: The file is translated and waiting to be QA'ed by the package maintainer. 
    • 
+
  •  Take: The translation is not complete and is available. Anyone with CVS access to that locale is able to take the translation task. 
    • 
+
  •  Assigned: The file is currently being translated by another person. Only the assigned translator is able to commit changes to that file. 
    • 
 

 
 Q: How do I "take" the files I want to translate? 

 

-If a file is available for translation, the availability field will show a Take button. Click that button, enter your username and password. Then the availability field will be changed to Assigned. The username is your cvs account login name, your password is the pin code issued when the account was approved.
+If a file is available for translation, the Availability field shows a Take button. Click that button, enter your username and password. Then the availability field will be changed to Assigned. The username is your CVS account login name, your password is the PIN code issued when the account was approved.
 

 
 Q: What should I do if I don't want to translate the file I've taken any more? 

 

-You should "release" the file if you no longer wish to work on it. Click the package name, then press Release button in Translation Status field. The file then is available for taken by other translators.
+You should "release" the file if you no longer wish to work on it. Click the package name, then press Release button in the Translation Status field. The file then is available to be taken by other translators.
 

-
 Q: I forgot my pin code. What should I do? 

+
 Q: I forgot my PIN code. What should I do? 

 

-Email i18n at redhat.com with your login name. Your pin code will be reissued and send to the email address you used to register the cvs account.
+Email i18n at redhat.com with your login name. Your PIN code is reissued and sent to the email address you used to register the CVS account.
 

 
 Q: How can I apply to be the maintainer of a package? 

 

-If you have translated most part of a particular package and wish to maintain any future translation to keep the consistency, you can apply to be the maintainer for that package in your locale. Click on the package name, then click Apply button next to Maintainer field.
+If you have translated most part of a particular package and wish to maintain any future translation to keep the consistency, you can apply to be the maintainer for that package in your locale. Click on the package name, then click Apply button next to Maintainer field.
 

 
 Q: I'm a maintainer. How can I approve the files in QA stage? 

 

-Click on the package name, then click Approve next to the Translation Status field.
+Click on the package name, then click Approve next to the Translation Status field.
 

 
 Q: I like to have new features implemented in the status page. Who should I contact? 

 




From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:43 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:43 -0500
Subject: web/html/Download install.php,1.1,1.2
Message-ID: <200512060654.jB66sD0k029333@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/Download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/Download

Modified Files:
	install.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: install.php
===================================================================
RCS file: /cvs/fedora/web/html/Download/install.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- install.php	29 Nov 2005 17:32:36 -0000	1.1
+++ install.php	6 Dec 2005 06:53:40 -0000	1.2
@@ -10,7 +10,7 @@
 
 
Download and Installation Instructions

 

-Read through the instructions before you begin to download Fedora Core.  These instructions are also available in a printable version.
+Read through the instructions before you begin to download Fedora Core.  These instructions are also available in a printable version.  For a more detailed treatment, refer to the Fedora Installation Guide.
 

 
 




From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:15 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:15 -0500
Subject: web/html/About/Projects/translations/translation-windows
	generated-index.php, 1.1, 1.2 index.php, 1.1,
	1.2 ln-legalnotice.php, 1.1, 1.2 s1-cvs.php, 1.1,
	1.2 s1-cycle.php, 1.1, 1.2 s1-poedit.php, 1.1, 1.2 s1-reg.php,
	1.1, 1.2 s1-resource.php, 1.1, 1.2 s1-setup.php, 1.1,
	1.2 s1-ssh.php, 1.1, 1.2
Message-ID: <200512060654.jB66sFHO029337@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/About/Projects/translations/translation-windows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/About/Projects/translations/translation-windows

Modified Files:
	generated-index.php index.php ln-legalnotice.php s1-cvs.php 
	s1-cycle.php s1-poedit.php s1-reg.php s1-resource.php 
	s1-setup.php s1-ssh.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: generated-index.php
===================================================================
RCS file: /cvs/fedora/web/html/About/Projects/translations/translation-windows/generated-index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- generated-index.php	29 Nov 2005 17:31:12 -0000	1.1
+++ generated-index.php	6 Dec 2005 06:53:13 -0000	1.2
@@ -7,7 +7,7 @@
 
 ?>
 
-
Index
Prev???
Index
F
Fedora Account
register, Register Your Fedora Account
I
Introduction, Introduction
L
Lifecycle, Translation Lifecycle
P
poEdit
download, Download and Install !
 poEdit
install, Download and Install poEdit
setup, Setup poEdit
start, Setup poEdit
R
resource
websites,  Related Websites 
S
SSH keys, Generate Your Digital ID
Status page
release,  Phase 5 
take,  Phase 1 
T
TortoiseCVS
connecting to cvs server,  Download Files from Fedora Server 
cvs commit,  Phase 4 
cvs up,  Phase 2 
download, Download and Install TortoiseCVS
install, Download and Install TortoiseCVS
setup,  Set up TortoiseCVS 
Prev?Up?
8.?Other Resources?Home?

+
Index
Prev   
Index
F
Fedora Account
register, Register Your Fedora Account
I
Introduction, Introduction
L
Lifecycle, Translation Lifecycle
P
poEdit
download, Downlo!
 ad and Install poEdit
install, Download and Install poEdit
setup, Setup poEdit
start, Setup poEdit
R
resource
websites,  Related Websites 
S
SSH keys, Generate Your Digital ID
Status page
release,  Phase 5 
take,  Phase 1 
T
TortoiseCVS
connecting to cvs server,  Download Files from Fedora Server 
cvs commit,  Phase 4 
cv!
 s up,  Phase 2 
!
 downlo
 Download and Install TortoiseCVS
install, Download and Install TortoiseCVS
setup,  Set up TortoiseCVS 
Prev Up 
8. Other Resources Home 

 
 
 
-
Translate Fedora in Microsoft Windows
???Next
Translate Fedora in Microsoft? Windows?
Chester Cheng
Copyright ? 2004 Red Hat, Inc., Chester Cheng
1. Introduction
2. !
 Download and Install TortoiseCVS
3. Generate Your Digital ID
4. Register Your Fedora Account
5. Using TortoiseCVS
5.1.  Set up TortoiseCVS 
5.2.  Download Files from Fedora Server 
6.  poEdit 
6.1. Download and Install poEdit
6.2. Setup poEdit
7. Translation Lifecycle
7.1.  Phase 1 
7.2.  Phase 2 
7.3.  Phase 3 
7.4.  Phase 4 
7.5.  Phase 5 
8. !
 Other 
ources
8.1.  Related Websites 
8.2.  Your Feedback 
1.?Introduction

+
Translate Fedora in Microsoft Windows
   Next
Translate Fedora in Microsoft® Windows®
Chester Cheng
Copyright © 2004 Red Hat, Inc., Chester Cheng
1.!
  Introduction
2. Download and Install TortoiseCVS
3. Generate Your Digital ID
4. Register Your Fedora Account
5. Using TortoiseCVS
5.1.  Set up TortoiseCVS 
5.2.  Download Files from Fedora Server 
6.  poEdit 
6.1. Download and Install poEdit
6.2. Setup poEdit
7. Tran!
 slation Lifecycle
7.1.  Phase 1 
7.2.  Phase 2 
7.3.  Phase 3 
7.4.  Phase 4 
7.5.  Phase 5 
8. Other Resources
8.1.  Related Websites 
8.2.  Your Feedback 
1. Introduction

       To join the Fedora translation team and work with people around the world
-      is easy in Microsoft? Windows? as well. To achieve this, several
+      is easy in Microsoft® Windows® as well. To achieve this, several
       tools are needed:
 	
  • 
     A Web Browser that supports cookies
 	
  • 
-    A Concurrent Versions System (CVS) client —
-	This artical uses TortoiseCVS
+    A Concurrent Versions System (CVS) client —
+	This artical uses TortoiseCVS
 	
  • 
-    An editor for .po files — This article uses poEdit
+    An editor for .po files — This article uses poEdit
 	
  • 
-    A Secury Shell (ssh) client — This article uses puttygen
+    A Secury Shell (ssh) client — This article uses puttygen
 	which is a free utility that generates personalized digital ID, using public key infrastructure.
-	This utility is bundled within TortoiseCVS
+	This utility is bundled within TortoiseCVS
 	

 	This article will introduce you where to find and download these tools, how to install and setup,
 	and even a brief description of how to use them.
-	
???Next
???2.?Download and Install TortoiseCVS

+	
   Next
   2. Download and Install TortoiseCVS

 
 

     Garrett LeSage created the admonition graphics (note, tip, important,
-    caution, and warning). They may be freely redistributed with documentation
-    produced for the Red Hat Linux project.
+    caution, and warning).
+    Tommy Reynolds  created the callout graphics.
+    They all may be freely redistributed with documentation
+    produced for the Fedora Project.
     

     how-to-translate-fedora-in-windows-0.1 (2004-09-16)
   

-    Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux
-    Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts,
-    Rawhide and all Red Hat-based trademarks and logos are trademarks or registered
-    trademarks of Red Hat, Inc. in the United States and other countries.
-  

-    Linux is a registered trademark of Linus Torvalds.
-  

-    Motif and UNIX are registered trademarks of The Open Group.
-  

-    Intel and Pentium are registered trademarks of Intel Corporation. Itanium
-    and Celeron are trademarks of Intel Corporation.
-  

-    AMD, AMD Athlon, AMD Duron, and AMD K6 are trademarks of Advanced Micro
-    Devices, Inc.
-  

-    Windows is a registered trademark of Microsoft Corporation.
-  

-    SSH and Secure Shell are trademarks of SSH Communications Security, Inc.
-  

-    FireWire is a trademark of Apple Computer Corporation.
+    Red Hat and the Red Hat "Shadow Man" logo are registered trademarks of
+    Red Hat, Inc. in the United States and other countries.
   

     All other trademarks and copyrights referred to are the property of their
     respective owners.


Index: s1-cvs.php
===================================================================
RCS file: /cvs/fedora/web/html/About/Projects/translations/translation-windows/s1-cvs.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s1-cvs.php	29 Nov 2005 17:31:12 -0000	1.1
+++ s1-cvs.php	6 Dec 2005 06:53:13 -0000	1.2
@@ -7,41 +7,41 @@
 
 ?>
 
-
2.?Download and Install TortoiseCVS
Prev???Next
2.?Download and Install TortoiseCVS

-      To download TortoiseCVS, go to:
+
2. Download and Install TortoiseCVS
Prev   Next
2. Download and Install TortoiseCVS

+      To download TortoiseCVS, go to:
 
 http://www.tortoisecvs.org/download.shtml
 

 	  For demonstration purpose, this artical uses TortoiseCVS-1.6.14.
     

-	To install TortoiseCVS, double-click the file you just downloaded.
+	To install TortoiseCVS, double-click the file you just downloaded.
 	The following screenshots illustrate the installation process step by step:
 	

 			Welcome to TortoiseCVS setup.
-        
Figure?1.?Welcome to TortoiseCVS setup

+        
Figure 1. Welcome to TortoiseCVS setup

 			Select destination directory.
-        
Figure?2.?Select Destination Directory

+        
Figure 2. Select Destination Directory

 			Select components.
-        
Figure?3.?Select Components

+        
Figure 3. Select Components

 			Installing.
-        
Figure?4.?Installing

+        
Figure 4. Installing

 			Finish.
-        
Figure?5.?Finish
Prev?Up?Next
Translate Fedora in Microsoft Windows?Home?3.?Generate Your Digital ID

+        ">
Figure 5. Finish
Prev Up Next
Translate Fedora in Microsoft Windows Home 3. Generate Your Digital ID

 
 
 
-
7.?Translation Lifecycle
Prev???Next
7.?Translation Lifecycle

+
7. Translation Lifecycle
Prev   Next
7. Translation Lifecycle

 To keep the consistency of all documents among Fedora repository and translators, a translation lifecycle is
-being established. The life cycle involves 5 phases as shown in Table?1.
-
PhaseActionSoftwareWhereLogin Requires
Section?7.1, “ Phase 1 ”Take the file you want to translate
-(if no other translators took it)Any Web broswer with cookies enabledFedora Translation Status PageLogin name and PIN code
Section?7.2, “ Phase 2 ”Download the latest file from Fedora repositoryTortoiseCVS or other CVS clientIn TortoiseCVS, right click the translate
-folder, choose CVS updatePassphrase of your private key
Section?7.3, “ Phase 3 ”Edit the file you had taken.
-Save before you finishpoEdit or other editorsFor poEdit, click start =>
-All Programs => poEdit =>
-poEdit, then open the file you want to edit in the
+being established. The life cycle involves 5 phases as shown in Table 1, “Fedora PO file translation life cycle”.
+
PhaseActionSoftwareWhereLogin Requires
Section 7.1, “ Phase 1 ”Take the file you want to translate
+(if no other translators took it)Any Web broswer with cookies enabledFedora Translation Status PageLogin name and PIN code
Section 7.2, “ Phase 2 ”Download the latest file from Fedora repositoryTortoiseCVS or other CVS clientIn TortoiseCVS, right click the translate
+folder, choose CVS updatePassphrase of your private key
Section 7.3, “ Phase 3 ”Edit the file you had taken.
+Save before you finishpoEdit or other editorsFor poEdit, click start =>
+All Programs => poEdit =>
+poEdit, then open the file you want to edit in the
 translate folder. Or double-click the file directly in
-Windows ExplorerN/A
Section?7.4, “ Phase 4 ”Upload your file back to Fedora repositoryTortoiseCVS or other CVS clientIn TortoiseCVS, right click translate
-folder, choose CVS update; Right click translate folder,
-choose CVS commmit if  there are no conflicts between files on your machine and the server.Passphrase of your private key
Section?7.5, “ Phase 5 ”Release the file you have taken if you don't wish to translate any moreAny Web broswer with cookies enabledFedora Translation Status PageLogin name and PIN code
Table?1.?Fedora PO file translation life cycle
7.1.? Phase 1 

+Windows Explorer
N/A
Section 7.4, “ Phase 4 ”Upload your file back to Fedora repositoryTortoiseCVS or other CVS clientIn TortoiseCVS, right click translate
+folder, choose CVS update; Right click translate folder,
+choose CVS commmit if  there are no conflicts between files on your machine and the server.Passphrase of your private key
Section 7.5, “ Phase 5 ”Release the file you have taken if you don't wish to translate any moreAny Web broswer with cookies enabledFedora Translation Status PageLogin name and PIN code
Table 1. Fedora PO file translation life cycle
7.1.  Phase 1 

 Open your browser and go to:
 
 http://i18n.redhat.com/cgi-bin/i18n-status
 

-After select your language, you'll see a web page similar to Figure?32.
+After select your language, you'll see a web page similar to Figure 32, “Take a File for Translation”.
 In this example, po file in package dist has 839 entries untranslated and not taken
-by any translator. To claim this file, press the Take link at the right hand side.
+by any translator. To claim this file, press the Take link at the right hand side.
 

 			To take a file for translation.
-        
Figure?32.?Take a File for Translation

+        ">
Figure 32. Take a File for Translation

 If the file is not available for translation because someone else is working on it, you will see the
-status as Assigned, as shown in Figure?33.
+status as Assigned, as shown in Figure 33, “File Has Been Taken”.
 

 			File has been taken.
-        
Figure?33.?File Has Been Taken

-After click the Take link, you'll be prompted for username and password
-(Figure?34). Please enter your Login name and PIN code as described in
-Figure?12.
+        ">
Figure 33. File Has Been Taken

+After click the Take link, you'll be prompted for username and password
+(Figure 34, “Username and Password Prompt”). Please enter your Login name and PIN code as described in
+Figure 12, “Example Email”.
 

 			Username and password prompt.
-        
Figure?34.?Username and Password Prompt
 The system will assign the file to you after you successfully login (Figure?35), or display the error page upon unsuccessful login (Figure?36). Please email i18n at redhat.com
+        ">
Figure 34. Username and Password Prompt
 The system will assign the file to you after you successfully login (Figure 35, “File is Assigned to You”), or display the error page upon unsuccessful login (Figure 36, “Authentication Failed”). Please email i18n at redhat.com
 to request your PIN code to be reissued if you have lost it.
 

 			File is assigned to you.
-        
Figure?35.?File is Assigned to You

+        
Figure 35. File is Assigned to You

 			Authentication failed.
-        
Figure?36.?Authentication Failed
7.2.? Phase 2 

+        ">
Figure 36. Authentication Failed
7.2.  Phase 2 

 To download the latest files from server, please right-click on the translate
-folder in Windows Explorer and select CVS Update
-You'll be prompted to enter the passphrase of your private key before TortoiseCVS
-can continue. Figure?37 illustrates.
+folder in Windows Explorer and select CVS Update
+You'll be prompted to enter the passphrase of your private key before TortoiseCVS
+can continue. Figure 37, “Get Update Files from CVS” illustrates.
 

 			Get update files from cvs repository.
-        
Figure?37.?Get Update Files from CVS

-You'll see a screen similar to Figure?38 after the update successfully finished.
+        ">
Figure 37. Get Update Files from CVS

+You'll see a screen similar to Figure 38, “Update Successful” after the update successfully finished.
 The letter "P" in front of any file stands for "patched", which means minor changes from the server had been
 patched to your files; while "U" stands for "updated" that your file is overwritten by the latest version due
 to major changes. Don't be panic if you see "P" and "U" since we work in the community environment the files
@@ -62,23 +62,23 @@
 that's the beauty of cvs.
 

 			Update successful.
-        
Figure?38.?Update Successful
7.3.? Phase 3 

+        ">
Figure 38. Update Successful
7.3.  Phase 3 

 Open the file you had taken and downloaded from the server. You can either double click on the
-.po file or open the .po file within poEdit
+.po file or open the .po file within poEdit
 application. Don't forget to save your changes before you finish everything.
-
7.4.? Phase 4 

+
7.4.  Phase 4 

 To upload the file you've taken and subsequently translated back to cvs server is similar to
-download operation. Right-click on translate folder in Windows
-Explorer and select CVS Update. You'll be prompted to enter
-the passphrase of your private key before TortoiseCVS can continue.
-After you correctly input your passphrase, you may see a screen similar to Figure?39.
+download operation. Right-click on translate folder in Windows
+Explorer and select CVS Update. You'll be prompted to enter
+the passphrase of your private key before TortoiseCVS can continue.
+After you correctly input your passphrase, you may see a screen similar to Figure 39, “Update Before Commit”.
 

 			Update before commit.
-        
Figure?39.?Update Before Commit

+        ">
Figure 39. Update Before Commit

 "M" stands for "modified". It indicates that this file had been modified on YOUR
 local machine and needed to be uploaded to server.
 

-If you see a capital "C" instead of "M", then it's time to panic. :P (See Figure?40.)
+If you see a capital "C" instead of "M", then it's time to panic. :P (See Figure 40, “File Conflict”.)
 "C" stands for "conflict", which means while you were modifying your local file
 this file on the server has been changed at the same time.
 This may be caused by the package maintainer who merged your file with .pot
@@ -88,37 +88,37 @@
 and relavant mailing lists.
 

 			File conflict
-        
Figure?40.?File Conflict

-If everything is fine, you can upload the file you had modified. Choose CVS Commit
-after you right-click on the translate folder, as shown in Figure?41.
+        ">
Figure 40. File Conflict

+If everything is fine, you can upload the file you had modified. Choose CVS Commit
+after you right-click on the translate folder, as shown in Figure 41, “Commit Files to Server”.
 
[Note] Note 

 cvs update will notify you the file modification on your local
 computer. It will NOT, however, upload the file back to server until you choose to
 cvs commit.
 

 			Commit files to server.
-        
Figure?41.?Commit Files to Server

-You'll see a list of modified files, as shown in Figure?42. Check the file(s)
+        ">
Figure 41. Commit Files to Server

+You'll see a list of modified files, as shown in Figure 42, “Commit Files to Server”. Check the file(s)
 you will upload to the server. It is also recommended to key in some comments, so other translators
-can easily track what has been changed in any file. Press OK to upload the file.
+can easily track what has been changed in any file. Press OK to upload the file.
 

 			Commit files to server.
-        
Figure?42.?Commit Files to Server

+        ">
Figure 42. Commit Files to Server

 Again, you'll be prompted the passphrase of your private key. After files are successfully uploaded
-to server, you will see a screen similar to Figure?43.
+to server, you will see a screen similar to Figure 43, “Commit Files to Server Successfully”.
 

 			Commit files to server successfully.
-        
Figure?43.?Commit Files to Server Successfully
7.5.? Phase 5 

+        ">
Figure 43. Commit Files to Server Successfully
7.5.  Phase 5 

 The phase is an optional one, only occurs when you decide to stop working on a file before it's fully translated. For example, you may go on a holiday and don't want to keep working on a file but would like others to be able
 to resume the work. To do so, you need to go to the Fedora status page, find the package you had taken,
 and click the package name to view the detail. On the bottom of that page, you would see the
-Release link, as shown in Figure?44.
+Release link, as shown in Figure 44, “Release File Screen”.
 

 			Release file screen.
-        
Figure?44.?Release File Screen

+        ">
Figure 44. Release File Screen

 This is the end of the life cycle of Fedora software translation. We do hope you enjoy being with part of the
 open source community and continue lending your support.
-
Prev?Up?Next
6.? poEdit ?Home?8.?Other Resources

+
Prev Up Next
6.  poEdit  Home 8. Other Resources

 
 
 
-
6.? poEdit 
Prev???Next
6.? poEdit 
6.1.?Download and Install poEdit

-	  To download poEdit, go to
+
6.  poEdit 
Prev   Next
6.  poEdit 
6.1. Download and Install poEdit

+	  To download poEdit, go to
 
 http://poedit.sourceforge.net/download.php#win32
 
 

 	For demonstration purpose, this article uses poEdit-1.3.1.
       

-	  Installing poEdit is as easy and straight-forward as installing
-	  TortoiseCVS. The main steps are:
+	  Installing poEdit is as easy and straight-forward as installing
+	  TortoiseCVS. The main steps are:
 	  

 			Welcome
-        
Figure?21.?Welcome

+        
Figure 21. Welcome

 			Licience agreement
-        
Figure?22.?Licience Agreement

+        
Figure 22. Licience Agreement

 			Select destination location
-        
Figure?23.?Select Destination Location

+        
Figure 23. Select Destination Location

 			Select components
-        
Figure?24.?Select Components

+        
Figure 24. Select Components

 			Select start menu folder
-        
Figure?25.?Select Start Menu Folder

+        
Figure 25. Select Start Menu Folder

 			Ready to install
-        
Figure?26.?Ready To Install

+        
Figure 26. Ready To Install

 			Installing
-        
Figure?27.?Installing

+        
Figure 27. Installing

 			Finish
-        
Figure?28.?Finish
6.2.?Setup poEdit

-	To start poEdit, click start =>
-	All Programs => poEdit =>
-	poEdit. You will a screen similar to Figure?29.
+        ">
Figure 28. Finish
6.2. Setup poEdit

+	To start poEdit, click start =>
+	All Programs => poEdit =>
+	poEdit. You will a screen similar to Figure 29, “Starting poEdit”.
 	

 			Starting poEdit.
-        
Figure?29.?Starting poEdit

-	To configure poEdit, go to File =>
-	Preferences (Figure?30).
-	Enter your name and email address as shown in Figure?31, then press
-	OK.
+        ">
Figure 29. Starting poEdit

+	To configure poEdit, go to File =>
+	Preferences (Figure 30, “Preference Submenu”).
+	Enter your name and email address as shown in Figure 31, “poEdit Preference Screen”, then press
+	OK.
 	

 			Preference submenu
-        
Figure?30.?Preference Submenu

+        
Figure 30. Preference Submenu

 			poEdit Preference screen
-        
Figure?31.?poEdit Preference Screen

+        ">
Figure 31. poEdit Preference Screen

 	Huh~, finally! All the preparation has come to the end. In next section we'll step into
 	the real translation work.
-	
Prev?Up?Next
5.?Using TortoiseCVS?Home?7.?Translation Lifecycle

+	
Prev Up Next
5. Using TortoiseCVS Home 7. Translation Lifecycle

 
 
 
-
4.?Register Your Fedora Account
Prev???Next
4.?Register Your Fedora Account

+
4. Register Your Fedora Account
Prev   Next
4. Register Your Fedora Account

 	It is essential to have an account and password to access Fedora translation CVS.
 	To become a translator please sign up at:
 
@@ -16,30 +16,30 @@
     

 	You need to provide your basic information include Login name, Real Name, a valid email address,
 	the language or locale you are going to translate, as well as the SSH public key that generated
-	from the previous step (refer to Section?3, “Generate Your Digital ID” and Figure?9).
-	This step is illustrated in Figure?10.
+	from the previous step (refer to Section 3, “Generate Your Digital ID” and Figure 9, “Key Generation In Progress”).
+	This step is illustrated in Figure 10, “Account Sign up Screen”.
 	

 			Account Sign up screen.
-        
Figure?10.?Account Sign up Screen

-	Press Continue once you are done. The next screen (Figure?11)
-	shows your account detail. Press Submit to confirm.
+        ">
Figure 10. Account Sign up Screen

+	Press Continue once you are done. The next screen (Figure 11, “Confirm Account Details”)
+	shows your account detail. Press Submit to confirm.
 	

 			Confirm account details.
-        
Figure?11.?Confirm Account Details

+        ">
Figure 11. Confirm Account Details

 	An email will be sent to the email address you provided advising your application is being processed.
 	Once the account is approved another email will be sent to you advising your login name and
-	PIN code. The example email is shown in Figure?12.
+	PIN code. The example email is shown in Figure 12, “Example Email”.
 	

 			Example email.
-        
Figure?12.?Example Email
[Note] Note 

+        ">
Figure 12. Example Email
[Note] Note 

 	In the example, the Login name is snowlet, while the PIN code is
 	0000. They are the information you use to access Fedora
 	translation status page, to take or release a file, to apply to be a maintainer,
 	or to approve a QA'ed file.
 	

-	Once the account is activated, we can setup TortoiseCVS to
+	Once the account is activated, we can setup TortoiseCVS to
 	download Fedora files.
-	
Prev?Up?Next
3.?Generate Your Digital ID?Home?5.?Using TortoiseCVS

+	
Prev Up Next
3. Generate Your Digital ID Home 5. Using TortoiseCVS

 
 
 
-
8.?Other Resources
Prev???Next
8.?Other Resources
8.1.? Related Websites 
 Official website of TortoiseCVS

+
8. Other Resources
Prev   Next
8. Other Resources
8.1.  Related Websites 
 Official website of TortoiseCVS

 	
 	http://www.tortoisecvs.org/
 	

-    
 Official website of poEdit

+    
 Official website of poEdit

 	
 	http://poedit.sourceforge.net/
 	

-    
 Official website of PuTTY

+    
 Official website of PuTTY

 	
 	http://www.chiark.greenend.org.uk/~sgtatham/putty/
 	

-    
  WinCvs CVS Client 

-	WinCvs is an alternative CVS client you can use. The following article
+    
  WinCvs CVS Client 

+	WinCvs is an alternative CVS client you can use. The following article
 	describes its installation steps in detail.
 	
 	http://sourceforge.net/docman/display_doc.php?docid=766&group_id=1
@@ -29,14 +29,14 @@
 	
 	http://www.loria.fr/~molli/cvs/doc/cvs_toc.html
 	

-    
8.2.? Your Feedback 

+    
8.2.  Your Feedback 

 Your feedback is always welcome! If you have spotted any typo or errors, please contact
 Chester Cheng,
 or simply discuss it through 
 Fedora Translation List.
 

 Hope this article has helped you to set things up.  Looking forward to hearing from you!
-
Prev?Up?Next
7.?Translation Lifecycle?Home?Index

+
Prev Up Next
7. Translation Lifecycle Home Index

 
 
 
-
5.?Using TortoiseCVS
Prev???Next
5.?Using TortoiseCVS
5.1.? Set up TortoiseCVS 

-      To connect TortoiseCVS to Fedora Translation Project CVS repository, you
+
5. Using TortoiseCVS
Prev   Next
5. Using TortoiseCVS
5.1.  Set up TortoiseCVS 

+      To connect TortoiseCVS to Fedora Translation Project CVS repository, you
 	  need to first setup the environment. These steps only need be done once. Right-click in
-	  Windows Explorer, choose CVS =>
-	  Preferences… as shown in Figure?13.
+	  Windows Explorer, choose CVS =>
+	  Preferences… as shown in Figure 13, “Setup Preferences”.
     

 			Setup preferences.
-        
Figure?13.?Setup Preferences
In Preferences popup window, click the Tools tab.
+        ">
Figure 13. Setup Preferences
In Preferences popup window, click the Tools tab.
 	Add the parameter –i <Your Private Key> as shown in
-	Figure?14. <Your Private Key> is the private
+	Figure 14, “TortoiseCVS Preferences Window - Tools”. <Your Private Key> is the private
 	key you generated and saved on your computer. Its corresponding public key has been
-	used to apply the Fedora account in Figure?10.
+	used to apply the Fedora account in Figure 10, “Account Sign up Screen”.
 	

 			TortoiseCVS Preferences Window - Tools
-        
Figure?14.?TortoiseCVS Preferences Window - Tools

-	The next thing needs to be setup is Network compression (as shown in
-	Figure?15), which will effectively speedup checkout process.
+        ">
Figure 14. TortoiseCVS Preferences Window - Tools

+	The next thing needs to be setup is Network compression (as shown in
+	Figure 15, “TortoiseCVS Preferences Window - Advanced”), which will effectively speedup checkout process.
 	Set 9 - Best for best compression if you have a powerful CPU.
 	

-	Press OK when you're done. Now you are ready to download files from the Fedora server.
+	Press OK when you're done. Now you are ready to download files from the Fedora server.
 	

 			TortoiseCVS Preferences Window - Advanced
-        
Figure?15.?TortoiseCVS Preferences Window - Advanced
5.2.? Download Files from Fedora Server 

+        ">
Figure 15. TortoiseCVS Preferences Window - Advanced
5.2.  Download Files from Fedora Server 

 	To download files from the Fedora server for the first time, it is important to tell
-	TortoiseCVS where to find them. Again, these only need to be done once.
+	TortoiseCVS where to find them. Again, these only need to be done once.
 	The information are in the email sent to you when your account is activated. You may refer to the
 	following example, but don't forget to change 'snowlet' into your own username.
 	

-	To start this, right click in Windows Explorer, choose
-	CVS checkout (also referred as "cvs co"). See Figure?16.
+	To start this, right click in Windows Explorer, choose
+	CVS checkout (also referred as "cvs co"). See Figure 16, “CVS Checkout Menu”.
 	

 			CVS Checkout menu.
-        
Figure?16.?CVS Checkout Menu

-
+    

+

+      Another source for updated information about the test release is http://fedoraproject.org/wiki/FC5Test1CommonProblems.
+    

+
[Note] Note 

-	Sometimes CVS checkout menu just doesn't appear.
+        ">
Figure 16. CVS Checkout Menu
[Note] Note 

+	Sometimes CVS checkout menu just doesn't appear.
 	Try to perform this action in "C:\" root directory.
 	

 	You can find the CVSROOT in the email Fedora had sent you.
-	The information in Figure?17 is for your reference only. Don't forget to change the
-	User name: field to match your own account. The module for Fedora translation
+	The information in Figure 17, “CVS Root and Module” is for your reference only. Don't forget to change the
+	User name: field to match your own account. The module for Fedora translation
 	is translate.
 	

 			CVS root and module.
-        
Figure?17.?CVS Root and Module

-	Press OK will lead you to Figure?18.
+        ">
Figure 17. CVS Root and Module

+	Press OK will lead you to Figure 18, “TortoisePlink”.
 	

 			TortoisePlink.
-        
Figure?18.?TortoisePlink

-	Here, TortoiseCVS is trying to connect Fedora CVS repository to get all
+        ">
Figure 18. TortoisePlink

+	Here, TortoiseCVS is trying to connect Fedora CVS repository to get all
 	the files needed. Your passphrase of your private key is required before you go on. Press
-	OK after you input the passphrase.
+	OK after you input the passphrase.
 	

-	TortoiseCVS is downloading files from Fedora server
-	(Figure?19). It's time to take a
+	TortoiseCVS is downloading files from Fedora server
+	(Figure 19, “Checking out Files”). It's time to take a
 	break before we go on to the next screen.
 	

 			Checking out files.
-        
Figure?19.?Checking out Files

+        ">
Figure 19. Checking out Files

 	Done! You'll find a folder called translate that contains all the files for
-	different locales and packages (Figure?20).
+	different locales and packages (Figure 20, “"translate" Folder”).
 	

 			"translate" folder.
-        
Figure?20.?"translate" Folder

+        '>
Figure 20. "translate" Folder

 	To edit these files, you can use plain text editor, or specialised po file editors, such as
-	poEdit. The following section will discuss about this tool.
-	
Prev?Up?Next
4.?Register Your Fedora Account?Home?6.? poEdit 

+	poEdit. The following section will discuss about this tool.
+	
Prev Up Next
4. Register Your Fedora Account Home 6.  poEdit 

 
 
 
-
3.?Generate Your Digital ID
Prev???Next
3.?Generate Your Digital ID

+
3. Generate Your Digital ID
Prev   Next
3. Generate Your Digital ID

       For security purpose, a pair of keys — private key and public key — is required to identify yourself.
-	  To generate the key pair, open your Windows Explorer, and go to
+	  To generate the key pair, open your Windows Explorer, and go to
 	  C:\Program Files\TortoiseCVS (or other folder where you installed
-	  TortoiseCVS), then double-click puttygen.exe as shown
-	  in Figure?6.
+	  TortoiseCVS), then double-click puttygen.exe as shown
+	  in Figure 6, “Start puttygen Program”.
     

 			Start puttygen program.
-        
Figure?6.?Start puttygen Program

-	Choose SSH2 DSA in Parameters (step 1), then press
-	Generate (step 2) as shown
-	in Figure?7.
+        ">
Figure 6. Start puttygen Program

+	Choose SSH2 DSA in Parameters (step 1), then press
+	Generate (step 2) as shown
+	in Figure 7, “Generate DSA Keys”.
 	

 			Generate dsa keys.
-        
Figure?7.?Generate DSA Keys

-	Move your mouse around the screen to generate the key pairs, as shown in Figure?8.
+        ">
Figure 7. Generate DSA Keys

+	Move your mouse around the screen to generate the key pairs, as shown in Figure 8, “Key Generation In Progress”.
 	

 			Key generation in progress.
-        
Figure?8.?Key Generation In Progress

+        ">
Figure 8. Key Generation In Progress

 	After the key pair is generated, enter some comment for this key pair (or accept the default comment).
 	Don’t forget to input the key passphrase twice to protect your private key.
 	This “key passphrase” will be used every time you connect to the Fedora CVS repository to get the
-	latest documents. (As shown in Figure?9 step 1.)
+	latest documents. (As shown in Figure 9, “Key Generation In Progress” step 1.)
 	
[Important]Important

 	It is very important to save your public and private keys in a safe place.
-	To save these keys, press Save public key and Save private key
-	as shown in Figure?9 step 2.
+	To save these keys, press Save public key and Save private key
+	as shown in Figure 9, “Key Generation In Progress” step 2.
 	

 			Key generation in progress.
-        
Figure?9.?Key Generation In Progress
[Tip] Tip 

-	The text circled in yellow (Figure?9) is your public key that needs
+        ">
Figure 9. Key Generation In Progress
[Tip] Tip 

+	The text circled in yellow (Figure 9, “Key Generation In Progress”) is your public key that needs
 	to be copied and pasted when registering an
-	account (refer to Section?4, “Register Your Fedora Account” for more information). You may want to leave this windows open
+	account (refer to Section 4, “Register Your Fedora Account” for more information). You may want to leave this windows open
 	for later use.
 	
[Note] Note 

 	It doesn’t matter where you save your keys
 	or what filenames you save them as. In this example, the filename id_dsa.ppk is used.
 	It is also important to make a copy of your key pairs and store in a safe place.
-	
Prev?Up?Next
2.?Download and Install TortoiseCVS?Home?4.?Register Your Fedora Account

+	
Prev Up Next
2. Download and Install TortoiseCVS Home 4. Register Your Fedora Account

 
 

Author: kwade

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

Modified Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- index.php	29 Nov 2005 17:33:04 -0000	1.6
+++ index.php	6 Dec 2005 06:53:46 -0000	1.7
@@ -10,8 +10,8 @@
 				
User Documentation

 				

 				This section is dedicated to user documentation for . All the
-				content is from the Documentation Project. Except for the 
-				Installation Guide, the documentation will be in tutorial format. All docs will be task-oriented.
+				content is from the Documentation Project. Except for guides such as the  
+				Installation Guide, the documentation is in tutorial format.  All docs are task-oriented.
 				

 
 				




From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:53 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:53 -0500
Subject: web/html/docs/selinux-faq index.php,1.2,1.3
Message-ID: <200512060654.jB66sOWl029351@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/selinux-faq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/docs/selinux-faq

Modified Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/selinux-faq/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.php	5 Jun 2005 00:58:00 -0000	1.2
+++ index.php	6 Dec 2005 06:53:51 -0000	1.3
@@ -22,7 +22,7 @@
                                 
 
 				

-				To obtain the source XML for this document, for example when writing a patch to submit in a bug report, follow the directions on the Docs Project to download using anonymouse CVS.  The module you want is fedora-docs/selinux-faq/.  This will get you the latest XML source code.
+				To obtain the source XML for this document, for example when writing a patch to submit in a bug report, follow the directions on the Docs Project to download using anonymous CVS.  The module you want is fedora-docs/selinux-faq/.  This will get you the latest XML source code.
 				

 				

 				If you are interested in writing docs for  as part of the



From fedora-extras-commits at redhat.com  Tue Dec  6 06:52:59 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:52:59 -0500
Subject: web/html/About index.php,1.1,1.2
Message-ID: <200512060654.jB66sTG5029359@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/About
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/About

Modified Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/About/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	29 Nov 2005 17:30:24 -0000	1.1
+++ index.php	6 Dec 2005 06:52:56 -0000	1.2
@@ -15,15 +15,15 @@
 
 
Fedora is a set of projects, sponsored by Red Hat and guided by the Fedora Foundation.  These projects are developed by a large community of people who strive to provide and maintain the very best in free, open source software and standards.

  
-
Fedora Core, the central Fedora project, is an operating system and platform, based on Linux, that is always free for anyone to use, modify and distribute, now and forever. 

+
Fedora Core, the central Fedora project, is an operating system and platform, based on Linux, that is always free for anyone to use, modify, and distribute, now and forever. 

 
 
What is the Fedora Foundation?

 
-
The Fedora Foundation is a 501(c)3 nonprofit organization.  It will serve the Fedora community in the following ways: 

+
The Fedora Foundation is a 501(c)3 nonprofit organization.  Its goal is to serve the Fedora community in the following ways: 

 
    
 
  • By providing a non-profit entity to organize and manage volunteers. 
    
 
    • 
-
  • By ensuring that the work of these volunteers will remain forever free. 
    
+
  • By ensuring that the work of these volunteers remains forever free. 
    
 
    • 
 
  • By providing a fundraising arm for the development and protection of Fedora and related open source projects. 
    
 
    • 
@@ -35,7 +35,7 @@
 

 
 

-  The initial board of directors of the Fedora Foundation continues to develop its governance model in partnership with a community advisory board.  More announcements will be made in coming months as key milestones are reached.
+  The initial board of directors of the Fedora Foundation continues to develop its governance model in partnership with a community advisory board.  More announcements are coming in the months ahead as key milestones are reached.
 

 
 
Why should I use Fedora?

@@ -73,11 +73,11 @@
 
 
Excellence: Easy and safe software management with RPM and yum

 
The yum utility requires no configuration, and you may add or remove software from Core or Extras as soon as the Fedora installation is complete. You may add a new package source by copying a simple text file into a directory, or by installing an RPM that does it for you.  

-
Package operations safely abort if dependencies cannot be met. By default, yum requires all packages to pass a digital signature test before they may install to your system. 

+
Package operations safely abort if dependencies cannot be met. By default, yum requires all packages to pass a digital signature test before they may install to your system. 

 
-
The yum utility is developed by system administrators for use on large production networks. Advanced administrative tasks are made easy. For example, you may manage software on disk images with the installroot feature, and recent versions provide an interactive shell to enable you to quickly carry out batches of commands. 

+
The yum utility is developed by system administrators for use on large production networks. Advanced administrative tasks are made easy. For example, you may manage software on disk images with the installroot feature, and recent versions provide an interactive shell to enable you to quickly carry out batches of commands. 

 
-
You may create your own plug-ins for yum to add new features. Both plug-ins and the application itself are written in Python, making it simple to extend and integrate yum with other software. RPM supports Perl and Python scripting, as well as providing a library for C applications. 

+
You may create your own plug-ins for yum to add new features. Both plug-ins and the application itself are written in Python, making it simple to extend and integrate yum with other software. RPM supports Perl and Python scripting, as well as providing a library for C applications. 

 
 
References: 

 
    
@@ -87,11 +87,11 @@
 
 
    Excellence: Simple and flexible installation with Anaconda
    
 
-
    Anaconda provides a well-designed installer with both a graphical and text based interface with safe defaults, to enable users to install a new system with minimal difficulty. The interface provides advanced customization options to more precisely control package selection, configure complex storage arrangements with LVM and RAID, and attach the system to network management services such as LDAP and Kerberos. 
    
+
    Anaconda provides a well-designed installer with both a graphical and text based interface with safe defaults, to enable users to install a new system with minimal difficulty. The interface provides advanced customization options to more precisely control package selection, configure complex storage arrangements with LVM and RAID, and attach the system to network management services such as LDAP and Kerberos. 
    
 
-
    Anaconda supports installation from disc images, portable hard drives and network file shares. Any standard FTP, HTTP, or NFS server may act as an installation source. You may boot Anaconda from a pen drive or TFTP network boot service and perform an installation with no discs or CD drive at all, which is ideal for laptops and network terminals. 
    
+
    Anaconda supports installation from disc images, portable hard drives and network file shares. Any standard FTP, HTTP, or NFS server may act as an installation source. You may boot Anaconda from a pen drive or TFTP network boot service and perform an installation with no discs or CD drive at all, which is ideal for laptops and network terminals. 
    
 
-
    Fedora installation may be partially or fully automated with kickstart files. Fedora includes a utility for generating and editing kickstart files.  As plain-text files, kickstart files may also be created and modified by a simple text editor. The system-config-netboot utility enables administrators to configure a network boot service that combines with kickstart files and a file server to provide completely automated network installations. 
    
+
    Fedora installation may be partially or fully automated with kickstart files. Fedora includes a utility for generating and editing kickstart files.  As plain-text files, kickstart files may also be created and modified by a simple text editor. The system-config-netboot utility enables administrators to configure a network boot service that combines with kickstart files and a file server to provide completely automated network installations. 
    
 
 
    References: 
    
 
      
@@ -101,7 +101,7 @@
 
 
      Excellence: Deep Analysis with Systemtap and Frysk
      
 
-
      SystemTap and frysk, developed and sponsored by Red Hat in partnership with others like IBM and Intel, provide a comprehensive framework to benchmark, analyse and improve system performance.   With SystemTap, developers and sysadmins can take a deep look into a running kernel.  With frysk, developers and sysadmins can directly mainpulate executables as they run. 
      
+
      SystemTap and frysk, developed and sponsored by Red Hat in partnership with others such as IBM and Intel, provide a comprehensive framework to benchmark, analyse, and improve system performance.   With SystemTap, developers and sysadmins can take a deep look into a running kernel.  With frysk, developers and sysadmins can directly manipulate executables as they run. 
      
 
 
      References: 
      
 
        
@@ -113,7 +113,7 @@
 
 
        Excellence: The Free Java Platform
        
 
-
        Java is now possibly the most popular programming language in the world. Fedora provides a completely Open Source platform for developing and running Java applications. The combination of GCJ and the GNU Classpath libraries provide much of the functionality of Java 1.4.2 without a proprietary runtime. The Free Java platform is actively being developed to complete the missing functionality and finalize a Web browser plugin. 
        
+
        Java is now possibly the most popular programming language in the world. Fedora provides a completely open source platform for developing and running Java applications. The combination of GCJ and the GNU Classpath libraries provide much of the functionality of Java 1.4.2 without a proprietary runtime. The Free Java platform is actively being developed to complete the missing functionality and finalize a Web browser plugin. 
        
 
        Supplied Java software includes the Eclipse development environment, the Tomcat applications server, the Struts Web application framework, and the Jakarta Commons libraries. Fedora Core also includes the Java-GNOME bindings, which enable Java developers to write GNOME and GTK+ desktop applications in pure Java. Fedora Java packages follow the JPackage standards, which enable the supplied applications to work alongside the dozens of Java packages provided by jpackage.org. 
        
 
        References: 
        
 
          
@@ -128,7 +128,7 @@
 
 
          Excellence: Fedora Directory Server
          
 
-
          The Fedora Directory Server is a robust, scalable open-source server designed to manage large directories of users and resources. It is based on an open-systems server protocol called the Lightweight Directory Access Protocol (LDAP). It was acquired from Netscape and open sourced by Red Hat. It also forms the basis of the Red Hat Directory Server and is capable of serving the needs of any enterprise. 
          
+
          The Fedora Directory Server is a robust, scalable, open source server designed to manage large directories of users and resources. It is based on an open systems server protocol called the Lightweight Directory Access Protocol (LDAP).  The Fedora Directory Server was acquiredoriginally from Netscape and open sourced by Red Hat. It also forms the basis of the Red Hat Directory Server and is capable of serving the needs of any enterprise. 
          
 
          References: 
          
 
 
            



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:26 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:26 -0500
Subject: web/html/About/legal/licenses beta_eula.php, 1.1, 1.2 eula.php, 1.1,
	1.2
Message-ID: <200512060654.jB66sQb5029356@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/About/legal/licenses
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/About/legal/licenses

Modified Files:
	beta_eula.php eula.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: beta_eula.php
===================================================================
RCS file: /cvs/fedora/web/html/About/legal/licenses/beta_eula.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beta_eula.php	29 Nov 2005 17:31:56 -0000	1.1
+++ beta_eula.php	6 Dec 2005 06:53:24 -0000	1.2
@@ -9,7 +9,7 @@
 ?>
 
 
            LICENSE AGREEMENT
            
-FEDORA™ CORE 1 TEST 2 RELEASE
            
+FEDORA™ CORE TEST RELEASE
            
 
 
            This agreement governs the download, installation or use of the 
 Software (as defined below) and any updates to the Software, regardless


Index: eula.php
===================================================================
RCS file: /cvs/fedora/web/html/About/legal/licenses/eula.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eula.php	29 Nov 2005 17:31:56 -0000	1.1
+++ eula.php	6 Dec 2005 06:53:24 -0000	1.2
@@ -9,7 +9,7 @@
 ?>
 
 
            LICENSE AGREEMENT
            
-FEDORA™ CORE 1
            
+FEDORA™ CORE
            
 
 
            This agreement governs the download, installation or use of the
 Software (as defined below) and any updates to the Software, regardless



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:32 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:32 -0500
Subject: web/html/About/schedule index.php,1.1,1.2
Message-ID: <200512060654.jB66sWto029367@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/About/schedule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/About/schedule

Modified Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/About/schedule/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	29 Nov 2005 17:32:18 -0000	1.1
+++ index.php	6 Dec 2005 06:53:30 -0000	1.2
@@ -17,6 +17,8 @@
 each test release even after we have frozen for the next test release;
 all feedback is helpful.
            
 
+
            Documentation and translation of content depends on this schedule.  The documentation schedule is found on the  wiki page.
            
+
 
            You can subscribe to this calendar 
 or download it.
 



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:04 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:04 -0500
Subject: web/html/About/Projects docs.php,1.2,1.3 index.php,1.1,1.2
Message-ID: <200512060654.jB66sY4F029371@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/About/Projects
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/About/Projects

Modified Files:
	docs.php index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: docs.php
===================================================================
RCS file: /cvs/fedora/web/html/About/Projects/docs.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docs.php	1 Dec 2005 01:18:28 -0000	1.2
+++ docs.php	6 Dec 2005 06:53:02 -0000	1.3
@@ -65,11 +65,11 @@
 		
          • Emacs with PSGML mode (optional, but recommended)
            • 
 		
          
 
-        
          HOWEVER, the project will take submissions of new
-        documentation in any format, as there are volunteers who will
+        
          HOWEVER, the project takes submissions of new
+        documentation in any format, as there are volunteers who can
         convert into DocBook/XML.  Ongoing maintenance for the new
-        document should happen in DocBook/XML, which will be much
-        easier to learn from the converted document.
          
+        document should happen in DocBook/XML, which is easier to learn 
+        from the converted document.
          
 
         
          The Documentation Project is not interested in unmaintained
         documentation.  If you have a document to submit, either you or
@@ -122,15 +122,7 @@
 href=\"http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=129784\">129784
 is being used to track tutorial ideas with no writer assigned to
 them. If you are looking for a topic, refer to this bug to see if
-anything sparks your interest.
           
          Documents in progress
-include:
          
-
-
            
-
          • FC3 Installation Guide
            • 
-
          • Software Management with Yum
            • 
-
          • Release Notes
            • 
-
          
-
+anything sparks your interest.
           
 ");
 
 $project->addMisc("Fedora Documentation Steering Committee (FDSCo)","
@@ -166,9 +158,11 @@
 
          Fedora Editors:
          
 
 
            
-
          • Tammy Fox
            • 
-
          • Paul W. Frields
            • 
-
          • Karsten Wade
            • 
+
          • Tammy Fox (technical, wordsmith)
            • 
+
          • Paul W. Frields (technical, wordsmith)
            • 
+
          • Karsten Wade (technical, wordsmith)
            • 
+
          • Stuart Ellis (technical, wordsmith)
            • 
+
          • Rahul Sundaram (technical)
            • 
 
          
 
 ");


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/About/Projects/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	29 Nov 2005 17:30:30 -0000	1.1
+++ index.php	6 Dec 2005 06:53:02 -0000	1.2
@@ -11,8 +11,7 @@
 
 
          Projects
          
 
          
- is made up of many smaller projects. The pages
-in this section describe the purpose of these projects.
+ is made up of many smaller projects.  These Project pages describe the project's purpose.
 Each project has a project maintainer. Patches and suggestions should be sent to the maintainer
 via Bugzilla. Emailing the maintainer directly is not the proper way to submit a request.
 
          



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:59 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:59 -0500
Subject: web/html/participate/schedule index.php,1.5,1.6
Message-ID: <200512060654.jB66sT6N029364@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/schedule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/participate/schedule

Modified Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/schedule/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.php	1 Nov 2005 22:42:34 -0000	1.5
+++ index.php	6 Dec 2005 06:53:57 -0000	1.6
@@ -1,124 +1,3 @@
-initCommon();
-$template->displayHeader();
-?>
-
-
          Schedule
          
-
-
          PRELIMINARY Fedora Core 5 Schedule
          
-
-
          This schedule is preliminary; it may be modified at any time.
-
          
-
-
          Test users should continue to file bug reports against
-each test release even after we have frozen for the next test release;
-all feedback is helpful.
          
-
-
          You can subscribe to this calendar 
-or download it.
-
-
          
-
-- - - -
-
- 
- 
- 
-
-
-
-  
-  
-  
-
- 
- 
- 
-
-
- 
- 
- 
-
-
- 
- 
- 
-
-
- 
- 
- 
-
-
- 
- 
- 
-
-
- 
- 
- 
-
-
- 
- 
- 
-
-
- 
- 
- 
-
-
-
          




          DayMonthEvent
          14Novtest1 devel freeze
          21Novtest1 release
          19Decembertest2 devel freeze, String change deadline (data provided)
          
- 
          23Decembertest2 release, string build freeze (builds completed)
          16January 2006Translation deadline (data provided)
          
-     test3 devel freeze
- 
          23January 2006test3 release, translation build freeze (builds completed)
           ...Continual freeze, only critical bugs fixed until release
          13February 2006Absolute devel freeze
          27February 2006Release open, announced
          
-
          
-
-
          In addition to these releases, the nightly trees will usually be
-installable.
          
-
-
          Fedora Core 4
          
-
            
-
          • 15 March 2005 - Test 1 release
            • 
-
          • 11 April 2005 - Test 2 release
            • 
-
          • 10 May 2005 - Test 3 release
            • 
-
          • 13 June 2005 - General Availability
            • 
-
          
-
-
          Fedora Core 3
          
-
            
-
          • 13 July 2004 - Test 1 release
            • 
-
          • 20 September 2004 - Test 2 release
            • 
-
          • 11 October 2004 - Test 3 release
            • 
-
          • 8 November 2004 - General Availability
            • 
-
          
-	
-
          Fedora Core 2
          
-
            
-
          • 12 February 2004 - Test 1 release
            • 
-
          • 29 March 2004 - Test 2 release
            • 
-
          • 27 April 2004 - Test 3 release
            • 
-
          • 18 May 2004 - General Availability
            • 
-
          
-	
-
          Fedora Core 1 / Cambridge
          
-
            
-
          • 21 July 2003 - Test 1 (originally called Beta 1) release
            • 
-
          • 25 September 2003 - Test 2 release
            • 
-
          • 13 October 2003 - Test 3 release
            • 
-
          • 5 November 2003 - General Availability
            • 
-
          
-
-displayFooter('$Date$');
+



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:37 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:37 -0500
Subject: web/html/Contribute index.php,1.2,1.3
Message-ID: <200512060654.jB66sbkd029381@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/Contribute
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/Contribute

Modified Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/Contribute/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.php	1 Dec 2005 01:18:35 -0000	1.2
+++ index.php	6 Dec 2005 06:53:35 -0000	1.3
@@ -54,7 +54,7 @@
 
          Fedora Ambassadors Project
          
 
 
          
-  Fedora Ambassadors are enthusiasts who spread the word about Fedora, Linux, and Open Source to the wider public.  Ambassadors represent Fedora at events worldwide, and also act as Fedora experts in their own communities.  The Fedora Project will support Ambassadors with business cards, trade show kits, presentation materials and other resources.
+  Fedora Ambassadors are enthusiasts who spread the word about Fedora, Linux, and free/libre open source software (FLOSS) to the wider public.  Ambassadors represent Fedora at events worldwide, and also act as Fedora experts in their own communities.  The Fedora Project supports Ambassadors with business cards, trade show kits, presentation materials, collaboration with other Ambassadors, and other resources.
 
          
 
 
          



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:54 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:54 -0500
Subject: web/html/participate/documentation-faq index.php,1.1.1.1,1.2
Message-ID: <200512060654.jB66sOoi029354@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-faq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/participate/documentation-faq

Modified Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-faq/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- index.php	30 Mar 2005 17:47:24 -0000	1.1.1.1
+++ index.php	6 Dec 2005 06:53:52 -0000	1.2
@@ -23,7 +23,7 @@
 
          
 
 
          
-To volunteer for a topic, refer to the Documentation Quick Guide for instructions on how to 
+To volunteer for a topic, refer to the DocsProject wiki for instructions on how to 
 get started.
 
          
 
@@ -49,12 +49,8 @@
 
          How do I get write access to CVS?
          
 
 
          
-Eventually, we intend for full contributors to have write access to
-CVS, as well as access to other build environments.  This is actively being
-worked out across the entire Fedora Project as described on 
-How to Participate. In the meantime, you can
-email a patch or new file to the mailing list, and the Fedora Docs leader will
-commit them to CVS for you.
+Read the DocsProject/NewWriters 
+wiki page for detailed information.
 
          
 
 

Author: kwade

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/include

Modified Files:
	template.inc 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: template.inc
===================================================================
RCS file: /cvs/fedora/web/include/template.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- template.inc	29 Nov 2005 17:36:14 -0000	1.6
+++ template.inc	6 Dec 2005 06:54:03 -0000	1.7
@@ -70,7 +70,7 @@
 			
 		



From fedora-extras-commits at redhat.com  Tue Dec  6 11:51:52 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  6 Dec 2005 06:51:52 -0500
Subject: rpms/bittorrent/devel bittorrent.spec, 1.31, 1.32 sources, 1.14,
	1.15 .cvsignore, 1.14, 1.15
Message-ID: <200512061152.jB6BqMm6005983@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	bittorrent.spec sources .cvsignore 
Log Message:
- Update to 4.2.1
- Source now at www.bittorrent.com rather than sourceforge



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- bittorrent.spec	23 Nov 2005 12:29:32 -0000	1.31
+++ bittorrent.spec	6 Dec 2005 11:51:49 -0000	1.32
@@ -3,14 +3,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        4.2.0
+Version:        4.2.1
 Release:        1%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
 License:        BitTorrent Open Source License
 URL:            http://www.bittorrent.com/
-Source0:        http://dl.sf.net/bittorrent/BitTorrent-%{version}.tar.gz
+Source0:        http://www.bittorrent.com/dl/BitTorrent-%{version}.tar.gz
 Source1:        bittorrent.desktop
 Source2:        bittorrent.png
 Source3:	btseed.init
@@ -217,6 +217,10 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Tue Dec  6 2005 Paul Howarth  4.2.1-1
+- Update to 4.2.1
+- Source now at www.bittorrent.com rather than sourceforge
+
 * Wed Nov 23 2005 Paul Howarth  4.2.0-1
 - update to 4.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Nov 2005 12:29:33 -0000	1.14
+++ sources	6 Dec 2005 11:51:49 -0000	1.15
@@ -1 +1 @@
-a6a6d07a20e75da44c7dbe44ff7d5346  BitTorrent-4.2.0.tar.gz
+0deb2e083e95206a9e601ff6ca35b826  BitTorrent-4.2.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Nov 2005 12:29:33 -0000	1.14
+++ .cvsignore	6 Dec 2005 11:51:49 -0000	1.15
@@ -1 +1 @@
-BitTorrent-4.2.0.tar.gz
+BitTorrent-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec  6 11:54:22 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  6 Dec 2005 06:54:22 -0500
Subject: rpms/bittorrent/FC-4 bittorrent.spec, 1.16, 1.17 sources, 1.8,
	1.9 .cvsignore, 1.8, 1.9
Message-ID: <200512061154.jB6BsrrS006060@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	bittorrent.spec sources .cvsignore 
Log Message:
resync with devel



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-4/bittorrent.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bittorrent.spec	23 Nov 2005 12:35:57 -0000	1.16
+++ bittorrent.spec	6 Dec 2005 11:54:20 -0000	1.17
@@ -3,14 +3,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        4.2.0
+Version:        4.2.1
 Release:        1%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
 License:        BitTorrent Open Source License
 URL:            http://www.bittorrent.com/
-Source0:        http://dl.sf.net/bittorrent/BitTorrent-%{version}.tar.gz
+Source0:        http://www.bittorrent.com/dl/BitTorrent-%{version}.tar.gz
 Source1:        bittorrent.desktop
 Source2:        bittorrent.png
 Source3:	btseed.init
@@ -217,6 +217,10 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Tue Dec  6 2005 Paul Howarth  4.2.1-1
+- Update to 4.2.1
+- Source now at www.bittorrent.com rather than sourceforge
+
 * Wed Nov 23 2005 Paul Howarth  4.2.0-1
 - update to 4.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Nov 2005 12:35:57 -0000	1.8
+++ sources	6 Dec 2005 11:54:20 -0000	1.9
@@ -1 +1 @@
-a6a6d07a20e75da44c7dbe44ff7d5346  BitTorrent-4.2.0.tar.gz
+0deb2e083e95206a9e601ff6ca35b826  BitTorrent-4.2.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Nov 2005 12:35:57 -0000	1.8
+++ .cvsignore	6 Dec 2005 11:54:20 -0000	1.9
@@ -1 +1 @@
-BitTorrent-4.2.0.tar.gz
+BitTorrent-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec  6 11:56:34 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  6 Dec 2005 06:56:34 -0500
Subject: rpms/bittorrent/FC-3 sources,1.8,1.9 .cvsignore,1.8,1.9
Message-ID: <200512061157.jB6Bv4k7006129@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	sources .cvsignore 
Log Message:
resync with devel



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Nov 2005 12:38:32 -0000	1.8
+++ sources	6 Dec 2005 11:56:32 -0000	1.9
@@ -1 +1 @@
-a6a6d07a20e75da44c7dbe44ff7d5346  BitTorrent-4.2.0.tar.gz
+0deb2e083e95206a9e601ff6ca35b826  BitTorrent-4.2.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Nov 2005 12:38:32 -0000	1.8
+++ .cvsignore	6 Dec 2005 11:56:32 -0000	1.9
@@ -1 +1 @@
-BitTorrent-4.2.0.tar.gz
+BitTorrent-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec  6 11:58:38 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  6 Dec 2005 06:58:38 -0500
Subject: rpms/bittorrent/FC-3 bittorrent.spec,1.11,1.12
Message-ID: <200512061159.jB6Bx8hY006235@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	bittorrent.spec 
Log Message:
resync with devel, after having actually changed the spec file this time...



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/bittorrent.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bittorrent.spec	23 Nov 2005 12:38:32 -0000	1.11
+++ bittorrent.spec	6 Dec 2005 11:58:36 -0000	1.12
@@ -3,14 +3,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        4.2.0
+Version:        4.2.1
 Release:        1%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
 License:        BitTorrent Open Source License
 URL:            http://www.bittorrent.com/
-Source0:        http://dl.sf.net/bittorrent/BitTorrent-%{version}.tar.gz
+Source0:        http://www.bittorrent.com/dl/BitTorrent-%{version}.tar.gz
 Source1:        bittorrent.desktop
 Source2:        bittorrent.png
 Source3:	btseed.init
@@ -217,6 +217,10 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Tue Dec  6 2005 Paul Howarth  4.2.1-1
+- Update to 4.2.1
+- Source now at www.bittorrent.com rather than sourceforge
+
 * Wed Nov 23 2005 Paul Howarth  4.2.0-1
 - update to 4.2.0
 



From fedora-extras-commits at redhat.com  Tue Dec  6 13:43:56 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Dec 2005 08:43:56 -0500
Subject: rpms/gpgme/FC-4 gpgme-1.1.0-tests.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 gpgme.spec, 1.9, 1.10 sources, 1.3, 1.4
Message-ID: <200512061344.jB6DiQ8b009793@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore gpgme.spec sources 
Added Files:
	gpgme-1.1.0-tests.patch 
Log Message:
* Mon Aug  8 2005 Rex Dieter  - 1.0.3-1
- 1.0.3
- --disable-static


gpgme-1.1.0-tests.patch:

--- NEW FILE gpgme-1.1.0-tests.patch ---
--- gpgme-1.1.0/tests/gpgsm/t-keylist.c.tests	2005-09-08 09:42:32.000000000 -0500
+++ gpgme-1.1.0/tests/gpgsm/t-keylist.c	2005-10-11 09:24:40.000000000 -0500
@@ -44,6 +44,7 @@
   char *issuer_name;
   char *chain_id;
   char *uid;
+  char *email;
   gpgme_validity_t validity;
   unsigned int key_length;
 }
@@ -53,7 +54,7 @@
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
       "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E",
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
-      GPGME_VALIDITY_ULTIMATE, 1024
+      NULL, GPGME_VALIDITY_ULTIMATE, 1024
     },
     { "DFA56FB5FC41E3A8921F77AD1622EEFD9152A5AD", 0, 909684190, 1009821790, "01",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -63,7 +64,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Top Level Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_NEVER, 2048
+      "", GPGME_VALIDITY_NEVER, 2048
     },
     { "2C8F3C356AB761CB3674835B792CDA52937F9285", 0, 973183644, 1009735200, "15",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -73,7 +74,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Server Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_UNKNOWN, 2048
+      "", GPGME_VALIDITY_UNKNOWN, 2048
     },
     { NULL }
   };
@@ -286,7 +287,8 @@
 	  exit (1);
 	}
 
-      if (!key->uids || key->uids->next)
+      /* Be tolerant against a missing email (ie, older gpgsm versions).  */
+      if (!key->uids || (key->uids->next && !keys[i].email))
 	{
 	  fprintf (stderr, "Key has unexpected number of user IDs\n");
 	  exit (1);
@@ -336,6 +338,13 @@
 		   key->uids->uid);
 	  exit (1);
 	}
+      if (key->uids->next && strcmp (key->uids->next->uid, keys[i].email))
+	{
+	  fprintf (stderr, "Unexpected email in user ID: %s\n",
+		   key->uids->next->uid);
+	  exit (1);
+	}
+
 
       gpgme_key_unref (key);
       i++;
--- gpgme-1.1.0/tests/gpg/t-sig-notation.c.tests	2005-09-30 21:06:08.000000000 -0500
+++ gpgme-1.1.0/tests/gpg/t-sig-notation.c	2005-10-11 09:24:40.000000000 -0500
@@ -42,8 +42,8 @@
   { "laughing at me",
     "Just Squeeze Me",
     GPGME_SIG_NOTATION_HUMAN_READABLE },
-  { "leave at home",
-    "Right Now",
+  { "preferred-email-encoding at pgp.com",
+    "pgpmime",
     GPGME_SIG_NOTATION_HUMAN_READABLE | GPGME_SIG_NOTATION_CRITICAL },
   { NULL, 
     "http://www.gnu.org/policy/",


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2005 19:47:28 -0000	1.3
+++ .cvsignore	6 Dec 2005 13:43:53 -0000	1.4
@@ -1 +1,2 @@
-gpgme-1.0.2.tar.bz2
+gpgme-1.0.3.tar.bz2
+gpgme-1.0.3.tar.bz2.sig


Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-4/gpgme.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gpgme.spec	12 May 2005 05:46:49 -0000	1.9
+++ gpgme.spec	6 Dec 2005 13:43:53 -0000	1.10
@@ -1,19 +1,22 @@
+
 Name:    gpgme
-Version: 1.0.2
-Release: 3%{?dist}
 Summary: GnuPG Made Easy - high level crypto API
+Version: 1.0.3
+Release: 1%{?dist}
+
 License: LGPL
 Group:   Applications/System
 URL:     http://www.gnupg.org/related_software/gpgme/
 Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig
-Patch0:  gpgme-1.0.2-macro.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: gpgme-1.0.2-macro.patch
+
 BuildRequires: gnupg >= 1.2.2
 BuildRequires: gnupg2 >= 1.9.6
-BuildRequires: pth-devel
 BuildRequires: libgpg-error-devel >= 0.5
+BuildRequires: pth-devel >= 2.0.4
 
 Requires: gnupg >= 1.2.2
 Requires: gnupg2 >= 1.9.6
@@ -27,38 +30,41 @@
 management.
 
 %package devel
-Summary:  Static 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
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
-%description    devel
-Static libraries and header files from GPGME, GnuPG Made Easy.
+%description devel
+%{summary}
 
 
 %prep
 %setup -q
-%patch0 -p0
+
+%patch0 -p0 -b .tests
 
 
 %build
 %configure \
-  --program-prefix="%{?_program_prefix}" \
-  --enable-static
+  --disable-static
 
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/*.la}
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %check || :
-make check
+# expect t-keylist failure, reported upstream
+make check ||:
 
 
 %clean
@@ -66,8 +72,8 @@
 
 
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %post devel
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
@@ -81,19 +87,22 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING* ChangeLog NEWS README* THANKS TODO VERSION
-%{_libdir}/libgpgme*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/gpgme-config
-%{_includedir}/gpgme.h
-%{_libdir}/libgpgme*.a
-%{_libdir}/libgpgme*.so
+%{_includedir}/*
+%{_libdir}/lib*.so
 %{_datadir}/aclocal/gpgme.m4
 %{_infodir}/gpgme.info*
 
 
 %changelog
+* Mon Aug  8 2005 Rex Dieter  - 1.0.3-1
+- 1.0.3
+- --disable-static
+
 * Thu May 12 2005 Michael Schwendt  - 1.0.2-3
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2005 19:47:28 -0000	1.3
+++ sources	6 Dec 2005 13:43:53 -0000	1.4
@@ -1 +1,2 @@
-25513fd35593bad08c1e486878296b40  gpgme-1.0.2.tar.bz2
+84f85671d63164fb1d338c23010f023d  gpgme-1.0.3.tar.bz2
+f91f3a341c0070aef7cec52e3cb4d770  gpgme-1.0.3.tar.bz2.sig



From fedora-extras-commits at redhat.com  Tue Dec  6 13:47:52 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Dec 2005 08:47:52 -0500
Subject: rpms/gpgme/FC-4 gpgme-1.0.2.tar.bz2.sig,1.1,NONE
Message-ID: <200512061347.jB6DlqCi009863@cvs-int.fedora.redhat.com>

Author: rdieter

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

Removed Files:
	gpgme-1.0.2.tar.bz2.sig 
Log Message:
remove old .sig



--- gpgme-1.0.2.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec  6 13:48:46 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Dec 2005 08:48:46 -0500
Subject: rpms/gpgme/FC-3 gpgme-1.0.2-macro.patch, NONE,
	1.1 gpgme-1.1.0-tests.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 gpgme.spec, 1.6, 1.7 sources, 1.3,
	1.4 gpgme-1.0.2.tar.bz2.sig, 1.1, NONE
Message-ID: <200512061349.jB6DnGDt009912@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore gpgme.spec sources 
Added Files:
	gpgme-1.0.2-macro.patch gpgme-1.1.0-tests.patch 
Removed Files:
	gpgme-1.0.2.tar.bz2.sig 
Log Message:
* Mon Aug  8 2005 Rex Dieter  - 1.0.3-1
- 1.0.3
- --disable-static


gpgme-1.0.2-macro.patch:

--- NEW FILE gpgme-1.0.2-macro.patch ---
--- gpgme/ath-compat.c~	2004-12-07 23:11:52.000000000 +0200
+++ gpgme/ath-compat.c	2005-03-18 12:54:44.000000000 +0200
@@ -108,7 +108,7 @@
 ath_read (int fd, void *buf, size_t nbytes)
 {
   if (ath_ops && ath_ops->read)
-    return ath_ops->read (fd, buf, nbytes);
+    return (ath_ops->read) (fd, buf, nbytes);
   else
     return read (fd, buf, nbytes);
 }

gpgme-1.1.0-tests.patch:

--- NEW FILE gpgme-1.1.0-tests.patch ---
--- gpgme-1.1.0/tests/gpgsm/t-keylist.c.tests	2005-09-08 09:42:32.000000000 -0500
+++ gpgme-1.1.0/tests/gpgsm/t-keylist.c	2005-10-11 09:24:40.000000000 -0500
@@ -44,6 +44,7 @@
   char *issuer_name;
   char *chain_id;
   char *uid;
+  char *email;
   gpgme_validity_t validity;
   unsigned int key_length;
 }
@@ -53,7 +54,7 @@
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
       "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E",
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
-      GPGME_VALIDITY_ULTIMATE, 1024
+      NULL, GPGME_VALIDITY_ULTIMATE, 1024
     },
     { "DFA56FB5FC41E3A8921F77AD1622EEFD9152A5AD", 0, 909684190, 1009821790, "01",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -63,7 +64,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Top Level Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_NEVER, 2048
+      "", GPGME_VALIDITY_NEVER, 2048
     },
     { "2C8F3C356AB761CB3674835B792CDA52937F9285", 0, 973183644, 1009735200, "15",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -73,7 +74,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Server Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_UNKNOWN, 2048
+      "", GPGME_VALIDITY_UNKNOWN, 2048
     },
     { NULL }
   };
@@ -286,7 +287,8 @@
 	  exit (1);
 	}
 
-      if (!key->uids || key->uids->next)
+      /* Be tolerant against a missing email (ie, older gpgsm versions).  */
+      if (!key->uids || (key->uids->next && !keys[i].email))
 	{
 	  fprintf (stderr, "Key has unexpected number of user IDs\n");
 	  exit (1);
@@ -336,6 +338,13 @@
 		   key->uids->uid);
 	  exit (1);
 	}
+      if (key->uids->next && strcmp (key->uids->next->uid, keys[i].email))
+	{
+	  fprintf (stderr, "Unexpected email in user ID: %s\n",
+		   key->uids->next->uid);
+	  exit (1);
+	}
+
 
       gpgme_key_unref (key);
       i++;
--- gpgme-1.1.0/tests/gpg/t-sig-notation.c.tests	2005-09-30 21:06:08.000000000 -0500
+++ gpgme-1.1.0/tests/gpg/t-sig-notation.c	2005-10-11 09:24:40.000000000 -0500
@@ -42,8 +42,8 @@
   { "laughing at me",
     "Just Squeeze Me",
     GPGME_SIG_NOTATION_HUMAN_READABLE },
-  { "leave at home",
-    "Right Now",
+  { "preferred-email-encoding at pgp.com",
+    "pgpmime",
     GPGME_SIG_NOTATION_HUMAN_READABLE | GPGME_SIG_NOTATION_CRITICAL },
   { NULL, 
     "http://www.gnu.org/policy/",


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2005 19:47:28 -0000	1.3
+++ .cvsignore	6 Dec 2005 13:48:43 -0000	1.4
@@ -1 +1,2 @@
-gpgme-1.0.2.tar.bz2
+gpgme-1.0.3.tar.bz2
+gpgme-1.0.3.tar.bz2.sig


Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-3/gpgme.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gpgme.spec	1 Feb 2005 19:52:10 -0000	1.6
+++ gpgme.spec	6 Dec 2005 13:48:43 -0000	1.7
@@ -1,25 +1,27 @@
 
-Name:	 gpgme
-Epoch:	 0
-Version: 1.0.2
-Release: 1%{?dist_tag}
+Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
+Version: 1.0.3
+Release: 1%{?dist}
+
 License: LGPL
 Group:   Applications/System
 URL:     http://www.gnupg.org/related_software/gpgme/
-Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2.sig
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: gnupg >= 0:1.2.2
-BuildRequires: gnupg2 >= 0:1.9.6
-BuildRequires: pth-devel
-BuildRequires: libgpg-error-devel >= 0:0.5
+Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch0: gpgme-1.0.2-macro.patch
+
+BuildRequires: gnupg >= 1.2.2
+BuildRequires: gnupg2 >= 1.9.6
+BuildRequires: libgpg-error-devel >= 0.5
+BuildRequires: pth-devel >= 2.0.4
 
-Requires: gnupg >= 0:1.2.2
-Requires: gnupg2 >= 0:1.9.6
+Requires: gnupg >= 1.2.2
+Requires: gnupg2 >= 1.9.6
 
-Obsoletes: cryptplug <= 0:0.3.16-2
+Obsoletes: cryptplug <= 0.3.16-2
 
 %description
 GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
@@ -28,37 +30,41 @@
 management.
 
 %package devel
-Summary:  Static libraries and header files from GPGME, GnuPG Made Easy
+Summary:  Development headers and libraries for %{name}
 Group:    Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: libgpg-error-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
-%description    devel
-Static libraries and header files from GPGME, GnuPG Made Easy.
+%description devel
+%{summary}
 
 
 %prep
 %setup -q
 
+%patch0 -p0 -b .tests
+
 
 %build
 %configure \
-  --program-prefix="%{?_program_prefix}" \
-  --enable-static
+  --disable-static
 
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/*.la}
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %check || :
-make check 
+# expect t-keylist failure, reported upstream
+make check ||:
 
 
 %clean
@@ -66,8 +72,8 @@
 
 
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %post devel
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
@@ -81,19 +87,28 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING* ChangeLog NEWS README* THANKS TODO VERSION
-%{_libdir}/libgpgme*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/gpgme-config
-%{_includedir}/gpgme.h
-%{_libdir}/libgpgme*.a
-%{_libdir}/libgpgme*.so
+%{_includedir}/*
+%{_libdir}/lib*.so
 %{_datadir}/aclocal/gpgme.m4
 %{_infodir}/gpgme.info*
 
 
 %changelog
+* Mon Aug  8 2005 Rex Dieter  - 1.0.3-1
+- 1.0.3
+- --disable-static
+
+* Thu May 12 2005 Michael Schwendt  - 1.0.2-3
+- rebuilt
+
+* Fri Mar 18 2005 Ville Skytt??  - 1.0.2-2
+- Fix FC4 build.
+
 * Tue Feb  1 2005 Michael Schwendt  - 0:1.0.2-1
 - LGPL used here, and made summary more explicit.
 - Remove dirmngr dependency (gpgsm interfaces with it).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2005 19:47:28 -0000	1.3
+++ sources	6 Dec 2005 13:48:43 -0000	1.4
@@ -1 +1,2 @@
-25513fd35593bad08c1e486878296b40  gpgme-1.0.2.tar.bz2
+84f85671d63164fb1d338c23010f023d  gpgme-1.0.3.tar.bz2
+f91f3a341c0070aef7cec52e3cb4d770  gpgme-1.0.3.tar.bz2.sig


--- gpgme-1.0.2.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec  6 14:05:42 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Dec 2005 09:05:42 -0500
Subject: rpms/gpgme/FC-4 gpgme-1.0.3-tests.patch, NONE, 1.1 gpgme.spec, 1.10,
	1.11
Message-ID: <200512061406.jB6E6CP1011568@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	gpgme.spec 
Added Files:
	gpgme-1.0.3-tests.patch 
Log Message:
* Tue Dec 06 2005 Rex Dieter  1.0.3-2
- tests.patch so 'make check' passes


gpgme-1.0.3-tests.patch:

--- NEW FILE gpgme-1.0.3-tests.patch ---
--- gpgme-1.1.0/tests/gpgsm/t-keylist.c.tests	2005-09-08 09:42:32.000000000 -0500
+++ gpgme-1.1.0/tests/gpgsm/t-keylist.c	2005-10-11 09:24:40.000000000 -0500
@@ -44,6 +44,7 @@
   char *issuer_name;
   char *chain_id;
   char *uid;
+  char *email;
   gpgme_validity_t validity;
   unsigned int key_length;
 }
@@ -53,7 +54,7 @@
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
       "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E",
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
-      GPGME_VALIDITY_ULTIMATE, 1024
+      NULL, GPGME_VALIDITY_ULTIMATE, 1024
     },
     { "DFA56FB5FC41E3A8921F77AD1622EEFD9152A5AD", 0, 909684190, 1009821790, "01",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -63,7 +64,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Top Level Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_NEVER, 2048
+      "", GPGME_VALIDITY_NEVER, 2048
     },
     { "2C8F3C356AB761CB3674835B792CDA52937F9285", 0, 973183644, 1009735200, "15",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -73,7 +74,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Server Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_UNKNOWN, 2048
+      "", GPGME_VALIDITY_UNKNOWN, 2048
     },
     { NULL }
   };
@@ -286,7 +287,8 @@
 	  exit (1);
 	}
 
-      if (!key->uids || key->uids->next)
+      /* Be tolerant against a missing email (ie, older gpgsm versions).  */
+      if (!key->uids || (key->uids->next && !keys[i].email))
 	{
 	  fprintf (stderr, "Key has unexpected number of user IDs\n");
 	  exit (1);
@@ -336,6 +338,13 @@
 		   key->uids->uid);
 	  exit (1);
 	}
+      if (key->uids->next && strcmp (key->uids->next->uid, keys[i].email))
+	{
+	  fprintf (stderr, "Unexpected email in user ID: %s\n",
+		   key->uids->next->uid);
+	  exit (1);
+	}
+
 
       gpgme_key_unref (key);
       i++;


Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-4/gpgme.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gpgme.spec	6 Dec 2005 13:43:53 -0000	1.10
+++ gpgme.spec	6 Dec 2005 14:05:39 -0000	1.11
@@ -2,7 +2,7 @@
 Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPL
 Group:   Applications/System
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: gpgme-1.0.2-macro.patch
+Patch1: gpgme-1.0.3-tests.patch
 
 BuildRequires: gnupg >= 1.2.2
 BuildRequires: gnupg2 >= 1.9.6
@@ -43,7 +44,8 @@
 %prep
 %setup -q
 
-%patch0 -p0 -b .tests
+%patch0 -p0 -b .macro
+%patch1 -p1 -b .tests
 
 
 %build
@@ -63,8 +65,7 @@
 
 
 %check || :
-# expect t-keylist failure, reported upstream
-make check ||:
+make check
 
 
 %clean
@@ -99,6 +100,9 @@
 
 
 %changelog
+* Tue Dec 06 2005 Rex Dieter  1.0.3-2
+- tests.patch so 'make check' passes
+
 * Mon Aug  8 2005 Rex Dieter  - 1.0.3-1
 - 1.0.3
 - --disable-static



From fedora-extras-commits at redhat.com  Tue Dec  6 14:05:24 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Dec 2005 09:05:24 -0500
Subject: rpms/gpgme/FC-3 gpgme-1.0.3-tests.patch, NONE, 1.1 gpgme.spec, 1.7,
	1.8
Message-ID: <200512061406.jB6E6dK7011569@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	gpgme.spec 
Added Files:
	gpgme-1.0.3-tests.patch 
Log Message:
* Tue Dec 06 2005 Rex Dieter  1.0.3-2
- tests.patch so 'make check' passes


gpgme-1.0.3-tests.patch:

--- NEW FILE gpgme-1.0.3-tests.patch ---
--- gpgme-1.1.0/tests/gpgsm/t-keylist.c.tests	2005-09-08 09:42:32.000000000 -0500
+++ gpgme-1.1.0/tests/gpgsm/t-keylist.c	2005-10-11 09:24:40.000000000 -0500
@@ -44,6 +44,7 @@
   char *issuer_name;
   char *chain_id;
   char *uid;
+  char *email;
   gpgme_validity_t validity;
   unsigned int key_length;
 }
@@ -53,7 +54,7 @@
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
       "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E",
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
-      GPGME_VALIDITY_ULTIMATE, 1024
+      NULL, GPGME_VALIDITY_ULTIMATE, 1024
     },
     { "DFA56FB5FC41E3A8921F77AD1622EEFD9152A5AD", 0, 909684190, 1009821790, "01",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -63,7 +64,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Top Level Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_NEVER, 2048
+      "", GPGME_VALIDITY_NEVER, 2048
     },
     { "2C8F3C356AB761CB3674835B792CDA52937F9285", 0, 973183644, 1009735200, "15",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -73,7 +74,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Server Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_UNKNOWN, 2048
+      "", GPGME_VALIDITY_UNKNOWN, 2048
     },
     { NULL }
   };
@@ -286,7 +287,8 @@
 	  exit (1);
 	}
 
-      if (!key->uids || key->uids->next)
+      /* Be tolerant against a missing email (ie, older gpgsm versions).  */
+      if (!key->uids || (key->uids->next && !keys[i].email))
 	{
 	  fprintf (stderr, "Key has unexpected number of user IDs\n");
 	  exit (1);
@@ -336,6 +338,13 @@
 		   key->uids->uid);
 	  exit (1);
 	}
+      if (key->uids->next && strcmp (key->uids->next->uid, keys[i].email))
+	{
+	  fprintf (stderr, "Unexpected email in user ID: %s\n",
+		   key->uids->next->uid);
+	  exit (1);
+	}
+
 
       gpgme_key_unref (key);
       i++;


Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-3/gpgme.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gpgme.spec	6 Dec 2005 13:48:43 -0000	1.7
+++ gpgme.spec	6 Dec 2005 14:05:22 -0000	1.8
@@ -2,7 +2,7 @@
 Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPL
 Group:   Applications/System
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: gpgme-1.0.2-macro.patch
+Patch1: gpgme-1.0.3-tests.patch
 
 BuildRequires: gnupg >= 1.2.2
 BuildRequires: gnupg2 >= 1.9.6
@@ -43,7 +44,8 @@
 %prep
 %setup -q
 
-%patch0 -p0 -b .tests
+%patch0 -p0 -b .macro
+%patch1 -p1 -b .tests
 
 
 %build
@@ -63,8 +65,7 @@
 
 
 %check || :
-# expect t-keylist failure, reported upstream
-make check ||:
+make check
 
 
 %clean
@@ -99,6 +100,9 @@
 
 
 %changelog
+* Tue Dec 06 2005 Rex Dieter  1.0.3-2
+- tests.patch so 'make check' passes
+
 * Mon Aug  8 2005 Rex Dieter  - 1.0.3-1
 - 1.0.3
 - --disable-static



From fedora-extras-commits at redhat.com  Tue Dec  6 15:52:53 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Dec 2005 10:52:53 -0500
Subject: rpms/openvpn/devel openvpn.spec,1.11,1.12
Message-ID: <200512061553.jB6FrOQP013469@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	openvpn.spec 
Log Message:
Rebuild.


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openvpn.spec	18 Nov 2005 23:33:28 -0000	1.11
+++ openvpn.spec	6 Dec 2005 15:52:51 -0000	1.12
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.3%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.4%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 #Source0:           http://openvpn.net/release/%{name}-%{version}.tar.gz
@@ -132,6 +132,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Tue Dec 06 2005 Steven Pritchard  2.1-0.4.beta7
+- Rebuild
+
 * Fri Nov 18 2005 Steven Pritchard  2.1-0.3.beta7
 - Update to 2.1_beta7
 



From fedora-extras-commits at redhat.com  Tue Dec  6 18:22:17 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 13:22:17 -0500
Subject: web/include navigation.inc,1.15,1.16
Message-ID: <200512061822.jB6IMlkd018682@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18665

Modified Files:
	navigation.inc 
Log Message:
Removing extra commas in navigation.inc


Index: navigation.inc
===================================================================
RCS file: /cvs/fedora/web/include/navigation.inc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- navigation.inc	6 Dec 2005 05:11:11 -0000	1.15
+++ navigation.inc	6 Dec 2005 18:22:15 -0000	1.16
@@ -11,7 +11,7 @@
 		"Mirrors"=>array("uri"=>"/Download/mirrors.php"),
 		"Vendors"=>array("uri"=>"/Download/vendors.php"),
 		"Updates"=>array("uri"=>"/Download/updates.php"),
-		"Download Server"=>array("uri"=>"http://download.fedora.redhat.com/pub/fedora/linux/"),
+		"Download Server"=>array("uri"=>"http://download.fedora.redhat.com/pub/fedora/linux/")
 		)),
 	"News"=>array("uri"=>"/News/"),
 	"Documentation"=>array("uri"=>"/docs/","sub"=>array(
@@ -21,7 +21,7 @@
 		"Jargon Buster"=>array("uri"=>"/docs/jargon-buster/"),
                 "SELinux FAQ"=>array("uri"=>"/docs/selinux-faq/"),
 		"Developer's Guide"=>array("uri"=>"/docs/developers-guide/"),
-		"Documentation Guide"=>array("uri"=>"/docs/documentation-guide/"),
+		"Documentation Guide"=>array("uri"=>"/docs/documentation-guide/")
 		)),
 	"Contribute"=>array("uri"=>"/Contribute/"),
 	"About"=>array("uri"=>"/About/","sub"=>array(
@@ -35,7 +35,7 @@
 		//"Product Relationship"=>array("uri"=>"/about/rhel.php"),
 		//"Fedora Name"=>array("uri"=>"/about/name.php"),
 		"Legal"=>array("uri"=>"/About/legal/"),
-		"GPG Keys"=>array("uri"=>"/About/security/"),
+		"GPG Keys"=>array("uri"=>"/About/security/")
 		))
 	);
 ?>



From fedora-extras-commits at redhat.com  Tue Dec  6 18:28:20 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 13:28:20 -0500
Subject: web/include template.inc,1.7,1.8
Message-ID: <200512061828.jB6ISoF1018758@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18726/include

Modified Files:
	template.inc 
Log Message:
Logo approved, moving on.


Index: template.inc
===================================================================
RCS file: /cvs/fedora/web/include/template.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- template.inc	6 Dec 2005 06:54:03 -0000	1.7
+++ template.inc	6 Dec 2005 18:28:18 -0000	1.8
@@ -64,7 +64,7 @@
 		
 		
          
 			
 
 			
          



From fedora-extras-commits at redhat.com  Tue Dec  6 18:55:04 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue,  6 Dec 2005 13:55:04 -0500
Subject: rpms/alsa-tools/devel .cvsignore, 1.5, 1.6 alsa-tools.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200512061855.jB6ItZDr019073@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/alsa-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19034

Modified Files:
	.cvsignore alsa-tools.spec sources 
Log Message:
Update to 1.0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Jun 2005 14:44:41 -0000	1.5
+++ .cvsignore	6 Dec 2005 18:55:02 -0000	1.6
@@ -1 +1 @@
-alsa-tools-1.0.9-pruned.tar.bz2
+alsa-tools-1.0.10-pruned.tar.bz2


Index: alsa-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/alsa-tools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- alsa-tools.spec	27 Jun 2005 14:44:41 -0000	1.8
+++ alsa-tools.spec	6 Dec 2005 18:55:02 -0000	1.9
@@ -4,7 +4,7 @@
 
 Summary: 	The ALSA Tools
 Name: 		alsa-tools
-Version: 	1.0.9
+Version: 	1.0.10
 Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
@@ -151,6 +151,9 @@
 %endif # ?_with_firmware
 
 %changelog
+* Tue Dec 06 2005 Thorsten Leemhuis  - 1.0.10-1
+- Update to 1.0.10
+
 * Fri May 06 2005 Thorsten Leemhuis  - 1.0.9-1
 - Update to 1.0.9
 - Use disttag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jun 2005 14:44:41 -0000	1.5
+++ sources	6 Dec 2005 18:55:02 -0000	1.6
@@ -1 +1 @@
-0151eb036e97d46bdee972cfdb433149  alsa-tools-1.0.9-pruned.tar.bz2
+dd280ae7294b3021438986ca54df9ca5  alsa-tools-1.0.10-pruned.tar.bz2



From fedora-extras-commits at redhat.com  Tue Dec  6 18:55:39 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 13:55:39 -0500
Subject: web/include widgets.inc,1.3,1.4
Message-ID: <200512061856.jB6Iu94T019168@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19081

Modified Files:
	widgets.inc 
Log Message:
Reverting this piece to what was in 1.2 that wasn't broken ... I'm figuring I did a phat phinger on this page while editing last night.


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- widgets.inc	15 Nov 2005 23:38:14 -0000	1.3
+++ widgets.inc	6 Dec 2005 18:55:37 -0000	1.4
@@ -55,7 +55,7 @@
 		$imgsize = getimagesize($_SERVER[DOCUMENT_ROOT]."/".$filename_deslash);
 	}
 	if ($extra != "") $extra = " ".$extra;
-	return "\"$alt\"$extra";
+	return "\"$alt\"$extra";
 }
 
 /* Escape and obfuscate the email to hide it from spambots,



From fedora-extras-commits at redhat.com  Tue Dec  6 18:59:37 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Dec 2005 13:59:37 -0500
Subject: rpms/sbcl/FC-3 .cvsignore, 1.5, 1.6 sbcl.spec, 1.24, 1.25 sources,
	1.5, 1.6
Message-ID: <200512061900.jB6J08AX019360@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Mon Nov 28 2005 Rex Dieter  0.9.7-1
- 0.9.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Oct 2005 17:34:32 -0000	1.5
+++ .cvsignore	6 Dec 2005 18:59:35 -0000	1.6
@@ -3,3 +3,4 @@
 sbcl-0.9.5-source.tar.bz2
 sbcl-0.9.5-x86-linux-binary.tar.bz2
 sbcl-0.9.6-source.tar.bz2
+sbcl-0.9.7-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sbcl.spec	27 Oct 2005 20:12:23 -0000	1.24
+++ sbcl.spec	6 Dec 2005 18:59:35 -0000	1.25
@@ -5,12 +5,15 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define verbose 1 
+%define sbcl_verbose 1 
+
+# shell to use
+%define sbcl_shell /bin/bash -x
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.6
-Release: 5%{?dist}
+Version: 0.9.7
+Release: 1%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -93,7 +96,7 @@
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
 %patch5 -p1 -b .make-config-fix
-%{?verbose:%patch6 -p1 -b .verbose-build}
+%{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
 # Enable sb-thread
@@ -110,7 +113,7 @@
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
 pushd sbcl-*-linux
-INSTALL_ROOT=`pwd`/../sbcl-bootstrap sh %{?verbose:-x} ./install.sh
+INSTALL_ROOT=`pwd`/../sbcl-bootstrap %{?sbcl_shell} ./install.sh
 popd
 %endif
 
@@ -141,7 +144,7 @@
 export EXTRA_CFLAGS="$CFLAGS"
 export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
-%{?setarch} %{?my_setarch} sh %{?verbose:-x} ./make.sh %{?bootstrap}
+%{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap}
 
 
 
@@ -162,7 +165,7 @@
 pushd tests 
 # Only x86 builds are expected to pass all
 # Don't worry about thread.impure failure(s), threading is optional anyway.
-%{?setarch} sh ./run-tests.sh ||:
+%{?setarch} %{?sbcl_shell} ./run-tests.sh ||:
 popd
 
 
@@ -174,7 +177,7 @@
 unset SBCL_HOME 
 export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} 
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} 
-sh %{?verbose:-x} ./install.sh 
+%{?sbcl_shell} ./install.sh 
 
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
@@ -182,8 +185,8 @@
 # CVS crud 
 find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
 find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f
-# 'test-passed' files from %%check (leave these in, for now -- Rex)
-# find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
+# 'test-passed' files from %%check
+find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -vf
 
 
 %if "%{?min_bootstrap}" == "%{nil}"
@@ -223,8 +226,11 @@
 
 
 %changelog
+* Mon Nov 28 2005 Rex Dieter  0.9.7-1
+- 0.9.7
+
 * Thu Oct 27 2005 Rex Dieter  0.9.6-5
-- override friggen sb-posix test failure(s).
+- override (bogus/mock-induced) sb-posix test failure(s).
 
 * Thu Oct 27 2005 Rex Dieter  0.9.6-4
 - drop -D_FILE_OFFSET_BITS=64


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Oct 2005 17:34:32 -0000	1.5
+++ sources	6 Dec 2005 18:59:35 -0000	1.6
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 67ec41e624a3f2ad7f6f3cde1bd001d3  sbcl-0.9.4-x86-64-linux-binary.tar.bz2
 cb01b462b517889723eeaf63b5474c70  sbcl-0.9.5-x86-linux-binary.tar.bz2
-5e94122e73bc59c1411ff93fee948bfb  sbcl-0.9.6-source.tar.bz2
+d5e5e4ae500f12b7523989222cb4cc88  sbcl-0.9.7-source.tar.bz2



From fedora-extras-commits at redhat.com  Tue Dec  6 19:03:53 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Dec 2005 14:03:53 -0500
Subject: rpms/sbcl/FC-3 sbcl.spec,1.25,1.26
Message-ID: <200512061904.jB6J4NnI021032@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	sbcl.spec 
Log Message:
previous tagging attempt failed, micro increment Release



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sbcl.spec	6 Dec 2005 18:59:35 -0000	1.25
+++ sbcl.spec	6 Dec 2005 19:03:50 -0000	1.26
@@ -13,7 +13,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.7
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: BSD/MIT
 Group: 	 Development/Languages



From fedora-extras-commits at redhat.com  Tue Dec  6 19:33:40 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:33:40 -0500
Subject: web/html/docs/developers-guide - New directory
Message-ID: <200512061933.jB6JXeA9021183@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/developers-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21174/developers-guide

Log Message:
Directory /cvs/fedora/web/html/docs/developers-guide added to the repository




From fedora-extras-commits at redhat.com  Tue Dec  6 19:33:45 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:33:45 -0500
Subject: web/html/docs/documentation-guide - New directory
Message-ID: <200512061933.jB6JXje9021198@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21174/documentation-guide

Log Message:
Directory /cvs/fedora/web/html/docs/documentation-guide added to the repository




From fedora-extras-commits at redhat.com  Tue Dec  6 19:34:35 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:34:35 -0500
Subject: web/html/docs/developers-guide/stylesheet-images - New directory
Message-ID: <200512061934.jB6JYZpH021232@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/developers-guide/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21221/developers-guide/stylesheet-images

Log Message:
Directory /cvs/fedora/web/html/docs/developers-guide/stylesheet-images added to the repository




From fedora-extras-commits at redhat.com  Tue Dec  6 19:34:41 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:34:41 -0500
Subject: web/html/docs/documentation-guide/stylesheet-images - New directory
Message-ID: <200512061934.jB6JYfGK021250@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-guide/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21221/documentation-guide/stylesheet-images

Log Message:
Directory /cvs/fedora/web/html/docs/documentation-guide/stylesheet-images added to the repository




From fedora-extras-commits at redhat.com  Tue Dec  6 19:35:38 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:35:38 -0500
Subject: web/html/docs/documentation-faq - New directory
Message-ID: <200512061935.jB6JZch7021274@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-faq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21264/documentation-faq

Log Message:
Directory /cvs/fedora/web/html/docs/documentation-faq added to the repository




From fedora-extras-commits at redhat.com  Tue Dec  6 19:37:05 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:37:05 -0500
Subject: web/html/docs/developers-guide ch-console-access.php, NONE,
	1.1 ch-cvs.php, NONE, 1.1 ch-guidelines.php, NONE,
	1.1 ch-menus.php, NONE, 1.1 ch-package-versions.php, NONE,
	1.1 ch-rpm-building.php, NONE, 1.1 ch-ui-guidelines.php, NONE,
	1.1 index.php, NONE, 1.1 ln-legalnotice.php, NONE,
	1.1 s1-cvs-configure.php, NONE, 1.1 s1-cvs-cvscommands.php,
	NONE, 1.1 s1-rpm-guidelines.php, NONE,
	1.1 s1-rpm-more-guidelines.php, NONE,
	1.1 s1-ui-get-details.php, NONE, 1.1 s1-ui-get-religion.php,
	NONE, 1.1 s1-ui-gnome-guidelines.php, NONE,
	1.1 s1-ui-more-suggestions.php, NONE, 1.1 s1-ui-scaling.php,
	NONE, 1.1 sn-cvs-config.php, NONE, 1.1 sn-cvs-cvscommands.php,
	NONE, 1.1 sn-cvs-preparation.php, NONE, 1.1
Message-ID: <200512061937.jB6Jb5U2021331@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/developers-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21296/developers-guide

Added Files:
	ch-console-access.php ch-cvs.php ch-guidelines.php 
	ch-menus.php ch-package-versions.php ch-rpm-building.php 
	ch-ui-guidelines.php index.php ln-legalnotice.php 
	s1-cvs-configure.php s1-cvs-cvscommands.php 
	s1-rpm-guidelines.php s1-rpm-more-guidelines.php 
	s1-ui-get-details.php s1-ui-get-religion.php 
	s1-ui-gnome-guidelines.php s1-ui-more-suggestions.php 
	s1-ui-scaling.php sn-cvs-config.php sn-cvs-cvscommands.php 
	sn-cvs-preparation.php 
Log Message:
Moving documentation FAQ, guide, and developer guide to where they belong under /docs; this makes the documentation directory able to be moved more easily.  I'll setup redirects in the old locations.


***** Error reading new file: [Errno 2] No such file or directory: 'ch-console-access.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-cvs.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-guidelines.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-menus.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-package-versions.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-rpm-building.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-ui-guidelines.php'

***** Error reading new file: [Errno 2] No such file or directory: 'index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ln-legalnotice.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-cvs-configure.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-cvs-cvscommands.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-rpm-guidelines.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-rpm-more-guidelines.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-ui-get-details.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-ui-get-religion.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-ui-gnome-guidelines.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-ui-more-suggestions.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-ui-scaling.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-config.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-cvscommands.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-preparation.php'



From fedora-extras-commits at redhat.com  Tue Dec  6 19:37:11 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:37:11 -0500
Subject: web/html/docs/documentation-faq index.php,NONE,1.1
Message-ID: <200512061937.jB6JbBhM021347@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-faq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21296/documentation-faq

Added Files:
	index.php 
Log Message:
Moving documentation FAQ, guide, and developer guide to where they belong under /docs; this makes the documentation directory able to be moved more easily.  I'll setup redirects in the old locations.


***** Error reading new file: [Errno 2] No such file or directory: 'index.php'



From fedora-extras-commits at redhat.com  Tue Dec  6 19:37:16 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:37:16 -0500
Subject: web/html/docs/documentation-guide acknowledgments.php, NONE,
 1.1 ch-converting.php, NONE, 1.1 ch-cvs.php, NONE, 1.1 ch-emacs-nxml.php,
 NONE, 1.1 ch-emacs.php, NONE, 1.1 ch-getting-files.php, NONE,
 1.1 ch-intro.php, NONE, 1.1 ch-rh-guidelines.php, NONE, 1.1 ch-style.php,
 NONE, 1.1 ch-tutorial.php, NONE, 1.1 ch-vim.php, NONE, 1.1 ch-xml-tags.php,
 NONE, 1.1 generated-index.php, NONE, 1.1 index.php, NONE,
 1.1 ln-legalnotice.php, NONE, 1.1 s1-diagrams-images.php, NONE,
 1.1 s1-emacs-additional-resources.php, NONE, 1.1 s1-emacs-basic-commands.php,
 NONE, 1.1 s1-emacs-cedfile.php, NONE, 1.1 s1-emacs-colors.php, NONE,
 1.1 s1-emacs-examples.php, NONE, 1.1 s1-emacs-loadced.php, NONE,
 1.1 s1-emacs-nxml-additional-resources.php, NONE,
 1.1 s1-emacs-nxml-readme.php, NONE, 1.1 s1-nxml-examples.php, NONE,
 1.1 s1-screenshots.php, NONE, 1.1 s1-tutorial-license.php, NONE,
 1.1 s1-vim-additional-resources.php, NONE, 1.1 s1-vim-keymapping.php, NONE,
 1.1 s1-xml-admon.php, NONE, 1.1 s1-xml-guidelines-header.php, NONE,
 1.1 s1-xml-tag-sulink.php, NONE, 1.1!
 s1-xml-tags-application.php, NONE, 1.1 s1-xml-tags-chapter.php, NONE,
 1.1 s1-xml-tags-citetitle.php, NONE, 1.1 s1-xml-tags-command.php, NONE,
 1.1 s1-xml-tags-compoutput.php, NONE, 1.1 s1-xml-tags-emphasis.php, NONE,
 1.1 s1-xml-tags-example.php, NONE, 1.1 s1-xml-tags-figure.php, NONE,
 1.1 s1-xml-tags-filename.php, NONE, 1.1 s1-xml-tags-firstterm.php, NONE,
 1.1 s1-xml-tags-footnote.php, NONE, 1.1 s1-xml-tags-gui.php, NONE,
 1.1 s1-xml-tags-indexing.php, NONE, 1.1 s1-xml-tags-keycap.php, NONE,
 1.1 s1-xml-tags-lists.php, NONE, 1.1 s1-xml-tags-option.php, NONE,
 1.1 s1-xml-tags-para.php, NONE, 1.1 s1-xml-tags-part.php, NONE,
 1.1 s1-xml-tags-prompt.php, NONE, 1.1 s1-xml-tags-replaceable.php, NONE,
 1.1 s1-xml-tags-screen.php, NONE, 1.1 s1-xml-tags-sections.php, NONE,
 1.1 s1-xml-tags-table.php, NONE, 1.1 s1-xml-tags-trademark.php, NONE,
 1.1 s1-xml-tags-userinput.php, NONE, 1.1 s1-xml-tags-wordasword.php, NONE,
 1.1 s1-xml-tags-xref.php, NONE, 1.1 sn-composition-tips.php, NONE,
 1.1 sn-cvs-config.php, NONE, 1.1 sn-cvs-cvscommands.php, NONE, 1.1!
 sn-cvs-preparation.php,NONE,1.1 sn-grammar-and-usage.php,NONE!
 ,1.1 s
Message-ID: <200512061937.jB6JbGTD021427@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21296/documentation-guide

Added Files:
	acknowledgments.php ch-converting.php ch-cvs.php 
	ch-emacs-nxml.php ch-emacs.php ch-getting-files.php 
	ch-intro.php ch-rh-guidelines.php ch-style.php ch-tutorial.php 
	ch-vim.php ch-xml-tags.php generated-index.php index.php 
	ln-legalnotice.php s1-diagrams-images.php 
	s1-emacs-additional-resources.php s1-emacs-basic-commands.php 
	s1-emacs-cedfile.php s1-emacs-colors.php s1-emacs-examples.php 
	s1-emacs-loadced.php s1-emacs-nxml-additional-resources.php 
	s1-emacs-nxml-readme.php s1-nxml-examples.php 
	s1-screenshots.php s1-tutorial-license.php 
	s1-vim-additional-resources.php s1-vim-keymapping.php 
	s1-xml-admon.php s1-xml-guidelines-header.php 
	s1-xml-tag-sulink.php s1-xml-tags-application.php 
	s1-xml-tags-chapter.php s1-xml-tags-citetitle.php 
	s1-xml-tags-command.php s1-xml-tags-compoutput.php 
	s1-xml-tags-emphasis.php s1-xml-tags-example.php 
	s1-xml-tags-figure.php s1-xml-tags-filename.php 
	s1-xml-tags-firstterm.php s1-xml-tags-footnote.php 
	s1-xml-tags-gui.php s1-xml-tags-indexing.php 
	s1-xml-tags-keycap.php s1-xml-tags-lists.php 
	s1-xml-tags-option.php s1-xml-tags-para.php 
	s1-xml-tags-part.php s1-xml-tags-prompt.php 
	s1-xml-tags-replaceable.php s1-xml-tags-screen.php 
	s1-xml-tags-sections.php s1-xml-tags-table.php 
	s1-xml-tags-trademark.php s1-xml-tags-userinput.php 
	s1-xml-tags-wordasword.php s1-xml-tags-xref.php 
	sn-composition-tips.php sn-cvs-config.php 
	sn-cvs-cvscommands.php sn-cvs-preparation.php 
	sn-grammar-and-usage.php sn-tech-docs-fundamentals.php 
Log Message:
Moving documentation FAQ, guide, and developer guide to where they belong under /docs; this makes the documentation directory able to be moved more easily.  I'll setup redirects in the old locations.


***** Error reading new file: [Errno 2] No such file or directory: 'acknowledgments.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-converting.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-cvs.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-emacs-nxml.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-emacs.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-getting-files.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-intro.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-rh-guidelines.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-style.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-tutorial.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-vim.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-xml-tags.php'

***** Error reading new file: [Errno 2] No such file or directory: 'generated-index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ln-legalnotice.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-diagrams-images.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-additional-resources.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-basic-commands.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-cedfile.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-colors.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-examples.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-loadced.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-nxml-additional-resources.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-nxml-readme.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-nxml-examples.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-screenshots.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-tutorial-license.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-vim-additional-resources.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-vim-keymapping.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-admon.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-guidelines-header.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tag-sulink.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-application.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-chapter.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-citetitle.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-command.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-compoutput.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-emphasis.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-example.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-figure.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-filename.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-firstterm.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-footnote.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-gui.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-indexing.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-keycap.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-lists.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-option.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-para.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-part.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-prompt.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-replaceable.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-screen.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-sections.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-table.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-trademark.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-userinput.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-wordasword.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-xref.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-composition-tips.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-config.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-cvscommands.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-preparation.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-grammar-and-usage.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-tech-docs-fundamentals.php'



From fedora-extras-commits at redhat.com  Tue Dec  6 19:41:17 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:41:17 -0500
Subject: web/html/participate/developers-guide index.php,1.2,1.3
Message-ID: <200512061941.jB6JfmGd021502@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/developers-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21453/developers-guide

Modified Files:
	index.php 
Log Message:
Deprecating to zero the documentation that was stored in /participate for some reason ... these redirects just do the right thing, which we decided was much better than leaving an explanation behind.  This also supports the no-broken-URLs standard we should strive for.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/developers-guide/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.php	29 Sep 2005 17:08:19 -0000	1.2
+++ index.php	6 Dec 2005 19:41:15 -0000	1.3
@@ -1,17 +1,3 @@
-initCommon(); 
-$template->displayHeader();
-
+
-
-
          Fedora Core Developer's Guide
             Next
          Fedora Core Developer's Guide
          Tammy Fox
          Havoc Pennington
          Copyright © 2003 Red Hat, Inc., Tammy Fox, Havoc Pennington
          Table of Co!
 ntents
          1. General Guidelines
          2. Package Versions
          2.1. Beta Exceptions
          3. CVS
          3.1. How CVS Works
          3.2. Preparing For CVS Use
          3.2.1. Is CVS Installed On Your System
          3.2.2. Generating SSH Keys
          3.3. Configuring For CVS Access
          3.3.1. Avoiding Repetitive Typing
          3.3.2. Configuring for Read-Only CVS Access
          3.3.3. Configuring Read/Write CVS Access
          3.4. Basic CVS Commands
          3.4.1. Checking Out Modules
          3.4.1.1. Checking Out Branches of Modules
          3.4.2. Updating Files
          3.4.3. Committing Files
          3.4.4. Adding Files
          3.4.5. Managing Binary Files
          3.4.6. Removing Files
          3.4.7. Status of Files
          3.4.8. Resolving Conflicts
          3.4.9. Summary
          4. Building RPM Packages
          4.1. Spec File
          4.2!
 . Guidelines
          4.3. More RPM Building Hints
          5. User Interface Guidelines
          5.1. Read the CliffNotes®
          5.2. The GNOME Guidelines
          5.3. Get Religion
          5.4. Get Details
          5.5. More Suggestions
          5.6. Scaling It Down
          6. Enabling Console Access
          7. Adding Applications to the Men!
 us
          7.1. Red Hat Categories
             Next
             Chapter 1. General Guidelines
          
-
-displayFooter('$Date$');
-
-?>
-



From fedora-extras-commits at redhat.com  Tue Dec  6 19:41:23 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:41:23 -0500
Subject: web/html/participate/documentation-faq index.php,1.2,1.3
Message-ID: <200512061941.jB6Jfr14021505@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-faq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21453/documentation-faq

Modified Files:
	index.php 
Log Message:
Deprecating to zero the documentation that was stored in /participate for some reason ... these redirects just do the right thing, which we decided was much better than leaving an explanation behind.  This also supports the no-broken-URLs standard we should strive for.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-faq/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.php	6 Dec 2005 06:53:52 -0000	1.2
+++ index.php	6 Dec 2005 19:41:21 -0000	1.3
@@ -1,60 +1,3 @@
-initCommon();
-
-$template->displayHeader();
-
-?>
-
-
          Fedora Documentation Project FAQ
          
-
-
          
-This is a list of FAQs from common questions asked on the mailing list.
-Please refer to this page before posting a question to the mailing list.
-
          
-
-
          Does Fedora Project need writers/editors?
          
-
-
          
-Yes. Writers are needed right now more then editors. Without writers, there is
-nothing to edit.
-
          
-
-
          
-To volunteer for a topic, refer to the DocsProject wiki for instructions on how to 
-get started.
-
          
-
-
          What documents are needed?
          
-
-
          
-The Fedora Documenation Project documents are of the tutorial/HOWTO 
-variety because it works well with the distributed project by allowing one
-person or a some group of people to concentrate on a specific topic. Currently,
-the only "guide" planned is an Installation Guide. Since the docs are Web-based,
-having topics combined into "manuals" or "books" does not have many advantages.
-
          
-
-
          May I translate the legal notice?
          
-
-
          
-The legal notice page from the file legalnotice-en.xml may be translated, 
-but a statement that the translation is provided for convenience only 
-and that the English   language version takes precedence must be on the top of the 
-page.
-
          
-
-
          How do I get write access to CVS?
          
-
-
          
-Read the DocsProject/NewWriters 
-wiki page for detailed information.
-
          
-
-displayFooter('$Date$');
-
+



From fedora-extras-commits at redhat.com  Tue Dec  6 19:41:28 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:41:28 -0500
Subject: web/html/participate/documentation-guide index.php,1.4,1.5
Message-ID: <200512061941.jB6JfwO7021508@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21453/documentation-guide

Modified Files:
	index.php 
Log Message:
Deprecating to zero the documentation that was stored in /participate for some reason ... these redirects just do the right thing, which we decided was much better than leaving an explanation behind.  This also supports the no-broken-URLs standard we should strive for.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.php	19 Sep 2005 18:50:48 -0000	1.4
+++ index.php	6 Dec 2005 19:41:26 -0000	1.5
@@ -1,19 +1,3 @@
-initCommon(); 
-$template->displayHeader();
-
-?>
-
-
          Fedora Project Documentation Guide
             Next
          Fedora Project Documentation Guide
          Version 0.2.6.3
          Tammy Fox
          Johnray Fuller
          Sandra Moore
          !
 Copyright © 2003,2004,2005 Red Hat, Inc., Tammy Fox, Johnray Fuller, Sandra Moore
          Table of Contents
          Introduction
          1. Getting the Files
          2. Red Hat Documentation Guidelines
          2.1. ID Naming Conventions
          2.2. File Header
          2.3. Admonitions
          2.3.1. Creating Notes, Tips, Cautions, Importants, and Warnings
          2.4. Screenshots!
 
          2.5. Diagrams and Images
          3. Emacs and PSGML Mode
          3.1. Setting Up Your .emacs File
          3.2. Customizing Emacs
          3.3. Create Recompiled DTD Subset
          3.4. Load the Parsed DTD
          3.5. Basic Emacs Commands
          3.6. Examples
          3.6.1. Tag Completion
          3.6.2. Tag Closure
          3.6.3. Other Emacs Tasks
          3.7. Additional Resources
          4. Emacs and nXML Mode
          4.1. Getting the nXML RPM
          4.2. Examples
          4.2.1. Commands
          4.3. Additional Resources
          4.4. nXML README File
          5. VIM and DocBook
          5.1. Setting Up Your .vimrc File
          5.2. Keymapping with VIM
          5.3. Additional VIM Resources
          6. DocBook XML Tags
          6.1. Tags and Entities Caveats
          6.2. application
          6.3. chapter
          6.4. citetitle
          6.5. command
          6.6. computeroutput
          6.7. emphasis
          6.8. example
          6.9. filename
          6.10. firstterm
          6.11. footnote
          6.12. figure
          6.13. GUI Tags
          6.13.1. guilabel
          6.13.2. guibutton
          6.13.3. guiicon
          6.13.4. guimenu and
-	  guimenuitem
          6.14. keycap
          6.14.1. menuchoice
          6.14.2. keycombo
          6.15. Lists
          6.15.1. itemizedlist
          6.15.2. OrderedList
          6.15.3. Variablelist
          6.15.4. Creating a List Within a Table Using Simplelist
          6.15.5. glosslist
          6.16. option
          6.17. Index Entries
          6.18. para
          6.19. part
          6.20. prompt
          6.21. replaceable
          6.22. screen
          6.22.1. Using Inline Tags with screen
          6.23. Sections
          6.24. table
          6.24.1. Creating a List Within a Table
          6.25. trademark
          6.26. userinput
          6.27. ulink
          6.28. wordasword
          6.29. xref
          7. The Layout of a Tutorial
          7.1. The Parent File
          7.2. Including the License Information
          8. Style
          8.1. Why Style Is Important
          8.2. Fundamental Concepts of Technical Documentation
          8.2.1. General Style Requirements
          8.2.2. Golden Rules
          8.2.3. Tone
          8.2.4. Reaching the Right Audience
          8.2.5. User Motivation
          8.2.6. New Users
          
.7. Experienced Users
          8.2.8. Do Not Offend Your Audience
          8.3. Grammar and Usage Guidelines
          8.4. Composition Tips
          8.4.1. Active Voice
          8.4.2. Present Tense
          8.4.3. Narrative Voice
          8.4.4. Negative Words
          8.4.5. Uncertainty
          8.4.6. Redundant Coverage
          8.4.7. Self-referential Value Judgments
          8.4.8. Precision of Language
          8.4.9. DocBook Tips
          8.4.9.1. Admonitions
          8.4.9.2. The replaceable
-	  Tag
          8.4.9.3. XML Entities
          9. Converting to HTML and PDF
          10. CVS
          10.1. How CVS Works
          10.2. Preparing For CVS Use
          10.2.1. Is CVS Installed On Your System
          10.2.2. Generating SSH Keys
          10.3. Configuring For CVS Access
          10.3.1. Avoiding Repetitive Typing
          10.3.2. Configuring for Read-Only CVS Access
          10.3.3. Configuring Read/Write CVS Access
          10.4. Basic CVS Commands
          10.4.1. Checking Out Modules
          10.4.1.1. Checking Out Branches of Modules
          10.4.2. Updating Files
          10.4.3. Committing Files
          10.4.5. Managing Binary Files
          10.4.6. Removing Files
          10.4.7. Status of Files
          10.4.8. Resolving Conflicts
          10.4.9. Summary
          11. Acknowledgments
          Index
             Next
             Introduction
          
-
-displayFooter('$Date$');
-
-?>
-
+
\ No newline at end of file



From fedora-extras-commits at redhat.com  Tue Dec  6 19:48:09 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:48:09 -0500
Subject: web/html/participate/developers-guide ch-console-access.php, 1.2,
	NONE ch-cvs.php, 1.2, NONE ch-guidelines.php, 1.2,
	NONE ch-menus.php, 1.2, NONE ch-package-versions.php, 1.2,
	NONE ch-rpm-building.php, 1.2, NONE ch-ui-guidelines.php, 1.2,
	NONE ln-legalnotice.php, 1.2, NONE s1-cvs-configure.php,
	1.1.1.1, NONE s1-cvs-cvscommands.php, 1.1.1.1,
	NONE s1-rpm-guidelines.php, 1.2,
	NONE s1-rpm-more-guidelines.php, 1.2,
	NONE s1-ui-get-details.php, 1.2, NONE s1-ui-get-religion.php,
	1.2, NONE s1-ui-gnome-guidelines.php, 1.2,
	NONE s1-ui-more-suggestions.php, 1.2, NONE s1-ui-scaling.php,
	1.2, NONE sn-cvs-config.php, 1.1, NONE sn-cvs-cvscommands.php,
	1.1, NONE sn-cvs-preparation.php, 1.1, NONE
Message-ID: <200512061948.jB6Jm9xv021631@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/developers-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21621

Removed Files:
	ch-console-access.php ch-cvs.php ch-guidelines.php 
	ch-menus.php ch-package-versions.php ch-rpm-building.php 
	ch-ui-guidelines.php ln-legalnotice.php s1-cvs-configure.php 
	s1-cvs-cvscommands.php s1-rpm-guidelines.php 
	s1-rpm-more-guidelines.php s1-ui-get-details.php 
	s1-ui-get-religion.php s1-ui-gnome-guidelines.php 
	s1-ui-more-suggestions.php s1-ui-scaling.php sn-cvs-config.php 
	sn-cvs-cvscommands.php sn-cvs-preparation.php 
Log Message:
This location is deprecated, content has moved to /docs.


--- ch-console-access.php DELETED ---


--- ch-cvs.php DELETED ---


--- ch-guidelines.php DELETED ---


--- ch-menus.php DELETED ---


--- ch-package-versions.php DELETED ---


--- ch-rpm-building.php DELETED ---


--- ch-ui-guidelines.php DELETED ---


--- ln-legalnotice.php DELETED ---


--- s1-cvs-configure.php DELETED ---


--- s1-cvs-cvscommands.php DELETED ---


--- s1-rpm-guidelines.php DELETED ---


--- s1-rpm-more-guidelines.php DELETED ---


--- s1-ui-get-details.php DELETED ---


--- s1-ui-get-religion.php DELETED ---


--- s1-ui-gnome-guidelines.php DELETED ---


--- s1-ui-more-suggestions.php DELETED ---


--- s1-ui-scaling.php DELETED ---


--- sn-cvs-config.php DELETED ---


--- sn-cvs-cvscommands.php DELETED ---


--- sn-cvs-preparation.php DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec  6 19:55:19 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:55:19 -0500
Subject: web/html/participate/documentation-guide acknowledgments.php, 1.4,
 NONE ch-converting.php, 1.4, NONE ch-cvs.php, 1.4, NONE ch-emacs-nxml.php,
 1.4, NONE ch-emacs.php, 1.4, NONE ch-getting-files.php, 1.4,
 NONE ch-intro.php, 1.4, NONE ch-rh-guidelines.php, 1.4, NONE ch-style.php,
 1.3, NONE ch-tutorial.php, 1.4, NONE ch-vim.php, 1.4, NONE ch-xml-tags.php,
 1.4, NONE generated-index.php, 1.4, NONE ln-legalnotice.php, 1.4,
 NONE s1-diagrams-images.php, 1.4, NONE s1-emacs-additional-resources.php,
 1.4, NONE s1-emacs-basic-commands.php, 1.4, NONE s1-emacs-cedfile.php, 1.4,
 NONE s1-emacs-colors.php, 1.4, NONE s1-emacs-examples.php, 1.4,
 NONE s1-emacs-loadced.php, 1.4, NONE s1-emacs-nxml-additional-resources.php,
 1.4, NONE s1-emacs-nxml-readme.php, 1.4, NONE s1-nxml-examples.php, 1.4,
 NONE s1-screenshots.php, 1.4, NONE s1-tutorial-license.php, 1.4,
 NONE s1-vim-additional-resources.php, 1.4, NONE s1-vim-keymapping.php, 1.4,
 NONE s1-xml-admon.php, 1.4, NONE s1-xml-guidelines-header.php, 1.4,
 NONE s1-xml-tag-sulink.php, 1.4, NONE s1-xml-tags!
 -application.php, 1.4, NONE s1-xml-tags-chapter.php, 1.4,
 NONE s1-xml-tags-citetitle.php, 1.4, NONE s1-xml-tags-command.php, 1.4,
 NONE s1-xml-tags-compoutput.php, 1.4, NONE s1-xml-tags-emphasis.php, 1.4,
 NONE s1-xml-tags-example.php, 1.4, NONE s1-xml-tags-figure.php, 1.4,
 NONE s1-xml-tags-filename.php, 1.4, NONE s1-xml-tags-firstterm.php, 1.4,
 NONE s1-xml-tags-footnote.php, 1.4, NONE s1-xml-tags-gui.php, 1.4,
 NONE s1-xml-tags-indexing.php, 1.4, NONE s1-xml-tags-keycap.php, 1.4,
 NONE s1-xml-tags-lists.php, 1.4, NONE s1-xml-tags-option.php, 1.4,
 NONE s1-xml-tags-para.php, 1.4, NONE s1-xml-tags-part.php, 1.4,
 NONE s1-xml-tags-prompt.php, 1.4, NONE s1-xml-tags-replaceable.php, 1.4,
 NONE s1-xml-tags-screen.php, 1.4, NONE s1-xml-tags-sections.php, 1.4,
 NONE s1-xml-tags-table.php, 1.4, NONE s1-xml-tags-trademark.php, 1.4,
 NONE s1-xml-tags-userinput.php, 1.4, NONE s1-xml-tags-wordasword.php, 1.4,
 NONE s1-xml-tags-xref.php, 1.4, NONE sn-composition-tips.php, 1.3,
 NONE sn-cvs-config.php, 1.2, NONE sn-cvs-cvscommands.php, 1.2,
 NONE sn-cvs-prep!
 aration.php,1.2,NONE sn-grammar-and-usage.php,1.3,NONE sn-tech!
 -docs-
Message-ID: <200512061955.jB6JtJlB021985@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21975

Removed Files:
	acknowledgments.php ch-converting.php ch-cvs.php 
	ch-emacs-nxml.php ch-emacs.php ch-getting-files.php 
	ch-intro.php ch-rh-guidelines.php ch-style.php ch-tutorial.php 
	ch-vim.php ch-xml-tags.php generated-index.php 
	ln-legalnotice.php s1-diagrams-images.php 
	s1-emacs-additional-resources.php s1-emacs-basic-commands.php 
	s1-emacs-cedfile.php s1-emacs-colors.php s1-emacs-examples.php 
	s1-emacs-loadced.php s1-emacs-nxml-additional-resources.php 
	s1-emacs-nxml-readme.php s1-nxml-examples.php 
	s1-screenshots.php s1-tutorial-license.php 
	s1-vim-additional-resources.php s1-vim-keymapping.php 
	s1-xml-admon.php s1-xml-guidelines-header.php 
	s1-xml-tag-sulink.php s1-xml-tags-application.php 
	s1-xml-tags-chapter.php s1-xml-tags-citetitle.php 
	s1-xml-tags-command.php s1-xml-tags-compoutput.php 
	s1-xml-tags-emphasis.php s1-xml-tags-example.php 
	s1-xml-tags-figure.php s1-xml-tags-filename.php 
	s1-xml-tags-firstterm.php s1-xml-tags-footnote.php 
	s1-xml-tags-gui.php s1-xml-tags-indexing.php 
	s1-xml-tags-keycap.php s1-xml-tags-lists.php 
	s1-xml-tags-option.php s1-xml-tags-para.php 
	s1-xml-tags-part.php s1-xml-tags-prompt.php 
	s1-xml-tags-replaceable.php s1-xml-tags-screen.php 
	s1-xml-tags-sections.php s1-xml-tags-table.php 
	s1-xml-tags-trademark.php s1-xml-tags-userinput.php 
	s1-xml-tags-wordasword.php s1-xml-tags-xref.php 
	sn-composition-tips.php sn-cvs-config.php 
	sn-cvs-cvscommands.php sn-cvs-preparation.php 
	sn-grammar-and-usage.php sn-tech-docs-fundamentals.php 
Log Message:
This location is deprecated, content has moved to /docs.


--- acknowledgments.php DELETED ---


--- ch-converting.php DELETED ---


--- ch-cvs.php DELETED ---


--- ch-emacs-nxml.php DELETED ---


--- ch-emacs.php DELETED ---


--- ch-getting-files.php DELETED ---


--- ch-intro.php DELETED ---


--- ch-rh-guidelines.php DELETED ---


--- ch-style.php DELETED ---


--- ch-tutorial.php DELETED ---


--- ch-vim.php DELETED ---


--- ch-xml-tags.php DELETED ---


--- generated-index.php DELETED ---


--- ln-legalnotice.php DELETED ---


--- s1-diagrams-images.php DELETED ---


--- s1-emacs-additional-resources.php DELETED ---


--- s1-emacs-basic-commands.php DELETED ---


--- s1-emacs-cedfile.php DELETED ---


--- s1-emacs-colors.php DELETED ---


--- s1-emacs-examples.php DELETED ---


--- s1-emacs-loadced.php DELETED ---


--- s1-emacs-nxml-additional-resources.php DELETED ---


--- s1-emacs-nxml-readme.php DELETED ---


--- s1-nxml-examples.php DELETED ---


--- s1-screenshots.php DELETED ---


--- s1-tutorial-license.php DELETED ---


--- s1-vim-additional-resources.php DELETED ---


--- s1-vim-keymapping.php DELETED ---


--- s1-xml-admon.php DELETED ---


--- s1-xml-guidelines-header.php DELETED ---


--- s1-xml-tag-sulink.php DELETED ---


--- s1-xml-tags-application.php DELETED ---


--- s1-xml-tags-chapter.php DELETED ---


--- s1-xml-tags-citetitle.php DELETED ---


--- s1-xml-tags-command.php DELETED ---


--- s1-xml-tags-compoutput.php DELETED ---


--- s1-xml-tags-emphasis.php DELETED ---


--- s1-xml-tags-example.php DELETED ---


--- s1-xml-tags-figure.php DELETED ---


--- s1-xml-tags-filename.php DELETED ---


--- s1-xml-tags-firstterm.php DELETED ---


--- s1-xml-tags-footnote.php DELETED ---


--- s1-xml-tags-gui.php DELETED ---


--- s1-xml-tags-indexing.php DELETED ---


--- s1-xml-tags-keycap.php DELETED ---


--- s1-xml-tags-lists.php DELETED ---


--- s1-xml-tags-option.php DELETED ---


--- s1-xml-tags-para.php DELETED ---


--- s1-xml-tags-part.php DELETED ---


--- s1-xml-tags-prompt.php DELETED ---


--- s1-xml-tags-replaceable.php DELETED ---


--- s1-xml-tags-screen.php DELETED ---


--- s1-xml-tags-sections.php DELETED ---


--- s1-xml-tags-table.php DELETED ---


--- s1-xml-tags-trademark.php DELETED ---


--- s1-xml-tags-userinput.php DELETED ---


--- s1-xml-tags-wordasword.php DELETED ---


--- s1-xml-tags-xref.php DELETED ---


--- sn-composition-tips.php DELETED ---


--- sn-cvs-config.php DELETED ---


--- sn-cvs-cvscommands.php DELETED ---


--- sn-cvs-preparation.php DELETED ---


--- sn-grammar-and-usage.php DELETED ---


--- sn-tech-docs-fundamentals.php DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec  6 20:15:57 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue,  6 Dec 2005 15:15:57 -0500
Subject: devel/NetworkManager-vpnc NetworkManager-vpnc.spec,1.4,1.5
Message-ID: <200512062016.jB6KGRhc023664@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/devel/NetworkManager-vpnc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23647

Modified Files:
	NetworkManager-vpnc.spec 
Log Message:
* Tue Dec  6 2005 Jeremy Katz  - 0.3-3
- rebuild for new dbus



Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/devel/NetworkManager-vpnc/NetworkManager-vpnc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NetworkManager-vpnc.spec	17 Oct 2005 17:53:27 -0000	1.4
+++ NetworkManager-vpnc.spec	6 Dec 2005 20:15:54 -0000	1.5
@@ -7,7 +7,7 @@
 Summary: NetworkManager VPN integration for vpnc
 Name: NetworkManager-vpnc
 Version: 0.3
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -84,6 +84,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Tue Dec  6 2005 Jeremy Katz  - 0.3-3
+- rebuild for new dbus
+
 * Mon Oct 17 2005 Dan Williams  0.3-2
 - Rebuild to test new Extras buildsystem
 



From fedora-extras-commits at redhat.com  Tue Dec  6 20:22:21 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 15:22:21 -0500
Subject: CVSROOT avail,1.16,1.17
Message-ID: <200512062022.jB6KMpQk023746@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23727/CVSROOT

Modified Files:
	avail 
Log Message:
Web project leaders need some control of what they are fixing, so I give it to them.


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- avail	10 Nov 2005 17:42:51 -0000	1.16
+++ avail	6 Dec 2005 20:22:19 -0000	1.17
@@ -22,6 +22,7 @@
 unavail | | web
 avail | tfox,notting,sopwith,gdk,katzj,kwade | web
 avail | havill,hp,nman64 | web
+avail | ivazquez,nman64 | web
 avail | katzj | web/html/projects/anaconda-installer
 avail | bfox | web/html/projects/config-tools
 avail | blizzard,krh | web/html/projects/desktop



From fedora-extras-commits at redhat.com  Tue Dec  6 20:26:15 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue,  6 Dec 2005 15:26:15 -0500
Subject: fedora-security/audit fc4,1.99,1.100 fc5,1.11,1.12
Message-ID: <200512062026.jB6KQjge023810@cvs-int.fedora.redhat.com>

Author: mjc

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

Modified Files:
	fc4 fc5 
Log Message:
A few updates (not done the kernel update yet)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- fc4	1 Dec 2005 22:40:19 -0000	1.99
+++ fc4	6 Dec 2005 20:26:13 -0000	1.100
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2005-3962 backport (perl) [since FEDORA-2005-1113]
+CVE-2005-3912 backport (perl) [since FEDORA-2005-1113]
 CVE-2005-3858 version (kernel, fixed 2.6.13) [since FEDORA-2005-949]
 CVE-2005-3857 VULNERABLE (kernel, fixed 2.6.15)
 CVE-2005-3848 version (kernel, fixed 2.6.13) [since FEDORA-2005-949]
@@ -55,6 +56,9 @@
 CVE-2005-3243 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3242 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3241 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
+CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1122]
+CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1122]
+CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1122]
 CVE-2005-3186 backport (gdk-pixbuf) [since FEDORA-2005-1085]
 CVE-2005-3186 backport (gtk2) [since FEDORA-2005-1088]
 CVE-2005-3185 blocked (curl) by FORTIFY_SOURCE


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fc5	1 Dec 2005 22:40:19 -0000	1.11
+++ fc5	6 Dec 2005 20:26:13 -0000	1.12
@@ -13,6 +13,7 @@
 ** are items that need attention
 
 CVE-2005-3962 VULNERABLE (perl)
+CVE-2005-3912 ** (perl)
 CVE-2005-3858 version (kernel, fixed 2.6.13)
 CVE-2005-3857 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1-git3
 CVE-2005-3848 version (kernel, fixed 2.6.13)
@@ -63,6 +64,9 @@
 CVE-2005-3243 version (ethereal, fixed 0.10.13)
 CVE-2005-3242 version (ethereal, fixed 0.10.13)
 CVE-2005-3241 version (ethereal, fixed 0.10.13)
+CVE-2005-3193 VULNERABLE (xpdf, fixed 3.0.1pl1)
+CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1)
+CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1)
 CVE-2005-3186 backport (gdk-pixbuf)
 CVE-2005-3186 version (gtk2, fixed 2.8.7 at least)
 CVE-2005-3185 version (curl, fixed 7.15)



From fedora-extras-commits at redhat.com  Tue Dec  6 20:40:05 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 15:40:05 -0500
Subject: web/include widgets.inc,1.4,1.5
Message-ID: <200512062040.jB6KeaBs023859@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23842

Modified Files:
	widgets.inc 
Log Message:
Patch from ivazquez for debugging.


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- widgets.inc	6 Dec 2005 18:55:37 -0000	1.4
+++ widgets.inc	6 Dec 2005 20:40:03 -0000	1.5
@@ -81,6 +81,10 @@
 	}
 
 	$output.="\t";
+	
+	if (!is_array($node)) {
+		die(var_export(debug_backtrace(), TRUE));
+	}
 
 	foreach($node as $item) {
 



From fedora-extras-commits at redhat.com  Tue Dec  6 21:15:01 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 16:15:01 -0500
Subject: web/include widgets.inc,1.5,1.6
Message-ID: <200512062115.jB6LFV04025647@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25623

Modified Files:
	widgets.inc 
Log Message:
Maybe a little more for the debugging.


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- widgets.inc	6 Dec 2005 20:40:03 -0000	1.5
+++ widgets.inc	6 Dec 2005 21:14:59 -0000	1.6
@@ -82,10 +82,12 @@
 
 	$output.="\t";
 	
-	if (!is_array($node)) {
+	if (!isset($node) || !is_array($node)) {
 		die(var_export(debug_backtrace(), TRUE));
 	}
 
+	unset $item;
+
 	foreach($node as $item) {
 
 		// Display item as selected if it is the correct or intended URI



From fedora-extras-commits at redhat.com  Tue Dec  6 21:38:14 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 16:38:14 -0500
Subject: web/include widgets.inc,1.6,1.7
Message-ID: <200512062138.jB6LciNj025764@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25743

Modified Files:
	widgets.inc 
Log Message:
Bad idea fixed.


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- widgets.inc	6 Dec 2005 21:14:59 -0000	1.6
+++ widgets.inc	6 Dec 2005 21:38:12 -0000	1.7
@@ -86,8 +86,6 @@
 		die(var_export(debug_backtrace(), TRUE));
 	}
 
-	unset $item;
-
 	foreach($node as $item) {
 
 		// Display item as selected if it is the correct or intended URI



From fedora-extras-commits at redhat.com  Tue Dec  6 22:00:29 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 17:00:29 -0500
Subject: web/include widgets.inc,1.7,1.8
Message-ID: <200512062200.jB6M0xOn025847@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25830

Modified Files:
	widgets.inc 
Log Message:
Debugging


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- widgets.inc	6 Dec 2005 21:38:12 -0000	1.7
+++ widgets.inc	6 Dec 2005 22:00:26 -0000	1.8
@@ -83,7 +83,7 @@
 	$output.="\t";
 	
 	if (!isset($node) || !is_array($node)) {
-		die(var_export(debug_backtrace(), TRUE));
+		var_export(debug_backtrace(), TRUE);
 	}
 
 	foreach($node as $item) {



From fedora-extras-commits at redhat.com  Tue Dec  6 22:04:00 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 17:04:00 -0500
Subject: web/include widgets.inc,1.8,1.9
Message-ID: <200512062204.jB6M4UOk027431@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27411

Modified Files:
	widgets.inc 
Log Message:
Debugging


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- widgets.inc	6 Dec 2005 22:00:26 -0000	1.8
+++ widgets.inc	6 Dec 2005 22:03:58 -0000	1.9
@@ -83,7 +83,7 @@
 	$output.="\t";
 	
 	if (!isset($node) || !is_array($node)) {
-		var_export(debug_backtrace(), TRUE);
+		var_dump(debug_backtrace());
 	}
 
 	foreach($node as $item) {



From fedora-extras-commits at redhat.com  Tue Dec  6 22:48:45 2005
From: fedora-extras-commits at redhat.com (Simon Bellwood (simonb))
Date: Tue,  6 Dec 2005 17:48:45 -0500
Subject: rpms/fdupes/devel fdupes.spec,1.1,1.2
Message-ID: <200512062249.jB6MnFBv027689@cvs-int.fedora.redhat.com>

Author: simonb

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

Modified Files:
	fdupes.spec 
Log Message:
Sync with FC-4



Index: fdupes.spec
===================================================================
RCS file: /cvs/extras/rpms/fdupes/devel/fdupes.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fdupes.spec	28 Nov 2005 19:24:20 -0000	1.1
+++ fdupes.spec	6 Dec 2005 22:48:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           fdupes
 Version:        1.40
-Release:        3
+Release:        5%{?dist}
 Summary:        Identifies and optionally deletes duplicate files
 
 Group:          Applications/File
@@ -47,6 +47,12 @@
 
 
 %changelog
+* Wed Nov 30 2005 Simon Bellwood  - 1.40-5
+- Initial attempt to import into Extras.
+
+* Wed Nov 30 2005 Simon Bellwood  - 1.40-4
+- Updated spec file to include dist in Release: field.
+
 * Thu Nov 24 2005 Simon Bellwood  - 1.40-3
 - Spec file cleanup.
 



From fedora-extras-commits at redhat.com  Tue Dec  6 22:49:55 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 17:49:55 -0500
Subject: web/include widgets.inc,1.9,1.10
Message-ID: <200512062250.jB6MoPQo027758@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27738

Modified Files:
	widgets.inc 
Log Message:
Try a different form.


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- widgets.inc	6 Dec 2005 22:03:58 -0000	1.9
+++ widgets.inc	6 Dec 2005 22:49:53 -0000	1.10
@@ -86,7 +86,9 @@
 		var_dump(debug_backtrace());
 	}
 
-	foreach($node as $item) {
+	unset($item);
+
+	while (list(, $item) = each($node)) {
 
 		// Display item as selected if it is the correct or intended URI
 		if ($item['uri'] == $page_level['complete_path'] || $item['uri'] == $options['selected_uri']) {
@@ -107,8 +109,6 @@
 			$output.=side_nav_traverse($item['sub'],$page_level,$current_level+1,$nav_id,$options);
 		}
 		$output.='';
-
-		next($node);
 	}
 	$output.="\n".str_repeat("\t",$current_level+3).'
        ';
 



From fedora-extras-commits at redhat.com  Tue Dec  6 23:23:39 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 18:23:39 -0500
Subject: web/include widgets.inc,1.10,1.11
Message-ID: <200512062324.jB6NO9XD029522@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29496

Modified Files:
	widgets.inc 
Log Message:
Silence until we can get a better look.


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- widgets.inc	6 Dec 2005 22:49:53 -0000	1.10
+++ widgets.inc	6 Dec 2005 23:23:37 -0000	1.11
@@ -75,18 +75,19 @@
 /* iterate through the sitelist recursively */
 function side_nav_traverse($node,$page_level,$current_level="0",$nav_id="",$options="") {
 
+	if (!isset($node) || !is_array($node)) {
+		var_dump(debug_backtrace())
+		return;
+	}
+
+	unset($item);
+
 	if ($current_level==0 && $nav_id != "") {
 		// set CSS id for top level only
 		$id=' id="'.$nav_id.'"';
 	}
 
 	$output.="\t";
-	
-	if (!isset($node) || !is_array($node)) {
-		var_dump(debug_backtrace());
-	}
-
-	unset($item);
 
 	while (list(, $item) = each($node)) {
 



From fedora-extras-commits at redhat.com  Wed Dec  7 00:13:06 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 19:13:06 -0500
Subject: web/include widgets.inc,1.12,1.13
Message-ID: <200512070013.jB70Dj6r031359@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31340

Modified Files:
	widgets.inc 
Log Message:
Debugging


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- widgets.inc	7 Dec 2005 00:12:36 -0000	1.12
+++ widgets.inc	7 Dec 2005 00:13:04 -0000	1.13
@@ -76,7 +76,8 @@
 function side_nav_traverse($node,$page_level,$current_level="0",$nav_id="",$options="") {
 
 	if (!isset($node) || !is_array($node)) {
-		var_dump(debug_backtrace())
+		var_dump(debug_backtrace());
+		return;
 	}
 
 	unset($item);



From fedora-extras-commits at redhat.com  Wed Dec  7 00:12:42 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 19:12:42 -0500
Subject: web/include widgets.inc,1.11,1.12
Message-ID: <200512070014.jB70ED4x031364@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31319

Modified Files:
	widgets.inc 
Log Message:
Debugging


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- widgets.inc	6 Dec 2005 23:23:37 -0000	1.11
+++ widgets.inc	7 Dec 2005 00:12:36 -0000	1.12
@@ -77,7 +77,6 @@
 
 	if (!isset($node) || !is_array($node)) {
 		var_dump(debug_backtrace())
-		return;
 	}
 
 	unset($item);



From fedora-extras-commits at redhat.com  Wed Dec  7 01:11:45 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Tue,  6 Dec 2005 20:11:45 -0500
Subject: rpms/gquilt/devel .cvsignore, 1.5, 1.6 gquilt.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <200512070112.jB71CFUd000634@cvs-int.fedora.redhat.com>

Author: jwboyer

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

Modified Files:
	.cvsignore gquilt.spec sources 
Log Message:
Update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2005 00:13:34 -0000	1.5
+++ .cvsignore	7 Dec 2005 01:11:42 -0000	1.6
@@ -1 +1 @@
-gquilt-0.14.tar.gz
+gquilt-0.15.tar.gz


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/gquilt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gquilt.spec	9 Sep 2005 00:13:34 -0000	1.4
+++ gquilt.spec	7 Dec 2005 01:11:42 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		gquilt
-Version:	0.14
+Version:	0.15
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
@@ -51,6 +51,9 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Mon Dec 5 2005 Josh Boyer  0.15-1
+- Update to latest release
+
 * Thu Sep 8 2005 Josh Boyer  0.14-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2005 00:13:34 -0000	1.5
+++ sources	7 Dec 2005 01:11:42 -0000	1.6
@@ -1 +1 @@
-3d4d853033f7b4b470ea8e3bc55737c8  gquilt-0.14.tar.gz
+b0a5eee0811471f50f9ee8fba5838a84  gquilt-0.15.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec  7 01:31:43 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Tue,  6 Dec 2005 20:31:43 -0500
Subject: rpms/gquilt/FC-4 .cvsignore, 1.5, 1.6 gquilt.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <200512070132.jB71WDD5000792@cvs-int.fedora.redhat.com>

Author: jwboyer

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

Modified Files:
	.cvsignore gquilt.spec sources 
Log Message:
Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2005 00:13:34 -0000	1.5
+++ .cvsignore	7 Dec 2005 01:31:41 -0000	1.6
@@ -1 +1 @@
-gquilt-0.14.tar.gz
+gquilt-0.15.tar.gz


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/gquilt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gquilt.spec	9 Sep 2005 00:13:34 -0000	1.4
+++ gquilt.spec	7 Dec 2005 01:31:41 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		gquilt
-Version:	0.14
+Version:	0.15
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
@@ -51,6 +51,9 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Mon Dec 5 2005 Josh Boyer  0.15-1
+- Update to latest release
+
 * Thu Sep 8 2005 Josh Boyer  0.14-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2005 00:13:34 -0000	1.5
+++ sources	7 Dec 2005 01:31:41 -0000	1.6
@@ -1 +1 @@
-3d4d853033f7b4b470ea8e3bc55737c8  gquilt-0.14.tar.gz
+b0a5eee0811471f50f9ee8fba5838a84  gquilt-0.15.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec  7 01:58:22 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 20:58:22 -0500
Subject: web/include widgets.inc,1.13,1.14
Message-ID: <200512070158.jB71wqMq000904@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv885

Modified Files:
	widgets.inc 
Log Message:
Debugging


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- widgets.inc	7 Dec 2005 00:13:04 -0000	1.13
+++ widgets.inc	7 Dec 2005 01:58:20 -0000	1.14
@@ -75,7 +75,7 @@
 /* iterate through the sitelist recursively */
 function side_nav_traverse($node,$page_level,$current_level="0",$nav_id="",$options="") {
 
-	if (!isset($node) || !is_array($node)) {
+	if (!isset($node) || !is_array($node) || empty($node)) {
 		var_dump(debug_backtrace());
 		return;
 	}
@@ -89,7 +89,7 @@
 
 	$output.="\t";
 
-	while (list(, $item) = each($node)) {
+	foreach($node as $item) {
 
 		// Display item as selected if it is the correct or intended URI
 		if ($item['uri'] == $page_level['complete_path'] || $item['uri'] == $options['selected_uri']) {
@@ -110,6 +110,8 @@
 			$output.=side_nav_traverse($item['sub'],$page_level,$current_level+1,$nav_id,$options);
 		}
 		$output.='';
+
+		next($node);
 	}
 	$output.="\n".str_repeat("\t",$current_level+3).'
      ';
 



From fedora-extras-commits at redhat.com  Wed Dec  7 02:42:23 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  6 Dec 2005 21:42:23 -0500
Subject: rpms/OpenSceneGraph/FC-4 .cvsignore, 1.1, 1.2 OpenSceneGraph.spec,
	1.5, 1.6 sources, 1.1, 1.2
Message-ID: <200512070242.jB72grAQ002579@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Log Message:
- Merge diffs into one file.
- Fix up *.pcs from inside of *.spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Aug 2005 05:06:09 -0000	1.1
+++ .cvsignore	7 Dec 2005 02:42:21 -0000	1.2
@@ -1,2 +1,2 @@
-openscenegraph_0.9.9-5.diff.gz
 OSG_OP_OT-0.9.9.zip
+OpenSceneGraph-0.9.9.diff


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-4/OpenSceneGraph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OpenSceneGraph.spec	28 Aug 2005 07:27:18 -0000	1.5
+++ OpenSceneGraph.spec	7 Dec 2005 02:42:21 -0000	1.6
@@ -4,9 +4,11 @@
 # package are under the same license as the package itself.
 #
 
+%define apivers 0.9.9
+
 Name:           OpenSceneGraph
 Version:        0.9.9
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -14,14 +16,7 @@
 URL:            http://www.openscenegraph.org/
 Source0:        http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{version}.zip
 
-# Debian patch
-Patch0:		http://ftp.debian.org/debian/pool/main/o/openscenegraph/openscenegraph_0.9.9-5.diff.gz
-
-# Revert parts of the Debian patch
-Patch1:		OpenSceneGraph-0.9.9-revdeb.diff
-
-Patch2: 	OpenSceneGraph-0.9.9-osgTerrain.diff
-Patch3:		OpenSceneGraph-0.9.9-osgPlugins.diff
+Patch0:		OpenSceneGraph-0.9.9.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,9 +45,6 @@
 %prep
 %setup -q -n OSG_OP_OT-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # backup, we hack this file later
 cp OpenSceneGraph/Make/dependencies \
@@ -85,7 +77,12 @@
     $dir/Make/makerules
 
 # Fix libdir
-  sed -i -e 's,^libdir=.*$,libdir = %{_libdir},' \
+  sed -i \
+    -e 's,^prefix=.*$,prefix = %{_prefix},' \
+    -e 's,^includedir=.*$,includedir = %{_includedir},' \
+    -e 's,^libdir=.*$,libdir = %{_libdir},' \
+    -e 's,^Version:.*$,Version: %{apivers},' \
+    -e '/^Conflicts:$/d' \
     $dir/Make/$(echo $dir | tr [:upper:] [:lower:]).pc
 done
 
@@ -366,6 +363,10 @@
 %{_includedir}/Producer
 
 %changelog
+* Tue Dec 06 2005 Ralf Corsepius  - 0.9.9-4%{?dist}.1
+- Merge diffs into one file.
+- Fix up *.pcs from inside of *.spec.
+
 * Sun Aug 28 2005 Ralf Corsepius  - 0.9.9-4
 - Propagate %%_libdir to pkgconfig files.
 - Fix typo in %%ifarch magic to setup LD_LIBRARY_PATH


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Aug 2005 04:38:17 -0000	1.1
+++ sources	7 Dec 2005 02:42:21 -0000	1.2
@@ -1,2 +1,2 @@
-4aed300dd024609687e8f2e8348409e7  openscenegraph_0.9.9-5.diff.gz
 711773db3874320967091327473dbc31  OSG_OP_OT-0.9.9.zip
+b1d2366ab6db7c8102153bd262a4a145  OpenSceneGraph-0.9.9.diff



From fedora-extras-commits at redhat.com  Wed Dec  7 02:47:38 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  6 Dec 2005 21:47:38 -0500
Subject: rpms/OpenSceneGraph/FC-4 OpenSceneGraph-0.9.9-osgPlugins.diff, 1.1,
	NONE OpenSceneGraph-0.9.9-osgTerrain.diff, 1.1,
	NONE OpenSceneGraph-0.9.9-revdeb.diff, 1.3, NONE
Message-ID: <200512070247.jB72lcxe002603@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Removed Files:
	OpenSceneGraph-0.9.9-osgPlugins.diff 
	OpenSceneGraph-0.9.9-osgTerrain.diff 
	OpenSceneGraph-0.9.9-revdeb.diff 
Log Message:
- Merge diffs into one file.
- Fix up *.pcs from inside of *.spec.



--- OpenSceneGraph-0.9.9-osgPlugins.diff DELETED ---


--- OpenSceneGraph-0.9.9-osgTerrain.diff DELETED ---


--- OpenSceneGraph-0.9.9-revdeb.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec  7 02:48:24 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  6 Dec 2005 21:48:24 -0500
Subject: rpms/OpenSceneGraph/FC-3 .cvsignore, 1.1, 1.2 OpenSceneGraph.spec,
	1.5, 1.6 sources, 1.1,
	1.2 OpenSceneGraph-0.9.9-osgPlugins.diff, 1.1,
	NONE OpenSceneGraph-0.9.9-osgTerrain.diff, 1.1,
	NONE OpenSceneGraph-0.9.9-revdeb.diff, 1.3, NONE
Message-ID: <200512070248.jB72mspE002640@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Removed Files:
	OpenSceneGraph-0.9.9-osgPlugins.diff 
	OpenSceneGraph-0.9.9-osgTerrain.diff 
	OpenSceneGraph-0.9.9-revdeb.diff 
Log Message:
- Merge diffs into one file.
- Fix up *.pcs from inside of *.spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-3/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Aug 2005 05:06:09 -0000	1.1
+++ .cvsignore	7 Dec 2005 02:48:22 -0000	1.2
@@ -1,2 +1,2 @@
-openscenegraph_0.9.9-5.diff.gz
 OSG_OP_OT-0.9.9.zip
+OpenSceneGraph-0.9.9.diff


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-3/OpenSceneGraph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OpenSceneGraph.spec	28 Aug 2005 07:27:18 -0000	1.5
+++ OpenSceneGraph.spec	7 Dec 2005 02:48:22 -0000	1.6
@@ -4,9 +4,11 @@
 # package are under the same license as the package itself.
 #
 
+%define apivers 0.9.9
+
 Name:           OpenSceneGraph
 Version:        0.9.9
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -14,14 +16,7 @@
 URL:            http://www.openscenegraph.org/
 Source0:        http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{version}.zip
 
-# Debian patch
-Patch0:		http://ftp.debian.org/debian/pool/main/o/openscenegraph/openscenegraph_0.9.9-5.diff.gz
-
-# Revert parts of the Debian patch
-Patch1:		OpenSceneGraph-0.9.9-revdeb.diff
-
-Patch2: 	OpenSceneGraph-0.9.9-osgTerrain.diff
-Patch3:		OpenSceneGraph-0.9.9-osgPlugins.diff
+Patch0:		OpenSceneGraph-0.9.9.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,9 +45,6 @@
 %prep
 %setup -q -n OSG_OP_OT-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # backup, we hack this file later
 cp OpenSceneGraph/Make/dependencies \
@@ -85,7 +77,12 @@
     $dir/Make/makerules
 
 # Fix libdir
-  sed -i -e 's,^libdir=.*$,libdir = %{_libdir},' \
+  sed -i \
+    -e 's,^prefix=.*$,prefix = %{_prefix},' \
+    -e 's,^includedir=.*$,includedir = %{_includedir},' \
+    -e 's,^libdir=.*$,libdir = %{_libdir},' \
+    -e 's,^Version:.*$,Version: %{apivers},' \
+    -e '/^Conflicts:$/d' \
     $dir/Make/$(echo $dir | tr [:upper:] [:lower:]).pc
 done
 
@@ -366,6 +363,10 @@
 %{_includedir}/Producer
 
 %changelog
+* Tue Dec 06 2005 Ralf Corsepius  - 0.9.9-4%{?dist}.1
+- Merge diffs into one file.
+- Fix up *.pcs from inside of *.spec.
+
 * Sun Aug 28 2005 Ralf Corsepius  - 0.9.9-4
 - Propagate %%_libdir to pkgconfig files.
 - Fix typo in %%ifarch magic to setup LD_LIBRARY_PATH


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-3/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Aug 2005 04:38:17 -0000	1.1
+++ sources	7 Dec 2005 02:48:22 -0000	1.2
@@ -1,2 +1,2 @@
-4aed300dd024609687e8f2e8348409e7  openscenegraph_0.9.9-5.diff.gz
 711773db3874320967091327473dbc31  OSG_OP_OT-0.9.9.zip
+b1d2366ab6db7c8102153bd262a4a145  OpenSceneGraph-0.9.9.diff


--- OpenSceneGraph-0.9.9-osgPlugins.diff DELETED ---


--- OpenSceneGraph-0.9.9-osgTerrain.diff DELETED ---


--- OpenSceneGraph-0.9.9-revdeb.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec  7 02:50:40 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  6 Dec 2005 21:50:40 -0500
Subject: rpms/OpenSceneGraph/devel .cvsignore, 1.1, 1.2 OpenSceneGraph.spec,
	1.5, 1.6 sources, 1.1,
	1.2 OpenSceneGraph-0.9.9-osgPlugins.diff, 1.1,
	NONE OpenSceneGraph-0.9.9-osgTerrain.diff, 1.1,
	NONE OpenSceneGraph-0.9.9-revdeb.diff, 1.3, NONE
Message-ID: <200512070251.jB72pAXs002677@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Removed Files:
	OpenSceneGraph-0.9.9-osgPlugins.diff 
	OpenSceneGraph-0.9.9-osgTerrain.diff 
	OpenSceneGraph-0.9.9-revdeb.diff 
Log Message:
- Merge diffs into one file.
- Fix up *.pcs from inside of *.spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Aug 2005 05:06:09 -0000	1.1
+++ .cvsignore	7 Dec 2005 02:50:38 -0000	1.2
@@ -1,2 +1,2 @@
-openscenegraph_0.9.9-5.diff.gz
 OSG_OP_OT-0.9.9.zip
+OpenSceneGraph-0.9.9.diff


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OpenSceneGraph.spec	28 Aug 2005 07:27:18 -0000	1.5
+++ OpenSceneGraph.spec	7 Dec 2005 02:50:38 -0000	1.6
@@ -4,9 +4,11 @@
 # package are under the same license as the package itself.
 #
 
+%define apivers 0.9.9
+
 Name:           OpenSceneGraph
 Version:        0.9.9
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -14,14 +16,7 @@
 URL:            http://www.openscenegraph.org/
 Source0:        http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{version}.zip
 
-# Debian patch
-Patch0:		http://ftp.debian.org/debian/pool/main/o/openscenegraph/openscenegraph_0.9.9-5.diff.gz
-
-# Revert parts of the Debian patch
-Patch1:		OpenSceneGraph-0.9.9-revdeb.diff
-
-Patch2: 	OpenSceneGraph-0.9.9-osgTerrain.diff
-Patch3:		OpenSceneGraph-0.9.9-osgPlugins.diff
+Patch0:		OpenSceneGraph-0.9.9.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,9 +45,6 @@
 %prep
 %setup -q -n OSG_OP_OT-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # backup, we hack this file later
 cp OpenSceneGraph/Make/dependencies \
@@ -85,7 +77,12 @@
     $dir/Make/makerules
 
 # Fix libdir
-  sed -i -e 's,^libdir=.*$,libdir = %{_libdir},' \
+  sed -i \
+    -e 's,^prefix=.*$,prefix = %{_prefix},' \
+    -e 's,^includedir=.*$,includedir = %{_includedir},' \
+    -e 's,^libdir=.*$,libdir = %{_libdir},' \
+    -e 's,^Version:.*$,Version: %{apivers},' \
+    -e '/^Conflicts:$/d' \
     $dir/Make/$(echo $dir | tr [:upper:] [:lower:]).pc
 done
 
@@ -366,6 +363,10 @@
 %{_includedir}/Producer
 
 %changelog
+* Tue Dec 06 2005 Ralf Corsepius  - 0.9.9-4%{?dist}.1
+- Merge diffs into one file.
+- Fix up *.pcs from inside of *.spec.
+
 * Sun Aug 28 2005 Ralf Corsepius  - 0.9.9-4
 - Propagate %%_libdir to pkgconfig files.
 - Fix typo in %%ifarch magic to setup LD_LIBRARY_PATH


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Aug 2005 04:38:17 -0000	1.1
+++ sources	7 Dec 2005 02:50:38 -0000	1.2
@@ -1,2 +1,2 @@
-4aed300dd024609687e8f2e8348409e7  openscenegraph_0.9.9-5.diff.gz
 711773db3874320967091327473dbc31  OSG_OP_OT-0.9.9.zip
+b1d2366ab6db7c8102153bd262a4a145  OpenSceneGraph-0.9.9.diff


--- OpenSceneGraph-0.9.9-osgPlugins.diff DELETED ---


--- OpenSceneGraph-0.9.9-osgTerrain.diff DELETED ---


--- OpenSceneGraph-0.9.9-revdeb.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec  7 08:22:02 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed,  7 Dec 2005 03:22:02 -0500
Subject: rpms/irssi/devel .cvsignore, 1.3, 1.4 irssi.spec, 1.10, 1.11 sources,
	1.3, 1.4
Message-ID: <200512070822.jB78MWPW012752@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	.cvsignore irssi.spec sources 
Log Message:
irssi: updated to 0.8.10rc8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Nov 2005 18:48:47 -0000	1.3
+++ .cvsignore	7 Dec 2005 08:22:00 -0000	1.4
@@ -1 +1 @@
-irssi-0.8.10-rc7.tar.gz
+irssi-0.8.10-rc8.tar.gz


Index: irssi.spec
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- irssi.spec	15 Nov 2005 18:48:47 -0000	1.10
+++ irssi.spec	7 Dec 2005 08:22:00 -0000	1.11
@@ -1,11 +1,11 @@
 %define		perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
-%define		release_candidate	rc7
+%define		release_candidate	rc8
 
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.10
-Release:	0.1.%{release_candidate}%{?dist}
+Release:	0.2.%{release_candidate}%{?dist}
 
 License:	GPL
 Group:		Applications/Communications
@@ -93,6 +93,9 @@
 %{_includedir}/irssi
 
 %changelog
+* Wed Dec  7 2005 Dams  - 0.8.10-0.2.rc8
+- Updated to rc8
+
 * Tue Nov 15 2005 Dams  - 0.8.10-0.1.rc7
 - Dropped patch 2 (seems applied upstream) and 3 (no longer needed)
 - Removed conditionnal build against glib1 parts


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Nov 2005 18:48:47 -0000	1.3
+++ sources	7 Dec 2005 08:22:00 -0000	1.4
@@ -1 +1 @@
-1931fc16009b593d98dc8c8f3503b701  irssi-0.8.10-rc7.tar.gz
+b51befaeca9ce3a763ee994096d4a387  irssi-0.8.10-rc8.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec  7 08:25:53 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed,  7 Dec 2005 03:25:53 -0500
Subject: rpms/irssi/FC-4 .cvsignore, 1.2, 1.3 irssi.spec, 1.8, 1.9 sources,
	1.2, 1.3 irssi-0.8.9-gcc4.patch, 1.1,
	NONE irssi-0.8.9-include-config.h.patch, 1.1, NONE
Message-ID: <200512070826.jB78QOSU012832@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	.cvsignore irssi.spec sources 
Removed Files:
	irssi-0.8.9-gcc4.patch irssi-0.8.9-include-config.h.patch 
Log Message:
irssi/FC-4: backport from devel: 0.8.10rc8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/irssi/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:36:20 -0000	1.2
+++ .cvsignore	7 Dec 2005 08:25:51 -0000	1.3
@@ -1 +1 @@
-irssi-0.8.9.tar.bz2
+irssi-0.8.10-rc8.tar.gz


Index: irssi.spec
===================================================================
RCS file: /cvs/extras/rpms/irssi/FC-4/irssi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- irssi.spec	11 Apr 2005 21:26:34 -0000	1.8
+++ irssi.spec	7 Dec 2005 08:25:51 -0000	1.9
@@ -1,45 +1,51 @@
 %define		perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
+%define		release_candidate	rc8
+
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
-Version:	0.8.9
-Release:	7
+Version:	0.8.10
+Release:	0.2.%{release_candidate}%{?dist}
 
 License:	GPL
 Group:		Applications/Communications
 URL:		http://irssi.org/
-Source0:	http://irssi.org/files/%{name}-%{version}.tar.bz2
+Source0:	http://irssi.org/files/irssi-%{version}-%{release_candidate}.tar.gz
 Source1:	http://wouter.coekaerts.be/irssi/scripts/replace.pl
 Source2:	http://wouter.coekaerts.be/irssi/scripts/trigger.pl
 Source3:	http://wouter.coekaerts.be/irssi/scripts/convert-replace-trigger.pl
 Patch1:		convert-replace-trigger.pl-fixpath-patch
-Patch2:		irssi-0.8.9-include-config.h.patch
-Patch3:		irssi-0.8.9-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	ncurses-devel openssl-devel zlib-devel pkgconfig gc-devel
-%{?_with_glib1:BuildRequires:	glib-devel}
-%{!?_with_glib1:BuildRequires:	glib2-devel}
+BuildRequires:	ncurses-devel openssl-devel zlib-devel 
+BuildRequires:	pkgconfig gc-devel glib2-devel
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%package devel
+Summary:	Development package for irssi
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description
 Irssi is a modular IRC client with Perl scripting. Only text-mode
 frontend is currently supported. The GTK/GNOME frontend is no longer
 being maintained.
 
+%description devel
+This package contains headers needed to develop irssi plugins.
+
+Irssi is a modular IRC client with Perl scripting. Only text-mode
+frontend is currently supported. The GTK/GNOME frontend is no longer
+being maintained.
+
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{release_candidate}
 install -m 0644 %{SOURCE3} .
 %patch1 -p0
-%patch2 -p1 -b .include-config.h
-%patch3 -p1 -b .gcc4
-
 
 %build
 %configure --enable-ipv6 --with-textui	\
-%{?_with_glib1:	--with-glib1}		\
 	--with-proxy			\
 	--with-bot			\
 	--with-perl=module		\
@@ -82,7 +88,21 @@
 %{perl_vendorarch}/auto/Irssi
 
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/irssi
+
 %changelog
+* Wed Dec  7 2005 Dams  - 0.8.10-0.2.rc8
+- Updated to rc8
+
+* Tue Nov 15 2005 Dams  - 0.8.10-0.1.rc7
+- Dropped patch 2 (seems applied upstream) and 3 (no longer needed)
+- Removed conditionnal build against glib1 parts
+
+* Sun Nov 13 2005 Luke Macken  0.8.9-8
+- Rebuild against new openssl
+
 * Mon Apr 11 2005 Michael Schwendt  0.8.9-7
 - Two patches to fix build for GCC4 and new Perl with config.h.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/irssi/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:36:20 -0000	1.2
+++ sources	7 Dec 2005 08:25:51 -0000	1.3
@@ -1 +1 @@
-6610ee0e27922f447e40828cf7dee507  irssi-0.8.9.tar.bz2
+b51befaeca9ce3a763ee994096d4a387  irssi-0.8.10-rc8.tar.gz


--- irssi-0.8.9-gcc4.patch DELETED ---


--- irssi-0.8.9-include-config.h.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec  7 12:00:00 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  7 Dec 2005 07:00:00 -0500
Subject: rpms/xmms/FC-4 xmms.spec,1.10,1.11
Message-ID: <200512071200.jB7C0UVf018829@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	xmms.spec 
Log Message:
Minor cleanups before requesting new builds.



Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/FC-4/xmms.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmms.spec	28 May 2005 12:29:55 -0000	1.10
+++ xmms.spec	7 Dec 2005 11:59:57 -0000	1.11
@@ -1,7 +1,7 @@
-Summary: The X MultiMedia System, a media player which resembles Winamp
+Summary: The X MultiMedia System, a media player
 Name: xmms
 Version: 1.2.10
-Release: 18
+Release: 18%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -74,7 +74,8 @@
 %patch11 -p1 -b .gcc4
 
 %build
-%configure --disable-dependency-tracking \
+%configure \
+  --disable-dependency-tracking \
   --enable-kanji \
   --enable-texthack \
   --enable-ipv6 \
@@ -112,20 +113,20 @@
 
 %find_lang %{name}
 
+%clean
+rm -rf %{buildroot}
+
 %post
-/sbin/ldconfig  
-update-desktop-database %{_datadir}/desktop-menu-patches || :
+/sbin/ldconfig
+update-desktop-database -q || :
 
 %postun
-/sbin/ldconfig 
-update-desktop-database %{_datadir}/desktop-menu-patches || :
-
-%clean
-rm -rf %{buildroot}
+/sbin/ldconfig
+update-desktop-database -q || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc AUTHORS COPYING ChangeLog FAQ NEWS TODO README 
+%doc AUTHORS COPYING ChangeLog FAQ NEWS TODO README
 %{_bindir}/xmms
 %{_bindir}/wmxmms
 %{_libdir}/libxmms.so.1*
@@ -139,11 +140,11 @@
 
 %files devel
 %defattr(-,root,root,0755)
-%{_includedir}/xmms/
 %{_bindir}/xmms-config
-%{_datadir}/aclocal/xmms.m4
+%{_includedir}/xmms/
 %{_libdir}/lib*.a
 %{_libdir}/lib*.so
+%{_datadir}/aclocal/xmms.m4
 
 %changelog
 * Sat May 28 2005 Matthias Saou  1:1.2.10-18



From fedora-extras-commits at redhat.com  Wed Dec  7 12:00:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  7 Dec 2005 07:00:05 -0500
Subject: rpms/xmms/devel xmms.spec,1.10,1.11
Message-ID: <200512071200.jB7C0aLn018832@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	xmms.spec 
Log Message:
Minor cleanups before requesting new builds.



Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmms.spec	28 May 2005 12:29:55 -0000	1.10
+++ xmms.spec	7 Dec 2005 12:00:03 -0000	1.11
@@ -1,7 +1,7 @@
-Summary: The X MultiMedia System, a media player which resembles Winamp
+Summary: The X MultiMedia System, a media player
 Name: xmms
 Version: 1.2.10
-Release: 18
+Release: 18%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -74,7 +74,8 @@
 %patch11 -p1 -b .gcc4
 
 %build
-%configure --disable-dependency-tracking \
+%configure \
+  --disable-dependency-tracking \
   --enable-kanji \
   --enable-texthack \
   --enable-ipv6 \
@@ -112,20 +113,20 @@
 
 %find_lang %{name}
 
+%clean
+rm -rf %{buildroot}
+
 %post
-/sbin/ldconfig  
-update-desktop-database %{_datadir}/desktop-menu-patches || :
+/sbin/ldconfig
+update-desktop-database -q || :
 
 %postun
-/sbin/ldconfig 
-update-desktop-database %{_datadir}/desktop-menu-patches || :
-
-%clean
-rm -rf %{buildroot}
+/sbin/ldconfig
+update-desktop-database -q || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc AUTHORS COPYING ChangeLog FAQ NEWS TODO README 
+%doc AUTHORS COPYING ChangeLog FAQ NEWS TODO README
 %{_bindir}/xmms
 %{_bindir}/wmxmms
 %{_libdir}/libxmms.so.1*
@@ -139,11 +140,11 @@
 
 %files devel
 %defattr(-,root,root,0755)
-%{_includedir}/xmms/
 %{_bindir}/xmms-config
-%{_datadir}/aclocal/xmms.m4
+%{_includedir}/xmms/
 %{_libdir}/lib*.a
 %{_libdir}/lib*.so
+%{_datadir}/aclocal/xmms.m4
 
 %changelog
 * Sat May 28 2005 Matthias Saou  1:1.2.10-18



From fedora-extras-commits at redhat.com  Wed Dec  7 12:33:50 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 07:33:50 -0500
Subject: rpms/rt3/devel rt3.spec,1.4,1.5
Message-ID: <200512071234.jB7CYLtq020545@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	rt3.spec 
Log Message:
 Require perl(HTML::Format), perl(HTML::TreeBuilder)


Index: rt3.spec
===================================================================
RCS file: /cvs/extras/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rt3.spec	4 Nov 2005 08:33:03 -0000	1.4
+++ rt3.spec	7 Dec 2005 12:33:48 -0000	1.5
@@ -13,7 +13,7 @@
 
 Name:		rt3
 Version:	3.4.4
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -41,19 +41,20 @@
 
 # rpm doesn't catch these:
 Requires: perl(Apache::Session)
-Requires: perl(URI::URL)
-Requires: perl(Tree::Simple)
-Requires: perl(Regexp::Common)
+Requires: perl(File::Temp)
+Requires: perl(HTML::Mason)
+Requires: perl(HTML::TextFormat)
+Requires: perl(HTML::TreeBuilder)
+Requires: perl(HTTP::Server::Simple::Mason)
 Requires: perl(I18N::LangTags::List)
-Requires: perl(MIME::Entity)
+Requires: perl(Locale::Maketext::Fuzzy)
 Requires: perl(LWP::MediaTypes)
-Requires: perl(File::Temp)
 Requires: perl(MIME::Entity)
-Requires: perl(Module::Versions::Report)
-Requires: perl(Locale::Maketext::Fuzzy)
-Requires: perl(HTTP::Server::Simple::Mason)
-Requires: perl(HTML::Mason)
 Requires: perl(mod_perl2)
+Requires: perl(Module::Versions::Report)
+Requires: perl(Regexp::Common)
+Requires: perl(Tree::Simple)
+Requires: perl(URI::URL)
 
 %description
 RT is an enterprise-grade ticketing system which enables a group of people
@@ -234,6 +235,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Wed Dec 07 2005 Ralf Cors??pius  - 3.4.4-11
+- Require perl(HTML::Format), perl(HTML::TreeBuilder) (#175176).
+
 * Fri Nov 04 2005 Ralf Cors??pius  - 3.4.4-10
 - Inline rt3-filter-provides.sh, rt3-filter-requires.sh into spec.
 



From fedora-extras-commits at redhat.com  Wed Dec  7 12:36:21 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 07:36:21 -0500
Subject: rpms/rt3/devel rt3.spec,1.5,1.6
Message-ID: <200512071236.jB7CapeY020573@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	rt3.spec 
Log Message:
Fix typo in previous change


Index: rt3.spec
===================================================================
RCS file: /cvs/extras/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rt3.spec	7 Dec 2005 12:33:48 -0000	1.5
+++ rt3.spec	7 Dec 2005 12:36:19 -0000	1.6
@@ -43,7 +43,7 @@
 Requires: perl(Apache::Session)
 Requires: perl(File::Temp)
 Requires: perl(HTML::Mason)
-Requires: perl(HTML::TextFormat)
+Requires: perl(HTML::FormatText)
 Requires: perl(HTML::TreeBuilder)
 Requires: perl(HTTP::Server::Simple::Mason)
 Requires: perl(I18N::LangTags::List)
@@ -236,7 +236,7 @@
 
 %changelog
 * Wed Dec 07 2005 Ralf Cors??pius  - 3.4.4-11
-- Require perl(HTML::Format), perl(HTML::TreeBuilder) (#175176).
+- Require perl(HTML::FormatText), perl(HTML::TreeBuilder) (#175176).
 
 * Fri Nov 04 2005 Ralf Cors??pius  - 3.4.4-10
 - Inline rt3-filter-provides.sh, rt3-filter-requires.sh into spec.



From fedora-extras-commits at redhat.com  Wed Dec  7 12:57:44 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 07:57:44 -0500
Subject: rpms/rt3/FC-4 rt3.spec,1.3,1.4
Message-ID: <200512071258.jB7CwEbE020737@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	rt3.spec 
Log Message:
Require perl(HTML::FormatText), perl(HTML::TreeBuilder) (#175176).


Index: rt3.spec
===================================================================
RCS file: /cvs/extras/rpms/rt3/FC-4/rt3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rt3.spec	5 Nov 2005 09:18:17 -0000	1.3
+++ rt3.spec	7 Dec 2005 12:57:42 -0000	1.4
@@ -13,7 +13,7 @@
 
 Name:		rt3
 Version:	3.4.4
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -41,19 +41,20 @@
 
 # rpm doesn't catch these:
 Requires: perl(Apache::Session)
-Requires: perl(URI::URL)
-Requires: perl(Tree::Simple)
-Requires: perl(Regexp::Common)
+Requires: perl(File::Temp)
+Requires: perl(HTML::Mason)
+Requires: perl(HTML::FormatText)
+Requires: perl(HTML::TreeBuilder)
+Requires: perl(HTTP::Server::Simple::Mason)
 Requires: perl(I18N::LangTags::List)
-Requires: perl(MIME::Entity)
+Requires: perl(Locale::Maketext::Fuzzy)
 Requires: perl(LWP::MediaTypes)
-Requires: perl(File::Temp)
 Requires: perl(MIME::Entity)
-Requires: perl(Module::Versions::Report)
-Requires: perl(Locale::Maketext::Fuzzy)
-Requires: perl(HTTP::Server::Simple::Mason)
-Requires: perl(HTML::Mason)
 Requires: perl(mod_perl2)
+Requires: perl(Module::Versions::Report)
+Requires: perl(Regexp::Common)
+Requires: perl(Tree::Simple)
+Requires: perl(URI::URL)
 
 %description
 RT is an enterprise-grade ticketing system which enables a group of people
@@ -234,6 +235,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Wed Dec 07 2005 Ralf Cors??pius  - 3.4.4-11
+- Require perl(HTML::FormatText), perl(HTML::TreeBuilder) (#175176).
+
 * Fri Nov 04 2005 Ralf Cors??pius  - 3.4.4-10
 - Inline rt3-filter-provides.sh, rt3-filter-requires.sh into spec.
 



From fedora-extras-commits at redhat.com  Wed Dec  7 13:15:53 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 08:15:53 -0500
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.6,1.7
Message-ID: <200512071316.jB7DGOq2022471@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	OpenSceneGraph.spec 
Log Message:
Use /sbin/ldconfig to create dyn. symlinks.


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OpenSceneGraph.spec	7 Dec 2005 02:50:38 -0000	1.6
+++ OpenSceneGraph.spec	7 Dec 2005 13:15:51 -0000	1.7
@@ -140,16 +140,7 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/OpenSceneGraph/src
 
 # fix up shared library symlinks
-pushd ${RPM_BUILD_ROOT}%{_libdir}
-  for i in lib*.so; do
-    if test -f $i; then
-      rm -f $i.*
-      soname=$(objdump -p $i | grep SONAME | sed 's,[ ]*SONAME[ ]*,,')
-      mv $i $soname
-      ln -s $soname $i
-    fi
-  done
-popd
+/sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir}
 
 install -m 644 -D OpenThreads/Make/openthreads.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
 install -m 644 -D OpenSceneGraph/Make/openscenegraph.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc



From fedora-extras-commits at redhat.com  Wed Dec  7 13:15:59 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 08:15:59 -0500
Subject: rpms/OpenSceneGraph/FC-3 OpenSceneGraph.spec,1.6,1.7
Message-ID: <200512071316.jB7DGTfE022474@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	OpenSceneGraph.spec 
Log Message:
Use /sbin/ldconfig to create dyn. symlinks.


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-3/OpenSceneGraph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OpenSceneGraph.spec	7 Dec 2005 02:48:22 -0000	1.6
+++ OpenSceneGraph.spec	7 Dec 2005 13:15:57 -0000	1.7
@@ -140,16 +140,7 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/OpenSceneGraph/src
 
 # fix up shared library symlinks
-pushd ${RPM_BUILD_ROOT}%{_libdir}
-  for i in lib*.so; do
-    if test -f $i; then
-      rm -f $i.*
-      soname=$(objdump -p $i | grep SONAME | sed 's,[ ]*SONAME[ ]*,,')
-      mv $i $soname
-      ln -s $soname $i
-    fi
-  done
-popd
+/sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir}
 
 install -m 644 -D OpenThreads/Make/openthreads.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
 install -m 644 -D OpenSceneGraph/Make/openscenegraph.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc



From fedora-extras-commits at redhat.com  Wed Dec  7 13:16:04 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 08:16:04 -0500
Subject: rpms/OpenSceneGraph/FC-4 OpenSceneGraph.spec,1.6,1.7
Message-ID: <200512071316.jB7DGYZ8022477@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	OpenSceneGraph.spec 
Log Message:
Use /sbin/ldconfig to create dyn. symlinks.


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-4/OpenSceneGraph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OpenSceneGraph.spec	7 Dec 2005 02:42:21 -0000	1.6
+++ OpenSceneGraph.spec	7 Dec 2005 13:16:02 -0000	1.7
@@ -140,16 +140,7 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/OpenSceneGraph/src
 
 # fix up shared library symlinks
-pushd ${RPM_BUILD_ROOT}%{_libdir}
-  for i in lib*.so; do
-    if test -f $i; then
-      rm -f $i.*
-      soname=$(objdump -p $i | grep SONAME | sed 's,[ ]*SONAME[ ]*,,')
-      mv $i $soname
-      ln -s $soname $i
-    fi
-  done
-popd
+/sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir}
 
 install -m 644 -D OpenThreads/Make/openthreads.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
 install -m 644 -D OpenSceneGraph/Make/openscenegraph.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc



From fedora-extras-commits at redhat.com  Wed Dec  7 14:33:45 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed,  7 Dec 2005 09:33:45 -0500
Subject: rpms/antiword/devel .cvsignore, 1.4, 1.5 antiword.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <200512071434.jB7EYFEK024498@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	.cvsignore antiword.spec sources 
Log Message:
* Wed Dec 07 2005 Adrian Reber  - 0.37-1
- updated to 0.37



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/antiword/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 May 2005 08:34:18 -0000	1.4
+++ .cvsignore	7 Dec 2005 14:33:42 -0000	1.5
@@ -1 +1 @@
-antiword-0.36.1.tar.gz
+antiword-0.37.tar.gz


Index: antiword.spec
===================================================================
RCS file: /cvs/extras/rpms/antiword/devel/antiword.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- antiword.spec	10 May 2005 12:45:18 -0000	1.10
+++ antiword.spec	7 Dec 2005 14:33:42 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:    MS Word to ASCII/Postscript converter
 Name:       antiword
-Version:    0.36.1
-Release:    2
+Version:    0.37
+Release:    1
 Source:     http://www.winfield.demon.nl/linux/%{name}-%{version}.tar.gz
 URL:        http://www.winfield.demon.nl/
 Patch0:     antiword-0.32-fix-flags.patch
@@ -30,6 +30,7 @@
 %{__cp} -a Resources/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/man1
 %{__cp} Docs/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%{__chmod} 644 kantiword
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -38,12 +39,15 @@
 %defattr(-,root,root)
 %doc Docs/COPYING Docs/FAQ Docs/ReadMe Docs/Netscape Docs/ChangeLog
 %doc Docs/Exmh Docs/Mozilla Docs/QandA Docs/Mutt Docs/antiword.php
-%doc Docs/Emacs Docs/History
+%doc Docs/Emacs Docs/History kantiword
 %{_bindir}/*
 %{_mandir}/*/*
 %{_datadir}/%{name}
 
 %changelog
+* Wed Dec 07 2005 Adrian Reber  - 0.37-1
+- updated to 0.37
+
 * Tue May 10 2005 Adrian Reber  - 0.36.1-2
 - updated to 0.36.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/antiword/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 May 2005 08:34:18 -0000	1.4
+++ sources	7 Dec 2005 14:33:42 -0000	1.5
@@ -1 +1 @@
-d46107219f4afaee658647a49dc45ed9  antiword-0.36.1.tar.gz
+f868e2a269edcbc06bf77e89a55898d1  antiword-0.37.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec  7 16:20:04 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 11:20:04 -0500
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.7,1.8
Message-ID: <200512071620.jB7GKYOC028058@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	OpenSceneGraph.spec 
Log Message:
Try at modular X11.


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- OpenSceneGraph.spec	7 Dec 2005 13:15:51 -0000	1.7
+++ OpenSceneGraph.spec	7 Dec 2005 16:20:02 -0000	1.8
@@ -8,7 +8,7 @@
 
 Name:           OpenSceneGraph
 Version:        0.9.9
-Release:        4%{?dist}.1
+Release:        5%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -21,7 +21,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	flex bison
-BuildRequires:  xorg-x11-Mesa-libGL
+BuildRequires:  libGL-devel
+BuildRequires: 	libGLU-devel
+BuildRequires:	libXmu-devel
+BuildRequires:	libX11-devel
 BuildRequires: 	Inventor-devel
 BuildRequires:	freeglut-devel
 BuildRequires:	libjpeg-devel
@@ -354,6 +357,9 @@
 %{_includedir}/Producer
 
 %changelog
+* Wed Dec 07 2005 Ralf Cors??pius  - 0.9.9-5
+- Try at getting this package buildable with modular X11.
+
 * Tue Dec 06 2005 Ralf Corsepius  - 0.9.9-4%{?dist}.1
 - Merge diffs into one file.
 - Fix up *.pcs from inside of *.spec.



From fedora-extras-commits at redhat.com  Wed Dec  7 17:11:06 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Wed,  7 Dec 2005 12:11:06 -0500
Subject: web/include widgets.inc,1.14,1.15
Message-ID: <200512071711.jB7HBaX1029939@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29922

Modified Files:
	widgets.inc 
Log Message:
Getting debug output mailed.


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- widgets.inc	7 Dec 2005 01:58:20 -0000	1.14
+++ widgets.inc	7 Dec 2005 17:11:04 -0000	1.15
@@ -76,7 +76,8 @@
 function side_nav_traverse($node,$page_level,$current_level="0",$nav_id="",$options="") {
 
 	if (!isset($node) || !is_array($node) || empty($node)) {
-		var_dump(debug_backtrace());
+		//var_dump(debug_backtrace());
+		@mail("webmaster at fedora.redhat.com", "Debug output from f.r.c", var_export(debug_backtrace(), TRUE));
 		return;
 	}
 



From fedora-extras-commits at redhat.com  Wed Dec  7 17:58:35 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Wed,  7 Dec 2005 12:58:35 -0500
Subject: web/html/participate common.inc,1.1.1.1,1.2
Message-ID: <200512071759.jB7Hx5hI030218@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/participate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30195

Modified Files:
	common.inc 
Log Message:
No longer using participate/common.inc


Index: common.inc
===================================================================
RCS file: /cvs/fedora/web/html/participate/common.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- common.inc	30 Mar 2005 17:47:23 -0000	1.1.1.1
+++ common.inc	7 Dec 2005 17:58:33 -0000	1.2
@@ -1,10 +1,10 @@
 addSideContent("Projects",$projects);
-
+*/
 ?>



From fedora-extras-commits at redhat.com  Wed Dec  7 18:03:04 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed,  7 Dec 2005 13:03:04 -0500
Subject: CVSROOT avail,1.17,1.18
Message-ID: <200512071803.jB7I3cWL031793@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31774

Modified Files:
	avail 
Log Message:
Trying to fix a lack of access for ivazquez; cleaning up repetitiveness may help?  Probably not, but worth an initial try.


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- avail	6 Dec 2005 20:22:19 -0000	1.17
+++ avail	7 Dec 2005 18:03:02 -0000	1.18
@@ -21,8 +21,7 @@
 # Fedora Web site
 unavail | | web
 avail | tfox,notting,sopwith,gdk,katzj,kwade | web
-avail | havill,hp,nman64 | web
-avail | ivazquez,nman64 | web
+avail | havill,hp,nman64,ivazquez | web
 avail | katzj | web/html/projects/anaconda-installer
 avail | bfox | web/html/projects/config-tools
 avail | blizzard,krh | web/html/projects/desktop



From fedora-extras-commits at redhat.com  Wed Dec  7 19:37:11 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed,  7 Dec 2005 14:37:11 -0500
Subject: web/html/docs/release-notes index.php,1.11,1.12
Message-ID: <200512071937.jB7Jbg8B001786@cvs-int.fedora.redhat.com>

Author: kwade

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

Modified Files:
	index.php 
Log Message:
Updating latest, also including ru and it trans as part of latest since they have updated their translations since the initial trans freeze.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/release-notes/index.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- index.php	26 Nov 2005 09:02:59 -0000	1.11
+++ index.php	7 Dec 2005 19:37:09 -0000	1.12
@@ -20,7 +20,9 @@
 These are the latest release notes, updated for FC5 test1:
 
      
 
      
-en
+en |
+it |
+ru
 
      
 
      
 These are the release notes as they shipped in the FC5 test1 ISO:



From fedora-extras-commits at redhat.com  Wed Dec  7 19:37:17 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed,  7 Dec 2005 14:37:17 -0500
Subject: web/html/docs/release-notes/fc5/test1-latest-en index.php,1.2,1.3
Message-ID: <200512071937.jB7Jbl9i001789@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-latest-en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1682/fc5/test1-latest-en

Modified Files:
	index.php 
Log Message:
Updating latest, also including ru and it trans as part of latest since they have updated their translations since the initial trans freeze.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/release-notes/fc5/test1-latest-en/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.php	25 Nov 2005 19:28:53 -0000	1.2
+++ index.php	7 Dec 2005 19:37:15 -0000	1.3
@@ -1,12 +1,12 @@
 initCommon();
-
+$template->initCommon(); 
 $template->displayHeader();
 
 ?>
+
 
      
 
      
 
      
@@ -23,10 +23,15 @@
 
[Tip]
 Latest Release Notes on the Web
 

+

+

       These release notes may be updated.  Visit http://fedora.redhat.com/docs/release-notes/
       to view the latest release notes for Fedora Core 5 test1.
-    

 

 

 
@@ -40,9 +45,9 @@
 
3. Introduction and Technical Release Notes

 
4. Hardware Requirements

 

-
4.1. CPU Requirements

-
4.2. Hard Disk Space Requirements

-
4.3. Memory Requirements

+
4.1. CPU Requirements

+
4.2. Hard Disk Space Requirements

+
4.3. Memory Requirements

 
4.4. PPC Hardware Requirements

 

 
5. Overview of This Release

@@ -57,11 +62,11 @@
 

 
7.1. Basic Components

 

-
7.1.1. Fedora Extras Repository

+
7.1.1. Fedora Extras Repository

 
7.1.2. Audit Daemon auditd and Log
 	Files

-
7.1.3. Enabling the slocate Database

-
7.1.4. Stricter Controls in openssh

+
7.1.3. Enabling the slocate Database

+
7.1.4. Stricter Controls in openssh

 
7.1.5. Java Package Recommendations

 

 
7.2. Core

@@ -74,26 +79,26 @@
   
 
7.3.1. Java-like Environment

 
7.4. Internationalization (i18n)

-
7.4.1. Language Support

+
7.4.1. Language Support

 
7.5. Multimedia

 

 
7.5.1. Excluded Multimedia Software

 
7.5.2. CD and DVD Authoring and Burning

 

 
7.6. Web Servers

-
7.6.1. httpd

+
7.6.1. httpd

 
7.7. Samba (Windows File System Compatibility)

 
7.8. X Window System (Graphics)

-
7.8.1. X Window System (Graphics)

+
7.8.1. X Window System (Graphics)

 
7.9. Games and Entertainment

 

 
8. Legacy Information

 
9. Packages Movement

 

 
9.1. Packages Added

-
9.2. Packages Removed

+
9.2. Packages Removed

 

-
10. Notes

+
10. Notes

 
11. An Overview of the Fedora Project

 
 

@@ -320,7 +325,7 @@
 

 

 

-4.1.??CPU Requirements

+4.1.??CPU Requirements

 

 

 
This section lists the CPU specifications required by Fedora Core
@@ -364,7 +369,7 @@
 

 

 

-4.2.??Hard Disk Space Requirements

+4.2.??Hard Disk Space Requirements

 

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

 

 

-4.3.??Memory Requirements

+4.3.??Memory Requirements

 

 
 
This section lists the memory required to install Fedora Core
@@ -720,7 +725,7 @@
 	  Certain hardware configurations (particularly those with
 	  LCD displays) may experience problems while starting the
 	  Fedora Core installation program.  In these instances, restart
-	  the installation, and add the "nofb" option
+	  the installation, and add the nofb option
 	  to the boot command line.
 	

 

@@ -730,7 +735,7 @@
 
- 
- 
+ 
+ 
- 
- 
+ 
+ 
- 
- 
+ 
+ 
- 
- 
+ 
+ 
@@ -73,13 +73,13 @@
  
- 
- 
+ 
+ 
- 
- 
+ 
+ 



From fedora-extras-commits at redhat.com  Tue Dec 20 22:50:50 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 17:50:50 -0500
Subject: rpms/cernlib/FC-3 cernlib-gxint-script.diff, 1.1, 1.2 cernlib.spec, 
	1.13, 1.14
Message-ID: <200512202251.jBKMpNwJ027749@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib-gxint-script.diff cernlib.spec 
Log Message:
* Tue Dec 20 2005 Patrice Dumas  - 2005-11
- add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
- fix gxint


cernlib-gxint-script.diff:

Index: cernlib-gxint-script.diff
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib-gxint-script.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-gxint-script.diff	9 Dec 2005 15:57:06 -0000	1.1
+++ cernlib-gxint-script.diff	20 Dec 2005 22:50:50 -0000	1.2
@@ -14,7 +14,7 @@
 -  CERN="/cern" ; export CERN
 -fi
 +# not used after the sed one liner in the spec file 
-+if [ -z "$CERN" ] ; then CERN="/usr"
++if [ -z "$CERN" ] ; then CERN="/usr"; fi
   
  if [ "$drv" = "/GKS" ] ; then
    if [ -z "$GKSR" ] ; then


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cernlib.spec	20 Dec 2005 21:54:45 -0000	1.13
+++ cernlib.spec	20 Dec 2005 22:50:50 -0000	1.14
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       10%{?dist}
+Release:       11%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -517,8 +517,8 @@
 	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
 # substitute version in gxint with the right version
-# substitute includedir in gxint to conform to FHS
-sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib:%{_includedir}/cernlib/\${ver}:' src/scripts/gxint 
+# substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
+sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
 sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \
@@ -613,6 +613,9 @@
 %{__ln_s} gxint321.f gxint.f
 popd
 
+# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
+%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+
 cd src
 # install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
@@ -670,6 +673,7 @@
 %{_bindir}/paw++
 %{_bindir}/paw
 %{_bindir}/pawX11
+%{_libdir}/cernlib/%{version}/bin/pawX11
 %doc paw.README 
 
 %files -n geant321
@@ -700,6 +704,10 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11
+- add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
+- fix gxint
+
 * Tue Dec 20 2005 Patrice Dumas  - 2005-10
 - add file in /etc/ld.so.conf.d required for dynamic linking
 



From fedora-extras-commits at redhat.com  Tue Dec 20 22:52:11 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 17:52:11 -0500
Subject: rpms/cernlib/FC-4 cernlib-gxint-script.diff, 1.2, 1.3 cernlib.spec, 
	1.18, 1.19
Message-ID: <200512202252.jBKMqiQB027817@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib-gxint-script.diff cernlib.spec 
Log Message:
* Tue Dec 20 2005 Patrice Dumas  - 2005-11
- add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
- fix gxint


cernlib-gxint-script.diff:

Index: cernlib-gxint-script.diff
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib-gxint-script.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-gxint-script.diff	9 Dec 2005 16:09:19 -0000	1.2
+++ cernlib-gxint-script.diff	20 Dec 2005 22:52:11 -0000	1.3
@@ -14,7 +14,7 @@
 -  CERN="/cern" ; export CERN
 -fi
 +# not used after the sed one liner in the spec file 
-+if [ -z "$CERN" ] ; then CERN="/usr"
++if [ -z "$CERN" ] ; then CERN="/usr"; fi
   
  if [ "$drv" = "/GKS" ] ; then
    if [ -z "$GKSR" ] ; then


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cernlib.spec	20 Dec 2005 21:54:01 -0000	1.18
+++ cernlib.spec	20 Dec 2005 22:52:11 -0000	1.19
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       10%{?dist}
+Release:       11%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -518,8 +518,8 @@
 	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
 # substitute version in gxint with the right version
-# substitute includedir in gxint to conform to FHS
-sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib:%{_includedir}/cernlib/\${ver}:' src/scripts/gxint 
+# substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
+sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
 sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \
@@ -614,6 +614,9 @@
 %{__ln_s} gxint321.f gxint.f
 popd
 
+# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
+%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+
 cd src
 # install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
@@ -671,6 +674,7 @@
 %{_bindir}/paw++
 %{_bindir}/paw
 %{_bindir}/pawX11
+%{_libdir}/cernlib/%{version}/bin/pawX11
 %doc paw.README 
 
 %files -n geant321
@@ -701,6 +705,10 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11
+- add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
+- fix gxint
+
 * Tue Dec 20 2005 Patrice Dumas  - 2005-10
 - add file in /etc/ld.so.conf.d required for dynamic linking
 



From fedora-extras-commits at redhat.com  Tue Dec 20 22:53:23 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 17:53:23 -0500
Subject: rpms/cernlib/devel cernlib-gxint-script.diff, 1.1, 1.2 cernlib.spec,
	1.11, 1.12
Message-ID: <200512202253.jBKMrtPw027885@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib-gxint-script.diff cernlib.spec 
Log Message:
* Tue Dec 20 2005 Patrice Dumas  - 2005-11
- add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
- fix gxint


cernlib-gxint-script.diff:

Index: cernlib-gxint-script.diff
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib-gxint-script.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-gxint-script.diff	30 Nov 2005 22:01:01 -0000	1.1
+++ cernlib-gxint-script.diff	20 Dec 2005 22:53:23 -0000	1.2
@@ -14,7 +14,7 @@
 -  CERN="/cern" ; export CERN
 -fi
 +# not used after the sed one liner in the spec file 
-+if [ -z "$CERN" ] ; then CERN="/usr"
++if [ -z "$CERN" ] ; then CERN="/usr"; fi
   
  if [ "$drv" = "/GKS" ] ; then
    if [ -z "$GKSR" ] ; then


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cernlib.spec	20 Dec 2005 21:50:55 -0000	1.11
+++ cernlib.spec	20 Dec 2005 22:53:23 -0000	1.12
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       10%{?dist}
+Release:       11%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -520,8 +520,8 @@
 	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
 # substitute version in gxint with the right version
-# substitute includedir in gxint to conform to FHS
-sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib:%{_includedir}/cernlib/\${ver}:' src/scripts/gxint 
+# substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
+sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
 sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \
@@ -616,6 +616,9 @@
 %{__ln_s} gxint321.f gxint.f
 popd
 
+# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
+%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+
 cd src
 # install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
@@ -673,6 +676,7 @@
 %{_bindir}/paw++
 %{_bindir}/paw
 %{_bindir}/pawX11
+%{_libdir}/cernlib/%{version}/bin/pawX11
 %doc paw.README 
 
 %files -n geant321
@@ -703,6 +707,10 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11
+- add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
+- fix gxint
+
 * Tue Dec 20 2005 Patrice Dumas  - 2005-10
 - add file in /etc/ld.so.conf.d required for dynamic linking
 



From fedora-extras-commits at redhat.com  Tue Dec 20 23:05:38 2005
From: fedora-extras-commits at redhat.com (Thomas Chung (tchung))
Date: Tue, 20 Dec 2005 18:05:38 -0500
Subject: web/html/News index.php,1.1,1.2
Message-ID: <200512202306.jBKN6ArW029607@cvs-int.fedora.redhat.com>

Author: tchung

Update of /cvs/fedora/web/html/News
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29585

Modified Files:
	index.php 
Log Message:



Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/News/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	29 Nov 2005 17:32:58 -0000	1.1
+++ index.php	20 Dec 2005 23:05:36 -0000	1.2
@@ -15,7 +15,7 @@
 

 
 
    
-  
  • Read Fedora News, a weekly summary of notable happenings in the Fedora community.
    • 
+  
  • Read Fedora News, a weekly summary of notable happenings in the Fedora community.
    • 
   
  • Meet Fedora contributors at an event near you.
    • 
   
  • Join Fedora mailing lists to participate in the discussions that shape Fedora.
    • 
 




From fedora-extras-commits at redhat.com  Tue Dec 20 23:19:06 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Tue, 20 Dec 2005 18:19:06 -0500
Subject: rpms/ghdl/FC-4 ghdl-svn38.patch, NONE, 1.1 ghdl.spec, 1.5,
	1.6 ghdl-0.21-infodirentry.patch, 1.1, NONE
Message-ID: <200512202319.jBKNJcvf029774@cvs-int.fedora.redhat.com>

Author: sailer

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

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-svn38.patch 
Removed Files:
	ghdl-0.21-infodirentry.patch 
Log Message:
update to svn38


ghdl-svn38.patch:

--- NEW FILE ghdl-svn38.patch ---
diff -urN ghdl-0.21/vhdl/ghdl.texi ghdl-0.22dev/vhdl/ghdl.texi
--- ghdl-0.21/vhdl/ghdl.texi	2005-12-12 03:21:55.000000000 +0100
+++ ghdl-0.22dev/vhdl/ghdl.texi	2005-12-20 16:18:45.000000000 +0100
@@ -4,10 +4,14 @@
 @settitle GHDL guide
 @c %**end of header
 
+ at direntry
+* ghdl: (ghdl).         VHDL compiler.
+ at end direntry
+
 @titlepage
 @title GHDL guide
 @subtitle GHDL, a VHDL compiler
- at subtitle For GHDL version 0.21 (Sokcho edition)
+ at subtitle For GHDL version 0.22 (Sokcho edition)
 @author Tristan Gingold
 @c The following two commands start the copyright page.
 @page
diff -urN ghdl-0.21/vhdl/grt/config/win32.c ghdl-0.22dev/vhdl/grt/config/win32.c
--- ghdl-0.21/vhdl/grt/config/win32.c	2005-12-12 03:39:16.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/config/win32.c	2005-12-20 16:18:50.000000000 +0100
@@ -1,5 +1,5 @@
-/*  GRT stack implementation for Win32
-    Copyright (C) 2004, 2005 Felix Bertram.
+/*  GRT stack implementation for Win32 using fibers.
+    Copyright (C) 2005 Tristan Gingold.
 
     GHDL 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
@@ -16,139 +16,74 @@
     Software Foundation, 59 Temple Place - Suite 330, Boston, MA
     02111-1307, USA.
 */
-//-----------------------------------------------------------------------------
-// Project:     GHDL - VHDL Simulator
-// Description: Win32 port of stacks package
-// Note:        Tristan's original i386/Linux used assembly-code 
-//              to manually switch stacks for performance reasons.
-// History:     2004feb09, FB, created.
-//-----------------------------------------------------------------------------
 
 #include 
-//#include 
-//#include 
-//#include 
-
-
-//#define INFO printf
-#define INFO (void)
-
-// GHDL names an endless loop calling FUNC with ARG a 'stack'
-// at a given time, only one stack may be 'executed'
-typedef struct 
-{	HANDLE              thread;         // stack's thread
-	HANDLE              mutex;          // mutex to suspend/resume thread
-	void                (*Func)(void*); // stack's FUNC
-	void*               Arg;            // ARG passed to FUNC
-} Stack_Type_t, *Stack_Type;
+#include 
 
-Stack_Type_t      main_stack_context;
-extern Stack_Type grt_stack_main_stack;
+struct stack_type
+{
+  LPVOID fiber; //  Win fiber.
+  void (*func)(void *);  // Function
+  void *arg; //  Function argument.
+};
+
+static struct stack_type  main_stack_context;
+extern void grt_set_main_stack (struct stack_type *stack);
 
-//------------------------------------------------------------------------------
 void grt_stack_init(void)
-// Initialize the stacks package.
-// This may adjust stack sizes.
-// Must be called after grt.options.decode.
-// => procedure Stack_Init;
-{	INFO("grt_stack_init\n");
-	INFO("  main_stack_context=0x%08x\n", &main_stack_context);
-
-	// create event. reset event, as we are currently running
-	main_stack_context.mutex = CreateEvent(NULL,  // lpsa
-	                                       FALSE, // fManualReset
-	                                       FALSE, // fInitialState
-	                                       NULL); // lpszEventName
-
-	grt_stack_main_stack= &main_stack_context;
-}
-
-//------------------------------------------------------------------------------
-static unsigned long __stdcall grt_stack_loop(void* pv_myStack)
-{
-	Stack_Type myStack= (Stack_Type)pv_myStack;
-
-	INFO("grt_stack_loop\n");
-	
-	INFO("  myStack=0x%08x\n", myStack);
-
-	// block until event becomes set again.
-	// this happens when this stack is enabled for the first time
-	WaitForSingleObject(myStack->mutex, INFINITE);
-	
-	// run stack's function in endless loop
-	while(1)
-	{	INFO("  call 0x%08x with 0x%08x\n", myStack->Func, myStack->Arg);
-		myStack->Func(myStack->Arg);
-	}
-	
-	// we never get here...
-	return 0;
-}
-
-//------------------------------------------------------------------------------
-Stack_Type grt_stack_create(void* Func, void* Arg) 
-// Create a new stack, which on first execution will call FUNC with
-// an argument ARG.
-// => function Stack_Create (Func : Address; Arg : Address) return Stack_Type;
-{  	Stack_Type newStack;
-	DWORD      m_IDThread; // Thread's ID (dummy)
-
-	INFO("grt_stack_create\n");
-	INFO("  call 0x%08x with 0x%08x\n", Func, Arg);
-			
-	newStack= malloc(sizeof(Stack_Type_t));
-	
-	// init function and argument
-	newStack->Func= Func;
-	newStack->Arg=  Arg;
-	
-	// create event. reset event, so that thread will blocked in grt_stack_loop
-	newStack->mutex= CreateEvent(NULL,  // lpsa
-	                             FALSE, // fManualReset
-	                             FALSE, // fInitialState
-	                             NULL); // lpszEventName
-	
-	INFO("  newStack=0x%08x\n", newStack);
-	
-	// create thread, which executes grt_stack_loop
-	newStack->thread= CreateThread(NULL,           // lpsa
-	                               0,              // cbStack
-	                               grt_stack_loop, // lpStartAddr
-	                               newStack,       // lpvThreadParm
-	                               0,              // fdwCreate
-	                               &m_IDThread);   // lpIDThread
-	
-	return newStack;
-}
-
-//------------------------------------------------------------------------------
-void grt_stack_switch(Stack_Type To, Stack_Type From)
-// Resume stack TO and save the current context to the stack pointed by
-// CUR.
-// => procedure Stack_Switch (To : Stack_Type; From : Stack_Type);
-{	INFO("grt_stack_switch\n");
-	INFO("  from 0x%08x to 0x%08x\n", From, To);
-	
-	// set 'To' event. this will make the other thread either
-	// - start for first time in grt_stack_loop
-	// - resume at WaitForSingleObject below
-	SetEvent(To->mutex);
-		
-	// block until 'From' event becomes set again
-	// as we are running, our event is reset and we block here
-	// when stacks are switched, with above SetEvent, we may proceed
-	WaitForSingleObject(From->mutex, INFINITE);
-}
-
-//------------------------------------------------------------------------------
-void grt_stack_delete(Stack_Type Stack)
-// Delete stack STACK, which must not be currently executed.
-// => procedure Stack_Delete (Stack : Stack_Type);
-{	INFO("grt_stack_delete\n");
+{
+  main_stack_context.fiber = ConvertThreadToFiber (NULL);
+  if (main_stack_context.fiber == NULL)
+    {
+      fprintf (stderr, "convertThreadToFiber failed (err=%lu)\n",
+	       GetLastError ());
+      abort ();
+    }
+  grt_set_main_stack (&main_stack_context);
+}
+
+static VOID __stdcall
+grt_stack_loop (void *v_stack)
+{
+  struct stack_type *stack = (struct stack_type *)v_stack;
+  while (1)
+    {
+      (*stack->func)(stack->arg);
+    }
+}
+
+struct stack_type *
+grt_stack_create (void (*func)(void *), void *arg) 
+{
+  struct stack_type *res;
+
+  res = malloc (sizeof (struct stack_type));
+  if (res == NULL)
+    return NULL;
+  res->func = func;
+  res->arg = arg;
+  res->fiber = CreateFiber (0, &grt_stack_loop, res);
+  if (res->fiber == NULL)
+    {
+      free (res);
+      return NULL;
+    }
+  return res;
+}
+
+void
+grt_stack_switch (struct stack_type *to, struct stack_type *from)
+{
+  SwitchToFiber (to->fiber);
+}
+
+void
+grt_stack_delete (struct stack_type *stack)
+{
+  DeleteFiber (stack->fiber);
+  stack->fiber = NULL;
 }
 
-//----------------------------------------------------------------------------
 #ifndef WITH_GNAT_RUN_TIME
 void __gnat_raise_storage_error(void)
 {
@@ -161,6 +96,3 @@
 }
 #endif
 
-//----------------------------------------------------------------------------
-// end of file
-
diff -urN ghdl-0.21/vhdl/grt/ghwlib.c ghdl-0.22dev/vhdl/grt/ghwlib.c
--- ghdl-0.21/vhdl/grt/ghwlib.c	2005-12-07 06:29:04.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/ghwlib.c	2005-12-20 16:18:50.000000000 +0100
@@ -1214,16 +1214,31 @@
   return 0;
 }
 
+static const char *
+ghw_get_lit (union ghw_type *type, int e)
+{
+  if (e >= type->en.nbr || e < 0)
+    return "??";
+  else
+    return type->en.lits[e];
+}
+
+static void
+ghw_disp_lit (union ghw_type *type, int e)
+{
+  printf ("%s (%d)", ghw_get_lit (type, e), e);
+}
+
 void
 ghw_disp_value (union ghw_val *val, union ghw_type *type)
 {
   switch (ghw_get_base_type (type)->kind)
     {
     case ghdl_rtik_type_b2:
-      printf ("%s (%d)", type->en.lits[val->b2], val->b2);
+      ghw_disp_lit (type, val->b2);
       break;
     case ghdl_rtik_type_e8:
-      printf ("%s (%d)", type->en.lits[val->e8], val->e8);
+      ghw_disp_lit (type, val->e8);
       break;
     case ghdl_rtik_type_i32:
       printf ("%d", val->i32);
@@ -1582,10 +1597,14 @@
 }
 
 void
-ghw_disp_range (union ghw_range *rng)
+ghw_disp_range (union ghw_type *type, union ghw_range *rng)
 {
   switch (rng->kind)
     {
+    case ghdl_rtik_type_e8:
+      printf ("%s %s %s", ghw_get_lit (type, rng->e8.left),
+	      ghw_get_dir (rng->e8.dir), ghw_get_lit (type, rng->e8.right));
+      break;
     case ghdl_rtik_type_i32:
     case ghdl_rtik_type_p32:
       printf ("%d %s %d",
@@ -1657,7 +1676,7 @@
 	printf ("subtype %s is ", s->name);
 	ghw_disp_typename (h, s->base);
 	printf (" range ");
-	ghw_disp_range (s->rng);
+	ghw_disp_range (s->base, s->rng);
 	printf (";\n");
       }
       break;
@@ -1692,7 +1711,7 @@
 	  {
 	    if (i != 0)
 	      printf (", ");
-	    ghw_disp_range (a->rngs[i]);
+	    ghw_disp_range ((union ghw_type *)a->base, a->rngs[i]);
 	  }
 	printf (");\n");
       }
diff -urN ghdl-0.21/vhdl/grt/ghwlib.h ghdl-0.22dev/vhdl/grt/ghwlib.h
--- ghdl-0.21/vhdl/grt/ghwlib.h	2005-12-07 06:27:09.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/ghwlib.h	2005-12-20 16:18:50.000000000 +0100
@@ -390,7 +390,8 @@
 
 const char *ghw_get_dir (int is_downto);
 
-void ghw_disp_range (union ghw_range *rng);
+/* Note: TYPE must be a base type (used only to display literals).  */
+void ghw_disp_range (union ghw_type *type, union ghw_range *rng);
 
 void ghw_disp_type (struct ghw_handler *h, union ghw_type *t);
 
diff -urN ghdl-0.21/vhdl/grt/grt-signals.adb ghdl-0.22dev/vhdl/grt/grt-signals.adb
--- ghdl-0.21/vhdl/grt/grt-signals.adb	2005-11-18 03:13:36.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/grt-signals.adb	2005-12-20 16:18:50.000000000 +0100
@@ -1095,15 +1095,6 @@
          when others =>
             Internal_Error ("ghdl_create_signal_attribute");
       end case;
---       Sig_Instance_Name := new Ghdl_Instance_Name_Type'
---         (Kind => Ghdl_Name_Signal,
---          Name => null,
---          Parent => null,
---          Brother => null,
---          Sig_Mode => Mode,
---          Sig_Kind => Kind_Signal_No,
---        Sig_Indexes => (First => Sig_Table.Last + 1, Last => Sig_Table.Last),
---          Sig_Type_Desc => Sig_Type);
       --  Note: bit and boolean are both mode_b2.
       Res := Create_Signal
         (Mode_B2, Value_Union'(Mode => Mode_B2, B2 => True),
diff -urN ghdl-0.21/vhdl/grt/grt-waves.adb ghdl-0.22dev/vhdl/grt/grt-waves.adb
--- ghdl-0.21/vhdl/grt/grt-waves.adb	2005-12-07 05:50:07.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/grt-waves.adb	2005-12-20 16:18:50.000000000 +0100
@@ -785,6 +785,15 @@
    Nbr_Scope_Signals : Natural := 0;
    Nbr_Dumped_Signals : Natural := 0;
 
+   --  This is only valid during write_hierarchy.
+   function Get_Signal_Number (Sig : Ghdl_Signal_Ptr) return Natural
+   is
+      function To_Integer_Address is new Ada.Unchecked_Conversion
+        (Ghdl_Signal_Ptr, Integer_Address);
+   begin
+      return Natural (To_Integer_Address (Sig.Alink));
+   end Get_Signal_Number;
+
    procedure Write_Signal_Number (Val_Addr : Address;
                                   Val_Name : Vstring;
                                   Val_Type : Ghdl_Rti_Access)
@@ -792,20 +801,28 @@
       pragma Unreferenced (Val_Name);
       pragma Unreferenced (Val_Type);
 
-      function To_Integer_Address is new Ada.Unchecked_Conversion
-        (Ghdl_Signal_Ptr, Integer_Address);
+      Num : Natural;
+
       function To_Ghdl_Signal_Ptr is new Ada.Unchecked_Conversion
         (Source => Integer_Address, Target => Ghdl_Signal_Ptr);
       Sig : Ghdl_Signal_Ptr;
    begin
+      --  Convert to signal.
       Sig := To_Ghdl_Signal_Ptr (To_Addr_Acc (Val_Addr).all);
-      if not Sig.Flags.Is_Dumped then
-         Sig.Flags.Is_Dumped := True;
+
+      --  Get signal number.
+      Num := Get_Signal_Number (Sig);
+
+      --  If the signal number is 0, then assign a valid signal number.
+      if Num = 0 then
          Nbr_Dumped_Signals := Nbr_Dumped_Signals + 1;
-         Sig.Flink := To_Ghdl_Signal_Ptr
+         Sig.Alink := To_Ghdl_Signal_Ptr
            (Integer_Address (Nbr_Dumped_Signals));
+         Num := Nbr_Dumped_Signals;
       end if;
-      Wave_Put_ULEB128 (Ghdl_E32 (To_Integer_Address (Sig.Flink)));
+
+      --  Do the real job: write the signal number.
+      Wave_Put_ULEB128 (Ghdl_E32 (Num));
    end Write_Signal_Number;
 
    procedure Foreach_Scalar_Signal_Number is new
@@ -1370,13 +1387,18 @@
       Table_Initial => 32,
       Table_Increment => 100);
 
+   function Get_Dump_Entry (N : Natural) return Ghdl_Signal_Ptr is
+   begin
+      return Dump_Table.Table (N);
+   end Get_Dump_Entry;
+
    procedure Write_Hierarchy (Root : VhpiHandleT)
    is
       N : Natural;
    begin
-      --  Check Flink is 0.
+      --  Check Alink is 0.
       for I in Sig_Table.First .. Sig_Table.Last loop
-         if Sig_Table.Table (I).Flink /= null then
+         if Sig_Table.Table (I).Alink /= null then
             Internal_Error ("wave.write_hierarchy");
          end if;
       end loop;
@@ -1393,15 +1415,20 @@
       Wave_Put_Byte (0);
 
       Dump_Table.Set_Last (Nbr_Dumped_Signals);
+      for I in Dump_Table.First .. Dump_Table.Last loop
+         Dump_Table.Table (I) := null;
+      end loop;
 
       --  Save and clear.
-      N := 0;
       for I in Sig_Table.First .. Sig_Table.Last loop
-         if Sig_Table.Table (I).Flags.Is_Dumped then
-            N := N + 1;
+         N := Get_Signal_Number (Sig_Table.Table (I));
+         if N /= 0 then
+            if Dump_Table.Table (N) /= null then
+               Internal_Error ("wave.write_hierarchy(2)");
+            end if;
             Dump_Table.Table (N) := Sig_Table.Table (I);
+            Sig_Table.Table (I).Alink := null;
          end if;
-         Sig_Table.Table (I).Flink := null;
       end loop;
    end Write_Hierarchy;
 
diff -urN ghdl-0.21/vhdl/version.ads ghdl-0.22dev/vhdl/version.ads
--- ghdl-0.21/vhdl/version.ads	2005-12-18 14:07:38.000000000 +0100
+++ ghdl-0.22dev/vhdl/version.ads	2005-12-20 16:18:55.000000000 +0100
@@ -1,4 +1,4 @@
 package Version is
    Ghdl_Version : constant String :=
-      "GHDL 0.21 (20051218) [Sokcho edition]";
+      "GHDL 0.22dev (20051220) [Sokcho edition]";
 end Version;


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/FC-4/ghdl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ghdl.spec	18 Dec 2005 23:06:54 -0000	1.5
+++ ghdl.spec	20 Dec 2005 23:19:06 -0000	1.6
@@ -3,8 +3,8 @@
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
-Version: 0.21
-Release: 1%{?dist}
+Version: 0.22
+Release: 0.38svn.0%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -14,7 +14,7 @@
 # ./dist.sh sources
 Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
-Patch0: ghdl-0.21-infodirentry.patch
+Patch0: ghdl-svn38.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo
 Requires(post): /sbin/install-info
@@ -52,9 +52,9 @@
 %prep
 %setup -q -n gcc-%{gccver} -T -b 1 -a 0
 pushd ghdl-%{ghdlver}
+%patch0 -p1
 %{__mv} vhdl ../gcc/
 popd
-%patch0 -p0
 
 %build
 %{__mkdir} obj-%{gcc_target_platform}
@@ -215,6 +215,9 @@
 %{_libexecdir}/gcc/
 
 %changelog
+* 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
 


--- ghdl-0.21-infodirentry.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 20 23:36:16 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 20 Dec 2005 18:36:16 -0500
Subject: rpms/plt-scheme/devel plt-scheme.spec, 1.19, 1.20 plt-xft.patch, 1.1,
	NONE
Message-ID: <200512202336.jBKNamON029872@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29855

Modified Files:
	plt-scheme.spec 
Removed Files:
	plt-xft.patch 
Log Message:



Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plt-scheme.spec	19 Dec 2005 21:28:40 -0000	1.19
+++ plt-scheme.spec	20 Dec 2005 23:36:16 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           plt-scheme
 Version:        300
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
@@ -9,7 +9,6 @@
 Source:		http://download.plt-scheme.org/bundles/300/plt/plt-300-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
-Patch1:		plt-xft.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
@@ -62,7 +61,6 @@
 %ifarch x86_64
 %patch0 -p1
 %endif
-%patch1 -p1
 
 
 %build
@@ -142,6 +140,9 @@
 
 
 %changelog
+* Wed Dec 21 2005 Gerard Milmeister  - 300-2
+- xft patch no longer necessary
+
 * Mon Dec 19 2005 Gerard Milmeister  - 300-1
 - New Version 300
 


--- plt-xft.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 06:30:53 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 01:30:53 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.11,1.12
Message-ID: <200512210631.jBL6VPCg009946@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9896/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Upgraded to 1.11.1.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nethack-vultures.spec	15 Dec 2005 23:49:02 -0000	1.11
+++ nethack-vultures.spec	21 Dec 2005 06:30:52 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.0
-Release:        8%{?dist}
+Version:        1.11.1
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 20 2005 Karen Pease  - 1.11.1-1
+- Upgraded source package; fixes some keyboard bugs and problems for 64bit/big endian machines concerning transparency.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-8
 - Forgot to relocate moved docs for postbuild.
 
@@ -180,15 +183,15 @@
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-3
 - Didn't quite get that patch right.
 
-* Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-2
 - Forgot to update the patches previously; done.
 
-* Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-1
 - Upgraded the tarball to the latest release
 - Upped the version
 - Removed a patch that's now part of the source
 
-* Mon Nov 21 2005 Karen Pease  - 1.10.1-1%{?dist}
+* Mon Nov 21 2005 Karen Pease  - 1.10.1-1
 - Made it so I don't have to manually tinker with revisions between dists
 - Using a 1.x release
 - Removed excess tarball



From fedora-extras-commits at redhat.com  Wed Dec 21 06:30:59 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 01:30:59 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.12,1.13
Message-ID: <200512210631.jBL6VWCn009949@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-serv9896/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Upgraded to 1.11.1.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nethack-vultures.spec	15 Dec 2005 23:49:07 -0000	1.12
+++ nethack-vultures.spec	21 Dec 2005 06:30:59 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.0
-Release:        8%{?dist}
+Version:        1.11.1
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 20 2005 Karen Pease  - 1.11.1-1
+- Upgraded source package; fixes some keyboard bugs and problems for 64bit/big endian machines concerning transparency.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-8
 - Forgot to relocate moved docs for postbuild.
 
@@ -183,15 +186,15 @@
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-3
 - Didn't quite get that patch right.
 
-* Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-2
 - Forgot to update the patches previously; done.
 
-* Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-1
 - Upgraded the tarball to the latest release
 - Upped the version
 - Removed a patch that's now part of the source
 
-* Mon Nov 21 2005 Karen Pease  - 1.10.1-1%{?dist}
+* Mon Nov 21 2005 Karen Pease  - 1.10.1-1
 - Made it so I don't have to manually tinker with revisions between dists
 - Using a 1.x release
 - Removed excess tarball



From fedora-extras-commits at redhat.com  Wed Dec 21 06:31:05 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 01:31:05 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.11,1.12
Message-ID: <200512210631.jBL6VcqQ009952@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9896/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Upgraded to 1.11.1.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nethack-vultures.spec	15 Dec 2005 23:49:13 -0000	1.11
+++ nethack-vultures.spec	21 Dec 2005 06:31:05 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.0
-Release:        8%{?dist}
+Version:        1.11.1
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 20 2005 Karen Pease  - 1.11.1-1
+- Upgraded source package; fixes some keyboard bugs and problems for 64bit/big endian machines concerning transparency.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-8
 - Forgot to relocate moved docs for postbuild.
 
@@ -183,15 +186,15 @@
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-3
 - Didn't quite get that patch right.
 
-* Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-2
 - Forgot to update the patches previously; done.
 
-* Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-1
 - Upgraded the tarball to the latest release
 - Upped the version
 - Removed a patch that's now part of the source
 
-* Mon Nov 21 2005 Karen Pease  - 1.10.1-1%{?dist}
+* Mon Nov 21 2005 Karen Pease  - 1.10.1-1
 - Made it so I don't have to manually tinker with revisions between dists
 - Using a 1.x release
 - Removed excess tarball



From fedora-extras-commits at redhat.com  Wed Dec 21 07:23:31 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 02:23:31 -0500
Subject: rpms/cernlib/devel cernlib.spec,1.12,1.13
Message-ID: <200512210724.jBL7O3Ef011718@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
create dir before making link



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cernlib.spec	20 Dec 2005 22:53:23 -0000	1.12
+++ cernlib.spec	21 Dec 2005 07:23:31 -0000	1.13
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}
+Release:       11%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -601,6 +601,11 @@
 %{__install} -m644 src/cfortran/*.h $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/
 
 %{__install} -m755 bin/* $RPM_BUILD_ROOT%{_bindir}/
+
+# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
+%{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/
+%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
 (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
@@ -616,9 +621,6 @@
 %{__ln_s} gxint321.f gxint.f
 popd
 
-# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
-%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
-
 cd src
 # install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
@@ -647,6 +649,7 @@
 %dir %{_libdir}/cernlib/
 %dir %{_libdir}/cernlib/%{version}
 %dir %{_libdir}/cernlib/%{version}/lib
+%dir %{_libdir}/cernlib/%{version}/bin
 %{_libdir}/cernlib/%{version}/lib/*.so.*
 %{_datadir}/cernlib/
 %doc cernlib.README copyright
@@ -676,6 +679,7 @@
 %{_bindir}/paw++
 %{_bindir}/paw
 %{_bindir}/pawX11
+%dir %{_libdir}/cernlib/%{version}/bin
 %{_libdir}/cernlib/%{version}/bin/pawX11
 %doc paw.README 
 
@@ -707,7 +711,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.1
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Wed Dec 21 07:23:58 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 02:23:58 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.19,1.20
Message-ID: <200512210724.jBL7OVrG011756@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
create dir before making link



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- cernlib.spec	20 Dec 2005 22:52:11 -0000	1.19
+++ cernlib.spec	21 Dec 2005 07:23:58 -0000	1.20
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}
+Release:       11%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -599,6 +599,11 @@
 %{__install} -m644 src/cfortran/*.h $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/
 
 %{__install} -m755 bin/* $RPM_BUILD_ROOT%{_bindir}/
+
+# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
+%{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/
+%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
 (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
@@ -614,9 +619,6 @@
 %{__ln_s} gxint321.f gxint.f
 popd
 
-# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
-%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
-
 cd src
 # install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
@@ -645,6 +647,7 @@
 %dir %{_libdir}/cernlib/
 %dir %{_libdir}/cernlib/%{version}
 %dir %{_libdir}/cernlib/%{version}/lib
+%dir %{_libdir}/cernlib/%{version}/bin
 %{_libdir}/cernlib/%{version}/lib/*.so.*
 %{_datadir}/cernlib/
 %doc cernlib.README copyright
@@ -674,6 +677,7 @@
 %{_bindir}/paw++
 %{_bindir}/paw
 %{_bindir}/pawX11
+%dir %{_libdir}/cernlib/%{version}/bin
 %{_libdir}/cernlib/%{version}/bin/pawX11
 %doc paw.README 
 
@@ -705,7 +709,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.1
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Wed Dec 21 07:26:01 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 02:26:01 -0500
Subject: rpms/cernlib/FC-3 cernlib.spec,1.14,1.15
Message-ID: <200512210726.jBL7QXSx011826@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
create dir before making link



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cernlib.spec	20 Dec 2005 22:50:50 -0000	1.14
+++ cernlib.spec	21 Dec 2005 07:26:00 -0000	1.15
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}
+Release:       11%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -598,6 +598,11 @@
 %{__install} -m644 src/cfortran/*.h $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/
 
 %{__install} -m755 bin/* $RPM_BUILD_ROOT%{_bindir}/
+
+# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
+%{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/
+%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
 (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
@@ -613,9 +618,6 @@
 %{__ln_s} gxint321.f gxint.f
 popd
 
-# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
-%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
-
 cd src
 # install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
@@ -644,6 +646,7 @@
 %dir %{_libdir}/cernlib/
 %dir %{_libdir}/cernlib/%{version}
 %dir %{_libdir}/cernlib/%{version}/lib
+%dir %{_libdir}/cernlib/%{version}/bin
 %{_libdir}/cernlib/%{version}/lib/*.so.*
 %{_datadir}/cernlib/
 %doc cernlib.README copyright
@@ -673,6 +676,7 @@
 %{_bindir}/paw++
 %{_bindir}/paw
 %{_bindir}/pawX11
+%dir %{_libdir}/cernlib/%{version}/bin
 %{_libdir}/cernlib/%{version}/bin/pawX11
 %doc paw.README 
 
@@ -704,7 +708,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.1
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Wed Dec 21 07:45:00 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 02:45:00 -0500
Subject: rpms/grads/devel grads.spec,1.2,1.3
Message-ID: <200512210745.jBL7jXKk011922@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	grads.spec 
Log Message:
* Wed Dec 21 2005 Patrice Dumas  1.9b4-5
- don't build the hdf interface on ppc, there is no hdf package



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grads.spec	20 Dec 2005 12:26:19 -0000	1.2
+++ grads.spec	21 Dec 2005 07:45:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -27,7 +27,11 @@
 Patch2:         grads-conditionnal_lats.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  hdf-devel udunits-devel netcdf-devel 
+# no hdf on ppc
+%ifnarch ppc
+BuildRequires:  hdf-devel 
+%endif
+BuildRequires:  udunits-devel netcdf-devel 
 #BuildRequires:  opendap-devel
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
@@ -100,6 +104,9 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Wed Dec 21 2005 Patrice Dumas  1.9b4-5
+- don't build the hdf interface on ppc, there is no hdf package
+
 * Tue Dec 13 2005 Patrice Dumas  1.9b4-4
 - simplify handling of data, as they are in the tarball
 



From fedora-extras-commits at redhat.com  Wed Dec 21 08:02:35 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 03:02:35 -0500
Subject: rpms/grads/devel grads.spec,1.3,1.4
Message-ID: <200512210803.jBL83AkK013647@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	grads.spec 
Log Message:
without hdf (on ppc) there is no gradshdf built



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grads.spec	21 Dec 2005 07:45:00 -0000	1.3
+++ grads.spec	21 Dec 2005 08:02:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        5%{?dist}
+Release:        5%{?dist}.1
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -69,6 +69,7 @@
 
 %build
 ./bootstrap
+# pass the -L and -I flags for hdf on ppc even though there is no hdf
 %configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
@@ -90,7 +91,9 @@
 %{_bindir}/bufrscan
 %{_bindir}/gradsc
 %{_bindir}/gradsdods
+%ifnarch ppc
 %{_bindir}/gradshdf
+%endif
 %{_bindir}/gradsnc
 %{_bindir}/gribmap
 %{_bindir}/gribscan
@@ -104,7 +107,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Wed Dec 21 2005 Patrice Dumas  1.9b4-5
+* Wed Dec 21 2005 Patrice Dumas  1.9b4-5.1
 - don't build the hdf interface on ppc, there is no hdf package
 
 * Tue Dec 13 2005 Patrice Dumas  1.9b4-4



From fedora-extras-commits at redhat.com  Wed Dec 21 08:08:32 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 03:08:32 -0500
Subject: rpms/cernlib/devel cernlib.spec,1.13,1.14
Message-ID: <200512210809.jBL896VL013735@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
don't point link to buildroot


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cernlib.spec	21 Dec 2005 07:23:31 -0000	1.13
+++ cernlib.spec	21 Dec 2005 08:08:31 -0000	1.14
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.1
+Release:       11%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -604,7 +604,7 @@
 
 # add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/
-%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+%{__ln_s} %{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
 
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
@@ -711,7 +711,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11.1
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.2
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Wed Dec 21 08:08:59 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 03:08:59 -0500
Subject: rpms/cernlib/FC-3 cernlib.spec,1.15,1.16
Message-ID: <200512210809.jBL89Vj7013753@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
don't point link to buildroot


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cernlib.spec	21 Dec 2005 07:26:00 -0000	1.15
+++ cernlib.spec	21 Dec 2005 08:08:59 -0000	1.16
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.1
+Release:       11%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -601,7 +601,7 @@
 
 # add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/
-%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+%{__ln_s} %{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
 
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
@@ -708,7 +708,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11.1
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.2
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Wed Dec 21 08:09:34 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed, 21 Dec 2005 03:09:34 -0500
Subject: rpms/irssi/devel .cvsignore, 1.4, 1.5 irssi.spec, 1.11, 1.12 sources,
	1.4, 1.5 convert-replace-trigger.pl, 1.1,
	NONE convert-replace-trigger.pl-fixpath-patch, 1.1,
	NONE replace.pl, 1.1, NONE trigger.pl, 1.1, NONE
Message-ID: <200512210810.jBL8AbFo013835@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	.cvsignore irssi.spec sources 
Removed Files:
	convert-replace-trigger.pl 
	convert-replace-trigger.pl-fixpath-patch replace.pl trigger.pl 
Log Message:
irssi: updated to 0.8.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Dec 2005 08:22:00 -0000	1.4
+++ .cvsignore	21 Dec 2005 08:09:33 -0000	1.5
@@ -1 +1,2 @@
 irssi-0.8.10-rc8.tar.gz
+irssi-0.8.10.tar.bz2


Index: irssi.spec
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- irssi.spec	7 Dec 2005 08:22:00 -0000	1.11
+++ irssi.spec	21 Dec 2005 08:09:33 -0000	1.12
@@ -1,20 +1,14 @@
 %define		perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
-%define		release_candidate	rc8
-
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.10
-Release:	0.2.%{release_candidate}%{?dist}
+Release:	1%{?dist}
 
 License:	GPL
 Group:		Applications/Communications
 URL:		http://irssi.org/
-Source0:	http://irssi.org/files/irssi-%{version}-%{release_candidate}.tar.gz
-Source1:	http://wouter.coekaerts.be/irssi/scripts/replace.pl
-Source2:	http://wouter.coekaerts.be/irssi/scripts/trigger.pl
-Source3:	http://wouter.coekaerts.be/irssi/scripts/convert-replace-trigger.pl
-Patch1:		convert-replace-trigger.pl-fixpath-patch
+Source0:	http://irssi.org/files/irssi-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel openssl-devel zlib-devel 
 BuildRequires:	pkgconfig gc-devel glib2-devel
@@ -40,9 +34,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{release_candidate}
-install -m 0644 %{SOURCE3} .
-%patch1 -p0
+%setup -q -n %{name}-%{version}
 
 %build
 %configure --enable-ipv6 --with-textui	\
@@ -57,10 +49,6 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
-# Extra script
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
-
 # Clean up
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a
 rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
@@ -77,7 +65,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README TODO convert-replace-trigger.pl
+%doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README TODO
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %{_bindir}/%{name}
 %{_bindir}/botti
@@ -93,6 +81,9 @@
 %{_includedir}/irssi
 
 %changelog
+* Sun Dec 11 2005 Dams  - 0.8.10-1
+- Updated to final 0.8.10
+
 * Wed Dec  7 2005 Dams  - 0.8.10-0.2.rc8
 - Updated to rc8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Dec 2005 08:22:00 -0000	1.4
+++ sources	21 Dec 2005 08:09:33 -0000	1.5
@@ -1 +1,2 @@
 b51befaeca9ce3a763ee994096d4a387  irssi-0.8.10-rc8.tar.gz
+4b83d4047670eb75bd14ae1bdd68dc38  irssi-0.8.10.tar.bz2


--- convert-replace-trigger.pl DELETED ---


--- convert-replace-trigger.pl-fixpath-patch DELETED ---


--- replace.pl DELETED ---


--- trigger.pl DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 08:11:26 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 03:11:26 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.20,1.21
Message-ID: <200512210811.jBL8BxQM013905@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
don't point link to buildroot


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cernlib.spec	21 Dec 2005 07:23:58 -0000	1.20
+++ cernlib.spec	21 Dec 2005 08:11:26 -0000	1.21
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.1
+Release:       11%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -602,7 +602,7 @@
 
 # add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/
-%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+%{__ln_s} %{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
 
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
@@ -709,7 +709,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11.1
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.2
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Wed Dec 21 08:13:45 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed, 21 Dec 2005 03:13:45 -0500
Subject: rpms/irssi/FC-4 .cvsignore, 1.3, 1.4 irssi.spec, 1.9, 1.10 sources, 
	1.3, 1.4 convert-replace-trigger.pl, 1.1,
	NONE convert-replace-trigger.pl-fixpath-patch, 1.1,
	NONE replace.pl, 1.1, NONE trigger.pl, 1.1, NONE
Message-ID: <200512210814.jBL8EIP4014021@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	.cvsignore irssi.spec sources 
Removed Files:
	convert-replace-trigger.pl 
	convert-replace-trigger.pl-fixpath-patch replace.pl trigger.pl 
Log Message:
irssi: updated to 0.8.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/irssi/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Dec 2005 08:25:51 -0000	1.3
+++ .cvsignore	21 Dec 2005 08:13:45 -0000	1.4
@@ -1 +1 @@
-irssi-0.8.10-rc8.tar.gz
+irssi-0.8.10.tar.bz2


Index: irssi.spec
===================================================================
RCS file: /cvs/extras/rpms/irssi/FC-4/irssi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- irssi.spec	7 Dec 2005 08:25:51 -0000	1.9
+++ irssi.spec	21 Dec 2005 08:13:45 -0000	1.10
@@ -1,20 +1,14 @@
 %define		perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
-%define		release_candidate	rc8
-
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.10
-Release:	0.2.%{release_candidate}%{?dist}
+Release:	1%{?dist}
 
 License:	GPL
 Group:		Applications/Communications
 URL:		http://irssi.org/
-Source0:	http://irssi.org/files/irssi-%{version}-%{release_candidate}.tar.gz
-Source1:	http://wouter.coekaerts.be/irssi/scripts/replace.pl
-Source2:	http://wouter.coekaerts.be/irssi/scripts/trigger.pl
-Source3:	http://wouter.coekaerts.be/irssi/scripts/convert-replace-trigger.pl
-Patch1:		convert-replace-trigger.pl-fixpath-patch
+Source0:	http://irssi.org/files/irssi-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel openssl-devel zlib-devel 
 BuildRequires:	pkgconfig gc-devel glib2-devel
@@ -40,9 +34,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{release_candidate}
-install -m 0644 %{SOURCE3} .
-%patch1 -p0
+%setup -q -n %{name}-%{version}
 
 %build
 %configure --enable-ipv6 --with-textui	\
@@ -57,10 +49,6 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
-# Extra script
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
-
 # Clean up
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a
 rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
@@ -77,7 +65,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README TODO convert-replace-trigger.pl
+%doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README TODO
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %{_bindir}/%{name}
 %{_bindir}/botti
@@ -93,6 +81,9 @@
 %{_includedir}/irssi
 
 %changelog
+* Sun Dec 11 2005 Dams  - 0.8.10-1
+- Updated to final 0.8.10
+
 * Wed Dec  7 2005 Dams  - 0.8.10-0.2.rc8
 - Updated to rc8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/irssi/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Dec 2005 08:25:51 -0000	1.3
+++ sources	21 Dec 2005 08:13:45 -0000	1.4
@@ -1 +1 @@
-b51befaeca9ce3a763ee994096d4a387  irssi-0.8.10-rc8.tar.gz
+4b83d4047670eb75bd14ae1bdd68dc38  irssi-0.8.10.tar.bz2


--- convert-replace-trigger.pl DELETED ---


--- convert-replace-trigger.pl-fixpath-patch DELETED ---


--- replace.pl DELETED ---


--- trigger.pl DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 08:15:03 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed, 21 Dec 2005 03:15:03 -0500
Subject: rpms/irssi/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200512210815.jBL8FZSX014058@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	.cvsignore sources 
Log Message:
irssi/devel: cleanup in sources/cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 08:09:33 -0000	1.5
+++ .cvsignore	21 Dec 2005 08:15:03 -0000	1.6
@@ -1,2 +1 @@
-irssi-0.8.10-rc8.tar.gz
 irssi-0.8.10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2005 08:09:33 -0000	1.5
+++ sources	21 Dec 2005 08:15:03 -0000	1.6
@@ -1,2 +1 @@
-b51befaeca9ce3a763ee994096d4a387  irssi-0.8.10-rc8.tar.gz
 4b83d4047670eb75bd14ae1bdd68dc38  irssi-0.8.10.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 21 08:18:01 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 03:18:01 -0500
Subject: rpms/cppunit/devel .cvsignore, 1.2, 1.3 cppunit.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200512210818.jBL8IXvb014183@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	.cvsignore cppunit.spec sources 
Log Message:
* Wed Dec 21 2005 Patrice Dumas  1.11.4-1
- update



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Sep 2005 14:30:04 -0000	1.2
+++ .cvsignore	21 Dec 2005 08:18:00 -0000	1.3
@@ -1 +1 @@
-cppunit-1.11.0.tar.gz
+cppunit-1.11.4.tar.gz


Index: cppunit.spec
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/cppunit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cppunit.spec	11 Sep 2005 16:31:46 -0000	1.2
+++ cppunit.spec	21 Dec 2005 08:18:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name: cppunit
-Version: 1.11.0
-Release: 2%{?dist}
+Version: 1.11.4
+Release: 1%{?dist}
 
 Summary: C++ unit testing framework
 License: LGPL
@@ -74,6 +74,9 @@
 %doc doc/html/*
 
 %changelog
+* Wed Dec 21 2005 Patrice Dumas  1.11.4-1
+- update
+
 * Mon Aug 15 2005 Tom "spot" Callaway  1.11.0-2
 - various cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Sep 2005 14:30:04 -0000	1.2
+++ sources	21 Dec 2005 08:18:01 -0000	1.3
@@ -1 +1 @@
-7b256f622158d3c932b3c5025ef5e2ed  cppunit-1.11.0.tar.gz
+6f24440c2a580b4a98f34af09e385933  cppunit-1.11.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 21 08:20:30 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 21 Dec 2005 03:20:30 -0500
Subject: rpms/perl-DBIx-DBSchema/devel DBIx-DBSchema-0.28-version.diff, NONE,
	1.1
Message-ID: <200512210820.jBL8KWXd014253@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14240/devel

Added Files:
	DBIx-DBSchema-0.28-version.diff 
Log Message:
New.

DBIx-DBSchema-0.28-version.diff:

--- NEW FILE DBIx-DBSchema-0.28-version.diff ---
--- DBIx-DBSchema-0.28.orig/DBSchema/DBD/Pg.pm	2005-04-07 10:14:52.000000000 +0200
+++ DBIx-DBSchema-0.28/DBSchema/DBD/Pg.pm	2005-12-21 08:30:23.000000000 +0100
@@ -2,13 +2,14 @@
 
 use strict;
 use vars qw($VERSION @ISA %typemap);
+$VERSION = '0.10';
+
 use DBD::Pg 1.32;
 die "DBD::Pg version 1.32 or 1.41 (or later) required--".
     "this is only version $DBD::Pg::VERSION\n"
   if $DBD::Pg::VERSION != 1.32 && $DBD::Pg::VERSION < 1.41;
 use DBIx::DBSchema::DBD;
 
-$VERSION = '0.10';
 @ISA = qw(DBIx::DBSchema::DBD);
 
 %typemap = (



From fedora-extras-commits at redhat.com  Wed Dec 21 08:20:36 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 21 Dec 2005 03:20:36 -0500
Subject: rpms/perl-DBIx-DBSchema/FC-4 DBIx-DBSchema-0.28-version.diff, NONE, 
	1.1
Message-ID: <200512210820.jBL8KciY014271@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14240/FC-4

Added Files:
	DBIx-DBSchema-0.28-version.diff 
Log Message:
New.

DBIx-DBSchema-0.28-version.diff:

--- NEW FILE DBIx-DBSchema-0.28-version.diff ---
--- DBIx-DBSchema-0.28.orig/DBSchema/DBD/Pg.pm	2005-04-07 10:14:52.000000000 +0200
+++ DBIx-DBSchema-0.28/DBSchema/DBD/Pg.pm	2005-12-21 08:30:23.000000000 +0100
@@ -2,13 +2,14 @@
 
 use strict;
 use vars qw($VERSION @ISA %typemap);
+$VERSION = '0.10';
+
 use DBD::Pg 1.32;
 die "DBD::Pg version 1.32 or 1.41 (or later) required--".
     "this is only version $DBD::Pg::VERSION\n"
   if $DBD::Pg::VERSION != 1.32 && $DBD::Pg::VERSION < 1.41;
 use DBIx::DBSchema::DBD;
 
-$VERSION = '0.10';
 @ISA = qw(DBIx::DBSchema::DBD);
 
 %typemap = (



From fedora-extras-commits at redhat.com  Wed Dec 21 08:21:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 21 Dec 2005 03:21:45 -0500
Subject: rpms/perl-DBIx-DBSchema/devel perl-DBIx-DBSchema.spec,1.3,1.4
Message-ID: <200512210822.jBL8MH63014319@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14287/devel

Modified Files:
	perl-DBIx-DBSchema.spec 
Log Message:
Add workaround to #175468


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/devel/perl-DBIx-DBSchema.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-DBIx-DBSchema.spec	5 Dec 2005 14:32:58 -0000	1.3
+++ perl-DBIx-DBSchema.spec	21 Dec 2005 08:21:45 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           perl-DBIx-DBSchema
 Version:        0.28
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Database-independent schema objects
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/DBIx-DBSchema/
 Source0:        http://search.cpan.org/CPAN/authors/id/I/IV/IVAN/DBIx-DBSchema-%{version}.tar.gz
+Patch0:         DBIx-DBSchema-0.28-version.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q -n DBIx-DBSchema-%{version}
+%patch0 -p1
 chmod -x README Changes
 find -name '*.pm' -exec chmod -x {} \;
 
@@ -63,6 +65,9 @@
 
 
 %changelog
+* Wed Dec 21 2005  Ralf Cors??pius  - 0.28-2
+- Apply work around to CPAN incompatibility (PR #175468, J.V. Dias).
+
 * Mon Dec 05 2005  Ralf Cors??pius  - 0.28-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Wed Dec 21 08:21:51 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 21 Dec 2005 03:21:51 -0500
Subject: rpms/perl-DBIx-DBSchema/FC-4 perl-DBIx-DBSchema.spec,1.3,1.4
Message-ID: <200512210822.jBL8MQr3014322@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14287/FC-4

Modified Files:
	perl-DBIx-DBSchema.spec 
Log Message:
Add workaround to #175468


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4/perl-DBIx-DBSchema.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-DBIx-DBSchema.spec	5 Dec 2005 14:37:49 -0000	1.3
+++ perl-DBIx-DBSchema.spec	21 Dec 2005 08:21:51 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           perl-DBIx-DBSchema
 Version:        0.28
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Database-independent schema objects
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/DBIx-DBSchema/
 Source0:        http://search.cpan.org/CPAN/authors/id/I/IV/IVAN/DBIx-DBSchema-%{version}.tar.gz
+Patch0:         DBIx-DBSchema-0.28-version.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q -n DBIx-DBSchema-%{version}
+%patch0 -p1
 chmod -x README Changes
 find -name '*.pm' -exec chmod -x {} \;
 
@@ -63,6 +65,9 @@
 
 
 %changelog
+* Wed Dec 21 2005  Ralf Cors??pius  - 0.28-2
+- Apply work around to CPAN incompatibility (PR #175468, J.V. Dias).
+
 * Mon Dec 05 2005  Ralf Cors??pius  - 0.28-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Wed Dec 21 08:30:03 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 21 Dec 2005 03:30:03 -0500
Subject: rpms/perl-Params-Util/devel .cvsignore, 1.4,
	1.5 perl-Params-Util.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200512210830.jBL8UZAG014457@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14433

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Oct 2005 02:19:45 -0000	1.4
+++ .cvsignore	21 Dec 2005 08:30:03 -0000	1.5
@@ -1 +1 @@
-Params-Util-0.07.tar.gz
+Params-Util-0.08.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Params-Util.spec	12 Oct 2005 02:19:45 -0000	1.3
+++ perl-Params-Util.spec	21 Dec 2005 08:30:03 -0000	1.4
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.07
+Version: 	0.08
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,15 +49,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Oct 12 2005 Ralf Corsepius  - 0.07-1
+* Wed Dec 21 2005 Ralf Cors??pius  - 0.08-1
 - Upstream update.
 
-* Fri Oct 07 2005 Ralf Corsepius  - 0.06-1
+* Wed Oct 12 2005 Ralf Corsepius  - 0.07-1
 - Upstream update.
-- Remove BR perl(ExtUtils::AutoInstall), not required anymore.
-
-* Tue Sep 14 2005 Ralf Corsepius  - 0.05-2
-- Add BR: perl(ExtUtils::AutoInstall) and core deps.
-
-* Tue Sep 14 2005 Ralf Corsepius  - 0.05-1
-- Initial version.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Oct 2005 02:19:45 -0000	1.4
+++ sources	21 Dec 2005 08:30:03 -0000	1.5
@@ -1 +1 @@
-c79bec91e1818b0797935f95f5b2259b  Params-Util-0.07.tar.gz
+f67b9a6361526901e33a47a45719a61b  Params-Util-0.08.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 21 08:31:26 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 21 Dec 2005 03:31:26 -0500
Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.4,
	1.5 perl-Params-Util.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200512210831.jBL8VxUj014531@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14510

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Oct 2005 02:19:44 -0000	1.4
+++ .cvsignore	21 Dec 2005 08:31:26 -0000	1.5
@@ -1 +1 @@
-Params-Util-0.07.tar.gz
+Params-Util-0.08.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Params-Util.spec	12 Oct 2005 02:19:44 -0000	1.3
+++ perl-Params-Util.spec	21 Dec 2005 08:31:26 -0000	1.4
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.07
+Version: 	0.08
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,15 +49,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Oct 12 2005 Ralf Corsepius  - 0.07-1
+* Wed Dec 21 2005 Ralf Cors??pius  - 0.08-1
 - Upstream update.
 
-* Fri Oct 07 2005 Ralf Corsepius  - 0.06-1
+* Wed Oct 12 2005 Ralf Corsepius  - 0.07-1
 - Upstream update.
-- Remove BR perl(ExtUtils::AutoInstall), not required anymore.
-
-* Tue Sep 14 2005 Ralf Corsepius  - 0.05-2
-- Add BR: perl(ExtUtils::AutoInstall) and core deps.
-
-* Tue Sep 14 2005 Ralf Corsepius  - 0.05-1
-- Initial version.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Oct 2005 02:19:44 -0000	1.4
+++ sources	21 Dec 2005 08:31:26 -0000	1.5
@@ -1 +1 @@
-c79bec91e1818b0797935f95f5b2259b  Params-Util-0.07.tar.gz
+f67b9a6361526901e33a47a45719a61b  Params-Util-0.08.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 21 08:33:14 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 21 Dec 2005 03:33:14 -0500
Subject: rpms/perl-Params-Util/FC-3 .cvsignore, 1.4,
	1.5 perl-Params-Util.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200512210833.jBL8Xl0a014617@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14594

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Oct 2005 02:19:43 -0000	1.4
+++ .cvsignore	21 Dec 2005 08:33:14 -0000	1.5
@@ -1 +1 @@
-Params-Util-0.07.tar.gz
+Params-Util-0.08.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/perl-Params-Util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Params-Util.spec	12 Oct 2005 02:19:43 -0000	1.3
+++ perl-Params-Util.spec	21 Dec 2005 08:33:14 -0000	1.4
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.07
+Version: 	0.08
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,15 +49,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Oct 12 2005 Ralf Corsepius  - 0.07-1
+* Wed Dec 21 2005 Ralf Cors??pius  - 0.08-1
 - Upstream update.
 
-* Fri Oct 07 2005 Ralf Corsepius  - 0.06-1
+* Wed Oct 12 2005 Ralf Corsepius  - 0.07-1
 - Upstream update.
-- Remove BR perl(ExtUtils::AutoInstall), not required anymore.
-
-* Tue Sep 14 2005 Ralf Corsepius  - 0.05-2
-- Add BR: perl(ExtUtils::AutoInstall) and core deps.
-
-* Tue Sep 14 2005 Ralf Corsepius  - 0.05-1
-- Initial version.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Oct 2005 02:19:43 -0000	1.4
+++ sources	21 Dec 2005 08:33:14 -0000	1.5
@@ -1 +1 @@
-c79bec91e1818b0797935f95f5b2259b  Params-Util-0.07.tar.gz
+f67b9a6361526901e33a47a45719a61b  Params-Util-0.08.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 21 08:38:31 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 21 Dec 2005 03:38:31 -0500
Subject: fedora-security/audit fc5,1.22,1.23
Message-ID: <200512210839.jBL8d1hA014697@cvs-int.fedora.redhat.com>

Author: mjc

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

Modified Files:
	fc5 
Log Message:
This file is currently against FC5-test1 which is vulnerable to
fetchmail issue.  We'll rebase the file against FC5-test2 once released



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fc5	20 Dec 2005 22:27:22 -0000	1.22
+++ fc5	21 Dec 2005 08:38:29 -0000	1.23
@@ -12,7 +12,7 @@
 
 ** are items that need attention
 
-CVE-2005-4348 version (fetchmail, fixed 6.3.1)
+CVE-2005-4348 VULNERABLE (fetchmail, fixed 6.3.1)
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages



From fedora-extras-commits at redhat.com  Wed Dec 21 09:39:01 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 21 Dec 2005 04:39:01 -0500
Subject: rpms/paps/devel paps-0.6.2-fix-bufferoverflow.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 paps.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200512210939.jBL9dX0b017091@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	.cvsignore paps.spec sources 
Added Files:
	paps-0.6.2-fix-bufferoverflow.patch 
Log Message:
* Wed Dec 21 2005 Akira TAGOH  - 0.6.2-1
- New upstream release.
  - the bitmap font is now ignored. (#176206)
- paps-0.6.2-fix-bufferoverflow.patch: applied to fix the buffer overflow.

paps-0.6.2-fix-bufferoverflow.patch:

--- NEW FILE paps-0.6.2-fix-bufferoverflow.patch ---
diff -ruN paps-0.6.2.orig/src/libpaps.c paps-0.6.2/src/libpaps.c
--- paps-0.6.2.orig/src/libpaps.c	2005-12-21 05:31:17.000000000 +0900
+++ paps-0.6.2/src/libpaps.c	2005-12-21 18:23:40.000000000 +0900
@@ -147,11 +147,8 @@
                              void *user_data);
 static void get_next_char_id(// output
                              char *char_id);
-static void get_glyph_hash_string(FT_Face face,
-                                  PangoGlyphInfo *glyph_info,
-                                  // output
-                                  gchar *hash_string
-                                  );
+static gchar *get_glyph_hash_string(FT_Face face,
+                                    PangoGlyphInfo *glyph_info);
 
 // Fonts are three character symbols in an alphabet composing of
 // the following characters:
@@ -422,7 +419,7 @@
   double scale = 72.0 / PANGO_SCALE  / PAPS_DPI;
   double epsilon = 1e-2;
   double glyph_width = glyph_info->geometry.width * scale;
-  gchar glyph_hash_string[20];
+  gchar *glyph_hash_string;
   gchar *id;
 
   /* Output outline */
@@ -436,10 +433,8 @@
   FT_Outline_Funcs *outlinefunc;
   OutlineInfo outline_info;
 
-  get_glyph_hash_string(face,
-                        glyph_info,
-                        // output
-                        glyph_hash_string);
+  glyph_hash_string = get_glyph_hash_string(face,
+                                            glyph_info);
 
   // Look up the key in the hash table
   if (!(id = g_hash_table_lookup(paps->glyph_cache,
@@ -498,6 +493,7 @@
       FT_Done_Glyph (glyph);
 
     }
+  g_free(glyph_hash_string);
 
   if (id[0] != '*')
     {
@@ -626,13 +622,10 @@
   return char_id;
 }
 
-static void get_glyph_hash_string(FT_Face face,
-                                  PangoGlyphInfo *glyph_info,
-                                  // output
-                                  gchar *hash_string
-                                  )
+static gchar *get_glyph_hash_string(FT_Face face,
+                                    PangoGlyphInfo *glyph_info)
 {
-  sprintf(hash_string, "%08x-%d-%d",
+  return g_strdup_printf("%08x-%d-%d",
 	  (unsigned int)face,
 	  glyph_info->glyph,
 	  glyph_info->geometry.width


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Dec 2005 13:32:23 -0000	1.4
+++ .cvsignore	21 Dec 2005 09:39:00 -0000	1.5
@@ -4,3 +4,4 @@
 paps-0.3.tgz
 paps-0.5.tgz
 paps-0.6.1.tar.gz
+paps-0.6.2.tar.gz


Index: paps.spec
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- paps.spec	13 Dec 2005 13:32:24 -0000	1.3
+++ paps.spec	21 Dec 2005 09:39:00 -0000	1.4
@@ -1,13 +1,14 @@
 Name:		paps
-Version:	0.6.1
+Version:	0.6.2
 Release:	1%{?dist}
 
 License:	LGPL
 URL:		http://paps.sourceforge.net/
-Source0:	http://paps.sourceforge.net/paps-%{version}.tar.gz
+Source0:	http://prdownloads.sourceforge.net/paps/paps-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pango-devel
 Patch0:		paps-0.6.1-makefile.patch
+Patch1:		paps-0.6.2-fix-bufferoverflow.patch
 
 Summary:	Plain Text to PostScript converter
 Group:		Applications/Publishing
@@ -18,6 +19,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .makefile
+%patch1 -p1 -b .overflow
 aclocal
 automake
 autoconf
@@ -44,6 +46,11 @@
 
 
 %changelog
+* Wed Dec 21 2005 Akira TAGOH  - 0.6.2-1
+- New upstream release.
+  - the bitmap font is now ignored. (#176206)
+- paps-0.6.2-fix-bufferoverflow.patch: applied to fix the buffer overflow.
+
 * Tue Dec 13 2005 Akira TAGOH  - 0.6.1-1
 - New upstream release.
 - paps-0.6.1-makefile.patch: applied to install docs on the proper dir.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Dec 2005 13:32:24 -0000	1.4
+++ sources	21 Dec 2005 09:39:00 -0000	1.5
@@ -1 +1 @@
-9de11306b1db7c87e754b66e3328b212  paps-0.6.1.tar.gz
+06268e6796e3869275ddeec42d9cfd53  paps-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 21 10:33:41 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 05:33:41 -0500
Subject: rpms/cernlib/devel cernlib.spec,1.14,1.15
Message-ID: <200512211034.jBLAYDwc018964@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
exclude x86_64 as it leads to bus errors in f771



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cernlib.spec	21 Dec 2005 08:08:31 -0000	1.14
+++ cernlib.spec	21 Dec 2005 10:33:40 -0000	1.15
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.2
+Release:       11%{?dist}.3
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -24,6 +24,7 @@
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:   x86_64
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -711,7 +712,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11.2
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.3
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Wed Dec 21 10:51:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 21 Dec 2005 05:51:24 -0500
Subject: rpms/synergy/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 synergy.spec, 1.11, 1.12
Message-ID: <200512211051.jBLApvPb019105@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore sources synergy.spec 
Log Message:
Update to 1.2.7, now use modular X build requirements for FC >= 5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synergy/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Nov 2005 13:37:16 -0000	1.7
+++ .cvsignore	21 Dec 2005 10:51:24 -0000	1.8
@@ -1 +1 @@
-synergy-1.2.5.tar.gz
+synergy-1.2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synergy/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Nov 2005 13:37:16 -0000	1.7
+++ sources	21 Dec 2005 10:51:24 -0000	1.8
@@ -1 +1 @@
-cf1b981acd317c003357f4ecba42448b  synergy-1.2.5.tar.gz
+da9effc847d13f9725b6db043d8283a5  synergy-1.2.7.tar.gz


Index: synergy.spec
===================================================================
RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- synergy.spec	7 Nov 2005 13:37:16 -0000	1.11
+++ synergy.spec	21 Dec 2005 10:51:24 -0000	1.12
@@ -1,14 +1,20 @@
 Summary: Mouse and keyboard sharing utility
 Name: synergy
-Version: 1.2.5
+Version: 1.2.7
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://synergy2.sourceforge.net/
-Source: http://dl.sf.net/synergy2/%{name}-%{version}.tar.gz
+Source: http://dl.sf.net/synergy2/synergy-%{version}.tar.gz
 Patch: synergy-1.2.2-werror.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, xorg-x11-devel, autoconf
+BuildRequires: gcc-c++, autoconf, automake
+%if "%{fedora}" >= "5"
+BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel
+BuildRequires: libXinerama-devel
+%else
+BuildRequires: xorg-x11-devel
+%endif
 
 %description
 Synergy lets you easily share a single mouse and keyboard between
@@ -48,6 +54,11 @@
 
 
 %changelog
+* Tue Dec 20 2005 Matthias Saou  1.2.7-1
+- Update to 1.2.7.
+- Add automake build requirement (to get aclocal).
+- For %%{fedora} >= 5, buildrequire modular X packages.
+
 * Mon Nov  7 2005 Matthias Saou  1.2.5-1
 - Update to 1.2.5, -Werror patch still required.
 



From fedora-extras-commits at redhat.com  Wed Dec 21 11:08:08 2005
From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost))
Date: Wed, 21 Dec 2005 06:08:08 -0500
Subject: rpms/fpc/devel .cvsignore, 1.4, 1.5 fpc.spec, 1.4, 1.5 sources, 1.5,
	1.6 fpc-2.0.0-G5.patch, 1.1, NONE
Message-ID: <200512211108.jBLB8eDN020819@cvs-int.fedora.redhat.com>

Author: joost

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

Modified Files:
	.cvsignore fpc.spec sources 
Removed Files:
	fpc-2.0.0-G5.patch 
Log Message:
* Tue Dec 20 2005 Joost van der Sluis  2.0.2-1
- Updated to version 2.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fpc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Aug 2005 15:55:24 -0000	1.4
+++ .cvsignore	21 Dec 2005 11:07:45 -0000	1.5
@@ -1,2 +1 @@
-fpc-2.0.0.compiler.bin.tar.gz
-fpc-2.0.0.source.tar.gz
+fpcbuild-2.0.2.tar.bz2


Index: fpc.spec
===================================================================
RCS file: /cvs/extras/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fpc.spec	17 Aug 2005 16:33:51 -0000	1.4
+++ fpc.spec	21 Dec 2005 11:07:45 -0000	1.5
@@ -1,18 +1,17 @@
 Name:           fpc
-Version:        2.0.0
-Release:        4%{?dist}
+Version:        2.0.2
+Release:        1%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
 License:        GPL and modified LGPL
 URL:            http://www.freepascal.org/
-Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}-%{version}.source.tar.gz
-Source1:        http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
+Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}build-%{version}.tar.bz2
 Patch0:         %{name}-%{version}-G5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	gpm, glibc, ncurses, binutils
-BuildRequires:  tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
+BuildRequires:  fpc, tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
 
 %description
 
@@ -54,20 +53,12 @@
 %endif
 
 %prep
-%setup -q -a1 -n %{name}
+%setup -q -n %{name}-src-%{version}
 %patch0 
 
 %build
-# The source-files:
-mkdir -p fpcsrc
-cp -a rtl fpcsrc
-cp -a fcl fpcsrc
-cp -a packages fpcsrc
-rm -rf fpcsrc/packages/extra/amunits
-rm -rf fpcsrc/packages/extra/winunits
-find fpcsrc -name .cvsignore -exec rm '{}' ';'
-
-STARTPP=`pwd`/startcompiler/%{ppcname}
+cd fpcsrc
+STARTPP=%{ppcname}
 NEWPP=`pwd`/compiler/%{ppcname}
 NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
 DATA2INC=`pwd`/utils/data2inc
@@ -79,9 +70,10 @@
 make packages_extra_smart FPC=${NEWPP}
 make ide_all FPC=${NEWPP}
 make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC}
+cd ..
 export save_size=40000
 export pool_size=1250000
-make -C docs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
+make -C fpcdocs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
 
 # disable the debuginfo package
 %define debug_package %{nil}
@@ -89,6 +81,7 @@
 
 %install
 rm -rf %{buildroot}
+cd fpcsrc
 FPCMAKE=`pwd`/utils/fpcm/fpcmake
 NEWPP=`pwd`/compiler/%{ppcname}
 INSTALLOPTS="FPC=${NEWPP} FPCMAKE=${FPCMAKE} \
@@ -106,23 +99,28 @@
 make fv_distinstall ${INSTALLOPTS}
 make ide_distinstall ${INSTALLOPTS}
 make utils_distinstall ${INSTALLOPTS}
-
-make doc_install ${INSTALLOPTS}
-make -C docs pdfinstall ${INSTALLOPTS}
-make man_install ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir}
+cd ../install
+make -C doc ${INSTALLOPTS}
+make -C man ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir}
+cd ..
+make -C fpcdocs pdfinstall ${INSTALLOPTS}
 
 # create link
 ln -sf ../%{_lib}/%{name}/%{version}/%{ppcname} %{buildroot}%{_bindir}/%{ppcname}
 
-# Include the COPYING-information in the documentation
-cp -a compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
-cp -a rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
-cp -a fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl
-cp -a rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
+# Include the COPYING-information for the fcl/rtl in the documentation
+cp -a fpcsrc/compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
+cp -a fpcsrc/rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
+cp -a fpcsrc/fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl
+cp -a fpcsrc/rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
 
 # The source-files:
 mkdir -p %{buildroot}%{_datadir}/fpcsrc
-cp -a fpcsrc/* %{buildroot}%{_datadir}/fpcsrc/
+rm -rf fpcsrc/packages/extra/amunits
+rm -rf fpcsrc/packages/extra/winunits
+cp -a fpcsrc/rtl %{buildroot}%{_datadir}/fpcsrc
+cp -a fpcsrc/fcl %{buildroot}%{_datadir}/fpcsrc
+cp -a fpcsrc/packages %{buildroot}%{_datadir}/fpcsrc
 
 # Workaround:
 # newer rpm versions do not allow garbage
@@ -158,6 +156,9 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-1
+- Updated to version 2.0.2
+
 * Wed Aug 17 2005 Joost van der Sluis  2.0.0-4
 - Added %%{?dist} to release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fpc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Aug 2005 15:55:24 -0000	1.5
+++ sources	21 Dec 2005 11:07:45 -0000	1.6
@@ -1,2 +1 @@
-fd5730c59bb5a87e5828568b7d039cb5  fpc-2.0.0.compiler.bin.tar.gz
-3f9c64d0146a3631f6963fd7477776d1  fpc-2.0.0.source.tar.gz
+b88893bc005c4404197ae55ef3c0de30  fpcbuild-2.0.2.tar.bz2


--- fpc-2.0.0-G5.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 11:16:51 2005
From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost))
Date: Wed, 21 Dec 2005 06:16:51 -0500
Subject: rpms/fpc/devel fpc-2.0.2-G5.patch,NONE,1.1 fpc.spec,1.5,1.6
Message-ID: <200512211117.jBLBHNXL020935@cvs-int.fedora.redhat.com>

Author: joost

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

Modified Files:
	fpc.spec 
Added Files:
	fpc-2.0.2-G5.patch 
Log Message:
* Tue Dec 20 2005 Joost van der Sluis  2.0.2-2
- Updated fpc-2.0.2-G5.patch


fpc-2.0.2-G5.patch:

--- NEW FILE fpc-2.0.2-G5.patch ---
Index: fpcsrc/rtl/powerpc/powerpc.inc
===================================================================
--- fpcsrc/rtl/powerpc/powerpc.inc	(revision 830)
+++ fpcsrc/rtl/powerpc/powerpc.inc	(working copy)
@@ -203,374 +203,7 @@
 end;
 {$endif MACOS}
 
-{****************************************************************************
-                                Move / Fill
-****************************************************************************}
 
-{$ifndef FPC_SYSTEM_HAS_MOVE}
-{$define FPC_SYSTEM_HAS_MOVE}
-procedure Move(const source;var dest;count:longint);[public, alias: 'FPC_MOVE'];assembler; nostackframe;
-asm
-          {  count <= 0 ?  }
-          cmpwi   cr0,r5,0
-          {  check if we have to do the move backwards because of overlap  }
-          sub     r10,r4,r3
-          {  carry := boolean(dest-source < count) = boolean(overlap) }
-          subc    r10,r10,r5
-
-          {  count < 15 ? (to decide whether we will move dwords or bytes  }
-          cmpwi   cr1,r5,15
-
-          {  if overlap, then r10 := -1 else r10 := 0  }
-          subfe   r10,r10,r10
-
-          {  count < 63 ? (32 + max. alignment (31) }
-          cmpwi   cr7,r5,63
-
-          {  if count <= 0, stop  }
-          ble     cr0,.LMoveDone
-
-          {  load the begin of the source in the data cache }
-          dcbt    0,r3
-          { and the dest as well }
-          dcbtst  0,r4
-
-          {  if overlap, then r0 := count else r0 := 0  }
-          and     r0,r5,r10
-          {  if overlap, then point source and dest to the end  }
-          add     r3,r3,r0
-          add     r4,r4,r0
-          {  if overlap, then r6 := 0, else r6 := -1  }
-          not     r6,r10
-          {  if overlap, then r10 := -2, else r10 := 0  }
-          slwi    r10,r10,1
-          {  if overlap, then r10 := -1, else r10 := 1  }
-          addi    r10,r10,1
-
-          {  if count < 15, copy everything byte by byte  }
-          blt     cr1,.LMoveBytes
-
-          {  if no overlap, then source/dest += -1, otherwise they stay }
-          {  After the next instruction, r3/r4 + r10 = next position to }
-          {  load/store from/to                                         }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-          {  otherwise, guarantee 4 byte alignment for dest for starters  }
-.LMove4ByteAlignLoop:
-          lbzux   r0,r3,r10
-          stbux   r0,r4,r10
-          {  is dest now 4 aligned?  }
-          andi.   r0,r4,3
-          subi    r5,r5,1
-          {  while not aligned, continue  }
-          bne     cr0,.LMove4ByteAlignLoop
-
-{$ifndef ppc603}
-          { check for 32 byte alignment }
-          andi.   r7,r4,31
-{$endif non ppc603}
-          { we are going to copy one byte again (the one at the newly }
-          { aligned address), so increase count byte 1                }
-          addi    r5,r5,1
-          { count div 4 for number of dwords to copy }
-          srwi    r0,r5,2
-          {  if 11 <= count < 63, copy using dwords }
-          blt     cr7,.LMoveDWords
-
-{$ifndef ppc603}
-          { # of dwords to copy to reach 32 byte alignment (*4) }
-          { (depends on forward/backward copy)                  }
-
-          { if forward copy, r6 = -1 -> r8 := 32 }
-          { if backward copy, r6 = 0 -> r8 := 0  }
-          rlwinm  r8,r6,0,31-6+1,31-6+1
-          { if forward copy, we have to copy 32 - unaligned count bytes }
-          { if backward copy unaligned count bytes                      }
-          sub     r7,r8,r7
-          { if backward copy, the calculated value is now negate -> }
-          { make it positive again                                 }
-          not     r8, r6
-          add     r7, r7, r8
-          xor     r7, r7, r8
-{$endif not ppc603}
-
-          { multiply the update count with 4 }
-          slwi    r10,r10,2
-          slwi    r6,r6,2
-          { and adapt the source and dest }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-{$ifndef ppc603}
-          beq     cr0,.LMove32BytesAligned
-.L32BytesAlignMoveLoop:
-          {  count >= 39 -> align to 8 byte boundary and then use the FPU  }
-          {  since we're already at 4 byte alignment, use dword store      }
-          subic.  r7,r7,4
-          lwzux   r0,r3,r10
-          subi    r5,r5,4
-          stwux   r0,r4,r10
-          bne     .L32BytesAlignMoveLoop
-
-.LMove32BytesAligned:
-          { count div 32 ( >= 1, since count was >=63 }
-          srwi    r0,r5,5
-          { remainder }
-          andi.   r5,r5,31
-          { to decide if we will do some dword stores (instead of only }
-          { byte stores) afterwards or not                             }
-{$else not ppc603}
-          srwi    r0,r5,4
-          andi.   r5,r5,15
-{$endif not ppc603}
-          cmpwi   cr1,r5,11
-          mtctr   r0
-
-          {  r0 := count div 4, will be moved to ctr when copying dwords  }
-          srwi    r0,r5,2
-
-{$ifndef ppc603}
-          {  adjust the update count: it will now be 8 or -8 depending on overlap  }
-          slwi    r10,r10,1
-
-          {  adjust source and dest pointers: because of the above loop, dest is now   }
-          {  aligned to 8 bytes. So if we add r6 we will still have an 8 bytes         }
-          { aligned address)                                                           }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-          slwi    r6,r6,1
-
-          { the dcbz offset must give a 32 byte aligned address when added   }
-          { to the current dest address and its address must point to the    }
-          { bytes that will be overwritten in the current iteration. In case }
-          { of a forward loop, the dest address has currently an offset of   }
-          { -8 compared to the bytes that will be overwritten (and r6 = -8). }
-          { In case of a backward of a loop, the dest address currently has  }
-          { an offset of +32 compared to the bytes that will be overwritten  }
-          { (and r6 = 0). So the forward dcbz offset must become +8 and the  }
-          { backward -32 -> (-r6 * 5) - 32 gives the correct offset          }
-          slwi    r7,r6,2
-          add     r7,r7,r6
-          neg     r7,r7
-          subi    r7,r7,32
-
-.LMove32ByteDcbz:
-          lfdux   f0,r3,r10
-          lfdux   f1,r3,r10
-          lfdux   f2,r3,r10
-          lfdux   f3,r3,r10
-          { must be done only now, in case source and dest are less than }
-          { 32 bytes apart!                                              }
-          dcbz    r4,r7
-          stfdux  f0,r4,r10
-          stfdux  f1,r4,r10
-          stfdux  f2,r4,r10
-          stfdux  f3,r4,r10
-          bdnz    .LMove32ByteDcbz
-.LMove32ByteLoopDone:
-{$else not ppc603}
-.LMove16ByteLoop:
-          lwzux   r11,r3,r10
-          lwzux   r7,r3,r10
-          lwzux   r8,r3,r10
-          lwzux   r9,r3,r10
-          stwux   r11,r4,r10
-          stwux   r7,r4,r10
-          stwux   r8,r4,r10
-          stwux   r9,r4,r10
-          bdnz    .LMove16ByteLoop
-{$endif not ppc603}
-
-          { cr0*4+eq is true if "count and 31" = 0 }
-          beq     cr0,.LMoveDone
-
-          {  make r10 again -1 or 1, but first adjust source/dest pointers }
-          sub     r3,r3,r6
-          sub     r4,r4,r6
-{$ifndef ppc603}
-          srawi   r10,r10,3
-          srawi   r6,r6,3
-{$else not ppc603}
-          srawi   r10,r10,2
-          srawi   r6,r6,2
-{$endif not ppc603}
-
-          { cr1 contains whether count <= 11 }
-          ble     cr1,.LMoveBytes
-
-.LMoveDWords:
-          mtctr   r0
-          andi.   r5,r5,3
-          {  r10 * 4  }
-          slwi    r10,r10,2
-          slwi    r6,r6,2
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-.LMoveDWordsLoop:
-          lwzux   r0,r3,r10
-          stwux   r0,r4,r10
-          bdnz    .LMoveDWordsLoop
-
-          beq     cr0,.LMoveDone
-          {  make r10 again -1 or 1  }
-          sub     r3,r3,r6
-          sub     r4,r4,r6
-          srawi   r10,r10,2
-          srawi   r6,r6,2
-.LMoveBytes:
-          add     r3,r3,r6
-          add     r4,r4,r6
-          mtctr   r5
-.LMoveBytesLoop:
-          lbzux   r0,r3,r10
-          stbux   r0,r4,r10
-          bdnz    .LMoveBytesLoop
-.LMoveDone:
-end;
-{$endif FPC_SYSTEM_HAS_MOVE}
-
-
-{$ifndef FPC_SYSTEM_HAS_FILLCHAR}
-{$define FPC_SYSTEM_HAS_FILLCHAR}
-
-Procedure FillChar(var x;count:longint;value:byte);assembler;
-{ input: x in r3, count in r4, value in r5 }
-
-{$ifndef FPC_ABI_AIX}
-{ in the AIX ABI, we can use te red zone for temp storage, otherwise we have }
-{ to explicitely allocate room                                               }
-var
-  temp : packed record
-    case byte of
-      0: (l1,l2: longint);
-      1: (d: double);
-    end;
-{$endif FPC_ABI_AIX}
-asm
-        { no bytes? }
-        cmpwi     cr6,r4,0
-        { less than 15 bytes? }
-        cmpwi     cr7,r4,15
-        { less than 64 bytes? }
-        cmpwi     cr1,r4,64
-        { fill r5 with ValueValueValueValue }
-        rlwimi    r5,r5,8,16,23
-        { setup for aligning x to multiple of 4}
-        rlwinm    r10,r3,0,31-2+1,31
-        rlwimi    r5,r5,16,0,15
-        ble       cr6,.LFillCharDone
-        { get the start of the data in the cache (and mark it as "will be }
-        { modified")                                                      }
-        dcbtst    0,r3
-        subfic    r10,r10,4
-        blt       cr7,.LFillCharVerySmall
-        { just store 4 bytes instead of using a loop to align (there are }
-        { plenty of other instructions now to keep the processor busy    }
-        { while it handles the (possibly unaligned) store)               }
-        stw       r5,0(r3)
-        { r3 := align(r3,4) }
-        add       r3,r3,r10
-        { decrease count with number of bytes already stored }
-        sub       r4,r4,r10
-        blt       cr1,.LFillCharSmall
-        { if we have to fill with 0 (which happens a lot), we can simply use }
-        { dcbz for the most part, which is very fast, so make a special case }
-        { for that                                                           }
-        cmplwi    cr1,r5,0
-        { align to a multiple of 32 (and immediately check whether we aren't }
-        { already 32 byte aligned)                                           }
-        rlwinm.   r10,r3,0,31-5+1,31
-        { setup r3 for using update forms of store instructions }
-        subi      r3,r3,4
-        { get number of bytes to store }
-        subfic    r10,r10,32
-        { if already 32byte aligned, skip align loop }
-        beq       .L32ByteAlignLoopDone
-        { substract from the total count }
-        sub       r4,r4,r10
-.L32ByteAlignLoop:
-        { we were already aligned to 4 byres, so this will count down to }
-        { exactly 0                                                      }
-        subic.    r10,r10,4
-        stwu      r5,4(r3)
-        bne       .L32ByteAlignLoop
-.L32ByteAlignLoopDone:
-        { get the amount of 32 byte blocks }
-        srwi      r10,r4,5
-        { and keep the rest in r4 (recording whether there is any rest) }
-        rlwinm.   r4,r4,0,31-5+1,31
-        { move to ctr }
-        mtctr     r10
-        { check how many rest there is (to decide whether we'll use }
-        { FillCharSmall or FillCharVerySmall)                       }
-        cmplwi    cr7,r4,11
-        { if filling with zero, only use dcbz }
-        bne       cr1, .LFillCharNoZero
-        { make r3 point again to the actual store position }
-        addi      r3,r3,4
-.LFillCharDCBZLoop:
-        dcbz      0,r3
-        addi      r3,r3,32
-        bdnz      .LFillCharDCBZLoop
-        { if there was no rest, we're finished }
-        beq       .LFillCharDone
-        b         .LFillCharVerySmall
-.LFillCharNoZero:
-{$ifdef FPC_ABI_AIX}
-        stw       r5,-4(r1)
-        stw       r5,-8(r1)
-        lfd       f0,-8(r1)
-{$else FPC_ABI_AIX}
-        stw       r5,temp
-        stw       r5,temp+4
-        lfd       f0,temp
-{$endif FPC_ABI_AIX}
-        { make r3 point to address-8, so we're able to use fp double stores }
-        { with update (it's already -4 now)                                 }
-        subi      r3,r3,4
-        { load r10 with 8, so that dcbz uses the correct address }
-        li        r10, 8
-.LFillChar32ByteLoop:
-        dcbz      r3,r10
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        bdnz      .LFillChar32ByteLoop
-        { if there was no rest, we're finished }
-        beq       .LFillCharDone
-        { make r3 point again to the actual next byte that must be written }
-        addi      r3,r3,8
-        b         .LFillCharVerySmall
-.LFillCharSmall:
-        { when we arrive here, we're already 4 byte aligned }
-        { get count div 4 to store dwords }
-        srwi      r10,r4,2
-        { get ready for use of update stores }
-        subi      r3,r3,4
-        mtctr     r10
-        rlwinm.   r4,r4,0,31-2+1,31
-.LFillCharSmallLoop:
-        stwu      r5,4(r3)
-        bdnz      .LFillCharSmallLoop
-        { if nothing left, stop }
-        beq       .LFillCharDone
-        { get ready to store bytes }
-        addi      r3,r3,4
-.LFillCharVerySmall:
-        mtctr     r4
-        subi      r3,r3,1
-.LFillCharVerySmallLoop:
-        stbu      r5,1(r3)
-        bdnz      .LFillCharVerySmallLoop
-.LFillCharDone:
-end;
-{$endif FPC_SYSTEM_HAS_FILLCHAR}
-
-
 {$ifndef FPC_SYSTEM_HAS_FILLDWORD}
 {$define FPC_SYSTEM_HAS_FILLDWORD}
 procedure filldword(var x;count : longint;value : dword);


Index: fpc.spec
===================================================================
RCS file: /cvs/extras/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fpc.spec	21 Dec 2005 11:07:45 -0000	1.5
+++ fpc.spec	21 Dec 2005 11:16:51 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           fpc
 Version:        2.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
@@ -156,6 +156,9 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-2
+- Updated fpc-2.0.2-G5.patch
+
 * Tue Dec 20 2005 Joost van der Sluis  2.0.2-1
 - Updated to version 2.0.2
 



From fedora-extras-commits at redhat.com  Wed Dec 21 11:23:20 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 21 Dec 2005 06:23:20 -0500
Subject: rpms/synergy/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 synergy.spec, 1.11, 1.12
Message-ID: <200512211123.jBLBNqKD021004@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore sources synergy.spec 
Log Message:
Update to 1.2.7, now use modular X build requirements for FC >= 5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synergy/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Nov 2005 13:36:48 -0000	1.7
+++ .cvsignore	21 Dec 2005 11:23:20 -0000	1.8
@@ -1 +1 @@
-synergy-1.2.5.tar.gz
+synergy-1.2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synergy/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Nov 2005 13:36:48 -0000	1.7
+++ sources	21 Dec 2005 11:23:20 -0000	1.8
@@ -1 +1 @@
-cf1b981acd317c003357f4ecba42448b  synergy-1.2.5.tar.gz
+da9effc847d13f9725b6db043d8283a5  synergy-1.2.7.tar.gz


Index: synergy.spec
===================================================================
RCS file: /cvs/extras/rpms/synergy/FC-4/synergy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- synergy.spec	7 Nov 2005 13:36:48 -0000	1.11
+++ synergy.spec	21 Dec 2005 11:23:20 -0000	1.12
@@ -1,14 +1,20 @@
 Summary: Mouse and keyboard sharing utility
 Name: synergy
-Version: 1.2.5
+Version: 1.2.7
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://synergy2.sourceforge.net/
-Source: http://dl.sf.net/synergy2/%{name}-%{version}.tar.gz
+Source: http://dl.sf.net/synergy2/synergy-%{version}.tar.gz
 Patch: synergy-1.2.2-werror.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, xorg-x11-devel, autoconf
+BuildRequires: gcc-c++, autoconf, automake
+%if "%{fedora}" >= "5"
+BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel
+BuildRequires: libXinerama-devel
+%else
+BuildRequires: xorg-x11-devel
+%endif
 
 %description
 Synergy lets you easily share a single mouse and keyboard between
@@ -48,6 +54,11 @@
 
 
 %changelog
+* Tue Dec 20 2005 Matthias Saou  1.2.7-1
+- Update to 1.2.7.
+- Add automake build requirement (to get aclocal).
+- For %%{fedora} >= 5, buildrequire modular X packages.
+
 * Mon Nov  7 2005 Matthias Saou  1.2.5-1
 - Update to 1.2.5, -Werror patch still required.
 



From fedora-extras-commits at redhat.com  Wed Dec 21 12:00:57 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Wed, 21 Dec 2005 07:00:57 -0500
Subject: rpms/digikam/FC-3 .cvsignore, 1.4, 1.5 digikam.spec, 1.5,
	1.6 sources, 1.4, 1.5 digikam-0.7.4-64bit-typo.patch, 1.3, NONE
Message-ID: <200512211201.jBLC1T6K022754@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	.cvsignore digikam.spec sources 
Removed Files:
	digikam-0.7.4-64bit-typo.patch 
Log Message:
- Revert to digikam-0_8_0-1_fc3 (SQLite >= 3.0.0 appeared in FE3)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Dec 2005 16:25:00 -0000	1.4
+++ .cvsignore	21 Dec 2005 12:00:56 -0000	1.5
@@ -1 +1,2 @@
 digikam-0.7.4.tar.bz2
+digikam-0.8.0.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/digikam.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- digikam.spec	1 Dec 2005 16:25:00 -0000	1.5
+++ digikam.spec	21 Dec 2005 12:00:56 -0000	1.6
@@ -1,17 +1,16 @@
 Name:		digikam
-Version:	0.7.4
-Release:	4%{?dist}
+Version:	0.8.0
+Release:	1%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		digikam-0.7.4-64bit-typo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0
-BuildRequires:	libkexif-devel >= 0.2 libkipi-devel >= 0.1 desktop-file-utils
+BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
+BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
 BuildRequires:	gettext
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -24,7 +23,8 @@
 digital camera, preview the images and download and/or delete them.
 
 digiKam buildin image editor makes the common photo correction a simple task.
-The image editor is extensible via plugins.
+The image editor is extensible via plugins, install the digikamimageplugins
+and/or kipi-plugins packages to use them.
 
 %package devel
 Summary:	Development files for %{name}
@@ -37,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b 64bit-typo.patch
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -95,7 +94,7 @@
 
 %files -f %name.lang
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING HACKING README
+%doc AUTHORS ChangeLog COPYING HACKING README TODO
 %{_bindir}/*
 %{_libdir}/libdigikam.so.*
 %{_libdir}/kde3/digikamimageplugin_core.la
@@ -116,6 +115,11 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Exclude libdigikam.la (bug #171503)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Dec 2005 16:25:00 -0000	1.4
+++ sources	21 Dec 2005 12:00:56 -0000	1.5
@@ -1 +1 @@
-3df53700ff78caca60cab4ea4116c7c5  digikam-0.7.4.tar.bz2
+9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2


--- digikam-0.7.4-64bit-typo.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 13:19:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 21 Dec 2005 08:19:55 -0500
Subject: rpms/wxPython/devel Makefile,1.3,1.4
Message-ID: <200512211320.jBLDKRe2024629@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Added Files:
	Makefile 
Log Message:
re-enable wxPython component in CVS


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	21 Dec 2005 13:19:54 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: wxPython
+# $Id$
+NAME := wxPython
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)



From fedora-extras-commits at redhat.com  Wed Dec 21 14:14:21 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 09:14:21 -0500
Subject: rpms/nethack-vultures/devel .cvsignore,1.3,1.4
Message-ID: <200512211415.jBLEFDe6026591@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26563

Modified Files:
	.cvsignore 
Log Message:
Syncing so that make tag will work right.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Dec 2005 18:33:06 -0000	1.3
+++ .cvsignore	21 Dec 2005 14:14:21 -0000	1.4
@@ -1 +1,2 @@
 vultures-1.11.0-full.tar.bz2
+vultures-1.11.1-full.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 21 14:41:57 2005
From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost))
Date: Wed, 21 Dec 2005 09:41:57 -0500
Subject: rpms/fpc/devel fpc.spec,1.6,1.7
Message-ID: <200512211442.jBLEgTil026792@cvs-int.fedora.redhat.com>

Author: joost

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

Modified Files:
	fpc.spec 
Log Message:
* Tue Dec 20 2005 Joost van der Sluis  2.0.2-3
- Disabled smart-linking for ppc



Index: fpc.spec
===================================================================
RCS file: /cvs/extras/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fpc.spec	21 Dec 2005 11:16:51 -0000	1.6
+++ fpc.spec	21 Dec 2005 14:41:57 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           fpc
 Version:        2.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
@@ -44,11 +44,14 @@
 
 %ifarch ppc
 %define ppcname ppcppc
+%define smart _all 
 %else
 %ifarch x86_64
 %define ppcname ppcx64
+%define smart _smart
 %else
 %define ppcname ppc386
+%define smart _smart
 %endif
 %endif
 
@@ -63,11 +66,11 @@
 NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
 DATA2INC=`pwd`/utils/data2inc
 make compiler_cycle FPC=${STARTPP}
-make rtl_clean rtl_smart FPC=${NEWPP}
-make packages_base_smart FPC=${NEWPP}
-make fcl_smart FPC=${NEWPP}
-make fv_smart FPC=${NEWPP}
-make packages_extra_smart FPC=${NEWPP}
+make rtl_clean rtl%{smart} FPC=${NEWPP}
+make packages_base%{smart} FPC=${NEWPP}
+make fcl%{smart} FPC=${NEWPP}
+make fv%{smart} FPC=${NEWPP}
+make packages_extra%{smart} FPC=${NEWPP}
 make ide_all FPC=${NEWPP}
 make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC}
 cd ..
@@ -156,6 +159,9 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-3
+- Disabled smart-linking for ppc
+
 * Tue Dec 20 2005 Joost van der Sluis  2.0.2-2
 - Updated fpc-2.0.2-G5.patch
 



From fedora-extras-commits at redhat.com  Wed Dec 21 15:09:39 2005
From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost))
Date: Wed, 21 Dec 2005 10:09:39 -0500
Subject: rpms/fpc/FC-3 fpc-2.0.2-G5.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 fpc.spec, 1.3, 1.4 sources, 1.3, 1.4 fpc-2.0.0-G5.patch, 1.1, NONE
Message-ID: <200512211510.jBLFAB7o028529@cvs-int.fedora.redhat.com>

Author: joost

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

Modified Files:
	.cvsignore fpc.spec sources 
Added Files:
	fpc-2.0.2-G5.patch 
Removed Files:
	fpc-2.0.0-G5.patch 
Log Message:
* Tue Dec 20 2005 Joost van der Sluis  2.0.2-3
- Disabled smart-linking for ppc

* Tue Dec 20 2005 Joost van der Sluis  2.0.2-1
- Updated to version 2.0.2


fpc-2.0.2-G5.patch:

--- NEW FILE fpc-2.0.2-G5.patch ---
Index: fpcsrc/rtl/powerpc/powerpc.inc
===================================================================
--- fpcsrc/rtl/powerpc/powerpc.inc	(revision 830)
+++ fpcsrc/rtl/powerpc/powerpc.inc	(working copy)
@@ -203,374 +203,7 @@
 end;
 {$endif MACOS}
 
-{****************************************************************************
-                                Move / Fill
-****************************************************************************}
 
-{$ifndef FPC_SYSTEM_HAS_MOVE}
-{$define FPC_SYSTEM_HAS_MOVE}
-procedure Move(const source;var dest;count:longint);[public, alias: 'FPC_MOVE'];assembler; nostackframe;
-asm
-          {  count <= 0 ?  }
-          cmpwi   cr0,r5,0
-          {  check if we have to do the move backwards because of overlap  }
-          sub     r10,r4,r3
-          {  carry := boolean(dest-source < count) = boolean(overlap) }
-          subc    r10,r10,r5
-
-          {  count < 15 ? (to decide whether we will move dwords or bytes  }
-          cmpwi   cr1,r5,15
-
-          {  if overlap, then r10 := -1 else r10 := 0  }
-          subfe   r10,r10,r10
-
-          {  count < 63 ? (32 + max. alignment (31) }
-          cmpwi   cr7,r5,63
-
-          {  if count <= 0, stop  }
-          ble     cr0,.LMoveDone
-
-          {  load the begin of the source in the data cache }
-          dcbt    0,r3
-          { and the dest as well }
-          dcbtst  0,r4
-
-          {  if overlap, then r0 := count else r0 := 0  }
-          and     r0,r5,r10
-          {  if overlap, then point source and dest to the end  }
-          add     r3,r3,r0
-          add     r4,r4,r0
-          {  if overlap, then r6 := 0, else r6 := -1  }
-          not     r6,r10
-          {  if overlap, then r10 := -2, else r10 := 0  }
-          slwi    r10,r10,1
-          {  if overlap, then r10 := -1, else r10 := 1  }
-          addi    r10,r10,1
-
-          {  if count < 15, copy everything byte by byte  }
-          blt     cr1,.LMoveBytes
-
-          {  if no overlap, then source/dest += -1, otherwise they stay }
-          {  After the next instruction, r3/r4 + r10 = next position to }
-          {  load/store from/to                                         }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-          {  otherwise, guarantee 4 byte alignment for dest for starters  }
-.LMove4ByteAlignLoop:
-          lbzux   r0,r3,r10
-          stbux   r0,r4,r10
-          {  is dest now 4 aligned?  }
-          andi.   r0,r4,3
-          subi    r5,r5,1
-          {  while not aligned, continue  }
-          bne     cr0,.LMove4ByteAlignLoop
-
-{$ifndef ppc603}
-          { check for 32 byte alignment }
-          andi.   r7,r4,31
-{$endif non ppc603}
-          { we are going to copy one byte again (the one at the newly }
-          { aligned address), so increase count byte 1                }
-          addi    r5,r5,1
-          { count div 4 for number of dwords to copy }
-          srwi    r0,r5,2
-          {  if 11 <= count < 63, copy using dwords }
-          blt     cr7,.LMoveDWords
-
-{$ifndef ppc603}
-          { # of dwords to copy to reach 32 byte alignment (*4) }
-          { (depends on forward/backward copy)                  }
-
-          { if forward copy, r6 = -1 -> r8 := 32 }
-          { if backward copy, r6 = 0 -> r8 := 0  }
-          rlwinm  r8,r6,0,31-6+1,31-6+1
-          { if forward copy, we have to copy 32 - unaligned count bytes }
-          { if backward copy unaligned count bytes                      }
-          sub     r7,r8,r7
-          { if backward copy, the calculated value is now negate -> }
-          { make it positive again                                 }
-          not     r8, r6
-          add     r7, r7, r8
-          xor     r7, r7, r8
-{$endif not ppc603}
-
-          { multiply the update count with 4 }
-          slwi    r10,r10,2
-          slwi    r6,r6,2
-          { and adapt the source and dest }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-{$ifndef ppc603}
-          beq     cr0,.LMove32BytesAligned
-.L32BytesAlignMoveLoop:
-          {  count >= 39 -> align to 8 byte boundary and then use the FPU  }
-          {  since we're already at 4 byte alignment, use dword store      }
-          subic.  r7,r7,4
-          lwzux   r0,r3,r10
-          subi    r5,r5,4
-          stwux   r0,r4,r10
-          bne     .L32BytesAlignMoveLoop
-
-.LMove32BytesAligned:
-          { count div 32 ( >= 1, since count was >=63 }
-          srwi    r0,r5,5
-          { remainder }
-          andi.   r5,r5,31
-          { to decide if we will do some dword stores (instead of only }
-          { byte stores) afterwards or not                             }
-{$else not ppc603}
-          srwi    r0,r5,4
-          andi.   r5,r5,15
-{$endif not ppc603}
-          cmpwi   cr1,r5,11
-          mtctr   r0
-
-          {  r0 := count div 4, will be moved to ctr when copying dwords  }
-          srwi    r0,r5,2
-
-{$ifndef ppc603}
-          {  adjust the update count: it will now be 8 or -8 depending on overlap  }
-          slwi    r10,r10,1
-
-          {  adjust source and dest pointers: because of the above loop, dest is now   }
-          {  aligned to 8 bytes. So if we add r6 we will still have an 8 bytes         }
-          { aligned address)                                                           }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-          slwi    r6,r6,1
-
-          { the dcbz offset must give a 32 byte aligned address when added   }
-          { to the current dest address and its address must point to the    }
-          { bytes that will be overwritten in the current iteration. In case }
-          { of a forward loop, the dest address has currently an offset of   }
-          { -8 compared to the bytes that will be overwritten (and r6 = -8). }
-          { In case of a backward of a loop, the dest address currently has  }
-          { an offset of +32 compared to the bytes that will be overwritten  }
-          { (and r6 = 0). So the forward dcbz offset must become +8 and the  }
-          { backward -32 -> (-r6 * 5) - 32 gives the correct offset          }
-          slwi    r7,r6,2
-          add     r7,r7,r6
-          neg     r7,r7
-          subi    r7,r7,32
-
-.LMove32ByteDcbz:
-          lfdux   f0,r3,r10
-          lfdux   f1,r3,r10
-          lfdux   f2,r3,r10
-          lfdux   f3,r3,r10
-          { must be done only now, in case source and dest are less than }
-          { 32 bytes apart!                                              }
-          dcbz    r4,r7
-          stfdux  f0,r4,r10
-          stfdux  f1,r4,r10
-          stfdux  f2,r4,r10
-          stfdux  f3,r4,r10
-          bdnz    .LMove32ByteDcbz
-.LMove32ByteLoopDone:
-{$else not ppc603}
-.LMove16ByteLoop:
-          lwzux   r11,r3,r10
-          lwzux   r7,r3,r10
-          lwzux   r8,r3,r10
-          lwzux   r9,r3,r10
-          stwux   r11,r4,r10
-          stwux   r7,r4,r10
-          stwux   r8,r4,r10
-          stwux   r9,r4,r10
-          bdnz    .LMove16ByteLoop
-{$endif not ppc603}
-
-          { cr0*4+eq is true if "count and 31" = 0 }
-          beq     cr0,.LMoveDone
-
-          {  make r10 again -1 or 1, but first adjust source/dest pointers }
-          sub     r3,r3,r6
-          sub     r4,r4,r6
-{$ifndef ppc603}
-          srawi   r10,r10,3
-          srawi   r6,r6,3
-{$else not ppc603}
-          srawi   r10,r10,2
-          srawi   r6,r6,2
-{$endif not ppc603}
-
-          { cr1 contains whether count <= 11 }
-          ble     cr1,.LMoveBytes
-
-.LMoveDWords:
-          mtctr   r0
-          andi.   r5,r5,3
-          {  r10 * 4  }
-          slwi    r10,r10,2
-          slwi    r6,r6,2
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-.LMoveDWordsLoop:
-          lwzux   r0,r3,r10
-          stwux   r0,r4,r10
-          bdnz    .LMoveDWordsLoop
-
-          beq     cr0,.LMoveDone
-          {  make r10 again -1 or 1  }
-          sub     r3,r3,r6
-          sub     r4,r4,r6
-          srawi   r10,r10,2
-          srawi   r6,r6,2
-.LMoveBytes:
-          add     r3,r3,r6
-          add     r4,r4,r6
-          mtctr   r5
-.LMoveBytesLoop:
-          lbzux   r0,r3,r10
-          stbux   r0,r4,r10
-          bdnz    .LMoveBytesLoop
-.LMoveDone:
-end;
-{$endif FPC_SYSTEM_HAS_MOVE}
-
-
-{$ifndef FPC_SYSTEM_HAS_FILLCHAR}
-{$define FPC_SYSTEM_HAS_FILLCHAR}
-
-Procedure FillChar(var x;count:longint;value:byte);assembler;
-{ input: x in r3, count in r4, value in r5 }
-
-{$ifndef FPC_ABI_AIX}
-{ in the AIX ABI, we can use te red zone for temp storage, otherwise we have }
-{ to explicitely allocate room                                               }
-var
-  temp : packed record
-    case byte of
-      0: (l1,l2: longint);
-      1: (d: double);
-    end;
-{$endif FPC_ABI_AIX}
-asm
-        { no bytes? }
-        cmpwi     cr6,r4,0
-        { less than 15 bytes? }
-        cmpwi     cr7,r4,15
-        { less than 64 bytes? }
-        cmpwi     cr1,r4,64
-        { fill r5 with ValueValueValueValue }
-        rlwimi    r5,r5,8,16,23
-        { setup for aligning x to multiple of 4}
-        rlwinm    r10,r3,0,31-2+1,31
-        rlwimi    r5,r5,16,0,15
-        ble       cr6,.LFillCharDone
-        { get the start of the data in the cache (and mark it as "will be }
-        { modified")                                                      }
-        dcbtst    0,r3
-        subfic    r10,r10,4
-        blt       cr7,.LFillCharVerySmall
-        { just store 4 bytes instead of using a loop to align (there are }
-        { plenty of other instructions now to keep the processor busy    }
-        { while it handles the (possibly unaligned) store)               }
-        stw       r5,0(r3)
-        { r3 := align(r3,4) }
-        add       r3,r3,r10
-        { decrease count with number of bytes already stored }
-        sub       r4,r4,r10
-        blt       cr1,.LFillCharSmall
-        { if we have to fill with 0 (which happens a lot), we can simply use }
-        { dcbz for the most part, which is very fast, so make a special case }
-        { for that                                                           }
-        cmplwi    cr1,r5,0
-        { align to a multiple of 32 (and immediately check whether we aren't }
-        { already 32 byte aligned)                                           }
-        rlwinm.   r10,r3,0,31-5+1,31
-        { setup r3 for using update forms of store instructions }
-        subi      r3,r3,4
-        { get number of bytes to store }
-        subfic    r10,r10,32
-        { if already 32byte aligned, skip align loop }
-        beq       .L32ByteAlignLoopDone
-        { substract from the total count }
-        sub       r4,r4,r10
-.L32ByteAlignLoop:
-        { we were already aligned to 4 byres, so this will count down to }
-        { exactly 0                                                      }
-        subic.    r10,r10,4
-        stwu      r5,4(r3)
-        bne       .L32ByteAlignLoop
-.L32ByteAlignLoopDone:
-        { get the amount of 32 byte blocks }
-        srwi      r10,r4,5
-        { and keep the rest in r4 (recording whether there is any rest) }
-        rlwinm.   r4,r4,0,31-5+1,31
-        { move to ctr }
-        mtctr     r10
-        { check how many rest there is (to decide whether we'll use }
-        { FillCharSmall or FillCharVerySmall)                       }
-        cmplwi    cr7,r4,11
-        { if filling with zero, only use dcbz }
-        bne       cr1, .LFillCharNoZero
-        { make r3 point again to the actual store position }
-        addi      r3,r3,4
-.LFillCharDCBZLoop:
-        dcbz      0,r3
-        addi      r3,r3,32
-        bdnz      .LFillCharDCBZLoop
-        { if there was no rest, we're finished }
-        beq       .LFillCharDone
-        b         .LFillCharVerySmall
-.LFillCharNoZero:
-{$ifdef FPC_ABI_AIX}
-        stw       r5,-4(r1)
-        stw       r5,-8(r1)
-        lfd       f0,-8(r1)
-{$else FPC_ABI_AIX}
-        stw       r5,temp
-        stw       r5,temp+4
-        lfd       f0,temp
-{$endif FPC_ABI_AIX}
-        { make r3 point to address-8, so we're able to use fp double stores }
-        { with update (it's already -4 now)                                 }
-        subi      r3,r3,4
-        { load r10 with 8, so that dcbz uses the correct address }
-        li        r10, 8
-.LFillChar32ByteLoop:
-        dcbz      r3,r10
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        bdnz      .LFillChar32ByteLoop
-        { if there was no rest, we're finished }
-        beq       .LFillCharDone
-        { make r3 point again to the actual next byte that must be written }
-        addi      r3,r3,8
-        b         .LFillCharVerySmall
-.LFillCharSmall:
-        { when we arrive here, we're already 4 byte aligned }
-        { get count div 4 to store dwords }
-        srwi      r10,r4,2
-        { get ready for use of update stores }
-        subi      r3,r3,4
-        mtctr     r10
-        rlwinm.   r4,r4,0,31-2+1,31
-.LFillCharSmallLoop:
-        stwu      r5,4(r3)
-        bdnz      .LFillCharSmallLoop
-        { if nothing left, stop }
-        beq       .LFillCharDone
-        { get ready to store bytes }
-        addi      r3,r3,4
-.LFillCharVerySmall:
-        mtctr     r4
-        subi      r3,r3,1
-.LFillCharVerySmallLoop:
-        stbu      r5,1(r3)
-        bdnz      .LFillCharVerySmallLoop
-.LFillCharDone:
-end;
-{$endif FPC_SYSTEM_HAS_FILLCHAR}
-
-
 {$ifndef FPC_SYSTEM_HAS_FILLDWORD}
 {$define FPC_SYSTEM_HAS_FILLDWORD}
 procedure filldword(var x;count : longint;value : dword);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fpc/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2005 15:15:37 -0000	1.2
+++ .cvsignore	21 Dec 2005 15:09:39 -0000	1.3
@@ -1,2 +1 @@
-fpc-2.0.0.compiler.bin.tar.gz
-fpc-2.0.0.source.tar.gz
+fpcbuild-2.0.2.tar.bz2


Index: fpc.spec
===================================================================
RCS file: /cvs/extras/rpms/fpc/FC-3/fpc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fpc.spec	17 Aug 2005 16:33:50 -0000	1.3
+++ fpc.spec	21 Dec 2005 15:09:39 -0000	1.4
@@ -1,18 +1,17 @@
 Name:           fpc
-Version:        2.0.0
-Release:        4%{?dist}
+Version:        2.0.2
+Release:        3%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
 License:        GPL and modified LGPL
 URL:            http://www.freepascal.org/
-Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}-%{version}.source.tar.gz
-Source1:        http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
+Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}build-%{version}.tar.bz2
 Patch0:         %{name}-%{version}-G5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	gpm, glibc, ncurses, binutils
-BuildRequires:  tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
+BuildRequires:  fpc, tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
 
 %description
 
@@ -45,43 +44,39 @@
 
 %ifarch ppc
 %define ppcname ppcppc
+%define smart _all 
 %else
 %ifarch x86_64
 %define ppcname ppcx64
+%define smart _smart
 %else
 %define ppcname ppc386
+%define smart _smart
 %endif
 %endif
 
 %prep
-%setup -q -a1 -n %{name}
+%setup -q -n %{name}-src-%{version}
 %patch0 
 
 %build
-# The source-files:
-mkdir -p fpcsrc
-cp -a rtl fpcsrc
-cp -a fcl fpcsrc
-cp -a packages fpcsrc
-rm -rf fpcsrc/packages/extra/amunits
-rm -rf fpcsrc/packages/extra/winunits
-find fpcsrc -name .cvsignore -exec rm '{}' ';'
-
-STARTPP=`pwd`/startcompiler/%{ppcname}
+cd fpcsrc
+STARTPP=%{ppcname}
 NEWPP=`pwd`/compiler/%{ppcname}
 NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
 DATA2INC=`pwd`/utils/data2inc
 make compiler_cycle FPC=${STARTPP}
-make rtl_clean rtl_smart FPC=${NEWPP}
-make packages_base_smart FPC=${NEWPP}
-make fcl_smart FPC=${NEWPP}
-make fv_smart FPC=${NEWPP}
-make packages_extra_smart FPC=${NEWPP}
+make rtl_clean rtl%{smart} FPC=${NEWPP}
+make packages_base%{smart} FPC=${NEWPP}
+make fcl%{smart} FPC=${NEWPP}
+make fv%{smart} FPC=${NEWPP}
+make packages_extra%{smart} FPC=${NEWPP}
 make ide_all FPC=${NEWPP}
 make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC}
+cd ..
 export save_size=40000
 export pool_size=1250000
-make -C docs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
+make -C fpcdocs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
 
 # disable the debuginfo package
 %define debug_package %{nil}
@@ -89,6 +84,7 @@
 
 %install
 rm -rf %{buildroot}
+cd fpcsrc
 FPCMAKE=`pwd`/utils/fpcm/fpcmake
 NEWPP=`pwd`/compiler/%{ppcname}
 INSTALLOPTS="FPC=${NEWPP} FPCMAKE=${FPCMAKE} \
@@ -106,23 +102,28 @@
 make fv_distinstall ${INSTALLOPTS}
 make ide_distinstall ${INSTALLOPTS}
 make utils_distinstall ${INSTALLOPTS}
-
-make doc_install ${INSTALLOPTS}
-make -C docs pdfinstall ${INSTALLOPTS}
-make man_install ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir}
+cd ../install
+make -C doc ${INSTALLOPTS}
+make -C man ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir}
+cd ..
+make -C fpcdocs pdfinstall ${INSTALLOPTS}
 
 # create link
 ln -sf ../%{_lib}/%{name}/%{version}/%{ppcname} %{buildroot}%{_bindir}/%{ppcname}
 
-# Include the COPYING-information in the documentation
-cp -a compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
-cp -a rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
-cp -a fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl
-cp -a rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
+# Include the COPYING-information for the fcl/rtl in the documentation
+cp -a fpcsrc/compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
+cp -a fpcsrc/rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
+cp -a fpcsrc/fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl
+cp -a fpcsrc/rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
 
 # The source-files:
 mkdir -p %{buildroot}%{_datadir}/fpcsrc
-cp -a fpcsrc/* %{buildroot}%{_datadir}/fpcsrc/
+rm -rf fpcsrc/packages/extra/amunits
+rm -rf fpcsrc/packages/extra/winunits
+cp -a fpcsrc/rtl %{buildroot}%{_datadir}/fpcsrc
+cp -a fpcsrc/fcl %{buildroot}%{_datadir}/fpcsrc
+cp -a fpcsrc/packages %{buildroot}%{_datadir}/fpcsrc
 
 # Workaround:
 # newer rpm versions do not allow garbage
@@ -158,6 +159,15 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-3
+- Disabled smart-linking for ppc
+
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-2
+- Updated fpc-2.0.2-G5.patch
+
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-1
+- Updated to version 2.0.2
+
 * Wed Aug 17 2005 Joost van der Sluis  2.0.0-4
 - Added %%{?dist} to release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fpc/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Aug 2005 15:55:19 -0000	1.3
+++ sources	21 Dec 2005 15:09:39 -0000	1.4
@@ -1,2 +1 @@
-fd5730c59bb5a87e5828568b7d039cb5  fpc-2.0.0.compiler.bin.tar.gz
-3f9c64d0146a3631f6963fd7477776d1  fpc-2.0.0.source.tar.gz
+b88893bc005c4404197ae55ef3c0de30  fpcbuild-2.0.2.tar.bz2


--- fpc-2.0.0-G5.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 16:01:40 2005
From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost))
Date: Wed, 21 Dec 2005 11:01:40 -0500
Subject: rpms/fpc/FC-4 fpc-2.0.2-G5.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 fpc.spec, 1.3, 1.4 sources, 1.3, 1.4 fpc-2.0.0-G5.patch, 1.1, NONE
Message-ID: <200512211602.jBLG2Yrm030368@cvs-int.fedora.redhat.com>

Author: joost

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

Modified Files:
	.cvsignore fpc.spec sources 
Added Files:
	fpc-2.0.2-G5.patch 
Removed Files:
	fpc-2.0.0-G5.patch 
Log Message:
* Tue Dec 20 2005 Joost van der Sluis  2.0.2-3
- Disabled smart-linking for ppc

* Tue Dec 20 2005 Joost van der Sluis  2.0.2-1
- Updated to version 2.0.2


fpc-2.0.2-G5.patch:

--- NEW FILE fpc-2.0.2-G5.patch ---
Index: fpcsrc/rtl/powerpc/powerpc.inc
===================================================================
--- fpcsrc/rtl/powerpc/powerpc.inc	(revision 830)
+++ fpcsrc/rtl/powerpc/powerpc.inc	(working copy)
@@ -203,374 +203,7 @@
 end;
 {$endif MACOS}
 
-{****************************************************************************
-                                Move / Fill
-****************************************************************************}
 
-{$ifndef FPC_SYSTEM_HAS_MOVE}
-{$define FPC_SYSTEM_HAS_MOVE}
-procedure Move(const source;var dest;count:longint);[public, alias: 'FPC_MOVE'];assembler; nostackframe;
-asm
-          {  count <= 0 ?  }
-          cmpwi   cr0,r5,0
-          {  check if we have to do the move backwards because of overlap  }
-          sub     r10,r4,r3
-          {  carry := boolean(dest-source < count) = boolean(overlap) }
-          subc    r10,r10,r5
-
-          {  count < 15 ? (to decide whether we will move dwords or bytes  }
-          cmpwi   cr1,r5,15
-
-          {  if overlap, then r10 := -1 else r10 := 0  }
-          subfe   r10,r10,r10
-
-          {  count < 63 ? (32 + max. alignment (31) }
-          cmpwi   cr7,r5,63
-
-          {  if count <= 0, stop  }
-          ble     cr0,.LMoveDone
-
-          {  load the begin of the source in the data cache }
-          dcbt    0,r3
-          { and the dest as well }
-          dcbtst  0,r4
-
-          {  if overlap, then r0 := count else r0 := 0  }
-          and     r0,r5,r10
-          {  if overlap, then point source and dest to the end  }
-          add     r3,r3,r0
-          add     r4,r4,r0
-          {  if overlap, then r6 := 0, else r6 := -1  }
-          not     r6,r10
-          {  if overlap, then r10 := -2, else r10 := 0  }
-          slwi    r10,r10,1
-          {  if overlap, then r10 := -1, else r10 := 1  }
-          addi    r10,r10,1
-
-          {  if count < 15, copy everything byte by byte  }
-          blt     cr1,.LMoveBytes
-
-          {  if no overlap, then source/dest += -1, otherwise they stay }
-          {  After the next instruction, r3/r4 + r10 = next position to }
-          {  load/store from/to                                         }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-          {  otherwise, guarantee 4 byte alignment for dest for starters  }
-.LMove4ByteAlignLoop:
-          lbzux   r0,r3,r10
-          stbux   r0,r4,r10
-          {  is dest now 4 aligned?  }
-          andi.   r0,r4,3
-          subi    r5,r5,1
-          {  while not aligned, continue  }
-          bne     cr0,.LMove4ByteAlignLoop
-
-{$ifndef ppc603}
-          { check for 32 byte alignment }
-          andi.   r7,r4,31
-{$endif non ppc603}
-          { we are going to copy one byte again (the one at the newly }
-          { aligned address), so increase count byte 1                }
-          addi    r5,r5,1
-          { count div 4 for number of dwords to copy }
-          srwi    r0,r5,2
-          {  if 11 <= count < 63, copy using dwords }
-          blt     cr7,.LMoveDWords
-
-{$ifndef ppc603}
-          { # of dwords to copy to reach 32 byte alignment (*4) }
-          { (depends on forward/backward copy)                  }
-
-          { if forward copy, r6 = -1 -> r8 := 32 }
-          { if backward copy, r6 = 0 -> r8 := 0  }
-          rlwinm  r8,r6,0,31-6+1,31-6+1
-          { if forward copy, we have to copy 32 - unaligned count bytes }
-          { if backward copy unaligned count bytes                      }
-          sub     r7,r8,r7
-          { if backward copy, the calculated value is now negate -> }
-          { make it positive again                                 }
-          not     r8, r6
-          add     r7, r7, r8
-          xor     r7, r7, r8
-{$endif not ppc603}
-
-          { multiply the update count with 4 }
-          slwi    r10,r10,2
-          slwi    r6,r6,2
-          { and adapt the source and dest }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-{$ifndef ppc603}
-          beq     cr0,.LMove32BytesAligned
-.L32BytesAlignMoveLoop:
-          {  count >= 39 -> align to 8 byte boundary and then use the FPU  }
-          {  since we're already at 4 byte alignment, use dword store      }
-          subic.  r7,r7,4
-          lwzux   r0,r3,r10
-          subi    r5,r5,4
-          stwux   r0,r4,r10
-          bne     .L32BytesAlignMoveLoop
-
-.LMove32BytesAligned:
-          { count div 32 ( >= 1, since count was >=63 }
-          srwi    r0,r5,5
-          { remainder }
-          andi.   r5,r5,31
-          { to decide if we will do some dword stores (instead of only }
-          { byte stores) afterwards or not                             }
-{$else not ppc603}
-          srwi    r0,r5,4
-          andi.   r5,r5,15
-{$endif not ppc603}
-          cmpwi   cr1,r5,11
-          mtctr   r0
-
-          {  r0 := count div 4, will be moved to ctr when copying dwords  }
-          srwi    r0,r5,2
-
-{$ifndef ppc603}
-          {  adjust the update count: it will now be 8 or -8 depending on overlap  }
-          slwi    r10,r10,1
-
-          {  adjust source and dest pointers: because of the above loop, dest is now   }
-          {  aligned to 8 bytes. So if we add r6 we will still have an 8 bytes         }
-          { aligned address)                                                           }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-          slwi    r6,r6,1
-
-          { the dcbz offset must give a 32 byte aligned address when added   }
-          { to the current dest address and its address must point to the    }
-          { bytes that will be overwritten in the current iteration. In case }
-          { of a forward loop, the dest address has currently an offset of   }
-          { -8 compared to the bytes that will be overwritten (and r6 = -8). }
-          { In case of a backward of a loop, the dest address currently has  }
-          { an offset of +32 compared to the bytes that will be overwritten  }
-          { (and r6 = 0). So the forward dcbz offset must become +8 and the  }
-          { backward -32 -> (-r6 * 5) - 32 gives the correct offset          }
-          slwi    r7,r6,2
-          add     r7,r7,r6
-          neg     r7,r7
-          subi    r7,r7,32
-
-.LMove32ByteDcbz:
-          lfdux   f0,r3,r10
-          lfdux   f1,r3,r10
-          lfdux   f2,r3,r10
-          lfdux   f3,r3,r10
-          { must be done only now, in case source and dest are less than }
-          { 32 bytes apart!                                              }
-          dcbz    r4,r7
-          stfdux  f0,r4,r10
-          stfdux  f1,r4,r10
-          stfdux  f2,r4,r10
-          stfdux  f3,r4,r10
-          bdnz    .LMove32ByteDcbz
-.LMove32ByteLoopDone:
-{$else not ppc603}
-.LMove16ByteLoop:
-          lwzux   r11,r3,r10
-          lwzux   r7,r3,r10
-          lwzux   r8,r3,r10
-          lwzux   r9,r3,r10
-          stwux   r11,r4,r10
-          stwux   r7,r4,r10
-          stwux   r8,r4,r10
-          stwux   r9,r4,r10
-          bdnz    .LMove16ByteLoop
-{$endif not ppc603}
-
-          { cr0*4+eq is true if "count and 31" = 0 }
-          beq     cr0,.LMoveDone
-
-          {  make r10 again -1 or 1, but first adjust source/dest pointers }
-          sub     r3,r3,r6
-          sub     r4,r4,r6
-{$ifndef ppc603}
-          srawi   r10,r10,3
-          srawi   r6,r6,3
-{$else not ppc603}
-          srawi   r10,r10,2
-          srawi   r6,r6,2
-{$endif not ppc603}
-
-          { cr1 contains whether count <= 11 }
-          ble     cr1,.LMoveBytes
-
-.LMoveDWords:
-          mtctr   r0
-          andi.   r5,r5,3
-          {  r10 * 4  }
-          slwi    r10,r10,2
-          slwi    r6,r6,2
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-.LMoveDWordsLoop:
-          lwzux   r0,r3,r10
-          stwux   r0,r4,r10
-          bdnz    .LMoveDWordsLoop
-
-          beq     cr0,.LMoveDone
-          {  make r10 again -1 or 1  }
-          sub     r3,r3,r6
-          sub     r4,r4,r6
-          srawi   r10,r10,2
-          srawi   r6,r6,2
-.LMoveBytes:
-          add     r3,r3,r6
-          add     r4,r4,r6
-          mtctr   r5
-.LMoveBytesLoop:
-          lbzux   r0,r3,r10
-          stbux   r0,r4,r10
-          bdnz    .LMoveBytesLoop
-.LMoveDone:
-end;
-{$endif FPC_SYSTEM_HAS_MOVE}
-
-
-{$ifndef FPC_SYSTEM_HAS_FILLCHAR}
-{$define FPC_SYSTEM_HAS_FILLCHAR}
-
-Procedure FillChar(var x;count:longint;value:byte);assembler;
-{ input: x in r3, count in r4, value in r5 }
-
-{$ifndef FPC_ABI_AIX}
-{ in the AIX ABI, we can use te red zone for temp storage, otherwise we have }
-{ to explicitely allocate room                                               }
-var
-  temp : packed record
-    case byte of
-      0: (l1,l2: longint);
-      1: (d: double);
-    end;
-{$endif FPC_ABI_AIX}
-asm
-        { no bytes? }
-        cmpwi     cr6,r4,0
-        { less than 15 bytes? }
-        cmpwi     cr7,r4,15
-        { less than 64 bytes? }
-        cmpwi     cr1,r4,64
-        { fill r5 with ValueValueValueValue }
-        rlwimi    r5,r5,8,16,23
-        { setup for aligning x to multiple of 4}
-        rlwinm    r10,r3,0,31-2+1,31
-        rlwimi    r5,r5,16,0,15
-        ble       cr6,.LFillCharDone
-        { get the start of the data in the cache (and mark it as "will be }
-        { modified")                                                      }
-        dcbtst    0,r3
-        subfic    r10,r10,4
-        blt       cr7,.LFillCharVerySmall
-        { just store 4 bytes instead of using a loop to align (there are }
-        { plenty of other instructions now to keep the processor busy    }
-        { while it handles the (possibly unaligned) store)               }
-        stw       r5,0(r3)
-        { r3 := align(r3,4) }
-        add       r3,r3,r10
-        { decrease count with number of bytes already stored }
-        sub       r4,r4,r10
-        blt       cr1,.LFillCharSmall
-        { if we have to fill with 0 (which happens a lot), we can simply use }
-        { dcbz for the most part, which is very fast, so make a special case }
-        { for that                                                           }
-        cmplwi    cr1,r5,0
-        { align to a multiple of 32 (and immediately check whether we aren't }
-        { already 32 byte aligned)                                           }
-        rlwinm.   r10,r3,0,31-5+1,31
-        { setup r3 for using update forms of store instructions }
-        subi      r3,r3,4
-        { get number of bytes to store }
-        subfic    r10,r10,32
-        { if already 32byte aligned, skip align loop }
-        beq       .L32ByteAlignLoopDone
-        { substract from the total count }
-        sub       r4,r4,r10
-.L32ByteAlignLoop:
-        { we were already aligned to 4 byres, so this will count down to }
-        { exactly 0                                                      }
-        subic.    r10,r10,4
-        stwu      r5,4(r3)
-        bne       .L32ByteAlignLoop
-.L32ByteAlignLoopDone:
-        { get the amount of 32 byte blocks }
-        srwi      r10,r4,5
-        { and keep the rest in r4 (recording whether there is any rest) }
-        rlwinm.   r4,r4,0,31-5+1,31
-        { move to ctr }
-        mtctr     r10
-        { check how many rest there is (to decide whether we'll use }
-        { FillCharSmall or FillCharVerySmall)                       }
-        cmplwi    cr7,r4,11
-        { if filling with zero, only use dcbz }
-        bne       cr1, .LFillCharNoZero
-        { make r3 point again to the actual store position }
-        addi      r3,r3,4
-.LFillCharDCBZLoop:
-        dcbz      0,r3
-        addi      r3,r3,32
-        bdnz      .LFillCharDCBZLoop
-        { if there was no rest, we're finished }
-        beq       .LFillCharDone
-        b         .LFillCharVerySmall
-.LFillCharNoZero:
-{$ifdef FPC_ABI_AIX}
-        stw       r5,-4(r1)
-        stw       r5,-8(r1)
-        lfd       f0,-8(r1)
-{$else FPC_ABI_AIX}
-        stw       r5,temp
-        stw       r5,temp+4
-        lfd       f0,temp
-{$endif FPC_ABI_AIX}
-        { make r3 point to address-8, so we're able to use fp double stores }
-        { with update (it's already -4 now)                                 }
-        subi      r3,r3,4
-        { load r10 with 8, so that dcbz uses the correct address }
-        li        r10, 8
-.LFillChar32ByteLoop:
-        dcbz      r3,r10
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        bdnz      .LFillChar32ByteLoop
-        { if there was no rest, we're finished }
-        beq       .LFillCharDone
-        { make r3 point again to the actual next byte that must be written }
-        addi      r3,r3,8
-        b         .LFillCharVerySmall
-.LFillCharSmall:
-        { when we arrive here, we're already 4 byte aligned }
-        { get count div 4 to store dwords }
-        srwi      r10,r4,2
-        { get ready for use of update stores }
-        subi      r3,r3,4
-        mtctr     r10
-        rlwinm.   r4,r4,0,31-2+1,31
-.LFillCharSmallLoop:
-        stwu      r5,4(r3)
-        bdnz      .LFillCharSmallLoop
-        { if nothing left, stop }
-        beq       .LFillCharDone
-        { get ready to store bytes }
-        addi      r3,r3,4
-.LFillCharVerySmall:
-        mtctr     r4
-        subi      r3,r3,1
-.LFillCharVerySmallLoop:
-        stbu      r5,1(r3)
-        bdnz      .LFillCharVerySmallLoop
-.LFillCharDone:
-end;
-{$endif FPC_SYSTEM_HAS_FILLCHAR}
-
-
 {$ifndef FPC_SYSTEM_HAS_FILLDWORD}
 {$define FPC_SYSTEM_HAS_FILLDWORD}
 procedure filldword(var x;count : longint;value : dword);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fpc/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2005 15:15:37 -0000	1.2
+++ .cvsignore	21 Dec 2005 16:01:40 -0000	1.3
@@ -1,2 +1 @@
-fpc-2.0.0.compiler.bin.tar.gz
-fpc-2.0.0.source.tar.gz
+fpcbuild-2.0.2.tar.bz2


Index: fpc.spec
===================================================================
RCS file: /cvs/extras/rpms/fpc/FC-4/fpc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fpc.spec	17 Aug 2005 16:33:51 -0000	1.3
+++ fpc.spec	21 Dec 2005 16:01:40 -0000	1.4
@@ -1,18 +1,17 @@
 Name:           fpc
-Version:        2.0.0
-Release:        4%{?dist}
+Version:        2.0.2
+Release:        3%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
 License:        GPL and modified LGPL
 URL:            http://www.freepascal.org/
-Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}-%{version}.source.tar.gz
-Source1:        http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
+Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}build-%{version}.tar.bz2
 Patch0:         %{name}-%{version}-G5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	gpm, glibc, ncurses, binutils
-BuildRequires:  tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
+BuildRequires:  fpc, tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
 
 %description
 
@@ -45,43 +44,39 @@
 
 %ifarch ppc
 %define ppcname ppcppc
+%define smart _all 
 %else
 %ifarch x86_64
 %define ppcname ppcx64
+%define smart _smart
 %else
 %define ppcname ppc386
+%define smart _smart
 %endif
 %endif
 
 %prep
-%setup -q -a1 -n %{name}
+%setup -q -n %{name}-src-%{version}
 %patch0 
 
 %build
-# The source-files:
-mkdir -p fpcsrc
-cp -a rtl fpcsrc
-cp -a fcl fpcsrc
-cp -a packages fpcsrc
-rm -rf fpcsrc/packages/extra/amunits
-rm -rf fpcsrc/packages/extra/winunits
-find fpcsrc -name .cvsignore -exec rm '{}' ';'
-
-STARTPP=`pwd`/startcompiler/%{ppcname}
+cd fpcsrc
+STARTPP=%{ppcname}
 NEWPP=`pwd`/compiler/%{ppcname}
 NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
 DATA2INC=`pwd`/utils/data2inc
 make compiler_cycle FPC=${STARTPP}
-make rtl_clean rtl_smart FPC=${NEWPP}
-make packages_base_smart FPC=${NEWPP}
-make fcl_smart FPC=${NEWPP}
-make fv_smart FPC=${NEWPP}
-make packages_extra_smart FPC=${NEWPP}
+make rtl_clean rtl%{smart} FPC=${NEWPP}
+make packages_base%{smart} FPC=${NEWPP}
+make fcl%{smart} FPC=${NEWPP}
+make fv%{smart} FPC=${NEWPP}
+make packages_extra%{smart} FPC=${NEWPP}
 make ide_all FPC=${NEWPP}
 make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC}
+cd ..
 export save_size=40000
 export pool_size=1250000
-make -C docs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
+make -C fpcdocs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
 
 # disable the debuginfo package
 %define debug_package %{nil}
@@ -89,6 +84,7 @@
 
 %install
 rm -rf %{buildroot}
+cd fpcsrc
 FPCMAKE=`pwd`/utils/fpcm/fpcmake
 NEWPP=`pwd`/compiler/%{ppcname}
 INSTALLOPTS="FPC=${NEWPP} FPCMAKE=${FPCMAKE} \
@@ -106,23 +102,28 @@
 make fv_distinstall ${INSTALLOPTS}
 make ide_distinstall ${INSTALLOPTS}
 make utils_distinstall ${INSTALLOPTS}
-
-make doc_install ${INSTALLOPTS}
-make -C docs pdfinstall ${INSTALLOPTS}
-make man_install ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir}
+cd ../install
+make -C doc ${INSTALLOPTS}
+make -C man ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir}
+cd ..
+make -C fpcdocs pdfinstall ${INSTALLOPTS}
 
 # create link
 ln -sf ../%{_lib}/%{name}/%{version}/%{ppcname} %{buildroot}%{_bindir}/%{ppcname}
 
-# Include the COPYING-information in the documentation
-cp -a compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
-cp -a rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
-cp -a fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl
-cp -a rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
+# Include the COPYING-information for the fcl/rtl in the documentation
+cp -a fpcsrc/compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
+cp -a fpcsrc/rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
+cp -a fpcsrc/fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl
+cp -a fpcsrc/rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
 
 # The source-files:
 mkdir -p %{buildroot}%{_datadir}/fpcsrc
-cp -a fpcsrc/* %{buildroot}%{_datadir}/fpcsrc/
+rm -rf fpcsrc/packages/extra/amunits
+rm -rf fpcsrc/packages/extra/winunits
+cp -a fpcsrc/rtl %{buildroot}%{_datadir}/fpcsrc
+cp -a fpcsrc/fcl %{buildroot}%{_datadir}/fpcsrc
+cp -a fpcsrc/packages %{buildroot}%{_datadir}/fpcsrc
 
 # Workaround:
 # newer rpm versions do not allow garbage
@@ -158,6 +159,15 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-3
+- Disabled smart-linking for ppc
+
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-2
+- Updated fpc-2.0.2-G5.patch
+
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-1
+- Updated to version 2.0.2
+
 * Wed Aug 17 2005 Joost van der Sluis  2.0.0-4
 - Added %%{?dist} to release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fpc/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Aug 2005 15:55:24 -0000	1.3
+++ sources	21 Dec 2005 16:01:40 -0000	1.4
@@ -1,2 +1 @@
-fd5730c59bb5a87e5828568b7d039cb5  fpc-2.0.0.compiler.bin.tar.gz
-3f9c64d0146a3631f6963fd7477776d1  fpc-2.0.0.source.tar.gz
+b88893bc005c4404197ae55ef3c0de30  fpcbuild-2.0.2.tar.bz2


--- fpc-2.0.0-G5.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 17:02:51 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 12:02:51 -0500
Subject: rpms/apcupsd/devel apcupsd.spec,1.3,1.4
Message-ID: <200512211703.jBLH3PjB032242@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	apcupsd.spec 
Log Message:
Rebuild



Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apcupsd.spec	16 Nov 2005 21:37:25 -0000	1.3
+++ apcupsd.spec	21 Dec 2005 17:02:50 -0000	1.4
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.10.18
-Release:      5%{?dist}
+Release:      6%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Wed Dec 21 2005 - Orion Poplawski  - 3.10.18-6
+- Rebuild
+
 * Wed Nov 16 2005 - Orion Poplawski  - 3.10.18-5
 - Bump for new openssl
 



From fedora-extras-commits at redhat.com  Wed Dec 21 17:12:25 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 12:12:25 -0500
Subject: rpms/gv/devel gv.spec,1.3,1.4
Message-ID: <200512211712.jBLHCwEa032322@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	gv.spec 
Log Message:
Rebuild



Index: gv.spec
===================================================================
RCS file: /cvs/extras/rpms/gv/devel/gv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gv.spec	31 Oct 2005 16:39:25 -0000	1.3
+++ gv.spec	21 Dec 2005 17:12:25 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A X front-end for the Ghostscript PostScript(TM) interpreter
 Name: gv
 Version: 3.6.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Publishing
 Requires: ghostscript
@@ -100,6 +100,9 @@
 %{_mandir}/man1/gv.*
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski  3.6.1-5
+- Rebuild
+
 * Thu Oct 27 2005 Orion Poplawski  3.6.1-4
 - Add patch find app defaults file (#171848)
 - Add BR: /usr/bin/makeinfo to properly build .info file (#171849)



From fedora-extras-commits at redhat.com  Wed Dec 21 17:22:42 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 12:22:42 -0500
Subject: rpms/hdf/devel hdf.spec,1.4,1.5
Message-ID: <200512211723.jBLHNEmX032475@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	hdf.spec 
Log Message:
Rebuild



Index: hdf.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf/devel/hdf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hdf.spec	5 Oct 2005 15:05:50 -0000	1.4
+++ hdf.spec	21 Dec 2005 17:22:42 -0000	1.5
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -73,6 +73,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski  4.2r1-6
+- Rebuild
+
 * Wed Oct 05 2005 Orion Poplawski  4.2r1-5
 - Add Requires: libjpeg-devel zlib-devel to -devel package
 



From fedora-extras-commits at redhat.com  Wed Dec 21 17:23:13 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 12:23:13 -0500
Subject: rpms/hdf5/devel hdf5.spec,1.4,1.5
Message-ID: <200512211723.jBLHNk9l032523@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	hdf5.spec 
Log Message:
Rebuild



Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hdf5.spec	30 Nov 2005 20:51:45 -0000	1.4
+++ hdf5.spec	21 Dec 2005 17:23:13 -0000	1.5
@@ -1,6 +1,6 @@
 Name: hdf5
 Version: 1.6.4
-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
@@ -94,6 +94,9 @@
 %{_libdir}/*.mod
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski  1.6.4-9
+- Rebuild
+
 * Wed Nov 30 2005 Orion Poplawski  1.6.4-8
 - Package fortran files properly
 - Move compiler wrappers to devel



From fedora-extras-commits at redhat.com  Wed Dec 21 17:29:25 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 12:29:25 -0500
Subject: rpms/nethack-vultures/FC-3 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200512211729.jBLHTwkk032658@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32607/FC-3

Modified Files:
	.cvsignore sources 
Log Message:
Committing new sources files




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Dec 2005 18:32:55 -0000	1.3
+++ .cvsignore	21 Dec 2005 17:29:25 -0000	1.4
@@ -1 +1 @@
-vultures-1.11.0-full.tar.bz2
+vultures-1.11.1-full.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Dec 2005 18:32:55 -0000	1.3
+++ sources	21 Dec 2005 17:29:25 -0000	1.4
@@ -1 +1 @@
-1c9957f9c46bd1bbb096a111f04a2f48  vultures-1.11.0-full.tar.bz2
+d1456849d0d854d29c5d510382f49287  vultures-1.11.1-full.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 21 17:29:37 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 12:29:37 -0500
Subject: rpms/nethack-vultures/devel .cvsignore,1.4,1.5 sources,1.3,1.4
Message-ID: <200512211730.jBLHU9rw032666@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32607/devel

Modified Files:
	.cvsignore sources 
Log Message:
Committing new sources files




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Dec 2005 14:14:21 -0000	1.4
+++ .cvsignore	21 Dec 2005 17:29:37 -0000	1.5
@@ -1,2 +1 @@
-vultures-1.11.0-full.tar.bz2
 vultures-1.11.1-full.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Dec 2005 18:33:06 -0000	1.3
+++ sources	21 Dec 2005 17:29:37 -0000	1.4
@@ -1 +1 @@
-1c9957f9c46bd1bbb096a111f04a2f48  vultures-1.11.0-full.tar.bz2
+d1456849d0d854d29c5d510382f49287  vultures-1.11.1-full.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 21 17:29:31 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 12:29:31 -0500
Subject: rpms/nethack-vultures/FC-4 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200512211730.jBLHU3hZ032662@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-serv32607/FC-4

Modified Files:
	.cvsignore sources 
Log Message:
Committing new sources files




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Dec 2005 18:33:01 -0000	1.3
+++ .cvsignore	21 Dec 2005 17:29:31 -0000	1.4
@@ -1 +1 @@
-vultures-1.11.0-full.tar.bz2
+vultures-1.11.1-full.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Dec 2005 18:33:01 -0000	1.3
+++ sources	21 Dec 2005 17:29:31 -0000	1.4
@@ -1 +1 @@
-1c9957f9c46bd1bbb096a111f04a2f48  vultures-1.11.0-full.tar.bz2
+d1456849d0d854d29c5d510382f49287  vultures-1.11.1-full.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 21 17:46:59 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 12:46:59 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.12,1.13
Message-ID: <200512211747.jBLHlVGE000358@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv341

Modified Files:
	nethack-vultures.spec 
Log Message:
Have to up the revision to get it to retag.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nethack-vultures.spec	21 Dec 2005 06:31:05 -0000	1.12
+++ nethack-vultures.spec	21 Dec 2005 17:46:58 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           nethack-vultures
-Version:        1.11.1
+Version:        1.11.2
 Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 



From fedora-extras-commits at redhat.com  Wed Dec 21 19:34:56 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 21 Dec 2005 14:34:56 -0500
Subject: rpms/wesnoth/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 wesnoth.spec, 1.24, 1.25
Message-ID: <200512211935.jBLJZT2O004233@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
* Wed Dec 21 2005 Michael Schwendt  - 1.0.2-1
- update to 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Oct 2005 12:07:38 -0000	1.12
+++ .cvsignore	21 Dec 2005 19:34:55 -0000	1.13
@@ -1 +1 @@
-wesnoth-1.0.1.tar.gz
+wesnoth-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Oct 2005 12:07:38 -0000	1.12
+++ sources	21 Dec 2005 19:34:55 -0000	1.13
@@ -1 +1 @@
-20a2498938a168bf6a0989af857da500  wesnoth-1.0.1.tar.gz
+1d2a26062ce1c90cbf10845023f9435c  wesnoth-1.0.2.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wesnoth.spec	23 Oct 2005 12:07:38 -0000	1.24
+++ wesnoth.spec	21 Dec 2005 19:34:55 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           wesnoth
-Version:        1.0.1
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
@@ -158,6 +158,9 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Wed Dec 21 2005 Michael Schwendt  - 1.0.2-1
+- update to 1.0.2
+
 * Sat Oct 22 2005 Michael Schwendt  - 1.0.1-1
 - update to 1.0.1
 



From fedora-extras-commits at redhat.com  Wed Dec 21 19:47:38 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 14:47:38 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.12,1.13
Message-ID: <200512211948.jBLJmB9U004349@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4302/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the revision numbers in hopes of this prodding plague to use the
correct source package.  The problem is that for some reason, the server
keeps downloading the wrong source package, which causes a build failure. 
I'm not sure why it's doing that.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nethack-vultures.spec	21 Dec 2005 06:30:52 -0000	1.12
+++ nethack-vultures.spec	21 Dec 2005 19:47:38 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -162,7 +162,10 @@
 
 
 %changelog
-* Thu Dec 20 2005 Karen Pease  - 1.11.1-1
+* Wed Dec 21 2005 Karen Pease  - 1.11.1-2
+- Upped revision to try to get package to build on the server.
+
+* Tue Dec 20 2005 Karen Pease  - 1.11.1-1
 - Upgraded source package; fixes some keyboard bugs and problems for 64bit/big endian machines concerning transparency.
 
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-8



From fedora-extras-commits at redhat.com  Wed Dec 21 19:47:44 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 14:47:44 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.13,1.14
Message-ID: <200512211948.jBLJmGqd004352@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-serv4302/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the revision numbers in hopes of this prodding plague to use the
correct source package.  The problem is that for some reason, the server
keeps downloading the wrong source package, which causes a build failure. 
I'm not sure why it's doing that.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nethack-vultures.spec	21 Dec 2005 06:30:59 -0000	1.13
+++ nethack-vultures.spec	21 Dec 2005 19:47:44 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -162,7 +162,10 @@
 
 
 %changelog
-* Thu Dec 20 2005 Karen Pease  - 1.11.1-1
+* Wed Dec 21 2005 Karen Pease  - 1.11.1-2
+- Upped revision to try to get package to build on the server.
+
+* Tue Dec 20 2005 Karen Pease  - 1.11.1-1
 - Upgraded source package; fixes some keyboard bugs and problems for 64bit/big endian machines concerning transparency.
 
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-8



From fedora-extras-commits at redhat.com  Wed Dec 21 19:47:50 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 14:47:50 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.13,1.14
Message-ID: <200512211948.jBLJmMDD004355@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4302/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the revision numbers in hopes of this prodding plague to use the
correct source package.  The problem is that for some reason, the server
keeps downloading the wrong source package, which causes a build failure. 
I'm not sure why it's doing that.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nethack-vultures.spec	21 Dec 2005 17:46:58 -0000	1.13
+++ nethack-vultures.spec	21 Dec 2005 19:47:50 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.2
-Release:        1%{?dist}
+Version:        1.11.1
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -162,7 +162,10 @@
 
 
 %changelog
-* Thu Dec 20 2005 Karen Pease  - 1.11.1-1
+* Wed Dec 21 2005 Karen Pease  - 1.11.1-2
+- Upped revision to try to get package to build on the server.
+
+* Tue Dec 20 2005 Karen Pease  - 1.11.1-1
 - Upgraded source package; fixes some keyboard bugs and problems for 64bit/big endian machines concerning transparency.
 
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-8



From fedora-extras-commits at redhat.com  Wed Dec 21 20:44:36 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 15:44:36 -0500
Subject: rpms/hdf5/FC-4 hdf5-1.6.5-h5diff_attr.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 hdf5.spec, 1.4, 1.5 sources, 1.2,
	1.3 hdf5-1.6.4-h5diff_attr.patch, 1.1, NONE
Message-ID: <200512212045.jBLKj8cD006262@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore hdf5.spec sources 
Added Files:
	hdf5-1.6.5-h5diff_attr.patch 
Removed Files:
	hdf5-1.6.4-h5diff_attr.patch 
Log Message:
Update to 1.6.5


hdf5-1.6.5-h5diff_attr.patch:

--- NEW FILE hdf5-1.6.5-h5diff_attr.patch ---
--- hdf5-1.6.5/tools/lib/h5diff_attr.c.orig	2005-12-21 12:08:45.000000000 -0700
+++ hdf5-1.6.5/tools/lib/h5diff_attr.c	2005-12-21 12:11:17.000000000 -0700
@@ -61,8 +61,8 @@
  int        rank2;        /* rank of dataset */
  hsize_t    dims1[H5S_MAX_RANK];/* dimensions of dataset */
  hsize_t    dims2[H5S_MAX_RANK];/* dimensions of dataset */
- char       name1[255];
- char       name2[255];
+ char       name1[255],np1[512];
+ char       name2[255],np2[512];
  int        n1, n2, i, j;
  int        ret=0;
  hsize_t    nfound;
@@ -196,21 +196,21 @@
  * array compare
  *-------------------------------------------------------------------------
  */
- sprintf(name1,"%s of <%s>",name1,path1);
- sprintf(name2,"%s of <%s>",name2,path2);
+ snprintf(np1,sizeof(np1),"%s of <%s>",name1,path1);
+ snprintf(np2,sizeof(np2),"%s of <%s>",name2,path2);
 
  /* always print name */
  if (options->m_verbose)
  {
-  printf( "Attribute:   <%s> and <%s>\n",name1,name2);
+  printf( "Attribute:   <%s> and <%s>\n",np1,np2);
   nfound = diff_array(buf1,
                      buf2,
                      nelmts1,
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -230,8 +230,8 @@
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -239,15 +239,15 @@
    options->m_quiet=0;
    if (nfound)
    {
-    printf( "Attribute:   <%s> and <%s>\n",name1,name2);
+    printf( "Attribute:   <%s> and <%s>\n",np1,np2);
     nfound = diff_array(buf1,
                      buf2,
                      nelmts1,
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -263,8 +263,8 @@
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hdf5/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Jul 2005 20:20:17 -0000	1.2
+++ .cvsignore	21 Dec 2005 20:44:35 -0000	1.3
@@ -1 +1 @@
-hdf5-1.6.4.tar.gz
+hdf5-1.6.5.tar.gz


Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/FC-4/hdf5.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hdf5.spec	30 Nov 2005 20:56:29 -0000	1.4
+++ hdf5.spec	21 Dec 2005 20:44:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name: hdf5
-Version: 1.6.4
-Release: 5%{?dist}
+Version: 1.6.5
+Release: 1%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -10,7 +10,7 @@
 Patch1: hdf5-1.6.4-destdir.patch
 Patch2: hdf5-1.6.4-norpath.patch
 Patch3: hdf5-1.6.4-testh5repack.patch
-Patch4: hdf5-1.6.4-h5diff_attr.patch
+Patch4: hdf5-1.6.5-h5diff_attr.patch
 Patch5: hdf5-1.6.4-ppc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gfortran >= 4.0.2, krb5-devel, openssl-devel, zlib-devel
@@ -75,6 +75,7 @@
 %{_bindir}/h5import
 %{_bindir}/h5jam
 %{_bindir}/h5ls
+%{_bindir}/h5perf
 %{_bindir}/h5repack
 %{_bindir}/h5repart
 %{_bindir}/h5unjam
@@ -93,6 +94,9 @@
 %{_libdir}/*.mod
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski  1.6.5-1
+- Update to 1.6.5
+
 * Wed Nov 30 2005 Orion Poplawski  1.6.4-5
 - Enable fortran, require fixed gfortran version
 - Add patch for fortran compilation on ppc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hdf5/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Jul 2005 20:20:17 -0000	1.2
+++ sources	21 Dec 2005 20:44:35 -0000	1.3
@@ -1 +1 @@
-a837391b633fc4c6681905d89047c032  hdf5-1.6.4.tar.gz
+67187b3253b89f1f41756b7fd4396ecf  hdf5-1.6.5.tar.gz


--- hdf5-1.6.4-h5diff_attr.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 20:57:24 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 15:57:24 -0500
Subject: rpms/hdf5/FC-4 hdf5.spec,1.5,1.6
Message-ID: <200512212057.jBLKvuWt006365@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	hdf5.spec 
Log Message:
We need time now



Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/FC-4/hdf5.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hdf5.spec	21 Dec 2005 20:44:35 -0000	1.5
+++ hdf5.spec	21 Dec 2005 20:57:24 -0000	1.6
@@ -13,7 +13,7 @@
 Patch4: hdf5-1.6.5-h5diff_attr.patch
 Patch5: hdf5-1.6.4-ppc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gcc-gfortran >= 4.0.2, krb5-devel, openssl-devel, zlib-devel
+BuildRequires: gcc-gfortran >= 4.0.2, krb5-devel, openssl-devel, zlib-devel, time
 
 %description
 HDF5 is a general purpose library and file format for storing scientific data.



From fedora-extras-commits at redhat.com  Wed Dec 21 21:07:35 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 16:07:35 -0500
Subject: rpms/hdf5/devel hdf5-1.6.5-h5diff_attr.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 hdf5.spec, 1.5, 1.6 sources, 1.2,
	1.3 hdf5-1.6.4-h5diff_attr.patch, 1.1, NONE
Message-ID: <200512212108.jBLL8C9t008069@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore hdf5.spec sources 
Added Files:
	hdf5-1.6.5-h5diff_attr.patch 
Removed Files:
	hdf5-1.6.4-h5diff_attr.patch 
Log Message:
Update to 1.6.5


hdf5-1.6.5-h5diff_attr.patch:

--- NEW FILE hdf5-1.6.5-h5diff_attr.patch ---
--- hdf5-1.6.5/tools/lib/h5diff_attr.c.orig	2005-12-21 12:08:45.000000000 -0700
+++ hdf5-1.6.5/tools/lib/h5diff_attr.c	2005-12-21 12:11:17.000000000 -0700
@@ -61,8 +61,8 @@
  int        rank2;        /* rank of dataset */
  hsize_t    dims1[H5S_MAX_RANK];/* dimensions of dataset */
  hsize_t    dims2[H5S_MAX_RANK];/* dimensions of dataset */
- char       name1[255];
- char       name2[255];
+ char       name1[255],np1[512];
+ char       name2[255],np2[512];
  int        n1, n2, i, j;
  int        ret=0;
  hsize_t    nfound;
@@ -196,21 +196,21 @@
  * array compare
  *-------------------------------------------------------------------------
  */
- sprintf(name1,"%s of <%s>",name1,path1);
- sprintf(name2,"%s of <%s>",name2,path2);
+ snprintf(np1,sizeof(np1),"%s of <%s>",name1,path1);
+ snprintf(np2,sizeof(np2),"%s of <%s>",name2,path2);
 
  /* always print name */
  if (options->m_verbose)
  {
-  printf( "Attribute:   <%s> and <%s>\n",name1,name2);
+  printf( "Attribute:   <%s> and <%s>\n",np1,np2);
   nfound = diff_array(buf1,
                      buf2,
                      nelmts1,
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -230,8 +230,8 @@
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -239,15 +239,15 @@
    options->m_quiet=0;
    if (nfound)
    {
-    printf( "Attribute:   <%s> and <%s>\n",name1,name2);
+    printf( "Attribute:   <%s> and <%s>\n",np1,np2);
     nfound = diff_array(buf1,
                      buf2,
                      nelmts1,
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -263,8 +263,8 @@
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Jul 2005 20:20:17 -0000	1.2
+++ .cvsignore	21 Dec 2005 21:07:16 -0000	1.3
@@ -1 +1 @@
-hdf5-1.6.4.tar.gz
+hdf5-1.6.5.tar.gz


Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hdf5.spec	21 Dec 2005 17:23:13 -0000	1.5
+++ hdf5.spec	21 Dec 2005 21:07:16 -0000	1.6
@@ -1,6 +1,6 @@
 Name: hdf5
-Version: 1.6.4
-Release: 9%{?dist}
+Version: 1.6.5
+Release: 1%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -10,10 +10,10 @@
 Patch1: hdf5-1.6.4-destdir.patch
 Patch2: hdf5-1.6.4-norpath.patch
 Patch3: hdf5-1.6.4-testh5repack.patch
-Patch4: hdf5-1.6.4-h5diff_attr.patch
+Patch4: hdf5-1.6.5-h5diff_attr.patch
 Patch5: hdf5-1.6.4-ppc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran
+BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
 
 %description
 HDF5 is a general purpose library and file format for storing scientific data.
@@ -76,6 +76,7 @@
 %{_bindir}/h5import
 %{_bindir}/h5jam
 %{_bindir}/h5ls
+%{_bindir}/h5perf
 %{_bindir}/h5repack
 %{_bindir}/h5repart
 %{_bindir}/h5unjam
@@ -94,6 +95,9 @@
 %{_libdir}/*.mod
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski  1.6.5-1
+- Update to 1.6.5
+
 * Wed Dec 21 2005 Orion Poplawski  1.6.4-9
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Jul 2005 20:20:17 -0000	1.2
+++ sources	21 Dec 2005 21:07:16 -0000	1.3
@@ -1 +1 @@
-a837391b633fc4c6681905d89047c032  hdf5-1.6.4.tar.gz
+67187b3253b89f1f41756b7fd4396ecf  hdf5-1.6.5.tar.gz


--- hdf5-1.6.4-h5diff_attr.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 21:55:39 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 16:55:39 -0500
Subject: rpms/hdf5/FC-4 hdf5.spec,1.6,1.7
Message-ID: <200512212156.jBLLuCa8008331@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	hdf5.spec 
Log Message:
Don't ship h5perf with missing library



Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/FC-4/hdf5.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hdf5.spec	21 Dec 2005 20:57:24 -0000	1.6
+++ hdf5.spec	21 Dec 2005 21:55:39 -0000	1.7
@@ -1,6 +1,6 @@
 Name: hdf5
 Version: 1.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -52,6 +52,8 @@
 find doc/html -name '*.sh*' | xargs chmod +x
 %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir}
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings
+# Don't instal h5perf until h5test.so.0 issues is sorted out
+rm $RPM_BUILD_ROOT/%{_bindir}/h5perf
 
 %check
 make check
@@ -75,7 +77,6 @@
 %{_bindir}/h5import
 %{_bindir}/h5jam
 %{_bindir}/h5ls
-%{_bindir}/h5perf
 %{_bindir}/h5repack
 %{_bindir}/h5repart
 %{_bindir}/h5unjam
@@ -94,6 +95,9 @@
 %{_libdir}/*.mod
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski  1.6.5-2
+- Don't ship h5perf with missing library
+
 * Wed Dec 21 2005 Orion Poplawski  1.6.5-1
 - Update to 1.6.5
 



From fedora-extras-commits at redhat.com  Wed Dec 21 21:57:14 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 16:57:14 -0500
Subject: rpms/hdf5/devel hdf5.spec,1.6,1.7
Message-ID: <200512212157.jBLLvk5a008409@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	hdf5.spec 
Log Message:
Don't ship h5perf with missing library



Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hdf5.spec	21 Dec 2005 21:07:16 -0000	1.6
+++ hdf5.spec	21 Dec 2005 21:57:14 -0000	1.7
@@ -1,6 +1,6 @@
 Name: hdf5
 Version: 1.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -53,6 +53,8 @@
 find doc/html -name '*.sh*' | xargs chmod +x
 %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir}
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings
+# Don't instal h5perf until h5test.so.0 issues is sorted out
+rm $RPM_BUILD_ROOT/%{_bindir}/h5perf
 
 %check
 make check
@@ -76,7 +78,6 @@
 %{_bindir}/h5import
 %{_bindir}/h5jam
 %{_bindir}/h5ls
-%{_bindir}/h5perf
 %{_bindir}/h5repack
 %{_bindir}/h5repart
 %{_bindir}/h5unjam
@@ -95,6 +96,9 @@
 %{_libdir}/*.mod
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski  1.6.5-2
+- Don't ship h5perf with missing library
+
 * Wed Dec 21 2005 Orion Poplawski  1.6.5-1
 - Update to 1.6.5
 



From fedora-extras-commits at redhat.com  Thu Dec 22 05:14:25 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 22 Dec 2005 00:14:25 -0500
Subject: rpms/kphone/devel kphone.spec,1.19,1.20
Message-ID: <200512220514.jBM5Ev5x022422@cvs-int.fedora.redhat.com>

Author: ausil

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

Modified Files:
	kphone.spec 
Log Message:
rebuild for gcc 4.1



Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kphone.spec	13 Nov 2005 02:47:30 -0000	1.19
+++ kphone.spec	22 Dec 2005 05:14:24 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -58,6 +58,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Thu Dec 22 05:35:28 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 22 Dec 2005 00:35:28 -0500
Subject: rpms/krecipes/devel krecipes.spec,1.9,1.10
Message-ID: <200512220536.jBM5a07s022516@cvs-int.fedora.redhat.com>

Author: ausil

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

Modified Files:
	krecipes.spec 
Log Message:
Rebuild for gcc 4.1



Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/krecipes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- krecipes.spec	5 Dec 2005 12:53:54 -0000	1.9
+++ krecipes.spec	22 Dec 2005 05:35:28 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           krecipes
 Version:        0.9.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
@@ -86,6 +86,8 @@
 %{_datadir}/mimelnk/*/*.desktop
 
 %changelog
+* Wed Dec 21 2005 Dennis Gilmore  - 0.9.1-3
+-Rebuild for gcc 4.1
 * Mon Dec 05 2005 Dennis Gilmore  - 0.9.1-2
 - retag because patch wasnt uploaded
 * Sun Dec 04 2005 Dennis Gilmore  - 0.9.1-1



From fedora-extras-commits at redhat.com  Thu Dec 22 08:10:34 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 03:10:34 -0500
Subject: rpms/libdap/devel libdap.spec,1.2,1.3
Message-ID: <200512220811.jBM8BL5X027747@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	libdap.spec 
Log Message:
* Thu Dec 22 2005 Patrice Dumas  - 3.5.3-3
- rebuild



Index: libdap.spec
===================================================================
RCS file: /cvs/extras/rpms/libdap/devel/libdap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libdap.spec	21 Nov 2005 22:01:19 -0000	1.2
+++ libdap.spec	22 Dec 2005 08:10:00 -0000	1.3
@@ -2,7 +2,7 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
 Version: 3.5.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 #Source0: http://www.opendap.org/pub/3.5/source/libdap-%{version}.tar.gz
 Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libdap-%{version}.tar.gz
@@ -74,6 +74,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Dec 22 2005 Patrice Dumas  - 3.5.3-3
+- rebuild
+
 * Mon Nov 21 2005 Patrice Dumas  - 3.5.3-2
 - fix Source0
 



From fedora-extras-commits at redhat.com  Thu Dec 22 08:17:04 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 03:17:04 -0500
Subject: rpms/libsx/devel libsx.spec,1.3,1.4
Message-ID: <200512220817.jBM8Hbi4027825@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	libsx.spec 
Log Message:
* Thu Dec 22 2005 Patrice Dumas  2.05-7
- rebuild



Index: libsx.spec
===================================================================
RCS file: /cvs/extras/rpms/libsx/devel/libsx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsx.spec	16 Nov 2005 22:40:22 -0000	1.3
+++ libsx.spec	22 Dec 2005 08:17:04 -0000	1.4
@@ -1,7 +1,7 @@
 Name:           libsx
 Summary:        Simple X library
 Version:        2.05
-Release:        6%{?dist}
+Release:        7%{?dist}
 Group:          System Environment/Libraries
 License:        LGPL
 Url:            ftp://ftp.ac-grenoble.fr/ge/Xlibraries/
@@ -52,9 +52,8 @@
 %patch -p0 -P 5
 
 %build
-mv libsx_defs libsx_defs-old
-sed -e s/'CFLAGS = -Wall -O2 -D_POSIX_SOURCE'/"CFLAGS = %{optflags} -fPIC"/g \
-	-e 's:-L/usr/X11R6/lib::' libsx_defs-old >libsx_defs
+sed -i -e s/'CFLAGS = -Wall -O2 -D_POSIX_SOURCE'/"CFLAGS = %{optflags} -fPIC"/g \
+	-e 's:-L/usr/X11R6/lib::' libsx_defs
 make src
 
 %install
@@ -96,6 +95,9 @@
 %{_includedir}/libsx.h
 
 %changelog
+* Thu Dec 22 2005 Patrice Dumas  2.05-7
+- rebuild
+
 * Wed Nov 16 2005 Patrice Dumas  2.05-6
 - adapt for modular X
 



From fedora-extras-commits at redhat.com  Thu Dec 22 08:35:34 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 22 Dec 2005 03:35:34 -0500
Subject: rpms/scribus/devel scribus.spec,1.11,1.12
Message-ID: <200512220836.jBM8a6ou027990@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	scribus.spec 
Log Message:
* Thu Dec 22 2005 Luke Macken  - 1.2.1-6
- Rebuild against new openssl (Bug #174781)




Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scribus.spec	22 May 2005 23:16:50 -0000	1.11
+++ scribus.spec	22 Dec 2005 08:35:34 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.2.1
-Release: 5
+Release:        6
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Luke Macken  - 1.2.1-6
+- Rebuild against new openssl (Bug #174781)
+
 * Sun May 22 2005 Jeremy Katz  - 1.2.1-5
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Dec 22 08:53:10 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 22 Dec 2005 03:53:10 -0500
Subject: rpms/net6/devel .cvsignore, 1.4, 1.5 net6.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200512220853.jBM8rgI5028073@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore net6.spec sources 
Log Message:
* Thu Dec 22 2005 Luke Macken  - 1.2.2-1
- 1.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Nov 2005 05:48:40 -0000	1.4
+++ .cvsignore	22 Dec 2005 08:53:09 -0000	1.5
@@ -1 +1 @@
-net6-1.2.1.tar.gz
+net6-1.2.2.tar.gz


Index: net6.spec
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/net6.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- net6.spec	27 Nov 2005 05:51:00 -0000	1.5
+++ net6.spec	22 Dec 2005 08:53:09 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           net6
-Version:        1.2.1
-Release:        2%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        A TCP protocol abstraction for library C++
 
 Group:          Development/Libraries
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Luke Macken  - 1.2.2-1
+- 1.2.2
+
 * Sat Nov 26 2005 Luke Macken  - 1.2.1-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Nov 2005 05:48:40 -0000	1.4
+++ sources	22 Dec 2005 08:53:09 -0000	1.5
@@ -1 +1 @@
-e5e22450144b7a788955164729ef5034  net6-1.2.1.tar.gz
+8a551a2d9785b2b0ed431bb9eeb6cfd6  net6-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 08:56:58 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 22 Dec 2005 03:56:58 -0500
Subject: rpms/obby/devel .cvsignore, 1.3, 1.4 obby.spec, 1.11, 1.12 sources, 
	1.3, 1.4
Message-ID: <200512220857.jBM8vVQ0028188@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore obby.spec sources 
Log Message:
* Thu Dec 22 2005 Luke Macken  - 0.3.0-1
- 0.3.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2005 05:52:53 -0000	1.3
+++ .cvsignore	22 Dec 2005 08:56:58 -0000	1.4
@@ -1 +1 @@
-obby-0.3.0rc3.tar.gz
+obby-0.3.0.tar.gz


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/obby.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- obby.spec	27 Nov 2005 05:52:53 -0000	1.11
+++ obby.spec	22 Dec 2005 08:56:58 -0000	1.12
@@ -1,14 +1,12 @@
-%define _rc rc3
-
 Name:           obby
 Version:        0.3.0
-Release:        1.%{_rc}%{?dist}
+Release:        1%{?dist}
 Summary:        A library which provides synced document buffers
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://releases.0x539.de/obby
-Source0:        http://releases.0x539.de/obby/%{name}-%{version}%{_rc}.tar.gz
+Source0:        http://releases.0x539.de/obby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  net6-devel, gmp-devel, gettext-devel, libsigc++
@@ -31,7 +29,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{_rc}
+%setup -q
 
 
 %build
@@ -67,6 +65,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Luke Macken  - 0.3.0-1
+- 0.3.0
+
 * Sat Nov 26 2005 Luke Macken  - 0.3.0-1.rc3
 - Remove calls to aclocal and autoconf
 - Bump to 0.3.0rc3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2005 05:52:53 -0000	1.3
+++ sources	22 Dec 2005 08:56:58 -0000	1.4
@@ -1 +1 @@
-7f6eae742cd20ceb239604bd2415a09a  obby-0.3.0rc3.tar.gz
+b14135018a3093395296cf091f9f824f  obby-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 08:59:49 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 03:59:49 -0500
Subject: rpms/tetex-tex4ht/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tetex-tex4ht.spec, 1.1, 1.2
Message-ID: <200512220900.jBM90MeZ028237@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/tetex-tex4ht/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28207

Modified Files:
	.cvsignore sources tetex-tex4ht.spec 
Log Message:
* Thu Dec 22 2005 Patrice Dumas  - 1.0.2005_12_21_0412-1
- update



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Nov 2005 23:21:46 -0000	1.2
+++ .cvsignore	22 Dec 2005 08:59:49 -0000	1.3
@@ -1,2 +1,2 @@
-tex4ht-1.0.2005_11_06_1516.tar.gz
 tex4ht-all-20050228.zip
+tex4ht-1.0.2005_12_21_0412.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Nov 2005 23:21:46 -0000	1.2
+++ sources	22 Dec 2005 08:59:49 -0000	1.3
@@ -1,2 +1,2 @@
-9e32056c20f02f39986aef5f7cdbff09  tex4ht-1.0.2005_11_06_1516.tar.gz
 26eb8df2d6631794b3df0d6fb87a0219  tex4ht-all-20050228.zip
+4c7eaa6719f8d4a2acdce1e766dd49f2  tex4ht-1.0.2005_12_21_0412.tar.gz


Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tetex-tex4ht.spec	15 Nov 2005 23:21:46 -0000	1.1
+++ tetex-tex4ht.spec	22 Dec 2005 08:59:49 -0000	1.2
@@ -2,8 +2,8 @@
 
 Summary:       Translates TeX and LaTeX into HTML or XML+MathML
 Name:          tetex-tex4ht
-Version:       1.0.2005_11_06_1516
-Release:       3%{?dist}
+Version:       1.0.2005_12_21_0412
+Release:       1%{?dist}
 License:       LaTeX Project Public License
 Group:         Applications/Publishing
 URL:           http://www.cse.ohio-state.edu/~gurari/TeX4ht/
@@ -11,7 +11,7 @@
 # Source1 is only used for documentation
 # renamed to tex4ht-all-YYYYMMDD.zip - based on last timestamp in directory
 Source1: tex4ht-all-20050228.zip
-# unversioned upstream source
+# unversioned upstream source, downloaded with wget -N
 #Source1 http://www.cse.ohio-state.edu/~gurari/TeX4ht/tex4ht-all.zip
 Source2:       tex4ht-lppl.txt
 Patch0:        tex4ht-env.patch
@@ -103,6 +103,9 @@
 texhash > /dev/null 2>&1 || :
 
 %changelog
+* Thu Dec 22 2005 Patrice Dumas  - 1.0.2005_12_21_0412-1
+- update
+
 * Mon Nov 14 2005 Patrice Dumas  - 1.0.2005_11_06_1516-3
 - add Requires for ImageMagick
 



From fedora-extras-commits at redhat.com  Thu Dec 22 09:13:30 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 22 Dec 2005 04:13:30 -0500
Subject: rpms/gobby/devel .cvsignore, 1.3, 1.4 gobby.spec, 1.3, 1.4 sources, 
	1.3, 1.4
Message-ID: <200512220914.jBM9ERoU030363@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore gobby.spec sources 
Log Message:
* Thu Dec 22 2005 Luke Macken  - 0.3.0-1
- 0.3.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2005 05:54:42 -0000	1.3
+++ .cvsignore	22 Dec 2005 09:13:30 -0000	1.4
@@ -1 +1 @@
-gobby-0.3.0rc3.tar.gz
+gobby-0.3.0.tar.gz


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/gobby.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gobby.spec	27 Nov 2005 05:54:42 -0000	1.3
+++ gobby.spec	22 Dec 2005 09:13:30 -0000	1.4
@@ -1,14 +1,12 @@
-%define _rc rc3
-
 Name:           gobby
 Version:        0.3.0
-Release:        1.%{_rc}%{?dist}
+Release:        1%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gobby.0x539.de
-Source0:        http://releases.0x539.de/gobby/%{name}-%{version}%{_rc}.tar.gz
+Source0:        http://releases.0x539.de/gobby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
@@ -27,7 +25,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{_rc}
+%setup -q
 
 
 %build
@@ -68,6 +66,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Luke Macken  - 0.3.0-1
+- 0.3.0
+
 * Sat Nov 26 2005 Luke Macken  - 0.3.0-1.rc3
 - Bump to 0.3.0rc3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2005 05:54:42 -0000	1.3
+++ sources	22 Dec 2005 09:13:30 -0000	1.4
@@ -1 +1 @@
-59f6b9b7076cb6f23fad054554eedb6a  gobby-0.3.0rc3.tar.gz
+1b674f42654cc1960d37e0a6a2fcff1f  gobby-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 09:14:32 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 22 Dec 2005 04:14:32 -0500
Subject: rpms/sobby/devel .cvsignore, 1.2, 1.3 sobby.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <200512220915.jBM9FgAX030595@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore sobby.spec sources 
Log Message:
* Thu Dec 22 2005 Luke Macken  - 0.3.0-1
- 0.3.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sobby/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2005 15:20:52 -0000	1.2
+++ .cvsignore	22 Dec 2005 09:14:32 -0000	1.3
@@ -1 +1 @@
-sobby-0.3.0rc3.tar.gz
+sobby-0.3.0.tar.gz


Index: sobby.spec
===================================================================
RCS file: /cvs/extras/rpms/sobby/devel/sobby.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sobby.spec	12 Dec 2005 15:20:52 -0000	1.1
+++ sobby.spec	22 Dec 2005 09:14:32 -0000	1.2
@@ -1,14 +1,12 @@
-%define _rc rc3
-
 Name:           sobby
 Version:        0.3.0
-Release:        1.%{_rc}%{?dist}
+Release:        1%{?dist}
 Summary:        Standalone obby server
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gobby.0x539.de
-Source0:        http://releases.0x539.de/sobby/%{name}-%{version}%{_rc}.tar.gz
+Source0:        http://releases.0x539.de/sobby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  obby-devel, glibmm24-devel
@@ -18,7 +16,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{_rc}
+%setup -q
 
 
 %build
@@ -42,5 +40,8 @@
 
 
 %changelog
+* Thu Dec 22 2005 Luke Macken  - 0.3.0-1
+- 0.3.0
+
 * Wed Dec 07 2005 Luke Macken  - 0.3.0-1.rc3
 - Packaged for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sobby/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2005 15:20:52 -0000	1.2
+++ sources	22 Dec 2005 09:14:32 -0000	1.3
@@ -1 +1 @@
-8c3538992f83527cfb9f0a42a9e2ed87  sobby-0.3.0rc3.tar.gz
+5408fc08d610be5aac4476c6ea6277f9  sobby-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 09:16:44 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 04:16:44 -0500
Subject: rpms/pam_ssh/devel pam_ssh.spec,1.7,1.8
Message-ID: <200512220917.jBM9HG2O030658@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	pam_ssh.spec 
Log Message:
* Thu Dec 22 2005 Patrice Dumas  - 1.91-12
- rebuild



Index: pam_ssh.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_ssh/devel/pam_ssh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pam_ssh.spec	13 Nov 2005 20:08:11 -0000	1.7
+++ pam_ssh.spec	22 Dec 2005 09:16:43 -0000	1.8
@@ -1,6 +1,6 @@
 Name: pam_ssh
 Version: 1.91
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: PAM module for use with SSH keys and ssh-agent
 Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2
 URL: http://sourceforge.net/projects/pam-ssh/
@@ -54,6 +54,9 @@
 %dir %{_localstatedir}/run/pam_ssh
 
 %changelog
+* Thu Dec 22 2005 Patrice Dumas  - 1.91-12
+- rebuild
+
 * Sun Nov 13 2005  1.91-11
 - add patch to include openssl/md5.h 
 



From fedora-extras-commits at redhat.com  Thu Dec 22 09:23:45 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 04:23:45 -0500
Subject: rpms/libnet/devel libnet.spec,1.5,1.6
Message-ID: <200512220924.jBM9OHAI030782@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	libnet.spec 
Log Message:
* Thu Dec 22 2005 Patrice Dumas  - 1.1.2.1-7
- rebuild



Index: libnet.spec
===================================================================
RCS file: /cvs/extras/rpms/libnet/devel/libnet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libnet.spec	12 Sep 2005 20:07:13 -0000	1.5
+++ libnet.spec	22 Dec 2005 09:23:45 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:        C library for portable packet creation and injection
 Name:           libnet
 Version:        1.1.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        BSD
 Group:          System Environment/Libraries
 URL:            http://www.packetfactory.net/libnet/
@@ -71,6 +71,9 @@
 %{_mandir}/man3/libnet*
 
 %changelog
+* Thu Dec 22 2005 Patrice Dumas  - 1.1.2.1-7
+- rebuild
+
 * Mon Sep 12 2005 Patrice Dumas  1.1.2.1-6
 - bump release and add dist tag
 



From fedora-extras-commits at redhat.com  Thu Dec 22 09:32:55 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 04:32:55 -0500
Subject: rpms/cernlib/devel cernlib.spec,1.15,1.16
Message-ID: <200512220933.jBM9XRNl030856@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
adjust link in cfortran dir


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cernlib.spec	21 Dec 2005 10:33:40 -0000	1.15
+++ cernlib.spec	22 Dec 2005 09:32:55 -0000	1.16
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.3
+Release:       11%{?dist}.4
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -617,7 +617,7 @@
 # add links for cfortran header files in the top include directory
 pushd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
 for file in *.h; do
-	%{__ln_s} $file cfortran/$file
+	%{__ln_s} ../$file cfortran/$file
 done
 %{__ln_s} gxint321.f gxint.f
 popd
@@ -712,7 +712,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11.3
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.4
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Thu Dec 22 09:35:01 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 04:35:01 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.21,1.22
Message-ID: <200512220935.jBM9ZYdj030923@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
adjust link in cfortran dir


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cernlib.spec	21 Dec 2005 08:11:26 -0000	1.21
+++ cernlib.spec	22 Dec 2005 09:35:01 -0000	1.22
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.2
+Release:       11%{?dist}.4
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -614,7 +614,7 @@
 # add links for cfortran header files in the top include directory
 pushd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
 for file in *.h; do
-	%{__ln_s} $file cfortran/$file
+	%{__ln_s} ../$file cfortran/$file
 done
 %{__ln_s} gxint321.f gxint.f
 popd
@@ -709,7 +709,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11.2
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.4
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Thu Dec 22 09:38:53 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 04:38:53 -0500
Subject: rpms/cernlib/FC-3 cernlib.spec,1.16,1.17
Message-ID: <200512220939.jBM9dPXu030988@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
adjust link in cfortran dir


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cernlib.spec	21 Dec 2005 08:08:59 -0000	1.16
+++ cernlib.spec	22 Dec 2005 09:38:53 -0000	1.17
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.2
+Release:       11%{?dist}.4
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -613,7 +613,7 @@
 # add links for cfortran header files in the top include directory
 pushd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
 for file in *.h; do
-	%{__ln_s} $file cfortran/$file
+	%{__ln_s} ../$file cfortran/$file
 done
 %{__ln_s} gxint321.f gxint.f
 popd
@@ -708,7 +708,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11.2
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.4
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Thu Dec 22 09:44:22 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 04:44:22 -0500
Subject: rpms/pam_ssh/devel pam_ssh-1.91-include_syslog.diff, NONE,
	1.1 pam_ssh.spec, 1.8, 1.9
Message-ID: <200512220944.jBM9is12031057@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	pam_ssh.spec 
Added Files:
	pam_ssh-1.91-include_syslog.diff 
Log Message:
* Thu Dec 22 2005 Patrice Dumas  - 1.91-13
- add patch to include syslog.h


pam_ssh-1.91-include_syslog.diff:

--- NEW FILE pam_ssh-1.91-include_syslog.diff ---
--- pam_ssh-1.91/pam_ssh.c	2004-04-12 15:55:08.000000000 +0200
+++ pam_ssh-1.91-pat/pam_ssh.c	2005-12-22 10:37:21.000000000 +0100
@@ -63,6 +63,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define PAM_SM_AUTH
 #define PAM_SM_SESSION


Index: pam_ssh.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_ssh/devel/pam_ssh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pam_ssh.spec	22 Dec 2005 09:16:43 -0000	1.8
+++ pam_ssh.spec	22 Dec 2005 09:44:22 -0000	1.9
@@ -1,6 +1,6 @@
 Name: pam_ssh
 Version: 1.91
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: PAM module for use with SSH keys and ssh-agent
 Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2
 URL: http://sourceforge.net/projects/pam-ssh/
@@ -8,6 +8,7 @@
 Patch1: pam_ssh-1.91-var_run.patch
 Patch2: pam_ssh-1.91-man_agent_files.diff
 Patch3: pam_ssh-1.91-include_md5.diff
+Patch4: pam_ssh-1.91-include_syslog.diff
 
 License: BSD
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,6 +30,7 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure  --with-pam-dir=/%{_lib}/security/
@@ -54,8 +56,8 @@
 %dir %{_localstatedir}/run/pam_ssh
 
 %changelog
-* Thu Dec 22 2005 Patrice Dumas  - 1.91-12
-- rebuild
+* Thu Dec 22 2005 Patrice Dumas  - 1.91-13
+- add patch to include syslog.h
 
 * Sun Nov 13 2005  1.91-11
 - add patch to include openssl/md5.h 



From fedora-extras-commits at redhat.com  Thu Dec 22 10:30:14 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 05:30:14 -0500
Subject: rpms/intuitively/devel intuitively.spec,1.2,1.3
Message-ID: <200512221030.jBMAUl9m000433@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	intuitively.spec 
Log Message:
* Thu Dec 22 2005 Patrice Dumas  0.7-7
- rebuild



Index: intuitively.spec
===================================================================
RCS file: /cvs/extras/rpms/intuitively/devel/intuitively.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- intuitively.spec	2 Dec 2005 14:18:35 -0000	1.2
+++ intuitively.spec	22 Dec 2005 10:30:14 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:      Automatic IP detection utility
 Name:         intuitively
 Version:      0.7
-Release:      6%{?dist}
+Release:      7%{?dist}
 URL:          http://home.samfundet.no/~tfheen/intuitively.html
 Source0:      http://ftp.debian.org/debian/pool/main/i/intuitively/intuitively_%{version}.orig.tar.gz
 License:      GPL
@@ -31,7 +31,7 @@
 %configure
 make %{?_smp_mflags}
 
-#  re-create man pages (it has a gabage due to wrong docbook2man invoking)
+# re-create man pages (it has a garbage due to wrong docbook2man invoking)
 pushd doc
 docbook2man intuitively.sgml
 docbook2man intuitively.conf.sgml
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Patrice Dumas  0.7-7
+- rebuild
+
 * Mon Nov 28 2005 Patrice Dumas  0.7-6
 - all changes are from Dmitry Butskoy
 - use a sed one-liner instead of Patch1



From fedora-extras-commits at redhat.com  Thu Dec 22 11:25:36 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Thu, 22 Dec 2005 06:25:36 -0500
Subject: rpms/recode/devel recode.spec,1.5,1.6
Message-ID: <200512221126.jBMBQ9sg002224@cvs-int.fedora.redhat.com>

Author: zkota

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

Modified Files:
	recode.spec 
Log Message:
Rebuild.



Index: recode.spec
===================================================================
RCS file: /cvs/extras/rpms/recode/devel/recode.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- recode.spec	26 Aug 2005 21:55:10 -0000	1.5
+++ recode.spec	22 Dec 2005 11:25:36 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Conversion between character sets and surfaces
 Name: recode
 Version: 3.6
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPL
 Group: Applications/File
 Source: http://recode.progiciels-bpi.ca/archives/recode-%{version}.tar.gz
@@ -87,6 +87,9 @@
 %{_includedir}/*
 
 %changelog
+* Thu Dec 22 2005 Zoltan Kota  3.6-20
+- rebuild
+
 * Fri Aug 26 2005 Zoltan Kota  3.6-19
 - fix requires
 - disable static libs and remove libtool archives



From fedora-extras-commits at redhat.com  Thu Dec 22 11:36:34 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 22 Dec 2005 06:36:34 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.26,1.27
Message-ID: <200512221137.jBMBb6jC002355@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	Inventor.spec 
Log Message:
Reflect mesa packages bugs reported to be fixed.


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Inventor.spec	14 Dec 2005 09:45:41 -0000	1.26
+++ Inventor.spec	22 Dec 2005 11:36:34 -0000	1.27
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        16%{?dist}
+Release:        17%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -41,7 +41,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libGLU-devel
-BuildRequires:  libGL-devel
 BuildRequires:	libGLw-devel
 # Work around to xorg-x11-proto-devel missing to require X11/Xauth.h
 BuildRequires:	libXau-devel
@@ -72,10 +71,6 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	libGLU-devel
-# PR #175253: libGLU-devel should implicitly pull-in libGL-devel
-Requires:	libGL-devel
-# PR #173712: libGL-devel should implicitly pull-in libX11-devel
-Requires:	libX11-devel
 Requires:	freetype-devel libjpeg-devel
 
 %description    devel
@@ -312,6 +307,10 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Thu Dec 21 2005 Ralf Cors??pius  - 2.1.5-17
+- Remove BR: libX11-devel (#173712 reported to be fixed).
+- Remove BR: libGL-devel (#175253 reported to be fixed).
+
 * Wed Dec 14 2005 Ralf Corsepius  - 2.1.5-16
 - Remove BR: libXext-devel (Impl. R'd by openmotif-devel).
 - Remove BR: xorg-x11-proto-devel (PR #175256).



From fedora-extras-commits at redhat.com  Thu Dec 22 11:37:44 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 22 Dec 2005 06:37:44 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.27,1.28
Message-ID: <200512221138.jBMBcHfb002399@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	Inventor.spec 
Log Message:
I love changelogs ;)


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Inventor.spec	22 Dec 2005 11:36:34 -0000	1.27
+++ Inventor.spec	22 Dec 2005 11:37:44 -0000	1.28
@@ -307,7 +307,7 @@
 %{_libdir}/Inventor/examples
 
 %changelog
-* Thu Dec 21 2005 Ralf Cors??pius  - 2.1.5-17
+* Thu Dec 22 2005 Ralf Cors??pius  - 2.1.5-17
 - Remove BR: libX11-devel (#173712 reported to be fixed).
 - Remove BR: libGL-devel (#175253 reported to be fixed).
 



From fedora-extras-commits at redhat.com  Thu Dec 22 11:41:43 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 22 Dec 2005 06:41:43 -0500
Subject: rpms/Coin2/devel Coin2.spec,1.23,1.24
Message-ID: <200512221142.jBMBgFTr002499@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	Coin2.spec 
Log Message:
- Remove hacks to mesa/X11 packaging bugs now reported to be fixed.



Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Coin2.spec	15 Dec 2005 13:46:07 -0000	1.23
+++ Coin2.spec	22 Dec 2005 11:41:43 -0000	1.24
@@ -13,7 +13,7 @@
 Summary: High-level 3D visualization library
 Name: Coin2
 Version: 2.4.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -29,12 +29,6 @@
 BuildRequires: libGLU-devel
 BuildRequires: libXext-devel
 
-# Workarounds to dependency bugs in modular X:
-# Missing in libGLU-devel
-BuildRequires: libGL-devel
-# Missing in libGL-devel, libXext-devel
-BuildRequires: libX11-devel
-
 BuildRequires: zlib-devel
 BuildRequires: bzip2-devel
 BuildRequires: fontconfig-devel
@@ -55,9 +49,6 @@
 Requires: %{name} = %{version}-%{release}
 Requires: zlib-devel bzip2-devel
 Requires: libGLU-devel
-Requires: libGL-devel
-# Missing in libGL-devel, libXext-devel
-BuildRequires: libX11-devel
 
 %description devel
 Development package for Coin
@@ -124,6 +115,9 @@
 %doc %{coin_htmldir}
 
 %changelog
+* Thu Dec 22 2005 Ralf Corsepius  - 2.4.4-6
+- Remove hacks to mesa/X11 packaging bugs now reported to be fixed.
+
 * Thu Dec 15 2005 Ralf Corsepius  - 2.4.4-5
 - More hacks for modular X11.
 - Add Coin-2.4.4-gcc-4.1.diff.



From fedora-extras-commits at redhat.com  Thu Dec 22 11:48:06 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Thu, 22 Dec 2005 06:48:06 -0500
Subject: rpms/python-bibtex/devel python-bibtex.spec,1.8,1.9
Message-ID: <200512221148.jBMBmceB002635@cvs-int.fedora.redhat.com>

Author: zkota

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

Modified Files:
	python-bibtex.spec 
Log Message:
Rebuild.



Index: python-bibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/python-bibtex/devel/python-bibtex.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-bibtex.spec	14 Oct 2005 21:37:25 -0000	1.8
+++ python-bibtex.spec	22 Dec 2005 11:48:06 -0000	1.9
@@ -5,7 +5,7 @@
 Summary: Python extension to parse BibTeX files
 Name: python-bibtex
 Version: 1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Libraries
 Source: http://dl.sf.net/pybliographer/python-bibtex-1.2.2.tar.gz
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Zoltan Kota  - 1.2.2-2
+- rebuild
+
 * Fri Oct 14 2005 Zoltan Kota  - 1.2.2-1
 - update to 1.2.2
 - add dist tag



From fedora-extras-commits at redhat.com  Thu Dec 22 12:02:03 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 22 Dec 2005 07:02:03 -0500
Subject: rpms/Coin2/FC-4 Coin-2.4.4-gcc-4.1.diff,NONE,1.1
Message-ID: <200512221202.jBMC2TRk004370@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Added Files:
	Coin-2.4.4-gcc-4.1.diff 
Log Message:
New.

Coin-2.4.4-gcc-4.1.diff:

--- NEW FILE Coin-2.4.4-gcc-4.1.diff ---
--- Coin-2.4.4.orig/src/nodes/SoExtSelection.cpp	2005-06-09 13:35:44.000000000 +0200
+++ Coin-2.4.4/src/nodes/SoExtSelection.cpp	2005-12-15 14:14:54.000000000 +0100
@@ -348,7 +348,7 @@
     SbList coords;
     SoTimerSensor * updatetimer;
 
-    SelectionState::SelectionState(SoExtSelection * t)
+    SelectionState(SoExtSelection * t)
     {
       this->updatetimer = new SoTimerSensor(&SoExtSelectionP::timercallback, t);
       this->updatetimer->setBaseTime(SbTime::zero());
@@ -356,7 +356,7 @@
       this->reset();
     }
 
-    SelectionState::~SelectionState()
+    ~SelectionState()
     {
       delete this->updatetimer;
     }



From fedora-extras-commits at redhat.com  Thu Dec 22 12:19:30 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 22 Dec 2005 07:19:30 -0500
Subject: rpms/Coin2/FC-4 Coin2.spec,1.14,1.15
Message-ID: <200512221220.jBMCK2xQ004574@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	Coin2.spec 
Log Message:
- Add Coin-2.4.4-gcc-4.1.diff.
- Remove ancient changelog entries from spec file.




Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-4/Coin2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Coin2.spec	22 Sep 2005 07:31:34 -0000	1.14
+++ Coin2.spec	22 Dec 2005 12:19:30 -0000	1.15
@@ -13,7 +13,7 @@
 Summary: High-level 3D visualization library
 Name: Coin2
 Version: 2.4.4
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -23,6 +23,7 @@
 
 Patch0: coin-2.3.0-simage-soname.diff
 Patch1: coin-2.3.0-openal-soname.diff
+Patch2:	Coin-2.4.4-gcc-4.1.diff
 Patch5: coin-2.3.0-man3.diff
 
 BuildRequires: xorg-x11-Mesa-libGL
@@ -55,6 +56,7 @@
 %setup -q -n Coin-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch5 -p1
 
 sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \
@@ -112,6 +114,10 @@
 %doc %{coin_htmldir}
 
 %changelog
+* Thu Sep 22 2005 Ralf Cors??pius  - 2.4.4-3.1
+- Add Coin-2.4.4-gcc-4.1.diff.
+- Remove ancient changelog entries from spec file.
+
 * Thu Sep 22 2005 Ralf Corsepius  - 2.4.4-3
 - Remove simacros patch.
 - Remove libtool patch.
@@ -141,22 +147,3 @@
 - Include simacros.
 - Regenerate configure from simacros and FC3 libtool for x86_64.
 - Don't install bogusly generated manpages for dirs.
-
-* Sun Jul 4  2004 Ralf Corsepius  - 0:2.3.0-0.fdr.4
-- Let Coin-devel Require: bzip2-devel, zlib-devel.
-- Use @XX@ patterns in soname sed calls.
-- Remove Mesa from BuildRequires.
-
-* Sat Jul 3  2004 Ralf Corsepius  - 0:2.3.0-0.fdr.3
-- Disable run-time linkage for GLU, bzip2, zlib.
-- Add SONAME-hacks to simage, openal, freetype.
-- Enable static libs.
-
-* Fri Jun 25 2004 Ralf Corsepius  - 0:2.3.0-0.fdr.2
-- Fix package description.
-- Initial submission to Fedora Extra.
-
-* Thu Jun 24 2004 Ralf Corsepius  - 0:2.3.0-0.fdr.1
-- Update to 2.3.0
-- Install html docs to default installation dir (%%{_datadir}/html).
-- Remove dependency to simage.



From fedora-extras-commits at redhat.com  Thu Dec 22 13:05:14 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 22 Dec 2005 08:05:14 -0500
Subject: rpms/ktrack/devel ktrack.spec,1.12,1.13
Message-ID: <200512221305.jBMD5krk006427@cvs-int.fedora.redhat.com>

Author: ausil

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

Modified Files:
	ktrack.spec 
Log Message:
Rebuild for gcc really :)



Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/rpms/ktrack/devel/ktrack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ktrack.spec	22 May 2005 23:44:21 -0000	1.12
+++ ktrack.spec	22 Dec 2005 13:05:13 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 11.rc1.fc4
+Release: 12.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
+* Thu Dec 22 2005 Dennis Gilmore  - 0.3.0-12.rc1
+- rebuild for gcc 4.1
+
 * Sun May 22 2005 Jeremy Katz  - 0.3.0-11.rc1.fc4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Dec 22 15:03:20 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 22 Dec 2005 10:03:20 -0500
Subject: rpms/gpgme03/devel gpgme03.spec,1.12,1.13
Message-ID: <200512221504.jBMF43wi010060@cvs-int.fedora.redhat.com>

Author: ausil

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

Modified Files:
	gpgme03.spec 
Log Message:
Rebuild for gcc 4.1



Index: gpgme03.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme03/devel/gpgme03.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gpgme03.spec	18 Mar 2005 03:16:47 -0000	1.12
+++ gpgme03.spec	22 Dec 2005 15:03:19 -0000	1.13
@@ -4,7 +4,7 @@
 Summary:        GnuPG Made Easy interface library
 Name:           gpgme03
 Version:        0.3.16
-Release:        8
+Release:        9%{?dist}
 License:        GPL
 Group:          Applications/System
 Source:         ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-0.3.16.tar.gz
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Dennis Gilmore  - 0.3.16-9
+- rebuild with gcc 4.1
+
 * Fri Mar 18 2005 Michael Schwendt  - 0.3.16-8
 - Fix build for FC4.
 - Remove conflict with gpgme packages (relocate files in -devel



From fedora-extras-commits at redhat.com  Thu Dec 22 15:08:49 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 22 Dec 2005 10:08:49 -0500
Subject: rpms/konversation/devel konversation.spec,1.3,1.4
Message-ID: <200512221509.jBMF9L3a010122@cvs-int.fedora.redhat.com>

Author: ausil

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

Modified Files:
	konversation.spec 
Log Message:
Rebuild for gcc 4.1



Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- konversation.spec	23 Oct 2005 04:56:09 -0000	1.3
+++ konversation.spec	22 Dec 2005 15:08:48 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           konversation
 Version:        0.18
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
 Group:          Applications/Internet
@@ -83,18 +83,24 @@
 
 
 %changelog
+* 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
-touch --no-create %{_datadir}/icons/hicolor || :
 - http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#implementation_notes
+
 * Sun Jul 03 2005 Dennis Gilmore  - 0.18-4
 - Explicly export QT lib and include dirs  for x86_64 build issue
+
 * Tue Jun 28 2005  Dennis Gilmore  - 0.18-3
 - Destop-file-install,  change gcc4 patch  to configure  
   remove unneeded build deps.
+
 * Mon Jun 27 2005  Dennis Gilmore  - 0.18-2
 - Fix build requires,set QT, %%lang'ify LOCALE bits and HTML docs
   move automake to prep
+
 * Sat Jun 25 2005  Dennis Gilmore  - 0.18-1
 - Initial build



From fedora-extras-commits at redhat.com  Thu Dec 22 15:16:08 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 22 Dec 2005 10:16:08 -0500
Subject: rpms/gentium-fonts - New directory
Message-ID: <200512221516.jBMFGANc010262@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10254/gentium-fonts

Log Message:
Directory /cvs/extras/rpms/gentium-fonts added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 22 15:16:14 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 22 Dec 2005 10:16:14 -0500
Subject: rpms/gentium-fonts/devel - New directory
Message-ID: <200512221516.jBMFGGjU010277@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10254/gentium-fonts/devel

Log Message:
Directory /cvs/extras/rpms/gentium-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 22 15:17:14 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 22 Dec 2005 10:17:14 -0500
Subject: rpms/gentium-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512221517.jBMFHGf7010311@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10299

Added Files:
	Makefile import.log 
Log Message:
Setup of module gentium-fonts


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 22 15:17:19 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 22 Dec 2005 10:17:19 -0500
Subject: rpms/gentium-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512221517.jBMFHLTV010332@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10299/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gentium-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gentium-fonts
# $Id$
NAME := gentium-fonts
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 Dec 22 15:24:06 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 22 Dec 2005 10:24:06 -0500
Subject: rpms/perl-HTML-Template-Expr/FC-4 .cvsignore, 1.2,
	1.3 perl-HTML-Template-Expr.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512221524.jBMFOc5L010424@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10384/FC-4

Modified Files:
	.cvsignore perl-HTML-Template-Expr.spec sources 
Log Message:
* Thu Dec 22 2005 Ville Skytt??  - 0.05-1
- 0.05.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Aug 2005 20:45:12 -0000	1.2
+++ .cvsignore	22 Dec 2005 15:24:06 -0000	1.3
@@ -1 +1 @@
-HTML-Template-Expr-0.04.tar.gz
+HTML-Template-Expr-0.05.tar.gz


Index: perl-HTML-Template-Expr.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/perl-HTML-Template-Expr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-HTML-Template-Expr.spec	9 Aug 2005 20:47:57 -0000	1.2
+++ perl-HTML-Template-Expr.spec	22 Dec 2005 15:24:06 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Template-Expr
-Version:        0.04
+Version:        0.05
 Release:        1%{?dist}
 Summary:        Expression support extension for HTML::Template
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Ville Skytt??  - 0.05-1
+- 0.05.
+
 * Tue Aug  9 2005 Ville Skytt??  - 0.04-1
 - Bump for first FE build.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Aug 2005 20:45:12 -0000	1.2
+++ sources	22 Dec 2005 15:24:06 -0000	1.3
@@ -1 +1 @@
-7b34e122677342475cfde168a70d7cab  HTML-Template-Expr-0.04.tar.gz
+726e5bb49083cbf7d752767f7c3f29cf  HTML-Template-Expr-0.05.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 15:24:12 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 22 Dec 2005 10:24:12 -0500
Subject: rpms/perl-HTML-Template-Expr/devel .cvsignore, 1.2,
	1.3 perl-HTML-Template-Expr.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512221524.jBMFOiw2010429@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-HTML-Template-Expr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10384/devel

Modified Files:
	.cvsignore perl-HTML-Template-Expr.spec sources 
Log Message:
* Thu Dec 22 2005 Ville Skytt??  - 0.05-1
- 0.05.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Aug 2005 20:45:12 -0000	1.2
+++ .cvsignore	22 Dec 2005 15:24:12 -0000	1.3
@@ -1 +1 @@
-HTML-Template-Expr-0.04.tar.gz
+HTML-Template-Expr-0.05.tar.gz


Index: perl-HTML-Template-Expr.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/perl-HTML-Template-Expr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-HTML-Template-Expr.spec	9 Aug 2005 20:47:57 -0000	1.2
+++ perl-HTML-Template-Expr.spec	22 Dec 2005 15:24:12 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Template-Expr
-Version:        0.04
+Version:        0.05
 Release:        1%{?dist}
 Summary:        Expression support extension for HTML::Template
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Ville Skytt??  - 0.05-1
+- 0.05.
+
 * Tue Aug  9 2005 Ville Skytt??  - 0.04-1
 - Bump for first FE build.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Aug 2005 20:45:12 -0000	1.2
+++ sources	22 Dec 2005 15:24:12 -0000	1.3
@@ -1 +1 @@
-7b34e122677342475cfde168a70d7cab  HTML-Template-Expr-0.04.tar.gz
+726e5bb49083cbf7d752767f7c3f29cf  HTML-Template-Expr-0.05.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 15:27:18 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 22 Dec 2005 10:27:18 -0500
Subject: rpms/gentium-fonts import.log,1.1,1.2
Message-ID: <200512221527.jBMFRoTo010594@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10522

Modified Files:
	import.log 
Log Message:
auto-import gentium-fonts-1.02-2 on branch devel from gentium-fonts-1.02-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gentium-fonts/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Dec 2005 15:17:13 -0000	1.1
+++ import.log	22 Dec 2005 15:27:18 -0000	1.2
@@ -0,0 +1 @@
+gentium-fonts-1_02-2:HEAD:gentium-fonts-1.02-2.src.rpm:1135265206



From fedora-extras-commits at redhat.com  Thu Dec 22 15:27:24 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 22 Dec 2005 10:27:24 -0500
Subject: rpms/gentium-fonts/devel gentium-fonts.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512221527.jBMFRuKX010598@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10522/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gentium-fonts.spec 
Log Message:
auto-import gentium-fonts-1.02-2 on branch devel from gentium-fonts-1.02-2.src.rpm


--- NEW FILE gentium-fonts.spec ---
%define archivename	ttf-sil-gentium
%define fontdir         %{_datadir}/fonts/gentium

Name:           gentium-fonts
Version:        1.02
Release:        2
Summary:        SIL Gentium fonts

Group:          User Interface/X
License:        SIL Open Font License
URL:            http://scripts.sil.org/Gentium_linux
# Source0 can be downloaded from the above URL, search for "tar.gz"
Source0:        ttf-sil-gentium_1.0.2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

# Providing the name of an upstream RPM
Obsoletes:      fonts-sil-gentium
Provides:       fonts-sil-gentium

%description
SIL Gentium ("belonging to the nations" in Latin) is a Unicode typeface family
designed to enable the many diverse ethnic groups around the world who use
the Latin script to produce readable, high-quality publications. It supports
a wide range of Latin-based alphabets and includes glyphs that correspond to
all the Latin ranges of Unicode.

%prep
%setup -q -n %{archivename}-%{version}


%build


%install
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
rm -rf $RPM_BUILD_ROOT


%post
if [ -x %{_bindir}/fc-cache ]; then
  %{_bindir}/fc-cache %{_datadir}/fonts
fi


%postun
if [ "$1" = "0" ]; then
  if [ -x %{_bindir}/fc-cache ]; then
    %{_bindir}/fc-cache %{_datadir}/fonts
  fi
fi


%files
%defattr(0644,root,root,0755)
%doc FONTLOG GENTIUM-FAQ OFL OFL-FAQ QUOTES README

%dir %{fontdir}
%{fontdir}/*.ttf
%ghost %{fontdir}/fonts.cache-1
%ghost %{fontdir}/fonts.cache-2


%changelog

* Wed Dec 21 2005 Roozbeh Porunader  1.02-2
- Added comment to Source0 about where to get the file
- Added Provides and Obsoletes for upsteam RPM name

* Mon Dec 19 2005 Roozbeh Pournader  1.02-1
- Initial packaging, borrowing many things from dejavu-fonts


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gentium-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Dec 2005 15:17:19 -0000	1.1
+++ .cvsignore	22 Dec 2005 15:27:24 -0000	1.2
@@ -0,0 +1 @@
+ttf-sil-gentium_1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gentium-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Dec 2005 15:17:19 -0000	1.1
+++ sources	22 Dec 2005 15:27:24 -0000	1.2
@@ -0,0 +1 @@
+4c3e6ae586be277537ebb68f2a45b883  ttf-sil-gentium_1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 15:39:12 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 22 Dec 2005 10:39:12 -0500
Subject: owners owners.list,1.474,1.475
Message-ID: <200512221539.jBMFdjM0010712@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	owners.list 
Log Message:
Added gentium-fonts



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -r1.474 -r1.475
--- owners.list	20 Dec 2005 20:04:54 -0000	1.474
+++ owners.list	22 Dec 2005 15:39:12 -0000	1.475
@@ -252,6 +252,7 @@
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|general|For bugs not specific to any single component.|dkl at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|gentium-fonts|SIL Gentium fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|gentoo|Graphical file management program in GTK+ for Linux|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|geomview|An interactive 3D viewing program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gfontview|A font viewer for Type 1 and TrueType fonts|mpeters at mac.com|extras-qa at fedoraproject.org|ksfiles at gmail.com



From fedora-extras-commits at redhat.com  Thu Dec 22 16:02:32 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 22 Dec 2005 11:02:32 -0500
Subject: rpms/perl-GDGraph/devel .cvsignore, 1.2, 1.3 perl-GDGraph.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200512221603.jBMG34AV012471@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GDGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12447

Modified Files:
	.cvsignore perl-GDGraph.spec sources 
Log Message:
Update to 1.4305.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:00:44 -0000	1.2
+++ .cvsignore	22 Dec 2005 16:02:32 -0000	1.3
@@ -1 +1 @@
-GDGraph-1.43.tar.gz
+GDGraph-1.4305.tar.gz


Index: perl-GDGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph/devel/perl-GDGraph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-GDGraph.spec	6 Apr 2005 22:12:45 -0000	1.5
+++ perl-GDGraph.spec	22 Dec 2005 16:02:32 -0000	1.6
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-GDGraph
-Version:        1.43
-Release:        4
-
+Version:        1.4305
+Release:        1%{?dist}
 Summary:        Graph generation package for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/GDGraph/
-Source0:        http://www.cpan.org/authors/id/M/MV/MVERB/GDGraph-1.43.tar.gz
+Source0:        http://www.cpan.org/authors/id/B/BW/BWARFIELD/GDGraph-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,6 +20,9 @@
 
 %prep
 %setup -q -n GDGraph-%{version}
+%{__perl} -pi -e 's{^#!/usr/local/bin/perl\b}{#!%{__perl}}' samples/sample1A.pl
+%{__perl} -pi -e 's/\r\n/\n/' samples/sample64.pl
+chmod a-x CHANGES README
 
 
 %build
@@ -37,8 +37,9 @@
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
+find $RPM_BUILD_ROOT -type f -name "*\.pm\.orig" -exec rm -f {} ';'
 
-%check || :
+%check
 make test
 
 
@@ -54,13 +55,16 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 22 2005 Jose Pedro Oliveira  - 1.4305-1
+- Update to 1.4305.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.43-4
 - rebuilt
 
-* Sun Jul 11 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.3
+* Sun Jul 11 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.3
 - Unowned directory: %%{perl_vendorlib}/GD (see bug 1800 comment #1).
 
-* Wed Jun 30 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.2
+* Wed Jun 30 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.2
 - Bring up to date with current fedora.us perl spec template.
 - Added the samples directory to the documentation files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:00:44 -0000	1.2
+++ sources	22 Dec 2005 16:02:32 -0000	1.3
@@ -1 +1 @@
-cf546f2de827a56458afe288ab0807f2  GDGraph-1.43.tar.gz
+7cba9e4e9fc0c146ab1e34d00f61d932  GDGraph-1.4305.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 17:03:19 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 12:03:19 -0500
Subject: rpms/kompose/devel kompose-0.5.3-x.patch, NONE, 1.1 kompose.spec,
	1.1, 1.2
Message-ID: <200512221704.jBMH4eY9014505@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	kompose.spec 
Added Files:
	kompose-0.5.3-x.patch 
Log Message:
Add patch to remove X checks in configure for modular X


kompose-0.5.3-x.patch:

--- NEW FILE kompose-0.5.3-x.patch ---
--- kompose-0.5.4/configure.orig	2005-11-11 14:25:22.000000000 -0700
+++ kompose-0.5.4/configure	2005-11-21 13:16:23.000000000 -0700
@@ -26605,535 +26605,6 @@
 
 fi;
 
-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-
-echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
-
-if test "${kde_cv_have_x+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # One or both of the vars are not set, and there is no cached value.
-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-   kde_x_includes=NO
-else
-   kde_x_includes=$x_includes
-fi
-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-   kde_x_libraries=NO
-else
-   kde_x_libraries=$x_libraries
-fi
-
-# below we use the standard autoconf calls
-ac_x_libraries=$kde_x_libraries
-ac_x_includes=$kde_x_includes
-
-
-
-
-if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
-  # First, try using that file with no special directory specified.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$x_direct_test_include>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /usr/X11/include          \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done
-fi
-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = NO
-
-if test "$ac_x_libraries" = NO; then
-  # Check for the libraries.
-
-  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS="$LIBS"
-  LIBS="-l$x_direct_test_library $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-${x_direct_test_function}()
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-    /usr/X11/lib${kdelibsuff}           \
-    /usr/X11R6/lib${kdelibsuff}         \
-    /usr/X11R5/lib${kdelibsuff}         \
-    /usr/X11R4/lib${kdelibsuff}         \
-                                        \
-    /usr/lib${kdelibsuff}/X11           \
-    /usr/lib${kdelibsuff}/X11R6         \
-    /usr/lib${kdelibsuff}/X11R5         \
-    /usr/lib${kdelibsuff}/X11R4         \
-                                        \
-    /usr/local/X11/lib${kdelibsuff}     \
-    /usr/local/X11R6/lib${kdelibsuff}   \
-    /usr/local/X11R5/lib${kdelibsuff}   \
-    /usr/local/X11R4/lib${kdelibsuff}   \
-                                        \
-    /usr/local/lib${kdelibsuff}/X11     \
-    /usr/local/lib${kdelibsuff}/X11R6   \
-    /usr/local/lib${kdelibsuff}/X11R5   \
-    /usr/local/lib${kdelibsuff}/X11R4   \
-                                        \
-    /usr/X386/lib${kdelibsuff}          \
-    /usr/x386/lib${kdelibsuff}          \
-    /usr/XFree86/lib${kdelibsuff}/X11   \
-                                        \
-    /usr/lib${kdelibsuff}               \
-    /usr/local/lib${kdelibsuff}         \
-    /usr/unsupported/lib${kdelibsuff}   \
-    /usr/athena/lib${kdelibsuff}        \
-    /usr/local/x11r5/lib${kdelibsuff}   \
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
-    /lib/usr/lib${kdelibsuff}/X11       \
-                                        \
-    /usr/openwin/lib${kdelibsuff}       \
-    /usr/openwin/share/lib${kdelibsuff} \
-    ; \
-do
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi # $ac_x_libraries = NO
-
-case "$host" in
-mips-sgi-irix6*)
-  ;;
-*-*-solaris*)
-  ;;
-*)
-  rm -fr conftest.dir
-if mkdir conftest.dir; then
-  cd conftest.dir
-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-  cat >Imakefile <<'_ACEOF'
-acfindx:
-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-_ACEOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-	 test -f $ac_im_libdir/libX11.$ac_extension; then
-	ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case $ac_im_incroot in
-	/usr/include) ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-    esac
-    case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-    esac
-  fi
-  cd ..
-  rm -fr conftest.dir
-fi
-
-  if test -z "$ac_x_includes"; then
-    ac_x_includes="."
-  fi
-  if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib${kdelibsuff}"
-  fi
-esac
-#from now on we use our own again
-
-# when the user already gave --x-includes, we ignore
-# what the standard autoconf macros told us.
-if test "$kde_x_includes" = NO; then
-  kde_x_includes=$ac_x_includes
-fi
-
-# for --x-libraries too
-if test "$kde_x_libraries" = NO; then
-  kde_x_libraries=$ac_x_libraries
-fi
-
-if test "$kde_x_includes" = NO; then
-  { { echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5
-echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-if test "$kde_x_libraries" = NO; then
-  { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
-echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# Record where we found X for the cache.
-kde_cv_have_x="have_x=yes \
-         kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
-
-fi
-
-eval "$kde_cv_have_x"
-
-if test "$have_x" != yes; then
-  echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
-  no_x=yes
-else
-  echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
-echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
-fi
-
-if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-  X_INCLUDES=""
-  x_includes=".";  else
-  x_includes=$kde_x_includes
-  X_INCLUDES="-I$x_includes"
-fi
-
-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
-  X_LDFLAGS=""
-  x_libraries="/usr/lib";  else
-  x_libraries=$kde_x_libraries
-  X_LDFLAGS="-L$x_libraries"
-fi
-all_includes="$X_INCLUDES"
-all_libraries="$X_LDFLAGS"
-
-# Check for libraries that X11R6 Xt/Xaw programs need.
-ac_save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-# check for ICE first), but we must link in the order -lSM -lICE or
-# we get undefined symbols.  So assume we have SM if we have ICE.
-# These have to be linked with before -lX11, unlike the other
-# libraries we check for below, so use a different variable.
-#  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
-echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char IceConnectionNumber ();
-int
-main ()
-{
-IceConnectionNumber ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ICE_IceConnectionNumber=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ICE_IceConnectionNumber=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-  LIBSM="-lSM -lICE"
-fi
-
-LDFLAGS="$ac_save_LDFLAGS"
-
-LIB_X11='-lX11 $(LIBSOCKET)'
-
-echo "$as_me:$LINENO: checking for libXext" >&5
-echo $ECHO_N "checking for libXext... $ECHO_C" >&6
-if test "${kde_cv_have_libXext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-kde_ldflags_safe="$LDFLAGS"
-kde_libs_safe="$LIBS"
-
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-LIBS="-lXext -lX11 $LIBSOCKET"
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include 
-#ifdef STDC_HEADERS
-# include 
-#endif
-
-int
-main ()
-{
-
-printf("hello Xext\n");
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  kde_cv_have_libXext=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-kde_cv_have_libXext=no
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-
-LDFLAGS=$kde_ldflags_safe
-LIBS=$kde_libs_safe
-
-fi
-
-
-echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
-echo "${ECHO_T}$kde_cv_have_libXext" >&6
-
-if test "$kde_cv_have_libXext" = "no"; then
-  { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-can't find it itself, we stop here assuming that make wouldn't find
-them either." >&5
-echo "$as_me: error: We need a working libXext to proceed. Since configure
-can't find it itself, we stop here assuming that make wouldn't find
-them either." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-LIB_XEXT="-lXext"
-QTE_NORTTI=""
-
-elif test "$kde_use_qt_emb" = "yes"; then
-    CPPFLAGS=-DQWS
-  CXXFLAGS="$CXXFLAGS -fno-rtti"
-  QTE_NORTTI="-fno-rtti -DQWS"
-  X_PRE_LIBS=""
-  LIB_X11=""
-  LIB_XEXT=""
-  LIB_XRENDER=""
-  LIBSM=""
-  X_INCLUDES=""
-  X_LDFLAGS=""
-  x_includes=""
-  x_libraries=""
-elif test "$kde_use_qt_mac" = "yes"; then
-      CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
-  CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
-  X_PRE_LIBS=""
-  LIB_X11=""
-  LIB_XEXT=""
-  LIB_XRENDER=""
-  LIBSM=""
-  X_INCLUDES=""
-  X_LDFLAGS=""
-  x_includes=""
-  x_libraries=""
-fi
-
-
-
-
-
-
-
-
-
-
-
 
 
   LIBPTHREAD=""


Index: kompose.spec
===================================================================
RCS file: /cvs/extras/rpms/kompose/devel/kompose.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kompose.spec	4 Aug 2005 17:09:36 -0000	1.1
+++ kompose.spec	22 Dec 2005 17:03:17 -0000	1.2
@@ -1,11 +1,12 @@
 Name: kompose
 Summary: Provides a full screen view of all open windows
 Version: 0.5.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: User Interface/X
 Url: http://kompose.berlios.de
 Source: http://download.berlios.de/kompose/%{name}-%{version}.tar.bz2
+Patch0: kompose-0.5.3-x.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kdelibs-devel >= 3.2, imlib2-devel
 Requires: kdebase
@@ -19,6 +20,8 @@
 
 %prep
 %setup -q
+%patch -p1 -b .x
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -26,6 +29,7 @@
 %configure --disable-rpath
 make %{?_smp_mflags}
 
+
 %install
 %makeinstall
 desktop-file-install --vendor=fedora \
@@ -63,6 +67,9 @@
 %{_datadir}/pixmaps/kompose.png
 
 %changelog
+* Thu Dec 22 2005 - Orion Poplawski  0.5.3-4
+- Add patch to remove X checks in configure for modular X
+
 * Mon Jul 25 2005 - Orion Poplawski  0.5.3-3
 - Requires kdebase
 - Fix doc symlink.



From fedora-extras-commits at redhat.com  Thu Dec 22 18:18:06 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 22 Dec 2005 13:18:06 -0500
Subject: rpms/perl-GD/FC-4 .cvsignore, 1.6, 1.7 perl-GD.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200512221818.jBMIIcJd017054@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GD/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17023

Modified Files:
	.cvsignore perl-GD.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Aug 2005 18:24:27 -0000	1.6
+++ .cvsignore	22 Dec 2005 18:18:06 -0000	1.7
@@ -1 +1 @@
-GD-2.28.tar.gz
+GD-2.30.tar.gz


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/FC-4/perl-GD.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-GD.spec	8 Aug 2005 18:24:27 -0000	1.8
+++ perl-GD.spec	22 Dec 2005 18:18:06 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-GD
-Version:        2.28
+Version:        2.30
 Release:        1%{?dist}
 Summary:        Perl interface to the GD graphics library
 
@@ -25,7 +25,7 @@
 %prep
 %setup -q -n GD-%{version}
 %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \
-  qd.pl bdf_scripts/cvtbdf.pl demos/{*.{pl,cgi},truetype_test}
+  qd.pl bdf_scripts/bdf2gdfont.pl demos/{*.{pl,cgi},truetype_test}
 chmod 644 bdf_scripts/* demos/*
 chmod 755 qd.pl
 
@@ -44,7 +44,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Oct 21 2005 Jose Pedro Oliveira  - 2.30-1
+- Update to 2.30.
+
 * Mon Aug  8 2005 Jose Pedro Oliveira  - 2.28-1
 - Update to 2.28.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Aug 2005 18:24:27 -0000	1.6
+++ sources	22 Dec 2005 18:18:06 -0000	1.7
@@ -1 +1 @@
-de591245f779e2ed11851d1470d4e9df  GD-2.28.tar.gz
+cbc232526c0b348582f386abea802fbc  GD-2.30.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 18:31:38 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 22 Dec 2005 13:31:38 -0500
Subject: rpms/perl-GDGraph/FC-4 .cvsignore, 1.2, 1.3 perl-GDGraph.spec, 1.5, 
	1.6 sources, 1.2, 1.3
Message-ID: <200512221832.jBMIWAkd017166@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-serv17145

Modified Files:
	.cvsignore perl-GDGraph.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:00:44 -0000	1.2
+++ .cvsignore	22 Dec 2005 18:31:37 -0000	1.3
@@ -1 +1 @@
-GDGraph-1.43.tar.gz
+GDGraph-1.4305.tar.gz


Index: perl-GDGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/perl-GDGraph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-GDGraph.spec	6 Apr 2005 22:12:45 -0000	1.5
+++ perl-GDGraph.spec	22 Dec 2005 18:31:37 -0000	1.6
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-GDGraph
-Version:        1.43
-Release:        4
-
+Version:        1.4305
+Release:        1%{?dist}
 Summary:        Graph generation package for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/GDGraph/
-Source0:        http://www.cpan.org/authors/id/M/MV/MVERB/GDGraph-1.43.tar.gz
+Source0:        http://www.cpan.org/authors/id/B/BW/BWARFIELD/GDGraph-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,6 +20,9 @@
 
 %prep
 %setup -q -n GDGraph-%{version}
+%{__perl} -pi -e 's{^#!/usr/local/bin/perl\b}{#!%{__perl}}' samples/sample1A.pl
+%{__perl} -pi -e 's/\r\n/\n/' samples/sample64.pl
+chmod a-x CHANGES README
 
 
 %build
@@ -37,8 +37,9 @@
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
+find $RPM_BUILD_ROOT -type f -name "*\.pm\.orig" -exec rm -f {} ';'
 
-%check || :
+%check
 make test
 
 
@@ -54,13 +55,16 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 22 2005 Jose Pedro Oliveira  - 1.4305-1
+- Update to 1.4305.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.43-4
 - rebuilt
 
-* Sun Jul 11 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.3
+* Sun Jul 11 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.3
 - Unowned directory: %%{perl_vendorlib}/GD (see bug 1800 comment #1).
 
-* Wed Jun 30 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.2
+* Wed Jun 30 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.2
 - Bring up to date with current fedora.us perl spec template.
 - Added the samples directory to the documentation files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:00:44 -0000	1.2
+++ sources	22 Dec 2005 18:31:37 -0000	1.3
@@ -1 +1 @@
-cf546f2de827a56458afe288ab0807f2  GDGraph-1.43.tar.gz
+7cba9e4e9fc0c146ab1e34d00f61d932  GDGraph-1.4305.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 18:49:04 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 13:49:04 -0500
Subject: rpms/netcdf/devel netcdf.spec,1.11,1.12
Message-ID: <200512221849.jBMInaGA017259@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	netcdf.spec 
Log Message:
rebuild for gcc41



Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- netcdf.spec	16 Oct 2005 06:11:56 -0000	1.11
+++ netcdf.spec	22 Dec 2005 18:49:04 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           netcdf
 Version:        3.6.0
-Release:        8.p1%{?dist}
+Release:        9.p1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Orion Poplawski  - 3.6.0-9.p1
+- rebuild for gcc4.1
+
 * Sun Oct 16 2005 Ed Hill  - 3.6.0-8.p1
 - building the library twice (once each for g77 and gfortran) 
   fixes an annoying problem for people who need both compilers



From fedora-extras-commits at redhat.com  Thu Dec 22 19:29:52 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 22 Dec 2005 14:29:52 -0500
Subject: rpms/perl-pmtools/devel perl-pmtools.spec,1.3,1.4
Message-ID: <200512221930.jBMJUP08019580@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19563

Modified Files:
	perl-pmtools.spec 
Log Message:
Dist tag


Index: perl-pmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/devel/perl-pmtools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-pmtools.spec	6 Apr 2005 22:13:29 -0000	1.3
+++ perl-pmtools.spec	22 Dec 2005 19:29:52 -0000	1.4
@@ -1,9 +1,6 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-pmtools
 Version:        1.00
-Release:        2
-
+Release:        3%{?dist}
 Summary:        A suite of small programs to help manage Perl modules
 
 Group:          Development/Libraries
@@ -68,7 +65,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 22 2005 Jose Pedro Oliveira  - 1.00-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.00-2
 - rebuilt
 
 * Sun Feb 06 2005 Jose Pedro Oliveira  - 1.00-1
@@ -81,5 +81,5 @@
   script 'pman' into 'pmman' in order to avoid a filename clash with
   the pinfo package.
 
-* Sat Feb 28 2004 Jose Pedro Oliveira  0:1.00-0.fdr.0
+* Sat Feb 28 2004 Jose Pedro Oliveira  - 0:1.00-0.fdr.0
 - Initial build for fedora.us



From fedora-extras-commits at redhat.com  Thu Dec 22 19:44:09 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 22 Dec 2005 14:44:09 -0500
Subject: rpms/perl-GDTextUtil/devel perl-GDTextUtil.spec,1.5,1.6
Message-ID: <200512221944.jBMJiffW019711@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GDTextUtil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19694

Modified Files:
	perl-GDTextUtil.spec 
Log Message:
Dist tag


Index: perl-GDTextUtil.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GDTextUtil/devel/perl-GDTextUtil.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-GDTextUtil.spec	6 Apr 2005 22:12:45 -0000	1.5
+++ perl-GDTextUtil.spec	22 Dec 2005 19:44:09 -0000	1.6
@@ -1,22 +1,20 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 %define fontdir %{_datadir}/fonts/perl
 
 Name:           perl-GDTextUtil
 Version:        0.86
-Release:        5
-
+Release:        6%{?dist}
 Summary:        Text utilities for use with GD
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/GDTextUtil/
-Source0:       http://www.cpan.org/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/MV/MVERB/GDTextUtil-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(GD), perl(Test::More)
+BuildRequires:  perl(GD)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       fontconfig
 
@@ -50,7 +48,7 @@
 touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
 
 
-%check || :
+%check
 make test
 
 
@@ -72,10 +70,13 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 22 2005 Jose Pedro Oliveira  - 0.86-6
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.86-5
 - rebuilt
 
-* Sun Jul 11 2004 Jose Pedro Oliveira  - 0:0.86-0.fdr.4
+* Sun Jul 11 2004 Jose Pedro Oliveira  - 0:0.86-0.fdr.4
 - Unowned directory: %%{perl_vendorlib}/GD (see bug 1800 comment #1).
 
 * Tue Jul  6 2004 Jose Pedro Oliveira  - 0:0.86-0.fdr.3



From fedora-extras-commits at redhat.com  Thu Dec 22 19:45:55 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 22 Dec 2005 14:45:55 -0500
Subject: rpms/perl-GDGraph3d/devel perl-GDGraph3d.spec,1.6,1.7
Message-ID: <200512221946.jBMJkRBH019779@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GDGraph3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19762

Modified Files:
	perl-GDGraph3d.spec 
Log Message:
Dist tag


Index: perl-GDGraph3d.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph3d/devel/perl-GDGraph3d.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-GDGraph3d.spec	6 Apr 2005 22:12:45 -0000	1.6
+++ perl-GDGraph3d.spec	22 Dec 2005 19:45:55 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-GDGraph3d
 Version:        0.63
-Release:        3
-
+Release:        4%{?dist}
 Summary:        3D graph generation package for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/GDGraph3d/
-Source0:        http://www.cpan.org/authors/id/W/WA/WADG/GD-Graph3d-0.63.tar.gz
+Source0:        http://www.cpan.org/authors/id/W/WA/WADG/GD-Graph3d-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -41,7 +38,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -57,7 +54,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 22 2005 Jose Pedro Oliveira  - 0.63-4
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.63-3
 - rebuilt
 
 * Sat Jan 15 2005 Jose Pedro Oliveira  - 0:0.63-2



From fedora-extras-commits at redhat.com  Thu Dec 22 20:12:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 22 Dec 2005 15:12:02 -0500
Subject: owners owners.list,1.475,1.476
Message-ID: <200512222012.jBMKCZgg021554@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	owners.list 
Log Message:
ortp


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -r1.475 -r1.476
--- owners.list	22 Dec 2005 15:39:12 -0000	1.475
+++ owners.list	22 Dec 2005 20:12:01 -0000	1.476
@@ -667,6 +667,7 @@
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|ortp|A C library implementing the RTP protocol (RFC3550)|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|osiv|Open Source Image Velocimetry|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|p0f|Versatile passive OS fingerprinting tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 22 20:18:28 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 15:18:28 -0500
Subject: rpms/plplot/devel plplot-5.5.3-x.patch,NONE,1.1
Message-ID: <200512222018.jBMKIU0r021629@cvs-int.fedora.redhat.com>

Author: orion

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

Added Files:
	plplot-5.5.3-x.patch 
Log Message:
patch to strip X check from configure for modular X


plplot-5.5.3-x.patch:

--- NEW FILE plplot-5.5.3-x.patch ---
--- plplot-5.5.3/configure.orig	2005-05-13 06:59:33.000000000 -0600
+++ plplot-5.5.3/configure	2005-12-22 11:16:35.000000000 -0700
@@ -30236,1404 +30236,10 @@
 
 
 
-
-
-
-if test "x$ac_path_x_has_been_run" != xyes; then
-  echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
-
-ac_path_x_has_been_run=yes
-
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
-  withval="$with_x"
-
-fi;
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
-  # The user explicitly disabled X.
-  have_x=disabled
-else
-  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-    # Both variables are already set.
-    have_x=yes
-  else
-    if test "${ac_cv_have_x+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
-rm -fr conftest.dir
-if mkdir conftest.dir; then
-  cd conftest.dir
-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-  cat >Imakefile <<'_ACEOF'
-acfindx:
-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-_ACEOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-	 test -f $ac_im_libdir/libX11.$ac_extension; then
-	ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case $ac_im_incroot in
-	/usr/include) ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-    esac
-    case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-    esac
-  fi
-  cd ..
-  rm -fr conftest.dir
-fi
-
-# Standard set of common directories for X headers.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
-/usr/X11/include
-/usr/X11R6/include
-/usr/X11R5/include
-/usr/X11R4/include
-
-/usr/include/X11
-/usr/include/X11R6
-/usr/include/X11R5
-/usr/include/X11R4
-
-/usr/local/X11/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
-
-/usr/local/include/X11
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
-
-/usr/X386/include
-/usr/x386/include
-/usr/XFree86/include/X11
-
-/usr/include
-/usr/local/include
-/usr/unsupported/include
-/usr/athena/include
-/usr/local/x11r5/include
-/usr/lpp/Xamples/include
-
-/usr/openwin/include
-/usr/openwin/share/include'
-
-if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for a specified header file.
-  # First, try using that file with no special directory specified.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include 
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Intrinsic.h"; then
-    ac_x_includes=$ac_dir
-    break
-  fi
-done
-fi
-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = no
-
-if test "$ac_x_libraries" = no; then
-  # Check for the libraries.
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS=$LIBS
-  LIBS="-lXt $LIBS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include 
-int
-main ()
-{
-XtMalloc (0)
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  LIBS=$ac_save_LIBS
-# We can link X programs with no special library path.
-ac_x_libraries=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-LIBS=$ac_save_LIBS
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-do
-  # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/libXt.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi # $ac_x_libraries = no
-
-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
-  # Didn't find X anywhere.  Cache the known absence of X.
-  ac_cv_have_x="have_x=no"
-else
-  # Record where we found X for the cache.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi
-fi
-
-  fi
-  eval "$ac_cv_have_x"
-fi # $with_x != no
-
-if test "$have_x" != yes; then
-  echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
-  no_x=yes
-else
-  # If each of the values was on the command line, it overrides each guess.
-  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-  # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  # It might be that x_includes is empty (headers are found in the
-  # standard search path. Then output the corresponding message
-  ac_out_x_includes=$x_includes
-  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
-fi
-
-fi
-if test "$no_x" = yes; then
-  # Not all programs may use this symbol, but it does not hurt to define it.
-
-cat >>confdefs.h <<\_ACEOF
-#define X_DISPLAY_MISSING 1
-_ACEOF
-
-  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
-  if test -n "$x_includes"; then
-    X_CFLAGS="$X_CFLAGS -I$x_includes"
-  fi
-
-  # It would also be nice to do this for all -L options, not just this one.
-  if test -n "$x_libraries"; then
-    X_LIBS="$X_LIBS -L$x_libraries"
-    # For Solaris; some versions of Sun CC require a space after -R and
-    # others require no space.  Words are not sufficient . . . .
-    case `(uname -sr) 2>/dev/null` in
-    "SunOS 5"*)
-      echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
-      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_R_nospace=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_R_nospace=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-      if test $ac_R_nospace = yes; then
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-	X_LIBS="$X_LIBS -R$x_libraries"
-      else
-	LIBS="$ac_xsave_LIBS -R $x_libraries"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_R_space=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_R_space=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-	if test $ac_R_space = yes; then
-	  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	  X_LIBS="$X_LIBS -R $x_libraries"
-	else
-	  echo "$as_me:$LINENO: result: neither works" >&5
-echo "${ECHO_T}neither works" >&6
-	fi
-      fi
-      LIBS=$ac_xsave_LIBS
-    esac
-  fi
-
-  # Check for system-dependent libraries X programs must link with.
-  # Do this before checking for the system-independent R6 libraries
-  # (-lICE), since we may need -lsocket or whatever for X linking.
-
-  if test "$ISC" = yes; then
-    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-  else
-    # Martyn Johnson says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And Karl Berry says
-    # the Alpha needs dnet_stub (dnet does not exist).
-    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char XOpenDisplay ();
-int
-main ()
-{
-XOpenDisplay ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dnet_ntoa ();
-int
-main ()
-{
-dnet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dnet_dnet_ntoa=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dnet_dnet_ntoa=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-fi
-
-    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet_stub  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dnet_ntoa ();
-int
-main ()
-{
-dnet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dnet_stub_dnet_ntoa=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dnet_stub_dnet_ntoa=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-fi
-
-    fi
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-    LIBS="$ac_xsave_LIBS"
-
-    # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-    # to get the SysV transport functions.
-    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
-    # needs -lnsl.
-    # The nsl library prevents programs from opening the X display
-    # on Irix 5.2, according to T.E. Dickey.
-    # The functions gethostbyname, getservbyname, and inet_addr are
-    # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:$LINENO: checking for gethostbyname" >&5
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
-if test "${ac_cv_func_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define gethostbyname to an innocuous variant, in case  declares gethostbyname.
-   For example, HP-UX 11i  declares gettimeofday.  */
-#define gethostbyname innocuous_gethostbyname
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname (); below.
-    Prefer  to  if __STDC__ is defined, since
-     exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include 
-#else
-# include 
-#endif
-
-#undef gethostbyname
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gethostbyname ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
-choke me
-#else
-char (*f) () = gethostbyname;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != gethostbyname;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_gethostbyname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
-
-    if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gethostbyname ();
-int
-main ()
-{
-gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl_gethostbyname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-fi
-
-      if test $ac_cv_lib_nsl_gethostbyname = no; then
-	echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gethostbyname ();
-int
-main ()
-{
-gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bsd_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bsd_gethostbyname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
-if test $ac_cv_lib_bsd_gethostbyname = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
-fi
-
-      fi
-    fi
-
-    # lieder at skyler.mavd.honeywell.com says without -lsocket,
-    # socket/setsockopt and other routines are undefined under SCO ODT
-    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-    # on later versions), says Simon Leinen: it contains gethostby*
-    # variants that don't use the name server (or something).  -lsocket
-    # must be given before -lnsl if both are needed.  We assume that
-    # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6
-if test "${ac_cv_func_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define connect to an innocuous variant, in case  declares connect.
-   For example, HP-UX 11i  declares gettimeofday.  */
-#define connect innocuous_connect
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect (); below.
-    Prefer  to  if __STDC__ is defined, since
-     exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include 
-#else
-# include 
-#endif
-
-#undef connect
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char connect ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_connect) || defined (__stub___connect)
-choke me
-#else
-char (*f) () = connect;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != connect;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_connect=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_connect=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6
-
-    if test $ac_cv_func_connect = no; then
-      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char connect ();
-int
-main ()
-{
-connect ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_connect=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_connect=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-if test $ac_cv_lib_socket_connect = yes; then
-  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-fi
-
-    fi
-
-    # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:$LINENO: checking for remove" >&5
-echo $ECHO_N "checking for remove... $ECHO_C" >&6
-if test "${ac_cv_func_remove+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define remove to an innocuous variant, in case  declares remove.
-   For example, HP-UX 11i  declares gettimeofday.  */
-#define remove innocuous_remove
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char remove (); below.
-    Prefer  to  if __STDC__ is defined, since
-     exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include 
-#else
-# include 
-#endif
-
-#undef remove
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char remove ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_remove) || defined (__stub___remove)
-choke me
-#else
-char (*f) () = remove;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != remove;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_remove=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_remove=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6
-
-    if test $ac_cv_func_remove = no; then
-      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
-if test "${ac_cv_lib_posix_remove+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lposix  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char remove ();
-int
-main ()
-{
-remove ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_posix_remove=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_posix_remove=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
-if test $ac_cv_lib_posix_remove = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-fi
-
-    fi
-
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:$LINENO: checking for shmat" >&5
-echo $ECHO_N "checking for shmat... $ECHO_C" >&6
-if test "${ac_cv_func_shmat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shmat to an innocuous variant, in case  declares shmat.
-   For example, HP-UX 11i  declares gettimeofday.  */
-#define shmat innocuous_shmat
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmat (); below.
-    Prefer  to  if __STDC__ is defined, since
-     exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include 
-#else
-# include 
-#endif
-
-#undef shmat
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shmat ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shmat) || defined (__stub___shmat)
-choke me
-#else
-char (*f) () = shmat;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shmat;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shmat=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shmat=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6
-
-    if test $ac_cv_func_shmat = no; then
-      echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lipc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shmat ();
-int
-main ()
-{
-shmat ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ipc_shmat=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ipc_shmat=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
-if test $ac_cv_lib_ipc_shmat = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-fi
-
-    fi
-  fi
-
-  # Check for libraries that X11R6 Xt/Xaw programs need.
-  ac_save_LDFLAGS=$LDFLAGS
-  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-  # check for ICE first), but we must link in the order -lSM -lICE or
-  # we get undefined symbols.  So assume we have SM if we have ICE.
-  # These have to be linked with before -lX11, unlike the other
-  # libraries we check for below, so use a different variable.
-  # John Interrante, Karl Berry
-  echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char IceConnectionNumber ();
-int
-main ()
-{
-IceConnectionNumber ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ICE_IceConnectionNumber=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ICE_IceConnectionNumber=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-fi
-
-  LDFLAGS=$ac_save_LDFLAGS
-
-fi
-
-
-if test "$have_x" != "yes"; then
-    enable_xwin="no"
-fi
-
-
-
-if test "$enable_xwin" = yes; then
-  enable_xwin_TRUE=
-  enable_xwin_FALSE='#'
-else
-  enable_xwin_TRUE='#'
-  enable_xwin_FALSE=
-fi
-
-
+enable_xwin=yes
+enable_xwin_TRUE=
+enable_xwin_FALSE='#'
+have_x=yes
 
 
 if test "$enable_tcl" = "no" -o "$have_x" != "yes"; then



From fedora-extras-commits at redhat.com  Thu Dec 22 20:18:20 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 22 Dec 2005 15:18:20 -0500
Subject: rpms/ortp/devel ortp.spec,1.5,1.6
Message-ID: <200512222018.jBMKIqgo021642@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	ortp.spec 
Log Message:
Added ortp.pc to -devel


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/ortp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ortp.spec	5 Dec 2005 23:59:14 -0000	1.5
+++ ortp.spec	22 Dec 2005 20:18:20 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ortp
 Version:        0.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
@@ -49,9 +49,13 @@
 %defattr(-,root,root,-)
 %{_includedir}/%{name}
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/ortp.pc
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Dec 22 2005 Ignacio Vazquez-Abrams  0.7.1-2
+- Added ortp.pc to -devel
+
 * Sat Dec  3 2005 Ignacio Vazquez-Abrams  0.7.1-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Thu Dec 22 20:18:54 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 15:18:54 -0500
Subject: rpms/plplot/devel plplot-5.5.3-matwrap.patch, 1.1,
	1.2 plplot-5.5.3-tk.patch, 1.1, 1.2 plplot.spec, 1.6, 1.7
Message-ID: <200512222019.jBMKJQb6021715@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	plplot-5.5.3-matwrap.patch plplot-5.5.3-tk.patch plplot.spec 
Log Message:
- Add patch to strip X check from configure for modular X
- Rework patches to patch configure and avoid autoconf
- Teporarily add BR on libXau-devel and libXdmcp (bz #176313)


plplot-5.5.3-matwrap.patch:

Index: plplot-5.5.3-matwrap.patch
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot-5.5.3-matwrap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plplot-5.5.3-matwrap.patch	10 Aug 2005 17:15:10 -0000	1.1
+++ plplot-5.5.3-matwrap.patch	22 Dec 2005 20:18:54 -0000	1.2
@@ -18,20 +18,59 @@
  	$remember_defs_in_file = 0; # We're not really interested in this file.
        } else {
  	$remember_defs_in_file = 1; # This is a file we are actually
---- plplot-5.5.3/cf/octave.ac.orig	2005-08-09 09:34:00.000000000 -0600
-+++ plplot-5.5.3/cf/octave.ac	2005-08-09 09:34:52.000000000 -0600
-@@ -35,13 +35,7 @@
+--- plplot-5.5.3/configure.matwrap	2005-12-22 11:24:27.000000000 -0700
++++ plplot-5.5.3/configure	2005-12-22 11:25:04.000000000 -0700
+@@ -24312,52 +24312,7 @@
+         enable_octave=no;
+     fi
  
- # check for matwrap
-     if test "$enable_octave" = "yes"; then
--        AC_CHECK_PROG(has_matwrap, matwrap, yes, no)
+-# check for matwrap
+-    if test "$enable_octave" = "yes"; then
+-        # Extract the first word of "matwrap", so it can be a program name with args.
+-set dummy matwrap; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_has_matwrap+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$has_matwrap"; then
+-  ac_cv_prog_has_matwrap="$has_matwrap" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_has_matwrap="yes"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-  test -z "$ac_cv_prog_has_matwrap" && ac_cv_prog_has_matwrap="no"
+-fi
+-fi
+-has_matwrap=$ac_cv_prog_has_matwrap
+-if test -n "$has_matwrap"; then
+-  echo "$as_me:$LINENO: result: $has_matwrap" >&5
+-echo "${ECHO_T}$has_matwrap" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
 -        if test "$has_matwrap" = "yes"; then
 -	    MATWRAP=`which matwrap`
 -	else
 -            MATWRAP=`pwd`"/bindings/octave/matwrap/matwrap"
--            AC_MSG_WARN([Using builtin matwrap.]);
+-            { echo "$as_me:$LINENO: WARNING: Using builtin matwrap." >&5
+-echo "$as_me: WARNING: Using builtin matwrap." >&2;};
 -        fi
-+        MATWRAP=`pwd`"/bindings/octave/matwrap/matwrap"
-     fi
+-    fi
++MATWRAP=`pwd`"/bindings/octave/matwrap/matwrap"
  
  # check for user supplied mkoctfile
+     if test "$enable_octave" = "yes"; then

plplot-5.5.3-tk.patch:

Index: plplot-5.5.3-tk.patch
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot-5.5.3-tk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plplot-5.5.3-tk.patch	10 Aug 2005 17:15:10 -0000	1.1
+++ plplot-5.5.3-tk.patch	22 Dec 2005 20:18:54 -0000	1.2
@@ -1,6 +1,6 @@
---- plplot-5.5.3/cf/tcl.ac.orig	2005-08-04 13:42:51.000000000 -0600
-+++ plplot-5.5.3/cf/tcl.ac	2005-08-04 13:43:27.000000000 -0600
-@@ -55,13 +55,10 @@
+--- plplot-5.5.3/configure.tk	2005-12-22 11:17:02.000000000 -0700
++++ plplot-5.5.3/configure	2005-12-22 11:17:40.000000000 -0700
+@@ -24638,13 +24638,10 @@
  # "/usr" which would give bad result under Linux without this ordering.
  
  incdirs_default="\


Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plplot.spec	15 Dec 2005 16:24:44 -0000	1.6
+++ plplot.spec	22 Dec 2005 20:18:54 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           plplot
 Version:        5.5.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -15,15 +15,17 @@
 Patch3:         plplot-5.5.3-x86_64.patch
 Patch4:         plplot-5.5.3-octave.patch
 Patch5:         plplot-5.5.3-check.patch
+Patch6:         plplot-5.5.3-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  autoconf
 BuildRequires:  gcc-gfortran, freetype-devel, octave-devel, qhull-devel
 BuildRequires:  java-devel, libgcj-devel
 BuildRequires:  gd-devel, tcl-devel, tk-devel
 BuildRequires:  python-devel, pygtk2-devel, python-numeric
 BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2
 BuildRequires:  perl(XML::DOM)
+#Temporary until bz #176313 is fixed
+BuildRequires:  libXau-devel, libXdmcp-devel
 #BuildRequires: libunicode-devel
 
 %description
@@ -133,10 +135,10 @@
 %patch3 -p1 -b .orig
 %patch4 -p1 -b .orig
 %patch5 -p1 -b .orig
+%patch6 -p1 -b .orig
 
 
 %build
-autoconf
 %configure --disable-static --without-rpath --with-pthreads \
            --with-freetype-font-dir=/usr/share/fonts \
            --with-libunicode=no --disable-cgm --disable-linuxvga \
@@ -308,6 +310,11 @@
 %{_datadir}/plplot%{version}/examples/tk/
 
 %changelog
+* 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
+- Teporarily add BR on libXau-devel and libXdmcp (bz #176313)
+
 * Thu Dec 15 2005 - Orion Poplawski  - 5.5.3-9
 - Rebuild for gcc 4.1
 



From fedora-extras-commits at redhat.com  Thu Dec 22 20:25:48 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Thu, 22 Dec 2005 15:25:48 -0500
Subject: rpms/python-simpy - New directory
Message-ID: <200512222025.jBMKPouS021827@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21819/python-simpy

Log Message:
Directory /cvs/extras/rpms/python-simpy added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 22 20:25:54 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Thu, 22 Dec 2005 15:25:54 -0500
Subject: rpms/python-simpy/devel - New directory
Message-ID: <200512222025.jBMKPu6D021842@cvs-int.fedora.redhat.com>

Author: sarantis

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

Log Message:
Directory /cvs/extras/rpms/python-simpy/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 22 20:26:15 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Thu, 22 Dec 2005 15:26:15 -0500
Subject: rpms/python-simpy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512222026.jBMKQH8F021876@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21864

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-simpy


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 22 20:26:21 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Thu, 22 Dec 2005 15:26:21 -0500
Subject: rpms/python-simpy/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512222026.jBMKQNWH021896@cvs-int.fedora.redhat.com>

Author: sarantis

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-simpy


--- NEW 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 Dec 22 20:27:14 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Thu, 22 Dec 2005 15:27:14 -0500
Subject: rpms/python-simpy import.log,1.1,1.2
Message-ID: <200512222027.jBMKRl1Q021980@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21938

Modified Files:
	import.log 
Log Message:
auto-import python-simpy-1.6.1-2 on branch devel from python-simpy-1.6.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Dec 2005 20:26:14 -0000	1.1
+++ import.log	22 Dec 2005 20:27:14 -0000	1.2
@@ -0,0 +1 @@
+python-simpy-1_6_1-2:HEAD:python-simpy-1.6.1-2.src.rpm:1135283225



From fedora-extras-commits at redhat.com  Thu Dec 22 20:27:20 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Thu, 22 Dec 2005 15:27:20 -0500
Subject: rpms/python-simpy/devel python-simpy-1.6.1-no-shebang.patch, NONE, 
	1.1 python-simpy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200512222027.jBMKRqrc021984@cvs-int.fedora.redhat.com>

Author: sarantis

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

Modified Files:
	.cvsignore sources 
Added Files:
	python-simpy-1.6.1-no-shebang.patch python-simpy.spec 
Log Message:
auto-import python-simpy-1.6.1-2 on branch devel from python-simpy-1.6.1-2.src.rpm

python-simpy-1.6.1-no-shebang.patch:

--- NEW FILE python-simpy-1.6.1-no-shebang.patch ---
diff -urN SimPy-orig/__init__.py SimPy/__init__.py
--- SimPy-orig/__init__.py	2005-11-16 12:55:29.000000000 +0200
+++ SimPy/__init__.py	2005-11-25 15:38:44.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """ SimPy a process-based simulation package in Python
 
 LICENSE:
diff -urN SimPy-orig/Lister.py SimPy/Lister.py
--- SimPy-orig/Lister.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/Lister.py	2005-11-25 15:39:07.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Lister 1.6.1
 Pretty-printer for SimPy class objects
 '$Revision: 1.1.1.6 $ $Date: 2005/11/12 04:39:47 $ kgm'
diff -urN SimPy-orig/Monitor.py SimPy/Monitor.py
--- SimPy-orig/Monitor.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/Monitor.py	2005-11-25 15:39:16.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Monitor 1.6.1
  '$Revision: 1.1.1.8 $ $Date: 2005/11/12 04:39:57 $ kgm'
 This dummy module is only provided for backward compatibility.
diff -urN SimPy-orig/MonitorTest.py SimPy/MonitorTest.py
--- SimPy-orig/MonitorTest.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/MonitorTest.py	2005-11-25 15:39:26.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 Testing Monitor, Tally. 
 This may be included in SimPyTest eventually.
diff -urN SimPy-orig/SimGUI.py SimPy/SimGUI.py
--- SimPy-orig/SimGUI.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/SimGUI.py	2005-11-25 15:39:43.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """SimGUI 1.6.1
 __version__ = '$Revision: 1.1.1.5 $ $Date: 2005/11/12 04:40:06 $ kgm'
 
diff -urN SimPy-orig/SimPlot.py SimPy/SimPlot.py
--- SimPy-orig/SimPlot.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/SimPlot.py	2005-11-25 15:39:49.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """ SimPlot 1.6.1
 
 $Revision: 1.1.1.10 $ $Date: 2005/11/16 09:39:29 $ kgm
diff -urN SimPy-orig/Simulation.py SimPy/Simulation.py
--- SimPy-orig/Simulation.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/Simulation.py	2005-11-25 15:39:56.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Simulation 1.6.1
 __version__ = '$Revision: 1.1.1.17 $ $Date: 2005/11/12 08:18:36 $ kgm'
 LICENSE:
diff -urN SimPy-orig/SimulationRT.py SimPy/SimulationRT.py
--- SimPy-orig/SimulationRT.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/SimulationRT.py	2005-11-25 15:40:03.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """SimulationRT 1.6.1
 __version__ = '$Revision: 1.1.1.9 $ $Date: 2005/11/12 05:43:35 $ kgm'
 LICENSE:
diff -urN SimPy-orig/SimulationStep.py SimPy/SimulationStep.py
--- SimPy-orig/SimulationStep.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/SimulationStep.py	2005-11-25 15:40:10.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """SimulationStep 1.6.1
 __version__ = '$Revision: 1.1.1.9 $ $Date: 2005/11/12 05:43:35 $ kgm'
 LICENSE:
diff -urN SimPy-orig/SimulationTrace.py SimPy/SimulationTrace.py
--- SimPy-orig/SimulationTrace.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/SimulationTrace.py	2005-11-25 15:40:17.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """SimulationTrace 1.6.1
 __version__ = '$Revision: 1.1.1.11 $ $Date: 2005/11/12 05:43:35 $ kgm'
 LICENSE:
diff -urN SimPy-orig/testSimPy.py SimPy/testSimPy.py
--- SimPy-orig/testSimPy.py	2005-11-16 12:55:29.000000000 +0200
+++ SimPy/testSimPy.py	2005-11-25 15:40:33.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # testSimPy.py test routines
 #        $Author: kgmuller $              $Revision: 1.1.1.11 $
 #        $Date: 2005/11/16 09:35:50 $
diff -urN SimPy-orig/testSimPyRT.py SimPy/testSimPyRT.py
--- SimPy-orig/testSimPyRT.py	2005-11-16 12:55:29.000000000 +0200
+++ SimPy/testSimPyRT.py	2005-11-25 15:40:43.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # testSimPyRT.py test routines
 #Based on testSimpy.py to test full compatibility
 #between Simulation and SimulationRT
diff -urN SimPy-orig/testSimPyStep.py SimPy/testSimPyStep.py
--- SimPy-orig/testSimPyStep.py	2005-11-16 12:55:29.000000000 +0200
+++ SimPy/testSimPyStep.py	2005-11-25 15:40:53.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # testSimPyStep.py test routines
 #        $Author: kgmuller $              $Revision: 1.1.1.5 $
 #        $Date: 2005/11/12 04:40:49 $
diff -urN SimPy-orig/testSimPyTrace.py SimPy/testSimPyTrace.py
--- SimPy-orig/testSimPyTrace.py	2005-11-16 12:55:29.000000000 +0200
+++ SimPy/testSimPyTrace.py	2005-11-25 15:41:28.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # testSimPyTrace.py test routines
 #        $Author: kgmuller $              $Revision: 1.1.1.5 $
 #        $Date: 2005/11/12 04:41:03 $


--- NEW FILE python-simpy.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pkgname SimPy

Name:		python-simpy
Version:	1.6.1
Release:	2
Summary:	Python simulation framework
Group:		Development/Languages
License:	LGPL
URL:		http://simpy.sourceforge.net
Source0:	http://download.sourceforge.net/simpy/SimPy-%{version}.tar.gz
Patch1:		python-simpy-1.6.1-no-shebang.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:	tkinter

%description
SimPy (= Simulation in Python) is an object-oriented, process-based
discrete-event simulation language based on standard Python. It
provides the modeler with components of a simulation model including
processes, for active components like customers, messages, and
vehicles, and resources, for passive components that form limited
capacity congestion points like servers, checkout counters, and
tunnels. It also provides monitor variables to aid in gathering
statistics. Random variates are provided by the standard Python random
module.

%package doc
Group: Documentation
Summary: Source code documentation for SimPy

%description doc
SimPy (= Simulation in Python) is an object-oriented, process-based
discrete-event simulation language based on standard Python.  This
package contains the source code documentation.


%prep
%setup -q -n %{pkgname}-%{version}
%patch1


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# choose html over txt files for documentation
%doc *.html PKG-INFO LGPLlicense_files SimPyDocs SimPyModels
%dir %{python_sitelib}/%{pkgname}/
%{python_sitelib}/%{pkgname}/*.py
%{python_sitelib}/%{pkgname}/*.pyc
%ghost %{python_sitelib}/%{pkgname}/*.pyo


%files doc
%defattr(-,root,root)
%doc SimPyDocs/SimPy_Sourcecode_Documentation/*


%changelog
* Wed Dec 21 2005 Sarantis Paskalis  - 1.6.1-2
- Add source code documentation as a -doc package (John Mahowald).
- Add Requires: tkinter for SimGUI to work (John Mahowald).
 
* Fri Nov 25 2005 Sarantis Paskalis  - 1.6.1-1
- First packaging version for FE.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Dec 2005 20:26:21 -0000	1.1
+++ .cvsignore	22 Dec 2005 20:27:20 -0000	1.2
@@ -0,0 +1 @@
+SimPy-1.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Dec 2005 20:26:21 -0000	1.1
+++ sources	22 Dec 2005 20:27:20 -0000	1.2
@@ -0,0 +1 @@
+6de42d6289bee6d767d07f8839f89d07  SimPy-1.6.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 20:33:48 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Thu, 22 Dec 2005 15:33:48 -0500
Subject: owners owners.list,1.476,1.477
Message-ID: <200512222034.jBMKYK1Y022055@cvs-int.fedora.redhat.com>

Author: sarantis

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

Modified Files:
	owners.list 
Log Message:
Add python-simpy



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -r1.476 -r1.477
--- owners.list	22 Dec 2005 20:12:01 -0000	1.476
+++ owners.list	22 Dec 2005 20:33:47 -0000	1.477
@@ -1008,6 +1008,7 @@
 Fedora Extras|python-quixote|A highly Pythonic Web application framework|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-reportlab|Python PDF generation library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-simpletal|Alternative implementation of Zope Page Templates|shahms at shahms.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-simpy|Python simulation framework|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|python-sqlite|Python bindings for SQLite|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-sqlobject|SQLObject is an object-relational mapper for python|oliver.andrich at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-tpg|Toy Parser Generator|shahms at shahms.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 22 22:36:20 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu, 22 Dec 2005 17:36:20 -0500
Subject: web/html/Download vendors.list,1.3,1.4
Message-ID: <200512222236.jBMMapXN025821@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/web/html/Download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25801

Modified Files:
	vendors.list 
Log Message:
add linuxshopp


Index: vendors.list
===================================================================
RCS file: /cvs/fedora/web/html/Download/vendors.list,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vendors.list	6 Dec 2005 05:03:06 -0000	1.3
+++ vendors.list	22 Dec 2005 22:36:18 -0000	1.4
@@ -56,6 +56,8 @@
 
 LinuxInstall.org::3 CDs::$10
 
+LinuxShopp.com.br::CDs::R$20.00
+
 LinuxShop.co.nz::3 binary CDs or 3 source CDs::$12.95 NZ o4 $14.95 NZ
 
 MASH Consulting::3 CDs or 6 CDs::$10 or $15



From fedora-extras-commits at redhat.com  Thu Dec 22 23:37:42 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 18:37:42 -0500
Subject: rpms/plplot/devel plplot-5.5.3-check.patch, NONE,
	1.1 plplot-5.5.3-octave.patch, NONE,
	1.1 plplot-5.5.3-x86_64.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200512222338.jBMNcFcL027684@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore sources 
Added Files:
	plplot-5.5.3-check.patch plplot-5.5.3-octave.patch 
	plplot-5.5.3-x86_64.patch 
Log Message:
Move from "sources"


plplot-5.5.3-check.patch:

--- NEW FILE plplot-5.5.3-check.patch ---
--- plplot-5.5.3/examples/c/x23c.c.orig	2005-04-27 00:43:51.000000000 -0600
+++ plplot-5.5.3/examples/c/x23c.c	2005-08-11 15:21:10.719597600 -0600
@@ -228,6 +228,6 @@
     plcol0(1);
 
     plend();
-
+    exit(0);
 }
 

plplot-5.5.3-octave.patch:

--- NEW FILE plplot-5.5.3-octave.patch ---
--- plplot-5.5.3/bindings/octave/PLplot/figure.m.orig	2005-08-10 11:56:53.000000000 -0600
+++ plplot-5.5.3/bindings/octave/PLplot/figure.m	2005-08-10 12:00:39.000000000 -0600
@@ -49,9 +49,10 @@
 
   if (!exist("__pl") || !struct_contains (__pl,"inited"))
     v = split(version ,'.');
-    if (! (str2num(v(1,:)) >= 2 &&
-           str2num(v(2,:)) >= 1 &&
-           str2num(v(3,:)) >= 57))
+    if (! ((str2num(v(1,:)) > 2) ||
+           (str2num(v(1,:)) == 2 && str2num(v(2,:)) > 1) ||
+           (str2num(v(1,:)) == 2 && str2num(v(2,:)) == 1 &&
+            str2num(v(3,:)) >= 57)))
         error("The PLplot-Octave scripts need an Octave version \n\
         greater then or equal to 2.1.57.\n");
     endif

plplot-5.5.3-x86_64.patch:

--- NEW FILE plplot-5.5.3-x86_64.patch ---
--- plplot-5.5.3/configure.x86_64	2005-12-22 11:18:39.000000000 -0700
+++ plplot-5.5.3/configure	2005-12-22 11:19:07.000000000 -0700
@@ -24661,6 +24661,7 @@
 $HOME/local/lib \
 $HOME/lib \
 /usr/local/lib \
+/usr/lib64 \
 /usr/lib"
 
 incdirs=$incdirs_default


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Aug 2005 22:23:37 -0000	1.4
+++ .cvsignore	22 Dec 2005 23:37:42 -0000	1.5
@@ -1,4 +1 @@
 plplot-5.5.3.tar.gz
-plplot-5.5.3-x86_64.patch
-plplot-5.5.3-octave.patch
-plplot-5.5.3-check.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Aug 2005 22:23:37 -0000	1.4
+++ sources	22 Dec 2005 23:37:42 -0000	1.5
@@ -1,4 +1 @@
 6df3d63cffac28337ff7fa56712da5c7  plplot-5.5.3.tar.gz
-02cc9f8eb72211581aae2bd38670252f  plplot-5.5.3-x86_64.patch
-7970faa7d90fe1e98e19354fd607a309  plplot-5.5.3-octave.patch
-22f2761b863bf1f47fb37b7d7fb9ab85  plplot-5.5.3-check.patch



From fedora-extras-commits at redhat.com  Thu Dec 22 23:57:32 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 18:57:32 -0500
Subject: rpms/python-numarray/devel .cvsignore, 1.2, 1.3 python-numarray.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512222358.jBMNw6Yn027811@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore python-numarray.spec sources 
Log Message:
Update to 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-numarray/devel/.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	22 Dec 2005 23:57:31 -0000	1.3
@@ -1 +1 @@
-numarray-1.3.3.tar.gz
+numarray-1.5.0.tar.gz


Index: python-numarray.spec
===================================================================
RCS file: /cvs/extras/rpms/python-numarray/devel/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	22 Dec 2005 23:57:31 -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.0
+Release:        1%{?dist}
 Summary:        Python array manipulation and computational library
 
 Group:          Development/Languages
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 - Orion Poplawski  - 1.5.0-1
+- Update to 1.5.0
+
 * 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/devel/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	22 Dec 2005 23:57:31 -0000	1.3
@@ -1 +1 @@
-2286f5dbccebd4ba743915e9e1d30856  numarray-1.3.3.tar.gz
+6db331e321a74fa896cd5961fe33b7ef  numarray-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 23:59:40 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 22 Dec 2005 18:59:40 -0500
Subject: rpms/libosip2/FC-4 .cvsignore, 1.3, 1.4 libosip2.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200512230000.jBN00VL2027916@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore libosip2.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Oct 2005 06:11:57 -0000	1.3
+++ .cvsignore	22 Dec 2005 23:59:40 -0000	1.4
@@ -1 +1 @@
-libosip2-2.2.1.tar.gz
+libosip2-2.2.2.tar.gz


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-4/libosip2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libosip2.spec	15 Oct 2005 06:11:57 -0000	1.5
+++ libosip2.spec	22 Dec 2005 23:59:40 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           libosip2
-Version:        2.2.1
+Version:        2.2.2
 Release:        1%{?dist}
 
 Summary:        oSIP is an implementation of SIP
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Dec 22 2005 Ignacio Vazquez-Abrams  2.2.2-1
+- Upstream update
+
 * Sat Oct 15 2005 Ignacio Vazquez-Abrams  2.2.1-1
 - Upstream update
 - Disable static library


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Oct 2005 06:11:57 -0000	1.3
+++ sources	22 Dec 2005 23:59:40 -0000	1.4
@@ -1 +1 @@
-6daf22ab1d814f3d601147ee75e25170  libosip2-2.2.1.tar.gz
+40ee3ec89030f0d6dfdb2cf6100e6685  libosip2-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 23:59:46 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 22 Dec 2005 18:59:46 -0500
Subject: rpms/libosip2/devel .cvsignore, 1.3, 1.4 libosip2.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200512230000.jBN00V68027915@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore libosip2.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Oct 2005 06:11:59 -0000	1.3
+++ .cvsignore	22 Dec 2005 23:59:46 -0000	1.4
@@ -1 +1 @@
-libosip2-2.2.1.tar.gz
+libosip2-2.2.2.tar.gz


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/libosip2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libosip2.spec	15 Oct 2005 06:11:59 -0000	1.5
+++ libosip2.spec	22 Dec 2005 23:59:46 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           libosip2
-Version:        2.2.1
+Version:        2.2.2
 Release:        1%{?dist}
 
 Summary:        oSIP is an implementation of SIP
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Dec 22 2005 Ignacio Vazquez-Abrams  2.2.2-1
+- Upstream update
+
 * Sat Oct 15 2005 Ignacio Vazquez-Abrams  2.2.1-1
 - Upstream update
 - Disable static library


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Oct 2005 06:11:59 -0000	1.3
+++ sources	22 Dec 2005 23:59:46 -0000	1.4
@@ -1 +1 @@
-6daf22ab1d814f3d601147ee75e25170  libosip2-2.2.1.tar.gz
+40ee3ec89030f0d6dfdb2cf6100e6685  libosip2-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 00:03:38 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 19:03:38 -0500
Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.11,1.12
Message-ID: <200512230004.jBN04QGT029588@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	python-matplotlib.spec 
Log Message:
Rebuild



Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-matplotlib.spec	20 Nov 2005 17:25:38 -0000	1.11
+++ python-matplotlib.spec	23 Dec 2005 00:03:38 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           python-matplotlib
 Version:        0.85
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python plotting library
 
 Group:          Development/Libraries
@@ -48,6 +48,9 @@
 %{_datadir}/matplotlib/
 
 %changelog
+* Thu Dec 22 2005 Orion Poplawski  0.85-2
+- Rebuild
+
 * Sun Nov 20 2005 Orion Poplawski  0.85-1
 - New upstream version 0.85
 



From fedora-extras-commits at redhat.com  Fri Dec 23 00:03:52 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 19:03:52 -0500
Subject: rpms/python-dateutil/devel .cvsignore, 1.2, 1.3 python-dateutil.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200512230004.jBN04Q0B029589@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore python-dateutil.spec sources 
Log Message:
Update to 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-dateutil/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Jul 2005 19:53:28 -0000	1.2
+++ .cvsignore	23 Dec 2005 00:03:51 -0000	1.3
@@ -1 +1 @@
-python-dateutil-1.0.tar.bz2
+python-dateutil-1.1.tar.bz2


Index: python-dateutil.spec
===================================================================
RCS file: /cvs/extras/rpms/python-dateutil/devel/python-dateutil.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-dateutil.spec	28 Jul 2005 19:53:28 -0000	1.1
+++ python-dateutil.spec	23 Dec 2005 00:03:51 -0000	1.2
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-dateutil
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Powerful extensions to the standard datetime module
 
 Group:          Development/Languages
 License:        Python Software Foundation License
-URL:            https://moin.conectiva.com.br/DateUtil
-#Source0:        https://moin.conectiva.com.br/DateUtil?action=AttachFile&do=get&target=python-dateutil-%{version}.tar.bz2
-Source0:        python-dateutil-%{version}.tar.bz2
+URL:            http://labix.org/python-dateutil
+Source0:        http://labix.org/download/python-dateutil/python-dateutil-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -42,6 +41,9 @@
 %{python_sitelib}/dateutil/
 
 %changelog
+* Thu Dec 22 2005 Orion Poplawski  1.1-1
+- Update to 1.1
+
 * Thu Jul 28 2005 Orion Poplawski  1.0-1
 - Update to 1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-dateutil/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jul 2005 19:53:28 -0000	1.2
+++ sources	23 Dec 2005 00:03:51 -0000	1.3
@@ -1 +1 @@
-764659b7b763fa551a5fbcec96d86d6d  python-dateutil-1.0.tar.bz2
+f259496f4059dda806837503ee4235f3  python-dateutil-1.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec 23 00:09:36 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 19:09:36 -0500
Subject: rpms/pytz/devel .cvsignore, 1.2, 1.3 pytz.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200512230010.jBN0AE1b029735@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore pytz.spec sources 
Log Message:
Update to 2005m



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jul 2005 20:58:39 -0000	1.2
+++ .cvsignore	23 Dec 2005 00:09:35 -0000	1.3
@@ -1 +1 @@
-pytz-2005i.tar.bz2
+pytz-2005m.tar.bz2


Index: pytz.spec
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/pytz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pytz.spec	28 Jul 2005 20:11:40 -0000	1.3
+++ pytz.spec	23 Dec 2005 00:09:35 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pytz
-Version:        2005i
-Release:        2%{?dist}
+Version:        2005m
+Release:        1%{?dist}
 Summary:        World Timezone Definitions for Python
 
 Group:          Development/Languages
@@ -47,6 +47,9 @@
 %{python_sitelib}/pytz/
 
 %changelog
+* Thu Dec 22 2005 Orion Poplawski  2005m-1
+- Update to 2005m
+
 * Fri Jul 22 2005 Orion Poplawski  2005i-2
 - Remove -O1 from install command
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jul 2005 20:58:39 -0000	1.2
+++ sources	23 Dec 2005 00:09:35 -0000	1.3
@@ -1 +1 @@
-45aeaba1bc49c62e65490c047ff7fbea  pytz-2005i.tar.bz2
+d0b8fd7e4a5be5fc763cb22044fba854  pytz-2005m.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec 23 01:45:52 2005
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Thu, 22 Dec 2005 20:45:52 -0500
Subject: rpms/bmp/FC-4 .cvsignore,1.2,1.3 bmp.spec,1.6,1.7 sources,1.2,1.3
Message-ID: <200512230146.jBN1kP39031782@cvs-int.fedora.redhat.com>

Author: ertzing

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

Modified Files:
	.cvsignore bmp.spec sources 
Log Message:
Update to upstream 0.9.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bmp/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Mar 2005 17:24:48 -0000	1.2
+++ .cvsignore	23 Dec 2005 01:45:51 -0000	1.3
@@ -1 +1 @@
-bmp-patched-0.9.7.tar.gz
+bmp-patched-0.9.7.1.tar.gz


Index: bmp.spec
===================================================================
RCS file: /cvs/extras/rpms/bmp/FC-4/bmp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bmp.spec	8 Jun 2005 17:42:03 -0000	1.6
+++ bmp.spec	23 Dec 2005 01:45:51 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           bmp
-Version:        0.9.7
-Release:        10%{?dist}
+Version:        0.9.7.1
+Release:        1%{?dist}
 Summary:        GTK2 based port of the XMMS media player
 
 Group:          Applications/Multimedia
@@ -15,7 +15,7 @@
 Patch0:         bmp-0.9.7-readmacro.patch
 Patch1:         bmp-0.9.7-default-skin.patch
 Patch2:         bmp-0.9.7-default-alsa.patch
-Patch3:         bmp-0.9.7-xmms-skins.patch
+Patch3:         bmp-0.9.7.1-xmms-skins.patch
 Patch4:         bmp-0.9.7-shaded-skin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -131,6 +131,10 @@
 
 
 %changelog
+* Fri Dec 23 2005 Ralf Ertzinger  0.9.7.1-1%{?dist}
+- Update to upstream 0.9.7.1
+- Update xmms-skins.patch
+
 * Thu Jun 02 2005 Ralf Ertzinger  0.9.7-10%{?dist} 
 - bmp-0.9.7-shaded-skin.patch (BZ #158402)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bmp/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Mar 2005 17:24:48 -0000	1.2
+++ sources	23 Dec 2005 01:45:52 -0000	1.3
@@ -1 +1 @@
-bcfd525c376ff9ece8f935d34bdcb56e  bmp-patched-0.9.7.tar.gz
+5df7869f4692b64bd2c5e8054569cd5e  bmp-patched-0.9.7.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 01:50:27 2005
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Thu, 22 Dec 2005 20:50:27 -0500
Subject: rpms/bmp/FC-4 bmp.spec,1.7,1.8 bmp-0.9.7-xmms-skins.patch,1.2,NONE
Message-ID: <200512230150.jBN1ox5Z031820@cvs-int.fedora.redhat.com>

Author: ertzing

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

Modified Files:
	bmp.spec 
Removed Files:
	bmp-0.9.7-xmms-skins.patch 
Log Message:
Remove old patch, disable dependency tracking in configure



Index: bmp.spec
===================================================================
RCS file: /cvs/extras/rpms/bmp/FC-4/bmp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bmp.spec	23 Dec 2005 01:45:51 -0000	1.7
+++ bmp.spec	23 Dec 2005 01:50:26 -0000	1.8
@@ -62,7 +62,8 @@
 %endif
 	--disable-mp3 \
 	--enable-gconf \
-	--enable-gnome-vfs
+	--enable-gnome-vfs \
+    --disable-dependency-tracking
 make %{?_smp_mflags}
 
 


--- bmp-0.9.7-xmms-skins.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec 23 01:58:23 2005
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Thu, 22 Dec 2005 20:58:23 -0500
Subject: rpms/bmp/FC-4 bmp-0.9.7.1-xmms-skins.patch,NONE,1.1
Message-ID: <200512230158.jBN1wPrb031919@cvs-int.fedora.redhat.com>

Author: ertzing

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

Added Files:
	bmp-0.9.7.1-xmms-skins.patch 
Log Message:
Add new patch file. Oops.


bmp-0.9.7.1-xmms-skins.patch:

--- NEW FILE bmp-0.9.7.1-xmms-skins.patch ---
diff -uNr bmp-0.9.7.1-orig/beep/skinwin.c bmp-0.9.7.1/beep/skinwin.c
--- bmp-0.9.7.1-orig/beep/skinwin.c	2005-11-27 17:35:25.000000000 +0100
+++ bmp-0.9.7.1/beep/skinwin.c	2005-11-27 17:36:58.000000000 +0100
@@ -232,11 +232,15 @@
 skinlist_update(void)
 {
     gchar *skinsdir;
+    gchar xmmsskinsdir[] = "/usr/share/xmms/Skins";
 
     skinlist_clear();
 
     scan_skindir(bmp_paths[BMP_PATH_USER_SKIN_DIR]);
     scan_skindir(DATA_DIR G_DIR_SEPARATOR_S BMP_SKIN_DIR_BASENAME);
+    if (g_file_test(xmmsskinsdir, G_FILE_TEST_IS_DIR)) {
+        scan_skindir( xmmsskinsdir );
+    }
 
     skinsdir = getenv("SKINSDIR");
     if (skinsdir) {



From fedora-extras-commits at redhat.com  Fri Dec 23 02:15:42 2005
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Thu, 22 Dec 2005 21:15:42 -0500
Subject: rpms/bmp/FC-4 bmp.spec,1.8,1.9
Message-ID: <200512230216.jBN2GFYf001168@cvs-int.fedora.redhat.com>

Author: ertzing

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

Modified Files:
	bmp.spec 
Log Message:
Remove TODO from filelist



Index: bmp.spec
===================================================================
RCS file: /cvs/extras/rpms/bmp/FC-4/bmp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bmp.spec	23 Dec 2005 01:50:26 -0000	1.8
+++ bmp.spec	23 Dec 2005 02:15:42 -0000	1.9
@@ -114,7 +114,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog FAQ NEWS README TODO
+%doc AUTHORS COPYING ChangeLog FAQ NEWS README
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_libdir}/bmp



From fedora-extras-commits at redhat.com  Fri Dec 23 06:05:40 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 23 Dec 2005 01:05:40 -0500
Subject: rpms/gnome-theme-clearlooks-bigpack/devel .cvsignore, 1.2,
	1.3 gnome-theme-clearlooks-bigpack.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512230606.jBN66UK1008347@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8324

Modified Files:
	.cvsignore gnome-theme-clearlooks-bigpack.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2005 12:02:36 -0000	1.2
+++ .cvsignore	23 Dec 2005 06:05:16 -0000	1.3
@@ -1 +1 @@
-Clearlooks-Big_Pack-0.5.tar.bz2
+Clearlooks-Big_Pack-0.6.x.tar.gz


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-theme-clearlooks-bigpack.spec	7 Apr 2005 12:20:40 -0000	1.2
+++ gnome-theme-clearlooks-bigpack.spec	23 Dec 2005 06:05:17 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           gnome-theme-clearlooks-bigpack
-Version:        0.5
-Release:        1.fc4
+Version:        0.6
+Release:        1%{?dist}
 Summary:        Additional Clearlooks color schemes
 
 Group:          User Interface/Desktops
 License:        GPL
-URL:            http://www.gnome-look.org/content/show.php?content=22259
-Source0:        http://oceanic.wsisiz.edu.pl/~slabosz/pliki/Clearlooks-Big_Pack-0.5.tar.bz2
+URL:            http://www.gnome-look.org/content/show.php?content=25557
+Source0:        http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -16,7 +16,7 @@
 Lots and lots of color schemes for the Clearlooks GTK+ 2.x engine.
 
 %prep
-%setup -q -n Clearlooks-Big_Pack-0.5
+%setup -q -c
 
 %build
 
@@ -33,6 +33,9 @@
 %{_datadir}/themes/*
 
 %changelog
+* Fri Dec 23 2005 Ignacio Vazquez-Abrams  0.6-1
+- Upstream update
+
 * Thu Apr  7 2005 Ignacio Vazquez-Abrams  0.5-1.fc4
 - Dist split
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2005 12:02:36 -0000	1.2
+++ sources	23 Dec 2005 06:05:17 -0000	1.3
@@ -1 +1 @@
-2fef62a30c3064bdb6b5381cc00d7d7c  Clearlooks-Big_Pack-0.5.tar.bz2
+9bf7ab320a7054c4ee1e8ee7ec97adca  Clearlooks-Big_Pack-0.6.x.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 06:44:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 23 Dec 2005 01:44:47 -0500
Subject: rpms/python-amara/devel python-amara.spec,1.9,1.10
Message-ID: <200512230645.jBN6jKog008553@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	python-amara.spec 
Log Message:
disttag


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/rpms/python-amara/devel/python-amara.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-amara.spec	20 Apr 2005 04:58:52 -0000	1.9
+++ python-amara.spec	23 Dec 2005 06:44:47 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           python-amara
 Version:        1.0
-Release:        1.b1.fc4
+Release:        1.b1%{?dist}
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -49,15 +49,15 @@
 %doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
-* Wed Apr 20 2005 Ignacio Vazquez-Abrams  1.0-1.b1.fc4
+* Wed Apr 20 2005 Ignacio Vazquez-Abrams  1.0-1.b1
 - Upstream update
 - Fixed file ownership
 
-* Tue Apr  5 2005 Ignacio Vazquez-Abrams  0.9.4-7.fc4
+* Tue Apr  5 2005 Ignacio Vazquez-Abrams  0.9.4-7
 - Added python to BuildRequires
 - Removed versioning code for now
 
-* Wed Mar 30 2005 Ignacio Vazquez-Abrams  0.9.4-6.fc4
+* Wed Mar 30 2005 Ignacio Vazquez-Abrams  0.9.4-6
 - Added disttag
 
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams  0.9.4-6



From fedora-extras-commits at redhat.com  Fri Dec 23 06:45:56 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 23 Dec 2005 01:45:56 -0500
Subject: rpms/python-HTMLgen/devel python-HTMLgen.spec,1.9,1.10
Message-ID: <200512230646.jBN6kTuo008581@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	python-HTMLgen.spec 
Log Message:
disttag


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/rpms/python-HTMLgen/devel/python-HTMLgen.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-HTMLgen.spec	5 Apr 2005 11:23:48 -0000	1.9
+++ python-HTMLgen.spec	23 Dec 2005 06:45:56 -0000	1.10
@@ -4,7 +4,7 @@
 
 Name:           python-HTMLgen
 Version:        2.2.2
-Release:        7.fc4
+Release:        7%{?dist}
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -45,11 +45,11 @@
 %{python_sitelib}/*.py[co]
 
 %changelog
-* Tue Apr  5 2005 Ignacio Vazquez-Abrams  2.2.2-7.fc4
+* Tue Apr  5 2005 Ignacio Vazquez-Abrams  2.2.2-7
 - Added python to BuildRequires
 - Removed versioning code for now
 
-* Wed Mar 30 2005 Ignacio Vazquez-Abrams  2.2.2-6.fc4
+* Wed Mar 30 2005 Ignacio Vazquez-Abrams  2.2.2-6
 - Added disttag
 
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams  2.2.2-6



From fedora-extras-commits at redhat.com  Fri Dec 23 07:07:29 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 23 Dec 2005 02:07:29 -0500
Subject: rpms/dbh/devel dbh.spec,1.4,1.5
Message-ID: <200512230708.jBN782uB010281@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	dbh.spec 
Log Message:
Remove hard coded dist tag (fixes bug 176471)
Remove zero length TODO and NEWS files
Remove static libs
Remove .la files



Index: dbh.spec
===================================================================
RCS file: /cvs/extras/rpms/dbh/devel/dbh.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dbh.spec	18 May 2005 22:34:43 -0000	1.4
+++ dbh.spec	23 Dec 2005 07:07:29 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Disk based hash library
 Name: dbh
 Version: 1.0.24
-Release: 1.fc4
+Release: 2%{?dist}
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.2/src/dbh-1.0.24.tar.gz
 Patch: dbh-1.0.22-rpath.patch
@@ -34,7 +34,7 @@
 %patch -p1 -b .rpath
 
 %build
-%configure --disable-rpath
+%configure --disable-rpath --disable-static
 
 make %{?_smp_mflags}
 
@@ -42,6 +42,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT 
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -51,18 +53,23 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING ChangeLog README
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-, root, root)
 %doc examples/*.c examples/Makefile* doc/*.html
 %{_libdir}/lib*.so
-%{_libdir}/*a
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 
 %changelog
+* Thu Dec 22 2005 Kevin Fenzi  - 1:1.0.24-2.fc5
+- Remove hard coded dist tag (fixes bug 176471)
+- Remove zero length TODO and NEWS files
+- Remove static libs
+- Remove .la files
+
 * Tue May 17 2005 Kevin Fenzi  - 1:1.0.24-1.fc4
 - Update to 1.0.24
 



From fedora-extras-commits at redhat.com  Fri Dec 23 07:12:32 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 23 Dec 2005 02:12:32 -0500
Subject: rpms/help2man/FC-4 help2man.spec,1.7,1.8
Message-ID: <200512230713.jBN7D7AA010451@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	help2man.spec 
Log Message:
- Fix disttag (#176473).
- Cleanup spec.



Index: help2man.spec
===================================================================
RCS file: /cvs/extras/rpms/help2man/FC-4/help2man.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- help2man.spec	29 Apr 2005 17:23:36 -0000	1.7
+++ help2man.spec	23 Dec 2005 07:12:32 -0000	1.8
@@ -1,7 +1,7 @@
 Name:         	help2man
 Summary:      	Create simple man pages from --help output
 Version:      	1.35.1
-Release:      	1.fc4
+Release:      	2%{?dist}
 Group:       	Development/Tools
 License:     	GPL
 URL:		http://www.gnu.org/software/help2man
@@ -52,12 +52,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec 23 2005 Ralf Cors??pius  - 1.35.1-2
+- Fix disttag (#176473).
+- Cleanup spec.
+
 * Fri Apr 29 2005 Ralf Corsepius  - 1.35.1-1
 - Update to 1.35.1
 - Minor spec fixes.
-
-* Thu Jul 09 2004 Ralf Corsepius  - 1.33.1-0.fdr.2
-- Use %%configure.
-
-* Thu Jul 08 2004 Ralf Corsepius  - 1.33.1-0.fdr.1
-- Initial Fedora Extras submission.



From fedora-extras-commits at redhat.com  Fri Dec 23 07:12:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 23 Dec 2005 02:12:12 -0500
Subject: rpms/help2man/devel help2man.spec,1.7,1.8
Message-ID: <200512230713.jBN7DIk8010455@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	help2man.spec 
Log Message:
- Fix disttag (#176473).
- Cleanup spec.



Index: help2man.spec
===================================================================
RCS file: /cvs/extras/rpms/help2man/devel/help2man.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- help2man.spec	29 Apr 2005 17:23:36 -0000	1.7
+++ help2man.spec	23 Dec 2005 07:12:12 -0000	1.8
@@ -1,7 +1,7 @@
 Name:         	help2man
 Summary:      	Create simple man pages from --help output
 Version:      	1.35.1
-Release:      	1.fc4
+Release:      	2%{?dist}
 Group:       	Development/Tools
 License:     	GPL
 URL:		http://www.gnu.org/software/help2man
@@ -52,12 +52,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec 23 2005 Ralf Cors??pius  - 1.35.1-2
+- Fix disttag (#176473).
+- Cleanup spec.
+
 * Fri Apr 29 2005 Ralf Corsepius  - 1.35.1-1
 - Update to 1.35.1
 - Minor spec fixes.
-
-* Thu Jul 09 2004 Ralf Corsepius  - 1.33.1-0.fdr.2
-- Use %%configure.
-
-* Thu Jul 08 2004 Ralf Corsepius  - 1.33.1-0.fdr.1
-- Initial Fedora Extras submission.



From fedora-extras-commits at redhat.com  Fri Dec 23 07:12:49 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 23 Dec 2005 02:12:49 -0500
Subject: rpms/help2man/FC-3 help2man.spec,1.6,1.7
Message-ID: <200512230713.jBN7DL0X010462@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	help2man.spec 
Log Message:
- Fix disttag (#176473).
- Cleanup spec.



Index: help2man.spec
===================================================================
RCS file: /cvs/extras/rpms/help2man/FC-3/help2man.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- help2man.spec	29 Apr 2005 17:29:42 -0000	1.6
+++ help2man.spec	23 Dec 2005 07:12:48 -0000	1.7
@@ -1,7 +1,7 @@
 Name:         	help2man
 Summary:      	Create simple man pages from --help output
 Version:      	1.35.1
-Release:      	1.fc3
+Release:      	2%{?dist}
 Group:       	Development/Tools
 License:     	GPL
 URL:		http://www.gnu.org/software/help2man
@@ -52,12 +52,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec 23 2005 Ralf Cors??pius  - 1.35.1-2
+- Fix disttag (#176473).
+- Cleanup spec.
+
 * Fri Apr 29 2005 Ralf Corsepius  - 1.35.1-1
 - Update to 1.35.1
 - Minor spec fixes.
-
-* Thu Jul 09 2004 Ralf Corsepius  - 1.33.1-0.fdr.2
-- Use %%configure.
-
-* Thu Jul 08 2004 Ralf Corsepius  - 1.33.1-0.fdr.1
-- Initial Fedora Extras submission.



From fedora-extras-commits at redhat.com  Fri Dec 23 07:15:59 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 23 Dec 2005 02:15:59 -0500
Subject: rpms/dbh/FC-4 dbh.spec,1.4,1.5
Message-ID: <200512230716.jBN7GVET010557@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	dbh.spec 
Log Message:
Remove hard coded dist tag (fixes bug 176471)
Remove zero length TODO and NEWS files
Remove static libs
Remove .la files



Index: dbh.spec
===================================================================
RCS file: /cvs/extras/rpms/dbh/FC-4/dbh.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dbh.spec	18 May 2005 22:34:43 -0000	1.4
+++ dbh.spec	23 Dec 2005 07:15:59 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Disk based hash library
 Name: dbh
 Version: 1.0.24
-Release: 1.fc4
+Release: 2%{?dist}
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.2/src/dbh-1.0.24.tar.gz
 Patch: dbh-1.0.22-rpath.patch
@@ -34,7 +34,7 @@
 %patch -p1 -b .rpath
 
 %build
-%configure --disable-rpath
+%configure --disable-rpath --disable-static
 
 make %{?_smp_mflags}
 
@@ -42,6 +42,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT 
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -51,18 +53,23 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING ChangeLog README
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-, root, root)
 %doc examples/*.c examples/Makefile* doc/*.html
 %{_libdir}/lib*.so
-%{_libdir}/*a
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 
 %changelog
+* Thu Dec 22 2005 Kevin Fenzi  - 1:1.0.24-2.fc4
+- Remove hard coded dist tag (fixes bug 176471)
+- Remove zero length TODO and NEWS files
+- Remove static libs
+- Remove .la files
+
 * Tue May 17 2005 Kevin Fenzi  - 1:1.0.24-1.fc4
 - Update to 1.0.24
 



From fedora-extras-commits at redhat.com  Fri Dec 23 07:21:04 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 23 Dec 2005 02:21:04 -0500
Subject: rpms/dbh/devel dbh.spec,1.5,1.6
Message-ID: <200512230721.jBN7Larw010626@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	dbh.spec 
Log Message:
Bump release to fix tagging issue



Index: dbh.spec
===================================================================
RCS file: /cvs/extras/rpms/dbh/devel/dbh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dbh.spec	23 Dec 2005 07:07:29 -0000	1.5
+++ dbh.spec	23 Dec 2005 07:21:04 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Disk based hash library
 Name: dbh
 Version: 1.0.24
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.2/src/dbh-1.0.24.tar.gz
 Patch: dbh-1.0.22-rpath.patch
@@ -64,6 +64,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Dec 23 2005 Kevin Fenzi  - 1:1.0.24-3.fc5
+- Bump release to fix tagging issue
+
 * Thu Dec 22 2005 Kevin Fenzi  - 1:1.0.24-2.fc5
 - Remove hard coded dist tag (fixes bug 176471)
 - Remove zero length TODO and NEWS files



From fedora-extras-commits at redhat.com  Fri Dec 23 07:22:25 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 23 Dec 2005 02:22:25 -0500
Subject: rpms/dbh/FC-4 dbh.spec,1.5,1.6
Message-ID: <200512230722.jBN7MwLw010693@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	dbh.spec 
Log Message:
Bump release to fix tagging issue



Index: dbh.spec
===================================================================
RCS file: /cvs/extras/rpms/dbh/FC-4/dbh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dbh.spec	23 Dec 2005 07:15:59 -0000	1.5
+++ dbh.spec	23 Dec 2005 07:22:25 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Disk based hash library
 Name: dbh
 Version: 1.0.24
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.2/src/dbh-1.0.24.tar.gz
 Patch: dbh-1.0.22-rpath.patch
@@ -64,6 +64,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Dec 22 2005 Kevin Fenzi  - 1:1.0.24-3.fc4
+- Bump release to fix tagging issue
+
 * Thu Dec 22 2005 Kevin Fenzi  - 1:1.0.24-2.fc4
 - Remove hard coded dist tag (fixes bug 176471)
 - Remove zero length TODO and NEWS files



From fedora-extras-commits at redhat.com  Fri Dec 23 08:34:18 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 23 Dec 2005 03:34:18 -0500
Subject: rpms/php-adodb/FC-4 .cvsignore, 1.4, 1.5 php-adodb.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512230834.jBN8Yo4Z012531@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/php-adodb/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12493/FC-4

Modified Files:
	.cvsignore php-adodb.spec sources 
Log Message:
- version 4.68


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Nov 2005 10:26:26 -0000	1.4
+++ .cvsignore	23 Dec 2005 08:34:17 -0000	1.5
@@ -1 +1 @@
-adodb467.tgz
+adodb468.tgz


Index: php-adodb.spec
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-4/php-adodb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-adodb.spec	18 Nov 2005 10:26:26 -0000	1.6
+++ php-adodb.spec	23 Dec 2005 08:34:17 -0000	1.7
@@ -1,9 +1,9 @@
 Name:           php-adodb
 Summary:        Active Data Objects Data Base
-Version:        4.67
+Version:        4.68
 Release:        1%{?dist}
 
-Source0:        http://dl.sf.net/adodb/adodb467.tgz
+Source0:        http://dl.sf.net/adodb/adodb468.tgz
 License:        BSD
 URL:            http://adodb.sf.net
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_var}/www/icons/*
 
 %changelog
+* Fri Dec 23 2005 Aurelien Bompard  4.68-1
+- version 4.68
+
 * Fri Nov 18 2005 Aurelien Bompard  4.67-1
 - version 4.67
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Nov 2005 10:26:26 -0000	1.4
+++ sources	23 Dec 2005 08:34:17 -0000	1.5
@@ -1 +1 @@
-679d4fac06126707f4bf636508e9ec8a  adodb467.tgz
+c4e8b0db2abc7181a1d3bb0621aa0c1d  adodb468.tgz



From fedora-extras-commits at redhat.com  Fri Dec 23 08:34:23 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 23 Dec 2005 03:34:23 -0500
Subject: rpms/php-adodb/devel .cvsignore, 1.4, 1.5 php-adodb.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512230834.jBN8YuD0012536@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/php-adodb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12493/devel

Modified Files:
	.cvsignore php-adodb.spec sources 
Log Message:
- version 4.68


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Nov 2005 10:26:32 -0000	1.4
+++ .cvsignore	23 Dec 2005 08:34:23 -0000	1.5
@@ -1 +1 @@
-adodb467.tgz
+adodb468.tgz


Index: php-adodb.spec
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/php-adodb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-adodb.spec	18 Nov 2005 10:26:32 -0000	1.6
+++ php-adodb.spec	23 Dec 2005 08:34:23 -0000	1.7
@@ -1,9 +1,9 @@
 Name:           php-adodb
 Summary:        Active Data Objects Data Base
-Version:        4.67
+Version:        4.68
 Release:        1%{?dist}
 
-Source0:        http://dl.sf.net/adodb/adodb467.tgz
+Source0:        http://dl.sf.net/adodb/adodb468.tgz
 License:        BSD
 URL:            http://adodb.sf.net
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_var}/www/icons/*
 
 %changelog
+* Fri Dec 23 2005 Aurelien Bompard  4.68-1
+- version 4.68
+
 * Fri Nov 18 2005 Aurelien Bompard  4.67-1
 - version 4.67
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Nov 2005 10:26:32 -0000	1.4
+++ sources	23 Dec 2005 08:34:23 -0000	1.5
@@ -1 +1 @@
-679d4fac06126707f4bf636508e9ec8a  adodb467.tgz
+c4e8b0db2abc7181a1d3bb0621aa0c1d  adodb468.tgz



From fedora-extras-commits at redhat.com  Fri Dec 23 08:37:08 2005
From: fedora-extras-commits at redhat.com (Leif O M Bergman (lmb))
Date: Fri, 23 Dec 2005 03:37:08 -0500
Subject: rpms/perl-IO-Multiplex - New directory
Message-ID: <200512230837.jBN8bAu1012593@cvs-int.fedora.redhat.com>

Author: lmb

Update of /cvs/extras/rpms/perl-IO-Multiplex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12585/perl-IO-Multiplex

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




From fedora-extras-commits at redhat.com  Fri Dec 23 08:37:14 2005
From: fedora-extras-commits at redhat.com (Leif O M Bergman (lmb))
Date: Fri, 23 Dec 2005 03:37:14 -0500
Subject: rpms/perl-IO-Multiplex/devel - New directory
Message-ID: <200512230837.jBN8bGIV012608@cvs-int.fedora.redhat.com>

Author: lmb

Update of /cvs/extras/rpms/perl-IO-Multiplex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12585/perl-IO-Multiplex/devel

Log Message:
Directory /cvs/extras/rpms/perl-IO-Multiplex/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 23 08:37:23 2005
From: fedora-extras-commits at redhat.com (Leif O M Bergman (lmb))
Date: Fri, 23 Dec 2005 03:37:23 -0500
Subject: rpms/perl-IO-Multiplex Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512230837.jBN8bPfC012642@cvs-int.fedora.redhat.com>

Author: lmb

Update of /cvs/extras/rpms/perl-IO-Multiplex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12630

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-IO-Multiplex


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 23 08:37:29 2005
From: fedora-extras-commits at redhat.com (Leif O M Bergman (lmb))
Date: Fri, 23 Dec 2005 03:37:29 -0500
Subject: rpms/perl-IO-Multiplex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200512230837.jBN8bVbE012662@cvs-int.fedora.redhat.com>

Author: lmb

Update of /cvs/extras/rpms/perl-IO-Multiplex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12630/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-IO-Multiplex


--- NEW 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 Dec 23 08:37:43 2005
From: fedora-extras-commits at redhat.com (Leif O M Bergman (lmb))
Date: Fri, 23 Dec 2005 03:37:43 -0500
Subject: rpms/perl-IO-Multiplex import.log,1.1,1.2
Message-ID: <200512230838.jBN8cGfC012801@cvs-int.fedora.redhat.com>

Author: lmb

Update of /cvs/extras/rpms/perl-IO-Multiplex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12696

Modified Files:
	import.log 
Log Message:
auto-import perl-IO-Multiplex-1.08-4 on branch devel from perl-IO-Multiplex-1.08-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Multiplex/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Dec 2005 08:37:23 -0000	1.1
+++ import.log	23 Dec 2005 08:37:43 -0000	1.2
@@ -0,0 +1 @@
+perl-IO-Multiplex-1_08-4:HEAD:perl-IO-Multiplex-1.08-4.src.rpm:1135327061



From fedora-extras-commits at redhat.com  Fri Dec 23 08:37:50 2005
From: fedora-extras-commits at redhat.com (Leif O M Bergman (lmb))
Date: Fri, 23 Dec 2005 03:37:50 -0500
Subject: rpms/perl-IO-Multiplex/devel perl-IO-Multiplex.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512230838.jBN8cN2q012810@cvs-int.fedora.redhat.com>

Author: lmb

Update of /cvs/extras/rpms/perl-IO-Multiplex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12696/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-IO-Multiplex.spec 
Log Message:
auto-import perl-IO-Multiplex-1.08-4 on branch devel from perl-IO-Multiplex-1.08-4.src.rpm


--- NEW FILE perl-IO-Multiplex.spec ---
Summary: IO-Multiplex module for perl
Name: perl-IO-Multiplex
Version: 1.08
Release: 4
License: Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/IO-Multiplex/

Source: http://www.cpan.org/authors/id/B/BB/BBB/IO-Multiplex-1.08.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch
BuildRequires: perl
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
IO::Multiplex is designed to take the effort out of managing
multiple file handles.  It is essentially a really fancy front end to
the select system call.  In addition to maintaining the select
loop, it buffers all input and output to/from the file handles.  It
can also accept incoming connections on one or more listen sockets.

%prep
%setup -n IO-Multiplex-%{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 ';'

%check
%{__make} test

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

%files
%defattr(-, root, root, -)
%doc Changes README
%doc %{_mandir}/man?/*
%{perl_vendorlib}/IO/

%changelog
* Tue Dec 13 2005 Leif O M Bergman  - 1.08-4
- Changes for fedora xtras compliance

* Mon Dec 12 2005 Leif O M Bergman  - 1.08-3
- Cosmetic changes for fedora xtras

* Sun Feb 20 2005 Dag Wieers  - 1.08-2
- Cosmetic changes.

* Thu Mar 18 2004 Dag Wieers  - 1.08-1
- Updated to release 1.08.

* Mon Jul 14 2003 Dag Wieers  - 1.04-0
- Initial package. (using DAR)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Multiplex/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Dec 2005 08:37:29 -0000	1.1
+++ .cvsignore	23 Dec 2005 08:37:49 -0000	1.2
@@ -0,0 +1 @@
+IO-Multiplex-1.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Multiplex/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Dec 2005 08:37:29 -0000	1.1
+++ sources	23 Dec 2005 08:37:49 -0000	1.2
@@ -0,0 +1 @@
+b27e0eb03f85cfd04b3e29953cfd4444  IO-Multiplex-1.08.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 08:42:18 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 23 Dec 2005 03:42:18 -0500
Subject: rpms/python-dialog/FC-4 python-dialog.spec,1.5,1.6
Message-ID: <200512230842.jBN8goJ6012897@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	python-dialog.spec 
Log Message:
- remove hardcoded disttag (#176478)


Index: python-dialog.spec
===================================================================
RCS file: /cvs/extras/rpms/python-dialog/FC-4/python-dialog.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-dialog.spec	30 Mar 2005 10:45:13 -0000	1.5
+++ python-dialog.spec	23 Dec 2005 08:42:18 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           python-dialog
 Version:        2.7
-Release:        1.fc4
+Release:        2%{?dist}
 Summary:        Python interface to the Unix dialog utility
 
 Group:          Development/Languages
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Aurelien Bompard  2.7-1
+- remove hardcoded disttag
+
 * Wed Mar 30 2005 Aurelien Bompard  2.7-1.fc4
 - change release tag for FC4
 - drop Epoch



From fedora-extras-commits at redhat.com  Fri Dec 23 08:42:24 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 23 Dec 2005 03:42:24 -0500
Subject: rpms/python-dialog/devel python-dialog.spec,1.5,1.6
Message-ID: <200512230842.jBN8guIR012900@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	python-dialog.spec 
Log Message:
- remove hardcoded disttag (#176478)


Index: python-dialog.spec
===================================================================
RCS file: /cvs/extras/rpms/python-dialog/devel/python-dialog.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-dialog.spec	30 Mar 2005 10:45:13 -0000	1.5
+++ python-dialog.spec	23 Dec 2005 08:42:24 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           python-dialog
 Version:        2.7
-Release:        1.fc4
+Release:        2%{?dist}
 Summary:        Python interface to the Unix dialog utility
 
 Group:          Development/Languages
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Aurelien Bompard  2.7-1
+- remove hardcoded disttag
+
 * Wed Mar 30 2005 Aurelien Bompard  2.7-1.fc4
 - change release tag for FC4
 - drop Epoch



From fedora-extras-commits at redhat.com  Fri Dec 23 08:49:22 2005
From: fedora-extras-commits at redhat.com (Leif O M Bergman (lmb))
Date: Fri, 23 Dec 2005 03:49:22 -0500
Subject: owners owners.list,1.477,1.478
Message-ID: <200512230849.jBN8ns8s012972@cvs-int.fedora.redhat.com>

Author: lmb

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

Modified Files:
	owners.list 
Log Message:
Adding perl-IO-Multiplex



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -r1.477 -r1.478
--- owners.list	22 Dec 2005 20:33:47 -0000	1.477
+++ owners.list	23 Dec 2005 08:49:22 -0000	1.478
@@ -805,6 +805,7 @@
 Fedora Extras|perl-Image-Xbm|Load, create, manipulate and save xbm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-Xpm|Load, create, manipulate and save xpm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-CaptureOutput|Capture STDOUT/STDERR from subprocesses and XS/C modules|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Dec 23 09:00:53 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 23 Dec 2005 04:00:53 -0500
Subject: rpms/grads/FC-3 grads.spec,1.4,1.5
Message-ID: <200512230901.jBN91PLb014708@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	grads.spec 
Log Message:
No hdf-devel on FC-3



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-3/grads.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grads.spec	21 Dec 2005 08:02:35 -0000	1.4
+++ grads.spec	23 Dec 2005 09:00:53 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        5%{?dist}.1
+Release:        5%{?dist}.2
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -28,9 +28,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # no hdf on ppc
-%ifnarch ppc
-BuildRequires:  hdf-devel 
-%endif
 BuildRequires:  udunits-devel netcdf-devel 
 #BuildRequires:  opendap-devel
 BuildRequires:  libdap-devel libnc-dap-devel
@@ -69,7 +66,7 @@
 
 %build
 ./bootstrap
-# pass the -L and -I flags for hdf on ppc even though there is no hdf
+# pass the -L and -I flags for hdf even though there is no hdf
 %configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
@@ -91,9 +88,6 @@
 %{_bindir}/bufrscan
 %{_bindir}/gradsc
 %{_bindir}/gradsdods
-%ifnarch ppc
-%{_bindir}/gradshdf
-%endif
 %{_bindir}/gradsnc
 %{_bindir}/gribmap
 %{_bindir}/gribscan
@@ -107,7 +101,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Wed Dec 21 2005 Patrice Dumas  1.9b4-5.1
+* Wed Dec 21 2005 Patrice Dumas  1.9b4-5.2
 - don't build the hdf interface on ppc, there is no hdf package
 
 * Tue Dec 13 2005 Patrice Dumas  1.9b4-4



From fedora-extras-commits at redhat.com  Fri Dec 23 09:10:40 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 23 Dec 2005 04:10:40 -0500
Subject: rpms/grads/FC-4 grads.spec,1.4,1.5
Message-ID: <200512230911.jBN9BDTP015070@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	grads.spec 
Log Message:
./configure fails on x86_64


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-4/grads.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grads.spec	21 Dec 2005 08:02:35 -0000	1.4
+++ grads.spec	23 Dec 2005 09:10:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        5%{?dist}.1
+Release:        5%{?dist}.2
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -26,6 +26,8 @@
 Patch1:         grads_dap-no_lats.patch
 Patch2:         grads-conditionnal_lats.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# configure fails on x86_64
+ExcludeArch:    x86_64
 
 # no hdf on ppc
 %ifnarch ppc
@@ -107,7 +109,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Wed Dec 21 2005 Patrice Dumas  1.9b4-5.1
+* Wed Dec 21 2005 Patrice Dumas  1.9b4-5.2
 - don't build the hdf interface on ppc, there is no hdf package
 
 * Tue Dec 13 2005 Patrice Dumas  1.9b4-4



From fedora-extras-commits at redhat.com  Fri Dec 23 09:22:01 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 23 Dec 2005 04:22:01 -0500
Subject: rpms/help2man/devel .cvsignore, 1.3, 1.4 help2man.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200512230923.jBN9N3UX015431@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	.cvsignore help2man.spec sources 
Log Message:
* Fri Dec 23 2005 Ralf Cors??pius  - 1.36.3-1
- Upstream update.
- Add build option --with nls.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/help2man/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Apr 2005 17:23:36 -0000	1.3
+++ .cvsignore	23 Dec 2005 09:22:01 -0000	1.4
@@ -1 +1 @@
-help2man-1.35.1.tar.gz
+help2man-1.36.3.tar.gz


Index: help2man.spec
===================================================================
RCS file: /cvs/extras/rpms/help2man/devel/help2man.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- help2man.spec	23 Dec 2005 07:12:12 -0000	1.8
+++ help2man.spec	23 Dec 2005 09:22:01 -0000	1.9
@@ -1,13 +1,20 @@
+# Supported build option:
+#
+# --with nls ... build this package with --enable-nls 
+
 Name:         	help2man
 Summary:      	Create simple man pages from --help output
-Version:      	1.35.1
-Release:      	2%{?dist}
+Version:      	1.36.3
+Release:      	1%{?dist}
 Group:       	Development/Tools
 License:     	GPL
 URL:		http://www.gnu.org/software/help2man
 Source:       	ftp://ftp.gnu.org/gnu/help2man/help2man-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:    	noarch
+
+%{!?_with_nls:BuildArch: noarch}
+%{?_with_nls:BuildRequires: perl(Locale::gettext)}
+%{?_with_nls:Requires: perl(Locale::gettext)}
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -24,9 +31,9 @@
 %setup -n help2man-%{version}
 
 %build
-# --enable-nls would require perl(Locale::gettext)
-  %configure --disable-nls
-make
+
+%configure %{!?_with_nls:--disable-nls}
+make %{?_smp_mflags}
 
 %install
 rm -fr $RPM_BUILD_ROOT
@@ -45,13 +52,27 @@
 fi
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %doc README NEWS THANKS
 %{_bindir}/help2man
 %{_infodir}/*
 %{_mandir}/man1/*
 
+%if "%{?_with_nls}"
+%{_libdir}/*.so
+%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/help2man.mo
+%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/help2man.mo
+%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/help2man.mo
+%lang(pl) %{_mandir}/pl/man1/*
+%lang(fi) %{_mandir}/fi/man1/*
+%lang(fr) %{_mandir}/fr/man1/*
+%endif
+
 %changelog
+* Fri Dec 23 2005 Ralf Cors??pius  - 1.36.3-1
+- Upstream update.
+- Add build option --with nls.
+
 * Fri Dec 23 2005 Ralf Cors??pius  - 1.35.1-2
 - Fix disttag (#176473).
 - Cleanup spec.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/help2man/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Apr 2005 17:23:36 -0000	1.3
+++ sources	23 Dec 2005 09:22:01 -0000	1.4
@@ -1 +1 @@
-e3c9e846dd163eb7f1d1661e2d0baa07  help2man-1.35.1.tar.gz
+4b5f1609d22a6a0aacbeb5eaf08ad2b1  help2man-1.36.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 09:37:04 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 23 Dec 2005 04:37:04 -0500
Subject: rpms/grads/FC-3 grads.spec,1.5,1.6
Message-ID: <200512230937.jBN9bb5Z015591@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	grads.spec 
Log Message:
./configure fails on x86_64


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-3/grads.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grads.spec	23 Dec 2005 09:00:53 -0000	1.5
+++ grads.spec	23 Dec 2005 09:37:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        5%{?dist}.2
+Release:        5%{?dist}.3
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -26,6 +26,8 @@
 Patch1:         grads_dap-no_lats.patch
 Patch2:         grads-conditionnal_lats.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# configure fails on x86_64
+ExcludeArch:    x86_64
 
 # no hdf on ppc
 BuildRequires:  udunits-devel netcdf-devel 
@@ -101,7 +103,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Wed Dec 21 2005 Patrice Dumas  1.9b4-5.2
+* Wed Dec 21 2005 Patrice Dumas  1.9b4-5.3
 - don't build the hdf interface on ppc, there is no hdf package
 
 * Tue Dec 13 2005 Patrice Dumas  1.9b4-4



From fedora-extras-commits at redhat.com  Fri Dec 23 10:17:50 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 23 Dec 2005 05:17:50 -0500
Subject: rpms/scim-input-pad/FC-3 .cvsignore, 1.2, 1.3 scim-input-pad.spec,
	1.2, 
	1.3 sources, 1.2, 1.3 scim-input-pad-0.1.0-casts.patch, 1.1, NONE
Message-ID: <200512231018.jBNAIMHT017498@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-serv17477

Modified Files:
	.cvsignore scim-input-pad.spec sources 
Removed Files:
	scim-input-pad-0.1.0-casts.patch 
Log Message:
update to 1.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2005 23:28:12 -0000	1.2
+++ .cvsignore	23 Dec 2005 10:17:50 -0000	1.3
@@ -1 +1 @@
-scim-input-pad-0.1.0.tar.gz
+scim-input-pad-0.1.1.tar.gz


Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-3/scim-input-pad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-input-pad.spec	21 Oct 2005 23:40:39 -0000	1.2
+++ scim-input-pad.spec	23 Dec 2005 10:17:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scim-input-pad
-Version:        0.1.0
-Release:        3%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -11,14 +11,12 @@
 
 BuildRequires:  scim-devel
 Requires:       scim
-Patch0:	        scim-input-pad-0.1.0-casts.patch
 
 %description
 Scim-input-pad is an on-screen input pad used to input symbols easily.
 
 %prep
 %setup -q
-%patch0 -p0 -b .orig
 
 
 %build
@@ -58,6 +56,10 @@
 
 
 %changelog
+* Fri Dec 23 2005 Ryo Dairiki 
+- update to 0.1.1
+- get rid of the patch for irregal casting
+
 * Sat Oct 22 2005 Ryo Dairiki 
 - reimport sourcefiles.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 23:28:12 -0000	1.2
+++ sources	23 Dec 2005 10:17:50 -0000	1.3
@@ -1 +1 @@
-119ce442a774d9fd25da550669675501  scim-input-pad-0.1.0.tar.gz
+45fc98fadcfdb8351478a2bc8e37b24f  scim-input-pad-0.1.1.tar.gz


--- scim-input-pad-0.1.0-casts.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec 23 10:18:50 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 23 Dec 2005 05:18:50 -0500
Subject: rpms/scim-input-pad/FC-4 scim-input-pad.spec, 1.2, 1.3 sources, 1.2,
	1.3 scim-input-pad-0.1.0-casts.patch, 1.1, NONE
Message-ID: <200512231019.jBNAJMhr017569@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-serv17509

Modified Files:
	scim-input-pad.spec sources 
Removed Files:
	scim-input-pad-0.1.0-casts.patch 
Log Message:
update to 0.1.1



Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-4/scim-input-pad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-input-pad.spec	21 Oct 2005 23:41:20 -0000	1.2
+++ scim-input-pad.spec	23 Dec 2005 10:18:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scim-input-pad
-Version:        0.1.0
-Release:        3%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -11,14 +11,12 @@
 
 BuildRequires:  scim-devel
 Requires:       scim
-Patch0:	        scim-input-pad-0.1.0-casts.patch
 
 %description
 Scim-input-pad is an on-screen input pad used to input symbols easily.
 
 %prep
 %setup -q
-%patch0 -p0 -b .orig
 
 
 %build
@@ -58,6 +56,10 @@
 
 
 %changelog
+* Fri Dec 23 2005 Ryo Dairiki 
+- update to 0.1.1
+- get rid of the patch for irregal casting
+
 * Sat Oct 22 2005 Ryo Dairiki 
 - reimport sourcefiles.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 23:25:51 -0000	1.2
+++ sources	23 Dec 2005 10:18:50 -0000	1.3
@@ -1 +1 @@
-119ce442a774d9fd25da550669675501  scim-input-pad-0.1.0.tar.gz
+45fc98fadcfdb8351478a2bc8e37b24f  scim-input-pad-0.1.1.tar.gz


--- scim-input-pad-0.1.0-casts.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec 23 10:19:53 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 23 Dec 2005 05:19:53 -0500
Subject: rpms/scim-input-pad/devel scim-input-pad.spec, 1.2, 1.3 sources, 1.2,
	1.3 scim-input-pad-0.1.0-casts.patch, 1.1, NONE
Message-ID: <200512231020.jBNAKP4F017639@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-serv17616

Modified Files:
	scim-input-pad.spec sources 
Removed Files:
	scim-input-pad-0.1.0-casts.patch 
Log Message:
update to 0.1.1



Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/devel/scim-input-pad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-input-pad.spec	21 Oct 2005 23:31:35 -0000	1.2
+++ scim-input-pad.spec	23 Dec 2005 10:19:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scim-input-pad
-Version:        0.1.0
-Release:        3%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -11,14 +11,12 @@
 
 BuildRequires:  scim-devel
 Requires:       scim
-Patch0:	        scim-input-pad-0.1.0-casts.patch
 
 %description
 Scim-input-pad is an on-screen input pad used to input symbols easily.
 
 %prep
 %setup -q
-%patch0 -p0 -b .orig
 
 
 %build
@@ -58,6 +56,10 @@
 
 
 %changelog
+* Fri Dec 23 2005 Ryo Dairiki 
+- update to 0.1.1
+- get rid of the patch for irregal casting
+
 * Sat Oct 22 2005 Ryo Dairiki 
 - reimport sourcefiles.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 23:25:24 -0000	1.2
+++ sources	23 Dec 2005 10:19:52 -0000	1.3
@@ -1 +1 @@
-119ce442a774d9fd25da550669675501  scim-input-pad-0.1.0.tar.gz
+45fc98fadcfdb8351478a2bc8e37b24f  scim-input-pad-0.1.1.tar.gz


--- scim-input-pad-0.1.0-casts.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec 23 11:09:13 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 23 Dec 2005 06:09:13 -0500
Subject: rpms/wesnoth/FC-4 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 wesnoth.spec, 1.16, 1.17
Message-ID: <200512231109.jBNB9p8V019524@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Oct 2005 10:33:13 -0000	1.11
+++ .cvsignore	23 Dec 2005 11:09:12 -0000	1.12
@@ -1 +1 @@
-wesnoth-1.0.1.tar.gz
+wesnoth-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Oct 2005 10:33:13 -0000	1.11
+++ sources	23 Dec 2005 11:09:12 -0000	1.12
@@ -1 +1 @@
-20a2498938a168bf6a0989af857da500  wesnoth-1.0.1.tar.gz
+1d2a26062ce1c90cbf10845023f9435c  wesnoth-1.0.2.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/wesnoth.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wesnoth.spec	24 Oct 2005 10:33:13 -0000	1.16
+++ wesnoth.spec	23 Dec 2005 11:09:12 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           wesnoth
-Version:        1.0.1
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
@@ -158,6 +158,9 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Wed Dec 21 2005 Michael Schwendt  - 1.0.2-1
+- update to 1.0.2
+
 * Sat Oct 22 2005 Michael Schwendt  - 1.0.1-1
 - update to 1.0.1
 



From fedora-extras-commits at redhat.com  Fri Dec 23 11:09:19 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 23 Dec 2005 06:09:19 -0500
Subject: rpms/wesnoth/FC-3 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 wesnoth.spec, 1.12, 1.13
Message-ID: <200512231110.jBNBA776019531@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Oct 2005 10:33:12 -0000	1.11
+++ .cvsignore	23 Dec 2005 11:09:18 -0000	1.12
@@ -1 +1 @@
-wesnoth-1.0.1.tar.gz
+wesnoth-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Oct 2005 10:33:12 -0000	1.11
+++ sources	23 Dec 2005 11:09:18 -0000	1.12
@@ -1 +1 @@
-20a2498938a168bf6a0989af857da500  wesnoth-1.0.1.tar.gz
+1d2a26062ce1c90cbf10845023f9435c  wesnoth-1.0.2.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/wesnoth.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wesnoth.spec	24 Oct 2005 10:33:12 -0000	1.12
+++ wesnoth.spec	23 Dec 2005 11:09:18 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           wesnoth
-Version:        1.0.1
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
@@ -158,6 +158,9 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Wed Dec 21 2005 Michael Schwendt  - 1.0.2-1
+- update to 1.0.2
+
 * Sat Oct 22 2005 Michael Schwendt  - 1.0.1-1
 - update to 1.0.1
 



From fedora-extras-commits at redhat.com  Fri Dec 23 13:08:34 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri, 23 Dec 2005 08:08:34 -0500
Subject: rpms/ktrack/FC-3 ktrack.spec,1.11,1.12
Message-ID: <200512231309.jBND97ea023236@cvs-int.fedora.redhat.com>

Author: ausil

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

Modified Files:
	ktrack.spec 
Log Message:
Fix hard coded dist tag



Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/rpms/ktrack/FC-3/ktrack.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ktrack.spec	6 Apr 2005 10:11:58 -0000	1.11
+++ ktrack.spec	23 Dec 2005 13:08:08 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 10.rc1.fc3
+Release: 12.rc1.%{?dist}
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -59,10 +59,16 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Thu Dec 22 2005 Dennis Gilmore  - 0.3.0-12.rc1
+- rebuild for gcc 4.1
+
+* Sun May 22 2005 Jeremy Katz  - 0.3.0-11.rc1.fc4
+- rebuild on all arches
+
 * Wed Apr  6 2005 Ignacio Vazquez-Abrams  0.3.0-10.rc1.fc3
 - Rebuild against hamlib 1.2.4
 
-* Sat Mar 26 2005 Michael Schwendt  0.3.0-9.rc1.fc3
+* Sat Mar 26 2005 Michael Schwendt  0.3.0-9.rc1.fc4
 - Pass Qt library/header location to configure script to work around
   broken Qt detection on x86_64.
 



From fedora-extras-commits at redhat.com  Fri Dec 23 13:11:57 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri, 23 Dec 2005 08:11:57 -0500
Subject: rpms/ktrack/FC-4 ktrack.spec,1.12,1.13
Message-ID: <200512231312.jBNDCU7P023337@cvs-int.fedora.redhat.com>

Author: ausil

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

Modified Files:
	ktrack.spec 
Log Message:
Build to fix hard coded dist tags




Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/rpms/ktrack/FC-4/ktrack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ktrack.spec	22 May 2005 23:44:21 -0000	1.12
+++ ktrack.spec	23 Dec 2005 13:11:57 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 11.rc1.fc4
+Release: 12.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
+* Thu Dec 22 2005 Dennis Gilmore  - 0.3.0-12.rc1
+- rebuild for gcc 4.1
+
 * Sun May 22 2005 Jeremy Katz  - 0.3.0-11.rc1.fc4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Fri Dec 23 15:39:03 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 23 Dec 2005 10:39:03 -0500
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.4,1.5
Message-ID: <200512231539.jBNFdZao026919@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Log Message:
* Fri Dec 23 2005 Rex Dieter  0.8.1-5
- cleanup %post
- fc5 respin for new(er) libofx



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kmymoney2.spec	15 Dec 2005 15:08:12 -0000	1.4
+++ kmymoney2.spec	23 Dec 2005 15:39:02 -0000	1.5
@@ -10,7 +10,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -109,18 +109,18 @@
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor ||:
-touch --no-create %{_datadir}/icons/locolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+for icon_theme in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig 
-touch --no-create %{_datadir}/icons/hicolor ||:
-touch --no-create %{_datadir}/icons/locolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+for icon_theme in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
@@ -152,6 +152,10 @@
 
 
 %changelog
+* Fri Dec 23 2005 Rex Dieter  0.8.1-5
+- cleanup %%post
+- fc5 respin for new(er) libofx
+
 * Mon Nov 14 2005 Rex Dieter  0.8.1-4
 - relax BR: kdelibs-devel to 3.3 (for aurora/sparc, #173133)
 



From fedora-extras-commits at redhat.com  Fri Dec 23 15:46:01 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Fri, 23 Dec 2005 10:46:01 -0500
Subject: rpms/mantis/devel mantis-1.0.0rc2-noadmin.patch, NONE, 1.1 sources, 
	1.4, 1.5 mantis.spec, 1.7, 1.8 mantis-1.0.0a3-nonmysql.patch,
	1.1, NONE mantis-0.19.2-noadmin.patch, 1.1, NONE
Message-ID: <200512231546.jBNFkYrF027089@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	sources mantis.spec 
Added Files:
	mantis-1.0.0rc2-noadmin.patch 
Removed Files:
	mantis-1.0.0a3-nonmysql.patch mantis-0.19.2-noadmin.patch 
Log Message:
- SECURITY: release 1.0.0rc4
- removed x-permission from most files
- rediffed


mantis-1.0.0rc2-noadmin.patch:

--- NEW FILE mantis-1.0.0rc2-noadmin.patch ---
--- mantis-1.0.0rc2/login_page.php.noadmin	2005-08-16 00:13:50.000000000 +0200
+++ mantis-1.0.0rc2/login_page.php	2005-10-27 19:56:19.000000000 +0200
@@ -141,7 +141,7 @@
 
 	# Check if the admin directory is available and is readable.
 	$t_admin_dir = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR;
-	if ( is_dir( $t_admin_dir ) && is_readable( $t_admin_dir ) ) {
+	if ( 0 && is_dir( $t_admin_dir ) && is_readable( $t_admin_dir ) ) {
 		echo '
', "\n";
 		echo '
WARNING: Admin directory should be removed.
', "\n";
 		echo '
', "\n";


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Jun 2005 14:48:48 -0000	1.4
+++ sources	23 Dec 2005 15:46:01 -0000	1.5
@@ -1 +1 @@
-b12ab13376e91313402f666f22948ded  mantis-1.0.0a3.tar.gz
+96724be25c508d2f4008dfa5535efd82  mantis-1.0.0rc4.tar.gz


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mantis.spec	25 Jun 2005 14:45:53 -0000	1.7
+++ mantis.spec	23 Dec 2005 15:46:01 -0000	1.8
@@ -1,6 +1,6 @@
 # $Id$
 
-%global alpha		a3
+%global alpha		rc4
 
 %global pkgdir		%_datadir/%name
 %global cfgdir		%_sysconfdir/%name
@@ -19,8 +19,7 @@
 Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%name-%version%{?alpha}.tar.gz
 Patch0:		mantis-1.0.0a3-iis.patch
 Patch1:		mantis-0.19.2-noexamplecom.patch
-Patch2:		mantis-0.19.2-noadmin.patch
-Patch3:		mantis-1.0.0a3-nonmysql.patch
+Patch2:		mantis-1.0.0rc2-noadmin.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	diffutils
 Requires:	php
@@ -60,7 +59,6 @@
 %patch0 -p1 -b .iis
 %patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
-%patch3 -p1 -b .nonmysql
 
 chmod -x *.php
 rm -rf packages
@@ -85,6 +83,22 @@
 mv $RPM_BUILD_ROOT%pkgdir/mantis_offline.php.sample $RPM_BUILD_ROOT%cfgdir/
 mv $RPM_BUILD_ROOT%pkgdir/config_inc.php.sample     $RPM_BUILD_ROOT%cfgdir/config_inc.php
 
+for i in $(find $RPM_BUILD_ROOT -type f -regex '.*\.\(php\|txt\|gif\|png\|css\|htm\|dtd\|xsl\|sql\|js\|bak\|xml\|zip\)$' -perm +0111); do
+	case $i in
+		(*.php)
+			if ! sed '1p;d' "$i" | grep -q '^#!'; then
+			   chmod a-x "$i"
+			elif sed '1p;d' "$i" | grep -q '/usr/local/bin/php'; then
+			   sed -i -e '1s!/usr/local/bin/php!/usr/bin/php!' "$i"
+			fi
+			;;
+		(*.bak)		rm -f "$i";;
+		(*)		chmod a-x "$i";;
+	esac
+done
+
+chmod -x $RPM_BUILD_ROOT%pkgdir/{doc/*,core/phpmailer/{README,LICENSE}}
+
 ln -s %cfgdir/config_inc.php	 $RPM_BUILD_ROOT%pkgdir/config_inc.php
 ln -s %cfgdir/mantis_offline.php $RPM_BUILD_ROOT%pkgdir/mantis_offline.php
 
@@ -115,9 +129,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc sql
 %pkgdir
-%exclude %pkgdir/sql
 %attr(-,root,apache) %dir %cfgdir
 %attr(0640,root,apache) %config(noreplace) %cfgdir/*
 
@@ -128,6 +140,11 @@
 
 
 %changelog
+* Fri Dec 23 2005 Enrico Scholz  - 1.0.0-0.1.rc4
+- SECURITY: release 1.0.0rc4
+- removed x-permission from most files
+- rediffed
+
 * Sat Jun 25 2005 Enrico Scholz  - 1.0.0
 - updated to 1.0.0a3
 - removed the part which created the psql-script; upstream has now a


--- mantis-1.0.0a3-nonmysql.patch DELETED ---


--- mantis-0.19.2-noadmin.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec 23 15:46:59 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Fri, 23 Dec 2005 10:46:59 -0500
Subject: rpms/mantis/FC-4 sources,1.4,1.5 mantis.spec,1.7,1.8
Message-ID: <200512231547.jBNFlVF6027119@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	sources mantis.spec 
Log Message:
- SECURITY: release 0.19.4
  * File Upload Vulnerability (TKADV2005-11-002) (thraxisp)
  * Injection Vulnerabilities in Filters (TKADV2005-11-002)
  * SQL Injection in manage user page (TKADV2005-11-002)
  * HTTP Header CRLF Injection (TKADV2005-11-002) (vboctor)
  * Port XSS Vulnerability in filters (TKADV2005-11-002) (thraxisp)
- removed x-permission from most files



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Oct 2005 17:26:44 -0000	1.4
+++ sources	23 Dec 2005 15:46:58 -0000	1.5
@@ -1 +1 @@
-b3c1d9f6f66bc5e7e236cc9449aa3ced  mantis-0.19.3.tar.gz
+6dd7282469f7be4fb2eeaff92942f448  mantis-0.19.4.tar.gz


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-4/mantis.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mantis.spec	27 Oct 2005 17:26:44 -0000	1.7
+++ mantis.spec	23 Dec 2005 15:46:58 -0000	1.8
@@ -8,7 +8,7 @@
 
 Summary:	Web-based bugtracking system
 Name:		mantis
-Version:	0.19.3
+Version:	0.19.4
 Release:	%release_func 1
 License:	GPL
 Group:		Applications/Internet
@@ -59,7 +59,7 @@
 %patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
 
-chmod -x *.php
+chmod -x *.php sql/*
 rm -rf packages
 
 sed -e '$s!CONCAT.*!md5(random()*random())||md5(now()));!;
@@ -95,6 +95,22 @@
 mv $RPM_BUILD_ROOT%pkgdir/mantis_offline.php.sample $RPM_BUILD_ROOT%cfgdir/
 mv $RPM_BUILD_ROOT%pkgdir/config_inc.php.sample     $RPM_BUILD_ROOT%cfgdir/config_inc.php
 
+for i in $(find $RPM_BUILD_ROOT -type f -regex '.*\.\(php\|txt\|gif\|png\|css\|htm\|dtd\|xsl\|sql\|js\|bak\|xml\)$' -perm +0111); do
+	case $i in
+		(*.php)
+			if ! sed '1p;d' "$i" | grep -q '^#!'; then
+			   chmod a-x "$i"
+			elif sed '1p;d' "$i" | grep -q '/usr/local/bin/php'; then
+			   sed -i -e '1s!/usr/local/bin/php!/usr/bin/php!' "$i"
+			fi
+			;;
+		(*.bak)		rm -f "$i";;
+		(*)		chmod a-x "$i";;
+	esac
+done
+
+chmod -x $RPM_BUILD_ROOT%pkgdir/{doc/*,core/phpmailer/{README,LICENSE}}
+
 ln -s %cfgdir/config_inc.php	   $RPM_BUILD_ROOT%pkgdir/config_inc.php
 ln -s %cfgdir/mantis_offline.php $RPM_BUILD_ROOT%pkgdir/mantis_offline.php
 
@@ -138,6 +154,15 @@
 
 
 %changelog
+* Fri Dec 23 2005 Enrico Scholz  - 0.19.4-1
+- SECURITY: release 0.19.4
+  * File Upload Vulnerability (TKADV2005-11-002) (thraxisp)
+  * Injection Vulnerabilities in Filters (TKADV2005-11-002)
+  * SQL Injection in manage user page (TKADV2005-11-002)
+  * HTTP Header CRLF Injection (TKADV2005-11-002) (vboctor)
+  * Port XSS Vulnerability in filters (TKADV2005-11-002) (thraxisp)
+- removed x-permission from most files
+
 * Thu Oct 27 2005 Enrico Scholz  - 0.19.3-1
 - updated to 0.19.3 (SECURITY)
 - minor spec file cleanups



From fedora-extras-commits at redhat.com  Fri Dec 23 16:12:41 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 23 Dec 2005 11:12:41 -0500
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.5,1.6
Message-ID: <200512231613.jBNGDDSW028940@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Log Message:
* Fri Dec 23 2005 Rex Dieter  0.8.1-6
- cleanup ofx deps



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kmymoney2.spec	23 Dec 2005 15:39:02 -0000	1.5
+++ kmymoney2.spec	23 Dec 2005 16:12:41 -0000	1.6
@@ -1,16 +1,23 @@
 
 %if "%{?fedora}" > "2"
 %define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel, openjade-devel >= 1.3.2
+%endif
+
+%if "%{?fedora}" > "4"
+%define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel opensp-devel
 %endif
 
 %if "%{?rhel}" > "3"
 %define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel, openjade-devel >= 1.3.2
 %endif
 
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -26,10 +33,9 @@
 BuildRequires: libxml2-devel
 BuildRequires: ghostscript
 BuildRequires: kdelibs-devel >= 6:3.3
+%{?_with_ofxbanking:BuildRequires: %{ofx_deps}}
 %{?_with_check:BuildRequires: cppunit-devel >= 1.8.0}
-%{?_with_ofxbanking:BuildRequires: openjade-devel >= 1.3.2, libofx-devel}
-## TODO
-#define _with_kbanking --with-kbanking
+## FIXME/TODO
 %{?_with_kbanking:BuildRequires: aqbanking-devel >= 1.6.0}
 
 
@@ -58,7 +64,8 @@
 
 %configure \
   --disable-rpath \
-  --disable-debug --disable-warnings --disable-dependency-tracking --enable-final \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final \
   %{?_with_kbanking: --enable-kbanking } %{!?_with_kbanking: --disable-kbanking } \
   %{?_with_ofxbanking: --enable-ofxbanking --enable-ofxplugin } \
   %{!?_with_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
@@ -152,6 +159,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Rex Dieter  0.8.1-6
+- cleanup ofx deps
+
 * Fri Dec 23 2005 Rex Dieter  0.8.1-5
 - cleanup %%post
 - fc5 respin for new(er) libofx



From fedora-extras-commits at redhat.com  Fri Dec 23 16:30:51 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 23 Dec 2005 11:30:51 -0500
Subject: rpms/phpldapadmin/FC-4 phpldapadmin-0.9.7.2-config.patch, NONE,
	1.1 phpldapadmin.spec, 1.7, 1.8 sources, 1.3,
	1.4 phpldapadmin-0.9.7.1-config.patch, 1.1, NONE
Message-ID: <200512231631.jBNGVOKe029039@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	phpldapadmin.spec sources 
Added Files:
	phpldapadmin-0.9.7.2-config.patch 
Removed Files:
	phpldapadmin-0.9.7.1-config.patch 
Log Message:


phpldapadmin-0.9.7.2-config.patch:

--- NEW FILE phpldapadmin-0.9.7.2-config.patch ---
diff -Nrbu phpldapadmin-0.9.7.2/config/config.php phpldapadmin-0.9.7.2-OK/config/config.php
--- phpldapadmin-0.9.7.2/config/config.php	2005-11-15 19:29:18.000000000 +0300
+++ phpldapadmin-0.9.7.2-OK/config/config.php	2005-11-15 19:29:06.000000000 +0300
@@ -34,6 +34,9 @@
 /* Useful important configuration overrides  */
 /*********************************************/
 
+#  $config->custom->appearance['language'] = 'en';
+#  $config->custom->appearance['show_clear_password'] = true;
+
 /* If you are asked to put pla in debug mode, this is how you do it: */
 #  $config->custom->debug['level'] = 2;
 #  $config->custom->debug['syslog'] = true;
@@ -64,7 +67,7 @@
 
 /* A convenient name that will appear in the tree viewer and throughout
    phpLDAPadmin to identify this LDAP server to users. */
-$ldapservers->SetValue($i,'server','name','My LDAP Server');
+$ldapservers->SetValue($i,'server','name','Local LDAP Server');
 
 /* Examples:
    'ldap.example.com',
@@ -93,6 +96,7 @@
    encrypted using blowfish and the secret your specify above as
    session['blowfish']. */
 // $ldapservers->SetValue($i,'server','auth_type','cookie');
+$ldapservers->SetValue($i,'server','auth_type','session');
 
 /* The DN of the user for phpLDAPadmin to bind with. For anonymous binds or
    'cookie' or 'session' auth_types, LEAVE THE LOGIN_DN AND LOGIN_PASS BLANK. If
@@ -118,6 +122,7 @@
 /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
    blowfish, crypt or leave blank for now default algorithm. */
 // $ldapservers->SetValue($i,'appearance','password_hash','md5');
+$ldapservers->SetValue($i,'appearance','password_hash','');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, you can
    optionally specify here an attribute to use when logging in. If you enter
@@ -129,6 +134,7 @@
    specify 'string', in which case you can provide a string to use for logging
    users in. See 'login_string' directly below. */
 // $ldapservers->SetValue($i,'login','attr','dn');
+$ldapservers->SetValue($i,'login','attr','uid');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, and you
    specified 'string' for 'login_attr' above, you must provide a string here for


Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/phpldapadmin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- phpldapadmin.spec	3 Nov 2005 13:12:50 -0000	1.7
+++ phpldapadmin.spec	23 Dec 2005 16:30:51 -0000	1.8
@@ -1,13 +1,13 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
-Version: 0.9.7.1
-Release: 1%{?dist}
+Version: 0.9.7.2
+Release: 2
 Group: Applications/Internet
 License: GPL
 URL: http://phpldapadmin.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tar.gz
 Patch1: phpldapadmin-0.9.7.1-namingcontexts.patch
-Patch2: phpldapadmin-0.9.7.1-config.patch
+Patch2: phpldapadmin-0.9.7.2-config.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -55,7 +55,7 @@
 cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
-rm -rf doc/ INSTALL LICENSE VERSION
+rm -rf doc/ INSTALL LICENSE
 popd
 
 
@@ -114,6 +114,13 @@
 
 
 %changelog
+* 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)
+
+* Tue Nov 15 2005 Dmitry Butskoy  - 0.9.7.2-1
+- update to 0.9.7.2
+
 * Tue Nov  1 2005 Dmitry Butskoy  - 0.9.7.1-1
 - upgrade to 0.9.7.1
 - adapt patches and spec to new upstream layout.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Nov 2005 16:36:11 -0000	1.3
+++ sources	23 Dec 2005 16:30:51 -0000	1.4
@@ -1 +1 @@
-7491767e6a6c1166217472daa9b4c45c  phpldapadmin-0.9.7.1.tar.gz
+ac9923e37bbc232b9ca537cfd9282691  phpldapadmin-0.9.7.2.tar.gz


--- phpldapadmin-0.9.7.1-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec 23 16:32:04 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 23 Dec 2005 11:32:04 -0500
Subject: rpms/phpldapadmin/FC-4 phpldapadmin.spec,1.8,1.9
Message-ID: <200512231632.jBNGWalO029092@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	phpldapadmin.spec 
Log Message:



Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/phpldapadmin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- phpldapadmin.spec	23 Dec 2005 16:30:51 -0000	1.8
+++ phpldapadmin.spec	23 Dec 2005 16:32:04 -0000	1.9
@@ -1,7 +1,7 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
 Version: 0.9.7.2
-Release: 2
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://phpldapadmin.sourceforge.net



From fedora-extras-commits at redhat.com  Fri Dec 23 16:34:03 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 23 Dec 2005 11:34:03 -0500
Subject: rpms/phpldapadmin/FC-3 phpldapadmin-0.9.7.2-config.patch, NONE,
	1.1 phpldapadmin.spec, 1.7, 1.8 sources, 1.3,
	1.4 phpldapadmin-0.9.7.1-config.patch, 1.1, NONE
Message-ID: <200512231634.jBNGYZpa029168@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	phpldapadmin.spec sources 
Added Files:
	phpldapadmin-0.9.7.2-config.patch 
Removed Files:
	phpldapadmin-0.9.7.1-config.patch 
Log Message:


phpldapadmin-0.9.7.2-config.patch:

--- NEW FILE phpldapadmin-0.9.7.2-config.patch ---
diff -Nrbu phpldapadmin-0.9.7.2/config/config.php phpldapadmin-0.9.7.2-OK/config/config.php
--- phpldapadmin-0.9.7.2/config/config.php	2005-11-15 19:29:18.000000000 +0300
+++ phpldapadmin-0.9.7.2-OK/config/config.php	2005-11-15 19:29:06.000000000 +0300
@@ -34,6 +34,9 @@
 /* Useful important configuration overrides  */
 /*********************************************/
 
+#  $config->custom->appearance['language'] = 'en';
+#  $config->custom->appearance['show_clear_password'] = true;
+
 /* If you are asked to put pla in debug mode, this is how you do it: */
 #  $config->custom->debug['level'] = 2;
 #  $config->custom->debug['syslog'] = true;
@@ -64,7 +67,7 @@
 
 /* A convenient name that will appear in the tree viewer and throughout
    phpLDAPadmin to identify this LDAP server to users. */
-$ldapservers->SetValue($i,'server','name','My LDAP Server');
+$ldapservers->SetValue($i,'server','name','Local LDAP Server');
 
 /* Examples:
    'ldap.example.com',
@@ -93,6 +96,7 @@
    encrypted using blowfish and the secret your specify above as
    session['blowfish']. */
 // $ldapservers->SetValue($i,'server','auth_type','cookie');
+$ldapservers->SetValue($i,'server','auth_type','session');
 
 /* The DN of the user for phpLDAPadmin to bind with. For anonymous binds or
    'cookie' or 'session' auth_types, LEAVE THE LOGIN_DN AND LOGIN_PASS BLANK. If
@@ -118,6 +122,7 @@
 /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
    blowfish, crypt or leave blank for now default algorithm. */
 // $ldapservers->SetValue($i,'appearance','password_hash','md5');
+$ldapservers->SetValue($i,'appearance','password_hash','');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, you can
    optionally specify here an attribute to use when logging in. If you enter
@@ -129,6 +134,7 @@
    specify 'string', in which case you can provide a string to use for logging
    users in. See 'login_string' directly below. */
 // $ldapservers->SetValue($i,'login','attr','dn');
+$ldapservers->SetValue($i,'login','attr','uid');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, and you
    specified 'string' for 'login_attr' above, you must provide a string here for


Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/phpldapadmin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- phpldapadmin.spec	3 Nov 2005 13:14:08 -0000	1.7
+++ phpldapadmin.spec	23 Dec 2005 16:34:03 -0000	1.8
@@ -1,13 +1,13 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
-Version: 0.9.7.1
-Release: 1%{?dist}
+Version: 0.9.7.2
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://phpldapadmin.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tar.gz
 Patch1: phpldapadmin-0.9.7.1-namingcontexts.patch
-Patch2: phpldapadmin-0.9.7.1-config.patch
+Patch2: phpldapadmin-0.9.7.2-config.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -55,7 +55,7 @@
 cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
-rm -rf doc/ INSTALL LICENSE VERSION
+rm -rf doc/ INSTALL LICENSE
 popd
 
 
@@ -114,6 +114,13 @@
 
 
 %changelog
+* 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)
+
+* Tue Nov 15 2005 Dmitry Butskoy  - 0.9.7.2-1
+- update to 0.9.7.2
+
 * Tue Nov  1 2005 Dmitry Butskoy  - 0.9.7.1-1
 - upgrade to 0.9.7.1
 - adapt patches and spec to new upstream layout.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Nov 2005 16:36:11 -0000	1.3
+++ sources	23 Dec 2005 16:34:03 -0000	1.4
@@ -1 +1 @@
-7491767e6a6c1166217472daa9b4c45c  phpldapadmin-0.9.7.1.tar.gz
+ac9923e37bbc232b9ca537cfd9282691  phpldapadmin-0.9.7.2.tar.gz


--- phpldapadmin-0.9.7.1-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec 23 16:46:29 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 23 Dec 2005 11:46:29 -0500
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.6,1.7
Message-ID: <200512231647.jBNGl1jx029240@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Log Message:
fix icon inclusion



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kmymoney2.spec	23 Dec 2005 16:12:41 -0000	1.6
+++ kmymoney2.spec	23 Dec 2005 16:46:29 -0000	1.7
@@ -137,8 +137,8 @@
 %{_bindir}/kmymoney*
 %{_datadir}/apps/kmymoney2
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*
-%{_datadir}/icons/locolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
 %{_libdir}/lib*.so.*



From fedora-extras-commits at redhat.com  Fri Dec 23 17:20:08 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri, 23 Dec 2005 12:20:08 -0500
Subject: rpms/crack/devel crack.spec,1.1,1.2
Message-ID: <200512231720.jBNHKfnH031077@cvs-int.fedora.redhat.com>

Author: c4chris

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

Modified Files:
	crack.spec 
Log Message:
Rebuild with gcc-4.1.


Index: crack.spec
===================================================================
RCS file: /cvs/extras/rpms/crack/devel/crack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crack.spec	7 Sep 2005 08:52:56 -0000	1.1
+++ crack.spec	23 Dec 2005 17:20:08 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:   Password cracker
 Name:      crack
 Version:   5.0a
-Release:   1%{?dist}
+Release:   2%{?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
+* Fri Dec 23 2005 Christian Iseli  5.0a-2
+- rebuild with gcc-4.1
+
 * Tue Sep 06 2005 Tom "spot" Callaway  5.0a-1
 - use words to make a richer dict 1
 



From fedora-extras-commits at redhat.com  Fri Dec 23 17:22:59 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri, 23 Dec 2005 12:22:59 -0500
Subject: rpms/hmmer/devel hmmer.spec,1.2,1.3
Message-ID: <200512231723.jBNHNVEC031200@cvs-int.fedora.redhat.com>

Author: c4chris

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

Modified Files:
	hmmer.spec 
Log Message:
Rebuild with gcc-4.1.


Index: hmmer.spec
===================================================================
RCS file: /cvs/extras/rpms/hmmer/devel/hmmer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hmmer.spec	8 Aug 2005 09:24:48 -0000	1.2
+++ hmmer.spec	23 Dec 2005 17:22:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           hmmer
 Version:        2.3.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Profile HMM software for protein sequence analysis
 
 Group:          Applications/Engineering
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Christian Iseli  2.3.2-4
+ - Rebuild with gcc-4.1.
+
 * Mon Aug 08 2005 Christian Iseli  2.3.2-3
  - Removed altivec switch for ppc: apparently, it only works using Apple's
    GCC compiler.



From fedora-extras-commits at redhat.com  Fri Dec 23 17:26:01 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri, 23 Dec 2005 12:26:01 -0500
Subject: rpms/nfswatch/devel nfswatch.spec,1.5,1.6
Message-ID: <200512231726.jBNHQXgb031325@cvs-int.fedora.redhat.com>

Author: c4chris

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

Modified Files:
	nfswatch.spec 
Log Message:
Rebuild with gcc-4.1.


Index: nfswatch.spec
===================================================================
RCS file: /cvs/extras/rpms/nfswatch/devel/nfswatch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nfswatch.spec	29 Nov 2005 16:54:32 -0000	1.5
+++ nfswatch.spec	23 Dec 2005 17:26:01 -0000	1.6
@@ -2,7 +2,7 @@
 Summary: An NFS traffic monitoring tool
 Name: nfswatch
 Version: 4.99.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: BSD
 URL: http://nfswatch.sourceforge.net
@@ -47,6 +47,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Dec 23 2005 Christian Iseli  4.99.5-2
+ - rebuild with gcc-4.1
+
 * Tue Nov 29 2005 Christian Iseli  4.99.5-1
  - new upstream version
 



From fedora-extras-commits at redhat.com  Fri Dec 23 17:41:34 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 23 Dec 2005 12:41:34 -0500
Subject: rpms/xemacs-sumo/devel
	xemacs-sumo-20051208-latin-unity-kludge.patch, 
	NONE, 1.1 xemacs-sumo.spec, 1.13, 1.14
Message-ID: <200512231742.jBNHg6X4031468@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31448

Modified Files:
	xemacs-sumo.spec 
Added Files:
	xemacs-sumo-20051208-latin-unity-kludge.patch 
Log Message:
* Sat Dec 17 2005 Ville Skytt??  - 20051208-1
- Patch to support write-region's kludge in latin-unity.


xemacs-sumo-20051208-latin-unity-kludge.patch:

--- NEW FILE xemacs-sumo-20051208-latin-unity-kludge.patch ---
--- mule-packages/lisp/latin-unity/ChangeLog	10 Apr 2005 13:50:28 -0000	1.41
+++ mule-packages/lisp/latin-unity/ChangeLog	17 Dec 2005 11:16:50 -0000
@@ -1,0 +1,5 @@
+2005-12-17  Ville Skytt?  
+
+	* latin-unity.el (latin-unity-sanity-check): Mimic `write-region's
+	kludgy feature where the region's start offset is a string.
+
--- mule-packages/lisp/latin-unity/latin-unity.el	15 Feb 2005 22:22:48 -0000	1.12
+++ mule-packages/lisp/latin-unity/latin-unity.el	17 Dec 2005 11:16:51 -0000
@@ -551,11 +551,14 @@
 setting `buffer-file-coding-system' to nil or 'no-conversion or 'binary.
 
 This function is intended for use as a `write-region-pre-hook'.  It does
-nothing except return nil if `write-region' handlers are inhibited."
+nothing except return nil if `write-region' handlers are inhibited, or if
+BEGIN is a string (to support the corresponding \"kludgy feature\" of
+`write-region')."
 
   ;; don't do anything if we're in a `write-region' handler
   ;; #### is nil the right return value if we are?
-  (if (eq inhibit-file-name-operation 'write-region)
+  ;; Bypass also on `write-region's "klugdy feature" where BEGIN is a string
+  (if (or (eq inhibit-file-name-operation 'write-region) (stringp begin))
       nil
     (prog1
     (let ((buffer-default


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xemacs-sumo.spec	10 Dec 2005 21:06:20 -0000	1.13
+++ xemacs-sumo.spec	23 Dec 2005 17:41:33 -0000	1.14
@@ -21,6 +21,7 @@
 Source17:       Emacs.ad.zh_TW.UTF-8
 Patch0:         %{name}-20051208-hypb-posix.patch
 Patch1:         %{name}-20051208-pydoc-path.patch
+Patch2:         %{name}-20051208-latin-unity-kludge.patch
 Patch6:         auctex-texsite-jlatex-detect-69129.patch
 Patch7:         auctex-texjp-platex.patch
 Patch8:         egg-wnn-host-unix-79826.patch
@@ -87,6 +88,8 @@
 %patch1 -p0
 install -dm 755 xemacs-packages/etc/python-modes
 mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes}
+# support write-region's kludge in latin-unity
+%patch2 -p0
 # fix jlatex autodetection
 %patch6 -p0
 # use ptex rather jtex by default for Japanese
@@ -208,7 +211,10 @@
 
 
 %changelog
-* Fri Dec  9 2005 Ville Skytt??  - 20051208-1
+* Sat Dec 17 2005 Ville Skytt??  - 20051208-1
+- Patch to support write-region's kludge in latin-unity.
+
+* Fri Dec  9 2005 Ville Skytt?? 
 - 2005-12-08.
 - Patch hyperbole to not require csh.
 - Patch pydoc.el to find pydoc_lisp.py out of the box.



From fedora-extras-commits at redhat.com  Fri Dec 23 21:22:19 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 23 Dec 2005 16:22:19 -0500
Subject: rpms/xemacs-sumo/FC-4 xemacs-sumo-20051208-hypb-posix.patch, NONE, 
	1.1 xemacs-sumo-20051208-latin-unity-kludge.patch, NONE,
	1.1 xemacs-sumo-20051208-pydoc-path.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 sources, 1.6, 1.7 xemacs-sumo.spec, 1.10, 1.11
Message-ID: <200512232122.jBNLMpjF006409@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6379/FC-4

Modified Files:
	.cvsignore sources xemacs-sumo.spec 
Added Files:
	xemacs-sumo-20051208-hypb-posix.patch 
	xemacs-sumo-20051208-latin-unity-kludge.patch 
	xemacs-sumo-20051208-pydoc-path.patch 
Log Message:
Sync with devel (package repocopied from devel too).

xemacs-sumo-20051208-hypb-posix.patch:

--- NEW FILE xemacs-sumo-20051208-hypb-posix.patch ---
--- xemacs-packages/lisp/hyperbole/smart-clib-sym	27 Jun 2003 05:11:53 -0000	1.1.1.1
+++ xemacs-packages/lisp/hyperbole/smart-clib-sym	8 Dec 2005 19:08:52 -0000
@@ -1,4 +1,4 @@
-#!/bin/csh -f
+#!/bin/sh
 #
 # SUMMARY:      Test whether symbol appears within a set of C libraries.
 # USAGE:         
@@ -26,37 +26,26 @@
 #
 # DESCRIP-END.
 
-# Perl script used to tell whether one file is newer than another.
-#
-set fn = "file-newer"
-
 # Create this file and place in the file the full path for each C, C++ or
 # Objective-C library that you want scanned for symbol names.  One filename
 # per line.  Do not quote the filenames.
 #
-set clib_list = "~/.CLIBS-LIST"
-
+clib_list="$HOME/.CLIBS-LIST"
 
 # This file will automatically be created to cache the symbol names.
 # Remove it if you ever want to rebuild the symbol table.
 #
-set clib_symbols = "~/.clibs-symbols"
-
-# Try to locate 'perl' and 'file-newer' script for use.
-
-which perl >& /dev/null
-if ($status) unset fn
+clib_symbols="$HOME/.clibs-symbols"
 
-set st = 0 rebuild = 0
-if (-e $clib_list) then
-   if (! -e $clib_symbols || -z $clib_symbols) set rebuild = 1
-   if (! $rebuild  && $?fn) @ rebuild = `perl $fn $clib_list $clib_symbols`
-   if ($rebuild) then
-      nm -g `cat $clib_list` | grep '^[0-9 ].* _[A-Za-z]' | sed -e 's/^[^_][^_]*_//g' | sort | uniq > $clib_symbols
-   endif
-   fgrep -sx $1 $clib_symbols >& /dev/null
-   @ st = ! $status
-endif
+st=0
+if [ -s $clib_list ] ; then
+    if [ ! -s $clib_symbols ] || \
+       [ -n "`find $clib_list -prune -newer $clib_symbols`" ] ; then
+        nm -gP `cat $clib_list` 2>/dev/null | grep '^_[A-Za-z]' \
+        | sed -e 's/^_//' -e 's/ .*//' | sort -u > $clib_symbols
+    fi
+    grep -Fx "$1" $clib_symbols >/dev/null 2>&1 && st=1
+fi
 
 echo $st
 exit $st

xemacs-sumo-20051208-latin-unity-kludge.patch:

--- NEW FILE xemacs-sumo-20051208-latin-unity-kludge.patch ---
--- mule-packages/lisp/latin-unity/ChangeLog	10 Apr 2005 13:50:28 -0000	1.41
+++ mule-packages/lisp/latin-unity/ChangeLog	17 Dec 2005 11:16:50 -0000
@@ -1,0 +1,5 @@
+2005-12-17  Ville Skytt?  
+
+	* latin-unity.el (latin-unity-sanity-check): Mimic `write-region's
+	kludgy feature where the region's start offset is a string.
+
--- mule-packages/lisp/latin-unity/latin-unity.el	15 Feb 2005 22:22:48 -0000	1.12
+++ mule-packages/lisp/latin-unity/latin-unity.el	17 Dec 2005 11:16:51 -0000
@@ -551,11 +551,14 @@
 setting `buffer-file-coding-system' to nil or 'no-conversion or 'binary.
 
 This function is intended for use as a `write-region-pre-hook'.  It does
-nothing except return nil if `write-region' handlers are inhibited."
+nothing except return nil if `write-region' handlers are inhibited, or if
+BEGIN is a string (to support the corresponding \"kludgy feature\" of
+`write-region')."
 
   ;; don't do anything if we're in a `write-region' handler
   ;; #### is nil the right return value if we are?
-  (if (eq inhibit-file-name-operation 'write-region)
+  ;; Bypass also on `write-region's "klugdy feature" where BEGIN is a string
+  (if (or (eq inhibit-file-name-operation 'write-region) (stringp begin))
       nil
     (prog1
     (let ((buffer-default

xemacs-sumo-20051208-pydoc-path.patch:

--- NEW FILE xemacs-sumo-20051208-pydoc-path.patch ---
--- xemacs-packages/lisp/python-modes/pydoc.el	18 Sep 2002 06:04:19 -0000	1.1
+++ xemacs-packages/lisp/python-modes/pydoc.el	9 Dec 2005 22:16:38 -0000
@@ -383,18 +383,23 @@
 
 (defun pydoc-initialize()
   (message "Please wait a moment while the Python help system is initialized...")
-  (let (output-buf)
+  (let ((output-buf)
+	(pydir (locate-data-directory "python-modes")))
     (save-window-excursion
       ;; Start a Python interpreter if not already running.
       (py-shell)
       (pydoc-wait-for-output (current-buffer) 3.0)
       (setq output-buf
 	    (py-execute-string
-	     "if not vars().has_key('pydoc_lisp'):
+	     (format
+	      "if not vars().has_key('pydoc_lisp'):
+    import sys
+    if not '%s' in sys.path:
+        sys.path.append('%s')
     import pydoc_lisp
 
 pydoc_lisp.pydoc_output_lisp()
-"))
+" pydir pydir)))
       ;; current vintages of python-mode.el (4.6 at least)
       ;; no longer return a buffer [name].  We get t from the
       ;; final kill-buffer instead.  If we see t we use the


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Jul 2005 12:29:57 -0000	1.6
+++ .cvsignore	23 Dec 2005 21:22:18 -0000	1.7
@@ -1,2 +1,2 @@
-xemacs-mule-sumo-2005-07-15.tar.bz2
-xemacs-sumo-2005-07-15.tar.bz2
+xemacs-mule-sumo-2005-12-08.tar.bz2
+xemacs-sumo-2005-12-08.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jul 2005 12:29:57 -0000	1.6
+++ sources	23 Dec 2005 21:22:18 -0000	1.7
@@ -1,2 +1,2 @@
-016362256e4de4b150d6c2f8d686dd3f  xemacs-mule-sumo-2005-07-15.tar.bz2
-28b92fa2e0bcd0c8e81fd6286d37af30  xemacs-sumo-2005-07-15.tar.bz2
+553da38bc36b4365ab98e0565a0530b8  xemacs-mule-sumo-2005-12-08.tar.bz2
+1927c40affd04ff7c10b979ef24548d0  xemacs-sumo-2005-12-08.tar.bz2


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/xemacs-sumo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xemacs-sumo.spec	23 Jul 2005 12:29:57 -0000	1.10
+++ xemacs-sumo.spec	23 Dec 2005 21:22:18 -0000	1.11
@@ -1,4 +1,4 @@
-%define sumo    2005-07-15
+%define sumo    2005-12-08
 %define pkgdir  %{_datadir}/xemacs
 
 Name:           xemacs-sumo
@@ -19,6 +19,9 @@
 Source15:       Emacs.ad.ko_KR.UTF-8
 Source16:       Emacs.ad.zh_CN.UTF-8
 Source17:       Emacs.ad.zh_TW.UTF-8
+Patch0:         %{name}-20051208-hypb-posix.patch
+Patch1:         %{name}-20051208-pydoc-path.patch
+Patch2:         %{name}-20051208-latin-unity-kludge.patch
 Patch6:         auctex-texsite-jlatex-detect-69129.patch
 Patch7:         auctex-texjp-platex.patch
 Patch8:         egg-wnn-host-unix-79826.patch
@@ -33,8 +36,10 @@
 BuildRequires:  xemacs-nox
 BuildRequires:  sed >= 3.95
 BuildRequires:  /sbin/install-info
+BuildRequires:  %{__python}
 Requires:       xemacs-common
-Provides:       apel-xemacs = 10.2
+# Fake release in this provision in order to avoid self-obsoletion (for now).
+Provides:       apel-xemacs = 10.6-6
 Provides:       ruby-mode-xemacs
 Obsoletes:      apel-xemacs < 10.6-6
 Obsoletes:      ruby-mode-xemacs
@@ -76,6 +81,15 @@
 
 %prep
 %setup -q -c -a1
+# get rid of csh dependency
+%patch0 -p0
+rm xemacs-packages/lisp/hyperbole/file-newer
+# find pydoc_lisp.py out-of-the-box
+%patch1 -p0
+install -dm 755 xemacs-packages/etc/python-modes
+mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes}
+# support write-region's kludge in latin-unity
+%patch2 -p0
 # fix jlatex autodetection
 %patch6 -p0
 # use ptex rather jtex by default for Japanese
@@ -94,7 +108,9 @@
 %patch15 -p0
 
 sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \
-  xemacs-packages/{lisp/hyperbole/file-newer,etc/bbdb/*.pl}
+  xemacs-packages/etc/bbdb/*.pl
+
+chmod -c -x xemacs-packages/lisp/edit-utils/crm.el
 
 # remove game we shouldn't ship
 rm xemacs-packages/lisp/games/tetris.el*
@@ -155,7 +171,7 @@
 find $RPM_BUILD_ROOT%{pkgdir} -type f -name '*.info*' | xargs gzip -9
 
 # separate files
-rm -f *.files base-files el-files info-files
+rm -f *.files
 echo "%%defattr(-,root,root,-)" > base-files
 echo "%%defattr(-,root,root,-)" > el-files
 echo "%%defattr(-,root,root,-)" > info-files
@@ -163,15 +179,21 @@
 find $RPM_BUILD_ROOT%{pkgdir}/* \
   \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \
   \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \
-  \( -type d -name info -fprint info.files -prune \) -o \
-  \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \
+  \( -type d -not -name info -fprintf dir.files "%%%%dir %%p\n" \) -o \
   \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \
      -fprint base-el-not-bytecomped.files \) \)
 
 sed -i -e "s|$RPM_BUILD_ROOT||" *.files
-cat base-*.files dir.files >> base-files
-cat el-*.files   dir.files >> el-files
-cat info.files             >> info-files
+cat base-*.files dir.files | grep -v /info/ >> base-files
+cat el-*.files dir.files                    >> el-files
+cat base-non-el.files | grep /info/         >> info-files
+
+sed -i -e 's/^\(.*\(\.ja\|-ja\.texi\)\)$/%lang(ja) \1/' base-files
+sed -i -e 's/^\(.*[_-]ja\.info.*\)$/%lang(ja) \1/' info-files
+
+# in case redhat-rpm-config is not installed or doesn't do this for us:
+%{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/python-modes', ddir='/', force=1)"
+%{__python} -O -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/python-modes', ddir='/', force=1)"
 
 
 %clean
@@ -179,13 +201,27 @@
 
 
 %files -f base-files
+%{pkgdir}/xemacs-packages/etc/python-modes/*.pyc
+%ghost %{pkgdir}/xemacs-packages/etc/python-modes/*.pyo
 
 %files el -f el-files
 
 %files info -f info-files
+%dir %{pkgdir}/*-packages/info/
 
 
 %changelog
+* Sat Dec 17 2005 Ville Skytt??  - 20051208-1
+- Patch to support write-region's kludge in latin-unity.
+
+* Fri Dec  9 2005 Ville Skytt?? 
+- 2005-12-08.
+- Patch hyperbole to not require csh.
+- Patch pydoc.el to find pydoc_lisp.py out of the box.
+- Include bytecompiled python files.
+- Set %%lang for various docs and info files.
+- Prune changelog entries from pre-xemacs-sumo times.
+
 * Sat Jul 16 2005 Ville Skytt??  - 20050715-1
 - 2005-07-15; jde font-lock, sql-mode abbrev, w3 stylesheet and file
   permissions fixed upstream.
@@ -195,12 +231,12 @@
 - Remove mew and skk, they're in separate packages again (#162952).
 - Reformat specfile.
 
-* Thu Jun  2 2005 Ville Skytt??  - 20050505-4.1
+* Thu Jun  2 2005 Ville Skytt??  - 20050505-6
 - Make sure we're using files included in this package
   when byte-recompiling patched *.el; also allows the byte-compilation
   to actually happen even if no previous xemacs-sumo is installed.
 
-* Wed Jun  1 2005 Ville Skytt??  - 20050505-4
+* Wed Jun  1 2005 Ville Skytt??  - 20050505-5
 - Bundle upstream cc-mode package version 1.45 (contains cc-mode 5.30.10).
 - Fix JDEE font-lock warnings with import statements.
 
@@ -308,243 +344,3 @@
 * Mon May 12 2003 Jens Petersen  - 20030414-1
 - new package to separate xemacs-sumo and xemacs-mule-sumo from
   main xemacs package
-
-
-* Sat May 10 2003 Jens Petersen  - 21.4.12-11
-- build with system malloc on ppc64
-
-* Tue Apr 22 2003 Jens Petersen  - 21.4.12-10
-- obsoletes ruby-mode-xemacs (#84673)
-- move obsoletes xemacs-sumo-el to -el subpackage
-- fix links in jde html documentation (#89499)
-
-* Tue Apr 15 2003 Jens Petersen  - 21.4.12-8
-- comment out ja and ko menubar translations in X resource files for now,
-  to avoid startup hanging in utf-8 locale (#88860)
-- use default menubar font in ja and ko locale
-- in a UTF-8 locale set default coding systems to utf-8 (partly #77130
-  and #74227)
-- set Info-directory-list in site-start.el again
-- move psgml setup into site-start.el
-- move previous contents of "dotxemacs-init.el" to new "default.el"
-
-* Mon Mar 31 2003 Akira TAGOH  21.4.12-7
-- Rebuild against the latest Canna.
-
-* Thu Feb 20 2003 Jens Petersen  - 21.4.12-6
-- default browse-url to use htmlview and update psgml-html browser
-  defaults (#84262)
-
-* Tue Feb 11 2003 Jens Petersen  - 21.4.12-5
-- build with system-malloc on alpha and ia64
-- skip redundant check-features target
-
-* Thu Feb  6 2003 Jens Petersen  - 21.4.12-4
-- fix "libexec dir" to be under lib64 on multilib archs
-- set default ftp to be non-kerberos in site-start.el
-- update sumos to 2003-02-05
-- mspec patch and rpm-spec-mode update no longer needed
-- buildrequire autoconf213
-- add ".xemacs/init.el" to /etc/skel
-- skip redundant check-features target on s390 and s390x
-
-* Wed Jan 22 2003 Tim Powers 
-- rebuilt
-
-* Tue Jan 21 2003 Jens Petersen  - 21.4.12-2
-- fix `paths-emacs-root-p' (find-paths.el) to look in share not lib
-- don't generate backup files when updating autoloads
-- try startup notification in desktop file
-- cleanup desktop file to use name XEmacs and add encoding key
-
-* Fri Jan 17 2003 Jens Petersen  21.4.12-1
-- update to 21.4.12 bugfix release (21.4 series now declared stable branch)
-- renumbered sumo package patches to be greater than 100
-- install sumo packages by copying rather than moving
-- patch sh-script.el to append m?spec entry to auto-mode-alist
-- avoid ppc.ldscript and build on ppc
-- remove games that we shouldn't ship
-- update to latest rcs2log
-- update to latest rpm-spec-mode.el
-- use _smp_mflags for lib-src and src
-- run batch-update-directory and batch-byte-recompile-directory on sumo lisp
-  dirs
-- improve datadir/xemacs-version/ ownership
-
-* Sat Jan  4 2003 Jens Petersen  21.4.11-1
-- update to 21.4.11
-- don't configure with union-type, since it causes runtime problems apparently
-- only do postun info dir deletions when uninstalling
-
-* Wed Jan  1 2003 Jens Petersen  21.4.10-6
-- move apel to separate package and require it
-- renamed psgml-init.el-xemacs to xemacs-psgml-init.el
-- use datadir in site-start.el
-- really include the movemail mkstemp patch
-- use mapc to load site-start.d files
-
-* Tue Dec 31 2002 Ville Skytt?? 
-- New Sumos (2002-12-30).
-- Use `construct-emacs-version-name' in `paths-emacs-root-p' (find-paths.el),
-  fixing "Couldn't find obvious default for XEmacs hierarchy" warnings
-  (as in XEmacs 21.5).
-- Move site-start stuff to site-packages.
-- Don't set Info-directory-list in site-start.el.
-- Don't use --pkgdir, it's ignored.  Don't pass pkgdir to makeinstall.
-- Fix source tarball URLs.
-- Don't override the defcustom in psgml-init.el, set its default value instead.
-- Add rpmbuild option: "--with debug" for building a debug-enabled XEmacs.
-
-* Sun Dec 29 2002 Jens Petersen 
-- updates package sumos to 2002-12-26 release
-
-* Mon Dec 23 2002 Jens Petersen  21.4.10-5
-- patch find-paths.el to search in datadir
-- setup lisp packages under datadir not libdir
-- use buildroot macro instead of RPM_BUILD_ROOT
-- drop local configure macro
-- fix buildrequires and requires
-- list configure options one-per-line
-- improve psgml-init.el catalog setup
-- remove and add lisp packages with package-admin
-- rebyte-compile lisp packages
-- keep etags as etags.xemacs (#78106)
-- don't bother removing non-existent udp2tcp nor .cvsignore files
-- simply filelist generation to a single find search pass
-- put core .el files in -el package
-- put package info files into -info package
-- don't create backup files when patching in lisp packages tree
-- don't explicitly gzip lisp package info files
-- don't mark the applications files noreplace
-- exclude ppc, since __init_array_start undefined
-
-* Wed Dec 18 2002 Jens Petersen 
-- patch egg-wnn to default to unix domain socket (#79826)
-  [patch from ynakai at redhat.com]
-- add ia64 patch from SuSE
-- use mkstemp in movemail
-
-* Tue Nov 19 2002 Jens Petersen 
-- apply jlatex autodetect patch correctly and drop append to tex-site.el
-- default to pTeX and pLaTeX for Japanese TeX and LaTeX
-
-* Mon Nov 18 2002 Jens Petersen  21.4.10-3
-- backout uncommenting of deactivate-mark (#77696)
-- update psgml dtd catalog path in psgml-init.el (#78022)
-  [reported by ville.skytta at iki.fi]
-- build with --use-union-type (#78024)
-  [suggested by ville.skytta at iki.fi]
-
-* Fri Nov 15 2002 Jens Petersen 
-- fix autodetection of jlatex (#69129)
-
-* Tue Nov 12 2002 Elliot Lee  21.4.10-2
-- build on x86_64
-
-* Mon Nov 11 2002 Jens Petersen  21.4.10-1
-- update to 21.4.10
-- update sumos to 2002-09-19
-- no longer backout mule-ucs package
-- encode this file in utf-8
-- xemacs-21.1.14-xfs.patch no longer needed
-- use _libdir, _datadir, _bindir, _prefix
-- exclude x86_64 (requires Canna)
-- own /usr/lib/xemacs/{,mule-packages} and /usr/X11R6/lib/X11/ (#73982)
-  [reported by enrico.scholz at informatik.tu-chemnitz.de]
-- fix default italic font size (#75275)
-  [reported with fix by ville.skytta at iki.fi]
-- update ja menubar translations in ja locale X resource file (#76068)
-  [from ynakai at redhat.com]
-- update ko locale X resource file (#76072) [from ynakai at redhat.com]
-- add pkgdir rpm macro for packages dir
-- uncomment deactivate-mark in simple.el (#77696)
-
-* Mon Aug 26 2002 Trond Eivind Glomsr??d  21.4.8-16
-- some cleanups - and remove the info tarball, it's now part
-  of the base tarball. Wow, the package gets smaller. (#72480)
-
-* Mon Aug 19 2002 Trond Eivind Glomsr??d  21.4.8-15
-- Bug in specfile from -14 gave bug on startup (#71743)
-
-* Thu Aug 15 2002 Trond Eivind Glomsr??d  21.4.8-14
-- Use utf-8 by default for input/output (#71584 )
-- Make it not segfault when handling utf-8 (#71589)
-
-* Wed Aug  7 2002 Trond Eivind Glomsr??d  21.4.8-13
-- Add openmotif-devel to buildrequires, as it will use it for widgets
-  if it finds it
-
-* Fri Aug  2 2002 Trond Eivind Glomsr??d  21.4.8-12
-- Don't package po-mode separately, it's now in sumo
-- Compile with drag'n'drop support
-- Use the bundled rpm-spec-mode, it has some adaptions for XEmacs
-
-* Wed Jul 31 2002 Trond Eivind Glomsr??d  21.4.8-11
-- Don't use a separate ispell.el file anymore - the included one is newer
-- Fix html-mode (#64826)
-
-* Tue Jul 23 2002 Trond Eivind Glomsr??d  21.4.8-10
-- Update lisp tarballs
-- desktop file fixes (#69542)
-- Add bdb support (#65640)
-
-* Mon Jul  8 2002 Trond Eivind Glomsr??d  21.4.8-9
-- Make it provide ruby-mode-xemacs (request from tagoh)
-
-* Fri Jun 21 2002 Tim Powers 
-- automated rebuild
-
-* Mon Jun 17 2002 Trond Eivind Glomsr??d  21.4.8-7
-- #66835
-
-* Wed May 29 2002 Trond Eivind Glomsr??d  21.4.8-6
-- Make it build... Evil.
-- Exclude IA64
-- Upgrade sumo tarballs to 2002-05-22
-
-* Fri May 24 2002 Jens Petersen  21.4.8-5
-- Build using portable dumper, so that build with glibc-2.3 malloc is ok
-
-* Mon May 13 2002 Trond Eivind Glomsr??d  21.4.8-2
-- Remove the s390 patches so it builds on s390 :)
-
-* Fri May 10 2002 Trond Eivind Glomsr??d  21.4.8-1
-- 21.4.8
-
-* Tue May  7 2002 Trond Eivind Glomsr??d  21.4.6-9
-- Rebuild... chmod -x pstogif to work around an rpm bug until
-  it's fixed (#64320)
-
-* Tue Apr 23 2002 Trond Eivind Glomsr??d  21.4.6-8
-- New sumo packages
-
-* Thu Feb 21 2002 Trond Eivind Glomsr??d  21.4.6-7
-- Rebuild
-
-* Tue Jan 29 2002 Jens Petersen  21.4.6-6
-- Remove skk package, since it conflicts with ddskk-xemacs (newer)
-
-* Thu Jan 24 2002 Trond Eivind Glomsr??d  21.4.6-5
-- New sumos
-
-* Wed Jan 09 2002 Tim Powers 
-- automated rebuild
-
-* Wed Dec 19 2001 Jens Petersen  21.4.6-3
-- Fix fontlist pattern in Emacs.ad.Japanese.
-- CHANGES-beta is now CHANGES-release.
-- Obsolete xemacs-sumo xemacs-sumo-el
-
-* Wed Dec 19 2001 Jens Petersen  21.4.6-2
-- Don't obsolete flim.
-
-* Mon Dec 17 2001 Trond Eivind Glomsr??d  21.4.6-1
-- 21.4.6
-- New sumo packages
-- disable alpha
-
-* Wed Nov 14 2001 Jens Petersen  21.4.5-2
-- Add -znocombreloc configure option to override new ld default.
-
-* Tue Nov  6 2001 Trond Eivind Glomsr??d  21.4.5-1
-- 21.4.5. It builds on IA64 and fixes #55578



From fedora-extras-commits at redhat.com  Fri Dec 23 21:28:14 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 23 Dec 2005 16:28:14 -0500
Subject: rpms/kmymoney2/devel kmymoney2-0.8.1-gcc41.patch, NONE,
	1.1 kmymoney2.spec, 1.7, 1.8
Message-ID: <200512232128.jBNLSkpl006474@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Added Files:
	kmymoney2-0.8.1-gcc41.patch 
Log Message:
* Fri Dec 23 2005 Rex Dieter  0.8.1-7
- gcc41 patch


kmymoney2-0.8.1-gcc41.patch:

--- NEW FILE kmymoney2-0.8.1-gcc41.patch ---
--- kmymoney2-0.8.1/kmymoney2/converter/mymoneyqifreader.h.gcc41	2005-07-16 14:17:29.000000000 -0500
+++ kmymoney2-0.8.1/kmymoney2/converter/mymoneyqifreader.h	2005-12-23 15:26:42.000000000 -0600
@@ -270,7 +270,7 @@
     * @param searchname The name of the account to find or create
     * @return QCString id of the found or created account
     */
-  static const QCString MyMoneyQifReader::findOrCreateIncomeAccount(const QString& searchname);
+  static const QCString findOrCreateIncomeAccount(const QString& searchname);
   
   /**
     * This method looks up the @p searchname account by name and returns its id
@@ -280,7 +280,7 @@
     * @param searchname The name of the account to find or create
     * @return QCString id of the found or created account
     */
-  static const QCString MyMoneyQifReader::findOrCreateExpenseAccount(const QString& searchname);
+  static const QCString findOrCreateExpenseAccount(const QString& searchname);
   
   void processQifLine(void);
   


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kmymoney2.spec	23 Dec 2005 16:46:29 -0000	1.7
+++ kmymoney2.spec	23 Dec 2005 21:28:14 -0000	1.8
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -27,6 +27,7 @@
 
 # inspired by http://article.gmane.org/gmane.comp.kde.kmymoney2.devel/3467
 Patch1: kmymoney2-0.8.1-qt335.patch
+Patch2: kmymoney2-0.8.1-gcc41.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: automake
@@ -56,6 +57,7 @@
 %setup -q
 
 %patch1 -p1 -b .qt335
+%patch2 -p1 -b .gcc41
 
 
 %build
@@ -159,6 +161,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Rex Dieter  0.8.1-7
+- gcc41 patch
+
 * Fri Dec 23 2005 Rex Dieter  0.8.1-6
 - cleanup ofx deps
 



From fedora-extras-commits at redhat.com  Fri Dec 23 21:37:44 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 23 Dec 2005 16:37:44 -0500
Subject: rpms/liferea/devel .cvsignore, 1.16, 1.17 liferea.spec, 1.23,
	1.24 sources, 1.17, 1.18
Message-ID: <200512232138.jBNLcGdC006583@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Fri Dec 23 2005 Brian Pepple  - 1.0-2
- Update to 1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	19 Nov 2005 01:04:12 -0000	1.16
+++ .cvsignore	23 Dec 2005 21:37:43 -0000	1.17
@@ -1 +1 @@
-liferea-1.0-RC4.tar.gz
+liferea-1.0.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- liferea.spec	4 Dec 2005 09:39:23 -0000	1.23
+++ liferea.spec	23 Dec 2005 21:37:44 -0000	1.24
@@ -2,13 +2,13 @@
 
 Name:           liferea
 Version:        1.0
-Release:        0.3.rc4%{?dist}
+Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
-Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-RC4.tar.gz
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel
@@ -35,7 +35,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-RC4
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Brian Pepple  - 1.0-2
+- Update to 1.0.
+
 * Sun Dec 04 2005 Luke Macken  - 1.0-0.3.rc4
 - Rebuild against dbus 0.60
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	19 Nov 2005 01:04:12 -0000	1.17
+++ sources	23 Dec 2005 21:37:44 -0000	1.18
@@ -1 +1 @@
-593df5a7743b3ec8925a68605bef22da  liferea-1.0-RC4.tar.gz
+ba3a520361e5b02a27f93ee5ecda4448  liferea-1.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 21:39:21 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 23 Dec 2005 16:39:21 -0500
Subject: rpms/liferea/FC-4 .cvsignore, 1.16, 1.17 liferea.spec, 1.21,
	1.22 sources, 1.17, 1.18
Message-ID: <200512232139.jBNLdrGe006661@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Fri Dec 23 2005 Brian Pepple  - 1.0-1
- Update to 1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	19 Nov 2005 01:06:49 -0000	1.16
+++ .cvsignore	23 Dec 2005 21:39:20 -0000	1.17
@@ -1 +1 @@
-liferea-1.0-RC4.tar.gz
+liferea-1.0.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- liferea.spec	19 Nov 2005 01:06:49 -0000	1.21
+++ liferea.spec	23 Dec 2005 21:39:20 -0000	1.22
@@ -2,13 +2,13 @@
 
 Name:           liferea
 Version:        1.0
-Release:        0.1.rc4%{?dist}
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
-Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-RC4.tar.gz
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel
@@ -35,7 +35,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-RC4
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Brian Pepple  - 1.0-1
+- Update to 1.0.
+
 * Fri Nov 18 2005 Brian Pepple  - 1.0-0.1.rc4
 - Update to 1.0-RC4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	19 Nov 2005 01:06:49 -0000	1.17
+++ sources	23 Dec 2005 21:39:20 -0000	1.18
@@ -1 +1 @@
-593df5a7743b3ec8925a68605bef22da  liferea-1.0-RC4.tar.gz
+ba3a520361e5b02a27f93ee5ecda4448  liferea-1.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 22:58:33 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Fri, 23 Dec 2005 17:58:33 -0500
Subject: rpms/cfitsio/devel .cvsignore, 1.2, 1.3 cfitsio.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200512232259.jBNMx6bn008699@cvs-int.fedora.redhat.com>

Author: mtruch

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

Modified Files:
	.cvsignore cfitsio.spec sources 
Log Message:
Bring cfitsio up to 3.005beta



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Nov 2005 00:15:39 -0000	1.2
+++ .cvsignore	23 Dec 2005 22:58:33 -0000	1.3
@@ -1 +1 @@
-cfitsio3004bbeta.tar.gz
+cfitsio3005beta.tar.gz


Index: cfitsio.spec
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cfitsio.spec	14 Nov 2005 19:00:22 -0000	1.6
+++ cfitsio.spec	23 Dec 2005 22:58:33 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           cfitsio
-Version:        3.004
-Release:        0.12.b%{?dist}
+Version:        3.005
+Release:        0.1.beta%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
-Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3004bbeta.tar.gz
+Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3005beta.tar.gz
 Patch:          cfitsio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +69,9 @@
 %{_libdir}/libcfitsio.so
 
 %changelog
+* Fri Dec 23 2005 Matthew Truch  - 3.005-0.1.beta
+- Update to 3.005beta release.
+
 * Mon Nov 14 2005 Matthew Truch  - 3.004-0.12.b
 - Put in proper URL and Source addresses.
 - Sync up spec files.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Nov 2005 00:15:39 -0000	1.2
+++ sources	23 Dec 2005 22:58:33 -0000	1.3
@@ -1 +1 @@
-28d128ad001aadb848cb13f4c4fc3d14  cfitsio3004bbeta.tar.gz
+c15fe2e87037e630255ca5a3bb97cbb5  cfitsio3005beta.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 23:09:21 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Fri, 23 Dec 2005 18:09:21 -0500
Subject: rpms/cfitsio/FC-4 .cvsignore, 1.2, 1.3 cfitsio.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200512232309.jBNN9aq1010398@cvs-int.fedora.redhat.com>

Author: mtruch

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

Modified Files:
	.cvsignore cfitsio.spec sources 
Log Message:
Updating FC-4 cfitsio to 3.005beta



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Nov 2005 00:15:39 -0000	1.2
+++ .cvsignore	23 Dec 2005 23:09:21 -0000	1.3
@@ -1 +1 @@
-cfitsio3004bbeta.tar.gz
+cfitsio3005beta.tar.gz


Index: cfitsio.spec
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/FC-4/cfitsio.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cfitsio.spec	14 Nov 2005 19:02:56 -0000	1.5
+++ cfitsio.spec	23 Dec 2005 23:09:21 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           cfitsio
-Version:        3.004
-Release:        0.12.b%{?dist}
+Version:        3.005
+Release:        0.1.beta%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
-Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3004bbeta.tar.gz
+Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3005beta.tar.gz
 Patch:          cfitsio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +69,9 @@
 %{_libdir}/libcfitsio.so
 
 %changelog
+* Fri Dec 23 2005 Matthew Truch  - 3.005-0.1.beta
+- Update to 3.005beta release.
+
 * Mon Nov 14 2005 Matthew Truch  - 3.004-0.12.b
 - Put in proper URL and Source addresses.
 - Sync up spec files.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Nov 2005 00:15:39 -0000	1.2
+++ sources	23 Dec 2005 23:09:21 -0000	1.3
@@ -1 +1 @@
-28d128ad001aadb848cb13f4c4fc3d14  cfitsio3004bbeta.tar.gz
+c15fe2e87037e630255ca5a3bb97cbb5  cfitsio3005beta.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 23:11:39 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Fri, 23 Dec 2005 18:11:39 -0500
Subject: rpms/cfitsio/FC-3 .cvsignore, 1.2, 1.3 cfitsio.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200512232312.jBNNCCKU010500@cvs-int.fedora.redhat.com>

Author: mtruch

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

Modified Files:
	.cvsignore cfitsio.spec sources 
Log Message:
Updating FC-3 cfitsio to 3.005beta



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Nov 2005 00:15:39 -0000	1.2
+++ .cvsignore	23 Dec 2005 23:11:39 -0000	1.3
@@ -1 +1 @@
-cfitsio3004bbeta.tar.gz
+cfitsio3005beta.tar.gz


Index: cfitsio.spec
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/FC-3/cfitsio.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cfitsio.spec	14 Nov 2005 19:07:01 -0000	1.5
+++ cfitsio.spec	23 Dec 2005 23:11:39 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           cfitsio
-Version:        3.004
-Release:        0.11.b%{?dist}
+Version:        3.005
+Release:        0.1.beta%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
-Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3004bbeta.tar.gz
+Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3005beta.tar.gz
 Patch:          cfitsio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -66,6 +66,9 @@
 %{_libdir}/libcfitsio.so
 
 %changelog
+* Fri Dec 23 2005 Matthew Truch  - 3.005-0.1.beta
+- Update to 3.005beta release.
+
 * Mon Nov 14 2005 Matthew Truch  - 3.004-0.11.b
 - Use proper URL: and Source: addresses.
 - Correct typo in revision number in changelog.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Nov 2005 00:15:39 -0000	1.2
+++ sources	23 Dec 2005 23:11:39 -0000	1.3
@@ -1 +1 @@
-28d128ad001aadb848cb13f4c4fc3d14  cfitsio3004bbeta.tar.gz
+c15fe2e87037e630255ca5a3bb97cbb5  cfitsio3005beta.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 23:24:33 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Fri, 23 Dec 2005 18:24:33 -0500
Subject: rpms/hpic/FC-3 hpic.spec,1.2,1.3
Message-ID: <200512232325.jBNNP5ao010596@cvs-int.fedora.redhat.com>

Author: mtruch

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

Modified Files:
	hpic.spec 
Log Message:
Sync up spec files.  No real changes, no new builds required.



Index: hpic.spec
===================================================================
RCS file: /cvs/extras/rpms/hpic/FC-3/hpic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hpic.spec	14 Nov 2005 16:04:46 -0000	1.2
+++ hpic.spec	23 Dec 2005 23:24:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           hpic
 Version:        0.52
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Healpix manipulation binaries and library
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@
 %{_libdir}/libhpic.a
 
 %changelog
+* Mon Nov 14 2005 Matthew Truch  - 0.52-4
+- Bump revision to make build system build.
+
 * Mon Nov 14 2005 Matthew Truch  - 0.52-3
 - hpic-devel requires cfitsio-devel (for headers).
 - Clean up URL and Source0.



From fedora-extras-commits at redhat.com  Fri Dec 23 23:24:39 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Fri, 23 Dec 2005 18:24:39 -0500
Subject: rpms/hpic/devel hpic.spec,1.2,1.3
Message-ID: <200512232325.jBNNPB6C010599@cvs-int.fedora.redhat.com>

Author: mtruch

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

Modified Files:
	hpic.spec 
Log Message:
Sync up spec files.  No real changes, no new builds required.



Index: hpic.spec
===================================================================
RCS file: /cvs/extras/rpms/hpic/devel/hpic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hpic.spec	14 Nov 2005 15:55:45 -0000	1.2
+++ hpic.spec	23 Dec 2005 23:24:38 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           hpic
 Version:        0.52
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Healpix manipulation binaries and library
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@
 %{_libdir}/libhpic.a
 
 %changelog
+* Mon Nov 14 2005 Matthew Truch  - 0.52-4
+- Bump revision to make build system build.
+
 * Mon Nov 14 2005 Matthew Truch  - 0.52-3
 - hpic-devel requires cfitsio-devel (for headers).
 - Clean up URL and Source0.



From fedora-extras-commits at redhat.com  Sat Dec 24 03:44:38 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 23 Dec 2005 22:44:38 -0500
Subject: rpms/grisbi/devel grisbi.spec,1.8,1.9
Message-ID: <200512240345.jBO3jAWb018001@cvs-int.fedora.redhat.com>

Author: notting

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

Modified Files:
	grisbi.spec 
Log Message:
bump for rebuild against new libofx



Index: grisbi.spec
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/grisbi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grisbi.spec	11 Jun 2005 19:58:59 -0000	1.8
+++ grisbi.spec	24 Dec 2005 03:44:37 -0000	1.9
@@ -1,7 +1,7 @@
 %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help
 Name:		grisbi
 Version:	0.5.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Personal finances manager
 
 Group:		Applications/Productivity
@@ -112,6 +112,9 @@
 %ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html
 
 %changelog
+* Fri Dec 23 2005 Bill Nottingham  0.5.7-2
+- rebuild against new libofx
+
 * Sat Jun 11 2005 Aurelien Bompard  0.5.7-1
 - version 0.5.7
 



From fedora-extras-commits at redhat.com  Sat Dec 24 06:48:07 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sat, 24 Dec 2005 01:48:07 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.13,1.14
Message-ID: <200512240648.jBO6mdcX023387@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23340/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Fixed a slash-em crash that was package-related




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nethack-vultures.spec	21 Dec 2005 19:47:38 -0000	1.13
+++ nethack-vultures.spec	24 Dec 2005 06:48:06 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -98,6 +98,7 @@
 
 # Save some space
 for f in graphics music sound ; do
+    cp $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f/* $RPM_BUILD_ROOT%{_prefix}/games/vultureseye/$f/
     rm -r $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
     ln -s ../vultureseye/$f \
         $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
@@ -162,6 +163,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Karen Pease  - 1.11.1-3
+- Modified the specfile to duplicate the slash'em contents into the vultures dirs before rm'ing, to fix a missing-file crash
+
 * Wed Dec 21 2005 Karen Pease  - 1.11.1-2
 - Upped revision to try to get package to build on the server.
 



From fedora-extras-commits at redhat.com  Sat Dec 24 06:48:13 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sat, 24 Dec 2005 01:48:13 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.14,1.15
Message-ID: <200512240648.jBO6mjd9023390@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-serv23340/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Fixed a slash-em crash that was package-related




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nethack-vultures.spec	21 Dec 2005 19:47:44 -0000	1.14
+++ nethack-vultures.spec	24 Dec 2005 06:48:13 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -98,6 +98,7 @@
 
 # Save some space
 for f in graphics music sound ; do
+    cp $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f/* $RPM_BUILD_ROOT%{_prefix}/games/vultureseye/$f/
     rm -r $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
     ln -s ../vultureseye/$f \
         $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
@@ -162,6 +163,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Karen Pease  - 1.11.1-3
+- Modified the specfile to duplicate the slash'em contents into the vultures dirs before rm'ing, to fix a missing-file crash
+
 * Wed Dec 21 2005 Karen Pease  - 1.11.1-2
 - Upped revision to try to get package to build on the server.
 



From fedora-extras-commits at redhat.com  Sat Dec 24 06:48:19 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sat, 24 Dec 2005 01:48:19 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.14,1.15
Message-ID: <200512240648.jBO6mpm7023394@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23340/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Fixed a slash-em crash that was package-related




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nethack-vultures.spec	21 Dec 2005 19:47:50 -0000	1.14
+++ nethack-vultures.spec	24 Dec 2005 06:48:19 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -98,6 +98,7 @@
 
 # Save some space
 for f in graphics music sound ; do
+    cp $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f/* $RPM_BUILD_ROOT%{_prefix}/games/vultureseye/$f/
     rm -r $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
     ln -s ../vultureseye/$f \
         $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
@@ -162,6 +163,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Karen Pease  - 1.11.1-3
+- Modified the specfile to duplicate the slash'em contents into the vultures dirs before rm'ing, to fix a missing-file crash
+
 * Wed Dec 21 2005 Karen Pease  - 1.11.1-2
 - Upped revision to try to get package to build on the server.
 



From fedora-extras-commits at redhat.com  Sat Dec 24 12:25:07 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 24 Dec 2005 07:25:07 -0500
Subject: rpms/milter-greylist/FC-4 milter-greylist-1.6-sysconf.patch, NONE, 
	1.1 milter-greylist.spec, 1.5, 1.6
Message-ID: <200512241225.jBOCPeN9002464@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2444

Modified Files:
	milter-greylist.spec 
Added Files:
	milter-greylist-1.6-sysconf.patch 
Log Message:
- allowed to configure the parameter given to the daemon in an
  /etc/sysconfig/milter-greylist file (bz #162334)
- set user and socketfile in the configfile
- minor specfile cleanups


milter-greylist-1.6-sysconf.patch:

--- NEW FILE milter-greylist-1.6-sysconf.patch ---
2005-12-24 Enrico Scholz 

	* rc-redhat.sh.in: allow to override the used options by
	  loading /etc/sysconfig/milter-greylist

--- milter-greylist-1.6/rc-redhat.sh.in.sysconf	2005-12-24 13:14:25.000000000 +0100
+++ milter-greylist-1.6/rc-redhat.sh.in	2005-12-24 13:15:09.000000000 +0100
@@ -16,6 +16,10 @@
 socket="/var/milter-greylist/milter-greylist.sock"
 user="@USER@"
 OPTIONS="-P $pidfile -u $user -p $socket"
+
+f=/etc/sysconfig/milter-greylist
+test ! -e "$f" || . "$f"
+
 RETVAL=0
 prog="Milter-Greylist"
 


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/FC-4/milter-greylist.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- milter-greylist.spec	19 May 2005 17:37:44 -0000	1.5
+++ milter-greylist.spec	24 Dec 2005 12:25:06 -0000	1.6
@@ -21,7 +21,7 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	1.6
-Release:	%release_func 3
+Release:	%release_func 4
 License:	BSD w/ advertising
 Group:		System Environment/Daemon
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -29,6 +29,7 @@
 Patch0:		milter-greylist-1.6-rh.patch
 Patch1:		milter-greylist-1.6-group.patch
 Patch2:		milter-greylist-1.4-spfbool.patch
+Patch3:		milter-greylist-1.6-sysconf.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:		init(%name)
 Requires(pre):		fedora-usermgmt
@@ -91,9 +92,12 @@
 %patch0 -p1 -b .rh
 %patch1 -p1 -b .group
 %patch2 -p1 -b .spfbool
+%patch3 -p1 -b .sysconf
 
 perl -pi -e 's!(\$\{INSTALL\}.*\s)(\S+\s*)$!$1\${DESTDIR}$2!' Makefile.in
 perl -pi -e 's!--rpath!--XXXX!g' configure
+sed  -i  -e 's!^\#user .*!user "%username"!;
+             s!^\#socket !socket !' greylist.conf
 
 for i in `find -type f`; do
     sed -e 's!/var/milter-greylist/milter-greylist.sock!%rundir/milter-greylist.sock!g;
@@ -117,7 +121,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %__install -d -m755 \
-	$RPM_BUILD_ROOT{/etc/mail,%rundir,%dbdir,%_initrddir,%minitsvcdir,%_var/run}
+	$RPM_BUILD_ROOT{%_sysconfdir/mail,%rundir,%dbdir,%_initrddir,%minitsvcdir,%_var/run}
 
 %__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)"
 %__install -p -m755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name
@@ -171,7 +175,7 @@
 %defattr(-,root,root,-)
 %doc ChangeLog README
 %_mandir/man*/*
-%attr(0640,root,%username) %config(noreplace) /etc/mail/greylist.conf
+%attr(0640,root,%username) %verify(not mtime) %config(noreplace) %_sysconfdir/mail/greylist.conf
 %dir %attr(0751,%username,%username) %vardir
 %dir %attr(0770,root,%username) %dbdir
 %dir %attr(0700,%username,root) %rundir
@@ -194,6 +198,12 @@
 %endif
 
 %changelog
+* Sat Dec 24 2005 Enrico Scholz  - 1.6-4
+- allowed to configure the parameter given to the daemon in an
+  /etc/sysconfig/milter-greylist file (bz #162334)
+- set user and socketfile in the configfile
+- minor specfile cleanups
+
 * Thu May 19 2005 Enrico Scholz  - 1.6-3
 - set %%dist
 - use %%global instead of %%define



From fedora-extras-commits at redhat.com  Sat Dec 24 12:56:33 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 24 Dec 2005 07:56:33 -0500
Subject: rpms/milter-greylist/devel milter-greylist.params, NONE,
	1.1 milter-greylist.i, NONE,
	1.1 milter-greylist-2.0.2-sysv.patch, NONE,
	1.1 milter-greylist.spec, 1.9,
	1.10 milter-greylist-2.0rc5-user.patch, 1.1, NONE
Message-ID: <200512241257.jBOCv5nc002634@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2606

Modified Files:
	milter-greylist.spec 
Added Files:
	milter-greylist.params milter-greylist.i 
	milter-greylist-2.0.2-sysv.patch 
Removed Files:
	milter-greylist-2.0rc5-user.patch 
Log Message:
- use /var/run/milter-greylist as directory for the socket (bz #162334#6)
- do not set user and socket in the sysv-initscript anymore; instead
  of uncomment the configfile entries
- ship minit params file as SOURCE instead of generating it on-the-fly
- added -initng subpackage
- minor specfile cleanups



--- NEW FILE milter-greylist.params ---
-D


--- NEW FILE milter-greylist.i ---
daemon daemon/milter-greylist {
	need = system/initial system/mountfs;
	use  = system/netmount;
	require_network;

	respawn;
	exec	  daemon = /usr/sbin/milter-greylist;
	exec_args daemon = -D;
}

milter-greylist-2.0.2-sysv.patch:

--- NEW FILE milter-greylist-2.0.2-sysv.patch ---
--- milter-greylist-2.0.2/rc-redhat.sh.in.sysv	2005-03-13 17:43:52.000000000 +0100
+++ milter-greylist-2.0.2/rc-redhat.sh.in	2005-12-24 13:08:37.000000000 +0100
@@ -13,9 +13,7 @@
 . /etc/init.d/functions
 
 pidfile="/var/milter-greylist/milter-greylist.pid"
-socket="/var/milter-greylist/milter-greylist.sock"
-user="@USER@"
-OPTIONS="-P $pidfile -p $socket"
+OPTIONS="-P $pidfile"
 if [ -f /etc/sysconfig/milter-greylist ]
 then
     . /etc/sysconfig/milter-greylist
@@ -29,7 +27,7 @@
                 RETVAL=1
                 failure
         else
-                daemon --user=$user @BINDIR@/milter-greylist $OPTIONS
+                daemon @BINDIR@/milter-greylist $OPTIONS
                 RETVAL=$?
                 [ $RETVAL -eq 0 ] && touch /var/lock/subsys/milter-greylist
         fi;


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- milter-greylist.spec	22 Oct 2005 00:56:35 -0000	1.9
+++ milter-greylist.spec	24 Dec 2005 12:56:33 -0000	1.10
@@ -1,10 +1,13 @@
 ## $Id$
 
 ## This package accepts the following switches:
-##   --with spf    ...  enable SPF support
-##   --with minit  ...  enable minit support
+##   --with spf        ...  enable SPF support
+##   --without minit   ...  disable creation of 'minit' subpackage
+##   --without initng  ...  disable creation of 'initng' subpackage
 
 ## Fedora Extras specific customization below...
+%{!?_with_minit:%global		_without_minit		--without minit}
+%{!?_with_initng:%global	_without_initng		--without initng}
 ##
 
 %global username	grmilter
@@ -12,7 +15,7 @@
 %global minitsvcdir	%minitdir/services/grmilter
 %global vardir		%_var/lib/%name
 %global dbdir		%vardir/db
-%global rundir		%vardir/run
+%global rundir		%_var/run/%name
 %global __chkconfig	/sbin/chkconfig
 
 %{!?release_func:%global release_func() %1%{?dist}}
@@ -20,12 +23,12 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	2.0.2
-Release:	%release_func 1
+Release:	%release_func 2
 License:	BSD w/ advertising
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
 Source0:	ftp://ftp.espci.fr/pub/milter-greylist/%name-%version.tgz
-Patch0:		milter-greylist-2.0rc5-user.patch
+Patch0:		milter-greylist-2.0.2-sysv.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:		init(%name)
 Requires(pre):		fedora-usermgmt
@@ -35,7 +38,7 @@
 
 %package sysv
 Summary:	Sysv initscripts for %name
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 Provides:	init(%name) = sysv
 Requires(preun):	%name = %version-%release
 Requires(postun):	%name = %version-%release
@@ -46,12 +49,23 @@
 
 %package minit
 Summary:	Minit initscripts for %name
-Group:		System Environment/Daemon
-Provides:	init(%name) = minit
+Group:		System Environment/Daemons
+Source20:	milter-greylist.params
+Provides:		init(%name) = minit
 Requires:		%name = %version-%release
 Requires(pre):		minit-setup
 Requires(postun):	minit-setup
 
+%package initng
+Summary:	initng initscripts for %name
+Group:		System Environment/Daemons
+Source30:	milter-greylist.i
+Provides:		init(%name) = initng
+Requires:		%name = %version-%release
+Requires(pre):		%_sysconfdir/initng %name
+Requires(preun):	initng %name
+Requires(postun):	initng %name
+
 
 %description
 Greylisting is a new method of blocking significant amounts of spam at
@@ -83,11 +97,23 @@
 This package provides the minit initscripts for the %name package.
 
 
+%description initng
+Greylisting is a new method of blocking significant amounts of spam at
+the mailserver level, but without resorting to heavyweight statistical
+analysis or other heuristical (and error-prone) approaches. Consequently,
+implementations are fairly lightweight, and may even decrease network
+traffic and processor load on your mailserver.
+
+This package provides the initng initscripts for the %name package.
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .user
+%patch0 -p1 -b .sysv
 
 perl -pi -e 's!--rpath!--XXXX!g' configure
+sed  -i  -e 's!^\#user .*!user "%username"!;
+             s!^\#socket !socket !' greylist.conf
 
 for i in `find -type f`; do
     sed -e 's!/var/milter-greylist/milter-greylist.sock!%rundir/milter-greylist.sock!g;
@@ -112,27 +138,28 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%__install -d -m755 $RPM_BUILD_ROOT{%_initrddir,%minitsvcdir,%rundir,%dbdir,%_var/run}
+%__install -d -m755 $RPM_BUILD_ROOT{%_initrddir,%minitsvcdir,%rundir,%dbdir,%_var/run} \
+		    $RPM_BUILD_ROOT%_sysconfdir/initng/daemon
 %__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)"
 %__install -p -m755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name
 
 # the minit stuff
 ln -s %_sbindir/milter-greylist $RPM_BUILD_ROOT%minitsvcdir/run
-touch $RPM_BUILD_ROOT%minitsvcdir/respawn
+%__install -p -m644 %SOURCE20   $RPM_BUILD_ROOT%minitsvcdir/params
+touch                           $RPM_BUILD_ROOT%minitsvcdir/respawn
 
-cat <$RPM_BUILD_ROOT%minitsvcdir/params
--D
--u%username
--p%rundir/milter-greylist.sock
-EOF
-
-# Short hack...
-%{!?_with_minit:rm -rf $RPM_BUILD_ROOT%minitdir}
+# the initng stuff
+%__install -p -m644 %SOURCE30	$RPM_BUILD_ROOT%_sysconfdir/initng/daemon/milter-greylist.i
 
 # create temporary files
 touch $RPM_BUILD_ROOT%rundir/milter-greylist.sock
 touch $RPM_BUILD_ROOT%_var/run/milter-greylist.pid
 
+## Remove the unwanted init-methods
+%{?_without_sysv:  rm -rf $RPM_BUILD_ROOT%_initrddir}
+%{?_without_minit: rm -rf $RPM_BUILD_ROOT%_sysconfdir/minit}
+%{?_without_initng:rm -rf $RPM_BUILD_ROOT%_sysconfdir/initng}
+
 
 %pre
 /usr/sbin/fedora-groupadd 7 -r %username &>/dev/null || :
@@ -157,6 +184,15 @@
 test "$1"  = 0 || %_initrddir/%name condrestart >/dev/null || :
 
 
+%preun initng
+test "$1" != 0 || {
+	/sbin/ngc --stop    daemon/milter-greylist &>/dev/null || :
+	/sbin/ng-update del daemon/milter-greylist &>/dev/null || :
+}
+
+%postun initng
+test "$1"  = 0 || /sbin/ngc --restart daemon/milter-greylist &>/dev/null || :
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -165,7 +201,7 @@
 %defattr(-,root,root,-)
 %doc ChangeLog README
 %_mandir/man*/*
-%attr(0640,root,%username) %config(noreplace) /etc/mail/greylist.conf
+%attr(0640,root,%username) %verify(not mtime) %config(noreplace) %_sysconfdir/mail/greylist.conf
 %dir %attr(0751,%username,%username) %vardir
 %dir %attr(0770,root,%username) %dbdir
 %dir %attr(0700,%username,root) %rundir
@@ -174,20 +210,36 @@
 %ghost %rundir/milter-greylist.sock
 %ghost %_var/run/milter-greylist.pid
 
+%if 0%{!?_without_sysv:1}
 %files sysv
-%defattr(-,root,root,-)
-%config %_initrddir/*
+  %defattr(-,root,root,-)
+  %config %_initrddir/*
+%endif
+
+%if 0%{!?_without_initng:1}
+%files initng
+  %defattr(-,root,root,-)
+  %config %_sysconfdir/initng/daemon/*
+%endif
 
-%if 0%{?_with_minit:1}
+%if 0%{!?_without_minit:1}
 %files minit
-%defattr(-,root,root,-)
-%dir %minitsvcdir
-%minitsvcdir/run
-%minitsvcdir/respawn
-%config(noreplace) %minitsvcdir/params
+  %defattr(-,root,root,-)
+  %dir %minitsvcdir
+  %minitsvcdir/run
+  %minitsvcdir/respawn
+  %config(noreplace) %minitsvcdir/params
 %endif
 
 %changelog
+* Sat Dec 24 2005 Enrico Scholz  - 2.0.2-2
+- use /var/run/milter-greylist as directory for the socket (bz #162334#6)
+- do not set user and socket in the sysv-initscript anymore; instead
+  of uncomment the configfile entries
+- ship minit params file as SOURCE instead of generating it on-the-fly
+- added -initng subpackage
+- minor specfile cleanups
+
 * Sat Oct 22 2005 Enrico Scholz  - 2.0.2-1
 - updated to 2.0.2
 


--- milter-greylist-2.0rc5-user.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Dec 24 13:07:06 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 24 Dec 2005 08:07:06 -0500
Subject: rpms/milter-greylist/FC-4 milter-greylist.spec,1.6,1.7
Message-ID: <200512241307.jBOD7vkk004330@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4310

Modified Files:
	milter-greylist.spec 
Log Message:
fixed groupname



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/FC-4/milter-greylist.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- milter-greylist.spec	24 Dec 2005 12:25:06 -0000	1.6
+++ milter-greylist.spec	24 Dec 2005 13:07:06 -0000	1.7
@@ -23,7 +23,7 @@
 Version:	1.6
 Release:	%release_func 4
 License:	BSD w/ advertising
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
 Source0:	ftp://ftp.espci.fr/pub/milter-greylist/%name-%version.tgz
 Patch0:		milter-greylist-1.6-rh.patch
@@ -39,7 +39,7 @@
 
 %package sysv
 Summary:	Sysv initscripts for %name
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 Provides:	init(%name) = sysv
 Requires(preun):	%name = %version-%release
 Requires(postun):	%name = %version-%release
@@ -50,7 +50,7 @@
 
 %package minit
 Summary:	Minit initscripts for %name
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 Provides:	init(%name) = minit
 Requires:		%name = %version-%release
 Requires(pre):		minit-setup
@@ -203,6 +203,7 @@
   /etc/sysconfig/milter-greylist file (bz #162334)
 - set user and socketfile in the configfile
 - minor specfile cleanups
+- fixed groupname
 
 * Thu May 19 2005 Enrico Scholz  - 1.6-3
 - set %%dist



From fedora-extras-commits at redhat.com  Sat Dec 24 13:15:45 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 24 Dec 2005 08:15:45 -0500
Subject: rpms/milter-greylist/FC-3 milter-greylist-1.6-sysconf.patch, NONE, 
	1.1 milter-greylist.spec, 1.2, 1.3
Message-ID: <200512241316.jBODGH0Y004511@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4491

Modified Files:
	milter-greylist.spec 
Added Files:
	milter-greylist-1.6-sysconf.patch 
Log Message:
- allowed to configure the parameter given to the daemon in an
  /etc/sysconfig/milter-greylist file (bz #162334)
- set user and socketfile in the configfile
- minor specfile cleanups
- fixed groupname


milter-greylist-1.6-sysconf.patch:

--- NEW FILE milter-greylist-1.6-sysconf.patch ---
2005-12-24 Enrico Scholz 

	* rc-redhat.sh.in: allow to override the used options by
	  loading /etc/sysconfig/milter-greylist

--- milter-greylist-1.6/rc-redhat.sh.in.sysconf	2005-12-24 13:14:25.000000000 +0100
+++ milter-greylist-1.6/rc-redhat.sh.in	2005-12-24 13:15:09.000000000 +0100
@@ -16,6 +16,10 @@
 socket="/var/milter-greylist/milter-greylist.sock"
 user="@USER@"
 OPTIONS="-P $pidfile -u $user -p $socket"
+
+f=/etc/sysconfig/milter-greylist
+test ! -e "$f" || . "$f"
+
 RETVAL=0
 prog="Milter-Greylist"
 


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/FC-3/milter-greylist.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- milter-greylist.spec	19 May 2005 17:39:07 -0000	1.2
+++ milter-greylist.spec	24 Dec 2005 13:15:45 -0000	1.3
@@ -21,14 +21,15 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	1.6
-Release:	%release_func 3
+Release:	%release_func 4
 License:	BSD w/ advertising
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
 Source0:	ftp://ftp.espci.fr/pub/milter-greylist/%name-%version.tgz
 Patch0:		milter-greylist-1.6-rh.patch
 Patch1:		milter-greylist-1.6-group.patch
 Patch2:		milter-greylist-1.4-spfbool.patch
+Patch3:		milter-greylist-1.6-sysconf.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:		init(%name)
 Requires(pre):		fedora-usermgmt
@@ -38,7 +39,7 @@
 
 %package sysv
 Summary:	Sysv initscripts for %name
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 Provides:	init(%name) = sysv
 Requires(preun):	%name = %version-%release
 Requires(postun):	%name = %version-%release
@@ -49,7 +50,7 @@
 
 %package minit
 Summary:	Minit initscripts for %name
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 Provides:	init(%name) = minit
 Requires:		%name = %version-%release
 Requires(pre):		minit-setup
@@ -91,9 +92,12 @@
 %patch0 -p1 -b .rh
 %patch1 -p1 -b .group
 %patch2 -p1 -b .spfbool
+%patch3 -p1 -b .sysconf
 
 perl -pi -e 's!(\$\{INSTALL\}.*\s)(\S+\s*)$!$1\${DESTDIR}$2!' Makefile.in
 perl -pi -e 's!--rpath!--XXXX!g' configure
+sed  -i  -e 's!^\#user .*!user "%username"!;
+             s!^\#socket !socket !' greylist.conf
 
 for i in `find -type f`; do
     sed -e 's!/var/milter-greylist/milter-greylist.sock!%rundir/milter-greylist.sock!g;
@@ -117,7 +121,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %__install -d -m755 \
-	$RPM_BUILD_ROOT{/etc/mail,%rundir,%dbdir,%_initrddir,%minitsvcdir,%_var/run}
+	$RPM_BUILD_ROOT{%_sysconfdir/mail,%rundir,%dbdir,%_initrddir,%minitsvcdir,%_var/run}
 
 %__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)"
 %__install -p -m755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name
@@ -171,7 +175,7 @@
 %defattr(-,root,root,-)
 %doc ChangeLog README
 %_mandir/man*/*
-%attr(0640,root,%username) %config(noreplace) /etc/mail/greylist.conf
+%attr(0640,root,%username) %verify(not mtime) %config(noreplace) %_sysconfdir/mail/greylist.conf
 %dir %attr(0751,%username,%username) %vardir
 %dir %attr(0770,root,%username) %dbdir
 %dir %attr(0700,%username,root) %rundir
@@ -194,6 +198,13 @@
 %endif
 
 %changelog
+* Sat Dec 24 2005 Enrico Scholz  - 1.6-4
+- allowed to configure the parameter given to the daemon in an
+  /etc/sysconfig/milter-greylist file (bz #162334)
+- set user and socketfile in the configfile
+- minor specfile cleanups
+- fixed groupname
+
 * Thu May 19 2005 Enrico Scholz  - 1.6-3
 - set %%dist
 - use %%global instead of %%define



From fedora-extras-commits at redhat.com  Sat Dec 24 16:12:52 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 24 Dec 2005 11:12:52 -0500
Subject: rpms/munin/devel munin.spec,1.3,1.4
Message-ID: <200512241613.jBOGDPWp009869@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	munin.spec 
Log Message:
Fixed ownership for /var/log/munin in node subpackage (fixes 176529)



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- munin.spec	15 Dec 2005 05:16:08 -0000	1.3
+++ munin.spec	24 Dec 2005 16:12:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -207,7 +207,7 @@
 %{_sbindir}/munin-run
 %{_sbindir}/munin-node
 %{_sbindir}/munin-node-configure
-%dir /var/log/munin
+%attr(-, munin, munin) %dir /var/log/munin
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
 %dir /etc/munin
@@ -222,7 +222,10 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
-* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
+* Sat Dec 24 2005 Kevin Fenzi  - 1.2.4-5
+- Fixed ownership for /var/log/munin in node subpackage (fixes 176529)
+
+* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-4
 - Fixed ownership for /var/lib/munin in node subpackage
 
 * Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3



From fedora-extras-commits at redhat.com  Sat Dec 24 16:15:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 24 Dec 2005 11:15:42 -0500
Subject: rpms/munin/FC-4 munin.spec,1.3,1.4
Message-ID: <200512241616.jBOGGEBO009938@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	munin.spec 
Log Message:
Fixed ownership for /var/log/munin in node subpackage (fixes 176529)



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-4/munin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- munin.spec	15 Dec 2005 05:19:44 -0000	1.3
+++ munin.spec	24 Dec 2005 16:15:41 -0000	1.4
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -207,7 +207,7 @@
 %{_sbindir}/munin-run
 %{_sbindir}/munin-node
 %{_sbindir}/munin-node-configure
-%dir /var/log/munin
+%attr(-, munin, munin) %dir /var/log/munin
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
 %dir /etc/munin
@@ -222,6 +222,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Dec 24 2005 Kevin Fenzi  - 1.2.4-5
+- Fixed ownership for /var/log/munin in node subpackage (fixes 176529)
+
 * Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-4
 - Fixed ownership for /var/lib/munin in node subpackage
 



From fedora-extras-commits at redhat.com  Sat Dec 24 16:18:02 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 24 Dec 2005 11:18:02 -0500
Subject: rpms/munin/FC-3 munin.spec,1.3,1.4
Message-ID: <200512241618.jBOGIYTO010007@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	munin.spec 
Log Message:
Fixed ownership for /var/log/munin in node subpackage (fixes 176529)



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-3/munin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- munin.spec	15 Dec 2005 05:22:06 -0000	1.3
+++ munin.spec	24 Dec 2005 16:18:02 -0000	1.4
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -207,7 +207,7 @@
 %{_sbindir}/munin-run
 %{_sbindir}/munin-node
 %{_sbindir}/munin-node-configure
-%dir /var/log/munin
+%attr(-, munin, munin) %dir /var/log/munin
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
 %dir /etc/munin
@@ -222,6 +222,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Dec 24 2005 Kevin Fenzi  - 1.2.4-5
+- Fixed ownership for /var/log/munin in node subpackage (fixes 176529)
+
 * Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-4
 - Fixed ownership for /var/lib/munin in node subpackage
 



From fedora-extras-commits at redhat.com  Sat Dec 24 18:53:15 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Sat, 24 Dec 2005 13:53:15 -0500
Subject: rpms/hpic/devel hpic.spec,1.3,1.4
Message-ID: <200512241853.jBOIrme4013704@cvs-int.fedora.redhat.com>

Author: mtruch

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

Modified Files:
	hpic.spec 
Log Message:
Forgot defattr for devel package.



Index: hpic.spec
===================================================================
RCS file: /cvs/extras/rpms/hpic/devel/hpic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hpic.spec	23 Dec 2005 23:24:38 -0000	1.3
+++ hpic.spec	24 Dec 2005 18:53:15 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           hpic
 Version:        0.52
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Healpix manipulation binaries and library
 
 Group:          Development/Libraries
@@ -60,11 +60,15 @@
 %{_bindir}/hpic*
 
 %files devel
+%defattr(-,root,root)
 %{_libdir}/libhpic.so
 %{_includedir}/hpic.h
 %{_libdir}/libhpic.a
 
 %changelog
+* Sat Dec 24 2005 Matthew Truch  - 0.52-5
+- Include missing %defattr for devel package (bug 173090).
+
 * Mon Nov 14 2005 Matthew Truch  - 0.52-4
 - Bump revision to make build system build.
 



From fedora-extras-commits at redhat.com  Sat Dec 24 19:02:40 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Sat, 24 Dec 2005 14:02:40 -0500
Subject: rpms/hpic/FC-4 hpic.spec,1.3,1.4
Message-ID: <200512241903.jBOJ3Cl0015486@cvs-int.fedora.redhat.com>

Author: mtruch

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

Modified Files:
	hpic.spec 
Log Message:
Fix missing %defattr from devel package.



Index: hpic.spec
===================================================================
RCS file: /cvs/extras/rpms/hpic/FC-4/hpic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hpic.spec	14 Nov 2005 18:48:24 -0000	1.3
+++ hpic.spec	24 Dec 2005 19:02:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           hpic
 Version:        0.52
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Healpix manipulation binaries and library
 
 Group:          Development/Libraries
@@ -60,11 +60,15 @@
 %{_bindir}/hpic*
 
 %files devel
+%defattr(-,root,root)
 %{_libdir}/libhpic.so
 %{_includedir}/hpic.h
 %{_libdir}/libhpic.a
 
 %changelog
+* Sat Dec 24 2005 Matthew Truch  - 0.52-5
+- Include missing %defattr for devel package (bug 173090).
+
 * Mon Nov 14 2005 Matthew Truch  - 0.52-4
 - Bump revision to make build system build.
 



From fedora-extras-commits at redhat.com  Sat Dec 24 19:02:13 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Sat, 24 Dec 2005 14:02:13 -0500
Subject: rpms/hpic/FC-3 hpic.spec,1.3,1.4
Message-ID: <200512241903.jBOJ3Fsc015489@cvs-int.fedora.redhat.com>

Author: mtruch

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

Modified Files:
	hpic.spec 
Log Message:
Fix missing %defattr from devel package.



Index: hpic.spec
===================================================================
RCS file: /cvs/extras/rpms/hpic/FC-3/hpic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hpic.spec	23 Dec 2005 23:24:32 -0000	1.3
+++ hpic.spec	24 Dec 2005 19:02:12 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           hpic
 Version:        0.52
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Healpix manipulation binaries and library
 
 Group:          Development/Libraries
@@ -60,11 +60,15 @@
 %{_bindir}/hpic*
 
 %files devel
+%defattr(-,root,root)
 %{_libdir}/libhpic.so
 %{_includedir}/hpic.h
 %{_libdir}/libhpic.a
 
 %changelog
+* Sat Dec 24 2005 Matthew Truch  - 0.52-5
+- Include missing %defattr for devel package (bug 173090).
+
 * Mon Nov 14 2005 Matthew Truch  - 0.52-4
 - Bump revision to make build system build.
 



From fedora-extras-commits at redhat.com  Sat Dec 24 20:12:19 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 24 Dec 2005 15:12:19 -0500
Subject: rpms/new import.log,1.2,1.3
Message-ID: <200512242012.jBOKCpGJ017410@cvs-int.fedora.redhat.com>

Author: mikep

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/new/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	19 Dec 2005 22:30:12 -0000	1.2
+++ import.log	24 Dec 2005 20:12:18 -0000	1.3
@@ -1 +1,2 @@
 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



From fedora-extras-commits at redhat.com  Sat Dec 24 20:12:25 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 24 Dec 2005 15:12:25 -0500
Subject: rpms/new/devel new.spec,1.1,1.2
Message-ID: <200512242012.jBOKCwXL017413@cvs-int.fedora.redhat.com>

Author: mikep

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

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


Index: new.spec
===================================================================
RCS file: /cvs/extras/rpms/new/devel/new.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- new.spec	19 Dec 2005 22:30:18 -0000	1.1
+++ new.spec	24 Dec 2005 20:12:25 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A simple template system
 Name: new
 Version: 1.3.5
-Release: 2
+Release: 3
 License: GPL
 Group: Development/Tools
 Source: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz
@@ -91,12 +91,16 @@
 %doc	AUTHORS COPYING ChangeLog INSTALL README
 
 %files devel
+%defattr(-, root, root)
 %{_libdir}/pkgconfig/new.pc
 %{_includedir}/new
 %{_libdir}/lib*.so
 
 
 %changelog
+* Sat Dec 24 2005 W. Michael Petullo  - 1.3.5-3
+   - Add %defattr for %files devel.
+
 * Tue Dec 13 2005 W. Michael Petullo  - 1.3.5-2
    - Broke out -devel package.
    - Simplifies %files block.



From fedora-extras-commits at redhat.com  Sun Dec 25 01:08:47 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 24 Dec 2005 20:08:47 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.5, 1.6 rxvt-unicode.spec, 1.7, 
	1.8 sources, 1.5, 1.6
Message-ID: <200512250109.jBP19vN9026119@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-serv26061/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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Dec 2005 21:53:46 -0000	1.5
+++ .cvsignore	25 Dec 2005 01:08:37 -0000	1.6
@@ -1 +1 @@
-rxvt-unicode-5.9.tar.bz2
+rxvt-unicode-6.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rxvt-unicode.spec	18 Dec 2005 21:53:46 -0000	1.7
+++ rxvt-unicode.spec	25 Dec 2005 01:08:37 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        5.9
+Version:        6.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+6.0-1
+- version upgrade
+
 * Sun Dec 18 2005 Andreas Bierfert 
 5.9-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Dec 2005 21:53:46 -0000	1.5
+++ sources	25 Dec 2005 01:08:37 -0000	1.6
@@ -1 +1 @@
-c160e8199d71324d789657c6d1092a4e  rxvt-unicode-5.9.tar.bz2
+7d00ac0675290a0b726d32d912e2cfcd  rxvt-unicode-6.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 25 01:08:56 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 24 Dec 2005 20:08:56 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.5, 1.6 rxvt-unicode.spec, 1.7, 
	1.8 sources, 1.5, 1.6
Message-ID: <200512250109.jBP19wvE026127@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-serv26061/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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Dec 2005 21:53:52 -0000	1.5
+++ .cvsignore	25 Dec 2005 01:08:55 -0000	1.6
@@ -1 +1 @@
-rxvt-unicode-5.9.tar.bz2
+rxvt-unicode-6.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rxvt-unicode.spec	18 Dec 2005 21:53:52 -0000	1.7
+++ rxvt-unicode.spec	25 Dec 2005 01:08:55 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        5.9
+Version:        6.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+6.0-1
+- version upgrade
+
 * Sun Dec 18 2005 Andreas Bierfert 
 5.9-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Dec 2005 21:53:52 -0000	1.5
+++ sources	25 Dec 2005 01:08:55 -0000	1.6
@@ -1 +1 @@
-c160e8199d71324d789657c6d1092a4e  rxvt-unicode-5.9.tar.bz2
+7d00ac0675290a0b726d32d912e2cfcd  rxvt-unicode-6.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 25 01:09:23 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 24 Dec 2005 20:09:23 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.5, 1.6 rxvt-unicode.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <200512250110.jBP19vUa026122@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26061/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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Dec 2005 21:53:58 -0000	1.5
+++ .cvsignore	25 Dec 2005 01:09:23 -0000	1.6
@@ -1 +1 @@
-rxvt-unicode-5.9.tar.bz2
+rxvt-unicode-6.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rxvt-unicode.spec	18 Dec 2005 21:53:58 -0000	1.10
+++ rxvt-unicode.spec	25 Dec 2005 01:09:23 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        5.9
+Version:        6.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -70,6 +70,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+6.0-1
+- version upgrade
+
 * Sun Dec 18 2005 Andreas Bierfert 
 5.9-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Dec 2005 21:53:58 -0000	1.5
+++ sources	25 Dec 2005 01:09:23 -0000	1.6
@@ -1 +1 @@
-c160e8199d71324d789657c6d1092a4e  rxvt-unicode-5.9.tar.bz2
+7d00ac0675290a0b726d32d912e2cfcd  rxvt-unicode-6.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 25 04:00:48 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 24 Dec 2005 23:00:48 -0500
Subject: rpms/gobby/devel gobby.spec,1.4,1.5
Message-ID: <200512250401.jBP41OSE031370@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	gobby.spec 
Log Message:
Add libXau-devel to BR



Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/gobby.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gobby.spec	22 Dec 2005 09:13:30 -0000	1.4
+++ gobby.spec	25 Dec 2005 04:00:47 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gobby
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:  desktop-file-utils, libXau-devel
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Sat Dec 24 2005 Luke Macken  - 0.3.0-2
+- Add libXau-devel to BuildRequires
+
 * Thu Dec 22 2005 Luke Macken  - 0.3.0-1
 - 0.3.0
 



From fedora-extras-commits at redhat.com  Sun Dec 25 04:15:30 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 24 Dec 2005 23:15:30 -0500
Subject: rpms/gobby/devel gobby.spec,1.5,1.6
Message-ID: <200512250416.jBP4G3Fr031479@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	gobby.spec 
Log Message:
update BR again..



Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/gobby.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gobby.spec	25 Dec 2005 04:00:47 -0000	1.5
+++ gobby.spec	25 Dec 2005 04:15:30 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gobby
 Version:        0.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
-BuildRequires:  desktop-file-utils, libXau-devel
+BuildRequires:  desktop-file-utils, libXau-devel, libXdmcp-devel
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Sat Dec 24 2005 Luke Macken  - 0.3.0-3
+- Add libXdmcp-devel to BuildRequires
+
 * Sat Dec 24 2005 Luke Macken  - 0.3.0-2
 - Add libXau-devel to BuildRequires
 



From fedora-extras-commits at redhat.com  Sun Dec 25 09:21:18 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 25 Dec 2005 04:21:18 -0500
Subject: rpms/libetpan/FC-3 .cvsignore, 1.5, 1.6 libetpan.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200512250921.jBP9LsiQ008365@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8306/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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2005 08:26:17 -0000	1.5
+++ .cvsignore	25 Dec 2005 09:21:16 -0000	1.6
@@ -1 +1 @@
-libetpan-0.40.tar.gz
+libetpan-0.41.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-3/libetpan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libetpan.spec	17 Nov 2005 08:21:46 -0000	1.4
+++ libetpan.spec	25 Dec 2005 09:21:16 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.40
+Version:        0.41
 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.40
+%setup -q -n %{name}-0.41
 
 %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.3.2.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.0.6.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+0.41-1
+- version upgrade
+
 * Thu Nov 17 2005 Andreas Bierfert 
 0.40-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2005 08:26:17 -0000	1.5
+++ sources	25 Dec 2005 09:21:16 -0000	1.6
@@ -1 +1 @@
-d204c1c222408d24b073dbaaf8ab3920  libetpan-0.40.tar.gz
+62fd85dc7d38f7586073b469278ee58e  libetpan-0.41.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 25 09:21:24 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 25 Dec 2005 04:21:24 -0500
Subject: rpms/libetpan/FC-4 .cvsignore, 1.5, 1.6 libetpan.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200512250921.jBP9Lu0X008370@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8306/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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2005 08:26:23 -0000	1.5
+++ .cvsignore	25 Dec 2005 09:21:24 -0000	1.6
@@ -1 +1 @@
-libetpan-0.40.tar.gz
+libetpan-0.41.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-4/libetpan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libetpan.spec	17 Nov 2005 08:21:51 -0000	1.4
+++ libetpan.spec	25 Dec 2005 09:21:24 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.40
+Version:        0.41
 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.40
+%setup -q -n %{name}-0.41
 
 %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.3.2.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.0.6.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+0.41-1
+- version upgrade
+
 * Thu Nov 17 2005 Andreas Bierfert 
 0.40-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2005 08:26:23 -0000	1.5
+++ sources	25 Dec 2005 09:21:24 -0000	1.6
@@ -1 +1 @@
-d204c1c222408d24b073dbaaf8ab3920  libetpan-0.40.tar.gz
+62fd85dc7d38f7586073b469278ee58e  libetpan-0.41.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 25 09:21:41 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 25 Dec 2005 04:21:41 -0500
Subject: rpms/libetpan/devel .cvsignore, 1.5, 1.6 libetpan.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200512250922.jBP9MDwg009249@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8306/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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2005 08:26:28 -0000	1.5
+++ .cvsignore	25 Dec 2005 09:21:40 -0000	1.6
@@ -1 +1 @@
-libetpan-0.40.tar.gz
+libetpan-0.41.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libetpan.spec	17 Nov 2005 08:21:57 -0000	1.5
+++ libetpan.spec	25 Dec 2005 09:21:40 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.40
+Version:        0.41
 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.40
+%setup -q -n %{name}-0.41
 
 %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.3.2.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.0.6.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+0.41-1
+- version upgrade
+
 * Thu Nov 17 2005 Andreas Bierfert 
 0.40-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2005 08:26:28 -0000	1.5
+++ sources	25 Dec 2005 09:21:40 -0000	1.6
@@ -1 +1 @@
-d204c1c222408d24b073dbaaf8ab3920  libetpan-0.40.tar.gz
+62fd85dc7d38f7586073b469278ee58e  libetpan-0.41.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 25 09:26:51 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 25 Dec 2005 04:26:51 -0500
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.11, 1.12 sources, 1.12,
	1.13 sylpheed-claws.spec, 1.27, 1.28
Message-ID: <200512250927.jBP9RNap011941@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11920

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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Nov 2005 09:57:01 -0000	1.11
+++ .cvsignore	25 Dec 2005 09:26:51 -0000	1.12
@@ -1 +1 @@
-sylpheed-claws-1.9.100.tar.bz2
+sylpheed-claws-2.0.0-rc2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Nov 2005 09:57:01 -0000	1.12
+++ sources	25 Dec 2005 09:26:51 -0000	1.13
@@ -1 +1 @@
-863c314557f90f17c2f6d6a0ab57e6c2  sylpheed-claws-1.9.100.tar.bz2
+1becc85e57825d4e654c34bf14e2877b  sylpheed-claws-2.0.0-rc2.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sylpheed-claws.spec	21 Nov 2005 08:12:34 -0000	1.27
+++ sylpheed-claws.spec	25 Dec 2005 09:26:51 -0000	1.28
@@ -1,13 +1,13 @@
-%define         openssl_pc  %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
+#%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}
+Version:        2.0.0
+Release:        0.rc2%{?dist}
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.100.tar.bz2
+Source0:        http://claws.sylpheed.org/snapshots/sylpheed-claws-2.0.0-rc2.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
 
@@ -47,13 +47,13 @@
 for development with %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
 
 %build
-%if %openssl_pc
-MY_OPENSSL_CFLAGS=`pkg-config openssl --cflags`
-%endif
-CFLAGS="${MY_OPENSSL_CFLAGS} ${RPM_OPT_FLAGS}" \
+#%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 +113,14 @@
 %{_libdir}/sylpheed-claws/plugins/*deps
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+2.0.0-0.rc2
+- version upgrade
+
+* Sun Dec 04 2005 Andreas Bierfert 
+2.0.0-0.rc1
+- version upgrade
+
 * 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  Sun Dec 25 09:29:10 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 25 Dec 2005 04:29:10 -0500
Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins.spec, 1.4,
	1.5
Message-ID: <200512250929.jBP9ThLG011982@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-serv11950/FC-4

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sylpheed-claws-plugins.spec	20 Nov 2005 22:11:17 -0000	1.4
+++ sylpheed-claws-plugins.spec	25 Dec 2005 09:29:10 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        1.9.100
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -285,6 +285,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+1.9.100-2
+- rebuild
+
 * Thu Nov 17 2005 Andreas Bierfert 
 1.9.100-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Dec 25 09:29:16 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 25 Dec 2005 04:29:16 -0500
Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.4, 
	1.5
Message-ID: <200512250929.jBP9TmUb011985@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-serv11950/devel

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sylpheed-claws-plugins.spec	20 Nov 2005 22:11:22 -0000	1.4
+++ sylpheed-claws-plugins.spec	25 Dec 2005 09:29:16 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        1.9.100
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -285,6 +285,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+1.9.100-2
+- rebuild
+
 * Thu Nov 17 2005 Andreas Bierfert 
 1.9.100-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Dec 25 15:24:52 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 25 Dec 2005 10:24:52 -0500
Subject: owners owners.list,1.478,1.479
Message-ID: <200512251525.jBPFPOl5022533@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	owners.list 
Log Message:
repair remaining damage done in r1.459


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -r1.478 -r1.479
--- owners.list	23 Dec 2005 08:49:22 -0000	1.478
+++ owners.list	25 Dec 2005 15:24:51 -0000	1.479
@@ -237,16 +237,16 @@
 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|compton at pcompton.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|galeon|GNOME2 Web browser based on Mozilla|denisleroy at yahoo.com|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|
 Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gcfilms|Movies collections management|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gcl|GNU Common Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdesklets|Advanced architecture for desktop applets|luya256 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -278,7 +278,7 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 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|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|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|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|
@@ -304,7 +304,7 @@
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-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|gnome-vfsmm26|C++ wrapper for gnome-vfs|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnugo|Text based go program|compton at pcompton.com|extras-qa at fedoraproject.org|
@@ -342,8 +342,8 @@
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -396,7 +396,7 @@
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org|
-Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|inkscape|A vector-based drawing program using SVG|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
@@ -486,15 +486,15 @@
 Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm20|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm24|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm20|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm24|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|libgnomedb|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|libgsf113|GNOME Structured File library 1.13|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libibverbs|A library for direct userspace use of InfiniBand|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libid3tag|ID3 tag manipulation library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -532,7 +532,7 @@
 Fedora Extras|libsexy|Funky fresh graphical widgets for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
-Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++|Typesafe Signal Framework for C++|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Dec 25 15:28:47 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 25 Dec 2005 10:28:47 -0500
Subject: owners owners.list,1.479,1.480
Message-ID: <200512251529.jBPFTJPZ022561@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	owners.list 
Log Message:
sort entries by package name


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -r1.479 -r1.480
--- owners.list	25 Dec 2005 15:24:51 -0000	1.479
+++ owners.list	25 Dec 2005 15:28:47 -0000	1.480
@@ -66,8 +66,8 @@
 Fedora Extras|blogtk|Gnome application for editing/maintaining blogs|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|blt|BLT widget extension to Tcl/Tk scripting language development|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bluefish|A GTK2 web development application for experienced users|compton at pcompton.com|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|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|ville.skytta at iki.fi|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|
@@ -154,8 +154,8 @@
 Fedora Extras|dkms|Dynamic Kernel Module Support (DKMS) method for installing module RPMS|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|tcallawa at redhat.com,gary_lerhaupt at dell.com
 Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
+Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|drivel|A journal or "blog" client|katzj at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -188,6 +188,7 @@
 Fedora Extras|factory|A C++ class library for multivariate polynomial data|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|fbdesk|Icon Manager for Fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|fbida|FrameBuffer Imageviewer|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-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|
@@ -223,8 +224,8 @@
 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|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
+Fedora Extras|fuse|File System in Userspace|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -434,8 +435,8 @@
 Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kid3|Efficient ID3 tagger|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|kile|LaTeX source editor and TeX shell|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|kinput2|Japanese kanji input server for X11|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kimdaba|KDE Image Database|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|kinput2|Japanese kanji input server for X11|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kiosktool|KIOSK administration tool for KDE|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kipi-plugins|Plugins to use with Kipi|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kmymoney2|Personal finance|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -453,12 +454,14 @@
 Fedora Extras|kxdocker|A Mac OSX style docker|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kxdocker-resources|Plugins, Sounds, and Themes for kxdocker|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kyum|Graphical User Frontend (GUI) for yum|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
+Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|lablgl|LablGL is an OpenGL interface for Objective Caml|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|lablgtk|An Objective Caml interface to gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|lcms|Color Management System|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|leafnode|A leafsite NNTP server|davidhart at tqmcube.com|extras-qa at fedoraproject.org|
 Fedora Extras|leafpad|GTK+ based simple text editor|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|lft|Alternate traceroute tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -555,8 +558,8 @@
 Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lincvs|Graphical CVS Client|compton at pcompton.com|extras-qa at fedoraproject.org|
-Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|linkchecker|Script that checks HTML documents for broken links|redhat at flyn.org|extras-qa at fedoraproject.org|
+Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -593,8 +596,8 @@
 Fedora Extras|mhash|Thread-safe hash algorithms library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|mhonarc|A Perl mail-to-HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|milter-greylist|Milter for greylisting, the next step in the spam control war|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|mknbi|Utility for creating network bootable images|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|mimetex|Easily embed LaTeX math in web pages|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|mknbi|Utility for creating network bootable images|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mmv|Move/copy/append/link multiple files|shishz at hotpop.com|extras-qa at fedoraproject.org|
 Fedora Extras|mock|Builds packages inside chroots|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
@@ -602,16 +605,16 @@
 Fedora Extras|mod_auth_pam|PAM authentication module for Apache|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|mod_security|Security module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|extras-qa at fedoraproject.org|
-Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|moin-latex|LaTeX plugin for the MoinMoin wiki|ed at eh3.com|extras-qa at fedoraproject.org|
+Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|monotone|A free, distributed version control system|roland at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|moodle|A Course Management System|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|moodss|Powerful modular monitoring graphical application|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org|
-Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org|
@@ -648,7 +651,9 @@
 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|
 Fedora Extras|numlockx|NumLockX turns on NumLock after starting X|jpmahowald at gmail.com|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|
 Fedora Extras|ocaml|The Objective Caml compiler and programming environment|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -697,11 +702,12 @@
 Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-BerkeleyDB|Perl interface to Berkeley DB|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Boulder|An API for hierarchical tag/value structures|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Business-Hours|Calculate business hours in a time period|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cache-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cache-Simple-TimedExpiry|Cache::Simple::TimedExpiry Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-capitalization|No capitalization on method names|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Carp-Assert|Executable comments|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Carp-Assert-More|Convenience wrappers around Carp::Assert|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cflow|Find flows in flow files|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -744,7 +750,6 @@
 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-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-capitalization|No capitalization on method names|rc040203 at freenet.de|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
 Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -770,19 +775,19 @@
 Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Flat|Implements a flat filesystem|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-FileHandle-Unget|A FileHandle that supports ungetting of multiple bytes|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-NCopy|Copy files to directories, or a single file to another file|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-FileHandle-Unget|A FileHandle that supports ungetting of multiple bytes|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-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-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-gettext|Interface to gettext family of functions|rc040203 at freenet.de|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
 Fedora Extras|perl-GD|Perl interface to the GD graphics library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GD-SVG|GD SVG enables SVG output from scripts written using GD|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GDTextUtil|Text utilities for use with GD|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Graph|A Perl module for dealing with graphs, the abstract data structures|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -795,8 +800,8 @@
 Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Ima-DBI|Database connection caching and organization|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-Base|Base class for loading, manipulating and saving images in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-ExifTool|Utility for reading and writing image meta info|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -839,8 +844,8 @@
 Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-IP-CMatch|Efficiently match IP addresses against IP ranges with C|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Netmask|Perl module for manipulation and lookup of IP network blocks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-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
@@ -849,9 +854,9 @@
 Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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-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-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
@@ -1070,7 +1075,6 @@
 Fedora Extras|sbcl|Steel Bank Common Lisp|rdieter at math.unl.edu|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|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-chewing|SCIM IMEngine for Traditional Chinese|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-fcitx|fcitx SCIM IMEngine for Simplified Chinese|petersen at redhat.com|extras-qa at fedoraproject.org|
@@ -1080,6 +1084,7 @@
 Fedora Extras|scim-pinyin|Chinese input method for SCIM|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-qtimm|SCIM Qt Input Method module|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-skk|Scim-skk is a SCIM IMEngine module for skk to support Japanese input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|scim|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|petersen at redhat.com|extras-qa at fedoraproject.org|
 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|
@@ -1162,8 +1167,8 @@
 Fedora Extras|tetex-eurofont|Provides a command that prints a euro symbol|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-cm-lgc|The CM-LGC Type1 fonts for LaTeX|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-kerkis|The Kerkis type 1 fonts for LaTeX|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
-Fedora Extras|tetex-font-tipa|The TIPA fonts for LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-fontools|Tools for handling fonts with LaTeX and fontinst|mpeters at mac.com|extras-qa at fedoraproject.org|
+Fedora Extras|tetex-font-tipa|The TIPA fonts for LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-lgrind|Source-code pretty-printer for LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-perltex|Define LaTeX macros in terms of Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-pgf|Create PostScript and PDF graphics in TeX|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
@@ -1244,8 +1249,8 @@
 Fedora Extras|xboard|An X Window System graphical chessboard|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|xbsql|A SQL wrapper for xbase|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xca|Graphical X.509 certificate management tool|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|xcin|A XIM server input method for Traditional Chinese|llch at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xchat-gnome|Gnome IRC Client|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|xcin|A XIM server input method for Traditional Chinese|llch at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xdaliclock|A clock for the X Window System|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|xdesktopwaves|Simulation of water waves on the X Window System desktop|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xemacs|A different version of Emacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -1259,8 +1264,8 @@
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-minicmd-plugin|Mini command-line plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1288,6 +1293,7 @@
 Fedora Extras|xlhtml|Excel 95/97 and PowerPoint to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|xlockmore|Screen lock and screen saver|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlindent|A XML stream reformatter|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlstarlet|Command line XML toolkit|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-acme|XMMS plugin to use special multimedia keys in GNOME or through acme|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -1308,6 +1314,7 @@
 Fedora Extras|xsupplicant|Open Source Implementation of IEEE 802.1x|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|yakuake|A Quake-like terminal application|dreadyman at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|yap|High-performance Prolog Compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|yasm|Complete rewrite of the NASM assembler|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org|
@@ -1316,10 +1323,3 @@
 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|yakuake|A Quake-like terminal application|dreadyman at gmail.com|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|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|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|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
-Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|
-Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Dec 25 19:21:17 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Sun, 25 Dec 2005 14:21:17 -0500
Subject: web/html index.php,1.18,1.19
Message-ID: <200512251921.jBPJLlFP029547@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29529

Modified Files:
	index.php 
Log Message:
Adding note about transition


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/index.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- index.php	1 Dec 2005 18:12:15 -0000	1.18
+++ index.php	25 Dec 2005 19:21:15 -0000	1.19
@@ -9,137 +9,31 @@
 ?>
 
 

-
+
+ 
 
 

- is an open source project sponsored by
-Red Hat and supported by the Fedora community. It is also a proving ground
-for new technology that may eventually make its way into Red Hat products.
-It is not a supported product of Red Hat, Inc.
+Fedora Core is a free operating system that offers the best combination of stable and cutting-edge software that exists in the free software world.
 

 
 

-To learn more about the process, refer to About, 
-the Objectives,
-and the FAQs.
+Download Fedora Core 4 now.
 

 
-

-
-
Fedora Directory Server 1.0 Release [01 Dec 2005]

-
-
 
-  FDS 1.0 is past the hurdles and released into the wild.  Read more
-  about this amazing milestone in the history of open source directory
-  servers on the FDS
-  Wiki.  
+Documentation for Fedora is available.
 

 
-

-
-
Latest Fedora News

-
-

-  [01 Dec 2005] fedora.redhat.com update in progress

-  This site is in the process of undergoing a content refresh and
-  facelift.  Sorry for the cruft whilst we are editing.  Expect
-  changes here soon.
-

-

-  [06 Oct 2005] FUDCon London, 2005 (formerly FUDCon
-  III)
 
-  FUDCon is the conference/summit that focuses on the Fedora Project
-  and all things that go along with it.  For more information, visit
-  the FUDCon
-  webpages.
-

-

-  [13 Jun 2005] Fedora Core 4 (Stentz) now available

-  Fedora Core 4 is now available
-  from Red Hat and at distinguished mirror sites near you, and is also
-  available in the torrent.
-  Fedora Core is available for x86-64, i386, and ppc/ppc64. Please file bugs via
-  Bugzilla, Product Fedora Core, Version 4,
-  so that they are noticed and appropriately classified. Discuss this release on 
-  fedora-list.
-

-

-  [02 Jun 2005] Fedora participates in the Summer Of Code 

-  The Fedora Project is proud to participate in Google's
-  Summer Of Code. For
-  ideas on some of the projects Fedora is looking to sponsor, please see
-  the Fedora Project Wiki.
-

-  [01 Jun 2005] Fedora Directory Server announced 

-  The Fedora Directory Server is a robust, scalable open-source server 
-  designed to manage large directories of users and resources.  It is based
-  on an open-systems server protocol called the Lightweight Directory Access
-  Protocol (LDAP).  For more information, go to 
-  the project website.
 

-  [10 May 2005] Fedora Core 4 test 3 now available 

-  The third test release of Fedora Core 4
-  is now available.  New features in FC4 
-  test 3 include GNOME 2.10, KDE 3.4, and a preview of GCC 4.0.  PowerPC is 
-  also supported.  Download it from the torrent.  File bugs in 
-  bugzilla against Fedora 
-  Core, version fc4test3.  Discuss this release on 
-  fedora-test-list.
+Fedora is always looking for contributors.
 

-

-  [03 May 2005] Endorsement of fedoraforum.org
  
-  The Fedora Project now endorses 
-  fedoraforum.org as its end-user
-  forum of choice.  Read more about the other available 
-  discussion forums.
-

-

-  [21 Apr 2005] FUDCon 2 Announced

-  FUDCon 2, the second gathering
-  of Fedora Users and Developers, will be held at LinuxTag in Karlsruhe,
-  Germany on the 24th and 25th of June.
-

-

-  [15 Apr 2005] Fedora Core 2 moves to Legacy Project

-  The Fedora Steering Committee announces the
-  transfer of Fedora Core 2 to the 
-  Fedora Legacy Project.
-  For more information on the Fedora Legacy Project, or if you wish to join
-  the team please see http://fedoralegacy.org/.
-

-

-  [01 Mar 2005] Announcing the Fedora Extras Project

-  The Fedora Extras Project has been 
-  established to create high-quality software to augment software available in 
-  Fedora Core. 
-

-
-

-
-
Fedora Core Release Schedule

 
 

-  The Fedora Project announces a new major release of Fedora Core every 
-  four to six months.  The current release schedule is available 
-  here.
-

-	
-
Red Hat Enterprise Linux

+Questions about Fedora?  Look for answers here.
+

 
 

- is one of the sources
-for new technologies and enhancements that may be incorporated
-into Red Hat Enterprise Linux in the future.  Red Hat Enterprise
-Linux is the solution that provides a robust, stable operating system
-supported by Red Hat, Inc. and a wide variety of independent
-software vendors (ISVs).  For production use, support, service
-level agreements (SLAs), and ISV support, we proudly ask that
-you look at Red
-Hat Enterprise Linux.
-
+We are currently in the process of evaluating a transition of this website to fedoraproject.org. fedoraproject.org is a community website that is being revamped and has more content being actively added to it on a regular basis. Users and developers are encouraged to visit this website for information and regular updates. The Fedora Websites Team is discussing the transition and a new content management system to host our updated infrastructure. Anyone is welcome to join those discussions. Thank you for your interest in the Fedora Project.
 

-
 

 
 

Author: nman64

Update of /cvs/fedora/web/html/Download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29624/Download

Modified Files:
	vendors.list 
Log Message:
Removing dead vendors


Index: vendors.list
===================================================================
RCS file: /cvs/fedora/web/html/Download/vendors.list,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vendors.list	22 Dec 2005 22:36:18 -0000	1.4
+++ vendors.list	25 Dec 2005 19:39:59 -0000	1.5
@@ -4,8 +4,6 @@
 
 B2B Poland::6 CDs or 1 DVD::17.99 Euros
 
-bitbone (Germany)::3 CDs::15 Euros
-
 Call A CD::3 CDs or 1 DVD::10 Euros
 
 CheapBytes::3 CDs or 6 CDs::$6.99 or $12.99
@@ -30,8 +28,6 @@
 
 Edmunds Enterprises::3 binary CDs or 3 source CDs or 6 CDs::$4.50 or $7.50
 
-eFusian::3 CDs::£4
-
 Fedora-France.org::3 CDs or 1 DVD::9.9 euro
 
 Galuna, Romania::3 CDs::3 euro
@@ -64,12 +60,8 @@
 
 Mathias Kettner ::3 CDs::15 Euro
 
-Moelands Digital (Netherlands only)::3 CDS or     6 CDS::15 euro or 30 euro
-
 Mynasoft::3 CDs or 6 CDs::$15 or $25
 
-N-iX ::3 CDs::18 euro
-
 OSdepot.com::3 CDs or 6 CDs::$3.95 or $14.95
 
 OSDisc.com::3 CDs or 6 CDs::$7.95 or $13.95



From fedora-extras-commits at redhat.com  Sun Dec 25 19:40:06 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Sun, 25 Dec 2005 14:40:06 -0500
Subject: web/html/download vendors.list,1.9,1.10
Message-ID: <200512251940.jBPJebF4029661@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29624/download

Modified Files:
	vendors.list 
Log Message:
Removing dead vendors


Index: vendors.list
===================================================================
RCS file: /cvs/fedora/web/html/download/vendors.list,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vendors.list	6 Dec 2005 05:03:43 -0000	1.9
+++ vendors.list	25 Dec 2005 19:40:04 -0000	1.10
@@ -4,8 +4,6 @@
 
 B2B Poland::6 CDs or 1 DVD::17.99 Euros
 
-bitbone (Germany)::3 CDs::15 Euros
-
 Call A CD::3 CDs or 1 DVD::10 Euros
 
 CheapBytes::3 CDs or 6 CDs::$6.99 or $12.99
@@ -30,8 +28,6 @@
 
 Edmunds Enterprises::3 binary CDs or 3 source CDs or 6 CDs::$4.50 or $7.50
 
-eFusian::3 CDs::£4
-
 Fedora-France.org::3 CDs or 1 DVD::9.9 euro
 
 Galuna, Romania::3 CDs::3 euro
@@ -56,18 +52,16 @@
 
 LinuxInstall.org::3 CDs::$10
 
+LinuxShopp.com.br::CDs::R$20.00
+
 LinuxShop.co.nz::3 binary CDs or 3 source CDs::$12.95 NZ o4 $14.95 NZ
 
 MASH Consulting::3 CDs or 6 CDs::$10 or $15
 
 Mathias Kettner ::3 CDs::15 Euro
 
-Moelands Digital (Netherlands only)::3 CDS or     6 CDS::15 euro or 30 euro
-
 Mynasoft::3 CDs or 6 CDs::$15 or $25
 
-N-iX ::3 CDs::18 euro
-
 OSdepot.com::3 CDs or 6 CDs::$3.95 or $14.95
 
 OSDisc.com::3 CDs or 6 CDs::$7.95 or $13.95



From fedora-extras-commits at redhat.com  Sun Dec 25 21:11:53 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 25 Dec 2005 16:11:53 -0500
Subject: rpms/wv/devel .cvsignore,1.3,1.4 sources,1.3,1.4 wv.spec,1.11,1.12
Message-ID: <200512252112.jBPLCP6H000935@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore sources wv.spec 
Log Message:
- version 1.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 May 2005 15:30:18 -0000	1.3
+++ .cvsignore	25 Dec 2005 21:11:53 -0000	1.4
@@ -1 +1 @@
-wv-1.0.3.tar.gz
+wv-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 May 2005 15:30:18 -0000	1.3
+++ sources	25 Dec 2005 21:11:53 -0000	1.4
@@ -1 +1 @@
-71e42aa9af1e03cc8c608bbbdcb43af8  wv-1.0.3.tar.gz
+b6319d5e75611fe2210453b5feb82c0c  wv-1.2.0.tar.gz


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/wv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wv.spec	28 Oct 2005 14:21:03 -0000	1.11
+++ wv.spec	25 Dec 2005 21:11:53 -0000	1.12
@@ -1,23 +1,23 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.0.3
-Release:    2%{?dist}
+Version:    1.2.0
+Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-1.0.3.tar.gz
-Patch0:     wv-wvtext-tmp.patch
-Patch1:     wv-1.0.3-oledecod.patch
-Patch2:     wv-1.0.3-gcc4.patch
+Source:     http://dl.sf.net/wvware/wv-1.2.0.tar.gz
+#Patch0:     wv-wvtext-tmp.patch
+#Patch1:     wv-1.0.3-oledecod.patch
+#Patch2:     wv-1.0.3-gcc4.patch
 Patch5:     wv-1.0.0-rhbug150461.patch
 
-#BuildRequires: XFree86-devel
 BuildRequires: glib2-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libxml2-devel
 BuildRequires: ImageMagick-devel
 BuildRequires: pkgconfig
+BuildRequires: libgsf-devel >= 1.11.2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:   wvware = %{version}-%{release}
 
@@ -42,8 +42,8 @@
 %prep
 %setup -q
 #%patch0
-%patch1 -p1 -b .oledecod
-%patch2 -p1 -b .gcc4
+#%patch1 -p1 -b .oledecod
+#%patch2 -p1 -b .gcc4
 %patch5 -p1 -b .printf-rhbug150461
 
 
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Nov 11 2005 Aurelien Bompard  1.2.0-1
+- version 1.2.0
+
 * Fri Oct 28 2005 Aurelien Bompard  1.0.3-2
 - split out a -devel package (#171962)
 



From fedora-extras-commits at redhat.com  Sun Dec 25 21:27:39 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 16:27:39 -0500
Subject: rpms/xca/FC-4 xca-0.5.1-gcc41.patch, NONE,
	1.1 xca-0.5.1-openssl098.patch, NONE, 1.1 xca-0.5.1-sha1.patch,
	NONE, 1.1 xca.spec, 1.10, 1.11
Message-ID: <200512252128.jBPLSBiI001064@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	xca.spec 
Added Files:
	xca-0.5.1-gcc41.patch xca-0.5.1-openssl098.patch 
	xca-0.5.1-sha1.patch 
Log Message:
- fixed compilation with gcc41 and openssl098
- use SHA1 instead of MD5 as the default hashalgo


xca-0.5.1-gcc41.patch:

--- NEW FILE xca-0.5.1-gcc41.patch ---
--- xca-0.5.1/lib/pki_key.h.gcc41	2003-12-10 07:43:05.000000000 +0100
+++ xca-0.5.1/lib/pki_key.h	2005-12-25 17:27:48.000000000 +0100
@@ -83,7 +83,7 @@
 	pki_key(const QString name = "", int type = EVP_PKEY_RSA);
 	pki_key(EVP_PKEY *pkey);
 	// copy constructor
-	pki_key::pki_key(const pki_key *pk);
+	pki_key(const pki_key *pk);
 	/* destructor */
 	~pki_key();
 	
--- xca-0.5.1/lib/db_crl.h.gcc41	2004-04-16 00:31:31.000000000 +0200
+++ xca-0.5.1/lib/db_crl.h	2005-12-25 16:01:56.000000000 +0100
@@ -69,7 +69,7 @@
 	void preprocess();
 	void inToCont(pki_base *pki);
 	pki_base *insert(pki_base *item);
-	void db_crl::deletePKI(pki_base *pki);
+	void deletePKI(pki_base *pki);
     signals:
 	void updateCertView();
 };
--- xca-0.5.1/lib/db_x509.h.gcc41	2004-02-18 01:03:05.000000000 +0100
+++ xca-0.5.1/lib/db_x509.h	2005-12-25 16:01:56.000000000 +0100
@@ -84,7 +84,7 @@
 	void writeAllCerts(const QString fname, bool onlyTrusted);
 	pki_x509 *getByIssSerial(const pki_x509 *issuer, const a1int &a);
 	pki_x509 *getBySubject(const x509name &xname, pki_x509 *last = NULL);
-	pki_base *db_x509::insert(pki_base *item);
+	pki_base *insert(pki_base *item);
     public slots:
 	void revokeCert(const x509rev &revok, const pki_x509 *issuer);
     
--- xca-0.5.1/lib/asn1time.h.gcc41	2003-08-06 10:15:37.000000000 +0200
+++ xca-0.5.1/lib/asn1time.h	2005-12-25 16:55:02.000000000 +0100
@@ -75,7 +75,7 @@
 	QString toPlain() const;
 	QString toSortable() const;
 	int ymdg(int *y, int *m, int *d, int *g) const;
-	int a1time::ymdg(int *y, int *m, int *d, int *h, int *M, int *s, int *g) const;
+	int ymdg(int *y, int *m, int *d, int *h, int *M, int *s, int *g) const;
 	ASN1_TIME *get() const;
 	ASN1_TIME *get_utc() const;
 	a1time &now(int delta = 0);

xca-0.5.1-openssl098.patch:

--- NEW FILE xca-0.5.1-openssl098.patch ---
--- xca-0.5.1/lib/x509rev.cpp.openssl098	2003-11-24 14:42:44.000000000 +0100
+++ xca-0.5.1/lib/x509rev.cpp	2005-12-25 21:38:32.000000000 +0100
@@ -50,8 +50,13 @@
 
 #include "x509rev.h"
 
-#define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+#  define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((i2d_of_void *)i2d_X509_REVOKED, \
+		(d2i_of_void *)d2i_X509_REVOKED,(char *)x5r)
+#else
+#  define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
 		(char *(*)())d2i_X509_REVOKED,(char *)x5r)
+#endif
 	
 x509rev::x509rev()
 {
--- xca-0.5.1/lib/openssl-compat.h.openssl098	2005-12-25 21:38:44.000000000 +0100
+++ xca-0.5.1/lib/openssl-compat.h	2005-12-25 21:51:29.000000000 +0100
@@ -0,0 +1,17 @@
+#ifndef H_XCA_LIB_OPENSSL_COMPAT_H
+#define H_XCA_LIB_OPENSSL_COMPAT_H
+
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+#  define XCA_D2I_F(F,X) \
+inline static X*					\
+d2i_##F(X** a, unsigned char**b, long int c)		\
+{							\
+  return d2i_##F(a, (unsigned char const **) b, c);	\
+}
+#  define XCA_D2I(X)		XCA_D2I_F(X,X)
+#else
+#  define XCA_D2I(X)
+#  define XCA_D2I_F(F,X)
+#endif
+
+#endif
--- xca-0.5.1/lib/asn1time.h.openssl098	2005-12-25 21:33:32.000000000 +0100
+++ xca-0.5.1/lib/asn1time.h	2005-12-25 21:42:47.000000000 +0100
@@ -89,4 +89,7 @@
 	bool const operator != (const a1time &a);
 };
 
+#include "openssl-compat.h"
+XCA_D2I(ASN1_TIME)
+
 #endif
--- xca-0.5.1/lib/pki_x509.h.openssl098	2004-02-18 01:03:06.000000000 +0100
+++ xca-0.5.1/lib/pki_x509.h	2005-12-25 21:43:37.000000000 +0100
@@ -141,4 +141,7 @@
 	   const EVP_MD *getDigest();
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509)
+
 #endif
--- xca-0.5.1/lib/pki_crl.h.openssl098	2004-02-18 01:03:05.000000000 +0100
+++ xca-0.5.1/lib/pki_crl.h	2005-12-25 21:44:28.000000000 +0100
@@ -97,4 +97,7 @@
 	void updateView();
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_CRL)
+
 #endif
--- xca-0.5.1/lib/pki_x509req.h.openssl098	2004-02-05 21:17:55.000000000 +0100
+++ xca-0.5.1/lib/pki_x509req.h	2005-12-25 21:45:20.000000000 +0100
@@ -95,4 +95,8 @@
 	   void set_spki(NETSCAPE_SPKI *_spki);
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_REQ)
+XCA_D2I(NETSCAPE_SPKI)
+
 #endif
--- xca-0.5.1/lib/pki_key.cpp.openssl098	2004-02-18 01:03:06.000000000 +0100
+++ xca-0.5.1/lib/pki_key.cpp	2005-12-25 21:53:16.000000000 +0100
@@ -58,6 +58,9 @@
 #include 
 #include 
 
+#include "openssl-compat.h"
+XCA_D2I_F(RSA_PUBKEY,RSA)
+
 char pki_key::passwd[40]="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
 
 QPixmap *pki_key::icon[2]= { NULL, NULL };
@@ -107,7 +110,13 @@
 	if (pk == NULL) return;
 	key->type = pk->key->type;
 	if (key->type == EVP_PKEY_RSA) {
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+		key->pkey.rsa=((RSA *)ASN1_dup( (i2d_of_void *)i2d_RSAPrivateKey,
+										(d2i_of_void *)d2i_RSAPrivateKey,
+										(char *)pk->key->pkey.rsa));
+#else
 		key->pkey.rsa=((RSA *)ASN1_dup( (int (*)())i2d_RSAPrivateKey, (char *(*)())d2i_RSAPrivateKey,(char *)pk->key->pkey.rsa));
+#endif
 	}
 	// TODO add DSA support.....	
 	openssl_error();
--- xca-0.5.1/lib/x509name.h.openssl098	2003-11-25 16:56:46.000000000 +0100
+++ xca-0.5.1/lib/x509name.h	2005-12-25 21:54:02.000000000 +0100
@@ -87,4 +87,7 @@
 		
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_NAME)
+
 #endif

xca-0.5.1-sha1.patch:

--- NEW FILE xca-0.5.1-sha1.patch ---
--- xca-0.5.1/widgets/NewX509.cpp.sha1	2004-05-21 21:07:44.000000000 +0200
+++ xca-0.5.1/widgets/NewX509.cpp	2005-12-25 22:14:07.000000000 +0100
@@ -117,7 +117,7 @@
 	// are there any useable private keys  ?
 	strings = MainWindow::keys->get0PrivateDesc();
 	keyList->insertStringList(strings);
-	hashAlgo->setCurrentItem(1);
+	hashAlgo->setCurrentItem(2);
 	
 	// any PKCS#10 requests to be used ?
 	strings = MainWindow::reqs->getDesc();


Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/FC-4/xca.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xca.spec	21 May 2005 13:46:10 -0000	1.10
+++ xca.spec	25 Dec 2005 21:27:38 -0000	1.11
@@ -5,7 +5,7 @@
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
 Version:	0.5.1
-Release:	%release_func 3
+Release:	%release_func 4
 
 License:	BSD
 Group:		Applications/Productivity
@@ -15,6 +15,9 @@
 # http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/clicklabel.cpp?r1=1.3&r2=1.4&diff_format=u
 Patch1:		%name-0.5.1-gcc4.patch
 Patch2:		%name-0.5.1-db43.patch
+Patch3:		%name-0.5.1-gcc41.patch
+Patch4:		%name-0.5.1-openssl098.patch
+Patch5:		%name-0.5.1-sha1.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt-devel openssl-devel
 BuildRequires:	/usr/include/db.h
@@ -35,6 +38,9 @@
 %patch0 -p0 -b .langinst
 %patch1 -p2 -b .gcc4
 %patch2 -p1 -b .db43
+%patch3 -p1 -b .gcc41
+%patch4 -p1 -b .openssl098
+%patch5 -p1 -b .sha1
 
 dblibs=$(echo /usr/%_lib/libdb_cxx*.so | tac | sed -e 's!.*lib\(db[^ ]*\)\.so!\1!g')
 sed -i "s! db_cxx-4 ! ${dblibs} !g" configure
@@ -86,6 +92,10 @@
 
 
 %changelog
+* Sun Dec 25 2005 Enrico Scholz  - 0.5.1-4
+- fixed compilation with gcc41 and openssl098
+- use SHA1 instead of MD5 as the default hashalgo
+
 * Sat May 21 2005 Enrico Scholz  - 0.5.1-3
 - generalized db4 detection
 - fixed x86_64 builds



From fedora-extras-commits at redhat.com  Sun Dec 25 21:27:44 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 16:27:44 -0500
Subject: rpms/xca/devel xca-0.5.1-gcc41.patch, NONE,
	1.1 xca-0.5.1-openssl098.patch, NONE, 1.1 xca-0.5.1-sha1.patch,
	NONE, 1.1 xca.spec, 1.10, 1.11
Message-ID: <200512252128.jBPLSH9q001067@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	xca.spec 
Added Files:
	xca-0.5.1-gcc41.patch xca-0.5.1-openssl098.patch 
	xca-0.5.1-sha1.patch 
Log Message:
- fixed compilation with gcc41 and openssl098
- use SHA1 instead of MD5 as the default hashalgo


xca-0.5.1-gcc41.patch:

--- NEW FILE xca-0.5.1-gcc41.patch ---
--- xca-0.5.1/lib/pki_key.h.gcc41	2003-12-10 07:43:05.000000000 +0100
+++ xca-0.5.1/lib/pki_key.h	2005-12-25 17:27:48.000000000 +0100
@@ -83,7 +83,7 @@
 	pki_key(const QString name = "", int type = EVP_PKEY_RSA);
 	pki_key(EVP_PKEY *pkey);
 	// copy constructor
-	pki_key::pki_key(const pki_key *pk);
+	pki_key(const pki_key *pk);
 	/* destructor */
 	~pki_key();
 	
--- xca-0.5.1/lib/db_crl.h.gcc41	2004-04-16 00:31:31.000000000 +0200
+++ xca-0.5.1/lib/db_crl.h	2005-12-25 16:01:56.000000000 +0100
@@ -69,7 +69,7 @@
 	void preprocess();
 	void inToCont(pki_base *pki);
 	pki_base *insert(pki_base *item);
-	void db_crl::deletePKI(pki_base *pki);
+	void deletePKI(pki_base *pki);
     signals:
 	void updateCertView();
 };
--- xca-0.5.1/lib/db_x509.h.gcc41	2004-02-18 01:03:05.000000000 +0100
+++ xca-0.5.1/lib/db_x509.h	2005-12-25 16:01:56.000000000 +0100
@@ -84,7 +84,7 @@
 	void writeAllCerts(const QString fname, bool onlyTrusted);
 	pki_x509 *getByIssSerial(const pki_x509 *issuer, const a1int &a);
 	pki_x509 *getBySubject(const x509name &xname, pki_x509 *last = NULL);
-	pki_base *db_x509::insert(pki_base *item);
+	pki_base *insert(pki_base *item);
     public slots:
 	void revokeCert(const x509rev &revok, const pki_x509 *issuer);
     
--- xca-0.5.1/lib/asn1time.h.gcc41	2003-08-06 10:15:37.000000000 +0200
+++ xca-0.5.1/lib/asn1time.h	2005-12-25 16:55:02.000000000 +0100
@@ -75,7 +75,7 @@
 	QString toPlain() const;
 	QString toSortable() const;
 	int ymdg(int *y, int *m, int *d, int *g) const;
-	int a1time::ymdg(int *y, int *m, int *d, int *h, int *M, int *s, int *g) const;
+	int ymdg(int *y, int *m, int *d, int *h, int *M, int *s, int *g) const;
 	ASN1_TIME *get() const;
 	ASN1_TIME *get_utc() const;
 	a1time &now(int delta = 0);

xca-0.5.1-openssl098.patch:

--- NEW FILE xca-0.5.1-openssl098.patch ---
--- xca-0.5.1/lib/x509rev.cpp.openssl098	2003-11-24 14:42:44.000000000 +0100
+++ xca-0.5.1/lib/x509rev.cpp	2005-12-25 21:38:32.000000000 +0100
@@ -50,8 +50,13 @@
 
 #include "x509rev.h"
 
-#define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+#  define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((i2d_of_void *)i2d_X509_REVOKED, \
+		(d2i_of_void *)d2i_X509_REVOKED,(char *)x5r)
+#else
+#  define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
 		(char *(*)())d2i_X509_REVOKED,(char *)x5r)
+#endif
 	
 x509rev::x509rev()
 {
--- xca-0.5.1/lib/openssl-compat.h.openssl098	2005-12-25 21:38:44.000000000 +0100
+++ xca-0.5.1/lib/openssl-compat.h	2005-12-25 21:51:29.000000000 +0100
@@ -0,0 +1,17 @@
+#ifndef H_XCA_LIB_OPENSSL_COMPAT_H
+#define H_XCA_LIB_OPENSSL_COMPAT_H
+
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+#  define XCA_D2I_F(F,X) \
+inline static X*					\
+d2i_##F(X** a, unsigned char**b, long int c)		\
+{							\
+  return d2i_##F(a, (unsigned char const **) b, c);	\
+}
+#  define XCA_D2I(X)		XCA_D2I_F(X,X)
+#else
+#  define XCA_D2I(X)
+#  define XCA_D2I_F(F,X)
+#endif
+
+#endif
--- xca-0.5.1/lib/asn1time.h.openssl098	2005-12-25 21:33:32.000000000 +0100
+++ xca-0.5.1/lib/asn1time.h	2005-12-25 21:42:47.000000000 +0100
@@ -89,4 +89,7 @@
 	bool const operator != (const a1time &a);
 };
 
+#include "openssl-compat.h"
+XCA_D2I(ASN1_TIME)
+
 #endif
--- xca-0.5.1/lib/pki_x509.h.openssl098	2004-02-18 01:03:06.000000000 +0100
+++ xca-0.5.1/lib/pki_x509.h	2005-12-25 21:43:37.000000000 +0100
@@ -141,4 +141,7 @@
 	   const EVP_MD *getDigest();
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509)
+
 #endif
--- xca-0.5.1/lib/pki_crl.h.openssl098	2004-02-18 01:03:05.000000000 +0100
+++ xca-0.5.1/lib/pki_crl.h	2005-12-25 21:44:28.000000000 +0100
@@ -97,4 +97,7 @@
 	void updateView();
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_CRL)
+
 #endif
--- xca-0.5.1/lib/pki_x509req.h.openssl098	2004-02-05 21:17:55.000000000 +0100
+++ xca-0.5.1/lib/pki_x509req.h	2005-12-25 21:45:20.000000000 +0100
@@ -95,4 +95,8 @@
 	   void set_spki(NETSCAPE_SPKI *_spki);
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_REQ)
+XCA_D2I(NETSCAPE_SPKI)
+
 #endif
--- xca-0.5.1/lib/pki_key.cpp.openssl098	2004-02-18 01:03:06.000000000 +0100
+++ xca-0.5.1/lib/pki_key.cpp	2005-12-25 21:53:16.000000000 +0100
@@ -58,6 +58,9 @@
 #include 
 #include 
 
+#include "openssl-compat.h"
+XCA_D2I_F(RSA_PUBKEY,RSA)
+
 char pki_key::passwd[40]="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
 
 QPixmap *pki_key::icon[2]= { NULL, NULL };
@@ -107,7 +110,13 @@
 	if (pk == NULL) return;
 	key->type = pk->key->type;
 	if (key->type == EVP_PKEY_RSA) {
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+		key->pkey.rsa=((RSA *)ASN1_dup( (i2d_of_void *)i2d_RSAPrivateKey,
+										(d2i_of_void *)d2i_RSAPrivateKey,
+										(char *)pk->key->pkey.rsa));
+#else
 		key->pkey.rsa=((RSA *)ASN1_dup( (int (*)())i2d_RSAPrivateKey, (char *(*)())d2i_RSAPrivateKey,(char *)pk->key->pkey.rsa));
+#endif
 	}
 	// TODO add DSA support.....	
 	openssl_error();
--- xca-0.5.1/lib/x509name.h.openssl098	2003-11-25 16:56:46.000000000 +0100
+++ xca-0.5.1/lib/x509name.h	2005-12-25 21:54:02.000000000 +0100
@@ -87,4 +87,7 @@
 		
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_NAME)
+
 #endif

xca-0.5.1-sha1.patch:

--- NEW FILE xca-0.5.1-sha1.patch ---
--- xca-0.5.1/widgets/NewX509.cpp.sha1	2004-05-21 21:07:44.000000000 +0200
+++ xca-0.5.1/widgets/NewX509.cpp	2005-12-25 22:14:07.000000000 +0100
@@ -117,7 +117,7 @@
 	// are there any useable private keys  ?
 	strings = MainWindow::keys->get0PrivateDesc();
 	keyList->insertStringList(strings);
-	hashAlgo->setCurrentItem(1);
+	hashAlgo->setCurrentItem(2);
 	
 	// any PKCS#10 requests to be used ?
 	strings = MainWindow::reqs->getDesc();


Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xca.spec	21 May 2005 13:46:10 -0000	1.10
+++ xca.spec	25 Dec 2005 21:27:44 -0000	1.11
@@ -5,7 +5,7 @@
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
 Version:	0.5.1
-Release:	%release_func 3
+Release:	%release_func 4
 
 License:	BSD
 Group:		Applications/Productivity
@@ -15,6 +15,9 @@
 # http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/clicklabel.cpp?r1=1.3&r2=1.4&diff_format=u
 Patch1:		%name-0.5.1-gcc4.patch
 Patch2:		%name-0.5.1-db43.patch
+Patch3:		%name-0.5.1-gcc41.patch
+Patch4:		%name-0.5.1-openssl098.patch
+Patch5:		%name-0.5.1-sha1.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt-devel openssl-devel
 BuildRequires:	/usr/include/db.h
@@ -35,6 +38,9 @@
 %patch0 -p0 -b .langinst
 %patch1 -p2 -b .gcc4
 %patch2 -p1 -b .db43
+%patch3 -p1 -b .gcc41
+%patch4 -p1 -b .openssl098
+%patch5 -p1 -b .sha1
 
 dblibs=$(echo /usr/%_lib/libdb_cxx*.so | tac | sed -e 's!.*lib\(db[^ ]*\)\.so!\1!g')
 sed -i "s! db_cxx-4 ! ${dblibs} !g" configure
@@ -86,6 +92,10 @@
 
 
 %changelog
+* Sun Dec 25 2005 Enrico Scholz  - 0.5.1-4
+- fixed compilation with gcc41 and openssl098
+- use SHA1 instead of MD5 as the default hashalgo
+
 * Sat May 21 2005 Enrico Scholz  - 0.5.1-3
 - generalized db4 detection
 - fixed x86_64 builds



From fedora-extras-commits at redhat.com  Sun Dec 25 22:04:09 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 17:04:09 -0500
Subject: rpms/mimetic - New directory
Message-ID: <200512252204.jBPM4AOW002863@cvs-int.fedora.redhat.com>

Author: ensc

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

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




From fedora-extras-commits at redhat.com  Sun Dec 25 22:04:38 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 17:04:38 -0500
Subject: rpms/mimetic/devel - New directory
Message-ID: <200512252204.jBPM4ehZ002877@cvs-int.fedora.redhat.com>

Author: ensc

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

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




From fedora-extras-commits at redhat.com  Sun Dec 25 22:05:58 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 17:05:58 -0500
Subject: rpms/mimetic Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512252206.jBPM60eH002917@cvs-int.fedora.redhat.com>

Author: ensc

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 25 22:06:04 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 17:06:04 -0500
Subject: rpms/mimetic/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512252206.jBPM66f4002935@cvs-int.fedora.redhat.com>

Author: ensc

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

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


--- NEW 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 Dec 25 22:09:51 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 17:09:51 -0500
Subject: rpms/mimetic/devel mimetic-0.8.9-gcc41.patch, NONE,
	1.1 mimetic-0.8.9-noconfigh.patch, NONE, 1.1 mimetic.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512252210.jBPMAObg003023@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	.cvsignore sources 
Added Files:
	mimetic-0.8.9-gcc41.patch mimetic-0.8.9-noconfigh.patch 
	mimetic.spec 
Log Message:
auto-import mimetic-0.8.9-3 on branch devel from mimetic-0.8.9-3.src.rpm

mimetic-0.8.9-gcc41.patch:

--- NEW FILE mimetic-0.8.9-gcc41.patch ---
--- mimetic-0.8.9/mimetic/utils.h.gcc41	2005-03-07 16:35:08.000000000 +0100
+++ mimetic-0.8.9/mimetic/utils.h	2005-12-25 22:56:59.000000000 +0100
@@ -56,13 +56,6 @@
  * returns an Iterator pointing at the first character of the found pattern
  * or \p eit if the search fails
  */
-template
-Iterator find_bm(Iterator bit, Iterator eit, const std::string& word)
-{
-    return find_bm(bit, eit, word, 
-        typename std::iterator_traits::iterator_category());
-}
-
 // find_bm specialization for random access iterators
 template
 Iterator find_bm(Iterator bit, Iterator eit, const std::string& word, const std::random_access_iterator_tag&)
@@ -94,6 +87,13 @@
     return bit + i + 1;
 }
 
+template
+Iterator find_bm(Iterator bit, Iterator eit, const std::string& word)
+{
+    return find_bm(bit, eit, word, 
+        typename std::iterator_traits::iterator_category());
+}
+
 
 
 } // ns utils

mimetic-0.8.9-noconfigh.patch:

--- NEW FILE mimetic-0.8.9-noconfigh.patch ---
Oct 24 2005 Enrico Scholz 
	* os/file.h, message.h: assume that HAVE_MMAP and HAVE_UNISTD_H are
	  '1'; this avoids problems when we are clearing 
	  (which conflicts with autoconf/automake) later. Because this
	  patch is for a Fedora package, it is safe to assume that these
	  macros are set

--- mimetic-0.8.9/mimetic/os/file.h.noconfigh	2005-02-23 11:26:15.000000000 +0100
+++ mimetic-0.8.9/mimetic/os/file.h	2005-10-24 17:43:59.000000000 +0200
@@ -23,14 +23,14 @@
 #include 
 #include 
 #include 
-#ifdef HAVE_MMAP
+#if 1
 #include 
 #endif
 
 namespace mimetic
 {
 
-#if HAVE_MMAP == 1
+#if 1 == 1
 typedef MMFile File;
 #else
 typedef StdFile File;
--- mimetic-0.8.9/mimetic/message.h.noconfigh	2005-03-07 16:35:08.000000000 +0100
+++ mimetic-0.8.9/mimetic/message.h	2005-10-24 17:43:48.000000000 +0200
@@ -21,7 +21,7 @@
 #include 
 #include 
 #include 
-#ifdef HAVE_UNISTD_H
+#if 1
 #include 
 #endif
 


--- NEW FILE mimetic.spec ---
## $Id: mimetic.spec 1791 2005-10-24 15:54:46Z ensc at BIGO.ENSC.DE $

%{!?release_func:%global release_func() %1%{?dist}}

Name:		mimetic
Version:	0.8.9
Release:	%release_func 3
Summary:	A full featured MIME library written in C++

Group:		System Environment/Libraries
License:	GPL
URL:		http://codesink.org/mimetic_mime_library.html
Source0:	http://codesink.org/download/%name-%version.tar.gz
Patch0:		mimetic-0.8.9-noconfigh.patch
Patch1:		mimetic-0.8.9-gcc41.patch
BuildRoot:	%_tmppath/%name-%version-%release-root-%(%__id_u -n)

BuildRequires:	doxygen


%package devel
Summary:	Files for development of applications which will use %name
Group:		Development/Libraries
Requires:	%name = %version-%release


%description
mimetic is a GPL MIME library written in C++ designed to be easy to use
and integrate but yet fast and efficient. mimetic doesn't use exceptions
but it heavily uses templates so a mostly standard compliant C++ compiler
is required.


%description devel
mimetic is a GPL MIME library written in C++ designed to be easy to use
and integrate but yet fast and efficient. mimetic doesn't use exceptions
but it heavily uses templates so a mostly standard compliant C++ compiler
is required.

This package contains files for the development of applications which
will use %name.


%prep
%setup -q
%patch0 -p1 -b .noconfigh
%patch1 -p1 -b .gcc41


%build
%configure --disable-static
%__make %{?_smp_mflags}
%__make docs -C doc


%install
rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%_libdir/*.la

echo "\
// cleared by the Fedora Extras package; content causes conflicts
// with autoconf/automake 'config.h' files else" > $RPM_BUILD_ROOT%_includedir/%name/config.h


%check
%__make check


%clean
rm -rf $RPM_BUILD_ROOT


%post   -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%_libdir/*.so.*


%files devel
%defattr(-,root,root,-)
%doc doc/html
%_libdir/*.so
%_includedir/%name


%changelog
* Sun Dec 25 2005 Enrico Scholz  - 0.8.9-3
- fixed compilation with gcc41
- first Fedora Extras release (review #171624)

* Mon Oct 24 2005 Enrico Scholz  - 0.8.9-2
- workaround problems with  which conflicts with
  local files from autoconf/automake

* Mon Oct 24 2005 Enrico Scholz  - 0.8.9-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimetic/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Dec 2005 22:06:04 -0000	1.1
+++ .cvsignore	25 Dec 2005 22:09:50 -0000	1.2
@@ -0,0 +1 @@
+mimetic-0.8.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimetic/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Dec 2005 22:06:04 -0000	1.1
+++ sources	25 Dec 2005 22:09:50 -0000	1.2
@@ -0,0 +1 @@
+fa3cb93e37684c71ac5afad02870302b  mimetic-0.8.9.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 25 22:09:23 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 17:09:23 -0500
Subject: rpms/mimetic import.log,1.1,1.2
Message-ID: <200512252210.jBPMATJo003024@cvs-int.fedora.redhat.com>

Author: ensc

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mimetic/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Dec 2005 22:05:58 -0000	1.1
+++ import.log	25 Dec 2005 22:09:23 -0000	1.2
@@ -0,0 +1 @@
+mimetic-0_8_9-3:HEAD:mimetic-0.8.9-3.src.rpm:1135548517



From fedora-extras-commits at redhat.com  Sun Dec 25 22:13:37 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 17:13:37 -0500
Subject: owners owners.list,1.480,1.481
Message-ID: <200512252214.jBPME9iJ003134@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	owners.list 
Log Message:
added mimetic


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -r1.480 -r1.481
--- owners.list	25 Dec 2005 15:28:47 -0000	1.480
+++ owners.list	25 Dec 2005 22:13:37 -0000	1.481
@@ -597,6 +597,7 @@
 Fedora Extras|mhonarc|A Perl mail-to-HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|milter-greylist|Milter for greylisting, the next step in the spam control war|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mimetex|Easily embed LaTeX math in web pages|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|mimetic|A full featured MIME library written in C++|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mknbi|Utility for creating network bootable images|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mmv|Move/copy/append/link multiple files|shishz at hotpop.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 26 02:52:47 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 25 Dec 2005 21:52:47 -0500
Subject: rpms/liferea/devel liferea.spec,1.24,1.25
Message-ID: <200512260253.jBQ2rJiC010236@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	liferea.spec 
Log Message:
* Sun Dec 25 2005 Brian Pepple  - 1.0-3
- Add BR for libXdmcp-devel,libXau-devel, & libSM-devel.



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- liferea.spec	23 Dec 2005 21:37:44 -0000	1.24
+++ liferea.spec	26 Dec 2005 02:52:46 -0000	1.25
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -14,6 +14,9 @@
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel mozilla-devel
 BuildRequires:  GConf2-devel
+BuildRequires:	libXdmcp-devel
+BuildRequires:	libXau-devel
+BuildRequires:	libSM-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  zlib-devel
@@ -92,6 +95,9 @@
 
 
 %changelog
+* Sun Dec 25 2005 Brian Pepple  - 1.0-3
+- Add BR for libXdmcp-devel,libXau-devel, & libSM-devel.
+
 * Fri Dec 23 2005 Brian Pepple  - 1.0-2
 - Update to 1.0.
 



From fedora-extras-commits at redhat.com  Mon Dec 26 11:07:09 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Mon, 26 Dec 2005 06:07:09 -0500
Subject: rpms/python-simpy/devel python-simpy.spec,1.1,1.2
Message-ID: <200512261107.jBQB7wNP026257@cvs-int.fedora.redhat.com>

Author: sarantis

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

Modified Files:
	python-simpy.spec 
Log Message:
Bump release



Index: python-simpy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/devel/python-simpy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-simpy.spec	22 Dec 2005 20:27:20 -0000	1.1
+++ python-simpy.spec	26 Dec 2005 11:06:49 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		python-simpy
 Version:	1.6.1
-Release:	2
+Release:	3
 Summary:	Python simulation framework
 Group:		Development/Languages
 License:	LGPL
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon Dec 26 2005 Sarantis Paskalis  - 1.6.1-3
+- Bump release.
+
 * Wed Dec 21 2005 Sarantis Paskalis  - 1.6.1-2
 - Add source code documentation as a -doc package (John Mahowald).
 - Add Requires: tkinter for SimGUI to work (John Mahowald).



From fedora-extras-commits at redhat.com  Mon Dec 26 11:14:14 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Mon, 26 Dec 2005 06:14:14 -0500
Subject: rpms/python-simpy/devel python-simpy.spec,1.2,1.3
Message-ID: <200512261114.jBQBEkvj026332@cvs-int.fedora.redhat.com>

Author: sarantis

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

Modified Files:
	python-simpy.spec 
Log Message:
Add dist to release. Bump release.



Index: python-simpy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/devel/python-simpy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-simpy.spec	26 Dec 2005 11:06:49 -0000	1.2
+++ python-simpy.spec	26 Dec 2005 11:14:14 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:		python-simpy
 Version:	1.6.1
-Release:	3
+Release:	3%{?dist}
 Summary:	Python simulation framework
 Group:		Development/Languages
 License:	LGPL
@@ -72,7 +72,7 @@
 
 %changelog
 * Mon Dec 26 2005 Sarantis Paskalis  - 1.6.1-3
-- Bump release.
+- Add dist in release. Bump release.
 
 * Wed Dec 21 2005 Sarantis Paskalis  - 1.6.1-2
 - Add source code documentation as a -doc package (John Mahowald).



From fedora-extras-commits at redhat.com  Mon Dec 26 11:15:23 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Mon, 26 Dec 2005 06:15:23 -0500
Subject: rpms/python-simpy/FC-4 python-simpy.spec,1.1,1.2
Message-ID: <200512261115.jBQBFtDG026388@cvs-int.fedora.redhat.com>

Author: sarantis

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

Modified Files:
	python-simpy.spec 
Log Message:
Add dist to release.  Bump release.



Index: python-simpy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/FC-4/python-simpy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-simpy.spec	22 Dec 2005 20:27:20 -0000	1.1
+++ python-simpy.spec	26 Dec 2005 11:15:22 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		python-simpy
 Version:	1.6.1
-Release:	2
+Release:	3%{?dist}
 Summary:	Python simulation framework
 Group:		Development/Languages
 License:	LGPL
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon Dec 26 2005 Sarantis Paskalis  - 1.6.1-3
+- Add dist in release. Bump release.
+
 * Wed Dec 21 2005 Sarantis Paskalis  - 1.6.1-2
 - Add source code documentation as a -doc package (John Mahowald).
 - Add Requires: tkinter for SimGUI to work (John Mahowald).



From fedora-extras-commits at redhat.com  Mon Dec 26 11:16:34 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Mon, 26 Dec 2005 06:16:34 -0500
Subject: rpms/python-simpy/FC-3 python-simpy.spec,1.1,1.2
Message-ID: <200512261117.jBQBH7AV026441@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26423

Modified Files:
	python-simpy.spec 
Log Message:
Insert dist in release.  Bump release.



Index: python-simpy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/FC-3/python-simpy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-simpy.spec	22 Dec 2005 20:27:20 -0000	1.1
+++ python-simpy.spec	26 Dec 2005 11:16:34 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		python-simpy
 Version:	1.6.1
-Release:	2
+Release:	3%{?dist}
 Summary:	Python simulation framework
 Group:		Development/Languages
 License:	LGPL
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon Dec 26 2005 Sarantis Paskalis  - 1.6.1-3
+- Add dist in release. Bump release.
+
 * Wed Dec 21 2005 Sarantis Paskalis  - 1.6.1-2
 - Add source code documentation as a -doc package (John Mahowald).
 - Add Requires: tkinter for SimGUI to work (John Mahowald).



From fedora-extras-commits at redhat.com  Mon Dec 26 11:54:26 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 26 Dec 2005 06:54:26 -0500
Subject: rpms/makebootfat - New directory
Message-ID: <200512261154.jBQBsSUV026700@cvs-int.fedora.redhat.com>

Author: buc

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

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




From fedora-extras-commits at redhat.com  Mon Dec 26 11:54:32 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 26 Dec 2005 06:54:32 -0500
Subject: rpms/makebootfat/devel - New directory
Message-ID: <200512261154.jBQBsYEo026717@cvs-int.fedora.redhat.com>

Author: buc

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

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




From fedora-extras-commits at redhat.com  Mon Dec 26 11:54:52 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 26 Dec 2005 06:54:52 -0500
Subject: rpms/makebootfat Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512261154.jBQBstis026753@cvs-int.fedora.redhat.com>

Author: buc

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 26 11:54:58 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 26 Dec 2005 06:54:58 -0500
Subject: rpms/makebootfat/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512261155.jBQBt0xG026773@cvs-int.fedora.redhat.com>

Author: buc

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

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


--- NEW 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 Dec 26 11:55:39 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 26 Dec 2005 06:55:39 -0500
Subject: rpms/makebootfat import.log,1.1,1.2
Message-ID: <200512261156.jBQBuDGG026857@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	import.log 
Log Message:
auto-import makebootfat-1.4-2 on branch devel from makebootfat-1.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/makebootfat/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Dec 2005 11:54:52 -0000	1.1
+++ import.log	26 Dec 2005 11:55:39 -0000	1.2
@@ -0,0 +1 @@
+makebootfat-1_4-2:HEAD:makebootfat-1.4-2.src.rpm:1135598130



From fedora-extras-commits at redhat.com  Mon Dec 26 11:55:56 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 26 Dec 2005 06:55:56 -0500
Subject: rpms/makebootfat/devel makebootfat-README.usbboot, NONE,
	1.1 makebootfat.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512261156.jBQBuSur026867@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	.cvsignore sources 
Added Files:
	makebootfat-README.usbboot makebootfat.spec 
Log Message:
auto-import makebootfat-1.4-2 on branch devel from makebootfat-1.4-2.src.rpm


--- NEW FILE makebootfat-README.usbboot ---
1. Extract contents of the image */images/diskboot.img (from an appropriate
distribution) to a directory, for example /tmp/imagedir

2. Copy file ldlinux.bss (from /usr/share/makebootfat directory or,
originally, from syslinux-*.src.rpm sources) to the same directory 

4. Put file mbrfat.bin (from /usr/share/makebootfat, or makebootfat sources)
to the same directory

   Note: generally, it is not required to put both the files into the same dir,
but for simpler usage it is better.

5. Generate an image of appropriate size, at least the size of diskboot.img
(see above), but better some more (8 or 16 Mb may be useful)
   dd bs=1M count=16 /tmp/image.img

6. Make the boot image in this temporary file image:
   losetup /dev/loop0 /tmp/image.img
   cd /tmp/imagedir
   /usr/bin/makebootfat -o /dev/loop0 -X -b ldlinux.bss \
	-m mbrfat.bin -F /tmp/imagedir
   losetup -d /dev/loop0

   Note: for syslinux >= 3, option `-Y' may be used instead of `-X'
   Note: if you specify real disk (i.e., /dev/sda instead of /dev/loop0),
   the whole disk area will be filled by a single fat filesystem...

7. Copy the created image to a target media:
   dd bs=512 /dev/sda

8. Add another partitions (if needed) onto free space left on the media
   fdisk /dev/sda

Thats all.



--- NEW FILE makebootfat.spec ---
Summary: Utility for creation bootable FAT disk
Name: makebootfat
Version: 1.4
Release: 2%{?dist}
Group: 	Applications/System
License: GPL
URL: http://advancemame.sourceforge.net/doc-makebootfat.html
Source0: http://dl.sourceforge.net/sourceforge/advancemame/%{name}-%{version}.tar.gz
Source1: makebootfat-README.usbboot

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


%description
This utility creates a bootable FAT filesystem and populates it
with files and boot tools.

It was mainly designed to create bootable USB and Fixed disk
for the AdvanceCD project (http://advancemame.sourceforge.net), but
can be successfully used separately for any purposes.


%prep
%setup -q

cp -a %{SOURCE1} README.usbboot


%build

%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/x86
install -p -m644 mbrfat.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/x86
install -p -m644 test/ldlinux.bss $RPM_BUILD_ROOT%{_datadir}/%{name}/x86


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc AUTHORS COPYING HISTORY README README.usbboot
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/*/*


%changelog
* Mon Dec 26 2005 Dmitry Butskoy  - 1.4-2
- place mbrfat.bin and ldlinux.bss under %{_datadir}/%{name}/x86

* Mon Dec 24 2005 Dmitry Butskoy  - 1.4-1
- accepted for Fedora Extra (review by John Mahowald )

* Mon Oct  3 2005 Dmitry Butskoy  - 1.4-1
- initial release
- install mbrfat.bin and ldlinux.bss binary files, they are
  actually needed to create something useful here.
- add README.usbboot -- instruction how to make diskboot.img more helpful
  (written by me).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/makebootfat/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Dec 2005 11:54:58 -0000	1.1
+++ .cvsignore	26 Dec 2005 11:55:55 -0000	1.2
@@ -0,0 +1 @@
+makebootfat-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/makebootfat/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Dec 2005 11:54:58 -0000	1.1
+++ sources	26 Dec 2005 11:55:55 -0000	1.2
@@ -0,0 +1 @@
+8ae9144e2bec8b8498361a25fdf76741  makebootfat-1.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 26 14:13:49 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Mon, 26 Dec 2005 09:13:49 -0500
Subject: rpms/up-imapproxy/FC-3 up-imapproxy.spec,1.5,1.6
Message-ID: <200512261414.jBQEELB9032180@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32086/FC-3

Modified Files:
	up-imapproxy.spec 
Log Message:
Release bump to build against new OpenSSL in devel branch -- fc5 only.
I copied the spec to fc3 and fc4 branches in order to keep the release 
tag consistent.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-3/up-imapproxy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- up-imapproxy.spec	11 Oct 2005 19:37:27 -0000	1.5
+++ up-imapproxy.spec	26 Dec 2005 14:13:48 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -74,6 +74,9 @@
 %{_sbindir}/*
 
 %changelog
+* Mon Dec 26 2005 Jeff Carlson  - 1.2.4-5
+- Rebuild against new OpenSSL in devel (fc5 only).
+
 * Tue Oct 11 2005 Ville Skytt??  - 1.2.4-4
 - Fix for CAN-2005-2661 (#170220, from Debian).
 



From fedora-extras-commits at redhat.com  Mon Dec 26 14:13:55 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Mon, 26 Dec 2005 09:13:55 -0500
Subject: rpms/up-imapproxy/FC-4 up-imapproxy.spec,1.5,1.6
Message-ID: <200512261414.jBQEERfU032183@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32086/FC-4

Modified Files:
	up-imapproxy.spec 
Log Message:
Release bump to build against new OpenSSL in devel branch -- fc5 only.
I copied the spec to fc3 and fc4 branches in order to keep the release 
tag consistent.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-4/up-imapproxy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- up-imapproxy.spec	11 Oct 2005 19:37:28 -0000	1.5
+++ up-imapproxy.spec	26 Dec 2005 14:13:55 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -74,6 +74,9 @@
 %{_sbindir}/*
 
 %changelog
+* Mon Dec 26 2005 Jeff Carlson  - 1.2.4-5
+- Rebuild against new OpenSSL in devel (fc5 only).
+
 * Tue Oct 11 2005 Ville Skytt??  - 1.2.4-4
 - Fix for CAN-2005-2661 (#170220, from Debian).
 



From fedora-extras-commits at redhat.com  Mon Dec 26 14:14:01 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Mon, 26 Dec 2005 09:14:01 -0500
Subject: rpms/up-imapproxy/devel up-imapproxy.spec,1.5,1.6
Message-ID: <200512261414.jBQEEXD8032186@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32086/devel

Modified Files:
	up-imapproxy.spec 
Log Message:
Release bump to build against new OpenSSL in devel branch -- fc5 only.
I copied the spec to fc3 and fc4 branches in order to keep the release 
tag consistent.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/up-imapproxy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- up-imapproxy.spec	11 Oct 2005 19:37:28 -0000	1.5
+++ up-imapproxy.spec	26 Dec 2005 14:14:01 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -74,6 +74,9 @@
 %{_sbindir}/*
 
 %changelog
+* Mon Dec 26 2005 Jeff Carlson  - 1.2.4-5
+- Rebuild against new OpenSSL in devel (fc5 only).
+
 * Tue Oct 11 2005 Ville Skytt??  - 1.2.4-4
 - Fix for CAN-2005-2661 (#170220, from Debian).
 



From fedora-extras-commits at redhat.com  Mon Dec 26 15:48:26 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 26 Dec 2005 10:48:26 -0500
Subject: owners owners.list,1.481,1.482
Message-ID: <200512261548.jBQFmwbv001545@cvs-int.fedora.redhat.com>

Author: pfrields

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

Modified Files:
	owners.list 
Log Message:
drivel package changing hands from Jeremy to Paul


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -r1.481 -r1.482
--- owners.list	25 Dec 2005 22:13:37 -0000	1.481
+++ owners.list	26 Dec 2005 15:48:26 -0000	1.482
@@ -156,7 +156,7 @@
 Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
-Fedora Extras|drivel|A journal or "blog" client|katzj at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|drivel|A journal or "blog" client|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 26 15:53:05 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 26 Dec 2005 10:53:05 -0500
Subject: rpms/liferea/devel liferea.spec,1.25,1.26
Message-ID: <200512261553.jBQFrbsK001587@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	liferea.spec 
Log Message:
* Mon Dec 26 2005 Brian Pepple  - 1.0-4
- Dropp BR for libXdmcp-devel & libXau-devel, replace w/ libX11-devel (#176313).



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- liferea.spec	26 Dec 2005 02:52:46 -0000	1.25
+++ liferea.spec	26 Dec 2005 15:53:05 -0000	1.26
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -14,8 +14,7 @@
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel mozilla-devel
 BuildRequires:  GConf2-devel
-BuildRequires:	libXdmcp-devel
-BuildRequires:	libXau-devel
+BuildRequires:	libX11-devel
 BuildRequires:	libSM-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -95,6 +94,9 @@
 
 
 %changelog
+* Mon Dec 26 2005 Brian Pepple  - 1.0-4
+- Dropp BR for libXdmcp-devel & libXau-devel, replace w/ libX11-devel (#176313).
+
 * Sun Dec 25 2005 Brian Pepple  - 1.0-3
 - Add BR for libXdmcp-devel,libXau-devel, & libSM-devel.
 



From fedora-extras-commits at redhat.com  Mon Dec 26 16:32:59 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 26 Dec 2005 11:32:59 -0500
Subject: owners owners.list,1.482,1.483
Message-ID: <200512261633.jBQGXV9A003364@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -r1.482 -r1.483
--- owners.list	26 Dec 2005 15:48:26 -0000	1.482
+++ owners.list	26 Dec 2005 16:32:58 -0000	1.483
@@ -581,6 +581,7 @@
 Fedora Extras|Maelstrom|A space combat game.|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|MagicPoint|X based presentation software|colin at fedoraproject.org|extras-qa at fedoraproject.org|rms at 1407.org
 Fedora Extras|mail-notification|Mail Notification is a status icon that informs you if you have new mail|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|makebootfat|Utility for creation bootable FAT disk|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|manedit|GUI editor for creating man pages.|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|mantis|A web-based bugtracking system|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mathml-fonts|Mathematical symbol fonts|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 26 17:04:34 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 26 Dec 2005 12:04:34 -0500
Subject: rpms/drivel/FC-3 drivel-2.0.2-desktop.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 drivel.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512261706.jBQH60pT005138@cvs-int.fedora.redhat.com>

Author: pfrields

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

Modified Files:
	.cvsignore drivel.spec sources 
Added Files:
	drivel-2.0.2-desktop.patch 
Log Message:
Update to 2.0.2, add trivial patch for .desktop file

drivel-2.0.2-desktop.patch:

--- NEW FILE drivel-2.0.2-desktop.patch ---
diff -uNr drivel-2.0.2-orig/data/gnome-drivel.desktop.in drivel-2.0.2/data/gnome-drivel.desktop.in
--- drivel-2.0.2-orig/data/gnome-drivel.desktop.in	2005-06-13 20:34:38.000000000 -0400
+++ drivel-2.0.2/data/gnome-drivel.desktop.in	2005-12-26 11:11:34.000000000 -0500
@@ -4,7 +4,7 @@
 _GenericName=Journal Editor
 _Comment=Update and manage your online journal
 Exec=drivel %U
-Terminal=False
+Terminal=false
 Type=Application
 Icon=drivel-48.png
 MimeType=application/x-drivel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jun 2005 21:07:57 -0000	1.2
+++ .cvsignore	26 Dec 2005 17:04:33 -0000	1.3
@@ -1 +1 @@
-drivel-2.0.0.tar.bz2
+drivel-2.0.2.tar.bz2


Index: drivel.spec
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-3/drivel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drivel.spec	13 Jun 2005 00:09:29 -0000	1.2
+++ drivel.spec	26 Dec 2005 17:04:34 -0000	1.3
@@ -1,11 +1,12 @@
 Summary: A journal or "blog" client
 Name: drivel
-Version: 2.0.0
-Release: 3%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 Url: http://www.dropline.net/drivel
 Source: %{name}-%{version}.tar.bz2
+Patch0:	drivel-2.0.2-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: scrollkeeper
 BuildRequires: gtkspell-devel 
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-schemas-install --disable-mime-update --disable-desktop-update --with-curl-libraries=%{_libdir}
@@ -110,6 +112,9 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Dec 26 2005 Paul W. Frields  - 2.0.2-1
+- Update to 2.0.2
+
 * Sun Jun 12 2005 Jeremy Katz  2.0.0-3
 - gconf schema removal, BR gettext, add Fedora category to the desktop file 
   (noticed by mschwendt)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jun 2005 21:07:57 -0000	1.2
+++ sources	26 Dec 2005 17:04:34 -0000	1.3
@@ -1 +1 @@
-38c866e10909d123bb20c6fb4a852ba7  drivel-2.0.0.tar.bz2
+b77d376946ab32f0f8992c5e0baf1f51  drivel-2.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 26 17:05:27 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 26 Dec 2005 12:05:27 -0500
Subject: rpms/drivel/devel drivel-2.0.2-desktop.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 drivel.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512261705.jBQH5xtI005136@cvs-int.fedora.redhat.com>

Author: pfrields

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

Modified Files:
	.cvsignore drivel.spec sources 
Added Files:
	drivel-2.0.2-desktop.patch 
Log Message:
Update to 2.0.2, add trivial patch for .desktop file

drivel-2.0.2-desktop.patch:

--- NEW FILE drivel-2.0.2-desktop.patch ---
diff -uNr drivel-2.0.2-orig/data/gnome-drivel.desktop.in drivel-2.0.2/data/gnome-drivel.desktop.in
--- drivel-2.0.2-orig/data/gnome-drivel.desktop.in	2005-06-13 20:34:38.000000000 -0400
+++ drivel-2.0.2/data/gnome-drivel.desktop.in	2005-12-26 11:11:34.000000000 -0500
@@ -4,7 +4,7 @@
 _GenericName=Journal Editor
 _Comment=Update and manage your online journal
 Exec=drivel %U
-Terminal=False
+Terminal=false
 Type=Application
 Icon=drivel-48.png
 MimeType=application/x-drivel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/drivel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jun 2005 21:07:57 -0000	1.2
+++ .cvsignore	26 Dec 2005 17:05:27 -0000	1.3
@@ -1 +1 @@
-drivel-2.0.0.tar.bz2
+drivel-2.0.2.tar.bz2


Index: drivel.spec
===================================================================
RCS file: /cvs/extras/rpms/drivel/devel/drivel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drivel.spec	13 Jun 2005 00:09:29 -0000	1.2
+++ drivel.spec	26 Dec 2005 17:05:27 -0000	1.3
@@ -1,11 +1,12 @@
 Summary: A journal or "blog" client
 Name: drivel
-Version: 2.0.0
-Release: 3%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 Url: http://www.dropline.net/drivel
 Source: %{name}-%{version}.tar.bz2
+Patch0:	drivel-2.0.2-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: scrollkeeper
 BuildRequires: gtkspell-devel 
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-schemas-install --disable-mime-update --disable-desktop-update --with-curl-libraries=%{_libdir}
@@ -110,6 +112,9 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Dec 26 2005 Paul W. Frields  - 2.0.2-1
+- Update to 2.0.2
+
 * Sun Jun 12 2005 Jeremy Katz  2.0.0-3
 - gconf schema removal, BR gettext, add Fedora category to the desktop file 
   (noticed by mschwendt)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/drivel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jun 2005 21:07:57 -0000	1.2
+++ sources	26 Dec 2005 17:05:27 -0000	1.3
@@ -1 +1 @@
-38c866e10909d123bb20c6fb4a852ba7  drivel-2.0.0.tar.bz2
+b77d376946ab32f0f8992c5e0baf1f51  drivel-2.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 26 17:05:01 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 26 Dec 2005 12:05:01 -0500
Subject: rpms/drivel/FC-4 drivel-2.0.2-desktop.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 drivel.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512261706.jBQH66DU005141@cvs-int.fedora.redhat.com>

Author: pfrields

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

Modified Files:
	.cvsignore drivel.spec sources 
Added Files:
	drivel-2.0.2-desktop.patch 
Log Message:
Update to 2.0.2, add trivial patch for .desktop file

drivel-2.0.2-desktop.patch:

--- NEW FILE drivel-2.0.2-desktop.patch ---
diff -uNr drivel-2.0.2-orig/data/gnome-drivel.desktop.in drivel-2.0.2/data/gnome-drivel.desktop.in
--- drivel-2.0.2-orig/data/gnome-drivel.desktop.in	2005-06-13 20:34:38.000000000 -0400
+++ drivel-2.0.2/data/gnome-drivel.desktop.in	2005-12-26 11:11:34.000000000 -0500
@@ -4,7 +4,7 @@
 _GenericName=Journal Editor
 _Comment=Update and manage your online journal
 Exec=drivel %U
-Terminal=False
+Terminal=false
 Type=Application
 Icon=drivel-48.png
 MimeType=application/x-drivel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jun 2005 21:07:57 -0000	1.2
+++ .cvsignore	26 Dec 2005 17:05:00 -0000	1.3
@@ -1 +1 @@
-drivel-2.0.0.tar.bz2
+drivel-2.0.2.tar.bz2


Index: drivel.spec
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-4/drivel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drivel.spec	13 Jun 2005 00:09:29 -0000	1.2
+++ drivel.spec	26 Dec 2005 17:05:01 -0000	1.3
@@ -1,11 +1,12 @@
 Summary: A journal or "blog" client
 Name: drivel
-Version: 2.0.0
-Release: 3%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 Url: http://www.dropline.net/drivel
 Source: %{name}-%{version}.tar.bz2
+Patch0:	drivel-2.0.2-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: scrollkeeper
 BuildRequires: gtkspell-devel 
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-schemas-install --disable-mime-update --disable-desktop-update --with-curl-libraries=%{_libdir}
@@ -110,6 +112,9 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Dec 26 2005 Paul W. Frields  - 2.0.2-1
+- Update to 2.0.2
+
 * Sun Jun 12 2005 Jeremy Katz  2.0.0-3
 - gconf schema removal, BR gettext, add Fedora category to the desktop file 
   (noticed by mschwendt)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jun 2005 21:07:57 -0000	1.2
+++ sources	26 Dec 2005 17:05:01 -0000	1.3
@@ -1 +1 @@
-38c866e10909d123bb20c6fb4a852ba7  drivel-2.0.0.tar.bz2
+b77d376946ab32f0f8992c5e0baf1f51  drivel-2.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 26 21:14:33 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 26 Dec 2005 16:14:33 -0500
Subject: rpms/celestia/devel celestia.spec,1.8,1.9
Message-ID: <200512262115.jBQLF5TB012820@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	celestia.spec 
Log Message:
Update to 1.4.0.
BR libGL-devel instead of xorg-x11-Mesa-libGL.



Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- celestia.spec	22 May 2005 23:42:44 -0000	1.8
+++ celestia.spec	26 Dec 2005 21:14:32 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           celestia
-Version:        1.3.2
-Release: 4
+Version:        1.4.0
+Release:        1%{?dist}
 
 Summary:        OpenGL real-time visual space simulation
 
 Group:          Amusements/Graphics
 License:        GPL
-Source0:        http://dl.sf.net/celestia/celestia-1.3.2.tar.gz
+Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
 Source3:        celestia.desktop
 Patch0:         %{name}-1.3.2-compile.patch
 URL:            http://www.shatters.net/celestia/
@@ -18,7 +18,7 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  xorg-x11-Mesa-libGL
+BuildRequires:  libGL-devel
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -93,6 +93,12 @@
 
 
 %changelog
+* Mon Dec 26 2005 Steven Pritchard  1.4.0-1
+- Update to 1.4.0
+
+* Sat Dec 03 2005 Steven Pritchard  1.3.2-5
+- BR libGL-devel instead of xorg-x11-Mesa-libGL
+
 * Sun May 22 2005 Jeremy Katz  - 1.3.2-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Mon Dec 26 22:42:18 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 26 Dec 2005 17:42:18 -0500
Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.28,1.29
Message-ID: <200512262242.jBQMgoq2014599@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14582

Modified Files:
	sylpheed-claws.spec 
Log Message:
- fix s/rc1/rc2/



Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sylpheed-claws.spec	25 Dec 2005 09:26:51 -0000	1.28
+++ sylpheed-claws.spec	26 Dec 2005 22:42:18 -0000	1.29
@@ -47,7 +47,7 @@
 for development with %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc2
 
 %build
 #%if %openssl_pc



From fedora-extras-commits at redhat.com  Mon Dec 26 22:50:49 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 26 Dec 2005 17:50:49 -0500
Subject: rpms/celestia/devel .cvsignore, 1.3, 1.4 celestia.spec, 1.9,
	1.10 sources, 1.3, 1.4 celestia-1.3.2-compile.patch, 1.1, NONE
Message-ID: <200512262251.jBQMpLXW014702@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	.cvsignore celestia.spec sources 
Removed Files:
	celestia-1.3.2-compile.patch 
Log Message:
Update to 1.4.0.
Remove celestia-1.3.2-compile.patch (seems to be applied upstream).
Use find_lang magic.
Remove duplicate desktop file.
Fix Help -> Controls.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:09:26 -0000	1.3
+++ .cvsignore	26 Dec 2005 22:50:48 -0000	1.4
@@ -1 +1 @@
-celestia-1.3.2.tar.gz
+celestia-1.4.0.tar.gz


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- celestia.spec	26 Dec 2005 21:14:32 -0000	1.9
+++ celestia.spec	26 Dec 2005 22:50:48 -0000	1.10
@@ -8,7 +8,6 @@
 License:        GPL
 Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
 Source3:        celestia.desktop
-Patch0:         %{name}-1.3.2-compile.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p6 -b .orig
 
 
 %build
@@ -56,8 +54,11 @@
 install -p -m 644 -D src/celestia/kde/data/hi48-app-celestia.png \
   $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 $RPM_BUILD_ROOT%{_datadir}/applications/celestia.desktop
+
 desktop-file-install \
   --vendor fedora                                          \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
@@ -66,6 +67,8 @@
   --add-category Graphics                                  \
   %{SOURCE3}
 
+%find_lang %{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,7 +85,7 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO controls.txt manual/*.html manual/*.css
 %{_bindir}/*
@@ -95,6 +98,10 @@
 %changelog
 * Mon Dec 26 2005 Steven Pritchard  1.4.0-1
 - Update to 1.4.0
+- Remove celestia-1.3.2-compile.patch (seems to be applied upstream)
+- Use find_lang magic
+- Remove duplicate desktop file
+- Fix Help -> Controls
 
 * Sat Dec 03 2005 Steven Pritchard  1.3.2-5
 - BR libGL-devel instead of xorg-x11-Mesa-libGL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:09:26 -0000	1.3
+++ sources	26 Dec 2005 22:50:48 -0000	1.4
@@ -1 +1 @@
-0aaf86592a8989a0576e34c1f4cb3c2a  celestia-1.3.2.tar.gz
+d4bd0029af87fdd9cb4a0828cf62a025  celestia-1.4.0.tar.gz


--- celestia-1.3.2-compile.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Dec 26 23:49:11 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 26 Dec 2005 18:49:11 -0500
Subject: rpms/tetex-xcolor/FC-3 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tetex-xcolor.spec, 1.7, 1.8
Message-ID: <200512262349.jBQNniiv016552@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16511

Modified Files:
	.cvsignore sources tetex-xcolor.spec 
Log Message:
Update to 2.09.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Nov 2005 16:47:29 -0000	1.8
+++ .cvsignore	26 Dec 2005 23:49:10 -0000	1.9
@@ -1 +1 @@
-xcolor-2.08.zip
+xcolor-2.09.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Nov 2005 16:47:29 -0000	1.8
+++ sources	26 Dec 2005 23:49:10 -0000	1.9
@@ -1 +1 @@
-a3ad5e01a15ad79fe742b1adfbad91df  xcolor-2.08.zip
+57ef23fa778f2ae6e22f773bcb21ea5d  xcolor-2.09.zip


Index: tetex-xcolor.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/tetex-xcolor.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tetex-xcolor.spec	30 Nov 2005 16:47:29 -0000	1.7
+++ tetex-xcolor.spec	26 Dec 2005 23:49:10 -0000	1.8
@@ -5,7 +5,7 @@
 %define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        2.08
+Version:        2.09
 Release:        1%{?dist}
 Summary:        Driver-independent color extensions for LaTeX and pdfLaTeX
 
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Dec 26 2005 Jose Pedro Oliveira  - 2.09-1
+- Update to 2.09.
+
 * Wed Nov 30 2005 Jose Pedro Oliveira  - 2.08-1
 - Update to 2.08.
 



From fedora-extras-commits at redhat.com  Mon Dec 26 23:49:29 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 26 Dec 2005 18:49:29 -0500
Subject: rpms/python-reportlab/devel python-reportlab.spec,1.7,1.8
Message-ID: <200512262350.jBQNo1gD016558@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	python-reportlab.spec 
Log Message:
* Mon Dec 26 2005 Brian Pepple  - 1.20-4
- Add dist tag. (#176479)



Index: python-reportlab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/devel/python-reportlab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-reportlab.spec	9 May 2005 16:49:18 -0000	1.7
+++ python-reportlab.spec	26 Dec 2005 23:49:29 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:		python-reportlab
 Version:	1.20
-Release:	3.fc4
+Release:	4%{?dist}
 Summary:	Python PDF generation library
 
 Group:		Development/Libraries
@@ -46,10 +46,14 @@
 %files
 %defattr(-,root,root,-)
 %doc reportlab/README reportlab/changes reportlab/license.txt
-%{python_sitelib}/*
+%dir %{python_sitelib}/reportlab
+%{python_sitelib}/reportlab/
 
 
 %changelog
+* Mon Dec 26 2005 Brian Pepple  - 1.20-4
+- Add dist tag. (#176479)
+
 * Mon May  9 2005 Brian Pepple  - 1.20-3.fc4
 - Switchback to sitelib patch.
 - Make package noarch.



From fedora-extras-commits at redhat.com  Mon Dec 26 23:51:51 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 26 Dec 2005 18:51:51 -0500
Subject: rpms/celestia/FC-4 .cvsignore, 1.3, 1.4 celestia.spec, 1.8,
	1.9 sources, 1.3, 1.4 celestia-1.3.2-compile.patch, 1.1, NONE
Message-ID: <200512262352.jBQNqOLD016681@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	.cvsignore celestia.spec sources 
Removed Files:
	celestia-1.3.2-compile.patch 
Log Message:
Update to 1.4.0.
Remove celestia-1.3.2-compile.patch (seems to be applied upstream).
Use find_lang magic.
Remove duplicate desktop file.
Fix Help -> Controls.
BR libGL-devel instead of xorg-x11-Mesa-libGL.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:09:26 -0000	1.3
+++ .cvsignore	26 Dec 2005 23:51:51 -0000	1.4
@@ -1 +1 @@
-celestia-1.3.2.tar.gz
+celestia-1.4.0.tar.gz


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-4/celestia.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- celestia.spec	22 May 2005 23:42:44 -0000	1.8
+++ celestia.spec	26 Dec 2005 23:51:51 -0000	1.9
@@ -1,14 +1,13 @@
 Name:           celestia
-Version:        1.3.2
-Release: 4
+Version:        1.4.0
+Release:        1%{?dist}
 
 Summary:        OpenGL real-time visual space simulation
 
 Group:          Amusements/Graphics
 License:        GPL
-Source0:        http://dl.sf.net/celestia/celestia-1.3.2.tar.gz
+Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
 Source3:        celestia.desktop
-Patch0:         %{name}-1.3.2-compile.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,7 +17,7 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  xorg-x11-Mesa-libGL
+BuildRequires:  libGL-devel
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -38,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p6 -b .orig
 
 
 %build
@@ -56,8 +54,11 @@
 install -p -m 644 -D src/celestia/kde/data/hi48-app-celestia.png \
   $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 $RPM_BUILD_ROOT%{_datadir}/applications/celestia.desktop
+
 desktop-file-install \
   --vendor fedora                                          \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
@@ -66,6 +67,8 @@
   --add-category Graphics                                  \
   %{SOURCE3}
 
+%find_lang %{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,7 +85,7 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO controls.txt manual/*.html manual/*.css
 %{_bindir}/*
@@ -93,6 +96,16 @@
 
 
 %changelog
+* Mon Dec 26 2005 Steven Pritchard  1.4.0-1
+- Update to 1.4.0
+- Remove celestia-1.3.2-compile.patch (seems to be applied upstream)
+- Use find_lang magic
+- Remove duplicate desktop file
+- Fix Help -> Controls
+
+* Sat Dec 03 2005 Steven Pritchard  1.3.2-5
+- BR libGL-devel instead of xorg-x11-Mesa-libGL
+
 * Sun May 22 2005 Jeremy Katz  - 1.3.2-4
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:09:26 -0000	1.3
+++ sources	26 Dec 2005 23:51:51 -0000	1.4
@@ -1 +1 @@
-0aaf86592a8989a0576e34c1f4cb3c2a  celestia-1.3.2.tar.gz
+d4bd0029af87fdd9cb4a0828cf62a025  celestia-1.4.0.tar.gz


--- celestia-1.3.2-compile.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 27 01:17:47 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 26 Dec 2005 20:17:47 -0500
Subject: rpms/loudmouth/devel loudmouth.spec,1.8,1.9
Message-ID: <200512270118.jBR1IJwS020175@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	loudmouth.spec 
Log Message:
* Mon Dec 26 2005 Brian Pepple  - 1.0.1-4
- Rebuild.



Index: loudmouth.spec
===================================================================
RCS file: /cvs/extras/rpms/loudmouth/devel/loudmouth.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- loudmouth.spec	31 Aug 2005 19:30:38 -0000	1.8
+++ loudmouth.spec	27 Dec 2005 01:17:46 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           loudmouth
 Version:        1.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Loudmouth is a Jabber programming library written in C
 
 Group:          System Environment/Libraries
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Mon Dec 26 2005 Brian Pepple  - 1.0.1-4
+- Rebuild.
+
 * Wed Aug 31 2005 Brian Pepple  - 1.0.1-3
 - Update to 1.0.1.
 



From fedora-extras-commits at redhat.com  Tue Dec 27 01:31:09 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 26 Dec 2005 20:31:09 -0500
Subject: rpms/gossip/devel gossip.spec,1.9,1.10
Message-ID: <200512270131.jBR1Vf08020447@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	gossip.spec 
Log Message:
* Mon Dec 26 2005 Brian Pepple  - 0.9-8
- Rebuild for new loudmouth.



Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gossip.spec	5 Dec 2005 21:24:31 -0000	1.9
+++ gossip.spec	27 Dec 2005 01:31:08 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           gossip
 Version:        0.9
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Gnome Jabber Client
 
 Group:          Applications/Communications
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Mon Dec 26 2005 Brian Pepple  - 0.9-8
+- Rebuild for new loudmouth.
+
 * Mon Dec  5 2005 Brian Pepple  - 0.9-7
 - Add BR for libXScrnSaver-devel, libXt-devel & xorg-x11-proto-devel.
 



From fedora-extras-commits at redhat.com  Tue Dec 27 03:11:12 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 26 Dec 2005 22:11:12 -0500
Subject: rpms/ddskk/devel ddskk.spec,1.2,1.3
Message-ID: <200512270311.jBR3BjI1024048@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	ddskk.spec 
Log Message:
add missing % for defattr of xemacs filelist



Index: ddskk.spec
===================================================================
RCS file: /cvs/extras/rpms/ddskk/devel/ddskk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ddskk.spec	16 Nov 2005 02:52:16 -0000	1.2
+++ ddskk.spec	27 Dec 2005 03:11:10 -0000	1.3
@@ -90,7 +90,7 @@
 %{_infodir}/*
 
 %files xemacs
-defattr(-,root,root)
+%defattr(-,root,root)
 %doc ChangeLog READMEs
 %{pkgdir}
 



From fedora-extras-commits at redhat.com  Tue Dec 27 03:16:11 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 26 Dec 2005 22:16:11 -0500
Subject: rpms/scim-fcitx/devel scim-fcitx.spec,1.1,1.2
Message-ID: <200512270316.jBR3GiQe024146@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	scim-fcitx.spec 
Log Message:
try to build without _smp_mflags to see if that fixes:
"make[2]: *** No rule to make target `pyphrase.mb', needed by `all-am'.  Stop."



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/devel/scim-fcitx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-fcitx.spec	20 Dec 2005 03:16:48 -0000	1.1
+++ scim-fcitx.spec	27 Dec 2005 03:16:11 -0000	1.2
@@ -31,7 +31,8 @@
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+# doesn't build with %{?_smp_mflags}
+make
 
 
 %install



From fedora-extras-commits at redhat.com  Tue Dec 27 03:25:33 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 26 Dec 2005 22:25:33 -0500
Subject: rpms/ddskk/FC-4 ddskk.spec,1.1,1.2
Message-ID: <200512270326.jBR3Q5kS024211@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	ddskk.spec 
Log Message:
sync with devel branch
- require and buildrequire apel version 10.6
- fix xemacs filelist defattr



Index: ddskk.spec
===================================================================
RCS file: /cvs/extras/rpms/ddskk/FC-4/ddskk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ddskk.spec	13 Jul 2005 09:30:45 -0000	1.1
+++ ddskk.spec	27 Dec 2005 03:25:33 -0000	1.2
@@ -1,12 +1,12 @@
 # [for Emacs] -*- coding: utf-8 -*-
 
-%define	apelminver	10.2
+%define	apelminver	10.6
 %define	pkgdir %{_datadir}/xemacs/mule-packages
 
 Summary: Daredevil SKK - Simple Kana to Kanji conversion program for Emacs
 Name: ddskk
 Version: 12.2.0
-Release: 6
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://openlab.ring.gr.jp/skk/main.html
@@ -90,11 +90,14 @@
 %{_infodir}/*
 
 %files xemacs
-defattr(-,root,root)
+%defattr(-,root,root)
 %doc ChangeLog READMEs
 %{pkgdir}
 
 %changelog
+* Wed Nov 16 2005 Jens Petersen  - 12.2.0-7
+- require and buildrequire apel version 10.6
+
 * Wed Jul 13 2005 Jens Petersen  - 12.2.0-6
 - initial import to Fedora Extras
 - bring back the xemacs subpackages



From fedora-extras-commits at redhat.com  Tue Dec 27 03:39:18 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 26 Dec 2005 22:39:18 -0500
Subject: rpms/scim-fcitx/FC-4 scim-fcitx.spec,1.1,1.2
Message-ID: <200512270339.jBR3doxg024283@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24266

Modified Files:
	scim-fcitx.spec 
Log Message:
don't build with _smp_mflags to fix multi-cpu build problem



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/FC-4/scim-fcitx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-fcitx.spec	20 Dec 2005 03:16:48 -0000	1.1
+++ scim-fcitx.spec	27 Dec 2005 03:39:17 -0000	1.2
@@ -31,7 +31,8 @@
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+# doesn't build with %{?_smp_mflags}
+make
 
 
 %install



From fedora-extras-commits at redhat.com  Tue Dec 27 04:35:14 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 26 Dec 2005 23:35:14 -0500
Subject: rpms/scim-fcitx/FC-3 scim-fcitx.spec,1.1,1.2
Message-ID: <200512270435.jBR4Zkid026100@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26080

Modified Files:
	scim-fcitx.spec 
Log Message:
sync with fc-4
- don't build with smp flags



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/FC-3/scim-fcitx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-fcitx.spec	20 Dec 2005 03:16:48 -0000	1.1
+++ scim-fcitx.spec	27 Dec 2005 04:35:13 -0000	1.2
@@ -31,7 +31,8 @@
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+# doesn't build with %{?_smp_mflags}
+make
 
 
 %install



From fedora-extras-commits at redhat.com  Tue Dec 27 04:50:33 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 26 Dec 2005 23:50:33 -0500
Subject: rpms/uim/devel .cvsignore, 1.12, 1.13 sources, 1.11, 1.12 uim.spec, 
	1.24, 1.25
Message-ID: <200512270451.jBR4p57c026201@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	.cvsignore sources uim.spec 
Log Message:
* Tue Dec 27 2005 Akira TAGOH  - 1.0.1-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	16 Dec 2005 11:03:20 -0000	1.12
+++ .cvsignore	27 Dec 2005 04:50:32 -0000	1.13
@@ -11,3 +11,4 @@
 uim-0.4.9.1.tar.gz
 uim-1.0.0-alpha.tar.gz
 uim-1.0.0-beta.tar.gz
+uim-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	16 Dec 2005 11:03:20 -0000	1.11
+++ sources	27 Dec 2005 04:50:32 -0000	1.12
@@ -1 +1 @@
-c68b7a8544551bd5b65df03dcb46d9e3  uim-1.0.0-beta.tar.gz
+1de96cb9ca0c570c0d04678a95f9c75a  uim-1.0.1.tar.gz


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- uim.spec	16 Dec 2005 11:03:20 -0000	1.24
+++ uim.spec	27 Dec 2005 04:50:32 -0000	1.25
@@ -3,8 +3,8 @@
 %define uninst_xinput for llcc in %{uim_locale}; do alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim ; done
 
 Name:		uim
-Version:	1.0.0
-Release:	0.2.beta%{?dist}
+Version:	1.0.1
+Release:	1%{?dist}
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,7 +12,7 @@
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
 BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
 BuildRequires:	emacs
-Source0:	http://uim.freedesktop.org/release/%{name}-%{version}-beta.tar.gz
+Source0:	http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz
 Source1:	xinput.d-uim
 Source2:	uim-init.el
 
@@ -153,7 +153,7 @@
 %define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules )
 
 %prep
-%setup -q -n %{name}-%{version}-beta
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -343,6 +343,9 @@
 %{_datadir}/uim/m17nlib.scm
 
 %changelog
+* Tue Dec 27 2005 Akira TAGOH  - 1.0.1-1
+- New upstream release.
+
 * Fri Dec 16 2005 Akira TAGOH  - 1.0.0-0.2.beta
 - updates to 1.0.0-beta.
 



From fedora-extras-commits at redhat.com  Tue Dec 27 04:55:18 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 26 Dec 2005 23:55:18 -0500
Subject: rpms/darcs/FC-4 darcs.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200512270455.jBR4tpuO026252@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	darcs.spec sources 
Log Message:
update to 1.0.5



Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/FC-4/darcs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- darcs.spec	17 Nov 2005 07:27:02 -0000	1.6
+++ darcs.spec	27 Dec 2005 04:55:18 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           darcs
-Version:        1.0.4
+Version:        1.0.5
 Release:        1%{?dist}
 Summary:        David's advanced revision control system
 
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Thu Dec  8 2005 Jens Petersen  - 1.0.5-1
+- 1.0.5 bugfix release
+
 * Mon Nov 14 2005 Jens Petersen  - 1.0.4-1
 - 1.0.4 release
   - skip tests/send.sh for now since it is failing in buildsystem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/darcs/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Nov 2005 07:03:41 -0000	1.3
+++ sources	27 Dec 2005 04:55:18 -0000	1.4
@@ -1 +1 @@
-0be693b00e4b1bd24906d4f479e78923  darcs-1.0.4.tar.gz
+9a9a4f84ed5b6258f7ab321713adf20b  darcs-1.0.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 05:44:01 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 27 Dec 2005 00:44:01 -0500
Subject: rpms/darcs/FC-3 darcs.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200512270544.jBR5iXNx028630@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	darcs.spec sources 
Log Message:
1.0.5 bugfix release



Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/FC-3/darcs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- darcs.spec	17 Nov 2005 07:29:56 -0000	1.4
+++ darcs.spec	27 Dec 2005 05:44:01 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           darcs
-Version:        1.0.4
+Version:        1.0.5
 Release:        1%{?dist}
 Summary:        David's advanced revision control system
 
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Thu Dec  8 2005 Jens Petersen  - 1.0.5-1
+- 1.0.5 bugfix release
+
 * Mon Nov 14 2005 Jens Petersen  - 1.0.4-1
 - 1.0.4 release
   - skip tests/send.sh for now since it is failing in buildsystem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/darcs/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Nov 2005 07:29:56 -0000	1.3
+++ sources	27 Dec 2005 05:44:01 -0000	1.4
@@ -1 +1 @@
-0be693b00e4b1bd24906d4f479e78923  darcs-1.0.4.tar.gz
+9a9a4f84ed5b6258f7ab321713adf20b  darcs-1.0.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 06:39:00 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 27 Dec 2005 01:39:00 -0500
Subject: rpms/scim-tables/FC-4 .cvsignore, 1.4, 1.5 scim-tables.spec, 1.13, 
	1.14 sources, 1.4, 1.5
Message-ID: <200512270639.jBR6dWWi030421@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-tables/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30400

Modified Files:
	.cvsignore scim-tables.spec sources 
Log Message:
sync with FC package:
- update to 0.5.5
  - update filelists
- remove the Japanese and Korean tables and subpackages with
  tables-skip-ja-ko.patch and %%{jk_tables}



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Nov 2005 13:53:44 -0000	1.4
+++ .cvsignore	27 Dec 2005 06:38:59 -0000	1.5
@@ -1 +1 @@
-scim-tables-0.5.4.tar.gz
+scim-tables-0.5.5.tar.gz


Index: scim-tables.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- scim-tables.spec	2 Nov 2005 14:43:22 -0000	1.13
+++ scim-tables.spec	27 Dec 2005 06:38:59 -0000	1.14
@@ -1,6 +1,9 @@
+# set to include Japanese and Korean tables
+%define jk_tables 0
+
 Name:		scim-tables
-Version:	0.5.4
-Release:	2%{?dist}
+Version:	0.5.5
+Release:	1%{?dist}
 Summary:	SCIM Generic Table IMEngine
 
 License:	GPL
@@ -12,6 +15,7 @@
 BuildRequires:	scim-devel, gtk2-devel
 BuildRequires:	gettext-devel
 Requires:	scim
+Patch1:		tables-skip-ja-ko.patch
 
 %description
 This package contains the Generic Table IMEngine for SCIM.
@@ -65,6 +69,7 @@
 %description hindi
 This package contains scim-tables files for Hindi input.
 
+%if %{jk_tables}
 %package japanese
 Summary:	SCIM tables for Japanese
 Group:		System Environment/Libraries
@@ -73,6 +78,7 @@
 
 %description japanese
 This package contains scim-tables files for Japanese.
+%endif
 
 %package kannada
 Summary:	SCIM tables for Kannada
@@ -82,6 +88,7 @@
 %description kannada
 This package contains scim-tables files for Kannada input.
 
+%if %{jk_tables}
 %package korean
 Summary:	SCIM tables for Korean
 Group:		System Environment/Libraries
@@ -90,6 +97,7 @@
 
 %description korean
 This package contains scim-tables files for Korean.
+%endif
 
 %package malayalam
 Summary:	SCIM tables for Malayalam scripts
@@ -167,6 +175,13 @@
 %prep
 %setup -q
 
+%if !%{jk_tables}
+%patch1 -p1 -b -1.JK
+# patch1 touches a Makefile.am file
+autoreconf
+%endif
+
+
 %build
 %configure --disable-static
 make  %{?_smp_mflags}
@@ -179,7 +194,6 @@
 # kill *.a and *.la files
 rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.la
 
-
 %find_lang %{name}
 
 
@@ -199,6 +213,7 @@
 %{_libdir}/scim-1.0/IMEngine/table.so
 %{_libdir}/scim-1.0/SetupUI/table-imengine-setup.so
 %{_datadir}/scim/icons/table.png
+%{_mandir}/man1/scim-make-table.1*
 
 
 %files amharic
@@ -226,17 +241,16 @@
 
 %files chinese
 %defattr(-, root, root, -)
-%doc tables/zh/README-Erbi.txt tables/zh/README-CangJie.txt
+%doc tables/zh/README-*.txt
 %dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Array30.bin
-%{_datadir}/scim/tables/CangJie.bin
-%{_datadir}/scim/tables/CangJie3.bin
+%{_datadir}/scim/tables/CangJie*.bin
 %{_datadir}/scim/tables/Cantonese.bin
 %{_datadir}/scim/tables/CantonHK.bin
 %{_datadir}/scim/tables/Dayi3.bin
+%{_datadir}/scim/tables/EZ*.bin
 %{_datadir}/scim/tables/Erbi.bin
 %{_datadir}/scim/tables/Erbi-QS.bin
-%{_datadir}/scim/tables/EZ.bin
 %{_datadir}/scim/tables/Jyutping.bin
 %{_datadir}/scim/tables/Quick.bin
 %{_datadir}/scim/tables/Simplex.bin
@@ -246,14 +260,13 @@
 %{_datadir}/scim/tables/Ziranma.bin
 %{_datadir}/scim/tables/ZhuYin.bin
 %{_datadir}/scim/icons/Array30.png
-%{_datadir}/scim/icons/CangJie.png
-%{_datadir}/scim/icons/CangJie3.png
+%{_datadir}/scim/icons/CangJie*.png
 %{_datadir}/scim/icons/Cantonese.png
 %{_datadir}/scim/icons/CantonHK.png
 %{_datadir}/scim/icons/Dayi.png
+%{_datadir}/scim/icons/EZ*.png
 %{_datadir}/scim/icons/Erbi.png
 %{_datadir}/scim/icons/Erbi-QS.png
-%{_datadir}/scim/icons/EZ.png
 %{_datadir}/scim/icons/Jyutping.png
 %{_datadir}/scim/icons/Quick.png
 %{_datadir}/scim/icons/Simplex.png
@@ -282,9 +295,10 @@
 %{_datadir}/scim/icons/Hindi-phonetic.png
 
 
+%if %{jk_tables}
 %files japanese
 %defattr(-, root, root, -)
-%doc tables/ja/kanjidic_licence.html tables/ja/kanjidic_doc.html
+%doc tables/ja/kanjidic*
 %dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/HIRAGANA.bin
 %{_datadir}/scim/tables/KATAKANA.bin
@@ -292,6 +306,7 @@
 %{_datadir}/scim/icons/HIRAGANA.png
 %{_datadir}/scim/icons/KATAKANA.png
 %{_datadir}/scim/icons/Nippon.png
+%endif
 
 
 %files kannada
@@ -303,6 +318,7 @@
 %{_datadir}/scim/icons/Kannada-kgp.png
 
 
+%if %{jk_tables}
 %files korean
 %defattr(-, root, root, -)
 %dir %{_datadir}/scim/tables
@@ -311,6 +327,7 @@
 %{_datadir}/scim/tables/Hanja.bin
 %{_datadir}/scim/icons/Hangul.png
 %{_datadir}/scim/icons/Hanja.png
+%endif
 
 
 %files malayalam
@@ -385,6 +402,12 @@
 
 
 %changelog
+* Mon Dec 26 2005 Jens Petersen  - 0.5.5-1%{?dist}
+- update to 0.5.5
+  - update filelists
+- remove the Japanese and Korean tables and subpackages with
+  tables-skip-ja-ko.patch and %%{jk_tables}
+
 * Wed Dec 1 2005 Ryo Dairiki  - 0.6.0-1%{?dist}
 - update to 0.5.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Nov 2005 13:53:44 -0000	1.4
+++ sources	27 Dec 2005 06:38:59 -0000	1.5
@@ -1 +1 @@
-69ce8f1945ba2ab4bf820386e76c2cd9  scim-tables-0.5.4.tar.gz
+15da0323195dea92690d4b391665b95a  scim-tables-0.5.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 06:42:08 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 27 Dec 2005 01:42:08 -0500
Subject: rpms/scim-tables/FC-4 tables-skip-ja-ko.patch,NONE,1.1
Message-ID: <200512270642.jBR6gAZS030482@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-tables/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30470

Added Files:
	tables-skip-ja-ko.patch 
Log Message:
add tables-skip-ja-ko.patch



tables-skip-ja-ko.patch:

--- NEW FILE tables-skip-ja-ko.patch ---
--- scim-tables-0.5.5/configure.ac~	2005-12-05 15:37:12.000000000 +0900
+++ scim-tables-0.5.5/configure.ac	2005-12-26 17:02:55.000000000 +0900
@@ -126,14 +126,6 @@
 		 tables/zh/Wubi.txt
 		 tables/zh/Ziranma.txt
 		 tables/zh/ZhuYin.txt
-		 tables/ja/Makefile
-		 tables/ja/HIRAGANA.txt
-		 tables/ja/KATAKANA.txt
-		 tables/ja/Nippon.txt
-		 tables/ko/Makefile
-		 tables/ko/Hangul.txt
-		 tables/ko/HangulRomaja.txt
-		 tables/ko/Hanja.txt
 		 tables/bn/Makefile
 		 tables/bn/Bengali-inscript.txt
 		 tables/bn/Bengali-probhat.txt
--- scim-tables-0.5.5/icons/Makefile.am~	2005-10-12 19:56:43.000000000 +0900
+++ scim-tables-0.5.5/icons/Makefile.am	2005-12-26 17:05:09.000000000 +0900
@@ -35,19 +35,14 @@
 			  EZ.png        \
 			  Gujarati-inscript.png	\
 			  Gujarati-phonetic.png	\
-			  Hangul.png    \
-			  Hanja.png     \
 			  Hindi-inscript.png	\
 			  Hindi-phonetic.png	\
-			  HIRAGANA.png  \
 			  Jyutping.png  \
-			  KATAKANA.png  \
 			  Kannada-inscript.png	\
 			  Kannada-kgp.png	\
 			  LaTeX.png     \
 			  Malayalam-inscript.png	\
 			  Nepali.png    \
-			  Nippon.png    \
 			  Punjabi-inscript.png	\
 			  Punjabi-jhelum.png	\
 			  Punjabi-phonetic.png	\
--- scim-tables-0.5.5/tables/Makefile.am~	2005-10-30 02:00:15.000000000 +0900
+++ scim-tables-0.5.5/tables/Makefile.am	2005-12-26 16:52:09.000000000 +0900
@@ -18,5 +18,5 @@
 MAINTAINERCLEANFILES 	= Makefile.in
 CLEANFILES		= *.bak 
 
-SUBDIRS 		= additional am ar bn gu hi ja kn ko ml ne pa ru ta te th vi zh
+SUBDIRS 		= additional am ar bn gu hi kn ml ne pa ru ta te th vi zh
 



From fedora-extras-commits at redhat.com  Tue Dec 27 06:44:57 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 27 Dec 2005 01:44:57 -0500
Subject: rpms/scim-tables/FC-3 tables-skip-ja-ko.patch, NONE,
	1.1 scim-tables.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <200512270645.jBR6jTal030557@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-tables/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30533

Modified Files:
	scim-tables.spec sources 
Added Files:
	tables-skip-ja-ko.patch 
Log Message:
sync with Core:
- update to 0.5.5
  - update filelists
- remove the Japanese and Korean tables and subpackages with
  tables-skip-ja-ko.patch and %%{jk_tables}


tables-skip-ja-ko.patch:

--- NEW FILE tables-skip-ja-ko.patch ---
--- scim-tables-0.5.5/configure.ac~	2005-12-05 15:37:12.000000000 +0900
+++ scim-tables-0.5.5/configure.ac	2005-12-26 17:02:55.000000000 +0900
@@ -126,14 +126,6 @@
 		 tables/zh/Wubi.txt
 		 tables/zh/Ziranma.txt
 		 tables/zh/ZhuYin.txt
-		 tables/ja/Makefile
-		 tables/ja/HIRAGANA.txt
-		 tables/ja/KATAKANA.txt
-		 tables/ja/Nippon.txt
-		 tables/ko/Makefile
-		 tables/ko/Hangul.txt
-		 tables/ko/HangulRomaja.txt
-		 tables/ko/Hanja.txt
 		 tables/bn/Makefile
 		 tables/bn/Bengali-inscript.txt
 		 tables/bn/Bengali-probhat.txt
--- scim-tables-0.5.5/icons/Makefile.am~	2005-10-12 19:56:43.000000000 +0900
+++ scim-tables-0.5.5/icons/Makefile.am	2005-12-26 17:05:09.000000000 +0900
@@ -35,19 +35,14 @@
 			  EZ.png        \
 			  Gujarati-inscript.png	\
 			  Gujarati-phonetic.png	\
-			  Hangul.png    \
-			  Hanja.png     \
 			  Hindi-inscript.png	\
 			  Hindi-phonetic.png	\
-			  HIRAGANA.png  \
 			  Jyutping.png  \
-			  KATAKANA.png  \
 			  Kannada-inscript.png	\
 			  Kannada-kgp.png	\
 			  LaTeX.png     \
 			  Malayalam-inscript.png	\
 			  Nepali.png    \
-			  Nippon.png    \
 			  Punjabi-inscript.png	\
 			  Punjabi-jhelum.png	\
 			  Punjabi-phonetic.png	\
--- scim-tables-0.5.5/tables/Makefile.am~	2005-10-30 02:00:15.000000000 +0900
+++ scim-tables-0.5.5/tables/Makefile.am	2005-12-26 16:52:09.000000000 +0900
@@ -18,5 +18,5 @@
 MAINTAINERCLEANFILES 	= Makefile.in
 CLEANFILES		= *.bak 
 
-SUBDIRS 		= additional am ar bn gu hi ja kn ko ml ne pa ru ta te th vi zh
+SUBDIRS 		= additional am ar bn gu hi kn ml ne pa ru ta te th vi zh
 


Index: scim-tables.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-3/scim-tables.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scim-tables.spec	2 Nov 2005 14:37:28 -0000	1.9
+++ scim-tables.spec	27 Dec 2005 06:44:56 -0000	1.10
@@ -1,6 +1,9 @@
+# set to include Japanese and Korean tables
+%define jk_tables 0
+
 Name:		scim-tables
-Version:	0.5.4
-Release:	2%{?dist}
+Version:	0.5.5
+Release:	1%{?dist}
 Summary:	SCIM Generic Table IMEngine
 
 License:	GPL
@@ -12,6 +15,7 @@
 BuildRequires:	scim-devel, gtk2-devel
 BuildRequires:	gettext-devel
 Requires:	scim
+Patch1:		tables-skip-ja-ko.patch
 
 %description
 This package contains the Generic Table IMEngine for SCIM.
@@ -65,6 +69,7 @@
 %description hindi
 This package contains scim-tables files for Hindi input.
 
+%if %{jk_tables}
 %package japanese
 Summary:	SCIM tables for Japanese
 Group:		System Environment/Libraries
@@ -73,6 +78,7 @@
 
 %description japanese
 This package contains scim-tables files for Japanese.
+%endif
 
 %package kannada
 Summary:	SCIM tables for Kannada
@@ -82,6 +88,7 @@
 %description kannada
 This package contains scim-tables files for Kannada input.
 
+%if %{jk_tables}
 %package korean
 Summary:	SCIM tables for Korean
 Group:		System Environment/Libraries
@@ -90,6 +97,7 @@
 
 %description korean
 This package contains scim-tables files for Korean.
+%endif
 
 %package malayalam
 Summary:	SCIM tables for Malayalam scripts
@@ -167,6 +175,13 @@
 %prep
 %setup -q
 
+%if !%{jk_tables}
+%patch1 -p1 -b -1.JK
+# patch1 touches a Makefile.am file
+autoreconf
+%endif
+
+
 %build
 %configure --disable-static
 make  %{?_smp_mflags}
@@ -179,7 +194,6 @@
 # kill *.a and *.la files
 rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.la
 
-
 %find_lang %{name}
 
 
@@ -199,6 +213,7 @@
 %{_libdir}/scim-1.0/IMEngine/table.so
 %{_libdir}/scim-1.0/SetupUI/table-imengine-setup.so
 %{_datadir}/scim/icons/table.png
+%{_mandir}/man1/scim-make-table.1*
 
 
 %files amharic
@@ -226,17 +241,16 @@
 
 %files chinese
 %defattr(-, root, root, -)
-%doc tables/zh/README-Erbi.txt tables/zh/README-CangJie.txt
+%doc tables/zh/README-*.txt
 %dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Array30.bin
-%{_datadir}/scim/tables/CangJie.bin
-%{_datadir}/scim/tables/CangJie3.bin
+%{_datadir}/scim/tables/CangJie*.bin
 %{_datadir}/scim/tables/Cantonese.bin
 %{_datadir}/scim/tables/CantonHK.bin
 %{_datadir}/scim/tables/Dayi3.bin
+%{_datadir}/scim/tables/EZ*.bin
 %{_datadir}/scim/tables/Erbi.bin
 %{_datadir}/scim/tables/Erbi-QS.bin
-%{_datadir}/scim/tables/EZ.bin
 %{_datadir}/scim/tables/Jyutping.bin
 %{_datadir}/scim/tables/Quick.bin
 %{_datadir}/scim/tables/Simplex.bin
@@ -246,14 +260,13 @@
 %{_datadir}/scim/tables/Ziranma.bin
 %{_datadir}/scim/tables/ZhuYin.bin
 %{_datadir}/scim/icons/Array30.png
-%{_datadir}/scim/icons/CangJie.png
-%{_datadir}/scim/icons/CangJie3.png
+%{_datadir}/scim/icons/CangJie*.png
 %{_datadir}/scim/icons/Cantonese.png
 %{_datadir}/scim/icons/CantonHK.png
 %{_datadir}/scim/icons/Dayi.png
+%{_datadir}/scim/icons/EZ*.png
 %{_datadir}/scim/icons/Erbi.png
 %{_datadir}/scim/icons/Erbi-QS.png
-%{_datadir}/scim/icons/EZ.png
 %{_datadir}/scim/icons/Jyutping.png
 %{_datadir}/scim/icons/Quick.png
 %{_datadir}/scim/icons/Simplex.png
@@ -282,9 +295,10 @@
 %{_datadir}/scim/icons/Hindi-phonetic.png
 
 
+%if %{jk_tables}
 %files japanese
 %defattr(-, root, root, -)
-%doc tables/ja/kanjidic_licence.html tables/ja/kanjidic_doc.html
+%doc tables/ja/kanjidic*
 %dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/HIRAGANA.bin
 %{_datadir}/scim/tables/KATAKANA.bin
@@ -292,6 +306,7 @@
 %{_datadir}/scim/icons/HIRAGANA.png
 %{_datadir}/scim/icons/KATAKANA.png
 %{_datadir}/scim/icons/Nippon.png
+%endif
 
 
 %files kannada
@@ -303,6 +318,7 @@
 %{_datadir}/scim/icons/Kannada-kgp.png
 
 
+%if %{jk_tables}
 %files korean
 %defattr(-, root, root, -)
 %dir %{_datadir}/scim/tables
@@ -311,6 +327,7 @@
 %{_datadir}/scim/tables/Hanja.bin
 %{_datadir}/scim/icons/Hangul.png
 %{_datadir}/scim/icons/Hanja.png
+%endif
 
 
 %files malayalam
@@ -385,6 +402,12 @@
 
 
 %changelog
+* Mon Dec 26 2005 Jens Petersen  - 0.5.5-1%{?dist}
+- update to 0.5.5
+  - update filelists
+- remove the Japanese and Korean tables and subpackages with
+  tables-skip-ja-ko.patch and %%{jk_tables}
+
 * Wed Dec 1 2005 Ryo Dairiki  - 0.6.0-1%{?dist}
 - update to 0.5.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Nov 2005 14:36:52 -0000	1.4
+++ sources	27 Dec 2005 06:44:56 -0000	1.5
@@ -1 +1 @@
-69ce8f1945ba2ab4bf820386e76c2cd9  scim-tables-0.5.4.tar.gz
+15da0323195dea92690d4b391665b95a  scim-tables-0.5.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 08:54:09 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 27 Dec 2005 03:54:09 -0500
Subject: rpms/uim/FC-3 uim-init.el, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 
	1.8, 1.9 uim.spec, 1.9,
	1.10 uim-0.4.6-dont-require-devel-pkgs.patch, 1.1,
	NONE uim-0.4.6-multilib.patch, 1.1, NONE
Message-ID: <200512270854.jBR8sfDm001636@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	.cvsignore sources uim.spec 
Added Files:
	uim-init.el 
Removed Files:
	uim-0.4.6-dont-require-devel-pkgs.patch 
	uim-0.4.6-multilib.patch 
Log Message:
* Tue Dec 27 2005 Akira TAGOH  - 1.0.1-1
- New upstream release.


--- NEW FILE uim-init.el ---
(require 'uim-leim)

(add-to-list 'load-path "/usr/share/emacs/site-lisp/uim-el")
(setq uim-el-agent "/usr/bin/uim-el-agent")
;(setq uim-candidate-display-inline t)
;(setq default-input-method "japanese-anthy-uim")


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2005 10:11:29 -0000	1.9
+++ .cvsignore	27 Dec 2005 08:54:08 -0000	1.10
@@ -8,3 +8,4 @@
 uim-0.4.7.1.tar.gz
 uim-0.4.8.tar.gz
 uim-0.4.9.1.tar.gz
+uim-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Sep 2005 10:11:29 -0000	1.8
+++ sources	27 Dec 2005 08:54:08 -0000	1.9
@@ -1 +1 @@
-0e2625cc926917d7864c4d0c341c535a  uim-0.4.9.1.tar.gz
+1de96cb9ca0c570c0d04678a95f9c75a  uim-1.0.1.tar.gz


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-3/uim.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- uim.spec	30 Sep 2005 10:11:29 -0000	1.9
+++ uim.spec	27 Dec 2005 08:54:08 -0000	1.10
@@ -2,23 +2,26 @@
 %define inst_xinput for llcc in %{uim_locale}; do alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim 50 ; done
 %define uninst_xinput for llcc in %{uim_locale}; do alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim ; done
 
-Summary:	A multilingual input method library
 Name:		uim
-Version:	0.4.9.1
+Version:	1.0.1
 Release:	1%{?dist}
 License:	GPL/BSD
-Group:		System Environment/Libraries
 URL:		http://uim.freedesktop.org/
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
+BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
+BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
+BuildRequires:	emacs
 Source0:	http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz
 Source1:	xinput.d-uim
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
-BuildRequires:	anthy-devel Canna-devel
+Source2:	uim-init.el
+
+
+Summary:	A multilingual input method library
+Group:		System Environment/Libraries
 Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
 Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
 
-Patch2:		uim-0.4.6-dont-require-devel-pkgs.patch
-
 %package	devel
 Summary:	Development files for the Uim library
 Group:		Development/Libraries
@@ -43,6 +46,17 @@
 Group:		User Interface/Desktops
 Requires:	uim = %{version}-%{release}
 
+%package	el
+Summary:	Emacs support for Uim
+Group:		System Environment/Libraries
+Requires:	%{name}-el-common = %{version}
+Requires:	emacs-common
+
+%package	el-common
+Summary:	Common package for Emacsen support for Uim
+Group:		System Environment/Libraries
+Requires:	uim = %{version}-%{release}
+
 %package	anthy
 Summary:	Anthy support for Uim
 Group:		System Environment/Libraries
@@ -67,6 +81,13 @@
 Requires(post):	gtk2
 Requires(postun): gtk2
 
+%package	m17n
+Summary:	m17n-lib support for Uim
+Group:		System Environment/Libraries
+Requires:	uim = %{version}-%{release}
+Requires(post):	gtk2
+Requires(postun): gtk2
+
 %description
 Uim is a multilingual input method library. Uim aims to
 provide secure and useful input methods for all
@@ -110,6 +131,12 @@
 
 This package provides the Qt IM module and helper programs.
 
+%description	el
+This package provides Emacs support.
+
+%description	el-common
+This package provides an utility to use Emacsen support for Uim.
+
 %description	anthy
 This package provides support for Anthy, a Japanese input method.
 
@@ -119,19 +146,18 @@
 %description	skk
 This package provides support for SKK, a Japanese input method.
 
+%description	m17n
+This package provides support for m17n-lib, which allows input of
+many languages using the input table map from m17n-db.
+
 %define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules )
 
 %prep
-%setup -q
-%patch2 -p1 -b .dlopen
+%setup -q -n %{name}-%{version}
 
-# patch creation:
-libtoolize --force && aclocal-1.9 -I m4 && autoheader && automake-1.9 --foreign && autoconf
-# touch uim/config.h.in, otherwise autoheader will run again
-touch uim/config.h.in
 
 %build
-%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule --without-scim
+%configure --with-x --with-xft --with-canna --with-anthy --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
 make
 
 %install
@@ -141,10 +167,13 @@
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim
+install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/
 
 %find_lang %{name}
+%find_lang uim-chardict-qt
 
-find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk)" > scm.list
+find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|m17n)" > scm.list
 cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
 
 # compress large doc
@@ -210,21 +239,29 @@
 	%{gtk_im_update}
 fi
 
+%post	m17n
+umask 022
+%{gtk_im_update}
+
+%postun m17n
+umask 022
+if [ $1 = 0 ]; then
+	%{gtk_im_update}
+fi
+
 %files -f %{name}.lang
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog* NEWS README
-%lang(ja) %doc README.ja
 %{_bindir}/uim-fep*
-%{_bindir}/uim-helper-server
 %{_bindir}/uim-module-manager
 %{_bindir}/uim-sh
 %{_bindir}/uim-xim
 %{_libdir}/lib*.so.*
 %dir %{_datadir}/uim
-%{_datadir}/uim/tables
 %{_sysconfdir}/X11/xinit/xinput.d
 %dir %{_libdir}/uim
 %{_libdir}/uim/plugin/libuim-custom-enabler.so
+%{_libexecdir}/uim-helper-server
 %{_datadir}/uim/pixmaps
 %{_datadir}/uim/helperdata
 %{_mandir}/man1/uim-xim.1*
@@ -241,8 +278,6 @@
 
 %files	gtk2
 %defattr (-, root, root)
-%{_bindir}/uim-candwin-gtk
-%{_bindir}/uim-helper-candwin-gtk
 %{_bindir}/uim-helper-toolbar-gtk
 %{_bindir}/uim-helper-toolbar-gtk-systray
 %{_bindir}/uim-pref-gtk
@@ -251,6 +286,7 @@
 %{_bindir}/uim-im-switcher-gtk
 %{_bindir}/uim-input-pad-ja
 %{_libdir}/gtk-2.0/2.*/immodules
+%{_libexecdir}/uim-candwin-gtk
 %exclude %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a
 %dir %{_datadir}/uim
 %{_datadir}/applications/uim.desktop
@@ -261,16 +297,27 @@
 %{_libexecdir}/uim-toolbar-applet
 %{_libdir}/bonobo/servers/GNOME_UimApplet.server
 
-%files	qt
+%files	-f uim-chardict-qt.lang qt
 %defattr (-, root, root)
-%{_bindir}/uim-candwin-qt
 %{_bindir}/uim-chardict-qt
 %{_bindir}/uim-im-switcher-qt
 %{_bindir}/uim-pref-qt
 %{_bindir}/uim-toolbar-qt
 %{_libdir}/qt-3.*/plugins/inputmethods
+%{_libexecdir}/uim-candwin-qt
 %exclude %{_libdir}/qt-3.*/plugins/inputmethods/lib*.*a
 
+%files	el
+%defattr (-, root, root)
+%doc emacs/COPYING emacs/README
+%lang(ja) %doc emacs/README.ja
+%{_datadir}/emacs/site-lisp/uim-el
+%{_datadir}/emacs/site-lisp/site-start.d/uim-init.el
+
+%files el-common
+%defattr (-, root, root)
+%{_bindir}/uim-el-agent
+
 %files	anthy
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-anthy.so
@@ -289,7 +336,25 @@
 %dir %{_datadir}/uim
 %{_datadir}/uim/skk*.scm
 
+%files m17n
+%defattr (-, root, root)
+%{_libdir}/uim/plugin/libuim-m17nlib.so
+%dir %{_datadir}/uim
+%{_datadir}/uim/m17nlib.scm
+
 %changelog
+* Tue Dec 27 2005 Akira TAGOH  - 1.0.1-1
+- New upstream release.
+
+* Fri Dec 16 2005 Akira TAGOH  - 1.0.0-0.2.beta
+- updates to 1.0.0-beta.
+
+* Thu Dec 15 2005 Akira TAGOH  - 1.0.0-0.1.alpha
+- New upstream release.
+- added uim-m17n package. (#175600)
+- added uim-el package.
+- uim-0.4.6-dont-require-devel-pkgs.patch: removed.
+
 * Fri Sep 30 2005 Akira TAGOH  - 0.4.9.1-1
 - New upstream release.
 


--- uim-0.4.6-dont-require-devel-pkgs.patch DELETED ---


--- uim-0.4.6-multilib.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 27 08:58:45 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 27 Dec 2005 03:58:45 -0500
Subject: rpms/uim/FC-4 uim-init.el, NONE, 1.1 .cvsignore, 1.10, 1.11 sources,
	1.9, 1.10 uim.spec, 1.16,
	1.17 uim-0.4.6-dont-require-devel-pkgs.patch, 1.1,
	NONE uim-0.4.6-multilib.patch, 1.1, NONE
Message-ID: <200512270859.jBR8xIKF001752@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	.cvsignore sources uim.spec 
Added Files:
	uim-init.el 
Removed Files:
	uim-0.4.6-dont-require-devel-pkgs.patch 
	uim-0.4.6-multilib.patch 
Log Message:
* Tue Dec 27 2005 Akira TAGOH  - 1.0.1-1
- New upstream release.


--- NEW FILE uim-init.el ---
(require 'uim-leim)

(add-to-list 'load-path "/usr/share/emacs/site-lisp/uim-el")
(setq uim-el-agent "/usr/bin/uim-el-agent")
;(setq uim-candidate-display-inline t)
;(setq default-input-method "japanese-anthy-uim")


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Sep 2005 09:48:23 -0000	1.10
+++ .cvsignore	27 Dec 2005 08:58:45 -0000	1.11
@@ -9,3 +9,4 @@
 uim-0.4.7.1.tar.gz
 uim-0.4.8.tar.gz
 uim-0.4.9.1.tar.gz
+uim-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2005 09:48:23 -0000	1.9
+++ sources	27 Dec 2005 08:58:45 -0000	1.10
@@ -1 +1 @@
-0e2625cc926917d7864c4d0c341c535a  uim-0.4.9.1.tar.gz
+1de96cb9ca0c570c0d04678a95f9c75a  uim-1.0.1.tar.gz


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-4/uim.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- uim.spec	30 Sep 2005 09:48:23 -0000	1.16
+++ uim.spec	27 Dec 2005 08:58:45 -0000	1.17
@@ -2,23 +2,26 @@
 %define inst_xinput for llcc in %{uim_locale}; do alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim 50 ; done
 %define uninst_xinput for llcc in %{uim_locale}; do alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim ; done
 
-Summary:	A multilingual input method library
 Name:		uim
-Version:	0.4.9.1
+Version:	1.0.1
 Release:	1%{?dist}
 License:	GPL/BSD
-Group:		System Environment/Libraries
 URL:		http://uim.freedesktop.org/
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
+BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
+BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
+BuildRequires:	emacs
 Source0:	http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz
 Source1:	xinput.d-uim
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
-BuildRequires:	anthy-devel Canna-devel
+Source2:	uim-init.el
+
+
+Summary:	A multilingual input method library
+Group:		System Environment/Libraries
 Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
 Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
 
-Patch2:		uim-0.4.6-dont-require-devel-pkgs.patch
-
 %package	devel
 Summary:	Development files for the Uim library
 Group:		Development/Libraries
@@ -43,6 +46,17 @@
 Group:		User Interface/Desktops
 Requires:	uim = %{version}-%{release}
 
+%package	el
+Summary:	Emacs support for Uim
+Group:		System Environment/Libraries
+Requires:	%{name}-el-common = %{version}
+Requires:	emacs-common
+
+%package	el-common
+Summary:	Common package for Emacsen support for Uim
+Group:		System Environment/Libraries
+Requires:	uim = %{version}-%{release}
+
 %package	anthy
 Summary:	Anthy support for Uim
 Group:		System Environment/Libraries
@@ -67,6 +81,13 @@
 Requires(post):	gtk2
 Requires(postun): gtk2
 
+%package	m17n
+Summary:	m17n-lib support for Uim
+Group:		System Environment/Libraries
+Requires:	uim = %{version}-%{release}
+Requires(post):	gtk2
+Requires(postun): gtk2
+
 %description
 Uim is a multilingual input method library. Uim aims to
 provide secure and useful input methods for all
@@ -110,6 +131,12 @@
 
 This package provides the Qt IM module and helper programs.
 
+%description	el
+This package provides Emacs support.
+
+%description	el-common
+This package provides an utility to use Emacsen support for Uim.
+
 %description	anthy
 This package provides support for Anthy, a Japanese input method.
 
@@ -119,19 +146,18 @@
 %description	skk
 This package provides support for SKK, a Japanese input method.
 
+%description	m17n
+This package provides support for m17n-lib, which allows input of
+many languages using the input table map from m17n-db.
+
 %define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules )
 
 %prep
-%setup -q
-%patch2 -p1 -b .dlopen
+%setup -q -n %{name}-%{version}
 
-# patch creation:
-libtoolize --force && aclocal-1.9 -I m4 && autoheader && automake-1.9 --foreign && autoconf
-# touch uim/config.h.in, otherwise autoheader will run again
-touch uim/config.h.in
 
 %build
-%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule --without-scim
+%configure --with-x --with-xft --with-canna --with-anthy --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
 make
 
 %install
@@ -141,10 +167,13 @@
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim
+install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/
 
 %find_lang %{name}
+%find_lang uim-chardict-qt
 
-find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk)" > scm.list
+find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|m17n)" > scm.list
 cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
 
 # compress large doc
@@ -210,21 +239,29 @@
 	%{gtk_im_update}
 fi
 
+%post	m17n
+umask 022
+%{gtk_im_update}
+
+%postun m17n
+umask 022
+if [ $1 = 0 ]; then
+	%{gtk_im_update}
+fi
+
 %files -f %{name}.lang
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog* NEWS README
-%lang(ja) %doc README.ja
 %{_bindir}/uim-fep*
-%{_bindir}/uim-helper-server
 %{_bindir}/uim-module-manager
 %{_bindir}/uim-sh
 %{_bindir}/uim-xim
 %{_libdir}/lib*.so.*
 %dir %{_datadir}/uim
-%{_datadir}/uim/tables
 %{_sysconfdir}/X11/xinit/xinput.d
 %dir %{_libdir}/uim
 %{_libdir}/uim/plugin/libuim-custom-enabler.so
+%{_libexecdir}/uim-helper-server
 %{_datadir}/uim/pixmaps
 %{_datadir}/uim/helperdata
 %{_mandir}/man1/uim-xim.1*
@@ -241,8 +278,6 @@
 
 %files	gtk2
 %defattr (-, root, root)
-%{_bindir}/uim-candwin-gtk
-%{_bindir}/uim-helper-candwin-gtk
 %{_bindir}/uim-helper-toolbar-gtk
 %{_bindir}/uim-helper-toolbar-gtk-systray
 %{_bindir}/uim-pref-gtk
@@ -251,6 +286,7 @@
 %{_bindir}/uim-im-switcher-gtk
 %{_bindir}/uim-input-pad-ja
 %{_libdir}/gtk-2.0/2.*/immodules
+%{_libexecdir}/uim-candwin-gtk
 %exclude %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a
 %dir %{_datadir}/uim
 %{_datadir}/applications/uim.desktop
@@ -261,16 +297,27 @@
 %{_libexecdir}/uim-toolbar-applet
 %{_libdir}/bonobo/servers/GNOME_UimApplet.server
 
-%files	qt
+%files	-f uim-chardict-qt.lang qt
 %defattr (-, root, root)
-%{_bindir}/uim-candwin-qt
 %{_bindir}/uim-chardict-qt
 %{_bindir}/uim-im-switcher-qt
 %{_bindir}/uim-pref-qt
 %{_bindir}/uim-toolbar-qt
 %{_libdir}/qt-3.*/plugins/inputmethods
+%{_libexecdir}/uim-candwin-qt
 %exclude %{_libdir}/qt-3.*/plugins/inputmethods/lib*.*a
 
+%files	el
+%defattr (-, root, root)
+%doc emacs/COPYING emacs/README
+%lang(ja) %doc emacs/README.ja
+%{_datadir}/emacs/site-lisp/uim-el
+%{_datadir}/emacs/site-lisp/site-start.d/uim-init.el
+
+%files el-common
+%defattr (-, root, root)
+%{_bindir}/uim-el-agent
+
 %files	anthy
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-anthy.so
@@ -289,7 +336,25 @@
 %dir %{_datadir}/uim
 %{_datadir}/uim/skk*.scm
 
+%files m17n
+%defattr (-, root, root)
+%{_libdir}/uim/plugin/libuim-m17nlib.so
+%dir %{_datadir}/uim
+%{_datadir}/uim/m17nlib.scm
+
 %changelog
+* Tue Dec 27 2005 Akira TAGOH  - 1.0.1-1
+- New upstream release.
+
+* Fri Dec 16 2005 Akira TAGOH  - 1.0.0-0.2.beta
+- updates to 1.0.0-beta.
+
+* Thu Dec 15 2005 Akira TAGOH  - 1.0.0-0.1.alpha
+- New upstream release.
+- added uim-m17n package. (#175600)
+- added uim-el package.
+- uim-0.4.6-dont-require-devel-pkgs.patch: removed.
+
 * Fri Sep 30 2005 Akira TAGOH  - 0.4.9.1-1
 - New upstream release.
 


--- uim-0.4.6-dont-require-devel-pkgs.patch DELETED ---


--- uim-0.4.6-multilib.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 27 09:10:27 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 27 Dec 2005 04:10:27 -0500
Subject: rpms/uim/FC-3 uim.spec,1.10,1.11
Message-ID: <200512270910.jBR9AjcJ003702@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	uim.spec 
Log Message:



Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-3/uim.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- uim.spec	27 Dec 2005 08:54:08 -0000	1.10
+++ uim.spec	27 Dec 2005 09:10:26 -0000	1.11
@@ -8,7 +8,7 @@
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
+BuildRequires:	xorg-x11-devel
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
 BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
 BuildRequires:	emacs



From fedora-extras-commits at redhat.com  Tue Dec 27 09:29:10 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 27 Dec 2005 04:29:10 -0500
Subject: rpms/uim/FC-4 uim.spec,1.17,1.18
Message-ID: <200512270929.jBR9Tgwe004088@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	uim.spec 
Log Message:



Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-4/uim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- uim.spec	27 Dec 2005 08:58:45 -0000	1.17
+++ uim.spec	27 Dec 2005 09:29:10 -0000	1.18
@@ -8,7 +8,7 @@
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
+BuildRequires:	xorg-x11-devel
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
 BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
 BuildRequires:	emacs



From fedora-extras-commits at redhat.com  Tue Dec 27 11:34:19 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 06:34:19 -0500
Subject: rpms/python-setuptools - New directory
Message-ID: <200512271134.jBRBYLwj007693@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7685/python-setuptools

Log Message:
Directory /cvs/extras/rpms/python-setuptools added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 27 11:34:25 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 06:34:25 -0500
Subject: rpms/python-setuptools/devel - New directory
Message-ID: <200512271134.jBRBYR8a007708@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Log Message:
Directory /cvs/extras/rpms/python-setuptools/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 27 11:35:56 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 06:35:56 -0500
Subject: rpms/python-setuptools Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512271135.jBRBZwfK007742@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7730

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-setuptools


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 27 11:36:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 06:36:01 -0500
Subject: rpms/python-setuptools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200512271136.jBRBa3xN007762@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-setuptools


--- NEW 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 Dec 27 11:38:51 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 06:38:51 -0500
Subject: rpms/python-setuptools import.log,1.1,1.2
Message-ID: <200512271139.jBRBdNZp007832@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7797

Modified Files:
	import.log 
Log Message:
auto-import python-setuptools-0.6a8-1 on branch devel from python-setuptools-0.6a8-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Dec 2005 11:35:55 -0000	1.1
+++ import.log	27 Dec 2005 11:38:50 -0000	1.2
@@ -0,0 +1 @@
+python-setuptools-0_6a8-1:HEAD:python-setuptools-0.6a8-1.src.rpm:1135683502



From fedora-extras-commits at redhat.com  Tue Dec 27 11:38:56 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 06:38:56 -0500
Subject: rpms/python-setuptools/devel python-setuptools.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512271139.jBRBdSdh007836@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore sources 
Added Files:
	python-setuptools.spec 
Log Message:
auto-import python-setuptools-0.6a8-1 on branch devel from python-setuptools-0.6a8-1.src.rpm


--- NEW FILE python-setuptools.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-setuptools
Version:        0.6a8
Release:        1
Summary:        Download, build, install, upgrade, and uninstall Python packages

Group:          Development/Languages
License:        PSFL/ZPL
URL:            http://peak.telecommunity.com/DevCenter/setuptools
Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       python-abi = %{pyver}

%description
setuptools is a collection of enhancements to the Python distutils that allow
you to more easily build and distribute Python packages, especially ones that
have dependencies on other packages.

%prep
%setup -q -n setuptools-%{version}
sed -i '1s@#!python@#!/usr/bin/python@' easy_install.py

%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
find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; -print | while read file ; do sed -i '1d' $file ; done
#find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; | while read file ; do grep -q '^#!' $file && sed -i '1d' $file ; done
echo "setuptools-%{version}-py%{pyver}.egg" > $RPM_BUILD_ROOT%{python_sitelib}/setuptools.pth

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc api_tests.txt EasyInstall.txt pkg_resources.txt setuptools.txt
%{_bindir}/*
%{python_sitelib}/setuptools.pth
%{python_sitelib}/setuptools-%{version}-py%{pyver}.egg

%changelog
* Sat Dec 24 2005 Ignacio Vazquez-Abrams  0.6a8-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Dec 2005 11:36:01 -0000	1.1
+++ .cvsignore	27 Dec 2005 11:38:56 -0000	1.2
@@ -0,0 +1 @@
+setuptools-0.6a8.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Dec 2005 11:36:01 -0000	1.1
+++ sources	27 Dec 2005 11:38:56 -0000	1.2
@@ -0,0 +1 @@
+3eecdf66c1a2cf8a6556bc00b69d572a  setuptools-0.6a8.zip



From fedora-extras-commits at redhat.com  Tue Dec 27 12:02:49 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 07:02:49 -0500
Subject: rpms/python-setuptools/devel python-setuptools.spec,1.1,1.2
Message-ID: <200512271203.jBRC3MIK009555@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	python-setuptools.spec 
Log Message:
disttag


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/python-setuptools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-setuptools.spec	27 Dec 2005 11:38:56 -0000	1.1
+++ python-setuptools.spec	27 Dec 2005 12:02:49 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           python-setuptools
 Version:        0.6a8
-Release:        1
+Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Tue Dec 27 17:25:44 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 27 Dec 2005 12:25:44 -0500
Subject: rpms/dclib/devel dclib.spec,1.5,1.6
Message-ID: <200512271726.jBRHQHpL018379@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	dclib.spec 
Log Message:
rebuild



Index: dclib.spec
===================================================================
RCS file: /cvs/extras/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dclib.spec	10 Nov 2005 17:45:01 -0000	1.5
+++ dclib.spec	27 Dec 2005 17:25:44 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           dclib
 Version:        0.3.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Direct Connect file sharing library
 
 Group:          Applications/Internet
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Tue Dec 27 2005 Luke Macken  0.3.7-5
+- Rebuild
+
 * Thu Nov 10 2005 Luke Macken  0.3.7-4
 - Rebuild for new openssl
 



From fedora-extras-commits at redhat.com  Tue Dec 27 17:28:23 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 27 Dec 2005 12:28:23 -0500
Subject: rpms/naim/devel naim.spec,1.5,1.6
Message-ID: <200512271728.jBRHStrg018443@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	naim.spec 
Log Message:
rebuild



Index: naim.spec
===================================================================
RCS file: /cvs/extras/rpms/naim/devel/naim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- naim.spec	15 Dec 2005 19:25:55 -0000	1.5
+++ naim.spec	27 Dec 2005 17:28:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name: naim
 Version: 0.11.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: An ncurses-based console AIM, ICQ, IRC, and Lily client
 
 Group: Applications/Internet
@@ -38,6 +38,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Dec 27 2005 Luke Macken  0.11.8.1-2
+- Rebuild
+
 * Thu Dec 15 2005 Luke Macken  0.11.8.1-1
 - Bump to 0.11.8.1
 



From fedora-extras-commits at redhat.com  Tue Dec 27 17:40:57 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 27 Dec 2005 12:40:57 -0500
Subject: rpms/nethack/devel nethack.spec,1.9,1.10
Message-ID: <200512271741.jBRHfTcJ018504@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	nethack.spec 
Log Message:
rebuild



Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nethack.spec	24 Nov 2005 05:37:18 -0000	1.9
+++ nethack.spec	27 Dec 2005 17:40:56 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Tue Dec 27 2005 Luke Macken  3.4.3-6
+- Rebuild
+
 * Wed Nov 23 2005 Luke Macken  3.4.3-5
 - Keep the license in the game directory (Bug #173385)
 - Don't obsolete falconseye anymore (Bug #173385)



From fedora-extras-commits at redhat.com  Tue Dec 27 17:43:05 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 27 Dec 2005 12:43:05 -0500
Subject: rpms/pork/devel pork.spec,1.2,1.3
Message-ID: <200512271743.jBRHhbkt018566@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	pork.spec 
Log Message:
rebuild



Index: pork.spec
===================================================================
RCS file: /cvs/extras/rpms/pork/devel/pork.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pork.spec	15 Nov 2005 00:29:50 -0000	1.2
+++ pork.spec	27 Dec 2005 17:43:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pork
 Version:        0.99.8.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Console based AIM client that looks like ircII
 
 Group:          Applications/Internet
@@ -52,7 +52,10 @@
 
 
 %changelog
-* Mon Nov 14 2005 Luke Macken  - 0.99.8.1-4
+- Rebuild
+
+* Mon Nov 14 2005 Luke Macken  - 0.99.8.1-3
 - Documentation update
 
 * Sun Nov 13 2005 Luke Macken  - 0.99.8.1-2



From fedora-extras-commits at redhat.com  Tue Dec 27 17:45:21 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 27 Dec 2005 12:45:21 -0500
Subject: rpms/xprobe2/devel xprobe2.spec,1.3,1.4
Message-ID: <200512271745.jBRHjrE8018629@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	xprobe2.spec 
Log Message:
rebuild



Index: xprobe2.spec
===================================================================
RCS file: /cvs/extras/rpms/xprobe2/devel/xprobe2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xprobe2.spec	12 Nov 2005 19:33:26 -0000	1.3
+++ xprobe2.spec	27 Dec 2005 17:45:21 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           xprobe2
 Version:        0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Xprobe2 is an active operating system fingerprinting tool
 
 Group:          Applications/Internet
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Dec 27 2005 Luke Macken  0.3-4
+- Rebuild
+
 * Sat Nov 12 2005 Luke Macken  0.3-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Dec 27 18:30:28 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 27 Dec 2005 13:30:28 -0500
Subject: mock mock.py,1.31,1.32 mock.spec,1.13,1.14
Message-ID: <200512271830.jBRIUw3n020447@cvs-int.fedora.redhat.com>

Author: skvidal

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

Modified Files:
	mock.py mock.spec 
Log Message:

apply all of Andreas Thienemann's patches.

fixes rm -rf call to rm -rfv and fixes the mock man page in the package
makefile and specfile.



Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mock.py	12 Nov 2005 19:00:46 -0000	1.31
+++ mock.py	27 Dec 2005 18:30:26 -0000	1.32
@@ -179,7 +179,7 @@
             self._umount('dev/pts')
             
         if os.path.exists(self.basedir):
-            cmd = '%s -rf %s' % (self.config['rm'], self.basedir)
+            cmd = '%s -rfv %s' % (self.config['rm'], self.basedir)
             (retval, output) = self.do(cmd)
 
             if retval != 0:
@@ -589,7 +589,7 @@
         # purge the builddir, if it exists
         bd_out = '%s%s' % (self.rootdir, self.builddir)
         if os.path.exists(bd_out):
-            cmd = 'rm -rf %s' % self.builddir
+            cmd = 'rm -rfv %s' % self.builddir
             self.do_chroot(cmd, fatal=True)
     
         # create dir structure


Index: mock.spec
===================================================================
RCS file: /cvs/fedora/mock/mock.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mock.spec	4 Aug 2005 07:23:01 -0000	1.13
+++ mock.spec	27 Dec 2005 18:30:26 -0000	1.14
@@ -47,12 +47,16 @@
 %config(noreplace) %{_sysconfdir}/%{name}/*.cfg
 %{_bindir}/%{name}
 %{_libexecdir}/mock-yum
+%{_mandir}/man1/mock.1*
 %attr(04750, root, mock) %{_sbindir}/mock-helper
 %attr(02775, root, mock) %dir /var/lib/mock
 %{_libdir}/libselinux-mock.so
 
 
 %changelog
+* Tue Dec 27 2005 Seth Vidal 
+- add patch from Andreas Thienemann - adds man page
+
 * Sat Jun 11 2005 Seth Vidal 
 - security fix in mock-helper
 



From fedora-extras-commits at redhat.com  Tue Dec 27 18:30:34 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 27 Dec 2005 13:30:34 -0500
Subject: mock/docs Makefile,1.1,1.2
Message-ID: <200512271831.jBRIV4vH020450@cvs-int.fedora.redhat.com>

Author: skvidal

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

Modified Files:
	Makefile 
Log Message:

apply all of Andreas Thienemann's patches.

fixes rm -rf call to rm -rfv and fixes the mock man page in the package
makefile and specfile.



Index: Makefile
===================================================================
RCS file: /cvs/fedora/mock/docs/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	5 Aug 2005 08:12:44 -0000	1.1
+++ Makefile	27 Dec 2005 18:30:31 -0000	1.2
@@ -5,6 +5,6 @@
 	rm -f *.pyc *.pyo *~
 
 install:
-	mkdir -p $(DESTDIR)/usr/share/man/man{1}
+	mkdir -p $(DESTDIR)/usr/share/man/man1
 	install -m 644 mock.1 $(DESTDIR)/usr/share/man/man1/mock.1
 



From fedora-extras-commits at redhat.com  Tue Dec 27 20:13:14 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 27 Dec 2005 15:13:14 -0500
Subject: rpms/lirc/devel lirc.spec,1.10,1.11
Message-ID: <200512272013.jBRKDkdG024136@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	lirc.spec 
Log Message:
* Tue Dec 27 2005 Ville Skytt?? 
- Split kernel modules into separate package.
- Disable debugging features.



Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lirc.spec	14 Dec 2005 21:07:23 -0000	1.10
+++ lirc.spec	27 Dec 2005 20:13:13 -0000	1.11
@@ -1,18 +1,12 @@
-# Driver TODO, sometime maybe:
-# - caraca (req: caraca, http://caraca.sf.net/)
-# - irman: (req: libirman, http://lirc.sf.net/software/snapshots/)
-# Other TODO:
+# TODO:
+# - caraca driver (req: caraca, http://caraca.sf.net/)
+# - irman driver (req: libirman, http://lirc.sf.net/software/snapshots/)
 # - move to -devel (?): irw, *mode2, others?
 #   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
 #   - does someone actually need xmode2/smode2 for something?
+# - bcond_without for alsa, portaudio, x?
 # - don't run as root and/or create dedicated group, reduce fifo permissions?
 # - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc.
-# - Verify that the kernel modules work and correct /dev entries get created
-#   automagically with proper permissions etc.
-
-%{!?kver: %{expand: %%define kver %(uname -r)}}
-%define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu}
-%define mdir /lib/modules/%{kver}/extra
 
 Name:           lirc
 Version:        0.8.0
@@ -29,14 +23,12 @@
 Patch0:         %{name}-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{!?_with_modules:1}
 BuildRequires:  %{__perl}
 BuildRequires:  alsa-lib-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libusb-devel
 BuildRequires:  portaudio-devel >= 18
 Build%{?_with_svgalib:Requires}%{!?_with_svgalib:Conflicts}: svgalib-devel
-%endif
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
@@ -57,43 +49,12 @@
 %description    devel
 %{summary}.
 
-%package     -n kernel-module-%{name}-%{kver}
-Summary:        Kernel modules for LIRC
-Group:          System Environment/Kernel
-Provides:       kernel-module
-Provides:       kernel-module-%{name} = %{version}
-%if 0%{?_with_modules:1}
-BuildRequires:  kernel-devel-%{_target_cpu} = %{kver}
-%endif
-Requires:       %{name} = %{version}
-Requires:       module-init-tools
-Requires:       kernel-%{_target_cpu} = %{kver}
-Requires:       udev
-
-%description -n kernel-module-%{name}-%{kver}
-LIRC kernel modules built for kernel
-%{kver} (%{_target_cpu}).
-
 
 %prep
 %setup -q -n %{name}-%{version}pre2
 %patch0 -p1
-
-# *cough*
-echo %{kver} | grep -q _FC5 && \
-   sed -i -e 's/KERNEL_VERSION(2,\s*6,\s*15)/KERNEL_VERSION(2,6,14)/' \
-   drivers/kcompat.h drivers/lirc_{imon,sasem}/lirc_*.c
-
 chmod 644 contrib/*
-
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
-
-# cmdir: unknown symbols (cmdir_{read,write}, set_tx_channels)
-# gpio: missing drivers/media/video/{bttv,bttvp}.h in kernel-devel
-for drv in cmdir gpio ; do
-  sed -i -e "/^\\s*(lirc_dev lirc_$drv)/d" -e "/^\\s*lirc_$drv/d" configure*
-done
-
 touch -r aclocal.m4 configure.in # avoid autofoo re-run
 
 
@@ -101,31 +62,18 @@
 %configure \
   --disable-static \
   --disable-dependency-tracking \
-  --enable-debug \
   --enable-sandboxed \
   --with-syslog=LOG_DAEMON \
-%if 0%{?_with_modules:1}
-  --with-kerneldir=%{ksrc} \
-  --with-moduledir=%{mdir}/%{name} \
-  --with-driver=all
-make %{?_smp_mflags} -C drivers
-%else
   --with-driver=userspace
 make %{?_smp_mflags}
-%endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 
-%if 0%{?_with_modules:1}
-make install DESTDIR=$RPM_BUILD_ROOT -C drivers
-# executable here to allow stripping, fixed later in %%files
-chmod +x $RPM_BUILD_ROOT%{mdir}/%{name}/*.ko
-
-%else
 make install DESTDIR=$RPM_BUILD_ROOT
 %{!?_with_svgalib:rm $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1*}
+
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc
 %{__perl} -pi -e \
   's|/etc/|%{_sysconfdir}/|g ;
@@ -133,16 +81,19 @@
    s|/usr/sbin/|%{_sbindir}/|g' \
   $RPM_BUILD_ROOT%{_initrddir}/lirc
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lirc
+
 mkdir __docs
 cp -pR doc contrib __docs
 cd __docs
 rm -rf doc/Makefile* doc/.libs doc/man* contrib/lirc.* contrib/sendxevent.c
 cd ..
+
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf
+
 install -dm 755 $RPM_BUILD_ROOT/dev
 touch $RPM_BUILD_ROOT/dev/lirc{d,m}
+
 rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
-%endif
 
 
 %clean
@@ -153,9 +104,6 @@
 /sbin/ldconfig
 /sbin/chkconfig --add lirc
 
-%post -n kernel-module-%{name}-%{kver}
-depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
-
 %preun
 if [ $1 -eq 0 ] ; then
   %{_initrddir}/lirc stop >/dev/null || :
@@ -168,11 +116,7 @@
   %{_initrddir}/lirc try-restart >/dev/null || :
 fi
 
-%postun -n kernel-module-%{name}-%{kver}
-depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
-
 
-%if 0%{!?_with_modules:1}
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO remotes __docs/*
@@ -192,16 +136,13 @@
 %defattr(-,root,root,-)
 %{_includedir}/lirc/
 %{_libdir}/liblirc_client.so
-%endif
-
-%if 0%{?_with_modules:1}
-%files -n kernel-module-%{name}-%{kver}
-%defattr(644,root,root,755)
-%{mdir}/
-%endif
 
 
 %changelog
+* Tue Dec 27 2005 Ville Skytt?? 
+- Split kernel modules into separate package.
+- Disable debugging features.
+
 * Wed Dec 14 2005 Ville Skytt??  - 0.8.0-0.2.pre2
 - 0.8.0pre2, kernel >= 2.6.15 USB patch applied upstream.
 - lirc_clientd renamed to lircrcd.



From fedora-extras-commits at redhat.com  Tue Dec 27 21:55:18 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 27 Dec 2005 16:55:18 -0500
Subject: owners owners.list,1.483,1.484
Message-ID: <200512272155.jBRLtp2G025922@cvs-int.fedora.redhat.com>

Author: chabotc

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

Modified Files:
	owners.list 
Log Message:
Added chabotc at xs4all.nl for buoh



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -r1.483 -r1.484
--- owners.list	26 Dec 2005 16:32:58 -0000	1.483
+++ owners.list	27 Dec 2005 21:55:18 -0000	1.484
@@ -1325,3 +1325,4 @@
 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|buoh|Online comics reader|chabotc at xs4all.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 27 22:10:48 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 27 Dec 2005 17:10:48 -0500
Subject: rpms/buoh - New directory
Message-ID: <200512272210.jBRMAoLm027615@cvs-int.fedora.redhat.com>

Author: chabotc

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

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




From fedora-extras-commits at redhat.com  Tue Dec 27 22:10:54 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 27 Dec 2005 17:10:54 -0500
Subject: rpms/buoh/devel - New directory
Message-ID: <200512272210.jBRMAu01027630@cvs-int.fedora.redhat.com>

Author: chabotc

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

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




From fedora-extras-commits at redhat.com  Tue Dec 27 22:12:27 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 27 Dec 2005 17:12:27 -0500
Subject: rpms/buoh Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512272212.jBRMCUVU027665@cvs-int.fedora.redhat.com>

Author: chabotc

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 27 22:12:36 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 27 Dec 2005 17:12:36 -0500
Subject: rpms/buoh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200512272212.jBRMCcHQ027685@cvs-int.fedora.redhat.com>

Author: chabotc

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

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


--- NEW 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 Dec 27 22:14:23 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 27 Dec 2005 17:14:23 -0500
Subject: rpms/buoh import.log,1.1,1.2
Message-ID: <200512272214.jBRMEuef027789@cvs-int.fedora.redhat.com>

Author: chabotc

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/buoh/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Dec 2005 22:12:23 -0000	1.1
+++ import.log	27 Dec 2005 22:14:23 -0000	1.2
@@ -0,0 +1 @@
+buoh-0_8_1-3:HEAD:buoh-0.8.1-3.src.rpm:1135721668



From fedora-extras-commits at redhat.com  Tue Dec 27 22:14:29 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 27 Dec 2005 17:14:29 -0500
Subject: rpms/buoh/devel buoh.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200512272215.jBRMF1XY027795@cvs-int.fedora.redhat.com>

Author: chabotc

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

Modified Files:
	.cvsignore sources 
Added Files:
	buoh.spec 
Log Message:
auto-import buoh-0.8.1-3 on branch devel from buoh-0.8.1-3.src.rpm


--- NEW FILE buoh.spec ---
Name:             buoh
License:          GPL
Group:            Applications/Internet
Version:          0.8.1
Release:          3
Summary:          Online comics reader
URL:              http://buoh.steve-o.org/
Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    desktop-file-utils,perl, perl-XML-Parser, gettext, gtk2-devel, libsoup-devel, libgnomeui-devel, GConf2-devel
Requires(post):   GConf2
Requires(postun): GConf2

%description
Buoh is a reader for online strips comics. It has a number of features,
including: Selecting your favorites comic through a list of more than 130
comics, easy & simple an eye-candy view of an online comic, browsing over
the comic strip archives.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
/usr/bin/install -m 644 $RPM_BUILD_ROOT%{_datadir}/buoh/pixmaps/buoh*.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/

perl -pi -e "s,Terminal=0,Terminal=false,g" $RPM_BUILD_ROOT%{_datadir}/applications/buoh.desktop
desktop-file-install --delete-original			\
  --vendor=gnome								\
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora						\
  $RPM_BUILD_ROOT%{_datadir}/applications/buoh.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/buoh.schemas > /dev/null  || :
killall -HUP gconfd-2 &>/dev/null || :

%postun
if [ "$1" -gt 1 ]; then
  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/buoh.schemas >/dev/null || :
  killall -HUP gconfd-2 &>/dev/null || :
fi

%preun
if [ "$1" -eq 0 ]; then
  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/buoh.schemas > /dev/null || :
  killall -HUP gconfd-2 &>/dev/null || :
fi
		  
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING INSTALL README NEWS TODO
%dir %{_datadir}/buoh
%dir %{_datadir}/buoh/comics
%dir %{_datadir}/buoh/ui
%{_bindir}/buoh
%{_sysconfdir}/gconf/schemas/buoh.schemas
%{_datadir}/applications/gnome-buoh.desktop
%{_datadir}/buoh/comics/comics.xml
%{_datadir}/buoh/ui/buoh-ui.xml
%{_datadir}/buoh/pixmaps/buoh*.png
%{_datadir}/pixmaps/buoh*.png

%changelog
* Mon Dec 27 2005 - Chris Chabot  - 0.8.1-3
- Added desktop file utils to PreReq, and used to install .desktop file
  with Fedora category
- Copy icon files to _datadir/pixmaps so desktop envirioment can find them
- Quick fix up to .desktop file to Terminal=false instead of Terminal=0
  following freedesktop standard
- Removed ldconfig from post,prerun and postrun, this package has
  no .so's

* Mon Dec 26 2005 - Chris Chabot  - 0.8.1-2
- Added gconf uninstall rules on upgrade and uninstall
- Commented out hard requirements, leaving them to rpm's autodep

* Fri Dec 23 2005 - Chris Chabot  - 0.8.1-1
- Updated to upstream 0.8.1
- Upstream changed required gtk+ version to 2.6

* Fri Dec 23 2005 - Chris Chabot  - 0.8-3
- Moved "rm -rf $RPM_BUILD_ROOT" from prep to install
- Removed "unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL" since
  this shouldn't be required (it has its own shell env)

* Tue Nov 15 2005 - Chris Chabot  - 0.8-2
- Changed %makeinstall into make install DESTDIR=$RPM_BUILD_ROOT,
  was a bug in the makefiles that caused make install to install
  buoh's icons and xml files in /usr/share, not in the build root.

* Mon Nov 14 2005 - Chris Chabot  - 0.8-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Dec 2005 22:12:36 -0000	1.1
+++ .cvsignore	27 Dec 2005 22:14:29 -0000	1.2
@@ -0,0 +1 @@
+buoh-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Dec 2005 22:12:36 -0000	1.1
+++ sources	27 Dec 2005 22:14:29 -0000	1.2
@@ -0,0 +1 @@
+5d05a51d7c6616d93e93df3465b49fe7  buoh-0.8.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 22:15:52 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 17:15:52 -0500
Subject: owners owners.list,1.484,1.485
Message-ID: <200512272216.jBRMGObN027844@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	owners.list 
Log Message:
python-setuptools


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -r1.484 -r1.485
--- owners.list	27 Dec 2005 21:55:18 -0000	1.484
+++ owners.list	27 Dec 2005 22:15:51 -0000	1.485
@@ -1015,6 +1015,7 @@
 Fedora Extras|python-psyco|Python specializing compiler|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-quixote|A highly Pythonic Web application framework|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-reportlab|Python PDF generation library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|python-setuptools|Download, build, install, upgrade, and uninstall Python packages|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-simpletal|Alternative implementation of Zope Page Templates|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-simpy|Python simulation framework|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|python-sqlite|Python bindings for SQLite|thomas at apestaart.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 27 22:54:20 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 17:54:20 -0500
Subject: rpms/libqalculate/devel .cvsignore, 1.4, 1.5 libqalculate.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200512272254.jBRMsqVX027936@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	.cvsignore libqalculate.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Nov 2005 01:26:49 -0000	1.4
+++ .cvsignore	27 Dec 2005 22:54:20 -0000	1.5
@@ -1 +1 @@
-libqalculate-0.9.0.tar.gz
+libqalculate-0.9.2.tar.gz


Index: libqalculate.spec
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/devel/libqalculate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libqalculate.spec	6 Nov 2005 01:26:49 -0000	1.5
+++ libqalculate.spec	27 Dec 2005 22:54:20 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Multi-purpose calculator library
 Name: libqalculate
-Version: 0.9.0
+Version: 0.9.2
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -73,6 +73,9 @@
 %{_bindir}/qalc
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sat Nov 05 2005 Deji Akingunola  - 0.9.0-1
 - Upgrade to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Nov 2005 01:26:49 -0000	1.4
+++ sources	27 Dec 2005 22:54:20 -0000	1.5
@@ -1 +1 @@
-1c730ef9865fc5ef850ae7c7dbe4eb93  libqalculate-0.9.0.tar.gz
+f7a67bb97e943641868fd1ddf395742d  libqalculate-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 22:57:07 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 17:57:07 -0500
Subject: rpms/libqalculate/FC-4 .cvsignore, 1.4, 1.5 libqalculate.spec, 1.6, 
	1.7 sources, 1.4, 1.5
Message-ID: <200512272257.jBRMve0n028027@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	.cvsignore libqalculate.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Nov 2005 01:38:02 -0000	1.4
+++ .cvsignore	27 Dec 2005 22:57:06 -0000	1.5
@@ -1 +1 @@
-libqalculate-0.9.0.tar.gz
+libqalculate-0.9.2.tar.gz


Index: libqalculate.spec
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-4/libqalculate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libqalculate.spec	6 Nov 2005 01:38:02 -0000	1.6
+++ libqalculate.spec	27 Dec 2005 22:57:06 -0000	1.7
@@ -1,6 +1,6 @@
 Summary: Multi-purpose calculator library
 Name: libqalculate
-Version: 0.9.0
+Version: 0.9.2
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -73,6 +73,9 @@
 %{_bindir}/qalc
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sat Nov 05 2005 Deji Akingunola  - 0.9.0-1
 - Upgrade to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Nov 2005 01:38:02 -0000	1.4
+++ sources	27 Dec 2005 22:57:06 -0000	1.5
@@ -1 +1 @@
-1c730ef9865fc5ef850ae7c7dbe4eb93  libqalculate-0.9.0.tar.gz
+f7a67bb97e943641868fd1ddf395742d  libqalculate-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 22:59:07 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 17:59:07 -0500
Subject: rpms/libqalculate/FC-3 .cvsignore, 1.5, 1.6 libqalculate.spec, 1.6, 
	1.7 sources, 1.5, 1.6
Message-ID: <200512272259.jBRMxe46028101@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	.cvsignore libqalculate.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Nov 2005 01:24:29 -0000	1.5
+++ .cvsignore	27 Dec 2005 22:59:07 -0000	1.6
@@ -1,2 +1 @@
-libqalculate-0.9.0.tar.gz
-libqalculate-gnomevfs.patch
+libqalculate-0.9.2.tar.gz


Index: libqalculate.spec
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-3/libqalculate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libqalculate.spec	7 Nov 2005 01:24:29 -0000	1.6
+++ libqalculate.spec	27 Dec 2005 22:59:07 -0000	1.7
@@ -1,6 +1,6 @@
 Summary: Multi-purpose calculator library
 Name: libqalculate
-Version: 0.9.0
+Version: 0.9.2
 Release: 2%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -75,6 +75,9 @@
 %{_bindir}/qalc
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sun Nov 06 2005 Deji Akingunola  - 0.9.0-2
 - Fix for gnome-vfs2 < 2.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Nov 2005 01:24:29 -0000	1.5
+++ sources	27 Dec 2005 22:59:07 -0000	1.6
@@ -1,2 +1 @@
-1c730ef9865fc5ef850ae7c7dbe4eb93  libqalculate-0.9.0.tar.gz
-54ba093ce9723e517ee76cc883749a4b  libqalculate-gnomevfs.patch
+f7a67bb97e943641868fd1ddf395742d  libqalculate-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 23:04:41 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:04:41 -0500
Subject: rpms/libqalculate/FC-3 libqalculate.spec,1.7,1.8
Message-ID: <200512272306.jBRN66Bk029763@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	libqalculate.spec 
Log Message:
Release number should be '1' not '2'



Index: libqalculate.spec
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-3/libqalculate.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libqalculate.spec	27 Dec 2005 22:59:07 -0000	1.7
+++ libqalculate.spec	27 Dec 2005 23:04:41 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Multi-purpose calculator library
 Name: libqalculate
 Version: 0.9.2
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://qalculate.sourceforge.net/



From fedora-extras-commits at redhat.com  Tue Dec 27 23:12:13 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:12:13 -0500
Subject: rpms/qalculate-gtk/devel .cvsignore, 1.4, 1.5 qalculate-gtk.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200512272312.jBRNCkvd029846@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/qalculate-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29822

Modified Files:
	.cvsignore qalculate-gtk.spec sources 
Log Message:
gnome-vfs2 patch no longer needed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Nov 2005 01:47:33 -0000	1.4
+++ .cvsignore	27 Dec 2005 23:12:13 -0000	1.5
@@ -1 +1 @@
-qalculate-gtk-0.9.0.tar.gz
+qalculate-gtk-0.9.2.tar.gz


Index: qalculate-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/devel/qalculate-gtk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qalculate-gtk.spec	6 Nov 2005 01:47:33 -0000	1.5
+++ qalculate-gtk.spec	27 Dec 2005 23:12:13 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: A multi-purpose desktop calculator for GNU/Linux
 Name: qalculate-gtk
-Version: 0.9.0
+Version: 0.9.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
@@ -62,6 +62,9 @@
 %{_datadir}/qalculate-gtk/
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sat Nov 05 2005 Deji Akingunola  - 0.9.0.1
 - Upgrade to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Nov 2005 01:47:33 -0000	1.4
+++ sources	27 Dec 2005 23:12:13 -0000	1.5
@@ -1 +1 @@
-964d42e83d00929593439f73e604a185  qalculate-gtk-0.9.0.tar.gz
+287cb244e13f7c12074f89ca8f008528  qalculate-gtk-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 23:14:41 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:14:41 -0500
Subject: rpms/libqalculate/FC-3 libqalculate.spec,1.8,1.9
Message-ID: <200512272315.jBRNFTTA029941@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	libqalculate.spec 
Log Message:
Remove gnome2-vfs patch



Index: libqalculate.spec
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-3/libqalculate.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libqalculate.spec	27 Dec 2005 23:04:41 -0000	1.8
+++ libqalculate.spec	27 Dec 2005 23:14:41 -0000	1.9
@@ -6,7 +6,6 @@
 Group: System Environment/Libraries
 URL: http://qalculate.sourceforge.net/
 Source0: http://dl.sf.net/sourceforge/qalculate/libqalculate-%{version}.tar.gz
-Patch0: libqalculate-gnomevfs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel, cln-devel
 BuildRequires: libxml2-devel >= 2.3.8
@@ -39,7 +38,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .gnomevfs
 
 %build
 %configure --disable-static
@@ -77,6 +75,7 @@
 %changelog
 * Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
 - Upgrade to new version
+- gnome-vfs patch not needed any more
 
 * Sun Nov 06 2005 Deji Akingunola  - 0.9.0-2
 - Fix for gnome-vfs2 < 2.10



From fedora-extras-commits at redhat.com  Tue Dec 27 23:17:33 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:17:33 -0500
Subject: rpms/libqalculate/FC-3 libqalculate.spec,1.9,1.10
Message-ID: <200512272318.jBRNI6ka029994@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	libqalculate.spec 
Log Message:
Bump relaese number



Index: libqalculate.spec
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-3/libqalculate.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libqalculate.spec	27 Dec 2005 23:14:41 -0000	1.9
+++ libqalculate.spec	27 Dec 2005 23:17:33 -0000	1.10
@@ -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/



From fedora-extras-commits at redhat.com  Tue Dec 27 23:22:03 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:22:03 -0500
Subject: rpms/qalculate-gtk/FC-4 .cvsignore, 1.3, 1.4 qalculate-gtk.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200512272322.jBRNMa4b030097@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/qalculate-gtk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30071

Modified Files:
	.cvsignore qalculate-gtk.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Nov 2005 01:49:58 -0000	1.3
+++ .cvsignore	27 Dec 2005 23:22:03 -0000	1.4
@@ -1 +1 @@
-qalculate-gtk-0.9.0.tar.gz
+qalculate-gtk-0.9.2.tar.gz


Index: qalculate-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/FC-4/qalculate-gtk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qalculate-gtk.spec	6 Nov 2005 01:49:58 -0000	1.4
+++ qalculate-gtk.spec	27 Dec 2005 23:22:03 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: A multi-purpose desktop calculator for GNU/Linux
 Name: qalculate-gtk
-Version: 0.9.0
+Version: 0.9.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
@@ -62,6 +62,9 @@
 %{_datadir}/qalculate-gtk/
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sat Nov 05 2005 Deji Akingunola  - 0.9.0.1
 - Upgrade to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Nov 2005 01:49:58 -0000	1.3
+++ sources	27 Dec 2005 23:22:03 -0000	1.4
@@ -1 +1 @@
-964d42e83d00929593439f73e604a185  qalculate-gtk-0.9.0.tar.gz
+287cb244e13f7c12074f89ca8f008528  qalculate-gtk-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 23:25:07 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:25:07 -0500
Subject: rpms/qalculate-gtk/FC-3 .cvsignore, 1.4, 1.5 qalculate-gtk.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200512272325.jBRNPdjJ030171@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/qalculate-gtk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30150

Modified Files:
	.cvsignore qalculate-gtk.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Nov 2005 01:28:56 -0000	1.4
+++ .cvsignore	27 Dec 2005 23:25:06 -0000	1.5
@@ -1,2 +1 @@
-qalculate-gtk-0.9.0.tar.gz
-qalculate-gtk.patch
+qalculate-gtk-0.9.2.tar.gz


Index: qalculate-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/FC-3/qalculate-gtk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qalculate-gtk.spec	7 Nov 2005 01:28:56 -0000	1.5
+++ qalculate-gtk.spec	27 Dec 2005 23:25:06 -0000	1.6
@@ -1,12 +1,11 @@
 Summary: A multi-purpose desktop calculator for GNU/Linux
 Name: qalculate-gtk
-Version: 0.9.0
-Release: 2%{?dist}
+Version: 0.9.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://qalculate.sourceforge.net/
 Source: http://dl.sf.net/qalculate/qalculate-gtk-%{version}.tar.gz
-Patch0: qalculate-gtk.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgnome-devel, libglade2-devel, libqalculate-devel
 BuildRequires: gettext, desktop-file-utils, scrollkeeper
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .
 
 %build
 %configure 
@@ -64,6 +62,10 @@
 %{_datadir}/qalculate-gtk/
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+- Remove gnome-vfs patch, fixed in this version
+
 * Sun Nov 06 2005 Deji Akingunola  - 0.9.0-2
 - Fix build issue on FC-3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Nov 2005 01:28:56 -0000	1.4
+++ sources	27 Dec 2005 23:25:06 -0000	1.5
@@ -1,2 +1 @@
-964d42e83d00929593439f73e604a185  qalculate-gtk-0.9.0.tar.gz
-59893873c247eca78fdabf7ebf49a1d4  qalculate-gtk.patch
+287cb244e13f7c12074f89ca8f008528  qalculate-gtk-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 23:27:45 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:27:45 -0500
Subject: rpms/qalculate-kde/devel .cvsignore, 1.3, 1.4 qalculate-kde.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200512272328.jBRNSHaF030254@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/qalculate-kde/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30231

Modified Files:
	.cvsignore qalculate-kde.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Nov 2005 02:31:25 -0000	1.3
+++ .cvsignore	27 Dec 2005 23:27:45 -0000	1.4
@@ -1 +1 @@
-qalculate-kde-0.9.0.tar.gz
+qalculate-kde-0.9.2.tar.gz


Index: qalculate-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/devel/qalculate-kde.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qalculate-kde.spec	6 Nov 2005 02:31:25 -0000	1.3
+++ qalculate-kde.spec	27 Dec 2005 23:27:45 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: A multi-purpose desktop calculator for GNU/Linux
 Name: qalculate-kde
-Version: 0.9.0
+Version: 0.9.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
@@ -61,6 +61,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sat Nov 05 2005 Deji Akingunola  - 0.9.0-1
 - Upgrade to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Nov 2005 02:31:25 -0000	1.3
+++ sources	27 Dec 2005 23:27:45 -0000	1.4
@@ -1 +1 @@
-00bec7f342212ac53d348c836e8cf040  qalculate-kde-0.9.0.tar.gz
+f77569e3396e3af769526ded6393c0e1  qalculate-kde-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 23:36:09 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:36:09 -0500
Subject: rpms/qalculate-kde/FC-4 .cvsignore, 1.3, 1.4 qalculate-kde.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200512272336.jBRNafHA030348@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/qalculate-kde/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30327

Modified Files:
	.cvsignore qalculate-kde.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Nov 2005 02:33:49 -0000	1.3
+++ .cvsignore	27 Dec 2005 23:36:09 -0000	1.4
@@ -1 +1 @@
-qalculate-kde-0.9.0.tar.gz
+qalculate-kde-0.9.2.tar.gz


Index: qalculate-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/FC-4/qalculate-kde.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qalculate-kde.spec	6 Nov 2005 02:33:49 -0000	1.3
+++ qalculate-kde.spec	27 Dec 2005 23:36:09 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: A multi-purpose desktop calculator for GNU/Linux
 Name: qalculate-kde
-Version: 0.9.0
+Version: 0.9.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
@@ -61,6 +61,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sat Nov 05 2005 Deji Akingunola  - 0.9.0-1
 - Upgrade to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Nov 2005 02:33:49 -0000	1.3
+++ sources	27 Dec 2005 23:36:09 -0000	1.4
@@ -1 +1 @@
-00bec7f342212ac53d348c836e8cf040  qalculate-kde-0.9.0.tar.gz
+f77569e3396e3af769526ded6393c0e1  qalculate-kde-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 23:39:44 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:39:44 -0500
Subject: rpms/qalculate-kde/FC-3 .cvsignore, 1.3, 1.4 qalculate-kde.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200512272340.jBRNeGqE030426@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/qalculate-kde/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30405

Modified Files:
	.cvsignore qalculate-kde.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Nov 2005 02:32:42 -0000	1.3
+++ .cvsignore	27 Dec 2005 23:39:43 -0000	1.4
@@ -1 +1 @@
-qalculate-kde-0.9.0.tar.gz
+qalculate-kde-0.9.2.tar.gz


Index: qalculate-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/FC-3/qalculate-kde.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qalculate-kde.spec	6 Nov 2005 02:32:42 -0000	1.3
+++ qalculate-kde.spec	27 Dec 2005 23:39:43 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: A multi-purpose desktop calculator for GNU/Linux
 Name: qalculate-kde
-Version: 0.9.0
+Version: 0.9.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
@@ -61,6 +61,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sat Nov 05 2005 Deji Akingunola  - 0.9.0-1
 - Upgrade to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Nov 2005 02:32:42 -0000	1.3
+++ sources	27 Dec 2005 23:39:43 -0000	1.4
@@ -1 +1 @@
-00bec7f342212ac53d348c836e8cf040  qalculate-kde-0.9.0.tar.gz
+f77569e3396e3af769526ded6393c0e1  qalculate-kde-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 08:09:46 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 28 Dec 2005 03:09:46 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.6, 1.7 rxvt-unicode.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <200512280810.jBS8ALBv013973@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13915/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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Dec 2005 01:09:23 -0000	1.6
+++ .cvsignore	28 Dec 2005 08:09:46 -0000	1.7
@@ -1 +1 @@
-rxvt-unicode-6.0.tar.bz2
+rxvt-unicode-6.1.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rxvt-unicode.spec	25 Dec 2005 01:09:23 -0000	1.11
+++ rxvt-unicode.spec	28 Dec 2005 08:09:46 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.0
+Version:        6.1
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -70,6 +70,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Dec 28 2005 Andreas Bierfert 
+6.1-1
+- version upgrade
+
 * Sun Dec 25 2005 Andreas Bierfert 
 6.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Dec 2005 01:09:23 -0000	1.6
+++ sources	28 Dec 2005 08:09:46 -0000	1.7
@@ -1 +1 @@
-7d00ac0675290a0b726d32d912e2cfcd  rxvt-unicode-6.0.tar.bz2
+9aae8858e0c123e5c618ab0f41da1bdc  rxvt-unicode-6.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 28 08:09:40 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 28 Dec 2005 03:09:40 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.6, 1.7 rxvt-unicode.spec, 1.8, 
	1.9 sources, 1.6, 1.7
Message-ID: <200512280810.jBS8AGMr013970@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-serv13915/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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Dec 2005 01:08:55 -0000	1.6
+++ .cvsignore	28 Dec 2005 08:09:40 -0000	1.7
@@ -1 +1 @@
-rxvt-unicode-6.0.tar.bz2
+rxvt-unicode-6.1.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rxvt-unicode.spec	25 Dec 2005 01:08:55 -0000	1.8
+++ rxvt-unicode.spec	28 Dec 2005 08:09:40 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.0
+Version:        6.1
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Dec 28 2005 Andreas Bierfert 
+6.1-1
+- version upgrade
+
 * Sun Dec 25 2005 Andreas Bierfert 
 6.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Dec 2005 01:08:55 -0000	1.6
+++ sources	28 Dec 2005 08:09:40 -0000	1.7
@@ -1 +1 @@
-7d00ac0675290a0b726d32d912e2cfcd  rxvt-unicode-6.0.tar.bz2
+9aae8858e0c123e5c618ab0f41da1bdc  rxvt-unicode-6.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 28 08:09:19 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 28 Dec 2005 03:09:19 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.6, 1.7 rxvt-unicode.spec, 1.8, 
	1.9 sources, 1.6, 1.7
Message-ID: <200512280810.jBS8ANiv013980@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-serv13915/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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Dec 2005 01:08:37 -0000	1.6
+++ .cvsignore	28 Dec 2005 08:09:18 -0000	1.7
@@ -1 +1 @@
-rxvt-unicode-6.0.tar.bz2
+rxvt-unicode-6.1.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rxvt-unicode.spec	25 Dec 2005 01:08:37 -0000	1.8
+++ rxvt-unicode.spec	28 Dec 2005 08:09:18 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.0
+Version:        6.1
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Dec 28 2005 Andreas Bierfert 
+6.1-1
+- version upgrade
+
 * Sun Dec 25 2005 Andreas Bierfert 
 6.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Dec 2005 01:08:37 -0000	1.6
+++ sources	28 Dec 2005 08:09:18 -0000	1.7
@@ -1 +1 @@
-7d00ac0675290a0b726d32d912e2cfcd  rxvt-unicode-6.0.tar.bz2
+9aae8858e0c123e5c618ab0f41da1bdc  rxvt-unicode-6.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 28 08:32:08 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 28 Dec 2005 03:32:08 -0500
Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.29,1.30
Message-ID: <200512280832.jBS8WeUK014174@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14157

Modified Files:
	sylpheed-claws.spec 
Log Message:
- fix path



Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sylpheed-claws.spec	26 Dec 2005 22:42:18 -0000	1.29
+++ sylpheed-claws.spec	28 Dec 2005 08:32:08 -0000	1.30
@@ -82,7 +82,7 @@
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
-%{__install} %{_builddir}/%{name}-%{version}/sylpheed-claws.png \
+%{__install} %{_builddir}/%{name}-%{version}-rc2/sylpheed-claws.png \
 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 
 %clean



From fedora-extras-commits at redhat.com  Wed Dec 28 08:46:36 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 28 Dec 2005 03:46:36 -0500
Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.30,1.31
Message-ID: <200512280847.jBS8l8Vo014258@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14241

Modified Files:
	sylpheed-claws.spec 
Log Message:
- no manual for now



Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sylpheed-claws.spec	28 Dec 2005 08:32:08 -0000	1.30
+++ sylpheed-claws.spec	28 Dec 2005 08:46:36 -0000	1.31
@@ -99,8 +99,8 @@
 %{_libdir}/sylpheed-claws/plugins/*.so
 %exclude %{_libdir}/sylpheed-claws/plugins/*.a
 %{_datadir}/pixmaps/*
-%dir %{_datadir}/sylpheed-claws/
-%{_datadir}/sylpheed-claws/*
+#%dir %{_datadir}/sylpheed-claws/
+#%{_datadir}/sylpheed-claws/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*
 #%{_datadir}/icons/*



From fedora-extras-commits at redhat.com  Wed Dec 28 09:46:17 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Wed, 28 Dec 2005 04:46:17 -0500
Subject: rpms/buoh/devel buoh.spec,1.1,1.2
Message-ID: <200512280946.jBS9knBn016616@cvs-int.fedora.redhat.com>

Author: chabotc

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

Modified Files:
	buoh.spec 
Log Message:
Changed vendor string to fedora



Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buoh.spec	27 Dec 2005 22:14:29 -0000	1.1
+++ buoh.spec	28 Dec 2005 09:46:16 -0000	1.2
@@ -2,7 +2,7 @@
 License:          GPL
 Group:            Applications/Internet
 Version:          0.8.1
-Release:          3
+Release:          4
 Summary:          Online comics reader
 URL:              http://buoh.steve-o.org/
 Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.gz
@@ -34,7 +34,7 @@
 
 perl -pi -e "s,Terminal=0,Terminal=false,g" $RPM_BUILD_ROOT%{_datadir}/applications/buoh.desktop
 desktop-file-install --delete-original			\
-  --vendor=gnome								\
+  --vendor=fedora								\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora						\
   $RPM_BUILD_ROOT%{_datadir}/applications/buoh.desktop
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/buoh*.png
 
 %changelog
+* Web Dec 28 2005 - Chris Chabot  - 0.8.1-4
+- Changed desktop entry vendor to fedora
+
 * Mon Dec 27 2005 - Chris Chabot  - 0.8.1-3
 - Added desktop file utils to PreReq, and used to install .desktop file
   with Fedora category



From fedora-extras-commits at redhat.com  Wed Dec 28 10:27:10 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 28 Dec 2005 05:27:10 -0500
Subject: owners owners.list,1.485,1.486
Message-ID: <200512281027.jBSARgRq018376@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	owners.list 
Log Message:
Transfer ownership of python-formencode


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -r1.485 -r1.486
--- owners.list	27 Dec 2005 22:15:51 -0000	1.485
+++ owners.list	28 Dec 2005 10:27:09 -0000	1.486
@@ -998,7 +998,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-formencode|FormEncode is a validation and form generation package.|oliver.andrich at gmail.com|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|
 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|



From fedora-extras-commits at redhat.com  Wed Dec 28 12:07:20 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 28 Dec 2005 07:07:20 -0500
Subject: rpms/bzflag/devel bzflag-2.0.4-stringdos.patch, NONE,
	1.1 bzflag.spec, 1.19, 1.20 bzflag-2.0.2-isoc++.patch, 1.1, NONE
Message-ID: <200512281207.jBSC7rRQ022083@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	bzflag.spec 
Added Files:
	bzflag-2.0.4-stringdos.patch 
Removed Files:
	bzflag-2.0.2-isoc++.patch 
Log Message:
don't crash on maliciously formed callsign, etc. strings (#176626, patch backported from upstream CVS)


bzflag-2.0.4-stringdos.patch:

--- NEW FILE bzflag-2.0.4-stringdos.patch ---
--- bzflag-2.0.4.20050930/src/game/PlayerInfo.cxx.stringdos	2005-09-28 02:24:42.000000000 +0200
+++ bzflag-2.0.4.20050930/src/game/PlayerInfo.cxx	2005-12-28 12:39:57.000000000 +0100
@@ -108,6 +108,12 @@
   buf = nboUnpackString(buf, email, EmailLen);
   buf = nboUnpackString(buf, token, TokenLen);
   buf = nboUnpackString(buf, clientVersion, VersionLen);
+
+  // terminate the strings
+  callSign[CallSignLen - 1] = '\0';
+  email[EmailLen - 1] = '\0';
+  token[TokenLen - 1] = '\0';
+  clientVersion[VersionLen - 1] = '\0';
   cleanEMail();
 
   DEBUG2("Player %s [%d] sent version string: %s\n",


Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bzflag.spec	25 Nov 2005 12:15:09 -0000	1.19
+++ bzflag.spec	28 Dec 2005 12:07:01 -0000	1.20
@@ -7,14 +7,14 @@
 Summary: 3D multi-player tank battle game
 Name: bzflag
 Version: 2.0.4
-Release: 1
+Release: 2
 License: GPL
 Group: Amusements/Games
 URL: http://bzflag.org
 Source0: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
 Source1: bzflag.desktop
 Patch0: bzflag-2.0.4-lookup.patch
-Patch1: bzflag-2.0.2-isoc++.patch
+Patch1: bzflag-2.0.4-stringdos.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 %if %_modular_X
 BuildRequires: libXi-devel
@@ -48,7 +48,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?date:.%{date}}
-%patch0 -p1 -b .isoc++
+%patch0 -p1 -b .lookup
+%patch1 -p1 -b .stringdos
 
 %build
 # Use PIE because bzflag/bzfs are networked server applications
@@ -93,6 +94,10 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Dec 28 2005 Nils Philippsen  2.0.4-2
+- don't crash on maliciously formed callsign, etc. strings (#176626, patch
+  backported from upstream CVS)
+
 * Mon Nov 21 2005 Nils Philippsen  2.0.4-1
 - version 2.0.4
 - update lookup patch


--- bzflag-2.0.2-isoc++.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 28 12:25:51 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 28 Dec 2005 07:25:51 -0500
Subject: rpms/bzflag/FC-4 bzflag-2.0.4-stringdos.patch, NONE, 1.1 bzflag.spec,
	1.16, 1.17 bzflag-2.0.2-isoc++.patch, 1.1, NONE
Message-ID: <200512281226.jBSCQNg3022345@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	bzflag.spec 
Added Files:
	bzflag-2.0.4-stringdos.patch 
Removed Files:
	bzflag-2.0.2-isoc++.patch 
Log Message:
don't crash on maliciously formed callsign, etc. strings (#176626, patch backported from upstream CVS)


bzflag-2.0.4-stringdos.patch:

--- NEW FILE bzflag-2.0.4-stringdos.patch ---
--- bzflag-2.0.4.20050930/src/game/PlayerInfo.cxx.stringdos	2005-09-28 02:24:42.000000000 +0200
+++ bzflag-2.0.4.20050930/src/game/PlayerInfo.cxx	2005-12-28 12:39:57.000000000 +0100
@@ -108,6 +108,12 @@
   buf = nboUnpackString(buf, email, EmailLen);
   buf = nboUnpackString(buf, token, TokenLen);
   buf = nboUnpackString(buf, clientVersion, VersionLen);
+
+  // terminate the strings
+  callSign[CallSignLen - 1] = '\0';
+  email[EmailLen - 1] = '\0';
+  token[TokenLen - 1] = '\0';
+  clientVersion[VersionLen - 1] = '\0';
   cleanEMail();
 
   DEBUG2("Player %s [%d] sent version string: %s\n",


Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/FC-4/bzflag.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bzflag.spec	29 Nov 2005 12:33:38 -0000	1.16
+++ bzflag.spec	28 Dec 2005 12:25:50 -0000	1.17
@@ -7,14 +7,14 @@
 Summary: 3D multi-player tank battle game
 Name: bzflag
 Version: 2.0.4
-Release: 0.fc4.2
+Release: 0.fc4.3
 License: GPL
 Group: Amusements/Games
 URL: http://bzflag.org
 Source0: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
 Source1: bzflag.desktop
 Patch0: bzflag-2.0.4-lookup.patch
-Patch1: bzflag-2.0.2-isoc++.patch
+Patch1: bzflag-2.0.2-stringdos.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 %if %_modular_X
 BuildRequires: libXi-devel
@@ -48,7 +48,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?date:.%{date}}
-%patch0 -p1 -b .isoc++
+%patch0 -p1 -b .stringdos
 
 %build
 # Use PIE because bzflag/bzfs are networked server applications
@@ -93,6 +93,10 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Dec 28 2005 Nils Philippsen  2.0.4-0.fc4.3
+- don't crash on maliciously formed callsign, etc. strings (#176626, patch
+  backported from upstream CVS)
+
 * Tue Nov 29 2005 Nils Philippsen  2.0.4-0.fc4.2
 - bump release to make build system build
 


--- bzflag-2.0.2-isoc++.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 28 12:28:39 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 28 Dec 2005 07:28:39 -0500
Subject: rpms/bzflag/FC-4 bzflag.spec,1.17,1.18
Message-ID: <200512281229.jBSCTCT8022406@cvs-int.fedora.redhat.com>

Author: nphilipp

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

Modified Files:
	bzflag.spec 
Log Message:
fix stringdos patch filename



Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/FC-4/bzflag.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bzflag.spec	28 Dec 2005 12:25:50 -0000	1.17
+++ bzflag.spec	28 Dec 2005 12:28:39 -0000	1.18
@@ -14,7 +14,7 @@
 Source0: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
 Source1: bzflag.desktop
 Patch0: bzflag-2.0.4-lookup.patch
-Patch1: bzflag-2.0.2-stringdos.patch
+Patch1: bzflag-2.0.4-stringdos.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 %if %_modular_X
 BuildRequires: libXi-devel



From fedora-extras-commits at redhat.com  Wed Dec 28 14:25:42 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 28 Dec 2005 09:25:42 -0500
Subject: rpms/xmms/devel xmms.spec,1.12,1.13
Message-ID: <200512281426.jBSEQE6g026276@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	xmms.spec 
Log Message:
* 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)
- Add missing modular Xorg BuildReqs, this (re)enables session managment
  support and the openGL plugins.



Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xmms.spec	20 Dec 2005 14:47:55 -0000	1.12
+++ xmms.spec	28 Dec 2005 14:25:41 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: The X MultiMedia System, a media player
 Name: xmms
 Version: 1.2.10
-Release: 18.1%{?dist}
+Release: 19%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -28,6 +28,10 @@
 
 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: zlib-devel
 Requires(pre): 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
@@ -80,7 +84,10 @@
   --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
 
 gcc -fPIC $RPM_OPT_FLAGS -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \
@@ -147,6 +154,12 @@
 %{_datadir}/aclocal/xmms.m4
 
 %changelog
+* 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)
+- Add missing modular Xorg BuildReqs, this (re)enables session managment
+  support and the openGL plugins.
+
 * Tue Dec 20 2005 Matthias Saou  1:1.2.10-18.1
 - Update gcc4 patch to include fix for xmms.org bug #1730, fixes FC5 build.
 



From fedora-extras-commits at redhat.com  Wed Dec 28 14:27:52 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 28 Dec 2005 09:27:52 -0500
Subject: rpms/xmms/FC-4 xmms.spec,1.11,1.12
Message-ID: <200512281428.jBSESOTa026359@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	xmms.spec 
Log Message:
* 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)



Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/FC-4/xmms.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xmms.spec	7 Dec 2005 11:59:57 -0000	1.11
+++ xmms.spec	28 Dec 2005 14:27:52 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: The X MultiMedia System, a media player
 Name: xmms
 Version: 1.2.10
-Release: 18%{?dist}
+Release: 19%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -80,7 +80,10 @@
   --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
 
 gcc -fPIC $RPM_OPT_FLAGS -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \
@@ -147,6 +150,10 @@
 %{_datadir}/aclocal/xmms.m4
 
 %changelog
+* 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)
+
 * Sat May 28 2005 Matthias Saou  1:1.2.10-18
 - Build with explicit --with-pic to fix compilation of flac plugin on
   x86_64.



From fedora-extras-commits at redhat.com  Wed Dec 28 16:08:31 2005
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Wed, 28 Dec 2005 11:08:31 -0500
Subject: rpms/balsa/devel .cvsignore, 1.8, 1.9 balsa.spec, 1.11, 1.12 sources,
	1.8, 1.9
Message-ID: <200512281609.jBSG940T030285@cvs-int.fedora.redhat.com>

Author: pawsa

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

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
- update to 2.3.8; enable gtkhtml and gtkspell.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Dec 2005 11:55:28 -0000	1.8
+++ .cvsignore	28 Dec 2005 16:08:31 -0000	1.9
@@ -1,2 +1,2 @@
+balsa-2.3.8.tar.bz2
 gmime-2.1.17.tar.bz2
-balsa-2.3.7.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- balsa.spec	4 Dec 2005 11:55:28 -0000	1.11
+++ balsa.spec	28 Dec 2005 16:08:31 -0000	1.12
@@ -1,8 +1,8 @@
 %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
+Version:        2.3.8
 Release:        1%{?dist}
 Summary:        Mail Client
 
@@ -15,18 +15,19 @@
 
 Requires: libesmtp >= 1.0.3
 Requires: scrollkeeper
-BuildRequires: scrollkeeper
-BuildRequires: libesmtp-devel >= 1.0.3
 BuildRequires: aspell-devel
+BuildRequires: desktop-file-utils
+BuildRequires: gnome-vfs2-devel
+BuildRequires: gtk2-devel
+BuildRequires: gtkhtml2-devel
+BuildRequires: gtkspell-devel
+BuildRequires: libesmtp-devel >= 1.0.3
+BuildRequires: libgnome-devel
+BuildRequires: libgnomeprint22-devel
+BuildRequires: libgnomeprintui22-devel
+BuildRequires: libgnomeui-devel
 BuildRequires: openssl-devel
-
-BuildRequires:  gtk2-devel
-BuildRequires:  libgnome-devel
-BuildRequires:  libgnomeui-devel
-BuildRequires:  gnome-vfs2-devel
-BuildRequires:  libgnomeprint22-devel
-BuildRequires:  libgnomeprintui22-devel
-BuildRequires:  desktop-file-utils
+BuildRequires: scrollkeeper
 
 %description
 Balsa is a GNOME email client which supports mbox, maildir, and mh
@@ -102,6 +103,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Pawel Salek  - 2.3.8-1
+- update to 2.3.8; enable gtkhtml and gtkspell.
+
 * Sun Dec  4 2005 Pawel Salek  - 2.3.7-1
 - update to upstream version 2.3.7. Use gmime-2.1.17
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Dec 2005 11:55:28 -0000	1.8
+++ sources	28 Dec 2005 16:08:31 -0000	1.9
@@ -1,2 +1,2 @@
+517c0a1cbd4dc85ec06a6c7b0f522ffa  balsa-2.3.8.tar.bz2
 4be55ee55e4b3966bd51fadbf5fb323b  gmime-2.1.17.tar.bz2
-d50a439a8b8c2be99e3b0108d5d6073e  balsa-2.3.7.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 28 17:12:19 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 28 Dec 2005 12:12:19 -0500
Subject: rpms/baobab/devel baobab.spec,1.6,1.7
Message-ID: <200512281712.jBSHCqYO032211@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	baobab.spec 
Log Message:
Rebuild with new libgtop


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- baobab.spec	8 Dec 2005 16:43:15 -0000	1.6
+++ baobab.spec	28 Dec 2005 17:12:19 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           baobab
 Version:        2.2.2
-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
+* Wed Dec 28 2005 Thorsten Leemhuis  - 2.2.2-2
+- Rebuild
+
 * Thu Dec 08 2005 Thorsten Leemhuis  - 2.2.2-1
 - Update to 2.2.2
 



From fedora-extras-commits at redhat.com  Wed Dec 28 18:12:31 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 28 Dec 2005 13:12:31 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.28,1.29
Message-ID: <200512281813.jBSID3Ef001779@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	Inventor.spec 
Log Message:
Remove patch10 (#173879, #175251 are reported to be fixed).


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Inventor.spec	22 Dec 2005 11:37:44 -0000	1.28
+++ Inventor.spec	28 Dec 2005 18:12:31 -0000	1.29
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        17%{?dist}
+Release:        18%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -33,11 +33,6 @@
 # Declare SoTempPath forward
 Patch8:		Inventor-SoPath.diff
 
-# Work around to RH shipping a broken libGLw
-# - PR #173879: libGLw headers missing
-# - PR #175251: libGLw missing motif
-Patch10:	Inventor-redhat-bugs.diff
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libGLU-devel
@@ -134,8 +129,6 @@
 %patch7 -p0
 %patch8 -p1
 
-%patch10 -p1
-
 grep -Rl __ia64 lib* | while read a; do \
   sed -i -e 's,__ia64,__ia64__,g' \
   -e 's,__ia64____,__ia64__,g' \
@@ -307,6 +300,9 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Wed Dec 28 2005 Ralf Cors??pius  - 2.1.5-18
+- Remove patch10 (#173879, #175251 are reported to be fixed).
+
 * Thu Dec 22 2005 Ralf Cors??pius  - 2.1.5-17
 - Remove BR: libX11-devel (#173712 reported to be fixed).
 - Remove BR: libGL-devel (#175253 reported to be fixed).



From fedora-extras-commits at redhat.com  Wed Dec 28 18:54:18 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 28 Dec 2005 13:54:18 -0500
Subject: web/html/docs/mirror generated-index.php, 1.1, 1.2 index.php, 1.1,
	1.2 ln-legalnotice.php, 1.1, 1.2 rv-revhistory.php, 1.1,
	1.2 sn-client-config.php, 1.1, 1.2 sn-planning-and-setup.php,
	1.1, 1.2 sn-server-config.php, 1.1, 1.2
Message-ID: <200512281854.jBSIsmQN002009@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/fedora/web/html/docs/mirror
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1977

Modified Files:
	generated-index.php index.php ln-legalnotice.php 
	rv-revhistory.php sn-client-config.php 
	sn-planning-and-setup.php sn-server-config.php 
Log Message:
Update to 0.37.2




Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/mirror/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	27 Nov 2005 17:18:38 -0000	1.1
+++ index.php	28 Dec 2005 18:54:16 -0000	1.2
@@ -20,7 +20,7 @@
     at http://bugzilla.redhat.com/.  When you file your bug, select "Fedora Documentation" as the
     Product, and select the title of this document as
     the Component.  The version of this document is
-    mirror-tutorial-0.37.1 (2005-11-27).
+    mirror-tutorial-0.37.2 (2005-12-28).
   

     The maintainers of this document will automatically receive your bug report.
     On behalf of the entire Fedora community, thank you for helping us make
@@ -37,7 +37,7 @@
 	    Using a command line interface
 	  
1.3. About Mirrors

 	A mirror
-	 is a server
+	 is a server
 	that provides a copy of one or more collections of files.
 	Mirroring a site reduces traffic to the original source site,
 	thus spreading the stress and bandwidth costs of many users
@@ -47,7 +47,7 @@
 	managing Internet services.
       

 	The site from which you retrieve files to build your mirror is
-	called an upstream mirror. If possible, choose an upstream mirror that is
+	called an upstream mirror. If possible, choose an upstream mirror that is
 	located close to you geographically. This reduces unnecessary
 	traffic across transcontinental sections of the Internet, where
 	bandwidth is limited and expensive. Use only upstream mirrors


Index: ln-legalnotice.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/mirror/ln-legalnotice.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ln-legalnotice.php	27 Nov 2005 17:18:38 -0000	1.1
+++ ln-legalnotice.php	28 Dec 2005 18:54:16 -0000	1.2
@@ -26,7 +26,7 @@
     They all may be freely redistributed with documentation
     produced for the Fedora Project.
     

-    mirror-tutorial-0.37.1 (2005-11-27)
+    mirror-tutorial-0.37.2 (2005-12-28)
   

     Red Hat and the Red Hat "Shadow Man" logo are registered trademarks of
     Red Hat, Inc. in the United States and other countries.


Index: rv-revhistory.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/mirror/rv-revhistory.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rv-revhistory.php	27 Nov 2005 17:18:38 -0000	1.1
+++ rv-revhistory.php	28 Dec 2005 18:54:16 -0000	1.2
@@ -85,6 +85,11 @@
 	  

 	    Minor revision fixing service reload command.
 	  

+	

 

 	    Chinese, Japanese, and Korean graphical installations
-	    started using the "nofb" option will
+	    started using the nofb option will
 	    start in English, and then switch to the appropriate
 	    language once the graphical phase of the installation
 	    process begins.
@@ -833,7 +838,7 @@
 

 

 

-7.1.1.??Fedora Extras Repository

+7.1.1.??Fedora Extras Repository

 

 
 

@@ -904,7 +909,7 @@
 

 

 

-7.1.3.??Enabling the slocate Database

+7.1.3.??Enabling the slocate Database

 

 
 

@@ -918,7 +923,7 @@
 

 

 

-7.1.4.??Stricter Controls in openssh

+7.1.4.??Stricter Controls in openssh

 

 
 

@@ -1063,7 +1068,7 @@
 

 

 

-7.2.1.3.??Following Generic Textbooks

+7.2.1.3.??Following Generic Textbooks

 

 
 

@@ -1411,7 +1416,7 @@
 

 

 

-7.4.1.??Language Support

+7.4.1.??Language Support

 

 
 

@@ -1537,7 +1542,7 @@
 

 

 

-7.6.1.??httpd

+7.6.1.??httpd

 

 
 

@@ -1611,7 +1616,7 @@
 

 

 

-7.8.1.??X Window System (Graphics)

+7.8.1.??X Window System (Graphics)

 

 
 
This section contains information related to the X Window
@@ -1666,7 +1671,7 @@
 

 

 

-7.8.1.2.1.??The /usr/X11R6 directory hierarchy

+7.8.1.2.1.??The /usr/X11R6 directory hierarchy

 

 
 

@@ -1683,7 +1688,7 @@
 

 

 

-7.8.1.2.2.??Imake

+7.8.1.2.2.??Imake

 

 
 
Imake is no longer used to build the X
@@ -1702,7 +1707,7 @@
 

 

 

-7.8.1.2.3.??The systemwide app-defaults directory

+7.8.1.2.3.??The systemwide app-defaults directory

 

 
 
The system app-defaults directory for X resources, is now
@@ -1957,7 +1962,7 @@
 

 

 

-9.2.??Packages Removed

+9.2.??Packages Removed

 

 
 

@@ -1980,7 +1985,7 @@
 

 

 

-10.??Notes

+10.??Notes

 

 
 




From fedora-extras-commits at redhat.com  Wed Dec  7 19:37:25 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed,  7 Dec 2005 14:37:25 -0500
Subject: web/html/docs/release-notes/fc5/test1-latest-it index.php,1.1,1.2
Message-ID: <200512071937.jB7Jbtvg001792@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-latest-it
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1682/fc5/test1-latest-it

Modified Files:
	index.php 
Log Message:
Updating latest, also including ru and it trans as part of latest since they have updated their translations since the initial trans freeze.


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 index.php
Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/release-notes/fc5/test1-latest-it/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	24 Nov 2005 21:40:58 -0000	1.1
+++ index.php	7 Dec 2005 19:37:22 -0000	1.2
@@ -7,30 +7,2093 @@
 
 ?>
 
-
Note di rilascio per Fedora Core 5 test1
   Avanti
Note di rilascio per Fedora Core 5 test1
Copyright © 2005 Red Hat, Inc.
1. Benvenuti in Fedora Core 5 test1
2. Note legali
3. Introduzione e Release Notes Tecniche
4. Requisiti Hardware
4.1. Requisiti CPU
4.2. Requisiti di spazio su sisco rigido
4.3. Requisiti di memoria
4.4. Requisiti Hardware PPC
5. Descrizione di questa release
6. Note Relative all'installazione
6.1. Note di installazione PPC
6.1.1. Requisiti hardware PPC!
 
6.2. Note su anaconda
6.3. Problemi relativi all'intallazione
7. Note specifiche sui pacchetti
7.1. Componenti di base
7.1.1. Repositorio Fedora Extras
7.1.2. Il demone di audit auditd ed i files di log
7.1.3. LinuxThreads contro NPTL
7.1.4. Abilitare il database slocate
7.1.5. Controlli più stretti in openssh
7.1.6. I symlinks Perl Binary Compat
7.1.7. Strumenti di configurazione del server e del sistema
7.1.8. Raccomandazioni sul pacchetto Java
7.2. Core
7.2.1. yum
7.2.2. 
-    Linux Kernel
-  
7.2.3. Sicurezza
7.3. Internationalizazione (i18n)
7.3.1. Supporto Linguaggi
7.4. Multimedia
7.4.1. Software multimediale escluso
7.4.2. CD e DVD Authoring e Burning
7.5. Giochi ed intrattenimento
7.6. Web Servers
7.6.1. httpd
7.7. Samba (Compatibilità con il File System di Windows)
7.8. Sistema X Window (Grafico)
7.8.1. xorg-x11
7.9. Giochi ed intrattenimento
8. Movimenti dei pacchetti
8.1. Pacchetti modificati
8.1!
 .1. Pacchetti aggiunti
8.1.2. Pacchetti Rimossi
8.2. Note
9. Una descrizione del Fedora Project
1. Benvenuti in Fedora Core 5 test1
[Attenzione]Informazioni non aggiornate

-      Il contenuto in questa sezione deve essere aggiornato per Fedora Core
-      5 test1
-    

-    Fedora Core è una piattaforma basata su Linux completamente gratutita, amichevole, sicura e
-    general purpose.  Fedora Project è un progetto open source che
+

+

+

+

+(Ultime) Note di rilascio per Fedora Core 5 test1

+
Copyright ?? 2005 Red Hat, Inc.

+

+

+    Questo documento ?? rilasciato sotto i termini della GNU Free Documentation
+    License.  Per maggiori dettagli, leggi le note legali complete su Sezione??2, ???Note legali???.
+  

+

+
+
+
+
+
+
[Tip]Le ultime note di rilascio sul Web

+      Queste note di rilascio possono essere aggiornate.  Visita http://fedora.redhat.com/docs/release-notes/
+      per vedere le ultime note di rilascio per Fedora Core 5 test1.
+    

+

+

+

+

+

+

+
1. Benvenuti in Fedora Core 5 test1

+
1.1. Che c'?? di nuovo in Fedora Core 5 test1

+
2. Note legali

+
3. Introduzione e Release Notes Tecniche

+
4. Requisiti Hardware

+

+
4.1. Requisiti CPU

+
4.2. Requisiti di spazio su sisco rigido

+
4.3. Requisiti di memoria

+
4.4. Requisiti Hardware PPC

+

+
5. Descrizione di questa release

+
6. Note relative all'installazione

+

+
6.1. Note di installazione PPC

+
6.2. Note su anaconda

+
6.3. Cambiamenti nel programma d'installazione

+
6.4. Problemi relativi all'intallazione

+

+
7. Note specifiche sui pacchetti

+

+
7.1. Componenti di base

+

+
7.1.1. Repositorio Fedora Extras

+
7.1.2. Il demone di audit auditd ed i files
+        di log

+
7.1.3. Abilitare il database slocate

+
7.1.4. Controlli pi?? stretti in openssh

+
7.1.5. Raccomandazioni sul pacchetto Java

+

+
7.2. Core

+

+
7.2.1. Linux Kernel

+
7.2.2. Sicurezza

+

+
7.3. 
+    Strumenti di sviluppo
+  

+
7.3.1. Ambiente Java-like

+
7.4. Internazionalizzazione (i18n)

+
7.4.1. Supporto Linguaggi

+
7.5. Multimedia

+

+
7.5.1. Software multimediale escluso

+
7.5.2. CD e DVD Authoring e masterizzazione

+

+
7.6. Web Servers

+
7.6.1. httpd

+
7.7. Samba (Compatibilit?? con il File System di Windows)

+
7.8. Il sistema X Window (Grafico)

+
7.8.1. Il sistema X Window (Grafico)

+
7.9. Giochi ed intrattenimento

+

+
8. Informazioni legacy

+
9. Movimenti dei pacchetti

+

+
9.1. Pacchetti aggiunti

+
9.2. Pacchetti Rimossi

+

+
10. Note

+
11. Una descrizione del Fedora Project

+

+

+

+

+1.??Benvenuti in Fedora Core 5 test1

+

+

+

+    Fedora Core ?? una piattaforma basata su Linux completamente gratutita, amichevole, sicura e
+    general purpose.  Fedora Project ?? un progetto open source che ?? utilizzabile, modificabile e distribuibile
+    liberamente da chiunque, ora e per sempre.  Il Fedora Project ?? un progetto open source che 
     esplora le ultime tecnologie e concetti sponsorizzato da Red Hat e
-    supportato dalla comunità Fedora.
-  

+
[Suggerimento]Ultime Release Notes sul Web

+    supportato dalla comunit?? Fedora.
+  

+

+
+
+
+
+
+
[Caution]Questa ?? una test release, non intesa per gli utenti finali

+

+      Questa ?? una test release ed ?? distribuita per gli sviluppatori e testers
+      per partecipare e fornire giudizzi. Non ?? intesa per gli
+      utenti finali.
+    

+

+      Sottoscrivi le mailing lists fedora-test e fedora-devel per tenere traccia
+      dei cambiamenti pi?? importanti nella versione di sviluppo attuale
+      e dare il tuo giudizio agli sviluppatori. Fedora Project ha bisogno che tu
+      invii i rapporti d'errore e le migliorie per dare all'utente finale una migliore
+      versione definitva. Per maggiori informazioni su questo, fa riferimento al
+      seguente documento:
+    

+

+      http://fedoraproject.org/wiki/BugsAndFeatureRequests. 
+      
+    

+

+

+
+
+
+
+
[Tip]Ultime Release Notes sul Web

       Queste release notes devono essere aggiornate.  Visita http://fedora.redhat.com/docs/release-notes/
       per vedere le ultimerelease notes per Fedora Core 5 test1.
-    

+    

+

     Fa riferimento a queste pagine web per cercare maggiori informazioni su Fedora:
-  
   Avanti
   2. Note legali

+      

+

+

+

+

+1.1.??Che c'?? di nuovo in Fedora Core 5 test1

+

+

+
    
+
  • Il software di virtualizzazione Xen ed lo strumento di amministrazione dei
+	  pacchetti yum sono ora ben integrati all'interno del proramma di installazione Fedora.
+	  L'interfaccia del programma d'installazione ?? molto sequenziale.  Il login remoto ed
+	  il supporto per i tracebacks ?? incluso.
[...1719 lines suppressed...]
+
    jrefactory-2.8.9-3jpp_1fc 
    
+
    mockobjects-0.09-12jpp_2fc 
    
+
    monolog-1.8.6-1jpp_5fc 
    
+
    oldkilim-1.1.3-2jpp_3fc 
    
+
    p6spy-1.3-2jpp_3fc 
    
+
    fractal-2.2-2jpp_1fc 
    
+
    velocity-1.4-3jpp_1fc 
    
+
    werken.xpath-0.9.4-0.beta.9jpp_1fc 
    
+
    gnu.regexp-1.1.4-7jpp_1fc 
    
+
    nanoxml-2.2.3-3jpp_3fc 
    
+
    asm-1.5.3-1jpp_1fc 
    
+
    cairo-1.0.0-1 
    
+
    objectweb-anttask-1.2-1jpp_1fc 
    
+
    objectweb-deploysched-0.2-1jpp_1fc 
    
+
    carol-1.8.9.3-1jpp_5fc 
    
+
    jacorb-2.2-3jpp_3fc 
    
+
    jakarta-commons-cli-1.0-6jpp_1fc 
    
+
    tanukiwrapper-3.1.1-4jpp_3fc 
    
+
    tog-pegasus-2.4.1-4.FC5 
    
+
    joram-4.1.5-1jpp_5fc 
    
+
    jotm-2.0.5-1jpp_3fc 
    
+
    lucene-1.4.3-1jpp_1fc 
    
+
    geronimo-specs-1.0-0.M2.2jpp_4fc 
    
+
    jakarta-commons-codec-1.3-2jpp_1fc 
    
+
    howl-logger-0.1.8-1jpp_3fc 
    
+
    dhcdbd-1.8-1 
    
+
    aspell-ru-0.99f7-2 
    
+
    hplip-0.9.5-3 
    
+
    gpart-0.1h-1 
    
+
    iso-codes-0.47-1 
    
+
    gif89encoder-0.90-0.b.1jpp_1fc 
    
+
    jonathan-rmi-3.1-5 
    
+
    pup-0.0.2-1 
    
+
    jorm-2.4.3-1jpp_2fc 
    
+
    jorm-rdb-adapter-2.6-1jpp_1fc 
    
+
    medor-1.4.4-1jpp_1fc 
    
+
    medor-expression-1.4.2-1jpp_1fc 
    
+
    perseus-cache-1.3.4-1jpp_1fc 
    
+
    perseus-concurrency-1.4-1jpp_1fc 
    
+
    perseus-dependency-1.4-1jpp_1fc 
    
+
    perseus-distribution-1.3.2-1jpp_1fc 
    
+
    perseus-fos-1.3.1-1jpp_1fc 
    
+
    perseus-persistence-1.3.4-1jpp_1fc 
    
+
    perseus-pool-1.3.3-1jpp_1fc 
    
+
    systemtap-0.4.1-2 
    
+
    pcmciautils-007-1 
    
+
    scim-tables-0.5.3-4 
    
+
    libsemanage-1.3.2-1 
    
+
    scim-hangul-0.2.0-5.fc5 
    
+
    scim-pinyin-0.5.91-1 
    
+
    scim-chewing-0.2.1-1 
    
+
    scim-qtimm-0.9.4-1 
    
+
    libchewing-0.2.7-1 
    
+
    kasumi-0.9-3.fc5 
    
+
    kexec-tools-1.101-2 
    
+
    libsetrans-0.1.7-1 
    
+
    icu-3.4-4 
    
+
    libiec61883-1.0.0-8.fc5 
    
+

+

+

+

+9.2.??Pacchetti Rimossi

+

+

+

+	Questi pacchetti sono stati rimossi:
+      

+
ccs-0.25-0.17 

+
cman-1.0-0.pre33.15 

+
cman-kernel-2.6.11.5-20050601.152643.FC4.2 

+
dlm-1.0-0.pre21.10 

+
dlm-kernel-2.6.11.5-20050601.152643.FC4.2 

+
fence-1.27-16 

+
GFS-kernel-2.6.11.8-20050601.152643.FC4.2 

+
gnbd-1.0-0.pre14.6 

+
gulm-1.0-0.pre30.1 

+
iddev-1.9-21 

+
magma-1.0-0.pre21.7 

+
magma-plugins-1.0-0.pre18.3 

+

+

+

+

+

+10.??Note

+

+

+

+      L'utilit?? di configurazione system-config-mouse
+      ?? stata scartata in questa release poich?? synaptic e la configurazione
+      dei mouse a 3 bottoni viene fatta automaticamente ed i mouse
+      seriali non sono supportati.
+    

+

+      Gli screensavers, per impostazione predefinita non sono pi?? installati?  Spieghiamo
+      il perch?? e forniamo i comandi per installarli.
+    

+

+

+

+

+11.??Una descrizione del Fedora Project

+

+

+

+      L'obiettivo del Fedora Project ?? di lavorare con la comunit?? Linux per
+      creare un sistema operativo completo, general-purpose esclusivamente
+      da software open source.  Lo sviluppo ?? compiuto in un forum pubbllico.
+      Il progetto produce delle releases su base temporale di Fedora Core approssimativamente
+      2-3 volte l'anno, con uno scadenziario pubblico delle release.  Le squadre
+      di ingegneri Red Hat continuano a participare alla costruzione della Fedora Core
+      ed invitano ed incoraggiano pi?? partecipanti esterni di quanto era
+      possibile in passato.  Utilizzando questo processo pi?? aperto, speriamo di
+      fornire un sistema operativo molto pi?? in linea con gli ideali di software
+      libero e molto pi?? appetibile alla comunit?? open source.
+    

+

+      Per maggiori informazioni, fate riferimento al sito web di Fedora Project:
+    

+

+      http://fedora.redhat.com/
+    

+

+      In aggiunta al sito, sono disponibili le seguenti
+      mailing lists:
+    

+
    
+
  • 
+	  fedora-list at redhat.com ??? Per gli utenti delle releases di Fedora Core
+	
    • 
+
  • 
+	  fedora-test-list at redhat.com ??? Per i testers delle test
+	  releases di Fedora Core
+	
    • 
+
  • 
+	  fedora-devel-list at redhat.com ??? Per gli sviluppatori,
+	  sviluppatori, sviluppatori
+	
    • 
+
  • 
+	  fedora-docs-list at redhat.com ??? Per i partecipanti al
+	  Documentation Project
+	
    • 
+
  • 
+	fedora-ambassadors-list at redhat.com ??? Per i componenti
+	della comunit?? che rappresentano il Fedora Project in pubblico.
+      
    • 
+

+

+    Per sottoscrivere ad una di queste liste, spedisci un email con la parola
+    "subscribe" nel soggetto a
+    <listname>-request
+    (dove
+    <listname>
+    ?? una delle sopraelencate liste.)
+  

+

+    Alternativamente, puoi sottoscriverti mediante l'interfaccia Web:
+  

+

+    http://www.redhat.com/mailman/listinfo/
+  

+

+      Il Fedora Project include anche un canale IRC (Internet Relay Chat).  IRC ?? una
+      forma di comunicazione real-time, basata su testo.  Con essa, puoi avere
+      conversazioni con pi?? persone contemporaneamente in un canale aperto o
+      chattare privatamente con qualcuno uno-a-uno.
+    

+

+      Per parlare con gli altri partecipanti al Fedora Project via IRC, accedi alla freenode IRC
+      network.  Inizialmente, potresti usare irc.freenode.net come
+      IRC server, anche se potresti decidere di selezionare un server che ti sia
+      geograficamente pi?? vicino.  Fai riferimento al sito web di freenode (http://www.freenode.net/) per ulteriori
+      informazioni.  I partecipanti a Fedora Project frequentano il canale
+      #fedora, mentre gli sviluppatori Fedora Project possono spesso essere
+      trovati sul canale #fedora-devel.  Alcuni dei progetti
+      pi?? grandi possono anche avere i propri canali; queste informazioni si possono
+      trovare sulle pagine del progetto.
+    

+

+      Per poter parlare sul canale #fedora, dovrai
+      registrare il tuo nickname (nick).
+      Ti verranno date istruzioni quando farai il /join al
+      cannale.
+    

+

+
+
+
+
+
+
[Note]Nota

+	Red Hat non ha controllo sui canali IRC di Fedora Project o i loro
+	contenuti.
+      

+

+

 
 

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-latest-en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5518

Modified Files:
	index.php 
Log Message:
Externalizing this link; same info from a source accessible by the public.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/release-notes/fc5/test1-latest-en/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.php	7 Dec 2005 19:37:15 -0000	1.3
+++ index.php	7 Dec 2005 21:35:48 -0000	1.4
@@ -1,8 +1,9 @@
 initCommon(); 
+$template->initCommon();
+
 $template->displayHeader();
 
 ?>
@@ -45,9 +46,9 @@
 
3. Introduction and Technical Release Notes

 
4. Hardware Requirements

 

-
4.1. CPU Requirements

-
4.2. Hard Disk Space Requirements

-
4.3. Memory Requirements

+
4.1. CPU Requirements

+
4.2. Hard Disk Space Requirements

+
4.3. Memory Requirements

 
4.4. PPC Hardware Requirements

 

 
5. Overview of This Release

@@ -62,11 +63,11 @@
 

 
7.1. Basic Components

 

-
7.1.1. Fedora Extras Repository

+
7.1.1. Fedora Extras Repository

 
7.1.2. Audit Daemon auditd and Log
 	Files

-
7.1.3. Enabling the slocate Database

-
7.1.4. Stricter Controls in openssh

+
7.1.3. Enabling the slocate Database

+
7.1.4. Stricter Controls in openssh

 
7.1.5. Java Package Recommendations

 

 
7.2. Core

@@ -79,26 +80,26 @@
   
 
7.3.1. Java-like Environment

 
7.4. Internationalization (i18n)

-
7.4.1. Language Support

+
7.4.1. Language Support

 
7.5. Multimedia

 

 
7.5.1. Excluded Multimedia Software

 
7.5.2. CD and DVD Authoring and Burning

 

 
7.6. Web Servers

-
7.6.1. httpd

+
7.6.1. httpd

 
7.7. Samba (Windows File System Compatibility)

 
7.8. X Window System (Graphics)

-
7.8.1. X Window System (Graphics)

+
7.8.1. X Window System (Graphics)

 
7.9. Games and Entertainment

 

 
8. Legacy Information

 
9. Packages Movement

 

 
9.1. Packages Added

-
9.2. Packages Removed

+
9.2. Packages Removed

 

-
10. Notes

+
10. Notes

 
11. An Overview of the Fedora Project

 

 

@@ -325,7 +326,7 @@
 

 

 

-4.1.??CPU Requirements

+4.1.??CPU Requirements

 

 

 
This section lists the CPU specifications required by Fedora Core
@@ -369,7 +370,7 @@
 

 

 

-4.2.??Hard Disk Space Requirements

+4.2.??Hard Disk Space Requirements

 

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

 

 

-4.3.??Memory Requirements

+4.3.??Memory Requirements

 

 
 
This section lists the memory required to install Fedora Core
@@ -838,7 +839,7 @@
 

 

 

-7.1.1.??Fedora Extras Repository

+7.1.1.??Fedora Extras Repository

 

 
 

@@ -909,7 +910,7 @@
 

 

 

-7.1.3.??Enabling the slocate Database

+7.1.3.??Enabling the slocate Database

 

 
 

@@ -923,7 +924,7 @@
 

 

 

-7.1.4.??Stricter Controls in openssh

+7.1.4.??Stricter Controls in openssh

 

 
 

@@ -1068,7 +1069,7 @@
 

 

 

-7.2.1.3.??Following Generic Textbooks

+7.2.1.3.??Following Generic Textbooks

 

 
 

@@ -1360,7 +1361,7 @@
       5 test1. For more information, read this informative article:
     

 

-      http://post-office.corp.redhat.com/archives/rhselinux-project/2005-June/msg00001.html
+      http://www.livejournal.com/users/james_morris/5583.html
     

 
 
@@ -1416,7 +1417,7 @@
 

 

 

-7.4.1.??Language Support

+7.4.1.??Language Support

 

 
 

@@ -1542,7 +1543,7 @@
 

 

 

-7.6.1.??httpd

+7.6.1.??httpd

 

 
 

@@ -1616,7 +1617,7 @@
 

 

 

-7.8.1.??X Window System (Graphics)

+7.8.1.??X Window System (Graphics)

 

 
 
This section contains information related to the X Window
@@ -1671,7 +1672,7 @@
 

 

 

-7.8.1.2.1.??The /usr/X11R6 directory hierarchy

+7.8.1.2.1.??The /usr/X11R6 directory hierarchy

 

 
 

@@ -1688,7 +1689,7 @@
 

 

 

-7.8.1.2.2.??Imake

+7.8.1.2.2.??Imake

 

 
 
Imake is no longer used to build the X
@@ -1707,7 +1708,7 @@
 

 

 

-7.8.1.2.3.??The systemwide app-defaults directory

+7.8.1.2.3.??The systemwide app-defaults directory

 

 
 
The system app-defaults directory for X resources, is now
@@ -1962,7 +1963,7 @@
 

 

 

-9.2.??Packages Removed

+9.2.??Packages Removed

 

 
 

@@ -1985,7 +1986,7 @@
 

 

 

-10.??Notes

+10.??Notes

 

 
 




From fedora-extras-commits at redhat.com  Wed Dec  7 22:13:52 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed,  7 Dec 2005 17:13:52 -0500
Subject: rpms/gdesklets - New directory
Message-ID: <200512072213.jB7MDqTw007504@cvs-int.fedora.redhat.com>

Author: luya

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

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




From fedora-extras-commits at redhat.com  Wed Dec  7 22:13:58 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed,  7 Dec 2005 17:13:58 -0500
Subject: rpms/gdesklets/devel - New directory
Message-ID: <200512072213.jB7MDwGB007519@cvs-int.fedora.redhat.com>

Author: luya

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

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




From fedora-extras-commits at redhat.com  Wed Dec  7 22:14:08 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed,  7 Dec 2005 17:14:08 -0500
Subject: rpms/gdesklets Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512072214.jB7ME8uS007553@cvs-int.fedora.redhat.com>

Author: luya

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec  7 22:14:15 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed,  7 Dec 2005 17:14:15 -0500
Subject: rpms/gdesklets/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512072214.jB7MEFNQ007571@cvs-int.fedora.redhat.com>

Author: luya

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

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


--- NEW 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 Dec  7 22:14:46 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed,  7 Dec 2005 17:14:46 -0500
Subject: rpms/gdesklets import.log,1.1,1.2
Message-ID: <200512072215.jB7MFGd6007649@cvs-int.fedora.redhat.com>

Author: luya

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

Modified Files:
	import.log 
Log Message:
auto-import gdesklets-0.35.2-20 on branch devel from gdesklets-0.35.2-20.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Dec 2005 22:14:06 -0000	1.1
+++ import.log	7 Dec 2005 22:14:44 -0000	1.2
@@ -0,0 +1 @@
+gdesklets-0_35_2-20:HEAD:gdesklets-0.35.2-20.src.rpm:1133993681



From fedora-extras-commits at redhat.com  Wed Dec  7 22:14:51 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed,  7 Dec 2005 17:14:51 -0500
Subject: rpms/gdesklets/devel NullObject-1.0-fix.patch, NONE,
	1.1 gdesklets.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512072214.jB7MEpWE007641@cvs-int.fedora.redhat.com>

Author: luya

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

Modified Files:
	.cvsignore sources 
Added Files:
	NullObject-1.0-fix.patch gdesklets.spec 
Log Message:
auto-import gdesklets-0.35.2-20 on branch devel from gdesklets-0.35.2-20.src.rpm

NullObject-1.0-fix.patch:

--- NEW FILE NullObject-1.0-fix.patch ---
 NullObject.py |    2 ++
 1 files changed, 2 insertions(+)

Index: gDesklets-0.35.2/NullObject.py
===================================================================
--- gDesklets-0.35.2.orig/NullObject.py	2005-11-29 16:35:03.000000000 -0600
+++ gDesklets-0.35.2/NullObject.py	2005-11-29 16:36:30.000000000 -0600
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
 class __Null:
 
     """Null object that does __nothing__"""


--- NEW FILE gdesklets.spec ---
Name:           gdesklets
Version:        0.35.2
Release:        20%{?dist}
Summary:        Advanced architecture for desktop applets

Group:          User Interface/Desktops
License:        GPL

URL:            http://gdesklets.gnomedesktop.org/
Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
Patch0:		NullObject-1.0-fix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


############################################################################
#
# Starting from 0.35.x, gDesklets no longer requires GConf. Future maintainers
# must avoid using it.
#
##########################################################################

BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1
BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0
# Requires:	gnome-python2-gconf >= 2.6.0
Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
Requires(post): desktop-file-utils
Requires(post): shared-mime-info
Requires(postun): desktop-file-utils
Requires(postun): shared-mime-info


%description
'gDesklets' provides an advanced architecture for desktop applets -
tiny displays that sit on your desktop such as status meters, icon
bars, weather sensors, news tickers.

%prep
%setup -q -n gDesklets-%{version}
%patch0 -p1 

%build

%configure \
  --disable-schemas-install
make %{?_smp_mflags}


#%_install
#rm -rf ${RPM_BUILD_ROOT}
#make -e install DESTDIR=${RPM_BUILD_ROOT}

%install
[ -n $RPM_BUILD_ROOT -a $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
env DESTDIR=$RPM_BUILD_ROOT make -e install
%find_lang %{name}


desktop-file-install --vendor=fedora  \
  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
  --add-category X-Fedora \
  --add-category Accessories \
  --add-category Application \
  --add-category Utility \
        data/%{name}.desktop


mkdir -p  ${RPM_BUILD_ROOT}{%{_bindir},%{_datadir}/%{name}/data/}
ln -sf ../../../../%{_datadir}/pixmaps/%{name}.png ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/data/%{name}.png
ln -sf ../../%{_libdir}/%{name}/%{name} ${RPM_BUILD_ROOT}%{_bindir}/%{name}

rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/application
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{globs,magic,XMLnamespaces,aliases,subclasses,mime.cache}
rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/{%{name}.desktop,mimeinfo.cache}


%post
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :


%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :


%clean
rm -rf ${RPM_BUILD_ROOT}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_sysconfdir}/gconf/schemas/%{name}-display-thumbnail.schemas
%{_bindir}/%{name}
%{_bindir}/%{name}-display-thumbnailer
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/gnome/48x48/mimetypes/*.png
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/fedora-%{name}.desktop
%{_libdir}/%{name}/
%{_mandir}/man1/*




%changelog
* Tue Dec 6 2005 Luya Tshimbalanga  - 0.35.2-20
- Clean up 
- Fixed the right path for symbolic link

* Sat Dec 3 2005 Luya Tshimbalanga  - 0.35.2-19
- Added disable-schemas-install on %_configure
- Trying to symlink using nrpms method based on FC3 version

* Tue Nov 29 2005 Luya Tshimbalanga  - 0.35.2-18
- Added patch against NullObject.py (thanks jwb)

* Tue Nov 29 2005 Luya Tshimbalanga  - 0.35.2-17
- Reorganized names and fixed %_install


* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-16
- Rebuild

* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-15
- Fixed %_install

* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-14
- Bump

* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-13
- Bump

* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-12
- Removed pygtk2

* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-11
- Added distribution version
- Clarified the note about GConf instead of gconf

* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-10
- Added libgnomeui-devel to test some sensors

* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-9
- Cleaned up and removed unnecesary buildrequires

* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-8
- Fixed error on mime.cache

* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-7
- Rebuilt

* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-6
- Rebuilt

* Wed Nov 16 2005 Luya Tshimbalanga  - 0.35.2-5
- Added desktop-file-utils command for post and postun

* Wed Nov 16 2005 Luya Tshimbalanga  - 0.35.2-4
- Fixed mistakes (thanks Alex Lancaster (alexl at users.sourceforge.net))

* Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-3
- Enhanced codes to be FedoraGuide compliant (thanks to Brian Pepple (bdpepple at ameritech.net))

* Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-2
- bump

* Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Dec 2005 22:14:12 -0000	1.1
+++ .cvsignore	7 Dec 2005 22:14:49 -0000	1.2
@@ -0,0 +1 @@
+gDesklets-0.35.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Dec 2005 22:14:12 -0000	1.1
+++ sources	7 Dec 2005 22:14:49 -0000	1.2
@@ -0,0 +1 @@
+8d77add2c07cb374a79a30d1d2055f54  gDesklets-0.35.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec  8 00:27:39 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed,  7 Dec 2005 19:27:39 -0500
Subject: web/html/participate/schedule index.php,1.6,1.7
Message-ID: <200512080028.jB80SNPh012719@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/schedule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12682

Modified Files:
	index.php 
Log Message:
Clean-up of syntax, might it yield a redirect on the live site?  We shall see.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/schedule/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- index.php	6 Dec 2005 06:53:57 -0000	1.6
+++ index.php	8 Dec 2005 00:27:37 -0000	1.7
@@ -1,3 +1,3 @@
 



From fedora-extras-commits at redhat.com  Thu Dec  8 02:17:20 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed,  7 Dec 2005 21:17:20 -0500
Subject: rpms/darcs/devel .cvsignore, 1.3, 1.4 darcs.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200512080217.jB82HosD016341@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	.cvsignore darcs.spec sources 
Log Message:
- 1.0.5 bugfix release
  - tests/send.sh ok again



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2005 00:33:29 -0000	1.3
+++ .cvsignore	8 Dec 2005 02:17:18 -0000	1.4
@@ -1 +1 @@
-darcs-1.0.4.tar.gz
+darcs-1.0.5.tar.gz


Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- darcs.spec	17 Nov 2005 06:38:32 -0000	1.5
+++ darcs.spec	8 Dec 2005 02:17:18 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           darcs
-Version:        1.0.4
+Version:        1.0.5
 Release:        1%{?dist}
 Summary:        David's advanced revision control system
 
@@ -47,8 +47,6 @@
 
 %prep
 %setup -q
-# skip test currently failing in buildsystem
-mv tests/send.sh{,-disabled}
 
 
 %build
@@ -85,9 +83,13 @@
 
 
 %changelog
+* Thu Dec  8 2005 Jens Petersen  - 1.0.5-1
+- 1.0.5 bugfix release
+  - tests/send.sh ok again
+
 * Mon Nov 14 2005 Jens Petersen  - 1.0.4-1
 - 1.0.4 release
-  - skip send.sh test for now since it is failing in buildsystem
+  - skip tests/send.sh for now since it is failing in buildsystem
 
 * Tue Jul  5 2005 Jens Petersen 
 - drop superfluous doc buildrequires (Karanbir Singh, #162436)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2005 00:33:29 -0000	1.3
+++ sources	8 Dec 2005 02:17:18 -0000	1.4
@@ -1 +1 @@
-0be693b00e4b1bd24906d4f479e78923  darcs-1.0.4.tar.gz
+9a9a4f84ed5b6258f7ab321713adf20b  darcs-1.0.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 02:38:55 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Wed,  7 Dec 2005 21:38:55 -0500
Subject: web/html/participate/schedule index.php,1.7,1.8
Message-ID: <200512080239.jB82dPZ3016621@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/participate/schedule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16599

Modified Files:
	index.php 
Log Message:
More complex, working redirect


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/schedule/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- index.php	8 Dec 2005 00:27:37 -0000	1.7
+++ index.php	8 Dec 2005 02:38:53 -0000	1.8
@@ -1,3 +1,3 @@
 



From fedora-extras-commits at redhat.com  Thu Dec  8 03:05:04 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Wed,  7 Dec 2005 22:05:04 -0500
Subject: web/html/participate/schedule index.php,1.8,1.9
Message-ID: <200512080306.jB83626r018271@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/participate/schedule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18254/schedule

Modified Files:
	index.php 
Log Message:
Without header() working...


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/schedule/index.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- index.php	8 Dec 2005 02:38:53 -0000	1.8
+++ index.php	8 Dec 2005 03:05:01 -0000	1.9
@@ -1,3 +1,41 @@
 initCommon();
+$template->displayHeader();
+
+?>
+
This Page Has Moved

+
+

+The new location is:
+

+
+
    
+ 
    • 
+

+
+

+Please update your links or bookmarks accordingly.
+

+
+displayFooter('$Date$moddate) .' UTC $');
+
 ?>



From fedora-extras-commits at redhat.com  Thu Dec  8 03:26:50 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Wed,  7 Dec 2005 22:26:50 -0500
Subject: web/html/participate/schedule index.php,1.9,1.10
Message-ID: <200512080327.jB83RKMp018390@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/participate/schedule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18373

Modified Files:
	index.php 
Log Message:
Foolish me.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/schedule/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- index.php	8 Dec 2005 03:05:01 -0000	1.9
+++ index.php	8 Dec 2005 03:26:48 -0000	1.10
@@ -28,14 +28,6 @@
 
 displayFooter('$Date$moddate) .' UTC $');
+$template->displayFooter('$Date$');
 
 ?>



From fedora-extras-commits at redhat.com  Thu Dec  8 04:07:47 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 23:07:47 -0500
Subject: rpms/Inventor/devel Inventor-redhat-bugs.diff,NONE,1.1
Message-ID: <200512080407.jB847lx6020147@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Added Files:
	Inventor-redhat-bugs.diff 
Log Message:
New.

Inventor-redhat-bugs.diff:

--- NEW FILE Inventor-redhat-bugs.diff ---
--- /dev/null	2005-11-21 11:13:32.160873500 +0100
+++ inventor/libSoXt/include/GL/GLwMDrawA.h	2005-12-08 04:29:09.000000000 +0100
@@ -0,0 +1,13 @@
+#include 
+
+#define glwMDrawingAreaWidgetClass SoglwMDrawingAreaWidgetClass
+
+#define GLwNredSize SoGLwNredSize
+#define GLwNgreenSize SoGLwNgreenSize
+#define GLwNblueSize SoGLwNblueSize
+
+#define GLwNrgba SoGLwNrgba
+#define GLwNvisualInfo SoGLwNvisualInfo
+
+#define GLwNexposeCallback SoGLwNexposeCallback
+#define GLwNginitCallback SoGLwNginitCallback
--- inventor/apps/samples/widgets/GNUmakefile.componentTest.orig	2005-12-08 04:47:39.000000000 +0100
+++ inventor/apps/samples/widgets/GNUmakefile.componentTest	2005-12-08 04:52:04.000000000 +0100
@@ -5,7 +5,7 @@
 
 CXXFILES = componentTest.c++
 
-LLDLIBS = libInventorWidget.a -lInventor -lInventorXt -lGLw
+LLDLIBS = libInventorWidget.a -lInventor -lInventorXt
 
 all install: all_ivbin
 



From fedora-extras-commits at redhat.com  Thu Dec  8 04:11:16 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 23:11:16 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.21,1.22
Message-ID: <200512080412.jB84C7G6020231@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	Inventor.spec 
Log Message:
Next attempt.


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Inventor.spec	22 Nov 2005 02:38:32 -0000	1.21
+++ Inventor.spec	8 Dec 2005 04:11:12 -0000	1.22
@@ -33,11 +33,16 @@
 # Declare SoTempPath forward
 Patch8:		Inventor-SoPath.diff
 
+# Work around to RH shipping a broken libGLw
+# - PR #173879: libGLw headers missing
+# - PR #175251: libGLw missing motif
+Patch10:	Inventor-redhat-bugs.diff
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  mesa-libGLU-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:	mesa-libGLw-devel
+BuildRequires:  libGLU-devel
+BuildRequires:  libGL-devel
+BuildRequires:	libGLw-devel
 BuildRequires:	libX11-devel
 BuildRequires:	libXext-devel
 # Work around to RH shipping libXext without headers
@@ -135,6 +140,8 @@
 %patch7 -p0
 %patch8 -p1
 
+%patch10 -p1
+
 grep -Rl __ia64 lib* | while read a; do \
   sed -i -e 's,__ia64,__ia64__,g' \
   -e 's,__ia64____,__ia64__,g' \
@@ -228,6 +235,9 @@
 install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor
 mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples
 
+# testing
+exit 1
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -306,8 +316,9 @@
 %{_libdir}/Inventor/examples
 
 %changelog
-* Mon Nov 21 2005 Ralf Corsepius  - 2.1.5-14
+* Tue Dec 8 2005 Ralf Corsepius  - 2.1.5-14
 - Attempt to build against modular X.
+- Add Inventor-redhat-bugs patch.
 
 * Tue Aug 03 2005 Ralf Corsepius  - 2.1.5-13
 - Let PPC use standard RPM_OPT_FLAGS.



From fedora-extras-commits at redhat.com  Thu Dec  8 04:33:43 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 23:33:43 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.22,1.23
Message-ID: <200512080434.jB84YDXx020387@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	Inventor.spec 
Log Message:
Next attempt.


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Inventor.spec	8 Dec 2005 04:11:12 -0000	1.22
+++ Inventor.spec	8 Dec 2005 04:33:40 -0000	1.23
@@ -316,7 +316,7 @@
 %{_libdir}/Inventor/examples
 
 %changelog
-* Tue Dec 8 2005 Ralf Corsepius  - 2.1.5-14
+* Thu Dec 8 2005 Ralf Corsepius  - 2.1.5-14
 - Attempt to build against modular X.
 - Add Inventor-redhat-bugs patch.
 



From fedora-extras-commits at redhat.com  Thu Dec  8 05:34:23 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu,  8 Dec 2005 00:34:23 -0500
Subject: rpms/darcs/devel darcs.spec,1.6,1.7
Message-ID: <200512080534.jB85Yrv3022108@cvs-int.fedora.redhat.com>

Author: petersen

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

Modified Files:
	darcs.spec 
Log Message:
on second thoughs still skip send.sh since it still fails in the buildsys



Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- darcs.spec	8 Dec 2005 02:17:18 -0000	1.6
+++ darcs.spec	8 Dec 2005 05:34:21 -0000	1.7
@@ -47,6 +47,8 @@
 
 %prep
 %setup -q
+# skip test currently failing in buildsystem
+mv tests/send.sh{,-disabled}
 
 
 %build
@@ -85,7 +87,6 @@
 %changelog
 * Thu Dec  8 2005 Jens Petersen  - 1.0.5-1
 - 1.0.5 bugfix release
-  - tests/send.sh ok again
 
 * Mon Nov 14 2005 Jens Petersen  - 1.0.4-1
 - 1.0.4 release



From fedora-extras-commits at redhat.com  Thu Dec  8 05:51:49 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  8 Dec 2005 00:51:49 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.23,1.24
Message-ID: <200512080552.jB85qKXQ022201@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	Inventor.spec 
Log Message:
Next attempt.


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Inventor.spec	8 Dec 2005 04:33:40 -0000	1.23
+++ Inventor.spec	8 Dec 2005 05:51:47 -0000	1.24
@@ -76,7 +76,11 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:	pkgconfig
-Requires:	xorg-x11-devel
+Requires:	libGLU-devel
+# PR #175253: libGLU-devel should implicitly pull-in libGL-devel
+Requires:	libGL-devel
+# PR #173712: libGL-devel should implicitly pull-in libX11-devel
+Requires:	libX11-devel
 Requires:	freetype-devel libjpeg-devel
 
 %description    devel
@@ -235,9 +239,6 @@
 install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor
 mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples
 
-# testing
-exit 1
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 



From fedora-extras-commits at redhat.com  Thu Dec  8 08:45:39 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  8 Dec 2005 03:45:39 -0500
Subject: rpms/Inventor/devel Inventor-pkgconfig.diff, 1.1, 1.2 Inventor.spec,
	1.24, 1.25
Message-ID: <200512080846.jB88kAg4027431@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	Inventor-pkgconfig.diff Inventor.spec 
Log Message:
- Further modular X fixes.
- Reflect modular X pkgconfigs.


Inventor-pkgconfig.diff:

Index: Inventor-pkgconfig.diff
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor-pkgconfig.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Inventor-pkgconfig.diff	8 Nov 2004 03:59:15 -0000	1.1
+++ Inventor-pkgconfig.diff	8 Dec 2005 08:45:37 -0000	1.2
@@ -9,9 +9,9 @@
 +Name: libInventor
 +Description: SGI Open Inventor
 +Version: 2.1.5
-+Requires: freetype2
-+Libs: -L${libdir} -L/usr/X11R6/lib -lInventor -ljpeg -lGL -lX11 -lm -ldl
-+Cflags: -I${includedir} -I/usr/X11R6/include
++Requires: freetype2 x11
++Libs: -L${libdir} -lInventor -ljpeg -lGL -lX11 -lm -ldl
++Cflags: -I${includedir}
 --- /dev/null	2003-09-15 15:40:47.000000000 +0200
 +++ libInventorXt.pc.in	2004-07-07 08:37:59.000000000 +0200
 @@ -0,0 +1,11 @@
@@ -23,6 +23,6 @@
 +Name: libInventorXt
 +Description: SGI Open InventorXt
 +Version: 2.1.5
-+Requires: libInventor
-+Libs: -L${libdir} -L/usr/X11R6/lib -lInventorXt -lXm -lXt
-+Cflags: -I${includedir} -I/usr/X11R6/include
++Requires: libInventor xt
++Libs: -L${libdir} -lInventorXt -lXm
++Cflags: -I${includedir}


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Inventor.spec	8 Dec 2005 05:51:47 -0000	1.24
+++ Inventor.spec	8 Dec 2005 08:45:37 -0000	1.25
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        14%{?dist}
+Release:        15%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -43,7 +43,6 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  libGL-devel
 BuildRequires:	libGLw-devel
-BuildRequires:	libX11-devel
 BuildRequires:	libXext-devel
 # Work around to RH shipping libXext without headers
 BuildRequires:  xorg-x11-proto-devel
@@ -52,7 +51,6 @@
 # FIXME: Why is libXi required?
 BuildRequires: 	libXi-devel
 
-BuildRequires: 	libXt-devel
 BuildRequires:	openmotif-devel
 BuildRequires:	freetype-devel
 BuildRequires:	libjpeg-devel
@@ -102,6 +100,8 @@
 Requires:	InventorXt = %{version}-%{release}
 Requires:	Inventor-devel = %{version}-%{release}
 Requires:	pkgconfig
+# PR 175256: Missing openmotif-devel dep
+Requires:	xorg-x11-proto-devel
 Requires:	openmotif-devel
 
 %description    -n InventorXt-devel
@@ -317,6 +317,10 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Thu Dec 8 2005 Ralf Corsepius  - 2.1.5-15
+- Further modular X fixes.
+- Reflect modular X pkgconfigs.
+
 * Thu Dec 8 2005 Ralf Corsepius  - 2.1.5-14
 - Attempt to build against modular X.
 - Add Inventor-redhat-bugs patch.



From fedora-extras-commits at redhat.com  Thu Dec  8 10:51:10 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 05:51:10 -0500
Subject: web/html/docs/translation-windows - New directory
Message-ID: <200512081051.jB8ApABB031980@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31971/translation-windows

Log Message:
Directory /cvs/fedora/web/html/docs/translation-windows added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 10:51:16 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 05:51:16 -0500
Subject: web/html/docs/translation-guide - New directory
Message-ID: <200512081051.jB8ApGY2031995@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31971/translation-guide

Log Message:
Directory /cvs/fedora/web/html/docs/translation-guide added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:00:55 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:00:55 -0500
Subject: web/html/docs/release-notes fedora.css,NONE,1.1
Message-ID: <200512081100.jB8B0tqI032103@cvs-int.fedora.redhat.com>

Author: kwade

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

Added Files:
	fedora.css 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #D0D0B0;
	background-color: #FAF9E0;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #22437f;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
      
h2 {
        font-size: 1.25em;
}

h3 {
        font-size: 1.1em;
}

a:link {
        color: #900;
}
a:visited {
        color: #48468f;
}
a:hover {
        color: #f20;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}

.procedure ol li {
        margin-bottom: 0.5em;
}
.procedure ol li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

.itemizedlist ul li {
	margin-bottom: 0.5em;
}
.itemizedlist ul li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

p.title	{
	text-align: center;
}



From fedora-extras-commits at redhat.com  Thu Dec  8 11:01:00 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:01:00 -0500
Subject: web/html/docs/translation-guide index.php,NONE,1.1
Message-ID: <200512081101.jB8B10pi032120@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32088/docs/translation-guide

Added Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


***** Error reading new file: [Errno 2] No such file or directory: 'index.php'



From fedora-extras-commits at redhat.com  Thu Dec  8 11:01:05 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:01:05 -0500
Subject: web/html/docs/translation-windows fedora.css, NONE,
	1.1 generated-index.php, NONE, 1.1 index.php, NONE,
	1.1 ln-legalnotice.php, NONE, 1.1 s1-cvs.php, NONE,
	1.1 s1-cycle.php, NONE, 1.1 s1-poedit.php, NONE,
	1.1 s1-reg.php, NONE, 1.1 s1-resource.php, NONE,
	1.1 s1-setup.php, NONE, 1.1 s1-ssh.php, NONE, 1.1
Message-ID: <200512081101.jB8B15rg001200@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32088/docs/translation-windows

Added Files:
	fedora.css generated-index.php index.php ln-legalnotice.php 
	s1-cvs.php s1-cycle.php s1-poedit.php s1-reg.php 
	s1-resource.php s1-setup.php s1-ssh.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #B0C4DE;
	background-color: #F0F8FF;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #990000;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
                                                                                                                
h2 {
        font-size: 1.25em;
}
                                                                                                                
h3 {
        font-size: 1.1em;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}


***** Error reading new file: [Errno 2] No such file or directory: 'generated-index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ln-legalnotice.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-cvs.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-cycle.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-poedit.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-reg.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-resource.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-setup.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-ssh.php'



From fedora-extras-commits at redhat.com  Thu Dec  8 11:03:55 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:03:55 -0500
Subject: web/html/participate/qa-guide index.php,1.1.1.1,1.2
Message-ID: <200512081105.jB8B5DRK001327@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/qa-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227/qa-guide

Modified Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/qa-guide/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- index.php	30 Mar 2005 17:47:24 -0000	1.1.1.1
+++ index.php	8 Dec 2005 11:03:53 -0000	1.2
@@ -1,17 +1,33 @@
-initCommon(); 
+$template->initCommon();
 $template->displayHeader();
 
 ?>
+
This Page Has Moved

+
+

+The new location is:
+

 
-
Red Hat Linux Project Quality Assurance Guide
???Next
Red Hat Linux Project Quality Assurance Guide
Brock Organ
Copyright ? 2003 Red Hat, Inc., Brock Organ
Table of Contents
Introduction
1. Infrastructure
2. Individual Packages
3. Installation
4. Release Engineering
5. Kernel Testing
6. Toolchain
7. General Applications
???Next
???Introduction

+
    
+ 
    • 
+

 
-
+Please update your links or bookmarks accordingly.
+

+
+displayFooter('$Date$');
 
 ?>
-



From fedora-extras-commits at redhat.com  Thu Dec  8 11:04:36 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:04:36 -0500
Subject: web/html/participate/translation-windows index.php,1.1.1.1,1.2
Message-ID: <200512081105.jB8B5CdF001322@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/translation-windows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227/translation-windows

Modified Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/translation-windows/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- index.php	30 Mar 2005 17:47:24 -0000	1.1.1.1
+++ index.php	8 Dec 2005 11:04:30 -0000	1.2
@@ -1,35 +1,33 @@
-initCommon(); 
+$template->initCommon();
 $template->displayHeader();
 
 ?>
+
This Page Has Moved

+
+

+The new location is:
+

 
-
Translate Fedora in Microsoft Windows
???Next
Translate Fedora in Microsoft? Windows?
Chester Cheng
Copyright ? 2004 Red Hat, Inc., Chester Cheng
1. Introduction
2. !
 Download and Install TortoiseCVS
3. Generate Your Digital ID
4. Register Your Fedora Account
5. Using TortoiseCVS
5.1.  Set up TortoiseCVS 
5.2.  Download Files from Fedora Server 
6.  poEdit 
6.1. Download and Install poEdit
6.2. Setup poEdit
7. Translation Lifecycle
7.1.  Phase 1 
7.2.  Phase 2 
7.3.  Phase 3 
7.4.  Phase 4 
7.5.  Phase 5 
8. !
 Other 
ources
8.1.  Related Websites 
8.2.  Your Feedback 
1.?Introduction

-      To join the Fedora translation team and work with people around the world
-      is easy in Microsoft? Windows? as well. To achieve this, several
-      tools are needed:
-	
  • 
-    A Web Browser that supports cookies
-	
  • 
-    A Concurrent Versions System (CVS) client —
-	This artical uses TortoiseCVS
-	
  • 
-    An editor for .po files — This article uses poEdit
-	
  • 
-    A Secury Shell (ssh) client — This article uses puttygen
-	which is a free utility that generates personalized digital ID, using public key infrastructure.
-	This utility is bundled within TortoiseCVS
-	

-	This article will introduce you where to find and download these tools, how to install and setup,
-	and even a brief description of how to use them.
-	
???Next
???2.?Download and Install TortoiseCVS

+
    
+ 
    • 
+

 
-
+Please update your links or bookmarks accordingly.
+

+
+displayFooter('$Date$');
 
 ?>
-



From fedora-extras-commits at redhat.com  Thu Dec  8 11:03:43 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:03:43 -0500
Subject: web/html/participate/documentation-guide index.php,1.5,1.6
Message-ID: <200512081105.jB8B5D0H001325@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227/documentation-guide

Modified Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.php	6 Dec 2005 19:41:26 -0000	1.5
+++ index.php	8 Dec 2005 11:03:40 -0000	1.6
@@ -1,3 +1,33 @@
 
\ No newline at end of file
+//
+// Easily-changeable template for redirection.
+//
+
+$NEWURL="http://fedora.redhat.com/docs/documentation-guide/";
+
+include("site.inc");
+
+$template = new Page;
+$template->initCommon();
+$template->displayHeader();
+
+?>
+
This Page Has Moved

+
+

+The new location is:
+

+
+
    
+ 
    • 
+

+
+

+Please update your links or bookmarks accordingly.
+

+
+displayFooter('$Date$');
+
+?>



From fedora-extras-commits at redhat.com  Thu Dec  8 11:03:48 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:03:48 -0500
Subject: web/html/participate/documentation-quick-start index.php, 1.1.1.1,
	1.2
Message-ID: <200512081105.jB8B5DY4001329@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-quick-start
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227/documentation-quick-start

Modified Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-quick-start/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- index.php	30 Mar 2005 17:47:24 -0000	1.1.1.1
+++ index.php	8 Dec 2005 11:03:46 -0000	1.2
@@ -1,175 +1,32 @@
-initCommon();
-
 $template->displayHeader();
 
 ?>
-
-
Fedora Documentation Project Quick Start Guide

-
-
Note: this document is still in progress. If you have any thoughts, please
-share them on the fedora-docs-list mailing list.

-
-

-Since reading the Documentation Guide 
-can be a bit overwhelming at first, read
-this page first to understand how to start participating and the
-process used to add a tutorial to the project.
-

-
-

-The first step is to choose whether you want to be a writer or an editor.
-Refer to the project page for each role's definition.
-Editors must first be approved by the project leader and must have experience
-with DocBook XML and the proper use of tags since all editors must follow the
-same guidelines when reviewing tutorials.
-

-
-

-If you are chosen as an editor, your name is added to the project page,
-and your job is to wait until writers are finished writing the tutorials and
-need editing.
-

+
This Page Has Moved

 
 

-If you choose to be a writer, the follow process must be used:
+The new location is:
 

 
 
    
-
-
  • Refer to bug fedora-docs-writing 
-to see the list of tutorials already in progress to make sure you do not select a duplicate.
    • 
-
-
  • If you have an idea that is not in the list of docs in progress, open a Bugzilla report
-with your idea and be sure to make bug fedora-docs-writing
-depend on it. Also, email the mailing list to let everyone know you are working on it.
-If you can't think of an idea, refer to fedora-docs-ideas
-for a list of ideas without owners.
    
-
    In your Bugzilla report for the new topic, include the following information:
-
      
-
    • What problem it solves
      • 
-
    • Summary of topic
      • 
-
    • Outline for tutorial
      • 
-
    • Intended target audience
      • 
-
    • Whether you are the sole author or whether it is a group effort
      • 
-
    • Whether it helps to create a set of documents with related themes
      • 
-
    • Time estimate on when it will be finished
      • 
-
    • Other resources (other than an editor) you will need to finish -- testers with similar hardware, etc.
      • 
+ 
      • 
 
    
-
    
-
    • 
-
-
  • If you are not familiar with DocBook XML, read the Documentation Guide 
-to learn how to use this format. Tutorials must be submitted in this format. Even if
-you are familiar with it, read the guide to learn how tags are used for the project
-and to learn how to setup your file to make it compatible with the CVS structure and
-the common entities file.
    • 
-
-
  • Start following the conventions in the guide from the beginning such as 
-preparing your directories according to the example-tutorial.
-
-
  • Once your file is ready, attach a tarball of the files it to the bug report you 
-created so that an editor can be assigned to it. The editor should be able to untar the file
-under the fedora-docs CVS module and type make html to build it. If you need help with creating
-this structure, ask the mailing list for help or ask for an editor so he/she can help you.
    • 
-
-
  • The editor will review your tutorial according to the editing guidelines (which are in progress)
-and work with you to get them corrected.
    • 
-
-
  • Once the writer and editor feel it is ready to be published to the website,
-make bug fedora-docs-ready 
-depend on this bug so the project maintainer can review it and post it to the website.
-Be sure to include the CVS file versions and branch name to make sure the correction
-document is posted.
    • 
-
  • Once it is posted to the website, you are still responsible for maintaining your tutorial.
-Until write access is available for CVS, submit updates to your tutorial in the form of
-patches via Bugzilla so that they can be applied.
    • 
-

-
-
*Before* the writer hands a document over to the editor, he/she must
-verify the following:

 
-
    
-
  1. Spell check all files.
    2. 
-
  2. Verify that all URLs are still valid.
    3. 
-
  3. Verify that the technical content is correct -- which means follow
-your own documentation step by step to confirm.
    4. 
-
  4. Verify that the names of the files include the language such as
-example-tutorial-en.xml.
    5. 
-
  5. Verify that all sections have an id so all HTML files generated have
-static filenames.
    6. 
-
  6. Verify that all ids following the naming convention in the Docs Guide
    7. 
-
  7. Checkout the fedora-docs CVS module if you haven't already, and   
-   verify that if you drop in your directory that it builds within the 
-   CVS environment, including using a Makefile based on the existing    
-   ones.
    8. 
-
  8. Verify the HTML Output:
-
      
-
    • Click all links to make sure they are valid
      • 
-
    • View each page to make sure there aren't any missing images.
      • 
-
    • Make sure all the images match their description in the text.
      • 
-
    • Click the Legal Notice link on the title page to make sure it   
-      works and contains the FDL, that the version number has been 
-      bumped if a previous version existed, and that the last modified 
-      date has been updated.
      • 
-
    
-
    9. 
-

-
-
Then, the editor is responsible for:

-
-
    
-
  1. Making sure the writer followed the docs conventions including using
-standard id names, verifying that the parent file follows the example
-tutorial so that it builds in CVS, and proper use of XML tags.
    2. 
-
  2. Checking the grammar and word usage.
    3. 
-
  3. Verifying that it is written for the intended target audience.
    4. 
-
  4. Looking for any possible missing steps (While reading, if it feels
-like a step was omitted, ask the writer to make sure. Many times writers
-who are familiar with a procedure will leave out a step that is obvious
-to them but not to the reader.
    5. 
-
  5. Verifying that it builds in the CVS structure
    6. 
-
  6. Determine if the topic needs a second technical review. If it does,
-work with the writer to email the mailing lists to find someone to
-follow the document step by step to make sure it works on their system
-as well.
  7. 
-

-
-
Summary of Tutorial Tracking

-
-
Bug fedora-docs-ideas: 
-Docs ideas without owners - a general bucket for ideas for new documents or conversions that come
-*first* through the list

-
Bug fedora-docs-writing: Docs in progress - for tracking
-documents actively being written/developed/edited

-
-
Bug fedora-docs-ready Docs ready for going to
-fedora.redhat.com - when it is done with fedora-docs-writing, it comes here while it
-undergoes final editing to go to the website.

-
-
This means the process of idea -> publication is: 

-
-
    
-
  1. File a bug report for your document, or carry the on the one with the
-idea in it.
    2. 
-
-
  2. Move the bug through the tracker in this order
-
    -idea 	             -> 	develop 	        <-> 	publish
-fedora-docs-ideas		fedora-docs-writing		fedora-docs-ready
-
    
-
    3. 
-

-
-
Note: there is a double-arrow between develop <-> publish because a
-document should stay alive after it is published.  Once you have
-published a version and have moved to writing for the next version of
-Fedora Core, your document's bug moves back to fedora-docs-writing.

+

+Please update your links or bookmarks accordingly.
+

 
-displayFooter('$Date$');
 



From fedora-extras-commits at redhat.com  Thu Dec  8 11:04:25 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:04:25 -0500
Subject: web/html/participate/translation-guide index.php,1.1.1.1,1.2
Message-ID: <200512081105.jB8B5DsM001328@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/translation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227/translation-guide

Modified Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/translation-guide/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- index.php	30 Mar 2005 17:47:24 -0000	1.1.1.1
+++ index.php	8 Dec 2005 11:04:22 -0000	1.2
@@ -1,4 +1,10 @@
-displayHeader();
 
 ?>
-
Translation Guide

+
This Page Has Moved

+
+

+The new location is:
+

+
+
    
+ 
    • 
+

 
 

-to be written by Paul Gampe and Sarah Smith
+Please update your links or bookmarks accordingly.
 

 
-displayFooter('$Date$');
 



From fedora-extras-commits at redhat.com  Thu Dec  8 11:03:24 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:03:24 -0500
Subject: web/html/participate/developers-guide index.php,1.3,1.4
Message-ID: <200512081105.jB8B5DMr001326@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/developers-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227/developers-guide

Modified Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/developers-guide/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.php	6 Dec 2005 19:41:15 -0000	1.3
+++ index.php	8 Dec 2005 11:03:21 -0000	1.4
@@ -1,3 +1,33 @@
 initCommon();
+$template->displayHeader();
+
+?>
+
This Page Has Moved

+
+

+The new location is:
+

+
+
    
+ 
    • 
+

+
+

+Please update your links or bookmarks accordingly.
+

+
+displayFooter('$Date$');
+
 ?>



From fedora-extras-commits at redhat.com  Thu Dec  8 11:09:52 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:09:52 -0500
Subject: web/html/participate/documentation-faq index.php,1.3,1.4
Message-ID: <200512081110.jB8BANrx001387@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-faq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1366/documentation-faq

Modified Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-faq/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.php	6 Dec 2005 19:41:21 -0000	1.3
+++ index.php	8 Dec 2005 11:09:49 -0000	1.4
@@ -1,3 +1,33 @@
 initCommon();
+$template->displayHeader();
+
+?>
+
This Page Has Moved

+
+

+The new location is:
+

+
+
    
+ 
    • 
+

+
+

+Please update your links or bookmarks accordingly.
+

+
+displayFooter('$Date$');
+
 ?>



From fedora-extras-commits at redhat.com  Thu Dec  8 11:11:48 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  8 Dec 2005 06:11:48 -0500
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.8,1.9
Message-ID: <200512081112.jB8BCIW9001443@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	OpenSceneGraph.spec 
Log Message:
Remove -lXi from makedefs.


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- OpenSceneGraph.spec	7 Dec 2005 16:20:02 -0000	1.8
+++ OpenSceneGraph.spec	8 Dec 2005 11:11:30 -0000	1.9
@@ -69,6 +69,7 @@
     -e 's,^\(INST_LIBS[ ]*=\).*$,\1 $(DESTDIR)%{_libdir},g' \
     -e 's,^\(INST_EXAMPLES[ ]*=\).*$,\1 $(DESTDIR)%{_bindir},g' \
     -e 's,\(^[ \t]*LIBS[ ]*=.*\) -lstdc++,\1,g' \
+    -e 's, -lXi,,g' \
     $dir/Make/makedefs
 
 # Propagate RPM_OPT_FLAGS



From fedora-extras-commits at redhat.com  Thu Dec  8 11:20:02 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:20:02 -0500
Subject: web/html/docs/translation-windows/figs - New directory
Message-ID: <200512081120.jB8BK2hU001521@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1512/figs

Log Message:
Directory /cvs/fedora/web/html/docs/translation-windows/figs added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:21:17 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:21:17 -0500
Subject: web/html/docs/translation-windows/figs/account - New directory
Message-ID: <200512081121.jB8BLHwE001548@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/account
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1539/account

Log Message:
Directory /cvs/fedora/web/html/docs/translation-windows/figs/account added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:21:22 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:21:22 -0500
Subject: web/html/docs/translation-windows/figs/cycle - New directory
Message-ID: <200512081121.jB8BLMFs001564@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/cycle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1539/cycle

Log Message:
Directory /cvs/fedora/web/html/docs/translation-windows/figs/cycle added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:21:28 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:21:28 -0500
Subject: web/html/docs/translation-windows/figs/key - New directory
Message-ID: <200512081121.jB8BLSWj001580@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/key
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1539/key

Log Message:
Directory /cvs/fedora/web/html/docs/translation-windows/figs/key added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:21:33 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:21:33 -0500
Subject: web/html/docs/translation-windows/figs/poedit - New directory
Message-ID: <200512081121.jB8BLXlY001595@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/poedit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1539/poedit

Log Message:
Directory /cvs/fedora/web/html/docs/translation-windows/figs/poedit added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:21:39 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:21:39 -0500
Subject: web/html/docs/translation-windows/figs/setup - New directory
Message-ID: <200512081121.jB8BLdq8001610@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/setup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1539/setup

Log Message:
Directory /cvs/fedora/web/html/docs/translation-windows/figs/setup added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:25:38 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:25:38 -0500
Subject: web/html/docs/translation-windows/figs/account image001.jpg, NONE,
	1.1 image002.jpg, NONE, 1.1 image003.jpg, NONE, 1.1
Message-ID: <200512081125.jB8BPcVO001663@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/account
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1643/translation-windows/figs/account

Added Files:
	image001.jpg image002.jpg image003.jpg 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:25:44 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:25:44 -0500
Subject: web/html/docs/translation-windows/figs/cycle conflict.jpg, NONE,
	1.1 cvs_up.jpg, NONE, 1.1 cvs_up_commit.jpg, NONE,
	1.1 cvs_up_finish.jpg, NONE, 1.1 cvs_up_menu_commit.jpg, NONE,
	1.1 cvs_up_modified.jpg, NONE, 1.1 fedora_assign_to_you.jpg,
	NONE, 1.1 fedora_assigned.jpg, NONE,
	1.1 fedora_auth_denied.jpg, NONE, 1.1 fedora_login.jpg, NONE,
	1.1 fedora_released.jpg, NONE, 1.1 fedora_take.jpg, NONE, 1.1
Message-ID: <200512081125.jB8BPiia001690@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/cycle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1643/translation-windows/figs/cycle

Added Files:
	conflict.jpg cvs_up.jpg cvs_up_commit.jpg cvs_up_finish.jpg 
	cvs_up_menu_commit.jpg cvs_up_modified.jpg 
	fedora_assign_to_you.jpg fedora_assigned.jpg 
	fedora_auth_denied.jpg fedora_login.jpg fedora_released.jpg 
	fedora_take.jpg 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:25:49 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:25:49 -0500
Subject: web/html/docs/translation-windows/figs/key image001.jpg, NONE,
	1.1 image002.jpg, NONE, 1.1 image003.jpg, NONE,
	1.1 image004.jpg, NONE, 1.1
Message-ID: <200512081125.jB8BPnIa001709@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/key
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1643/translation-windows/figs/key

Added Files:
	image001.jpg image002.jpg image003.jpg image004.jpg 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:25:55 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:25:55 -0500
Subject: web/html/docs/translation-windows/figs/poedit image001.jpg, NONE,
	1.1 image002.jpg, NONE, 1.1 image003.jpg, NONE,
	1.1 image004.jpg, NONE, 1.1 image005.jpg, NONE,
	1.1 image006.jpg, NONE, 1.1 image007.jpg, NONE,
	1.1 image008.jpg, NONE, 1.1 menu_preferences.jpg, NONE,
	1.1 poEdit_start.jpg, NONE, 1.1 preferences.jpg, NONE, 1.1
Message-ID: <200512081125.jB8BPtpH001735@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/poedit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1643/translation-windows/figs/poedit

Added Files:
	image001.jpg image002.jpg image003.jpg image004.jpg 
	image005.jpg image006.jpg image007.jpg image008.jpg 
	menu_preferences.jpg poEdit_start.jpg preferences.jpg 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:26:00 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:26:00 -0500
Subject: web/html/docs/translation-windows/figs/setup image001.jpg, NONE,
	1.1 image002.jpg, NONE, 1.1 image003.jpg, NONE, 1.1
Message-ID: <200512081126.jB8BQ0ho001754@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/setup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1643/translation-windows/figs/setup

Added Files:
	image001.jpg image002.jpg image003.jpg 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:26:06 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:26:06 -0500
Subject: web/html/docs/translation-windows/figs/tortoise cvs20.jpg, NONE,
	1.1 cvs_co.jpg, NONE, 1.1 cvs_commit.jpg, NONE,
	1.1 cvs_cvsroot_module.jpg, NONE, 1.1 cvs_right_click_menu.jpg,
	NONE, 1.1 cvs_tortoisePlink.jpg, NONE, 1.1 image001.jpg, NONE,
	1.1 image002.jpg, NONE, 1.1 image003.jpg, NONE,
	1.1 image004.jpg, NONE, 1.1 image005.jpg, NONE, 1.1
Message-ID: <200512081126.jB8BQ6hB001780@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/tortoise
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1643/translation-windows/figs/tortoise

Added Files:
	cvs20.jpg cvs_co.jpg cvs_commit.jpg cvs_cvsroot_module.jpg 
	cvs_right_click_menu.jpg cvs_tortoisePlink.jpg image001.jpg 
	image002.jpg image003.jpg image004.jpg image005.jpg 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:30:59 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:30:59 -0500
Subject: web/html/docs/qa-guide - New directory
Message-ID: <200512081130.jB8BUxHm001831@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/qa-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1822/qa-guide

Log Message:
Directory /cvs/fedora/web/html/docs/qa-guide added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:31:45 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:31:45 -0500
Subject: web/html/docs/qa-guide ch-intro.php, NONE,
	1.1 general-applications.php, NONE, 1.1 index.php, NONE,
	1.1 individual-packages.php, NONE, 1.1 infrastructure.php,
	NONE, 1.1 installation.php, NONE, 1.1 kernel.php, NONE,
	1.1 ln-legalnotice.php, NONE, 1.1 release-engineering.php,
	NONE, 1.1 toolchain.php, NONE, 1.1
Message-ID: <200512081131.jB8BVjPd001867@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/qa-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1847/qa-guide

Added Files:
	ch-intro.php general-applications.php index.php 
	individual-packages.php infrastructure.php installation.php 
	kernel.php ln-legalnotice.php release-engineering.php 
	toolchain.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


***** Error reading new file: [Errno 2] No such file or directory: 'ch-intro.php'

***** Error reading new file: [Errno 2] No such file or directory: 'general-applications.php'

***** Error reading new file: [Errno 2] No such file or directory: 'index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'individual-packages.php'

***** Error reading new file: [Errno 2] No such file or directory: 'infrastructure.php'

***** Error reading new file: [Errno 2] No such file or directory: 'installation.php'

***** Error reading new file: [Errno 2] No such file or directory: 'kernel.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ln-legalnotice.php'

***** Error reading new file: [Errno 2] No such file or directory: 'release-engineering.php'

***** Error reading new file: [Errno 2] No such file or directory: 'toolchain.php'



From fedora-extras-commits at redhat.com  Thu Dec  8 11:39:08 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:39:08 -0500
Subject: web/html/docs/developers-guide common.inc,NONE,1.1
Message-ID: <200512081139.jB8Bd8wr001921@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/developers-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1906/developers-guide

Added Files:
	common.inc 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE common.inc ---
options["selected_uri"]="/participate/developers-guide/";

?>



From fedora-extras-commits at redhat.com  Thu Dec  8 11:39:13 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:39:13 -0500
Subject: web/html/docs/documentation-guide common.inc,NONE,1.1
Message-ID: <200512081139.jB8BdD7M001937@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1906/documentation-guide

Added Files:
	common.inc 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE common.inc ---
options["selected_uri"]="/participate/documentation-guide/";

?>



From fedora-extras-commits at redhat.com  Thu Dec  8 11:39:18 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:39:18 -0500
Subject: web/html/docs/qa-guide common.inc,NONE,1.1
Message-ID: <200512081139.jB8BdIYQ001953@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/qa-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1906/qa-guide

Added Files:
	common.inc 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE common.inc ---
options["selected_uri"]="/participate/qa-guide/";

?>



From fedora-extras-commits at redhat.com  Thu Dec  8 11:39:24 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:39:24 -0500
Subject: web/html/docs/translation-guide common.inc,NONE,1.1
Message-ID: <200512081139.jB8BdOAG001969@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1906/translation-guide

Added Files:
	common.inc 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE common.inc ---
options["selected_uri"]="/participate/translation-guide/";

?>



From fedora-extras-commits at redhat.com  Thu Dec  8 11:41:12 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:41:12 -0500
Subject: web/html/docs/release-notes/figs - New directory
Message-ID: <200512081141.jB8BfC63002002@cvs-int.fedora.redhat.com>

Author: kwade

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

Log Message:
Directory /cvs/fedora/web/html/docs/release-notes/figs added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:41:40 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:41:40 -0500
Subject: web/html/docs/developers-guide/stylesheet-images caution.png, NONE,
	1.1 important.png, NONE, 1.1 note.png, NONE, 1.1 tip.png, NONE,
	1.1 warning.png, NONE, 1.1
Message-ID: <200512081141.jB8Bfetm002037@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/developers-guide/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/developers-guide/stylesheet-images

Added Files:
	caution.png important.png note.png tip.png warning.png 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:41:45 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:41:45 -0500
Subject: web/html/docs/documentation-guide/stylesheet-images caution.png,
	NONE, 1.1 important.png, NONE, 1.1 note.png, NONE, 1.1 tip.png,
	NONE, 1.1 warning.png, NONE, 1.1
Message-ID: <200512081141.jB8BfjHh002057@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-guide/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/documentation-guide/stylesheet-images

Added Files:
	caution.png important.png note.png tip.png warning.png 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:41:50 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:41:50 -0500
Subject: web/html/docs/qa-guide qa-guide.pdf,NONE,1.1
Message-ID: <200512081141.jB8BfonN002073@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/qa-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/qa-guide

Added Files:
	qa-guide.pdf 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE qa-guide.pdf ---
%PDF-1.3
5 0 obj
<< /S /GoTo /D (documentation-guide.1) >>
endobj
8 0 obj
(Red Hat Linux Project Quality Assurance Guide)
endobj
9 0 obj
<< /S /GoTo /D (ch-intro.2) >>
endobj
12 0 obj
(Introduction)
endobj
13 0 obj
<< /S /GoTo /D (infrastructure.2) >>
endobj
16 0 obj
(Infrastructure)
endobj
17 0 obj
<< /S /GoTo /D (individual-packages.2) >>
endobj
20 0 obj
(Individual Packages)
endobj
21 0 obj
<< /S /GoTo /D (installation.2) >>
endobj
24 0 obj
(Installation)
endobj
25 0 obj
<< /S /GoTo /D (release-engineering.2) >>
endobj
28 0 obj
(Release Engineering)
endobj
29 0 obj
<< /S /GoTo /D (kernel.2) >>
endobj
32 0 obj
(Kernel Testing)
endobj
33 0 obj
<< /S /GoTo /D (toolchain.2) >>
endobj
36 0 obj
(Toolchain)
endobj
37 0 obj
<< /S /GoTo /D (general-applications.2) >>
endobj
40 0 obj
(General Applications)
endobj
41 0 obj
<< /S /GoTo /D [42 0 R  /Fit ] >>
endobj
44 0 obj <<
/Length 263       
/Filter /FlateDecode
>>
stream
x??RMK?0??W?1=4??i>?????7?P?Z?j?????4?.
??J ?????{	?A??LA?!?.?G8U?B??#??R?M<6Ig???Se?n
9?kJ????????.?
endobj
42 0 obj <<
/Type /Page
/Contents 44 0 R
/Resources 43 0 R
/MediaBox [0 0 612 792]
/Parent 50 0 R
>> endobj
45 0 obj <<
/D [42 0 R /XYZ 72 756 null]
>> endobj
46 0 obj <<
/D [42 0 R /XYZ 72 720 null]
>> endobj
47 0 obj <<
/D [42 0 R /XYZ 72 720 null]
>> endobj
6 0 obj <<
/D [42 0 R /XYZ 72 720 null]
>> endobj
43 0 obj <<
/Font << /F22 49 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
53 0 obj <<
/Length 1758      
/Filter /FlateDecode
>>
stream
x???R?8?=_??'g??ww_B?t??vw???c?D?m???)?G:???$???}?0????s?H1?[?G???\bz??O??????g?]1?????G4>?????????~??????N???S?1???P`;?V???_h????cFn?[$???L7RX_z?[??????'M???yO??y???}?A???F???{(qA?eB|?@??*[???c????@??o?8?h\?t0???xW89c??XF??b`[??&z?Cg????AY?".?????t?y???z?*?mF~????B;4?pE??3gU?????C??[????g??Fy?yNcfx6?)???tf
??'uN?
?u?R???j\??)??????F???t?	?U??KhQ62?1 ?T,U%??TQ?m???w???*#eq??|???R???d??ae?1?`DYa?E?????~?h?$1?+?`V?p??8???6D?`????U
??R??i??/???K?ZZ??????C???:??8?}??9
?u?~hH?]?0?2xP;???Lo?
?????????;sZ?&?L??????43gU?????e??z???)t?]?4?'?j??*??y?kL(?hL???	??L???S??i??\:p)D??????T$,??;????#/?6u???@C;??B?s&:?a??s??~?:;"?'?????,`?XM*> endobj
57 0 obj <<
/Type /Annot
/Border[1 0 0]/H/I/C[0 1 1]
/Rect [152.322 646.24 271.657 655.362]
/Subtype/Link/A<>
>> endobj
54 0 obj <<
/D [52 0 R /XYZ 72 741.554 null]
>> endobj
51 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
60 0 obj <<
/Length 572       
/Filter /FlateDecode
>>
stream
x??UM??0??W??Hc;??A??i!??B??fS?8	+?=N???jKA]????of??=??Q1?8g ?x?V{??a???	o=2???!??C?^NC??ecO?Bq*??NC??NG??2????????)a`????{x????;?)?{KDY6^???????????x?<]o?????qi?K?~?U?}??$$F8??I?W?(??(?j???|?[?S???[Uk?1??????
?????R[	JD??[@?/)???????U??G???n#u?V???F?lr?>K?j???5u.?F???.????:??????8????A?6???[????y??c????D???C?????4???FfMPc?	?CbJ?UWX?!PYwze??5?d;#o??q*T???*????n??)+G?VL8?????*???o}O??,H]*-?Y??|??4ZV?\?u]??)}???r?K9?????D?E??V*????:rs?@XD?-??)p?x]c~?B?5_!<>???9:?4?.&?iJPl??1??r??d?+??I B$?$_dC9=>
endobj
59 0 obj <<
/Type /Page
/Contents 60 0 R
/Resources 58 0 R
/MediaBox [0 0 612 792]
/Parent 50 0 R
>> endobj
61 0 obj <<
/D [59 0 R /XYZ 72 741.554 null]
>> endobj
62 0 obj <<
/D [59 0 R /XYZ 72 720 null]
>> endobj
10 0 obj <<
/D [59 0 R /XYZ 72 720 null]
>> endobj
58 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
65 0 obj <<
/Length 977       
/Filter /FlateDecode
>>
stream
x??WK??6??W?(5KR/??&M??!??h?????+?????3?H??????M,??p??h????s??`i???.???/?v?M???^????aI?y?s????c??q}?????Ac~]????uOc???I`t$E?E??D???%???3x???+?~x?
Z2??.?#=]o??w??djyho?????x?????q??=Y?>?2?	??p?v:?????V?{???2W?`~}??;m??P?????-^???S&b??????G??,???)??Bo6????gsQ????kO-?_?a?o???H???????m]?3???LD??K?][k???n?|g??n*???A?U-g?G????W?
endobj
64 0 obj <<
/Type /Page
/Contents 65 0 R
/Resources 63 0 R
/MediaBox [0 0 612 792]
/Parent 50 0 R
>> endobj
66 0 obj <<
/D [64 0 R /XYZ 72 741.554 null]
>> endobj
67 0 obj <<
/D [64 0 R /XYZ 72 720 null]
>> endobj
14 0 obj <<
/D [64 0 R /XYZ 72 720 null]
>> endobj
63 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
70 0 obj <<
/Length 506       
/Filter /FlateDecode
>>
stream
x??UMo?0??W?hK???
??VM????-?????e??M?~?.d?M?(?R??????{???#p*q??Z?b?8?`??A?V8?.???*?T???????/?m?]?89i???C???G?'?2/I`H?G"fFeOS?8?L??]]s\??????Ie?
?.??D???'|?$?Q??w?????8????????C???K??b???????+???n?ki$??H????????]??sb*9YX*8?h_????}??15???[?p???a&?[)K??(??l?@????+??a1bE?zS]/krCY?A??ba+7?\???
??)?????Q?c?
endobj
69 0 obj <<
/Type /Page
/Contents 70 0 R
/Resources 68 0 R
/MediaBox [0 0 612 792]
/Parent 50 0 R
>> endobj
71 0 obj <<
/D [69 0 R /XYZ 72 741.554 null]
>> endobj
72 0 obj <<
/D [69 0 R /XYZ 72 720 null]
>> endobj
18 0 obj <<
/D [69 0 R /XYZ 72 720 null]
>> endobj
68 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
75 0 obj <<
/Length 1537      
/Filter /FlateDecode
>>
stream
x??X?o?6?_?G	?5R??[?4]
t?Zw????h??,y?????w??d???vh?
???????oF|???&?4	?E?4?L?t?gf?z5???gn????aL??R?G?{??qu??????^bv^??`?yM?_??0(?y?i??'D????f????u9y3???;?8?!??M?> endobj
76 0 obj <<
/D [74 0 R /XYZ 72 741.554 null]
>> endobj
77 0 obj <<
/D [74 0 R /XYZ 72 720 null]
>> endobj
22 0 obj <<
/D [74 0 R /XYZ 72 720 null]
>> endobj
73 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
80 0 obj <<
/Length 444       
/Filter /FlateDecode
>>
stream
x??UKO?0??W?????A=jVo*7???$> endobj
81 0 obj <<
/D [79 0 R /XYZ 72 741.554 null]
>> endobj
82 0 obj <<
/D [79 0 R /XYZ 72 720 null]
>> endobj
26 0 obj <<
/D [79 0 R /XYZ 72 720 null]
>> endobj
78 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
86 0 obj <<
/Length 500       
/Filter /FlateDecode
>>
stream
x??UKo?0??W?(?&?zX=vXt???u=??M??V??_=?
?t?a? 0E~"???D!q?
??S,??
X;? ???0
??x???s????i???7?6R&?E?"????!????~???$0bT??fX??0%S?????????C_??|?;1???w?%?W|r?o)o?w???> endobj
87 0 obj <<
/D [85 0 R /XYZ 72 741.554 null]
>> endobj
88 0 obj <<
/D [85 0 R /XYZ 72 720 null]
>> endobj
30 0 obj <<
/D [85 0 R /XYZ 72 720 null]
>> endobj
84 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
91 0 obj <<
/Length 402       
/Filter /FlateDecode
>>
stream
x??T]o?0}???#D]?B:????O???? ?~?o??S?W?|'??%z?G????0?0b?F????????????2
?????3??N???j(7?m??^?0?6?vnL?D!?jww?R
)CR?`Vc?x??/?U??]?J?d??U?)?,r	va???`?????t??jxh??6?)?wB(h??	1??q?L?2??;e?J?????uc?U??XK?)?|n??> endobj
92 0 obj <<
/D [90 0 R /XYZ 72 741.554 null]
>> endobj
93 0 obj <<
/D [90 0 R /XYZ 72 720 null]
>> endobj
34 0 obj <<
/D [90 0 R /XYZ 72 720 null]
>> endobj
89 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
96 0 obj <<
/Length 413       
/Filter /FlateDecode
>>
stream
x??U?k?0????QfILL??6????<J??	V??????VEjKG;6"yy~???O	??C??P0?8g?_?J;??ZDP/3 at v??e?1G????iH?_??????Y?#?q?op`?R??9d??@k?Z?F????0?0b?A}????B??V~?'e
?A}???
???????/o???jD??k?k??r?H?ec??7SJ!eH(???,??w//??????@z??iXx????y?^g??\?s0q?68"6??VF????r???w??v	??^@??4??aZ6?sl?Y?-??b?7?I?8??>[?5j#Wm?~?M???6oM?&??>?=M??"?E???P??????~P???kE?7?x???????"?F????<?J4??????0Qu?????????????q?;endstream
endobj
95 0 obj <<
/Type /Page
/Contents 96 0 R
/Resources 94 0 R
/MediaBox [0 0 612 792]
/Parent 83 0 R
>> endobj
97 0 obj <<
/D [95 0 R /XYZ 72 741.554 null]
>> endobj
98 0 obj <<
/D [95 0 R /XYZ 72 720 null]
>> endobj
38 0 obj <<
/D [95 0 R /XYZ 72 720 null]
>> endobj
94 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
99 0 obj <<
/Type /Encoding
/Differences [ 0 /.notdef 1/dotaccent/fi/fl/fraction/hungarumlaut/Lslash/lslash/ogonek/ring 10/.notdef 11/breve/minus 13/.notdef 14/Zcaron/zcaron/caron/dotlessi/dotlessj/ff/ffi/ffl 22/.notdef 30/grave/quotesingle/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quoteright/parenleft/parenright/asterisk/plus/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore/quoteleft/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 127/.notdef 130/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE 141/.notdef 147/quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron/guilsinglright/oe 157/.notdef 159/Ydieresis 160/.notdef 161/exclamdown/cent/sterling/currency/yen/brokenbar/section/dieresis/copyr!
 ight/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]
>> endobj
56 0 obj <<
/Type /Font
/Subtype /Type1
/Encoding 99 0 R
/BaseFont /Times-Roman
>> endobj
49 0 obj <<
/Type /Font
/Subtype /Type1
/Encoding 99 0 R
/BaseFont /Helvetica-Bold
>> endobj
50 0 obj <<
/Type /Pages
/Count 6
/Parent 100 0 R
/Kids [42 0 R 52 0 R 59 0 R 64 0 R 69 0 R 74 0 R]
>> endobj
83 0 obj <<
/Type /Pages
/Count 4
/Parent 100 0 R
/Kids [79 0 R 85 0 R 90 0 R 95 0 R]
>> endobj
100 0 obj <<
/Type /Pages
/Count 10
/Kids [50 0 R 83 0 R]
>> endobj
101 0 obj <<
/Type /Outlines
/First 7 0 R
/Last 7 0 R
/Count 1
>> endobj
39 0 obj <<
/Title 40 0 R
/A 37 0 R
/Parent 7 0 R
/Prev 35 0 R
>> endobj
35 0 obj <<
/Title 36 0 R
/A 33 0 R
/Parent 7 0 R
/Prev 31 0 R
/Next 39 0 R
>> endobj
31 0 obj <<
/Title 32 0 R
/A 29 0 R
/Parent 7 0 R
/Prev 27 0 R
/Next 35 0 R
>> endobj
27 0 obj <<
/Title 28 0 R
/A 25 0 R
/Parent 7 0 R
/Prev 23 0 R
/Next 31 0 R
>> endobj
23 0 obj <<
/Title 24 0 R
/A 21 0 R
/Parent 7 0 R
/Prev 19 0 R
/Next 27 0 R
>> endobj
19 0 obj <<
/Title 20 0 R
/A 17 0 R
/Parent 7 0 R
/Prev 15 0 R
/Next 23 0 R
>> endobj
15 0 obj <<
/Title 16 0 R
/A 13 0 R
/Parent 7 0 R
/Prev 11 0 R
/Next 19 0 R
>> endobj
11 0 obj <<
/Title 12 0 R
/A 9 0 R
/Parent 7 0 R
/Next 15 0 R
>> endobj
7 0 obj <<
/Title 8 0 R
/A 5 0 R
/Parent 101 0 R
/First 11 0 R
/Last 39 0 R
/Count -8
>> endobj
102 0 obj <<
/Names [(Doc-Start) 46 0 R (ch-intro) 62 0 R (ch-intro.2) 10 0 R (documentation-guide) 47 0 R (documentation-guide.1) 6 0 R (general-applications) 98 0 R (general-applications.2) 38 0 R (individual-packages) 72 0 R (individual-packages.2) 18 0 R (infrastructure) 67 0 R (infrastructure.2) 14 0 R (installation) 77 0 R (installation.2) 22 0 R (kernel) 88 0 R (kernel.2) 30 0 R (page.1) 45 0 R (page.10) 97 0 R (page.2) 54 0 R (page.3) 61 0 R (page.4) 66 0 R (page.5) 71 0 R (page.6) 76 0 R (page.7) 81 0 R (page.8) 87 0 R (page.9) 92 0 R (release-engineering) 82 0 R (release-engineering.2) 26 0 R (toolchain) 93 0 R (toolchain.2) 34 0 R]
/Limits [(Doc-Start) (toolchain.2)]
>> endobj
103 0 obj <<
/Kids [102 0 R]
>> endobj
104 0 obj <<
/Dests 103 0 R
>> endobj
105 0 obj <<
/Type /Catalog
/Pages 100 0 R
/Outlines 101 0 R
/Names 104 0 R
/PageMode /UseOutlines /URI<>  /ViewerPreferences<<>> 
/OpenAction 41 0 R
>> endobj
106 0 obj <<
/Producer (pdfTeX-0.14h)
/Author()/Title()/Subject()/Creator(LaTeX with hyperref package)/Producer(pdfTeX14.h)/Keywords()
/Creator (TeX)
/CreationDate (D:20030717002700)
>> endobj
xref
0 107
0000000001 65535 f 
0000000002 00000 f 
0000000003 00000 f 
0000000004 00000 f 
0000000048 00000 f 
0000000009 00000 n 
0000001471 00000 n 
0000015613 00000 n 
0000000066 00000 n 
0000000129 00000 n 
0000004739 00000 n 
0000015541 00000 n 
0000000175 00000 n 
0000000206 00000 n 
0000006142 00000 n 
0000015455 00000 n 
0000000259 00000 n 
0000000292 00000 n 
0000007074 00000 n 
0000015369 00000 n 
0000000350 00000 n 
0000000388 00000 n 
0000009037 00000 n 
0000015283 00000 n 
0000000439 00000 n 
0000000470 00000 n 
0000009907 00000 n 
0000015197 00000 n 
0000000528 00000 n 
0000000566 00000 n 
0000010833 00000 n 
0000015111 00000 n 
0000000611 00000 n 
0000000644 00000 n 
0000011661 00000 n 
0000015025 00000 n 
0000000692 00000 n 
0000000720 00000 n 
0000012500 00000 n 
0000014952 00000 n 
0000000779 00000 n 
0000000818 00000 n 
0000001210 00000 n 
0000001521 00000 n 
0000000868 00000 n 
0000001318 00000 n 
0000001369 00000 n 
0000001420 00000 n 
0000000055 00000 f 
0000014512 00000 n 
0000014605 00000 n 
0000003792 00000 n 
0000003428 00000 n 
0000001591 00000 n 
0000003737 00000 n 
0000000000 00000 f 
0000014422 00000 n 
0000003555 00000 n 
0000004790 00000 n 
0000004525 00000 n 
0000003874 00000 n 
0000004633 00000 n 
0000004688 00000 n 
0000006193 00000 n 
0000005928 00000 n 
0000004872 00000 n 
0000006036 00000 n 
0000006091 00000 n 
0000007125 00000 n 
0000006860 00000 n 
0000006275 00000 n 
0000006968 00000 n 
0000007023 00000 n 
0000009088 00000 n 
0000008823 00000 n 
0000007207 00000 n 
0000008931 00000 n 
0000008986 00000 n 
0000009958 00000 n 
0000009693 00000 n 
0000009170 00000 n 
0000009801 00000 n 
0000009856 00000 n 
0000014715 00000 n 
0000010884 00000 n 
0000010619 00000 n 
0000010040 00000 n 
0000010727 00000 n 
0000010782 00000 n 
0000011712 00000 n 
0000011447 00000 n 
0000010966 00000 n 
0000011555 00000 n 
0000011610 00000 n 
0000012551 00000 n 
0000012286 00000 n 
0000011794 00000 n 
0000012394 00000 n 
0000012449 00000 n 
0000012633 00000 n 
0000014811 00000 n 
0000014879 00000 n 
0000015709 00000 n 
0000016406 00000 n 
0000016445 00000 n 
0000016483 00000 n 
0000016652 00000 n 
trailer
<<
/Size 107
/Root 105 0 R
/Info 106 0 R
>>
startxref
16845
%%EOF



From fedora-extras-commits at redhat.com  Thu Dec  8 11:41:56 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:41:56 -0500
Subject: web/html/docs/release-notes/fc5/test1-en fedora.css,NONE,1.1
Message-ID: <200512081141.jB8BfuOV002089@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/release-notes/fc5/test1-en

Added Files:
	fedora.css 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #D0D0B0;
	background-color: #FAF9E0;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #22437f;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
      
h2 {
        font-size: 1.25em;
}

h3 {
        font-size: 1.1em;
}

a:link {
        color: #900;
}
a:visited {
        color: #48468f;
}
a:hover {
        color: #f20;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}

.procedure ol li {
        margin-bottom: 0.5em;
}
.procedure ol li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

.itemizedlist ul li {
	margin-bottom: 0.5em;
}
.itemizedlist ul li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

p.title	{
	text-align: center;
}



From fedora-extras-commits at redhat.com  Thu Dec  8 11:42:01 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:42:01 -0500
Subject: web/html/docs/release-notes/fc5/test1-it fedora.css,NONE,1.1
Message-ID: <200512081142.jB8Bg1Ux002105@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-it
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/release-notes/fc5/test1-it

Added Files:
	fedora.css 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

/* 
This "body" section is included for reference.  Diff with fedora-draft.css
body	{
	background-attachment	scroll;
	background-color:	#FEFEFF;
	background-image:	url('watermark.png');
	background-position:	top center;
	background-repeat:	repeat;
}
*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #D0D0B0;
	background-color: #FAF9E0;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #22437f;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
      
h2 {
        font-size: 1.25em;
}

h3 {
        font-size: 1.1em;
}

a:link {
        color: #900;
}
a:visited {
        color: #48468f;
}
a:hover {
        color: #f20;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}

.procedure ol li {
        margin-bottom: 0.5em;
}
.procedure ol li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

.itemizedlist ul li {
	margin-bottom: 0.5em;
}
.itemizedlist ul li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

p.title	{
	text-align: center;
}



From fedora-extras-commits at redhat.com  Thu Dec  8 11:42:06 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:42:06 -0500
Subject: web/html/docs/release-notes/fc5/test1-ja_JP fedora.css,NONE,1.1
Message-ID: <200512081142.jB8Bg6Ae002121@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-ja_JP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/release-notes/fc5/test1-ja_JP

Added Files:
	fedora.css 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

/* 
This "body" section is included for reference.  Diff with fedora-draft.css
body	{
	background-attachment	scroll;
	background-color:	#FEFEFF;
	background-image:	url('watermark.png');
	background-position:	top center;
	background-repeat:	repeat;
}
*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #D0D0B0;
	background-color: #FAF9E0;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #22437f;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
      
h2 {
        font-size: 1.25em;
}

h3 {
        font-size: 1.1em;
}

a:link {
        color: #900;
}
a:visited {
        color: #48468f;
}
a:hover {
        color: #f20;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}

.procedure ol li {
        margin-bottom: 0.5em;
}
.procedure ol li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

.itemizedlist ul li {
	margin-bottom: 0.5em;
}
.itemizedlist ul li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

p.title	{
	text-align: center;
}



From fedora-extras-commits at redhat.com  Thu Dec  8 11:42:12 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:42:12 -0500
Subject: web/html/docs/release-notes/fc5/test1-ru fedora.css,NONE,1.1
Message-ID: <200512081142.jB8BgC8J002137@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-ru
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/release-notes/fc5/test1-ru

Added Files:
	fedora.css 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

/* 
This "body" section is included for reference.  Diff with fedora-draft.css
body	{
	background-attachment	scroll;
	background-color:	#FEFEFF;
	background-image:	url('watermark.png');
	background-position:	top center;
	background-repeat:	repeat;
}
*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #D0D0B0;
	background-color: #FAF9E0;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #22437f;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
      
h2 {
        font-size: 1.25em;
}

h3 {
        font-size: 1.1em;
}

a:link {
        color: #900;
}
a:visited {
        color: #48468f;
}
a:hover {
        color: #f20;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}

.procedure ol li {
        margin-bottom: 0.5em;
}
.procedure ol li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

.itemizedlist ul li {
	margin-bottom: 0.5em;
}
.itemizedlist ul li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

p.title	{
	text-align: center;
}



From fedora-extras-commits at redhat.com  Thu Dec  8 11:42:17 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:42:17 -0500
Subject: web/html/docs/release-notes/fc5/test1-zh_CN fedora.css,NONE,1.1
Message-ID: <200512081142.jB8BgHS3002153@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-zh_CN
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/release-notes/fc5/test1-zh_CN

Added Files:
	fedora.css 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

/* 
This "body" section is included for reference.  Diff with fedora-draft.css
body	{
	background-attachment	scroll;
	background-color:	#FEFEFF;
	background-image:	url('watermark.png');
	background-position:	top center;
	background-repeat:	repeat;
}
*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #D0D0B0;
	background-color: #FAF9E0;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #22437f;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
      
h2 {
        font-size: 1.25em;
}

h3 {
        font-size: 1.1em;
}

a:link {
        color: #900;
}
a:visited {
        color: #48468f;
}
a:hover {
        color: #f20;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}

.procedure ol li {
        margin-bottom: 0.5em;
}
.procedure ol li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

.itemizedlist ul li {
	margin-bottom: 0.5em;
}
.itemizedlist ul li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

p.title	{
	text-align: center;
}



From fedora-extras-commits at redhat.com  Thu Dec  8 11:42:22 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:42:22 -0500
Subject: web/html/docs/release-notes/stylesheet-images 1.png, NONE,
	1.1 10.png, NONE, 1.1 11.png, NONE, 1.1 12.png, NONE,
	1.1 13.png, NONE, 1.1 14.png, NONE, 1.1 15.png, NONE,
	1.1 2.png, NONE, 1.1 3.png, NONE, 1.1 4.png, NONE, 1.1 5.png,
	NONE, 1.1 6.png, NONE, 1.1 7.png, NONE, 1.1 8.png, NONE,
	1.1 9.png, NONE, 1.1 caution.png, NONE, 1.1 important.png,
	NONE, 1.1 note.png, NONE, 1.1 tip.png, NONE, 1.1 warning.png,
	NONE, 1.1
Message-ID: <200512081142.jB8BgMu1002189@cvs-int.fedora.redhat.com>

Author: kwade

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

Added Files:
	1.png 10.png 11.png 12.png 13.png 14.png 15.png 2.png 3.png 
	4.png 5.png 6.png 7.png 8.png 9.png caution.png important.png 
	note.png tip.png warning.png 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:45:24 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:45:24 -0500
Subject: web/html/docs/release-notes/figs Fedora_Desktop.png,NONE,1.1
Message-ID: <200512081145.jB8BjOCR002226@cvs-int.fedora.redhat.com>

Author: kwade

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

Added Files:
	Fedora_Desktop.png 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:57:56 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:57:56 -0500
Subject: web/html/docs/documentation-quick-start - New directory
Message-ID: <200512081157.jB8BvuGr002341@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-quick-start
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2331/documentation-quick-start

Log Message:
Directory /cvs/fedora/web/html/docs/documentation-quick-start added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 12:00:08 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 07:00:08 -0500
Subject: web/html/docs/documentation-quick-start index.php,NONE,1.1
Message-ID: <200512081200.jB8C08H8002393@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-quick-start
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2382/documentation-quick-start

Added Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


***** Error reading new file: [Errno 2] No such file or directory: 'index.php'



From fedora-extras-commits at redhat.com  Thu Dec  8 12:20:08 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  8 Dec 2005 07:20:08 -0500
Subject: rpms/koffice/FC-4 koffice-CAN-2005-3193.diff, NONE, 1.1 koffice.spec,
	1.9, 1.10
Message-ID: <200512081220.jB8CKd6l004044@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	koffice.spec 
Added Files:
	koffice-CAN-2005-3193.diff 
Log Message:
- fix CAN-2005-3193


koffice-CAN-2005-3193.diff:

--- NEW FILE koffice-CAN-2005-3193.diff ---
Index: filters/kword/pdf/xpdf/xpdf/Stream.cc
===================================================================
--- filters/kword/pdf/xpdf/xpdf/Stream.cc	(revision 485850)
+++ filters/kword/pdf/xpdf/xpdf/Stream.cc	(revision 486431)
@@ -404,18 +404,33 @@ void ImageStream::skipLine() {
 
 StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
 				 int widthA, int nCompsA, int nBitsA) {
+  int totalBits;
+
   str = strA;
   predictor = predictorA;
   width = widthA;
   nComps = nCompsA;
   nBits = nBitsA;
+  predLine = NULL;
+  ok = gFalse;
 
   nVals = width * nComps;
+  totalBits = nVals * nBits;
+  if ( totalBits == 0 ||
+     (totalBits / nBits) / nComps != width ||
+     totalBits + 7 < 0) {
+    return;
+  }
   pixBytes = (nComps * nBits + 7) >> 3;
-  rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
+  rowBytes = ((totalBits + 7) >> 3) + pixBytes;
+  if (rowBytes < 0)
+    return;
+
   predLine = (Guchar *)gmalloc(rowBytes);
   memset(predLine, 0, rowBytes);
   predIdx = rowBytes;
+
+  ok = gTrue;
 }
 
 StreamPredictor::~StreamPredictor() {
@@ -982,6 +997,10 @@ LZWStream::LZWStream(Stream *strA, int p
     FilterStream(strA) {
   if (predictor != 1) {
     pred = new StreamPredictor(this, predictor, columns, colors, bits);
+    if ( !pred->isOk()) {
+       delete pred;
+       pred = NULL;
+    }
   } else {
     pred = NULL;
   }
@@ -2861,6 +2880,10 @@ GBool DCTStream::readBaselineSOF() {
   height = read16();
   width = read16();
   numComps = str->getChar();
+  if (numComps <= 0 || numComps > 4) {
+     error(getPos(), "Bad number of components in DCT stream");
+     return gFalse;
+  }
   if (prec != 8) {
     error(getPos(), "Bad DCT precision %d", prec);
     return gFalse;
@@ -3179,6 +3202,10 @@ FlateStream::FlateStream(Stream *strA, i
     FilterStream(strA) {
   if (predictor != 1) {
     pred = new StreamPredictor(this, predictor, columns, colors, bits);
+    if ( !pred->isOk()) {
+        delete pred;
+        pred = NULL;
+    }
   } else {
     pred = NULL;
   }
Index: filters/kword/pdf/xpdf/xpdf/Stream.h
===================================================================
--- filters/kword/pdf/xpdf/xpdf/Stream.h	(revision 485850)
+++ filters/kword/pdf/xpdf/xpdf/Stream.h	(revision 486431)
@@ -227,6 +227,7 @@ public:
 
   int lookChar();
   int getChar();
+  GBool isOk() { return ok; }
 
 private:
 
@@ -242,6 +243,7 @@ private:
   int rowBytes;			// bytes per line
   Guchar *predLine;		// line buffer
   int predIdx;			// current index in predLine
+  GBool ok;
 };
 
 //------------------------------------------------------------------------


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- koffice.spec	16 Oct 2005 21:25:35 -0000	1.9
+++ koffice.spec	8 Dec 2005 12:20:06 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -11,7 +11,8 @@
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-
+# CAN-2005-3193 see #175260
+Patch1:         koffice-CAN-2005-3193.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -191,8 +192,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1
 
-# this will make sure that patch0 and patch1 are considered
+# this will make sure that patch0 is considered
 make -f admin/Makefile.common
 
 %build
@@ -744,6 +746,10 @@
 %{_datadir}/servicetypes/kofilter*.desktop
 
 %changelog
+* Thu Dec 08 2005 Andreas Bierfert 
+1.4.2-2
+- fix CAN-2005-3193
+
 * Fri Oct 14 2005 Andreas Bierfert 
 1.4.2-1
 - version upgrade



From fedora-extras-commits at redhat.com  Thu Dec  8 12:24:12 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  8 Dec 2005 07:24:12 -0500
Subject: rpms/koffice/devel koffice-CAN-2005-3193.diff, NONE,
	1.1 koffice.spec, 1.15, 1.16
Message-ID: <200512081224.jB8COhVI004117@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	koffice.spec 
Added Files:
	koffice-CAN-2005-3193.diff 
Log Message:
- fix CAN-2005-3193


koffice-CAN-2005-3193.diff:

--- NEW FILE koffice-CAN-2005-3193.diff ---
Index: filters/kword/pdf/xpdf/xpdf/Stream.cc
===================================================================
--- filters/kword/pdf/xpdf/xpdf/Stream.cc	(revision 485850)
+++ filters/kword/pdf/xpdf/xpdf/Stream.cc	(revision 486431)
@@ -404,18 +404,33 @@ void ImageStream::skipLine() {
 
 StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
 				 int widthA, int nCompsA, int nBitsA) {
+  int totalBits;
+
   str = strA;
   predictor = predictorA;
   width = widthA;
   nComps = nCompsA;
   nBits = nBitsA;
+  predLine = NULL;
+  ok = gFalse;
 
   nVals = width * nComps;
+  totalBits = nVals * nBits;
+  if ( totalBits == 0 ||
+     (totalBits / nBits) / nComps != width ||
+     totalBits + 7 < 0) {
+    return;
+  }
   pixBytes = (nComps * nBits + 7) >> 3;
-  rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
+  rowBytes = ((totalBits + 7) >> 3) + pixBytes;
+  if (rowBytes < 0)
+    return;
+
   predLine = (Guchar *)gmalloc(rowBytes);
   memset(predLine, 0, rowBytes);
   predIdx = rowBytes;
+
+  ok = gTrue;
 }
 
 StreamPredictor::~StreamPredictor() {
@@ -982,6 +997,10 @@ LZWStream::LZWStream(Stream *strA, int p
     FilterStream(strA) {
   if (predictor != 1) {
     pred = new StreamPredictor(this, predictor, columns, colors, bits);
+    if ( !pred->isOk()) {
+       delete pred;
+       pred = NULL;
+    }
   } else {
     pred = NULL;
   }
@@ -2861,6 +2880,10 @@ GBool DCTStream::readBaselineSOF() {
   height = read16();
   width = read16();
   numComps = str->getChar();
+  if (numComps <= 0 || numComps > 4) {
+     error(getPos(), "Bad number of components in DCT stream");
+     return gFalse;
+  }
   if (prec != 8) {
     error(getPos(), "Bad DCT precision %d", prec);
     return gFalse;
@@ -3179,6 +3202,10 @@ FlateStream::FlateStream(Stream *strA, i
     FilterStream(strA) {
   if (predictor != 1) {
     pred = new StreamPredictor(this, predictor, columns, colors, bits);
+    if ( !pred->isOk()) {
+        delete pred;
+        pred = NULL;
+    }
   } else {
     pred = NULL;
   }
Index: filters/kword/pdf/xpdf/xpdf/Stream.h
===================================================================
--- filters/kword/pdf/xpdf/xpdf/Stream.h	(revision 485850)
+++ filters/kword/pdf/xpdf/xpdf/Stream.h	(revision 486431)
@@ -227,6 +227,7 @@ public:
 
   int lookChar();
   int getChar();
+  GBool isOk() { return ok; }
 
 private:
 
@@ -242,6 +243,7 @@ private:
   int rowBytes;			// bytes per line
   Guchar *predLine;		// line buffer
   int predIdx;			// current index in predLine
+  GBool ok;
 };
 
 //------------------------------------------------------------------------


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- koffice.spec	21 Nov 2005 22:42:28 -0000	1.15
+++ koffice.spec	8 Dec 2005 12:24:10 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -11,7 +11,9 @@
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-Patch1:         koffice-qt3.3.5.patch
+
+# fix CAN-2005-3193 see #175260
+Patch1:         koffice-CAN-2005-3193.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -192,9 +194,9 @@
 %prep
 %setup -q
 %patch0 -p1
-#%patch1
+%patch1
 
-# this will make sure that patch0 and patch1 are considered
+# this will make sure that patch0 is considered
 make -f admin/Makefile.common
 
 %build
@@ -746,6 +748,10 @@
 %{_datadir}/servicetypes/kofilter*.desktop
 
 %changelog
+* Thu Dec 08 2005 Andreas Bierfert 
+1.4.2-3
+- fix CAN-2005-3193
+
 * Thu Nov 10 2005 Andreas Bierfert 
 1.4.2-2
 - remove xorg-x11-devel BR



From fedora-extras-commits at redhat.com  Thu Dec  8 13:17:27 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu,  8 Dec 2005 08:17:27 -0500
Subject: rpms/goffice/devel goffice.spec,1.4,1.5
Message-ID: <200512081317.jB8DHvm9005930@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	goffice.spec 
Log Message:
switch to Core libgsf


Index: goffice.spec
===================================================================
RCS file: /cvs/extras/rpms/goffice/devel/goffice.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- goffice.spec	28 Nov 2005 18:41:25 -0000	1.4
+++ goffice.spec	8 Dec 2005 13:17:25 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		goffice         
 Version: 	0.1.2
-Release:        2
+Release:        3
 Summary:        Goffice support libraries
 
 Group:          System Environment/Libraries
@@ -9,7 +9,7 @@
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/${name}/0.1/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgsf113-devel	>= 1.13.3
+BuildRequires:  libgsf-devel	>= 1.13.3
 BuildRequires:	libgnomeprint22-devel	>= 2.8.2
 BuildRequires:	libgnomeui-devel >= 2.0.0
 # this is probably needed because of a bug in one of the above three, try
@@ -36,7 +36,6 @@
 
 
 %build
-export PKG_CONFIG_PATH=%{_libdir}/libgsf-1.13/lib/pkgconfig
 %configure
 make %{?_smp_mflags}
 
@@ -70,6 +69,10 @@
 
 
 %changelog
+* Mon Nov 28 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.
+
 * Mon Nov 28 2005 Hans de Goede  0.1.2-2
 -Make Source0 a full URL
 -Better URL tag



From fedora-extras-commits at redhat.com  Thu Dec  8 13:22:11 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu,  8 Dec 2005 08:22:11 -0500
Subject: rpms/goffice/devel goffice.spec,1.5,1.6
Message-ID: <200512081322.jB8DMgwn006012@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	goffice.spec 
Log Message:
try building without BR libSM-devel


Index: goffice.spec
===================================================================
RCS file: /cvs/extras/rpms/goffice/devel/goffice.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- goffice.spec	8 Dec 2005 13:17:25 -0000	1.5
+++ goffice.spec	8 Dec 2005 13:22:06 -0000	1.6
@@ -9,12 +9,12 @@
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/${name}/0.1/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgsf-devel	>= 1.13.3
+BuildRequires:	libgsf-devel		>= 1.13.3
 BuildRequires:	libgnomeprint22-devel	>= 2.8.2
-BuildRequires:	libgnomeui-devel >= 2.0.0
+BuildRequires:	libgnomeui-devel	>= 2.0.0
 # this is probably needed because of a bug in one of the above three, try
 # removing this some time in the future.
-BuildRequires:  libSM-devel
+# BuildRequires:  libSM-devel
 
 
 %description
@@ -24,9 +24,9 @@
 Summary:	Libraries and include files for goffice
 Group:		Development/Libraries
 Requires:	%{name} = %{version}
-Requires:	libgsf113-devel >= 1.13.3
-Requires:	libgnomeprint22-devel >= 2.8.2
-Requires:	libgnomeui-devel >= 2.0.0
+Requires:	libgsf-devel		>= 1.13.3
+Requires:	libgnomeprint22-devel	>= 2.8.2
+Requires:	libgnomeui-devel	>= 2.0.0
 
 %description devel
 Development libraries for goffice
@@ -69,7 +69,7 @@
 
 
 %changelog
-* Mon Nov 28 2005 Hans de Goede  0.1.2-3
+* 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  Thu Dec  8 15:59:34 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu,  8 Dec 2005 10:59:34 -0500
Subject: rpms/tinyerp/FC-3 tinyerp.spec,1.4,1.5
Message-ID: <200512081600.jB8G0579010494@cvs-int.fedora.redhat.com>

Author: sharkcz

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

Modified Files:
	tinyerp.spec 
Log Message:
 - set owner for dirs in %post not %pre



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tinyerp.spec	28 Nov 2005 14:40:32 -0000	1.4
+++ tinyerp.spec	8 Dec 2005 15:59:32 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -109,11 +109,11 @@
 /usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
-chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
-
 exit 0
 
 %post server
+chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
+
 /sbin/chkconfig --add tinyerp-server
 
 %preun server



From fedora-extras-commits at redhat.com  Thu Dec  8 16:00:57 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu,  8 Dec 2005 11:00:57 -0500
Subject: rpms/tinyerp/FC-4 tinyerp.spec,1.6,1.7
Message-ID: <200512081601.jB8G1RL4012071@cvs-int.fedora.redhat.com>

Author: sharkcz

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

Modified Files:
	tinyerp.spec 
Log Message:
 - set owner for dirs in %post instead of %pre



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tinyerp.spec	28 Nov 2005 14:43:00 -0000	1.6
+++ tinyerp.spec	8 Dec 2005 16:00:55 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -109,11 +109,11 @@
 /usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
-chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
-
 exit 0
 
 %post server
+chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
+
 /sbin/chkconfig --add tinyerp-server
 
 %preun server



From fedora-extras-commits at redhat.com  Thu Dec  8 16:43:17 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu,  8 Dec 2005 11:43:17 -0500
Subject: rpms/baobab/devel .cvsignore, 1.5, 1.6 baobab.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <200512081643.jB8GhlH6012263@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	.cvsignore baobab.spec sources 
Log Message:
update to 2.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Dec 2005 19:17:01 -0000	1.5
+++ .cvsignore	8 Dec 2005 16:43:15 -0000	1.6
@@ -1 +1 @@
-baobab-2.2.0.tar.gz
+baobab-2.2.2.tar.gz


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- baobab.spec	1 Dec 2005 19:17:01 -0000	1.5
+++ baobab.spec	8 Dec 2005 16:43:15 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           baobab
-Version:        2.2.0
+Version:        2.2.2
 Release:        1%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.marzocca.net/linux/baobab.html
-Source0:        http://www.marzocca.net/linux/downloads/baobab-2.2.0.tar.gz
+Source0:        http://www.marzocca.net/linux/downloads/baobab-2.2.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -56,6 +56,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Dec 08 2005 Thorsten Leemhuis  - 2.2.2-1
+- Update to 2.2.2
+
 * Thu Dec 01 2005 Thorsten Leemhuis  - 2.2.0-1
 - Update to 2.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Dec 2005 19:17:01 -0000	1.5
+++ sources	8 Dec 2005 16:43:15 -0000	1.6
@@ -1 +1 @@
-8ea3c8c67a27e6f0be14744adc2c17c7  baobab-2.2.0.tar.gz
+2a4911a28c27752e1c92f6505b39cc60  baobab-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 16:56:07 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu,  8 Dec 2005 11:56:07 -0500
Subject: rpms/baobab/FC-4 .cvsignore, 1.5, 1.6 baobab.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <200512081656.jB8GubTX012352@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	.cvsignore baobab.spec sources 
Log Message:
update to 2.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Dec 2005 19:16:55 -0000	1.5
+++ .cvsignore	8 Dec 2005 16:56:05 -0000	1.6
@@ -1 +1 @@
-baobab-2.2.0.tar.gz
+baobab-2.2.2.tar.gz


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- baobab.spec	1 Dec 2005 19:16:55 -0000	1.5
+++ baobab.spec	8 Dec 2005 16:56:05 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           baobab
-Version:        2.2.0
+Version:        2.2.2
 Release:        1%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.marzocca.net/linux/baobab.html
-Source0:        http://www.marzocca.net/linux/downloads/baobab-2.2.0.tar.gz
+Source0:        http://www.marzocca.net/linux/downloads/baobab-2.2.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -57,6 +57,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Dec 08 2005 Thorsten Leemhuis  - 2.2.2-1
+- Update to 2.2.2
+
 * Thu Dec 01 2005 Thorsten Leemhuis  - 2.2.0-1
 - Update to 2.2.0
 - Still works with older GNOME_CANVAS so drop requires in configure slightly


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Dec 2005 19:16:55 -0000	1.5
+++ sources	8 Dec 2005 16:56:05 -0000	1.6
@@ -1 +1 @@
-8ea3c8c67a27e6f0be14744adc2c17c7  baobab-2.2.0.tar.gz
+2a4911a28c27752e1c92f6505b39cc60  baobab-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 17:09:35 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu,  8 Dec 2005 12:09:35 -0500
Subject: rpms/perl-Data-Buffer - New directory
Message-ID: <200512081709.jB8H9Zdd014040@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Data-Buffer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14029/perl-Data-Buffer

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




From fedora-extras-commits at redhat.com  Thu Dec  8 17:09:50 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu,  8 Dec 2005 12:09:50 -0500
Subject: rpms/perl-Data-Buffer/devel - New directory
Message-ID: <200512081709.jB8H9oSD014053@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-serv14029/perl-Data-Buffer/devel

Log Message:
Directory /cvs/extras/rpms/perl-Data-Buffer/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 17:11:20 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu,  8 Dec 2005 12:11:20 -0500
Subject: rpms/perl-Data-Buffer Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512081711.jB8HBKaI014131@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Data-Buffer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14118

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Data-Buffer


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec  8 17:11:25 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu,  8 Dec 2005 12:11:25 -0500
Subject: rpms/perl-Data-Buffer/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512081711.jB8HBPaG014151@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-serv14118/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Data-Buffer


--- NEW 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 Dec  8 17:11:45 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu,  8 Dec 2005 12:11:45 -0500
Subject: rpms/tinyerp/FC-3 tinyerp.spec,1.5,1.6
Message-ID: <200512081712.jB8HCG0k014194@cvs-int.fedora.redhat.com>

Author: sharkcz

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

Modified Files:
	tinyerp.spec 
Log Message:
 - chown for log and spool is not required



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tinyerp.spec	8 Dec 2005 15:59:32 -0000	1.5
+++ tinyerp.spec	8 Dec 2005 17:11:43 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -112,8 +112,6 @@
 exit 0
 
 %post server
-chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
-
 /sbin/chkconfig --add tinyerp-server
 
 %preun server
@@ -132,6 +130,9 @@
 
 
 %changelog
+* Thu Dec  7 2005 Dan Horak  3.1.1-3
+- chown for log and spool is not required
+
 * Mon Nov 28 2005 Dan Horak  3.1.1-1
 - upgrade to tinyerp 3.1.1
 



From fedora-extras-commits at redhat.com  Thu Dec  8 17:12:51 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu,  8 Dec 2005 12:12:51 -0500
Subject: rpms/tinyerp/FC-4 tinyerp.spec,1.7,1.8
Message-ID: <200512081713.jB8HDLgD014299@cvs-int.fedora.redhat.com>

Author: sharkcz

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

Modified Files:
	tinyerp.spec 
Log Message:
 - chown for log and spool is not required



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tinyerp.spec	8 Dec 2005 16:00:55 -0000	1.7
+++ tinyerp.spec	8 Dec 2005 17:12:49 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -112,8 +112,6 @@
 exit 0
 
 %post server
-chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
-
 /sbin/chkconfig --add tinyerp-server
 
 %preun server
@@ -132,6 +130,9 @@
 
 
 %changelog
+* Thu Dec  7 2005 Dan Horak  3.1.1-3
+- chown for log and spool is not required
+
 * Mon Nov 28 2005 Dan Horak  3.1.1-1
 - upgrade to tinyerp 3.1.1
 



From fedora-extras-commits at redhat.com  Thu Dec  8 17:12:50 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu,  8 Dec 2005 12:12:50 -0500
Subject: rpms/perl-Data-Buffer import.log,1.1,1.2
Message-ID: <200512081713.jB8HDKaD014296@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Data-Buffer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14214

Modified Files:
	import.log 
Log Message:
auto-import perl-Data-Buffer-0.04-1 on branch devel from perl-Data-Buffer-0.04-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Buffer/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Dec 2005 17:11:18 -0000	1.1
+++ import.log	8 Dec 2005 17:12:48 -0000	1.2
@@ -0,0 +1 @@
+perl-Data-Buffer-0_04-1:HEAD:perl-Data-Buffer-0.04-1.src.rpm:1134061954



From fedora-extras-commits at redhat.com  Thu Dec  8 17:12:55 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu,  8 Dec 2005 12:12:55 -0500
Subject: rpms/perl-Data-Buffer/devel perl-Data-Buffer.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512081713.jB8HDP5r014303@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-serv14214/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Data-Buffer.spec 
Log Message:
auto-import perl-Data-Buffer-0.04-1 on branch devel from perl-Data-Buffer-0.04-1.src.rpm


--- NEW FILE perl-Data-Buffer.spec ---
Summary:	Read/write buffer class for perl
Name:		perl-Data-Buffer
Version:	0.04
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Data-Buffer/
Source0:	http://search.cpan.org/CPAN/authors/id/B/BT/BTROTT/Data-Buffer-%{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
Data::Buffer implements a low-level binary buffer in which you can get and put
integers, strings, and other data. Internally the implementation is based on
pack and unpack, such that Data::Buffer is really a layer on top of those
built-in functions.

%prep
%setup -q -n Data-Buffer-%{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
%{perl_vendorlib}/Data/
%{_mandir}/man3/Data::Buffer.3pm*

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Buffer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Dec 2005 17:11:23 -0000	1.1
+++ .cvsignore	8 Dec 2005 17:12:53 -0000	1.2
@@ -0,0 +1 @@
+Data-Buffer-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Buffer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Dec 2005 17:11:23 -0000	1.1
+++ sources	8 Dec 2005 17:12:53 -0000	1.2
@@ -0,0 +1 @@
+d971f7b92684cc4f4cba7a9c774b8480  Data-Buffer-0.04.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 17:16:44 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu,  8 Dec 2005 12:16:44 -0500
Subject: owners owners.list,1.434,1.435
Message-ID: <200512081717.jB8HHE26014454@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	owners.list 
Log Message:
Add perl-Data-Buffer



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -r1.434 -r1.435
--- owners.list	5 Dec 2005 18:15:07 -0000	1.434
+++ owners.list	8 Dec 2005 17:16:42 -0000	1.435
@@ -722,6 +722,7 @@
 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-capitalization|No capitalization on method names|rc040203 at freenet.de|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
 Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Dec  8 18:46:06 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 13:46:06 -0500
Subject: rpms/perl-Readonly - New directory
Message-ID: <200512081846.jB8Ik6x1016316@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16307/perl-Readonly

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




From fedora-extras-commits at redhat.com  Thu Dec  8 18:46:11 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 13:46:11 -0500
Subject: rpms/perl-Readonly/devel - New directory
Message-ID: <200512081846.jB8IkBu5016331@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16307/perl-Readonly/devel

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




From fedora-extras-commits at redhat.com  Thu Dec  8 18:46:51 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 13:46:51 -0500
Subject: rpms/perl-Readonly Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512081846.jB8Ikpxt016365@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16352

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec  8 18:46:56 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 13:46:56 -0500
Subject: rpms/perl-Readonly/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512081846.jB8Iku6m016383@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16352/devel

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


--- NEW 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 Dec  8 18:48:02 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 13:48:02 -0500
Subject: rpms/perl-Readonly import.log,1.1,1.2
Message-ID: <200512081848.jB8ImWNv016450@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16416

Modified Files:
	import.log 
Log Message:
auto-import perl-Readonly-1.03-4 on branch devel from perl-Readonly-1.03-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Dec 2005 18:46:49 -0000	1.1
+++ import.log	8 Dec 2005 18:48:00 -0000	1.2
@@ -0,0 +1 @@
+perl-Readonly-1_03-4:HEAD:perl-Readonly-1.03-4.src.rpm:1134067601



From fedora-extras-commits at redhat.com  Thu Dec  8 18:48:08 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 13:48:08 -0500
Subject: rpms/perl-Readonly/devel perl-Readonly.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512081848.jB8ImcNZ016454@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16416/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Readonly.spec 
Log Message:
auto-import perl-Readonly-1.03-4 on branch devel from perl-Readonly-1.03-4.src.rpm


--- NEW FILE perl-Readonly.spec ---
Name:           perl-Readonly
Version:        1.03
Release:        4%{?dist}
Summary:        Facility for creating read-only scalars, arrays, hashes

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Readonly/
Source0:        http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Readonly.pm provides a facility for creating non-modifiable scalars,
arrays, and hashes.

Readonly.pm
* Creates scalars, arrays (not lists), and hashes.
* Creates variables that look and work like native perl variables.
* Creates global or lexical variables.
* Works at runtime or compile time.
* Works with deep or shallow data structures.
* Prevents reassignment of Readonly variables.

%prep
%setup -q -n Readonly-%{version}


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


%install
rm -rf $RPM_BUILD_ROOT
make pure_install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%{perl_vendorlib}/benchmark.pl .

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README benchmark.pl
%{perl_vendorlib}/Readonly.pm
%{_mandir}/man3/*


%changelog
* Thu Dec 08 2005 Michael A. Peters  - 1.03-3
- Remove requires on perl-Readonly-XS

* Thu Dec 08 2005 Michael A. Peters  - 1.03-3
- Fix license and BuildRequires, use %%{?_smp_mflags} with make,

* Sat Nov 12 2005 Michael A. Peters  - 1.03-2
- separate out perl-Readonly-XS into its own package
- package benchmark.pl as a doc

* Mon Nov 7 2005 Michael A. Peters  - 1.03-1
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Dec 2005 18:46:54 -0000	1.1
+++ .cvsignore	8 Dec 2005 18:48:05 -0000	1.2
@@ -0,0 +1 @@
+Readonly-1.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Dec 2005 18:46:54 -0000	1.1
+++ sources	8 Dec 2005 18:48:05 -0000	1.2
@@ -0,0 +1 @@
+0acef3a995ac9ecf575f66a726d638f4  Readonly-1.03.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 18:53:09 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 13:53:09 -0500
Subject: owners owners.list,1.435,1.436
Message-ID: <200512081853.jB8IreqK016518@cvs-int.fedora.redhat.com>

Author: mpeters

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

Modified Files:
	owners.list 
Log Message:
added  perl-Readonly



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -r1.435 -r1.436
--- owners.list	8 Dec 2005 17:16:42 -0000	1.435
+++ owners.list	8 Dec 2005 18:53:07 -0000	1.436
@@ -835,6 +835,7 @@
 Fedora Extras|perl-Pod-Tests|Extract embedded tests and code examples from POD|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Razor-Agent|Use a Razor catalogue server to filter spam messages|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Readonly|Facility for creating read-only scalars, arrays, hashes|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Regexp-Common|Regexp::Common Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SNMP_Session|SNMP support for Perl 5|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Dec  8 19:11:47 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:11:47 -0500
Subject: rpms/perl-Readonly-XS - New directory
Message-ID: <200512081911.jB8JBlQE018250@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly-XS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18241/perl-Readonly-XS

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




From fedora-extras-commits at redhat.com  Thu Dec  8 19:11:53 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:11:53 -0500
Subject: rpms/perl-Readonly-XS/devel - New directory
Message-ID: <200512081911.jB8JBrKo018265@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18241/perl-Readonly-XS/devel

Log Message:
Directory /cvs/extras/rpms/perl-Readonly-XS/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 19:12:30 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:12:30 -0500
Subject: rpms/perl-Readonly-XS Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512081912.jB8JCUXb018302@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly-XS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18289

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Readonly-XS


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec  8 19:12:36 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:12:36 -0500
Subject: rpms/perl-Readonly-XS/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512081912.jB8JCaLh018322@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18289/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Readonly-XS


--- NEW 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 Dec  8 19:13:36 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:13:36 -0500
Subject: rpms/perl-Readonly-XS import.log,1.1,1.2
Message-ID: <200512081914.jB8JE6ec018395@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly-XS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18361

Modified Files:
	import.log 
Log Message:
auto-import perl-Readonly-XS-1.04-2 on branch devel from perl-Readonly-XS-1.04-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Dec 2005 19:12:28 -0000	1.1
+++ import.log	8 Dec 2005 19:13:34 -0000	1.2
@@ -0,0 +1 @@
+perl-Readonly-XS-1_04-2:HEAD:perl-Readonly-XS-1.04-2.src.rpm:1134069137



From fedora-extras-commits at redhat.com  Thu Dec  8 19:13:42 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:13:42 -0500
Subject: rpms/perl-Readonly-XS/devel perl-Readonly-XS.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512081914.jB8JECnH018399@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18361/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Readonly-XS.spec 
Log Message:
auto-import perl-Readonly-XS-1.04-2 on branch devel from perl-Readonly-XS-1.04-2.src.rpm


--- NEW FILE perl-Readonly-XS.spec ---
Name:           perl-Readonly-XS
Version:        1.04
Release:        2%{?dist}
Summary:        Companion module for Readonly.pm

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Readonly-XS/
Source0:        http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-XS-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: perl(Readonly) >= 1.02
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:  perl(Readonly)

%description
Readonly-XS is a companion module for Readonly.pm, to speed up read-only
scalar variables

%prep
%setup -q -n Readonly-XS-%{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' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README Changes
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Readonly/
%{_mandir}/man3/*.3*


%changelog
* Thu Dec 08 2005 Michael A. Peters  - 1.04-2
- proper version on perl(Readonly) BuildRequires

* Thu Dec 08 2005 Michael A. Peters  - 1.04-1
- New Version
- BuildRequires perl(Readonly), remove explicit requires on
- perl-Readonly version

* Thu Dec 08 2005 Michael A. Peters  - 1.03-2
- Fix license and BuildRequires

* Sat Nov 12 2005 Michael A. Peters  - 1.03-1
- created spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Dec 2005 19:12:34 -0000	1.1
+++ .cvsignore	8 Dec 2005 19:13:39 -0000	1.2
@@ -0,0 +1 @@
+Readonly-XS-1.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Dec 2005 19:12:34 -0000	1.1
+++ sources	8 Dec 2005 19:13:39 -0000	1.2
@@ -0,0 +1 @@
+6d1e61f5c90ff1bf7ffcbfb01148b316  Readonly-XS-1.04.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 19:16:28 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:16:28 -0500
Subject: owners owners.list,1.436,1.437
Message-ID: <200512081916.jB8JGw5F018450@cvs-int.fedora.redhat.com>

Author: mpeters

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

Modified Files:
	owners.list 
Log Message:
ownership of perl-Readonly-XS



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- owners.list	8 Dec 2005 18:53:07 -0000	1.436
+++ owners.list	8 Dec 2005 19:16:26 -0000	1.437
@@ -836,6 +836,7 @@
 Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Razor-Agent|Use a Razor catalogue server to filter spam messages|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Readonly|Facility for creating read-only scalars, arrays, hashes|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Readonly-XS|Companion module for Readonly.pm|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Regexp-Common|Regexp::Common Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SNMP_Session|SNMP support for Perl 5|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Dec  8 19:28:14 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:28:14 -0500
Subject: rpms/perl-File-BOM/devel .cvsignore, 1.2, 1.3 perl-File-BOM.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200512081928.jB8JSiF5018605@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-File-BOM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18583

Modified Files:
	.cvsignore perl-File-BOM.spec sources 
Log Message:
New upstream version - updating in devel branch only



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BOM/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jun 2005 07:13:18 -0000	1.2
+++ .cvsignore	8 Dec 2005 19:28:12 -0000	1.3
@@ -1 +1,2 @@
 File-BOM-0.09.tar.gz
+File-BOM-0.11.tar.gz


Index: perl-File-BOM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BOM/devel/perl-File-BOM.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-BOM.spec	18 Jun 2005 07:13:18 -0000	1.1
+++ perl-File-BOM.spec	8 Dec 2005 19:28:12 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-File-BOM
-Version:        0.09
+Version:        0.11
 Release:        1%{?dist}
 Summary:        Utilities for reading Byte Order Marks
 
@@ -10,8 +10,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Readonly)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -49,5 +51,8 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Nov 05 2005 Michael A. Peters  0.11-1
+- update from upstream, BuildRequires perl(Readonly)
+
 * Sat Jun 18 2005 Michael A. Peters  0.09-1
 - initial Fedora Extras CVS Checkin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BOM/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jun 2005 07:13:18 -0000	1.2
+++ sources	8 Dec 2005 19:28:12 -0000	1.3
@@ -1 +1,2 @@
 907feafba72c9762b24c756ca1c0cb3d  File-BOM-0.09.tar.gz
+ba42fb0d185582c8dfa02dcab28efa9f  File-BOM-0.11.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 19:35:31 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Thu,  8 Dec 2005 14:35:31 -0500
Subject: fedora-security/audit fc4,1.100,1.101 fc5,1.12,1.13
Message-ID: <200512081936.jB8Ja2e3018677@cvs-int.fedora.redhat.com>

Author: bressers

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

Modified Files:
	fc4 fc5 
Log Message:
Add all the outstanding CVE ids.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- fc4	6 Dec 2005 20:26:13 -0000	1.100
+++ fc4	8 Dec 2005 19:35:27 -0000	1.101
@@ -1,10 +1,25 @@
-Up to date CVE as of CVE email 20051127
+Up to date CVE as of CVE email 20051207
 Up to date FC4 as of 200501127
 
 ** are items that need attention
 
+CVE-2005-4077 VULNERABLE (curl)
+CVE-2005-3193 VULNERABLE (xpdf)
+CVE-2005-3193 VULNERABLE (kdegraphics)
+CVE-2005-3193 VULNERABLE (tetex)
+CVE-2005-3193 VULNERABLE (poppler)
+CVE-2005-3192 VULNERABLE (xpdf)
+CVE-2005-3192 VULNERABLE (kdegraphics)
+CVE-2005-3192 VULNERABLE (tetex)
+CVE-2005-3192 VULNERABLE (poppler)
+CVE-2005-3191 VULNERABLE (xpdf)
+CVE-2005-3191 VULNERABLE (kdegraphics)
+CVE-2005-3191 VULNERABLE (tetex)
+CVE-2005-3191 VULNERABLE (poppler)
+CVE-2005-3964 VULNERABLE (openmotif)
 CVE-2005-3962 backport (perl) [since FEDORA-2005-1113]
 CVE-2005-3912 backport (perl) [since FEDORA-2005-1113]
+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-3848 version (kernel, fixed 2.6.13) [since FEDORA-2005-949]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fc5	6 Dec 2005 20:26:13 -0000	1.12
+++ fc5	8 Dec 2005 19:35:28 -0000	1.13
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20051127
+Up to date CVE as of CVE email 20051207
 Up to date FC5 as of FC5-Test1-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -12,8 +12,23 @@
 
 ** are items that need attention
 
+CVE-2005-4077 VULNERABLE (curl)
+CVE-2005-3193 VULNERABLE (xpdf)
+CVE-2005-3193 VULNERABLE (kdegraphics)
+CVE-2005-3193 VULNERABLE (tetex)
+CVE-2005-3193 VULNERABLE (poppler)
+CVE-2005-3192 VULNERABLE (xpdf)
+CVE-2005-3192 VULNERABLE (kdegraphics)
+CVE-2005-3192 VULNERABLE (tetex)
+CVE-2005-3192 VULNERABLE (poppler)
+CVE-2005-3191 VULNERABLE (xpdf)
+CVE-2005-3191 VULNERABLE (kdegraphics)
+CVE-2005-3191 VULNERABLE (tetex)
+CVE-2005-3191 VULNERABLE (poppler)
+CVE-2005-3964 VULNERABLE (openmotif)
 CVE-2005-3962 VULNERABLE (perl)
 CVE-2005-3912 ** (perl)
+CVE-2005-3883 VULNERABLE (php)
 CVE-2005-3858 version (kernel, fixed 2.6.13)
 CVE-2005-3857 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1-git3
 CVE-2005-3848 version (kernel, fixed 2.6.13)



From fedora-extras-commits at redhat.com  Thu Dec  8 20:11:46 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu,  8 Dec 2005 15:11:46 -0500
Subject: CVSROOT loginfo,1.10,1.11 syncmail,1.1,1.2
Message-ID: <200512082012.jB8KCH02020415@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20385

Modified Files:
	loginfo syncmail 
Log Message:
do *docs*


Index: loginfo
===================================================================
RCS file: /cvs/fedora/CVSROOT/loginfo,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- loginfo	3 Jun 2005 21:21:59 -0000	1.10
+++ loginfo	8 Dec 2005 20:11:44 -0000	1.11
@@ -29,3 +29,4 @@
 ^extras-buildsys-temp $CVSROOT/CVSROOT/syncmail %{sVv} katzj skvidal
 ALL	$CVSROOT/CVSROOT/syncmail %{sVv} cvsextras at fedora.redhat.com
 ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/fedora localdelivery at cvs-int.fedora.redhat.com
+ALL $CVSROOT/CVSROOT/syncmail --require-keyword='*docs*' %{sVv} relnotes at fedoraproject.org


Index: syncmail
===================================================================
RCS file: /cvs/fedora/CVSROOT/syncmail,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syncmail	22 Apr 2005 22:42:19 -0000	1.1
+++ syncmail	8 Dec 2005 20:11:44 -0000	1.2
@@ -5,6 +5,7 @@
 #     check out the CVSROOT directory on your local machine,
 #     make the changes there and commit. Otherwise your changes
 #     will be lost. --gafton
+# - updated by sopwith to add a --require-keyword option that only sends mail if 'keyword' is found in the comment message
 #
 # - updated by gafton to allow for --nodiff option. The nodiff option
 #   still sends out messages when something changes in a directory, but
@@ -62,6 +63,9 @@
     	Use  as the environment variable CVSROOT.  Otherwise this
     	variable must exist in the environment.
 
+    --require-keyword=STRING
+        Only send mail if STRING is found in the commit message.
+
     --nodiff
     	Don't bother generating the full diff, just report if the files changed
         or not.
@@ -183,7 +187,7 @@
     return string.join(lines, '')
 
 # send mail using sendmail
-def blast_mail(subject, people):    
+def blast_mail(subject, people):
     global optDiffStat
 
     # the redirection sequence in this command is actually intentional
@@ -198,7 +202,11 @@
         del diff_files[-3:]
     if diff_files[-3:] == ['-', 'Imported', 'sources']:
         del diff_files[-3:]
-        
+    commit_message = sys.stdin.read()
+    for I in optRequireKeyword:
+        if I not in commit_message:
+            return
+
     # cannot wait for child process or that will cause parent to retain cvs
     # lock for too long.  Urg!
     if not os.fork(): # in the child
@@ -220,7 +228,7 @@
         fp.write("\n")
         fp.write("Author: %s\n\n" % (username,))
         # now insert the CVS blurb
-        fp.write(sys.stdin.read())
+        fp.write(commit_message)
         fp.write('\n')
         # append the diffs if available and sensible
 	graphics = re.compile(r".*\.(jp(e)?g|gif|png|tif(f)?),", re.IGNORECASE)
@@ -246,14 +254,16 @@
     global DIFF_HEAD_LINES
     global DIFF_TAIL_LINES
     global DIFF_TRUNCATE_IF_LARGER
+    global optRequireKeyword
     
     try:
         opts, args = getopt.getopt(sys.argv[1:], 'h', [
 	    'cvsroot=', 'quiet', 'nodiff', 'nodiffstat', 'help',
-	    'headlines=', 'taillines=', 'truncate='])
+	    'headlines=', 'taillines=', 'truncate=', 'require-keyword='])
     except getopt.error, msg:
         usage(1, msg)
 
+    optRequireKeyword = []
     # parse the options
     for opt, arg in opts:
         if opt in ('-h', '--help'):
@@ -269,12 +279,14 @@
             optDiffStat = 0
         elif opt == '--nodiffstat':
             optDiffStat = 0
-	elif opt == 'headlines=':
+	elif opt == '--headlines':
 	    DIFF_HEAD_LINES = arg
-	elif opt == 'taillines=':
+	elif opt == '--taillines':
 	    DIFF_TAIL_LINES = arg
-	elif opt == 'truncate=':
+	elif opt == '--truncate':
 	    DIFF_TRUNCATE_IF_LARGER = arg
+        elif opt == '--require-keyword':
+            optRequireKeyword.append(arg)
 
     # What follows is the specification containing the files that were
     # modified.  The argument actually must be split, with the first component



From fedora-extras-commits at redhat.com  Thu Dec  8 20:32:14 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  8 Dec 2005 15:32:14 -0500
Subject: rpms/libapreq2/devel libapreq2-2.07-rc3-ldflags.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 libapreq2.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200512082032.jB8KWifF020644@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore libapreq2.spec sources 
Added Files:
	libapreq2-2.07-rc3-ldflags.patch 
Log Message:
* 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.


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/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2005 09:10:07 -0000	1.4
+++ .cvsignore	8 Dec 2005 20:32:12 -0000	1.5
@@ -1 +1 @@
-libapreq2-2.07-rc2.tar.gz
+libapreq2-2.07-rc3.tar.gz


Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libapreq2.spec	15 Oct 2005 09:10:07 -0000	1.4
+++ libapreq2.spec	8 Dec 2005 20:32:12 -0000	1.5
@@ -2,16 +2,17 @@
 
 Name:           libapreq2
 Version:        2.07
-Release:        0.rc2%{?dist}
+Release:        0.1.rc3%{?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-rc2.tar.gz
+Source0:        http://people.apache.org/~joes/libapreq2-2.07-rc3.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
@@ -55,8 +56,9 @@
 
 %prep
 %setup -q
-aprver=$(apr-config --version)
-apuver=$(apu-config --version)
+# 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
@@ -67,7 +69,8 @@
   "s|.*?|%{_docdir}/apr-util-devel-$apuver/html/|" \
   docs/apu.tag
 %patch0
-rm glue/perl/pm_to_blib
+%patch1
+%{__perl} -pi -e 's|/usr/lib|%{_libdir}|' apreq2-config.in # patch1 ~ multilib
 ./buildconf
 
 
@@ -136,6 +139,13 @@
 
 
 %changelog
+* 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.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2005 09:10:07 -0000	1.4
+++ sources	8 Dec 2005 20:32:12 -0000	1.5
@@ -1 +1 @@
-58126a3682617e65a5ce18ca542fd797  libapreq2-2.07-rc2.tar.gz
+3dcccf0afb7a5315e3d8115041893ee4  libapreq2-2.07-rc3.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 21:34:54 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu,  8 Dec 2005 16:34:54 -0500
Subject: CVSROOT syncmail,1.2,1.3
Message-ID: <200512082135.jB8LZPZf022486@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22466/CVSROOT-ext-fedora

Modified Files:
	syncmail 
Log Message:
fix syncmail


Index: syncmail
===================================================================
RCS file: /cvs/fedora/CVSROOT/syncmail,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- syncmail	8 Dec 2005 20:11:44 -0000	1.2
+++ syncmail	8 Dec 2005 21:34:52 -0000	1.3
@@ -204,7 +204,7 @@
         del diff_files[-3:]
     commit_message = sys.stdin.read()
     for I in optRequireKeyword:
-        if I not in commit_message:
+        if commit_message.find(I) < 0:
             return
 
     # cannot wait for child process or that will cause parent to retain cvs



From fedora-extras-commits at redhat.com  Thu Dec  8 21:35:28 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu,  8 Dec 2005 16:35:28 -0500
Subject: CVSROOT syncmail,1.1,1.2
Message-ID: <200512082135.jB8LZxql022511@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/devel/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22492/CVSROOT-ext-devel

Modified Files:
	syncmail 
Log Message:
fix syncmail


Index: syncmail
===================================================================
RCS file: /cvs/devel/CVSROOT/syncmail,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syncmail	22 Apr 2005 22:42:19 -0000	1.1
+++ syncmail	8 Dec 2005 21:35:26 -0000	1.2
@@ -5,6 +5,7 @@
 #     check out the CVSROOT directory on your local machine,
 #     make the changes there and commit. Otherwise your changes
 #     will be lost. --gafton
+# - updated by sopwith to add a --require-keyword option that only sends mail if 'keyword' is found in the comment message
 #
 # - updated by gafton to allow for --nodiff option. The nodiff option
 #   still sends out messages when something changes in a directory, but
@@ -62,6 +63,9 @@
     	Use  as the environment variable CVSROOT.  Otherwise this
     	variable must exist in the environment.
 
+    --require-keyword=STRING
+        Only send mail if STRING is found in the commit message.
+
     --nodiff
     	Don't bother generating the full diff, just report if the files changed
         or not.
@@ -183,7 +187,7 @@
     return string.join(lines, '')
 
 # send mail using sendmail
-def blast_mail(subject, people):    
+def blast_mail(subject, people):
     global optDiffStat
 
     # the redirection sequence in this command is actually intentional
@@ -198,7 +202,11 @@
         del diff_files[-3:]
     if diff_files[-3:] == ['-', 'Imported', 'sources']:
         del diff_files[-3:]
-        
+    commit_message = sys.stdin.read()
+    for I in optRequireKeyword:
+        if commit_message.find(I) < 0:
+            return
+
     # cannot wait for child process or that will cause parent to retain cvs
     # lock for too long.  Urg!
     if not os.fork(): # in the child
@@ -220,7 +228,7 @@
         fp.write("\n")
         fp.write("Author: %s\n\n" % (username,))
         # now insert the CVS blurb
-        fp.write(sys.stdin.read())
+        fp.write(commit_message)
         fp.write('\n')
         # append the diffs if available and sensible
 	graphics = re.compile(r".*\.(jp(e)?g|gif|png|tif(f)?),", re.IGNORECASE)
@@ -246,14 +254,16 @@
     global DIFF_HEAD_LINES
     global DIFF_TAIL_LINES
     global DIFF_TRUNCATE_IF_LARGER
+    global optRequireKeyword
     
     try:
         opts, args = getopt.getopt(sys.argv[1:], 'h', [
 	    'cvsroot=', 'quiet', 'nodiff', 'nodiffstat', 'help',
-	    'headlines=', 'taillines=', 'truncate='])
+	    'headlines=', 'taillines=', 'truncate=', 'require-keyword='])
     except getopt.error, msg:
         usage(1, msg)
 
+    optRequireKeyword = []
     # parse the options
     for opt, arg in opts:
         if opt in ('-h', '--help'):
@@ -269,12 +279,14 @@
             optDiffStat = 0
         elif opt == '--nodiffstat':
             optDiffStat = 0
-	elif opt == 'headlines=':
+	elif opt == '--headlines':
 	    DIFF_HEAD_LINES = arg
-	elif opt == 'taillines=':
+	elif opt == '--taillines':
 	    DIFF_TAIL_LINES = arg
-	elif opt == 'truncate=':
+	elif opt == '--truncate':
 	    DIFF_TRUNCATE_IF_LARGER = arg
+        elif opt == '--require-keyword':
+            optRequireKeyword.append(arg)
 
     # What follows is the specification containing the files that were
     # modified.  The argument actually must be split, with the first component



From fedora-extras-commits at redhat.com  Thu Dec  8 21:56:21 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu,  8 Dec 2005 16:56:21 -0500
Subject: owners owners.list,1.2,1.3
Message-ID: <200512082156.jB8Lupap022587@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	owners.list 
Log Message:
fix owner of cvs


Index: owners.list
===================================================================
RCS file: /cvs/fedora/owners/owners.list,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- owners.list	11 Jul 2005 19:35:50 -0000	1.2
+++ owners.list	8 Dec 2005 21:56:19 -0000	1.3
@@ -9,7 +9,7 @@
 # All e-mail addresses used here MUST correspond to existing bugzilla accounts!
 
 Fedora Infrastructure|Account System|accounts.fedora.redhat.com|sopwith at redhat.com||wtogami at redhat.com
-Fedora Infrastructure|cvs|For issues related to the Fedora CVS system.|gafton at redhat.com|katzj at redhat.com|notting at redhat.com,wtogami at redhat.com,sopwith at redhat.com
+Fedora Infrastructure|cvs|For issues related to the Fedora CVS system.|sopwith at redhat.com|katzj at redhat.com|notting at redhat.com,wtogami at redhat.com,sopwith at redhat.com
 Fedora Infrastructure|extras buildsys|For issues related to the Fedora Extras build system.|skvidal at phy.duke.edu|katzj at redhat.com|wtogami at redhat.com
 Fedora Infrastructure|other|Anything else|wtogami at redhat.com||sopwith at redhat.com
 Fedora Infrastructure|update system|The Fedora Core update system|lmacken at redhat.com|notting at redhat.com|



From fedora-extras-commits at redhat.com  Thu Dec  8 22:19:35 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Thu,  8 Dec 2005 17:19:35 -0500
Subject: rpms/pgadmin3/FC-4 pgadmin3.spec,1.5,1.6
Message-ID: <200512082220.jB8MK5Jo024312@cvs-int.fedora.redhat.com>

Author: ghenry

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

Modified Files:
	pgadmin3.spec 
Log Message:
Updated Devel and FC-4 specfiles for version 1.4.0.


Index: pgadmin3.spec
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/FC-4/pgadmin3.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pgadmin3.spec	22 May 2005 23:18:49 -0000	1.5
+++ pgadmin3.spec	8 Dec 2005 22:19:33 -0000	1.6
@@ -1,14 +1,14 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
-Version:	1.0.2
-Release: 5
+Version:	1.4.0
+Release:    2%{?dist}
 
 License:	Artistic
 Group:		Applications/Databases
-Source: 	ftp://ftp.postgresql.org/pub/pgadmin3/release/src/pgadmin3-1.0.2.tar.gz
+Source: 	ftp://ftp.postgresql.org/pub/pgadmin3/release/src/pgadmin3-1.4.0.tar.gz
 URL:		http://www.pgadmin.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	wxGTK2-devel wxGTK2-stc wxGTK2-xrc postgresql-devel desktop-file-utils openssl-devel
+BuildRequires:	wxGTK-devel wxGTK-stc wxGTK-xrc postgresql-devel desktop-file-utils openssl-devel
 
 %description
 pgAdmin III is a comprehensive PostgreSQL database design
@@ -19,8 +19,8 @@
 
 %build
 %configure
-#Somehow doesn't link in these..
-make %{?_smp_mflags} LDFLAGS="-lwx_gtk2-2.4 -lwx_gtk2_stc-2.4 -lwx_gtk2_xrc-2.4" all
+
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +48,12 @@
 %{_datadir}/applications/*
 
 %changelog
+* Thu Dec 8 2005 Gavin Henry  - 1.4.0-2
+- Removed specific lib includes, not needed anymore 
+
+* Wed Dec 7 2005 Gavin Henry  - 1.4.0-1
+- Updated to latest release
+
 * Sun May 22 2005 Jeremy Katz  - 1.0.2-5
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Dec  8 22:19:40 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Thu,  8 Dec 2005 17:19:40 -0500
Subject: rpms/pgadmin3/devel pgadmin3.spec,1.5,1.6
Message-ID: <200512082220.jB8MKBeL024315@cvs-int.fedora.redhat.com>

Author: ghenry

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

Modified Files:
	pgadmin3.spec 
Log Message:
Updated Devel and FC-4 specfiles for version 1.4.0.


Index: pgadmin3.spec
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/pgadmin3.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pgadmin3.spec	22 May 2005 23:18:49 -0000	1.5
+++ pgadmin3.spec	8 Dec 2005 22:19:38 -0000	1.6
@@ -1,14 +1,14 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
-Version:	1.0.2
-Release: 5
+Version:	1.4.0
+Release:    2%{?dist}
 
 License:	Artistic
 Group:		Applications/Databases
-Source: 	ftp://ftp.postgresql.org/pub/pgadmin3/release/src/pgadmin3-1.0.2.tar.gz
+Source: 	ftp://ftp.postgresql.org/pub/pgadmin3/release/src/pgadmin3-1.4.0.tar.gz
 URL:		http://www.pgadmin.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	wxGTK2-devel wxGTK2-stc wxGTK2-xrc postgresql-devel desktop-file-utils openssl-devel
+BuildRequires:	wxGTK-devel wxGTK-stc wxGTK-xrc postgresql-devel desktop-file-utils openssl-devel
 
 %description
 pgAdmin III is a comprehensive PostgreSQL database design
@@ -19,8 +19,8 @@
 
 %build
 %configure
-#Somehow doesn't link in these..
-make %{?_smp_mflags} LDFLAGS="-lwx_gtk2-2.4 -lwx_gtk2_stc-2.4 -lwx_gtk2_xrc-2.4" all
+
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +48,12 @@
 %{_datadir}/applications/*
 
 %changelog
+* Thu Dec 8 2005 Gavin Henry  - 1.4.0-2
+- Removed specific lib includes, not needed anymore 
+
+* Wed Dec 7 2005 Gavin Henry  - 1.4.0-1
+- Updated to latest release
+
 * Sun May 22 2005 Jeremy Katz  - 1.0.2-5
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Dec  8 22:26:10 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Thu,  8 Dec 2005 17:26:10 -0500
Subject: rpms/pgadmin3/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200512082226.jB8MQe7m024377@cvs-int.fedora.redhat.com>

Author: ghenry

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

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:12:23 -0000	1.2
+++ .cvsignore	8 Dec 2005 22:26:08 -0000	1.3
@@ -1 +1 @@
-pgadmin3-1.0.2.tar.gz
+pgadmin3-1.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:12:23 -0000	1.2
+++ sources	8 Dec 2005 22:26:08 -0000	1.3
@@ -1 +1 @@
-6f0c61d2d0736d057b80a319b8148fd2  pgadmin3-1.0.2.tar.gz
+a0779079bf579b0cd5e132ac5372f7f3  pgadmin3-1.4.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 22:27:20 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Thu,  8 Dec 2005 17:27:20 -0500
Subject: rpms/pgadmin3/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200512082227.jB8MRpSZ024409@cvs-int.fedora.redhat.com>

Author: ghenry

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

Modified Files:
	.cvsignore sources 
Log Message:
added new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:12:23 -0000	1.2
+++ .cvsignore	8 Dec 2005 22:27:18 -0000	1.3
@@ -1 +1 @@
-pgadmin3-1.0.2.tar.gz
+pgadmin3-1.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:12:23 -0000	1.2
+++ sources	8 Dec 2005 22:27:18 -0000	1.3
@@ -1 +1 @@
-6f0c61d2d0736d057b80a319b8148fd2  pgadmin3-1.0.2.tar.gz
+a0779079bf579b0cd5e132ac5372f7f3  pgadmin3-1.4.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 04:44:28 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu,  8 Dec 2005 23:44:28 -0500
Subject: rpms/deskbar-applet/devel deskbar-applet.spec,1.9,1.10
Message-ID: <200512090444.jB94iwh4002416@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2396

Modified Files:
	deskbar-applet.spec 
Log Message:
Upstream update


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- deskbar-applet.spec	1 Dec 2005 13:17:21 -0000	1.9
+++ deskbar-applet.spec	9 Dec 2005 04:44:25 -0000	1.10
@@ -2,17 +2,17 @@
 %{!?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.5
-Release:        2%{?dist}
+Version:        0.8.6
+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://dl.sourceforge.net/browserbookapp/%{name}-%{version}.tar.gz
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/0.8/%{name}-%{version}.tar.bz2
 Source1:        fedorabz.py
 Source2:        fedorabz.png
-Patch0:         deskbar-applet-0.8.2-fedorabz.patch
+Patch0:         deskbar-applet-0.8.6-fedorabz.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
@@ -57,9 +57,11 @@
 %{_libdir}/bonobo/servers/Deskbar_Applet.server
 %{python_sitelib}/deskbar
 %{_datadir}/%{name}
-%{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Dec  8 2005 Ignacio Vazquez-Abrams  0.8.6-1
+- Upstream update
+
 * Thu Dec  1 2005 Ignacio Vazquez-Abrams  0.8.5-2
 - Fixed bugs in Fedora BZ handler
 



From fedora-extras-commits at redhat.com  Fri Dec  9 05:15:12 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri,  9 Dec 2005 00:15:12 -0500
Subject: rpms/deskbar-applet/devel deskbar-applet-0.8.6-fedorabz.patch, NONE,
	1.1 deskbar-applet-0.8.2-fedorabz.patch, 1.1, NONE
Message-ID: <200512090515.jB95FCEe004134@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4121

Added Files:
	deskbar-applet-0.8.6-fedorabz.patch 
Removed Files:
	deskbar-applet-0.8.2-fedorabz.patch 
Log Message:
Add the patch

deskbar-applet-0.8.6-fedorabz.patch:

--- NEW FILE deskbar-applet-0.8.6-fedorabz.patch ---
--- deskbar-applet-0.8.6/deskbar/handlers/Makefile.in.fedorabz	2005-12-06 15:37:07.000000000 -0500
+++ deskbar-applet-0.8.6/deskbar/handlers/Makefile.in	2005-12-08 22:52:46.000000000 -0500
@@ -238,6 +238,7 @@
 deskbar_handlers_PYTHON = beagle.py beagle-live.py email_address.py \
 	epiphany.py files.py galago.py galeon.py gtkbookmarks.py \
 	google-live.py mozilla.py programs.py pathprograms.py \
+	fedorabz.py \
 	volumes.py web_address.py $(am__append_1)
 EXTRA_DIST = \
 	debug-async_handler.py \
--- deskbar-applet-0.8.6/data/art/Makefile.in.fedorabz	2005-12-06 15:37:07.000000000 -0500
+++ deskbar-applet-0.8.6/data/art/Makefile.in	2005-12-08 22:44:02.000000000 -0500
@@ -240,6 +240,7 @@
 art_DATA = \
 	deskbar-applet.svg \
 	deskbar-applet-small.png \
+	fedorabz.png \
 	folder-bookmark.png \
 	generic.png \
 	google.png \


--- deskbar-applet-0.8.2-fedorabz.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 05:19:17 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri,  9 Dec 2005 00:19:17 -0500
Subject: rpms/deskbar-applet/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200512090519.jB95Jlpn004231@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4211

Modified Files:
	.cvsignore sources 
Log Message:
And the tarball...


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Nov 2005 06:27:07 -0000	1.4
+++ .cvsignore	9 Dec 2005 05:19:15 -0000	1.5
@@ -1 +1 @@
-deskbar-applet-0.8.5.tar.gz
+deskbar-applet-0.8.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Nov 2005 06:27:07 -0000	1.4
+++ sources	9 Dec 2005 05:19:15 -0000	1.5
@@ -1 +1 @@
-7f4963686dd92255d423014c5e404e68  deskbar-applet-0.8.5.tar.gz
+67507881804181b749d5e317a76b91ee  deskbar-applet-0.8.6.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec  9 05:53:16 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri,  9 Dec 2005 00:53:16 -0500
Subject: rpms/perl-Readonly-XS/devel perl-Readonly-XS.spec,1.1,1.2
Message-ID: <200512090553.jB95rkLS004326@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4300

Modified Files:
	perl-Readonly-XS.spec 
Log Message:
Added proper version requires to perl(Readonly)



Index: perl-Readonly-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/devel/perl-Readonly-XS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Readonly-XS.spec	8 Dec 2005 19:13:39 -0000	1.1
+++ perl-Readonly-XS.spec	9 Dec 2005 05:53:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Readonly-XS
 Version:        1.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Companion module for Readonly.pm
 
 Group:          Development/Libraries
@@ -11,7 +11,7 @@
 
 BuildRequires: perl(Readonly) >= 1.02
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:  perl(Readonly)
+Requires:  perl(Readonly) >= 1.02
 
 %description
 Readonly-XS is a companion module for Readonly.pm, to speed up read-only
@@ -52,8 +52,8 @@
 
 
 %changelog
-* Thu Dec 08 2005 Michael A. Peters  - 1.04-2
-- proper version on perl(Readonly) BuildRequires
+* Thu Dec 08 2005 Michael A. Peters  - 1.04-3
+- proper version on perl(Readonly) BuildRequires & Requires
 
 * Thu Dec 08 2005 Michael A. Peters  - 1.04-1
 - New Version



From fedora-extras-commits at redhat.com  Fri Dec  9 08:17:52 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 03:17:52 -0500
Subject: rpms/perl-Crypt-DH - New directory
Message-ID: <200512090817.jB98HquH009723@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

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




From fedora-extras-commits at redhat.com  Fri Dec  9 08:17:58 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 03:17:58 -0500
Subject: rpms/perl-Crypt-DH/devel - New directory
Message-ID: <200512090817.jB98HwIG009739@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9714/perl-Crypt-DH/devel

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




From fedora-extras-commits at redhat.com  Fri Dec  9 08:18:27 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 03:18:27 -0500
Subject: rpms/perl-Crypt-DH Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512090818.jB98IRrD009774@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec  9 08:18:32 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 03:18:32 -0500
Subject: rpms/perl-Crypt-DH/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512090818.jB98IW7M009793@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9761/devel

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


--- NEW 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 Dec  9 08:19:39 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 03:19:39 -0500
Subject: rpms/perl-Crypt-DH import.log,1.1,1.2
Message-ID: <200512090820.jB98K9Cr009887@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DH/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Dec 2005 08:18:25 -0000	1.1
+++ import.log	9 Dec 2005 08:19:37 -0000	1.2
@@ -0,0 +1 @@
+perl-Crypt-DH-0_06-1:HEAD:perl-Crypt-DH-0.06-1.src.rpm:1134116345



From fedora-extras-commits at redhat.com  Fri Dec  9 08:19:45 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 03:19:45 -0500
Subject: rpms/perl-Crypt-DH/devel perl-Crypt-DH.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512090820.jB98KFu9009894@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9845/devel

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


--- NEW FILE perl-Crypt-DH.spec ---
Summary:	Perl module implementing the Diffie-Hellman key exchange system
Name:		perl-Crypt-DH
Version:	0.06
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Crypt-DH/
Source0:	http://search.cpan.org/CPAN/authors/id/B/BT/BTROTT/Crypt-DH-%{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
Crypt::DH is a Perl implementation of the Diffie-Hellman key exchange system.
Diffie-Hellman is an algorithm by which two parties can agree on a shared
secret key, known only to them. The secret is negotiated over an insecure
network without the two parties ever passing the actual shared secret, or their
private keys, between them.

%prep
%setup -q -n Crypt-DH-%{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::DH.3pm*

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DH/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Dec 2005 08:18:30 -0000	1.1
+++ .cvsignore	9 Dec 2005 08:19:42 -0000	1.2
@@ -0,0 +1 @@
+Crypt-DH-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DH/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Dec 2005 08:18:30 -0000	1.1
+++ sources	9 Dec 2005 08:19:42 -0000	1.2
@@ -0,0 +1 @@
+eabecac024d427c670a6e0edbadcec5d  Crypt-DH-0.06.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 08:32:28 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 03:32:28 -0500
Subject: rpms/perl-Crypt-DH/devel perl-Crypt-DH.spec,1.1,1.2
Message-ID: <200512090832.jB98WwAn009983@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9965

Modified Files:
	perl-Crypt-DH.spec 
Log Message:
Add facility to skip test suite at build time if desired



Index: perl-Crypt-DH.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DH/devel/perl-Crypt-DH.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Crypt-DH.spec	9 Dec 2005 08:19:42 -0000	1.1
+++ perl-Crypt-DH.spec	9 Dec 2005 08:32:25 -0000	1.2
@@ -1,7 +1,11 @@
+# To skip the lengthy test suite, use:
+# rpmbuild --without checks
+%bcond_without checks
+
 Summary:	Perl module implementing the Diffie-Hellman key exchange system
 Name:		perl-Crypt-DH
 Version:	0.06
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-DH/
@@ -25,7 +29,7 @@
 %{__make} %{?_smp_mflags}
 
 %check
-%{__make} test
+%{?with_checks:%{__make} test}
 
 %install
 %{__rm} -rf %{buildroot}
@@ -44,5 +48,8 @@
 %{_mandir}/man3/Crypt::DH.3pm*
 
 %changelog
+* Fri Dec  9 2005 Paul Howarth  0.06-2
+- Add facility to skip test suite at build time if desired
+
 * Tue Nov 29 2005 Paul Howarth  0.06-1
 - Initial build



From fedora-extras-commits at redhat.com  Fri Dec  9 08:33:42 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri,  9 Dec 2005 03:33:42 -0500
Subject: rpms/rdiff-backup/devel rdiff-backup.spec,1.9,1.10
Message-ID: <200512090834.jB98YCQ4010045@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10027

Modified Files:
	rdiff-backup.spec 
Log Message:
Upgraded to version 1.0.3.


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rdiff-backup.spec	14 Sep 2005 07:40:55 -0000	1.9
+++ rdiff-backup.spec	9 Dec 2005 08:33:39 -0000	1.10
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Version: 1.0.1
+Version: 1.0.3
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -53,6 +53,8 @@
 %ghost %{python_sitearch}/rdiff_backup/*.pyo
 
 %changelog
+* Fri Dec 9  2005 Gavin Henry  - 0:1.0.3-1 
+
 * Wed Sep 14 2005 Gavin Henry  - 0:1.0.1-1
 - New version
 



From fedora-extras-commits at redhat.com  Fri Dec  9 08:36:53 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri,  9 Dec 2005 03:36:53 -0500
Subject: rpms/rdiff-backup/devel .cvsignore,1.3,1.4 sources,1.4,1.5
Message-ID: <200512090837.jB98bNjI010101@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10081

Modified Files:
	.cvsignore sources 
Log Message:
New sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Sep 2005 07:40:55 -0000	1.3
+++ .cvsignore	9 Dec 2005 08:36:51 -0000	1.4
@@ -1 +1 @@
-rdiff-backup-1.0.1.tar.gz
+rdiff-backup-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Sep 2005 07:40:55 -0000	1.4
+++ sources	9 Dec 2005 08:36:51 -0000	1.5
@@ -1 +1 @@
-765e8c97c696eeb7b19006d9ed0967be  rdiff-backup-1.0.1.tar.gz
+dedae55157ec11d046ffd79bd48db25c  rdiff-backup-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 08:38:56 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri,  9 Dec 2005 03:38:56 -0500
Subject: rpms/rdiff-backup/FC-4 rdiff-backup.spec,1.10,1.11
Message-ID: <200512090839.jB98dRjV010125@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rdiff-backup/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10107

Modified Files:
	rdiff-backup.spec 
Log Message:
New version.


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/rdiff-backup.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rdiff-backup.spec	14 Sep 2005 07:39:49 -0000	1.10
+++ rdiff-backup.spec	9 Dec 2005 08:38:54 -0000	1.11
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Version: 1.0.1
+Version: 1.0.3
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -53,6 +53,9 @@
 %ghost %{python_sitearch}/rdiff_backup/*.pyo
 
 %changelog
+* Fri Dec 9  2005 Gavin Henry  - 0:1.0.3-1
+- New version
+
 * Wed Sep 14 2005 Gavin Henry  - 0:1.0.1-1
 - New version
 



From fedora-extras-commits at redhat.com  Fri Dec  9 08:42:44 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri,  9 Dec 2005 03:42:44 -0500
Subject: rpms/rdiff-backup/FC-4 .cvsignore,1.4,1.5 sources,1.5,1.6
Message-ID: <200512090843.jB98hEfm010235@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rdiff-backup/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10215

Modified Files:
	.cvsignore sources 
Log Message:
Added new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Sep 2005 07:39:49 -0000	1.4
+++ .cvsignore	9 Dec 2005 08:42:42 -0000	1.5
@@ -1 +1 @@
-rdiff-backup-1.0.1.tar.gz
+rdiff-backup-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Sep 2005 07:39:49 -0000	1.5
+++ sources	9 Dec 2005 08:42:42 -0000	1.6
@@ -1 +1 @@
-765e8c97c696eeb7b19006d9ed0967be  rdiff-backup-1.0.1.tar.gz
+dedae55157ec11d046ffd79bd48db25c  rdiff-backup-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 10:14:06 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 05:14:06 -0500
Subject: owners owners.list,1.437,1.438
Message-ID: <200512091014.jB9AEaJt014315@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	owners.list 
Log Message:
perl-Crypt-DH



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- owners.list	8 Dec 2005 19:16:26 -0000	1.437
+++ owners.list	9 Dec 2005 10:14:04 -0000	1.438
@@ -721,6 +721,7 @@
 Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-Blowfish|XS Blowfish implementation for Perl|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-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-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-capitalization|No capitalization on method names|rc040203 at freenet.de|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  Fri Dec  9 10:24:50 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri,  9 Dec 2005 05:24:50 -0500
Subject: rpms/amarok/FC-4 amarok-1.3.6-libtunepimp040.patch, NONE,
	1.1 .cvsignore, 1.16, 1.17 amarok.spec, 1.32, 1.33 sources,
	1.16, 1.17
Message-ID: <200512091025.jB9APKdl014392@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore amarok.spec sources 
Added Files:
	amarok-1.3.6-libtunepimp040.patch 
Log Message:
- version 1.3.7

amarok-1.3.6-libtunepimp040.patch:

--- NEW FILE amarok-1.3.6-libtunepimp040.patch ---
--- amarok-1.3.6/amarok/src/ktrm.cpp.tp 2005-11-07 16:19:18.000000000 -0600
+++ amarok-1.3.6/amarok/src/ktrm.cpp    2005-11-17 13:09:35.000000000 -0600
@@ -42,7 +42,7 @@
 
 extern "C"
 {
-    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId);
+    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status);
 }
 
 /**
@@ -66,7 +66,8 @@
         int id;
 
         if(!m_fileMap.contains(lookup->file())) {
-            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()));
+            // Not sure if 3rd field should be 0 or 1, guessing 1 -- Rex
+            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()),1);
             m_fileMap.insert(lookup->file(), id);
         }
         else {
@@ -121,7 +122,6 @@
         tp_SetAutoSaveThreshold(m_pimp, -1);
         tp_SetMoveFiles(m_pimp, false);
         tp_SetRenameFiles(m_pimp, false);
-        tp_SetUseUTF8(m_pimp, true);
         tp_SetNotifyCallback(m_pimp, TRMNotifyCallback, 0);
 
         if(KProtocolManager::useProxy()) {
@@ -245,13 +245,13 @@
  * Callback fuction for TunePimp lookup events.
  */
 
-static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId)
+static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId, TPFileStatus status)
 {
     if(type != tpFileChanged)
         return;
 
     track_t track = tp_GetTrack(pimp, fileId);
-    TPFileStatus status = tr_GetStatus(track);
+    status = tr_GetStatus(track);
 
     switch(status) {
     case eRecognized:
@@ -556,10 +556,10 @@
                 KTRMResult result;
 
                 result.d->title = QString::fromUtf8(tracks[i]->name);
-                result.d->artist = QString::fromUtf8(tracks[i]->artist->name);
-                result.d->album = QString::fromUtf8(tracks[i]->album->name);
+                result.d->artist = QString::fromUtf8(tracks[i]->artist.name);
+                result.d->album = QString::fromUtf8(tracks[i]->album.name);
                 result.d->track = tracks[i]->trackNum;
-                result.d->year = tracks[i]->album->releaseYear;
+                result.d->year = tracks[i]->album.releaseYear;
                 result.d->relevance =
                     4 * stringSimilarity(strList,result.d->title) +
                     2 * stringSimilarity(strList,result.d->artist) +



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	11 Nov 2005 13:41:11 -0000	1.16
+++ .cvsignore	9 Dec 2005 10:24:48 -0000	1.17
@@ -1 +1 @@
-amarok-1.3.6.tar.bz2
+amarok-1.3.7.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- amarok.spec	11 Nov 2005 13:41:11 -0000	1.32
+++ amarok.spec	9 Dec 2005 10:24:48 -0000	1.33
@@ -6,14 +6,15 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.6
+Version:    1.3.7
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.6.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.7.tar.bz2
 Patch0:     amarok-1.3.4-helix-libs.patch
+Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,6 +27,7 @@
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
+BuildRequires:  libtunepimp-devel >= 0.4.0
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
@@ -83,6 +85,8 @@
 %setup -q
 # Discover the helix libs
 %patch0 -p1 -b .helix-libs
+# Use libtunepimp 0.4.0 (api changed)
+%patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
@@ -197,8 +201,6 @@
 %{_datadir}/services/amarok_helixengine_plugin.desktop
 %endif
 
-%exclude %{_datadir}/apps/zeroconf/_shoutcast._tcp
-
 
 %files visualisation
 %defattr(-,root,root)
@@ -216,6 +218,13 @@
 
 
 %changelog
+* Wed Dec 07 2005 Aurelien Bompard  1.3.7-1
+- version 1.3.7
+
+* Sun Nov 20 2005 Aurelien Bompard  1.3.6-2
+- build with libtunepimp
+- add patch to use libtunepimp 0.4.0 (api changed)
+
 * Tue Nov 08 2005 Aurelien Bompard  1.3.6-1
 - version 1.3.6
 - BR libGL instead of xorg-x11-Mesa-libGL to prepare for X11R7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	11 Nov 2005 13:41:11 -0000	1.16
+++ sources	9 Dec 2005 10:24:48 -0000	1.17
@@ -1 +1 @@
-f97ac51a8c2f150ffc4cc0ef49c59a2f  amarok-1.3.6.tar.bz2
+e2297042070643c105f8bb0e524c73ad  amarok-1.3.7.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec  9 10:24:56 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri,  9 Dec 2005 05:24:56 -0500
Subject: rpms/amarok/devel amarok-1.3.6-libtunepimp040.patch, NONE,
	1.1 .cvsignore, 1.16, 1.17 amarok.spec, 1.30, 1.31 sources,
	1.16, 1.17
Message-ID: <200512091025.jB9APQfJ014397@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore amarok.spec sources 
Added Files:
	amarok-1.3.6-libtunepimp040.patch 
Log Message:
- version 1.3.7

amarok-1.3.6-libtunepimp040.patch:

--- NEW FILE amarok-1.3.6-libtunepimp040.patch ---
--- amarok-1.3.6/amarok/src/ktrm.cpp.tp 2005-11-07 16:19:18.000000000 -0600
+++ amarok-1.3.6/amarok/src/ktrm.cpp    2005-11-17 13:09:35.000000000 -0600
@@ -42,7 +42,7 @@
 
 extern "C"
 {
-    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId);
+    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status);
 }
 
 /**
@@ -66,7 +66,8 @@
         int id;
 
         if(!m_fileMap.contains(lookup->file())) {
-            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()));
+            // Not sure if 3rd field should be 0 or 1, guessing 1 -- Rex
+            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()),1);
             m_fileMap.insert(lookup->file(), id);
         }
         else {
@@ -121,7 +122,6 @@
         tp_SetAutoSaveThreshold(m_pimp, -1);
         tp_SetMoveFiles(m_pimp, false);
         tp_SetRenameFiles(m_pimp, false);
-        tp_SetUseUTF8(m_pimp, true);
         tp_SetNotifyCallback(m_pimp, TRMNotifyCallback, 0);
 
         if(KProtocolManager::useProxy()) {
@@ -245,13 +245,13 @@
  * Callback fuction for TunePimp lookup events.
  */
 
-static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId)
+static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId, TPFileStatus status)
 {
     if(type != tpFileChanged)
         return;
 
     track_t track = tp_GetTrack(pimp, fileId);
-    TPFileStatus status = tr_GetStatus(track);
+    status = tr_GetStatus(track);
 
     switch(status) {
     case eRecognized:
@@ -556,10 +556,10 @@
                 KTRMResult result;
 
                 result.d->title = QString::fromUtf8(tracks[i]->name);
-                result.d->artist = QString::fromUtf8(tracks[i]->artist->name);
-                result.d->album = QString::fromUtf8(tracks[i]->album->name);
+                result.d->artist = QString::fromUtf8(tracks[i]->artist.name);
+                result.d->album = QString::fromUtf8(tracks[i]->album.name);
                 result.d->track = tracks[i]->trackNum;
-                result.d->year = tracks[i]->album->releaseYear;
+                result.d->year = tracks[i]->album.releaseYear;
                 result.d->relevance =
                     4 * stringSimilarity(strList,result.d->title) +
                     2 * stringSimilarity(strList,result.d->artist) +



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	11 Nov 2005 13:41:17 -0000	1.16
+++ .cvsignore	9 Dec 2005 10:24:54 -0000	1.17
@@ -1 +1 @@
-amarok-1.3.6.tar.bz2
+amarok-1.3.7.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- amarok.spec	11 Nov 2005 13:41:17 -0000	1.30
+++ amarok.spec	9 Dec 2005 10:24:54 -0000	1.31
@@ -6,14 +6,15 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.6
+Version:    1.3.7
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.6.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.7.tar.bz2
 Patch0:     amarok-1.3.4-helix-libs.patch
+Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,6 +27,7 @@
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
+BuildRequires:  libtunepimp-devel >= 0.4.0
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
@@ -83,6 +85,8 @@
 %setup -q
 # Discover the helix libs
 %patch0 -p1 -b .helix-libs
+# Use libtunepimp 0.4.0 (api changed)
+%patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
@@ -197,8 +201,6 @@
 %{_datadir}/services/amarok_helixengine_plugin.desktop
 %endif
 
-%exclude %{_datadir}/apps/zeroconf/_shoutcast._tcp
-
 
 %files visualisation
 %defattr(-,root,root)
@@ -216,6 +218,13 @@
 
 
 %changelog
+* Wed Dec 07 2005 Aurelien Bompard  1.3.7-1
+- version 1.3.7
+
+* Sun Nov 20 2005 Aurelien Bompard  1.3.6-2
+- build with libtunepimp
+- add patch to use libtunepimp 0.4.0 (api changed)
+
 * Tue Nov 08 2005 Aurelien Bompard  1.3.6-1
 - version 1.3.6
 - BR libGL instead of xorg-x11-Mesa-libGL to prepare for X11R7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	11 Nov 2005 13:41:17 -0000	1.16
+++ sources	9 Dec 2005 10:24:54 -0000	1.17
@@ -1 +1 @@
-f97ac51a8c2f150ffc4cc0ef49c59a2f  amarok-1.3.6.tar.bz2
+e2297042070643c105f8bb0e524c73ad  amarok-1.3.7.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec  9 12:40:06 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri,  9 Dec 2005 07:40:06 -0500
Subject: rpms/torcs/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 torcs.spec,
	1.9, 1.10 TORCS-1.2.3-64bit.patch, 1.1, NONE
Message-ID: <200512091240.jB9CeaZF018843@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore sources torcs.spec 
Removed Files:
	TORCS-1.2.3-64bit.patch 
Log Message:
Backport TORCS 1.2.4 from devel to FC-4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Feb 2005 15:39:54 -0000	1.4
+++ .cvsignore	9 Dec 2005 12:40:04 -0000	1.5
@@ -1,5 +1,5 @@
-TORCS-1.2.3-src.tgz
-TORCS-1.2.3-src-robots-base.tgz
-TORCS-1.2.3-src-robots-berniw.tgz
-TORCS-1.2.3-src-robots-bt.tgz
-TORCS-1.2.3-src-robots-olethros.tgz
+TORCS-1.2.4-src-robots-base.tgz
+TORCS-1.2.4-src-robots-berniw.tgz
+TORCS-1.2.4-src-robots-bt.tgz
+TORCS-1.2.4-src-robots-olethros.tgz
+TORCS-1.2.4-src.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Feb 2005 15:39:54 -0000	1.4
+++ sources	9 Dec 2005 12:40:04 -0000	1.5
@@ -1,5 +1,5 @@
-0f1dc6a3f08e1ae9f80e118c350bb4b4  TORCS-1.2.3-src.tgz
-43d670da19adb2e4c632390611d2dc31  TORCS-1.2.3-src-robots-base.tgz
-ba4f75b0707a592cb18ea971da8c1382  TORCS-1.2.3-src-robots-berniw.tgz
-605d82faeb3d547ccb9acbbac9281ff9  TORCS-1.2.3-src-robots-bt.tgz
-2cd15c851a6f07410a4363114a5b2880  TORCS-1.2.3-src-robots-olethros.tgz
+3afe0d23f1e637fe56efccd2b6e8a8f1  TORCS-1.2.4-src-robots-base.tgz
+40aed9595f91051e8468e8a19b65f809  TORCS-1.2.4-src-robots-berniw.tgz
+337eecc6e545aceda094d945e12c3023  TORCS-1.2.4-src-robots-bt.tgz
+13b1eeba1148ca57dc1d989fcb27d308  TORCS-1.2.4-src-robots-olethros.tgz
+f5b41bf29cb7b6160e5ead6e187380b6  TORCS-1.2.4-src.tgz


Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-4/torcs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- torcs.spec	4 Aug 2005 15:35:46 -0000	1.9
+++ torcs.spec	9 Dec 2005 12:40:04 -0000	1.10
@@ -2,8 +2,8 @@
 
 Summary: The Open Racing Car Simulator
 Name: torcs
-Version: 1.2.3
-Release: 5%{?dist}
+Version: 1.2.4
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://torcs.org/
@@ -12,11 +12,10 @@
 Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz
 Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
 Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz
-Patch0: TORCS-1.2.3-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: torcs-data, torcs-data-cars-extra
+Requires: torcs-data, torcs-data-tracks-road, torcs-data-cars-extra
 BuildRequires: xorg-x11-devel, freeglut-devel, plib-devel >= 1.8.3
-BuildRequires: libpng-devel, libjpeg-devel, zlib-devel
+BuildRequires: libpng-devel, libjpeg-devel, zlib-devel, openal-devel
 BuildRequires: desktop-file-utils
 
 %description
@@ -40,7 +39,6 @@
 
 %prep
 %setup -a 1 -a 2 -a 3 -a 4
-%patch0 -p1 -b .64bit
 # Put the drivers back where they belong
 %{__mv} %{name}-%{version}/src/drivers/* src/drivers/
 
@@ -55,7 +53,7 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
-%{__install} -m 644 -D Ticon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
+%{__install} -D -p -m 0644 Ticon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
 %{__cat} > %{name}.desktop << EOF
 [Desktop Entry]
@@ -120,7 +118,6 @@
 %{_datadir}/games/%{name}/telemetry/
 %{_datadir}/pixmaps/%{name}.png
 
-
 %files robots
 %defattr(-, root, root, 0755)
 %dir %{_libdir}/%{name}/
@@ -148,6 +145,12 @@
 
 
 %changelog
+* Wed Oct 12 2005 Matthias Saou  1.2.4-1
+- Update to 1.2.4.
+- Add torcs-data-tracks-road requirement directly to main torcs.
+- Drop no longer needed TORCS-1.2.3-64bit.patch.
+- Add openal-devel build dependency.
+
 * Wed Aug  3 2005 Matthias Saou  1.2.3-5
 - Move base robots from the sub-package to the main one to have the default
   quick race work. Hopefully this will change in later versions if the game


--- TORCS-1.2.3-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 13:18:47 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 08:18:47 -0500
Subject: rpms/cernlib/devel 114-install-scripts-properly.dpatch, NONE,
	1.1 211-fix-comis-on-64-bit-arches.dpatch, NONE,
	1.1 cernlib_2005.05.09.dfsg-2.diff, NONE,
	1.1 003-geant-dummy-functions.dpatch, 1.1, 1.2 cernlib.spec,
	1.6, 1.7 cernlib-install_scripts.patch, 1.1,
	NONE cernlib_2005.05.09.dfsg-1.diff, 1.2, NONE
Message-ID: <200512091318.jB9DIlWc020609@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	003-geant-dummy-functions.dpatch cernlib.spec 
Added Files:
	114-install-scripts-properly.dpatch 
	211-fix-comis-on-64-bit-arches.dpatch 
	cernlib_2005.05.09.dfsg-2.diff 
Removed Files:
	cernlib-install_scripts.patch cernlib_2005.05.09.dfsg-1.diff 
Log Message:
- use new debian patchset
- enable 64 bit fixes patch




--- NEW FILE 114-install-scripts-properly.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 114-install-scripts-properly.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Install scripts properly (i.e. don't try to strip them).

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/scripts/Imakefile cernlib-2005.05.09.dfsg/src/scripts/Imakefile
--- cernlib-2005.05.09.dfsg~/src/scripts/Imakefile	2004-07-29 10:17:08.000000000 -0400
+++ cernlib-2005.05.09.dfsg/src/scripts/Imakefile	2005-12-02 10:45:23.091782817 -0500
@@ -1,10 +1,10 @@
 
-InstallProgram(paw,$(CERN_BINDIR))
+InstallNamedProg(paw,paw,$(CERN_BINDIR))
 
 #if defined(CERNLIB_SHIFT)
 InstallNamedProg(cernlib_shift,cernlib,$(CERN_BINDIR))
 #else
-InstallProgram(cernlib,$(CERN_BINDIR))
+InstallNamedProg(cernlib,cernlib,$(CERN_BINDIR))
 #endif
 
-InstallProgram(gxint,$(CERN_BINDIR))
+InstallNamedProg(gxint,gxint,$(CERN_BINDIR))


--- NEW FILE 211-fix-comis-on-64-bit-arches.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-64-bit-arches.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09~/src/geant321/gphys/gphot.F cernlib-2005.05.09/src/geant321/gphys/gphot.F
--- cernlib-2005.05.09~/src/geant321/gphys/gphot.F	1995-10-24 10:21:29.000000000 +0000
+++ cernlib-2005.05.09/src/geant321/gphys/gphot.F	2005-09-20 19:27:10.734527890 +0000
@@ -240,7 +240,7 @@
                   ELSE
 C Radiative shell decay
                      JS = JFN+1+2*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 40 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
@@ -296,7 +296,7 @@
                   ELSE
 c Nonradiative decay
                      JS = JFN+1+3*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 60 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
diff -urNad cernlib-2005.05.09~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.05.09/src/packlib/kernlib/kerngen/ccgen/locb.c
--- cernlib-2005.05.09~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/kernlib/kerngen/ccgen/locb.c	2005-09-20 19:27:10.734527890 +0000
@@ -44,7 +44,25 @@
    DummyDef
 #endif
 {
+#if defined(CERNLIB_QMLXIA64)
+   const unsigned long long int mask=0x00000000ffffffff;
+   static unsigned long long int base=1;
+   unsigned long long int jadr=(unsigned long long int) iadr;
+   unsigned long long int jadrl = (mask & jadr);
+
+   if (base == 1) {
+     base = (~mask & jadr);
+   } else if(base != (~mask & jadr)) {
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+     printf("locb_() Warning: changing base from %lx to %lx!!!\n",
+     	   base, (~mask & jadr));
+     printf("This may result in program crash or incorrect results\n");
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+   }
+   return ((int) jadrl);
+#else
    return( (int) iadr );
+#endif
 }
 /*> END <----------------------------------------------------------*/
 #ifdef CERNLIB_TCGEN_LOCB
diff -urNad cernlib-2005.05.09~/src/packlib/zbook/code/zjump.c cernlib-2005.05.09/src/packlib/zbook/code/zjump.c
--- cernlib-2005.05.09~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/zbook/code/zjump.c	2005-09-20 19:27:10.734527890 +0000
@@ -7,6 +7,9 @@
  *
  */
 #include "zbook/pilot_c.h"
+#if defined(CERNLIB_QMLXIA64)
+static void (*target)();
+#endif
 #if defined(CERNLIB_UNIX)
 #if defined(CERNLIB_QX_SC)
 zjump_(name,p1,p2,p3,p4)
@@ -18,8 +21,23 @@
 ZJUMP(name,p1,p2,p3,p4)
 #endif
 char *p1, *p2, *p3, *p4;
+
+/*  LP64 compatibility:
+    name is taken from a Fortran array and therefore its address is 32 bit
+    which has to be converted to a 64 bit address to satisfy void (*) (H. Vogt) */
+
+#if defined(CERNLIB_QMLXIA64)
+int *name;
+{
+  long jadr;
+  jadr   = *name;  /* convert int to long */
+  target = (void (*)())jadr;
+  (*target)(p1, p2, p3, p4);
+}
+#else
 void (**name)();
 {
    (**name)(p1, p2, p3, p4);
 }
 #endif
+#endif
diff -urNad cernlib-2005.05.09~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.05.09/src/packlib/zebra/test/brztest/btest2.F
--- cernlib-2005.05.09~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/zebra/test/brztest/btest2.F	2005-09-20 19:27:10.734527890 +0000
@@ -29,6 +29,15 @@
 ********************************************************************************
 *
       COMMON/CRZT/IXSTOR,IXDIV,IFENCE(2),LEV,LEVIN,BLVECT(30000)
+
+*     LP64 compatibility:
+*     For 64-bit pointer systems put local variables referenced by LOCF
+*     in a dummy named common block to keep addresses in the program region.
+*     see also: packlib/ffread/test/main.F (H. Vogt)
+
+#if defined(CERNLIB_QMLXIA64)
+      COMMON /TEST64/LBANK
+#endif
       DIMENSION LQ(999),IQ(999),Q(999)
       EQUIVALENCE (IQ(1),Q(1),LQ(9)),(LQ(1),LEV)
 C
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09~/src/pawlib/comis/code/Imakefile	2005-09-20 19:26:47.894420356 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-09-20 19:27:10.734527890 +0000
@@ -50,6 +50,10 @@
 SRCS_F := $(SRCS_F) cscrexec.F
 #endif
 
+#if defined(CERNLIB_QMLXIA64)
+SRCS_F := $(SRCS_F) csrtgpl.F csitgpl.F
+#endif
+
 #if defined(CERNLIB_OLD)
 SRCS_F := $(SRCS_F) cspdir.F csrmbk.F
 #endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csaddr.F	1996-02-26 17:16:25.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-09-20 19:27:10.735527676 +0000
@@ -17,8 +17,14 @@
       INTEGER CSLTGP,CSITGP
       CHARACTER*32 NAME
 #include "comis/cstab.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       INTEGER CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      INTEGER*8 CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)
       NAME=CHNAME
       NC=LENOCC(NAME)
       CALL CSCHID(NAME(:NC))
@@ -26,21 +32,39 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
+#endif
+#endif
+#if defined(CERNLIB_SHL)
           ELSE
             I=0
           ENDIF
         ENDIF
       ELSE
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+        IF(IADGPL.NE.0)THEN
+          IFCS=-2
+          ITYPGP=-2
+          I=CSITGPL(IPVS)
+        ENDIF
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
           I=CSITGP(IPVS)
         ENDIF
+#endif
       END IF
       CSADDR=I
 #endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csinit.F cernlib-2005.05.09/src/pawlib/comis/code/csinit.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csinit.F	2005-04-18 15:41:04.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csinit.F	2005-09-20 19:27:10.735527676 +0000
@@ -64,6 +64,9 @@
 #if defined(CERNLIB_SHL)
 #include "comis/cshlnm.inc"
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+#endif
 #if defined(CERNLIB_PAW)
 #include "paw/pcmode.inc"
 #include "comis/cshfill.inc"
@@ -159,6 +162,9 @@
       ICHMINU=ICHAR('-')
       ICHPLUS=ICHAR('+')
       ICHCOMM=ICHAR(',')
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+      IPIADGV=0
+#endif
 #if defined(CERNLIB_PAW)
       CALL CSPAWI
       MODHFI=0
@@ -209,11 +215,16 @@
       CHF77 ='f77 -c -pic'
       CHCC  ='cc -c -pic'
 #endif
-#if (defined(CERNLIB_LINUX))
+#if (defined(CERNLIB_LINUX))&&(!defined(CERNLIB_QMLXIA64))
       ITMPLEN=CSTMPD(CHPATH, 256)
       CHF77 ='g77 -c'
       CHCC  ='cc -c'
 #endif
+#if (defined(CERNLIB_LINUX))&&(defined(CERNLIB_QMLXIA64))
+      ITMPLEN=CSTMPD(CHPATH, 256)
+      CHF77 ='g77 -c -fPIC -fno-f2c'
+      CHCC  ='cc -c -fPIC -fno-f2c'
+#endif
 #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
       ITMPLEN=CSTMPD(CHPATH, 256)
       CHF77 ='f77 -c'
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csintx.F cernlib-2005.05.09/src/pawlib/comis/code/csintx.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csintx.F	1996-12-05 09:50:37.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csintx.F	2005-09-20 19:27:10.762521893 +0000
@@ -38,6 +38,9 @@
 #if defined(CERNLIB_PAW)
 #include "comis/cskucs.inc"
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_ALPHA_OSF))
       INTEGER CSTRCMP
 #endif
@@ -1105,6 +1108,32 @@
       ENDIF
 #endif
 #if (!defined(CERNLIB_VAX))&&(!defined(CERNLIB_APOLLO))
+#if defined(CERNLIB_QMLXIA64)
+      IF(IQ(IP+KSIFCS).EQ.-2)THEN
+*Dynamic linker may give long addresses
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ENDIF
+#else
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NPAR,IDA(IOFSPL))
       ELSEIF(ITP.EQ.2)THEN
@@ -1115,6 +1144,7 @@
         DCSRES=CSCALD(IADGP,NPAR,IDA(IOFSPL))
       ENDIF
 #endif
+#endif
       IPC=IPC+4
       GO TO 999
 *NUM I
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csitgpl.F cernlib-2005.05.09/src/pawlib/comis/code/csitgpl.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csitgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csitgpl.F	2005-09-20 19:27:10.763521679 +0000
@@ -0,0 +1,32 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZU:  1.16/16 04/10/93  12.14.52  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+      INTEGER FUNCTION CSITGPL(IP)
+***------------------------------
+*   it is last routine from the tables-set.
+***-----------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cspnts.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab64.inc"
+      I=MHLOC(KSIDP+NWIDEN)
+      IQ(I)=0
+      IQ(I+1)=NCIDEN
+      DO 1 K=1,NWIDEN
+        IQ(I+KSIDP-1+K)=IDEN(K)
+   1  CONTINUE
+      CALL CSRTGPL(I)
+      IF(IP.EQ.0)THEN
+        IPGP=I
+      ELSE
+        IQ(IP)=I
+      ENDIF
+      CSITGP=I
+      END
+#endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/cskcal.F cernlib-2005.05.09/src/pawlib/comis/code/cskcal.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/cskcal.F	1996-12-05 09:50:39.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/cskcal.F	2005-09-20 19:27:10.763521679 +0000
@@ -31,6 +31,9 @@
 #include "comis/cstab.inc"
 #include "comis/csfres.inc"
 #include "comis/cssysd.inc"
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
       CHARACTER PRONAME*32
       INTEGER CSCALI
       DOUBLE PRECISION CSCALD
@@ -232,6 +235,34 @@
         I2=I2+KS
         I=I+1
  9203 CONTINUE
+#if defined(CERNLIB_QMLXIA64)
+*  Dynamic linker may give long addresses
+      IF (IFCS.EQ.-2)THEN
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ENDIF
+#else
 *      IT=IABS(ITYPGP)
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NOPAR,IF77PL(1))
@@ -245,6 +276,7 @@
       ENDIF
 *+SELF,IF=UNIX,IF=-SGI,IF=-IBMRT,IF=-DECS,IF=-HPUX,IF=-SUN,IF=-MSDOS.
 #endif
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_STDUNIX))
       I=1
       DO 9203 K=ITA-NPAR+1,ITA
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/cslink.F cernlib-2005.05.09/src/pawlib/comis/code/cslink.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/cslink.F	1996-02-26 17:16:17.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/cslink.F	2005-09-20 19:27:10.763521679 +0000
@@ -21,10 +21,15 @@
 #include "comis/cstab.inc"
 #include "comis/cspnts.inc"
 #include "comis/cslun.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       CHARACTER*(KLENID) FNNAME
       INTEGER CS_GET_FUNC
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      CHARACTER*(KLENID) FNNAME
+      INTEGER*8 CS_GET_FUNC
+#endif
          COMMON/CSGSCM/IGS,JGS,NGS,CSJUNK(3)
       IF(ISTLIB.EQ.0 .AND. ITBS.EQ.0)RETURN
    2  I=IPGP
@@ -60,12 +65,20 @@
 #if defined(CERNLIB_SHL)
           CALL CSGTIDP(I,FNNAME,NC)
           CALL CUTOL(FNNAME(1:NC))
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(FNNAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+          ENDIF
+#else
           IADGP=CS_GET_FUNC(FNNAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
           ENDIF
 #endif
+#endif
           IP=0
         ENDIF
       ENDIF
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csrtgpl.F cernlib-2005.05.09/src/pawlib/comis/code/csrtgpl.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csrtgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csrtgpl.F	2005-09-20 19:27:10.764521465 +0000
@@ -0,0 +1,31 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZ :  1.18/14 10/01/95  15.41.06  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+
+      SUBROUTINE CSRTGPL(I)
+***--------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab.inc"
+#include "comis/cstab64.inc"
+
+      IPIADGV = IPIADGV + 1
+      IF (IPIADGV .GT. MAXIAD64)  THEN
+        WRITE (*,'(2a,I4)') 'to much addresses for dynamik linking, ',
+     &                      'limit is ', MAXIAD64
+        WRITE (*,'(2a)') 'increase MAXIAD64 in cstab64.inc and ',
+     &                    'recompile COMIS'
+
+        STOP
+      END IF
+      IADGPLV(IPIADGV) = IADGPL
+      IADGP            = IPIADGV
+      CALL CCOPYA(IADGP,IQ(I+2),KSIDP-2)
+      END
+#endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/comis/cstab64.inc cernlib-2005.05.09/src/pawlib/comis/comis/cstab64.inc
--- cernlib-2005.05.09~/src/pawlib/comis/comis/cstab64.inc	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/comis/cstab64.inc	2005-09-20 19:27:10.775519109 +0000
@@ -0,0 +1,10 @@
+*
+*
+* cstab64.inc
+*
+      PARAMETER (MAXIAD64=100) !maximum number of shared objects
+      INTEGER*8 IADGPL,IADGPLV(MAXIAD64)
+      INTEGER   IADGPL1, IADGPL2
+      COMMON /CSTB64/ IADGPL,IADGPLV
+      COMMON /CSTB64I/ IPIADGV
+      EQUIVALENCE (IADGPL, IADGPL1)
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/ccopys.c	1997-09-02 15:50:38.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/ccopys.c	2005-09-20 19:27:10.776518895 +0000
@@ -33,11 +33,25 @@
 #else
 void ccopys_(ja,jb,nn)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *nn;
+{
+  int i,n; char *a,*b;
+  n=*nn; (long)a=*ja; (long)b=*jb;
+#else
      char **ja, **jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+#endif
   if ( a >= b )
      for ( i=0; i
 #endif
@@ -274,6 +285,7 @@
 #endif
          p->next = f->first_proc;
          f->first_proc = p;
+         if (debug_level > 0) printf("function pointer is: %p\n", p->funcptr);
          return (void *)(p->funcptr);
       }
      f = f->next;
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscald.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscald.c	2004-10-27 09:01:54.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscald.c	2005-09-20 19:27:10.776518895 +0000
@@ -32,8 +32,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 double cscald_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -46,10 +45,41 @@
     int CSCALD (name,n,p)
 #  endif
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscald_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+double cscald_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[15];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = *fptr + (unsigned long)jumpad_;
+   if ( *fptr > 0 ) ptr = 0;
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  double (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    double d;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscali.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscali.c	2004-10-22 12:42:40.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscali.c	2005-09-20 19:27:10.777518681 +0000
@@ -29,8 +29,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 int cscali_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -39,10 +38,41 @@
 #if defined(CERNLIB_QXCAPT)
 int type_of_call CSCALI (name,n,p)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscali_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+int cscali_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[15];
+{
+   int jumpad_();
+   int (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   if ( *fptr > 0 ) ptr = 0;
+   ptr += *fptr;
+   name = (int (*)())ptr;
+/*    printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  int (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    int i;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscalr.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscalr.c	2004-10-22 12:03:16.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscalr.c	2005-09-20 19:27:10.788516325 +0000
@@ -33,16 +33,12 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 float cscalr_ (name,n,p)
 #endif
-
 #if defined(CERNLIB_QXNO_SC)
 float cscalr (name,n,p)
 #endif
-
 #if defined(CERNLIB_QXCAPT)
 # if defined(CERNLIB_MSSTDCALL)
    float type_of_call CSCALR(name,n,p)
@@ -51,10 +47,39 @@
 # endif
 #endif
 
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscalr_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+float cscalr_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ int pin[15];
+{
+   int jumpad_();
+   float (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   ptr += *fptr;
+   name = (float (*)())ptr;
+/*    printf ("cscalr - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  float (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    float r;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cstrcmp.c	1997-09-02 15:50:44.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cstrcmp.c	2005-09-20 19:27:10.788516325 +0000
@@ -36,6 +36,27 @@
 #else
 int cstrcmp_(ja,na,jb,nb)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *na, *nb;
+{
+
+  int i,la,lb,k; char *a,*b;
+  if ( *na >= *nb )
+     {
+      (long)a=*ja; (long)b=*jb; la=*na; lb=*nb; k=1;
+      }
+  else
+    {
+      (long)a=*jb; (long)b=*ja; la=*nb; lb=*na; k=-1;
+     }
+#else
      char **ja, **jb;
      int *na, *nb;
 {
@@ -48,6 +69,7 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+#endif
   for ( i=0; i b[i]) ? k : -k ); }
diff -urNad cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_execute.c cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_execute.c
--- cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_execute.c	2001-09-18 13:41:35.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_execute.c	2005-09-20 19:27:10.789516111 +0000
@@ -245,7 +245,15 @@
 	char		ntname[MAX_NAME_LEN+6];
 	int		i, ierr, indx, itype, isize, ielem;
 	Int32 *		addr;
-	int		ibase[1], ioff, nuse;
+
+	/* LP64 compatibility:
+	   use static for ibase (at least) because its address is stored
+	   as Int32 in structure CWNBlock                                 
+	   static takes ibase from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int	ibase[1], ioff, nuse;
 	int		id = qe->id;
 	char *		path = qe->path;
 	char *		title;
@@ -871,8 +879,21 @@
 			if ( cmd->u.scan.pawpp ) {
 				char	buf[33];
 
+				/* for LP64 ABI matlab and matrow are 64 bit pointer, type is void*  
+				   but PCADDR.jmlab and PCADDR.jmrow are of type int
+				   see: c_pcaddr.h and qp_command.h
+				   it is related to CWNBlock -> see above (H. Vogt)*/
+
+#if defined(CERNLIB_QMLXIA64)
+				unsigned long long int	 myjmlab, myjmrow;
+				myjmlab = PCADDR.jmlab;
+				myjmrow = PCADDR.jmrow;
+				c->matlab = (TableCallBack) myjmlab;
+				c->matrow = (TableCallBack) myjmrow;
+#else
 				c->matlab = (TableCallBack) PCADDR.jmlab;
 				c->matrow = (TableCallBack) PCADDR.jmrow;
+#endif
 
 				qp_assert( qe->nexpr <= MAX_OUTSTR );
 
diff -urNad cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_hbook_if.c cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_hbook_if.c
--- cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_hbook_if.c	1999-07-05 15:43:35.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_hbook_if.c	2005-09-20 19:27:10.801513541 +0000
@@ -149,7 +149,15 @@
 	int	idn, idtmp;
 	int	icycle;
 	int	ierr;
-	int     izero = 0;
+
+	/* LP64 compatibility:
+	   use static for izero because its address is fetched by hbname_
+	   using locb and locb expects 32 bit addresses only.
+	   static takes izero from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int     izero = 0;
 
 	/* split string into  path, id and cycle */
 
diff -urNad cernlib-2005.05.09~/src/scripts/cernlib cernlib-2005.05.09/src/scripts/cernlib
--- cernlib-2005.05.09~/src/scripts/cernlib	2003-01-23 14:00:37.000000000 +0000
+++ cernlib-2005.05.09/src/scripts/cernlib	2005-09-20 19:27:10.801513541 +0000
@@ -115,6 +115,12 @@
 	       [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
 	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
 	       [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
+#                      add path to lib64 for x86_64 architecture
+	       if [ `uname -m` = x86_64 ] && [ -d /usr/X11R6/lib64 ] ; then
+		  SYSGDIRS="-L/usr/X11R6/lib -L/usr/X11R6/lib64"
+		  SYSGX11="$SYSGDIRS -lX11"
+		  SYSGMOTIF="$SYSGDIRS -lXm -lXt -lXp -lXext -lX11"
+	       fi
 	       ;;
       NeXT)    SYSGX11="/usr/lib/X11/libX11.r" ;
                SYSGMOTIF="-lXm -lXt /usr/lib/X11/libX11.r" ;;

cernlib_2005.05.09.dfsg-2.diff:

***** Error reading new file: [Errno 2] No such file or directory: 'cernlib_2005.05.09.dfsg-2.diff'

Index: 003-geant-dummy-functions.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/003-geant-dummy-functions.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 003-geant-dummy-functions.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 003-geant-dummy-functions.dpatch	9 Dec 2005 13:18:44 -0000	1.2
@@ -21,7 +21,7 @@
 diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gkine/dummy.c cernlib-2005.05.09.dfsg/src/geant321/gkine/dummy.c
 --- cernlib-2005.05.09.dfsg~/src/geant321/gkine/dummy.c	1970-01-01 00:00:00.000000000 +0000
 +++ cernlib-2005.05.09.dfsg/src/geant321/gkine/dummy.c	2005-11-29 16:55:14.274440352 +0000
-@@ -0,0 +1,204 @@
+@@ -0,0 +1,205 @@
 +/* Dummy file to avoid undefined symbols in the library */
 +/* Kevin McCarty, 14 Jan 2003 */
 +/* Last revised 22 November 2005 */
@@ -179,7 +179,8 @@
 + * shared libraries in the 12 official Debian architectures and determining
 + * the maximum size of each common block there. */
 +
-+#define COMMON(fortranname_, size) struct { char c[size]; } fortranname_
++#define COMMON(fortranname_, size) \
++        struct { char c[size]; } fortranname_ = { { 0, } }
 +
 +COMMON(fkadhn_, 1376);
 +COMMON(fkadhp_, 3712);


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cernlib.spec	2 Dec 2005 09:57:41 -0000	1.6
+++ cernlib.spec	9 Dec 2005 13:18:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       7%{?dist}
+Release:       8%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -62,7 +62,7 @@
 Source201: cernlib-deadpool.txt
 
 # debian patchset
-Patch0: cernlib_2005.05.09.dfsg-1.diff
+Patch0: cernlib_2005.05.09.dfsg-2.diff
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: 001-fix-missing-fluka.dpatch
@@ -84,6 +84,7 @@
 Patch112: 112-remove-nonexistent-prototypes-from-gen.h.dpatch
 # a workaround for cups. Applied in doubt.
 Patch113: 113-cups-postscript-fix.dpatch
+Patch114: 114-install-scripts-properly.dpatch
 Patch200: 200-comis-allow-special-chars-in-path.dpatch
 Patch201: 201-update-kuip-helper-apps.dpatch
 Patch202: 202-fix-includes-in-minuit-example.dpatch
@@ -97,8 +98,8 @@
 Patch208: 208-fix-redundant-packlib-dependencies.dpatch
 Patch209: 209-ignore-unneeded-headers-in-kmutil.c.dpatch
 Patch210: 210-improve-cfortran-header-files.dpatch
-# disabled in the debian patchset
-# 211-fix-comis-on-64-bit-arches.disabled
+# disabled in the debian patchset, enabled here
+Patch211: 211-fix-comis-on-64-bit-arches.dpatch
 Patch300: 300-skip-duplicate-lenocc.dpatch
 # Use another approach, see cernlib-enforce-FHS
 # Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -168,13 +169,13 @@
 
 # change the cernlib script such that -llapack -lblas is used instead of 
 # cernlib lapack
-# and also depend explicitely on libkernlib now that it is out of packlib
+# depend explicitely on libkernlib now that it is out of packlib
+# use lesstif-pawlib and lesstif-packlib
 # the modified script is renamed cernlib-static later and the debian cernlib
 # script is used instead.
 Patch1200: cernlib-cernlib_kernlib.patch
 # don't stop if the CERN variable isn't defined
 Patch1201: cernlib-gxint-script.diff
-Patch1202: cernlib-install_scripts.patch
 Patch1203: cernlib-hwuli2_use_dimag.diff 
 Patch1204: cernlib-hwhiga_use_dimag.diff
 Patch1205: cernlib-gfortran.diff 
@@ -307,6 +308,7 @@
 %patch -P 111 -p1
 %patch -P 112 -p1
 %patch -P 113 -p1
+%patch -P 114 -p1
 %patch -P 200 -p1
 %patch -P 201 -p1
 %patch -P 202 -p1
@@ -318,7 +320,7 @@
 %patch -P 208 -p1
 %patch -P 209 -p1
 %patch -P 210 -p1
-#%patch -P 211 -p1
+%patch -P 211 -p1
 %patch -P 300 -p1
 #%patch -P 301 -p1
 #%patch -P 302 -p1
@@ -447,7 +449,6 @@
 
 %patch -P 1200
 %patch -P 1201
-%patch -P 1202
 %patch -P 1203
 %patch -P 1204
 # use gfortran
@@ -688,6 +689,10 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8
+- use new debian patchset
+- enable 64 bit fixes patch
+
 * Fri Dec  2 2005 Patrice Dumas  - 2005-7
 - use updated beta debian patchset
 - remove the BSD in the licence because there is no library nor binary


--- cernlib-install_scripts.patch DELETED ---


--- cernlib_2005.05.09.dfsg-1.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 15:53:18 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Fri,  9 Dec 2005 10:53:18 -0500
Subject: rpms/digikam/devel digikam.spec,1.4,1.5
Message-ID: <200512091553.jB9Frm50024284@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	digikam.spec 
Log Message:
- Work around for modular X.Org paths



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- digikam.spec	1 Dec 2005 15:20:30 -0000	1.4
+++ digikam.spec	9 Dec 2005 15:53:16 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -43,6 +43,8 @@
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
+	--with-extra-includes=/usr/share/X11/ \
+	--with-extra-libs=/usr/share/X11/ \
 	--disable-rpath \
 	--disable-debug
 make %{?_smp_mflags}
@@ -115,6 +117,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Add description about digikamimageplugins and kipi-plugins
 - Remove 64 bit patch, applied upstream



From fedora-extras-commits at redhat.com  Fri Dec  9 15:57:08 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 10:57:08 -0500
Subject: rpms/cernlib/FC-3 001-fix-missing-fluka.dpatch, NONE,
 1.1 002-fix-missing-mclibs.dpatch, NONE,
 1.1 003-geant-dummy-functions.dpatch, NONE,
 1.1 100-fix-isajet-manual-corruption.dpatch, NONE,
 1.1 101-undefine-PPC.dpatch, NONE, 1.1 102-dont-optimize-some-code.dpatch,
 NONE, 1.1 103-ignore-overly-long-macro-in-gen.h.dpatch, NONE,
 1.1 104-fix-undefined-insertchar-warning.dpatch, NONE,
 1.1 105-fix-obsolete-xmfontlistcreate-warning.dpatch, NONE,
 1.1 106-fix-paw++-menus-in-lesstif.dpatch, NONE,
 1.1 107-define-strdup-macro-safely.dpatch, NONE,
 1.1 108-quote-protect-comis-script.dpatch, NONE,
 1.1 110-ignore-included-lapack-rule.dpatch, NONE,
 1.1 111-fix-kuesvr-install-location.dpatch, NONE,
 1.1 112-remove-nonexistent-prototypes-from-gen.h.dpatch, NONE,
 1.1 113-cups-postscript-fix.dpatch, NONE,
 1.1 114-install-scripts-properly.dpatch, NONE,
 1.1 200-comis-allow-special-chars-in-path.dpatch, NONE,
 1.1 201-update-kuip-helper-apps.dpatch, NONE,
 1.1 202-fix-includes-in-minuit-example.dpatch, NONE,
 1.1 203-compile-geant-wi!
 th-ertrak.dpatch, NONE, 1.1 204-compile-isajet-with-isasrt.dpatch, NONE,
 1.1 205-max-path-length-to-256.dpatch, NONE,
 1.1 206-herwig-uses-DBLE-not-REAL.dpatch, NONE,
 1.1 207-compile-temp-libs-with-fPIC.dpatch, NONE,
 1.1 208-fix-redundant-packlib-dependencies.dpatch, NONE,
 1.1 209-ignore-unneeded-headers-in-kmutil.c.dpatch, NONE,
 1.1 210-improve-cfortran-header-files.dpatch, NONE,
 1.1 211-fix-comis-on-64-bit-arches.dpatch, NONE,
 1.1 300-skip-duplicate-lenocc.dpatch, NONE,
 1.1 303-shadow-passwords-supported.dpatch, NONE,
 1.1 304-update-Imake-config-files.dpatch, NONE,
 1.1 305-use-POWERPC-not-PPC-as-test.dpatch, NONE,
 1.1 306-patch-assert.h-for-makedepend.dpatch, NONE,
 1.1 307-use-canonical-cfortran.dpatch, NONE,
 1.1 308-use-canonical-cfortran-location.dpatch, NONE,
 1.1 309-define-dummy-herwig-routines.dpatch, NONE,
 1.1 310-define-dummy-fowl-routines.dpatch, NONE,
 1.1 311-skip-duplicate-qnext.dpatch, NONE,
 1.1 312-skip-duplicate-gamma.dpatch, NONE,
 1.1 313-comis-preserves-filename-case.dpatch, NONE, 1.1 314-permit-usi!
 ng-regcomp-for-re_comp.dpatch,NONE,1.1 315-fixes-for-MacOSX.dp!
 atch,N
Message-ID: <200512091557.jB9Fv888024440@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	.cvsignore cernlib-deadpool.txt cernlib.README cernlib.spec 
	paw.README sources 
Added Files:
	001-fix-missing-fluka.dpatch 002-fix-missing-mclibs.dpatch 
	003-geant-dummy-functions.dpatch 
	100-fix-isajet-manual-corruption.dpatch 
	101-undefine-PPC.dpatch 102-dont-optimize-some-code.dpatch 
	103-ignore-overly-long-macro-in-gen.h.dpatch 
	104-fix-undefined-insertchar-warning.dpatch 
	105-fix-obsolete-xmfontlistcreate-warning.dpatch 
	106-fix-paw++-menus-in-lesstif.dpatch 
	107-define-strdup-macro-safely.dpatch 
	108-quote-protect-comis-script.dpatch 
	110-ignore-included-lapack-rule.dpatch 
	111-fix-kuesvr-install-location.dpatch 
	112-remove-nonexistent-prototypes-from-gen.h.dpatch 
	113-cups-postscript-fix.dpatch 
	114-install-scripts-properly.dpatch 
	200-comis-allow-special-chars-in-path.dpatch 
	201-update-kuip-helper-apps.dpatch 
	202-fix-includes-in-minuit-example.dpatch 
	203-compile-geant-with-ertrak.dpatch 
	204-compile-isajet-with-isasrt.dpatch 
	205-max-path-length-to-256.dpatch 
	206-herwig-uses-DBLE-not-REAL.dpatch 
	207-compile-temp-libs-with-fPIC.dpatch 
	208-fix-redundant-packlib-dependencies.dpatch 
	209-ignore-unneeded-headers-in-kmutil.c.dpatch 
	210-improve-cfortran-header-files.dpatch 
	211-fix-comis-on-64-bit-arches.dpatch 
	300-skip-duplicate-lenocc.dpatch 
	303-shadow-passwords-supported.dpatch 
	304-update-Imake-config-files.dpatch 
	305-use-POWERPC-not-PPC-as-test.dpatch 
	306-patch-assert.h-for-makedepend.dpatch 
	307-use-canonical-cfortran.dpatch 
	308-use-canonical-cfortran-location.dpatch 
	309-define-dummy-herwig-routines.dpatch 
	310-define-dummy-fowl-routines.dpatch 
	311-skip-duplicate-qnext.dpatch 
	312-skip-duplicate-gamma.dpatch 
	313-comis-preserves-filename-case.dpatch 
	314-permit-using-regcomp-for-re_comp.dpatch 
	315-fixes-for-MacOSX.dpatch 
	318-additional-gcc-3.4-fixes.dpatch 
	700-remove-kernlib-from-packlib-Imakefile.dpatch 
	701-patch-hbook-comis-Imakefiles.dpatch 
	702-patch-Imakefiles-for-packlib-mathlib.dpatch 
	703-patch-code_motif-packlib-Imakefiles.dpatch 
	704-patch-code_kuip-higzcc-Imakefiles.dpatch 
	705-patch-paw_motif-paw-Imakefiles.dpatch 
	800-implement-shared-library-rules-in-Imake.dpatch 
	801-non-optimized-rule-uses-fPIC-g.dpatch 
	802-create-shared-libraries.dpatch 
	803-link-binaries-dynamically.dpatch 
	804-workaround-for-comis-mdpool-struct-location.dpatch 
	805-expunge-missing-mathlib-kernlib-symbols.dpatch 
	806-bump-mathlib-and-dependents-sonames.dpatch 
	cernlib-enforce-FHS.diff cernlib-gxint-script.diff 
	cernlib-hwhiga_use_dimag.diff cernlib-hwuli2_use_dimag.diff 
	cernlib_2005.05.09.dfsg-2.diff 
Removed Files:
	001-delete-pythia-refs 003-enforce-FHS 
	005-enable-shadow-passwd 007-delete-fluka-refs 008-undef-PPC 
	010-comis-allow-special-chars-in-path 
	012-add-no-optimization-macro 
	013-fix-paw-imakefile-special-rules 
	014-fix-herwig-imakefile-special-rules 015-fix-optimization 
	018-move-kernlib-to-toplevel 028-fix-isajet-docs 
	030-filename-length-to-256 033-fix-undefined-insertchar 
	035-do-not-use-XmFontListCreate 038-fix-strndup-macro-problem 
	039-use-DBLE-not-REAL 044-fix-strdup-redefinition 
	045-compile-with-isasrt 047-fix-paw++-menus 
	cernlib-XmDrawShadow-no-prototype.patch 
	cernlib-bimsel-nodouble-save.diff cernlib-cernlib.patch 
	cernlib-hwhiga_use_aimag.diff cernlib-hwuli2_use_aimag.diff 
	cernlib-install_scripts.patch cernlib-static-tcpaw.diff 
	cernlib_2004.11.04-3.diff gxint-script.diff 
Log Message:
- update with newer debian patchset for cernlib, fix licence issues
- remove the BSD in the licence because there is no library nor binary
  under a BSD licence and someone could get the idea that there is 
  some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
  because of cfortran
- don't use the include.tar.gz source, instead get include files from
  the source files
- build shared libraries
- simplify the scripts modifications

sync with devel, except 64 bit fixes



--- NEW FILE 001-fix-missing-fluka.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 001-fix-missing-fluka.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Deal with FLUKA code having been purged from Debian's Cernlib source.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	1998-03-05 11:20:07.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-11-23 17:41:29.886310858 +0000
@@ -4,10 +4,11 @@
 
 AllTarget(geant321)
 
-LIBDIRS= block cdf cgpack fiface fluka gbase gcons gdraw \ @@\
+/* Fluka removed from Debian source package for copyright reasons. */
+LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
          geocad ggeom gheisha ghits ghrout ghutils giface \ @@\
 	 giopa gkine gphys gscan gstrag gtrak guser gxint \ @@\
-	 miface miguti neutron peanut
+	 miface miguti neutron
 
 
 SUBDIRS= $(LIBDIRS) data examples gxuser geant321
@@ -25,9 +26,12 @@
 InstallLibrary(geant321,$(CERN_LIBDIR))
 InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
 
+/* Fluka removed from Debian source package for copyright reasons. */
+/*
 SubdirDataFile($(LIBRARY),flukaaf.dat,data)
 
 InstallNonExecFileTarget(install.lib,flukaaf.dat,$(CERN_LIBDIR))
+*/
 
 /* This will install the correct link for xsneut95.dat at CERN;
  * If you want a local copy of the file, just copy it there
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/miface/Imakefile cernlib-2005.05.09.dfsg/src/geant321/miface/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/miface/Imakefile	1995-10-24 10:21:53.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/miface/Imakefile	2005-11-23 17:41:52.230563421 +0000
@@ -1,5 +1,5 @@
 SRCS_F= \ @@\
-	 gfmdis.F gfmfin.F gmicap.F gmiset.F gmorin.F gmplxs.F gmxsec.F
+	                   gmicap.F gmiset.F gmorin.F gmplxs.F gmxsec.F
 
 #ifdef CERNLIB_QMVAOS
  FORTRANSAVEOPTION=FortranSaveFlags


--- NEW FILE 002-fix-missing-mclibs.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 002-fix-missing-mclibs.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Deal with several of the MC libs having to be purged from source.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/Imakefile /tmp/dpep.pmIy0R/cernlib-2005.05.09/src/mclibs/Imakefile
--- cernlib-2005.05.09/src/mclibs/Imakefile	1999-05-20 09:30:20.000000000 -0400
+++ /tmp/dpep.pmIy0R/cernlib-2005.05.09/src/mclibs/Imakefile	2005-06-08 15:39:37.783591646 -0400
@@ -2,9 +2,11 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-
-LIBDIRS= ariadne cojets eurodec herwig fritiof \ @@\
-	 isajet jetset lepto63 pdf photos pythia
+/* Pythia and Jetset are not under GPL, so we must remove references
+   to them and their dependents.  They have already been purged from
+   Debianized source code.  Also, re-order libs so that dependent ones
+   come after dependees. */
+LIBDIRS= cojets eurodec pdf photos herwig isajet
 
 SUBDIRS = $(LIBDIRS)
 
@@ -12,8 +14,8 @@
 
 InstallLibSubdirs($(LIBDIRS))
 
-INCLUDEDIRS= ariadne cojets eurodec herwig fritiof \ @@\
-	 isajet jetset lepto63 pdf pythia
+/* Again, purge Pythia, Jetset and dependents. */
+INCLUDEDIRS= cojets eurodec herwig isajet pdf
 
 InstallIncludeSubdirs($(INCLUDEDIRS))
 


--- NEW FILE 003-geant-dummy-functions.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 003-geant-dummy-functions.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add stub Geant functions to avoid missing symbols due to Fluka removal.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gkine/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gkine/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/gkine/Imakefile	1996-03-28 16:21:20.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/gkine/Imakefile	2005-11-29 15:59:27.035065621 +0000
@@ -1,6 +1,9 @@
 SRCS_F= gfkine.F gfvert.F gludky.F glund.F glundi.F gpkine.F \ @@\
 	gpkinx.F gpvert.F gskine.F gskinu.F gsvert.F gsveru.F gtau.F
 
+/* Dummy file containing stubs for deleted Fluka and mclibs functions: */
+SRCS_C= dummy.c
+
 #ifdef CERNLIB_QMVAOS
  FORTRANSAVEOPTION=FortranSaveFlags
  FORTRANOPTIONS = -math_library accurate $(FORTRANSAVEOPTION)
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gkine/dummy.c cernlib-2005.05.09.dfsg/src/geant321/gkine/dummy.c
--- cernlib-2005.05.09.dfsg~/src/geant321/gkine/dummy.c	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/gkine/dummy.c	2005-11-29 16:55:14.274440352 +0000
@@ -0,0 +1,205 @@
+/* Dummy file to avoid undefined symbols in the library */
+/* Kevin McCarty, 14 Jan 2003 */
+/* Last revised 22 November 2005 */
+
+#include 
+#include 
+#include 
+
+/* Want the dummy functions to be weakly defined so they may be overridden
+ * without error. */
+
+#define kludge(x)    #x
+#define stringify(x) kludge(x)
+#define underline(x) __ ## x
+
+#define DUMMY(domain, UPPERNAME, fortranname_, returntype) \
+returntype fortranname_() {print_dummy(#domain,#UPPERNAME);}
+
+#define WEAKDUMMY(domain, UPPERNAME, fortranname_, returntype) \
+static returntype underline(fortranname_)() {print_dummy(#domain,#UPPERNAME);} \
+void fortranname_() \
+	__attribute__ ((weak, alias (stringify(underline(fortranname_))) ))
+
+static void print_dummy(const char *domain, const char *function)
+{
+  fprintf(stderr, "Geant321: Now in dummy %s routine.\n", function);
+  fprintf(stderr,
+"If you see this message, you are presumably trying to call (possibly\n"
+"indirectly) the %s routine");
+
+  if (strcmp(domain, "Jetset") == 0)
+    fprintf(stderr,
+" in the Jetset library.\n"
+#if defined (CERNLIB_DEBIAN)
+"To obtain the Jetset library, please see the file\n"
+"/usr/share/doc/geant321/README.Debian\n"
+#endif
+    );
+
+  else if (strcmp(domain, "Fluka") == 0)
+    fprintf(stderr,
+" in the FLUKA library.\n"
+"FLUKA is unfortunately not available in this distribution of Cernlib for\n"
+"licensing reasons"
+#if defined (CERNLIB_DEBIAN)
+"; please see the file /usr/share/doc/geant321/README.Debian\n"
+"for details.\n"
+#else
+".\n"
+#endif
+    );
+  
+  else if (strcmp(domain, "User") == 0)
+    fprintf(stderr, ".  This routine is not built into Geant;\n"
+"you must write code for it yourself.  Please see the documentation"
+#if defined (CERNLIB_DEBIAN)
+"\n(for instance in the geant321-doc package)"
+#endif
+".\n");
+  
+  exit(EXIT_FAILURE);
+}
+
+/* Functions that the user is supposed to set up */
+WEAKDUMMY(User, UGINIT, uginit_, void);
+WEAKDUMMY(User, UGLAST, uglast_, void);
+
+/* Functions in the non-free Jetset library, which can be used
+ * if it's installed */
+WEAKDUMMY(Jetset, LU1ENT, lu1ent_, void);
+WEAKDUMMY(Jetset, LUCOMP, lucomp_, int);
+WEAKDUMMY(Jetset, LUEEVT, lueevt_, void);
+WEAKDUMMY(Jetset, LUEXEC, luexec_, void);
+
+/* N.B.  When the libgeant321 dynamic soversion is bumped, at the same time
+ * everything below this point except the dummy FLDIST and FLINIT subroutines
+ * may be deleted; those should be turned into weak aliases in case anyone
+ * wants to create a separate GEANT-FLUKA library. */
+
+/* From src/geant321/fluka (not the complete set of functions, just
+ * those referenced from external files) */
+WEAKDUMMY(Fluka, DOST,   dost_,   double);
+WEAKDUMMY(Fluka, EEXLVL, eexlvl_, void);
+WEAKDUMMY(Fluka, EVENTV, eventv_, void);
+WEAKDUMMY(Fluka, EVEVAP, evevap_, void);
+WEAKDUMMY(Fluka, EVVINI, evvini_, void);
+WEAKDUMMY(Fluka, FKENER, fkener_, double);
+WEAKDUMMY(Fluka, FKZERO, fkzero_, void);
+WEAKDUMMY(Fluka, NIZLNW, nizlnw_, void);
+WEAKDUMMY(Fluka, NUCREL, nucrel_, void);
+WEAKDUMMY(Fluka, RACO,   raco_,   void);
+WEAKDUMMY(Fluka, SAMCST, samcst_, void);
+WEAKDUMMY(Fluka, SIGEL,  sigel_,  void);
+WEAKDUMMY(Fluka, SITSAO, sitsao_, double);
+
+/* The following dummy functions are added due to the removal
+ * of the corresponding code from Geant (it is also part of FLUKA).
+ * We are constrained to keep the ABI for the dynamic library, so
+ * these dummy functions must be kept until next time the libgeant321
+ * soversion is changed. */
+
+/* From src/geant321/fiface */
+DUMMY(Fluka, FLDIST, fldist_, void);
+DUMMY(Fluka, FLINIT, flinit_, void);
+DUMMY(Fluka, FLUFIN, flufin_, void);
+
+/* From src/geant321/miface */
+DUMMY(Fluka, GFMFIN, gfmfin_, void);
+DUMMY(Fluka, GFMDIS, gfmdis_, void);
+
+/* From src/geant321/block */
+DUMMY(Fluka, FDEVAP, fdevap_, void);
+DUMMY(Fluka, FDNOPT, fdnopt_, void);
+DUMMY(Fluka, FDPREE, fdpree_, void);
+DUMMY(Fluka, FLKDT1, flkdt1_, void);
+DUMMY(Fluka, FLKDT2, flkdt2_, void);
+DUMMY(Fluka, FLKDT3, flkdt3_, void);
+DUMMY(Fluka, FLKDT4, flkdt4_, void);
+DUMMY(Fluka, FLKDT5, flkdt5_, void);
+DUMMY(Fluka, FLKDT6, flkdt6_, void);
+DUMMY(Fluka, FLKDT7, flkdt7_, void);
+
+/* From src/geant321/peanut */
+DUMMY(Fluka, BIMNXT, bimnxt_, void);   /* alternate entry to BIMSEL */
+DUMMY(Fluka, BIMSEL, bimsel_, void);
+DUMMY(Fluka, COSLEG, cosleg_, double);
+DUMMY(Fluka, FEKFNC, fekfnc_, double);
+DUMMY(Fluka, FPFRNC, fpfrnc_, double);
+DUMMY(Fluka, FRADNC, fradnc_, double);
+DUMMY(Fluka, FRHINC, frhinc_, double);
+DUMMY(Fluka, FRHONC, frhonc_, double);
+DUMMY(Fluka, NCLVFX, nclvfx_, double); /* alternate entry to PFNCLV */
+DUMMY(Fluka, NCLVIN, nclvin_, void);
+DUMMY(Fluka, NCLVST, nclvst_, void);
+DUMMY(Fluka, NUCNUC, nucnuc_, void);
+DUMMY(Fluka, NWINXT, nwinxt_, void);   /* alternate entry to NWISEL */
+DUMMY(Fluka, NWISEL, nwisel_, void);
+DUMMY(Fluka, PEANUT, peanut_, void);
+DUMMY(Fluka, PFNCLV, pfnclv_, double);
+DUMMY(Fluka, PHDSET, phdset_, void);
+DUMMY(Fluka, PHDWLL, phdwll_, void);
+DUMMY(Fluka, PIOABS, pioabs_, void);
+DUMMY(Fluka, PREPRE, prepre_, void);
+DUMMY(Fluka, RSCOMP, rscomp_, void);   /* alternate entry to SBCOMP */
+DUMMY(Fluka, RSTNXT, rstnxt_, void);   /* alternate entry to RSTSEL */
+DUMMY(Fluka, RSTSEL, rstsel_, void);
+DUMMY(Fluka, SBCOMP, sbcomp_, void);
+DUMMY(Fluka, SIGFER, sigfer_, void);
+DUMMY(Fluka, UMOFIN, umofin_, void);
+DUMMY(Fluka, XINNEU, xinneu_, double);
+DUMMY(Fluka, XINPRO, xinpro_, double);
+
+/* The following dummy common blocks are added for the same reason.
+ * The number of bytes required was determined by inspecting the existing
+ * shared libraries in the 12 official Debian architectures and determining
+ * the maximum size of each common block there. */
+
+#define COMMON(fortranname_, size) \
+        struct { char c[size]; } fortranname_ = { { 0, } }
+
+COMMON(fkadhn_, 1376);
+COMMON(fkadhp_, 3712);
+COMMON(fkbala_,  288);
+COMMON(fkcd97_, 1152);
+COMMON(fkchpa_, 1472);
+COMMON(fkchpr_,  576);
+COMMON(fkcmcy_,  176);
+COMMON(fkcomc_, 7424);
+COMMON(fkcosp_,   64);
+COMMON(fkdecc_,10816);
+COMMON(fkdech_, 4328);
+COMMON(fkenco_,   16);
+COMMON(fkeva0_,60960);
+COMMON(fkfinu_,52000);
+COMMON(fkhadf_,  352);
+COMMON(fkheac_,   96);
+COMMON(fkheav_, 5408);
+COMMON(fkhet7_,   64);
+COMMON(fkhetp_,   32);
+COMMON(fkhigf_, 1632);
+COMMON(fkidgb_,   16);
+COMMON(fkinpf_,   32);
+COMMON(fkisot_,10208);
+COMMON(fkmapa_, 5824);
+COMMON(fknegx_,  128);
+COMMON(fknuct_,   16);
+COMMON(fknuda_, 1248);
+COMMON(fknuge_, 1120);
+COMMON(fknugi_,26944);
+COMMON(fknuii_, 1888);
+COMMON(fknule_,18048);
+COMMON(fknupw_,   32);
+COMMON(fkpapr_, 2400);
+COMMON(fkpare_,  256);
+COMMON(fkparn_, 7296);
+COMMON(fkpart_, 9696);
+COMMON(fkploc_, 2864);
+COMMON(fkquar_,  832);
+COMMON(fkreac_,50976);
+COMMON(fkredv_, 2368);
+COMMON(fkresn_,  256);
+COMMON(fkrun_,    32);
+COMMON(fkslop_,  608);
+COMMON(fkxsep_,13600);
+


--- NEW FILE 100-fix-isajet-manual-corruption.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 100-fix-isajet-manual-corruption.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix corruption in LaTeX source to the Isajet manual.
## DP: (Replacement text obtained from a PS version of the manual on the web.)

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc /tmp/dpep.tlmeFD/cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc
--- cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc	2001-10-08 10:03:08.000000000 -0400
+++ /tmp/dpep.tlmeFD/cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc	2005-06-08 16:12:37.814042242 -0400
@@ -122,7 +122,7 @@
 $W/Z$ decay. These were calculated using FORM 1.1 by J.~Vermaseren. The
 process $g + t \to W + b$ is {\it not} included. Both $g + b \to W^- +
 t$ and $g + \bar t \to W^- + \bar b$ of course give the same $W^- + t
-+\BARB_FINALSTATEAFTERQCDEVOLUTION
++\bar b$ final state after QCD evolution.  While the latter process is
 needed to describe the $m_t = 0$(!) mass singularity for $q_t \gg
 m_t$, it has a pole in the physical region at low $q_t$ from on-shell
 $t \to W + b$ decays. There is no obvious way to avoid this without


--- NEW FILE 101-undefine-PPC.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 101-undefine-PPC.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: If "PPC" is defined by compiler, undefine where it clashes with a
## DP: local variable.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F /tmp/dpep.aeMGeJ/cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F
--- cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F	1996-01-11 09:14:33.000000000 -0500
+++ /tmp/dpep.aeMGeJ/cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F	2005-06-08 17:00:48.403200778 -0400
@@ -37,6 +37,15 @@
 #include "cojets/zpar2.inc"
 #include "cojets/zwpar.inc"
 #include "cojets/weakon.inc"
+
+C     The following is necessary since PPC is defined in g77 on
+C     the powerpc architecture, but it's also a variable in this
+C     file.
+C       -- Kevin McCarty
+#ifdef PPC
+#undef PPC
+#endif
+
       DIMENSION QP(4),QM(4),QK(4),QE(4),QN(4)
       DIMENSION COEF(2,2),QQV(2)
 C


--- NEW FILE 102-dont-optimize-some-code.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 102-dont-optimize-some-code.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't allow the compiler to optimize several files that cause trouble
## DP: (either compiler crash or broken code generation).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	1996-06-12 11:25:38.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-09 11:14:52.470486750 -0400
@@ -19,6 +19,11 @@
 SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
 	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F rgmlt.F rkstp64.F \ @@\
 	simps64.F triint64.F 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(rderiv,rderiv,-O0,NullParameter)
+SpecialFortranLibObjectRule(rfrdh1,rfrdh1,-O0,NullParameter)
+#endif
 #else
 SRCS_F:= $(SRCS_F) cgauss128.F cauchy.F cauchy128.F deqbs128.F deqmr128.F \ @@\
 	deriv128.F minfc128.F rfrdh128.F rgmlt128.F rkstp128.F simps128.F \ @@\
@@ -37,6 +42,16 @@
 IMAKE_DEFINES=-DFortranDoesCpp=NO
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(rknysd,rknysd,-O0,NullParameter)
+SpecialFortranLibObjectRule(old506,old506,-O0,NullParameter)
+
+/* -O1 -fno-automatic optimization creates wrong code in g77 2.95, 3.3, 3.4
+   due to x86 chip extended precision, cf. http://bugs.debian.org/290438 */
+SpecialFortranLibObjectRule(radmul,radmul,-O0,NullParameter)
+#endif
+
 FORTRANSAVEOPTION = FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/mathlib/gen/e/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/e/Imakefile	1996-05-01 09:21:54.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile	2005-06-09 11:16:07.058731880 -0400
@@ -12,6 +12,11 @@
 
 #if defined(CERNLIB_DOUBLE)
 SRCS_F:= $(SRCS_F) chsum.F dchebn.F rchecf.F rcspln.F
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(rchecf,rchecf,-O0,NullParameter)
+SpecialFortranLibObjectRule(rcspln,rcspln,-O0,NullParameter)
+#endif
 #else
 SRCS_F:= $(SRCS_F) chsum128.F rchebn.F rcspln128.F
 #endif
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile	1996-05-06 11:19:44.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile	2005-06-09 11:16:58.039286811 -0400
@@ -4,4 +4,8 @@
 
 FORTRANSAVEOPTION = FortranSaveFlags
 
+#if defined(CERNLIB_LINUX)
+SpecialFortranLibObjectRule(isawev,isawev,-O0,NullParameter)
+#endif
+
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile
--- cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile	2000-04-19 09:51:56.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile	2005-06-09 11:22:02.812494322 -0400
@@ -97,4 +97,10 @@
 #ifdef CERNLIB_HPUX
 FORTRANOPTIONS += '-WF,-P'
 #endif
+
+#if defined(CERNLIB_LINUX)
+/* -O2 optimization on ARM breaks in g77 3.3.3 */
+SpecialFortranLibObjectRule(structm,structm,-O0,NullParameter)
+#endif
+
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile	1996-06-10 06:20:57.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile	2005-06-09 11:09:34.621022534 -0400
@@ -14,6 +14,11 @@
 FDEBUGFLAGS=+O1
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(muller,muller,-O0,NullParameter)
+#endif
+
 FORTRANSAVEOPTION = FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile	1996-06-12 06:04:36.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile	2005-06-09 11:10:40.068274255 -0400
@@ -4,6 +4,11 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(ranget,ranget,-O0,NullParameter)
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2001-09-14 09:08:51.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-09 11:19:57.756983183 -0400
@@ -101,4 +101,10 @@
 SpecialFortranLibObjectRule(cskide,cskide,-O0,NullParameter)
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* optimizing this file, even at -O1, causes runtime breakage with g77 3.3
+   cf. http://bugs.debian.org/233689 */
+SpecialFortranLibObjectRule(csrfun,csrfun,-O0,NullParameter)
+#endif
+
 SubdirLibraryTarget(NullParameter,NullParameter)


--- NEW FILE 103-ignore-overly-long-macro-in-gen.h.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 103-ignore-overly-long-macro-in-gen.h.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Comment out macro in cfortran/gen.h with too many arguments for cfortran
## DP: to accept.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/gen.h /tmp/dpep.weQ8Dc/cernlib-2005.05.09/src/cfortran/gen.h
--- cernlib-2005.05.09/src/cfortran/gen.h	2000-06-23 06:13:58.000000000 -0400
+++ /tmp/dpep.weQ8Dc/cernlib-2005.05.09/src/cfortran/gen.h	2005-06-09 11:43:16.729842789 -0400
@@ -1123,10 +1123,10 @@
 
 PROTOCCALLSFSUB3(NAMEZB,namezb,FLOAT,INT,INT)
 #define NAMEZB(A1,A2,A3)  CCALLSFSUB3(NAMEZB,namezb,FLOAT,INT,INT,A1,A2,A3)
-
+/*
 PROTOCCALLSFSUB29(NEWPTQ,newptq,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,PDOUBLE,DOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PINT,PINT)
 #define NEWPTQ(A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11,A12,A13,A14,A15,A16,A17,A18,A19,A20,A21,A22,A23,A24,A25,A26,A27,A28,A29)  CCALLSFSUB29(NEWPTQ,newptq,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,PDOUBLE,DOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PINT,PINT,A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11,A12,A13,A14,A15,A16,A17,A18,A19,A20,A21,A22,A23,A24,A25,A26,A27,A28,A29)
-
+*/
 PROTOCCALLSFSUB9(NEWRO,newro,INT,INT,INT,FLOAT,PFLOAT,FLOATV,FLOATV,FLOATV,FLOATV)
 #define NEWRO(A1,A2,A3,A4,A5,A6,A7,A8,A9)  CCALLSFSUB9(NEWRO,newro,INT,INT,INT,FLOAT,PFLOAT,FLOATV,FLOATV,FLOATV,FLOATV,A1,A2,A3,A4,A5,A6,A7,A8,A9)
 


--- NEW FILE 104-fix-undefined-insertchar-warning.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 104-fix-undefined-insertchar-warning.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Correct Lesstif warning about undefined InsertChar.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c /tmp/dpep.XJ5w0K/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c
--- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c	1996-03-08 10:33:04.000000000 -0500
+++ /tmp/dpep.XJ5w0K/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c	2005-06-09 14:36:52.509109480 -0400
@@ -573,7 +573,7 @@
                         EditMenu,
                         RES_CONVERT( XmNlabelString, "Copy" ),
                         RES_CONVERT( XmNmnemonic, "C" ),
-                        XmNaccelerator, "CtrlInsertChar",
+                        XmNaccelerator, "CtrlInsert",
                         RES_CONVERT( XmNacceleratorText, "Ctrl+Ins" ),
                         NULL );
         UxPutContext( copyButton, (char *) UxKuipIoContext );
@@ -585,7 +585,7 @@
                         EditMenu,
                         RES_CONVERT( XmNlabelString, "Paste" ),
                         RES_CONVERT( XmNmnemonic, "P" ),
-                        XmNaccelerator, "ShiftInsertChar",
+                        XmNaccelerator, "ShiftInsert",
                         RES_CONVERT( XmNacceleratorText, "Shift+Ins" ),
                         NULL );
         UxPutContext( pasteButton, (char *) UxKuipIoContext );


--- NEW FILE 105-fix-obsolete-xmfontlistcreate-warning.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 105-fix-obsolete-xmfontlistcreate-warning.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix Lesstif warning about use of obsolete XmFontListCreate() function

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	1996-10-24 08:13:41.000000000 -0400
+++ /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	2005-06-09 14:39:00.831812710 -0400
@@ -776,6 +776,7 @@
  ***********************************************************************/
 static void init_data ()
 {
+  /* This function edited not to use obsolete function XmFontListCreate() */
     int k;
 
     km_charset = XmSTRING_DEFAULT_CHARSET;
@@ -792,8 +793,11 @@
        if (help_font_struct == NULL)
            printf ("%s Warning: Font loaded for HELP (%s) is NULL \n",
                    main_prompt, srec.Help_font);
-       else
-           help_font = XmFontListCreate (help_font_struct,km_charset);
+       else {
+	   XmFontListEntry entry = XmFontListEntryCreate(
+	       km_charset, XmFONT_IS_FONT, (XtPointer)help_font_struct );
+           help_font = XmFontListAppendEntry( NULL, entry );
+       }
    }
 
    /*
diff -urNad cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c
--- cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c	2000-10-03 10:11:22.000000000 -0400
+++ /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c	2005-06-09 14:39:00.803818666 -0400
@@ -215,18 +215,22 @@
  *****************************************************************************/
 static void MajButton(Widget w, Widget font,Widget pre,int postab)
 {
+   /* this function edited not to use obsolete function XmFontListCreate() */
    XmFontList police;
+   XmFontListEntry entry;
    XFontStruct *info_police;
    char strlabel[20];
    int prenum,policenum;
-
+   
    XtVaGetValues(pre,XmNuserData,&prenum,NULL);
    prenum--;
    XtVaGetValues(font,XmNuserData,&policenum,NULL);
    policenum--;
    if (( info_police=XLoadQueryFont(UxDisplay,StrFontTab[policenum]))== NULL)
       fprintf(stderr,"Unable to load font %s \n ",StrFontTab[policenum]);
-   police=XmFontListCreate(info_police,XmSTRING_DEFAULT_CHARSET);
+   entry = XmFontListEntryCreate(XmSTRING_DEFAULT_CHARSET,XmFONT_IS_FONT,
+				 (XtPointer)info_police);
+   police=XmFontListAppendEntry(NULL,entry);
    XtVaSetValues(w,XmNfontList,police,NULL);
    /* XFreeFont(UxDisplay,info_police);*/
 


--- NEW FILE 106-fix-paw++-menus-in-lesstif.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 106-fix-paw++-menus-in-lesstif.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix odd behavior of Paw++ menus when compiled against Lesstif.  The
## DP: problem is that Paw++ Motif code does some awfully weird things that
## DP: Lesstif doesn't support; cf. http://bugs.debian.org/270862 .

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c /tmp/dpep.KorIaA/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	2005-06-09 14:41:14.451377612 -0400
+++ /tmp/dpep.KorIaA/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	2005-06-09 14:41:22.929573007 -0400
@@ -1066,7 +1066,7 @@
 {
     int narg;
     Arg arglist[2];
-    Widget id_pdm;
+    Widget id_pdm, id_pdm_shell;
     Widget PdMenu[15];
 
     /*
@@ -1076,8 +1076,19 @@
     UxKuipBrowserContext = (_UxCkuipBrowser *)UxGetContext(parent);
 
     /*  create pulldown_menu */
-    id_pdm = XmCreatePulldownMenu (browserMenu,"OptionsPdMenu",arglist,0);
-
+    id_pdm_shell = XtVaCreatePopupShell ("OptionsPdMenu_shell",
+	xmMenuShellWidgetClass, browserMenu,
+	XmNwidth, 1,
+	XmNheight, 1,
+	XmNallowShellResize, TRUE,
+	XmNoverrideRedirect, TRUE,
+	NULL );
+    id_pdm = XtVaCreateWidget( "OptionsPdMenu",
+	xmRowColumnWidgetClass,
+	id_pdm_shell,
+	XmNrowColumnType, XmMENU_PULLDOWN,
+	NULL );
+/*  id_pdm = XmCreatePulldownMenu (browserMenu,"OptionsPdMenu",arglist,0); */
 
     /* create pulldown_menu_entry "Options" */
     XtVaCreateManagedWidget( "optionsMenu",
@@ -1091,7 +1102,7 @@
 /*  create list of push_buttons and separators for menu "Option"             */
 /*  create pulldown_menu for "Raise Window" (with list of appl. shells)       */
     narg = 0;
-#if XmREVISION == 99 /* problem with REVISION 2 ! */
+#if XmVERSION > 1 || XmREVISION >= 2
     XtSetArg(arglist[narg], XmNtearOffModel, XmTEAR_OFF_ENABLED); narg++;
 #endif
     kuipControlShellM = XmCreatePulldownMenu
@@ -1312,9 +1323,7 @@
 static void create_command_menu(parent)
    Widget parent;
 {
-    Widget id_pdme, id_pdm;
-    Arg    arglist[2];
-    int    narg;
+    Widget id_pdme, id_pdm, id_pdm_shell;
 
     /*
      *   find and restore the context for Browser
@@ -1323,12 +1332,26 @@
     UxKuipBrowserContext = (_UxCkuipBrowser *)UxGetContext(parent);
 
     /* create pulldown_menu_entry "Commands" for all commands */
-    narg = 0;
+
+    id_pdm_shell = XtVaCreatePopupShell ("CommandsPdMenu_shell",
+	xmMenuShellWidgetClass, browserMenu,
+	XmNwidth, 1,
+	XmNheight, 1,
+	XmNallowShellResize, TRUE,
+	XmNoverrideRedirect, TRUE,
+	NULL );
+    
+    id_pdm = XtVaCreateWidget( "CommandsPdMenu",
+	xmRowColumnWidgetClass,
+	id_pdm_shell,
+	XmNrowColumnType, XmMENU_PULLDOWN,
 #if XmVERSION > 1 || XmREVISION >= 2
-    XtSetArg(arglist[narg], XmNtearOffModel, XmTEAR_OFF_ENABLED); narg++;
+	XmNtearOffModel, XmTEAR_OFF_ENABLED,
 #endif
-    id_pdm = XmCreatePulldownMenu
-                     (browserMenu, "CommandsPdMenu", arglist, narg);
+	NULL );
+      
+/*      XmCreatePulldownMenu
+                     (browserMenu, "CommandsPdMenu", arglist, narg); */
 
     id_pdme = XtVaCreateManagedWidget( "id_pdme",
                         xmCascadeButtonGadgetClass, browserMenu,
@@ -1927,7 +1950,7 @@
    if (kuipControlShellM != NULL) XtDestroyWidget (kuipControlShellM);
 
    narg = 0;
-#if XmREVISION == 99 /* problem with REVISION 2 ! */
+#if XmVERSION > 1 || XmREVISION >= 2
    XtSetArg(arglist[narg], XmNtearOffModel, XmTEAR_OFF_ENABLED); narg++;
 #endif
    kuipControlShellM = XmCreatePulldownMenu


--- NEW FILE 107-define-strdup-macro-safely.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 107-define-strdup-macro-safely.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: In some cases strdup() and strndup() are macros, causing a build
## DP: failure.  Ensure any such macros are undefined before redeclaring them.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h /tmp/dpep.ieQnkg/cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h
--- cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h	1997-03-14 12:16:39.000000000 -0500
+++ /tmp/dpep.ieQnkg/cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h	2005-06-09 14:58:22.446739916 -0400
@@ -32,6 +32,9 @@
 
 extern char* strrstr( const char* str1, const char* str2 );
 
+#ifdef strdup
+# undef strdup /* otherwise the next function declaration may bomb */
+#endif
 #define strdup Strdup           /* prototype without const */
 extern char* strdup( const char* str );
 
@@ -46,6 +49,10 @@
                      const char* str4 );
 extern char* str5dup( const char* str1, const char* str2, const char* str3,
                      const char* str4, const char* str5 );
+
+#ifdef strndup
+# undef strndup /* otherwise the next function declaration may bomb */
+#endif
 extern char* strndup( const char* buf, size_t n );
 extern char* stridup( int i );
 


--- NEW FILE 108-quote-protect-comis-script.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 108-quote-protect-comis-script.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.tIRzzG/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
--- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2000-09-25 10:16:36.000000000 -0400
+++ /tmp/dpep.tIRzzG/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:41:16.757077306 -0400
@@ -70,7 +70,7 @@
       LEXEC=LENOCC(FEXEC)
       OPEN(LUNOUT,FILE=FEXEC(:LEXEC), STATUS='UNKNOWN',ERR=99)
       WRITE(LUNOUT,'(A)')         '#!/bin/sh'
-      WRITE(LUNOUT,'(A)')         'olddir=`pwd`'
+      WRITE(LUNOUT,'(A)')         'olddir="`pwd`"'
 *      WRITE(LUNOUT,'(A)')         'cd '//CHPATH(:LPATH)
       CHLINE=                     'cd '//CHPATH(:LPATH)
       L=LENOCC(CHLINE)
@@ -206,7 +206,7 @@
       CHLINE=                     '/bin/rm -f '//NAME(:LN)//'.o'
       L=LENOCC(CHLINE)
       WRITE(LUNOUT,'(A)')CHLINE(:L)
-      WRITE(LUNOUT,'(A)')         'cd $olddir'
+      WRITE(LUNOUT,'(A)')         'cd "$olddir"'
       WRITE(LUNOUT,'(A)')         'exit 0'
       CALL CSCLOS(LUNOUT)
       CLOSE(LUNOUT)


--- NEW FILE 110-ignore-included-lapack-rule.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 110-ignore-included-lapack-rule.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Comment out rule requiring liblapack in a subdirectory of mathlib code.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mathlib/Imakefile /tmp/dpep.Ib8j9x/cernlib-2005.05.09/src/mathlib/Imakefile
--- cernlib-2005.05.09/src/mathlib/Imakefile	1999-11-09 12:07:49.000000000 -0500
+++ /tmp/dpep.Ib8j9x/cernlib-2005.05.09/src/mathlib/Imakefile	2005-06-10 11:24:47.771309475 -0400
@@ -5,9 +5,12 @@
 
 LIBDIRS= gen bvsl
 
+/* Lapack is independent of Cernlib and should be installed as one of
+   the build dependencies.
 #ifndef WIN32
  LIBDIRS := $(LIBDIRS) lapack
 #endif
+*/
 
 SUBDIRS= $(LIBDIRS)
 


--- NEW FILE 111-fix-kuesvr-install-location.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 111-fix-kuesvr-install-location.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix install location of kuesvr binary.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile /tmp/dpep.ZmakmH/cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile	1996-03-11 10:43:22.000000000 -0500
+++ /tmp/dpep.ZmakmH/cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile	2005-06-10 12:03:32.706178628 -0400
@@ -1,4 +1,4 @@
 
 NormalProgramTarget(kuesvr,kuesvr.o,NullParameter,NullParameter,NullParameter)
 
-InstallProgram(kuesvr,$(CERN)/$(CERN_LEVEL)/bin)
+InstallProgram(kuesvr,$(CERN_BINDIR))


--- NEW FILE 112-remove-nonexistent-prototypes-from-gen.h.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 112-remove-nonexistent-prototypes-from-gen.h.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove prototypes from gen.h of functions that don't exist in mathlib.
## DP: Because of the way cfortran works, their existence otherwise causes
## DP: linking failures in third-party code.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/gen.h /tmp/dpep.3jFEkx/cernlib-2005.05.09/src/cfortran/gen.h
--- cernlib-2005.05.09/src/cfortran/gen.h	2005-06-27 10:02:17.225463958 -0400
+++ /tmp/dpep.3jFEkx/cernlib-2005.05.09/src/cfortran/gen.h	2005-06-27 10:05:41.503584328 -0400
@@ -84,10 +84,10 @@
 
 PROTOCCALLSFFUN1(FLOAT,ALGAMA,algama,FLOAT)
 #define ALGAMA(A2)  CCALLSFFUN1(ALGAMA,algama,FLOAT,A2)
-
+/*
 PROTOCCALLSFFUN1(FLOAT,QLGAMA,qlgama,FLOAT)
 #define QLGAMA(A2)  CCALLSFFUN1(QLGAMA,qlgama,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(DOUBLE,DLGAMA,dlgama,DOUBLE)
 #define DLGAMA(A2)  CCALLSFFUN1(DLGAMA,dlgama,DOUBLE,A2)
 
@@ -141,10 +141,10 @@
 
 PROTOCCALLSFFUN5(DOUBLE,DCAUCH,dcauch,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE)
 #define DCAUCH(A2,A3,A4,A5,A6)  CCALLSFFUN5(DCAUCH,dcauch,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,A2,A3,A4,A5,A6)
-
+/*
 PROTOCCALLSFFUN6(DOUBLE,CHEBQU,chebqu,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,INT,DOUBLE)
 #define CHEBQU(A2,A3,A4,A5,A6,A7)  CCALLSFFUN6(CHEBQU,chebqu,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,INT,DOUBLE,A2,A3,A4,A5,A6,A7)
-
+*/
 PROTOCCALLSFFUN2(FLOAT,CHISIN,chisin,FLOAT,INT)
 #define CHISIN(A2,A3)  CCALLSFFUN2(CHISIN,chisin,FLOAT,INT,A2,A3)
 
@@ -204,13 +204,13 @@
 
 PROTOCCALLSFFUN3(DOUBLE,DVDOT,dvdot,INT,DOUBLEV,DOUBLEV)
 #define DVDOT(A2,A3,A4)  CCALLSFFUN3(DVDOT,dvdot,INT,DOUBLEV,DOUBLEV,A2,A3,A4)
-
+/*
 PROTOCCALLSFFUN2(DOUBLE,E401BD,e401bd,DOUBLE,DOUBLE)
 #define E401BD(A2,A3)  CCALLSFFUN2(E401BD,e401bd,DOUBLE,DOUBLE,A2,A3)
 
 PROTOCCALLSFFUN2(FLOAT,ELIN1,elin1,FLOAT,FLOAT)
 #define ELIN1(A2,A3)  CCALLSFFUN2(ELIN1,elin1,FLOAT,FLOAT,A2,A3)
-
+*/
 PROTOCCALLSFFUN1(FLOAT,ERF,erf,FLOAT)
 #define ERF(A2)  CCALLSFFUN1(ERF,erf,FLOAT,A2)
 
@@ -237,13 +237,13 @@
 
 PROTOCCALLSFFUN2(FLOAT,FREARG,frearg,FLOAT,FLOAT)
 #define FREARG(A2,A3)  CCALLSFFUN2(FREARG,frearg,FLOAT,FLOAT,A2,A3)
-
+/*
 PROTOCCALLSFFUN3(FLOAT,FRED2,fred2,FLOAT,FLOAT,FLOAT)
 #define FRED2(A2,A3,A4)  CCALLSFFUN3(FRED2,fred2,FLOAT,FLOAT,FLOAT,A2,A3,A4)
 
 PROTOCCALLSFFUN1(FLOAT,FRED3,fred3,FLOAT)
 #define FRED3(A2)  CCALLSFFUN1(FRED3,fred3,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(FLOAT,FREQ,freq,FLOAT)
 #define FREQ(A2)  CCALLSFFUN1(FREQ,freq,FLOAT,A2)
 
@@ -255,10 +255,10 @@
 
 PROTOCCALLSFFUN1(DOUBLE,DFRSIN,dfrsin,DOUBLE)
 #define DFRSIN(A2)  CCALLSFFUN1(DFRSIN,dfrsin,DOUBLE,A2)
-
+/*
 PROTOCCALLSFFUN2(FLOAT,FUN,fun,INT,FLOATV)
 #define FUN(A2,A3)  CCALLSFFUN2(FUN,fun,INT,FLOATV,A2,A3)
-
+*/
 PROTOCCALLSFFUN1(FLOAT,G116F1,g116f1,FLOAT)
 #define G116F1(A2)  CCALLSFFUN1(G116F1,g116f1,FLOAT,A2)
 
@@ -270,10 +270,10 @@
 
 PROTOCCALLSFFUN1(FLOAT,GAMMA,gamma,FLOAT)
 #define GAMMA(A2)  CCALLSFFUN1(GAMMA,gamma,FLOAT,A2)
-
+/*
 PROTOCCALLSFFUN1(FLOAT,QGAMMA,qgamma,FLOAT)
 #define QGAMMA(A2)  CCALLSFFUN1(QGAMMA,qgamma,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(DOUBLE,DGAMMA,dgamma,DOUBLE)
 #define DGAMMA(A2)  CCALLSFFUN1(DGAMMA,dgamma,DOUBLE,A2)
 
@@ -297,16 +297,16 @@
 
 PROTOCCALLSFFUN4(FLOAT,GAUSS,gauss,ROUTINE,FLOAT,FLOAT,FLOAT)
 #define GAUSS(A2,A3,A4,A5)  CCALLSFFUN4(GAUSS,gauss,ROUTINE,FLOAT,FLOAT,FLOAT,A2,A3,A4,A5)
-
+/*
 PROTOCCALLSFFUN4(FLOAT,QGAUSS,qgauss,ROUTINE,FLOAT,FLOAT,FLOAT)
 #define QGAUSS(A2,A3,A4,A5)  CCALLSFFUN4(QGAUSS,qgauss,ROUTINE,FLOAT,FLOAT,FLOAT,A2,A3,A4,A5)
-
+*/
 PROTOCCALLSFFUN4(DOUBLE,DGAUSS,dgauss,ROUTINE,DOUBLE,DOUBLE,DOUBLE)
 #define DGAUSS(A2,A3,A4,A5)  CCALLSFFUN4(DGAUSS,dgauss,ROUTINE,DOUBLE,DOUBLE,DOUBLE,A2,A3,A4,A5)
-
+/*
 PROTOCCALLSFFUN6(DOUBLE,GPINDP,gpindp,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,DOUBLE,INT)
 #define GPINDP(A2,A3,A4,A5,A6,A7)  CCALLSFFUN6(GPINDP,gpindp,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,DOUBLE,INT,A2,A3,A4,A5,A6,A7)
-
+*/
 PROTOCCALLSFFUN2(INT,IGET,iget,INTV,INT)
 #define IGET(A2,A3)  CCALLSFFUN2(IGET,iget,INTV,INT,A2,A3)
 
@@ -315,16 +315,16 @@
 
 PROTOCCALLSFFUN3(INT,ILSUM,ilsum,INT,LOGICALV,INT)
 #define ILSUM(A2,A3,A4)  CCALLSFFUN3(ILSUM,ilsum,INT,LOGICALV,INT,A2,A3,A4)
-
+/*
 PROTOCCALLSFFUN10(FLOAT,QLINSQ,qlinsq,INT,INT,INT,FLOATV,PFLOAT,FLOATV,FLOATV,FLOATV,PDOUBLE,INT)
 #define QLINSQ(A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)  CCALLSFFUN10(QLINSQ,qlinsq,INT,INT,INT,FLOATV,PFLOAT,FLOATV,FLOATV,FLOATV,PDOUBLE,INT,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)
-
+*/
 PROTOCCALLSFFUN3(INT,LKKSPL,lkkspl,DOUBLE,DOUBLEV,INT)
 #define LKKSPL(A2,A3,A4)  CCALLSFFUN3(LKKSPL,lkkspl,DOUBLE,DOUBLEV,INT,A2,A3,A4)
-
+/*
 PROTOCCALLSFFUN4(INT,LOCHAR,lochar,INTV,INT,INTV,INT)
 #define LOCHAR(A2,A3,A4,A5)  CCALLSFFUN4(LOCHAR,lochar,INTV,INT,INTV,INT,A2,A3,A4,A5)
-
+*/
 PROTOCCALLSFFUN2(INT,MAXFZE,maxfze,FLOATV,INT)
 #define MAXFZE(A2,A3)  CCALLSFFUN2(MAXFZE,maxfze,FLOATV,INT,A2,A3)
 
@@ -339,10 +339,10 @@
 
 PROTOCCALLSFFUN2(INT,NDIGIT,ndigit,DOUBLE,DOUBLE)
 #define NDIGIT(A2,A3)  CCALLSFFUN2(NDIGIT,ndigit,DOUBLE,DOUBLE,A2,A3)
-
+/*
 PROTOCCALLSFFUN1(INT,NEAR1,near1,FLOAT)
 #define NEAR1(A2)  CCALLSFFUN1(NEAR1,near1,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(INT,NIC311,nic311,FLOAT)
 #define NIC311(A2)  CCALLSFFUN1(NIC311,nic311,FLOAT,A2)
 


--- NEW FILE 113-cups-postscript-fix.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 113-cups-postscript-fix.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Re-order PostScript output to work around CUPS printing issue.

@DPATCH@
diff -urNad cernlib-2005.05.09~/src/graflib/higz/ipost/ipdef.F cernlib-2005.05.09/src/graflib/higz/ipost/ipdef.F
--- cernlib-2005.05.09~/src/graflib/higz/ipost/ipdef.F	2003-03-20 09:14:10.000000000 +0000
+++ cernlib-2005.05.09/src/graflib/higz/ipost/ipdef.F	2005-09-20 18:59:21.992348547 +0000
@@ -316,6 +316,7 @@
       CALL IPPSTR('%%EndProlog@')
 *
       CALL IPPSTR('%%BeginSetup@')
+      CALL IPPSTR('%%EndSetup@')
       CALL IPPSTF(8,'newpath ')
       CALL IPSVRT(1)
       IF (MODE.EQ.1.OR.MODE.EQ.4) THEN
@@ -333,7 +334,6 @@
       ENDIF
       CALL IPPSTF(15,' .25 .25 scale ')
       IF (MODE.NE.3) CALL IPSVRT(1)
-      CALL IPPSTR('%%EndSetup@')
 *
       NBSAV0 = NBSAVE
       IF (MODE.NE.3) CALL IPPSTR('%%Page: number 1@')


--- NEW FILE 114-install-scripts-properly.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 114-install-scripts-properly.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Install scripts properly (i.e. don't try to strip them).

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/scripts/Imakefile cernlib-2005.05.09.dfsg/src/scripts/Imakefile
--- cernlib-2005.05.09.dfsg~/src/scripts/Imakefile	2004-07-29 10:17:08.000000000 -0400
+++ cernlib-2005.05.09.dfsg/src/scripts/Imakefile	2005-12-02 10:45:23.091782817 -0500
@@ -1,10 +1,10 @@
 
-InstallProgram(paw,$(CERN_BINDIR))
+InstallNamedProg(paw,paw,$(CERN_BINDIR))
 
 #if defined(CERNLIB_SHIFT)
 InstallNamedProg(cernlib_shift,cernlib,$(CERN_BINDIR))
 #else
-InstallProgram(cernlib,$(CERN_BINDIR))
+InstallNamedProg(cernlib,cernlib,$(CERN_BINDIR))
 #endif
 
-InstallProgram(gxint,$(CERN_BINDIR))
+InstallNamedProg(gxint,gxint,$(CERN_BINDIR))


--- NEW FILE 200-comis-allow-special-chars-in-path.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 200-comis-allow-special-chars-in-path.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F /tmp/dpep.gkT1Y2/cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F
--- cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F	1997-05-20 05:37:58.000000000 -0400
+++ /tmp/dpep.gkT1Y2/cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F	2005-06-08 19:34:43.101436210 -0400
@@ -29,6 +29,7 @@
 C.    *        CHFUNC may be the name of a COMIS function              *
 C.    *        or a file name. A file cannot contain one of            *
 C.    *        the following characters: +*=-()<>                      *
+C.    *        [n.b. patched to work around this. --Kevin McCarty]     *
 C.    *                                                                *
 C.    ******************************************************************
 #include "paw/pawcfu.inc"
@@ -60,7 +61,11 @@
       IF(NCH.LE.0)GO TO 99
       IFILE=0
       TFILE=' '
-      IF(INDEX(CHFUNC,']').EQ.0.AND.INDEX(CHFUNC,':').EQ.0)THEN
+* Added '/' as a character symbolizing a filename; otherwise Unix paths
+* containing +, *, =, -, etc. return a bogus "Unknown routine" error
+* (Fix by Kevin McCarty)
+      IF(INDEX(CHFUNC,']').EQ.0.AND.INDEX(CHFUNC,':').EQ.0.AND.
+     +   INDEX(CHFUNC,'/').EQ.0)THEN
          IF(INDEX(CHFUNC,'+').NE.0.OR.
      +      INDEX(CHFUNC,'*').NE.0.OR.
      +      INDEX(CHFUNC,'=').NE.0.OR.


--- NEW FILE 201-update-kuip-helper-apps.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 201-update-kuip-helper-apps.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Instead of "ghostview" and "lp", call the more modern helper apps
## DP: "gv" and "lpr" from KUIP.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2003-02-13 09:25:23.000000000 -0500
+++ /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2005-06-09 12:34:49.057760462 -0400
@@ -249,7 +249,7 @@
     host_psviewer = getenv( "PSVIEWER" );
   if( host_psviewer == NULL ) {
 #ifdef UNIX
-    host_psviewer = "ghostview";
+    host_psviewer = "gv";
 #endif
 #ifdef vms
     host_psviewer = "VIEW/FORM=PS/INTERFACE=DECWINDOWS";
@@ -277,7 +277,7 @@
 # if defined(MSDOS) || defined(CERNLIB_WINNT)
   ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'print $*'" );
 # else
-  ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'lp $*'" );
+  ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'lpr $*'" );
 # endif
 #else
   ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'XPRINT $*'" );
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	1997-09-25 10:02:25.000000000 -0400
+++ /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	2005-06-09 12:35:59.499480148 -0400
@@ -925,7 +925,7 @@
 The startup value can be defined by the environment variables
 'KUIPPSVIEWER' or 'PSVIEWER'.
 .
-On Unix workstations it is by default set to 'ghostview'.
+On Unix workstations it is by default set to 'gv'.
 On VAX/VMS the default commands is 'VIEW/FORM=PS/INTERFACE=DECWINDOWS'.
 
 >Action kxhostpsviewer%C


--- NEW FILE 202-fix-includes-in-minuit-example.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 202-fix-includes-in-minuit-example.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: minuit-main example should have <> instead of "" around include files.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c /tmp/dpep.SuauEf/cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c
--- cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c	2001-04-18 04:56:22.000000000 -0400
+++ /tmp/dpep.SuauEf/cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c	2005-06-09 13:22:59.567224997 -0400
@@ -15,8 +15,8 @@
 #define FCN fcn
 #endif
 
-#include "cfortran.h"
-#include "minuit.h"
+#include 
+#include 
 #define Ncont 20
 int main()
 {


--- NEW FILE 203-compile-geant-with-ertrak.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 203-compile-geant-with-ertrak.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Ertrak code added to library in Debian since I saw no reason to exclude.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-11-23 15:41:44.798536817 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-11-23 15:43:39.618959247 +0000
@@ -5,11 +5,12 @@
 AllTarget(geant321)
 
 /* Fluka removed from Debian source package for copyright reasons. */
+/* Ertrak added to Debian since I saw no reason to leave it out. */
 LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
          geocad ggeom gheisha ghits ghrout ghutils giface \ @@\
 	 giopa gkine gphys gscan gstrag gtrak guser gxint \ @@\
-	 miface miguti neutron
-
+	 miface miguti neutron        \ @@\
+	 erdecks erpremc matx55
 
 SUBDIRS= $(LIBDIRS) data examples gxuser geant321
 


--- NEW FILE 204-compile-isajet-with-isasrt.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 204-compile-isajet-with-isasrt.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Include isasrt in the Isajet library, by request (cf.
## DP: http://bugs.debian.org/260469 )

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile /tmp/dpep.PM12lm/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2001-10-08 09:06:49.000000000 -0400
+++ /tmp/dpep.PM12lm/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2005-06-09 14:25:29.621215677 -0400
@@ -9,7 +9,7 @@
 	 fortop.F frgjet.F frgmnt.F gamma.F getpt.F gettot.F heavyx.F \ @@\
 	 hevolv.F higgs.F idanti.F idgen.F iframs.F inisap.F ipartns.F \ @@\
 	 ipjset.F iprtns.F irmov0.F isabeg.F isaend.F isaevt.F isaini.F \ @@\
-	 isajet.F ispjet.F istrad.F iswdky.F jetgen.F \ @@\
+	 isajet.F isasrt.F ispjet.F istrad.F iswdky.F jetgen.F \ @@\
 	 label.F lboost.F logerr.F \ @@\
 	 logic.F logp.F logphi.F logphw.F logpt.F logqm.F logqt.F logthw.F \ @@\
 	 logx.F logxw.F logyth.F logyw.F lstsq.F mbias.F mbset.F nogood.F \ @@\


--- NEW FILE 205-max-path-length-to-256.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 205-max-path-length-to-256.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Set max path length to 256 in Hbook.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc /tmp/dpep.ceXWNa/cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc
--- cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc	2003-02-07 07:13:37.000000000 -0500
+++ /tmp/dpep.ceXWNa/cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc	2005-06-09 15:20:49.541661646 -0400
@@ -20,7 +20,7 @@
 *
 *CMZ :  4.20/03 28/07/93  09.33.32  by  Rene Brun
 *-- Author :
-      PARAMETER (NLPATM=100, MXFILES=50, LENHFN=128)
+      PARAMETER (NLPATM=100, MXFILES=50, LENHFN=256)
       COMMON /HCDIRN/NLCDIR,NLNDIR,NLPAT,ICDIR,NCHTOP,ICHTOP(MXFILES)
      +              ,ICHTYP(MXFILES),ICHLUN(MXFILES)
       CHARACTER*16   CHNDIR,    CHCDIR,    CHPAT    ,CHTOP


--- NEW FILE 206-herwig-uses-DBLE-not-REAL.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 206-herwig-uses-DBLE-not-REAL.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Have libherwig use double precision consistently

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F
--- cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F	1996-12-03 09:16:56.000000000 -0500
+++ /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F	2005-06-09 15:22:00.263743792 -0400
@@ -72,7 +72,7 @@
       TAMP(6)=HWHIG5(T,S,U,EMH2,EMQ2,2,0,5,0,0,0)
       TAMP(7)=HWHIG5(U,T,S,EMH2,EMQ2,3,0,6,0,0,0)
       DO 20 I=1,7
-      TAMPI(I)= REAL(TAMP(I))
+      TAMPI(I)= DBLE(TAMP(I))
   20  TAMPR(I)=-IMAG(TAMP(I))
 C Square and add prefactors
       WTGG=0.03125*FLOAT(NCOLO*(NCOLO**2-1))
diff -urNad cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F
--- cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F	1996-12-03 09:17:04.000000000 -0500
+++ /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F	2005-06-09 15:22:00.263743792 -0400
@@ -18,7 +18,7 @@
      &  1.644934066848226D0/
       PROD(Y,Y2)=Y*(ONE+A1*Y*(ONE+A2*Y*(ONE+A3*Y2*(ONE+A4*Y2*(ONE+A5*Y2*
      & (ONE+A6*Y2*(ONE+A7*Y2*(ONE+A8*Y2*(ONE+A9*Y2*(ONE+A10*Y2))))))))))
-      XR=REAL(X)
+      XR=DBLE(X)
       XI=IMAG(X)
       R2=XR*XR+XI*XI
       IF (R2.GT.ONE.AND.(XR/R2).GT.HALF) THEN


--- NEW FILE 207-compile-temp-libs-with-fPIC.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 207-compile-temp-libs-with-fPIC.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Compile temporary COMIS libraries with -fPIC for non-x86 arches.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.srSRmd/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
--- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2000-09-25 10:16:36.000000000 -0400
+++ /tmp/dpep.srSRmd/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:47:44.859676286 -0400
@@ -81,12 +81,12 @@
       WRITE(LUNOUT,'(A)')CHLINE(:L)
       IF(FEXT.EQ.'.c')THEN
         L=LENOCC(CHCC)
-*                                 'cc -c .... name.c'
-        CHLINE=CHCC(:L)//' '//NAME(:LN)// '.c'
+*                                 'cc -c .... -fPIC name.c'
+        CHLINE=CHCC(:L)//' -fPIC '//NAME(:LN)// '.c'
       ELSE
         L=LENOCC(CHF77)
-*                                 'f77 -c .... name.f'
-        CHLINE=CHF77(:L)//' '//NAME(:LN)// '.f'
+*                                 'f77 -c .... -fPIC name.f'
+        CHLINE=CHF77(:L)//' -fPIC '//NAME(:LN)// '.f'
       ENDIF
       L=LENOCC(CHLINE)
       WRITE(LUNOUT,'(A)')CHLINE(:L)
@@ -176,7 +176,7 @@
       ENDIF
 #endif
 #if defined(CERNLIB_LINUX)
-      CHLINE=                   'ld -shared -o '
+      CHLINE=                   'g77 -shared -o '
      +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
 #endif
 #if defined(CERNLIB_ALPHA_OSF)


--- NEW FILE 208-fix-redundant-packlib-dependencies.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 208-fix-redundant-packlib-dependencies.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove some redundancy in the libraries listed to be linked against.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile
--- cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile	1996-05-09 10:32:43.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile	2005-06-10 11:54:49.270360036 -0400
@@ -20,7 +20,7 @@
 NeedTcpipLib
 #endif
 
-CernlibFortranProgramTarget(dzeX11,dzedit.o,$(PACKAGE_LIB),$(PACKAGE_LIB),graflib/X11 packlib)
+CernlibFortranProgramTarget(dzeX11,dzedit.o,libdzdoc.a,libdzdoc.a,graflib/X11 packlib)
 
 InstallProgram(dzeX11,$(CERN_BINDIR))
 InstallScript(dzedit,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile
--- cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile	1996-04-16 04:09:49.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile	2005-06-10 11:55:33.872780414 -0400
@@ -14,6 +14,6 @@
 
 NeedTcpipLib
 
-CernlibFortranProgramTarget(zftp,zftp.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(zftp,zftp.o,libzftplib.a,libzftplib.a,packlib)
 
 InstallProgram(zftp,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile
--- cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile	1996-05-05 05:40:20.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile	2005-06-10 11:56:23.109221943 -0400
@@ -31,10 +31,10 @@
 
 DefinePackageLibrary(zservlib)
 
-CernlibFortranProgramTarget(zserv,zs.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(zserv,zs.o,libzservlib.a,libzservlib.a,packlib)
 
 InstallProgram(zserv,$(CERN_BINDIR))
 
-CernlibFortranProgramTarget(pawserv,zs.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(pawserv,zs.o,libzservlib.a,libzservlib.a,packlib)
 
 InstallProgram(pawserv,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile
--- cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile	1996-11-05 04:32:29.000000000 -0500
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile	2005-06-10 11:56:54.779438847 -0400
@@ -28,6 +28,6 @@
 NeedSysexe
 #endif
 
-CernlibFortranProgramTarget(fatmen,fatmen.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(fatmen,fatmen.o,libfmkuip.a,libfmkuip.a,packlib)
 
 InstallProgram(fatmen,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile
--- cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile	1996-04-02 05:03:43.000000000 -0500
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile	2005-06-10 11:57:39.794807919 -0400
@@ -17,6 +17,6 @@
 SpecialFortranObjectRule(hepdb,hepdb,'-WF,-P',NullParameter)
 #endif
 
-CernlibFortranProgramTarget(hepdb,hepdb.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(hepdb,hepdb.o,libdbmodule.a,libdbmodule.a,packlib)
 
 InstallProgram(hepdb,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	1996-04-18 12:33:08.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-10 12:00:35.355791756 -0400
@@ -21,6 +21,6 @@
 #endif
 
 
-CernlibCcProgramTarget(kxterm,kxterm.o,$(PACKAGE_LIB),$(PACKAGE_LIB),$(CLIBS))
+CernlibCcProgramTarget(kxterm,kxterm.o,libkxtlib.a,libkxtlib.a,$(CLIBS))
 
 InstallProgram(kxterm,$(CERN_BINDIR))


--- NEW FILE 209-ignore-unneeded-headers-in-kmutil.c.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 209-ignore-unneeded-headers-in-kmutil.c.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Comment out header files not actually needed in kmutil.c.
## DP: (This will be helpful when we move this file elsewhere to be part of
## DP: the Lesstif-dependent library split out from packlib.)

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c /tmp/dpep.BncUU7/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c	1996-03-08 10:33:09.000000000 -0500
+++ /tmp/dpep.BncUU7/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c	2005-06-10 12:06:07.198547576 -0400
@@ -20,12 +20,13 @@
 /******************************************************************************/
 
 #include "kuip/kuip.h"
+/* commented out, since this file doesn't need these includes. --Kevin McCarty
 #include "kuip/kfor.h"
 #include "kuip/kmenu.h"
 
 #include "mkutda.h"
 #include "kuip/mkutfu.h"
-
+*/
 
 /***********************************************************************
  *                                                                     *


--- NEW FILE 210-improve-cfortran-header-files.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 210-improve-cfortran-header-files.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Protect against multiple inclusion and add explicit dependency on
## DP: cfortran.h to the Cernlib C headers.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/comis.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/comis.h
--- cernlib-2005.05.09/src/cfortran/comis.h	1999-10-29 07:41:26.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/comis.h	2005-06-10 12:51:30.985999665 -0400
@@ -1,3 +1,11 @@
+#ifndef _COMIS_H
+#define _COMIS_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN1(INT,CSADDR,csaddr,STRING)
 #define	CSADDR(CHFILE) CCALLSFFUN1(CSADDR,csaddr,STRING,CHFILE)
 
@@ -30,3 +38,9 @@
 
 PROTOCCALLSFSUB2(CSTYPE,cstype,INT,PSTRING)
 #define CSTYPE(CADR,CHTYPE) CCALLSFSUB2(CSTYPE,cstype,INT,PSTRING,CADR,CHTYPE)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _COMIS_H */
diff -urNad cernlib-2005.05.09/src/cfortran/cspack.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/cspack.h
--- cernlib-2005.05.09/src/cfortran/cspack.h	1999-10-29 07:42:56.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/cspack.h	2005-06-10 12:51:31.013993690 -0400
@@ -1,5 +1,19 @@
+#ifndef _CSPACK_H
+#define _CSPACK_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB2(CZPUTA,czputa,STRING,PINT)
 #define CZPUTA(CHMAIL,ISTAT) CCALLSFSUB2(CZPUTA,czputa,STRING,PINT,CHMAIL,ISTAT)
 
 PROTOCCALLSFSUB2(CZGETA,czgeta,PSTRING,PINT)
 #define CZGETA(CHMAIL,ISTAT) CCALLSFSUB2(CZGETA,czgeta,PSTRING,PINT,CHMAIL,ISTAT)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _CSPACK_H */
diff -urNad cernlib-2005.05.09/src/cfortran/geant315.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant315.h
--- cernlib-2005.05.09/src/cfortran/geant315.h	1996-05-15 05:24:06.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant315.h	2005-06-10 12:51:31.080979393 -0400
@@ -1,3 +1,11 @@
+#ifndef _GEANT315_H
+#define _GEANT315_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*------------------------------------------------------------------
 fortran filename   : /cern/new/src/cfs/geant315/abbrch.f
 ------------------------------------------------------------------*/
@@ -4797,3 +4805,9 @@
 
 #define ZEREGS() CCALLSFSUB0(ZEREGS,zeregs)
 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GEANT315_H */
diff -urNad cernlib-2005.05.09/src/cfortran/geant321.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant321.h
--- cernlib-2005.05.09/src/cfortran/geant321.h	1996-05-15 05:24:07.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant321.h	2005-06-10 12:51:31.148964883 -0400
@@ -1,3 +1,11 @@
+#ifndef _GEANT321_H
+#define _GEANT321_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*------------------------------------------------------------------
 fortran filename   : abbrch.f
 ------------------------------------------------------------------*/
@@ -6099,3 +6107,9 @@
  PROTOCCALLSFFUN3(DOUBLE,XSEPRO,xsepro,DOUBLE,DOUBLE,DOUBLE)
 #define XSEPRO(A2,A3,A4)  CCALLSFFUN3(XSEPRO,xsepro,DOUBLE,DOUBLE,DOUBLE,A2,A3,A4)
 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GEANT321_H */
diff -urNad cernlib-2005.05.09/src/cfortran/gen.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/gen.h
--- cernlib-2005.05.09/src/cfortran/gen.h	2005-06-10 12:51:00.965407158 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/gen.h	2005-06-10 12:51:31.190955921 -0400
@@ -1,3 +1,11 @@
+#ifndef _GEN_H
+#define _GEN_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Subroutines/Functions with COMPLEX not supported ***
 
 #define CBSJA(A1,A2,A3,A4,A5)  CCALLSFSUB5(CBSJA,cbsja,COMPLEX,FLOAT,INT,INT,PCOMPLEX,A1,A2,A3,A4,A5)
@@ -1489,3 +1497,9 @@
 
 PROTOCCALLSFSUB6(ZEROX,zerox,FLOAT,FLOAT,FLOAT,INT,FLOAT,INT)
 #define ZEROX(A1,A2,A3,A4,A5,A6)  CCALLSFSUB6(ZEROX,zerox,FLOAT,FLOAT,FLOAT,INT,FLOAT,INT,A1,A2,A3,A4,A5,A6)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GEN_H */
diff -urNad cernlib-2005.05.09/src/cfortran/graflib.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/graflib.h
--- cernlib-2005.05.09/src/cfortran/graflib.h	1998-01-29 05:49:27.000000000 -0500
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/graflib.h	2005-06-10 12:51:31.220949519 -0400
@@ -1,2 +1,16 @@
-#include "higz.h"
-#include "hplot.h"
+#ifndef _GRAFLIB_H
+#define _GRAFLIB_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include 
+#include 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GRAFLIB_H */
diff -urNad cernlib-2005.05.09/src/cfortran/jetset74.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/jetset74.h
--- cernlib-2005.05.09/src/cfortran/jetset74.h	1999-10-29 12:55:45.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/jetset74.h	2005-06-10 12:51:31.250943117 -0400
@@ -1,3 +1,11 @@
+#ifndef _JETSET74_H
+#define _JETSET74_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN2(INT,KLU,klu,INT,INT)
 #define KLU(A2,A3)  CCALLSFFUN2(KLU,klu,INT,INT,A2,A3)
 
@@ -327,3 +335,9 @@
 
 PROTOCCALLSFSUB11(STRUCTM,structm,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE)
 #define STRUCTM(A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)  CCALLSFSUB11(STRUCTM,structm,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _JETSET74_H */
diff -urNad cernlib-2005.05.09/src/cfortran/kernlib.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kernlib.h
--- cernlib-2005.05.09/src/cfortran/kernlib.h	2000-03-16 11:58:18.000000000 -0500
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kernlib.h	2005-06-10 12:51:31.291934368 -0400
@@ -1,3 +1,11 @@
+#ifndef _KERNLIB_H
+#define _KERNLIB_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN1(FLOAT,ALOGAM,alogam,FLOAT)
 #define ALOGAM(A2)  CCALLSFFUN1(ALOGAM,alogam,FLOAT,A2)
 
@@ -1512,3 +1520,9 @@
 
 PROTOCCALLSFSUB1(WORDSEP,wordsep,STRING)
 #define WORDSEP(A1)  CCALLSFSUB1(WORDSEP,wordsep,STRING,A1)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _KERNLIB_H */
diff -urNad cernlib-2005.05.09/src/cfortran/kuip.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kuip.h
--- cernlib-2005.05.09/src/cfortran/kuip.h	2000-10-05 10:27:54.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kuip.h	2005-06-10 12:51:31.319928394 -0400
@@ -1,3 +1,11 @@
+#ifndef _KUIP_H
+#define _KUIP_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB3(KUCLOS,kuclos,INT,STRING,INT)
 #define KUCLOS(A1,A2,A3)    CCALLSFSUB3(KUCLOS,kuclos,INT,STRING,INT,A1,A2,A3)
 
@@ -6,3 +14,9 @@
 
 PROTOCCALLSFSUB0(KUWHAG,kuwhag)
 #define KUWHAG() CCALLSFSUB0(KUWHAG,kuwhag)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _KUIP_H */
diff -urNad cernlib-2005.05.09/src/cfortran/lapack.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lapack.h
--- cernlib-2005.05.09/src/cfortran/lapack.h	2000-06-23 06:13:58.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lapack.h	2005-06-10 12:51:31.348922205 -0400
@@ -1,2 +1,16 @@
+#ifndef _LAPACK_H
+#define _LAPACK_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB11(DGELS,dgels,STRING,INT,INT,INT,DOUBLEV,INT,DOUBLEV,INT,DOUBLEV,INT,PINT)
 #define DGELS(TRANS,M,N,NRHS,A,LDA,B,LDB,WORK,LWORK,INFO) CCALLSFSUB11(DGELS,dgels,STRING,INT,INT,INT,DOUBLEV,INT,DOUBLEV,INT,DOUBLEV,INT,PINT,TRANS,M,N,NRHS,A,LDA,B,LDB,WORK,LWORK,INFO)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _LAPACK_H */
diff -urNad cernlib-2005.05.09/src/cfortran/lepto62.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lepto62.h
--- cernlib-2005.05.09/src/cfortran/lepto62.h	1999-10-29 12:55:45.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lepto62.h	2005-06-10 12:51:31.378915804 -0400
@@ -1,3 +1,11 @@
+#ifndef _LEPTO62_H
+#define _LEPTO62_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN2(FLOAT,DCROSS,dcross,FLOAT,FLOAT)
 #define DCROSS(A2,A3)  CCALLSFFUN2(DCROSS,dcross,FLOAT,FLOAT,A2,A3)
 
@@ -174,3 +182,9 @@
 
 PROTOCCALLSFSUB0(RIWIBD,riwibd)
 #define RIWIBD() CCALLSFSUB0(RIWIBD,riwibd)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _LEPTO62_H */
diff -urNad cernlib-2005.05.09/src/cfortran/minuit.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/minuit.h
--- cernlib-2005.05.09/src/cfortran/minuit.h	1999-10-27 11:30:23.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/minuit.h	2005-06-10 12:51:31.407909615 -0400
@@ -1,3 +1,11 @@
+#ifndef _MINUIT_H
+#define _MINUIT_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  *  Interface to minuit using cfortran.h
  *
@@ -190,3 +198,9 @@
 
 PROTOCCALLSFSUB0(STAND,stand)
 #define STAND() CCALLSFSUB0(STAND,stand)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _MINUIT_H */
diff -urNad cernlib-2005.05.09/src/cfortran/packlib.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/packlib.h
--- cernlib-2005.05.09/src/cfortran/packlib.h	1998-01-29 11:17:45.000000000 -0500
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/packlib.h	2005-06-10 12:51:31.436903427 -0400
@@ -1,4 +1,18 @@
-#include "hbook.h"
-#include "minuit.h"
-#include "kuip.h"
-#include "zebra.h"
+#ifndef _PACKLIB_H
+#define _PACKLIB_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include 
+#include 
+#include 
+#include 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _PACKLIB_H */
diff -urNad cernlib-2005.05.09/src/cfortran/paw.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/paw.h
--- cernlib-2005.05.09/src/cfortran/paw.h	2000-10-05 10:27:55.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/paw.h	2005-06-10 12:51:31.464897452 -0400
@@ -1,6 +1,20 @@
+#ifndef _PAW_H
+#define _PAW_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB2(PAW,paw,INT,INT)
 #define PAW(A1,A2)  CCALLSFSUB2(PAW,paw,INT,INT,A1,A2)
 
 PROTOCCALLSFSUB0(PAEXIT,paexit)
 #define PAEXIT() CCALLSFSUB0(PAEXIT,paexit)
 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _PAW_H */
diff -urNad cernlib-2005.05.09/src/cfortran/zebra.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/zebra.h
--- cernlib-2005.05.09/src/cfortran/zebra.h	1999-10-29 07:35:47.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/zebra.h	2005-06-10 12:51:31.496890624 -0400
@@ -1,5 +1,19 @@
+#ifndef _ZEBRA_H
+#define _ZEBRA_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB1(MZEBRA,mzebra,INT)
 #define MZEBRA(A1)    CCALLSFSUB1(MZEBRA,mzebra,INT,A1)
 
 PROTOCCALLSFSUB2(MZPAW,mzpaw,INT,STRING)
 #define MZPAW(A1,A2)  CCALLSFSUB2(MZPAW,mzpaw,INT,STRING,A1,A2)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _ZEBRA_H */


--- NEW FILE 211-fix-comis-on-64-bit-arches.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-64-bit-arches.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09~/src/geant321/gphys/gphot.F cernlib-2005.05.09/src/geant321/gphys/gphot.F
--- cernlib-2005.05.09~/src/geant321/gphys/gphot.F	1995-10-24 10:21:29.000000000 +0000
+++ cernlib-2005.05.09/src/geant321/gphys/gphot.F	2005-09-20 19:27:10.734527890 +0000
@@ -240,7 +240,7 @@
                   ELSE
 C Radiative shell decay
                      JS = JFN+1+2*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 40 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
@@ -296,7 +296,7 @@
                   ELSE
 c Nonradiative decay
                      JS = JFN+1+3*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 60 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
diff -urNad cernlib-2005.05.09~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.05.09/src/packlib/kernlib/kerngen/ccgen/locb.c
--- cernlib-2005.05.09~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/kernlib/kerngen/ccgen/locb.c	2005-09-20 19:27:10.734527890 +0000
@@ -44,7 +44,25 @@
    DummyDef
 #endif
 {
+#if defined(CERNLIB_QMLXIA64)
+   const unsigned long long int mask=0x00000000ffffffff;
+   static unsigned long long int base=1;
+   unsigned long long int jadr=(unsigned long long int) iadr;
+   unsigned long long int jadrl = (mask & jadr);
+
+   if (base == 1) {
+     base = (~mask & jadr);
+   } else if(base != (~mask & jadr)) {
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+     printf("locb_() Warning: changing base from %lx to %lx!!!\n",
+     	   base, (~mask & jadr));
+     printf("This may result in program crash or incorrect results\n");
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+   }
+   return ((int) jadrl);
+#else
    return( (int) iadr );
+#endif
 }
 /*> END <----------------------------------------------------------*/
 #ifdef CERNLIB_TCGEN_LOCB
diff -urNad cernlib-2005.05.09~/src/packlib/zbook/code/zjump.c cernlib-2005.05.09/src/packlib/zbook/code/zjump.c
--- cernlib-2005.05.09~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/zbook/code/zjump.c	2005-09-20 19:27:10.734527890 +0000
@@ -7,6 +7,9 @@
  *
  */
 #include "zbook/pilot_c.h"
+#if defined(CERNLIB_QMLXIA64)
+static void (*target)();
+#endif
 #if defined(CERNLIB_UNIX)
 #if defined(CERNLIB_QX_SC)
 zjump_(name,p1,p2,p3,p4)
@@ -18,8 +21,23 @@
 ZJUMP(name,p1,p2,p3,p4)
 #endif
 char *p1, *p2, *p3, *p4;
+
+/*  LP64 compatibility:
+    name is taken from a Fortran array and therefore its address is 32 bit
+    which has to be converted to a 64 bit address to satisfy void (*) (H. Vogt) */
+
+#if defined(CERNLIB_QMLXIA64)
+int *name;
+{
+  long jadr;
+  jadr   = *name;  /* convert int to long */
+  target = (void (*)())jadr;
+  (*target)(p1, p2, p3, p4);
+}
+#else
 void (**name)();
 {
    (**name)(p1, p2, p3, p4);
 }
 #endif
+#endif
diff -urNad cernlib-2005.05.09~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.05.09/src/packlib/zebra/test/brztest/btest2.F
--- cernlib-2005.05.09~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/zebra/test/brztest/btest2.F	2005-09-20 19:27:10.734527890 +0000
@@ -29,6 +29,15 @@
 ********************************************************************************
 *
       COMMON/CRZT/IXSTOR,IXDIV,IFENCE(2),LEV,LEVIN,BLVECT(30000)
+
+*     LP64 compatibility:
+*     For 64-bit pointer systems put local variables referenced by LOCF
+*     in a dummy named common block to keep addresses in the program region.
+*     see also: packlib/ffread/test/main.F (H. Vogt)
+
+#if defined(CERNLIB_QMLXIA64)
+      COMMON /TEST64/LBANK
+#endif
       DIMENSION LQ(999),IQ(999),Q(999)
       EQUIVALENCE (IQ(1),Q(1),LQ(9)),(LQ(1),LEV)
 C
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09~/src/pawlib/comis/code/Imakefile	2005-09-20 19:26:47.894420356 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-09-20 19:27:10.734527890 +0000
@@ -50,6 +50,10 @@
 SRCS_F := $(SRCS_F) cscrexec.F
 #endif
 
+#if defined(CERNLIB_QMLXIA64)
+SRCS_F := $(SRCS_F) csrtgpl.F csitgpl.F
+#endif
+
 #if defined(CERNLIB_OLD)
 SRCS_F := $(SRCS_F) cspdir.F csrmbk.F
 #endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csaddr.F	1996-02-26 17:16:25.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-09-20 19:27:10.735527676 +0000
@@ -17,8 +17,14 @@
       INTEGER CSLTGP,CSITGP
       CHARACTER*32 NAME
 #include "comis/cstab.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       INTEGER CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      INTEGER*8 CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)
       NAME=CHNAME
       NC=LENOCC(NAME)
       CALL CSCHID(NAME(:NC))
@@ -26,21 +32,39 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
+#endif
+#endif
+#if defined(CERNLIB_SHL)
           ELSE
             I=0
           ENDIF
         ENDIF
       ELSE
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+        IF(IADGPL.NE.0)THEN
+          IFCS=-2
+          ITYPGP=-2
+          I=CSITGPL(IPVS)
+        ENDIF
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
           I=CSITGP(IPVS)
         ENDIF
+#endif
       END IF
       CSADDR=I
 #endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csinit.F cernlib-2005.05.09/src/pawlib/comis/code/csinit.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csinit.F	2005-04-18 15:41:04.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csinit.F	2005-09-20 19:27:10.735527676 +0000
@@ -64,6 +64,9 @@
 #if defined(CERNLIB_SHL)
 #include "comis/cshlnm.inc"
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+#endif
 #if defined(CERNLIB_PAW)
 #include "paw/pcmode.inc"
 #include "comis/cshfill.inc"
@@ -159,6 +162,9 @@
       ICHMINU=ICHAR('-')
       ICHPLUS=ICHAR('+')
       ICHCOMM=ICHAR(',')
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+      IPIADGV=0
+#endif
 #if defined(CERNLIB_PAW)
       CALL CSPAWI
       MODHFI=0
@@ -209,11 +215,16 @@
       CHF77 ='f77 -c -pic'
       CHCC  ='cc -c -pic'
 #endif
-#if (defined(CERNLIB_LINUX))
+#if (defined(CERNLIB_LINUX))&&(!defined(CERNLIB_QMLXIA64))
       ITMPLEN=CSTMPD(CHPATH, 256)
       CHF77 ='g77 -c'
       CHCC  ='cc -c'
 #endif
+#if (defined(CERNLIB_LINUX))&&(defined(CERNLIB_QMLXIA64))
+      ITMPLEN=CSTMPD(CHPATH, 256)
+      CHF77 ='g77 -c -fPIC -fno-f2c'
+      CHCC  ='cc -c -fPIC -fno-f2c'
+#endif
 #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
       ITMPLEN=CSTMPD(CHPATH, 256)
       CHF77 ='f77 -c'
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csintx.F cernlib-2005.05.09/src/pawlib/comis/code/csintx.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csintx.F	1996-12-05 09:50:37.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csintx.F	2005-09-20 19:27:10.762521893 +0000
@@ -38,6 +38,9 @@
 #if defined(CERNLIB_PAW)
 #include "comis/cskucs.inc"
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_ALPHA_OSF))
       INTEGER CSTRCMP
 #endif
@@ -1105,6 +1108,32 @@
       ENDIF
 #endif
 #if (!defined(CERNLIB_VAX))&&(!defined(CERNLIB_APOLLO))
+#if defined(CERNLIB_QMLXIA64)
+      IF(IQ(IP+KSIFCS).EQ.-2)THEN
+*Dynamic linker may give long addresses
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ENDIF
+#else
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NPAR,IDA(IOFSPL))
       ELSEIF(ITP.EQ.2)THEN
@@ -1115,6 +1144,7 @@
         DCSRES=CSCALD(IADGP,NPAR,IDA(IOFSPL))
       ENDIF
 #endif
+#endif
       IPC=IPC+4
       GO TO 999
 *NUM I
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csitgpl.F cernlib-2005.05.09/src/pawlib/comis/code/csitgpl.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csitgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csitgpl.F	2005-09-20 19:27:10.763521679 +0000
@@ -0,0 +1,32 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZU:  1.16/16 04/10/93  12.14.52  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+      INTEGER FUNCTION CSITGPL(IP)
+***------------------------------
+*   it is last routine from the tables-set.
+***-----------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cspnts.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab64.inc"
+      I=MHLOC(KSIDP+NWIDEN)
+      IQ(I)=0
+      IQ(I+1)=NCIDEN
+      DO 1 K=1,NWIDEN
+        IQ(I+KSIDP-1+K)=IDEN(K)
+   1  CONTINUE
+      CALL CSRTGPL(I)
+      IF(IP.EQ.0)THEN
+        IPGP=I
+      ELSE
+        IQ(IP)=I
+      ENDIF
+      CSITGP=I
+      END
+#endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/cskcal.F cernlib-2005.05.09/src/pawlib/comis/code/cskcal.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/cskcal.F	1996-12-05 09:50:39.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/cskcal.F	2005-09-20 19:27:10.763521679 +0000
@@ -31,6 +31,9 @@
 #include "comis/cstab.inc"
 #include "comis/csfres.inc"
 #include "comis/cssysd.inc"
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
       CHARACTER PRONAME*32
       INTEGER CSCALI
       DOUBLE PRECISION CSCALD
@@ -232,6 +235,34 @@
         I2=I2+KS
         I=I+1
  9203 CONTINUE
+#if defined(CERNLIB_QMLXIA64)
+*  Dynamic linker may give long addresses
+      IF (IFCS.EQ.-2)THEN
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ENDIF
+#else
 *      IT=IABS(ITYPGP)
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NOPAR,IF77PL(1))
@@ -245,6 +276,7 @@
       ENDIF
 *+SELF,IF=UNIX,IF=-SGI,IF=-IBMRT,IF=-DECS,IF=-HPUX,IF=-SUN,IF=-MSDOS.
 #endif
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_STDUNIX))
       I=1
       DO 9203 K=ITA-NPAR+1,ITA
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/cslink.F cernlib-2005.05.09/src/pawlib/comis/code/cslink.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/cslink.F	1996-02-26 17:16:17.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/cslink.F	2005-09-20 19:27:10.763521679 +0000
@@ -21,10 +21,15 @@
 #include "comis/cstab.inc"
 #include "comis/cspnts.inc"
 #include "comis/cslun.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       CHARACTER*(KLENID) FNNAME
       INTEGER CS_GET_FUNC
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      CHARACTER*(KLENID) FNNAME
+      INTEGER*8 CS_GET_FUNC
+#endif
          COMMON/CSGSCM/IGS,JGS,NGS,CSJUNK(3)
       IF(ISTLIB.EQ.0 .AND. ITBS.EQ.0)RETURN
    2  I=IPGP
@@ -60,12 +65,20 @@
 #if defined(CERNLIB_SHL)
           CALL CSGTIDP(I,FNNAME,NC)
           CALL CUTOL(FNNAME(1:NC))
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(FNNAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+          ENDIF
+#else
           IADGP=CS_GET_FUNC(FNNAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
           ENDIF
 #endif
+#endif
           IP=0
         ENDIF
       ENDIF
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csrtgpl.F cernlib-2005.05.09/src/pawlib/comis/code/csrtgpl.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csrtgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csrtgpl.F	2005-09-20 19:27:10.764521465 +0000
@@ -0,0 +1,31 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZ :  1.18/14 10/01/95  15.41.06  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+
+      SUBROUTINE CSRTGPL(I)
+***--------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab.inc"
+#include "comis/cstab64.inc"
+
+      IPIADGV = IPIADGV + 1
+      IF (IPIADGV .GT. MAXIAD64)  THEN
+        WRITE (*,'(2a,I4)') 'to much addresses for dynamik linking, ',
+     &                      'limit is ', MAXIAD64
+        WRITE (*,'(2a)') 'increase MAXIAD64 in cstab64.inc and ',
+     &                    'recompile COMIS'
+
+        STOP
+      END IF
+      IADGPLV(IPIADGV) = IADGPL
+      IADGP            = IPIADGV
+      CALL CCOPYA(IADGP,IQ(I+2),KSIDP-2)
+      END
+#endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/comis/cstab64.inc cernlib-2005.05.09/src/pawlib/comis/comis/cstab64.inc
--- cernlib-2005.05.09~/src/pawlib/comis/comis/cstab64.inc	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/comis/cstab64.inc	2005-09-20 19:27:10.775519109 +0000
@@ -0,0 +1,10 @@
+*
+*
+* cstab64.inc
+*
+      PARAMETER (MAXIAD64=100) !maximum number of shared objects
+      INTEGER*8 IADGPL,IADGPLV(MAXIAD64)
+      INTEGER   IADGPL1, IADGPL2
+      COMMON /CSTB64/ IADGPL,IADGPLV
+      COMMON /CSTB64I/ IPIADGV
+      EQUIVALENCE (IADGPL, IADGPL1)
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/ccopys.c	1997-09-02 15:50:38.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/ccopys.c	2005-09-20 19:27:10.776518895 +0000
@@ -33,11 +33,25 @@
 #else
 void ccopys_(ja,jb,nn)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *nn;
+{
+  int i,n; char *a,*b;
+  n=*nn; (long)a=*ja; (long)b=*jb;
+#else
      char **ja, **jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+#endif
   if ( a >= b )
      for ( i=0; i
 #endif
@@ -274,6 +285,7 @@
 #endif
          p->next = f->first_proc;
          f->first_proc = p;
+         if (debug_level > 0) printf("function pointer is: %p\n", p->funcptr);
          return (void *)(p->funcptr);
       }
      f = f->next;
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscald.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscald.c	2004-10-27 09:01:54.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscald.c	2005-09-20 19:27:10.776518895 +0000
@@ -32,8 +32,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 double cscald_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -46,10 +45,41 @@
     int CSCALD (name,n,p)
 #  endif
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscald_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+double cscald_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[15];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = *fptr + (unsigned long)jumpad_;
+   if ( *fptr > 0 ) ptr = 0;
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  double (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    double d;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscali.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscali.c	2004-10-22 12:42:40.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscali.c	2005-09-20 19:27:10.777518681 +0000
@@ -29,8 +29,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 int cscali_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -39,10 +38,41 @@
 #if defined(CERNLIB_QXCAPT)
 int type_of_call CSCALI (name,n,p)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscali_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+int cscali_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[15];
+{
+   int jumpad_();
+   int (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   if ( *fptr > 0 ) ptr = 0;
+   ptr += *fptr;
+   name = (int (*)())ptr;
+/*    printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  int (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    int i;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscalr.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscalr.c	2004-10-22 12:03:16.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscalr.c	2005-09-20 19:27:10.788516325 +0000
@@ -33,16 +33,12 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 float cscalr_ (name,n,p)
 #endif
-
 #if defined(CERNLIB_QXNO_SC)
 float cscalr (name,n,p)
 #endif
-
 #if defined(CERNLIB_QXCAPT)
 # if defined(CERNLIB_MSSTDCALL)
    float type_of_call CSCALR(name,n,p)
@@ -51,10 +47,39 @@
 # endif
 #endif
 
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscalr_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+float cscalr_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ int pin[15];
+{
+   int jumpad_();
+   float (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   ptr += *fptr;
+   name = (float (*)())ptr;
+/*    printf ("cscalr - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  float (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    float r;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cstrcmp.c	1997-09-02 15:50:44.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cstrcmp.c	2005-09-20 19:27:10.788516325 +0000
@@ -36,6 +36,27 @@
 #else
 int cstrcmp_(ja,na,jb,nb)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *na, *nb;
+{
+
+  int i,la,lb,k; char *a,*b;
+  if ( *na >= *nb )
+     {
+      (long)a=*ja; (long)b=*jb; la=*na; lb=*nb; k=1;
+      }
+  else
+    {
+      (long)a=*jb; (long)b=*ja; la=*nb; lb=*na; k=-1;
+     }
+#else
      char **ja, **jb;
      int *na, *nb;
 {
@@ -48,6 +69,7 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+#endif
   for ( i=0; i b[i]) ? k : -k ); }
diff -urNad cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_execute.c cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_execute.c
--- cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_execute.c	2001-09-18 13:41:35.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_execute.c	2005-09-20 19:27:10.789516111 +0000
@@ -245,7 +245,15 @@
 	char		ntname[MAX_NAME_LEN+6];
 	int		i, ierr, indx, itype, isize, ielem;
 	Int32 *		addr;
-	int		ibase[1], ioff, nuse;
+
+	/* LP64 compatibility:
+	   use static for ibase (at least) because its address is stored
+	   as Int32 in structure CWNBlock                                 
+	   static takes ibase from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int	ibase[1], ioff, nuse;
 	int		id = qe->id;
 	char *		path = qe->path;
 	char *		title;
@@ -871,8 +879,21 @@
 			if ( cmd->u.scan.pawpp ) {
 				char	buf[33];
 
+				/* for LP64 ABI matlab and matrow are 64 bit pointer, type is void*  
+				   but PCADDR.jmlab and PCADDR.jmrow are of type int
+				   see: c_pcaddr.h and qp_command.h
+				   it is related to CWNBlock -> see above (H. Vogt)*/
+
+#if defined(CERNLIB_QMLXIA64)
+				unsigned long long int	 myjmlab, myjmrow;
+				myjmlab = PCADDR.jmlab;
+				myjmrow = PCADDR.jmrow;
+				c->matlab = (TableCallBack) myjmlab;
+				c->matrow = (TableCallBack) myjmrow;
+#else
 				c->matlab = (TableCallBack) PCADDR.jmlab;
 				c->matrow = (TableCallBack) PCADDR.jmrow;
+#endif
 
 				qp_assert( qe->nexpr <= MAX_OUTSTR );
 
diff -urNad cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_hbook_if.c cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_hbook_if.c
--- cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_hbook_if.c	1999-07-05 15:43:35.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_hbook_if.c	2005-09-20 19:27:10.801513541 +0000
@@ -149,7 +149,15 @@
 	int	idn, idtmp;
 	int	icycle;
 	int	ierr;
-	int     izero = 0;
+
+	/* LP64 compatibility:
+	   use static for izero because its address is fetched by hbname_
+	   using locb and locb expects 32 bit addresses only.
+	   static takes izero from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int     izero = 0;
 
 	/* split string into  path, id and cycle */
 
diff -urNad cernlib-2005.05.09~/src/scripts/cernlib cernlib-2005.05.09/src/scripts/cernlib
--- cernlib-2005.05.09~/src/scripts/cernlib	2003-01-23 14:00:37.000000000 +0000
+++ cernlib-2005.05.09/src/scripts/cernlib	2005-09-20 19:27:10.801513541 +0000
@@ -115,6 +115,12 @@
 	       [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
 	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
 	       [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
+#                      add path to lib64 for x86_64 architecture
+	       if [ `uname -m` = x86_64 ] && [ -d /usr/X11R6/lib64 ] ; then
+		  SYSGDIRS="-L/usr/X11R6/lib -L/usr/X11R6/lib64"
+		  SYSGX11="$SYSGDIRS -lX11"
+		  SYSGMOTIF="$SYSGDIRS -lXm -lXt -lXp -lXext -lX11"
+	       fi
 	       ;;
       NeXT)    SYSGX11="/usr/lib/X11/libX11.r" ;
                SYSGMOTIF="-lXm -lXt /usr/lib/X11/libX11.r" ;;


--- NEW FILE 300-skip-duplicate-lenocc.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 300-skip-duplicate-lenocc.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Only compile one of the two "lenocc()" functions.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile
--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile	2002-09-19 16:44:52.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile	2005-11-28 19:59:28.690293288 +0000
@@ -19,7 +19,9 @@
 SRCS_C += apofsz.c
 #endif
 
-#if defined(CERNLIB_WINNT)
+#if defined(CERNLIB_WINNT) || defined(CERNLIB_LINUX)
+/* Do not use lenocc.c in Linux; favor packlib/kernlib/kerngen/tcgen/lenocc.F
+ * instead.  --Kevin McCarty, for Debian */
 SRCS_C += lnblnk.c
 #endif
 
@@ -29,7 +31,7 @@
 
 #if defined(CERNLIB_DECS) || defined(CERNLIB_QMVAOS) \
  || defined(CERNLIB_HPUX) || defined(CERNLIB_IBMRT) || defined(CERNLIB_IBMRTD) \
- || defined(CERNLIB_OS9)  || defined(CERNLIB_LINUX)
+ || defined(CERNLIB_OS9)
 SRCS_C += lenocc.c lnblnk.c
 #endif
 


--- NEW FILE 303-shadow-passwords-supported.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 303-shadow-passwords-supported.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Allow Cern's server code to read from /etc/shadow.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.KyLyTI/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
--- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-04-18 11:39:28.000000000 -0400
+++ /tmp/dpep.KyLyTI/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-08 16:55:00.088372396 -0400
@@ -28,6 +28,9 @@
  *
  */
 #include "cspack/pilot.h"
+#if defined(CERNLIB_LINUX) && ! defined(CERNLIB_MACOSX)
+#define SHADOW_SUPPORT /* for Debian */
+#endif
 #if !defined(CERNLIB_IBM)||defined(CERNLIB_TCPSOCK)
 /*N.B. Must define sequence TCPLOG if a log file is required, e.g.*/
 /*#define LOGFILE "disk$dd:-ben.socks-serv.log"*/ /* VMS    */
@@ -231,7 +234,7 @@
 #endif /* OSK */
 #endif /* AUTHENT */
  
-#ifdef linux_softland
+#if defined(linux_softland) || defined(SHADOW_SUPPORT)
 #include 
 #endif /* linux_softland */
  
@@ -1780,10 +1783,10 @@
         union wait ret;
 #endif /* APOPWD1 */
  
-        char   *xpasswd, *crypt();
+        char   *xpasswd, *encrypted, *crypt();
         struct passwd *pw;
  
-#ifdef linux_softland
+#if defined(linux_softland) || defined(SHADOW_SUPPORT)
         struct spwd *spwd;
 #endif /* linux_softland */
  
@@ -1798,6 +1801,7 @@
                 reply("Unknown user %s.\n", user);
                 return(-2);
         }
+	encrypted = pw->pw_passwd;
  
 #ifdef linux_softland
         spwd = getspnam(user);
@@ -1805,6 +1809,29 @@
                 reply("User %s has illegal shadow password\n",user);
                 return(-2);
         }
+	encrypted = spwd->sp_pwdp;
+
+#elif defined(SHADOW_SUPPORT)
+	/* shadow passwords may not be enabled in Debian, so must check */
+	{
+		FILE *test = fopen("/etc/shadow", "r");
+		if (test) {
+			fclose(test);
+			spwd = getspnam(user);
+			if (spwd == NULL) {
+				reply("User %s has illegal shadow password\n",
+				      user);
+				return(-2);
+			}
+			encrypted = spwd->sp_pwdp;
+		}
+		else if (errno == EACCES) {
+			reply("Server has insufficient permissions to "
+			      "read /etc/shadow file\n");
+			return(-2);
+		}
+	}
+
 #endif /* linux_softland */
  
 #ifdef APOPWD1
@@ -1850,15 +1877,16 @@
 #else
  
 #ifdef linux_softland
-            xpasswd = pw_encrypt(pass,spwd->sp_pwdp);
+            xpasswd = pw_encrypt(pass, encrypted);
 #else
-            xpasswd = crypt(pass, pw->pw_passwd);
+            xpasswd = crypt(pass, encrypted);
 #endif /* linux_softland */
+
             /* The strcmp does not catch null passwords! */
-#ifdef linux_softland
-            if (spwd->sp_pwdp == '\0' || strcmp(xpasswd,spwd->sp_pwdp)) {
+#if defined(linux_softland) || defined(SHADOW_SUPPORT)
+            if (*encrypted == '\0' || strcmp(xpasswd,spwd->sp_pwdp)) {
 #else
-            if (*pw->pw_passwd == '\0' || strcmp(xpasswd,pw->pw_passwd)) {
+            if (*encrypted == '\0' || strcmp(xpasswd,pw->pw_passwd)) {
 #endif /* linux_softland */
  
 #endif /* AFS */


***** Error reading new file: [Errno 2] No such file or directory: '304-update-Imake-config-files.dpatch'

--- NEW FILE 305-use-POWERPC-not-PPC-as-test.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 305-use-POWERPC-not-PPC-as-test.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Since patch 304 changed the meaning of CERNLIB_PPC to a mere endianness
## DP: test, we now use CERNLIB_POWERPC to mean actually checking for a PowerPC
## DP: processor; fix the three occurences of this in Imakefiles.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile
--- cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile	1998-09-25 11:34:28.000000000 -0400
+++ /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile	2005-06-09 10:51:45.913019086 -0400
@@ -43,7 +43,7 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_PPC)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
 SpecialFortranLibObjectRule(hwuci2,hwuci2,-O0,NullParameter)
 #endif
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/Imakefile /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	1998-09-25 05:33:51.000000000 -0400
+++ /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	2005-06-09 10:50:47.068482917 -0400
@@ -56,7 +56,7 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_PPC)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
 SpecialFortranLibObjectRule(pawins,pawins,-O0,NullParameter)
 #endif
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	1999-09-14 05:20:08.000000000 -0400
+++ /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	2005-06-09 10:51:15.807396176 -0400
@@ -46,7 +46,7 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_PPC)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
 SpecialObjectRule(archive/qp_execute.o,qp_execute.c archive/qp_execute.d,-O0 -o $@)
 SpecialObjectRule(debug/qp_execute.o,qp_execute.c debug/qp_execute.d,-O0 -o $@)
 SpecialObjectRule(shared/qp_execute.o,qp_execute.c shared/qp_execute.d,-O0 -o $@)


--- NEW FILE 306-patch-assert.h-for-makedepend.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 306-patch-assert.h-for-makedepend.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Include local copy of assert.h with a workaround for a bug of
## DP: makedepend (cf. Debian bug # 171908).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/include/assert.h /tmp/dpep.9sKNsJ/cernlib-2005.05.09/src/include/assert.h
--- cernlib-2005.05.09/src/include/assert.h	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.9sKNsJ/cernlib-2005.05.09/src/include/assert.h	2005-06-09 12:50:41.751880968 -0400
@@ -0,0 +1,153 @@
+#ifndef CERNLIB_LINUX
+# include "/usr/include/assert.h"
+#else
+
+/* Copyright (C) 1991,1992,1994-2001,2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/*
+ *	ISO C99 Standard: 7.2 Diagnostics	
+ */
+
+#ifdef	_ASSERT_H
+
+# undef	_ASSERT_H
+# undef	assert
+# undef __ASSERT_VOID_CAST
+
+# ifdef	__USE_GNU
+#  undef assert_perror
+# endif
+
+#endif /* assert.h	*/
+
+#define	_ASSERT_H	1
+#include 
+
+#if defined __cplusplus && __GNUC_PREREQ (2,95)
+# define __ASSERT_VOID_CAST static_cast
+#else
+# define __ASSERT_VOID_CAST (void)
+#endif
+
+/* void assert (int expression);
+
+   If NDEBUG is defined, do nothing.
+   If not, and EXPRESSION is zero, print an error message and abort.  */
+
+#ifdef	NDEBUG
+
+# define assert(expr)		(__ASSERT_VOID_CAST (0))
+
+/* void assert_perror (int errnum);
+
+   If NDEBUG is defined, do nothing.  If not, and ERRNUM is not zero, print an
+   error message with the error text for ERRNUM and abort.
+   (This is a GNU extension.) */
+
+# ifdef	__USE_GNU
+#  define assert_perror(errnum)	(__ASSERT_VOID_CAST (0))
+# endif
+
+#else /* Not NDEBUG.  */
+
+#ifndef _ASSERT_H_DECLS
+#define _ASSERT_H_DECLS
+__BEGIN_DECLS
+
+/* This prints an "Assertion failed" message and aborts.  */
+extern void __assert_fail (__const char *__assertion, __const char *__file,
+			   unsigned int __line, __const char *__function)
+     __THROW __attribute__ ((__noreturn__));
+
+/* Likewise, but prints the error text for ERRNUM.  */
+extern void __assert_perror_fail (int __errnum, __const char *__file,
+				  unsigned int __line,
+				  __const char *__function)
+     __THROW __attribute__ ((__noreturn__));
+
+
+/* The following is not at all used here but needed for standard
+   compliance.  */
+extern void __assert (const char *__assertion, const char *__file, int __line)
+     __THROW __attribute__ ((__noreturn__));
+
+
+__END_DECLS
+#endif /* Not _ASSERT_H_DECLS */
+
+/* For the macro definition we use gcc's __builtin_expect if possible
+   to generate good code for the non-error case.  gcc 3.0 is a good
+   enough estimate for when the feature became available.  */
+# if __GNUC_PREREQ (3, 0)
+#  define assert(expr) \
+  (__ASSERT_VOID_CAST (__builtin_expect (!!(expr), 1) ? 0 :		      \
+		       (__assert_fail (__STRING(expr), __FILE__, __LINE__,    \
+				       __ASSERT_FUNCTION), 0)))
+# else
+#  define assert(expr) \
+  (__ASSERT_VOID_CAST ((expr) ? 0 :					      \
+		       (__assert_fail (__STRING(expr), __FILE__, __LINE__,    \
+				       __ASSERT_FUNCTION), 0)))
+# endif
+
+# ifdef	__USE_GNU
+#  if __GNUC_PREREQ (3, 0)
+#   define assert_perror(errnum) \
+  (__ASSERT_VOID_CAST (__builtin_expect (!(errnum), 1) ? 0 :		      \
+		       (__assert_perror_fail ((errnum), __FILE__, __LINE__,   \
+					      __ASSERT_FUNCTION), 0)))
+#  else
+#   define assert_perror(errnum) \
+  (__ASSERT_VOID_CAST (!(errnum) ? 0 :					      \
+		       (__assert_perror_fail ((errnum), __FILE__, __LINE__,   \
+					      __ASSERT_FUNCTION), 0)))
+#  endif
+# endif
+
+/* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
+   which contains the name of the function currently being defined.
+   This is broken in G++ before version 2.6.
+   C9x has a similar variable called __func__, but prefer the GCC one since
+   it demangles C++ function names.  */
+
+/* The following commented-out line breaks makedepend (bug # 171908); a local
+ * patched version of assert.h is therefore included.
+ *   --Kevin McCarty, for Debian */
+/* # if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4) */
+
+/* begin fix to work around Debian Bug # 171908 */
+# if defined __cplusplus
+#  if __GNUC_PREREQ (2, 6)
+#   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
+#  endif
+# elif __GNUC_PREREQ (2, 4)
+/* end fix */
+
+#   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
+# else
+#  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#   define __ASSERT_FUNCTION	__func__
+#  else
+#   define __ASSERT_FUNCTION	((__const char *) 0)
+#  endif
+# endif
+
+#endif /* NDEBUG.  */
+
+#endif /* CERNLIB_LINUX */


--- NEW FILE 307-use-canonical-cfortran.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 307-use-canonical-cfortran.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Use the most recent version of cfortran.h and cfortran.doc from
## DP: Debian package of cfortran, version 4.4-6.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.doc /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc
--- cernlib-2005.05.09/src/cfortran/cfortran.doc	1998-12-11 12:17:09.000000000 -0500
+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc	2004-12-10 10:47:33.000000000 -0500
@@ -195,7 +195,7 @@
 HP9000> f77 -c cfortex.f
 HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest
 
-HP0000> # If old-style f77 +800 compiled objects are required:
+HP9000> # If old-style f77 +800 compiled objects are required:
 HP9000> # #define hpuxFortran800
 HP9000> cc -c -Aa -DhpuxFortran800 cfortest.c
 HP9000> f77 +800 -o cfortest cfortest.o cfortex.f
@@ -643,7 +643,7 @@
    [For an ancient math.h on a 386 or sparc, get similar from a new math.h.]
    #ifdef mc68000     /* 5 lines Copyright (c) 1988 by Sun Microsystems, Inc. */
    #define FLOATFUNCTIONTYPE	int
-   #define RETURNFLOAT(x) 		return (*(int *)(&(x)))
+   #define RETURNFLOAT(x) 	return (*(int *)(&(x)))
    #define ASSIGNFLOAT(x,y)	*(int *)(&x) = y
    #endif
 
@@ -874,7 +874,7 @@
 works everywhere and would seem to be an obvious choice.
 
 
-3. 
+3. 
 
 cfortran.h encourages the exact specification of the type and dimension of
 array parameters because it allows the C compiler to detect errors in the
@@ -1835,7 +1835,7 @@
 
 Unlike all other C compilers supported by cfortran.h,
 'gcc -traditional' promotes to double all functions returning float
-as demonstrated bu the following example.
+as demonstrated by the following example.
 
 /* m.c */
 #include 
@@ -2017,8 +2017,9 @@
 
 THIS PACKAGE, I.E. CFORTRAN.H, THIS DOCUMENT, AND THE CFORTRAN.H EXAMPLE
 PROGRAMS ARE PROPERTY OF THE AUTHOR WHO RESERVES ALL RIGHTS. THIS PACKAGE AND
-THE CODE IT PRODUCES MAY BE FREELY DISTRIBUTED WITHOUT FEES, SUBJECT TO THE
-FOLLOWING RESTRICTIONS:
+THE CODE IT PRODUCES MAY BE FREELY DISTRIBUTED WITHOUT FEES, SUBJECT
+(AT YOUR CHOICE) EITHER TO THE GNU LIBRARY GENERAL PUBLIC LICENSE
+AT http://www.gnu.org/licenses/lgpl.html OR TO THE FOLLOWING RESTRICTIONS:
 - YOU MUST ACCOMPANY ANY COPIES OR DISTRIBUTION WITH THIS (UNALTERED) NOTICE.
 - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA 
   (E.G. TAPE, DISK, COMPUTER, PAPER.)
diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.h /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h
--- cernlib-2005.05.09/src/cfortran/cfortran.h	2002-09-11 13:05:51.000000000 -0400
+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h	2004-12-10 10:47:34.000000000 -0500
@@ -1,4 +1,4 @@
-/* cfortran.h  4.4_cernlib2002 */
+/* cfortran.h  4.4 */
 /* http://www-zeus.desy.de/~burow/cfortran/                   */
 /* Burkhard Burow  burow at desy.de                 1990 - 2002. */
 
@@ -11,6 +11,32 @@
    MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE.
 */
 
+/* The following modifications were made by the authors of CFITSIO or by me. 
+ * I've flagged them below with "(CFITSIO)" or "(KMCCARTY)".
+ * PDW = Peter Wilson
+ * DM  = Doug Mink
+ * LEB = ??
+ * -- Kevin McCarty, for Debian (11/29/2003) */
+
+/*******
+   Modifications:
+      Oct 1997: Changed symbol name extname to appendus (PDW/HSTX)
+                (Conflicted with a common variable name in FTOOLS)
+      Nov 1997: If g77Fortran defined, also define f2cFortran (PDW/HSTX)
+      Feb 1998: Let VMS see the NUM_ELEMS code. Lets programs treat
+                single strings as vectors with single elements
+      Nov 1999: If macintoxh defined, also define f2cfortran (for Mac OS-X)
+      Apr 2000: If WIN32 defined, also define PowerStationFortran and
+                VISUAL_CPLUSPLUS (Visual C++)
+      Jun 2000: If __GNUC__ and linux defined, also define f2cFortran
+                (linux/gcc environment detection)
+      Apr 2002: If __CYGWIN__ is defined, also define f2cFortran
+      Nov 2002: If __APPLE__ defined, also define f2cfortran (for Mac OS-X)
+
+      Nov 2003: If __INTEL_COMPILER or INTEL_COMPILER defined, also define
+                f2cFortran (KMCCARTY)
+ *******/
+
 /* 
   Avoid symbols already used by compilers and system *.h:
   __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c
@@ -75,7 +101,8 @@
 
 /* Remainder of cfortran.h depends on the Fortran compiler. */
 
-#if defined(CLIPPERFortran) || defined(pgiFortran)
+/* 11/29/2003 (KMCCARTY): add *INTEL_COMPILER symbols here */
+#if defined(CLIPPERFortran) || defined(pgiFortran) || defined(__INTEL_COMPILER) || defined(INTEL_COMPILER)
 #define f2cFortran
 #endif
 
@@ -90,6 +117,27 @@
                            Support f2c or f77 with gcc, vcc with f2c. 
                            f77 with vcc works, missing link magic for f77 I/O.*/
 #endif
+/* 04/13/00 DM (CFITSIO): Add these lines for NT */
+/*   with PowerStationFortran and and Visual C++ */
+#if defined(WIN32) && !defined(__CYGWIN__)
+#define PowerStationFortran   
+#define VISUAL_CPLUSPLUS
+#endif
+#if defined(g77Fortran)                        /* 11/03/97 PDW (CFITSIO) */
+#define f2cFortran
+#endif
+#if        defined(__CYGWIN__)                 /* 04/11/02 LEB (CFITSIO) */
+#define       f2cFortran 
+#endif
+#if        defined(__GNUC__) && defined(linux) /* 06/21/00 PDW (CFITSIO) */
+#define       f2cFortran 
+#endif
+#if defined(macintosh)                         /* 11/1999 (CFITSIO) */
+#define f2cFortran
+#endif
+#if defined(__APPLE__)                         /* 11/2002 (CFITSIO) */
+#define f2cFortran
+#endif
 #if defined(__hpux)             /* 921107: Use __hpux instead of __hp9000s300 */
 #define       hpuxFortran       /*         Should also allow hp9000s7/800 use.*/
 #endif
@@ -131,6 +179,7 @@
 #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
 /* If your compiler barfs on ' #error', replace # with the trigraph for #     */
  #error "cfortran.h:  Can't find your environment among:\
+    - GNU gcc (g77) on Linux.                                            \
     - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...)     \
     - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000     \
     - VAX   VMS CC 3.1 and FORTRAN 5.4.                                  \
@@ -151,7 +200,8 @@
     - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran          \
     - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \
     - Absoft Pro Fortran: Use #define AbsoftProFortran \
-    - Portland Group Fortran: Use #define pgiFortran"
+    - Portland Group Fortran: Use #define pgiFortran \
+    - Intel Fortran: Use #define INTEL_COMPILER"
 /* Compiler must throw us out at this point! */
 #endif
 #endif
@@ -164,7 +214,8 @@
 
 /* Throughout cfortran.h we use: UN = Uppercase Name.  LN = Lowercase Name.   */
 
-#if defined(f2cFortran) || defined(NAGf90Fortran) || defined(DECFortran) || defined(mipsFortran) || defined(apolloFortran) || defined(sunFortran) || defined(CONVEXFortran) || defined(SXFortran) || defined(extname)
+/* "extname" changed to "appendus" below (CFITSIO) */
+#if defined(f2cFortran) || defined(NAGf90Fortran) || defined(DECFortran) || defined(mipsFortran) || defined(apolloFortran) || defined(sunFortran) || defined(CONVEXFortran) || defined(SXFortran) || defined(appendus)
 #define CFC_(UN,LN)            _(LN,_)      /* Lowercase FORTRAN symbols.     */
 #define orig_fcallsc(UN,LN)    CFC_(UN,LN)
 #else 
@@ -268,7 +319,8 @@
 #endif
 
 #ifndef apolloFortran
-#define COMMON_BLOCK_DEF(DEFINITION, NAME) DEFINITION NAME
+/* "extern" removed (CFITSIO) */
+#define COMMON_BLOCK_DEF(DEFINITION, NAME) /* extern */ DEFINITION NAME
 #define CF_NULL_PROTO
 #else                                         /* HP doesn't understand #elif. */
 /* Without ANSI prototyping, Apollo promotes float functions to double.    */
@@ -512,7 +564,7 @@
                     *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO)  ),   \
   (F).dsc$a_a0    =  ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length          ,(F))
 
-#else
+#endif      /* PDW: 2/10/98 (CFITSIO) -- Let VMS see NUM_ELEMS definitions */
 #define _NUM_ELEMS      -1
 #define _NUM_ELEM_ARG   -2
 #define NUM_ELEMS(A)    A,_NUM_ELEMS
@@ -540,7 +592,8 @@
 }
 return (int)num;
 }
-#endif
+/* #endif removed 2/10/98 (CFITSIO) */
+
 /*-------------------------------------------------------------------------*/
 
 /*           UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS       */


--- NEW FILE 308-use-canonical-cfortran-location.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 308-use-canonical-cfortran-location.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: All code compiled at Cernlib build-time should look for cfortran.h
## DP: at .

@DPATCH@
diff -urNad cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c /tmp/dpep.d3syqe/cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c
--- cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c	1996-02-14 08:10:26.000000000 -0500
+++ /tmp/dpep.d3syqe/cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c	2005-06-09 13:13:22.079711057 -0400
@@ -39,7 +39,7 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  */
 
-#include "higz/cfortran.h"
+#include 
 #if !defined(VMS) && !defined(_WINDOWS)
 #include "higz/tkConfig.h"
 #endif
diff -urNad cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c /tmp/dpep.d3syqe/cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c
--- cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c	1996-04-17 10:46:29.000000000 -0400
+++ /tmp/dpep.d3syqe/cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c	2005-06-09 13:14:58.654908060 -0400
@@ -16,7 +16,7 @@
 #include	
 
 
-#include	"cfortran.h"
+#include	
 
 /* #include	"packlib.h" */
 #include	"hbook_interface.h"


--- NEW FILE 309-define-dummy-herwig-routines.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 309-define-dummy-herwig-routines.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Define stub functions for herwig routines that are supposed to be
## DP: provided by the user.  Also, comment out the dummy functions pdfset
## DP: and structm; real versions are provided in pdflib.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/Imakefile	2005-11-28 19:46:53.619963660 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/Imakefile	2005-11-28 19:46:58.890844233 +0000
@@ -24,8 +24,13 @@
 	hwulob.F hwulof.F hwulor.F hwumas.F hwupcm.F hwurap.F hwures.F \ @@\
 	hwurob.F hwurof.F hwurot.F hwusor.F hwusqr.F hwusta.F hwutab.F \ @@\
 	hwutim.F hwvdif.F hwvdot.F hwvequ.F hwvsca.F hwvsum.F hwvzro.F \ @@\
-	hwwarn.F ieupdg.F ipdgeu.F pdfset.F qqinit.F qqlmat.F sasano.F \ @@\
-	sasbeh.F sasdir.F sasgam.F sasvmd.F structm.F
+	hwwarn.F ieupdg.F ipdgeu.F /*pdfset.F*/ qqinit.F qqlmat.F sasano.F \ @@\
+	sasbeh.F sasdir.F sasgam.F sasvmd.F /*structm.F*/
+	/* comment out pdfset.F, structm.F; real versions are in pdflib */
+
+/* add the following file to define dummy routines as weak symbols */
+/* --Kevin McCarty, for Debian */
+SRCS_C= dummy.c
 
 FORTRANSAVEOPTION = FortranSaveFlags
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/dummy.c cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/dummy.c
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/dummy.c	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/dummy.c	2005-11-28 19:49:17.897320746 +0000
@@ -0,0 +1,34 @@
+/* Dummy file to avoid undefined symbols in the library */
+/* Kevin McCarty, 14 Jan 2003 */
+
+#include 
+#include 
+
+/* Want the dummy functions to be weakly defined so they may be overridden
+ * without error. */
+
+#define kludge(x)    #x
+#define stringify(x) kludge(x)
+#define underline(x) dummy_ ## x
+
+#define DUMMY(UPPERNAME, fortranname_, returntype) \
+static returntype underline(fortranname_)() { print_dummy(#UPPERNAME); } \
+void fortranname_() \
+	__attribute__ ((weak, alias (stringify(underline(fortranname_))) ))
+
+static void print_dummy(const char *function)
+{
+  fprintf(stderr, "herwig59: Now in dummy %s routine.\n", function);
+  fprintf(stderr,
+          "If you see this message, you should define your own such routine.\n"
+#if defined (CERNLIB_DEBIAN)
+	  "For details, see the file /usr/share/doc/libherwig59-2-dev/herwig59.txt.gz\n"
+#endif
+  );
+  exit(EXIT_FAILURE);
+}
+
+DUMMY(HWABEG, hwabeg_, void);
+DUMMY(HWANAL, hwanal_, void);
+DUMMY(HWAEND, hwaend_, void);
+


--- NEW FILE 310-define-dummy-fowl-routines.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 310-define-dummy-fowl-routines.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Define stub functions for routines in fowl that are supposed to be
## DP: user-defined.  Also, rename START to FSTART to avoid name clash
## DP: with mathlib.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/Imakefile cernlib-2005.05.09.dfsg/src/phtools/fowl/Imakefile
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/Imakefile	1996-04-26 07:13:52.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/Imakefile	2005-11-28 19:49:52.412989577 +0000
@@ -1,10 +1,12 @@
-SRCS_F=	 beamin.F breitw.F chmove.F delsq.F dumpme.F finish.F \ @@\
+SRCS_F=	 beamin.F breitw.F chmove.F delsq.F dumpme.F /* finish.F */ \ @@\
 	fmass.F fmassq.F fowl.F fowlmp.F fowlpr.F genev.F histey.F \ @@\
 	labsys.F pdk.F qqstrt.F rangnr.F redat2.F redata.F rotes2.F \ @@\
 	scout.F teedia.F tranch.F xplsdx.F
 
+SRCS_C= dummy.c /*"fake" defn of start, user, finish to avoid undefined syms*/
+
 #if !defined(CERNLIB_UNIX)
-SRCS_F := $(SRCS_F) start.F
+SRCS_F := $(SRCS_F) /* start.F */
 #endif
 
 SubdirLibraryTarget(fowl,NullParameter)
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/dummy.c cernlib-2005.05.09.dfsg/src/phtools/fowl/dummy.c
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/dummy.c	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/dummy.c	2005-11-28 19:53:31.287496776 +0000
@@ -0,0 +1,39 @@
+/* Dummy file to avoid undefined symbols in the library */
+/* Kevin McCarty, 26 Apr 2004 */
+/* Last revised 13 Aug 2004 */
+
+#include 
+#include 
+
+/* Want the dummy functions to be weakly defined so they may be overridden
+ * without error. */
+
+#define kludge(x)    #x
+#define stringify(x) kludge(x)
+#define underline(x) dummy_ ## x
+
+#define DUMMY(UPPERNAME, fortranname_, returntype) \
+static returntype underline(fortranname_)() { print_dummy(#UPPERNAME); } \
+void fortranname_() \
+	__attribute__ ((weak, alias (stringify(underline(fortranname_))) ))
+
+static void print_dummy(const char *function)
+{
+  fprintf(stderr, "phtools: Now in dummy %s routine.\n", function);
+  fprintf(stderr,
+          "If you see this message, you should define your own such routine.\n"
+	  "For details, see "
+#if defined (CERNLIB_DEBIAN)
+	                   "/usr/share/doc/libphtools2-dev/README.Debian\n"
+	  "and "
+#endif
+	      "the CERN writeup for FOWL (available at the URL\n"
+	  "http://wwwasdoc.web.cern.ch/wwwasdoc/Welcome.html ; scroll down\n"
+	  "to the link for W505 - FOWL.)\n");
+  exit(EXIT_FAILURE);
+}
+
+DUMMY(FSTART, fstart_, void);
+DUMMY(USER,   user_,   void);
+DUMMY(FINISH, finish_, void);
+
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/fowlmp.F cernlib-2005.05.09.dfsg/src/phtools/fowl/fowlmp.F
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/fowlmp.F	1996-03-22 16:42:46.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/fowlmp.F	2005-11-28 19:49:52.412989577 +0000
@@ -30,7 +30,7 @@
       CALL REDATA
       IF(NEVTOT.LT.NGRP) NGRP = NEVTOT
       N2 = MIN (NEVTOT/NGRP, 30000)
-      CALL START
+      CALL FSTART
       DO  500 I2= 1, N2
       DO  400  I= 1, NGRP
       IEVENT = IEVENT + 1
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/qqstrt.F cernlib-2005.05.09.dfsg/src/phtools/fowl/qqstrt.F
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/qqstrt.F	1996-03-22 16:42:47.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/qqstrt.F	2005-11-28 19:49:52.412989577 +0000
@@ -38,6 +38,9 @@
       COMMON
      +/TAPES / NTPIN     ,NTPOUT   ,NTPNCH   ,NTPBIN   ,KONSOL
       IF(JEVT.LE.0) RETURN
+#if 0
+C     Comment this section out; "which" is obsolete
+C     -- Kevin McCarty, for Debian, 26 April 2004
       CALL WHICH(ISIT,VAL)
       WRITE(6,700)JEVT,VAL
   700 FORMAT('0RANDOM NUMBER GENERATOR INITIATED TO',I12,
@@ -46,6 +49,7 @@
 C--     CDC   60-BIT WORD
 CDC                             )B10000000000000007171 .RO.  TVEJ( = POL
       GOTO 200
+#endif
   100 CONTINUE
 C         FOR -CDC JUST MAKE SURE IT IS ODD
       IGLOP = JEVT


--- NEW FILE 311-skip-duplicate-qnext.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 311-skip-duplicate-qnext.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't compile in redundant versions of qnext.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile	1998-03-05 08:17:18.000000000 -0500
+++ /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile	2005-06-09 14:28:05.755053006 -0400
@@ -1,5 +1,6 @@
+/* don't compile qnexte.F --Kevin*/
 SRCS_F= abend.F accessf.F exitf.F \ @@\
-	intrac.F jumpxn.F lnblnk.F locb.F locf.F qnexte.F unlinkf.F
+	intrac.F jumpxn.F lnblnk.F locb.F locf.F unlinkf.F
 
 #ifndef CERNLIB_OS9
 SRCS_F := $(SRCS_F) timed.F timel.F timex.F 
diff -urNad cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile
--- cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile	1996-03-06 05:47:15.000000000 -0500
+++ /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile	2005-06-09 14:28:05.755053006 -0400
@@ -1,6 +1,7 @@
+/* don't compile qnext.F --Kevin*/
 SRCS_F=	 izbcd.F izbcdt.F izbcdv.F izchav.F izhnum.F lzbyt.F \ @@\
 	lzfind.F lzfval.F lzlast.F lzlong.F nzbank.F nzfind.F nzlong.F \ @@\
-	qnext.F zhtoi.F zitoh.F zkrak.F zkrakn.F znumid.F zpress.F \ @@\
+	zhtoi.F zitoh.F zkrak.F zkrakn.F znumid.F zpress.F \ @@\
 	zshunt.F zsort.F zsorth.F zsorti.F zsorv.F zsorvh.F zsorvi.F \ @@\
 	ztopsy.F
 


--- NEW FILE 312-skip-duplicate-gamma.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 312-skip-duplicate-gamma.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't compile in redundant gamma function in isajet; use the mathlib one

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile /tmp/dpep.IX54UM/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2005-06-09 14:29:18.976494518 -0400
+++ /tmp/dpep.IX54UM/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2005-06-09 14:30:21.913126207 -0400
@@ -1,12 +1,13 @@
 DoIncludePackage(isajet)
 #include "pilot.h"
 
+/* gamma.F removed; use the one defined in mathlib/gen/c/gamma.F */
 SRCS_F= \ @@\
 	 amass.F charge.F cteq5l.F ctxc2i.F ctxi2c.F ctxin.F ctxout.F \ @@\
 	 dblpcm.F dblvec.F dboost.F decay.F decjet.F \ @@\
 	 domssm.F drllyn.F eebeg.F eemax.F elctrn.F epf.F evol01.F evol02.F \ @@\
 	 evol03.F evol05.F evol06.F evol07.F evolms.F evolve.F flavor.F \ @@\
-	 fortop.F frgjet.F frgmnt.F gamma.F getpt.F gettot.F heavyx.F \ @@\
+	 fortop.F frgjet.F frgmnt.F         getpt.F gettot.F heavyx.F \ @@\
 	 hevolv.F higgs.F idanti.F idgen.F iframs.F inisap.F ipartns.F \ @@\
 	 ipjset.F iprtns.F irmov0.F isabeg.F isaend.F isaevt.F isaini.F \ @@\
 	 isajet.F isasrt.F ispjet.F istrad.F iswdky.F jetgen.F \ @@\


--- NEW FILE 313-comis-preserves-filename-case.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 313-comis-preserves-filename-case.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Have COMIS preserve filename case when interpreting FORTRAN code.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2003-02-13 09:25:23.000000000 -0500
+++ /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2005-06-09 15:24:32.751560586 -0400
@@ -200,6 +200,14 @@
   ku_exel( "/KUIP/SET_SHOW/COLUMNS -1" );
   ku_exel( "/KUIP/SET_SHOW/DOLLAR 'ON'" );
 
+#if defined(UNIX) && (defined(WINNT) || !defined(MSDOS))
+/* Correct the default behavior of converting filenames to lower-case
+ * on a case-sensitive operating system... Not that I'm bitter or anything.
+ * --Kevin McCarty, for Debian
+ */
+  ku_exel( "/KUIP/SET_SHOW/FILECASE 'KEEP'" );
+#endif
+
   host_editor = getenv( "KUIPEDITOR" );
   if( host_editor == NULL )
     host_editor = getenv( "EDITOR" );
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	1997-09-25 10:02:25.000000000 -0400
+++ /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	2005-06-09 15:23:49.276738602 -0400
@@ -1064,11 +1064,12 @@
 .
 This command has only an effect on Unix systems to select whether filenames
 are kept as entered on the command line.
-The startup value is 'CONVERT', i.e. filenames are converted to lowercase.
+The startup value is 'KEEP', i.e. filename cases are preserved.  With
+the 'CONVERT' setting, filenames are converted to lowercase.
 .
 On other systems filenames are always converted to uppercase.
 .
-The 'RESTORE' option set the conversion mode to the value effective
+The 'RESTORE' option sets the conversion mode to the value effective
 before the last FILECASE KEEP/CONVERT command.
 E.g. the sequence
      FILECASE KEEP; EDIT Read.Me; FILECASE RESTORE
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F /tmp/dpep.GROFhd/cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F
--- cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F	1999-05-20 03:37:18.000000000 -0400
+++ /tmp/dpep.GROFhd/cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F	2005-06-09 15:23:49.276738602 -0400
@@ -140,7 +140,7 @@
       CHUTIT = ' '
 *
       IF (IPIAF.EQ.0) THEN
-         CALL KUOPEN(10,'PAW.METAFILE','UNKNOWN',ISTAT)
+         CALL KUOPEN(10,'paw.metafile','UNKNOWN',ISTAT)
 #if (defined(CERNLIB_IBM))&&(!defined(CERNLIB_IBMMVS))
          CALL HERMES(19)
          CALL VMCMS('FILEDEF 19 DISK GKSERROR OUTPUT A',IRET)


--- NEW FILE 314-permit-using-regcomp-for-re_comp.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 314-permit-using-regcomp-for-re_comp.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add a possibility to use regcomp() instead of re_comp() (selected at
## DP: compile time)

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c /tmp/dpep.OUDE1M/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c	1996-03-08 10:33:08.000000000 -0500
+++ /tmp/dpep.OUDE1M/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c	2005-06-09 15:49:30.689188356 -0400
@@ -18,6 +18,11 @@
 #include "kuip/mkutfu.h"
 #include "mkutda.h"
 
+#ifdef MATCH_REGCOMP
+#include 
+#include      /* for regex_t */
+#endif
+
 static char **ftype_list = NULL;
 static char **class_list = NULL;
 static char **stext_list = NULL;
@@ -92,8 +97,12 @@
     DIR            *dirp;
     struct dirent  *dp;
     char           *pattern;
+#ifdef MATCH_REGCOMP
+    regex_t        *re = (regex_t *)malloc( sizeof(regex_t) );
+#else
     char           *re;
 #endif
+#endif
     struct stat     filestatus;
 
     ndlist     = 0;
@@ -221,11 +230,15 @@
       }
     }
     pattern = mstrcat( pattern, "$" );
+#ifdef MATCH_REGCOMP
+    regcomp( re, pattern, REG_NEWLINE );
+#else
 #ifdef MATCH_RE_COMP
     re = re_comp( pattern );
 #else
     re = regcmp( pattern, NULL );
 #endif
+#endif
     free( pattern );
 
     /*
@@ -260,12 +273,16 @@
         }
         else if( (filestatus.st_mode & S_IFMT) == S_IFREG ) {
           /* regular file: match name against regexp */
+#ifdef MATCH_REGCOMP
+          int match = (regexec( re, dp->d_name, 0, NULL, 0 ) == 0);
+#else
 #ifdef MATCH_RE_COMP
           int match = re_exec( dp->d_name );
 #else
           int match = (regex( re, dp->d_name ) != NULL);
 #endif
-          if( match == 1 ) {
+#endif
+          if( match ) {
             filelist = (char**)realloc( (char*)filelist,
                                        (nflist+1) * sizeof(char*) );
             filelist[nflist] = strdup( dp->d_name );
@@ -276,6 +293,9 @@
       closedir( dirp );
     }
 
+#ifdef MATCH_REGCOMP
+    regfree( re );
+#endif
 #ifndef MATCH_RE_COMP
     free( re );
 #endif


--- NEW FILE 315-fixes-for-MacOSX.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 315-fixes-for-MacOSX.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch set (mostly due to Keisuke Fujii) to allow Cernlib to compile
## DP: and run on OS X.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/config/Imake.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules
--- cernlib-2005.05.09/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules	2005-06-09 15:52:06.472072084 -0400
@@ -2171,7 +2171,7 @@
 #define CppScriptTarget(dst,src,defs,deplist)				@@\
 dst::  src deplist							@@\
 	RemoveFile($@)							@@\
-	$(CPP) defs $@				@@\
+	$(CPP) defs src | CppSedMagic >$@				@@\
 	chmod a+x $@							@@\
 									@@\
 clean::									@@\
@@ -2203,7 +2203,7 @@
 #define CppFileTarget(dst,src,defs,deplist)				@@\
 dst::  src deplist							@@\
 	RemoveFile($@)							@@\
-	$(CPP) defs $@				@@\
+	$(CPP) defs src | CppSedMagic >$@				@@\
 									@@\
 clean::									@@\
 	RemoveFiles(dst)
diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf
--- cernlib-2005.05.09/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,170 @@
+XCOMM platform:  $SFO: MOSXS.cf,v 1.0 95/11/19 23:21:00 sl Exp $
+
+#define OSVendor          Apple Computer, Inc.
+#ifdef MacOSXArchitecture
+#define OSName            MacOSX
+#define OSMajorVersion    DefaultOSMajorVersion
+#define OSMinorVersion    DefaultOSMinorVersion
+#define OSTeenyVersion    0
+#endif
+
+#define ProjectRulesFile  
+#define ProjectTmplFile   
+
+#define InstKmemFlags -m 2755 -g kmem
+/* #define ConstructMFLAGS		NO */
+
+#define HasNdbm     YES
+#define SetTtyGroup YES
+#define HasBsearch  YES
+#ifdef MacOSXArchitecture
+#define HasPutenv               YES
+#define MathLibrary             /**/
+#define DBMLibrary              /**/
+#define TermcapLibrary          /**/
+#define HasBSD44Sockets         YES
+#define HAS_SNPRINTF            YES
+#endif
+
+#define NeedConstPrototypes     YES
+#define NeedVarargsPrototypes   YES
+#define NeedFunctionPrototypes  YES
+#define NeedWidePrototypes      NO
+
+#define GzipFontCompression     YES
+#define CompressAllFonts        YES
+
+#ifndef HasShm
+# define HasShm			YES
+#endif
+#ifndef BuildGlxExt
+# define BuildGlxExt 	  	YES
+# define GlxUseNSGL             YES
+#endif
+#define BuildServer             YES
+#define BuildXprint             NO
+#define BuildFonts              YES
+#define BuildDPMS               NO
+
+#define TenonServer             YES
+#define XprtServer              NO
+#define XVendorString "Tenon Intersystems Xtools"
+#define XVendorRelease 1000
+#ifndef UseRgbTxt
+#define UseRgbTxt               YES
+#endif
+
+#define BuildPexExt             NO
+
+#ifndef BuildGLXLibrary
+# define BuildGLXLibrary	YES
+#endif
+
+/* no direct graphics extension */
+#define	BuildXF86DGA	NO
+
+/* no extra tablets and weird input devices */
+#define BuildXInputExt	NO
+
+/* Build Xinerama (aka panoramiX) extension */
+#define BuildXinerama		YES
+
+/* no Display Power Management extension */
+#define	BuildDPMSExt	NO
+
+# define BuildXvExt     NO
+
+#ifndef OptimizationLevel
+# define OptimizationLevel -O
+#endif
+#define OptimizedCDebugFlags OptimizationLevel -fPIC -pipe
+#define ExtraLoadFlags -L/usr/X11R6/lib -L/sw/lib -L/usr/lib -lc
+
+#define BuildExamples YES
+
+#define StandardDefines -DCERNLIB_LINUX -DCERNLIB_PPC -DCERNLIB_MACOSX \
+			-Dunix=unix -D__powerpc__ -D__DARWIN__
+/* -DX_NOT_POSIX -DX_LOCALE */
+
+#define HasVoidSignalReturn YES
+
+#ifndef DependFlags
+#define DependFlags -I/usr/include/ansi -I/usr/include/bsd -I/sw/include
+#endif
+
+#define StandardIncludes -I/sw/include
+
+#define InstallCmd	install	/* unlink old */
+
+/* #define ArCmd libtool -a -o */
+#define ArCmd ar -r
+
+#ifndef RanlibCmd
+#define RanlibCmd	ranlib -c -s
+#endif
+
+/* see below for ServerDefines */
+
+#define PrimaryScreenResolution 95	/* for 17 inch screen */
+
+#define ServerCDebugFlags OptimizationLevel -fPIC -g -pipe
+
+#ifndef HasGcc
+#define HasGcc YES
+#endif
+
+#undef CcCmd
+#undef CplusplusCmd
+#ifdef MacOSXArchitecture
+#define CcCmd		cc -g -arch "ppc" -no-cpp-precomp
+#define CplusplusCmd    c++ -g -no-cpp-precomp
+#endif
+#ifndef CcCmd
+#define CcCmd cc -g
+#endif
+
+#define CppCmd        /usr/bin/cpp
+
+#include 
+#include 
+#undef XFree86Server
+/* #define GLX_DIRECT_RENDERING */
+
+#define f2cFortran              YES
+#define FortranCmd              g77 -g
+#define XargsCmd                xargs
+#define FortranSaveFlags        /* */ /* Everything static !? */
+#define OptimisedFortranFlags	OptimizationLevel -fPIC -funroll-loops \
+				-fomit-frame-pointer
+#define DefaultCCOptions	OptimizationLevel
+#define DefaultFCOptions        -fno-automatic \
+				-fno-second-underscore \
+				-fno-f90 -fugly-complex -fno-globals \
+				-fugly-init -Wno-globals OptimizationLevel
+
+#ifndef CernlibLocalDefines
+# define CernlibLocalDefines
+#endif
+#define CernlibSystem           -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX \
+				-DCERNLIB_PPC -DCERNLIB_QMGLIBC \
+				-DCERNLIB_MACOSX CernlibLocalDefines
+
+#undef CERNLIB_SHIFT
+
+#define CERNLIB_LINUX
+#define CERNLIB_UNIX
+#define CERNLIB_LNX
+#define CERNLIB_PPC
+#define CERNLIB_QMGLIBC
+#define CERNLIB_MACOSX
+
+#define X11Includes             -I/usr/X11R6/include
+
+/*
+ *  Create a Make Variable to allow building with/out Motif
+ */
+#undef MotifDependantMakeVar
+#define MotifDependantMakeVar(variable,value) variable=value
+/* End  CERNLIB changes */
+
+
diff -urNad cernlib-2005.05.09/src/config/MacOSX.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules
--- cernlib-2005.05.09/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,123 @@
+XCOMM $XConsortium: MOSXS.rules,v 1.1 97/12/12 15:34:45 sl Exp $
+
+/*
+ * MacOSX shared library rules
+ */
+
+#define HasSharedLibraries YES
+
+#define ForceNormalLib NO
+
+#ifndef SharedDataSeparation
+#define SharedDataSeparation YES
+#endif
+#ifndef SharedCodeDef
+#define SharedCodeDef
+#endif
+#ifndef SharedLibraryDef
+#define SharedLibraryDef -fno-common
+#endif
+
+#define ShLibIncludeFile 
+
+#ifndef SharedLibraryLoadFlags
+#define SharedLibraryLoadFlags
+#endif
+#ifndef PositionIndependentCFlags
+#define PositionIndependentCFlags
+#endif
+
+
+/*
+ * InstallSharedLibrary - generate rules to install the shared library.
+ * Edited 2003-05-09 by Kevin McCarty to add an install.shlib target.
+ */
+#ifndef InstallSharedLibrary
+#define InstallSharedLibrary(libname,rev,dest)				@@\
+.PHONY: install.shlib shlib/libname					@@\
+shlib/libname:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+install.shlib:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+$(DESTDIR)dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\
+	MakeDir($(DESTDIR)dest)						@@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.rev.dylib) $(DESTDIR)dest @@\
+	(T=`echo Concat($(DESTDIR)dest/lib,libname.rev.dylib) | sed 's/\.[^\.d]*\.dylib/\.dylib/'`;\ @@\
+		$(RM) $$T && $(LN) Concat(lib,libname.rev.dylib) $$T)	@@\
+	$(RM) Concat($(DESTDIR)dest/lib,libname.dylib)			@@\
+	$(LN) Concat(lib,libname.rev.dylib) Concat($(DESTDIR)dest/lib,libname.dylib)
+#endif /* InstallSharedLibrary */
+
+/*
+ * NormalSharedLibraryTarget - generate rules to create a shared library;
+ * build it into a different name so that the we do not hose people by having
+ * the library gone for long periods.
+ */
+#ifndef SharedLibraryTarget
+#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
+AllTarget(Concat(lib,libname.dylib))					@@\
+									@@\
+Concat(lib,libname.dylib):  solist $(EXTRALIBRARYDEPS)			@@\
+	$(RM) $@~							@@\
+	(cd down; $(CC) -I/usr/X11R6/lib -dynamiclib -undefined suppress -install_name /usr/X11R6/lib/$@ -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.dylib)
+
+#endif /* SharedLibraryTarget */
+
+/*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepLibraryTarget
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.dylib))					@@\
+									@@\
+Concat(lib,libname.dylib):  deplist $(EXTRALIBRARYDEPS)		@@\
+	$(RM) $@~							@@\
+	(cd down; $(CC) -I/usr/X11R6/lib -dynamiclib -undefined suppress -install_name /usr/X11R6/lib/$@ -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
+	$(RM) $@							@@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.dylib)
+
+#endif /* SharedDepLibraryTarget */
+
+/*
+ * SharedLibraryDataTarget - generate rules to create shlib data file;
+ */
+#ifndef SharedLibraryDataTarget
+#define SharedLibraryDataTarget(libname,rev,salist)
+#endif /* SharedLibraryDataTarget */
+
+#ifndef InstallSharedLibraryData
+#define InstallSharedLibraryData(libname,rev,dest)
+#endif /* InstallSharedLibraryData */
+
+/*
+ * SharedLibReferences - variables for shared libraries
+ */
+#ifndef SharedLibReferences
+#define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
+revname = rev								@@\
+Concat3(DEP,varname,LIB) = SharedLibDependencies(libname,libsource,revname) @@\
+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
+LintLibReferences(varname,libname,libsource)
+#endif
+
+/*
+ * SharedDSLibReferences - variables for shared libraries
+ */
+#ifndef SharedDSLibReferences
+#define SharedDSLibReferences(varname,libname,libsource,revname,rev)	@@\
+revname = rev								@@\
+Concat3(DEP,varname,LIB) = SharedDSLibDependencies(libname,libsource,revname) @@\
+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) Concat3(Shared,libname,Reqs)		@@\
+LintLibReferences(varname,libname,libsource)
+#endif
+
+
diff -urNad cernlib-2005.05.09/src/config/MacOSX.tmpl /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl
--- cernlib-2005.05.09/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,67 @@
+XCOMM $XConsortium: MOSXS.tmpl,v 1.2 97/12/12 19:07:12 sl Exp $
+
+/*
+ * Xnext shared library template
+ */
+
+
+
+#ifndef SharedXtReqs
+#define SharedXtReqs /**/
+#endif
+#ifndef SharedXawReqs
+#define SharedXawReqs /**/
+#endif
+#ifndef SharedXmuReqs
+#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB)
+#endif
+
+#define SharedLibX11 YES
+#define SharedX11Rev F
+SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev)
+
+#define SharedLibXau NO		/* don't need shared form */
+#define SharedLibXdmcp NO	/* don't need shared form */
+
+#define SharedLibXmu YES
+#define SharedXmuRev F
+
+#define SharedOldXRev F
+
+#define SharedLibXext YES
+#define SharedXextRev F
+
+#define SharedLibXt YES
+#define SharedXtRev F
+SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev)
+
+#define SharedXawRev F
+
+#define SharedXtfRev A
+
+#define SharedLibXi YES
+#define SharedXiRev F
+SharedLibReferences(XI,Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev)
+
+#define SharedLibXtst YES
+#define SharedXtstRev F
+SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev)
+
+
+#define SharedPexRev F
+SharedLibReferences(PEX,PEX5,$(PEXLIBSRC),SOPEXREV,SharedPexRev)
+
+#define SharedLibXie YES
+#define SharedXieRev F
+
+#define SharedLibICE YES
+#define SharedICERev F
+SharedLibReferences(ICE,ICE,$(ICESRC),SOICEREV,SharedICERev)
+
+#define SharedLibSM YES
+#define SharedSMRev F
+SharedLibReferences(SM,SM,$(SMSRC),SOSMREV,SharedSMRev)
+
+#define SharedFSRev F
+SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
+
diff -urNad cernlib-2005.05.09/src/config/site.def /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def
--- cernlib-2005.05.09/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def	2005-06-09 15:52:06.472072084 -0400
@@ -99,9 +99,7 @@
 /*   if it is already defined and false, undef it! */
 /* do not use shift by default
 #if defined(CERNLIB_UNIX) && !defined(CERNLIB_WINNT)
-#if ! defined(CERNLIB_SHIFT)
-#define CERNLIB_SHIFT
-#elif  ! CERNLIB_SHIFT
+#if defined(CERNLIB_SHIFT) && !CERNLIB_SHIFT
 #undef CERNLIB_SHIFT
 #endif
 #endif
diff -urNad cernlib-2005.05.09/src/geant321/gxint/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile
--- cernlib-2005.05.09/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile	2005-06-09 15:52:06.472072084 -0400
@@ -30,7 +30,7 @@
 
 gxint321.f:  gxint.F
 	RemoveFile($@)
-	$(CPP) $(FORTRANALLDEFMDEPEND) < $^ | sed -e '/^$$/d' | CppSedMagic >$@
+	FortranCmd -E $(FORTRANALLDEFMDEPEND) $^ | sed -e '/^$$/d' | CppSedMagic >$@
 
 install.lib:: $(CERN_LIBDIR)/gxint.f
 
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile	2005-06-09 15:52:06.471072296 -0400
@@ -7,8 +7,12 @@
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
 #ifdef CERNLIB_UNIX
+#ifdef CERNLIB_MACOSX
+SUBDIRS:= $(SUBDIRS) scripts
+#else
 SUBDIRS:= $(SUBDIRS) scripts mgr
 #endif
+#endif
 
 InstallLibSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F
--- cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	2005-06-09 15:52:06.483069745 -0400
@@ -92,7 +92,11 @@
 #endif
       ENDIF
       WRITE(Z,'(2D26.16)') H,T
+#if defined(CERNLIB_MACOSX)
+      READ(Z,'(2(4X,D22.16))') H1,T1
+#else
       READ(Z,'(2(D22.16,4X))') H1,T1
+#endif
        IF(IDS .EQ. 1) THEN
       ERRMAX=MAX(ERRMAX,ABS(H1-T1))
       LTEST= LTEST .AND. ERRMAX .LE.  TSTERR
diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F
--- cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	2005-06-09 15:52:06.483069745 -0400
@@ -70,7 +70,11 @@
 #endif
       END IF
       WRITE(Z,'(2D26.16)') R,T
+#if defined(CERNLIB_MACOSX)
+      READ(Z,'(2(4X,D22.16))') R1,T1
+#else
       READ(Z,'(2(D22.16,4X))') R1,T1
+#endif
       ERMAX= MAX(ERMAX,ABS(R1-T1))
       IF(IDS .EQ. 3 .OR. IDS .EQ. 4) THEN
        WRITE(LOUT,'(1X,F10.3,2F25.16,1P,D10.1)') SX,R,T,ABS(R1-T1)
diff -urNad cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile
--- cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
@@ -1,11 +1,11 @@
 
 .SUFFIXES:
 
-CopyFile(cojets.cpp,cojets.cin)
+CopyFile(cojets.cpp,cojets.s)
 CopyFile(decay.cpp,decay.cin)
 CopyFile(table.cpp,table.cin)
 
-CppFileTarget(cojets.dat,cojets.cin,NullParameter,table.cin decay.cin)
+CppFileTarget(cojets.dat,cojets.s,-E -traditional,table.cin decay.cin)
 
 PackageDirFileTarget(cojets.dat)
 
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
@@ -1,9 +1,9 @@
 
 .SUFFIXES:
 
-CopyFile(decay.cpp,decay.cin)
+CopyFile(decay.cpp,decay.s)
 
-CppFileTarget(isajet.dat,decay.cin,NullParameter,NullParameter)
+CppFileTarget(isajet.dat,decay.s,-E -traditional ,NullParameter)
 
 PackageDirFileTarget(isajet.dat)
 
diff -urNad cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c
--- cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2005-06-09 15:52:06.483069745 -0400
@@ -80,7 +80,7 @@
 static int pid;                 /* process identifier                   */
 static int logfd ;              /* logging file descriptor              */
 #if !defined(SOLARIS) && !defined(linux) && !defined(_AIX) \
-  && !defined(IRIX5) && !defined(apollo)
+  && !defined(IRIX5) && !defined(apollo) && !defined(__DARWIN__)
 extern int syslog();
 #endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX */
 extern char *getenv();
diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
--- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:51:53.621804393 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:52:06.485069320 -0400
@@ -2569,7 +2569,7 @@
 #if !defined(IBM) && !defined(_WIN32)
 /* I provide "getpass" myself as standard version truncates to 8 characters */
 #include 
-#ifdef CBREAK
+#if defined(CBREAK) || defined(CERNLIB_MACOSX)
 #define BSDTTY         /* First find out if BSD or SYSV terminal handling.. */
 #endif
  
@@ -2577,6 +2577,10 @@
 #include 
 #else
 #include 
+# if defined(CERNLIB_MACOSX)
+# define gtty(x,y) ioctl(x,TIOCGETP,y)
+# define stty(x,y) ioctl(x,TIOCSETP,y)
+# endif
 #endif
  
 /* Fails with gcc 3.4.3
@@ -3540,3 +3544,20 @@
  
 }
 #endif
+
+#if defined(CERNLIB_MACOSX)
+  /* need to define cuserid() for OS X */
+
+char * getlogin();
+
+char *
+cuserid(char *string)
+{
+  static char cuserid_str[L_cuserid];
+  char *result = (string ? string : cuserid_str);
+  
+  strncpy(result, getlogin(), L_cuserid - 1);
+  result[L_cuserid - 1] = '\0';
+  return result;
+}
+#endif /* CERNLIB_MACOSX */
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c
--- cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	2005-06-09 15:52:06.485069320 -0400
@@ -200,7 +200,7 @@
 || defined(_IBMR2) \
 || defined(__convexc__) \
 || defined(_OSK) \
-|| defined(__linux) || defined(__FreeBSD__)
+|| defined(__linux) || defined(__FreeBSD__) || defined(__DARWIN__)
 
   void systems_( command, buf, buflen, l, chars, rc, ovflw )
 
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
@@ -4,6 +4,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
@@ -10,6 +10,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -11,6 +11,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -6,6 +6,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -7,6 +7,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 	 
 
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -7,6 +7,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h
--- cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	2005-06-09 15:52:06.487068895 -0400
@@ -188,6 +188,17 @@
 #endif
 
 
+#ifdef CERNLIB_MACOSX
+#  define MACOSX
+#  define MACHINE_NAME "MACOSX"
+#  define UNIX
+#  define HAVE_MEMMOVE
+#  define HAVE_STRCASECMP
+#  define HAVE_SELECT
+#  define MATCH_REGCOMP         /* use regcomp/regexec */
+#endif
+
+
 #ifdef MSDOS
 #  define MACHINE_NAME "IBMPC"
 #  define OS_NAME "MSDOS"
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
@@ -26,7 +26,12 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+c     thanks to Keisuke Fujii for this patch for OS X
+#if defined(CERNLIB_MACOSX)
+          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
+#endif
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
@@ -35,7 +40,11 @@
           ENDIF
         ENDIF
       ELSE
+#if defined(CERNLIB_MACOSX)
+        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
+#endif
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
--- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:51:53.524825013 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:57:50.699841388 -0400
@@ -82,11 +82,19 @@
       IF(FEXT.EQ.'.c')THEN
         L=LENOCC(CHCC)
 *                                 'cc -c .... -fPIC name.c'
+#if defined(CERNLIB_MACOSX)
+        CHLINE=CHCC(:L)//' -fPIC -fno-common '//NAME(:LN)// '.c'
+#else
         CHLINE=CHCC(:L)//' -fPIC '//NAME(:LN)// '.c'
+#endif
       ELSE
         L=LENOCC(CHF77)
 *                                 'f77 -c .... -fPIC name.f'
+#if defined(CERNLIB_MACOSX)
+        CHLINE=CHF77(:L)//' -fPIC -fno-common '//NAME(:LN)// '.f'
+#else
         CHLINE=CHF77(:L)//' -fPIC '//NAME(:LN)// '.f'
+#endif
       ENDIF
       L=LENOCC(CHLINE)
       WRITE(LUNOUT,'(A)')CHLINE(:L)
@@ -176,8 +184,15 @@
       ENDIF
 #endif
 #if defined(CERNLIB_LINUX)
+# if defined(CERNLIB_MACOSX)
+      CHLINE= 'g77 -bundle -bind_at_load -bundle_loader '
+     +        '`/usr/bin/which pawX11` -o '
+     +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
+C     thanks to Keisuke Fujii for the above compiler command      
+# else
       CHLINE=                   'g77 -shared -o '
      +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
+# endif
 #endif
 #if defined(CERNLIB_ALPHA_OSF)
         CHLINE=                   'ld -shared -o '
diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -9,7 +9,7 @@
 EXTRA_LDOPTIONS=-Wl,-E
 #endif
 
-#if defined(CERNLIB_LINUX)
+#if defined(CERNLIB_LINUX) && !defined(CERNLIB_MACOSX)
 EXTRA_LDOPTIONS=-Wl,-E
 #endif
 


--- NEW FILE 318-additional-gcc-3.4-fixes.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 318-additional-gcc-3.4-fixes.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Additional fixes for gcc 3.4, courtesy of Andreas Jochens.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
--- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-14 12:31:12.078969103 -0400
+++ /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-14 12:33:16.618251997 -0400
@@ -2405,6 +2405,7 @@
  */
 
 static  FILE *cfile;
+static  rnetrc(), token();
  
 ruserpass(host, aname, apass)
         char *host, **aname, **apass;
@@ -2592,6 +2593,8 @@
 /*** NOTE MAXPASSWD IS DEFINED AS 8 IN ALL STANDARD UNIX SYSTEMS, BUT THIS
  *** GIVES US PROBLEMS INTERWORKING WITH VMS AND CRAY-SECURID SYSTEMS. ***/
 #define MAXPASSWD     20       /* max significant characters in password */
+
+static void (*sig)(), catch();
  
 char *
 getpass(prompt)
@@ -2608,7 +2611,6 @@
         register int c;
         FILE    *fi;
         static char pbuf[ MAXPASSWD + 1 ];
-        void    (*sig)(), catch();
  
         if((fi = fopen("/dev/tty", "r")) == NULL)
                 return((char*)NULL);
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c	1996-03-08 10:33:10.000000000 -0500
+++ /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c	2005-06-14 12:33:43.511482468 -0400
@@ -31,7 +31,7 @@
 /* _Xm routine definitions  */
 void    _XmHighlightBorder ();
 void   _XmUnhighlightBorder ();
-void   _XmDrawShadow ();
+/* void   _XmDrawShadow (); */
 
 /* Motif1.1 ( except apollo, hpux has _XmPrimitive... with two args only
  * Gunter 30-jan-95


--- NEW FILE 700-remove-kernlib-from-packlib-Imakefile.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 700-remove-kernlib-from-packlib-Imakefile.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	2005-06-10 16:46:36.495568752 -0400
+++ /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/Imakefile	2005-06-10 16:50:33.508709032 -0400
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= packlib pawlib graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib pawlib graflib mathlib geant321 mclibs phtools
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
@@ -23,5 +23,5 @@
 DelegateTarget(bin/kuipc,packlib)
 
 DelegateTarget(lib/packlib,packlib)
-DelegateTarget(lib/kernlib,packlib)
+DelegateTarget(lib/kernlib,kernlib)
 
diff -urNad cernlib-2005.05.09/src/packlib/Imakefile /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/packlib/Imakefile
--- cernlib-2005.05.09/src/packlib/Imakefile	1997-10-02 10:09:19.000000000 -0400
+++ /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/packlib/Imakefile	2005-06-10 16:48:25.928085636 -0400
@@ -4,7 +4,7 @@
 
 
 LIBDIRS= cspack epio fatmen ffread hbook hepdb kapack kuip \ @@\
-	 minuit zbook zebra kernlib
+	 minuit zbook zebra
 
 SUBDIRS= $(LIBDIRS)
 
@@ -17,14 +17,10 @@
 
 TestSubdirs($(LIBDIRS))
 
-#ifndef CERNLIB_VAXVMS
-
-InstallLibSubdirs(kernlib)
-
-#else
+#ifdef CERNLIB_VAXVMS
 
 SUBDIRS := $(SUBDIRS) vmslibfiles
-InstallLibSubdirs(kernlib vmslibfiles)
+InstallLibSubdirs(vmslibfiles)
 
 #endif
 


--- NEW FILE 701-patch-hbook-comis-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 701-patch-hbook-comis-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix up makefiles after moving hkfill.F and hkf1q.F in the other
## DP: 701 dpatch (a shell script).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/hbook/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile
--- cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	2005-06-10 17:04:08.866020136 -0400
@@ -19,8 +19,8 @@
 	hgn.F hgnf.F hgnpar.F hgstat.F hhipar.F hhxye.F hi.F \ @@\
 	hictoi.F hid1.F hid2.F hidall.F hidopt.F hidpos.F hie.F  \ @@\
 	hif.F hij.F hije.F hijxy.F hindex.F hinprx.F hinteg.F  \ @@\
-	hipak1.F histdo.F histgo.F hix.F hkf1.F hkf1q.F hkf2.F  \ @@\
-	hkff1.F hkff2.F hkffi1.F hkfi1.F hkfil2.F hkfill.F hkfilpf.F \ @@\
+	hipak1.F histdo.F histgo.F hix.F hkf1.F         hkf2.F  \ @@\
+	hkff1.F hkff2.F hkffi1.F hkfi1.F hkfil2.F          hkfilpf.F \ @@\
 	hkind.F hknul1.F hknuli.F hlabel.F hlabeq.F hlabnb.F \ @@\
 	hlattr.F hlccmp.F hldir.F hldir1.F hldir2.F hldirt.F \ @@\
 	hlgnxt.F hlhcmp.F hlimit.F hllsq.F hlnext.F hlocat.F \ @@\
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:02:24.843306185 -0400
+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:05:09.955931988 -0400
@@ -37,7 +37,8 @@
 	csspar.F cssubr.F cssvpt.F cstadv.F cstarr.F csterr.F cstext.F \ @@\
 	cstfrf.F cstinf.F cstlgb.F cstlog.F cstpar.F cstran.F cstrer.F \ @@\
 	cstypar.F cstype.F csubad.F csunam.F csundf.F csxpar.F \ @@\
-	mcline.F mcsident.F
+	mcline.F mcsident.F \ @@\
+	hkfill.F hkf1q.F /* moved here from src/packlib/hbook/code */
 
 #if defined(CERNLIB_PAW)
 SRCS_F := $(SRCS_F) cspawi.F cskuix.F cktoiv.F cspawv.F csmkvd.F \ @@\


--- NEW FILE 702-patch-Imakefiles-for-packlib-mathlib.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 702-patch-Imakefiles-for-packlib-mathlib.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Hacks to Imakefiles to go along with the 702 shellscript for moving
## DP: files around.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-10 22:19:15.720962444 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-10 22:24:26.783925145 -0400
@@ -1,6 +1,8 @@
 DoIncludePackage(gen)
 #include "pilot.h"
 
+/* rgmlt*.F have been moved into packlib/hbook to remove circular dependencies.
+   --Kevin McCarty, for Debian. */
 SRCS_F=	arithm.F c128.F c256.F c512.F c64.F cauchy64.F cft.F cfstft.F \ @@\
 	rfstft.F cgauss.F d107d1.F d107r1.F d501l1.F d501l2.F d501n1.F \ @@\
         d501n2.F d501p1.F d501p2.F d501sf.F d700su.F d701bd.F \ @@\
@@ -10,14 +12,14 @@
         epditr.F epdje.F epdloc.F epdsrt.F epdtab.F errorf.F esolve.F \ @@\
 	fcn1.F fftrc.F fumili.F gauss.F i128.F i32.F i64.F linsq.F \ @@\
 	mconv.F mft.F minfc.F minsq.F monito.F newro.F old506.F radapt.F \ @@\
-	radmul.F rca.F rfrdh164.F rfrdh264.F rft.F rgmlt64.F rgquad.F \ @@\
+	radmul.F rca.F rfrdh164.F rfrdh264.F rft.F           rgquad.F \ @@\
 	rgs56p.F rgset.F riwiad.F riwibd.F rknys64.F rknysd.F rkstp.F \ @@\
 	rpa.F rps.F rrkstp.F rsa.F rtriint.F s128.F s256.F s512.F \ @@\
 	s64.F scal.F sgz.F simps.F synt.F traper.F triint.F vd01a.F
 
 #if defined(CERNLIB_DOUBLE)
 SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
-	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F rgmlt.F rkstp64.F \ @@\
+	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F         rkstp64.F \ @@\
 	simps64.F triint64.F 
 #if defined(CERNLIB_LINUX)
 /* -O3 optimization breaks in g77 3.2 */
@@ -26,7 +28,7 @@
 #endif
 #else
 SRCS_F:= $(SRCS_F) cgauss128.F cauchy.F cauchy128.F deqbs128.F deqmr128.F \ @@\
-	deriv128.F minfc128.F rfrdh128.F rgmlt128.F rkstp128.F simps128.F \ @@\
+	deriv128.F minfc128.F rfrdh128.F            rkstp128.F simps128.F \ @@\
 	triint128.F 
 #endif
 
diff -urNad cernlib-2005.05.09/src/mathlib/gen/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/Imakefile	1996-10-02 12:09:45.000000000 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/Imakefile	2005-06-10 22:20:55.683416711 -0400
@@ -8,7 +8,8 @@
 IMAKE_DEFINES=-DFortranDoesCpp=NO
 #endif
 
-LIBDIRS= a b c d divon e f g h j m n s u v x
+/* "n" subdir moved to packlib/hbook/  --Kevin McCarty, for Debian */
+LIBDIRS= a b c d divon e f g h j m   s u v x
 
 SUBDIRS= $(LIBDIRS) gen tests
 
diff -urNad cernlib-2005.05.09/src/mathlib/hbook/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/hbook/Imakefile
--- cernlib-2005.05.09/src/mathlib/hbook/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/hbook/Imakefile	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,12 @@
+/* this Imakefile used to get hdiff to compile within the mathlib tree */
+
+#define IHaveSubdirs
+#define PassCDebugFlags
+
+LIBDIRS= hdiff
+SUBDIRS= $(LIBDIRS) hbook
+
+TopOfPackage(hbook)
+SubdirLibraryTarget(hbook,$(LIBDIRS))
+DoIncludePackage(hbook)
+InstallIncludeSubdirs(hbook)
diff -urNad cernlib-2005.05.09/src/mathlib/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/Imakefile
--- cernlib-2005.05.09/src/mathlib/Imakefile	2005-06-10 22:19:15.834937877 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/Imakefile	2005-06-10 22:20:05.279280394 -0400
@@ -3,7 +3,7 @@
 #define PassCDebugFlags 
 
 
-LIBDIRS= gen bvsl
+LIBDIRS= gen bvsl hbook /* hdiff stuff moved from packlib */
 
 /* Lapack is independent of Cernlib and should be installed as one of
    the build dependencies.
diff -urNad cernlib-2005.05.09/src/packlib/hbook/d/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/d/Imakefile
--- cernlib-2005.05.09/src/packlib/hbook/d/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/d/Imakefile	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,25 @@
+/* this Imakefile is used to get some things from mathlib/gen/d to compile
+   within the packlib/hbook tree */
+
+DoIncludePackage(gen)
+#include "pilot.h"
+
+SRCS_F=	rgmlt64.F
+
+#if defined(CERNLIB_DOUBLE)
+SRCS_F:= $(SRCS_F) rgmlt.F
+#else
+SRCS_F:= $(SRCS_F) rgmlt128.F
+#endif
+
+#ifdef CERNLIB_HPUX
+FORTRANOPTIONS += -WF,-P
+#endif
+
+#if defined(CERNLIB_SGI)
+IMAKE_DEFINES=-DFortranDoesCpp=NO
+#endif
+
+FORTRANSAVEOPTION = FortranSaveFlags
+
+SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/hbook/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/Imakefile
--- cernlib-2005.05.09/src/packlib/hbook/Imakefile	1997-04-28 04:21:23.000000000 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/Imakefile	2005-06-10 22:26:27.063010420 -0400
@@ -2,7 +2,9 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-LIBDIRS= hdiff hmerge hquad chbook fpclassc \ @@\
+/* hdiff moved to mathlib to avoid circular DLL dependencies; "d" and "n"
+   moved here from mathlib for the same reasons */
+LIBDIRS= d n   hmerge hquad chbook fpclassc \ @@\
 	 hrz code hmcstat hntup
 
 #ifdef CERNLIB_VAX


--- NEW FILE 703-patch-code_motif-packlib-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 703-patch-code_motif-packlib-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix up Imakefiles, etc. so that code_motif becomes a separate library
## DP: after moving it around in the patch 703 shell script.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/code_motif/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/code_motif/Imakefile
--- cernlib-2005.05.09/src/code_motif/Imakefile	1996-12-10 10:20:59.000000000 -0500
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/code_motif/Imakefile	2005-06-12 10:31:56.480928814 -0400
@@ -10,8 +10,10 @@
 	kuxxt.c mkdcmp.c mkdgra.c mkdpan.c mkmpan.c mkuip.c
 
 MotifDependantMakeVar(SRCS_C,$(MOTIF_SRCS_C))
-	
+
+/* Commented out since kmutil.c has been moved to packlib/kuip/code_kuip
 SRCS_C:= $(SRCS_C) kmutil.c
+*/
 
 #if defined(CERNLIB_VAXVMS)
 
@@ -22,4 +24,10 @@
  
 PACKAGE_INCLUDES := $(PACKAGE_INCLUDES) MotifIncludes X11Includes
 
-SubdirLibraryTarget(NullParameter,NullParameter)
+/* Top of package boilerplate to split this out as a separate library */
+
+TopOfPackage(packlib-lesstif)
+
+SubdirLibraryTarget(packlib-lesstif,NullParameter) 
+
+InstallLibrary(packlib-lesstif,$(CERN_LIBDIR))
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	2005-06-12 10:31:54.221414133 -0400
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/Imakefile	2005-06-12 10:32:20.947673659 -0400
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= kernlib packlib pawlib graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib code_motif pawlib graflib mathlib geant321 mclibs phtools
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	1999-11-24 04:52:07.000000000 -0500
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	2005-06-12 10:31:56.480928814 -0400
@@ -3,7 +3,9 @@
 SRCS_C=	getline.c kalias.c kbrow.c kedit.c kexec.c khash.c kicon.c \ @@\
 	kienbr.c kipiaf.c kkern.c kmacro.c kmath.c kmenu.c kmisc.c \ @@\
 	kmodel.c kmterm.c kuinit.c kutrue.c kuvers.c kuwhag.c	   \ @@\
-	kuwhat.c kvect.c
+	kuwhat.c kvect.c \ @@\
+	kmutil.c
+	/* ^^ moved here from code_motif.  --Kevin McCarty */
 
 #ifdef CERNLIB_WINNT
 SRCS_C :=$(SRCS_C) kmutil0.c
diff -urNad cernlib-2005.05.09/src/packlib/kuip/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/Imakefile	1997-11-28 12:26:56.000000000 -0500
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/Imakefile	2005-06-12 10:31:56.480928814 -0400
@@ -4,11 +4,14 @@
 
 LIBDIRS= code_kuip 
 
+/* Commented out so that code_motif gives a separate shared library
+ * --Kevin McCarty
 #ifndef CERNLIB_WINNT
 LIBDIRS := $(LIBDIRS) code_motif
 #else
 LIBDIRS := $(LIBDIRS) code_windows
 #endif
+*/
 
 SUBDIRS= $(LIBDIRS) programs examples kuip
 


--- NEW FILE 704-patch-code_kuip-higzcc-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 704-patch-code_kuip-higzcc-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch Imakefiles after moving kuwhag.c from packlib to grafX11.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile /tmp/dpep.IDWarm/cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile
--- cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile	1998-11-16 04:36:53.000000000 -0500
+++ /tmp/dpep.IDWarm/cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile	2005-06-13 09:45:37.637201936 -0400
@@ -1,7 +1,7 @@
 DoIncludePackage(higz)
 #include "pilot.h"
 
-SRCS_C=	igvers.c
+SRCS_C=	igvers.c kuwhag.c /* <-- moved here from packlib/kuip/code_kuip */
 
 #if defined(CERNLIB_FALCO) && !defined(CERNLIB_VAX)
 SRCS_C := $(SRCS_C) falint.c 
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile /tmp/dpep.IDWarm/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	2005-06-13 09:44:00.536042728 -0400
+++ /tmp/dpep.IDWarm/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	2005-06-13 09:44:41.448261682 -0400
@@ -2,7 +2,7 @@
 
 SRCS_C=	getline.c kalias.c kbrow.c kedit.c kexec.c khash.c kicon.c \ @@\
 	kienbr.c kipiaf.c kkern.c kmacro.c kmath.c kmenu.c kmisc.c \ @@\
-	kmodel.c kmterm.c kuinit.c kutrue.c kuvers.c kuwhag.c	   \ @@\
+	kmodel.c kmterm.c kuinit.c kutrue.c kuvers.c         	   \ @@\
 	kuwhat.c kvect.c \ @@\
 	kmutil.c
 	/* ^^ moved here from code_motif.  --Kevin McCarty */


--- NEW FILE 705-patch-paw_motif-paw-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 705-patch-paw_motif-paw-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	2005-06-13 16:04:27.418461884 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/Imakefile	2005-06-13 16:04:48.698899728 -0400
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= kernlib packlib code_motif pawlib graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile	1999-08-31 04:47:07.000000000 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile	2005-06-13 16:05:01.263206159 -0400
@@ -1,6 +1,6 @@
 #define IHaveCDF
 
-SRCS_CDF= pawcdf.cdf pamcdf.cdf mlpdef.cdf
+SRCS_CDF= pawcdf.cdf            mlpdef.cdf
 
 #ifdef CERNLIB_IBMRT
 /* Otherwise cc dies with internal compiler error on pawcdf. 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	2005-06-13 16:04:26.689618135 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	2005-06-13 16:04:33.962059051 -0400
@@ -11,8 +11,8 @@
 	pautit.F pavect.F paw.F pawbrk.F pawdef.F pawfca.F \ @@\
 	pawfitz.F pawfop.F pawfu1.F pawfu2.F \ @@\
 	pawfu3.F pawfud.F pawfun.F pawfuy.F pawild.F pawins.F pawint.F \ @@\
-	pawint1.F pawint2.F pawint3.F pawint4.F pawintm.F \ @@\
-	pawjoj.F pawloc.F pawork.F pawpp.F pawrit.F pawrop.F \ @@\
+	pawint1.F pawint2.F pawint3.F pawint4.F           \ @@\
+	pawjoj.F pawloc.F pawork.F         pawrit.F pawrop.F \ @@\
 	pawsim.F pawusr.F pawuwf.F paxcut.F pazdz.F pazfz.F pazrz.F \ @@\
 	pchain.F pchclo.F pchncd.F pchrop.F pcnext.F pfclos.F \ @@\
 	pfhigz.F pfindc.F pfindf.F pfindf1.F pfindv.F pfinit.F pflog.F \ @@\
diff -urNad cernlib-2005.05.09/src/pawlib/paw/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/Imakefile	2000-06-27 11:27:03.000000000 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/Imakefile	2005-06-13 16:04:33.962059051 -0400
@@ -9,6 +9,9 @@
 
 LIBDIRS= code cpaw cdf ntuple mlpfit
 
+/* Comment out this whole section; Motif code has been moved to
+   paw_motif at top level.  -- Kevin McCarty */
+#if 0
 #ifndef CERNLIB_WINNT
 LIBDIRS :=$(LIBDIRS) $(MOTIF_DIRS) $(PAWPP_DIRS)
 #endif
@@ -22,6 +25,7 @@
 MotifDependantMakeVar(PAWPP_DIRS,xbaevms)
 LIBDIRS := $(LIBDIRS) $(PAWPP_DIRS)
 #endif
+#endif
 
 SUBDIRS= $(LIBDIRS) programs piafs hbpiaf stagerd paw
 
diff -urNad cernlib-2005.05.09/src/paw_motif/cdf/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/cdf/Imakefile
--- cernlib-2005.05.09/src/paw_motif/cdf/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/cdf/Imakefile	2005-06-13 16:04:33.963058837 -0400
@@ -0,0 +1,5 @@
+#define IHaveCDF
+
+SRCS_CDF= pamcdf.cdf
+
+SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/paw_motif/code/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/code/Imakefile
--- cernlib-2005.05.09/src/paw_motif/code/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/code/Imakefile	2005-06-13 16:04:33.963058837 -0400
@@ -0,0 +1,7 @@
+SRCS_F=	pawintm.F pawpp.F
+
+DoIncludePackage(paw)
+#include "pilot.h"
+
+SubdirLibraryTarget(NullParameter,NullParameter)
+
diff -urNad cernlib-2005.05.09/src/paw_motif/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/Imakefile
--- cernlib-2005.05.09/src/paw_motif/Imakefile	2000-06-27 11:27:03.000000000 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/Imakefile	2005-06-13 16:04:33.963058837 -0400
@@ -7,7 +7,7 @@
 MotifDependantMakeVar(MOTIF_DIRS,cmotif fmotif fpanelsc)
 MotifDependantMakeVar(PAWPP_DIRS,fpanelsf tree uimx)
 
-LIBDIRS= code cpaw cdf ntuple mlpfit
+LIBDIRS= code cdf
 
 #ifndef CERNLIB_WINNT
 LIBDIRS :=$(LIBDIRS) $(MOTIF_DIRS) $(PAWPP_DIRS)
@@ -23,19 +23,11 @@
 LIBDIRS := $(LIBDIRS) $(PAWPP_DIRS)
 #endif
 
-SUBDIRS= $(LIBDIRS) programs piafs hbpiaf stagerd paw
-
-#if defined CERNLIB_WINNT
-SUBDIRS := $(LIBDIRS) programs
-#endif
-
-TopOfPackage(paw)
-
-SubdirLibraryTarget(paw,$(LIBDIRS))
+SUBDIRS= $(LIBDIRS)
 
-InstallBinSubdirs(programs)
+TopOfPackage(pawlib-lesstif)
 
-TestSubdirs(test)
+SubdirLibraryTarget(pawlib-lesstif,$(LIBDIRS))
 
-InstallIncludeSubdirs(paw)
+InstallLibrary(pawlib-lesstif,$(CERN_LIBDIR))
 


--- NEW FILE 800-implement-shared-library-rules-in-Imake.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 800-implement-shared-library-rules-in-Imake.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Implement macros for shared libraries on Linux in the Imake cfg files.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2005-11-29 17:07:32.035570303 +0000
+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2005-11-29 17:07:40.003888782 +0000
@@ -904,6 +904,8 @@
  * InstallSharedLibrary - generate rules to install the indicated sharable 
  * Library
  */
+/* Commented out because this appears to be overriding the definition
+ * in lnxLib.rules --Kevin McCarty, 16 May 2002
 #undef InstallSharedLibrary
 #ifndef InstallSharedLibrary
 #define InstallSharedLibrary(libname,rev,dest)				@@\
@@ -917,7 +919,8 @@
 	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS)  $< $@		@@\
 	RemoveFile($<)							@@\
 	$(LN) $@ $<
-#endif /* InstallSharedLibrary */
+#endif InstallSharedLibrary
+*/
 
 /*
  * InstallLinkKitLibrary - rule to install Link Kit library.
@@ -1963,6 +1966,15 @@
 #endif /* InstallSubdirs */
 
 /*
+ * InstallSharedLibSubdirs - generate rules to recursively install shared
+ * libraries.  Added by Kevin McCarty for Debian, 15 May 2002
+ */
+#ifndef InstallSharedLibSubdirs
+#define InstallSharedLibSubdirs(dirs) \
+NamedTargetSubdirs(install.shlib,dirs,"installing",DESTDIR=$(DESTDIR),install.shlib)
+#endif /* InstallSharedLibSubdirs */
+
+/*
  * InstallBinSubdirs - generate rules to recursively install programs and
  *		       scripts
  */
@@ -2341,9 +2353,12 @@
  */
 #ifndef DefinePackageLibrary
 #define DefinePackageLibrary(locallib) \
+/* commented out since these will be .so files. -Kevin */		@@\
+/*									@@\
 ifeq ($(strip $(PACKAGE_LIB)),)						@@\
 PACKAGE_LIB=$(TOP)$(PACKAGETOP)/LibraryTargetName($(PACKAGE_NAME))	@@\
 endif									@@\
+*/									@@\
 ifneq (locallib,)							@@\
 override PACKAGE_LIB:= LibraryTargetName(locallib) $(PACKAGE_LIB)	@@\
 									@@\
diff -urNad cernlib-2005.05.09.dfsg~/src/config/biglib.rules cernlib-2005.05.09.dfsg/src/config/biglib.rules
--- cernlib-2005.05.09.dfsg~/src/config/biglib.rules	2000-04-19 10:51:01.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/config/biglib.rules	2005-11-29 17:09:29.336812562 +0000
@@ -227,7 +227,7 @@
 	RanLibrary($@)
 #endif
 
-#if defined(HPArchitecture)
+#if defined(HPArchitecture) && !defined(LinuxArchitecture)
 
 #ifndef SharedLibraryTargetName
 #define SharedLibraryTargetName(name)Concat(lib,name.sl)
@@ -264,7 +264,7 @@
 	@date
 #endif
 
-#elif defined(AlphaArchitecture)
+#elif defined(AlphaArchitecture) && !defined(LinuxArchitecture)
 
 #ifndef SharedLibraryTargetName
 #define SharedLibraryTargetName(name)Concat(lib,name.so)
@@ -281,6 +281,41 @@
 	@date
 #endif
 
+#elif defined(LinuxArchitecture) /* added by Kevin McCarty
+				    for Debian, 15 May 2002 */
+#ifndef SharedLibraryTargetName
+#define SharedLibraryTargetName(name)Concat(lib,name.so.$(LIB_SONAME).$(CERN_LEVEL))
+#endif
+
+#ifndef SharedLibraryBuild
+#define SharedLibraryBuild(libname,version)				@@\
+SharedLibraryTargetName(libname): version/objects.list			@@\
+	@echo rebuild version library $@ in $(CURRENT_DIR)		@@\
+	@$(RM) $@							@@\
+	@date								@@\
+	@$(FCLINK) -shared -Wl,-soname=Concat(lib,libname.so.$(LIB_SONAME))\ @@\
+		-o $@ `cat version/objects.list` `cernlib -v "" -dy libname\ @@\
+		| sed s/Concat(-l,libname)//g`				@@\
+	@date
+#endif
+
+#elif defined(DarwinArchitecture) /* added by Kevin McCarty
+				      for fink, 10 May 2003 */
+#ifndef SharedLibraryTargetName
+#define SharedLibraryTargetName(name)Concat(lib,name.$(LIB_SONAME).$(CERN_LEVEL).dylib)
+#endif
+
+#ifndef SharedLibraryBuild
+#define SharedLibraryBuild(libname,version)				@@\
+SharedLibraryTargetName(libname): version/objects.list			@@\
+	@echo rebuild version library $@ in $(CURRENT_DIR)		@@\
+	@$(RM) $@							@@\
+	@/usr/bin/libtool -dynamic -o $@ -compatibility_version $(LIB_SONAME) \ @@\
+		`cat version/objects.list` `cernlib -v "" -dy libname	\ @@\
+		| sed s/Concat(-l,libname)//g`				@@\
+	@date
+#endif
+
 #elif 1 
 #ifndef SharedLibraryBuild
 #define SharedLibraryBuild(libname,version)				@@\
diff -urNad cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules cernlib-2005.05.09.dfsg/src/config/lnxLib.rules
--- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules	1995-12-20 15:26:45.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules	2005-11-29 17:07:40.004888571 +0000
@@ -43,6 +43,9 @@
 #ifndef PositionIndependentCplusplusFlags
 #define PositionIndependentCplusplusFlags -fPIC
 #endif
+#ifndef PositionIndependentFortranFlags
+#define PositionIndependentFortranFlags -fPIC
+#endif
 
 /*
  * InstallSharedLibrary - generate rules to install the shared library.
@@ -50,13 +53,20 @@
  */
 #ifndef InstallSharedLibrary
 #define	InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.so.rev) 					@@\
+.PHONY: install.shlib shlib/libname					@@\
+shlib/libname:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+install.shlib:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+$(DESTDIR)dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\
 	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
 	(T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
 		$(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T)	@@\
 	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
-	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
+	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so) @@\
+	$(RM) $<                                                        @@\
+	$(LN) $@ $<
 #endif /* InstallSharedLibrary */
 
 /*


--- NEW FILE 801-non-optimized-rule-uses-fPIC-g.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 801-non-optimized-rule-uses-fPIC-g.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Ensure that special rules for creating non-optimized object files
## DP: use -fPIC for files that go into shared libs, and -g for all files.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/config/fortran.rules /tmp/dpep.gResDB/cernlib-2005.05.09/src/config/fortran.rules
--- cernlib-2005.05.09/src/config/fortran.rules	1997-05-30 12:25:18.000000000 -0400
+++ /tmp/dpep.gResDB/cernlib-2005.05.09/src/config/fortran.rules	2005-06-09 10:37:19.092244331 -0400
@@ -345,9 +345,9 @@
 
 #ifndef SpecialFortranLibObjectRule
 #define SpecialFortranLibObjectRule(baseobj,basedep,options,cppoptions)	@@\
-SpecialFortranArchiveObjectRule(baseobj,basedep,options,cppoptions)	@@\
-SpecialFortranSharedObjectRule(baseobj,basedep,options,cppoptions)	@@\
-SpecialFortranDebugObjectRule(baseobj,basedep,options,cppoptions)
+SpecialFortranArchiveObjectRule(baseobj,basedep,options -g,cppoptions)	    @@\
+SpecialFortranSharedObjectRule(baseobj,basedep,options -g -fPIC,cppoptions) @@\
+SpecialFortranDebugObjectRule(baseobj,basedep,options -g,cppoptions)
 #endif
 
 #ifndef SpecialFortranArchiveObjectRule
diff -urNad cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile /tmp/dpep.gResDB/cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile
--- cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile	1996-09-23 10:20:46.000000000 -0400
+++ /tmp/dpep.gResDB/cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile	2005-06-09 10:37:55.631538119 -0400
@@ -3,7 +3,7 @@
 	plotisto.F pmhist.F pminit.F show_chain.F
 
 #ifdef CERNLIB_LINUX
-FORTRANOPTIONS = -fno-backslash  $(FORTRANSAVEOPTION) -fno-second-underscore
+FORTRANOPTIONS = -g -fno-backslash  $(FORTRANSAVEOPTION) -fno-second-underscore
 #endif
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile /tmp/dpep.gResDB/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	1999-09-14 05:20:08.000000000 -0400
+++ /tmp/dpep.gResDB/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	2005-06-09 10:40:47.421285771 -0400
@@ -46,8 +46,8 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
-SpecialObjectRule(archive/qp_execute.o,qp_execute.c archive/qp_execute.d,-O0 -o $@)
-SpecialObjectRule(debug/qp_execute.o,qp_execute.c debug/qp_execute.d,-O0 -o $@)
-SpecialObjectRule(shared/qp_execute.o,qp_execute.c shared/qp_execute.d,-O0 -o $@)
+#if defined(CERNLIB_LINUX)
+SpecialObjectRule(archive/qp_execute.o,qp_execute.c archive/qp_execute.d,-O0 -g -o $@)
+SpecialObjectRule(debug/qp_execute.o,qp_execute.c debug/qp_execute.d,-O0 -g -o $@)
+SpecialObjectRule(shared/qp_execute.o,qp_execute.c shared/qp_execute.d,-O0 -g -fPIC -o $@)
 #endif


--- NEW FILE 802-create-shared-libraries.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 802-create-shared-libraries.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Actually implement the rules to create shared libraries.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile
--- cernlib-2005.05.09.dfsg~/src/Imakefile	2005-12-01 15:19:24.191267776 +0000
+++ cernlib-2005.05.09.dfsg/src/Imakefile	2005-12-01 15:20:10.310483251 +0000
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib mathlib graflib code_motif mclibs phtools pawlib paw_motif geant321
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
@@ -15,6 +15,7 @@
 #endif
 
 InstallLibSubdirs($(LIBDIRS))
+InstallSharedLibSubdirs($(LIBDIRS))
 
 INCLUDEDIRS= $(LIBDIRS) cfortran
 
diff -urNad cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile cernlib-2005.05.09.dfsg/src/code_motif/Imakefile
--- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile	2005-12-01 15:19:24.062295137 +0000
+++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -31,3 +31,4 @@
 SubdirLibraryTarget(packlib-lesstif,NullParameter) 
 
 InstallLibrary(packlib-lesstif,$(CERN_LIBDIR))
+InstallSharedLibrary(packlib-lesstif,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-12-01 15:19:23.018516575 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -26,6 +26,7 @@
 
 InstallLibrary(geant321,$(CERN_LIBDIR))
 InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
+InstallSharedLibrary(geant321,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 /* Fluka removed from Debian source package for copyright reasons. */
 /*
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile	1996-12-19 14:19:18.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -10,6 +10,7 @@
 SubdirLibraryTarget(geant321_parallel,NullParameter)
 
 InstallLibrary(geant321_parallel,$(CERN_LIBDIR))
+InstallSharedLibrary(geant321_parallel,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 CopyFile(../gbase/grun.F,grun.F)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/Imakefile cernlib-2005.05.09.dfsg/src/graflib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/graflib/Imakefile	2001-12-11 15:06:28.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -11,9 +11,12 @@
 
 SubdirLibraryTarget(graflib,$(LIBDIRS))
 
-InstallLibrary(graflib,$(CERN_LIBDIR))
-
 InstallLibSubdirs(higz)
+InstallSharedLibSubdirs(higz)
+
+/* these lines follow the above because graflib depends on grafX11 */
+InstallLibrary(graflib,$(CERN_LIBDIR))
+InstallSharedLibrary(graflib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(higz)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile
--- cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile	1997-09-02 13:34:47.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -13,6 +13,7 @@
 SubdirLibraryTarget(grafX11,$(LIBDIRS))
 
 InstallLibrary(grafX11,$(CERN_LIBDIR))
+InstallSharedLibrary(grafX11,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(examples)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile	2002-04-26 14:37:20.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -14,6 +14,7 @@
 
 InstallLibrary(kernlib,$(CERN_LIBDIR))
 InstallLibraryAlias(kernlib,kernlib-shift,$(CERN_LIBDIR))
+InstallSharedLibrary(kernlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 test::	LibraryTargetName(kernlib)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile	2005-12-01 15:19:24.005307227 +0000
+++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -19,6 +19,7 @@
 SubdirLibraryTarget(mathlib,$(LIBDIRS))
 
 InstallLibrary(mathlib,$(CERN_LIBDIR))
+InstallSharedLibrary(mathlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 InstallIncludeSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile	2005-12-01 15:19:22.512623901 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -13,6 +13,7 @@
 TestSubdirs($(LIBDIRS))
 
 InstallLibSubdirs($(LIBDIRS))
+InstallSharedLibSubdirs($(LIBDIRS))
 
 /* Again, purge Pythia, Jetset and dependents. */
 INCLUDEDIRS= cojets eurodec herwig isajet pdf
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile	1996-05-06 20:06:50.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
 SubdirLibraryTarget(cojets,$(LIBDIRS))
 
 InstallLibrary(cojets,$(CERN_LIBDIR))
+InstallSharedLibrary(cojets,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 SubdirDataFile($(LIBRARY),cojets.dat,data)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile	1996-05-06 20:06:55.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
 SubdirLibraryTarget(eurodec,$(LIBDIRS))
 
 InstallLibrary(eurodec,$(CERN_LIBDIR))
+InstallSharedLibrary(eurodec,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 SubdirDataFile($(LIBRARY),eurodec.dat,data)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile	1997-01-06 17:06:41.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -10,6 +10,7 @@
 
 InstallLibrary(herwig59,$(CERN_LIBDIR))
 InstallLibraryAlias(herwig59,herwig,$(CERN_LIBDIR))
+InstallSharedLibrary(herwig59,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(test)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile	2001-10-08 14:03:02.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
 SubdirLibraryTarget(isajet758,$(LIBDIRS))
 
 InstallLibrary(isajet758,$(CERN_LIBDIR))
+InstallSharedLibrary(isajet758,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 SubdirDataFile($(LIBRARY),isajet.dat,data)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile	2000-05-29 14:49:59.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -15,6 +15,7 @@
 SubdirLibraryTarget(pdflib804,spdf npdf)
 
 InstallLibrary(pdflib804,$(CERN_LIBDIR))
+InstallSharedLibrary(pdflib804,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(tpdf)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile	1999-03-26 10:52:23.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -15,6 +15,7 @@
 SubdirLibraryTarget(photos202,code)
 
 InstallLibrary(photos202,$(CERN_LIBDIR))
+InstallSharedLibrary(photos202,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(test)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/Imakefile cernlib-2005.05.09.dfsg/src/packlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile	2005-12-01 15:19:23.885332680 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -14,6 +14,7 @@
 
 InstallLibrary(packlib,$(CERN_LIBDIR))
 InstallLibraryAlias(packlib,packlib-shift,$(CERN_LIBDIR))
+InstallSharedLibrary(packlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile
--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile	2005-12-01 15:19:24.192267563 +0000
+++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -30,4 +30,5 @@
 SubdirLibraryTarget(pawlib-lesstif,$(LIBDIRS))
 
 InstallLibrary(pawlib-lesstif,$(CERN_LIBDIR))
+InstallSharedLibrary(pawlib-lesstif,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile	1996-10-01 14:12:23.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -11,6 +11,7 @@
 SubdirLibraryTarget(pawlib,$(LIBDIRS))
 
 InstallLibrary(pawlib,$(CERN_LIBDIR))
+InstallSharedLibrary(pawlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 InstallIncludeSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/Imakefile cernlib-2005.05.09.dfsg/src/phtools/Imakefile
--- cernlib-2005.05.09.dfsg~/src/phtools/Imakefile	1996-11-14 16:44:33.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile	2005-12-01 15:19:31.189783029 +0000
@@ -11,7 +11,7 @@
 SubdirLibraryTarget(phtools,$(LIBDIRS))
 
 InstallLibrary(phtools,$(CERN_LIBDIR))
-InstallSharedLibrary(phtools,$(CERN_LEVEL),$(CERN_SHLIBDIR))
+InstallSharedLibrary(phtools,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(wicoexam)
 


--- NEW FILE 803-link-binaries-dynamically.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 803-link-binaries-dynamically.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Link binaries dynamically against Cern libraries.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/config/fortran.rules /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules
--- cernlib-2005.05.09/src/config/fortran.rules	2005-06-13 15:26:19.991403858 -0400
+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules	2005-06-13 15:26:23.699609849 -0400
@@ -189,13 +189,13 @@
  */
 #ifndef CernlibDependLibrary
 #define CernlibDependLibrary(cernlibs)\
-$(filter-out +%,$(filter-out -%,$(shell cernlib cernlibs)))
+$(filter-out +%,$(filter-out -%,$(shell cernlib -dy cernlibs)))
 #endif
 
 /* Helper to use cernlib command
  */
 #ifndef CernlibCmd
-#define CernlibCmd(libraries)cernlib libraries
+#define CernlibCmd(libraries)cernlib -dy libraries
 #endif
 /*
  * CernlibFortranProgramTarget - rule to link fortran program using
@@ -207,7 +207,7 @@
 ProgramTargetName(program): SetWin32ObjSuffix(objects) deplibs CernlibDependLibrary(cernlibs)	@@\
 	RemoveTargetProgram($@)						@@\
 	@echo "Linking with cern libraries"				@@\
-	@cernlib cernlibs						@@\
+	@cernlib -dy cernlibs						@@\
 	CernlibFortranLinkRule($@,$(FCLDOPTIONS),objects,locallibs $(LDLIBS),CernlibCmd(cernlibs)) @@\
 									@@\
 clean::									@@\
@@ -233,8 +233,8 @@
 ProgramTargetName(program): objects deplibs CernlibDependLibrary(cernlibs) @@\
 	RemoveTargetProgram($@)						@@\
 	@echo "Linking with cern libraries"				@@\
-	@cernlib cernlibs						@@\
-	CernlibLinkRule($@,$(LDOPTIONS),objects,locallibs $(LDLIBS),cernlib cernlibs) @@\
+	@cernlib -dy cernlibs						@@\
+	CernlibLinkRule($@,$(LDOPTIONS),objects,locallibs $(LDLIBS),cernlib -dy cernlibs) @@\
 									@@\
 clean::									@@\
 	RemoveFile(ProgramTargetName(program))				@@\
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-13 15:26:18.903636773 -0400
+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-13 15:26:23.699609849 -0400
@@ -13,14 +13,14 @@
 DefinePackageLibrary(kxtlib)
 
 #if defined(CERNLIB_UNIX)
-CLIBS= -G Motif kernlib
+CLIBS= -G Motif Xm
 #endif
 
 #if defined(CERNLIB_VAXVMS)
-CLIBS= graflib/motif packlib kernlib
+CLIBS= -G Motif Xm
 #endif
 
 
-CernlibCcProgramTarget(kxterm,kxterm.o,libkxtlib.a,libkxtlib.a,$(CLIBS))
+CernlibFortranProgramTarget(kxterm,kxterm.o,libkxtlib.a,libkxtlib.a,$(CLIBS))
 
 InstallProgram(kxterm,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-13 15:26:19.418526524 -0400
+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-13 15:27:38.102678258 -0400
@@ -20,7 +20,7 @@
 InstallScript(paw,$(CERN_BINDIR))
 
 #if defined (CERNLIB_UNIX) && !defined(CERNLIB_WINNT)
-CernlibFortranProgramTarget(pawX11,0pamain.o,NullParameter,NullParameter,pawlib graflib/X11 packlib mathlib kernlib)
+CernlibFortranProgramTarget(pawX11,0pamain.o,NullParameter,NullParameter,-G X11 pawlib)
 
 InstallProgram(pawX11,$(CERN_BINDIR))
 
@@ -34,7 +34,7 @@
 /* This is a gmake ifeq, not a Imake/cpp #if... ! */
 ifeq ($(DO_PAW_PP),YES)
 
-CernlibFortranProgramTarget(paw++,0pamainm.o,NullParameter,NullParameter,pawlib graflib/Motif packlib mathlib kernlib)
+CernlibFortranProgramTarget(paw++,0pamainm.o,NullParameter,NullParameter,-G Motif pawlib)
 
 InstallProgram(paw++,$(CERN_BINDIR))
 


--- NEW FILE 804-workaround-for-comis-mdpool-struct-location.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 804-workaround-for-comis-mdpool-struct-location.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Hack to workaround Comis not liking it when code has a negative
## DP: offset from the mdpool struct (as is the case when using shared
## DP: libraries on some arches).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/Examples/pamain.c /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/cfortran/Examples/pamain.c
--- cernlib-2005.05.09/src/cfortran/Examples/pamain.c	2002-09-12 12:05:18.000000000 -0400
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/cfortran/Examples/pamain.c	2005-06-11 09:59:51.875449396 -0400
@@ -2,6 +2,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define PAWC_SIZE 9000000
 
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc
--- cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc	2000-05-30 09:53:58.000000000 -0400
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc	2005-06-11 09:59:51.876449180 -0400
@@ -15,7 +15,9 @@
 *
 * cspar.inc
 *
-        PARAMETER (LHP=50006, KON1=17694720, KON2=KON1
+#include "comis/mdsize.h"
+
+        PARAMETER (LHP=MDSIZE, KON1=17694720, KON2=KON1
      +, KON3=2**16, LRECU=8,NRECU=5,MLRECU=NRECU*LRECU
      +, MXRECU=MLRECU-LRECU
      1,      LASTK=2000,LSSTK=50,KLENID=32
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h
--- cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,33 @@
+#ifndef _MDPOOL_H
+#define _MDPOOL_H
+
+/* mdpool.h */
+
+/* #include  or  in one source code file of
+ * your executable program dynamically linked against libpaw
+ * so that MDPOOL is defined in your executable.  This is
+ * necessary for proper functioning of the COMIS interpreter when
+ * dynamically linked.
+ */
+
+/* define MDSIZE: */
+#include 
+
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+  int iq[MDSIZE];
+} mdpool_def;
+
+#define MDPOOL COMMON_BLOCK(MDPOOL, mdpool)
+COMMON_BLOCK_DEF(mdpool_def, MDPOOL);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* _MDPOOL_H */
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc
--- cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc	1996-02-26 12:16:34.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc	2005-06-11 09:59:51.876449180 -0400
@@ -12,6 +12,8 @@
 *
 * mdpool.inc
 *
+#include "comis/cspar.inc"
+
       COMMON/MDPOOL/IQ(LHP)
       INTEGER ISEM(LHP),KD(LHP),IDA(LHP),KD1(99),KD2(99),KD3(99)
       EQUIVALENCE (IQ,ISEM),(IQ,KD),(IQ,IDA)
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h
--- cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,6 @@
+#ifndef _MDSIZE_H
+#define _MDSIZE_H
+
+#define MDSIZE 50006
+
+#endif
diff -urNad cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c
--- cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c	1999-11-15 08:36:24.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c	2005-06-11 09:59:51.875449396 -0400
@@ -39,21 +39,20 @@
 /*-- Author :*/
 
 #include 
+#include 
+#include 
+#include "comis/mdsize.h"
 
 typedef struct {
-    int iq[6];
+    int iq[MDSIZE]; /* instead of int iq[6] */
 } mdpool_def;
 
 #define MDPOOL COMMON_BLOCK(MDPOOL,mdpool)
-COMMON_BLOCK_DEF(mdpool_def,MDPOOL);
+extern COMMON_BLOCK_DEF(mdpool_def,MDPOOL);
 
-unsigned long iqpntr = (unsigned long)MDPOOL.iq;
+unsigned long iqpntr = 0;
 
 
-#ifdef CERNLIB_WINNT
-# include 
-#endif
-
 #if defined(CERNLIB_QX_SC)
 int type_of_call csallo_(lenb)
 #endif
@@ -65,11 +64,31 @@
 #endif
  int *lenb;
 {
-  long lpntr;
+  unsigned long lpntr;
   int pntr; 
 
+  if (! iqpntr)
+    iqpntr = (unsigned long)MDPOOL.iq;
   lpntr= (long)( malloc(*lenb) );
-  pntr=lpntr - iqpntr;
+  if (! lpntr) {
+    fprintf(stderr,
+	    "CSALLO: not enough dynamic memory to allocate %d bytes\n", *lenb);
+    exit(EXIT_FAILURE);
+  }
+
+  pntr = (long)lpntr - (long)iqpntr;
+  if (pntr < 0) {
+    fprintf(stderr, "CSALLO: heap below bss?!");
+#if defined (CERNLIB_DEBIAN)
+    fprintf(stderr, "\n"
+"See the file /usr/share/doc/libpawlib2-dev/README.Debian for more information.\n"
+"If it does not help to solve this problem, please file a bug report against\n"
+"the libpawlib2 package, including the source code of your executable.\n");
+#else
+    fprintf(stderr, "  Try linking against pawlib statically.\n");
+#endif
+    exit(EXIT_FAILURE);
+  }
   return pntr;
 }
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc
--- cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc	1996-03-01 11:50:06.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc	2005-06-11 09:59:51.875449396 -0400
@@ -28,5 +28,9 @@
 #include "paw/pawsmall.inc"
 #endif
 
+C      Include this file so that MDPOOL/IQ is present in pawX11 and
+C      paw++ dynamically linked executables.
+C      -- Kevin McCarty, for Debian, 1 Nov 2003
+#include "comis/mdpool.inc"
 
 #endif
diff -urNad cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc
--- cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc	1996-03-01 11:50:06.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc	2005-06-11 09:59:51.875449396 -0400
@@ -28,5 +28,9 @@
 #include "paw/pawsmall.inc"
 #endif
 
+C      Include this file so that MDPOOL/IQ is present in pawX11 and
+C      paw++ dynamically linked executables.
+C      -- Kevin McCarty, for Debian, 1 Nov 2003
+#include "comis/mdpool.inc"
 
 #endif


--- NEW FILE 805-expunge-missing-mathlib-kernlib-symbols.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 805-expunge-missing-mathlib-kernlib-symbols.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove some unreferenced symbols from mathlib and kernlib.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile
--- cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile	2002-09-19 12:44:52.000000000 -0400
+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile	2005-06-13 11:20:33.838151240 -0400
@@ -1,6 +1,8 @@
 #ifndef CERNLIB_VAXVMS
 
-SRCS_F= accessf.F chdirf.F getenvf.F getwdf.F lstatf.F perrorf.F \ @@\
+/* perrorf.F has been removed since it depends upon files which introduce
+   unreferenced dependencies into the shared libraries.  --Kevin McCarty */
+SRCS_F= accessf.F chdirf.F getenvf.F getwdf.F lstatf.F           \ @@\
 	readlnf.F renamef.F setenvf.F statf.F systemf.F tmpro.F \ @@\
 	tmproi.F toslat.F unlinkf.F
 
diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-13 11:12:24.894703741 -0400
+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-13 11:16:54.864966246 -0400
@@ -2,20 +2,22 @@
 #include "pilot.h"
 
 /* rgmlt*.F have been moved into packlib/hbook to remove circular dependencies.
+   Some other files have been removed from this list because they depend upon
+   non-existent functions.
    --Kevin McCarty, for Debian. */
-SRCS_F=	arithm.F c128.F c256.F c512.F c64.F cauchy64.F cft.F cfstft.F \ @@\
+SRCS_F=	         c128.F c256.F c512.F c64.F cauchy64.F cft.F cfstft.F \ @@\
 	rfstft.F cgauss.F d107d1.F d107r1.F d501l1.F d501l2.F d501n1.F \ @@\
         d501n2.F d501p1.F d501p2.F d501sf.F d700su.F d701bd.F \ @@\
         dadapt.F deqbs64.F deqmr64.F deriv64.F dfunft.F dgs56p.F \ @@\
         dmaxlk.F dsumsq.F elanal.F elpahy.F epdbps.F epdchk.F \ @@\
-        epdchn.F epdcj.F epde1.F epdecc.F epdfix.F epdin.F \ @@\
-        epditr.F epdje.F epdloc.F epdsrt.F epdtab.F errorf.F esolve.F \ @@\
-	fcn1.F fftrc.F fumili.F gauss.F i128.F i32.F i64.F linsq.F \ @@\
-	mconv.F mft.F minfc.F minsq.F monito.F newro.F old506.F radapt.F \ @@\
+                 epdcj.F                  epdfix.F epdin.F \ @@\
+        epditr.F epdje.F epdloc.F epdsrt.F epdtab.F          esolve.F \ @@\
+	       fftrc.F          gauss.F i128.F i32.F i64.F         \ @@\
+	mconv.F mft.F minfc.F         monito.F newro.F          radapt.F \ @@\
 	radmul.F rca.F rfrdh164.F rfrdh264.F rft.F           rgquad.F \ @@\
 	rgs56p.F rgset.F riwiad.F riwibd.F rknys64.F rknysd.F rkstp.F \ @@\
 	rpa.F rps.F rrkstp.F rsa.F rtriint.F s128.F s256.F s512.F \ @@\
-	s64.F scal.F sgz.F simps.F synt.F traper.F triint.F vd01a.F
+	s64.F scal.F       simps.F synt.F traper.F triint.F vd01a.F
 
 #if defined(CERNLIB_DOUBLE)
 SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
diff -urNad cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile	1996-05-01 09:21:53.000000000 -0400
+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile	2005-06-13 11:19:42.456136998 -0400
@@ -1,9 +1,12 @@
-SRCS_F=	addbnd.F bfgs.F bndopt.F bndtst.F bounds.F bucmve.F \ @@\
-	bufopt.F delbnd.F delete.F delslv.F divon.F dvcopy.F dvdot.F \ @@\
-	dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F fun.F genpnt.F \ @@\
-	grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\
-	newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\
-	quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\
+/* Some files deleted from the below list since they depend upon the
+   lepto63 library, which cannot be included in Debian for licensing reasons. */
+
+SRCS_F=	addbnd.F bfgs.F          bndtst.F bounds.F bucmve.F \ @@\
+	         delbnd.F delete.F                  dvcopy.F dvdot.F \ @@\
+	dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F                \ @@\
+	                  ldlsol.F          modchl.F          mxstep.F \ @@\
+	newptq.F nmdchl.F         nodaud.F orthvc.F         quad.F \ @@\
+	quasi.F ranums.F          rlen.F settol.F shrnk.F         \ @@\
 	treaud.F tredmp.F tstext.F usrint.F usrtrm.F
 
 FORTRANSAVEOPTION = FortranSaveFlags


--- NEW FILE 806-bump-mathlib-and-dependents-sonames.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 806-bump-mathlib-and-dependents-sonames.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Bump so versions of mathlib and dependents since it is now compiled
## DP: against liblapack3 instead of liblapack2.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-11-23 15:49:19.722162373 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-11-23 15:49:27.431512287 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 AllTarget(geant321)
 
 /* Fluka removed from Debian source package for copyright reasons. */
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile	2005-11-23 15:49:19.723162159 +0000
+++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile	2005-11-23 15:49:27.431512287 +0000
@@ -2,6 +2,7 @@
 #define IHaveSubdirs
 #define PassCDebugFlags 
 
+export LIB_SONAME := 2
 
 LIBDIRS= gen bvsl hbook /* hdiff stuff moved from packlib */
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile	2005-11-23 15:49:19.723162159 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile	2005-11-23 15:49:27.431512287 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 AllTarget(cojets)
 
 LIBDIRS= code cojdata cojtapew
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 SUBDIRS= code doc test herwig59
 
 TopOfPackage(herwig59)
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -3,6 +3,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 LIBDIRS= code isadata isasusy isarun isatape
 
 SUBDIRS= $(LIBDIRS) test data isajet
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -6,6 +6,8 @@
 IMAKE_DEFINES=-DFortranDoesCpp=NO
 #endif
 
+export LIB_SONAME := 2
+
 AllTarget(pdflib804)
 
 SUBDIRS= spdf npdf tpdf pdf
diff -urNad cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile
--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -1,6 +1,8 @@
 DoIncludePackage(paw)
 #include "paw/pilot.h"
 
+export LIB_SONAME := 2
+
 #define IHaveSubdirs
 #define PassCDebugFlags
 
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -2,6 +2,7 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
 
 LIBDIRS= comis paw sigma
 SUBDIRS= $(LIBDIRS)
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/Imakefile cernlib-2005.05.09.dfsg/src/phtools/Imakefile
--- cernlib-2005.05.09.dfsg~/src/phtools/Imakefile	2005-11-23 15:49:19.725161731 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 LIBDIRS= genbod fowl wico
 
 SUBDIRS= $(LIBDIRS) wicoexam

cernlib-enforce-FHS.diff:

--- NEW FILE cernlib-enforce-FHS.diff ---
diff -ur ../original-cernlib-source/src/geant321/miface/gmorin.F src/geant321/miface/gmorin.F
--- ../original-cernlib-source/src/geant321/miface/gmorin.F     Mon Sep 30 10:26:05 1996
+++ src/geant321/miface/gmorin.F     Tue Oct 22 07:27:55 2002
@@ -112,7 +112,7 @@
          OPEN(UNIT=MICROS,FILE=XSFILE, STATUS='OLD',READONLY)
 #endif
 #if defined(CERNLIB_UNIX)||defined(CERNLIB_CRAY)
-         XSFILE = 'xsneut95.dat'
+         XSFILE = 'DATADIR/xsneut95.dat'
          INQUIRE(FILE=XSFILE,EXIST=EXISTS)
          IF(.NOT.EXISTS) THEN
             CHROOT=' '
diff -ur ../original-cernlib-source/src/mclibs/cojets/test/test.F src/mclibs/cojets/test/test.F
--- ../original-cernlib-source/src/mclibs/cojets/test/test.F    Mon Mar 25 07:53:36 1996
+++ src/mclibs/cojets/test/test.F    Tue Oct 22 07:27:55 2002
@@ -6,7 +6,7 @@
 #if defined(CERNLIB_IBMVM)
       PARAMETER (DFILE='/COJETS DATA *')
 #else
-      PARAMETER (DFILE='cojets.dat')
+      PARAMETER (DFILE='DATADIR/cojets.dat')
 #endif
 C
 C          MAIN PROGRAM FOR COJETS
diff -ur ../original-cernlib-source/src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/eurodec/eurodec/eufiles.inc
--- ../original-cernlib-source/src/mclibs/eurodec/eurodec/eufiles.inc   Fri Mar  8 11:58:49 1996
+++ src/mclibs/eurodec/eurodec/eufiles.inc   Tue Oct 22 07:27:55 2002
@@ -18,7 +18,7 @@
       PARAMETER (ETFILE='/EUTITLE DAT   *')
 #endif
       CHARACTER*(*) EDFILE,ETFILE
-      PARAMETER (EDFILE='eurodec.dat')
+      PARAMETER (EDFILE='DATADIR/eurodec.dat')
       PARAMETER (ETFILE='eutitle.dat')

 #endif
diff -ur ../original-cernlib-source/src/mclibs/isajet/test/isajett.F src/mclibs/isajet/test/isajett.F
--- ../original-cernlib-source/src/mclibs/isajet/test/isajett.F Fri Mar 14 12:32:39 1997
+++ src/mclibs/isajet/test/isajett.F Tue Oct 22 07:27:55 2002
@@ -8,7 +8,7 @@
 #if defined(CERNLIB_VAXVMS)
       PARAMETER (DFILE='CERN_ROOT:[lib]isajet.dat')
 #else
-      PARAMETER (DFILE='isajet.dat')
+      PARAMETER (DFILE='DATADIR/isajet.dat')
 #endif
 #endif
 C

cernlib-gxint-script.diff:

--- NEW FILE cernlib-gxint-script.diff ---
--- src/scripts/gxint-old	2005-11-23 23:11:08.000000000 +0100
+++ src/scripts/gxint	2005-11-29 11:42:30.000000000 +0100
@@ -103,15 +103,8 @@
    echo "gxint_Warning: no user program specified"
 fi
  
- 
- 
-if [ -z "$CERN" ] ; then
-  if [ ! -d /cern ]; then
-   echo "gxint_Error: shell variable CERN must be set or /cern must exist"
-   exit 1
-  fi
-  CERN="/cern" ; export CERN
-fi
+# not used after the sed one liner in the spec file 
+if [ -z "$CERN" ] ; then CERN="/usr"
  
 if [ "$drv" = "/GKS" ] ; then
   if [ -z "$GKSR" ] ; then

cernlib-hwhiga_use_dimag.diff:

--- NEW FILE cernlib-hwhiga_use_dimag.diff ---
--- src/mclibs/herwig/code/hwhiga.F.old	2005-06-24 09:45:07.000000000 +0200
+++ src/mclibs/herwig/code/hwhiga.F	2005-06-24 10:11:59.000000000 +0200
@@ -73,7 +73,7 @@
       TAMP(7)=HWHIG5(U,T,S,EMH2,EMQ2,3,0,6,0,0,0)
       DO 20 I=1,7
       TAMPI(I)= DBLE(TAMP(I))
-  20  TAMPR(I)=-IMAG(TAMP(I))
+  20  TAMPR(I)=-DIMAG(TAMP(I))
 C Square and add prefactors
       WTGG=0.03125*FLOAT(NCOLO*(NCOLO**2-1))
      &    *(TAMPR(1)**2+TAMPI(1)**2+TAMPR(2)**2+TAMPI(2)**2

cernlib-hwuli2_use_dimag.diff:

--- NEW FILE cernlib-hwuli2_use_dimag.diff ---
--- src/mclibs/herwig/code/hwuli2.F.old	2005-06-24 10:09:09.000000000 +0200
+++ src/mclibs/herwig/code/hwuli2.F	2005-06-24 10:11:52.000000000 +0200
@@ -19,7 +19,7 @@
       PROD(Y,Y2)=Y*(ONE+A1*Y*(ONE+A2*Y*(ONE+A3*Y2*(ONE+A4*Y2*(ONE+A5*Y2*
      & (ONE+A6*Y2*(ONE+A7*Y2*(ONE+A8*Y2*(ONE+A9*Y2*(ONE+A10*Y2))))))))))
       XR=DBLE(X)
-      XI=IMAG(X)
+      XI=DIMAG(X)
       R2=XR*XR+XI*XI
       IF (R2.GT.ONE.AND.(XR/R2).GT.HALF) THEN
          Z=-LOG(ONE/X)

cernlib_2005.05.09.dfsg-2.diff:

***** Error reading new file: [Errno 2] No such file or directory: 'cernlib_2005.05.09.dfsg-2.diff'

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Nov 2005 23:34:07 -0000	1.2
+++ .cvsignore	9 Dec 2005 15:57:06 -0000	1.3
@@ -1,15 +1,15 @@
-include.tar.gz
-src_Imakefile.tar.gz
 src_car.tar.gz
+src_Imakefile.tar.gz
+src_patchy.tar.gz
 src_cfortran.tar.gz
-src_config.tar.gz
-src_geant321.tar.gz
-src_graflib.tar.gz
 src_include.tar.gz
-src_mathlib.tar.gz
-src_mclibs.tar.gz
-src_packlib.tar.gz
-src_patchy.tar.gz
 src_pawlib.tar.gz
+src_config.tar.gz
+src_mathlib.tar.gz
 src_phtools.tar.gz
+src_geant321.tar.gz
+src_mclibs.tar.gz
 src_scripts.tar.gz
+src_graflib.tar.gz
+src_packlib.tar.gz
+xsneut95.dat


Index: cernlib-deadpool.txt
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib-deadpool.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-deadpool.txt	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib-deadpool.txt	9 Dec 2005 15:57:06 -0000	1.2
@@ -2,26 +2,86 @@
 # for copyright reasons.  Given is the file or directory to delete
 # relative to $CERN_ROOT/src/.
 
-# --Kevin McCarty, 19 Aug. 2003
+# --Kevin McCarty, 23 Nov 2005
 
-# Authors of FLUKA and Pythia/Jetset did NOT give permission to release
+# Authors of Pythia/Jetset did NOT give permission to release
 # their code under GPL.  CERN should have checked this more carefully!!!
-geant321/data/flukaaf.dat
-geant321/fluka/
-car/geanf321.car
-car/geanf.car
-
-mclibs/jetset/
 car/jetset74.car
+mclibs/jetset/
 mclibs/pythia/
 
-# removal of Pythia/Jetset also necessitates removal of Fritiof, Lepto, Ariadne
+# Removal of Pythia/Jetset also necessitates removal of Fritiof, Lepto, Ariadne
 mclibs/fritiof/
 mclibs/ariadne/
 mclibs/ariadne_407/
 mclibs/lepto63/
 
-# other problematic files (mostly on VMS or obsolete archs)
+# The same applies to GEANT-FLUKA; see for instance the comments at
+# the web site http://www.fluka.org/Faq.html
+car/geanf.car
+car/geanf321.car
+#cmz/geanf.cmz
+#cmz/geanf321.cmz
+geant321/data/flukaaf.dat
+geant321/block/
+geant321/fiface/
+geant321/fluka/
+geant321/miface/gfmfin.F
+geant321/miface/gfmdis.F
+geant321/peanut/
+geant321/geant321/aadat.inc
+geant321/geant321/auxpar.inc
+geant321/geant321/balanc.inc
+geant321/geant321/bamjcm.inc
+geant321/geant321/cmsres.inc
+geant321/geant321/comcon.inc
+geant321/geant321/corinc.inc
+geant321/geant321/dblprc.inc
+geant321/geant321/decayc.inc
+geant321/geant321/decayc2.inc
+geant321/geant321/depnuc.inc
+geant321/geant321/dimpar.inc
+geant321/geant321/eva0.inc
+geant321/geant321/eva1.inc
+geant321/geant321/fheavy.inc
+geant321/geant321/finlsp.inc
+geant321/geant321/finlsp2.inc
+geant321/geant321/finlsp3.inc
+geant321/geant321/finpar.inc
+geant321/geant321/finpar2.inc
+geant321/geant321/finuc.inc
+geant321/geant321/finuc2.inc
+geant321/geant321/finuct.inc
+geant321/geant321/hadflg.inc
+geant321/geant321/hadpar.inc
+geant321/geant321/higfis.inc
+geant321/geant321/inpdat.inc
+geant321/geant321/inpdat2.inc
+geant321/geant321/inpflg.inc
+geant321/geant321/iounit.inc
+geant321/geant321/isotop.inc
+geant321/geant321/labcos.inc
+geant321/geant321/mapa.inc
+geant321/geant321/metlsp.inc
+geant321/geant321/nucdat.inc
+geant321/geant321/nucgeo.inc
+geant321/geant321/nuclev.inc
+geant321/geant321/nucpar.inc
+geant321/geant321/nucstf.inc
+geant321/geant321/paprop.inc
+geant321/geant321/parevt.inc
+geant321/geant321/parnuc.inc
+geant321/geant321/part.inc
+geant321/geant321/part2.inc
+geant321/geant321/part3.inc
+geant321/geant321/qquark.inc
+geant321/geant321/reac.inc
+geant321/geant321/redver.inc
+geant321/geant321/resnuc.inc
+geant321/geant321/split.inc
+geant321/geant321/xsepar.inc
+
+# Other problematic files (mostly on VMS or obsolete archs)
 graflib/higz/igold/golini.F
 packlib/cspack/sysreq/pwd_vms.h
 packlib/cspack/sysreq/sgtty.h


Index: cernlib.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib.README	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib.README	9 Dec 2005 15:57:06 -0000	1.2
@@ -48,3 +48,13 @@
 
 The cernlib script has been modified to use an external lapack and not
 the one provided with the cernlib.
+
+5) kernlib out of packlib
+
+kernlib has been moved outside of packlib. If you use the cernlib script
+for linking it should be taken into account, however if you link directly
+with packlib you could need to add the kernlib on your link command line.
+
+6) split of motif dependent libs from packlib and pawlib
+
+The motif dependent libs are in libpacklib-lesstif and libpawlib-lesstif.


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cernlib.spec	18 Nov 2005 12:45:03 -0000	1.6
+++ cernlib.spec	9 Dec 2005 15:57:06 -0000	1.7
@@ -1,11 +1,11 @@
 Name:          cernlib
 Version:       2005
-Release:       4%{?dist}.2
+Release:       8%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
 # http://borex.princeton.edu/~kmccarty/faq.html#44
-License:       GPL/LGPL/BSD
+License:       GPL/LGPL
 URL:           http://cernlib.web.cern.ch/cernlib/
 # mandrake
 #BuildRequires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
@@ -15,6 +15,7 @@
 BuildRequires: xorg-x11-devel lapack blas openmotif-devel 
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
 # build the cernlib
+#BuildRequires: imake lapack-devel blas-devel openmotif-devel 
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,8 +32,7 @@
 # not used during the build (if I'm not wrong)
 Source15: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_car.tar.gz
 # unmodified files
-Source0: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/include.tar.gz
-Source1: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_config.tar.gz
+Source0: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_config.tar.gz
 Source2: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_Imakefile.tar.gz
 Source5: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_include.tar.gz
 Source6: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_mathlib.tar.gz 
@@ -43,7 +43,7 @@
 Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz
 Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz
 Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat
-# A shell script that goes in /etc/profile.d
+# Shell scripts that go in /etc/profile.d
 Source100: cernlib.sh.in
 Source105: cernlib.csh.in
 # m4 macros for autoconf
@@ -59,58 +59,126 @@
 Source200: cernlib-remove-deadpool
 Source201: cernlib-deadpool.txt
 
-# change the cernlib script such that -llapack -lblas is used instead of 
-# cernlib lapack
-Patch: cernlib-cernlib.patch
-# debian cernlib patch full of good things
-Patch1: cernlib_2004.11.04-3.diff
-# modified, to have only DATADIR
-Patch2: 003-enforce-FHS
-Patch3: 005-enable-shadow-passwd
-Patch4: 007-delete-fluka-refs
-Patch5: 008-undef-PPC
-Patch6: 010-comis-allow-special-chars-in-path
-Patch7: 012-add-no-optimization-macro
-Patch8: 013-fix-paw-imakefile-special-rules
-Patch9: 014-fix-herwig-imakefile-special-rules
-Patch11: 015-fix-optimization
-# not applied, break build
-Patch12: 018-move-kernlib-to-toplevel
-Patch13: 022-no-assign-string-literals
+# debian patchset
+Patch0: cernlib_2005.05.09.dfsg-2.diff
+# change file to directory to DATADIR
+Patch1100: cernlib-enforce-FHS.diff
+Patch1: 001-fix-missing-fluka.dpatch
+Patch2: 002-fix-missing-mclibs.dpatch
+Patch3: 003-geant-dummy-functions.dpatch
+Patch100: 100-fix-isajet-manual-corruption.dpatch
+Patch101: 101-undefine-PPC.dpatch
+Patch102: 102-dont-optimize-some-code.dpatch
+Patch103: 103-ignore-overly-long-macro-in-gen.h.dpatch
+Patch104: 104-fix-undefined-insertchar-warning.dpatch
+Patch105: 105-fix-obsolete-xmfontlistcreate-warning.dpatch 
+Patch106: 106-fix-paw++-menus-in-lesstif.dpatch
+Patch107: 107-define-strdup-macro-safely.dpatch
+Patch108: 108-quote-protect-comis-script.dpatch
+# not used as xsneut.dat is at the right place
+#Patch109: 109-fix-broken-xsneut95.dat-link.dpatch
+Patch110: 110-ignore-included-lapack-rule.dpatch
+Patch111: 111-fix-kuesvr-install-location.dpatch
+Patch112: 112-remove-nonexistent-prototypes-from-gen.h.dpatch
+# a workaround for cups. Applied in doubt.
+Patch113: 113-cups-postscript-fix.dpatch
+Patch114: 114-install-scripts-properly.dpatch
+Patch200: 200-comis-allow-special-chars-in-path.dpatch
+Patch201: 201-update-kuip-helper-apps.dpatch
+Patch202: 202-fix-includes-in-minuit-example.dpatch
+Patch203: 203-compile-geant-with-ertrak.dpatch
+Patch204: 204-compile-isajet-with-isasrt.dpatch
+Patch205: 205-max-path-length-to-256.dpatch
+Patch206: 206-herwig-uses-DBLE-not-REAL.dpatch
+Patch207: 207-compile-temp-libs-with-fPIC.dpatch
+# without that patch the binaries are linked with something like
+# libzftplib.a /builddir/build/BUILD/cernlib-2005/2005/build/packlib/cspack/programs/zftp/libzftplib.a
+Patch208: 208-fix-redundant-packlib-dependencies.dpatch
+Patch209: 209-ignore-unneeded-headers-in-kmutil.c.dpatch
+Patch210: 210-improve-cfortran-header-files.dpatch
+# disabled in the debian patchset, enabled here
+Patch211: 211-fix-comis-on-64-bit-arches.dpatch
+Patch300: 300-skip-duplicate-lenocc.dpatch
+# Use another approach, see cernlib-enforce-FHS
+# Patch33: 301-datafiles-comply-with-FHS.dpatch
+# use cernlib-gxint-script.diff instead and sed for paw and dzedit.script
+# Patch34: 302-scripts-comply-with-FHS.dpatch
+Patch303: 303-shadow-passwords-supported.dpatch
+Patch304: 304-update-Imake-config-files.dpatch
+Patch305: 305-use-POWERPC-not-PPC-as-test.dpatch
+# the bug in /usr/include/assert.h seems to be present in FC-4. So a local
+# version is provided in that patch. Will have to look at newer glibc-headers
+# packages
+Patch306: 306-patch-assert.h-for-makedepend.dpatch
+Patch307: 307-use-canonical-cfortran.dpatch
+Patch308: 308-use-canonical-cfortran-location.dpatch
+Patch309: 309-define-dummy-herwig-routines.dpatch
+Patch310: 310-define-dummy-fowl-routines.dpatch
+# The zebra qnexte is a fake, removing it remove an unneeded dependency.
+# the other qnext don't seem to be the same code? They are duplicate symbols
+# anyway so one must be removed
+Patch311: 311-skip-duplicate-qnext.dpatch
+Patch312: 312-skip-duplicate-gamma.dpatch
+# It is a departure from upstream. Apply, but may revert if not agreed.  
+Patch313: 313-comis-preserves-filename-case.dpatch
+Patch314: 314-permit-using-regcomp-for-re_comp.dpatch
+Patch315: 315-fixes-for-MacOSX.dpatch
+Patch318: 318-additional-gcc-3.4-fixes.dpatch
+
+Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch
+Patch701: 701-patch-hbook-comis-Imakefiles.dpatch
+Patch702: 702-patch-Imakefiles-for-packlib-mathlib.dpatch
+# I would have preferred not to move the motif code to toplevel...
+Patch703: 703-patch-code_motif-packlib-Imakefiles.dpatch
+Patch704: 704-patch-code_kuip-higzcc-Imakefiles.dpatch
+# I would have preferred not to move the motif code to toplevel...
+Patch705: 705-patch-paw_motif-paw-Imakefiles.dpatch
+
+Patch800: 800-implement-shared-library-rules-in-Imake.dpatch
+Patch801: 801-non-optimized-rule-uses-fPIC-g.dpatch
+Patch802: 802-create-shared-libraries.dpatch
+# in the original cernlib kxterm is built with the C compiler, which cause
+# a failure if compiled with de cernlib debian script as -lg2c isn't found. 
+# It is corrected by
+Patch803: 803-link-binaries-dynamically.dpatch
+# 803 depends on 
+# 208-fix-redundant-packlib-dependencies.dpatch
+
+# no idea about what this does
+Patch804: 804-workaround-for-comis-mdpool-struct-location.dpatch
+Patch805: 805-expunge-missing-mathlib-kernlib-symbols.dpatch 
+# not needed but keep sync with debian, that'll avoid bumping sonames
+Patch806: 806-bump-mathlib-and-dependents-sonames.dpatch
+
+# not applied in newer debian patchset
+Patch3006: 022-no-assign-string-literals
 # fixed upstream
-Patch14: 027-use-tmpfile-not-mktemp
-Patch15: 028-fix-isajet-docs
-Patch16: 030-filename-length-to-256
-Patch17: 031-fix-varargs-use
-Patch18: 033-fix-undefined-insertchar
-Patch19: 035-do-not-use-XmFontListCreate
-Patch20: 038-fix-strndup-macro-problem
-Patch21: 039-use-DBLE-not-REAL
-Patch22: 044-fix-strdup-redefinition
-Patch23: 045-compile-with-isasrt
-Patch24: 047-fix-paw++-menus
+Patch3007: 027-use-tmpfile-not-mktemp
+# not applied in the newer debian patchset
+Patch3008: 031-fix-varargs-use
 # fixed upstream 
-Patch25: 048-log-to-var-log-not-tmp
+Patch3009: 048-log-to-var-log-not-tmp
 # fixed upstream
-Patch26: 049-fix-kuesvr-security-hole
+Patch3010: 049-fix-kuesvr-security-hole
 # fixed upstream
-Patch27: 050-make-secure-comis-tmpdir
+Patch3011: 050-make-secure-comis-tmpdir
 # fixed upstream
-Patch28: 051-fix-miscellaneous-tmp-uses
-# extracted from 001-enable-shared-libs
-Patch29: 001-delete-pythia-refs
-# prepare gxint for substitutions of path and version
-Patch30: gxint-script.diff
-Patch31: cernlib-XmDrawShadow-no-prototype.patch
-Patch32: cernlib-install_scripts.patch
-Patch33: cernlib-static-tcpaw.diff
-Patch34: cernlib-hwuli2_use_aimag.diff 
-Patch35: cernlib-hwhiga_use_aimag.diff
-Patch36: cernlib-gfortran.diff 
-Patch42: cernlib-rsrtnt64_goto_outer_block.diff
-Patch43: cernlib-v107z0_X_before_string.diff
-Patch44: cernlib-bimsel-nodouble-save.diff
+Patch3012: 051-fix-miscellaneous-tmp-uses
 
+# change the cernlib script such that -llapack -lblas is used instead of 
+# cernlib lapack
+# depend explicitely on libkernlib now that it is out of packlib
+# use lesstif-pawlib and lesstif-packlib
+# the modified script is renamed cernlib-static later and the debian cernlib
+# script is used instead.
+Patch1200: cernlib-cernlib_kernlib.patch
+# don't stop if the CERN variable isn't defined
+Patch1201: cernlib-gxint-script.diff
+Patch1203: cernlib-hwuli2_use_dimag.diff 
+Patch1204: cernlib-hwhiga_use_dimag.diff
+Patch1205: cernlib-gfortran.diff 
+Patch1206: cernlib-rsrtnt64_goto_outer_block.diff
+Patch1207: cernlib-v107z0_X_before_string.diff
 
 %description
 CERN program library is a large collection of general purpose libraries
@@ -120,12 +188,15 @@
 detectors simulation, data-handling etc... applicable to a wide range 
 of problems.
 
-The devel packages are parallel installable, but not the helper
+The main and devel packages are parallel installable, but not the helper
 scripts from the utils subpackage.
 
 %package devel
 Summary:       General purpose CERN library static libraries and headers
-Requires:      xorg-x11-devel lapack blas openmotif-devel
+Requires:      lapack-devel blas-devel openmotif-devel
+# workaround #173530
+Requires:      libXau-devel
+Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
 
 %description devel
@@ -142,7 +213,7 @@
 %package utils
 Summary:   CERN library compilation and environment setting scripts
 Group:     Applications/System
-Requires:  cernlib-devel = %{version}
+Requires:  %{name}-devel = %{version}-%{release}
 
 %description utils
 CERN library compilation and environment setting scripts.
@@ -201,7 +272,6 @@
 
 %prep
 %setup -c 
-%setup -T -D -a 1
 %setup -T -D -a 2
 %setup -T -D -a 3
 %setup -T -D -a 4
@@ -216,51 +286,187 @@
 %setup -T -D -a 14
 %setup -T -D -a 15
 
-%patch -P 1 -p1
+%patch -p1
 cd %{version}
-%patch 
-%patch -P 2 -p2
-%patch -P 3 -p2
-%patch -P 4
-%patch -P 5
-%patch -P 6
-%patch -P 7
-%patch -P 8
-%patch -P 9
-%patch -P 11
-#%patch -P 12
-%patch -P 13
-#%patch -P 14
-%patch -P 15
-%patch -P 16
-%patch -P 17 
-%patch -P 18 
-%patch -P 19 
-%patch -P 20
-%patch -P 21 
-%patch -P 22 
-%patch -P 23 
-%patch -P 24 
-#%patch -P 25 
-#%patch -P 26 
-#%patch -P 27 
-#%patch -P 28 
-%patch -P 29
-%patch -P 30
-%patch -P 31
-%patch -P 32
-%patch -P 33
-%patch -P 34
-%patch -P 35
+%patch -P 1100 -p2
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 100 -p1
+%patch -P 101 -p1
+%patch -P 102 -p1
+%patch -P 103 -p1
+%patch -P 104 -p1
+%patch -P 105 -p1
+%patch -P 106 -p1
+%patch -P 107 -p1
+%patch -P 108 -p1
+#%patch -P 109 -p1
+%patch -P 110 -p1
+%patch -P 111 -p1
+%patch -P 112 -p1
+%patch -P 113 -p1
+%patch -P 114 -p1
+%patch -P 200 -p1
+%patch -P 201 -p1
+%patch -P 202 -p1
+%patch -P 203 -p1
+%patch -P 204 -p1
+%patch -P 205 -p1
+%patch -P 206 -p1
+%patch -P 207 -p1
+%patch -P 208 -p1
+%patch -P 209 -p1
+%patch -P 210 -p1
+%patch -P 211 -p1
+%patch -P 300 -p1
+#%patch -P 301 -p1
+#%patch -P 302 -p1
+%patch -P 303 -p1
+%patch -P 304 -p1
+%patch -P 305 -p1
+%patch -P 306 -p1
+%patch -P 307 -p1
+%patch -P 308 -p1
+%patch -P 309 -p1
+%patch -P 310 -p1
+%patch -P 311 -p1
+%patch -P 312 -p1
+%patch -P 313 -p1
+%patch -P 314 -p1
+%patch -P 315 -p1
+
+# copy a paw include file to include directory (debian
+# 317-copy-converter.h-to-installed-headers-dir.sh.dpatch)
+cp src/pawlib/paw/tree/converter.h src/pawlib/paw/paw/
+
+%patch -P 318 -p1
+
+# move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch)
+mv src/packlib/kernlib src/kernlib
+
+%patch -P 700 -p1
+
+# move hkf1q.F and hkfill.F out of packlib/hbook and into
+# pawlib/comis where they obviously belong (it even says so in the files!)
+# (debian 701-move-packlib-hkfill-to-comis.sh.dpatch)
+pushd src
+                mv packlib/hbook/code/hkf1q.F  pawlib/comis/code/
+                mv packlib/hbook/code/hkfill.F pawlib/comis/code/
+                # these files also need some headers to go with them:
+                mkdir pawlib/comis/hbook
+                cp -p packlib/hbook/hbook/pilot.h    pawlib/comis/hbook/
+                cp -p packlib/hbook/hbook/hcbook.inc pawlib/comis/hbook/
+                cp -p packlib/hbook/hbook/hcbits.inc pawlib/comis/hbook/
+                cp -p packlib/hbook/hbook/hcfast.inc pawlib/comis/hbook/
+popd
+
+%patch -P 701 -p1
+
+# Must create dirs before applying following patch. 
+# Corresponds with 702-fix-packlib-mathlib-circular-mess.sh.dpatch
+
+pushd src
+                # Hdiff depends upon a bunch of mathlib files; move it into
+                # mathlib.
+                mkdir mathlib/hbook
+                mv packlib/hbook/hdiff mathlib/hbook/
+                cp -r packlib/hbook/hbook mathlib/hbook/
+
+                # Meanwhile, other packlib files depend upon these mathlib
+                # files which are easily moved:
+                mkdir packlib/hbook/d
+                mv mathlib/gen/d/rgmlt*.F packlib/hbook/d/
+                mv mathlib/gen/n          packlib/hbook/
+                cp -r mathlib/gen/gen     packlib/hbook/
+popd
+
+%patch -P 702 -p1
+
+# Script to move packlib/kuip/code_motif to top level, splitting it out
+# from packlib.  But keep kmutil.c in packlib, it's otherwise used.
+# debian 703-move-code_motif-to-top-level.sh.dpatch
+
+pushd src
+                mv packlib/kuip/code_motif/kmutil.c packlib/kuip/code_kuip/
+                mv packlib/kuip/code_motif          ./
+                cp -r packlib/kuip/kuip             code_motif/
+popd
+
+%patch -P 703 -p1
+
+# Script to move the file kuwhag.c from packlib/kuip/code_kuip/kuwhag.c
+# into graflib/higz/higzcc.  It appears to be the only file in code_kuip
+# that depends upon grafX11 and libX11, so it fits in better here.
+# debian 704-move-kuwhag.c-to-grafX11.sh.dpatch
+
+pushd src
+                mv packlib/kuip/code_kuip/kuwhag.c graflib/higz/higzcc/
+                cp -r packlib/kuip/kuip            graflib/higz/
+popd
+
+%patch -P 704 -p1
+
+# Script to move Lesstif-dependent Paw code into its own library.
+# debian 705-move-paw++-code-to-top-level.sh.dpatch
+
+pushd src
+                mkdir paw_motif
+                mv pawlib/paw/?motif pawlib/paw/fpanels? paw_motif/
+                mv pawlib/paw/tree pawlib/paw/uimx pawlib/paw/xbae* paw_motif/
+                cp -p pawlib/paw/Imakefile paw_motif/
+                
+                mkdir paw_motif/code
+                mv pawlib/paw/code/pawpp.F   paw_motif/code/
+                mv pawlib/paw/code/pawintm.F paw_motif/code/
+
+                mkdir paw_motif/cdf
+                mv pawlib/paw/cdf/pamcdf.cdf paw_motif/cdf/
+
+                cp -pr pawlib/paw/paw paw_motif/
+                cp -pr pawlib/paw/hpaw paw_motif/
+popd
+
+%patch -P 705 -p1
+
+%patch -P 800 -p1
+%patch -P 801 -p1
+%patch -P 802 -p1
+%patch -P 803 -p1
+
+# Shell script to link pawlib/comis/comis into the top-level include directory.
+# debian 804-link-to-comis-includes.sh.dpatch
+pushd src
+                ln -s ../pawlib/comis/comis include/comis
+popd
+
+%patch -P 804 -p1
+%patch -P 805 -p1
+%patch -P 806 -p1
+
+
+%patch -P 1200
+%patch -P 1201
+%patch -P 1203
+%patch -P 1204
 # use gfortran
-#%patch -P 36
+#%patch -P 1205
 # workaround gfortran bug
-%patch -P 42
-%patch -P 43
-%patch -P 44
+%patch -P 1206
+%patch -P 1207
 
+# remove CVS directories
+find . -depth -type d -name CVS -exec rm -rf {} ';' 
+
+# unset executable bit on source files
+chmod a-x src/kernlib/kerngen/ccgencf/cfstati.c \
+  src/cfortran/cfortran.*
+
+# remove empty header file not needed anywhere to shut up rpmlint
+rm src/pawlib/paw/ntuple/dbmalloc.h
 
 %build
+
 CERN=$RPM_BUILD_DIR/cernlib-%{version}
 CERN_LEVEL=%{version}
 CERN_ROOT=$CERN/$CERN_LEVEL
@@ -273,7 +479,10 @@
 export CVSCOSRC
 export PATH
 
-# set the CERN and CERN_LEVEL environment variables in a shell script
+LIB_SONAME=1
+export LIB_SONAME
+
+# set the CERN and CERN_LEVEL environment variables in shell scripts
 # meant to go to /etc/profile.d
 sed -e 's/==CERN_LEVEL==/%{version}/' -e 's:==CERN==:%{_libdir}/cernlib:' %{SOURCE100} > cernlib-%{version}.sh
 sed -e 's/==CERN_LEVEL==/%{version}/' -e 's:==CERN==:%{_libdir}/cernlib:' %{SOURCE105} > cernlib-%{version}.csh
@@ -281,6 +490,12 @@
 cp %{SOURCE101} .
 cp %{SOURCE102} .
 cp %{SOURCE103} .
+
+# Regenerate the copyright file (from debian/rules)
+grep -v DEADPOOL_LIST_GOES_HERE debian/copyright.in > copyright
+sed -e 's/#.*//g' -e '/^[[:space:]]*$$/d' %{SOURCE200} | \
+                sort | uniq >> copyright
+
 # copy xsneut.data in 2005/share/lib, where geant expects it to be
 # there is a link from 2005/lib
 mkdir -p %{version}/share/lib
@@ -288,33 +503,43 @@
 
 cd $CERN_ROOT
 
-# substitude the right defaults in the cernlib script
-sed -i -e 's:/cern:%{_libdir}/cernlib/:' -e 's:pro:%{version}:' src/scripts/cernlib
+# substitude the right defaults in the scripts
+sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{version}":' \
+	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
 # substitute version in gxint with the right version
 # substitute includedir in gxint to conform to FHS
-sed -e 's/==VERSION==/%{version}/' -e 's:==includedir==:%{_includedir}:' src/scripts/gxint > src/scripts/gxint.new
-cp src/scripts/gxint.new src/scripts/gxint
+sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib:%{_includedir}/cernlib/\${ver}:' src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
-for file in src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F; do
-  cp $file $file.bef
-  sed -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' $file.bef > $file
-done
+sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \
+  src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F
 
 # Create the build directory structure
+mkdir -p build bin lib shlib
 
-mkdir -p build bin lib build/log
+# rename the cernlib script cernlib-static and use the debian cernlib
+# script for dynamic libraries support
+# remove -lg2c to the link commands, because libg2c.so isn't available, 
+# it is found by g77 if needed
+mv src/scripts/cernlib bin/cernlib-static
+sed -e 's:@PREFIX@:%{_prefix}:g' \
+  -e 's:@LIBPREFIX@:%{_libdir}/cernlib/%{version}:g' \
+  -e 's/-lg2c//' \
+  ../debian/add-ons/bin/cernlib.in > src/scripts/cernlib
+chmod 0755 src/scripts/cernlib
 
+# install mkdirhier which is needed to make directories
 cp %{SOURCE104} bin/
 chmod a+x bin/mkdirhier
 
 # Create the top level Makefile with imake
-# the RPM optflags are not used
 
 cd $CERN_ROOT/build
 $CVSCOSRC/config/imake_boot
 
+# the RPM optflags are not used during the build
+
 # Install kuipc and the scripts (cernlib, paw and gxint) in $CERN_ROOT/bin
 
 make %{?_smp_mflags} bin/kuipc
@@ -327,6 +552,8 @@
 cd $CERN_ROOT/build
 #  %{?_smp_mflags} breaks the build
 make
+make install.shlib
+chmod a+x ../shlib/*.so.*
 
 # Build paw
 cd $CERN_ROOT/build/pawlib
@@ -345,7 +572,7 @@
 %{__install} -m755 cernlib-%{version}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
 %{__install} -d -m755 cfortran/Examples
-%{__install} -m644 %{version}/include/cfortran/Examples/*.c cfortran/Examples/
+%{__install} -m644 %{version}/src/cfortran/Examples/*.c cfortran/Examples/
 
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_datadir}/aclocal
 %{__install} -m644 cernlib.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/cernlib.m4
@@ -354,43 +581,74 @@
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_datadir}/cernlib/%{version}
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
+%{__install} -d -m755 $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/cfortran
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_bindir}/
 
 %{__install} -m644 lib/*.dat $RPM_BUILD_ROOT%{_datadir}/cernlib/%{version}
 %{__install} -m644 lib/gxint321.f $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
-(cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && %{__ln_s} gxint321.f gxint.f)
+%{__install} -m644 src/cfortran/*.h $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/
 
 %{__install} -m755 bin/* $RPM_BUILD_ROOT%{_bindir}/
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
-(cd include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -)
+(cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
+#(cd src/include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -)
 
-rm -rf $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/cfortran/Examples/
 rm -f $RPM_BUILD_ROOT%{_bindir}/mkdirhier
 
+# add links for cfortran header files in the top include directory
+pushd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
+for file in *.h; do
+	%{__ln_s} $file cfortran/$file
+done
+%{__ln_s} gxint321.f gxint.f
+popd
+
+cd src
+# install include directories for the cernlib libraries
+base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
+for dir in `cat ../../debian/add-ons/includelist.txt`; do
+	basedir=`basename $dir`
+	rm -rf $base_include/$basedir
+	cp -Rp $dir $base_include/
+done
+
+find $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} -name Imakefile -exec rm -f \{\} \;
+rm -f $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/ntuple/*.c
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%dir %{_libdir}/cernlib/
+%dir %{_libdir}/cernlib/%{version}
+%dir %{_libdir}/cernlib/%{version}/lib
+%{_libdir}/cernlib/%{version}/lib/*.so.*
+%{_datadir}/cernlib/
+%doc cernlib.README copyright
+%doc debian/debhelper/geant321.README.debian 
+%doc debian/debhelper/libpdflib804-2-dev.README.debian
+%doc debian/debhelper/libmathlib2.README.debian 
+%doc debian/debhelper/montecarlo-base.README.debian
+
 # the utils and devel are separated to have the possibility to install
 # parallel versions of the library
-
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/cernlib/%{version}
-%{_datadir}/cernlib/%{version}
-%{_includedir}/cernlib/%{version}
+%{_libdir}/cernlib/%{version}/lib/*.a
+%{_libdir}/cernlib/%{version}/lib/*.so
+%{_includedir}/cernlib/
 %{_datadir}/aclocal/cernlib.m4
-# those file should be in a cernlib main package
-%doc cernlib.README debian/copyright
-%doc debian/libgeant1.README.debian debian/libpdflib804-dev.README.debian
-%doc debian/libmathlib1.README.debian debian/montecarlo-base.README.debian
-# devel specific files
 %doc cfortran 
 
 %files utils
 %defattr(-,root,root,-)
-%{_bindir}/cernlib
+%{_bindir}/cernlib*
 %{_sysconfdir}/profile.d/cernlib-%{version}.sh
 %{_sysconfdir}/profile.d/cernlib-%{version}.csh
 
@@ -426,9 +684,20 @@
 %{_bindir}/hepdb
 %{_bindir}/kxterm
 %{_bindir}/zftp
-%doc debian/zftp.README.debian
+%doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8
+- update with newer debian patchset for cernlib, fix licence issues
+- remove the BSD in the licence because there is no library nor binary
+  under a BSD licence and someone could get the idea that there is 
+  some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
+  because of cfortran
+- don't use the include.tar.gz source, instead get include files from
+  the source files
+- build shared libraries
+- simplify the scripts modifications
+
 * Thu Nov 17 2005 Patrice Dumas  - 2005-4.2
 - on fc-3 there is no lapack-devel and blas-devel, but instead blas 
   and lapack


Index: paw.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/paw.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw.README	16 Nov 2005 23:34:07 -0000	1.1
+++ paw.README	9 Dec 2005 15:57:06 -0000	1.2
@@ -5,18 +5,17 @@
 
 If you experience corruption of the graphics window when other windows are
 moved over top of it, turn on the BackingStore option of the X server.
-In the "Screen" section of your /etc/X11/XF86Config-4 file or 
-/etc/X11/xorg.conf, you should have
-something like:
+In the "Screen" section of your /etc/X11/XF86Config-4 or /etc/X11/xorg.conf
+file (whichever one exists), you should have something like:
 
 Section "Screen"
-        .
-        .
-        .
+	.
+	.
+	.
     Option "BackingStore"
-        .
-        .
-        .
+	.
+	.
+	.
 EndSection
 
 2) Remote data files
@@ -32,12 +31,22 @@
 If you compile a FORTRAN script within PAW, the path to the file cannot
 be excessively long (more than 256 characters).
 
-4) 64-bit issues
+4) Filename case issues
+
+The default behavior has been set so that PAW is case-sensitive in its 
+treatment of filenames.  If you have any old Paw scripts that do not
+treat filenames in a case-sensitive way, you may need to add the line
+
+        filecase convert
+
+to the beginning of them.
+
+5) 64-bit issues
 
 Note that this package is not yet fully functional on 64-bit machines, as the
 COMIS portion of Pawlib does not yet work correctly on those architectures.
 
--- Kevin McCarty , Mon, 29 Nov 2004
+-- Kevin McCarty , Tue, 22 Nov 2005
 
 Adapted to the rpm package by 
--- Dumas Patrice , Tue, 16 Jun 2005
+-- Dumas Patrice 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Nov 2005 12:45:03 -0000	1.3
+++ sources	9 Dec 2005 15:57:06 -0000	1.4
@@ -1,16 +1,15 @@
-cdbd82c54aed8d1385f1ef0a10be8667  include.tar.gz
+9d37e3c16c336d1887029227b27a42d8  src_car.tar.gz
 03bfd1239e57a23ab087bf29fe48c8a8  src_Imakefile.tar.gz
-1f25e16563f89a69c1b15b8ed11af904  src_car.tar.gz
+fd20e80b3f58fc88168bcd6ce701f999  src_patchy.tar.gz
 9e686519ae3a52344222b21c9444ddd6  src_cfortran.tar.gz
-b72b89cb3a7f7c592d28b992c95b4eff  src_config.tar.gz
-2cf91d533315b430f4e36c1c6e23841a  src_geant321.tar.gz
-f09d0f28e5c7ecc1a3932369f5a15dab  src_graflib.tar.gz
 9ebd72a2b6e5349b25fc93e7b20c172a  src_include.tar.gz
+bb4e224a7713ac4b8c13598e388c17f3  src_pawlib.tar.gz
+b72b89cb3a7f7c592d28b992c95b4eff  src_config.tar.gz
 0ec66e6d4920af79999b4c73fd3b065a  src_mathlib.tar.gz
-ce6d941a50c3e1fdc8bdcc4ec2988116  src_mclibs.tar.gz
-d7d4628d136ed97f1e9ba164774a6878  src_packlib.tar.gz
-fd20e80b3f58fc88168bcd6ce701f999  src_patchy.tar.gz
-dcd46166a57a8a4ec45d872d79839f1a  src_pawlib.tar.gz
 f215b9adba3cfb3be4bd74d624f00d32  src_phtools.tar.gz
+24e2460fa61675df1cd74c7204a8d79e  src_geant321.tar.gz
+666d8a5c483c275463ebb1a3dd48c742  src_mclibs.tar.gz
 b30b121167ddf6508c22fc25a4272276  src_scripts.tar.gz
+67228b011eac13b44499c50219e21545  src_graflib.tar.gz
+4fdcdc9f819ebbb9c6d3a04f339cdcf8  src_packlib.tar.gz
 eecb52159458ead0ee6b0d00b90aab66  xsneut95.dat


--- 001-delete-pythia-refs DELETED ---


--- 003-enforce-FHS DELETED ---


--- 005-enable-shadow-passwd DELETED ---


--- 007-delete-fluka-refs DELETED ---


--- 008-undef-PPC DELETED ---


--- 010-comis-allow-special-chars-in-path DELETED ---


--- 012-add-no-optimization-macro DELETED ---


--- 013-fix-paw-imakefile-special-rules DELETED ---


--- 014-fix-herwig-imakefile-special-rules DELETED ---


--- 015-fix-optimization DELETED ---


--- 018-move-kernlib-to-toplevel DELETED ---


--- 028-fix-isajet-docs DELETED ---


--- 030-filename-length-to-256 DELETED ---


--- 033-fix-undefined-insertchar DELETED ---


--- 035-do-not-use-XmFontListCreate DELETED ---


--- 038-fix-strndup-macro-problem DELETED ---


--- 039-use-DBLE-not-REAL DELETED ---


--- 044-fix-strdup-redefinition DELETED ---


--- 045-compile-with-isasrt DELETED ---


--- 047-fix-paw++-menus DELETED ---


--- cernlib-XmDrawShadow-no-prototype.patch DELETED ---


--- cernlib-bimsel-nodouble-save.diff DELETED ---


--- cernlib-cernlib.patch DELETED ---


--- cernlib-hwhiga_use_aimag.diff DELETED ---


--- cernlib-hwuli2_use_aimag.diff DELETED ---


--- cernlib-install_scripts.patch DELETED ---


--- cernlib-static-tcpaw.diff DELETED ---


--- cernlib_2004.11.04-3.diff DELETED ---


--- gxint-script.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 16:06:06 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 11:06:06 -0500
Subject: rpms/cernlib/FC-3 cernlib-cernlib_kernlib.patch, NONE,
	1.1 cernlib.spec, 1.7, 1.8
Message-ID: <200512091606.jB9G66eV026115@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Added Files:
	cernlib-cernlib_kernlib.patch 
Log Message:
in fact the 64 bit fixes are included, and a patch was missing


cernlib-cernlib_kernlib.patch:

--- NEW FILE cernlib-cernlib_kernlib.patch ---
--- src/scripts/cernlib-old	2005-11-30 20:15:23.000000000 +0100
+++ src/scripts/cernlib	2005-11-30 20:15:23.000000000 +0100
@@ -16,12 +16,16 @@
   [ -z "$CERN_LEVEL" ] && gver="pro" || gver="$CERN_LEVEL"
  
   _P=0  ; _p=0 ;   _u=0 ; Gsys=""
+  #default is to use dynamic lapack
+  _l=1 ;
+  dynlapack=0;
   while [ $# -gt 0 ]
   do case $1 in
        -G) Gsys=$2   ; shift ;;
        -P) _P=1              ;;
        -s) _s="is an obsolete option"     ;;
        -u) _u=1 ; _p=1       ;;
+       -l) _l=0              ;;
        -v) gver=$2   ; shift ;;
        --) shift ; break     ;;
         *)         break     ;;
@@ -46,14 +50,29 @@
       [ $# -eq 2 -a $1 != "graflib" ] && lver=$2
       dir=$CERN/$lver/lib
          ln=$1
-      if [ $1 = "kernlib" -o $1 = "packlib" ] ; then
+      if [ $1 = "kernlib" ]; then
          _p=1
       fi
+      if [ $1 = "packlib" ]; then
+         _p=1
+         ln="packlib-lesstif.a $dir/libpacklib.a $dir/libkernlib"
+      fi
          [ $1 = "genlib"  ] && ln="mathlib.a $dir/libphtools"
          [ $1 = "bvsl"    ] && ln="mathlib"
          [ $1 = "mpalib"  ] && ln="mathlib"
-         [ $1 = "lapack"  ] && ln="lapack3.a $dir/libblas"
-	 [ $1 = "pawlib"  ] && ln="pawlib.a $dir/liblapack3.a $dir/libblas"
+         if [ $_l -eq 0 ] ; then
+           [ $1 = "pawlib"  ] && ln="pawlib-lesstif.a $dir/libpawlib.a $dir/liblapack3.a $dir/libblas"
+           [ $1 = "lapack"  ] && ln="lapack3.a $dir/libblas"
+         else
+           if [ $1 = "pawlib"  ] ; then 
+              ln="pawlib-lesstif.a $dir/libpawlib"
+              dynlapack=1
+           fi
+           if [ $1 = "lapack"  ] ; then
+              ln=""
+              dynlapack=1
+           fi
+         fi
          [ $1 = "pythia"  ] && ln="jetset"
       if [ $1 = "GKS" -o $1 = "gks" ] ; then
          drv="X11" ; glib="$1" ; dir="$CERN/gks/$lver/lib"
@@ -69,9 +88,9 @@
          [ $drv = "Motif" ] && drv="X11"
          ln="$ln.a $dir/libgraf$drv"
       fi
-         CERNLIB="$CERNLIB $dir/lib$ln.a"
+      [ -n "$ln" ] && CERNLIB="$CERNLIB $dir/lib$ln.a"
   done
-  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib.a"
+  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib-lesstif.a $CERN/$gver/lib/libpacklib.a $CERN/$gver/lib/libkernlib.a"
 
 #  get system name
   [ -d /NextAdmin ] && Msys="NeXT" || Msys=`uname -s`
@@ -110,10 +129,14 @@
                SYSGGL="-lfgl -lgl_s -lm -lbsd" ;
                SYSGMOTIF="-lXm -lXt -lX11 -lPW"
 	       ;;
-      Linux)   [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
+      Linux)   SYSGX11="-lX11"
+	       SYSGMOTIF="-lXm -lXt -lXp -lXext -lX11"
+	       [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
 	       [ -d /usr/X11/lib ] && SYSGX11="-L/usr/X11/lib -lX11"
 	       [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
+	       [ -d /usr/X11R6/lib64 ] && SYSGX11="-L/usr/X11R6/lib64 -lX11"
 	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
+	       [ -d /usr/X11R6/lib64 ] && SYSGMOTIF="-L/usr/X11R6/lib64 -lXm -lXt -lXp -lXext -lX11"
 	       [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
 	       ;;
       NeXT)    SYSGX11="/usr/lib/X11/libX11.r" ;
@@ -208,6 +231,10 @@
      fi
      if [ "$Msys" = "Linux" ] ; then
         CERNLIB="$CERNLIB -lnsl -lcrypt -ldl"
+#        echo $CERNLIB | grep pawlib >/dev/null &&   CERNLIB="$CERNLIB -llapack -lblas"
+     fi
+     if [ $dynlapack = 1 ] ; then
+         CERNLIB="$CERNLIB -llapack -lblas"
      fi
   fi
  


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cernlib.spec	9 Dec 2005 15:57:06 -0000	1.7
+++ cernlib.spec	9 Dec 2005 16:06:04 -0000	1.8
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}
+Release:       8%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -12,7 +12,12 @@
 #BuildRequires: gcc-g77
 #Requires:      libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
 # fedora core
-BuildRequires: xorg-x11-devel lapack blas openmotif-devel 
+# fc 3
+BuildRequires: xorg-x11-devel lapack blas openmotif-devel
+# fc 4
+BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
+# fc devel
+#BuildRequires: imake lapack-devel blas-devel openmotif-devel 
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
 # build the cernlib
 #BuildRequires: imake lapack-devel blas-devel openmotif-devel 
@@ -687,8 +692,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.1
 - update with newer debian patchset for cernlib, fix licence issues
+- enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary
   under a BSD licence and someone could get the idea that there is 
   some dual BSD/GPL licenced binaries or libraries. The LGPL is kept



From fedora-extras-commits at redhat.com  Fri Dec  9 16:09:21 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 11:09:21 -0500
Subject: rpms/cernlib/FC-4 003-geant-dummy-functions.dpatch, NONE,
 1.1 100-fix-isajet-manual-corruption.dpatch, NONE,
 1.1 101-undefine-PPC.dpatch, NONE, 1.1 102-dont-optimize-some-code.dpatch,
 NONE, 1.1 103-ignore-overly-long-macro-in-gen.h.dpatch, NONE,
 1.1 104-fix-undefined-insertchar-warning.dpatch, NONE,
 1.1 105-fix-obsolete-xmfontlistcreate-warning.dpatch, NONE,
 1.1 106-fix-paw++-menus-in-lesstif.dpatch, NONE,
 1.1 107-define-strdup-macro-safely.dpatch, NONE,
 1.1 108-quote-protect-comis-script.dpatch, NONE,
 1.1 110-ignore-included-lapack-rule.dpatch, NONE,
 1.1 111-fix-kuesvr-install-location.dpatch, NONE,
 1.1 112-remove-nonexistent-prototypes-from-gen.h.dpatch, NONE,
 1.1 113-cups-postscript-fix.dpatch, NONE,
 1.1 114-install-scripts-properly.dpatch, NONE,
 1.1 200-comis-allow-special-chars-in-path.dpatch, NONE,
 1.1 201-update-kuip-helper-apps.dpatch, NONE,
 1.1 202-fix-includes-in-minuit-example.dpatch, NONE,
 1.1 203-compile-geant-with-ertrak.dpatch, NONE,
 1.1 204-compile-isajet-with-isasrt.dpatch, NONE, 1.1 205-!
 max-path-length-to-256.dpatch, NONE, 1.1 206-herwig-uses-DBLE-not-REAL.dpatch,
 NONE, 1.1 207-compile-temp-libs-with-fPIC.dpatch, NONE,
 1.1 208-fix-redundant-packlib-dependencies.dpatch, NONE,
 1.1 209-ignore-unneeded-headers-in-kmutil.c.dpatch, NONE,
 1.1 210-improve-cfortran-header-files.dpatch, NONE,
 1.1 211-fix-comis-on-64-bit-arches.dpatch, NONE,
 1.1 300-skip-duplicate-lenocc.dpatch, NONE,
 1.1 303-shadow-passwords-supported.dpatch, NONE,
 1.1 304-update-Imake-config-files.dpatch, NONE,
 1.1 305-use-POWERPC-not-PPC-as-test.dpatch, NONE,
 1.1 306-patch-assert.h-for-makedepend.dpatch, NONE,
 1.1 307-use-canonical-cfortran.dpatch, NONE,
 1.1 308-use-canonical-cfortran-location.dpatch, NONE,
 1.1 309-define-dummy-herwig-routines.dpatch, NONE,
 1.1 310-define-dummy-fowl-routines.dpatch, NONE,
 1.1 311-skip-duplicate-qnext.dpatch, NONE,
 1.1 312-skip-duplicate-gamma.dpatch, NONE,
 1.1 313-comis-preserves-filename-case.dpatch, NONE,
 1.1 314-permit-using-regcomp-for-re_comp.dpatch, NONE,
 1.1 315-fixes-for-MacOSX.dpatch, NONE, 1.1 3!
 18-additional-gcc-3.4-fixes.dpatch,NONE,1.1 701-patch-hbook-co!
 mis-Im
Message-ID: <200512091609.jB9G9LKJ026243@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	001-fix-missing-fluka.dpatch 002-fix-missing-mclibs.dpatch 
	700-remove-kernlib-from-packlib-Imakefile.dpatch 
	cernlib-cernlib_kernlib.patch cernlib-deadpool.txt 
	cernlib-gxint-script.diff cernlib.README cernlib.spec 
	paw.README sources 
Added Files:
	003-geant-dummy-functions.dpatch 
	100-fix-isajet-manual-corruption.dpatch 
	101-undefine-PPC.dpatch 102-dont-optimize-some-code.dpatch 
	103-ignore-overly-long-macro-in-gen.h.dpatch 
	104-fix-undefined-insertchar-warning.dpatch 
	105-fix-obsolete-xmfontlistcreate-warning.dpatch 
	106-fix-paw++-menus-in-lesstif.dpatch 
	107-define-strdup-macro-safely.dpatch 
	108-quote-protect-comis-script.dpatch 
	110-ignore-included-lapack-rule.dpatch 
	111-fix-kuesvr-install-location.dpatch 
	112-remove-nonexistent-prototypes-from-gen.h.dpatch 
	113-cups-postscript-fix.dpatch 
	114-install-scripts-properly.dpatch 
	200-comis-allow-special-chars-in-path.dpatch 
	201-update-kuip-helper-apps.dpatch 
	202-fix-includes-in-minuit-example.dpatch 
	203-compile-geant-with-ertrak.dpatch 
	204-compile-isajet-with-isasrt.dpatch 
	205-max-path-length-to-256.dpatch 
	206-herwig-uses-DBLE-not-REAL.dpatch 
	207-compile-temp-libs-with-fPIC.dpatch 
	208-fix-redundant-packlib-dependencies.dpatch 
	209-ignore-unneeded-headers-in-kmutil.c.dpatch 
	210-improve-cfortran-header-files.dpatch 
	211-fix-comis-on-64-bit-arches.dpatch 
	300-skip-duplicate-lenocc.dpatch 
	303-shadow-passwords-supported.dpatch 
	304-update-Imake-config-files.dpatch 
	305-use-POWERPC-not-PPC-as-test.dpatch 
	306-patch-assert.h-for-makedepend.dpatch 
	307-use-canonical-cfortran.dpatch 
	308-use-canonical-cfortran-location.dpatch 
	309-define-dummy-herwig-routines.dpatch 
	310-define-dummy-fowl-routines.dpatch 
	311-skip-duplicate-qnext.dpatch 
	312-skip-duplicate-gamma.dpatch 
	313-comis-preserves-filename-case.dpatch 
	314-permit-using-regcomp-for-re_comp.dpatch 
	315-fixes-for-MacOSX.dpatch 
	318-additional-gcc-3.4-fixes.dpatch 
	701-patch-hbook-comis-Imakefiles.dpatch 
	702-patch-Imakefiles-for-packlib-mathlib.dpatch 
	703-patch-code_motif-packlib-Imakefiles.dpatch 
	704-patch-code_kuip-higzcc-Imakefiles.dpatch 
	705-patch-paw_motif-paw-Imakefiles.dpatch 
	800-implement-shared-library-rules-in-Imake.dpatch 
	801-non-optimized-rule-uses-fPIC-g.dpatch 
	802-create-shared-libraries.dpatch 
	803-link-binaries-dynamically.dpatch 
	804-workaround-for-comis-mdpool-struct-location.dpatch 
	805-expunge-missing-mathlib-kernlib-symbols.dpatch 
	806-bump-mathlib-and-dependents-sonames.dpatch 
	cernlib-enforce-FHS.diff cernlib-hwhiga_use_dimag.diff 
	cernlib-hwuli2_use_dimag.diff cernlib_2005.05.09.dfsg-2.diff 
Removed Files:
	003-enforce-FHS 005-enable-shadow-passwd 008-undef-PPC 
	010-comis-allow-special-chars-in-path 
	012-add-no-optimization-macro 
	013-fix-paw-imakefile-special-rules 
	013-fix-paw-imakefile-special-rules-modified 
	014-fix-herwig-imakefile-special-rules 015-fix-optimization 
	028-fix-isajet-docs 029-fixes-for-MacOSX 
	030-filename-length-to-256 032-use-regcomp-not-re_comp 
	033-fix-undefined-insertchar 035-do-not-use-XmFontListCreate 
	038-fix-strndup-macro-problem 039-use-DBLE-not-REAL 
	044-fix-strdup-redefinition 045-compile-with-isasrt 
	047-fix-paw++-menus cernlib-XmDrawShadow-no-prototype.patch 
	cernlib-bimsel-nodouble-save.diff cernlib-config_pmac.diff 
	cernlib-hwhiga_use_aimag.diff cernlib-hwuli2_use_aimag.diff 
	cernlib-includelist.txt cernlib-install_scripts.patch 
	cernlib-static-tcpaw.diff cernlib_2004.11.04-3.diff 
Log Message:
- use new debian patchset
- enable 64 bit fixes patch
- remove the BSD in the licence because there is no library nor binary
  under a BSD licence and someone could get the idea that there is 
  some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
  because of cfortran
- update with newer debian patchset for cernlib, fix licence issues
- build shared libraries
- simplify the scripts modifications

sync with devel



--- NEW FILE 003-geant-dummy-functions.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 003-geant-dummy-functions.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add stub Geant functions to avoid missing symbols due to Fluka removal.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gkine/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gkine/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/gkine/Imakefile	1996-03-28 16:21:20.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/gkine/Imakefile	2005-11-29 15:59:27.035065621 +0000
@@ -1,6 +1,9 @@
 SRCS_F= gfkine.F gfvert.F gludky.F glund.F glundi.F gpkine.F \ @@\
 	gpkinx.F gpvert.F gskine.F gskinu.F gsvert.F gsveru.F gtau.F
 
+/* Dummy file containing stubs for deleted Fluka and mclibs functions: */
+SRCS_C= dummy.c
+
 #ifdef CERNLIB_QMVAOS
  FORTRANSAVEOPTION=FortranSaveFlags
  FORTRANOPTIONS = -math_library accurate $(FORTRANSAVEOPTION)
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gkine/dummy.c cernlib-2005.05.09.dfsg/src/geant321/gkine/dummy.c
--- cernlib-2005.05.09.dfsg~/src/geant321/gkine/dummy.c	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/gkine/dummy.c	2005-11-29 16:55:14.274440352 +0000
@@ -0,0 +1,205 @@
+/* Dummy file to avoid undefined symbols in the library */
+/* Kevin McCarty, 14 Jan 2003 */
+/* Last revised 22 November 2005 */
+
+#include 
+#include 
+#include 
+
+/* Want the dummy functions to be weakly defined so they may be overridden
+ * without error. */
+
+#define kludge(x)    #x
+#define stringify(x) kludge(x)
+#define underline(x) __ ## x
+
+#define DUMMY(domain, UPPERNAME, fortranname_, returntype) \
+returntype fortranname_() {print_dummy(#domain,#UPPERNAME);}
+
+#define WEAKDUMMY(domain, UPPERNAME, fortranname_, returntype) \
+static returntype underline(fortranname_)() {print_dummy(#domain,#UPPERNAME);} \
+void fortranname_() \
+	__attribute__ ((weak, alias (stringify(underline(fortranname_))) ))
+
+static void print_dummy(const char *domain, const char *function)
+{
+  fprintf(stderr, "Geant321: Now in dummy %s routine.\n", function);
+  fprintf(stderr,
+"If you see this message, you are presumably trying to call (possibly\n"
+"indirectly) the %s routine");
+
+  if (strcmp(domain, "Jetset") == 0)
+    fprintf(stderr,
+" in the Jetset library.\n"
+#if defined (CERNLIB_DEBIAN)
+"To obtain the Jetset library, please see the file\n"
+"/usr/share/doc/geant321/README.Debian\n"
+#endif
+    );
+
+  else if (strcmp(domain, "Fluka") == 0)
+    fprintf(stderr,
+" in the FLUKA library.\n"
+"FLUKA is unfortunately not available in this distribution of Cernlib for\n"
+"licensing reasons"
+#if defined (CERNLIB_DEBIAN)
+"; please see the file /usr/share/doc/geant321/README.Debian\n"
+"for details.\n"
+#else
+".\n"
+#endif
+    );
+  
+  else if (strcmp(domain, "User") == 0)
+    fprintf(stderr, ".  This routine is not built into Geant;\n"
+"you must write code for it yourself.  Please see the documentation"
+#if defined (CERNLIB_DEBIAN)
+"\n(for instance in the geant321-doc package)"
+#endif
+".\n");
+  
+  exit(EXIT_FAILURE);
+}
+
+/* Functions that the user is supposed to set up */
+WEAKDUMMY(User, UGINIT, uginit_, void);
+WEAKDUMMY(User, UGLAST, uglast_, void);
+
+/* Functions in the non-free Jetset library, which can be used
+ * if it's installed */
+WEAKDUMMY(Jetset, LU1ENT, lu1ent_, void);
+WEAKDUMMY(Jetset, LUCOMP, lucomp_, int);
+WEAKDUMMY(Jetset, LUEEVT, lueevt_, void);
+WEAKDUMMY(Jetset, LUEXEC, luexec_, void);
+
+/* N.B.  When the libgeant321 dynamic soversion is bumped, at the same time
+ * everything below this point except the dummy FLDIST and FLINIT subroutines
+ * may be deleted; those should be turned into weak aliases in case anyone
+ * wants to create a separate GEANT-FLUKA library. */
+
+/* From src/geant321/fluka (not the complete set of functions, just
+ * those referenced from external files) */
+WEAKDUMMY(Fluka, DOST,   dost_,   double);
+WEAKDUMMY(Fluka, EEXLVL, eexlvl_, void);
+WEAKDUMMY(Fluka, EVENTV, eventv_, void);
+WEAKDUMMY(Fluka, EVEVAP, evevap_, void);
+WEAKDUMMY(Fluka, EVVINI, evvini_, void);
+WEAKDUMMY(Fluka, FKENER, fkener_, double);
+WEAKDUMMY(Fluka, FKZERO, fkzero_, void);
+WEAKDUMMY(Fluka, NIZLNW, nizlnw_, void);
+WEAKDUMMY(Fluka, NUCREL, nucrel_, void);
+WEAKDUMMY(Fluka, RACO,   raco_,   void);
+WEAKDUMMY(Fluka, SAMCST, samcst_, void);
+WEAKDUMMY(Fluka, SIGEL,  sigel_,  void);
+WEAKDUMMY(Fluka, SITSAO, sitsao_, double);
+
+/* The following dummy functions are added due to the removal
+ * of the corresponding code from Geant (it is also part of FLUKA).
+ * We are constrained to keep the ABI for the dynamic library, so
+ * these dummy functions must be kept until next time the libgeant321
+ * soversion is changed. */
+
+/* From src/geant321/fiface */
+DUMMY(Fluka, FLDIST, fldist_, void);
+DUMMY(Fluka, FLINIT, flinit_, void);
+DUMMY(Fluka, FLUFIN, flufin_, void);
+
+/* From src/geant321/miface */
+DUMMY(Fluka, GFMFIN, gfmfin_, void);
+DUMMY(Fluka, GFMDIS, gfmdis_, void);
+
+/* From src/geant321/block */
+DUMMY(Fluka, FDEVAP, fdevap_, void);
+DUMMY(Fluka, FDNOPT, fdnopt_, void);
+DUMMY(Fluka, FDPREE, fdpree_, void);
+DUMMY(Fluka, FLKDT1, flkdt1_, void);
+DUMMY(Fluka, FLKDT2, flkdt2_, void);
+DUMMY(Fluka, FLKDT3, flkdt3_, void);
+DUMMY(Fluka, FLKDT4, flkdt4_, void);
+DUMMY(Fluka, FLKDT5, flkdt5_, void);
+DUMMY(Fluka, FLKDT6, flkdt6_, void);
+DUMMY(Fluka, FLKDT7, flkdt7_, void);
+
+/* From src/geant321/peanut */
+DUMMY(Fluka, BIMNXT, bimnxt_, void);   /* alternate entry to BIMSEL */
+DUMMY(Fluka, BIMSEL, bimsel_, void);
+DUMMY(Fluka, COSLEG, cosleg_, double);
+DUMMY(Fluka, FEKFNC, fekfnc_, double);
+DUMMY(Fluka, FPFRNC, fpfrnc_, double);
+DUMMY(Fluka, FRADNC, fradnc_, double);
+DUMMY(Fluka, FRHINC, frhinc_, double);
+DUMMY(Fluka, FRHONC, frhonc_, double);
+DUMMY(Fluka, NCLVFX, nclvfx_, double); /* alternate entry to PFNCLV */
+DUMMY(Fluka, NCLVIN, nclvin_, void);
+DUMMY(Fluka, NCLVST, nclvst_, void);
+DUMMY(Fluka, NUCNUC, nucnuc_, void);
+DUMMY(Fluka, NWINXT, nwinxt_, void);   /* alternate entry to NWISEL */
+DUMMY(Fluka, NWISEL, nwisel_, void);
+DUMMY(Fluka, PEANUT, peanut_, void);
+DUMMY(Fluka, PFNCLV, pfnclv_, double);
+DUMMY(Fluka, PHDSET, phdset_, void);
+DUMMY(Fluka, PHDWLL, phdwll_, void);
+DUMMY(Fluka, PIOABS, pioabs_, void);
+DUMMY(Fluka, PREPRE, prepre_, void);
+DUMMY(Fluka, RSCOMP, rscomp_, void);   /* alternate entry to SBCOMP */
+DUMMY(Fluka, RSTNXT, rstnxt_, void);   /* alternate entry to RSTSEL */
+DUMMY(Fluka, RSTSEL, rstsel_, void);
+DUMMY(Fluka, SBCOMP, sbcomp_, void);
+DUMMY(Fluka, SIGFER, sigfer_, void);
+DUMMY(Fluka, UMOFIN, umofin_, void);
+DUMMY(Fluka, XINNEU, xinneu_, double);
+DUMMY(Fluka, XINPRO, xinpro_, double);
+
+/* The following dummy common blocks are added for the same reason.
+ * The number of bytes required was determined by inspecting the existing
+ * shared libraries in the 12 official Debian architectures and determining
+ * the maximum size of each common block there. */
+
+#define COMMON(fortranname_, size) \
+        struct { char c[size]; } fortranname_ = { { 0, } }
+
+COMMON(fkadhn_, 1376);
+COMMON(fkadhp_, 3712);
+COMMON(fkbala_,  288);
+COMMON(fkcd97_, 1152);
+COMMON(fkchpa_, 1472);
+COMMON(fkchpr_,  576);
+COMMON(fkcmcy_,  176);
+COMMON(fkcomc_, 7424);
+COMMON(fkcosp_,   64);
+COMMON(fkdecc_,10816);
+COMMON(fkdech_, 4328);
+COMMON(fkenco_,   16);
+COMMON(fkeva0_,60960);
+COMMON(fkfinu_,52000);
+COMMON(fkhadf_,  352);
+COMMON(fkheac_,   96);
+COMMON(fkheav_, 5408);
+COMMON(fkhet7_,   64);
+COMMON(fkhetp_,   32);
+COMMON(fkhigf_, 1632);
+COMMON(fkidgb_,   16);
+COMMON(fkinpf_,   32);
+COMMON(fkisot_,10208);
+COMMON(fkmapa_, 5824);
+COMMON(fknegx_,  128);
+COMMON(fknuct_,   16);
+COMMON(fknuda_, 1248);
+COMMON(fknuge_, 1120);
+COMMON(fknugi_,26944);
+COMMON(fknuii_, 1888);
+COMMON(fknule_,18048);
+COMMON(fknupw_,   32);
+COMMON(fkpapr_, 2400);
+COMMON(fkpare_,  256);
+COMMON(fkparn_, 7296);
+COMMON(fkpart_, 9696);
+COMMON(fkploc_, 2864);
+COMMON(fkquar_,  832);
+COMMON(fkreac_,50976);
+COMMON(fkredv_, 2368);
+COMMON(fkresn_,  256);
+COMMON(fkrun_,    32);
+COMMON(fkslop_,  608);
+COMMON(fkxsep_,13600);
+


--- NEW FILE 100-fix-isajet-manual-corruption.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 100-fix-isajet-manual-corruption.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix corruption in LaTeX source to the Isajet manual.
## DP: (Replacement text obtained from a PS version of the manual on the web.)

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc /tmp/dpep.tlmeFD/cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc
--- cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc	2001-10-08 10:03:08.000000000 -0400
+++ /tmp/dpep.tlmeFD/cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc	2005-06-08 16:12:37.814042242 -0400
@@ -122,7 +122,7 @@
 $W/Z$ decay. These were calculated using FORM 1.1 by J.~Vermaseren. The
 process $g + t \to W + b$ is {\it not} included. Both $g + b \to W^- +
 t$ and $g + \bar t \to W^- + \bar b$ of course give the same $W^- + t
-+\BARB_FINALSTATEAFTERQCDEVOLUTION
++\bar b$ final state after QCD evolution.  While the latter process is
 needed to describe the $m_t = 0$(!) mass singularity for $q_t \gg
 m_t$, it has a pole in the physical region at low $q_t$ from on-shell
 $t \to W + b$ decays. There is no obvious way to avoid this without


--- NEW FILE 101-undefine-PPC.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 101-undefine-PPC.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: If "PPC" is defined by compiler, undefine where it clashes with a
## DP: local variable.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F /tmp/dpep.aeMGeJ/cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F
--- cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F	1996-01-11 09:14:33.000000000 -0500
+++ /tmp/dpep.aeMGeJ/cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F	2005-06-08 17:00:48.403200778 -0400
@@ -37,6 +37,15 @@
 #include "cojets/zpar2.inc"
 #include "cojets/zwpar.inc"
 #include "cojets/weakon.inc"
+
+C     The following is necessary since PPC is defined in g77 on
+C     the powerpc architecture, but it's also a variable in this
+C     file.
+C       -- Kevin McCarty
+#ifdef PPC
+#undef PPC
+#endif
+
       DIMENSION QP(4),QM(4),QK(4),QE(4),QN(4)
       DIMENSION COEF(2,2),QQV(2)
 C


--- NEW FILE 102-dont-optimize-some-code.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 102-dont-optimize-some-code.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't allow the compiler to optimize several files that cause trouble
## DP: (either compiler crash or broken code generation).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	1996-06-12 11:25:38.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-09 11:14:52.470486750 -0400
@@ -19,6 +19,11 @@
 SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
 	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F rgmlt.F rkstp64.F \ @@\
 	simps64.F triint64.F 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(rderiv,rderiv,-O0,NullParameter)
+SpecialFortranLibObjectRule(rfrdh1,rfrdh1,-O0,NullParameter)
+#endif
 #else
 SRCS_F:= $(SRCS_F) cgauss128.F cauchy.F cauchy128.F deqbs128.F deqmr128.F \ @@\
 	deriv128.F minfc128.F rfrdh128.F rgmlt128.F rkstp128.F simps128.F \ @@\
@@ -37,6 +42,16 @@
 IMAKE_DEFINES=-DFortranDoesCpp=NO
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(rknysd,rknysd,-O0,NullParameter)
+SpecialFortranLibObjectRule(old506,old506,-O0,NullParameter)
+
+/* -O1 -fno-automatic optimization creates wrong code in g77 2.95, 3.3, 3.4
+   due to x86 chip extended precision, cf. http://bugs.debian.org/290438 */
+SpecialFortranLibObjectRule(radmul,radmul,-O0,NullParameter)
+#endif
+
 FORTRANSAVEOPTION = FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/mathlib/gen/e/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/e/Imakefile	1996-05-01 09:21:54.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile	2005-06-09 11:16:07.058731880 -0400
@@ -12,6 +12,11 @@
 
 #if defined(CERNLIB_DOUBLE)
 SRCS_F:= $(SRCS_F) chsum.F dchebn.F rchecf.F rcspln.F
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(rchecf,rchecf,-O0,NullParameter)
+SpecialFortranLibObjectRule(rcspln,rcspln,-O0,NullParameter)
+#endif
 #else
 SRCS_F:= $(SRCS_F) chsum128.F rchebn.F rcspln128.F
 #endif
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile	1996-05-06 11:19:44.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile	2005-06-09 11:16:58.039286811 -0400
@@ -4,4 +4,8 @@
 
 FORTRANSAVEOPTION = FortranSaveFlags
 
+#if defined(CERNLIB_LINUX)
+SpecialFortranLibObjectRule(isawev,isawev,-O0,NullParameter)
+#endif
+
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile
--- cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile	2000-04-19 09:51:56.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile	2005-06-09 11:22:02.812494322 -0400
@@ -97,4 +97,10 @@
 #ifdef CERNLIB_HPUX
 FORTRANOPTIONS += '-WF,-P'
 #endif
+
+#if defined(CERNLIB_LINUX)
+/* -O2 optimization on ARM breaks in g77 3.3.3 */
+SpecialFortranLibObjectRule(structm,structm,-O0,NullParameter)
+#endif
+
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile	1996-06-10 06:20:57.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile	2005-06-09 11:09:34.621022534 -0400
@@ -14,6 +14,11 @@
 FDEBUGFLAGS=+O1
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(muller,muller,-O0,NullParameter)
+#endif
+
 FORTRANSAVEOPTION = FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile	1996-06-12 06:04:36.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile	2005-06-09 11:10:40.068274255 -0400
@@ -4,6 +4,11 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(ranget,ranget,-O0,NullParameter)
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2001-09-14 09:08:51.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-09 11:19:57.756983183 -0400
@@ -101,4 +101,10 @@
 SpecialFortranLibObjectRule(cskide,cskide,-O0,NullParameter)
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* optimizing this file, even at -O1, causes runtime breakage with g77 3.3
+   cf. http://bugs.debian.org/233689 */
+SpecialFortranLibObjectRule(csrfun,csrfun,-O0,NullParameter)
+#endif
+
 SubdirLibraryTarget(NullParameter,NullParameter)


--- NEW FILE 103-ignore-overly-long-macro-in-gen.h.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 103-ignore-overly-long-macro-in-gen.h.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Comment out macro in cfortran/gen.h with too many arguments for cfortran
## DP: to accept.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/gen.h /tmp/dpep.weQ8Dc/cernlib-2005.05.09/src/cfortran/gen.h
--- cernlib-2005.05.09/src/cfortran/gen.h	2000-06-23 06:13:58.000000000 -0400
+++ /tmp/dpep.weQ8Dc/cernlib-2005.05.09/src/cfortran/gen.h	2005-06-09 11:43:16.729842789 -0400
@@ -1123,10 +1123,10 @@
 
 PROTOCCALLSFSUB3(NAMEZB,namezb,FLOAT,INT,INT)
 #define NAMEZB(A1,A2,A3)  CCALLSFSUB3(NAMEZB,namezb,FLOAT,INT,INT,A1,A2,A3)
-
+/*
 PROTOCCALLSFSUB29(NEWPTQ,newptq,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,PDOUBLE,DOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PINT,PINT)
 #define NEWPTQ(A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11,A12,A13,A14,A15,A16,A17,A18,A19,A20,A21,A22,A23,A24,A25,A26,A27,A28,A29)  CCALLSFSUB29(NEWPTQ,newptq,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,PDOUBLE,DOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PINT,PINT,A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11,A12,A13,A14,A15,A16,A17,A18,A19,A20,A21,A22,A23,A24,A25,A26,A27,A28,A29)
-
+*/
 PROTOCCALLSFSUB9(NEWRO,newro,INT,INT,INT,FLOAT,PFLOAT,FLOATV,FLOATV,FLOATV,FLOATV)
 #define NEWRO(A1,A2,A3,A4,A5,A6,A7,A8,A9)  CCALLSFSUB9(NEWRO,newro,INT,INT,INT,FLOAT,PFLOAT,FLOATV,FLOATV,FLOATV,FLOATV,A1,A2,A3,A4,A5,A6,A7,A8,A9)
 


--- NEW FILE 104-fix-undefined-insertchar-warning.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 104-fix-undefined-insertchar-warning.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Correct Lesstif warning about undefined InsertChar.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c /tmp/dpep.XJ5w0K/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c
--- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c	1996-03-08 10:33:04.000000000 -0500
+++ /tmp/dpep.XJ5w0K/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c	2005-06-09 14:36:52.509109480 -0400
@@ -573,7 +573,7 @@
                         EditMenu,
                         RES_CONVERT( XmNlabelString, "Copy" ),
                         RES_CONVERT( XmNmnemonic, "C" ),
-                        XmNaccelerator, "CtrlInsertChar",
+                        XmNaccelerator, "CtrlInsert",
                         RES_CONVERT( XmNacceleratorText, "Ctrl+Ins" ),
                         NULL );
         UxPutContext( copyButton, (char *) UxKuipIoContext );
@@ -585,7 +585,7 @@
                         EditMenu,
                         RES_CONVERT( XmNlabelString, "Paste" ),
                         RES_CONVERT( XmNmnemonic, "P" ),
-                        XmNaccelerator, "ShiftInsertChar",
+                        XmNaccelerator, "ShiftInsert",
                         RES_CONVERT( XmNacceleratorText, "Shift+Ins" ),
                         NULL );
         UxPutContext( pasteButton, (char *) UxKuipIoContext );


--- NEW FILE 105-fix-obsolete-xmfontlistcreate-warning.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 105-fix-obsolete-xmfontlistcreate-warning.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix Lesstif warning about use of obsolete XmFontListCreate() function

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	1996-10-24 08:13:41.000000000 -0400
+++ /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	2005-06-09 14:39:00.831812710 -0400
@@ -776,6 +776,7 @@
  ***********************************************************************/
 static void init_data ()
 {
+  /* This function edited not to use obsolete function XmFontListCreate() */
     int k;
 
     km_charset = XmSTRING_DEFAULT_CHARSET;
@@ -792,8 +793,11 @@
        if (help_font_struct == NULL)
            printf ("%s Warning: Font loaded for HELP (%s) is NULL \n",
                    main_prompt, srec.Help_font);
-       else
-           help_font = XmFontListCreate (help_font_struct,km_charset);
+       else {
+	   XmFontListEntry entry = XmFontListEntryCreate(
+	       km_charset, XmFONT_IS_FONT, (XtPointer)help_font_struct );
+           help_font = XmFontListAppendEntry( NULL, entry );
+       }
    }
 
    /*
diff -urNad cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c
--- cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c	2000-10-03 10:11:22.000000000 -0400
+++ /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c	2005-06-09 14:39:00.803818666 -0400
@@ -215,18 +215,22 @@
  *****************************************************************************/
 static void MajButton(Widget w, Widget font,Widget pre,int postab)
 {
+   /* this function edited not to use obsolete function XmFontListCreate() */
    XmFontList police;
+   XmFontListEntry entry;
    XFontStruct *info_police;
    char strlabel[20];
    int prenum,policenum;
-
+   
    XtVaGetValues(pre,XmNuserData,&prenum,NULL);
    prenum--;
    XtVaGetValues(font,XmNuserData,&policenum,NULL);
    policenum--;
    if (( info_police=XLoadQueryFont(UxDisplay,StrFontTab[policenum]))== NULL)
       fprintf(stderr,"Unable to load font %s \n ",StrFontTab[policenum]);
-   police=XmFontListCreate(info_police,XmSTRING_DEFAULT_CHARSET);
+   entry = XmFontListEntryCreate(XmSTRING_DEFAULT_CHARSET,XmFONT_IS_FONT,
+				 (XtPointer)info_police);
+   police=XmFontListAppendEntry(NULL,entry);
    XtVaSetValues(w,XmNfontList,police,NULL);
    /* XFreeFont(UxDisplay,info_police);*/
 


--- NEW FILE 106-fix-paw++-menus-in-lesstif.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 106-fix-paw++-menus-in-lesstif.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix odd behavior of Paw++ menus when compiled against Lesstif.  The
## DP: problem is that Paw++ Motif code does some awfully weird things that
## DP: Lesstif doesn't support; cf. http://bugs.debian.org/270862 .

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c /tmp/dpep.KorIaA/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	2005-06-09 14:41:14.451377612 -0400
+++ /tmp/dpep.KorIaA/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	2005-06-09 14:41:22.929573007 -0400
@@ -1066,7 +1066,7 @@
 {
     int narg;
     Arg arglist[2];
-    Widget id_pdm;
+    Widget id_pdm, id_pdm_shell;
     Widget PdMenu[15];
 
     /*
@@ -1076,8 +1076,19 @@
     UxKuipBrowserContext = (_UxCkuipBrowser *)UxGetContext(parent);
 
     /*  create pulldown_menu */
-    id_pdm = XmCreatePulldownMenu (browserMenu,"OptionsPdMenu",arglist,0);
-
+    id_pdm_shell = XtVaCreatePopupShell ("OptionsPdMenu_shell",
+	xmMenuShellWidgetClass, browserMenu,
+	XmNwidth, 1,
+	XmNheight, 1,
+	XmNallowShellResize, TRUE,
+	XmNoverrideRedirect, TRUE,
+	NULL );
+    id_pdm = XtVaCreateWidget( "OptionsPdMenu",
+	xmRowColumnWidgetClass,
+	id_pdm_shell,
+	XmNrowColumnType, XmMENU_PULLDOWN,
+	NULL );
+/*  id_pdm = XmCreatePulldownMenu (browserMenu,"OptionsPdMenu",arglist,0); */
 
     /* create pulldown_menu_entry "Options" */
     XtVaCreateManagedWidget( "optionsMenu",
@@ -1091,7 +1102,7 @@
 /*  create list of push_buttons and separators for menu "Option"             */
 /*  create pulldown_menu for "Raise Window" (with list of appl. shells)       */
     narg = 0;
-#if XmREVISION == 99 /* problem with REVISION 2 ! */
+#if XmVERSION > 1 || XmREVISION >= 2
     XtSetArg(arglist[narg], XmNtearOffModel, XmTEAR_OFF_ENABLED); narg++;
 #endif
     kuipControlShellM = XmCreatePulldownMenu
@@ -1312,9 +1323,7 @@
 static void create_command_menu(parent)
    Widget parent;
 {
-    Widget id_pdme, id_pdm;
-    Arg    arglist[2];
-    int    narg;
+    Widget id_pdme, id_pdm, id_pdm_shell;
 
     /*
      *   find and restore the context for Browser
@@ -1323,12 +1332,26 @@
     UxKuipBrowserContext = (_UxCkuipBrowser *)UxGetContext(parent);
 
     /* create pulldown_menu_entry "Commands" for all commands */
-    narg = 0;
+
+    id_pdm_shell = XtVaCreatePopupShell ("CommandsPdMenu_shell",
+	xmMenuShellWidgetClass, browserMenu,
+	XmNwidth, 1,
+	XmNheight, 1,
+	XmNallowShellResize, TRUE,
+	XmNoverrideRedirect, TRUE,
+	NULL );
+    
+    id_pdm = XtVaCreateWidget( "CommandsPdMenu",
+	xmRowColumnWidgetClass,
+	id_pdm_shell,
+	XmNrowColumnType, XmMENU_PULLDOWN,
 #if XmVERSION > 1 || XmREVISION >= 2
-    XtSetArg(arglist[narg], XmNtearOffModel, XmTEAR_OFF_ENABLED); narg++;
+	XmNtearOffModel, XmTEAR_OFF_ENABLED,
 #endif
-    id_pdm = XmCreatePulldownMenu
-                     (browserMenu, "CommandsPdMenu", arglist, narg);
+	NULL );
+      
+/*      XmCreatePulldownMenu
+                     (browserMenu, "CommandsPdMenu", arglist, narg); */
 
     id_pdme = XtVaCreateManagedWidget( "id_pdme",
                         xmCascadeButtonGadgetClass, browserMenu,
@@ -1927,7 +1950,7 @@
    if (kuipControlShellM != NULL) XtDestroyWidget (kuipControlShellM);
 
    narg = 0;
-#if XmREVISION == 99 /* problem with REVISION 2 ! */
+#if XmVERSION > 1 || XmREVISION >= 2
    XtSetArg(arglist[narg], XmNtearOffModel, XmTEAR_OFF_ENABLED); narg++;
 #endif
    kuipControlShellM = XmCreatePulldownMenu


--- NEW FILE 107-define-strdup-macro-safely.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 107-define-strdup-macro-safely.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: In some cases strdup() and strndup() are macros, causing a build
## DP: failure.  Ensure any such macros are undefined before redeclaring them.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h /tmp/dpep.ieQnkg/cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h
--- cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h	1997-03-14 12:16:39.000000000 -0500
+++ /tmp/dpep.ieQnkg/cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h	2005-06-09 14:58:22.446739916 -0400
@@ -32,6 +32,9 @@
 
 extern char* strrstr( const char* str1, const char* str2 );
 
+#ifdef strdup
+# undef strdup /* otherwise the next function declaration may bomb */
+#endif
 #define strdup Strdup           /* prototype without const */
 extern char* strdup( const char* str );
 
@@ -46,6 +49,10 @@
                      const char* str4 );
 extern char* str5dup( const char* str1, const char* str2, const char* str3,
                      const char* str4, const char* str5 );
+
+#ifdef strndup
+# undef strndup /* otherwise the next function declaration may bomb */
+#endif
 extern char* strndup( const char* buf, size_t n );
 extern char* stridup( int i );
 


--- NEW FILE 108-quote-protect-comis-script.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 108-quote-protect-comis-script.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.tIRzzG/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
--- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2000-09-25 10:16:36.000000000 -0400
+++ /tmp/dpep.tIRzzG/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:41:16.757077306 -0400
@@ -70,7 +70,7 @@
       LEXEC=LENOCC(FEXEC)
       OPEN(LUNOUT,FILE=FEXEC(:LEXEC), STATUS='UNKNOWN',ERR=99)
       WRITE(LUNOUT,'(A)')         '#!/bin/sh'
-      WRITE(LUNOUT,'(A)')         'olddir=`pwd`'
+      WRITE(LUNOUT,'(A)')         'olddir="`pwd`"'
 *      WRITE(LUNOUT,'(A)')         'cd '//CHPATH(:LPATH)
       CHLINE=                     'cd '//CHPATH(:LPATH)
       L=LENOCC(CHLINE)
@@ -206,7 +206,7 @@
       CHLINE=                     '/bin/rm -f '//NAME(:LN)//'.o'
       L=LENOCC(CHLINE)
       WRITE(LUNOUT,'(A)')CHLINE(:L)
-      WRITE(LUNOUT,'(A)')         'cd $olddir'
+      WRITE(LUNOUT,'(A)')         'cd "$olddir"'
       WRITE(LUNOUT,'(A)')         'exit 0'
       CALL CSCLOS(LUNOUT)
       CLOSE(LUNOUT)


--- NEW FILE 110-ignore-included-lapack-rule.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 110-ignore-included-lapack-rule.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Comment out rule requiring liblapack in a subdirectory of mathlib code.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mathlib/Imakefile /tmp/dpep.Ib8j9x/cernlib-2005.05.09/src/mathlib/Imakefile
--- cernlib-2005.05.09/src/mathlib/Imakefile	1999-11-09 12:07:49.000000000 -0500
+++ /tmp/dpep.Ib8j9x/cernlib-2005.05.09/src/mathlib/Imakefile	2005-06-10 11:24:47.771309475 -0400
@@ -5,9 +5,12 @@
 
 LIBDIRS= gen bvsl
 
+/* Lapack is independent of Cernlib and should be installed as one of
+   the build dependencies.
 #ifndef WIN32
  LIBDIRS := $(LIBDIRS) lapack
 #endif
+*/
 
 SUBDIRS= $(LIBDIRS)
 


--- NEW FILE 111-fix-kuesvr-install-location.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 111-fix-kuesvr-install-location.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix install location of kuesvr binary.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile /tmp/dpep.ZmakmH/cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile	1996-03-11 10:43:22.000000000 -0500
+++ /tmp/dpep.ZmakmH/cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile	2005-06-10 12:03:32.706178628 -0400
@@ -1,4 +1,4 @@
 
 NormalProgramTarget(kuesvr,kuesvr.o,NullParameter,NullParameter,NullParameter)
 
-InstallProgram(kuesvr,$(CERN)/$(CERN_LEVEL)/bin)
+InstallProgram(kuesvr,$(CERN_BINDIR))


--- NEW FILE 112-remove-nonexistent-prototypes-from-gen.h.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 112-remove-nonexistent-prototypes-from-gen.h.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove prototypes from gen.h of functions that don't exist in mathlib.
## DP: Because of the way cfortran works, their existence otherwise causes
## DP: linking failures in third-party code.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/gen.h /tmp/dpep.3jFEkx/cernlib-2005.05.09/src/cfortran/gen.h
--- cernlib-2005.05.09/src/cfortran/gen.h	2005-06-27 10:02:17.225463958 -0400
+++ /tmp/dpep.3jFEkx/cernlib-2005.05.09/src/cfortran/gen.h	2005-06-27 10:05:41.503584328 -0400
@@ -84,10 +84,10 @@
 
 PROTOCCALLSFFUN1(FLOAT,ALGAMA,algama,FLOAT)
 #define ALGAMA(A2)  CCALLSFFUN1(ALGAMA,algama,FLOAT,A2)
-
+/*
 PROTOCCALLSFFUN1(FLOAT,QLGAMA,qlgama,FLOAT)
 #define QLGAMA(A2)  CCALLSFFUN1(QLGAMA,qlgama,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(DOUBLE,DLGAMA,dlgama,DOUBLE)
 #define DLGAMA(A2)  CCALLSFFUN1(DLGAMA,dlgama,DOUBLE,A2)
 
@@ -141,10 +141,10 @@
 
 PROTOCCALLSFFUN5(DOUBLE,DCAUCH,dcauch,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE)
 #define DCAUCH(A2,A3,A4,A5,A6)  CCALLSFFUN5(DCAUCH,dcauch,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,A2,A3,A4,A5,A6)
-
+/*
 PROTOCCALLSFFUN6(DOUBLE,CHEBQU,chebqu,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,INT,DOUBLE)
 #define CHEBQU(A2,A3,A4,A5,A6,A7)  CCALLSFFUN6(CHEBQU,chebqu,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,INT,DOUBLE,A2,A3,A4,A5,A6,A7)
-
+*/
 PROTOCCALLSFFUN2(FLOAT,CHISIN,chisin,FLOAT,INT)
 #define CHISIN(A2,A3)  CCALLSFFUN2(CHISIN,chisin,FLOAT,INT,A2,A3)
 
@@ -204,13 +204,13 @@
 
 PROTOCCALLSFFUN3(DOUBLE,DVDOT,dvdot,INT,DOUBLEV,DOUBLEV)
 #define DVDOT(A2,A3,A4)  CCALLSFFUN3(DVDOT,dvdot,INT,DOUBLEV,DOUBLEV,A2,A3,A4)
-
+/*
 PROTOCCALLSFFUN2(DOUBLE,E401BD,e401bd,DOUBLE,DOUBLE)
 #define E401BD(A2,A3)  CCALLSFFUN2(E401BD,e401bd,DOUBLE,DOUBLE,A2,A3)
 
 PROTOCCALLSFFUN2(FLOAT,ELIN1,elin1,FLOAT,FLOAT)
 #define ELIN1(A2,A3)  CCALLSFFUN2(ELIN1,elin1,FLOAT,FLOAT,A2,A3)
-
+*/
 PROTOCCALLSFFUN1(FLOAT,ERF,erf,FLOAT)
 #define ERF(A2)  CCALLSFFUN1(ERF,erf,FLOAT,A2)
 
@@ -237,13 +237,13 @@
 
 PROTOCCALLSFFUN2(FLOAT,FREARG,frearg,FLOAT,FLOAT)
 #define FREARG(A2,A3)  CCALLSFFUN2(FREARG,frearg,FLOAT,FLOAT,A2,A3)
-
+/*
 PROTOCCALLSFFUN3(FLOAT,FRED2,fred2,FLOAT,FLOAT,FLOAT)
 #define FRED2(A2,A3,A4)  CCALLSFFUN3(FRED2,fred2,FLOAT,FLOAT,FLOAT,A2,A3,A4)
 
 PROTOCCALLSFFUN1(FLOAT,FRED3,fred3,FLOAT)
 #define FRED3(A2)  CCALLSFFUN1(FRED3,fred3,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(FLOAT,FREQ,freq,FLOAT)
 #define FREQ(A2)  CCALLSFFUN1(FREQ,freq,FLOAT,A2)
 
@@ -255,10 +255,10 @@
 
 PROTOCCALLSFFUN1(DOUBLE,DFRSIN,dfrsin,DOUBLE)
 #define DFRSIN(A2)  CCALLSFFUN1(DFRSIN,dfrsin,DOUBLE,A2)
-
+/*
 PROTOCCALLSFFUN2(FLOAT,FUN,fun,INT,FLOATV)
 #define FUN(A2,A3)  CCALLSFFUN2(FUN,fun,INT,FLOATV,A2,A3)
-
+*/
 PROTOCCALLSFFUN1(FLOAT,G116F1,g116f1,FLOAT)
 #define G116F1(A2)  CCALLSFFUN1(G116F1,g116f1,FLOAT,A2)
 
@@ -270,10 +270,10 @@
 
 PROTOCCALLSFFUN1(FLOAT,GAMMA,gamma,FLOAT)
 #define GAMMA(A2)  CCALLSFFUN1(GAMMA,gamma,FLOAT,A2)
-
+/*
 PROTOCCALLSFFUN1(FLOAT,QGAMMA,qgamma,FLOAT)
 #define QGAMMA(A2)  CCALLSFFUN1(QGAMMA,qgamma,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(DOUBLE,DGAMMA,dgamma,DOUBLE)
 #define DGAMMA(A2)  CCALLSFFUN1(DGAMMA,dgamma,DOUBLE,A2)
 
@@ -297,16 +297,16 @@
 
 PROTOCCALLSFFUN4(FLOAT,GAUSS,gauss,ROUTINE,FLOAT,FLOAT,FLOAT)
 #define GAUSS(A2,A3,A4,A5)  CCALLSFFUN4(GAUSS,gauss,ROUTINE,FLOAT,FLOAT,FLOAT,A2,A3,A4,A5)
-
+/*
 PROTOCCALLSFFUN4(FLOAT,QGAUSS,qgauss,ROUTINE,FLOAT,FLOAT,FLOAT)
 #define QGAUSS(A2,A3,A4,A5)  CCALLSFFUN4(QGAUSS,qgauss,ROUTINE,FLOAT,FLOAT,FLOAT,A2,A3,A4,A5)
-
+*/
 PROTOCCALLSFFUN4(DOUBLE,DGAUSS,dgauss,ROUTINE,DOUBLE,DOUBLE,DOUBLE)
 #define DGAUSS(A2,A3,A4,A5)  CCALLSFFUN4(DGAUSS,dgauss,ROUTINE,DOUBLE,DOUBLE,DOUBLE,A2,A3,A4,A5)
-
+/*
 PROTOCCALLSFFUN6(DOUBLE,GPINDP,gpindp,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,DOUBLE,INT)
 #define GPINDP(A2,A3,A4,A5,A6,A7)  CCALLSFFUN6(GPINDP,gpindp,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,DOUBLE,INT,A2,A3,A4,A5,A6,A7)
-
+*/
 PROTOCCALLSFFUN2(INT,IGET,iget,INTV,INT)
 #define IGET(A2,A3)  CCALLSFFUN2(IGET,iget,INTV,INT,A2,A3)
 
@@ -315,16 +315,16 @@
 
 PROTOCCALLSFFUN3(INT,ILSUM,ilsum,INT,LOGICALV,INT)
 #define ILSUM(A2,A3,A4)  CCALLSFFUN3(ILSUM,ilsum,INT,LOGICALV,INT,A2,A3,A4)
-
+/*
 PROTOCCALLSFFUN10(FLOAT,QLINSQ,qlinsq,INT,INT,INT,FLOATV,PFLOAT,FLOATV,FLOATV,FLOATV,PDOUBLE,INT)
 #define QLINSQ(A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)  CCALLSFFUN10(QLINSQ,qlinsq,INT,INT,INT,FLOATV,PFLOAT,FLOATV,FLOATV,FLOATV,PDOUBLE,INT,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)
-
+*/
 PROTOCCALLSFFUN3(INT,LKKSPL,lkkspl,DOUBLE,DOUBLEV,INT)
 #define LKKSPL(A2,A3,A4)  CCALLSFFUN3(LKKSPL,lkkspl,DOUBLE,DOUBLEV,INT,A2,A3,A4)
-
+/*
 PROTOCCALLSFFUN4(INT,LOCHAR,lochar,INTV,INT,INTV,INT)
 #define LOCHAR(A2,A3,A4,A5)  CCALLSFFUN4(LOCHAR,lochar,INTV,INT,INTV,INT,A2,A3,A4,A5)
-
+*/
 PROTOCCALLSFFUN2(INT,MAXFZE,maxfze,FLOATV,INT)
 #define MAXFZE(A2,A3)  CCALLSFFUN2(MAXFZE,maxfze,FLOATV,INT,A2,A3)
 
@@ -339,10 +339,10 @@
 
 PROTOCCALLSFFUN2(INT,NDIGIT,ndigit,DOUBLE,DOUBLE)
 #define NDIGIT(A2,A3)  CCALLSFFUN2(NDIGIT,ndigit,DOUBLE,DOUBLE,A2,A3)
-
+/*
 PROTOCCALLSFFUN1(INT,NEAR1,near1,FLOAT)
 #define NEAR1(A2)  CCALLSFFUN1(NEAR1,near1,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(INT,NIC311,nic311,FLOAT)
 #define NIC311(A2)  CCALLSFFUN1(NIC311,nic311,FLOAT,A2)
 


--- NEW FILE 113-cups-postscript-fix.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 113-cups-postscript-fix.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Re-order PostScript output to work around CUPS printing issue.

@DPATCH@
diff -urNad cernlib-2005.05.09~/src/graflib/higz/ipost/ipdef.F cernlib-2005.05.09/src/graflib/higz/ipost/ipdef.F
--- cernlib-2005.05.09~/src/graflib/higz/ipost/ipdef.F	2003-03-20 09:14:10.000000000 +0000
+++ cernlib-2005.05.09/src/graflib/higz/ipost/ipdef.F	2005-09-20 18:59:21.992348547 +0000
@@ -316,6 +316,7 @@
       CALL IPPSTR('%%EndProlog@')
 *
       CALL IPPSTR('%%BeginSetup@')
+      CALL IPPSTR('%%EndSetup@')
       CALL IPPSTF(8,'newpath ')
       CALL IPSVRT(1)
       IF (MODE.EQ.1.OR.MODE.EQ.4) THEN
@@ -333,7 +334,6 @@
       ENDIF
       CALL IPPSTF(15,' .25 .25 scale ')
       IF (MODE.NE.3) CALL IPSVRT(1)
-      CALL IPPSTR('%%EndSetup@')
 *
       NBSAV0 = NBSAVE
       IF (MODE.NE.3) CALL IPPSTR('%%Page: number 1@')


--- NEW FILE 114-install-scripts-properly.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 114-install-scripts-properly.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Install scripts properly (i.e. don't try to strip them).

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/scripts/Imakefile cernlib-2005.05.09.dfsg/src/scripts/Imakefile
--- cernlib-2005.05.09.dfsg~/src/scripts/Imakefile	2004-07-29 10:17:08.000000000 -0400
+++ cernlib-2005.05.09.dfsg/src/scripts/Imakefile	2005-12-02 10:45:23.091782817 -0500
@@ -1,10 +1,10 @@
 
-InstallProgram(paw,$(CERN_BINDIR))
+InstallNamedProg(paw,paw,$(CERN_BINDIR))
 
 #if defined(CERNLIB_SHIFT)
 InstallNamedProg(cernlib_shift,cernlib,$(CERN_BINDIR))
 #else
-InstallProgram(cernlib,$(CERN_BINDIR))
+InstallNamedProg(cernlib,cernlib,$(CERN_BINDIR))
 #endif
 
-InstallProgram(gxint,$(CERN_BINDIR))
+InstallNamedProg(gxint,gxint,$(CERN_BINDIR))


--- NEW FILE 200-comis-allow-special-chars-in-path.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 200-comis-allow-special-chars-in-path.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F /tmp/dpep.gkT1Y2/cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F
--- cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F	1997-05-20 05:37:58.000000000 -0400
+++ /tmp/dpep.gkT1Y2/cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F	2005-06-08 19:34:43.101436210 -0400
@@ -29,6 +29,7 @@
 C.    *        CHFUNC may be the name of a COMIS function              *
 C.    *        or a file name. A file cannot contain one of            *
 C.    *        the following characters: +*=-()<>                      *
+C.    *        [n.b. patched to work around this. --Kevin McCarty]     *
 C.    *                                                                *
 C.    ******************************************************************
 #include "paw/pawcfu.inc"
@@ -60,7 +61,11 @@
       IF(NCH.LE.0)GO TO 99
       IFILE=0
       TFILE=' '
-      IF(INDEX(CHFUNC,']').EQ.0.AND.INDEX(CHFUNC,':').EQ.0)THEN
+* Added '/' as a character symbolizing a filename; otherwise Unix paths
+* containing +, *, =, -, etc. return a bogus "Unknown routine" error
+* (Fix by Kevin McCarty)
+      IF(INDEX(CHFUNC,']').EQ.0.AND.INDEX(CHFUNC,':').EQ.0.AND.
+     +   INDEX(CHFUNC,'/').EQ.0)THEN
          IF(INDEX(CHFUNC,'+').NE.0.OR.
      +      INDEX(CHFUNC,'*').NE.0.OR.
      +      INDEX(CHFUNC,'=').NE.0.OR.


--- NEW FILE 201-update-kuip-helper-apps.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 201-update-kuip-helper-apps.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Instead of "ghostview" and "lp", call the more modern helper apps
## DP: "gv" and "lpr" from KUIP.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2003-02-13 09:25:23.000000000 -0500
+++ /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2005-06-09 12:34:49.057760462 -0400
@@ -249,7 +249,7 @@
     host_psviewer = getenv( "PSVIEWER" );
   if( host_psviewer == NULL ) {
 #ifdef UNIX
-    host_psviewer = "ghostview";
+    host_psviewer = "gv";
 #endif
 #ifdef vms
     host_psviewer = "VIEW/FORM=PS/INTERFACE=DECWINDOWS";
@@ -277,7 +277,7 @@
 # if defined(MSDOS) || defined(CERNLIB_WINNT)
   ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'print $*'" );
 # else
-  ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'lp $*'" );
+  ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'lpr $*'" );
 # endif
 #else
   ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'XPRINT $*'" );
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	1997-09-25 10:02:25.000000000 -0400
+++ /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	2005-06-09 12:35:59.499480148 -0400
@@ -925,7 +925,7 @@
 The startup value can be defined by the environment variables
 'KUIPPSVIEWER' or 'PSVIEWER'.
 .
-On Unix workstations it is by default set to 'ghostview'.
+On Unix workstations it is by default set to 'gv'.
 On VAX/VMS the default commands is 'VIEW/FORM=PS/INTERFACE=DECWINDOWS'.
 
 >Action kxhostpsviewer%C


--- NEW FILE 202-fix-includes-in-minuit-example.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 202-fix-includes-in-minuit-example.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: minuit-main example should have <> instead of "" around include files.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c /tmp/dpep.SuauEf/cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c
--- cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c	2001-04-18 04:56:22.000000000 -0400
+++ /tmp/dpep.SuauEf/cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c	2005-06-09 13:22:59.567224997 -0400
@@ -15,8 +15,8 @@
 #define FCN fcn
 #endif
 
-#include "cfortran.h"
-#include "minuit.h"
+#include 
+#include 
 #define Ncont 20
 int main()
 {


--- NEW FILE 203-compile-geant-with-ertrak.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 203-compile-geant-with-ertrak.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Ertrak code added to library in Debian since I saw no reason to exclude.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-11-23 15:41:44.798536817 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-11-23 15:43:39.618959247 +0000
@@ -5,11 +5,12 @@
 AllTarget(geant321)
 
 /* Fluka removed from Debian source package for copyright reasons. */
+/* Ertrak added to Debian since I saw no reason to leave it out. */
 LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
          geocad ggeom gheisha ghits ghrout ghutils giface \ @@\
 	 giopa gkine gphys gscan gstrag gtrak guser gxint \ @@\
-	 miface miguti neutron
-
+	 miface miguti neutron        \ @@\
+	 erdecks erpremc matx55
 
 SUBDIRS= $(LIBDIRS) data examples gxuser geant321
 


--- NEW FILE 204-compile-isajet-with-isasrt.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 204-compile-isajet-with-isasrt.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Include isasrt in the Isajet library, by request (cf.
## DP: http://bugs.debian.org/260469 )

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile /tmp/dpep.PM12lm/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2001-10-08 09:06:49.000000000 -0400
+++ /tmp/dpep.PM12lm/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2005-06-09 14:25:29.621215677 -0400
@@ -9,7 +9,7 @@
 	 fortop.F frgjet.F frgmnt.F gamma.F getpt.F gettot.F heavyx.F \ @@\
 	 hevolv.F higgs.F idanti.F idgen.F iframs.F inisap.F ipartns.F \ @@\
 	 ipjset.F iprtns.F irmov0.F isabeg.F isaend.F isaevt.F isaini.F \ @@\
-	 isajet.F ispjet.F istrad.F iswdky.F jetgen.F \ @@\
+	 isajet.F isasrt.F ispjet.F istrad.F iswdky.F jetgen.F \ @@\
 	 label.F lboost.F logerr.F \ @@\
 	 logic.F logp.F logphi.F logphw.F logpt.F logqm.F logqt.F logthw.F \ @@\
 	 logx.F logxw.F logyth.F logyw.F lstsq.F mbias.F mbset.F nogood.F \ @@\


--- NEW FILE 205-max-path-length-to-256.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 205-max-path-length-to-256.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Set max path length to 256 in Hbook.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc /tmp/dpep.ceXWNa/cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc
--- cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc	2003-02-07 07:13:37.000000000 -0500
+++ /tmp/dpep.ceXWNa/cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc	2005-06-09 15:20:49.541661646 -0400
@@ -20,7 +20,7 @@
 *
 *CMZ :  4.20/03 28/07/93  09.33.32  by  Rene Brun
 *-- Author :
-      PARAMETER (NLPATM=100, MXFILES=50, LENHFN=128)
+      PARAMETER (NLPATM=100, MXFILES=50, LENHFN=256)
       COMMON /HCDIRN/NLCDIR,NLNDIR,NLPAT,ICDIR,NCHTOP,ICHTOP(MXFILES)
      +              ,ICHTYP(MXFILES),ICHLUN(MXFILES)
       CHARACTER*16   CHNDIR,    CHCDIR,    CHPAT    ,CHTOP


--- NEW FILE 206-herwig-uses-DBLE-not-REAL.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 206-herwig-uses-DBLE-not-REAL.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Have libherwig use double precision consistently

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F
--- cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F	1996-12-03 09:16:56.000000000 -0500
+++ /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F	2005-06-09 15:22:00.263743792 -0400
@@ -72,7 +72,7 @@
       TAMP(6)=HWHIG5(T,S,U,EMH2,EMQ2,2,0,5,0,0,0)
       TAMP(7)=HWHIG5(U,T,S,EMH2,EMQ2,3,0,6,0,0,0)
       DO 20 I=1,7
-      TAMPI(I)= REAL(TAMP(I))
+      TAMPI(I)= DBLE(TAMP(I))
   20  TAMPR(I)=-IMAG(TAMP(I))
 C Square and add prefactors
       WTGG=0.03125*FLOAT(NCOLO*(NCOLO**2-1))
diff -urNad cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F
--- cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F	1996-12-03 09:17:04.000000000 -0500
+++ /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F	2005-06-09 15:22:00.263743792 -0400
@@ -18,7 +18,7 @@
      &  1.644934066848226D0/
       PROD(Y,Y2)=Y*(ONE+A1*Y*(ONE+A2*Y*(ONE+A3*Y2*(ONE+A4*Y2*(ONE+A5*Y2*
      & (ONE+A6*Y2*(ONE+A7*Y2*(ONE+A8*Y2*(ONE+A9*Y2*(ONE+A10*Y2))))))))))
-      XR=REAL(X)
+      XR=DBLE(X)
       XI=IMAG(X)
       R2=XR*XR+XI*XI
       IF (R2.GT.ONE.AND.(XR/R2).GT.HALF) THEN


--- NEW FILE 207-compile-temp-libs-with-fPIC.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 207-compile-temp-libs-with-fPIC.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Compile temporary COMIS libraries with -fPIC for non-x86 arches.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.srSRmd/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
--- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2000-09-25 10:16:36.000000000 -0400
+++ /tmp/dpep.srSRmd/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:47:44.859676286 -0400
@@ -81,12 +81,12 @@
       WRITE(LUNOUT,'(A)')CHLINE(:L)
       IF(FEXT.EQ.'.c')THEN
         L=LENOCC(CHCC)
-*                                 'cc -c .... name.c'
-        CHLINE=CHCC(:L)//' '//NAME(:LN)// '.c'
+*                                 'cc -c .... -fPIC name.c'
+        CHLINE=CHCC(:L)//' -fPIC '//NAME(:LN)// '.c'
       ELSE
         L=LENOCC(CHF77)
-*                                 'f77 -c .... name.f'
-        CHLINE=CHF77(:L)//' '//NAME(:LN)// '.f'
+*                                 'f77 -c .... -fPIC name.f'
+        CHLINE=CHF77(:L)//' -fPIC '//NAME(:LN)// '.f'
       ENDIF
       L=LENOCC(CHLINE)
       WRITE(LUNOUT,'(A)')CHLINE(:L)
@@ -176,7 +176,7 @@
       ENDIF
 #endif
 #if defined(CERNLIB_LINUX)
-      CHLINE=                   'ld -shared -o '
+      CHLINE=                   'g77 -shared -o '
      +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
 #endif
 #if defined(CERNLIB_ALPHA_OSF)


--- NEW FILE 208-fix-redundant-packlib-dependencies.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 208-fix-redundant-packlib-dependencies.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove some redundancy in the libraries listed to be linked against.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile
--- cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile	1996-05-09 10:32:43.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile	2005-06-10 11:54:49.270360036 -0400
@@ -20,7 +20,7 @@
 NeedTcpipLib
 #endif
 
-CernlibFortranProgramTarget(dzeX11,dzedit.o,$(PACKAGE_LIB),$(PACKAGE_LIB),graflib/X11 packlib)
+CernlibFortranProgramTarget(dzeX11,dzedit.o,libdzdoc.a,libdzdoc.a,graflib/X11 packlib)
 
 InstallProgram(dzeX11,$(CERN_BINDIR))
 InstallScript(dzedit,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile
--- cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile	1996-04-16 04:09:49.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile	2005-06-10 11:55:33.872780414 -0400
@@ -14,6 +14,6 @@
 
 NeedTcpipLib
 
-CernlibFortranProgramTarget(zftp,zftp.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(zftp,zftp.o,libzftplib.a,libzftplib.a,packlib)
 
 InstallProgram(zftp,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile
--- cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile	1996-05-05 05:40:20.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile	2005-06-10 11:56:23.109221943 -0400
@@ -31,10 +31,10 @@
 
 DefinePackageLibrary(zservlib)
 
-CernlibFortranProgramTarget(zserv,zs.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(zserv,zs.o,libzservlib.a,libzservlib.a,packlib)
 
 InstallProgram(zserv,$(CERN_BINDIR))
 
-CernlibFortranProgramTarget(pawserv,zs.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(pawserv,zs.o,libzservlib.a,libzservlib.a,packlib)
 
 InstallProgram(pawserv,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile
--- cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile	1996-11-05 04:32:29.000000000 -0500
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile	2005-06-10 11:56:54.779438847 -0400
@@ -28,6 +28,6 @@
 NeedSysexe
 #endif
 
-CernlibFortranProgramTarget(fatmen,fatmen.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(fatmen,fatmen.o,libfmkuip.a,libfmkuip.a,packlib)
 
 InstallProgram(fatmen,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile
--- cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile	1996-04-02 05:03:43.000000000 -0500
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile	2005-06-10 11:57:39.794807919 -0400
@@ -17,6 +17,6 @@
 SpecialFortranObjectRule(hepdb,hepdb,'-WF,-P',NullParameter)
 #endif
 
-CernlibFortranProgramTarget(hepdb,hepdb.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(hepdb,hepdb.o,libdbmodule.a,libdbmodule.a,packlib)
 
 InstallProgram(hepdb,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	1996-04-18 12:33:08.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-10 12:00:35.355791756 -0400
@@ -21,6 +21,6 @@
 #endif
 
 
-CernlibCcProgramTarget(kxterm,kxterm.o,$(PACKAGE_LIB),$(PACKAGE_LIB),$(CLIBS))
+CernlibCcProgramTarget(kxterm,kxterm.o,libkxtlib.a,libkxtlib.a,$(CLIBS))
 
 InstallProgram(kxterm,$(CERN_BINDIR))


--- NEW FILE 209-ignore-unneeded-headers-in-kmutil.c.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 209-ignore-unneeded-headers-in-kmutil.c.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Comment out header files not actually needed in kmutil.c.
## DP: (This will be helpful when we move this file elsewhere to be part of
## DP: the Lesstif-dependent library split out from packlib.)

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c /tmp/dpep.BncUU7/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c	1996-03-08 10:33:09.000000000 -0500
+++ /tmp/dpep.BncUU7/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c	2005-06-10 12:06:07.198547576 -0400
@@ -20,12 +20,13 @@
 /******************************************************************************/
 
 #include "kuip/kuip.h"
+/* commented out, since this file doesn't need these includes. --Kevin McCarty
 #include "kuip/kfor.h"
 #include "kuip/kmenu.h"
 
 #include "mkutda.h"
 #include "kuip/mkutfu.h"
-
+*/
 
 /***********************************************************************
  *                                                                     *


--- NEW FILE 210-improve-cfortran-header-files.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 210-improve-cfortran-header-files.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Protect against multiple inclusion and add explicit dependency on
## DP: cfortran.h to the Cernlib C headers.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/comis.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/comis.h
--- cernlib-2005.05.09/src/cfortran/comis.h	1999-10-29 07:41:26.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/comis.h	2005-06-10 12:51:30.985999665 -0400
@@ -1,3 +1,11 @@
+#ifndef _COMIS_H
+#define _COMIS_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN1(INT,CSADDR,csaddr,STRING)
 #define	CSADDR(CHFILE) CCALLSFFUN1(CSADDR,csaddr,STRING,CHFILE)
 
@@ -30,3 +38,9 @@
 
 PROTOCCALLSFSUB2(CSTYPE,cstype,INT,PSTRING)
 #define CSTYPE(CADR,CHTYPE) CCALLSFSUB2(CSTYPE,cstype,INT,PSTRING,CADR,CHTYPE)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _COMIS_H */
diff -urNad cernlib-2005.05.09/src/cfortran/cspack.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/cspack.h
--- cernlib-2005.05.09/src/cfortran/cspack.h	1999-10-29 07:42:56.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/cspack.h	2005-06-10 12:51:31.013993690 -0400
@@ -1,5 +1,19 @@
+#ifndef _CSPACK_H
+#define _CSPACK_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB2(CZPUTA,czputa,STRING,PINT)
 #define CZPUTA(CHMAIL,ISTAT) CCALLSFSUB2(CZPUTA,czputa,STRING,PINT,CHMAIL,ISTAT)
 
 PROTOCCALLSFSUB2(CZGETA,czgeta,PSTRING,PINT)
 #define CZGETA(CHMAIL,ISTAT) CCALLSFSUB2(CZGETA,czgeta,PSTRING,PINT,CHMAIL,ISTAT)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _CSPACK_H */
diff -urNad cernlib-2005.05.09/src/cfortran/geant315.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant315.h
--- cernlib-2005.05.09/src/cfortran/geant315.h	1996-05-15 05:24:06.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant315.h	2005-06-10 12:51:31.080979393 -0400
@@ -1,3 +1,11 @@
+#ifndef _GEANT315_H
+#define _GEANT315_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*------------------------------------------------------------------
 fortran filename   : /cern/new/src/cfs/geant315/abbrch.f
 ------------------------------------------------------------------*/
@@ -4797,3 +4805,9 @@
 
 #define ZEREGS() CCALLSFSUB0(ZEREGS,zeregs)
 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GEANT315_H */
diff -urNad cernlib-2005.05.09/src/cfortran/geant321.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant321.h
--- cernlib-2005.05.09/src/cfortran/geant321.h	1996-05-15 05:24:07.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant321.h	2005-06-10 12:51:31.148964883 -0400
@@ -1,3 +1,11 @@
+#ifndef _GEANT321_H
+#define _GEANT321_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*------------------------------------------------------------------
 fortran filename   : abbrch.f
 ------------------------------------------------------------------*/
@@ -6099,3 +6107,9 @@
  PROTOCCALLSFFUN3(DOUBLE,XSEPRO,xsepro,DOUBLE,DOUBLE,DOUBLE)
 #define XSEPRO(A2,A3,A4)  CCALLSFFUN3(XSEPRO,xsepro,DOUBLE,DOUBLE,DOUBLE,A2,A3,A4)
 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GEANT321_H */
diff -urNad cernlib-2005.05.09/src/cfortran/gen.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/gen.h
--- cernlib-2005.05.09/src/cfortran/gen.h	2005-06-10 12:51:00.965407158 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/gen.h	2005-06-10 12:51:31.190955921 -0400
@@ -1,3 +1,11 @@
+#ifndef _GEN_H
+#define _GEN_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Subroutines/Functions with COMPLEX not supported ***
 
 #define CBSJA(A1,A2,A3,A4,A5)  CCALLSFSUB5(CBSJA,cbsja,COMPLEX,FLOAT,INT,INT,PCOMPLEX,A1,A2,A3,A4,A5)
@@ -1489,3 +1497,9 @@
 
 PROTOCCALLSFSUB6(ZEROX,zerox,FLOAT,FLOAT,FLOAT,INT,FLOAT,INT)
 #define ZEROX(A1,A2,A3,A4,A5,A6)  CCALLSFSUB6(ZEROX,zerox,FLOAT,FLOAT,FLOAT,INT,FLOAT,INT,A1,A2,A3,A4,A5,A6)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GEN_H */
diff -urNad cernlib-2005.05.09/src/cfortran/graflib.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/graflib.h
--- cernlib-2005.05.09/src/cfortran/graflib.h	1998-01-29 05:49:27.000000000 -0500
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/graflib.h	2005-06-10 12:51:31.220949519 -0400
@@ -1,2 +1,16 @@
-#include "higz.h"
-#include "hplot.h"
+#ifndef _GRAFLIB_H
+#define _GRAFLIB_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include 
+#include 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GRAFLIB_H */
diff -urNad cernlib-2005.05.09/src/cfortran/jetset74.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/jetset74.h
--- cernlib-2005.05.09/src/cfortran/jetset74.h	1999-10-29 12:55:45.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/jetset74.h	2005-06-10 12:51:31.250943117 -0400
@@ -1,3 +1,11 @@
+#ifndef _JETSET74_H
+#define _JETSET74_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN2(INT,KLU,klu,INT,INT)
 #define KLU(A2,A3)  CCALLSFFUN2(KLU,klu,INT,INT,A2,A3)
 
@@ -327,3 +335,9 @@
 
 PROTOCCALLSFSUB11(STRUCTM,structm,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE)
 #define STRUCTM(A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)  CCALLSFSUB11(STRUCTM,structm,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _JETSET74_H */
diff -urNad cernlib-2005.05.09/src/cfortran/kernlib.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kernlib.h
--- cernlib-2005.05.09/src/cfortran/kernlib.h	2000-03-16 11:58:18.000000000 -0500
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kernlib.h	2005-06-10 12:51:31.291934368 -0400
@@ -1,3 +1,11 @@
+#ifndef _KERNLIB_H
+#define _KERNLIB_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN1(FLOAT,ALOGAM,alogam,FLOAT)
 #define ALOGAM(A2)  CCALLSFFUN1(ALOGAM,alogam,FLOAT,A2)
 
@@ -1512,3 +1520,9 @@
 
 PROTOCCALLSFSUB1(WORDSEP,wordsep,STRING)
 #define WORDSEP(A1)  CCALLSFSUB1(WORDSEP,wordsep,STRING,A1)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _KERNLIB_H */
diff -urNad cernlib-2005.05.09/src/cfortran/kuip.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kuip.h
--- cernlib-2005.05.09/src/cfortran/kuip.h	2000-10-05 10:27:54.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kuip.h	2005-06-10 12:51:31.319928394 -0400
@@ -1,3 +1,11 @@
+#ifndef _KUIP_H
+#define _KUIP_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB3(KUCLOS,kuclos,INT,STRING,INT)
 #define KUCLOS(A1,A2,A3)    CCALLSFSUB3(KUCLOS,kuclos,INT,STRING,INT,A1,A2,A3)
 
@@ -6,3 +14,9 @@
 
 PROTOCCALLSFSUB0(KUWHAG,kuwhag)
 #define KUWHAG() CCALLSFSUB0(KUWHAG,kuwhag)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _KUIP_H */
diff -urNad cernlib-2005.05.09/src/cfortran/lapack.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lapack.h
--- cernlib-2005.05.09/src/cfortran/lapack.h	2000-06-23 06:13:58.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lapack.h	2005-06-10 12:51:31.348922205 -0400
@@ -1,2 +1,16 @@
+#ifndef _LAPACK_H
+#define _LAPACK_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB11(DGELS,dgels,STRING,INT,INT,INT,DOUBLEV,INT,DOUBLEV,INT,DOUBLEV,INT,PINT)
 #define DGELS(TRANS,M,N,NRHS,A,LDA,B,LDB,WORK,LWORK,INFO) CCALLSFSUB11(DGELS,dgels,STRING,INT,INT,INT,DOUBLEV,INT,DOUBLEV,INT,DOUBLEV,INT,PINT,TRANS,M,N,NRHS,A,LDA,B,LDB,WORK,LWORK,INFO)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _LAPACK_H */
diff -urNad cernlib-2005.05.09/src/cfortran/lepto62.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lepto62.h
--- cernlib-2005.05.09/src/cfortran/lepto62.h	1999-10-29 12:55:45.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lepto62.h	2005-06-10 12:51:31.378915804 -0400
@@ -1,3 +1,11 @@
+#ifndef _LEPTO62_H
+#define _LEPTO62_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN2(FLOAT,DCROSS,dcross,FLOAT,FLOAT)
 #define DCROSS(A2,A3)  CCALLSFFUN2(DCROSS,dcross,FLOAT,FLOAT,A2,A3)
 
@@ -174,3 +182,9 @@
 
 PROTOCCALLSFSUB0(RIWIBD,riwibd)
 #define RIWIBD() CCALLSFSUB0(RIWIBD,riwibd)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _LEPTO62_H */
diff -urNad cernlib-2005.05.09/src/cfortran/minuit.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/minuit.h
--- cernlib-2005.05.09/src/cfortran/minuit.h	1999-10-27 11:30:23.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/minuit.h	2005-06-10 12:51:31.407909615 -0400
@@ -1,3 +1,11 @@
+#ifndef _MINUIT_H
+#define _MINUIT_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  *  Interface to minuit using cfortran.h
  *
@@ -190,3 +198,9 @@
 
 PROTOCCALLSFSUB0(STAND,stand)
 #define STAND() CCALLSFSUB0(STAND,stand)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _MINUIT_H */
diff -urNad cernlib-2005.05.09/src/cfortran/packlib.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/packlib.h
--- cernlib-2005.05.09/src/cfortran/packlib.h	1998-01-29 11:17:45.000000000 -0500
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/packlib.h	2005-06-10 12:51:31.436903427 -0400
@@ -1,4 +1,18 @@
-#include "hbook.h"
-#include "minuit.h"
-#include "kuip.h"
-#include "zebra.h"
+#ifndef _PACKLIB_H
+#define _PACKLIB_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include 
+#include 
+#include 
+#include 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _PACKLIB_H */
diff -urNad cernlib-2005.05.09/src/cfortran/paw.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/paw.h
--- cernlib-2005.05.09/src/cfortran/paw.h	2000-10-05 10:27:55.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/paw.h	2005-06-10 12:51:31.464897452 -0400
@@ -1,6 +1,20 @@
+#ifndef _PAW_H
+#define _PAW_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB2(PAW,paw,INT,INT)
 #define PAW(A1,A2)  CCALLSFSUB2(PAW,paw,INT,INT,A1,A2)
 
 PROTOCCALLSFSUB0(PAEXIT,paexit)
 #define PAEXIT() CCALLSFSUB0(PAEXIT,paexit)
 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _PAW_H */
diff -urNad cernlib-2005.05.09/src/cfortran/zebra.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/zebra.h
--- cernlib-2005.05.09/src/cfortran/zebra.h	1999-10-29 07:35:47.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/zebra.h	2005-06-10 12:51:31.496890624 -0400
@@ -1,5 +1,19 @@
+#ifndef _ZEBRA_H
+#define _ZEBRA_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB1(MZEBRA,mzebra,INT)
 #define MZEBRA(A1)    CCALLSFSUB1(MZEBRA,mzebra,INT,A1)
 
 PROTOCCALLSFSUB2(MZPAW,mzpaw,INT,STRING)
 #define MZPAW(A1,A2)  CCALLSFSUB2(MZPAW,mzpaw,INT,STRING,A1,A2)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _ZEBRA_H */


--- NEW FILE 211-fix-comis-on-64-bit-arches.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-64-bit-arches.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09~/src/geant321/gphys/gphot.F cernlib-2005.05.09/src/geant321/gphys/gphot.F
--- cernlib-2005.05.09~/src/geant321/gphys/gphot.F	1995-10-24 10:21:29.000000000 +0000
+++ cernlib-2005.05.09/src/geant321/gphys/gphot.F	2005-09-20 19:27:10.734527890 +0000
@@ -240,7 +240,7 @@
                   ELSE
 C Radiative shell decay
                      JS = JFN+1+2*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 40 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
@@ -296,7 +296,7 @@
                   ELSE
 c Nonradiative decay
                      JS = JFN+1+3*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 60 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
diff -urNad cernlib-2005.05.09~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.05.09/src/packlib/kernlib/kerngen/ccgen/locb.c
--- cernlib-2005.05.09~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/kernlib/kerngen/ccgen/locb.c	2005-09-20 19:27:10.734527890 +0000
@@ -44,7 +44,25 @@
    DummyDef
 #endif
 {
+#if defined(CERNLIB_QMLXIA64)
+   const unsigned long long int mask=0x00000000ffffffff;
+   static unsigned long long int base=1;
+   unsigned long long int jadr=(unsigned long long int) iadr;
+   unsigned long long int jadrl = (mask & jadr);
+
+   if (base == 1) {
+     base = (~mask & jadr);
+   } else if(base != (~mask & jadr)) {
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+     printf("locb_() Warning: changing base from %lx to %lx!!!\n",
+     	   base, (~mask & jadr));
+     printf("This may result in program crash or incorrect results\n");
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+   }
+   return ((int) jadrl);
+#else
    return( (int) iadr );
+#endif
 }
 /*> END <----------------------------------------------------------*/
 #ifdef CERNLIB_TCGEN_LOCB
diff -urNad cernlib-2005.05.09~/src/packlib/zbook/code/zjump.c cernlib-2005.05.09/src/packlib/zbook/code/zjump.c
--- cernlib-2005.05.09~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/zbook/code/zjump.c	2005-09-20 19:27:10.734527890 +0000
@@ -7,6 +7,9 @@
  *
  */
 #include "zbook/pilot_c.h"
+#if defined(CERNLIB_QMLXIA64)
+static void (*target)();
+#endif
 #if defined(CERNLIB_UNIX)
 #if defined(CERNLIB_QX_SC)
 zjump_(name,p1,p2,p3,p4)
@@ -18,8 +21,23 @@
 ZJUMP(name,p1,p2,p3,p4)
 #endif
 char *p1, *p2, *p3, *p4;
+
+/*  LP64 compatibility:
+    name is taken from a Fortran array and therefore its address is 32 bit
+    which has to be converted to a 64 bit address to satisfy void (*) (H. Vogt) */
+
+#if defined(CERNLIB_QMLXIA64)
+int *name;
+{
+  long jadr;
+  jadr   = *name;  /* convert int to long */
+  target = (void (*)())jadr;
+  (*target)(p1, p2, p3, p4);
+}
+#else
 void (**name)();
 {
    (**name)(p1, p2, p3, p4);
 }
 #endif
+#endif
diff -urNad cernlib-2005.05.09~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.05.09/src/packlib/zebra/test/brztest/btest2.F
--- cernlib-2005.05.09~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/zebra/test/brztest/btest2.F	2005-09-20 19:27:10.734527890 +0000
@@ -29,6 +29,15 @@
 ********************************************************************************
 *
       COMMON/CRZT/IXSTOR,IXDIV,IFENCE(2),LEV,LEVIN,BLVECT(30000)
+
+*     LP64 compatibility:
+*     For 64-bit pointer systems put local variables referenced by LOCF
+*     in a dummy named common block to keep addresses in the program region.
+*     see also: packlib/ffread/test/main.F (H. Vogt)
+
+#if defined(CERNLIB_QMLXIA64)
+      COMMON /TEST64/LBANK
+#endif
       DIMENSION LQ(999),IQ(999),Q(999)
       EQUIVALENCE (IQ(1),Q(1),LQ(9)),(LQ(1),LEV)
 C
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09~/src/pawlib/comis/code/Imakefile	2005-09-20 19:26:47.894420356 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-09-20 19:27:10.734527890 +0000
@@ -50,6 +50,10 @@
 SRCS_F := $(SRCS_F) cscrexec.F
 #endif
 
+#if defined(CERNLIB_QMLXIA64)
+SRCS_F := $(SRCS_F) csrtgpl.F csitgpl.F
+#endif
+
 #if defined(CERNLIB_OLD)
 SRCS_F := $(SRCS_F) cspdir.F csrmbk.F
 #endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csaddr.F	1996-02-26 17:16:25.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-09-20 19:27:10.735527676 +0000
@@ -17,8 +17,14 @@
       INTEGER CSLTGP,CSITGP
       CHARACTER*32 NAME
 #include "comis/cstab.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       INTEGER CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      INTEGER*8 CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)
       NAME=CHNAME
       NC=LENOCC(NAME)
       CALL CSCHID(NAME(:NC))
@@ -26,21 +32,39 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
+#endif
+#endif
+#if defined(CERNLIB_SHL)
           ELSE
             I=0
           ENDIF
         ENDIF
       ELSE
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+        IF(IADGPL.NE.0)THEN
+          IFCS=-2
+          ITYPGP=-2
+          I=CSITGPL(IPVS)
+        ENDIF
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
           I=CSITGP(IPVS)
         ENDIF
+#endif
       END IF
       CSADDR=I
 #endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csinit.F cernlib-2005.05.09/src/pawlib/comis/code/csinit.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csinit.F	2005-04-18 15:41:04.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csinit.F	2005-09-20 19:27:10.735527676 +0000
@@ -64,6 +64,9 @@
 #if defined(CERNLIB_SHL)
 #include "comis/cshlnm.inc"
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+#endif
 #if defined(CERNLIB_PAW)
 #include "paw/pcmode.inc"
 #include "comis/cshfill.inc"
@@ -159,6 +162,9 @@
       ICHMINU=ICHAR('-')
       ICHPLUS=ICHAR('+')
       ICHCOMM=ICHAR(',')
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+      IPIADGV=0
+#endif
 #if defined(CERNLIB_PAW)
       CALL CSPAWI
       MODHFI=0
@@ -209,11 +215,16 @@
       CHF77 ='f77 -c -pic'
       CHCC  ='cc -c -pic'
 #endif
-#if (defined(CERNLIB_LINUX))
+#if (defined(CERNLIB_LINUX))&&(!defined(CERNLIB_QMLXIA64))
       ITMPLEN=CSTMPD(CHPATH, 256)
       CHF77 ='g77 -c'
       CHCC  ='cc -c'
 #endif
+#if (defined(CERNLIB_LINUX))&&(defined(CERNLIB_QMLXIA64))
+      ITMPLEN=CSTMPD(CHPATH, 256)
+      CHF77 ='g77 -c -fPIC -fno-f2c'
+      CHCC  ='cc -c -fPIC -fno-f2c'
+#endif
 #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
       ITMPLEN=CSTMPD(CHPATH, 256)
       CHF77 ='f77 -c'
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csintx.F cernlib-2005.05.09/src/pawlib/comis/code/csintx.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csintx.F	1996-12-05 09:50:37.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csintx.F	2005-09-20 19:27:10.762521893 +0000
@@ -38,6 +38,9 @@
 #if defined(CERNLIB_PAW)
 #include "comis/cskucs.inc"
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_ALPHA_OSF))
       INTEGER CSTRCMP
 #endif
@@ -1105,6 +1108,32 @@
       ENDIF
 #endif
 #if (!defined(CERNLIB_VAX))&&(!defined(CERNLIB_APOLLO))
+#if defined(CERNLIB_QMLXIA64)
+      IF(IQ(IP+KSIFCS).EQ.-2)THEN
+*Dynamic linker may give long addresses
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ENDIF
+#else
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NPAR,IDA(IOFSPL))
       ELSEIF(ITP.EQ.2)THEN
@@ -1115,6 +1144,7 @@
         DCSRES=CSCALD(IADGP,NPAR,IDA(IOFSPL))
       ENDIF
 #endif
+#endif
       IPC=IPC+4
       GO TO 999
 *NUM I
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csitgpl.F cernlib-2005.05.09/src/pawlib/comis/code/csitgpl.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csitgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csitgpl.F	2005-09-20 19:27:10.763521679 +0000
@@ -0,0 +1,32 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZU:  1.16/16 04/10/93  12.14.52  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+      INTEGER FUNCTION CSITGPL(IP)
+***------------------------------
+*   it is last routine from the tables-set.
+***-----------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cspnts.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab64.inc"
+      I=MHLOC(KSIDP+NWIDEN)
+      IQ(I)=0
+      IQ(I+1)=NCIDEN
+      DO 1 K=1,NWIDEN
+        IQ(I+KSIDP-1+K)=IDEN(K)
+   1  CONTINUE
+      CALL CSRTGPL(I)
+      IF(IP.EQ.0)THEN
+        IPGP=I
+      ELSE
+        IQ(IP)=I
+      ENDIF
+      CSITGP=I
+      END
+#endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/cskcal.F cernlib-2005.05.09/src/pawlib/comis/code/cskcal.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/cskcal.F	1996-12-05 09:50:39.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/cskcal.F	2005-09-20 19:27:10.763521679 +0000
@@ -31,6 +31,9 @@
 #include "comis/cstab.inc"
 #include "comis/csfres.inc"
 #include "comis/cssysd.inc"
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
       CHARACTER PRONAME*32
       INTEGER CSCALI
       DOUBLE PRECISION CSCALD
@@ -232,6 +235,34 @@
         I2=I2+KS
         I=I+1
  9203 CONTINUE
+#if defined(CERNLIB_QMLXIA64)
+*  Dynamic linker may give long addresses
+      IF (IFCS.EQ.-2)THEN
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ENDIF
+#else
 *      IT=IABS(ITYPGP)
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NOPAR,IF77PL(1))
@@ -245,6 +276,7 @@
       ENDIF
 *+SELF,IF=UNIX,IF=-SGI,IF=-IBMRT,IF=-DECS,IF=-HPUX,IF=-SUN,IF=-MSDOS.
 #endif
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_STDUNIX))
       I=1
       DO 9203 K=ITA-NPAR+1,ITA
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/cslink.F cernlib-2005.05.09/src/pawlib/comis/code/cslink.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/cslink.F	1996-02-26 17:16:17.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/cslink.F	2005-09-20 19:27:10.763521679 +0000
@@ -21,10 +21,15 @@
 #include "comis/cstab.inc"
 #include "comis/cspnts.inc"
 #include "comis/cslun.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       CHARACTER*(KLENID) FNNAME
       INTEGER CS_GET_FUNC
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      CHARACTER*(KLENID) FNNAME
+      INTEGER*8 CS_GET_FUNC
+#endif
          COMMON/CSGSCM/IGS,JGS,NGS,CSJUNK(3)
       IF(ISTLIB.EQ.0 .AND. ITBS.EQ.0)RETURN
    2  I=IPGP
@@ -60,12 +65,20 @@
 #if defined(CERNLIB_SHL)
           CALL CSGTIDP(I,FNNAME,NC)
           CALL CUTOL(FNNAME(1:NC))
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(FNNAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+          ENDIF
+#else
           IADGP=CS_GET_FUNC(FNNAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
           ENDIF
 #endif
+#endif
           IP=0
         ENDIF
       ENDIF
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csrtgpl.F cernlib-2005.05.09/src/pawlib/comis/code/csrtgpl.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csrtgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csrtgpl.F	2005-09-20 19:27:10.764521465 +0000
@@ -0,0 +1,31 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZ :  1.18/14 10/01/95  15.41.06  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+
+      SUBROUTINE CSRTGPL(I)
+***--------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab.inc"
+#include "comis/cstab64.inc"
+
+      IPIADGV = IPIADGV + 1
+      IF (IPIADGV .GT. MAXIAD64)  THEN
+        WRITE (*,'(2a,I4)') 'to much addresses for dynamik linking, ',
+     &                      'limit is ', MAXIAD64
+        WRITE (*,'(2a)') 'increase MAXIAD64 in cstab64.inc and ',
+     &                    'recompile COMIS'
+
+        STOP
+      END IF
+      IADGPLV(IPIADGV) = IADGPL
+      IADGP            = IPIADGV
+      CALL CCOPYA(IADGP,IQ(I+2),KSIDP-2)
+      END
+#endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/comis/cstab64.inc cernlib-2005.05.09/src/pawlib/comis/comis/cstab64.inc
--- cernlib-2005.05.09~/src/pawlib/comis/comis/cstab64.inc	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/comis/cstab64.inc	2005-09-20 19:27:10.775519109 +0000
@@ -0,0 +1,10 @@
+*
+*
+* cstab64.inc
+*
+      PARAMETER (MAXIAD64=100) !maximum number of shared objects
+      INTEGER*8 IADGPL,IADGPLV(MAXIAD64)
+      INTEGER   IADGPL1, IADGPL2
+      COMMON /CSTB64/ IADGPL,IADGPLV
+      COMMON /CSTB64I/ IPIADGV
+      EQUIVALENCE (IADGPL, IADGPL1)
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/ccopys.c	1997-09-02 15:50:38.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/ccopys.c	2005-09-20 19:27:10.776518895 +0000
@@ -33,11 +33,25 @@
 #else
 void ccopys_(ja,jb,nn)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *nn;
+{
+  int i,n; char *a,*b;
+  n=*nn; (long)a=*ja; (long)b=*jb;
+#else
      char **ja, **jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+#endif
   if ( a >= b )
      for ( i=0; i
 #endif
@@ -274,6 +285,7 @@
 #endif
          p->next = f->first_proc;
          f->first_proc = p;
+         if (debug_level > 0) printf("function pointer is: %p\n", p->funcptr);
          return (void *)(p->funcptr);
       }
      f = f->next;
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscald.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscald.c	2004-10-27 09:01:54.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscald.c	2005-09-20 19:27:10.776518895 +0000
@@ -32,8 +32,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 double cscald_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -46,10 +45,41 @@
     int CSCALD (name,n,p)
 #  endif
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscald_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+double cscald_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[15];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = *fptr + (unsigned long)jumpad_;
+   if ( *fptr > 0 ) ptr = 0;
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  double (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    double d;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscali.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscali.c	2004-10-22 12:42:40.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscali.c	2005-09-20 19:27:10.777518681 +0000
@@ -29,8 +29,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 int cscali_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -39,10 +38,41 @@
 #if defined(CERNLIB_QXCAPT)
 int type_of_call CSCALI (name,n,p)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscali_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+int cscali_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[15];
+{
+   int jumpad_();
+   int (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   if ( *fptr > 0 ) ptr = 0;
+   ptr += *fptr;
+   name = (int (*)())ptr;
+/*    printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  int (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    int i;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscalr.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscalr.c	2004-10-22 12:03:16.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscalr.c	2005-09-20 19:27:10.788516325 +0000
@@ -33,16 +33,12 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 float cscalr_ (name,n,p)
 #endif
-
 #if defined(CERNLIB_QXNO_SC)
 float cscalr (name,n,p)
 #endif
-
 #if defined(CERNLIB_QXCAPT)
 # if defined(CERNLIB_MSSTDCALL)
    float type_of_call CSCALR(name,n,p)
@@ -51,10 +47,39 @@
 # endif
 #endif
 
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscalr_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+float cscalr_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ int pin[15];
+{
+   int jumpad_();
+   float (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   ptr += *fptr;
+   name = (float (*)())ptr;
+/*    printf ("cscalr - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  float (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    float r;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cstrcmp.c	1997-09-02 15:50:44.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cstrcmp.c	2005-09-20 19:27:10.788516325 +0000
@@ -36,6 +36,27 @@
 #else
 int cstrcmp_(ja,na,jb,nb)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *na, *nb;
+{
+
+  int i,la,lb,k; char *a,*b;
+  if ( *na >= *nb )
+     {
+      (long)a=*ja; (long)b=*jb; la=*na; lb=*nb; k=1;
+      }
+  else
+    {
+      (long)a=*jb; (long)b=*ja; la=*nb; lb=*na; k=-1;
+     }
+#else
      char **ja, **jb;
      int *na, *nb;
 {
@@ -48,6 +69,7 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+#endif
   for ( i=0; i b[i]) ? k : -k ); }
diff -urNad cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_execute.c cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_execute.c
--- cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_execute.c	2001-09-18 13:41:35.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_execute.c	2005-09-20 19:27:10.789516111 +0000
@@ -245,7 +245,15 @@
 	char		ntname[MAX_NAME_LEN+6];
 	int		i, ierr, indx, itype, isize, ielem;
 	Int32 *		addr;
-	int		ibase[1], ioff, nuse;
+
+	/* LP64 compatibility:
+	   use static for ibase (at least) because its address is stored
+	   as Int32 in structure CWNBlock                                 
+	   static takes ibase from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int	ibase[1], ioff, nuse;
 	int		id = qe->id;
 	char *		path = qe->path;
 	char *		title;
@@ -871,8 +879,21 @@
 			if ( cmd->u.scan.pawpp ) {
 				char	buf[33];
 
+				/* for LP64 ABI matlab and matrow are 64 bit pointer, type is void*  
+				   but PCADDR.jmlab and PCADDR.jmrow are of type int
+				   see: c_pcaddr.h and qp_command.h
+				   it is related to CWNBlock -> see above (H. Vogt)*/
+
+#if defined(CERNLIB_QMLXIA64)
+				unsigned long long int	 myjmlab, myjmrow;
+				myjmlab = PCADDR.jmlab;
+				myjmrow = PCADDR.jmrow;
+				c->matlab = (TableCallBack) myjmlab;
+				c->matrow = (TableCallBack) myjmrow;
+#else
 				c->matlab = (TableCallBack) PCADDR.jmlab;
 				c->matrow = (TableCallBack) PCADDR.jmrow;
+#endif
 
 				qp_assert( qe->nexpr <= MAX_OUTSTR );
 
diff -urNad cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_hbook_if.c cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_hbook_if.c
--- cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_hbook_if.c	1999-07-05 15:43:35.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_hbook_if.c	2005-09-20 19:27:10.801513541 +0000
@@ -149,7 +149,15 @@
 	int	idn, idtmp;
 	int	icycle;
 	int	ierr;
-	int     izero = 0;
+
+	/* LP64 compatibility:
+	   use static for izero because its address is fetched by hbname_
+	   using locb and locb expects 32 bit addresses only.
+	   static takes izero from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int     izero = 0;
 
 	/* split string into  path, id and cycle */
 
diff -urNad cernlib-2005.05.09~/src/scripts/cernlib cernlib-2005.05.09/src/scripts/cernlib
--- cernlib-2005.05.09~/src/scripts/cernlib	2003-01-23 14:00:37.000000000 +0000
+++ cernlib-2005.05.09/src/scripts/cernlib	2005-09-20 19:27:10.801513541 +0000
@@ -115,6 +115,12 @@
 	       [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
 	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
 	       [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
+#                      add path to lib64 for x86_64 architecture
+	       if [ `uname -m` = x86_64 ] && [ -d /usr/X11R6/lib64 ] ; then
+		  SYSGDIRS="-L/usr/X11R6/lib -L/usr/X11R6/lib64"
+		  SYSGX11="$SYSGDIRS -lX11"
+		  SYSGMOTIF="$SYSGDIRS -lXm -lXt -lXp -lXext -lX11"
+	       fi
 	       ;;
       NeXT)    SYSGX11="/usr/lib/X11/libX11.r" ;
                SYSGMOTIF="-lXm -lXt /usr/lib/X11/libX11.r" ;;


--- NEW FILE 300-skip-duplicate-lenocc.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 300-skip-duplicate-lenocc.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Only compile one of the two "lenocc()" functions.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile
--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile	2002-09-19 16:44:52.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile	2005-11-28 19:59:28.690293288 +0000
@@ -19,7 +19,9 @@
 SRCS_C += apofsz.c
 #endif
 
-#if defined(CERNLIB_WINNT)
+#if defined(CERNLIB_WINNT) || defined(CERNLIB_LINUX)
+/* Do not use lenocc.c in Linux; favor packlib/kernlib/kerngen/tcgen/lenocc.F
+ * instead.  --Kevin McCarty, for Debian */
 SRCS_C += lnblnk.c
 #endif
 
@@ -29,7 +31,7 @@
 
 #if defined(CERNLIB_DECS) || defined(CERNLIB_QMVAOS) \
  || defined(CERNLIB_HPUX) || defined(CERNLIB_IBMRT) || defined(CERNLIB_IBMRTD) \
- || defined(CERNLIB_OS9)  || defined(CERNLIB_LINUX)
+ || defined(CERNLIB_OS9)
 SRCS_C += lenocc.c lnblnk.c
 #endif
 


--- NEW FILE 303-shadow-passwords-supported.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 303-shadow-passwords-supported.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Allow Cern's server code to read from /etc/shadow.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.KyLyTI/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
--- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-04-18 11:39:28.000000000 -0400
+++ /tmp/dpep.KyLyTI/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-08 16:55:00.088372396 -0400
@@ -28,6 +28,9 @@
  *
  */
 #include "cspack/pilot.h"
+#if defined(CERNLIB_LINUX) && ! defined(CERNLIB_MACOSX)
+#define SHADOW_SUPPORT /* for Debian */
+#endif
 #if !defined(CERNLIB_IBM)||defined(CERNLIB_TCPSOCK)
 /*N.B. Must define sequence TCPLOG if a log file is required, e.g.*/
 /*#define LOGFILE "disk$dd:-ben.socks-serv.log"*/ /* VMS    */
@@ -231,7 +234,7 @@
 #endif /* OSK */
 #endif /* AUTHENT */
  
-#ifdef linux_softland
+#if defined(linux_softland) || defined(SHADOW_SUPPORT)
 #include 
 #endif /* linux_softland */
  
@@ -1780,10 +1783,10 @@
         union wait ret;
 #endif /* APOPWD1 */
  
-        char   *xpasswd, *crypt();
+        char   *xpasswd, *encrypted, *crypt();
         struct passwd *pw;
  
-#ifdef linux_softland
+#if defined(linux_softland) || defined(SHADOW_SUPPORT)
         struct spwd *spwd;
 #endif /* linux_softland */
  
@@ -1798,6 +1801,7 @@
                 reply("Unknown user %s.\n", user);
                 return(-2);
         }
+	encrypted = pw->pw_passwd;
  
 #ifdef linux_softland
         spwd = getspnam(user);
@@ -1805,6 +1809,29 @@
                 reply("User %s has illegal shadow password\n",user);
                 return(-2);
         }
+	encrypted = spwd->sp_pwdp;
+
+#elif defined(SHADOW_SUPPORT)
+	/* shadow passwords may not be enabled in Debian, so must check */
+	{
+		FILE *test = fopen("/etc/shadow", "r");
+		if (test) {
+			fclose(test);
+			spwd = getspnam(user);
+			if (spwd == NULL) {
+				reply("User %s has illegal shadow password\n",
+				      user);
+				return(-2);
+			}
+			encrypted = spwd->sp_pwdp;
+		}
+		else if (errno == EACCES) {
+			reply("Server has insufficient permissions to "
+			      "read /etc/shadow file\n");
+			return(-2);
+		}
+	}
+
 #endif /* linux_softland */
  
 #ifdef APOPWD1
@@ -1850,15 +1877,16 @@
 #else
  
 #ifdef linux_softland
-            xpasswd = pw_encrypt(pass,spwd->sp_pwdp);
+            xpasswd = pw_encrypt(pass, encrypted);
 #else
-            xpasswd = crypt(pass, pw->pw_passwd);
+            xpasswd = crypt(pass, encrypted);
 #endif /* linux_softland */
+
             /* The strcmp does not catch null passwords! */
-#ifdef linux_softland
-            if (spwd->sp_pwdp == '\0' || strcmp(xpasswd,spwd->sp_pwdp)) {
+#if defined(linux_softland) || defined(SHADOW_SUPPORT)
+            if (*encrypted == '\0' || strcmp(xpasswd,spwd->sp_pwdp)) {
 #else
-            if (*pw->pw_passwd == '\0' || strcmp(xpasswd,pw->pw_passwd)) {
+            if (*encrypted == '\0' || strcmp(xpasswd,pw->pw_passwd)) {
 #endif /* linux_softland */
  
 #endif /* AFS */


***** Error reading new file: [Errno 2] No such file or directory: '304-update-Imake-config-files.dpatch'

--- NEW FILE 305-use-POWERPC-not-PPC-as-test.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 305-use-POWERPC-not-PPC-as-test.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Since patch 304 changed the meaning of CERNLIB_PPC to a mere endianness
## DP: test, we now use CERNLIB_POWERPC to mean actually checking for a PowerPC
## DP: processor; fix the three occurences of this in Imakefiles.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile
--- cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile	1998-09-25 11:34:28.000000000 -0400
+++ /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile	2005-06-09 10:51:45.913019086 -0400
@@ -43,7 +43,7 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_PPC)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
 SpecialFortranLibObjectRule(hwuci2,hwuci2,-O0,NullParameter)
 #endif
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/Imakefile /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	1998-09-25 05:33:51.000000000 -0400
+++ /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	2005-06-09 10:50:47.068482917 -0400
@@ -56,7 +56,7 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_PPC)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
 SpecialFortranLibObjectRule(pawins,pawins,-O0,NullParameter)
 #endif
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	1999-09-14 05:20:08.000000000 -0400
+++ /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	2005-06-09 10:51:15.807396176 -0400
@@ -46,7 +46,7 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_PPC)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
 SpecialObjectRule(archive/qp_execute.o,qp_execute.c archive/qp_execute.d,-O0 -o $@)
 SpecialObjectRule(debug/qp_execute.o,qp_execute.c debug/qp_execute.d,-O0 -o $@)
 SpecialObjectRule(shared/qp_execute.o,qp_execute.c shared/qp_execute.d,-O0 -o $@)


--- NEW FILE 306-patch-assert.h-for-makedepend.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 306-patch-assert.h-for-makedepend.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Include local copy of assert.h with a workaround for a bug of
## DP: makedepend (cf. Debian bug # 171908).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/include/assert.h /tmp/dpep.9sKNsJ/cernlib-2005.05.09/src/include/assert.h
--- cernlib-2005.05.09/src/include/assert.h	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.9sKNsJ/cernlib-2005.05.09/src/include/assert.h	2005-06-09 12:50:41.751880968 -0400
@@ -0,0 +1,153 @@
+#ifndef CERNLIB_LINUX
+# include "/usr/include/assert.h"
+#else
+
+/* Copyright (C) 1991,1992,1994-2001,2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/*
+ *	ISO C99 Standard: 7.2 Diagnostics	
+ */
+
+#ifdef	_ASSERT_H
+
+# undef	_ASSERT_H
+# undef	assert
+# undef __ASSERT_VOID_CAST
+
+# ifdef	__USE_GNU
+#  undef assert_perror
+# endif
+
+#endif /* assert.h	*/
+
+#define	_ASSERT_H	1
+#include 
+
+#if defined __cplusplus && __GNUC_PREREQ (2,95)
+# define __ASSERT_VOID_CAST static_cast
+#else
+# define __ASSERT_VOID_CAST (void)
+#endif
+
+/* void assert (int expression);
+
+   If NDEBUG is defined, do nothing.
+   If not, and EXPRESSION is zero, print an error message and abort.  */
+
+#ifdef	NDEBUG
+
+# define assert(expr)		(__ASSERT_VOID_CAST (0))
+
+/* void assert_perror (int errnum);
+
+   If NDEBUG is defined, do nothing.  If not, and ERRNUM is not zero, print an
+   error message with the error text for ERRNUM and abort.
+   (This is a GNU extension.) */
+
+# ifdef	__USE_GNU
+#  define assert_perror(errnum)	(__ASSERT_VOID_CAST (0))
+# endif
+
+#else /* Not NDEBUG.  */
+
+#ifndef _ASSERT_H_DECLS
+#define _ASSERT_H_DECLS
+__BEGIN_DECLS
+
+/* This prints an "Assertion failed" message and aborts.  */
+extern void __assert_fail (__const char *__assertion, __const char *__file,
+			   unsigned int __line, __const char *__function)
+     __THROW __attribute__ ((__noreturn__));
+
+/* Likewise, but prints the error text for ERRNUM.  */
+extern void __assert_perror_fail (int __errnum, __const char *__file,
+				  unsigned int __line,
+				  __const char *__function)
+     __THROW __attribute__ ((__noreturn__));
+
+
+/* The following is not at all used here but needed for standard
+   compliance.  */
+extern void __assert (const char *__assertion, const char *__file, int __line)
+     __THROW __attribute__ ((__noreturn__));
+
+
+__END_DECLS
+#endif /* Not _ASSERT_H_DECLS */
+
+/* For the macro definition we use gcc's __builtin_expect if possible
+   to generate good code for the non-error case.  gcc 3.0 is a good
+   enough estimate for when the feature became available.  */
+# if __GNUC_PREREQ (3, 0)
+#  define assert(expr) \
+  (__ASSERT_VOID_CAST (__builtin_expect (!!(expr), 1) ? 0 :		      \
+		       (__assert_fail (__STRING(expr), __FILE__, __LINE__,    \
+				       __ASSERT_FUNCTION), 0)))
+# else
+#  define assert(expr) \
+  (__ASSERT_VOID_CAST ((expr) ? 0 :					      \
+		       (__assert_fail (__STRING(expr), __FILE__, __LINE__,    \
+				       __ASSERT_FUNCTION), 0)))
+# endif
+
+# ifdef	__USE_GNU
+#  if __GNUC_PREREQ (3, 0)
+#   define assert_perror(errnum) \
+  (__ASSERT_VOID_CAST (__builtin_expect (!(errnum), 1) ? 0 :		      \
+		       (__assert_perror_fail ((errnum), __FILE__, __LINE__,   \
+					      __ASSERT_FUNCTION), 0)))
+#  else
+#   define assert_perror(errnum) \
+  (__ASSERT_VOID_CAST (!(errnum) ? 0 :					      \
+		       (__assert_perror_fail ((errnum), __FILE__, __LINE__,   \
+					      __ASSERT_FUNCTION), 0)))
+#  endif
+# endif
+
+/* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
+   which contains the name of the function currently being defined.
+   This is broken in G++ before version 2.6.
+   C9x has a similar variable called __func__, but prefer the GCC one since
+   it demangles C++ function names.  */
+
+/* The following commented-out line breaks makedepend (bug # 171908); a local
+ * patched version of assert.h is therefore included.
+ *   --Kevin McCarty, for Debian */
+/* # if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4) */
+
+/* begin fix to work around Debian Bug # 171908 */
+# if defined __cplusplus
+#  if __GNUC_PREREQ (2, 6)
+#   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
+#  endif
+# elif __GNUC_PREREQ (2, 4)
+/* end fix */
+
+#   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
+# else
+#  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#   define __ASSERT_FUNCTION	__func__
+#  else
+#   define __ASSERT_FUNCTION	((__const char *) 0)
+#  endif
+# endif
+
+#endif /* NDEBUG.  */
+
+#endif /* CERNLIB_LINUX */


--- NEW FILE 307-use-canonical-cfortran.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 307-use-canonical-cfortran.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Use the most recent version of cfortran.h and cfortran.doc from
## DP: Debian package of cfortran, version 4.4-6.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.doc /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc
--- cernlib-2005.05.09/src/cfortran/cfortran.doc	1998-12-11 12:17:09.000000000 -0500
+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc	2004-12-10 10:47:33.000000000 -0500
@@ -195,7 +195,7 @@
 HP9000> f77 -c cfortex.f
 HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest
 
-HP0000> # If old-style f77 +800 compiled objects are required:
+HP9000> # If old-style f77 +800 compiled objects are required:
 HP9000> # #define hpuxFortran800
 HP9000> cc -c -Aa -DhpuxFortran800 cfortest.c
 HP9000> f77 +800 -o cfortest cfortest.o cfortex.f
@@ -643,7 +643,7 @@
    [For an ancient math.h on a 386 or sparc, get similar from a new math.h.]
    #ifdef mc68000     /* 5 lines Copyright (c) 1988 by Sun Microsystems, Inc. */
    #define FLOATFUNCTIONTYPE	int
-   #define RETURNFLOAT(x) 		return (*(int *)(&(x)))
+   #define RETURNFLOAT(x) 	return (*(int *)(&(x)))
    #define ASSIGNFLOAT(x,y)	*(int *)(&x) = y
    #endif
 
@@ -874,7 +874,7 @@
 works everywhere and would seem to be an obvious choice.
 
 
-3. 
+3. 
 
 cfortran.h encourages the exact specification of the type and dimension of
 array parameters because it allows the C compiler to detect errors in the
@@ -1835,7 +1835,7 @@
 
 Unlike all other C compilers supported by cfortran.h,
 'gcc -traditional' promotes to double all functions returning float
-as demonstrated bu the following example.
+as demonstrated by the following example.
 
 /* m.c */
 #include 
@@ -2017,8 +2017,9 @@
 
 THIS PACKAGE, I.E. CFORTRAN.H, THIS DOCUMENT, AND THE CFORTRAN.H EXAMPLE
 PROGRAMS ARE PROPERTY OF THE AUTHOR WHO RESERVES ALL RIGHTS. THIS PACKAGE AND
-THE CODE IT PRODUCES MAY BE FREELY DISTRIBUTED WITHOUT FEES, SUBJECT TO THE
-FOLLOWING RESTRICTIONS:
+THE CODE IT PRODUCES MAY BE FREELY DISTRIBUTED WITHOUT FEES, SUBJECT
+(AT YOUR CHOICE) EITHER TO THE GNU LIBRARY GENERAL PUBLIC LICENSE
+AT http://www.gnu.org/licenses/lgpl.html OR TO THE FOLLOWING RESTRICTIONS:
 - YOU MUST ACCOMPANY ANY COPIES OR DISTRIBUTION WITH THIS (UNALTERED) NOTICE.
 - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA 
   (E.G. TAPE, DISK, COMPUTER, PAPER.)
diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.h /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h
--- cernlib-2005.05.09/src/cfortran/cfortran.h	2002-09-11 13:05:51.000000000 -0400
+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h	2004-12-10 10:47:34.000000000 -0500
@@ -1,4 +1,4 @@
-/* cfortran.h  4.4_cernlib2002 */
+/* cfortran.h  4.4 */
 /* http://www-zeus.desy.de/~burow/cfortran/                   */
 /* Burkhard Burow  burow at desy.de                 1990 - 2002. */
 
@@ -11,6 +11,32 @@
    MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE.
 */
 
+/* The following modifications were made by the authors of CFITSIO or by me. 
+ * I've flagged them below with "(CFITSIO)" or "(KMCCARTY)".
+ * PDW = Peter Wilson
+ * DM  = Doug Mink
+ * LEB = ??
+ * -- Kevin McCarty, for Debian (11/29/2003) */
+
+/*******
+   Modifications:
+      Oct 1997: Changed symbol name extname to appendus (PDW/HSTX)
+                (Conflicted with a common variable name in FTOOLS)
+      Nov 1997: If g77Fortran defined, also define f2cFortran (PDW/HSTX)
+      Feb 1998: Let VMS see the NUM_ELEMS code. Lets programs treat
+                single strings as vectors with single elements
+      Nov 1999: If macintoxh defined, also define f2cfortran (for Mac OS-X)
+      Apr 2000: If WIN32 defined, also define PowerStationFortran and
+                VISUAL_CPLUSPLUS (Visual C++)
+      Jun 2000: If __GNUC__ and linux defined, also define f2cFortran
+                (linux/gcc environment detection)
+      Apr 2002: If __CYGWIN__ is defined, also define f2cFortran
+      Nov 2002: If __APPLE__ defined, also define f2cfortran (for Mac OS-X)
+
+      Nov 2003: If __INTEL_COMPILER or INTEL_COMPILER defined, also define
+                f2cFortran (KMCCARTY)
+ *******/
+
 /* 
   Avoid symbols already used by compilers and system *.h:
   __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c
@@ -75,7 +101,8 @@
 
 /* Remainder of cfortran.h depends on the Fortran compiler. */
 
-#if defined(CLIPPERFortran) || defined(pgiFortran)
+/* 11/29/2003 (KMCCARTY): add *INTEL_COMPILER symbols here */
+#if defined(CLIPPERFortran) || defined(pgiFortran) || defined(__INTEL_COMPILER) || defined(INTEL_COMPILER)
 #define f2cFortran
 #endif
 
@@ -90,6 +117,27 @@
                            Support f2c or f77 with gcc, vcc with f2c. 
                            f77 with vcc works, missing link magic for f77 I/O.*/
 #endif
+/* 04/13/00 DM (CFITSIO): Add these lines for NT */
+/*   with PowerStationFortran and and Visual C++ */
+#if defined(WIN32) && !defined(__CYGWIN__)
+#define PowerStationFortran   
+#define VISUAL_CPLUSPLUS
+#endif
+#if defined(g77Fortran)                        /* 11/03/97 PDW (CFITSIO) */
+#define f2cFortran
+#endif
+#if        defined(__CYGWIN__)                 /* 04/11/02 LEB (CFITSIO) */
+#define       f2cFortran 
+#endif
+#if        defined(__GNUC__) && defined(linux) /* 06/21/00 PDW (CFITSIO) */
+#define       f2cFortran 
+#endif
+#if defined(macintosh)                         /* 11/1999 (CFITSIO) */
+#define f2cFortran
+#endif
+#if defined(__APPLE__)                         /* 11/2002 (CFITSIO) */
+#define f2cFortran
+#endif
 #if defined(__hpux)             /* 921107: Use __hpux instead of __hp9000s300 */
 #define       hpuxFortran       /*         Should also allow hp9000s7/800 use.*/
 #endif
@@ -131,6 +179,7 @@
 #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
 /* If your compiler barfs on ' #error', replace # with the trigraph for #     */
  #error "cfortran.h:  Can't find your environment among:\
+    - GNU gcc (g77) on Linux.                                            \
     - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...)     \
     - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000     \
     - VAX   VMS CC 3.1 and FORTRAN 5.4.                                  \
@@ -151,7 +200,8 @@
     - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran          \
     - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \
     - Absoft Pro Fortran: Use #define AbsoftProFortran \
-    - Portland Group Fortran: Use #define pgiFortran"
+    - Portland Group Fortran: Use #define pgiFortran \
+    - Intel Fortran: Use #define INTEL_COMPILER"
 /* Compiler must throw us out at this point! */
 #endif
 #endif
@@ -164,7 +214,8 @@
 
 /* Throughout cfortran.h we use: UN = Uppercase Name.  LN = Lowercase Name.   */
 
-#if defined(f2cFortran) || defined(NAGf90Fortran) || defined(DECFortran) || defined(mipsFortran) || defined(apolloFortran) || defined(sunFortran) || defined(CONVEXFortran) || defined(SXFortran) || defined(extname)
+/* "extname" changed to "appendus" below (CFITSIO) */
+#if defined(f2cFortran) || defined(NAGf90Fortran) || defined(DECFortran) || defined(mipsFortran) || defined(apolloFortran) || defined(sunFortran) || defined(CONVEXFortran) || defined(SXFortran) || defined(appendus)
 #define CFC_(UN,LN)            _(LN,_)      /* Lowercase FORTRAN symbols.     */
 #define orig_fcallsc(UN,LN)    CFC_(UN,LN)
 #else 
@@ -268,7 +319,8 @@
 #endif
 
 #ifndef apolloFortran
-#define COMMON_BLOCK_DEF(DEFINITION, NAME) DEFINITION NAME
+/* "extern" removed (CFITSIO) */
+#define COMMON_BLOCK_DEF(DEFINITION, NAME) /* extern */ DEFINITION NAME
 #define CF_NULL_PROTO
 #else                                         /* HP doesn't understand #elif. */
 /* Without ANSI prototyping, Apollo promotes float functions to double.    */
@@ -512,7 +564,7 @@
                     *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO)  ),   \
   (F).dsc$a_a0    =  ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length          ,(F))
 
-#else
+#endif      /* PDW: 2/10/98 (CFITSIO) -- Let VMS see NUM_ELEMS definitions */
 #define _NUM_ELEMS      -1
 #define _NUM_ELEM_ARG   -2
 #define NUM_ELEMS(A)    A,_NUM_ELEMS
@@ -540,7 +592,8 @@
 }
 return (int)num;
 }
-#endif
+/* #endif removed 2/10/98 (CFITSIO) */
+
 /*-------------------------------------------------------------------------*/
 
 /*           UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS       */


--- NEW FILE 308-use-canonical-cfortran-location.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 308-use-canonical-cfortran-location.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: All code compiled at Cernlib build-time should look for cfortran.h
## DP: at .

@DPATCH@
diff -urNad cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c /tmp/dpep.d3syqe/cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c
--- cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c	1996-02-14 08:10:26.000000000 -0500
+++ /tmp/dpep.d3syqe/cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c	2005-06-09 13:13:22.079711057 -0400
@@ -39,7 +39,7 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  */
 
-#include "higz/cfortran.h"
+#include 
 #if !defined(VMS) && !defined(_WINDOWS)
 #include "higz/tkConfig.h"
 #endif
diff -urNad cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c /tmp/dpep.d3syqe/cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c
--- cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c	1996-04-17 10:46:29.000000000 -0400
+++ /tmp/dpep.d3syqe/cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c	2005-06-09 13:14:58.654908060 -0400
@@ -16,7 +16,7 @@
 #include	
 
 
-#include	"cfortran.h"
+#include	
 
 /* #include	"packlib.h" */
 #include	"hbook_interface.h"


--- NEW FILE 309-define-dummy-herwig-routines.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 309-define-dummy-herwig-routines.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Define stub functions for herwig routines that are supposed to be
## DP: provided by the user.  Also, comment out the dummy functions pdfset
## DP: and structm; real versions are provided in pdflib.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/Imakefile	2005-11-28 19:46:53.619963660 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/Imakefile	2005-11-28 19:46:58.890844233 +0000
@@ -24,8 +24,13 @@
 	hwulob.F hwulof.F hwulor.F hwumas.F hwupcm.F hwurap.F hwures.F \ @@\
 	hwurob.F hwurof.F hwurot.F hwusor.F hwusqr.F hwusta.F hwutab.F \ @@\
 	hwutim.F hwvdif.F hwvdot.F hwvequ.F hwvsca.F hwvsum.F hwvzro.F \ @@\
-	hwwarn.F ieupdg.F ipdgeu.F pdfset.F qqinit.F qqlmat.F sasano.F \ @@\
-	sasbeh.F sasdir.F sasgam.F sasvmd.F structm.F
+	hwwarn.F ieupdg.F ipdgeu.F /*pdfset.F*/ qqinit.F qqlmat.F sasano.F \ @@\
+	sasbeh.F sasdir.F sasgam.F sasvmd.F /*structm.F*/
+	/* comment out pdfset.F, structm.F; real versions are in pdflib */
+
+/* add the following file to define dummy routines as weak symbols */
+/* --Kevin McCarty, for Debian */
+SRCS_C= dummy.c
 
 FORTRANSAVEOPTION = FortranSaveFlags
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/dummy.c cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/dummy.c
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/dummy.c	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/dummy.c	2005-11-28 19:49:17.897320746 +0000
@@ -0,0 +1,34 @@
+/* Dummy file to avoid undefined symbols in the library */
+/* Kevin McCarty, 14 Jan 2003 */
+
+#include 
+#include 
+
+/* Want the dummy functions to be weakly defined so they may be overridden
+ * without error. */
+
+#define kludge(x)    #x
+#define stringify(x) kludge(x)
+#define underline(x) dummy_ ## x
+
+#define DUMMY(UPPERNAME, fortranname_, returntype) \
+static returntype underline(fortranname_)() { print_dummy(#UPPERNAME); } \
+void fortranname_() \
+	__attribute__ ((weak, alias (stringify(underline(fortranname_))) ))
+
+static void print_dummy(const char *function)
+{
+  fprintf(stderr, "herwig59: Now in dummy %s routine.\n", function);
+  fprintf(stderr,
+          "If you see this message, you should define your own such routine.\n"
+#if defined (CERNLIB_DEBIAN)
+	  "For details, see the file /usr/share/doc/libherwig59-2-dev/herwig59.txt.gz\n"
+#endif
+  );
+  exit(EXIT_FAILURE);
+}
+
+DUMMY(HWABEG, hwabeg_, void);
+DUMMY(HWANAL, hwanal_, void);
+DUMMY(HWAEND, hwaend_, void);
+


--- NEW FILE 310-define-dummy-fowl-routines.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 310-define-dummy-fowl-routines.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Define stub functions for routines in fowl that are supposed to be
## DP: user-defined.  Also, rename START to FSTART to avoid name clash
## DP: with mathlib.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/Imakefile cernlib-2005.05.09.dfsg/src/phtools/fowl/Imakefile
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/Imakefile	1996-04-26 07:13:52.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/Imakefile	2005-11-28 19:49:52.412989577 +0000
@@ -1,10 +1,12 @@
-SRCS_F=	 beamin.F breitw.F chmove.F delsq.F dumpme.F finish.F \ @@\
+SRCS_F=	 beamin.F breitw.F chmove.F delsq.F dumpme.F /* finish.F */ \ @@\
 	fmass.F fmassq.F fowl.F fowlmp.F fowlpr.F genev.F histey.F \ @@\
 	labsys.F pdk.F qqstrt.F rangnr.F redat2.F redata.F rotes2.F \ @@\
 	scout.F teedia.F tranch.F xplsdx.F
 
+SRCS_C= dummy.c /*"fake" defn of start, user, finish to avoid undefined syms*/
+
 #if !defined(CERNLIB_UNIX)
-SRCS_F := $(SRCS_F) start.F
+SRCS_F := $(SRCS_F) /* start.F */
 #endif
 
 SubdirLibraryTarget(fowl,NullParameter)
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/dummy.c cernlib-2005.05.09.dfsg/src/phtools/fowl/dummy.c
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/dummy.c	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/dummy.c	2005-11-28 19:53:31.287496776 +0000
@@ -0,0 +1,39 @@
+/* Dummy file to avoid undefined symbols in the library */
+/* Kevin McCarty, 26 Apr 2004 */
+/* Last revised 13 Aug 2004 */
+
+#include 
+#include 
+
+/* Want the dummy functions to be weakly defined so they may be overridden
+ * without error. */
+
+#define kludge(x)    #x
+#define stringify(x) kludge(x)
+#define underline(x) dummy_ ## x
+
+#define DUMMY(UPPERNAME, fortranname_, returntype) \
+static returntype underline(fortranname_)() { print_dummy(#UPPERNAME); } \
+void fortranname_() \
+	__attribute__ ((weak, alias (stringify(underline(fortranname_))) ))
+
+static void print_dummy(const char *function)
+{
+  fprintf(stderr, "phtools: Now in dummy %s routine.\n", function);
+  fprintf(stderr,
+          "If you see this message, you should define your own such routine.\n"
+	  "For details, see "
+#if defined (CERNLIB_DEBIAN)
+	                   "/usr/share/doc/libphtools2-dev/README.Debian\n"
+	  "and "
+#endif
+	      "the CERN writeup for FOWL (available at the URL\n"
+	  "http://wwwasdoc.web.cern.ch/wwwasdoc/Welcome.html ; scroll down\n"
+	  "to the link for W505 - FOWL.)\n");
+  exit(EXIT_FAILURE);
+}
+
+DUMMY(FSTART, fstart_, void);
+DUMMY(USER,   user_,   void);
+DUMMY(FINISH, finish_, void);
+
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/fowlmp.F cernlib-2005.05.09.dfsg/src/phtools/fowl/fowlmp.F
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/fowlmp.F	1996-03-22 16:42:46.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/fowlmp.F	2005-11-28 19:49:52.412989577 +0000
@@ -30,7 +30,7 @@
       CALL REDATA
       IF(NEVTOT.LT.NGRP) NGRP = NEVTOT
       N2 = MIN (NEVTOT/NGRP, 30000)
-      CALL START
+      CALL FSTART
       DO  500 I2= 1, N2
       DO  400  I= 1, NGRP
       IEVENT = IEVENT + 1
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/qqstrt.F cernlib-2005.05.09.dfsg/src/phtools/fowl/qqstrt.F
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/qqstrt.F	1996-03-22 16:42:47.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/qqstrt.F	2005-11-28 19:49:52.412989577 +0000
@@ -38,6 +38,9 @@
       COMMON
      +/TAPES / NTPIN     ,NTPOUT   ,NTPNCH   ,NTPBIN   ,KONSOL
       IF(JEVT.LE.0) RETURN
+#if 0
+C     Comment this section out; "which" is obsolete
+C     -- Kevin McCarty, for Debian, 26 April 2004
       CALL WHICH(ISIT,VAL)
       WRITE(6,700)JEVT,VAL
   700 FORMAT('0RANDOM NUMBER GENERATOR INITIATED TO',I12,
@@ -46,6 +49,7 @@
 C--     CDC   60-BIT WORD
 CDC                             )B10000000000000007171 .RO.  TVEJ( = POL
       GOTO 200
+#endif
   100 CONTINUE
 C         FOR -CDC JUST MAKE SURE IT IS ODD
       IGLOP = JEVT


--- NEW FILE 311-skip-duplicate-qnext.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 311-skip-duplicate-qnext.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't compile in redundant versions of qnext.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile	1998-03-05 08:17:18.000000000 -0500
+++ /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile	2005-06-09 14:28:05.755053006 -0400
@@ -1,5 +1,6 @@
+/* don't compile qnexte.F --Kevin*/
 SRCS_F= abend.F accessf.F exitf.F \ @@\
-	intrac.F jumpxn.F lnblnk.F locb.F locf.F qnexte.F unlinkf.F
+	intrac.F jumpxn.F lnblnk.F locb.F locf.F unlinkf.F
 
 #ifndef CERNLIB_OS9
 SRCS_F := $(SRCS_F) timed.F timel.F timex.F 
diff -urNad cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile
--- cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile	1996-03-06 05:47:15.000000000 -0500
+++ /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile	2005-06-09 14:28:05.755053006 -0400
@@ -1,6 +1,7 @@
+/* don't compile qnext.F --Kevin*/
 SRCS_F=	 izbcd.F izbcdt.F izbcdv.F izchav.F izhnum.F lzbyt.F \ @@\
 	lzfind.F lzfval.F lzlast.F lzlong.F nzbank.F nzfind.F nzlong.F \ @@\
-	qnext.F zhtoi.F zitoh.F zkrak.F zkrakn.F znumid.F zpress.F \ @@\
+	zhtoi.F zitoh.F zkrak.F zkrakn.F znumid.F zpress.F \ @@\
 	zshunt.F zsort.F zsorth.F zsorti.F zsorv.F zsorvh.F zsorvi.F \ @@\
 	ztopsy.F
 


--- NEW FILE 312-skip-duplicate-gamma.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 312-skip-duplicate-gamma.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't compile in redundant gamma function in isajet; use the mathlib one

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile /tmp/dpep.IX54UM/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2005-06-09 14:29:18.976494518 -0400
+++ /tmp/dpep.IX54UM/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2005-06-09 14:30:21.913126207 -0400
@@ -1,12 +1,13 @@
 DoIncludePackage(isajet)
 #include "pilot.h"
 
+/* gamma.F removed; use the one defined in mathlib/gen/c/gamma.F */
 SRCS_F= \ @@\
 	 amass.F charge.F cteq5l.F ctxc2i.F ctxi2c.F ctxin.F ctxout.F \ @@\
 	 dblpcm.F dblvec.F dboost.F decay.F decjet.F \ @@\
 	 domssm.F drllyn.F eebeg.F eemax.F elctrn.F epf.F evol01.F evol02.F \ @@\
 	 evol03.F evol05.F evol06.F evol07.F evolms.F evolve.F flavor.F \ @@\
-	 fortop.F frgjet.F frgmnt.F gamma.F getpt.F gettot.F heavyx.F \ @@\
+	 fortop.F frgjet.F frgmnt.F         getpt.F gettot.F heavyx.F \ @@\
 	 hevolv.F higgs.F idanti.F idgen.F iframs.F inisap.F ipartns.F \ @@\
 	 ipjset.F iprtns.F irmov0.F isabeg.F isaend.F isaevt.F isaini.F \ @@\
 	 isajet.F isasrt.F ispjet.F istrad.F iswdky.F jetgen.F \ @@\


--- NEW FILE 313-comis-preserves-filename-case.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 313-comis-preserves-filename-case.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Have COMIS preserve filename case when interpreting FORTRAN code.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2003-02-13 09:25:23.000000000 -0500
+++ /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2005-06-09 15:24:32.751560586 -0400
@@ -200,6 +200,14 @@
   ku_exel( "/KUIP/SET_SHOW/COLUMNS -1" );
   ku_exel( "/KUIP/SET_SHOW/DOLLAR 'ON'" );
 
+#if defined(UNIX) && (defined(WINNT) || !defined(MSDOS))
+/* Correct the default behavior of converting filenames to lower-case
+ * on a case-sensitive operating system... Not that I'm bitter or anything.
+ * --Kevin McCarty, for Debian
+ */
+  ku_exel( "/KUIP/SET_SHOW/FILECASE 'KEEP'" );
+#endif
+
   host_editor = getenv( "KUIPEDITOR" );
   if( host_editor == NULL )
     host_editor = getenv( "EDITOR" );
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	1997-09-25 10:02:25.000000000 -0400
+++ /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	2005-06-09 15:23:49.276738602 -0400
@@ -1064,11 +1064,12 @@
 .
 This command has only an effect on Unix systems to select whether filenames
 are kept as entered on the command line.
-The startup value is 'CONVERT', i.e. filenames are converted to lowercase.
+The startup value is 'KEEP', i.e. filename cases are preserved.  With
+the 'CONVERT' setting, filenames are converted to lowercase.
 .
 On other systems filenames are always converted to uppercase.
 .
-The 'RESTORE' option set the conversion mode to the value effective
+The 'RESTORE' option sets the conversion mode to the value effective
 before the last FILECASE KEEP/CONVERT command.
 E.g. the sequence
      FILECASE KEEP; EDIT Read.Me; FILECASE RESTORE
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F /tmp/dpep.GROFhd/cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F
--- cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F	1999-05-20 03:37:18.000000000 -0400
+++ /tmp/dpep.GROFhd/cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F	2005-06-09 15:23:49.276738602 -0400
@@ -140,7 +140,7 @@
       CHUTIT = ' '
 *
       IF (IPIAF.EQ.0) THEN
-         CALL KUOPEN(10,'PAW.METAFILE','UNKNOWN',ISTAT)
+         CALL KUOPEN(10,'paw.metafile','UNKNOWN',ISTAT)
 #if (defined(CERNLIB_IBM))&&(!defined(CERNLIB_IBMMVS))
          CALL HERMES(19)
          CALL VMCMS('FILEDEF 19 DISK GKSERROR OUTPUT A',IRET)


--- NEW FILE 314-permit-using-regcomp-for-re_comp.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 314-permit-using-regcomp-for-re_comp.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add a possibility to use regcomp() instead of re_comp() (selected at
## DP: compile time)

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c /tmp/dpep.OUDE1M/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c	1996-03-08 10:33:08.000000000 -0500
+++ /tmp/dpep.OUDE1M/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c	2005-06-09 15:49:30.689188356 -0400
@@ -18,6 +18,11 @@
 #include "kuip/mkutfu.h"
 #include "mkutda.h"
 
+#ifdef MATCH_REGCOMP
+#include 
+#include      /* for regex_t */
+#endif
+
 static char **ftype_list = NULL;
 static char **class_list = NULL;
 static char **stext_list = NULL;
@@ -92,8 +97,12 @@
     DIR            *dirp;
     struct dirent  *dp;
     char           *pattern;
+#ifdef MATCH_REGCOMP
+    regex_t        *re = (regex_t *)malloc( sizeof(regex_t) );
+#else
     char           *re;
 #endif
+#endif
     struct stat     filestatus;
 
     ndlist     = 0;
@@ -221,11 +230,15 @@
       }
     }
     pattern = mstrcat( pattern, "$" );
+#ifdef MATCH_REGCOMP
+    regcomp( re, pattern, REG_NEWLINE );
+#else
 #ifdef MATCH_RE_COMP
     re = re_comp( pattern );
 #else
     re = regcmp( pattern, NULL );
 #endif
+#endif
     free( pattern );
 
     /*
@@ -260,12 +273,16 @@
         }
         else if( (filestatus.st_mode & S_IFMT) == S_IFREG ) {
           /* regular file: match name against regexp */
+#ifdef MATCH_REGCOMP
+          int match = (regexec( re, dp->d_name, 0, NULL, 0 ) == 0);
+#else
 #ifdef MATCH_RE_COMP
           int match = re_exec( dp->d_name );
 #else
           int match = (regex( re, dp->d_name ) != NULL);
 #endif
-          if( match == 1 ) {
+#endif
+          if( match ) {
             filelist = (char**)realloc( (char*)filelist,
                                        (nflist+1) * sizeof(char*) );
             filelist[nflist] = strdup( dp->d_name );
@@ -276,6 +293,9 @@
       closedir( dirp );
     }
 
+#ifdef MATCH_REGCOMP
+    regfree( re );
+#endif
 #ifndef MATCH_RE_COMP
     free( re );
 #endif


--- NEW FILE 315-fixes-for-MacOSX.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 315-fixes-for-MacOSX.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch set (mostly due to Keisuke Fujii) to allow Cernlib to compile
## DP: and run on OS X.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/config/Imake.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules
--- cernlib-2005.05.09/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules	2005-06-09 15:52:06.472072084 -0400
@@ -2171,7 +2171,7 @@
 #define CppScriptTarget(dst,src,defs,deplist)				@@\
 dst::  src deplist							@@\
 	RemoveFile($@)							@@\
-	$(CPP) defs $@				@@\
+	$(CPP) defs src | CppSedMagic >$@				@@\
 	chmod a+x $@							@@\
 									@@\
 clean::									@@\
@@ -2203,7 +2203,7 @@
 #define CppFileTarget(dst,src,defs,deplist)				@@\
 dst::  src deplist							@@\
 	RemoveFile($@)							@@\
-	$(CPP) defs $@				@@\
+	$(CPP) defs src | CppSedMagic >$@				@@\
 									@@\
 clean::									@@\
 	RemoveFiles(dst)
diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf
--- cernlib-2005.05.09/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,170 @@
+XCOMM platform:  $SFO: MOSXS.cf,v 1.0 95/11/19 23:21:00 sl Exp $
+
+#define OSVendor          Apple Computer, Inc.
+#ifdef MacOSXArchitecture
+#define OSName            MacOSX
+#define OSMajorVersion    DefaultOSMajorVersion
+#define OSMinorVersion    DefaultOSMinorVersion
+#define OSTeenyVersion    0
+#endif
+
+#define ProjectRulesFile  
+#define ProjectTmplFile   
+
+#define InstKmemFlags -m 2755 -g kmem
+/* #define ConstructMFLAGS		NO */
+
+#define HasNdbm     YES
+#define SetTtyGroup YES
+#define HasBsearch  YES
+#ifdef MacOSXArchitecture
+#define HasPutenv               YES
+#define MathLibrary             /**/
+#define DBMLibrary              /**/
+#define TermcapLibrary          /**/
+#define HasBSD44Sockets         YES
+#define HAS_SNPRINTF            YES
+#endif
+
+#define NeedConstPrototypes     YES
+#define NeedVarargsPrototypes   YES
+#define NeedFunctionPrototypes  YES
+#define NeedWidePrototypes      NO
+
+#define GzipFontCompression     YES
+#define CompressAllFonts        YES
+
+#ifndef HasShm
+# define HasShm			YES
+#endif
+#ifndef BuildGlxExt
+# define BuildGlxExt 	  	YES
+# define GlxUseNSGL             YES
+#endif
+#define BuildServer             YES
+#define BuildXprint             NO
+#define BuildFonts              YES
+#define BuildDPMS               NO
+
+#define TenonServer             YES
+#define XprtServer              NO
+#define XVendorString "Tenon Intersystems Xtools"
+#define XVendorRelease 1000
+#ifndef UseRgbTxt
+#define UseRgbTxt               YES
+#endif
+
+#define BuildPexExt             NO
+
+#ifndef BuildGLXLibrary
+# define BuildGLXLibrary	YES
+#endif
+
+/* no direct graphics extension */
+#define	BuildXF86DGA	NO
+
+/* no extra tablets and weird input devices */
+#define BuildXInputExt	NO
+
+/* Build Xinerama (aka panoramiX) extension */
+#define BuildXinerama		YES
+
+/* no Display Power Management extension */
+#define	BuildDPMSExt	NO
+
+# define BuildXvExt     NO
+
+#ifndef OptimizationLevel
+# define OptimizationLevel -O
+#endif
+#define OptimizedCDebugFlags OptimizationLevel -fPIC -pipe
+#define ExtraLoadFlags -L/usr/X11R6/lib -L/sw/lib -L/usr/lib -lc
+
+#define BuildExamples YES
+
+#define StandardDefines -DCERNLIB_LINUX -DCERNLIB_PPC -DCERNLIB_MACOSX \
+			-Dunix=unix -D__powerpc__ -D__DARWIN__
+/* -DX_NOT_POSIX -DX_LOCALE */
+
+#define HasVoidSignalReturn YES
+
+#ifndef DependFlags
+#define DependFlags -I/usr/include/ansi -I/usr/include/bsd -I/sw/include
+#endif
+
+#define StandardIncludes -I/sw/include
+
+#define InstallCmd	install	/* unlink old */
+
+/* #define ArCmd libtool -a -o */
+#define ArCmd ar -r
+
+#ifndef RanlibCmd
+#define RanlibCmd	ranlib -c -s
+#endif
+
+/* see below for ServerDefines */
+
+#define PrimaryScreenResolution 95	/* for 17 inch screen */
+
+#define ServerCDebugFlags OptimizationLevel -fPIC -g -pipe
+
+#ifndef HasGcc
+#define HasGcc YES
+#endif
+
+#undef CcCmd
+#undef CplusplusCmd
+#ifdef MacOSXArchitecture
+#define CcCmd		cc -g -arch "ppc" -no-cpp-precomp
+#define CplusplusCmd    c++ -g -no-cpp-precomp
+#endif
+#ifndef CcCmd
+#define CcCmd cc -g
+#endif
+
+#define CppCmd        /usr/bin/cpp
+
+#include 
+#include 
+#undef XFree86Server
+/* #define GLX_DIRECT_RENDERING */
+
+#define f2cFortran              YES
+#define FortranCmd              g77 -g
+#define XargsCmd                xargs
+#define FortranSaveFlags        /* */ /* Everything static !? */
+#define OptimisedFortranFlags	OptimizationLevel -fPIC -funroll-loops \
+				-fomit-frame-pointer
+#define DefaultCCOptions	OptimizationLevel
+#define DefaultFCOptions        -fno-automatic \
+				-fno-second-underscore \
+				-fno-f90 -fugly-complex -fno-globals \
+				-fugly-init -Wno-globals OptimizationLevel
+
+#ifndef CernlibLocalDefines
+# define CernlibLocalDefines
+#endif
+#define CernlibSystem           -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX \
+				-DCERNLIB_PPC -DCERNLIB_QMGLIBC \
+				-DCERNLIB_MACOSX CernlibLocalDefines
+
+#undef CERNLIB_SHIFT
+
+#define CERNLIB_LINUX
+#define CERNLIB_UNIX
+#define CERNLIB_LNX
+#define CERNLIB_PPC
+#define CERNLIB_QMGLIBC
+#define CERNLIB_MACOSX
+
+#define X11Includes             -I/usr/X11R6/include
+
+/*
+ *  Create a Make Variable to allow building with/out Motif
+ */
+#undef MotifDependantMakeVar
+#define MotifDependantMakeVar(variable,value) variable=value
+/* End  CERNLIB changes */
+
+
diff -urNad cernlib-2005.05.09/src/config/MacOSX.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules
--- cernlib-2005.05.09/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,123 @@
+XCOMM $XConsortium: MOSXS.rules,v 1.1 97/12/12 15:34:45 sl Exp $
+
+/*
+ * MacOSX shared library rules
+ */
+
+#define HasSharedLibraries YES
+
+#define ForceNormalLib NO
+
+#ifndef SharedDataSeparation
+#define SharedDataSeparation YES
+#endif
+#ifndef SharedCodeDef
+#define SharedCodeDef
+#endif
+#ifndef SharedLibraryDef
+#define SharedLibraryDef -fno-common
+#endif
+
+#define ShLibIncludeFile 
+
+#ifndef SharedLibraryLoadFlags
+#define SharedLibraryLoadFlags
+#endif
+#ifndef PositionIndependentCFlags
+#define PositionIndependentCFlags
+#endif
+
+
+/*
+ * InstallSharedLibrary - generate rules to install the shared library.
+ * Edited 2003-05-09 by Kevin McCarty to add an install.shlib target.
+ */
+#ifndef InstallSharedLibrary
+#define InstallSharedLibrary(libname,rev,dest)				@@\
+.PHONY: install.shlib shlib/libname					@@\
+shlib/libname:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+install.shlib:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+$(DESTDIR)dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\
+	MakeDir($(DESTDIR)dest)						@@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.rev.dylib) $(DESTDIR)dest @@\
+	(T=`echo Concat($(DESTDIR)dest/lib,libname.rev.dylib) | sed 's/\.[^\.d]*\.dylib/\.dylib/'`;\ @@\
+		$(RM) $$T && $(LN) Concat(lib,libname.rev.dylib) $$T)	@@\
+	$(RM) Concat($(DESTDIR)dest/lib,libname.dylib)			@@\
+	$(LN) Concat(lib,libname.rev.dylib) Concat($(DESTDIR)dest/lib,libname.dylib)
+#endif /* InstallSharedLibrary */
+
+/*
+ * NormalSharedLibraryTarget - generate rules to create a shared library;
+ * build it into a different name so that the we do not hose people by having
+ * the library gone for long periods.
+ */
+#ifndef SharedLibraryTarget
+#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
+AllTarget(Concat(lib,libname.dylib))					@@\
+									@@\
+Concat(lib,libname.dylib):  solist $(EXTRALIBRARYDEPS)			@@\
+	$(RM) $@~							@@\
+	(cd down; $(CC) -I/usr/X11R6/lib -dynamiclib -undefined suppress -install_name /usr/X11R6/lib/$@ -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.dylib)
+
+#endif /* SharedLibraryTarget */
+
+/*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepLibraryTarget
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.dylib))					@@\
+									@@\
+Concat(lib,libname.dylib):  deplist $(EXTRALIBRARYDEPS)		@@\
+	$(RM) $@~							@@\
+	(cd down; $(CC) -I/usr/X11R6/lib -dynamiclib -undefined suppress -install_name /usr/X11R6/lib/$@ -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
+	$(RM) $@							@@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.dylib)
+
+#endif /* SharedDepLibraryTarget */
+
+/*
+ * SharedLibraryDataTarget - generate rules to create shlib data file;
+ */
+#ifndef SharedLibraryDataTarget
+#define SharedLibraryDataTarget(libname,rev,salist)
+#endif /* SharedLibraryDataTarget */
+
+#ifndef InstallSharedLibraryData
+#define InstallSharedLibraryData(libname,rev,dest)
+#endif /* InstallSharedLibraryData */
+
+/*
+ * SharedLibReferences - variables for shared libraries
+ */
+#ifndef SharedLibReferences
+#define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
+revname = rev								@@\
+Concat3(DEP,varname,LIB) = SharedLibDependencies(libname,libsource,revname) @@\
+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
+LintLibReferences(varname,libname,libsource)
+#endif
+
+/*
+ * SharedDSLibReferences - variables for shared libraries
+ */
+#ifndef SharedDSLibReferences
+#define SharedDSLibReferences(varname,libname,libsource,revname,rev)	@@\
+revname = rev								@@\
+Concat3(DEP,varname,LIB) = SharedDSLibDependencies(libname,libsource,revname) @@\
+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) Concat3(Shared,libname,Reqs)		@@\
+LintLibReferences(varname,libname,libsource)
+#endif
+
+
diff -urNad cernlib-2005.05.09/src/config/MacOSX.tmpl /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl
--- cernlib-2005.05.09/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,67 @@
+XCOMM $XConsortium: MOSXS.tmpl,v 1.2 97/12/12 19:07:12 sl Exp $
+
+/*
+ * Xnext shared library template
+ */
+
+
+
+#ifndef SharedXtReqs
+#define SharedXtReqs /**/
+#endif
+#ifndef SharedXawReqs
+#define SharedXawReqs /**/
+#endif
+#ifndef SharedXmuReqs
+#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB)
+#endif
+
+#define SharedLibX11 YES
+#define SharedX11Rev F
+SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev)
+
+#define SharedLibXau NO		/* don't need shared form */
+#define SharedLibXdmcp NO	/* don't need shared form */
+
+#define SharedLibXmu YES
+#define SharedXmuRev F
+
+#define SharedOldXRev F
+
+#define SharedLibXext YES
+#define SharedXextRev F
+
+#define SharedLibXt YES
+#define SharedXtRev F
+SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev)
+
+#define SharedXawRev F
+
+#define SharedXtfRev A
+
+#define SharedLibXi YES
+#define SharedXiRev F
+SharedLibReferences(XI,Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev)
+
+#define SharedLibXtst YES
+#define SharedXtstRev F
+SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev)
+
+
+#define SharedPexRev F
+SharedLibReferences(PEX,PEX5,$(PEXLIBSRC),SOPEXREV,SharedPexRev)
+
+#define SharedLibXie YES
+#define SharedXieRev F
+
+#define SharedLibICE YES
+#define SharedICERev F
+SharedLibReferences(ICE,ICE,$(ICESRC),SOICEREV,SharedICERev)
+
+#define SharedLibSM YES
+#define SharedSMRev F
+SharedLibReferences(SM,SM,$(SMSRC),SOSMREV,SharedSMRev)
+
+#define SharedFSRev F
+SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
+
diff -urNad cernlib-2005.05.09/src/config/site.def /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def
--- cernlib-2005.05.09/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def	2005-06-09 15:52:06.472072084 -0400
@@ -99,9 +99,7 @@
 /*   if it is already defined and false, undef it! */
 /* do not use shift by default
 #if defined(CERNLIB_UNIX) && !defined(CERNLIB_WINNT)
-#if ! defined(CERNLIB_SHIFT)
-#define CERNLIB_SHIFT
-#elif  ! CERNLIB_SHIFT
+#if defined(CERNLIB_SHIFT) && !CERNLIB_SHIFT
 #undef CERNLIB_SHIFT
 #endif
 #endif
diff -urNad cernlib-2005.05.09/src/geant321/gxint/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile
--- cernlib-2005.05.09/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile	2005-06-09 15:52:06.472072084 -0400
@@ -30,7 +30,7 @@
 
 gxint321.f:  gxint.F
 	RemoveFile($@)
-	$(CPP) $(FORTRANALLDEFMDEPEND) < $^ | sed -e '/^$$/d' | CppSedMagic >$@
+	FortranCmd -E $(FORTRANALLDEFMDEPEND) $^ | sed -e '/^$$/d' | CppSedMagic >$@
 
 install.lib:: $(CERN_LIBDIR)/gxint.f
 
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile	2005-06-09 15:52:06.471072296 -0400
@@ -7,8 +7,12 @@
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
 #ifdef CERNLIB_UNIX
+#ifdef CERNLIB_MACOSX
+SUBDIRS:= $(SUBDIRS) scripts
+#else
 SUBDIRS:= $(SUBDIRS) scripts mgr
 #endif
+#endif
 
 InstallLibSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F
--- cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	2005-06-09 15:52:06.483069745 -0400
@@ -92,7 +92,11 @@
 #endif
       ENDIF
       WRITE(Z,'(2D26.16)') H,T
+#if defined(CERNLIB_MACOSX)
+      READ(Z,'(2(4X,D22.16))') H1,T1
+#else
       READ(Z,'(2(D22.16,4X))') H1,T1
+#endif
        IF(IDS .EQ. 1) THEN
       ERRMAX=MAX(ERRMAX,ABS(H1-T1))
       LTEST= LTEST .AND. ERRMAX .LE.  TSTERR
diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F
--- cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	2005-06-09 15:52:06.483069745 -0400
@@ -70,7 +70,11 @@
 #endif
       END IF
       WRITE(Z,'(2D26.16)') R,T
+#if defined(CERNLIB_MACOSX)
+      READ(Z,'(2(4X,D22.16))') R1,T1
+#else
       READ(Z,'(2(D22.16,4X))') R1,T1
+#endif
       ERMAX= MAX(ERMAX,ABS(R1-T1))
       IF(IDS .EQ. 3 .OR. IDS .EQ. 4) THEN
        WRITE(LOUT,'(1X,F10.3,2F25.16,1P,D10.1)') SX,R,T,ABS(R1-T1)
diff -urNad cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile
--- cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
@@ -1,11 +1,11 @@
 
 .SUFFIXES:
 
-CopyFile(cojets.cpp,cojets.cin)
+CopyFile(cojets.cpp,cojets.s)
 CopyFile(decay.cpp,decay.cin)
 CopyFile(table.cpp,table.cin)
 
-CppFileTarget(cojets.dat,cojets.cin,NullParameter,table.cin decay.cin)
+CppFileTarget(cojets.dat,cojets.s,-E -traditional,table.cin decay.cin)
 
 PackageDirFileTarget(cojets.dat)
 
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
@@ -1,9 +1,9 @@
 
 .SUFFIXES:
 
-CopyFile(decay.cpp,decay.cin)
+CopyFile(decay.cpp,decay.s)
 
-CppFileTarget(isajet.dat,decay.cin,NullParameter,NullParameter)
+CppFileTarget(isajet.dat,decay.s,-E -traditional ,NullParameter)
 
 PackageDirFileTarget(isajet.dat)
 
diff -urNad cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c
--- cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2005-06-09 15:52:06.483069745 -0400
@@ -80,7 +80,7 @@
 static int pid;                 /* process identifier                   */
 static int logfd ;              /* logging file descriptor              */
 #if !defined(SOLARIS) && !defined(linux) && !defined(_AIX) \
-  && !defined(IRIX5) && !defined(apollo)
+  && !defined(IRIX5) && !defined(apollo) && !defined(__DARWIN__)
 extern int syslog();
 #endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX */
 extern char *getenv();
diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
--- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:51:53.621804393 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:52:06.485069320 -0400
@@ -2569,7 +2569,7 @@
 #if !defined(IBM) && !defined(_WIN32)
 /* I provide "getpass" myself as standard version truncates to 8 characters */
 #include 
-#ifdef CBREAK
+#if defined(CBREAK) || defined(CERNLIB_MACOSX)
 #define BSDTTY         /* First find out if BSD or SYSV terminal handling.. */
 #endif
  
@@ -2577,6 +2577,10 @@
 #include 
 #else
 #include 
+# if defined(CERNLIB_MACOSX)
+# define gtty(x,y) ioctl(x,TIOCGETP,y)
+# define stty(x,y) ioctl(x,TIOCSETP,y)
+# endif
 #endif
  
 /* Fails with gcc 3.4.3
@@ -3540,3 +3544,20 @@
  
 }
 #endif
+
+#if defined(CERNLIB_MACOSX)
+  /* need to define cuserid() for OS X */
+
+char * getlogin();
+
+char *
+cuserid(char *string)
+{
+  static char cuserid_str[L_cuserid];
+  char *result = (string ? string : cuserid_str);
+  
+  strncpy(result, getlogin(), L_cuserid - 1);
+  result[L_cuserid - 1] = '\0';
+  return result;
+}
+#endif /* CERNLIB_MACOSX */
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c
--- cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	2005-06-09 15:52:06.485069320 -0400
@@ -200,7 +200,7 @@
 || defined(_IBMR2) \
 || defined(__convexc__) \
 || defined(_OSK) \
-|| defined(__linux) || defined(__FreeBSD__)
+|| defined(__linux) || defined(__FreeBSD__) || defined(__DARWIN__)
 
   void systems_( command, buf, buflen, l, chars, rc, ovflw )
 
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
@@ -4,6 +4,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
@@ -10,6 +10,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -11,6 +11,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -6,6 +6,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -7,6 +7,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 	 
 
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -7,6 +7,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h
--- cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	2005-06-09 15:52:06.487068895 -0400
@@ -188,6 +188,17 @@
 #endif
 
 
+#ifdef CERNLIB_MACOSX
+#  define MACOSX
+#  define MACHINE_NAME "MACOSX"
+#  define UNIX
+#  define HAVE_MEMMOVE
+#  define HAVE_STRCASECMP
+#  define HAVE_SELECT
+#  define MATCH_REGCOMP         /* use regcomp/regexec */
+#endif
+
+
 #ifdef MSDOS
 #  define MACHINE_NAME "IBMPC"
 #  define OS_NAME "MSDOS"
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
@@ -26,7 +26,12 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+c     thanks to Keisuke Fujii for this patch for OS X
+#if defined(CERNLIB_MACOSX)
+          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
+#endif
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
@@ -35,7 +40,11 @@
           ENDIF
         ENDIF
       ELSE
+#if defined(CERNLIB_MACOSX)
+        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
+#endif
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
--- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:51:53.524825013 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:57:50.699841388 -0400
@@ -82,11 +82,19 @@
       IF(FEXT.EQ.'.c')THEN
         L=LENOCC(CHCC)
 *                                 'cc -c .... -fPIC name.c'
+#if defined(CERNLIB_MACOSX)
+        CHLINE=CHCC(:L)//' -fPIC -fno-common '//NAME(:LN)// '.c'
+#else
         CHLINE=CHCC(:L)//' -fPIC '//NAME(:LN)// '.c'
+#endif
       ELSE
         L=LENOCC(CHF77)
 *                                 'f77 -c .... -fPIC name.f'
+#if defined(CERNLIB_MACOSX)
+        CHLINE=CHF77(:L)//' -fPIC -fno-common '//NAME(:LN)// '.f'
+#else
         CHLINE=CHF77(:L)//' -fPIC '//NAME(:LN)// '.f'
+#endif
       ENDIF
       L=LENOCC(CHLINE)
       WRITE(LUNOUT,'(A)')CHLINE(:L)
@@ -176,8 +184,15 @@
       ENDIF
 #endif
 #if defined(CERNLIB_LINUX)
+# if defined(CERNLIB_MACOSX)
+      CHLINE= 'g77 -bundle -bind_at_load -bundle_loader '
+     +        '`/usr/bin/which pawX11` -o '
+     +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
+C     thanks to Keisuke Fujii for the above compiler command      
+# else
       CHLINE=                   'g77 -shared -o '
      +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
+# endif
 #endif
 #if defined(CERNLIB_ALPHA_OSF)
         CHLINE=                   'ld -shared -o '
diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -9,7 +9,7 @@
 EXTRA_LDOPTIONS=-Wl,-E
 #endif
 
-#if defined(CERNLIB_LINUX)
+#if defined(CERNLIB_LINUX) && !defined(CERNLIB_MACOSX)
 EXTRA_LDOPTIONS=-Wl,-E
 #endif
 


--- NEW FILE 318-additional-gcc-3.4-fixes.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 318-additional-gcc-3.4-fixes.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Additional fixes for gcc 3.4, courtesy of Andreas Jochens.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
--- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-14 12:31:12.078969103 -0400
+++ /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-14 12:33:16.618251997 -0400
@@ -2405,6 +2405,7 @@
  */
 
 static  FILE *cfile;
+static  rnetrc(), token();
  
 ruserpass(host, aname, apass)
         char *host, **aname, **apass;
@@ -2592,6 +2593,8 @@
 /*** NOTE MAXPASSWD IS DEFINED AS 8 IN ALL STANDARD UNIX SYSTEMS, BUT THIS
  *** GIVES US PROBLEMS INTERWORKING WITH VMS AND CRAY-SECURID SYSTEMS. ***/
 #define MAXPASSWD     20       /* max significant characters in password */
+
+static void (*sig)(), catch();
  
 char *
 getpass(prompt)
@@ -2608,7 +2611,6 @@
         register int c;
         FILE    *fi;
         static char pbuf[ MAXPASSWD + 1 ];
-        void    (*sig)(), catch();
  
         if((fi = fopen("/dev/tty", "r")) == NULL)
                 return((char*)NULL);
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c	1996-03-08 10:33:10.000000000 -0500
+++ /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c	2005-06-14 12:33:43.511482468 -0400
@@ -31,7 +31,7 @@
 /* _Xm routine definitions  */
 void    _XmHighlightBorder ();
 void   _XmUnhighlightBorder ();
-void   _XmDrawShadow ();
+/* void   _XmDrawShadow (); */
 
 /* Motif1.1 ( except apollo, hpux has _XmPrimitive... with two args only
  * Gunter 30-jan-95


--- NEW FILE 701-patch-hbook-comis-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 701-patch-hbook-comis-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix up makefiles after moving hkfill.F and hkf1q.F in the other
## DP: 701 dpatch (a shell script).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/hbook/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile
--- cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	2005-06-10 17:04:08.866020136 -0400
@@ -19,8 +19,8 @@
 	hgn.F hgnf.F hgnpar.F hgstat.F hhipar.F hhxye.F hi.F \ @@\
 	hictoi.F hid1.F hid2.F hidall.F hidopt.F hidpos.F hie.F  \ @@\
 	hif.F hij.F hije.F hijxy.F hindex.F hinprx.F hinteg.F  \ @@\
-	hipak1.F histdo.F histgo.F hix.F hkf1.F hkf1q.F hkf2.F  \ @@\
-	hkff1.F hkff2.F hkffi1.F hkfi1.F hkfil2.F hkfill.F hkfilpf.F \ @@\
+	hipak1.F histdo.F histgo.F hix.F hkf1.F         hkf2.F  \ @@\
+	hkff1.F hkff2.F hkffi1.F hkfi1.F hkfil2.F          hkfilpf.F \ @@\
 	hkind.F hknul1.F hknuli.F hlabel.F hlabeq.F hlabnb.F \ @@\
 	hlattr.F hlccmp.F hldir.F hldir1.F hldir2.F hldirt.F \ @@\
 	hlgnxt.F hlhcmp.F hlimit.F hllsq.F hlnext.F hlocat.F \ @@\
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:02:24.843306185 -0400
+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:05:09.955931988 -0400
@@ -37,7 +37,8 @@
 	csspar.F cssubr.F cssvpt.F cstadv.F cstarr.F csterr.F cstext.F \ @@\
 	cstfrf.F cstinf.F cstlgb.F cstlog.F cstpar.F cstran.F cstrer.F \ @@\
 	cstypar.F cstype.F csubad.F csunam.F csundf.F csxpar.F \ @@\
-	mcline.F mcsident.F
+	mcline.F mcsident.F \ @@\
+	hkfill.F hkf1q.F /* moved here from src/packlib/hbook/code */
 
 #if defined(CERNLIB_PAW)
 SRCS_F := $(SRCS_F) cspawi.F cskuix.F cktoiv.F cspawv.F csmkvd.F \ @@\


--- NEW FILE 702-patch-Imakefiles-for-packlib-mathlib.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 702-patch-Imakefiles-for-packlib-mathlib.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Hacks to Imakefiles to go along with the 702 shellscript for moving
## DP: files around.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-10 22:19:15.720962444 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-10 22:24:26.783925145 -0400
@@ -1,6 +1,8 @@
 DoIncludePackage(gen)
 #include "pilot.h"
 
+/* rgmlt*.F have been moved into packlib/hbook to remove circular dependencies.
+   --Kevin McCarty, for Debian. */
 SRCS_F=	arithm.F c128.F c256.F c512.F c64.F cauchy64.F cft.F cfstft.F \ @@\
 	rfstft.F cgauss.F d107d1.F d107r1.F d501l1.F d501l2.F d501n1.F \ @@\
         d501n2.F d501p1.F d501p2.F d501sf.F d700su.F d701bd.F \ @@\
@@ -10,14 +12,14 @@
         epditr.F epdje.F epdloc.F epdsrt.F epdtab.F errorf.F esolve.F \ @@\
 	fcn1.F fftrc.F fumili.F gauss.F i128.F i32.F i64.F linsq.F \ @@\
 	mconv.F mft.F minfc.F minsq.F monito.F newro.F old506.F radapt.F \ @@\
-	radmul.F rca.F rfrdh164.F rfrdh264.F rft.F rgmlt64.F rgquad.F \ @@\
+	radmul.F rca.F rfrdh164.F rfrdh264.F rft.F           rgquad.F \ @@\
 	rgs56p.F rgset.F riwiad.F riwibd.F rknys64.F rknysd.F rkstp.F \ @@\
 	rpa.F rps.F rrkstp.F rsa.F rtriint.F s128.F s256.F s512.F \ @@\
 	s64.F scal.F sgz.F simps.F synt.F traper.F triint.F vd01a.F
 
 #if defined(CERNLIB_DOUBLE)
 SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
-	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F rgmlt.F rkstp64.F \ @@\
+	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F         rkstp64.F \ @@\
 	simps64.F triint64.F 
 #if defined(CERNLIB_LINUX)
 /* -O3 optimization breaks in g77 3.2 */
@@ -26,7 +28,7 @@
 #endif
 #else
 SRCS_F:= $(SRCS_F) cgauss128.F cauchy.F cauchy128.F deqbs128.F deqmr128.F \ @@\
-	deriv128.F minfc128.F rfrdh128.F rgmlt128.F rkstp128.F simps128.F \ @@\
+	deriv128.F minfc128.F rfrdh128.F            rkstp128.F simps128.F \ @@\
 	triint128.F 
 #endif
 
diff -urNad cernlib-2005.05.09/src/mathlib/gen/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/Imakefile	1996-10-02 12:09:45.000000000 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/Imakefile	2005-06-10 22:20:55.683416711 -0400
@@ -8,7 +8,8 @@
 IMAKE_DEFINES=-DFortranDoesCpp=NO
 #endif
 
-LIBDIRS= a b c d divon e f g h j m n s u v x
+/* "n" subdir moved to packlib/hbook/  --Kevin McCarty, for Debian */
+LIBDIRS= a b c d divon e f g h j m   s u v x
 
 SUBDIRS= $(LIBDIRS) gen tests
 
diff -urNad cernlib-2005.05.09/src/mathlib/hbook/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/hbook/Imakefile
--- cernlib-2005.05.09/src/mathlib/hbook/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/hbook/Imakefile	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,12 @@
+/* this Imakefile used to get hdiff to compile within the mathlib tree */
+
+#define IHaveSubdirs
+#define PassCDebugFlags
+
+LIBDIRS= hdiff
+SUBDIRS= $(LIBDIRS) hbook
+
+TopOfPackage(hbook)
+SubdirLibraryTarget(hbook,$(LIBDIRS))
+DoIncludePackage(hbook)
+InstallIncludeSubdirs(hbook)
diff -urNad cernlib-2005.05.09/src/mathlib/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/Imakefile
--- cernlib-2005.05.09/src/mathlib/Imakefile	2005-06-10 22:19:15.834937877 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/Imakefile	2005-06-10 22:20:05.279280394 -0400
@@ -3,7 +3,7 @@
 #define PassCDebugFlags 
 
 
-LIBDIRS= gen bvsl
+LIBDIRS= gen bvsl hbook /* hdiff stuff moved from packlib */
 
 /* Lapack is independent of Cernlib and should be installed as one of
    the build dependencies.
diff -urNad cernlib-2005.05.09/src/packlib/hbook/d/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/d/Imakefile
--- cernlib-2005.05.09/src/packlib/hbook/d/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/d/Imakefile	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,25 @@
+/* this Imakefile is used to get some things from mathlib/gen/d to compile
+   within the packlib/hbook tree */
+
+DoIncludePackage(gen)
+#include "pilot.h"
+
+SRCS_F=	rgmlt64.F
+
+#if defined(CERNLIB_DOUBLE)
+SRCS_F:= $(SRCS_F) rgmlt.F
+#else
+SRCS_F:= $(SRCS_F) rgmlt128.F
+#endif
+
+#ifdef CERNLIB_HPUX
+FORTRANOPTIONS += -WF,-P
+#endif
+
+#if defined(CERNLIB_SGI)
+IMAKE_DEFINES=-DFortranDoesCpp=NO
+#endif
+
+FORTRANSAVEOPTION = FortranSaveFlags
+
+SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/hbook/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/Imakefile
--- cernlib-2005.05.09/src/packlib/hbook/Imakefile	1997-04-28 04:21:23.000000000 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/Imakefile	2005-06-10 22:26:27.063010420 -0400
@@ -2,7 +2,9 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-LIBDIRS= hdiff hmerge hquad chbook fpclassc \ @@\
+/* hdiff moved to mathlib to avoid circular DLL dependencies; "d" and "n"
+   moved here from mathlib for the same reasons */
+LIBDIRS= d n   hmerge hquad chbook fpclassc \ @@\
 	 hrz code hmcstat hntup
 
 #ifdef CERNLIB_VAX


--- NEW FILE 703-patch-code_motif-packlib-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 703-patch-code_motif-packlib-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix up Imakefiles, etc. so that code_motif becomes a separate library
## DP: after moving it around in the patch 703 shell script.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/code_motif/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/code_motif/Imakefile
--- cernlib-2005.05.09/src/code_motif/Imakefile	1996-12-10 10:20:59.000000000 -0500
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/code_motif/Imakefile	2005-06-12 10:31:56.480928814 -0400
@@ -10,8 +10,10 @@
 	kuxxt.c mkdcmp.c mkdgra.c mkdpan.c mkmpan.c mkuip.c
 
 MotifDependantMakeVar(SRCS_C,$(MOTIF_SRCS_C))
-	
+
+/* Commented out since kmutil.c has been moved to packlib/kuip/code_kuip
 SRCS_C:= $(SRCS_C) kmutil.c
+*/
 
 #if defined(CERNLIB_VAXVMS)
 
@@ -22,4 +24,10 @@
  
 PACKAGE_INCLUDES := $(PACKAGE_INCLUDES) MotifIncludes X11Includes
 
-SubdirLibraryTarget(NullParameter,NullParameter)
+/* Top of package boilerplate to split this out as a separate library */
+
+TopOfPackage(packlib-lesstif)
+
+SubdirLibraryTarget(packlib-lesstif,NullParameter) 
+
+InstallLibrary(packlib-lesstif,$(CERN_LIBDIR))
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	2005-06-12 10:31:54.221414133 -0400
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/Imakefile	2005-06-12 10:32:20.947673659 -0400
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= kernlib packlib pawlib graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib code_motif pawlib graflib mathlib geant321 mclibs phtools
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	1999-11-24 04:52:07.000000000 -0500
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	2005-06-12 10:31:56.480928814 -0400
@@ -3,7 +3,9 @@
 SRCS_C=	getline.c kalias.c kbrow.c kedit.c kexec.c khash.c kicon.c \ @@\
 	kienbr.c kipiaf.c kkern.c kmacro.c kmath.c kmenu.c kmisc.c \ @@\
 	kmodel.c kmterm.c kuinit.c kutrue.c kuvers.c kuwhag.c	   \ @@\
-	kuwhat.c kvect.c
+	kuwhat.c kvect.c \ @@\
+	kmutil.c
+	/* ^^ moved here from code_motif.  --Kevin McCarty */
 
 #ifdef CERNLIB_WINNT
 SRCS_C :=$(SRCS_C) kmutil0.c
diff -urNad cernlib-2005.05.09/src/packlib/kuip/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/Imakefile	1997-11-28 12:26:56.000000000 -0500
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/Imakefile	2005-06-12 10:31:56.480928814 -0400
@@ -4,11 +4,14 @@
 
 LIBDIRS= code_kuip 
 
+/* Commented out so that code_motif gives a separate shared library
+ * --Kevin McCarty
 #ifndef CERNLIB_WINNT
 LIBDIRS := $(LIBDIRS) code_motif
 #else
 LIBDIRS := $(LIBDIRS) code_windows
 #endif
+*/
 
 SUBDIRS= $(LIBDIRS) programs examples kuip
 


--- NEW FILE 704-patch-code_kuip-higzcc-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 704-patch-code_kuip-higzcc-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch Imakefiles after moving kuwhag.c from packlib to grafX11.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile /tmp/dpep.IDWarm/cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile
--- cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile	1998-11-16 04:36:53.000000000 -0500
+++ /tmp/dpep.IDWarm/cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile	2005-06-13 09:45:37.637201936 -0400
@@ -1,7 +1,7 @@
 DoIncludePackage(higz)
 #include "pilot.h"
 
-SRCS_C=	igvers.c
+SRCS_C=	igvers.c kuwhag.c /* <-- moved here from packlib/kuip/code_kuip */
 
 #if defined(CERNLIB_FALCO) && !defined(CERNLIB_VAX)
 SRCS_C := $(SRCS_C) falint.c 
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile /tmp/dpep.IDWarm/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	2005-06-13 09:44:00.536042728 -0400
+++ /tmp/dpep.IDWarm/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	2005-06-13 09:44:41.448261682 -0400
@@ -2,7 +2,7 @@
 
 SRCS_C=	getline.c kalias.c kbrow.c kedit.c kexec.c khash.c kicon.c \ @@\
 	kienbr.c kipiaf.c kkern.c kmacro.c kmath.c kmenu.c kmisc.c \ @@\
-	kmodel.c kmterm.c kuinit.c kutrue.c kuvers.c kuwhag.c	   \ @@\
+	kmodel.c kmterm.c kuinit.c kutrue.c kuvers.c         	   \ @@\
 	kuwhat.c kvect.c \ @@\
 	kmutil.c
 	/* ^^ moved here from code_motif.  --Kevin McCarty */


--- NEW FILE 705-patch-paw_motif-paw-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 705-patch-paw_motif-paw-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	2005-06-13 16:04:27.418461884 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/Imakefile	2005-06-13 16:04:48.698899728 -0400
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= kernlib packlib code_motif pawlib graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile	1999-08-31 04:47:07.000000000 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile	2005-06-13 16:05:01.263206159 -0400
@@ -1,6 +1,6 @@
 #define IHaveCDF
 
-SRCS_CDF= pawcdf.cdf pamcdf.cdf mlpdef.cdf
+SRCS_CDF= pawcdf.cdf            mlpdef.cdf
 
 #ifdef CERNLIB_IBMRT
 /* Otherwise cc dies with internal compiler error on pawcdf. 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	2005-06-13 16:04:26.689618135 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	2005-06-13 16:04:33.962059051 -0400
@@ -11,8 +11,8 @@
 	pautit.F pavect.F paw.F pawbrk.F pawdef.F pawfca.F \ @@\
 	pawfitz.F pawfop.F pawfu1.F pawfu2.F \ @@\
 	pawfu3.F pawfud.F pawfun.F pawfuy.F pawild.F pawins.F pawint.F \ @@\
-	pawint1.F pawint2.F pawint3.F pawint4.F pawintm.F \ @@\
-	pawjoj.F pawloc.F pawork.F pawpp.F pawrit.F pawrop.F \ @@\
+	pawint1.F pawint2.F pawint3.F pawint4.F           \ @@\
+	pawjoj.F pawloc.F pawork.F         pawrit.F pawrop.F \ @@\
 	pawsim.F pawusr.F pawuwf.F paxcut.F pazdz.F pazfz.F pazrz.F \ @@\
 	pchain.F pchclo.F pchncd.F pchrop.F pcnext.F pfclos.F \ @@\
 	pfhigz.F pfindc.F pfindf.F pfindf1.F pfindv.F pfinit.F pflog.F \ @@\
diff -urNad cernlib-2005.05.09/src/pawlib/paw/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/Imakefile	2000-06-27 11:27:03.000000000 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/Imakefile	2005-06-13 16:04:33.962059051 -0400
@@ -9,6 +9,9 @@
 
 LIBDIRS= code cpaw cdf ntuple mlpfit
 
+/* Comment out this whole section; Motif code has been moved to
+   paw_motif at top level.  -- Kevin McCarty */
+#if 0
 #ifndef CERNLIB_WINNT
 LIBDIRS :=$(LIBDIRS) $(MOTIF_DIRS) $(PAWPP_DIRS)
 #endif
@@ -22,6 +25,7 @@
 MotifDependantMakeVar(PAWPP_DIRS,xbaevms)
 LIBDIRS := $(LIBDIRS) $(PAWPP_DIRS)
 #endif
+#endif
 
 SUBDIRS= $(LIBDIRS) programs piafs hbpiaf stagerd paw
 
diff -urNad cernlib-2005.05.09/src/paw_motif/cdf/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/cdf/Imakefile
--- cernlib-2005.05.09/src/paw_motif/cdf/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/cdf/Imakefile	2005-06-13 16:04:33.963058837 -0400
@@ -0,0 +1,5 @@
+#define IHaveCDF
+
+SRCS_CDF= pamcdf.cdf
+
+SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/paw_motif/code/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/code/Imakefile
--- cernlib-2005.05.09/src/paw_motif/code/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/code/Imakefile	2005-06-13 16:04:33.963058837 -0400
@@ -0,0 +1,7 @@
+SRCS_F=	pawintm.F pawpp.F
+
+DoIncludePackage(paw)
+#include "pilot.h"
+
+SubdirLibraryTarget(NullParameter,NullParameter)
+
diff -urNad cernlib-2005.05.09/src/paw_motif/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/Imakefile
--- cernlib-2005.05.09/src/paw_motif/Imakefile	2000-06-27 11:27:03.000000000 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/Imakefile	2005-06-13 16:04:33.963058837 -0400
@@ -7,7 +7,7 @@
 MotifDependantMakeVar(MOTIF_DIRS,cmotif fmotif fpanelsc)
 MotifDependantMakeVar(PAWPP_DIRS,fpanelsf tree uimx)
 
-LIBDIRS= code cpaw cdf ntuple mlpfit
+LIBDIRS= code cdf
 
 #ifndef CERNLIB_WINNT
 LIBDIRS :=$(LIBDIRS) $(MOTIF_DIRS) $(PAWPP_DIRS)
@@ -23,19 +23,11 @@
 LIBDIRS := $(LIBDIRS) $(PAWPP_DIRS)
 #endif
 
-SUBDIRS= $(LIBDIRS) programs piafs hbpiaf stagerd paw
-
-#if defined CERNLIB_WINNT
-SUBDIRS := $(LIBDIRS) programs
-#endif
-
-TopOfPackage(paw)
-
-SubdirLibraryTarget(paw,$(LIBDIRS))
+SUBDIRS= $(LIBDIRS)
 
-InstallBinSubdirs(programs)
+TopOfPackage(pawlib-lesstif)
 
-TestSubdirs(test)
+SubdirLibraryTarget(pawlib-lesstif,$(LIBDIRS))
 
-InstallIncludeSubdirs(paw)
+InstallLibrary(pawlib-lesstif,$(CERN_LIBDIR))
 


--- NEW FILE 800-implement-shared-library-rules-in-Imake.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 800-implement-shared-library-rules-in-Imake.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Implement macros for shared libraries on Linux in the Imake cfg files.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2005-11-29 17:07:32.035570303 +0000
+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2005-11-29 17:07:40.003888782 +0000
@@ -904,6 +904,8 @@
  * InstallSharedLibrary - generate rules to install the indicated sharable 
  * Library
  */
+/* Commented out because this appears to be overriding the definition
+ * in lnxLib.rules --Kevin McCarty, 16 May 2002
 #undef InstallSharedLibrary
 #ifndef InstallSharedLibrary
 #define InstallSharedLibrary(libname,rev,dest)				@@\
@@ -917,7 +919,8 @@
 	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS)  $< $@		@@\
 	RemoveFile($<)							@@\
 	$(LN) $@ $<
-#endif /* InstallSharedLibrary */
+#endif InstallSharedLibrary
+*/
 
 /*
  * InstallLinkKitLibrary - rule to install Link Kit library.
@@ -1963,6 +1966,15 @@
 #endif /* InstallSubdirs */
 
 /*
+ * InstallSharedLibSubdirs - generate rules to recursively install shared
+ * libraries.  Added by Kevin McCarty for Debian, 15 May 2002
+ */
+#ifndef InstallSharedLibSubdirs
+#define InstallSharedLibSubdirs(dirs) \
+NamedTargetSubdirs(install.shlib,dirs,"installing",DESTDIR=$(DESTDIR),install.shlib)
+#endif /* InstallSharedLibSubdirs */
+
+/*
  * InstallBinSubdirs - generate rules to recursively install programs and
  *		       scripts
  */
@@ -2341,9 +2353,12 @@
  */
 #ifndef DefinePackageLibrary
 #define DefinePackageLibrary(locallib) \
+/* commented out since these will be .so files. -Kevin */		@@\
+/*									@@\
 ifeq ($(strip $(PACKAGE_LIB)),)						@@\
 PACKAGE_LIB=$(TOP)$(PACKAGETOP)/LibraryTargetName($(PACKAGE_NAME))	@@\
 endif									@@\
+*/									@@\
 ifneq (locallib,)							@@\
 override PACKAGE_LIB:= LibraryTargetName(locallib) $(PACKAGE_LIB)	@@\
 									@@\
diff -urNad cernlib-2005.05.09.dfsg~/src/config/biglib.rules cernlib-2005.05.09.dfsg/src/config/biglib.rules
--- cernlib-2005.05.09.dfsg~/src/config/biglib.rules	2000-04-19 10:51:01.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/config/biglib.rules	2005-11-29 17:09:29.336812562 +0000
@@ -227,7 +227,7 @@
 	RanLibrary($@)
 #endif
 
-#if defined(HPArchitecture)
+#if defined(HPArchitecture) && !defined(LinuxArchitecture)
 
 #ifndef SharedLibraryTargetName
 #define SharedLibraryTargetName(name)Concat(lib,name.sl)
@@ -264,7 +264,7 @@
 	@date
 #endif
 
-#elif defined(AlphaArchitecture)
+#elif defined(AlphaArchitecture) && !defined(LinuxArchitecture)
 
 #ifndef SharedLibraryTargetName
 #define SharedLibraryTargetName(name)Concat(lib,name.so)
@@ -281,6 +281,41 @@
 	@date
 #endif
 
+#elif defined(LinuxArchitecture) /* added by Kevin McCarty
+				    for Debian, 15 May 2002 */
+#ifndef SharedLibraryTargetName
+#define SharedLibraryTargetName(name)Concat(lib,name.so.$(LIB_SONAME).$(CERN_LEVEL))
+#endif
+
+#ifndef SharedLibraryBuild
+#define SharedLibraryBuild(libname,version)				@@\
+SharedLibraryTargetName(libname): version/objects.list			@@\
+	@echo rebuild version library $@ in $(CURRENT_DIR)		@@\
+	@$(RM) $@							@@\
+	@date								@@\
+	@$(FCLINK) -shared -Wl,-soname=Concat(lib,libname.so.$(LIB_SONAME))\ @@\
+		-o $@ `cat version/objects.list` `cernlib -v "" -dy libname\ @@\
+		| sed s/Concat(-l,libname)//g`				@@\
+	@date
+#endif
+
+#elif defined(DarwinArchitecture) /* added by Kevin McCarty
+				      for fink, 10 May 2003 */
+#ifndef SharedLibraryTargetName
+#define SharedLibraryTargetName(name)Concat(lib,name.$(LIB_SONAME).$(CERN_LEVEL).dylib)
+#endif
+
+#ifndef SharedLibraryBuild
+#define SharedLibraryBuild(libname,version)				@@\
+SharedLibraryTargetName(libname): version/objects.list			@@\
+	@echo rebuild version library $@ in $(CURRENT_DIR)		@@\
+	@$(RM) $@							@@\
+	@/usr/bin/libtool -dynamic -o $@ -compatibility_version $(LIB_SONAME) \ @@\
+		`cat version/objects.list` `cernlib -v "" -dy libname	\ @@\
+		| sed s/Concat(-l,libname)//g`				@@\
+	@date
+#endif
+
 #elif 1 
 #ifndef SharedLibraryBuild
 #define SharedLibraryBuild(libname,version)				@@\
diff -urNad cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules cernlib-2005.05.09.dfsg/src/config/lnxLib.rules
--- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules	1995-12-20 15:26:45.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules	2005-11-29 17:07:40.004888571 +0000
@@ -43,6 +43,9 @@
 #ifndef PositionIndependentCplusplusFlags
 #define PositionIndependentCplusplusFlags -fPIC
 #endif
+#ifndef PositionIndependentFortranFlags
+#define PositionIndependentFortranFlags -fPIC
+#endif
 
 /*
  * InstallSharedLibrary - generate rules to install the shared library.
@@ -50,13 +53,20 @@
  */
 #ifndef InstallSharedLibrary
 #define	InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.so.rev) 					@@\
+.PHONY: install.shlib shlib/libname					@@\
+shlib/libname:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+install.shlib:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+$(DESTDIR)dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\
 	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
 	(T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
 		$(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T)	@@\
 	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
-	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
+	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so) @@\
+	$(RM) $<                                                        @@\
+	$(LN) $@ $<
 #endif /* InstallSharedLibrary */
 
 /*


--- NEW FILE 801-non-optimized-rule-uses-fPIC-g.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 801-non-optimized-rule-uses-fPIC-g.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Ensure that special rules for creating non-optimized object files
## DP: use -fPIC for files that go into shared libs, and -g for all files.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/config/fortran.rules /tmp/dpep.gResDB/cernlib-2005.05.09/src/config/fortran.rules
--- cernlib-2005.05.09/src/config/fortran.rules	1997-05-30 12:25:18.000000000 -0400
+++ /tmp/dpep.gResDB/cernlib-2005.05.09/src/config/fortran.rules	2005-06-09 10:37:19.092244331 -0400
@@ -345,9 +345,9 @@
 
 #ifndef SpecialFortranLibObjectRule
 #define SpecialFortranLibObjectRule(baseobj,basedep,options,cppoptions)	@@\
-SpecialFortranArchiveObjectRule(baseobj,basedep,options,cppoptions)	@@\
-SpecialFortranSharedObjectRule(baseobj,basedep,options,cppoptions)	@@\
-SpecialFortranDebugObjectRule(baseobj,basedep,options,cppoptions)
+SpecialFortranArchiveObjectRule(baseobj,basedep,options -g,cppoptions)	    @@\
+SpecialFortranSharedObjectRule(baseobj,basedep,options -g -fPIC,cppoptions) @@\
+SpecialFortranDebugObjectRule(baseobj,basedep,options -g,cppoptions)
 #endif
 
 #ifndef SpecialFortranArchiveObjectRule
diff -urNad cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile /tmp/dpep.gResDB/cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile
--- cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile	1996-09-23 10:20:46.000000000 -0400
+++ /tmp/dpep.gResDB/cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile	2005-06-09 10:37:55.631538119 -0400
@@ -3,7 +3,7 @@
 	plotisto.F pmhist.F pminit.F show_chain.F
 
 #ifdef CERNLIB_LINUX
-FORTRANOPTIONS = -fno-backslash  $(FORTRANSAVEOPTION) -fno-second-underscore
+FORTRANOPTIONS = -g -fno-backslash  $(FORTRANSAVEOPTION) -fno-second-underscore
 #endif
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile /tmp/dpep.gResDB/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	1999-09-14 05:20:08.000000000 -0400
+++ /tmp/dpep.gResDB/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	2005-06-09 10:40:47.421285771 -0400
@@ -46,8 +46,8 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
-SpecialObjectRule(archive/qp_execute.o,qp_execute.c archive/qp_execute.d,-O0 -o $@)
-SpecialObjectRule(debug/qp_execute.o,qp_execute.c debug/qp_execute.d,-O0 -o $@)
-SpecialObjectRule(shared/qp_execute.o,qp_execute.c shared/qp_execute.d,-O0 -o $@)
+#if defined(CERNLIB_LINUX)
+SpecialObjectRule(archive/qp_execute.o,qp_execute.c archive/qp_execute.d,-O0 -g -o $@)
+SpecialObjectRule(debug/qp_execute.o,qp_execute.c debug/qp_execute.d,-O0 -g -o $@)
+SpecialObjectRule(shared/qp_execute.o,qp_execute.c shared/qp_execute.d,-O0 -g -fPIC -o $@)
 #endif


--- NEW FILE 802-create-shared-libraries.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 802-create-shared-libraries.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Actually implement the rules to create shared libraries.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile
--- cernlib-2005.05.09.dfsg~/src/Imakefile	2005-12-01 15:19:24.191267776 +0000
+++ cernlib-2005.05.09.dfsg/src/Imakefile	2005-12-01 15:20:10.310483251 +0000
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib mathlib graflib code_motif mclibs phtools pawlib paw_motif geant321
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
@@ -15,6 +15,7 @@
 #endif
 
 InstallLibSubdirs($(LIBDIRS))
+InstallSharedLibSubdirs($(LIBDIRS))
 
 INCLUDEDIRS= $(LIBDIRS) cfortran
 
diff -urNad cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile cernlib-2005.05.09.dfsg/src/code_motif/Imakefile
--- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile	2005-12-01 15:19:24.062295137 +0000
+++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -31,3 +31,4 @@
 SubdirLibraryTarget(packlib-lesstif,NullParameter) 
 
 InstallLibrary(packlib-lesstif,$(CERN_LIBDIR))
+InstallSharedLibrary(packlib-lesstif,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-12-01 15:19:23.018516575 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -26,6 +26,7 @@
 
 InstallLibrary(geant321,$(CERN_LIBDIR))
 InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
+InstallSharedLibrary(geant321,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 /* Fluka removed from Debian source package for copyright reasons. */
 /*
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile	1996-12-19 14:19:18.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -10,6 +10,7 @@
 SubdirLibraryTarget(geant321_parallel,NullParameter)
 
 InstallLibrary(geant321_parallel,$(CERN_LIBDIR))
+InstallSharedLibrary(geant321_parallel,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 CopyFile(../gbase/grun.F,grun.F)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/Imakefile cernlib-2005.05.09.dfsg/src/graflib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/graflib/Imakefile	2001-12-11 15:06:28.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -11,9 +11,12 @@
 
 SubdirLibraryTarget(graflib,$(LIBDIRS))
 
-InstallLibrary(graflib,$(CERN_LIBDIR))
-
 InstallLibSubdirs(higz)
+InstallSharedLibSubdirs(higz)
+
+/* these lines follow the above because graflib depends on grafX11 */
+InstallLibrary(graflib,$(CERN_LIBDIR))
+InstallSharedLibrary(graflib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(higz)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile
--- cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile	1997-09-02 13:34:47.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -13,6 +13,7 @@
 SubdirLibraryTarget(grafX11,$(LIBDIRS))
 
 InstallLibrary(grafX11,$(CERN_LIBDIR))
+InstallSharedLibrary(grafX11,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(examples)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile	2002-04-26 14:37:20.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -14,6 +14,7 @@
 
 InstallLibrary(kernlib,$(CERN_LIBDIR))
 InstallLibraryAlias(kernlib,kernlib-shift,$(CERN_LIBDIR))
+InstallSharedLibrary(kernlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 test::	LibraryTargetName(kernlib)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile	2005-12-01 15:19:24.005307227 +0000
+++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -19,6 +19,7 @@
 SubdirLibraryTarget(mathlib,$(LIBDIRS))
 
 InstallLibrary(mathlib,$(CERN_LIBDIR))
+InstallSharedLibrary(mathlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 InstallIncludeSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile	2005-12-01 15:19:22.512623901 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -13,6 +13,7 @@
 TestSubdirs($(LIBDIRS))
 
 InstallLibSubdirs($(LIBDIRS))
+InstallSharedLibSubdirs($(LIBDIRS))
 
 /* Again, purge Pythia, Jetset and dependents. */
 INCLUDEDIRS= cojets eurodec herwig isajet pdf
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile	1996-05-06 20:06:50.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
 SubdirLibraryTarget(cojets,$(LIBDIRS))
 
 InstallLibrary(cojets,$(CERN_LIBDIR))
+InstallSharedLibrary(cojets,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 SubdirDataFile($(LIBRARY),cojets.dat,data)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile	1996-05-06 20:06:55.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
 SubdirLibraryTarget(eurodec,$(LIBDIRS))
 
 InstallLibrary(eurodec,$(CERN_LIBDIR))
+InstallSharedLibrary(eurodec,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 SubdirDataFile($(LIBRARY),eurodec.dat,data)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile	1997-01-06 17:06:41.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -10,6 +10,7 @@
 
 InstallLibrary(herwig59,$(CERN_LIBDIR))
 InstallLibraryAlias(herwig59,herwig,$(CERN_LIBDIR))
+InstallSharedLibrary(herwig59,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(test)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile	2001-10-08 14:03:02.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
 SubdirLibraryTarget(isajet758,$(LIBDIRS))
 
 InstallLibrary(isajet758,$(CERN_LIBDIR))
+InstallSharedLibrary(isajet758,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 SubdirDataFile($(LIBRARY),isajet.dat,data)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile	2000-05-29 14:49:59.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -15,6 +15,7 @@
 SubdirLibraryTarget(pdflib804,spdf npdf)
 
 InstallLibrary(pdflib804,$(CERN_LIBDIR))
+InstallSharedLibrary(pdflib804,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(tpdf)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile	1999-03-26 10:52:23.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -15,6 +15,7 @@
 SubdirLibraryTarget(photos202,code)
 
 InstallLibrary(photos202,$(CERN_LIBDIR))
+InstallSharedLibrary(photos202,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(test)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/Imakefile cernlib-2005.05.09.dfsg/src/packlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile	2005-12-01 15:19:23.885332680 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -14,6 +14,7 @@
 
 InstallLibrary(packlib,$(CERN_LIBDIR))
 InstallLibraryAlias(packlib,packlib-shift,$(CERN_LIBDIR))
+InstallSharedLibrary(packlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile
--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile	2005-12-01 15:19:24.192267563 +0000
+++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -30,4 +30,5 @@
 SubdirLibraryTarget(pawlib-lesstif,$(LIBDIRS))
 
 InstallLibrary(pawlib-lesstif,$(CERN_LIBDIR))
+InstallSharedLibrary(pawlib-lesstif,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile	1996-10-01 14:12:23.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -11,6 +11,7 @@
 SubdirLibraryTarget(pawlib,$(LIBDIRS))
 
 InstallLibrary(pawlib,$(CERN_LIBDIR))
+InstallSharedLibrary(pawlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 InstallIncludeSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/Imakefile cernlib-2005.05.09.dfsg/src/phtools/Imakefile
--- cernlib-2005.05.09.dfsg~/src/phtools/Imakefile	1996-11-14 16:44:33.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile	2005-12-01 15:19:31.189783029 +0000
@@ -11,7 +11,7 @@
 SubdirLibraryTarget(phtools,$(LIBDIRS))
 
 InstallLibrary(phtools,$(CERN_LIBDIR))
-InstallSharedLibrary(phtools,$(CERN_LEVEL),$(CERN_SHLIBDIR))
+InstallSharedLibrary(phtools,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(wicoexam)
 


--- NEW FILE 803-link-binaries-dynamically.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 803-link-binaries-dynamically.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Link binaries dynamically against Cern libraries.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/config/fortran.rules /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules
--- cernlib-2005.05.09/src/config/fortran.rules	2005-06-13 15:26:19.991403858 -0400
+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules	2005-06-13 15:26:23.699609849 -0400
@@ -189,13 +189,13 @@
  */
 #ifndef CernlibDependLibrary
 #define CernlibDependLibrary(cernlibs)\
-$(filter-out +%,$(filter-out -%,$(shell cernlib cernlibs)))
+$(filter-out +%,$(filter-out -%,$(shell cernlib -dy cernlibs)))
 #endif
 
 /* Helper to use cernlib command
  */
 #ifndef CernlibCmd
-#define CernlibCmd(libraries)cernlib libraries
+#define CernlibCmd(libraries)cernlib -dy libraries
 #endif
 /*
  * CernlibFortranProgramTarget - rule to link fortran program using
@@ -207,7 +207,7 @@
 ProgramTargetName(program): SetWin32ObjSuffix(objects) deplibs CernlibDependLibrary(cernlibs)	@@\
 	RemoveTargetProgram($@)						@@\
 	@echo "Linking with cern libraries"				@@\
-	@cernlib cernlibs						@@\
+	@cernlib -dy cernlibs						@@\
 	CernlibFortranLinkRule($@,$(FCLDOPTIONS),objects,locallibs $(LDLIBS),CernlibCmd(cernlibs)) @@\
 									@@\
 clean::									@@\
@@ -233,8 +233,8 @@
 ProgramTargetName(program): objects deplibs CernlibDependLibrary(cernlibs) @@\
 	RemoveTargetProgram($@)						@@\
 	@echo "Linking with cern libraries"				@@\
-	@cernlib cernlibs						@@\
-	CernlibLinkRule($@,$(LDOPTIONS),objects,locallibs $(LDLIBS),cernlib cernlibs) @@\
+	@cernlib -dy cernlibs						@@\
+	CernlibLinkRule($@,$(LDOPTIONS),objects,locallibs $(LDLIBS),cernlib -dy cernlibs) @@\
 									@@\
 clean::									@@\
 	RemoveFile(ProgramTargetName(program))				@@\
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-13 15:26:18.903636773 -0400
+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-13 15:26:23.699609849 -0400
@@ -13,14 +13,14 @@
 DefinePackageLibrary(kxtlib)
 
 #if defined(CERNLIB_UNIX)
-CLIBS= -G Motif kernlib
+CLIBS= -G Motif Xm
 #endif
 
 #if defined(CERNLIB_VAXVMS)
-CLIBS= graflib/motif packlib kernlib
+CLIBS= -G Motif Xm
 #endif
 
 
-CernlibCcProgramTarget(kxterm,kxterm.o,libkxtlib.a,libkxtlib.a,$(CLIBS))
+CernlibFortranProgramTarget(kxterm,kxterm.o,libkxtlib.a,libkxtlib.a,$(CLIBS))
 
 InstallProgram(kxterm,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-13 15:26:19.418526524 -0400
+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-13 15:27:38.102678258 -0400
@@ -20,7 +20,7 @@
 InstallScript(paw,$(CERN_BINDIR))
 
 #if defined (CERNLIB_UNIX) && !defined(CERNLIB_WINNT)
-CernlibFortranProgramTarget(pawX11,0pamain.o,NullParameter,NullParameter,pawlib graflib/X11 packlib mathlib kernlib)
+CernlibFortranProgramTarget(pawX11,0pamain.o,NullParameter,NullParameter,-G X11 pawlib)
 
 InstallProgram(pawX11,$(CERN_BINDIR))
 
@@ -34,7 +34,7 @@
 /* This is a gmake ifeq, not a Imake/cpp #if... ! */
 ifeq ($(DO_PAW_PP),YES)
 
-CernlibFortranProgramTarget(paw++,0pamainm.o,NullParameter,NullParameter,pawlib graflib/Motif packlib mathlib kernlib)
+CernlibFortranProgramTarget(paw++,0pamainm.o,NullParameter,NullParameter,-G Motif pawlib)
 
 InstallProgram(paw++,$(CERN_BINDIR))
 


--- NEW FILE 804-workaround-for-comis-mdpool-struct-location.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 804-workaround-for-comis-mdpool-struct-location.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Hack to workaround Comis not liking it when code has a negative
## DP: offset from the mdpool struct (as is the case when using shared
## DP: libraries on some arches).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/Examples/pamain.c /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/cfortran/Examples/pamain.c
--- cernlib-2005.05.09/src/cfortran/Examples/pamain.c	2002-09-12 12:05:18.000000000 -0400
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/cfortran/Examples/pamain.c	2005-06-11 09:59:51.875449396 -0400
@@ -2,6 +2,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define PAWC_SIZE 9000000
 
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc
--- cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc	2000-05-30 09:53:58.000000000 -0400
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc	2005-06-11 09:59:51.876449180 -0400
@@ -15,7 +15,9 @@
 *
 * cspar.inc
 *
-        PARAMETER (LHP=50006, KON1=17694720, KON2=KON1
+#include "comis/mdsize.h"
+
+        PARAMETER (LHP=MDSIZE, KON1=17694720, KON2=KON1
      +, KON3=2**16, LRECU=8,NRECU=5,MLRECU=NRECU*LRECU
      +, MXRECU=MLRECU-LRECU
      1,      LASTK=2000,LSSTK=50,KLENID=32
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h
--- cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,33 @@
+#ifndef _MDPOOL_H
+#define _MDPOOL_H
+
+/* mdpool.h */
+
+/* #include  or  in one source code file of
+ * your executable program dynamically linked against libpaw
+ * so that MDPOOL is defined in your executable.  This is
+ * necessary for proper functioning of the COMIS interpreter when
+ * dynamically linked.
+ */
+
+/* define MDSIZE: */
+#include 
+
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+  int iq[MDSIZE];
+} mdpool_def;
+
+#define MDPOOL COMMON_BLOCK(MDPOOL, mdpool)
+COMMON_BLOCK_DEF(mdpool_def, MDPOOL);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* _MDPOOL_H */
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc
--- cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc	1996-02-26 12:16:34.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc	2005-06-11 09:59:51.876449180 -0400
@@ -12,6 +12,8 @@
 *
 * mdpool.inc
 *
+#include "comis/cspar.inc"
+
       COMMON/MDPOOL/IQ(LHP)
       INTEGER ISEM(LHP),KD(LHP),IDA(LHP),KD1(99),KD2(99),KD3(99)
       EQUIVALENCE (IQ,ISEM),(IQ,KD),(IQ,IDA)
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h
--- cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,6 @@
+#ifndef _MDSIZE_H
+#define _MDSIZE_H
+
+#define MDSIZE 50006
+
+#endif
diff -urNad cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c
--- cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c	1999-11-15 08:36:24.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c	2005-06-11 09:59:51.875449396 -0400
@@ -39,21 +39,20 @@
 /*-- Author :*/
 
 #include 
+#include 
+#include 
+#include "comis/mdsize.h"
 
 typedef struct {
-    int iq[6];
+    int iq[MDSIZE]; /* instead of int iq[6] */
 } mdpool_def;
 
 #define MDPOOL COMMON_BLOCK(MDPOOL,mdpool)
-COMMON_BLOCK_DEF(mdpool_def,MDPOOL);
+extern COMMON_BLOCK_DEF(mdpool_def,MDPOOL);
 
-unsigned long iqpntr = (unsigned long)MDPOOL.iq;
+unsigned long iqpntr = 0;
 
 
-#ifdef CERNLIB_WINNT
-# include 
-#endif
-
 #if defined(CERNLIB_QX_SC)
 int type_of_call csallo_(lenb)
 #endif
@@ -65,11 +64,31 @@
 #endif
  int *lenb;
 {
-  long lpntr;
+  unsigned long lpntr;
   int pntr; 
 
+  if (! iqpntr)
+    iqpntr = (unsigned long)MDPOOL.iq;
   lpntr= (long)( malloc(*lenb) );
-  pntr=lpntr - iqpntr;
+  if (! lpntr) {
+    fprintf(stderr,
+	    "CSALLO: not enough dynamic memory to allocate %d bytes\n", *lenb);
+    exit(EXIT_FAILURE);
+  }
+
+  pntr = (long)lpntr - (long)iqpntr;
+  if (pntr < 0) {
+    fprintf(stderr, "CSALLO: heap below bss?!");
+#if defined (CERNLIB_DEBIAN)
+    fprintf(stderr, "\n"
+"See the file /usr/share/doc/libpawlib2-dev/README.Debian for more information.\n"
+"If it does not help to solve this problem, please file a bug report against\n"
+"the libpawlib2 package, including the source code of your executable.\n");
+#else
+    fprintf(stderr, "  Try linking against pawlib statically.\n");
+#endif
+    exit(EXIT_FAILURE);
+  }
   return pntr;
 }
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc
--- cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc	1996-03-01 11:50:06.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc	2005-06-11 09:59:51.875449396 -0400
@@ -28,5 +28,9 @@
 #include "paw/pawsmall.inc"
 #endif
 
+C      Include this file so that MDPOOL/IQ is present in pawX11 and
+C      paw++ dynamically linked executables.
+C      -- Kevin McCarty, for Debian, 1 Nov 2003
+#include "comis/mdpool.inc"
 
 #endif
diff -urNad cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc
--- cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc	1996-03-01 11:50:06.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc	2005-06-11 09:59:51.875449396 -0400
@@ -28,5 +28,9 @@
 #include "paw/pawsmall.inc"
 #endif
 
+C      Include this file so that MDPOOL/IQ is present in pawX11 and
+C      paw++ dynamically linked executables.
+C      -- Kevin McCarty, for Debian, 1 Nov 2003
+#include "comis/mdpool.inc"
 
 #endif


--- NEW FILE 805-expunge-missing-mathlib-kernlib-symbols.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 805-expunge-missing-mathlib-kernlib-symbols.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove some unreferenced symbols from mathlib and kernlib.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile
--- cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile	2002-09-19 12:44:52.000000000 -0400
+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile	2005-06-13 11:20:33.838151240 -0400
@@ -1,6 +1,8 @@
 #ifndef CERNLIB_VAXVMS
 
-SRCS_F= accessf.F chdirf.F getenvf.F getwdf.F lstatf.F perrorf.F \ @@\
+/* perrorf.F has been removed since it depends upon files which introduce
+   unreferenced dependencies into the shared libraries.  --Kevin McCarty */
+SRCS_F= accessf.F chdirf.F getenvf.F getwdf.F lstatf.F           \ @@\
 	readlnf.F renamef.F setenvf.F statf.F systemf.F tmpro.F \ @@\
 	tmproi.F toslat.F unlinkf.F
 
diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-13 11:12:24.894703741 -0400
+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-13 11:16:54.864966246 -0400
@@ -2,20 +2,22 @@
 #include "pilot.h"
 
 /* rgmlt*.F have been moved into packlib/hbook to remove circular dependencies.
+   Some other files have been removed from this list because they depend upon
+   non-existent functions.
    --Kevin McCarty, for Debian. */
-SRCS_F=	arithm.F c128.F c256.F c512.F c64.F cauchy64.F cft.F cfstft.F \ @@\
+SRCS_F=	         c128.F c256.F c512.F c64.F cauchy64.F cft.F cfstft.F \ @@\
 	rfstft.F cgauss.F d107d1.F d107r1.F d501l1.F d501l2.F d501n1.F \ @@\
         d501n2.F d501p1.F d501p2.F d501sf.F d700su.F d701bd.F \ @@\
         dadapt.F deqbs64.F deqmr64.F deriv64.F dfunft.F dgs56p.F \ @@\
         dmaxlk.F dsumsq.F elanal.F elpahy.F epdbps.F epdchk.F \ @@\
-        epdchn.F epdcj.F epde1.F epdecc.F epdfix.F epdin.F \ @@\
-        epditr.F epdje.F epdloc.F epdsrt.F epdtab.F errorf.F esolve.F \ @@\
-	fcn1.F fftrc.F fumili.F gauss.F i128.F i32.F i64.F linsq.F \ @@\
-	mconv.F mft.F minfc.F minsq.F monito.F newro.F old506.F radapt.F \ @@\
+                 epdcj.F                  epdfix.F epdin.F \ @@\
+        epditr.F epdje.F epdloc.F epdsrt.F epdtab.F          esolve.F \ @@\
+	       fftrc.F          gauss.F i128.F i32.F i64.F         \ @@\
+	mconv.F mft.F minfc.F         monito.F newro.F          radapt.F \ @@\
 	radmul.F rca.F rfrdh164.F rfrdh264.F rft.F           rgquad.F \ @@\
 	rgs56p.F rgset.F riwiad.F riwibd.F rknys64.F rknysd.F rkstp.F \ @@\
 	rpa.F rps.F rrkstp.F rsa.F rtriint.F s128.F s256.F s512.F \ @@\
-	s64.F scal.F sgz.F simps.F synt.F traper.F triint.F vd01a.F
+	s64.F scal.F       simps.F synt.F traper.F triint.F vd01a.F
 
 #if defined(CERNLIB_DOUBLE)
 SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
diff -urNad cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile	1996-05-01 09:21:53.000000000 -0400
+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile	2005-06-13 11:19:42.456136998 -0400
@@ -1,9 +1,12 @@
-SRCS_F=	addbnd.F bfgs.F bndopt.F bndtst.F bounds.F bucmve.F \ @@\
-	bufopt.F delbnd.F delete.F delslv.F divon.F dvcopy.F dvdot.F \ @@\
-	dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F fun.F genpnt.F \ @@\
-	grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\
-	newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\
-	quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\
+/* Some files deleted from the below list since they depend upon the
+   lepto63 library, which cannot be included in Debian for licensing reasons. */
+
+SRCS_F=	addbnd.F bfgs.F          bndtst.F bounds.F bucmve.F \ @@\
+	         delbnd.F delete.F                  dvcopy.F dvdot.F \ @@\
+	dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F                \ @@\
+	                  ldlsol.F          modchl.F          mxstep.F \ @@\
+	newptq.F nmdchl.F         nodaud.F orthvc.F         quad.F \ @@\
+	quasi.F ranums.F          rlen.F settol.F shrnk.F         \ @@\
 	treaud.F tredmp.F tstext.F usrint.F usrtrm.F
 
 FORTRANSAVEOPTION = FortranSaveFlags


--- NEW FILE 806-bump-mathlib-and-dependents-sonames.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 806-bump-mathlib-and-dependents-sonames.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Bump so versions of mathlib and dependents since it is now compiled
## DP: against liblapack3 instead of liblapack2.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-11-23 15:49:19.722162373 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-11-23 15:49:27.431512287 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 AllTarget(geant321)
 
 /* Fluka removed from Debian source package for copyright reasons. */
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile	2005-11-23 15:49:19.723162159 +0000
+++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile	2005-11-23 15:49:27.431512287 +0000
@@ -2,6 +2,7 @@
 #define IHaveSubdirs
 #define PassCDebugFlags 
 
+export LIB_SONAME := 2
 
 LIBDIRS= gen bvsl hbook /* hdiff stuff moved from packlib */
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile	2005-11-23 15:49:19.723162159 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile	2005-11-23 15:49:27.431512287 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 AllTarget(cojets)
 
 LIBDIRS= code cojdata cojtapew
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 SUBDIRS= code doc test herwig59
 
 TopOfPackage(herwig59)
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -3,6 +3,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 LIBDIRS= code isadata isasusy isarun isatape
 
 SUBDIRS= $(LIBDIRS) test data isajet
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -6,6 +6,8 @@
 IMAKE_DEFINES=-DFortranDoesCpp=NO
 #endif
 
+export LIB_SONAME := 2
+
 AllTarget(pdflib804)
 
 SUBDIRS= spdf npdf tpdf pdf
diff -urNad cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile
--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -1,6 +1,8 @@
 DoIncludePackage(paw)
 #include "paw/pilot.h"
 
+export LIB_SONAME := 2
+
 #define IHaveSubdirs
 #define PassCDebugFlags
 
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -2,6 +2,7 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
 
 LIBDIRS= comis paw sigma
 SUBDIRS= $(LIBDIRS)
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/Imakefile cernlib-2005.05.09.dfsg/src/phtools/Imakefile
--- cernlib-2005.05.09.dfsg~/src/phtools/Imakefile	2005-11-23 15:49:19.725161731 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 LIBDIRS= genbod fowl wico
 
 SUBDIRS= $(LIBDIRS) wicoexam

cernlib-enforce-FHS.diff:

--- NEW FILE cernlib-enforce-FHS.diff ---
diff -ur ../original-cernlib-source/src/geant321/miface/gmorin.F src/geant321/miface/gmorin.F
--- ../original-cernlib-source/src/geant321/miface/gmorin.F     Mon Sep 30 10:26:05 1996
+++ src/geant321/miface/gmorin.F     Tue Oct 22 07:27:55 2002
@@ -112,7 +112,7 @@
          OPEN(UNIT=MICROS,FILE=XSFILE, STATUS='OLD',READONLY)
 #endif
 #if defined(CERNLIB_UNIX)||defined(CERNLIB_CRAY)
-         XSFILE = 'xsneut95.dat'
+         XSFILE = 'DATADIR/xsneut95.dat'
          INQUIRE(FILE=XSFILE,EXIST=EXISTS)
          IF(.NOT.EXISTS) THEN
             CHROOT=' '
diff -ur ../original-cernlib-source/src/mclibs/cojets/test/test.F src/mclibs/cojets/test/test.F
--- ../original-cernlib-source/src/mclibs/cojets/test/test.F    Mon Mar 25 07:53:36 1996
+++ src/mclibs/cojets/test/test.F    Tue Oct 22 07:27:55 2002
@@ -6,7 +6,7 @@
 #if defined(CERNLIB_IBMVM)
       PARAMETER (DFILE='/COJETS DATA *')
 #else
-      PARAMETER (DFILE='cojets.dat')
+      PARAMETER (DFILE='DATADIR/cojets.dat')
 #endif
 C
 C          MAIN PROGRAM FOR COJETS
diff -ur ../original-cernlib-source/src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/eurodec/eurodec/eufiles.inc
--- ../original-cernlib-source/src/mclibs/eurodec/eurodec/eufiles.inc   Fri Mar  8 11:58:49 1996
+++ src/mclibs/eurodec/eurodec/eufiles.inc   Tue Oct 22 07:27:55 2002
@@ -18,7 +18,7 @@
       PARAMETER (ETFILE='/EUTITLE DAT   *')
 #endif
       CHARACTER*(*) EDFILE,ETFILE
-      PARAMETER (EDFILE='eurodec.dat')
+      PARAMETER (EDFILE='DATADIR/eurodec.dat')
       PARAMETER (ETFILE='eutitle.dat')

 #endif
diff -ur ../original-cernlib-source/src/mclibs/isajet/test/isajett.F src/mclibs/isajet/test/isajett.F
--- ../original-cernlib-source/src/mclibs/isajet/test/isajett.F Fri Mar 14 12:32:39 1997
+++ src/mclibs/isajet/test/isajett.F Tue Oct 22 07:27:55 2002
@@ -8,7 +8,7 @@
 #if defined(CERNLIB_VAXVMS)
       PARAMETER (DFILE='CERN_ROOT:[lib]isajet.dat')
 #else
-      PARAMETER (DFILE='isajet.dat')
+      PARAMETER (DFILE='DATADIR/isajet.dat')
 #endif
 #endif
 C

cernlib-hwhiga_use_dimag.diff:

--- NEW FILE cernlib-hwhiga_use_dimag.diff ---
--- src/mclibs/herwig/code/hwhiga.F.old	2005-06-24 09:45:07.000000000 +0200
+++ src/mclibs/herwig/code/hwhiga.F	2005-06-24 10:11:59.000000000 +0200
@@ -73,7 +73,7 @@
       TAMP(7)=HWHIG5(U,T,S,EMH2,EMQ2,3,0,6,0,0,0)
       DO 20 I=1,7
       TAMPI(I)= DBLE(TAMP(I))
-  20  TAMPR(I)=-IMAG(TAMP(I))
+  20  TAMPR(I)=-DIMAG(TAMP(I))
 C Square and add prefactors
       WTGG=0.03125*FLOAT(NCOLO*(NCOLO**2-1))
      &    *(TAMPR(1)**2+TAMPI(1)**2+TAMPR(2)**2+TAMPI(2)**2

cernlib-hwuli2_use_dimag.diff:

--- NEW FILE cernlib-hwuli2_use_dimag.diff ---
--- src/mclibs/herwig/code/hwuli2.F.old	2005-06-24 10:09:09.000000000 +0200
+++ src/mclibs/herwig/code/hwuli2.F	2005-06-24 10:11:52.000000000 +0200
@@ -19,7 +19,7 @@
       PROD(Y,Y2)=Y*(ONE+A1*Y*(ONE+A2*Y*(ONE+A3*Y2*(ONE+A4*Y2*(ONE+A5*Y2*
      & (ONE+A6*Y2*(ONE+A7*Y2*(ONE+A8*Y2*(ONE+A9*Y2*(ONE+A10*Y2))))))))))
       XR=DBLE(X)
-      XI=IMAG(X)
+      XI=DIMAG(X)
       R2=XR*XR+XI*XI
       IF (R2.GT.ONE.AND.(XR/R2).GT.HALF) THEN
          Z=-LOG(ONE/X)

cernlib_2005.05.09.dfsg-2.diff:

***** Error reading new file: [Errno 2] No such file or directory: 'cernlib_2005.05.09.dfsg-2.diff'

Index: 001-fix-missing-fluka.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/001-fix-missing-fluka.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 001-fix-missing-fluka.dpatch	28 Nov 2005 10:43:24 -0000	1.1
+++ 001-fix-missing-fluka.dpatch	9 Dec 2005 16:09:19 -0000	1.2
@@ -1,23 +1,27 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 001-fix-missing-fluka.dpatch by  
+## 001-fix-missing-fluka.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Deal with FLUKA code having been purged from Debian's Cernlib source.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/geant321/Imakefile /tmp/dpep.yPljcw/cernlib-2005.05.09/src/geant321/Imakefile
---- cernlib-2005.05.09/src/geant321/Imakefile	1998-03-05 06:20:07.000000000 -0500
-+++ /tmp/dpep.yPljcw/cernlib-2005.05.09/src/geant321/Imakefile	2005-06-08 15:32:20.735091925 -0400
-@@ -4,7 +4,8 @@
+diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	1998-03-05 11:20:07.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-11-23 17:41:29.886310858 +0000
+@@ -4,10 +4,11 @@
  
  AllTarget(geant321)
  
 -LIBDIRS= block cdf cgpack fiface fluka gbase gcons gdraw \ @@\
 +/* Fluka removed from Debian source package for copyright reasons. */
-+LIBDIRS= block cdf cgpack fiface       gbase gcons gdraw \ @@\
++LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
           geocad ggeom gheisha ghits ghrout ghutils giface \ @@\
  	 giopa gkine gphys gscan gstrag gtrak guser gxint \ @@\
- 	 miface miguti neutron peanut
+-	 miface miguti neutron peanut
++	 miface miguti neutron
+ 
+ 
+ SUBDIRS= $(LIBDIRS) data examples gxuser geant321
 @@ -25,9 +26,12 @@
  InstallLibrary(geant321,$(CERN_LIBDIR))
  InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
@@ -31,3 +35,13 @@
  
  /* This will install the correct link for xsneut95.dat at CERN;
   * If you want a local copy of the file, just copy it there
+diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/miface/Imakefile cernlib-2005.05.09.dfsg/src/geant321/miface/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/geant321/miface/Imakefile	1995-10-24 10:21:53.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/geant321/miface/Imakefile	2005-11-23 17:41:52.230563421 +0000
+@@ -1,5 +1,5 @@
+ SRCS_F= \ @@\
+-	 gfmdis.F gfmfin.F gmicap.F gmiset.F gmorin.F gmplxs.F gmxsec.F
++	                   gmicap.F gmiset.F gmorin.F gmplxs.F gmxsec.F
+ 
+ #ifdef CERNLIB_QMVAOS
+  FORTRANSAVEOPTION=FortranSaveFlags


Index: 002-fix-missing-mclibs.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/002-fix-missing-mclibs.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 002-fix-missing-mclibs.dpatch	28 Nov 2005 10:43:24 -0000	1.1
+++ 002-fix-missing-mclibs.dpatch	9 Dec 2005 16:09:19 -0000	1.2
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 002-fix-missing-mclibs.dpatch by  
+## 002-fix-missing-mclibs.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Deal with several of the MC libs having to be purged from source.


Index: 700-remove-kernlib-from-packlib-Imakefile.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/700-remove-kernlib-from-packlib-Imakefile.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 700-remove-kernlib-from-packlib-Imakefile.dpatch	28 Nov 2005 10:43:24 -0000	1.1
+++ 700-remove-kernlib-from-packlib-Imakefile.dpatch	9 Dec 2005 16:09:19 -0000	1.2
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 700-remove-kernlib-from-packlib-Imakefile.dpatch by  
+## 700-remove-kernlib-from-packlib-Imakefile.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.

cernlib-cernlib_kernlib.patch:

Index: cernlib-cernlib_kernlib.patch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib-cernlib_kernlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-cernlib_kernlib.patch	28 Nov 2005 10:43:24 -0000	1.1
+++ cernlib-cernlib_kernlib.patch	9 Dec 2005 16:09:19 -0000	1.2
@@ -1,5 +1,5 @@
---- src/scripts/cernlib-orig	2005-11-24 13:51:54.000000000 +0100
-+++ src/scripts/cernlib	2005-11-24 14:02:25.000000000 +0100
+--- src/scripts/cernlib-old	2005-11-30 20:15:23.000000000 +0100
++++ src/scripts/cernlib	2005-11-30 20:15:23.000000000 +0100
 @@ -16,12 +16,16 @@
    [ -z "$CERN_LEVEL" ] && gver="pro" || gver="$CERN_LEVEL"
   
@@ -27,7 +27,7 @@
        fi
 +      if [ $1 = "packlib" ]; then
 +         _p=1
-+         ln="packlib.a $dir/libkernlib"
++         ln="packlib-lesstif.a $dir/libpacklib.a $dir/libkernlib"
 +      fi
           [ $1 = "genlib"  ] && ln="mathlib.a $dir/libphtools"
           [ $1 = "bvsl"    ] && ln="mathlib"
@@ -35,11 +35,11 @@
 -         [ $1 = "lapack"  ] && ln="lapack3.a $dir/libblas"
 -	 [ $1 = "pawlib"  ] && ln="pawlib.a $dir/liblapack3.a $dir/libblas"
 +         if [ $_l -eq 0 ] ; then
-+           [ $1 = "pawlib"  ] && ln="pawlib.a $dir/liblapack3.a $dir/libblas"
++           [ $1 = "pawlib"  ] && ln="pawlib-lesstif.a $dir/libpawlib.a $dir/liblapack3.a $dir/libblas"
 +           [ $1 = "lapack"  ] && ln="lapack3.a $dir/libblas"
 +         else
 +           if [ $1 = "pawlib"  ] ; then 
-+              ln="pawlib"
++              ln="pawlib-lesstif.a $dir/libpawlib"
 +              dynlapack=1
 +           fi
 +           if [ $1 = "lapack"  ] ; then
@@ -58,12 +58,18 @@
 +      [ -n "$ln" ] && CERNLIB="$CERNLIB $dir/lib$ln.a"
    done
 -  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib.a"
-+  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib.a $CERN/$gver/lib/libkernlib.a"
++  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib-lesstif.a $CERN/$gver/lib/libpacklib.a $CERN/$gver/lib/libkernlib.a"
  
  #  get system name
    [ -d /NextAdmin ] && Msys="NeXT" || Msys=`uname -s`
-@@ -113,7 +132,9 @@
-       Linux)   [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
+@@ -110,10 +129,14 @@
+                SYSGGL="-lfgl -lgl_s -lm -lbsd" ;
+                SYSGMOTIF="-lXm -lXt -lX11 -lPW"
+ 	       ;;
+-      Linux)   [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
++      Linux)   SYSGX11="-lX11"
++	       SYSGMOTIF="-lXm -lXt -lXp -lXext -lX11"
++	       [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
  	       [ -d /usr/X11/lib ] && SYSGX11="-L/usr/X11/lib -lX11"
  	       [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
 +	       [ -d /usr/X11R6/lib64 ] && SYSGX11="-L/usr/X11R6/lib64 -lX11"
@@ -72,7 +78,7 @@
  	       [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
  	       ;;
        NeXT)    SYSGX11="/usr/lib/X11/libX11.r" ;
-@@ -208,6 +229,10 @@
+@@ -208,6 +231,10 @@
       fi
       if [ "$Msys" = "Linux" ] ; then
          CERNLIB="$CERNLIB -lnsl -lcrypt -ldl"


Index: cernlib-deadpool.txt
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib-deadpool.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-deadpool.txt	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib-deadpool.txt	9 Dec 2005 16:09:19 -0000	1.2
@@ -2,26 +2,86 @@
 # for copyright reasons.  Given is the file or directory to delete
 # relative to $CERN_ROOT/src/.
 
-# --Kevin McCarty, 19 Aug. 2003
+# --Kevin McCarty, 23 Nov 2005
 
-# Authors of FLUKA and Pythia/Jetset did NOT give permission to release
+# Authors of Pythia/Jetset did NOT give permission to release
 # their code under GPL.  CERN should have checked this more carefully!!!
-geant321/data/flukaaf.dat
-geant321/fluka/
-car/geanf321.car
-car/geanf.car
-
-mclibs/jetset/
 car/jetset74.car
+mclibs/jetset/
 mclibs/pythia/
 
-# removal of Pythia/Jetset also necessitates removal of Fritiof, Lepto, Ariadne
+# Removal of Pythia/Jetset also necessitates removal of Fritiof, Lepto, Ariadne
 mclibs/fritiof/
 mclibs/ariadne/
 mclibs/ariadne_407/
 mclibs/lepto63/
 
-# other problematic files (mostly on VMS or obsolete archs)
+# The same applies to GEANT-FLUKA; see for instance the comments at
+# the web site http://www.fluka.org/Faq.html
+car/geanf.car
+car/geanf321.car
+#cmz/geanf.cmz
+#cmz/geanf321.cmz
+geant321/data/flukaaf.dat
+geant321/block/
+geant321/fiface/
+geant321/fluka/
+geant321/miface/gfmfin.F
+geant321/miface/gfmdis.F
+geant321/peanut/
+geant321/geant321/aadat.inc
+geant321/geant321/auxpar.inc
+geant321/geant321/balanc.inc
+geant321/geant321/bamjcm.inc
+geant321/geant321/cmsres.inc
+geant321/geant321/comcon.inc
+geant321/geant321/corinc.inc
+geant321/geant321/dblprc.inc
+geant321/geant321/decayc.inc
+geant321/geant321/decayc2.inc
+geant321/geant321/depnuc.inc
+geant321/geant321/dimpar.inc
+geant321/geant321/eva0.inc
+geant321/geant321/eva1.inc
+geant321/geant321/fheavy.inc
+geant321/geant321/finlsp.inc
+geant321/geant321/finlsp2.inc
+geant321/geant321/finlsp3.inc
+geant321/geant321/finpar.inc
+geant321/geant321/finpar2.inc
+geant321/geant321/finuc.inc
+geant321/geant321/finuc2.inc
+geant321/geant321/finuct.inc
+geant321/geant321/hadflg.inc
+geant321/geant321/hadpar.inc
+geant321/geant321/higfis.inc
+geant321/geant321/inpdat.inc
+geant321/geant321/inpdat2.inc
+geant321/geant321/inpflg.inc
+geant321/geant321/iounit.inc
+geant321/geant321/isotop.inc
+geant321/geant321/labcos.inc
+geant321/geant321/mapa.inc
+geant321/geant321/metlsp.inc
+geant321/geant321/nucdat.inc
+geant321/geant321/nucgeo.inc
+geant321/geant321/nuclev.inc
+geant321/geant321/nucpar.inc
+geant321/geant321/nucstf.inc
+geant321/geant321/paprop.inc
+geant321/geant321/parevt.inc
+geant321/geant321/parnuc.inc
+geant321/geant321/part.inc
+geant321/geant321/part2.inc
+geant321/geant321/part3.inc
+geant321/geant321/qquark.inc
+geant321/geant321/reac.inc
+geant321/geant321/redver.inc
+geant321/geant321/resnuc.inc
+geant321/geant321/split.inc
+geant321/geant321/xsepar.inc
+
+# Other problematic files (mostly on VMS or obsolete archs)
 graflib/higz/igold/golini.F
 packlib/cspack/sysreq/pwd_vms.h
 packlib/cspack/sysreq/sgtty.h

cernlib-gxint-script.diff:

Index: cernlib-gxint-script.diff
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib-gxint-script.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-gxint-script.diff	28 Nov 2005 10:43:24 -0000	1.1
+++ cernlib-gxint-script.diff	9 Dec 2005 16:09:19 -0000	1.2
@@ -1,21 +1,20 @@
---- src/scripts/gxint.orig	2005-06-12 14:12:21.183392960 +0200
-+++ src/scripts/gxint	2005-06-12 14:14:52.733353864 +0200
-@@ -78,7 +78,7 @@
-      fi
-   fi
+--- src/scripts/gxint-old	2005-11-23 23:11:08.000000000 +0100
++++ src/scripts/gxint	2005-11-29 11:42:30.000000000 +0100
+@@ -103,15 +103,8 @@
+    echo "gxint_Warning: no user program specified"
+ fi
   
--drv="/X11" ; ver="pro" ; OUT="${HOME}/GEANT$$"
-+drv="/X11" ; ver="==VERSION==" ; OUT="${HOME}/GEANT$$"
- gxint=""
+- 
+- 
+-if [ -z "$CERN" ] ; then
+-  if [ ! -d /cern ]; then
+-   echo "gxint_Error: shell variable CERN must be set or /cern must exist"
+-   exit 1
+-  fi
+-  CERN="/cern" ; export CERN
+-fi
++# not used after the sed one liner in the spec file 
++if [ -z "$CERN" ] ; then CERN="/usr"
   
- while [ $# -gt 0 ]
-@@ -142,7 +142,8 @@
-  
- CLIB="geant${gvs} pawlib graflib$drv packlib mathlib"
-  
--[ -z "$_m" ] && gxint="${CERN}/${ver}/lib/gxint${gvs}.$_o" 
-+#[ -z "$_m" ] && gxint="${CERN}/${ver}/lib/gxint${gvs}.$_o" 
-+[ -z "$_m" ] && gxint="==includedir==/cernlib/${ver}/gxint${gvs}.f" 
-  
- cat << EoD
- $line
+ if [ "$drv" = "/GKS" ] ; then
+   if [ -z "$GKSR" ] ; then


Index: cernlib.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib.README	28 Nov 2005 10:43:24 -0000	1.2
+++ cernlib.README	9 Dec 2005 16:09:19 -0000	1.3
@@ -54,3 +54,7 @@
 kernlib has been moved outside of packlib. If you use the cernlib script
 for linking it should be taken into account, however if you link directly
 with packlib you could need to add the kernlib on your link command line.
+
+6) split of motif dependent libs from packlib and pawlib
+
+The motif dependent libs are in libpacklib-lesstif and libpawlib-lesstif.


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cernlib.spec	28 Nov 2005 10:43:24 -0000	1.10
+++ cernlib.spec	9 Dec 2005 16:09:19 -0000	1.11
@@ -1,24 +1,27 @@
 Name:          cernlib
 Version:       2005
-Release:       4%{?dist}.8
+Release:       8%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
 # http://borex.princeton.edu/~kmccarty/faq.html#44
-License:       GPL/LGPL/BSD
+License:       GPL/LGPL
 URL:           http://cernlib.web.cern.ch/cernlib/
 # mandrake
 #BuildRequires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
 #BuildRequires: gcc-g77
 #Requires:      libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
 # fedora core
+# fc 3
+#BuildRequires: xorg-x11-devel lapack blas openmotif-devel
+# fc 4
 BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
+# fc devel
+#BuildRequires: imake lapack-devel blas-devel openmotif-devel 
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# f771 segfaults on x86_64
-ExcludeArch:   x86_64
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -44,7 +47,7 @@
 Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz
 Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz
 Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat
-# A shell script that goes in /etc/profile.d
+# Shell scripts that go in /etc/profile.d
 Source100: cernlib.sh.in
 Source105: cernlib.csh.in
 # m4 macros for autoconf
@@ -55,75 +58,131 @@
 Source103: cernlib.README
 # mkdirhier is used to create directories. Taken from xorg-x11
 Source104: mkdirhier
-# list of include directories (includelist.txt from debian)
-Source105: cernlib-includelist.txt
 # Files that can be used in the SOURCE directory to remove files with
 # GPL incompatible licences from upstream sources
 Source200: cernlib-remove-deadpool
 Source201: cernlib-deadpool.txt
 
-# change the cernlib script such that -llapack -lblas is used instead of 
-# cernlib lapack
-# and also depend explicitely on libkernlib now that it is out of packlib
-Patch49: cernlib-cernlib_kernlib.patch
-
-# debian cernlib patch full of good things
-Patch0: cernlib_2004.11.04-3.diff
+# debian patchset
+Patch0: cernlib_2005.05.09.dfsg-2.diff
+# change file to directory to DATADIR
+Patch1100: cernlib-enforce-FHS.diff
 Patch1: 001-fix-missing-fluka.dpatch
 Patch2: 002-fix-missing-mclibs.dpatch
-# modified, to have only DATADIR
-Patch3: 003-enforce-FHS
-Patch4: 005-enable-shadow-passwd
-#Patch4: 007-delete-fluka-refs
-Patch5: 008-undef-PPC
-Patch6: 010-comis-allow-special-chars-in-path
-Patch7: 012-add-no-optimization-macro
-# not applied, requires debian imake rules
-Patch8: 013-fix-paw-imakefile-special-rules
-# not applied, requires debian imake rules
-Patch9: 014-fix-herwig-imakefile-special-rules
-Patch11: 015-fix-optimization
-Patch12: 700-remove-kernlib-from-packlib-Imakefile.dpatch
-Patch13: 022-no-assign-string-literals
+Patch3: 003-geant-dummy-functions.dpatch
+Patch100: 100-fix-isajet-manual-corruption.dpatch
+Patch101: 101-undefine-PPC.dpatch
+Patch102: 102-dont-optimize-some-code.dpatch
+Patch103: 103-ignore-overly-long-macro-in-gen.h.dpatch
+Patch104: 104-fix-undefined-insertchar-warning.dpatch
+Patch105: 105-fix-obsolete-xmfontlistcreate-warning.dpatch 
+Patch106: 106-fix-paw++-menus-in-lesstif.dpatch
+Patch107: 107-define-strdup-macro-safely.dpatch
+Patch108: 108-quote-protect-comis-script.dpatch
+# not used as xsneut.dat is at the right place
+#Patch109: 109-fix-broken-xsneut95.dat-link.dpatch
+Patch110: 110-ignore-included-lapack-rule.dpatch
+Patch111: 111-fix-kuesvr-install-location.dpatch
+Patch112: 112-remove-nonexistent-prototypes-from-gen.h.dpatch
+# a workaround for cups. Applied in doubt.
+Patch113: 113-cups-postscript-fix.dpatch
+Patch114: 114-install-scripts-properly.dpatch
+Patch200: 200-comis-allow-special-chars-in-path.dpatch
+Patch201: 201-update-kuip-helper-apps.dpatch
+Patch202: 202-fix-includes-in-minuit-example.dpatch
+Patch203: 203-compile-geant-with-ertrak.dpatch
+Patch204: 204-compile-isajet-with-isasrt.dpatch
+Patch205: 205-max-path-length-to-256.dpatch
+Patch206: 206-herwig-uses-DBLE-not-REAL.dpatch
+Patch207: 207-compile-temp-libs-with-fPIC.dpatch
+# without that patch the binaries are linked with something like
+# libzftplib.a /builddir/build/BUILD/cernlib-2005/2005/build/packlib/cspack/programs/zftp/libzftplib.a
+Patch208: 208-fix-redundant-packlib-dependencies.dpatch
+Patch209: 209-ignore-unneeded-headers-in-kmutil.c.dpatch
+Patch210: 210-improve-cfortran-header-files.dpatch
+# disabled in the debian patchset, enabled here
+Patch211: 211-fix-comis-on-64-bit-arches.dpatch
+Patch300: 300-skip-duplicate-lenocc.dpatch
+# Use another approach, see cernlib-enforce-FHS
+# Patch33: 301-datafiles-comply-with-FHS.dpatch
+# use cernlib-gxint-script.diff instead and sed for paw and dzedit.script
+# Patch34: 302-scripts-comply-with-FHS.dpatch
+Patch303: 303-shadow-passwords-supported.dpatch
+Patch304: 304-update-Imake-config-files.dpatch
+Patch305: 305-use-POWERPC-not-PPC-as-test.dpatch
+# the bug in /usr/include/assert.h seems to be present in FC-4. So a local
+# version is provided in that patch. Will have to look at newer glibc-headers
+# packages
+Patch306: 306-patch-assert.h-for-makedepend.dpatch
+Patch307: 307-use-canonical-cfortran.dpatch
+Patch308: 308-use-canonical-cfortran-location.dpatch
+Patch309: 309-define-dummy-herwig-routines.dpatch
+Patch310: 310-define-dummy-fowl-routines.dpatch
+# The zebra qnexte is a fake, removing it remove an unneeded dependency.
+# the other qnext don't seem to be the same code? They are duplicate symbols
+# anyway so one must be removed
+Patch311: 311-skip-duplicate-qnext.dpatch
+Patch312: 312-skip-duplicate-gamma.dpatch
+# It is a departure from upstream. Apply, but may revert if not agreed.  
+Patch313: 313-comis-preserves-filename-case.dpatch
+Patch314: 314-permit-using-regcomp-for-re_comp.dpatch
+Patch315: 315-fixes-for-MacOSX.dpatch
+Patch318: 318-additional-gcc-3.4-fixes.dpatch
+
+Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch
+Patch701: 701-patch-hbook-comis-Imakefiles.dpatch
+Patch702: 702-patch-Imakefiles-for-packlib-mathlib.dpatch
+# I would have preferred not to move the motif code to toplevel...
+Patch703: 703-patch-code_motif-packlib-Imakefiles.dpatch
+Patch704: 704-patch-code_kuip-higzcc-Imakefiles.dpatch
+# I would have preferred not to move the motif code to toplevel...
+Patch705: 705-patch-paw_motif-paw-Imakefiles.dpatch
+
+Patch800: 800-implement-shared-library-rules-in-Imake.dpatch
+Patch801: 801-non-optimized-rule-uses-fPIC-g.dpatch
+Patch802: 802-create-shared-libraries.dpatch
+# in the original cernlib kxterm is built with the C compiler, which cause
+# a failure if compiled with de cernlib debian script as -lg2c isn't found. 
+# It is corrected by
+Patch803: 803-link-binaries-dynamically.dpatch
+# 803 depends on 
+# 208-fix-redundant-packlib-dependencies.dpatch
+
+# no idea about what this does
+Patch804: 804-workaround-for-comis-mdpool-struct-location.dpatch
+Patch805: 805-expunge-missing-mathlib-kernlib-symbols.dpatch 
+# not needed but keep sync with debian, that'll avoid bumping sonames
+Patch806: 806-bump-mathlib-and-dependents-sonames.dpatch
+
+# not applied in newer debian patchset
+Patch3006: 022-no-assign-string-literals
 # fixed upstream
-Patch14: 027-use-tmpfile-not-mktemp
-Patch15: 028-fix-isajet-docs
-Patch16: 030-filename-length-to-256
-Patch17: 031-fix-varargs-use
-Patch18: 033-fix-undefined-insertchar
-Patch19: 035-do-not-use-XmFontListCreate
-Patch20: 038-fix-strndup-macro-problem
-Patch21: 039-use-DBLE-not-REAL
-Patch22: 044-fix-strdup-redefinition
-Patch23: 045-compile-with-isasrt
-Patch24: 047-fix-paw++-menus
+Patch3007: 027-use-tmpfile-not-mktemp
+# not applied in the newer debian patchset
+Patch3008: 031-fix-varargs-use
 # fixed upstream 
-Patch25: 048-log-to-var-log-not-tmp
+Patch3009: 048-log-to-var-log-not-tmp
 # fixed upstream
-Patch26: 049-fix-kuesvr-security-hole
+Patch3010: 049-fix-kuesvr-security-hole
 # fixed upstream
-Patch27: 050-make-secure-comis-tmpdir
+Patch3011: 050-make-secure-comis-tmpdir
 # fixed upstream
-Patch28: 051-fix-miscellaneous-tmp-uses
-# extracted from 001-enable-shared-libs
-#Patch29: 001-delete-pythia-refs
-# prepare gxint for substitutions of path and version
-Patch30: cernlib-gxint-script.diff
-Patch31: cernlib-XmDrawShadow-no-prototype.patch
-Patch32: cernlib-install_scripts.patch
-Patch33: cernlib-static-tcpaw.diff
-Patch34: cernlib-hwuli2_use_aimag.diff 
-Patch35: cernlib-hwhiga_use_aimag.diff
-Patch36: cernlib-gfortran.diff 
-Patch42: cernlib-rsrtnt64_goto_outer_block.diff
-Patch43: cernlib-v107z0_X_before_string.diff
-Patch44: cernlib-bimsel-nodouble-save.diff
-Patch45: 029-fixes-for-MacOSX
-Patch46: cernlib-config_pmac.diff
-Patch47: 032-use-regcomp-not-re_comp
-# modified version of 013-fix-paw-imakefile-special-rules that doesn't
-# requires the debian imake rules
-Patch48: 013-fix-paw-imakefile-special-rules-modified
+Patch3012: 051-fix-miscellaneous-tmp-uses
+
+# change the cernlib script such that -llapack -lblas is used instead of 
+# cernlib lapack
+# depend explicitely on libkernlib now that it is out of packlib
+# use lesstif-pawlib and lesstif-packlib
+# the modified script is renamed cernlib-static later and the debian cernlib
+# script is used instead.
+Patch1200: cernlib-cernlib_kernlib.patch
+# don't stop if the CERN variable isn't defined
+Patch1201: cernlib-gxint-script.diff
+Patch1203: cernlib-hwuli2_use_dimag.diff 
+Patch1204: cernlib-hwhiga_use_dimag.diff
+Patch1205: cernlib-gfortran.diff 
+Patch1206: cernlib-rsrtnt64_goto_outer_block.diff
+Patch1207: cernlib-v107z0_X_before_string.diff
 
 %description
 CERN program library is a large collection of general purpose libraries
@@ -133,12 +192,15 @@
 detectors simulation, data-handling etc... applicable to a wide range 
 of problems.
 
-The devel packages are parallel installable, but not the helper
+The main and devel packages are parallel installable, but not the helper
 scripts from the utils subpackage.
 
 %package devel
 Summary:       General purpose CERN library static libraries and headers
-Requires:      xorg-x11-devel lapack-devel blas-devel openmotif-devel
+Requires:      lapack-devel blas-devel openmotif-devel
+# workaround #173530
+Requires:      libXau-devel
+Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
 
 %description devel
@@ -155,7 +217,7 @@
 %package utils
 Summary:   CERN library compilation and environment setting scripts
 Group:     Applications/System
-Requires:  cernlib-devel = %{version}
+Requires:  %{name}-devel = %{version}-%{release}
 
 %description utils
 CERN library compilation and environment setting scripts.
@@ -230,56 +292,185 @@
 
 %patch -p1
 cd %{version}
+%patch -P 1100 -p2
 %patch -P 1 -p1
 %patch -P 2 -p1
-%patch -P 3 -p2
-%patch -P 4 -p2
-%patch -P 5
-%patch -P 6
-%patch -P 7
-#%patch -P 8
-#%patch -P 9
-%patch -P 11
-%patch -P 12 -p1
-%patch -P 13
-#%patch -P 14
-%patch -P 15
-%patch -P 16
-%patch -P 17 
-%patch -P 18 
-%patch -P 19 
-%patch -P 20
-%patch -P 21 
-%patch -P 22 
-%patch -P 23 
-%patch -P 24 
-#%patch -P 25 
-#%patch -P 26 
-#%patch -P 27 
-#%patch -P 28 
-# not needed anymore
-#%patch -P 29
-%patch -P 30
-%patch -P 31
-%patch -P 32
-%patch -P 33
-%patch -P 34
-%patch -P 35
+%patch -P 3 -p1
+%patch -P 100 -p1
+%patch -P 101 -p1
+%patch -P 102 -p1
+%patch -P 103 -p1
+%patch -P 104 -p1
+%patch -P 105 -p1
+%patch -P 106 -p1
+%patch -P 107 -p1
+%patch -P 108 -p1
+#%patch -P 109 -p1
+%patch -P 110 -p1
+%patch -P 111 -p1
+%patch -P 112 -p1
+%patch -P 113 -p1
+%patch -P 114 -p1
+%patch -P 200 -p1
+%patch -P 201 -p1
+%patch -P 202 -p1
+%patch -P 203 -p1
+%patch -P 204 -p1
+%patch -P 205 -p1
+%patch -P 206 -p1
+%patch -P 207 -p1
+%patch -P 208 -p1
+%patch -P 209 -p1
+%patch -P 210 -p1
+%patch -P 211 -p1
+%patch -P 300 -p1
+#%patch -P 301 -p1
+#%patch -P 302 -p1
+%patch -P 303 -p1
+%patch -P 304 -p1
+%patch -P 305 -p1
+%patch -P 306 -p1
+%patch -P 307 -p1
+%patch -P 308 -p1
+%patch -P 309 -p1
+%patch -P 310 -p1
+%patch -P 311 -p1
+%patch -P 312 -p1
+%patch -P 313 -p1
+%patch -P 314 -p1
+%patch -P 315 -p1
+
+# copy a paw include file to include directory (debian
+# 317-copy-converter.h-to-installed-headers-dir.sh.dpatch)
+cp src/pawlib/paw/tree/converter.h src/pawlib/paw/paw/
+
+%patch -P 318 -p1
+
+# move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch)
+mv src/packlib/kernlib src/kernlib
+
+%patch -P 700 -p1
+
+# move hkf1q.F and hkfill.F out of packlib/hbook and into
+# pawlib/comis where they obviously belong (it even says so in the files!)
+# (debian 701-move-packlib-hkfill-to-comis.sh.dpatch)
+pushd src
+                mv packlib/hbook/code/hkf1q.F  pawlib/comis/code/
+                mv packlib/hbook/code/hkfill.F pawlib/comis/code/
+                # these files also need some headers to go with them:
+                mkdir pawlib/comis/hbook
+                cp -p packlib/hbook/hbook/pilot.h    pawlib/comis/hbook/
+                cp -p packlib/hbook/hbook/hcbook.inc pawlib/comis/hbook/
+                cp -p packlib/hbook/hbook/hcbits.inc pawlib/comis/hbook/
+                cp -p packlib/hbook/hbook/hcfast.inc pawlib/comis/hbook/
+popd
+
+%patch -P 701 -p1
+
+# Must create dirs before applying following patch. 
+# Corresponds with 702-fix-packlib-mathlib-circular-mess.sh.dpatch
+
+pushd src
+                # Hdiff depends upon a bunch of mathlib files; move it into
+                # mathlib.
+                mkdir mathlib/hbook
+                mv packlib/hbook/hdiff mathlib/hbook/
+                cp -r packlib/hbook/hbook mathlib/hbook/
+
+                # Meanwhile, other packlib files depend upon these mathlib
+                # files which are easily moved:
+                mkdir packlib/hbook/d
+                mv mathlib/gen/d/rgmlt*.F packlib/hbook/d/
+                mv mathlib/gen/n          packlib/hbook/
+                cp -r mathlib/gen/gen     packlib/hbook/
+popd
+
+%patch -P 702 -p1
+
+# Script to move packlib/kuip/code_motif to top level, splitting it out
+# from packlib.  But keep kmutil.c in packlib, it's otherwise used.
+# debian 703-move-code_motif-to-top-level.sh.dpatch
+
+pushd src
+                mv packlib/kuip/code_motif/kmutil.c packlib/kuip/code_kuip/
+                mv packlib/kuip/code_motif          ./
+                cp -r packlib/kuip/kuip             code_motif/
+popd
+
+%patch -P 703 -p1
+
+# Script to move the file kuwhag.c from packlib/kuip/code_kuip/kuwhag.c
+# into graflib/higz/higzcc.  It appears to be the only file in code_kuip
+# that depends upon grafX11 and libX11, so it fits in better here.
+# debian 704-move-kuwhag.c-to-grafX11.sh.dpatch
+
+pushd src
+                mv packlib/kuip/code_kuip/kuwhag.c graflib/higz/higzcc/
+                cp -r packlib/kuip/kuip            graflib/higz/
+popd
+
+%patch -P 704 -p1
+
+# Script to move Lesstif-dependent Paw code into its own library.
+# debian 705-move-paw++-code-to-top-level.sh.dpatch
+
+pushd src
+                mkdir paw_motif
+                mv pawlib/paw/?motif pawlib/paw/fpanels? paw_motif/
+                mv pawlib/paw/tree pawlib/paw/uimx pawlib/paw/xbae* paw_motif/
+                cp -p pawlib/paw/Imakefile paw_motif/
+                
+                mkdir paw_motif/code
+                mv pawlib/paw/code/pawpp.F   paw_motif/code/
+                mv pawlib/paw/code/pawintm.F paw_motif/code/
+
+                mkdir paw_motif/cdf
+                mv pawlib/paw/cdf/pamcdf.cdf paw_motif/cdf/
+
+                cp -pr pawlib/paw/paw paw_motif/
+                cp -pr pawlib/paw/hpaw paw_motif/
+popd
+
+%patch -P 705 -p1
+
+%patch -P 800 -p1
+%patch -P 801 -p1
+%patch -P 802 -p1
+%patch -P 803 -p1
+
+# Shell script to link pawlib/comis/comis into the top-level include directory.
+# debian 804-link-to-comis-includes.sh.dpatch
+pushd src
+                ln -s ../pawlib/comis/comis include/comis
+popd
+
+%patch -P 804 -p1
+%patch -P 805 -p1
+%patch -P 806 -p1
+
+
+%patch -P 1200
+%patch -P 1201
+%patch -P 1203
+%patch -P 1204
 # use gfortran
-#%patch -P 36
+#%patch -P 1205
 # workaround gfortran bug
-%patch -P 42
-%patch -P 43
-%patch -P 44
-# try to build on ppc
-%patch -P 45
-%patch -P 46
-%patch -P 47
-%patch -P 48
-%patch -P 49
+%patch -P 1206
+%patch -P 1207
+
+# remove CVS directories
+find . -depth -type d -name CVS -exec rm -rf {} ';' 
 
+# unset executable bit on source files
+chmod a-x src/kernlib/kerngen/ccgencf/cfstati.c \
+  src/cfortran/cfortran.*
+
+# remove empty header file not needed anywhere to shut up rpmlint
+rm src/pawlib/paw/ntuple/dbmalloc.h
 
 %build
+
 CERN=$RPM_BUILD_DIR/cernlib-%{version}
 CERN_LEVEL=%{version}
 CERN_ROOT=$CERN/$CERN_LEVEL
@@ -292,7 +483,10 @@
 export CVSCOSRC
 export PATH
 
-# set the CERN and CERN_LEVEL environment variables in a shell script
+LIB_SONAME=1
+export LIB_SONAME
+
+# set the CERN and CERN_LEVEL environment variables in shell scripts
 # meant to go to /etc/profile.d
 sed -e 's/==CERN_LEVEL==/%{version}/' -e 's:==CERN==:%{_libdir}/cernlib:' %{SOURCE100} > cernlib-%{version}.sh
 sed -e 's/==CERN_LEVEL==/%{version}/' -e 's:==CERN==:%{_libdir}/cernlib:' %{SOURCE105} > cernlib-%{version}.csh
@@ -300,6 +494,12 @@
 cp %{SOURCE101} .
 cp %{SOURCE102} .
 cp %{SOURCE103} .
+
+# Regenerate the copyright file (from debian/rules)
+grep -v DEADPOOL_LIST_GOES_HERE debian/copyright.in > copyright
+sed -e 's/#.*//g' -e '/^[[:space:]]*$$/d' %{SOURCE200} | \
+                sort | uniq >> copyright
+
 # copy xsneut.data in 2005/share/lib, where geant expects it to be
 # there is a link from 2005/lib
 mkdir -p %{version}/share/lib
@@ -307,36 +507,43 @@
 
 cd $CERN_ROOT
 
-find . -type d -name CVS -depth -exec rm -rf {} ';' 
-
-# substitude the right defaults in the cernlib script
-sed -i -e 's:/cern:%{_libdir}/cernlib/:' -e 's:pro:%{version}:' src/scripts/cernlib
+# substitude the right defaults in the scripts
+sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{version}":' \
+	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
 # substitute version in gxint with the right version
 # substitute includedir in gxint to conform to FHS
-sed -i -e 's/==VERSION==/%{version}/' -e 's:==includedir==:%{_includedir}:' src/scripts/gxint 
+sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib:%{_includedir}/cernlib/\${ver}:' src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
-for file in src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F; do
-  sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' $file
-done
-
-# move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch)
-mv src/packlib/kernlib src/kernlib
+sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \
+  src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F
 
 # Create the build directory structure
+mkdir -p build bin lib shlib
 
-mkdir -p build bin lib build/log
+# rename the cernlib script cernlib-static and use the debian cernlib
+# script for dynamic libraries support
+# remove -lg2c to the link commands, because libg2c.so isn't available, 
+# it is found by g77 if needed
+mv src/scripts/cernlib bin/cernlib-static
+sed -e 's:@PREFIX@:%{_prefix}:g' \
+  -e 's:@LIBPREFIX@:%{_libdir}/cernlib/%{version}:g' \
+  -e 's/-lg2c//' \
+  ../debian/add-ons/bin/cernlib.in > src/scripts/cernlib
+chmod 0755 src/scripts/cernlib
 
+# install mkdirhier which is needed to make directories
 cp %{SOURCE104} bin/
 chmod a+x bin/mkdirhier
 
 # Create the top level Makefile with imake
-# the RPM optflags are not used
 
 cd $CERN_ROOT/build
 $CVSCOSRC/config/imake_boot
 
+# the RPM optflags are not used during the build
+
 # Install kuipc and the scripts (cernlib, paw and gxint) in $CERN_ROOT/bin
 
 make %{?_smp_mflags} bin/kuipc
@@ -349,6 +556,8 @@
 cd $CERN_ROOT/build
 #  %{?_smp_mflags} breaks the build
 make
+make install.shlib
+chmod a+x ../shlib/*.so.*
 
 # Build paw
 cd $CERN_ROOT/build/pawlib
@@ -386,10 +595,12 @@
 %{__install} -m755 bin/* $RPM_BUILD_ROOT%{_bindir}/
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
+(cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
 #(cd src/include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -)
- 
+
 rm -f $RPM_BUILD_ROOT%{_bindir}/mkdirhier
 
+# add links for cfortran header files in the top include directory
 pushd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
 for file in *.h; do
 	%{__ln_s} $file cfortran/$file
@@ -398,38 +609,50 @@
 popd
 
 cd src
+# install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
-for dir in `cat %{SOURCE105}`; do
+for dir in `cat ../../debian/add-ons/includelist.txt`; do
 	basedir=`basename $dir`
 	rm -rf $base_include/$basedir
 	cp -Rp $dir $base_include/
 done
 
 find $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} -name Imakefile -exec rm -f \{\} \;
-#rm -rf $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/cfortran/Examples/
+rm -f $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/ntuple/*.c
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%dir %{_libdir}/cernlib/
+%dir %{_libdir}/cernlib/%{version}
+%dir %{_libdir}/cernlib/%{version}/lib
+%{_libdir}/cernlib/%{version}/lib/*.so.*
+%{_datadir}/cernlib/
+%doc cernlib.README copyright
+%doc debian/debhelper/geant321.README.debian 
+%doc debian/debhelper/libpdflib804-2-dev.README.debian
+%doc debian/debhelper/libmathlib2.README.debian 
+%doc debian/debhelper/montecarlo-base.README.debian
+
 # the utils and devel are separated to have the possibility to install
 # parallel versions of the library
-
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/cernlib/%{version}
-%{_datadir}/cernlib/%{version}
-%{_includedir}/cernlib/%{version}
+%{_libdir}/cernlib/%{version}/lib/*.a
+%{_libdir}/cernlib/%{version}/lib/*.so
+%{_includedir}/cernlib/
 %{_datadir}/aclocal/cernlib.m4
-# those file should be in a cernlib main package
-%doc cernlib.README debian/copyright
-%doc debian/libgeant1.README.debian debian/libpdflib804-dev.README.debian
-%doc debian/libmathlib1.README.debian debian/montecarlo-base.README.debian
-# devel specific files
 %doc cfortran 
 
 %files utils
 %defattr(-,root,root,-)
-%{_bindir}/cernlib
+%{_bindir}/cernlib*
 %{_sysconfdir}/profile.d/cernlib-%{version}.sh
 %{_sysconfdir}/profile.d/cernlib-%{version}.csh
 
@@ -465,9 +688,20 @@
 %{_bindir}/hepdb
 %{_bindir}/kxterm
 %{_bindir}/zftp
-%doc debian/zftp.README.debian
+%doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8
+- use new debian patchset
+- enable 64 bit fixes patch
+- remove the BSD in the licence because there is no library nor binary
+  under a BSD licence and someone could get the idea that there is 
+  some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
+  because of cfortran
+- update with newer debian patchset for cernlib, fix licence issues
+- build shared libraries
+- simplify the scripts modifications
+
 * Fri Nov 25 2005 Patrice Dumas  - 2005-4.8
 - use debian patches of the cernlib 2005 patchset for the files removal
 - move kernlib out of packlib


Index: paw.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/paw.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw.README	16 Nov 2005 23:34:07 -0000	1.1
+++ paw.README	9 Dec 2005 16:09:19 -0000	1.2
@@ -5,18 +5,17 @@
 
 If you experience corruption of the graphics window when other windows are
 moved over top of it, turn on the BackingStore option of the X server.
-In the "Screen" section of your /etc/X11/XF86Config-4 file or 
-/etc/X11/xorg.conf, you should have
-something like:
+In the "Screen" section of your /etc/X11/XF86Config-4 or /etc/X11/xorg.conf
+file (whichever one exists), you should have something like:
 
 Section "Screen"
-        .
-        .
-        .
+	.
+	.
+	.
     Option "BackingStore"
-        .
-        .
-        .
+	.
+	.
+	.
 EndSection
 
 2) Remote data files
@@ -32,12 +31,22 @@
 If you compile a FORTRAN script within PAW, the path to the file cannot
 be excessively long (more than 256 characters).
 
-4) 64-bit issues
+4) Filename case issues
+
+The default behavior has been set so that PAW is case-sensitive in its 
+treatment of filenames.  If you have any old Paw scripts that do not
+treat filenames in a case-sensitive way, you may need to add the line
+
+        filecase convert
+
+to the beginning of them.
+
+5) 64-bit issues
 
 Note that this package is not yet fully functional on 64-bit machines, as the
 COMIS portion of Pawlib does not yet work correctly on those architectures.
 
--- Kevin McCarty , Mon, 29 Nov 2004
+-- Kevin McCarty , Tue, 22 Nov 2005
 
 Adapted to the rpm package by 
--- Dumas Patrice , Tue, 16 Jun 2005
+-- Dumas Patrice 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2005 10:43:24 -0000	1.4
+++ sources	9 Dec 2005 16:09:19 -0000	1.5
@@ -1,15 +1,15 @@
-1f25e16563f89a69c1b15b8ed11af904  src_car.tar.gz
+9d37e3c16c336d1887029227b27a42d8  src_car.tar.gz
 03bfd1239e57a23ab087bf29fe48c8a8  src_Imakefile.tar.gz
 fd20e80b3f58fc88168bcd6ce701f999  src_patchy.tar.gz
 9e686519ae3a52344222b21c9444ddd6  src_cfortran.tar.gz
 9ebd72a2b6e5349b25fc93e7b20c172a  src_include.tar.gz
-dcd46166a57a8a4ec45d872d79839f1a  src_pawlib.tar.gz
+bb4e224a7713ac4b8c13598e388c17f3  src_pawlib.tar.gz
 b72b89cb3a7f7c592d28b992c95b4eff  src_config.tar.gz
 0ec66e6d4920af79999b4c73fd3b065a  src_mathlib.tar.gz
 f215b9adba3cfb3be4bd74d624f00d32  src_phtools.tar.gz
-2cf91d533315b430f4e36c1c6e23841a  src_geant321.tar.gz
-ce6d941a50c3e1fdc8bdcc4ec2988116  src_mclibs.tar.gz
+24e2460fa61675df1cd74c7204a8d79e  src_geant321.tar.gz
+666d8a5c483c275463ebb1a3dd48c742  src_mclibs.tar.gz
 b30b121167ddf6508c22fc25a4272276  src_scripts.tar.gz
-f09d0f28e5c7ecc1a3932369f5a15dab  src_graflib.tar.gz
-d7d4628d136ed97f1e9ba164774a6878  src_packlib.tar.gz
+67228b011eac13b44499c50219e21545  src_graflib.tar.gz
+4fdcdc9f819ebbb9c6d3a04f339cdcf8  src_packlib.tar.gz
 eecb52159458ead0ee6b0d00b90aab66  xsneut95.dat


--- 003-enforce-FHS DELETED ---


--- 005-enable-shadow-passwd DELETED ---


--- 008-undef-PPC DELETED ---


--- 010-comis-allow-special-chars-in-path DELETED ---


--- 012-add-no-optimization-macro DELETED ---


--- 013-fix-paw-imakefile-special-rules DELETED ---


--- 013-fix-paw-imakefile-special-rules-modified DELETED ---


--- 014-fix-herwig-imakefile-special-rules DELETED ---


--- 015-fix-optimization DELETED ---


--- 028-fix-isajet-docs DELETED ---


--- 029-fixes-for-MacOSX DELETED ---


--- 030-filename-length-to-256 DELETED ---


--- 032-use-regcomp-not-re_comp DELETED ---


--- 033-fix-undefined-insertchar DELETED ---


--- 035-do-not-use-XmFontListCreate DELETED ---


--- 038-fix-strndup-macro-problem DELETED ---


--- 039-use-DBLE-not-REAL DELETED ---


--- 044-fix-strdup-redefinition DELETED ---


--- 045-compile-with-isasrt DELETED ---


--- 047-fix-paw++-menus DELETED ---


--- cernlib-XmDrawShadow-no-prototype.patch DELETED ---


--- cernlib-bimsel-nodouble-save.diff DELETED ---


--- cernlib-config_pmac.diff DELETED ---


--- cernlib-hwhiga_use_aimag.diff DELETED ---


--- cernlib-hwuli2_use_aimag.diff DELETED ---


--- cernlib-includelist.txt DELETED ---


--- cernlib-install_scripts.patch DELETED ---


--- cernlib-static-tcpaw.diff DELETED ---


--- cernlib_2004.11.04-3.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 16:17:33 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 11:17:33 -0500
Subject: rpms/cernlib/FC-3 cernlib.spec,1.8,1.9
Message-ID: <200512091618.jB9GI39g026381@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
Correct wrongly uncommmented BuildRequires line



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cernlib.spec	9 Dec 2005 16:06:04 -0000	1.8
+++ cernlib.spec	9 Dec 2005 16:17:31 -0000	1.9
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.1
+Release:       8%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -15,7 +15,7 @@
 # fc 3
 BuildRequires: xorg-x11-devel lapack blas openmotif-devel
 # fc 4
-BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
+#BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
 # fc devel
 #BuildRequires: imake lapack-devel blas-devel openmotif-devel 
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
@@ -692,7 +692,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8.1
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.2
 - update with newer debian patchset for cernlib, fix licence issues
 - enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary



From fedora-extras-commits at redhat.com  Fri Dec  9 17:28:15 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 12:28:15 -0500
Subject: rpms/cernlib/FC-4 315-fixes-for-MacOSX.dpatch, 1.1, 1.2 cernlib.spec,
	1.11, 1.12
Message-ID: <200512091728.jB9HSjCk028302@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	315-fixes-for-MacOSX.dpatch cernlib.spec 
Log Message:
Correct patch 315 that conflicts with 211



Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 315-fixes-for-MacOSX.dpatch	9 Dec 2005 16:09:19 -0000	1.1
+++ 315-fixes-for-MacOSX.dpatch	9 Dec 2005 17:28:12 -0000	1.2
@@ -679,10 +679,10 @@
 diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
 --- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
 +++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
-@@ -26,7 +26,12 @@
-       I=CSLTGP(IPVS)
-       IF(I.GT.0)THEN
-         IF(IFCS.EQ.0)THEN
+@@ -38,7 +38,12 @@
+             IFCS=-2
+             CALL CSRTGPL(I)
+ #else
 +c     thanks to Keisuke Fujii for this patch for OS X
 +#if defined(CERNLIB_MACOSX)
 +          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
@@ -692,10 +692,10 @@
            IF(IADGP.NE.0)THEN
              IFCS=-2
              CALL CSRTGP(I)
-@@ -35,7 +40,11 @@
-           ENDIF
+@@ -58,7 +63,11 @@
+           I=CSITGPL(IPVS)
          ENDIF
-       ELSE
+ #else
 +#if defined(CERNLIB_MACOSX)
 +        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cernlib.spec	9 Dec 2005 16:09:19 -0000	1.11
+++ cernlib.spec	9 Dec 2005 17:28:12 -0000	1.12
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}
+Release:       8%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -691,7 +691,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.1
 - use new debian patchset
 - enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary



From fedora-extras-commits at redhat.com  Fri Dec  9 17:31:19 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 12:31:19 -0500
Subject: rpms/cernlib/FC-3 315-fixes-for-MacOSX.dpatch, 1.1, 1.2 cernlib.spec,
	1.9, 1.10
Message-ID: <200512091731.jB9HVngc028362@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	315-fixes-for-MacOSX.dpatch cernlib.spec 
Log Message:
Modify patch 315 that conflicted with 211



Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 315-fixes-for-MacOSX.dpatch	9 Dec 2005 15:57:06 -0000	1.1
+++ 315-fixes-for-MacOSX.dpatch	9 Dec 2005 17:31:10 -0000	1.2
@@ -679,10 +679,10 @@
 diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
 --- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
 +++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
-@@ -26,7 +26,12 @@
-       I=CSLTGP(IPVS)
-       IF(I.GT.0)THEN
-         IF(IFCS.EQ.0)THEN
+@@ -38,7 +38,12 @@
+             IFCS=-2
+             CALL CSRTGPL(I)
+ #else
 +c     thanks to Keisuke Fujii for this patch for OS X
 +#if defined(CERNLIB_MACOSX)
 +          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
@@ -692,10 +692,10 @@
            IF(IADGP.NE.0)THEN
              IFCS=-2
              CALL CSRTGP(I)
-@@ -35,7 +40,11 @@
-           ENDIF
+@@ -58,7 +63,11 @@
+           I=CSITGPL(IPVS)
          ENDIF
-       ELSE
+ #else
 +#if defined(CERNLIB_MACOSX)
 +        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cernlib.spec	9 Dec 2005 16:17:31 -0000	1.9
+++ cernlib.spec	9 Dec 2005 17:31:10 -0000	1.10
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.2
+Release:       8%{?dist}.3
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -692,7 +692,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8.2
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.3
 - update with newer debian patchset for cernlib, fix licence issues
 - enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary



From fedora-extras-commits at redhat.com  Fri Dec  9 19:14:27 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri,  9 Dec 2005 14:14:27 -0500
Subject: rpms/ircd-hybrid import.log,1.12,1.13
Message-ID: <200512091914.jB9JEvND031835@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31798

Modified Files:
	import.log 
Log Message:
auto-import ircd-hybrid-7.2.0-2 on branch devel from ircd-hybrid-7.2.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- import.log	19 Nov 2005 12:40:13 -0000	1.12
+++ import.log	9 Dec 2005 19:14:25 -0000	1.13
@@ -9,3 +9,4 @@
 ircd-hybrid-7_1_3-11:HEAD:ircd-hybrid-7.1.3-11.src.rpm:1132403221
 ircd-hybrid-7_1_3-11:FC-3:ircd-hybrid-7.1.3-11.src.rpm:1132403904
 ircd-hybrid-7_1_3-11:FC-4:ircd-hybrid-7.1.3-11.src.rpm:1132404003
+ircd-hybrid-7_2_0-2:HEAD:ircd-hybrid-7.2.0-2.src.rpm:1134155655



From fedora-extras-commits at redhat.com  Fri Dec  9 19:14:33 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri,  9 Dec 2005 14:14:33 -0500
Subject: rpms/ircd-hybrid/devel .cvsignore, 1.2, 1.3 ircd-hybrid.spec, 1.5,
	1.6 sources, 1.2, 1.3 ircd-hybrid-7.1.3-openssl.diff, 1.1, NONE
Message-ID: <200512091915.jB9JF3f4031842@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31798/devel

Modified Files:
	.cvsignore ircd-hybrid.spec sources 
Removed Files:
	ircd-hybrid-7.1.3-openssl.diff 
Log Message:
auto-import ircd-hybrid-7.2.0-2 on branch devel from ircd-hybrid-7.2.0-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2005 18:50:08 -0000	1.2
+++ .cvsignore	9 Dec 2005 19:14:31 -0000	1.3
@@ -1 +1 @@
-ircd-hybrid-7.1.3.tgz
+ircd-hybrid-7.2.0.tgz


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/devel/ircd-hybrid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ircd-hybrid.spec	19 Nov 2005 12:27:17 -0000	1.5
+++ ircd-hybrid.spec	9 Dec 2005 19:14:31 -0000	1.6
@@ -9,14 +9,13 @@
 
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
-Version: 7.1.3
-Release: 11%{?dist}
+Version: 7.2.0
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
-Patch0:	ircd-hybrid-7.1.3-openssl.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): fedora-usermgmt
@@ -33,16 +32,16 @@
 
 %prep
 %setup -q
-%patch0 -p1
-sed -i 's?\r??' doc/Tao-of-IRC.940110
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
+# Change modules/autoload path (IRCD_PREFIX "/modules/autoload/" - by default)
 # Change modules path (IRCD_PREFIX "/modules/" - by default)
 %{__perl} -pi -e 's|(^#define ETCPATH) .*|$1 "%{_sysconfdir}/ircd"|g;
                   s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g;
+		   s|(^#define AUTOMODPATH IRCD_PREFIX) .*|#define AUTOMODPATH "%{_libdir}/ircd/modules/autoload/"|g;
                   s|(^#define MODPATH) .*|$1 "%{_libdir}/ircd/modules/"|g' \
-    include/defaults.h
+   include/defaults.h
 #Added for x86_64 arch support
 sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
@@ -50,7 +49,7 @@
 %build
 %configure \
     --sysconfdir=%{_sysconfdir}/ircd \
-    --with-nicklen=%{nicklen} \
+   --with-nicklen=%{nicklen} \
     --with-topiclen=%{topiclen} \
     --with-maxconn=%{maxconn}
 %{__make} %{?_smp_mflags}
@@ -70,7 +69,7 @@
 
 # Move binaries with generic and potentially conflicting names ouf of the way
 %{__mkdir_p} %{buildroot}%{_libexecdir}/ircd/
-%{__mv} %{buildroot}%{_bindir}/{conv*,encspeed,mkpasswd,vi*} \
+%{__mv} %{buildroot}%{_bindir}/{encspeed,mkpasswd} \
         %{buildroot}%{_libexecdir}/ircd/
 
 # Move empty directory which we changed previously (src/Makefile.in would need
@@ -113,7 +112,7 @@
 %files
 %defattr(-, root, root, -)
 %doc BUGS ChangeLog Hybrid-team LICENSE README.FIRST RELNOTES TODO
-%doc doc/{*.txt,server-version-info,Tao-of-IRC.940110,technical/}
+%doc doc/{*.txt,server-version-info,technical/}
 %doc etc/*.conf*
 %attr(770,ircd,ircd) %dir %{_sysconfdir}/ircd/
 %attr(640,ircd,ircd) %config(noreplace) %{_sysconfdir}/ircd/*
@@ -126,10 +125,16 @@
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-%exclude %{_includedir}
+%exclude %{_prefix}/help
 
 
 %changelog
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-2
+- Modify spec file to take into account the 7.2.0 update
+
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-1
+- Update to 7.2.0
+
 * Fri Nov 18 2005 Eric Tanguy 7.1.3-11
 - modify changelog
 - modify abslolute path to relative one for doc/Tao-of-IRC.940110


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2005 18:50:08 -0000	1.2
+++ sources	9 Dec 2005 19:14:31 -0000	1.3
@@ -1 +1 @@
-4f3a69eed68b00bf72bfede35fffb70d  ircd-hybrid-7.1.3.tgz
+e3c716fef0c62eaba147df06f32ea87d  ircd-hybrid-7.2.0.tgz


--- ircd-hybrid-7.1.3-openssl.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 20:16:03 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 15:16:03 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.12,1.13
Message-ID: <200512092016.jB9KGXA3001260@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
re exclude x86_64



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cernlib.spec	9 Dec 2005 17:28:12 -0000	1.12
+++ cernlib.spec	9 Dec 2005 20:16:01 -0000	1.13
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.1
+Release:       8%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -22,6 +22,8 @@
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# f771 segfaults on x86_64
+ExcludeArch:   x86_64
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -691,7 +693,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8.1
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.2
 - use new debian patchset
 - enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary



From fedora-extras-commits at redhat.com  Fri Dec  9 20:39:10 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 15:39:10 -0500
Subject: rpms/cernlib/devel 315-fixes-for-MacOSX.dpatch, 1.1,
	1.2 cernlib.spec, 1.7, 1.8
Message-ID: <200512092039.jB9KdeIB001354@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	315-fixes-for-MacOSX.dpatch cernlib.spec 
Log Message:
Correct patch 315 that conflicts with 211




Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 315-fixes-for-MacOSX.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 315-fixes-for-MacOSX.dpatch	9 Dec 2005 20:39:08 -0000	1.2
@@ -679,10 +679,10 @@
 diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
 --- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
 +++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
-@@ -26,7 +26,12 @@
-       I=CSLTGP(IPVS)
-       IF(I.GT.0)THEN
-         IF(IFCS.EQ.0)THEN
+@@ -38,7 +38,12 @@
+             IFCS=-2
+             CALL CSRTGPL(I)
+ #else
 +c     thanks to Keisuke Fujii for this patch for OS X
 +#if defined(CERNLIB_MACOSX)
 +          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
@@ -692,10 +692,10 @@
            IF(IADGP.NE.0)THEN
              IFCS=-2
              CALL CSRTGP(I)
-@@ -35,7 +40,11 @@
-           ENDIF
+@@ -58,7 +63,11 @@
+           I=CSITGPL(IPVS)
          ENDIF
-       ELSE
+ #else
 +#if defined(CERNLIB_MACOSX)
 +        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cernlib.spec	9 Dec 2005 13:18:44 -0000	1.7
+++ cernlib.spec	9 Dec 2005 20:39:08 -0000	1.8
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}
+Release:       8%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -12,10 +12,14 @@
 #BuildRequires: gcc-g77
 #Requires:      libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
 # fedora core
+# fc 3
+#BuildRequires: xorg-x11-devel lapack blas openmotif-devel
+# fc 4
+#BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
+# fc devel
 BuildRequires: imake lapack-devel blas-devel openmotif-devel 
 # workaround #173530
 BuildRequires: libXau-devel
-#BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
 # build the cernlib
 BuildRequires: /usr/bin/g77
@@ -689,7 +693,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.1
 - use new debian patchset
 - enable 64 bit fixes patch
 



From fedora-extras-commits at redhat.com  Fri Dec  9 22:03:54 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri,  9 Dec 2005 17:03:54 -0500
Subject: rpms/ircd-hybrid import.log,1.13,1.14
Message-ID: <200512092204.jB9M4OW7004842@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4801

Modified Files:
	import.log 
Log Message:
auto-import ircd-hybrid-7.2.0-2 on branch FC-4 from ircd-hybrid-7.2.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	9 Dec 2005 19:14:25 -0000	1.13
+++ import.log	9 Dec 2005 22:03:51 -0000	1.14
@@ -10,3 +10,4 @@
 ircd-hybrid-7_1_3-11:FC-3:ircd-hybrid-7.1.3-11.src.rpm:1132403904
 ircd-hybrid-7_1_3-11:FC-4:ircd-hybrid-7.1.3-11.src.rpm:1132404003
 ircd-hybrid-7_2_0-2:HEAD:ircd-hybrid-7.2.0-2.src.rpm:1134155655
+ircd-hybrid-7_2_0-2:FC-4:ircd-hybrid-7.2.0-2.src.rpm:1134165805



From fedora-extras-commits at redhat.com  Fri Dec  9 22:04:14 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri,  9 Dec 2005 17:04:14 -0500
Subject: rpms/ircd-hybrid/FC-4 .cvsignore, 1.2, 1.3 ircd-hybrid.spec, 1.4,
	1.5 sources, 1.2, 1.3 ircd-hybrid-7.1.3-openssl.diff, 1.1, NONE
Message-ID: <200512092204.jB9M4i4r004847@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4801/FC-4

Modified Files:
	.cvsignore ircd-hybrid.spec sources 
Removed Files:
	ircd-hybrid-7.1.3-openssl.diff 
Log Message:
auto-import ircd-hybrid-7.2.0-2 on branch FC-4 from ircd-hybrid-7.2.0-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2005 18:50:08 -0000	1.2
+++ .cvsignore	9 Dec 2005 22:04:11 -0000	1.3
@@ -1 +1 @@
-ircd-hybrid-7.1.3.tgz
+ircd-hybrid-7.2.0.tgz


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-4/ircd-hybrid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ircd-hybrid.spec	19 Nov 2005 12:40:19 -0000	1.4
+++ ircd-hybrid.spec	9 Dec 2005 22:04:11 -0000	1.5
@@ -9,14 +9,13 @@
 
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
-Version: 7.1.3
-Release: 11%{?dist}
+Version: 7.2.0
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
-Patch0:	ircd-hybrid-7.1.3-openssl.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): fedora-usermgmt
@@ -33,16 +32,16 @@
 
 %prep
 %setup -q
-%patch0 -p1
-sed -i 's?\r??' doc/Tao-of-IRC.940110
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
+# Change modules/autoload path (IRCD_PREFIX "/modules/autoload/" - by default)
 # Change modules path (IRCD_PREFIX "/modules/" - by default)
 %{__perl} -pi -e 's|(^#define ETCPATH) .*|$1 "%{_sysconfdir}/ircd"|g;
                   s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g;
+		   s|(^#define AUTOMODPATH IRCD_PREFIX) .*|#define AUTOMODPATH "%{_libdir}/ircd/modules/autoload/"|g;
                   s|(^#define MODPATH) .*|$1 "%{_libdir}/ircd/modules/"|g' \
-    include/defaults.h
+   include/defaults.h
 #Added for x86_64 arch support
 sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
@@ -50,7 +49,7 @@
 %build
 %configure \
     --sysconfdir=%{_sysconfdir}/ircd \
-    --with-nicklen=%{nicklen} \
+   --with-nicklen=%{nicklen} \
     --with-topiclen=%{topiclen} \
     --with-maxconn=%{maxconn}
 %{__make} %{?_smp_mflags}
@@ -70,7 +69,7 @@
 
 # Move binaries with generic and potentially conflicting names ouf of the way
 %{__mkdir_p} %{buildroot}%{_libexecdir}/ircd/
-%{__mv} %{buildroot}%{_bindir}/{conv*,encspeed,mkpasswd,vi*} \
+%{__mv} %{buildroot}%{_bindir}/{encspeed,mkpasswd} \
         %{buildroot}%{_libexecdir}/ircd/
 
 # Move empty directory which we changed previously (src/Makefile.in would need
@@ -113,7 +112,7 @@
 %files
 %defattr(-, root, root, -)
 %doc BUGS ChangeLog Hybrid-team LICENSE README.FIRST RELNOTES TODO
-%doc doc/{*.txt,server-version-info,Tao-of-IRC.940110,technical/}
+%doc doc/{*.txt,server-version-info,technical/}
 %doc etc/*.conf*
 %attr(770,ircd,ircd) %dir %{_sysconfdir}/ircd/
 %attr(640,ircd,ircd) %config(noreplace) %{_sysconfdir}/ircd/*
@@ -126,10 +125,16 @@
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-%exclude %{_includedir}
+%exclude %{_prefix}/help
 
 
 %changelog
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-2
+- Modify spec file to take into account the 7.2.0 update
+
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-1
+- Update to 7.2.0
+
 * Fri Nov 18 2005 Eric Tanguy 7.1.3-11
 - modify changelog
 - modify abslolute path to relative one for doc/Tao-of-IRC.940110


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2005 18:50:08 -0000	1.2
+++ sources	9 Dec 2005 22:04:11 -0000	1.3
@@ -1 +1 @@
-4f3a69eed68b00bf72bfede35fffb70d  ircd-hybrid-7.1.3.tgz
+e3c716fef0c62eaba147df06f32ea87d  ircd-hybrid-7.2.0.tgz


--- ircd-hybrid-7.1.3-openssl.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:08:49 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri,  9 Dec 2005 17:08:49 -0500
Subject: rpms/ircd-hybrid import.log,1.14,1.15
Message-ID: <200512092209.jB9M9JxE004952@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4916

Modified Files:
	import.log 
Log Message:
auto-import ircd-hybrid-7.2.0-2 on branch FC-3 from ircd-hybrid-7.2.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- import.log	9 Dec 2005 22:03:51 -0000	1.14
+++ import.log	9 Dec 2005 22:08:28 -0000	1.15
@@ -11,3 +11,4 @@
 ircd-hybrid-7_1_3-11:FC-4:ircd-hybrid-7.1.3-11.src.rpm:1132404003
 ircd-hybrid-7_2_0-2:HEAD:ircd-hybrid-7.2.0-2.src.rpm:1134155655
 ircd-hybrid-7_2_0-2:FC-4:ircd-hybrid-7.2.0-2.src.rpm:1134165805
+ircd-hybrid-7_2_0-2:FC-3:ircd-hybrid-7.2.0-2.src.rpm:1134166074



From fedora-extras-commits at redhat.com  Fri Dec  9 22:08:52 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri,  9 Dec 2005 17:08:52 -0500
Subject: rpms/ircd-hybrid/FC-3 .cvsignore, 1.2, 1.3 ircd-hybrid.spec, 1.4,
	1.5 sources, 1.2, 1.3 ircd-hybrid-7.1.3-openssl.diff, 1.1, NONE
Message-ID: <200512092209.jB9M9MCW004957@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4916/FC-3

Modified Files:
	.cvsignore ircd-hybrid.spec sources 
Removed Files:
	ircd-hybrid-7.1.3-openssl.diff 
Log Message:
auto-import ircd-hybrid-7.2.0-2 on branch FC-3 from ircd-hybrid-7.2.0-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2005 18:50:08 -0000	1.2
+++ .cvsignore	9 Dec 2005 22:08:50 -0000	1.3
@@ -1 +1 @@
-ircd-hybrid-7.1.3.tgz
+ircd-hybrid-7.2.0.tgz


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/ircd-hybrid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ircd-hybrid.spec	19 Nov 2005 12:38:40 -0000	1.4
+++ ircd-hybrid.spec	9 Dec 2005 22:08:50 -0000	1.5
@@ -9,14 +9,13 @@
 
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
-Version: 7.1.3
-Release: 11%{?dist}
+Version: 7.2.0
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
-Patch0:	ircd-hybrid-7.1.3-openssl.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): fedora-usermgmt
@@ -33,16 +32,16 @@
 
 %prep
 %setup -q
-%patch0 -p1
-sed -i 's?\r??' doc/Tao-of-IRC.940110
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
+# Change modules/autoload path (IRCD_PREFIX "/modules/autoload/" - by default)
 # Change modules path (IRCD_PREFIX "/modules/" - by default)
 %{__perl} -pi -e 's|(^#define ETCPATH) .*|$1 "%{_sysconfdir}/ircd"|g;
                   s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g;
+		   s|(^#define AUTOMODPATH IRCD_PREFIX) .*|#define AUTOMODPATH "%{_libdir}/ircd/modules/autoload/"|g;
                   s|(^#define MODPATH) .*|$1 "%{_libdir}/ircd/modules/"|g' \
-    include/defaults.h
+   include/defaults.h
 #Added for x86_64 arch support
 sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
@@ -50,7 +49,7 @@
 %build
 %configure \
     --sysconfdir=%{_sysconfdir}/ircd \
-    --with-nicklen=%{nicklen} \
+   --with-nicklen=%{nicklen} \
     --with-topiclen=%{topiclen} \
     --with-maxconn=%{maxconn}
 %{__make} %{?_smp_mflags}
@@ -70,7 +69,7 @@
 
 # Move binaries with generic and potentially conflicting names ouf of the way
 %{__mkdir_p} %{buildroot}%{_libexecdir}/ircd/
-%{__mv} %{buildroot}%{_bindir}/{conv*,encspeed,mkpasswd,vi*} \
+%{__mv} %{buildroot}%{_bindir}/{encspeed,mkpasswd} \
         %{buildroot}%{_libexecdir}/ircd/
 
 # Move empty directory which we changed previously (src/Makefile.in would need
@@ -113,7 +112,7 @@
 %files
 %defattr(-, root, root, -)
 %doc BUGS ChangeLog Hybrid-team LICENSE README.FIRST RELNOTES TODO
-%doc doc/{*.txt,server-version-info,Tao-of-IRC.940110,technical/}
+%doc doc/{*.txt,server-version-info,technical/}
 %doc etc/*.conf*
 %attr(770,ircd,ircd) %dir %{_sysconfdir}/ircd/
 %attr(640,ircd,ircd) %config(noreplace) %{_sysconfdir}/ircd/*
@@ -126,10 +125,16 @@
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-%exclude %{_includedir}
+%exclude %{_prefix}/help
 
 
 %changelog
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-2
+- Modify spec file to take into account the 7.2.0 update
+
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-1
+- Update to 7.2.0
+
 * Fri Nov 18 2005 Eric Tanguy 7.1.3-11
 - modify changelog
 - modify abslolute path to relative one for doc/Tao-of-IRC.940110


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2005 18:50:08 -0000	1.2
+++ sources	9 Dec 2005 22:08:50 -0000	1.3
@@ -1 +1 @@
-4f3a69eed68b00bf72bfede35fffb70d  ircd-hybrid-7.1.3.tgz
+e3c716fef0c62eaba147df06f32ea87d  ircd-hybrid-7.2.0.tgz


--- ircd-hybrid-7.1.3-openssl.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:13:31 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri,  9 Dec 2005 17:13:31 -0500
Subject: fedora-security/audit fc4,1.101,1.102 fc5,1.13,1.14
Message-ID: <200512092214.jB9ME2eY005142@cvs-int.fedora.redhat.com>

Author: bressers

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

Modified Files:
	fc4 fc5 
Log Message:
* We are still vulnerable to an old gd issue.
* Add a new ethereal CVE id.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- fc4	8 Dec 2005 19:35:27 -0000	1.101
+++ fc4	9 Dec 2005 22:13:29 -0000	1.102
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2005-4077 VULNERABLE (curl)
+CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)
 CVE-2005-3193 VULNERABLE (tetex)
@@ -703,7 +704,7 @@
 CVE-2004-1004 version (mc, fixed 4.6.0)
 CVE-2004-1002 ignore (ppp) not a security issue
 CVE-2004-0996 backport (cscope, not fixed in 15.5)
-CVE-2004-0990 version (gd, fixed 2.0.29)
+CVE-2004-0990 VULNERABLE (gd)
 CVE-2004-0989 version (libxml2, fixed 2.6.15)
 CVE-2004-0986 version (iptables, fixed 1.2.12)
 CVE-2004-0983 version (ruby, fixed 1.8.2)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fc5	8 Dec 2005 19:35:28 -0000	1.13
+++ fc5	9 Dec 2005 22:13:29 -0000	1.14
@@ -13,6 +13,7 @@
 ** are items that need attention
 
 CVE-2005-4077 VULNERABLE (curl)
+CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)
 CVE-2005-3193 VULNERABLE (tetex)
@@ -743,7 +744,7 @@
 CVE-2004-1004 version (mc, fixed 4.6.0)
 CVE-2004-1002 ignore (ppp) not a security issue
 CVE-2004-0996 backport (cscope) not fixed in 15.5
-CVE-2004-0990 version (gd, fixed 2.0.29)
+CVE-2004-0990 VULNERABLE (gd)
 CVE-2004-0989 version (libxml2, fixed 2.6.15)
 CVE-2004-0986 version (iptables, fixed 1.2.12)
 CVE-2004-0983 version (ruby, fixed 1.8.2)



From fedora-extras-commits at redhat.com  Fri Dec  9 22:21:51 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:21:51 -0500
Subject: rpms/xfce4-windowlist-plugin - New directory
Message-ID: <200512092221.jB9MLpn1005254@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5245/xfce4-windowlist-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-windowlist-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:21:56 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:21:56 -0500
Subject: rpms/xfce4-windowlist-plugin/devel - New directory
Message-ID: <200512092221.jB9MLuwJ005270@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5245/xfce4-windowlist-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-windowlist-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:22:17 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:22:17 -0500
Subject: rpms/xfce4-windowlist-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512092222.jB9MMHnE005305@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5292

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-windowlist-plugin


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:22:25 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:22:25 -0500
Subject: rpms/xfce4-windowlist-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512092222.jB9MMPV1005327@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5292/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-windowlist-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:23:31 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:23:31 -0500
Subject: rpms/xfce4-windowlist-plugin import.log,1.1,1.2
Message-ID: <200512092224.jB9MO2en005408@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5371

Modified Files:
	import.log 
Log Message:
auto-import xfce4-windowlist-plugin-0.1.0-4.fc4 on branch devel from xfce4-windowlist-plugin-0.1.0-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-windowlist-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Dec 2005 22:22:15 -0000	1.1
+++ import.log	9 Dec 2005 22:23:29 -0000	1.2
@@ -0,0 +1 @@
+xfce4-windowlist-plugin-0_1_0-4_fc4:HEAD:xfce4-windowlist-plugin-0.1.0-4.fc4.src.rpm:1134166999



From fedora-extras-commits at redhat.com  Fri Dec  9 22:23:37 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:23:37 -0500
Subject: rpms/xfce4-windowlist-plugin/devel xfce4-windowlist-plugin.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512092224.jB9MO7Av005412@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5371/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-windowlist-plugin.spec 
Log Message:
auto-import xfce4-windowlist-plugin-0.1.0-4.fc4 on branch devel from xfce4-windowlist-plugin-0.1.0-4.fc4.src.rpm


--- NEW FILE xfce4-windowlist-plugin.spec ---
Name:		xfce4-windowlist-plugin
Version:	0.1.0
Release:	4%{?dist}
Summary:	Windowlist plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
Windowlist plugin for the Xfce panel. The menubutton shows the icon of the 
active window and leftclick pops up a window list. Leftclick on one of the 
items activates the selected window, rightclick pops up a window action menu.

%prep
%setup -q -n %{name}

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.1.0-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.1.0-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.1.0-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.1.0-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.1.0-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-windowlist-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Dec 2005 22:22:23 -0000	1.1
+++ .cvsignore	9 Dec 2005 22:23:35 -0000	1.2
@@ -0,0 +1 @@
+xfce4-windowlist-plugin-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-windowlist-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Dec 2005 22:22:23 -0000	1.1
+++ sources	9 Dec 2005 22:23:35 -0000	1.2
@@ -0,0 +1 @@
+29b1a752003734c0b8171200dfafb733  xfce4-windowlist-plugin-0.1.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 22:31:42 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:31:42 -0500
Subject: rpms/xfce4-datetime-plugin - New directory
Message-ID: <200512092231.jB9MVgwK005551@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5542/xfce4-datetime-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-datetime-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:31:47 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:31:47 -0500
Subject: rpms/xfce4-datetime-plugin/devel - New directory
Message-ID: <200512092231.jB9MVlu1005567@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5542/xfce4-datetime-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-datetime-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:32:08 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:32:08 -0500
Subject: rpms/xfce4-datetime-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512092232.jB9MW8KZ005602@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5589

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-datetime-plugin


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:32:14 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:32:14 -0500
Subject: rpms/xfce4-datetime-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512092232.jB9MWEDe005623@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5589/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-datetime-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:33:22 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:33:22 -0500
Subject: rpms/xfce4-datetime-plugin import.log,1.1,1.2
Message-ID: <200512092233.jB9MXqsV005695@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5659

Modified Files:
	import.log 
Log Message:
auto-import xfce4-datetime-plugin-0.3.1-4.fc4 on branch devel from xfce4-datetime-plugin-0.3.1-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Dec 2005 22:32:06 -0000	1.1
+++ import.log	9 Dec 2005 22:33:19 -0000	1.2
@@ -0,0 +1 @@
+xfce4-datetime-plugin-0_3_1-4_fc4:HEAD:xfce4-datetime-plugin-0.3.1-4.fc4.src.rpm:1134167590



From fedora-extras-commits at redhat.com  Fri Dec  9 22:33:27 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:33:27 -0500
Subject: rpms/xfce4-datetime-plugin/devel xfce4-datetime-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512092233.jB9MXvWs005699@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5659/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-datetime-plugin.spec 
Log Message:
auto-import xfce4-datetime-plugin-0.3.1-4.fc4 on branch devel from xfce4-datetime-plugin-0.3.1-4.fc4.src.rpm


--- NEW FILE xfce4-datetime-plugin.spec ---
Name:		xfce4-datetime-plugin
Version:	0.3.1
Release:	4%{?dist}
Summary:	Date/time plugin 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.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxml2-devel, gettext

%description
An alternative clock plugin for the Xfce panel. A calendar appears when you 
left-click on it.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang xfce4-datetime

%clean
rm -rf $RPM_BUILD_ROOT

%files -f xfce4-datetime.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Fri Nov 25 2005 Christoph Wickert  - 0.3.1-4
- Rebuild with new source because of md5sum mismatch.

* Mon Nov 14 2005 Christoph Wickert  - 0.3.1-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.3.1-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.3.1-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.3.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Dec 2005 22:32:11 -0000	1.1
+++ .cvsignore	9 Dec 2005 22:33:25 -0000	1.2
@@ -0,0 +1 @@
+xfce4-datetime-plugin-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Dec 2005 22:32:11 -0000	1.1
+++ sources	9 Dec 2005 22:33:25 -0000	1.2
@@ -0,0 +1 @@
+92b7ebee7f0c8074f5cf590f77f676f2  xfce4-datetime-plugin-0.3.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 22:36:31 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:36:31 -0500
Subject: rpms/xfce4-genmon-plugin - New directory
Message-ID: <200512092236.jB9MaVCJ005787@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5778/xfce4-genmon-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-genmon-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:36:36 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:36:36 -0500
Subject: rpms/xfce4-genmon-plugin/devel - New directory
Message-ID: <200512092236.jB9MaaEq005803@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5778/xfce4-genmon-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-genmon-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:36:57 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:36:57 -0500
Subject: rpms/xfce4-genmon-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512092236.jB9MavMJ005838@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5825

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-genmon-plugin


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:37:03 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:37:03 -0500
Subject: rpms/xfce4-genmon-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512092237.jB9Mb3JP005859@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5825/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-genmon-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:38:00 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:38:00 -0500
Subject: rpms/xfce4-genmon-plugin import.log,1.1,1.2
Message-ID: <200512092238.jB9McUox005934@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5898

Modified Files:
	import.log 
Log Message:
auto-import xfce4-genmon-plugin-1.1-4.fc4 on branch devel from xfce4-genmon-plugin-1.1-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Dec 2005 22:36:55 -0000	1.1
+++ import.log	9 Dec 2005 22:37:58 -0000	1.2
@@ -0,0 +1 @@
+xfce4-genmon-plugin-1_1-4_fc4:HEAD:xfce4-genmon-plugin-1.1-4.fc4.src.rpm:1134167869



From fedora-extras-commits at redhat.com  Fri Dec  9 22:38:06 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:38:06 -0500
Subject: rpms/xfce4-genmon-plugin/devel xfce4-genmon-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512092238.jB9McaQp005940@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5898/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-genmon-plugin.spec 
Log Message:
auto-import xfce4-genmon-plugin-1.1-4.fc4 on branch devel from xfce4-genmon-plugin-1.1-4.fc4.src.rpm


--- NEW FILE xfce4-genmon-plugin.spec ---
Name:		xfce4-genmon-plugin
Version:	1.1
Release:	4%{?dist}
Summary:	Generic monitor plugin for the Xfce panel

Group:		User Interface/Desktops
License:	LGPL
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
The GenMon plugin cyclically spawns the indicated script/program,
captures its output and displays it as a string into the panel.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 1.1-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 1.1-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 1.1-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 1.1-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 1.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Dec 2005 22:37:01 -0000	1.1
+++ .cvsignore	9 Dec 2005 22:38:04 -0000	1.2
@@ -0,0 +1 @@
+xfce4-genmon-plugin-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Dec 2005 22:37:01 -0000	1.1
+++ sources	9 Dec 2005 22:38:04 -0000	1.2
@@ -0,0 +1 @@
+130be5e17d4ae41f86bbb952adb6a95d  xfce4-genmon-plugin-1.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 22:40:38 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:40:38 -0500
Subject: rpms/xfce4-weather-plugin - New directory
Message-ID: <200512092240.jB9Mecr0006025@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6016/xfce4-weather-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-weather-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:40:43 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:40:43 -0500
Subject: rpms/xfce4-weather-plugin/devel - New directory
Message-ID: <200512092240.jB9MehZP006041@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6016/xfce4-weather-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-weather-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:41:03 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:41:03 -0500
Subject: rpms/xfce4-weather-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512092241.jB9Mf3NU006076@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-weather-plugin


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:41:09 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:41:09 -0500
Subject: rpms/xfce4-weather-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512092241.jB9Mf9s5006097@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-weather-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:42:40 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:42:40 -0500
Subject: rpms/xfce4-weather-plugin import.log,1.1,1.2
Message-ID: <200512092243.jB9MhANq006180@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6138

Modified Files:
	import.log 
Log Message:
auto-import xfce4-weather-plugin-0.4.9-4.fc4 on branch devel from xfce4-weather-plugin-0.4.9-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Dec 2005 22:41:01 -0000	1.1
+++ import.log	9 Dec 2005 22:42:38 -0000	1.2
@@ -0,0 +1 @@
+xfce4-weather-plugin-0_4_9-4_fc4:HEAD:xfce4-weather-plugin-0.4.9-4.fc4.src.rpm:1134168149



From fedora-extras-commits at redhat.com  Fri Dec  9 22:42:45 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:42:45 -0500
Subject: rpms/xfce4-weather-plugin/devel xfce4-weather-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512092243.jB9MhGwo006184@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6138/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-weather-plugin.spec 
Log Message:
auto-import xfce4-weather-plugin-0.4.9-4.fc4 on branch devel from xfce4-weather-plugin-0.4.9-4.fc4.src.rpm


--- NEW FILE xfce4-weather-plugin.spec ---
Name:		xfce4-weather-plugin
Version:	0.4.9
Release:	4%{?dist}
Summary:	Weather plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
A weather plugin for the Xfce panel. It shows the current temperature and 
weather condition, using weather data provided by xoap.weather.com.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang xfce4-weather

%clean
rm -rf $RPM_BUILD_ROOT

%files -f xfce4-weather.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so
%{_datadir}/xfce4/*

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.4.9-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.4.9-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.4.9-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.4.9-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.4.9-1.fc3.cw
- Updated to version 0.4.9.

* Wed Apr 13 2005 Christoph Wickert  - 0.3.9.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Dec 2005 22:41:06 -0000	1.1
+++ .cvsignore	9 Dec 2005 22:42:43 -0000	1.2
@@ -0,0 +1 @@
+xfce4-weather-plugin-0.4.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Dec 2005 22:41:06 -0000	1.1
+++ sources	9 Dec 2005 22:42:43 -0000	1.2
@@ -0,0 +1 @@
+1d5ba253c8eae5a9ad5e3d7002a0dae0  xfce4-weather-plugin-0.4.9.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 22:45:54 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:45:54 -0500
Subject: rpms/xfce4-xmms-plugin - New directory
Message-ID: <200512092245.jB9MjsPX006285@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6276/xfce4-xmms-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-xmms-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:46:01 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:46:01 -0500
Subject: rpms/xfce4-xmms-plugin/devel - New directory
Message-ID: <200512092246.jB9Mk17n006303@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6276/xfce4-xmms-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-xmms-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:46:28 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:46:28 -0500
Subject: rpms/xfce4-xmms-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512092246.jB9MkSkP006338@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6325

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-xmms-plugin


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:46:33 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:46:33 -0500
Subject: rpms/xfce4-xmms-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512092246.jB9MkXcd006359@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6325/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-xmms-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:47:57 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:47:57 -0500
Subject: rpms/xfce4-xmms-plugin import.log,1.1,1.2
Message-ID: <200512092248.jB9MmS9F006452@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6407

Modified Files:
	import.log 
Log Message:
auto-import xfce4-xmms-plugin-0.3.1-4.fc4 on branch devel from xfce4-xmms-plugin-0.3.1-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Dec 2005 22:46:25 -0000	1.1
+++ import.log	9 Dec 2005 22:47:55 -0000	1.2
@@ -0,0 +1 @@
+xfce4-xmms-plugin-0_3_1-4_fc4:HEAD:xfce4-xmms-plugin-0.3.1-4.fc4.src.rpm:1134168466



From fedora-extras-commits at redhat.com  Fri Dec  9 22:48:03 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:48:03 -0500
Subject: rpms/xfce4-xmms-plugin/devel xfce4-xmms-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512092248.jB9MmXUB006456@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6407/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-xmms-plugin.spec 
Log Message:
auto-import xfce4-xmms-plugin-0.3.1-4.fc4 on branch devel from xfce4-xmms-plugin-0.3.1-4.fc4.src.rpm


--- NEW FILE xfce4-xmms-plugin.spec ---
Name:		xfce4-xmms-plugin
Version:	0.3.1
Release:	4%{?dist}
Summary:	XMMS plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildRequires:	gettext, xmms-devel >= 1.2
Requires:	xmms >= 1.2


%description
Control XMMS from the Xfce panel.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so
%{_datadir}/xfce4/*

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.3.1-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.3.1-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.3.1-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.3.1-1.fc4.cw
- Updated to version 0.3.1.
- Rebuild for Core 4.

* Thu Apr 14 2005 Christoph Wickert  - 0.1.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Dec 2005 22:46:31 -0000	1.1
+++ .cvsignore	9 Dec 2005 22:48:01 -0000	1.2
@@ -0,0 +1 @@
+xfce4-xmms-plugin-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Dec 2005 22:46:31 -0000	1.1
+++ sources	9 Dec 2005 22:48:01 -0000	1.2
@@ -0,0 +1 @@
+0dac8795b192383c13b1d5cd072b754a  xfce4-xmms-plugin-0.3.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec  9 22:51:19 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:51:19 -0500
Subject: rpms/xfce4-cpugraph-plugin - New directory
Message-ID: <200512092251.jB9MpJav006553@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6543/xfce4-cpugraph-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-cpugraph-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:51:24 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:51:24 -0500
Subject: rpms/xfce4-cpugraph-plugin/devel - New directory
Message-ID: <200512092251.jB9MpOHL006569@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6543/xfce4-cpugraph-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-cpugraph-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:51:45 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:51:45 -0500
Subject: rpms/xfce4-cpugraph-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512092251.jB9Mpjbs006607@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6594

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-cpugraph-plugin


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:51:50 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:51:50 -0500
Subject: rpms/xfce4-cpugraph-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512092251.jB9Mpo8g006628@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6594/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-cpugraph-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:52:45 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:52:45 -0500
Subject: rpms/xfce4-cpugraph-plugin import.log,1.1,1.2
Message-ID: <200512092253.jB9MrFLO006716@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6675

Modified Files:
	import.log 
Log Message:
auto-import xfce4-cpugraph-plugin-0.2.2-4.fc4 on branch devel from xfce4-cpugraph-plugin-0.2.2-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Dec 2005 22:51:43 -0000	1.1
+++ import.log	9 Dec 2005 22:52:42 -0000	1.2
@@ -0,0 +1 @@
+xfce4-cpugraph-plugin-0_2_2-4_fc4:HEAD:xfce4-cpugraph-plugin-0.2.2-4.fc4.src.rpm:1134168753



From fedora-extras-commits at redhat.com  Fri Dec  9 22:52:50 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:52:50 -0500
Subject: rpms/xfce4-cpugraph-plugin/devel xfce4-cpugraph-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512092253.jB9MrKjE006722@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6675/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-cpugraph-plugin.spec 
Log Message:
auto-import xfce4-cpugraph-plugin-0.2.2-4.fc4 on branch devel from xfce4-cpugraph-plugin-0.2.2-4.fc4.src.rpm


--- NEW FILE xfce4-cpugraph-plugin.spec ---
Name:		xfce4-cpugraph-plugin
Version:	0.2.2
Release:	4%{?dist}
Summary:	CPU monitor for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel  >= 4.2, libxml2-devel

%description
A CPU monitor plugin for the Xfce panel. It offers multiple display modes 
(LED, gradient, fire, etc...) to show the current CPU load of the system. The 
colors and the size of the plugin are customizable.

%prep
%setup -q -n %{name}

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README TODO
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Mon Nov 28 2005 Christoph Wickert  - 0.2.2-4
- Rebuild with new source because of md5sum mismatch.
- Add libxfcegui4-devel BuildReqs.

* Mon Nov 14 2005 Christoph Wickert  - 0.2.2-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.2.2-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.2.2-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.2.2-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Dec 2005 22:51:48 -0000	1.1
+++ .cvsignore	9 Dec 2005 22:52:48 -0000	1.2
@@ -0,0 +1 @@
+xfce4-cpugraph-plugin-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Dec 2005 22:51:48 -0000	1.1
+++ sources	9 Dec 2005 22:52:48 -0000	1.2
@@ -0,0 +1 @@
+bde4c578ef469aade3f6b58a9bde8ec6  xfce4-cpugraph-plugin-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 23:00:53 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 18:00:53 -0500
Subject: rpms/xfce4-datetime-plugin/devel xfce4-datetime-plugin.spec, 1.1,
	1.2
Message-ID: <200512092301.jB9N1M9j008389@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6830/devel

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
add missing libxfce4gui-devel BuildReq


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/xfce4-datetime-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-datetime-plugin.spec	9 Dec 2005 22:33:25 -0000	1.1
+++ xfce4-datetime-plugin.spec	9 Dec 2005 23:00:51 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-datetime-plugin
 Version:	0.3.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Date/time plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -9,7 +9,8 @@
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.2, libxml2-devel, gettext
+BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel  >= 4.2
+BuildRequires:	libxml2-devel, gettext
 
 %description
 An alternative clock plugin for the Xfce panel. A calendar appears when you 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Nov 29 2005 Christoph Wickert  - 0.3.1-5
+- Add libxfcegui4-devel BuildReqs.
+
 * Fri Nov 25 2005 Christoph Wickert  - 0.3.1-4
 - Rebuild with new source because of md5sum mismatch.
 



From fedora-extras-commits at redhat.com  Fri Dec  9 23:30:23 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 18:30:23 -0500
Subject: owners owners.list,1.438,1.439
Message-ID: <200512092330.jB9NUrAB008629@cvs-int.fedora.redhat.com>

Author: cwickert

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

Modified Files:
	owners.list 
Log Message:
add xfce4-cpugraph-plugin xfce4-datetime-plugin xfce4-genmon-plugin xce4-weather-plugin xfce4-windowlist-plugin xfce4-xmms-plugin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- owners.list	9 Dec 2005 10:14:04 -0000	1.438
+++ owners.list	9 Dec 2005 23:30:21 -0000	1.439
@@ -1218,6 +1218,9 @@
 Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-appfinder|Appfinder for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1226,6 +1229,9 @@
 Fedora Extras|xfce4-systray|Systray for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-toys|Small Xfce4 applications|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-trigger-launcher|Trigger launcher for Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-weather-plugin|Weather plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-windowlist-plugin|Windowlist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-xmms-plugin|Control XMMS from the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-plugins|Plugins for multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-utils|Utilities for the Xfce Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 10 11:59:20 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 10 Dec 2005 06:59:20 -0500
Subject: rpms/fedora-usermgmt/FC-3 fedora-usermgmt-wrapper, 1.1,
	1.2 fedora-usermgmt.spec, 1.5, 1.6
Message-ID: <200512101159.jBABxpE2030048@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	fedora-usermgmt-wrapper fedora-usermgmt.spec 
Log Message:
- fixed URL metadata (bz #172758)
- execute 'nscd -i ...' before and after creating users/groups; this
  should workaround nscd caching problems
- minor cleanups and logging enhancements in the wrapper script
- removed epoch



Index: fedora-usermgmt-wrapper
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/FC-3/fedora-usermgmt-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-usermgmt-wrapper	8 Nov 2004 04:16:50 -0000	1.1
+++ fedora-usermgmt-wrapper	10 Dec 2005 11:59:18 -0000	1.2
@@ -18,9 +18,27 @@
 #  
 
 PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
-
 BASE_DIR=/etc/fedora/usermgmt
 
+function invalidateCache {
+    local rc=0
+    {
+	# Enforce some nscd activity
+	id root
+	id nscd
+
+	# Clear the caches
+	/usr/sbin/nscd -i group  || rc=1
+	/usr/sbin/nscd -i passwd || rc=1
+
+	# Enforce some nscd activity
+	id root
+	id nscd
+    } &>/dev/null
+
+    return $rc
+}
+
 test -r "$BASE_DIR/baseuid" && BASE_UID=`cat "$BASE_DIR/baseuid"` || BASE_UID=300
 test -r "$BASE_DIR/basegid" && BASE_GID=`cat "$BASE_DIR/basegid"` || BASE_GID=$BASE_UID
 
@@ -32,8 +50,8 @@
     test -x "$i" && { exec_name=$i; break; }
 done
 
-case "$skin" in
-    useradd)
+case $skin in
+    (useradd)
 	test "$1" != "--help" || {
 	    printf $"Usage: %s  +\n" "$(basename $0)"
 	    exit 0
@@ -48,7 +66,7 @@
 	shift
 	set -- "$v" "$@"
 	;;
-    groupadd)
+    (groupadd)
 	test "$1" != "--help" || {
 	    printf $"Usage: %s  +\n" "$(basename $0)"
 	    exit 0
@@ -63,19 +81,27 @@
 	shift
 	set -- "$v" "$@"
 	;;
-    *)  test "$exec_name" || exec_name=$skin;;
+    (*)  test "$exec_name" || exec_name=$skin;;
 esac
 
 log="$BASE_DIR/log"
 if test -e "$log"  -a -L "$log"; then
-    echo "`date`: '$exec_name' $*" >>"$BASE_DIR/log"
+    echo "`date` [$$]: '$exec_name' $*" >>"$BASE_DIR/log"
     exec 1>>"$BASE_DIR/log"
     exec 2>>"$BASE_DIR/log"
 fi
 
-test "$exec_name" || {
+test -n "$exec_name" || {
     echo $"Wrapper could not be found; aborting" >&2
     exit 1
 }
 
-exec "$exec_name" "$@"
+invalidateCache
+"$exec_name" "$@"
+rc=$?
+invalidateCache && sleep 1
+invalidateCache
+
+test $rc -eq 0 || echo "`date` [$$]: failed with '$rc'" >&2
+
+exit $rc


Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/FC-3/fedora-usermgmt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-usermgmt.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ fedora-usermgmt.spec	10 Dec 2005 11:59:18 -0000	1.6
@@ -6,13 +6,13 @@
 
 Summary:	Fedora tools for user management
 Name:		fedora-usermgmt
-Version:	0.7
-Release:	2
-Epoch:		0
+Version:	0.8
+Release:	1
+
 License:	GPL
 BuildArch:	noarch
 Group:		Applications/System
-URL:		http://www.fedora.us/wiki/PackageUserCreation
+URL:		http://fedoraproject.org/wiki/PackageUserCreation
 Source0:	fedora-usermgmt-wrapper
 Source1:	fedora-usermgmt-README
 Requires(pre):	instance(fedora-usermgmt)
@@ -40,7 +40,7 @@
 Source20:	fedora-usermgmt-groupadd.legacy
 Source21:	fedora-usermgmt-useradd.legacy
 Provides:	instance(fedora-usermgmt)
-Requires:	%name = %epoch:%version-%release
+Requires:	%name = %version-%release
 Requires(pre):		%confdir
 Requires(postun):	%confdir
 Requires(post):		%alternatives
@@ -145,6 +145,13 @@
 
 
 %changelog
+* Sat Dec 10 2005 Enrico Scholz  - 0.8-1
+- fixed URL metadata (bz #172758)
+- execute 'nscd -i ...' before and after creating users/groups; this
+  should workaround nscd caching problems
+- minor cleanups and logging enhancements in the wrapper script
+- removed epoch
+
 * Sat Mar 20 2004 Enrico Scholz  - 0:0.7-0.fdr.2
 - applied patch from https://bugzilla.fedora.us/show_bug.cgi?id=701#c10
   I should not defer such things but apply them immediatly...



From fedora-extras-commits at redhat.com  Sat Dec 10 11:59:26 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 10 Dec 2005 06:59:26 -0500
Subject: rpms/fedora-usermgmt/FC-4 fedora-usermgmt-wrapper, 1.1,
	1.2 fedora-usermgmt.spec, 1.7, 1.8
Message-ID: <200512101159.jBABxvT2030052@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	fedora-usermgmt-wrapper fedora-usermgmt.spec 
Log Message:
- fixed URL metadata (bz #172758)
- execute 'nscd -i ...' before and after creating users/groups; this
  should workaround nscd caching problems
- minor cleanups and logging enhancements in the wrapper script
- removed epoch



Index: fedora-usermgmt-wrapper
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/FC-4/fedora-usermgmt-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-usermgmt-wrapper	8 Nov 2004 04:16:50 -0000	1.1
+++ fedora-usermgmt-wrapper	10 Dec 2005 11:59:24 -0000	1.2
@@ -18,9 +18,27 @@
 #  
 
 PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
-
 BASE_DIR=/etc/fedora/usermgmt
 
+function invalidateCache {
+    local rc=0
+    {
+	# Enforce some nscd activity
+	id root
+	id nscd
+
+	# Clear the caches
+	/usr/sbin/nscd -i group  || rc=1
+	/usr/sbin/nscd -i passwd || rc=1
+
+	# Enforce some nscd activity
+	id root
+	id nscd
+    } &>/dev/null
+
+    return $rc
+}
+
 test -r "$BASE_DIR/baseuid" && BASE_UID=`cat "$BASE_DIR/baseuid"` || BASE_UID=300
 test -r "$BASE_DIR/basegid" && BASE_GID=`cat "$BASE_DIR/basegid"` || BASE_GID=$BASE_UID
 
@@ -32,8 +50,8 @@
     test -x "$i" && { exec_name=$i; break; }
 done
 
-case "$skin" in
-    useradd)
+case $skin in
+    (useradd)
 	test "$1" != "--help" || {
 	    printf $"Usage: %s  +\n" "$(basename $0)"
 	    exit 0
@@ -48,7 +66,7 @@
 	shift
 	set -- "$v" "$@"
 	;;
-    groupadd)
+    (groupadd)
 	test "$1" != "--help" || {
 	    printf $"Usage: %s  +\n" "$(basename $0)"
 	    exit 0
@@ -63,19 +81,27 @@
 	shift
 	set -- "$v" "$@"
 	;;
-    *)  test "$exec_name" || exec_name=$skin;;
+    (*)  test "$exec_name" || exec_name=$skin;;
 esac
 
 log="$BASE_DIR/log"
 if test -e "$log"  -a -L "$log"; then
-    echo "`date`: '$exec_name' $*" >>"$BASE_DIR/log"
+    echo "`date` [$$]: '$exec_name' $*" >>"$BASE_DIR/log"
     exec 1>>"$BASE_DIR/log"
     exec 2>>"$BASE_DIR/log"
 fi
 
-test "$exec_name" || {
+test -n "$exec_name" || {
     echo $"Wrapper could not be found; aborting" >&2
     exit 1
 }
 
-exec "$exec_name" "$@"
+invalidateCache
+"$exec_name" "$@"
+rc=$?
+invalidateCache && sleep 1
+invalidateCache
+
+test $rc -eq 0 || echo "`date` [$$]: failed with '$rc'" >&2
+
+exit $rc


Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/FC-4/fedora-usermgmt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-usermgmt.spec	6 Apr 2005 22:11:37 -0000	1.7
+++ fedora-usermgmt.spec	10 Dec 2005 11:59:24 -0000	1.8
@@ -6,13 +6,13 @@
 
 Summary:	Fedora tools for user management
 Name:		fedora-usermgmt
-Version:	0.7
-Release:	3
+Version:	0.8
+Release:	1
 
 License:	GPL
 BuildArch:	noarch
 Group:		Applications/System
-URL:		http://www.fedora.us/wiki/PackageUserCreation
+URL:		http://fedoraproject.org/wiki/PackageUserCreation
 Source0:	fedora-usermgmt-wrapper
 Source1:	fedora-usermgmt-README
 Requires(pre):	instance(fedora-usermgmt)
@@ -113,8 +113,8 @@
 
 
 %preun shadow-utils
-test "$1" != "0" || %alternatives --remove %name %confdir/scripts.shadow-utils
-test "$1" != "0" || %alternatives --remove %name %confdir/scripts.legacy
+test "$1" != 0 || %alternatives --remove %name %confdir/scripts.shadow-utils
+test "$1" != 0 || %alternatives --remove %name %confdir/scripts.legacy
 
 
 %clean
@@ -145,6 +145,12 @@
 
 
 %changelog
+* Sat Dec 10 2005 Enrico Scholz  - 0.8-1
+- fixed URL metadata (bz #172758)
+- execute 'nscd -i ...' before and after creating users/groups; this
+  should workaround nscd caching problems
+- minor cleanups and logging enhancements in the wrapper script
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sat Dec 10 11:59:32 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 10 Dec 2005 06:59:32 -0500
Subject: rpms/fedora-usermgmt/devel fedora-usermgmt-wrapper, 1.1,
	1.2 fedora-usermgmt.spec, 1.7, 1.8
Message-ID: <200512101200.jBAC02dJ030061@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	fedora-usermgmt-wrapper fedora-usermgmt.spec 
Log Message:
- fixed URL metadata (bz #172758)
- execute 'nscd -i ...' before and after creating users/groups; this
  should workaround nscd caching problems
- minor cleanups and logging enhancements in the wrapper script
- removed epoch



Index: fedora-usermgmt-wrapper
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/fedora-usermgmt-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-usermgmt-wrapper	8 Nov 2004 04:16:50 -0000	1.1
+++ fedora-usermgmt-wrapper	10 Dec 2005 11:59:30 -0000	1.2
@@ -18,9 +18,27 @@
 #  
 
 PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
-
 BASE_DIR=/etc/fedora/usermgmt
 
+function invalidateCache {
+    local rc=0
+    {
+	# Enforce some nscd activity
+	id root
+	id nscd
+
+	# Clear the caches
+	/usr/sbin/nscd -i group  || rc=1
+	/usr/sbin/nscd -i passwd || rc=1
+
+	# Enforce some nscd activity
+	id root
+	id nscd
+    } &>/dev/null
+
+    return $rc
+}
+
 test -r "$BASE_DIR/baseuid" && BASE_UID=`cat "$BASE_DIR/baseuid"` || BASE_UID=300
 test -r "$BASE_DIR/basegid" && BASE_GID=`cat "$BASE_DIR/basegid"` || BASE_GID=$BASE_UID
 
@@ -32,8 +50,8 @@
     test -x "$i" && { exec_name=$i; break; }
 done
 
-case "$skin" in
-    useradd)
+case $skin in
+    (useradd)
 	test "$1" != "--help" || {
 	    printf $"Usage: %s  +\n" "$(basename $0)"
 	    exit 0
@@ -48,7 +66,7 @@
 	shift
 	set -- "$v" "$@"
 	;;
-    groupadd)
+    (groupadd)
 	test "$1" != "--help" || {
 	    printf $"Usage: %s  +\n" "$(basename $0)"
 	    exit 0
@@ -63,19 +81,27 @@
 	shift
 	set -- "$v" "$@"
 	;;
-    *)  test "$exec_name" || exec_name=$skin;;
+    (*)  test "$exec_name" || exec_name=$skin;;
 esac
 
 log="$BASE_DIR/log"
 if test -e "$log"  -a -L "$log"; then
-    echo "`date`: '$exec_name' $*" >>"$BASE_DIR/log"
+    echo "`date` [$$]: '$exec_name' $*" >>"$BASE_DIR/log"
     exec 1>>"$BASE_DIR/log"
     exec 2>>"$BASE_DIR/log"
 fi
 
-test "$exec_name" || {
+test -n "$exec_name" || {
     echo $"Wrapper could not be found; aborting" >&2
     exit 1
 }
 
-exec "$exec_name" "$@"
+invalidateCache
+"$exec_name" "$@"
+rc=$?
+invalidateCache && sleep 1
+invalidateCache
+
+test $rc -eq 0 || echo "`date` [$$]: failed with '$rc'" >&2
+
+exit $rc


Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/fedora-usermgmt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-usermgmt.spec	6 Apr 2005 22:11:37 -0000	1.7
+++ fedora-usermgmt.spec	10 Dec 2005 11:59:30 -0000	1.8
@@ -6,13 +6,13 @@
 
 Summary:	Fedora tools for user management
 Name:		fedora-usermgmt
-Version:	0.7
-Release:	3
+Version:	0.8
+Release:	1
 
 License:	GPL
 BuildArch:	noarch
 Group:		Applications/System
-URL:		http://www.fedora.us/wiki/PackageUserCreation
+URL:		http://fedoraproject.org/wiki/PackageUserCreation
 Source0:	fedora-usermgmt-wrapper
 Source1:	fedora-usermgmt-README
 Requires(pre):	instance(fedora-usermgmt)
@@ -113,8 +113,8 @@
 
 
 %preun shadow-utils
-test "$1" != "0" || %alternatives --remove %name %confdir/scripts.shadow-utils
-test "$1" != "0" || %alternatives --remove %name %confdir/scripts.legacy
+test "$1" != 0 || %alternatives --remove %name %confdir/scripts.shadow-utils
+test "$1" != 0 || %alternatives --remove %name %confdir/scripts.legacy
 
 
 %clean
@@ -145,6 +145,12 @@
 
 
 %changelog
+* Sat Dec 10 2005 Enrico Scholz  - 0.8-1
+- fixed URL metadata (bz #172758)
+- execute 'nscd -i ...' before and after creating users/groups; this
+  should workaround nscd caching problems
+- minor cleanups and logging enhancements in the wrapper script
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sat Dec 10 13:10:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 10 Dec 2005 08:10:32 -0500
Subject: rpms/abcde/devel abcde-2.3.99-conf.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 abcde.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200512101311.jBADB2un001136@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore abcde.spec sources 
Added Files:
	abcde-2.3.99-conf.patch 
Log Message:
* Sat Dec 10 2005 Ville Skytt??  - 2.3.99-1
- 2.3.99, minor config file fixes.


abcde-2.3.99-conf.patch:

--- NEW FILE abcde-2.3.99-conf.patch ---
--- abcde.conf~	2005-12-10 13:38:05.000000000 +0200
+++ abcde.conf	2005-12-10 13:44:45.000000000 +0200
@@ -40,12 +40,12 @@
 # so they can be reused when ripping CDs.
 #CDDBUSELOCAL="n"
 
-# List, separated with a coma, the fields we want the parsing function to
+# List, separated with a comma, the fields we want the parsing function to
 # output. Defaults to YEAR and GENRE, for a complete list of fields provided by
 # CDDB.
 # The fields are not case sensitive. Actually, "y,g" will work as fine as "Y,G"
 # or "YEAR, GENRE"
-#SHOWPARSEDFIELDS=year,genre
+#SHOWCDDBFIELDS=year,genre
 
 # Specify the style of encoder to use here - 
 # oggenc, vorbize - for OGGENCODERSYNTAX
@@ -271,7 +271,7 @@
 # * Translate spaces and forward slashes to underscores
 # * Translate stars into pluses.
 # To change that, redefine the mungefilename function.
-# mungefilename recieves the CDDB data (artist, track, title, whatever)
+# mungefilename receives the CDDB data (artist, track, title, whatever)
 # as $1 and outputs it on stdout.
 #mungefilename ()
 #{
@@ -280,7 +280,7 @@
 
 # Custom genre munging:
 # By default we just transform uppercase to lowercase. Not much of a fancy
-# function, with not much use, but one can disable it ot just turn the first
+# function, with not much use, but one can disable it or just turn the first
 # Uppercase.
 #mungegenre ()
 #{
@@ -290,7 +290,7 @@
 
 # Custom pre-read function
 # By default it does nothing.
-# You can set some things to get abcde funtion in better ways:
+# You can set some things to get abcde function in better ways:
 # * Close the CD tray using eject -t (if available in eject and supported by 
 #   your CD device.
 # * Set the CD speed. You can also use the built-in options, but you can also 
@@ -305,7 +305,7 @@
 
 # Custom post-read function
 # By default it does nothing.
-# You can set some things to get abcde funtion in better ways:
+# You can set some things to get abcde function in better ways:
 # * Store a copy of the CD TOC.
 # KEEP IN MIND that executables included in post_read must be in your $PATH or
 # you have to define them with full /path/to/binary
@@ -325,5 +325,5 @@
 #REMOTEHOSTS=foo,bar,baz,quux,qiix
 
 # Set to obtain some information about actions happening in the background
-# Usefull if you have a slow network or CDDB servers seem irresponsive.
+# Useful if you have a slow network or CDDB servers seem irresponsive.
 #EXTRAVERBOSE=n


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Sep 2005 15:28:45 -0000	1.6
+++ .cvsignore	10 Dec 2005 13:10:30 -0000	1.7
@@ -1 +1 @@
-abcde_2.3.4.orig.tar.gz
+abcde_2.3.99.orig.tar.gz


Index: abcde.spec
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/abcde.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- abcde.spec	6 Sep 2005 15:28:45 -0000	1.7
+++ abcde.spec	10 Dec 2005 13:10:30 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.3.4
+Version:        2.3.99
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
@@ -7,7 +7,8 @@
 License:        GPL or Artistic
 URL:            http://www.hispalinux.es/~data/abcde.php
 Source0:        http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
-Patch0:         abcde-2.1.19-inst.patch
+Patch0:         %{name}-2.1.19-inst.patch
+Patch1:         %{name}-2.3.99-conf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -27,8 +28,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1
 sed -i 's/normalize-audio/normalize/g' abcde*
-iconv -f iso-8859-1 -t utf-8 abcde.1 > abcde.1.utf8 ; mv abcde.1.utf8 abcde.1
 
 
 %install
@@ -44,7 +45,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc changelog COPYING README TODO FAQ examples/
+%doc COPYING FAQ README TODO USEPIPES changelog examples/
 %config(noreplace) %{_sysconfdir}/abcde.conf
 %{_bindir}/abcde
 %{_bindir}/cddb-tool
@@ -53,6 +54,9 @@
 
 
 %changelog
+* Sat Dec 10 2005 Ville Skytt??  - 2.3.99-1
+- 2.3.99, minor config file fixes.
+
 * Mon Sep  5 2005 Ville Skytt??  - 2.3.4-1
 - 2.3.4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Sep 2005 15:28:45 -0000	1.6
+++ sources	10 Dec 2005 13:10:30 -0000	1.7
@@ -1 +1 @@
-fc7e2364c8e25af34e5721ba9e2eda46  abcde_2.3.4.orig.tar.gz
+1310c7d2319dbee4baa27e8deeedc776  abcde_2.3.99.orig.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 10 15:52:55 2005
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sat, 10 Dec 2005 10:52:55 -0500
Subject: rpms/dkms/FC-3 .cvsignore, 1.3, 1.4 dkms.spec, 1.6, 1.7 sources, 1.4,
	1.5
Message-ID: <200512101553.jBAFrPJo006017@cvs-int.fedora.redhat.com>

Author: mdomsch

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

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
update to 2.0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2005 03:48:02 -0000	1.3
+++ .cvsignore	10 Dec 2005 15:52:53 -0000	1.4
@@ -1 +1 @@
-dkms-2.0.8.tar.gz
+dkms-2.0.9.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-3/dkms.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dkms.spec	8 Nov 2005 03:48:02 -0000	1.6
+++ dkms.spec	10 Dec 2005 15:52:53 -0000	1.7
@@ -1,6 +1,6 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.8
+Version: 2.0.9
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -8,6 +8,7 @@
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
 Requires: bash > 1.99
 Provides: dkms-minimal
+URL: http://linux.dell.com/dkms
 Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: kernel-devel
@@ -102,6 +103,17 @@
 
 
 %changelog
+* Sat Dec 10 2005 Matt Domsch  2.0.9-1
+- Added URL tag
+- Update to 2.0.9
+  - fix DF28947 (remove word 'only') from a printed message
+  - gzip -9 dkms.8 manpage
+  - look to DKMS_DIRECTIVE* environment variables to override dkms.conf settings
+  - don't create/remove (unused) /var/lock/subsys/dkms files in autoinstaller
+  - Multi driver suse driver disk support (thanks to Sreenivas.Bagalkote at engenio.com)
+  - Cleanup tempdir when ldtarball fails
+  - mkrpm now is built with -ba, not -bb (creates source RPM)
+
 * Mon Nov  7 2005 Matt Domsch  2.0.8-1
 - Update to 2.0.8 from Gary Lerhaupt
   - In dkms_autoinstaller added -no-clean-kernel to builds of multiple


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2005 03:48:02 -0000	1.4
+++ sources	10 Dec 2005 15:52:53 -0000	1.5
@@ -1 +1 @@
-06587f9312aca2a6070eb946abe6baa4  dkms-2.0.8.tar.gz
+a0f0cff22c84386cbe897e812a2eda29  dkms-2.0.9.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 10 15:53:52 2005
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sat, 10 Dec 2005 10:53:52 -0500
Subject: rpms/dkms/FC-4 .cvsignore, 1.3, 1.4 dkms.spec, 1.6, 1.7 sources, 1.4,
	1.5
Message-ID: <200512101553.jBAFrqd7006080@cvs-int.fedora.redhat.com>

Author: mdomsch

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

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
update to 2.0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2005 03:33:56 -0000	1.3
+++ .cvsignore	10 Dec 2005 15:53:50 -0000	1.4
@@ -1 +1 @@
-dkms-2.0.8.tar.gz
+dkms-2.0.9.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-4/dkms.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dkms.spec	8 Nov 2005 03:24:44 -0000	1.6
+++ dkms.spec	10 Dec 2005 15:53:50 -0000	1.7
@@ -1,6 +1,6 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.8
+Version: 2.0.9
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -8,6 +8,7 @@
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
 Requires: bash > 1.99
 Provides: dkms-minimal
+URL: http://linux.dell.com/dkms
 Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: kernel-devel
@@ -102,6 +103,17 @@
 
 
 %changelog
+* Sat Dec 10 2005 Matt Domsch  2.0.9-1
+- Added URL tag
+- Update to 2.0.9
+  - fix DF28947 (remove word 'only') from a printed message
+  - gzip -9 dkms.8 manpage
+  - look to DKMS_DIRECTIVE* environment variables to override dkms.conf settings
+  - don't create/remove (unused) /var/lock/subsys/dkms files in autoinstaller
+  - Multi driver suse driver disk support (thanks to Sreenivas.Bagalkote at engenio.com)
+  - Cleanup tempdir when ldtarball fails
+  - mkrpm now is built with -ba, not -bb (creates source RPM)
+
 * Mon Nov  7 2005 Matt Domsch  2.0.8-1
 - Update to 2.0.8 from Gary Lerhaupt
   - In dkms_autoinstaller added -no-clean-kernel to builds of multiple


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2005 03:33:56 -0000	1.4
+++ sources	10 Dec 2005 15:53:50 -0000	1.5
@@ -1 +1 @@
-06587f9312aca2a6070eb946abe6baa4  dkms-2.0.8.tar.gz
+a0f0cff22c84386cbe897e812a2eda29  dkms-2.0.9.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 10 15:54:12 2005
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sat, 10 Dec 2005 10:54:12 -0500
Subject: rpms/dkms/devel .cvsignore, 1.4, 1.5 dkms.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <200512101554.jBAFsh89006165@cvs-int.fedora.redhat.com>

Author: mdomsch

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

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
update to 2.0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2005 03:03:47 -0000	1.4
+++ .cvsignore	10 Dec 2005 15:54:10 -0000	1.5
@@ -1 +1 @@
-dkms-2.0.8.tar.gz
+dkms-2.0.9.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dkms.spec	8 Nov 2005 03:19:39 -0000	1.7
+++ dkms.spec	10 Dec 2005 15:54:10 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.8
+Version: 2.0.9
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -8,6 +8,7 @@
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
 Requires: bash > 1.99
 Provides: dkms-minimal
+URL: http://linux.dell.com/dkms
 Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: kernel-devel
@@ -102,6 +103,17 @@
 
 
 %changelog
+* Sat Dec 10 2005 Matt Domsch  2.0.9-1
+- Added URL tag
+- Update to 2.0.9
+  - fix DF28947 (remove word 'only') from a printed message
+  - gzip -9 dkms.8 manpage
+  - look to DKMS_DIRECTIVE* environment variables to override dkms.conf settings
+  - don't create/remove (unused) /var/lock/subsys/dkms files in autoinstaller
+  - Multi driver suse driver disk support (thanks to Sreenivas.Bagalkote at engenio.com)
+  - Cleanup tempdir when ldtarball fails
+  - mkrpm now is built with -ba, not -bb (creates source RPM)
+
 * Mon Nov  7 2005 Matt Domsch  2.0.8-1
 - Update to 2.0.8 from Gary Lerhaupt
   - In dkms_autoinstaller added -no-clean-kernel to builds of multiple


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2005 03:03:47 -0000	1.4
+++ sources	10 Dec 2005 15:54:10 -0000	1.5
@@ -1 +1 @@
-06587f9312aca2a6070eb946abe6baa4  dkms-2.0.8.tar.gz
+a0f0cff22c84386cbe897e812a2eda29  dkms-2.0.9.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 10 20:37:23 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 10 Dec 2005 15:37:23 -0500
Subject: rpms/libapreq2/devel libapreq2.spec,1.5,1.6
Message-ID: <200512102037.jBAKbr3f015718@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	libapreq2.spec 
Log Message:
* Sat Dec 10 2005 Ville Skytt??  - 2.07-0.2.rc3
- Filter unversioned perl(*) provides for which a versioned one exists.



Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libapreq2.spec	8 Dec 2005 20:32:12 -0000	1.5
+++ libapreq2.spec	10 Dec 2005 20:37:21 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.07
-Release:        0.1.rc3%{?dist}
+Release:        0.2.rc3%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -56,6 +56,18 @@
 
 %prep
 %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)
@@ -68,9 +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
 
 
@@ -139,6 +153,9 @@
 
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Sat Dec 10 21:06:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 10 Dec 2005 16:06:27 -0500
Subject: rpms/xemacs-sumo/devel xemacs-sumo-20051208-hypb-posix.patch, NONE,
	1.1 xemacs-sumo-20051208-pydoc-path.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xemacs-sumo.spec,
	1.12, 1.13
Message-ID: <200512102107.jBAL7WKd017508@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17481

Modified Files:
	.cvsignore sources xemacs-sumo.spec 
Added Files:
	xemacs-sumo-20051208-hypb-posix.patch 
	xemacs-sumo-20051208-pydoc-path.patch 
Log Message:
* Fri Dec  9 2005 Ville Skytt??  - 20051208-1
- 2005-12-08.
- Patch hyperbole to not require csh.
- Patch pydoc.el to find pydoc_lisp.py out of the box.
- Include bytecompiled python files.
- Set %lang for various docs and info files.
- Prune changelog entries from pre-xemacs-sumo times.


xemacs-sumo-20051208-hypb-posix.patch:

--- NEW FILE xemacs-sumo-20051208-hypb-posix.patch ---
--- xemacs-packages/lisp/hyperbole/smart-clib-sym	27 Jun 2003 05:11:53 -0000	1.1.1.1
+++ xemacs-packages/lisp/hyperbole/smart-clib-sym	8 Dec 2005 19:08:52 -0000
@@ -1,4 +1,4 @@
-#!/bin/csh -f
+#!/bin/sh
 #
 # SUMMARY:      Test whether symbol appears within a set of C libraries.
 # USAGE:         
@@ -26,37 +26,26 @@
 #
 # DESCRIP-END.
 
-# Perl script used to tell whether one file is newer than another.
-#
-set fn = "file-newer"
-
 # Create this file and place in the file the full path for each C, C++ or
 # Objective-C library that you want scanned for symbol names.  One filename
 # per line.  Do not quote the filenames.
 #
-set clib_list = "~/.CLIBS-LIST"
-
+clib_list="$HOME/.CLIBS-LIST"
 
 # This file will automatically be created to cache the symbol names.
 # Remove it if you ever want to rebuild the symbol table.
 #
-set clib_symbols = "~/.clibs-symbols"
-
-# Try to locate 'perl' and 'file-newer' script for use.
-
-which perl >& /dev/null
-if ($status) unset fn
+clib_symbols="$HOME/.clibs-symbols"
 
-set st = 0 rebuild = 0
-if (-e $clib_list) then
-   if (! -e $clib_symbols || -z $clib_symbols) set rebuild = 1
-   if (! $rebuild  && $?fn) @ rebuild = `perl $fn $clib_list $clib_symbols`
-   if ($rebuild) then
-      nm -g `cat $clib_list` | grep '^[0-9 ].* _[A-Za-z]' | sed -e 's/^[^_][^_]*_//g' | sort | uniq > $clib_symbols
-   endif
-   fgrep -sx $1 $clib_symbols >& /dev/null
-   @ st = ! $status
-endif
+st=0
+if [ -s $clib_list ] ; then
+    if [ ! -s $clib_symbols ] || \
+       [ -n "`find $clib_list -prune -newer $clib_symbols`" ] ; then
+        nm -gP `cat $clib_list` 2>/dev/null | grep '^_[A-Za-z]' \
+        | sed -e 's/^_//' -e 's/ .*//' | sort -u > $clib_symbols
+    fi
+    grep -Fx "$1" $clib_symbols >/dev/null 2>&1 && st=1
+fi
 
 echo $st
 exit $st

xemacs-sumo-20051208-pydoc-path.patch:

--- NEW FILE xemacs-sumo-20051208-pydoc-path.patch ---
--- xemacs-packages/lisp/python-modes/pydoc.el	18 Sep 2002 06:04:19 -0000	1.1
+++ xemacs-packages/lisp/python-modes/pydoc.el	9 Dec 2005 22:16:38 -0000
@@ -383,18 +383,23 @@
 
 (defun pydoc-initialize()
   (message "Please wait a moment while the Python help system is initialized...")
-  (let (output-buf)
+  (let ((output-buf)
+	(pydir (locate-data-directory "python-modes")))
     (save-window-excursion
       ;; Start a Python interpreter if not already running.
       (py-shell)
       (pydoc-wait-for-output (current-buffer) 3.0)
       (setq output-buf
 	    (py-execute-string
-	     "if not vars().has_key('pydoc_lisp'):
+	     (format
+	      "if not vars().has_key('pydoc_lisp'):
+    import sys
+    if not '%s' in sys.path:
+        sys.path.append('%s')
     import pydoc_lisp
 
 pydoc_lisp.pydoc_output_lisp()
-"))
+" pydir pydir)))
       ;; current vintages of python-mode.el (4.6 at least)
       ;; no longer return a buffer [name].  We get t from the
       ;; final kill-buffer instead.  If we see t we use the


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Jul 2005 16:37:57 -0000	1.6
+++ .cvsignore	10 Dec 2005 21:06:20 -0000	1.7
@@ -1,2 +1,2 @@
-xemacs-mule-sumo-2005-07-15.tar.bz2
-xemacs-sumo-2005-07-15.tar.bz2
+xemacs-mule-sumo-2005-12-08.tar.bz2
+xemacs-sumo-2005-12-08.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Jul 2005 16:37:57 -0000	1.6
+++ sources	10 Dec 2005 21:06:20 -0000	1.7
@@ -1,2 +1,2 @@
-016362256e4de4b150d6c2f8d686dd3f  xemacs-mule-sumo-2005-07-15.tar.bz2
-28b92fa2e0bcd0c8e81fd6286d37af30  xemacs-sumo-2005-07-15.tar.bz2
+553da38bc36b4365ab98e0565a0530b8  xemacs-mule-sumo-2005-12-08.tar.bz2
+1927c40affd04ff7c10b979ef24548d0  xemacs-sumo-2005-12-08.tar.bz2


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xemacs-sumo.spec	17 Jul 2005 16:37:57 -0000	1.12
+++ xemacs-sumo.spec	10 Dec 2005 21:06:20 -0000	1.13
@@ -1,4 +1,4 @@
-%define sumo    2005-07-15
+%define sumo    2005-12-08
 %define pkgdir  %{_datadir}/xemacs
 
 Name:           xemacs-sumo
@@ -19,6 +19,8 @@
 Source15:       Emacs.ad.ko_KR.UTF-8
 Source16:       Emacs.ad.zh_CN.UTF-8
 Source17:       Emacs.ad.zh_TW.UTF-8
+Patch0:         %{name}-20051208-hypb-posix.patch
+Patch1:         %{name}-20051208-pydoc-path.patch
 Patch6:         auctex-texsite-jlatex-detect-69129.patch
 Patch7:         auctex-texjp-platex.patch
 Patch8:         egg-wnn-host-unix-79826.patch
@@ -33,8 +35,10 @@
 BuildRequires:  xemacs-nox
 BuildRequires:  sed >= 3.95
 BuildRequires:  /sbin/install-info
+BuildRequires:  %{__python}
 Requires:       xemacs-common
-Provides:       apel-xemacs = 10.2
+# Fake release in this provision in order to avoid self-obsoletion (for now).
+Provides:       apel-xemacs = 10.6-6
 Provides:       ruby-mode-xemacs
 Obsoletes:      apel-xemacs < 10.6-6
 Obsoletes:      ruby-mode-xemacs
@@ -76,6 +80,13 @@
 
 %prep
 %setup -q -c -a1
+# get rid of csh dependency
+%patch0 -p0
+rm xemacs-packages/lisp/hyperbole/file-newer
+# find pydoc_lisp.py out-of-the-box
+%patch1 -p0
+install -dm 755 xemacs-packages/etc/python-modes
+mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes}
 # fix jlatex autodetection
 %patch6 -p0
 # use ptex rather jtex by default for Japanese
@@ -94,7 +105,9 @@
 %patch15 -p0
 
 sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \
-  xemacs-packages/{lisp/hyperbole/file-newer,etc/bbdb/*.pl}
+  xemacs-packages/etc/bbdb/*.pl
+
+chmod -c -x xemacs-packages/lisp/edit-utils/crm.el
 
 # remove game we shouldn't ship
 rm xemacs-packages/lisp/games/tetris.el*
@@ -155,7 +168,7 @@
 find $RPM_BUILD_ROOT%{pkgdir} -type f -name '*.info*' | xargs gzip -9
 
 # separate files
-rm -f *.files base-files el-files info-files
+rm -f *.files
 echo "%%defattr(-,root,root,-)" > base-files
 echo "%%defattr(-,root,root,-)" > el-files
 echo "%%defattr(-,root,root,-)" > info-files
@@ -163,15 +176,21 @@
 find $RPM_BUILD_ROOT%{pkgdir}/* \
   \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \
   \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \
-  \( -type d -name info -fprint info.files -prune \) -o \
-  \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \
+  \( -type d -not -name info -fprintf dir.files "%%%%dir %%p\n" \) -o \
   \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \
      -fprint base-el-not-bytecomped.files \) \)
 
 sed -i -e "s|$RPM_BUILD_ROOT||" *.files
-cat base-*.files dir.files >> base-files
-cat el-*.files   dir.files >> el-files
-cat info.files             >> info-files
+cat base-*.files dir.files | grep -v /info/ >> base-files
+cat el-*.files dir.files                    >> el-files
+cat base-non-el.files | grep /info/         >> info-files
+
+sed -i -e 's/^\(.*\(\.ja\|-ja\.texi\)\)$/%lang(ja) \1/' base-files
+sed -i -e 's/^\(.*[_-]ja\.info.*\)$/%lang(ja) \1/' info-files
+
+# in case redhat-rpm-config is not installed or doesn't do this for us:
+%{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/python-modes', ddir='/', force=1)"
+%{__python} -O -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/python-modes', ddir='/', force=1)"
 
 
 %clean
@@ -179,13 +198,24 @@
 
 
 %files -f base-files
+%{pkgdir}/xemacs-packages/etc/python-modes/*.pyc
+%ghost %{pkgdir}/xemacs-packages/etc/python-modes/*.pyo
 
 %files el -f el-files
 
 %files info -f info-files
+%dir %{pkgdir}/*-packages/info/
 
 
 %changelog
+* Fri Dec  9 2005 Ville Skytt??  - 20051208-1
+- 2005-12-08.
+- Patch hyperbole to not require csh.
+- Patch pydoc.el to find pydoc_lisp.py out of the box.
+- Include bytecompiled python files.
+- Set %%lang for various docs and info files.
+- Prune changelog entries from pre-xemacs-sumo times.
+
 * Sat Jul 16 2005 Ville Skytt??  - 20050715-1
 - 2005-07-15; jde font-lock, sql-mode abbrev, w3 stylesheet and file
   permissions fixed upstream.
@@ -308,243 +338,3 @@
 * Mon May 12 2003 Jens Petersen  - 20030414-1
 - new package to separate xemacs-sumo and xemacs-mule-sumo from
   main xemacs package
-
-
-* Sat May 10 2003 Jens Petersen  - 21.4.12-11
-- build with system malloc on ppc64
-
-* Tue Apr 22 2003 Jens Petersen  - 21.4.12-10
-- obsoletes ruby-mode-xemacs (#84673)
-- move obsoletes xemacs-sumo-el to -el subpackage
-- fix links in jde html documentation (#89499)
-
-* Tue Apr 15 2003 Jens Petersen  - 21.4.12-8
-- comment out ja and ko menubar translations in X resource files for now,
-  to avoid startup hanging in utf-8 locale (#88860)
-- use default menubar font in ja and ko locale
-- in a UTF-8 locale set default coding systems to utf-8 (partly #77130
-  and #74227)
-- set Info-directory-list in site-start.el again
-- move psgml setup into site-start.el
-- move previous contents of "dotxemacs-init.el" to new "default.el"
-
-* Mon Mar 31 2003 Akira TAGOH  21.4.12-7
-- Rebuild against the latest Canna.
-
-* Thu Feb 20 2003 Jens Petersen  - 21.4.12-6
-- default browse-url to use htmlview and update psgml-html browser
-  defaults (#84262)
-
-* Tue Feb 11 2003 Jens Petersen  - 21.4.12-5
-- build with system-malloc on alpha and ia64
-- skip redundant check-features target
-
-* Thu Feb  6 2003 Jens Petersen  - 21.4.12-4
-- fix "libexec dir" to be under lib64 on multilib archs
-- set default ftp to be non-kerberos in site-start.el
-- update sumos to 2003-02-05
-- mspec patch and rpm-spec-mode update no longer needed
-- buildrequire autoconf213
-- add ".xemacs/init.el" to /etc/skel
-- skip redundant check-features target on s390 and s390x
-
-* Wed Jan 22 2003 Tim Powers 
-- rebuilt
-
-* Tue Jan 21 2003 Jens Petersen  - 21.4.12-2
-- fix `paths-emacs-root-p' (find-paths.el) to look in share not lib
-- don't generate backup files when updating autoloads
-- try startup notification in desktop file
-- cleanup desktop file to use name XEmacs and add encoding key
-
-* Fri Jan 17 2003 Jens Petersen  21.4.12-1
-- update to 21.4.12 bugfix release (21.4 series now declared stable branch)
-- renumbered sumo package patches to be greater than 100
-- install sumo packages by copying rather than moving
-- patch sh-script.el to append m?spec entry to auto-mode-alist
-- avoid ppc.ldscript and build on ppc
-- remove games that we shouldn't ship
-- update to latest rcs2log
-- update to latest rpm-spec-mode.el
-- use _smp_mflags for lib-src and src
-- run batch-update-directory and batch-byte-recompile-directory on sumo lisp
-  dirs
-- improve datadir/xemacs-version/ ownership
-
-* Sat Jan  4 2003 Jens Petersen  21.4.11-1
-- update to 21.4.11
-- don't configure with union-type, since it causes runtime problems apparently
-- only do postun info dir deletions when uninstalling
-
-* Wed Jan  1 2003 Jens Petersen  21.4.10-6
-- move apel to separate package and require it
-- renamed psgml-init.el-xemacs to xemacs-psgml-init.el
-- use datadir in site-start.el
-- really include the movemail mkstemp patch
-- use mapc to load site-start.d files
-
-* Tue Dec 31 2002 Ville Skytt?? 
-- New Sumos (2002-12-30).
-- Use `construct-emacs-version-name' in `paths-emacs-root-p' (find-paths.el),
-  fixing "Couldn't find obvious default for XEmacs hierarchy" warnings
-  (as in XEmacs 21.5).
-- Move site-start stuff to site-packages.
-- Don't set Info-directory-list in site-start.el.
-- Don't use --pkgdir, it's ignored.  Don't pass pkgdir to makeinstall.
-- Fix source tarball URLs.
-- Don't override the defcustom in psgml-init.el, set its default value instead.
-- Add rpmbuild option: "--with debug" for building a debug-enabled XEmacs.
-
-* Sun Dec 29 2002 Jens Petersen 
-- updates package sumos to 2002-12-26 release
-
-* Mon Dec 23 2002 Jens Petersen  21.4.10-5
-- patch find-paths.el to search in datadir
-- setup lisp packages under datadir not libdir
-- use buildroot macro instead of RPM_BUILD_ROOT
-- drop local configure macro
-- fix buildrequires and requires
-- list configure options one-per-line
-- improve psgml-init.el catalog setup
-- remove and add lisp packages with package-admin
-- rebyte-compile lisp packages
-- keep etags as etags.xemacs (#78106)
-- don't bother removing non-existent udp2tcp nor .cvsignore files
-- simply filelist generation to a single find search pass
-- put core .el files in -el package
-- put package info files into -info package
-- don't create backup files when patching in lisp packages tree
-- don't explicitly gzip lisp package info files
-- don't mark the applications files noreplace
-- exclude ppc, since __init_array_start undefined
-
-* Wed Dec 18 2002 Jens Petersen 
-- patch egg-wnn to default to unix domain socket (#79826)
-  [patch from ynakai at redhat.com]
-- add ia64 patch from SuSE
-- use mkstemp in movemail
-
-* Tue Nov 19 2002 Jens Petersen 
-- apply jlatex autodetect patch correctly and drop append to tex-site.el
-- default to pTeX and pLaTeX for Japanese TeX and LaTeX
-
-* Mon Nov 18 2002 Jens Petersen  21.4.10-3
-- backout uncommenting of deactivate-mark (#77696)
-- update psgml dtd catalog path in psgml-init.el (#78022)
-  [reported by ville.skytta at iki.fi]
-- build with --use-union-type (#78024)
-  [suggested by ville.skytta at iki.fi]
-
-* Fri Nov 15 2002 Jens Petersen 
-- fix autodetection of jlatex (#69129)
-
-* Tue Nov 12 2002 Elliot Lee  21.4.10-2
-- build on x86_64
-
-* Mon Nov 11 2002 Jens Petersen  21.4.10-1
-- update to 21.4.10
-- update sumos to 2002-09-19
-- no longer backout mule-ucs package
-- encode this file in utf-8
-- xemacs-21.1.14-xfs.patch no longer needed
-- use _libdir, _datadir, _bindir, _prefix
-- exclude x86_64 (requires Canna)
-- own /usr/lib/xemacs/{,mule-packages} and /usr/X11R6/lib/X11/ (#73982)
-  [reported by enrico.scholz at informatik.tu-chemnitz.de]
-- fix default italic font size (#75275)
-  [reported with fix by ville.skytta at iki.fi]
-- update ja menubar translations in ja locale X resource file (#76068)
-  [from ynakai at redhat.com]
-- update ko locale X resource file (#76072) [from ynakai at redhat.com]
-- add pkgdir rpm macro for packages dir
-- uncomment deactivate-mark in simple.el (#77696)
-
-* Mon Aug 26 2002 Trond Eivind Glomsr??d  21.4.8-16
-- some cleanups - and remove the info tarball, it's now part
-  of the base tarball. Wow, the package gets smaller. (#72480)
-
-* Mon Aug 19 2002 Trond Eivind Glomsr??d  21.4.8-15
-- Bug in specfile from -14 gave bug on startup (#71743)
-
-* Thu Aug 15 2002 Trond Eivind Glomsr??d  21.4.8-14
-- Use utf-8 by default for input/output (#71584 )
-- Make it not segfault when handling utf-8 (#71589)
-
-* Wed Aug  7 2002 Trond Eivind Glomsr??d  21.4.8-13
-- Add openmotif-devel to buildrequires, as it will use it for widgets
-  if it finds it
-
-* Fri Aug  2 2002 Trond Eivind Glomsr??d  21.4.8-12
-- Don't package po-mode separately, it's now in sumo
-- Compile with drag'n'drop support
-- Use the bundled rpm-spec-mode, it has some adaptions for XEmacs
-
-* Wed Jul 31 2002 Trond Eivind Glomsr??d  21.4.8-11
-- Don't use a separate ispell.el file anymore - the included one is newer
-- Fix html-mode (#64826)
-
-* Tue Jul 23 2002 Trond Eivind Glomsr??d  21.4.8-10
-- Update lisp tarballs
-- desktop file fixes (#69542)
-- Add bdb support (#65640)
-
-* Mon Jul  8 2002 Trond Eivind Glomsr??d  21.4.8-9
-- Make it provide ruby-mode-xemacs (request from tagoh)
-
-* Fri Jun 21 2002 Tim Powers 
-- automated rebuild
-
-* Mon Jun 17 2002 Trond Eivind Glomsr??d  21.4.8-7
-- #66835
-
-* Wed May 29 2002 Trond Eivind Glomsr??d  21.4.8-6
-- Make it build... Evil.
-- Exclude IA64
-- Upgrade sumo tarballs to 2002-05-22
-
-* Fri May 24 2002 Jens Petersen  21.4.8-5
-- Build using portable dumper, so that build with glibc-2.3 malloc is ok
-
-* Mon May 13 2002 Trond Eivind Glomsr??d  21.4.8-2
-- Remove the s390 patches so it builds on s390 :)
-
-* Fri May 10 2002 Trond Eivind Glomsr??d  21.4.8-1
-- 21.4.8
-
-* Tue May  7 2002 Trond Eivind Glomsr??d  21.4.6-9
-- Rebuild... chmod -x pstogif to work around an rpm bug until
-  it's fixed (#64320)
-
-* Tue Apr 23 2002 Trond Eivind Glomsr??d  21.4.6-8
-- New sumo packages
-
-* Thu Feb 21 2002 Trond Eivind Glomsr??d  21.4.6-7
-- Rebuild
-
-* Tue Jan 29 2002 Jens Petersen  21.4.6-6
-- Remove skk package, since it conflicts with ddskk-xemacs (newer)
-
-* Thu Jan 24 2002 Trond Eivind Glomsr??d  21.4.6-5
-- New sumos
-
-* Wed Jan 09 2002 Tim Powers 
-- automated rebuild
-
-* Wed Dec 19 2001 Jens Petersen  21.4.6-3
-- Fix fontlist pattern in Emacs.ad.Japanese.
-- CHANGES-beta is now CHANGES-release.
-- Obsolete xemacs-sumo xemacs-sumo-el
-
-* Wed Dec 19 2001 Jens Petersen  21.4.6-2
-- Don't obsolete flim.
-
-* Mon Dec 17 2001 Trond Eivind Glomsr??d  21.4.6-1
-- 21.4.6
-- New sumo packages
-- disable alpha
-
-* Wed Nov 14 2001 Jens Petersen  21.4.5-2
-- Add -znocombreloc configure option to override new ld default.
-
-* Tue Nov  6 2001 Trond Eivind Glomsr??d  21.4.5-1
-- 21.4.5. It builds on IA64 and fixes #55578



From fedora-extras-commits at redhat.com  Sun Dec 11 12:18:41 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 11 Dec 2005 07:18:41 -0500
Subject: rpms/tinyerp/FC-3 tinyerp.spec,1.6,1.7
Message-ID: <200512111219.jBBCJB2s014909@cvs-int.fedora.redhat.com>

Author: sharkcz

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

Modified Files:
	tinyerp.spec 
Log Message:
 - moved Requires(pre) to the -server package (Ville Skytta)



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tinyerp.spec	8 Dec 2005 17:11:43 -0000	1.6
+++ tinyerp.spec	11 Dec 2005 12:18:39 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -19,7 +19,6 @@
 BuildRequires:	python-psycopg, libxslt-python, pydot
 BuildRequires:	desktop-file-utils, xorg-x11-Xvfb
 Requires:	pygtk2, pygtk2-libglade, pydot
-Requires(pre):	fedora-usermgmt
 Patch0:		tinyerp-client.patch
 Patch1:		tinyerp-server.patch
 
@@ -38,6 +37,7 @@
 Requires:	libxslt-python, python-imaging
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
+Requires(pre):	fedora-usermgmt
 
 %description server
 Server components for Tiny ERP.
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Sun Dec 11 2005 Dan Horak  3.1.1-4
+- moved Requires(pre) to the -server package (Ville Skytt??)
+
 * Thu Dec  7 2005 Dan Horak  3.1.1-3
 - chown for log and spool is not required
 



From fedora-extras-commits at redhat.com  Sun Dec 11 12:20:53 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 11 Dec 2005 07:20:53 -0500
Subject: rpms/tinyerp/FC-4 tinyerp.spec,1.8,1.9
Message-ID: <200512111221.jBBCLNeL014936@cvs-int.fedora.redhat.com>

Author: sharkcz

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

Modified Files:
	tinyerp.spec 
Log Message:
 - moved Requires(pre) to the -server package (Ville Skytta)



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tinyerp.spec	8 Dec 2005 17:12:49 -0000	1.8
+++ tinyerp.spec	11 Dec 2005 12:20:51 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -19,7 +19,6 @@
 BuildRequires:	python-psycopg, libxslt-python, pydot
 BuildRequires:	desktop-file-utils, xorg-x11-Xvfb
 Requires:	pygtk2, pygtk2-libglade, pydot
-Requires(pre):	fedora-usermgmt
 Patch0:		tinyerp-client.patch
 Patch1:		tinyerp-server.patch
 
@@ -38,6 +37,7 @@
 Requires:	libxslt-python, python-imaging
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
+Requires(pre):	fedora-usermgmt
 
 %description server
 Server components for Tiny ERP.
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Sun Dec 11 2005 Dan Horak  3.1.1-4
+- moved Requires(pre) to the -server package (Ville Skytt??)
+
 * Thu Dec  7 2005 Dan Horak  3.1.1-3
 - chown for log and spool is not required
 



From fedora-extras-commits at redhat.com  Sun Dec 11 18:33:22 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sun, 11 Dec 2005 13:33:22 -0500
Subject: rpms/gtkmathview/devel .cvsignore, 1.4, 1.5 gtkmathview.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200512111833.jBBIXq2l025649@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	.cvsignore gtkmathview.spec sources 
Log Message:
Update to 0.7.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Sep 2005 12:45:58 -0000	1.4
+++ .cvsignore	11 Dec 2005 18:33:20 -0000	1.5
@@ -1 +1 @@
-gtkmathview-0.7.5.tar.gz
+gtkmathview-0.7.6.tar.gz


Index: gtkmathview.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/devel/gtkmathview.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkmathview.spec	25 Sep 2005 12:45:58 -0000	1.3
+++ gtkmathview.spec	11 Dec 2005 18:33:20 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: A MathML rendering library
 Name: gtkmathview
-Version: 0.7.5
+Version: 0.7.6
 Release: 1
 Group: System Environment/Libraries
 License: GPL
@@ -75,6 +75,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Sun Dec 11 2005 Marc Maurer  - 0.7.6-1
+- Update to 0.7.6
+
 * Sun Sep 25 2005 Marc Maurer  - 0.7.5-1
 - Update to 0.7.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Sep 2005 12:45:58 -0000	1.4
+++ sources	11 Dec 2005 18:33:20 -0000	1.5
@@ -1 +1 @@
-94a4415a8226874075037a88972baa11  gtkmathview-0.7.5.tar.gz
+4bb348c98367228f0de0a2216a13d48f  gtkmathview-0.7.6.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 11 18:33:52 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sun, 11 Dec 2005 13:33:52 -0500
Subject: rpms/gtkmathview/FC-4 .cvsignore, 1.4, 1.5 gtkmathview.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512111834.jBBIYM9E025681@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	.cvsignore gtkmathview.spec sources 
Log Message:
Update to 0.7.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Sep 2005 12:45:58 -0000	1.4
+++ .cvsignore	11 Dec 2005 18:33:50 -0000	1.5
@@ -1 +1 @@
-gtkmathview-0.7.5.tar.gz
+gtkmathview-0.7.6.tar.gz


Index: gtkmathview.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/FC-4/gtkmathview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkmathview.spec	26 Sep 2005 11:40:16 -0000	1.6
+++ gtkmathview.spec	11 Dec 2005 18:33:50 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: A MathML rendering library
 Name: gtkmathview
-Version: 0.7.5
-Release: 3%{?dist}
+Version: 0.7.6
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: GPL
 Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz
@@ -75,6 +75,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Sun Dec 11 2005 Marc Maurer  - 0.7.6-1.fc4
+- Update to 0.7.6
+
 * Mon Sep 25 2005 Marc Maurer  - 0.7.5-3.fc4
 - Escape the dist macro in the changelog
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Sep 2005 12:45:58 -0000	1.4
+++ sources	11 Dec 2005 18:33:50 -0000	1.5
@@ -1 +1 @@
-94a4415a8226874075037a88972baa11  gtkmathview-0.7.5.tar.gz
+4bb348c98367228f0de0a2216a13d48f  gtkmathview-0.7.6.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 11 18:34:08 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sun, 11 Dec 2005 13:34:08 -0500
Subject: rpms/gtkmathview/FC-3 .cvsignore, 1.4, 1.5 gtkmathview.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200512111834.jBBIYcCG025691@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	.cvsignore gtkmathview.spec sources 
Log Message:
Update to 0.7.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Sep 2005 12:45:58 -0000	1.4
+++ .cvsignore	11 Dec 2005 18:34:06 -0000	1.5
@@ -1 +1 @@
-gtkmathview-0.7.5.tar.gz
+gtkmathview-0.7.6.tar.gz


Index: gtkmathview.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/FC-3/gtkmathview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtkmathview.spec	2 Oct 2005 16:09:28 -0000	1.4
+++ gtkmathview.spec	11 Dec 2005 18:34:06 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: A MathML rendering library
 Name: gtkmathview
-Version: 0.7.5
+Version: 0.7.6
 Release: 1%{?dist}
 Group: System Environment/Libraries
 License: GPL
@@ -75,5 +75,8 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Sun Dec 11 2005 Marc Maurer  - 0.7.6-1.fc3
+- Update to 0.7.6
+
 * Sun Oct 2 2005 Marc Maurer  - 0.7.5-1.fc3
 - Initial release into FC-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Sep 2005 12:45:58 -0000	1.4
+++ sources	11 Dec 2005 18:34:06 -0000	1.5
@@ -1 +1 @@
-94a4415a8226874075037a88972baa11  gtkmathview-0.7.5.tar.gz
+4bb348c98367228f0de0a2216a13d48f  gtkmathview-0.7.6.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 11 20:14:28 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Sun, 11 Dec 2005 15:14:28 -0500
Subject: fedora-security/audit fc4,1.102,1.103
Message-ID: <200512112014.jBBKExTa029190@cvs-int.fedora.redhat.com>

Author: mjc

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

Modified Files:
	fc4 
Log Message:
Clear a few eay mails



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- fc4	9 Dec 2005 22:13:29 -0000	1.102
+++ fc4	11 Dec 2005 20:14:26 -0000	1.103
@@ -3,20 +3,20 @@
 
 ** are items that need attention
 
-CVE-2005-4077 VULNERABLE (curl)
+CVE-2005-4077 backport (curl) [since FEDORA-2005-1129]
 CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)
-CVE-2005-3193 VULNERABLE (tetex)
-CVE-2005-3193 VULNERABLE (poppler)
+CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3193 backport (poppler) [since FEDORA-2005-1132]
 CVE-2005-3192 VULNERABLE (xpdf)
 CVE-2005-3192 VULNERABLE (kdegraphics)
-CVE-2005-3192 VULNERABLE (tetex)
-CVE-2005-3192 VULNERABLE (poppler)
+CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3192 backport (poppler) [since FEDORA-2005-1132]
 CVE-2005-3191 VULNERABLE (xpdf)
 CVE-2005-3191 VULNERABLE (kdegraphics)
-CVE-2005-3191 VULNERABLE (tetex)
-CVE-2005-3191 VULNERABLE (poppler)
+CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3191 backport (poppler) [since FEDORA-2005-1132]
 CVE-2005-3964 VULNERABLE (openmotif)
 CVE-2005-3962 backport (perl) [since FEDORA-2005-1113]
 CVE-2005-3912 backport (perl) [since FEDORA-2005-1113]
@@ -77,7 +77,7 @@
 CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1122]
 CVE-2005-3186 backport (gdk-pixbuf) [since FEDORA-2005-1085]
 CVE-2005-3186 backport (gtk2) [since FEDORA-2005-1088]
-CVE-2005-3185 blocked (curl) by FORTIFY_SOURCE
+CVE-2005-3185 backport (curl) [since FEDORA-2005-1129] was blocked (curl) by FORTIFY_SOURCE
 CVE-2005-3185 blocked (wget) by FORTIFY_SOURCE
 CVE-2005-3184 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3183 backport (w3c-libwww) [since FEDORA-2005-952]
@@ -117,6 +117,7 @@
 CVE-2005-2959 ignore (sudo) not a vulnerability
 CVE-2005-2946 VULNERABLE (openssl, fixed 0.9.8) (as it uses md5 md)
 CVE-2005-2933 VULNERABLE (uw-imap) bz#171345
+CVE-2005-2933 backport (libc-client) [since FEDORA-2005-1115]
 CVE-2005-2929 backport (lynx) [since FEDORA-2005-1079]
 CVE-2005-2917 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913]
 CVE-2005-2876 backport (util-linux) [since FEDORA-2005-887]



From fedora-extras-commits at redhat.com  Sun Dec 11 21:57:10 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 11 Dec 2005 16:57:10 -0500
Subject: rpms/libopensync - New directory
Message-ID: <200512112157.jBBLvA1N030989@cvs-int.fedora.redhat.com>

Author: awjb

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

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




From fedora-extras-commits at redhat.com  Sun Dec 11 21:57:16 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 11 Dec 2005 16:57:16 -0500
Subject: rpms/libopensync/devel - New directory
Message-ID: <200512112157.jBBLvGAB031007@cvs-int.fedora.redhat.com>

Author: awjb

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

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




From fedora-extras-commits at redhat.com  Sun Dec 11 21:57:35 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 11 Dec 2005 16:57:35 -0500
Subject: rpms/libopensync Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512112157.jBBLvZc7031044@cvs-int.fedora.redhat.com>

Author: awjb

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 11 21:57:41 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 11 Dec 2005 16:57:41 -0500
Subject: rpms/libopensync/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512112157.jBBLvffR031067@cvs-int.fedora.redhat.com>

Author: awjb

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

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


--- NEW 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 Dec 11 21:58:40 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 11 Dec 2005 16:58:40 -0500
Subject: rpms/libopensync import.log,1.1,1.2
Message-ID: <200512112159.jBBLxAHb031168@cvs-int.fedora.redhat.com>

Author: awjb

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopensync/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Dec 2005 21:57:33 -0000	1.1
+++ import.log	11 Dec 2005 21:58:38 -0000	1.2
@@ -0,0 +1 @@
+libopensync-0_18-3:HEAD:libopensync-0.18-3.src.rpm:1134338309



From fedora-extras-commits at redhat.com  Sun Dec 11 21:58:46 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 11 Dec 2005 16:58:46 -0500
Subject: rpms/libopensync/devel libopensync-32.conf, NONE,
	1.1 libopensync-64.conf, NONE, 1.1 libopensync-rpath.patch,
	NONE, 1.1 libopensync.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512112158.jBBLwk0i031161@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	.cvsignore sources 
Added Files:
	libopensync-32.conf libopensync-64.conf 
	libopensync-rpath.patch libopensync.spec 
Log Message:
auto-import libopensync-0.18-3 on branch devel from libopensync-0.18-3.src.rpm


--- NEW FILE libopensync-32.conf ---
/usr/lib/opensync/
/usr/lib/opensync/formats/
/usr/lib/opensync/plugins/


--- NEW FILE libopensync-64.conf ---
/usr/lib64/opensync/
/usr/lib64/opensync/formats/
/usr/lib64/opensync/plugins/

libopensync-rpath.patch:

--- NEW FILE libopensync-rpath.patch ---
--- tools/Makefile.am.orig	2005-11-29 15:05:27.000000000 +0100
+++ tools/Makefile.am	2005-11-29 15:05:04.000000000 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
+AM_CFLAGS = -Wall @GCOV_CFLAGS@
 
 INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
 
@@ -9,23 +9,23 @@
 endif
 
 osyncdump_SOURCES = osyncdump.c
-osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
 osyncdump_LDADD = $(top_builddir)/opensync/libopensync.la
 
 osyncstress_SOURCES = osyncstress.c
-osyncstress_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncstress_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osyncstress_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
 
 osyncplugin_SOURCES = osyncplugin.c
-osyncplugin_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncplugin_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osyncplugin_LDADD = $(top_builddir)/opensync/libopensync.la
 
 osynctest_SOURCES = osynctest.c
-osynctest_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osynctest_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osynctest_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
 
 osyncbinary_SOURCES = osyncbinary.c
-osyncbinary_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
+osyncbinary_LDFLAGS = @PACKAGE_LIBS@
 osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
 
 CLEANFILES = \
--- osengine/Makefile.am.orig	2005-11-29 15:10:14.000000000 +0100
+++ osengine/Makefile.am	2005-11-29 15:12:13.000000000 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
+AM_CFLAGS = -Wall @GCOV_CFLAGS@
 
 INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
 
@@ -47,5 +47,5 @@
 	*.bbg \
 	*.da
 
-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
 libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
--- osengine/Makefile.in.orig	2005-11-29 15:14:18.000000000 +0100
+++ osengine/Makefile.in	2005-11-29 15:20:32.000000000 +0100
@@ -270,7 +270,7 @@
 	*.bbg \
 	*.da
 
-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
 libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
 all: all-am
 
--- wrapper/Makefile.am.orig	2005-11-29 15:27:35.000000000 +0100
+++ wrapper/Makefile.am	2005-11-29 15:27:48.000000000 +0100
@@ -22,5 +22,5 @@
 endif
 
 nodist__opensync_la_SOURCES = opensync_wrap.c
-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
 _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
--- wrapper/Makefile.in.orig	2005-11-29 15:30:22.000000000 +0100
+++ wrapper/Makefile.in	2005-11-29 15:31:52.000000000 +0100
@@ -235,7 +235,7 @@
 @HAVE_PYTHON_TRUE at osbindingsdir = $(pythondir)
 @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
 nodist__opensync_la_SOURCES = opensync_wrap.c
-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
 _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
 all: all-am
 
--- tools/Makefile.in.orig	2005-11-29 15:37:42.000000000 +0100
+++ tools/Makefile.in	2005-11-29 15:38:03.000000000 +0100
@@ -237,19 +237,19 @@
 AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
 INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
 osyncdump_SOURCES = osyncdump.c
-osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
 osyncdump_LDADD = $(top_builddir)/opensync/libopensync.la
 osyncstress_SOURCES = osyncstress.c
-osyncstress_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncstress_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osyncstress_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
 osyncplugin_SOURCES = osyncplugin.c
-osyncplugin_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncplugin_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osyncplugin_LDADD = $(top_builddir)/opensync/libopensync.la
 osynctest_SOURCES = osynctest.c
-osynctest_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osynctest_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osynctest_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
 osyncbinary_SOURCES = osyncbinary.c
-osyncbinary_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
+osyncbinary_LDFLAGS = @PACKAGE_LIBS@
 osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
 CLEANFILES = \
 	*.bb \


--- NEW FILE libopensync.spec ---
Name:           libopensync
Version:        0.18
Release:        3
Summary:        A synchronization framework

Group:          System Environment/Libraries
License:        LGPL
URL:            http://www.opensync.org/
# see http://www.opensync.org/wiki/download
Source0:        %{name}-%{version}.tar.gz
Source1:        libopensync-32.conf
Source2:        libopensync-64.conf
Patch0:         libopensync-rpath.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glib2-devel
BuildRequires:  libxml2-devel
BuildRequires:  sqlite-devel
BuildRequires:  zlib-devel
BuildRequires:  python-devel
BuildRequires:  swig
BuildRequires:  pkgconfig

%description
OpenSync is a synchronization framework that is platform and distribution
independent. It consists of several plugins that can be used to connect to
devices, a powerful sync-engine and the framework itself. The synchronization
framework is kept very flexible and is capable of synchronizing any type of
data, including contacts, calendar, tasks, notes and files. 

%package devel
Summary:        Development package for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       glib2-devel
Requires:       libxml2-devel
Requires:       zlib-devel
%description    devel
The %{name}-devel package contains the files needed for development
with %{name}.

%prep
%setup -q
%patch0
# some source files are marked executable
for dir in opensync osengine; do
    cd %{_builddir}/%{name}-%{version}/$dir
    chmod -x *
done

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT/%{_datadir}/opensync
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/opensync/formats
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/opensync/plugins

find $RPM_BUILD_ROOT -type f -name *.la -exec rm -f {} \;

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/

%ifarch x86_64
install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
%else
install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README TODO
%{_bindir}/*
%{_libdir}/*.so.*
%dir %{_libdir}/opensync
%dir %{_libdir}/opensync/formats
%dir %{_libdir}/opensync/plugins
%{_libdir}/opensync/formats/*
%{_libdir}/python*/*
%dir %{_datadir}/opensync
%config %{_sysconfdir}/ld.so.conf.d/*

%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/opensync-1.0
%{_includedir}/opensync-1.0/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%changelog
* Sun Dec 11 2005 Andreas Bierfert 
0.18-3
- .c and .h files should not be marked executable

* Sun Dec 04 2005 Andreas Bierfert 
0.18-2
- fix missing BR
- mark ldconf as config

* Sat Nov 12 2005 Andreas Bierfert 
0.18-1
- Version upgrade

* Mon Oct 03 2005 Andreas Bierfert 
0.17-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Dec 2005 21:57:39 -0000	1.1
+++ .cvsignore	11 Dec 2005 21:58:44 -0000	1.2
@@ -0,0 +1 @@
+libopensync-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Dec 2005 21:57:39 -0000	1.1
+++ sources	11 Dec 2005 21:58:44 -0000	1.2
@@ -0,0 +1 @@
+ce94a69fb7ae7533d1f8828b6402cec8  libopensync-0.18.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 11 23:44:55 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 11 Dec 2005 18:44:55 -0500
Subject: rpms/libopensync/devel libopensync.spec,1.1,1.2
Message-ID: <200512112345.jBBNjPEO002049@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	libopensync.spec 
Log Message:
- add dist



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync.spec	11 Dec 2005 21:58:44 -0000	1.1
+++ libopensync.spec	11 Dec 2005 23:44:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libopensync
 Version:        0.18
-Release:        3
+Release:        4%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -100,6 +100,10 @@
 
 %changelog
 * Sun Dec 11 2005 Andreas Bierfert 
+0.18-4
+- add dist
+
+* Sun Dec 11 2005 Andreas Bierfert 
 0.18-3
 - .c and .h files should not be marked executable
 



From fedora-extras-commits at redhat.com  Sun Dec 11 23:49:44 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 11 Dec 2005 18:49:44 -0500
Subject: rpms/perl-PatchReader - New directory
Message-ID: <200512112349.jBBNniGE002151@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/perl-PatchReader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2138/perl-PatchReader

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




From fedora-extras-commits at redhat.com  Sun Dec 11 23:49:50 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 11 Dec 2005 18:49:50 -0500
Subject: rpms/perl-PatchReader/devel - New directory
Message-ID: <200512112349.jBBNno7k002169@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/perl-PatchReader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2138/perl-PatchReader/devel

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




From fedora-extras-commits at redhat.com  Sun Dec 11 23:50:06 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 11 Dec 2005 18:50:06 -0500
Subject: rpms/perl-PatchReader Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512112350.jBBNo6Sj002205@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/perl-PatchReader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2192

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 11 23:50:11 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 11 Dec 2005 18:50:11 -0500
Subject: rpms/perl-PatchReader/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512112350.jBBNoBRY002226@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/perl-PatchReader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2192/devel

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


--- NEW 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 Dec 11 23:50:39 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 11 Dec 2005 18:50:39 -0500
Subject: rpms/perl-PatchReader import.log,1.1,1.2
Message-ID: <200512112351.jBBNp9ss002296@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/perl-PatchReader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2260

Modified Files:
	import.log 
Log Message:
auto-import perl-PatchReader-0.9.5-3 on branch devel from perl-PatchReader-0.9.5-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-PatchReader/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Dec 2005 23:50:04 -0000	1.1
+++ import.log	11 Dec 2005 23:50:37 -0000	1.2
@@ -0,0 +1 @@
+perl-PatchReader-0_9_5-3:HEAD:perl-PatchReader-0.9.5-3.src.rpm:1134344998



From fedora-extras-commits at redhat.com  Sun Dec 11 23:50:44 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 11 Dec 2005 18:50:44 -0500
Subject: rpms/perl-PatchReader/devel perl-PatchReader.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512112351.jBBNpFcB002300@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/perl-PatchReader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2260/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-PatchReader.spec 
Log Message:
auto-import perl-PatchReader-0.9.5-3 on branch devel from perl-PatchReader-0.9.5-3.src.rpm


--- NEW FILE perl-PatchReader.spec ---
Name:		perl-PatchReader
Version: 	0.9.5
Release: 	3%{?dist}
Summary:	Utilities to read and manipulate patches and CVS

Group: 		Development/Libraries
License: 	MPL
URL: 		http://search.cpan.org/dist/PatchReader/
Source: 	http://www.cpan.org/authors/id/J/JK/JKEISER/PatchReader-%{version}.tar.gz
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: 	noarch
BuildRequires: 	perl >= 1:5.6.1
BuildRequires:	perl(File::Temp)
Requires: 	cvs
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
PatchReader is a set of utilities for reading in, transforming, and doing
various other things with a patch.  It basically allows you to create a
chain of readers that can read a patch, remove files from a patch, add
CVS context, fix up the patch root according to CVS, and output the patch
as raw unified or through a template processor (used in some places to
output a patch as HTML).


%prep
%setup -q -n PatchReader-%{version}
chmod 644 Changes README
find . -name "*.pm" | xargs chmod 644
%{__perl} -pi -e 's/\r//g' Changes README


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


%install
%{__rm} -rf ${RPM_BUILD_ROOT}
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
%{__rm} -rf ${RPM_BUILD_ROOT}


%files
%defattr(-, root, root, -)
%doc Changes README
%{_mandir}/man3/PatchReader.*
%{perl_vendorlib}/PatchReader.pm
%{perl_vendorlib}/PatchReader/


%changelog
* Sun Dec 11 2005 Paul W. Frields  - 0.9.5-3
- Final cosmetic tweaks

* Sat Dec 10 2005 Paul W. Frields  - 0.9.5-2
- Get in line with fedora-rpmdevtools standards

* Thu Dec  8 2005 Paul W. Frields  - 0.9.5-1
- Initial RPM version for Fedora Extras, based on Dag spec



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PatchReader/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Dec 2005 23:50:09 -0000	1.1
+++ .cvsignore	11 Dec 2005 23:50:42 -0000	1.2
@@ -0,0 +1 @@
+PatchReader-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PatchReader/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Dec 2005 23:50:09 -0000	1.1
+++ sources	11 Dec 2005 23:50:42 -0000	1.2
@@ -0,0 +1 @@
+8aca86b807aec3c82dcb981c7730f022  PatchReader-0.9.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 11 23:53:26 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 11 Dec 2005 18:53:26 -0500
Subject: owners owners.list,1.439,1.440
Message-ID: <200512112353.jBBNrufw002360@cvs-int.fedora.redhat.com>

Author: pfrields

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

Modified Files:
	owners.list 
Log Message:
Added perl-PatchReader


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- owners.list	9 Dec 2005 23:30:21 -0000	1.439
+++ owners.list	11 Dec 2005 23:53:24 -0000	1.440
@@ -828,6 +828,7 @@
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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-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-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
 Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Dec 12 02:38:35 2005
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Sun, 11 Dec 2005 21:38:35 -0500
Subject: rpms/monotone/FC-4 README.monotone-server, NONE, 1.1 .cvsignore, 1.4,
	1.5 monotone.init, 1.5, 1.6 monotone.spec, 1.10,
	1.11 monotone.sysconfig, 1.1, 1.2 sources, 1.4, 1.5
Message-ID: <200512120239.jBC2d5qe009249@cvs-int.fedora.redhat.com>

Author: roland

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

Modified Files:
	.cvsignore monotone.init monotone.spec monotone.sysconfig 
	sources 
Added Files:
	README.monotone-server 
Log Message:
Update to 0.24


--- NEW FILE README.monotone-server ---
The Fedora Extras build of monotone provides an extra RPM monotone-server.
This package is intended to make it easy to set up an unattended server
installation for Monotone's Netsync protocol (i.e. "monotone serve").

The package a standard Fedora-style init.d script with chkconfig support
for running the server, installed as /usr/sbin/monotone-server.
(This is just a symlink to monotone that the init script runs instead.
This enables matching "monotone-server" processes with ps to distinguish
server instances from people using monotone.)

The /etc/monotone directory serves as ~/.monotone for the server.  This
directory and its contents are not writable by the "monotone" user ID under
which the network server runs.  The database lives in /var/db/monotone,
which the "monotone" user ID must write to.

The init.d script will generate a private key for the server to use, if
none exists yet.  The key identification will be the host's FQDN (from
/bin/hostname -f).  You can use "service monotone genkey [IDENT]" to
generate the private key by hand and set up the unattended server to use
it, supplying a different key identification string if you like.

Before starting the server, the script will migrate an old database
format if you had a previous version of the monotone-server installation.
(This includes converting private keys from the old format.)
You can always do this explicitly with "service monotone migrate".

Access to the server is controlled by the /etc/monotone/read-permissions and
/etc/monotone/write-permissions files, unless you write your own Lua hooks
in /etc/monotone/monotonerc.  These files are not created or editted by the
RPM scripts, you must create them.  These files refer to key identification
strings for keys already the database.  Anyone allowed write access by the
netwrok server can put new keys in the database with "monotone push" using
the --key-to-push option.  To bootstrap this, /etc/monotone/write-permission
must allow some key and that key must be in the database already.  You can
put a key in the server's database easily with "service monotone import",
e.g. to import the public key for a private key in ~/.monotone/keys:

	monotone pubkey me at my.com | sudo service monotone import

For problems with this package or its scripts, please file bugs
at http://bugzilla.redhat.com/ for the "monotone" component
in th "Fedora Extras" product.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Oct 2005 03:02:27 -0000	1.4
+++ .cvsignore	12 Dec 2005 02:38:33 -0000	1.5
@@ -1 +1 @@
-monotone-0.23.tar.gz
+monotone-0.24.tar.gz


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- monotone.init	23 Aug 2005 09:47:30 -0000	1.5
+++ monotone.init	12 Dec 2005 02:38:33 -0000	1.6
@@ -7,7 +7,7 @@
 # processname: monotone-server
 # pidfile: /var/run/monotone-server.pid
 # config: /etc/sysconfig/monotone
-# config: /etc/monotonerc
+# config: /etc/monotone/monotonerc
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -31,7 +31,7 @@
 random_passphrase()
 {
 	# As of 0.22, 32 chars is the maximum pass phrase length.
-	dd if=/dev/urandom count=1 2> /dev/null | md5sum |
+	dd if=/dev/urandom bs=32 count=1 2> /dev/null | md5sum |
 	{ read sum rest; echo $sum; }
 }
 
@@ -40,8 +40,16 @@
 # See how we were called.
 case "$1" in
   start)
-	[ -e $MONOTONE_DBFILE ] || { $0 init && $0 genkey; }
+	if [ -e $MONOTONE_DBFILE ]; then
+		$0 migrate
+	else
+		$0 init
+	fi
 	RETVAL=$?
+	if [ $RETVAL = 0 ] && [ "x`ls $MONOTONE_KEYDIR`" = x ]; then
+		$0 genkey
+		RETVAL=$?
+	fi
 	if [ $RETVAL = 0 ]; then
 		# Start daemon.
 		echo -n $"Starting monotone server: "
@@ -60,7 +68,7 @@
         ;;
   stop)
         # Stop daemons.
-        echo -n "Stopping monotone server: "
+        echo -n $"Stopping monotone server: "
         killproc $MTSERVER
         RETVAL=$?
         [ $RETVAL = 0 ] && rm -f /var/lock/subsys/monotone
@@ -78,7 +86,7 @@
 	RETVAL=$?
 	;;
   init)
-	echo -n $"Initializing $MONOTONE_DBFILE: "
+	echo -n $"Initializing database" "$MONOTONE_DBFILE" ": "
 	{ [ -d /var/db/monotone ] ||
  	  /usr/bin/install -o ${MONOTONE_USER:-monotone} \
 			   -g ${MONOTONE_GROUP:-monotone} \
@@ -91,7 +99,7 @@
 	echo
 	;;
   genkey)
-	MONOTONE_KEYID=${MONOTONE_KEYID:-`/bin/hostname -f`}
+	MONOTONE_KEYID=${2:-${MONOTONE_KEYID:-`/bin/hostname -f`}}
 	MONOTONE_PPFILE=${MONOTONE_PPFILE:-/var/db/monotone/passphrase.lua}
 	echo -n $"Generating RSA key for server $MONOTONE_KEYID"
 	tmp=/tmp/mtserver$$
@@ -106,9 +114,8 @@
   return "$passphrase"
 end
 EOF
-		/usr/bin/install -o ${MONOTONE_USER:-monotone} \
-		    		 -g ${MONOTONE_GROUP:-monotone} \
-				 -m 0600 $tmp ${MONOTONE_PPFILE}
+		/usr/bin/install -o root -g ${MONOTONE_GROUP:-monotone} \
+				 -m 0440 $tmp ${MONOTONE_PPFILE}
 	then
 		success $"key generation"
 	else
@@ -118,8 +125,47 @@
 	rm -f $tmp
 	echo
 	;;
+  migrate)
+  	oppfile=/var/db/monotone/passphrase.lua
+	RETVAL=0
+	if [ ! -e $MONOTONE_PPFILE ] && [ -e $oppfile ]; then
+		echo -n $"Moving old server passphrase file to new location: "
+		/usr/bin/install -o root -g ${MONOTONE_GROUP:-monotone} \
+				 -m 0440 $oppfile ${MONOTONE_PPFILE} &&
+		success $"move passphrase file" ||
+		failure $"move passphrase file"
+		RETVAL=$?
+		echo
+	fi
+	[ $RETVAL -eq 0 ] || exit $RETVAL
+	# Note this must run as root in case migration is writing
+	# into /etc/monotone/private-keys.
+	echo $"Checking database format in" "${MONOTONE_DBFILE}:"
+	(umask 027
+	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db migrate &&
+	 /bin/chgrp -R ${MONOTONE_GROUP:-monotone} $MONOTONE_KEYDIR)
+		success $"database check" ||
+		failure $"database check"
+	RETVAL=$?
+	echo
+	;;
+  # Use "monotone pubkey me at my.com | service monotone import"
+  # to import the first keys to enable in /etc/monotone/write-permission.
+  # Thereafter, those with write permission can add other keys via
+  # netsync with "monotone push --key-to-push=IDENT" and then IDENT
+  # can be used in the read-permission and write-permission files.
+  import)
+	echo -n $"Importing packets to monotone database: "
+	runuser -s /bin/bash - ${MONOTONE_USER:-monotone} -c "umask 007; \
+		$MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS read" &&
+		success $"packet import" ||
+		failure $"packet import"
+	RETVAL=$?
+	echo
+	;;
   *)
-	echo "Usage: $0 {start|stop|restart|status|condrestart|init|genkey}"
+	echo "\
+Usage: $0 {start|stop|restart|status|condrestart|init|import|genkey [IDENT]}"
 	RETVAL=1
 	;;
 esac


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monotone.spec	4 Oct 2005 03:02:27 -0000	1.10
+++ monotone.spec	12 Dec 2005 02:38:33 -0000	1.11
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.23
+Version: 0.24
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -10,14 +10,12 @@
 Source0: http://www.venge.net/monotone/downloads/%{name}-%{version}.tar.gz
 Source1: monotone.init
 Source2: monotone.sysconfig
-
-Patch1: monotone-xfail-if-root.patch
+Source3: README.monotone-server
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
 BuildRequires: boost-devel >= 1.32.0
-BuildRequires: lua
 %if 1
 %define bundled_sqlite yes
 %else
@@ -25,6 +23,11 @@
 BuildRequires: sqlite-devel >= 3.2.7
 %define bundled_sqlite no
 %endif
+# monotone has local hacks in lua 5.0.2 as well, sigh.
+%define bundled_lua 1
+%if %{bundled_lua} == 0
+BuildRequires: lua
+%endif
 
 # The test suite needs cvs.
 BuildRequires: cvs
@@ -56,14 +59,13 @@
 %prep
 %setup -q
 
-%patch1 -p1
-
 %build
-%configure --with-bundled-lua=no --with-bundled-sqlite=%{bundled_sqlite}
+%configure --with-bundled-lua=%{bundled_lua} \
+	   --with-bundled-sqlite=%{bundled_sqlite}
 make %{?_smp_mflags}
 
 %check
-make check || { cat testsuite.log; false; }
+#make check || { cat testsuite.log; false; }
 
 %install
 rm -rf %{buildroot}
@@ -84,14 +86,21 @@
 ln -snf ../bin/monotone %{buildroot}%{_sbindir}/monotone-server
 %{__install} -c -m 0555 %{SOURCE1} %{buildroot}/etc/init.d/monotone
 %{__install} -c -m 0644 %{SOURCE2} %{buildroot}/etc/sysconfig/monotone
-%{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotonerc
+%{__install} -d -m 0755 %{buildroot}/etc/monotone
+%{__install} -d -m 0750 %{buildroot}/etc/monotone/private-keys
 %{__install} -d -m 0770 %{buildroot}/var/db/monotone
 
 # These do not actually wind up in the package, due to %%ghost.
+%{__install} -c -m 0440 /dev/null %{buildroot}/etc/monotone/passphrase.lua
+%{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/read-permissions
+%{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/write-permissions
+%{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotone/monotonerc
 touch %{buildroot}/var/db/monotone/server.db
-touch %{buildroot}/var/db/monotone/passphrase.lua
+
+cp %{SOURCE3} .
 
 %clean
+rm -f README.monotone-server
 rm -rf %{buildroot}
 
 %post
@@ -118,14 +127,20 @@
 
 
 %files server
+%doc README.monotone-server
 %defattr(-,root,root,-)
 %{_sbindir}/monotone-server
 /etc/init.d/monotone
-%config(noreplace) /etc/sysconfig/monotone
-%config(noreplace) /etc/monotonerc
+%config /etc/sysconfig/monotone
+%dir %attr(0755,root,monotone) /etc/monotone
+%dir %attr(0750,root,monotone) /etc/monotone/private-keys
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/monotonerc
+%attr(0440,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/passphrase.lua
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/read-permissions
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/write-permissions
+ %attr(0750,root,monotone) /etc/monotone/private-keys
 %dir %attr(0770,monotone,monotone) /var/db/monotone
 %attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.db
-%attr(0600,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/passphrase.lua
 
 %pre server
 # Add the "monotone" user
@@ -136,6 +151,9 @@
 # Register the monotone service
 /sbin/chkconfig --add monotone
 
+# Restart the running server, which will update its db format when needed.
+/sbin/service monotone condrestart
+
 %preun server
 if [ $1 = 0 ]; then
 	/sbin/service monotone stop > /dev/null 2>&1
@@ -144,6 +162,9 @@
 
 
 %changelog
+* Sun Dec 11 2005 Roland McGrath  - 0.24-1
+- Updated for 0.24 release.
+
 * Mon Oct  3 2005 Roland McGrath  - 0.23-1
 - Updated for 0.23 release.
 


Index: monotone.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monotone.sysconfig	23 Aug 2005 05:31:11 -0000	1.1
+++ monotone.sysconfig	12 Dec 2005 02:38:33 -0000	1.2
@@ -1,9 +1,10 @@
-MONOTONERC=/etc/monotonerc
+MONOTONE_CONFDIR=/etc/monotone
+MONOTONE_KEYDIR=/etc/monotone/private-keys
 MONOTONE_DBFILE=/var/db/monotone/server.db
-MONOTONE_PPFILE=/var/db/monotone/passphrase.lua
+MONOTONE_PPFILE=/etc/monotone/passphrase.lua
 
-MONOTONE_RCOPTS="--norc --rcfile=$MONOTONERC"
-MONOTONE_DBOPTS="--db=$MONOTONE_DBFILE"
+MONOTONE_RCOPTS="--confdir=$MONOTONE_CONFDIR"
+MONOTONE_DBOPTS="--db=$MONOTONE_DBFILE --keydir=$MONOTONE_KEYDIR"
 MONOTONE_PPOPTS="--rcfile=$MONOTONE_PPFILE"
 
-MONOTONE_SERVE_OPTS="0.0.0.0 '*'"
+MONOTONE_SERVE_OPTS="'*'"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Oct 2005 03:02:27 -0000	1.4
+++ sources	12 Dec 2005 02:38:33 -0000	1.5
@@ -1 +1 @@
-6d9e909480c2be0b23e2820c3a42e6f1  monotone-0.23.tar.gz
+8193203c8b48104500d956f9e524bfcd  monotone-0.24.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 02:42:33 2005
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Sun, 11 Dec 2005 21:42:33 -0500
Subject: rpms/monotone/FC-4 monotone-xfail-if-root.patch,1.1,NONE
Message-ID: <200512120242.jBC2gXDc009326@cvs-int.fedora.redhat.com>

Author: roland

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

Removed Files:
	monotone-xfail-if-root.patch 
Log Message:
Remove obsolete patch


--- monotone-xfail-if-root.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Dec 12 10:01:31 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Dec 2005 05:01:31 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.13,1.14
Message-ID: <200512121002.jBCA22dN023445@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
remove devel specific Requires



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cernlib.spec	9 Dec 2005 20:16:01 -0000	1.13
+++ cernlib.spec	12 Dec 2005 10:01:28 -0000	1.14
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.2
+Release:       8%{?dist}.3
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -200,8 +200,6 @@
 %package devel
 Summary:       General purpose CERN library static libraries and headers
 Requires:      lapack-devel blas-devel openmotif-devel
-# workaround #173530
-Requires:      libXau-devel
 Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
 
@@ -693,7 +691,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8.2
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.3
 - use new debian patchset
 - enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary



From fedora-extras-commits at redhat.com  Mon Dec 12 10:04:06 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Dec 2005 05:04:06 -0500
Subject: rpms/cernlib/FC-3 cernlib.spec,1.10,1.11
Message-ID: <200512121004.jBCA4cLj023517@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
Modify Requires to suit FC-3 and not FC-4/devel



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cernlib.spec	9 Dec 2005 17:31:10 -0000	1.10
+++ cernlib.spec	12 Dec 2005 10:04:04 -0000	1.11
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.3
+Release:       8%{?dist}.4
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -198,9 +198,7 @@
 
 %package devel
 Summary:       General purpose CERN library static libraries and headers
-Requires:      lapack-devel blas-devel openmotif-devel
-# workaround #173530
-Requires:      libXau-devel
+Requires:      lapack blas openmotif-devel
 Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
 
@@ -692,7 +690,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8.3
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.4
 - update with newer debian patchset for cernlib, fix licence issues
 - enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary



From fedora-extras-commits at redhat.com  Mon Dec 12 11:30:15 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 12 Dec 2005 06:30:15 -0500
Subject: rpms/kasumi/FC-3 .cvsignore, 1.3, 1.4 kasumi.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200512121130.jBCBUjVv025390@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	.cvsignore kasumi.spec sources 
Log Message:
* Mon Dec 12 2005 Akira TAGOH  - 1.0-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kasumi/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2005 07:28:58 -0000	1.3
+++ .cvsignore	12 Dec 2005 11:30:13 -0000	1.4
@@ -1,2 +1,3 @@
 kasumi-0.9.tar.gz
 kasumi-0.10.tar.gz
+kasumi-1.0.tar.gz


Index: kasumi.spec
===================================================================
RCS file: /cvs/extras/rpms/kasumi/FC-3/kasumi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kasumi.spec	13 Oct 2005 07:28:58 -0000	1.3
+++ kasumi.spec	12 Dec 2005 11:30:13 -0000	1.4
@@ -1,5 +1,5 @@
 Name:    kasumi
-Version: 0.10
+Version: 1.0
 Release: 1%{?dist}
 
 License: GPL
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Dec 12 2005 Akira TAGOH  - 1.0-1
+- New upstream release.
+
 * Thu Oct 13 2005 Akira TAGOH  - 0.10-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kasumi/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2005 07:28:58 -0000	1.3
+++ sources	12 Dec 2005 11:30:13 -0000	1.4
@@ -1 +1 @@
-bfeba1ef78a15da7f180f04ec271f987  kasumi-0.10.tar.gz
+15314d8eaaf83abf5fd41b93be8ce91f  kasumi-1.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 13:11:08 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 12 Dec 2005 08:11:08 -0500
Subject: rpms/gnome-sudoku - New directory
Message-ID: <200512121311.jBCDB81F028817@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28808/gnome-sudoku

Log Message:
Directory /cvs/extras/rpms/gnome-sudoku added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 12 13:11:13 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 12 Dec 2005 08:11:13 -0500
Subject: rpms/gnome-sudoku/devel - New directory
Message-ID: <200512121311.jBCDBD6N028833@cvs-int.fedora.redhat.com>

Author: pfrields

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

Log Message:
Directory /cvs/extras/rpms/gnome-sudoku/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 12 13:11:27 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 12 Dec 2005 08:11:27 -0500
Subject: rpms/gnome-sudoku Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512121311.jBCDBR7P028868@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28855

Added Files:
	Makefile import.log 
Log Message:
Setup of module gnome-sudoku


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 12 13:11:32 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 12 Dec 2005 08:11:32 -0500
Subject: rpms/gnome-sudoku/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512121311.jBCDBWRh028887@cvs-int.fedora.redhat.com>

Author: pfrields

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-sudoku


--- NEW 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 Dec 12 13:12:01 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 12 Dec 2005 08:12:01 -0500
Subject: rpms/gnome-sudoku import.log,1.1,1.2
Message-ID: <200512121312.jBCDCVq9028959@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28921

Modified Files:
	import.log 
Log Message:
auto-import gnome-sudoku-0.3.4-1 on branch devel from gnome-sudoku-0.3.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Dec 2005 13:11:25 -0000	1.1
+++ import.log	12 Dec 2005 13:11:59 -0000	1.2
@@ -0,0 +1 @@
+gnome-sudoku-0_3_4-1:HEAD:gnome-sudoku-0.3.4-1.src.rpm:1134393082



From fedora-extras-commits at redhat.com  Mon Dec 12 13:12:06 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 12 Dec 2005 08:12:06 -0500
Subject: rpms/gnome-sudoku/devel gnome-sudoku.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512121312.jBCDCb9Y028963@cvs-int.fedora.redhat.com>

Author: pfrields

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

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-sudoku.spec 
Log Message:
auto-import gnome-sudoku-0.3.4-1 on branch devel from gnome-sudoku-0.3.4-1.src.rpm


--- NEW FILE gnome-sudoku.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:           gnome-sudoku
Version:        0.3.4
Release:        1%{?dist}
Summary:        GNOME based Sudoku, a logic puzzle game

Group:          Amusements/Games
License:        GPL
URL:            http://gnome-sudoku.sourceforge.net
Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  pygtk2-libglade
BuildRequires:	gnome-python2-gnomeprint, python-imaging
BuildRequires:	desktop-file-utils
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
Requires:   gnome-python2-gnomeprint, python-imaging

%description
GNOME Sudoku is a Japanese logic puzzle game.  GNOME Sudoku takes care
to generate valid sudoku -- symmetrical puzzles for which there is a
unique solution.

%prep
%setup -q
# Fix one hardcoding instance
sed -i 's!/usr/local!%{_prefix}!g' src/lib/game_selector.py
# This must be something internal to the developer's system
for i in src/lib/*.py ; do
    sed -i 's!.*simple_debug.*!!g' "$i"
done


%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
desktop-file-install --vendor fedora \
		     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
		     --add-category X-Fedora \
		     ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING FAQ README
%dir %{python_sitelib}/gnome_sudoku/
%{python_sitelib}/gnome_sudoku/*
%{_datadir}/applications/fedora-%{name}.desktop
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/*
%{_datadir}/pixmaps/sudoku.png
%{_bindir}/%{name}


%changelog
* Sun Dec 11 2005 Paul W. Frields  - 0.3.4-1
- Fix to fedora-rpmdevtools standards

* Sat Dec  3 2005 Paul W. Frields  - 0.3.4-0.9
- Initial RPM version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Dec 2005 13:11:30 -0000	1.1
+++ .cvsignore	12 Dec 2005 13:12:04 -0000	1.2
@@ -0,0 +1 @@
+gnome-sudoku-0.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Dec 2005 13:11:30 -0000	1.1
+++ sources	12 Dec 2005 13:12:04 -0000	1.2
@@ -0,0 +1 @@
+6b411c8f925b0f9ce0ac195400c08f6a  gnome-sudoku-0.3.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 13:15:40 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 12 Dec 2005 08:15:40 -0500
Subject: owners owners.list,1.440,1.441
Message-ID: <200512121316.jBCDGARE029029@cvs-int.fedora.redhat.com>

Author: pfrields

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

Modified Files:
	owners.list 
Log Message:
Added gnome-sudoku


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- owners.list	11 Dec 2005 23:53:24 -0000	1.440
+++ owners.list	12 Dec 2005 13:15:38 -0000	1.441
@@ -289,6 +289,7 @@
 Fedora Extras|gnome-common|Useful things common to building gnome packages from scratch|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-cpufreq-applet|CPU frequency scaling monitor applet|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-password-generator|Graphical secure password generator|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-sudoku|GNOME based Sudoku, a logic puzzle game|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnomesword|GNOME-based Bible research tool|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-telnet|A fancy GNOME telnet client|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks|An attractive GTK+ 2 engine with a focus on usability|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 12 14:05:35 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 12 Dec 2005 09:05:35 -0500
Subject: rpms/perl-Crypt-DH/FC-3 perl-Crypt-DH.spec,1.2,1.3
Message-ID: <200512121406.jBCE66H2030821@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30797

Modified Files:
	perl-Crypt-DH.spec 
Log Message:
Add support for FC-3, which doesn't have %bcond_with{,out} predefined



Index: perl-Crypt-DH.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DH/FC-3/perl-Crypt-DH.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Crypt-DH.spec	9 Dec 2005 08:32:25 -0000	1.2
+++ perl-Crypt-DH.spec	12 Dec 2005 14:05:33 -0000	1.3
@@ -1,11 +1,13 @@
 # To skip the lengthy test suite, use:
 # rpmbuild --without checks
+%{!?bcond_with:%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}}
+%{!?bcond_without:%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}}
 %bcond_without checks
 
 Summary:	Perl module implementing the Diffie-Hellman key exchange system
 Name:		perl-Crypt-DH
 Version:	0.06
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-DH/
@@ -48,6 +50,9 @@
 %{_mandir}/man3/Crypt::DH.3pm*
 
 %changelog
+* Mon Dec 12 2005 Paul Howarth  0.06-3
+- Add support for FC-3, which doesn't have %%bcond_with{,out} predefined
+
 * Fri Dec  9 2005 Paul Howarth  0.06-2
 - Add facility to skip test suite at build time if desired
 



From fedora-extras-commits at redhat.com  Mon Dec 12 14:07:32 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 12 Dec 2005 09:07:32 -0500
Subject: rpms/perl-Crypt-DH/FC-4 perl-Crypt-DH.spec,1.2,1.3
Message-ID: <200512121408.jBCE838N030857@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30831

Modified Files:
	perl-Crypt-DH.spec 
Log Message:
resync with FC-3



Index: perl-Crypt-DH.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DH/FC-4/perl-Crypt-DH.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Crypt-DH.spec	9 Dec 2005 08:32:25 -0000	1.2
+++ perl-Crypt-DH.spec	12 Dec 2005 14:07:30 -0000	1.3
@@ -1,11 +1,13 @@
 # To skip the lengthy test suite, use:
 # rpmbuild --without checks
+%{!?bcond_with:%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}}
+%{!?bcond_without:%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}}
 %bcond_without checks
 
 Summary:	Perl module implementing the Diffie-Hellman key exchange system
 Name:		perl-Crypt-DH
 Version:	0.06
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-DH/
@@ -48,6 +50,9 @@
 %{_mandir}/man3/Crypt::DH.3pm*
 
 %changelog
+* Mon Dec 12 2005 Paul Howarth  0.06-3
+- Add support for FC-3, which doesn't have %%bcond_with{,out} predefined
+
 * Fri Dec  9 2005 Paul Howarth  0.06-2
 - Add facility to skip test suite at build time if desired
 



From fedora-extras-commits at redhat.com  Mon Dec 12 14:09:20 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 12 Dec 2005 09:09:20 -0500
Subject: rpms/perl-Crypt-DH/devel perl-Crypt-DH.spec,1.2,1.3
Message-ID: <200512121409.jBCE9pn2030888@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30863

Modified Files:
	perl-Crypt-DH.spec 
Log Message:
resync with FC-3



Index: perl-Crypt-DH.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DH/devel/perl-Crypt-DH.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Crypt-DH.spec	9 Dec 2005 08:32:25 -0000	1.2
+++ perl-Crypt-DH.spec	12 Dec 2005 14:09:13 -0000	1.3
@@ -1,11 +1,13 @@
 # To skip the lengthy test suite, use:
 # rpmbuild --without checks
+%{!?bcond_with:%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}}
+%{!?bcond_without:%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}}
 %bcond_without checks
 
 Summary:	Perl module implementing the Diffie-Hellman key exchange system
 Name:		perl-Crypt-DH
 Version:	0.06
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-DH/
@@ -48,6 +50,9 @@
 %{_mandir}/man3/Crypt::DH.3pm*
 
 %changelog
+* Mon Dec 12 2005 Paul Howarth  0.06-3
+- Add support for FC-3, which doesn't have %%bcond_with{,out} predefined
+
 * Fri Dec  9 2005 Paul Howarth  0.06-2
 - Add facility to skip test suite at build time if desired
 



From fedora-extras-commits at redhat.com  Mon Dec 12 14:10:03 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 12 Dec 2005 09:10:03 -0500
Subject: fedora-security/audit fc4,1.103,1.104 fc5,1.14,1.15
Message-ID: <200512121410.jBCEAZa9030910@cvs-int.fedora.redhat.com>

Author: mjc

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

Modified Files:
	fc4 fc5 
Log Message:
Deal with kernel FC4 update



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- fc4	11 Dec 2005 20:14:26 -0000	1.103
+++ fc4	12 Dec 2005 14:10:01 -0000	1.104
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20051207
-Up to date FC4 as of 200501127
+Up to date CVE as of CVE email 20051211
+Up to date FC4 as of 20051211
 
 ** are items that need attention
 
@@ -17,7 +17,7 @@
 CVE-2005-3191 VULNERABLE (kdegraphics)
 CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3191 backport (poppler) [since FEDORA-2005-1132]
-CVE-2005-3964 VULNERABLE (openmotif)
+CVE-2005-3964 VULNERABLE (openmotif) bz#174815
 CVE-2005-3962 backport (perl) [since FEDORA-2005-1113]
 CVE-2005-3912 backport (perl) [since FEDORA-2005-1113]
 CVE-2005-3883 VULNERABLE (php)
@@ -25,14 +25,14 @@
 CVE-2005-3857 VULNERABLE (kernel, fixed 2.6.15)
 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 VULNERABLE (kernel, fixed 2.6.15) affects 2.6.14 only [vulnerable since FEDORA-2005-1067]
-CVE-2005-3809 VULNERABLE (kernel, fixed 2.6.15) affects 2.6.14 only [vulnerable since FEDORA-2005-1067]
-CVE-2005-3808 VULNERABLE (kernel)
-CVE-2005-3807 VULNERABLE (kernel) bz#172691
+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-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 VULNERABLE (kernel, fixed 2.6.15)
-CVE-2005-3783 VULNERABLE (kernel, fixed 2.6.14.2)
+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-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
@@ -136,6 +136,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-2708 ignore (kernel) not reproducable on x86_64
 CVE-2005-2707 version (thunderbird) [since FEDORA-2005-963]
 CVE-2005-2707 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
@@ -567,6 +568,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
+CVE-2004-2607 version (kernel, fixed 2.6.5)
 CVE-2004-2589 version (gaim, fixed 0.82)
 CVE-2004-2546 version (samba, fixed 3.0.6)
 CVE-2004-2541 blocked (cscope) by FORTIFY_SOURCE


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fc5	9 Dec 2005 22:13:29 -0000	1.14
+++ fc5	12 Dec 2005 14:10:01 -0000	1.15
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20051207
+Up to date CVE as of CVE email 20051211
 Up to date FC5 as of FC5-Test1-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -141,6 +141,7 @@
 CVE-2005-2794 version (squid, fixed 2.5.STABLE11)
 CVE-2005-2728 backport (httpd, fixed 2.0.55) 
 CVE-2005-2710 version (HelixPlayer, fixed 1.0.6)
+CVE-2005-2709 VULNERABLE (kernel, fixed 2.6.14.3)
 CVE-2005-2708 ignore (kernel) not reproducable on x86_64
 CVE-2005-2707 version (thunderbird)
 CVE-2005-2707 version (firefox, fixed 1.0.7)
@@ -598,6 +599,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
+CVE-2004-2607 version (kernel, fixed 2.6.5)
 CVE-2004-2589 version (gaim, fixed 0.82)
 CVE-2004-2546 version (samba, fixed 3.0.6)
 CVE-2004-2541 blocked (cscope) by FORTIFY_SOURCE



From fedora-extras-commits at redhat.com  Mon Dec 12 15:13:30 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 12 Dec 2005 10:13:30 -0500
Subject: rpms/ircd-hybrid import.log,1.15,1.16
Message-ID: <200512121514.jBCFE1RC000345@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv306

Modified Files:
	import.log 
Log Message:
auto-import ircd-hybrid-7.2.0-4 on branch devel from ircd-hybrid-7.2.0-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- import.log	9 Dec 2005 22:08:28 -0000	1.15
+++ import.log	12 Dec 2005 15:13:28 -0000	1.16
@@ -12,3 +12,4 @@
 ircd-hybrid-7_2_0-2:HEAD:ircd-hybrid-7.2.0-2.src.rpm:1134155655
 ircd-hybrid-7_2_0-2:FC-4:ircd-hybrid-7.2.0-2.src.rpm:1134165805
 ircd-hybrid-7_2_0-2:FC-3:ircd-hybrid-7.2.0-2.src.rpm:1134166074
+ircd-hybrid-7_2_0-4:HEAD:ircd-hybrid-7.2.0-4.src.rpm:1134400398



From fedora-extras-commits at redhat.com  Mon Dec 12 15:13:36 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 12 Dec 2005 10:13:36 -0500
Subject: rpms/ircd-hybrid/devel ircd-hybrid-7.2.0-help.diff, NONE,
	1.1 ircd-hybrid.spec, 1.6, 1.7
Message-ID: <200512121514.jBCFE6Zn000348@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv306/devel

Modified Files:
	ircd-hybrid.spec 
Added Files:
	ircd-hybrid-7.2.0-help.diff 
Log Message:
auto-import ircd-hybrid-7.2.0-4 on branch devel from ircd-hybrid-7.2.0-4.src.rpm

ircd-hybrid-7.2.0-help.diff:

--- NEW FILE ircd-hybrid-7.2.0-help.diff ---
--- ircd-hybrid-7.2.0/help/Makefile.old	2005-12-09 06:52:54.000000000 +0100
+++ ircd-hybrid-7.2.0/help/Makefile.in	2005-12-12 15:26:05.000000000 +0100
@@ -41,7 +41,8 @@
 	done
 	@for link in $(SYMLINKS); do \
 		rm -f $(uhelpdir)/$$link; \
-		ln -s $(ohelpdir)/$$link $(uhelpdir); \
+		cd $(uhelpdir); \
+		ln -s ../opers/$$link .; \
 	done
 
 distclean:


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/devel/ircd-hybrid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ircd-hybrid.spec	9 Dec 2005 19:14:31 -0000	1.6
+++ ircd-hybrid.spec	12 Dec 2005 15:13:34 -0000	1.7
@@ -10,12 +10,13 @@
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
 Version: 7.2.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
+Patch0:  ircd-hybrid-7.2.0-help.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): fedora-usermgmt
@@ -32,24 +33,23 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
 # Change modules/autoload path (IRCD_PREFIX "/modules/autoload/" - by default)
 # Change modules path (IRCD_PREFIX "/modules/" - by default)
 %{__perl} -pi -e 's|(^#define ETCPATH) .*|$1 "%{_sysconfdir}/ircd"|g;
-                  s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g;
-		   s|(^#define AUTOMODPATH IRCD_PREFIX) .*|#define AUTOMODPATH "%{_libdir}/ircd/modules/autoload/"|g;
-                  s|(^#define MODPATH) .*|$1 "%{_libdir}/ircd/modules/"|g' \
+                  s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g' \
    include/defaults.h
 #Added for x86_64 arch support
 sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
-
 %build
 %configure \
+    --prefix=%{_libdir}/ircd \
     --sysconfdir=%{_sysconfdir}/ircd \
-   --with-nicklen=%{nicklen} \
+    --with-nicklen=%{nicklen} \
     --with-topiclen=%{topiclen} \
     --with-maxconn=%{maxconn}
 %{__make} %{?_smp_mflags}
@@ -57,8 +57,10 @@
 
 %install
 %{__rm} -rf %{buildroot}
+
 %makeinstall \
-    sysconfdir=%{buildroot}%{_sysconfdir}/ircd
+   prefix=%{buildroot}%{_libdir}/ircd \
+   sysconfdir=%{buildroot}%{_sysconfdir}/ircd
 
 %{__install} -m 0755 -D %{SOURCE1} %{buildroot}%{_initrddir}/ircd
 %{__install} -m 0640 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ircd
@@ -77,13 +79,9 @@
 %{__rm} -r   %{buildroot}%{_localstatedir}/logs/
 %{__mkdir_p} %{buildroot}%{_var}/log/ircd/
 
-chmod 755 %{buildroot}%{_prefix}/modules/*.so
-chmod 755 %{buildroot}%{_prefix}/modules/autoload/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd/modules/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd/modules/autoload/*.so
 
-# Move modules directory which we changed previously (same remark as above)
-%{__mkdir_p} %{buildroot}%{_libdir}/ircd/modules/
-%{__mv}      %{buildroot}%{_prefix}/modules/* \
-             %{buildroot}%{_libdir}/ircd/modules/.
 %{__mkdir_p} %{buildroot}%{_var}/lib/ircd
 
 %clean
@@ -120,15 +118,20 @@
 %{_sysconfdir}/rc.d/init.d/ircd
 %{_bindir}/ircd
 %{_bindir}/servlink
-%{_libdir}/ircd/
+%{_libdir}/ircd
 %{_libexecdir}/ircd/
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-%exclude %{_prefix}/help
 
 
 %changelog
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-4
+- Modify spec file to help files
+
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-3
+- Modify spec file to use configure correctly 
+
 * Fri Dec 09 2005 Eric Tanguy 7.2.0-2
 - Modify spec file to take into account the 7.2.0 update
 



From fedora-extras-commits at redhat.com  Mon Dec 12 15:15:08 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 12 Dec 2005 10:15:08 -0500
Subject: rpms/ircd-hybrid import.log,1.16,1.17
Message-ID: <200512121515.jBCFFcaL000447@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv410

Modified Files:
	import.log 
Log Message:
auto-import ircd-hybrid-7.2.0-4 on branch FC-4 from ircd-hybrid-7.2.0-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- import.log	12 Dec 2005 15:13:28 -0000	1.16
+++ import.log	12 Dec 2005 15:15:06 -0000	1.17
@@ -13,3 +13,4 @@
 ircd-hybrid-7_2_0-2:FC-4:ircd-hybrid-7.2.0-2.src.rpm:1134165805
 ircd-hybrid-7_2_0-2:FC-3:ircd-hybrid-7.2.0-2.src.rpm:1134166074
 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



From fedora-extras-commits at redhat.com  Mon Dec 12 15:15:14 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 12 Dec 2005 10:15:14 -0500
Subject: rpms/ircd-hybrid/FC-4 ircd-hybrid-7.2.0-help.diff, NONE,
	1.1 ircd-hybrid.spec, 1.5, 1.6
Message-ID: <200512121515.jBCFFite000450@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv410/FC-4

Modified Files:
	ircd-hybrid.spec 
Added Files:
	ircd-hybrid-7.2.0-help.diff 
Log Message:
auto-import ircd-hybrid-7.2.0-4 on branch FC-4 from ircd-hybrid-7.2.0-4.src.rpm

ircd-hybrid-7.2.0-help.diff:

--- NEW FILE ircd-hybrid-7.2.0-help.diff ---
--- ircd-hybrid-7.2.0/help/Makefile.old	2005-12-09 06:52:54.000000000 +0100
+++ ircd-hybrid-7.2.0/help/Makefile.in	2005-12-12 15:26:05.000000000 +0100
@@ -41,7 +41,8 @@
 	done
 	@for link in $(SYMLINKS); do \
 		rm -f $(uhelpdir)/$$link; \
-		ln -s $(ohelpdir)/$$link $(uhelpdir); \
+		cd $(uhelpdir); \
+		ln -s ../opers/$$link .; \
 	done
 
 distclean:


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-4/ircd-hybrid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ircd-hybrid.spec	9 Dec 2005 22:04:11 -0000	1.5
+++ ircd-hybrid.spec	12 Dec 2005 15:15:12 -0000	1.6
@@ -10,12 +10,13 @@
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
 Version: 7.2.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
+Patch0:  ircd-hybrid-7.2.0-help.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): fedora-usermgmt
@@ -32,24 +33,23 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
 # Change modules/autoload path (IRCD_PREFIX "/modules/autoload/" - by default)
 # Change modules path (IRCD_PREFIX "/modules/" - by default)
 %{__perl} -pi -e 's|(^#define ETCPATH) .*|$1 "%{_sysconfdir}/ircd"|g;
-                  s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g;
-		   s|(^#define AUTOMODPATH IRCD_PREFIX) .*|#define AUTOMODPATH "%{_libdir}/ircd/modules/autoload/"|g;
-                  s|(^#define MODPATH) .*|$1 "%{_libdir}/ircd/modules/"|g' \
+                  s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g' \
    include/defaults.h
 #Added for x86_64 arch support
 sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
-
 %build
 %configure \
+    --prefix=%{_libdir}/ircd \
     --sysconfdir=%{_sysconfdir}/ircd \
-   --with-nicklen=%{nicklen} \
+    --with-nicklen=%{nicklen} \
     --with-topiclen=%{topiclen} \
     --with-maxconn=%{maxconn}
 %{__make} %{?_smp_mflags}
@@ -57,8 +57,10 @@
 
 %install
 %{__rm} -rf %{buildroot}
+
 %makeinstall \
-    sysconfdir=%{buildroot}%{_sysconfdir}/ircd
+   prefix=%{buildroot}%{_libdir}/ircd \
+   sysconfdir=%{buildroot}%{_sysconfdir}/ircd
 
 %{__install} -m 0755 -D %{SOURCE1} %{buildroot}%{_initrddir}/ircd
 %{__install} -m 0640 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ircd
@@ -77,13 +79,9 @@
 %{__rm} -r   %{buildroot}%{_localstatedir}/logs/
 %{__mkdir_p} %{buildroot}%{_var}/log/ircd/
 
-chmod 755 %{buildroot}%{_prefix}/modules/*.so
-chmod 755 %{buildroot}%{_prefix}/modules/autoload/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd/modules/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd/modules/autoload/*.so
 
-# Move modules directory which we changed previously (same remark as above)
-%{__mkdir_p} %{buildroot}%{_libdir}/ircd/modules/
-%{__mv}      %{buildroot}%{_prefix}/modules/* \
-             %{buildroot}%{_libdir}/ircd/modules/.
 %{__mkdir_p} %{buildroot}%{_var}/lib/ircd
 
 %clean
@@ -120,15 +118,20 @@
 %{_sysconfdir}/rc.d/init.d/ircd
 %{_bindir}/ircd
 %{_bindir}/servlink
-%{_libdir}/ircd/
+%{_libdir}/ircd
 %{_libexecdir}/ircd/
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-%exclude %{_prefix}/help
 
 
 %changelog
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-4
+- Modify spec file to help files
+
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-3
+- Modify spec file to use configure correctly 
+
 * Fri Dec 09 2005 Eric Tanguy 7.2.0-2
 - Modify spec file to take into account the 7.2.0 update
 



From fedora-extras-commits at redhat.com  Mon Dec 12 15:16:32 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 12 Dec 2005 10:16:32 -0500
Subject: rpms/ircd-hybrid import.log,1.17,1.18
Message-ID: <200512121517.jBCFH3iV000560@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv516

Modified Files:
	import.log 
Log Message:
auto-import ircd-hybrid-7.2.0-4 on branch FC-3 from ircd-hybrid-7.2.0-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- import.log	12 Dec 2005 15:15:06 -0000	1.17
+++ import.log	12 Dec 2005 15:16:30 -0000	1.18
@@ -14,3 +14,4 @@
 ircd-hybrid-7_2_0-2:FC-3:ircd-hybrid-7.2.0-2.src.rpm:1134166074
 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



From fedora-extras-commits at redhat.com  Mon Dec 12 15:16:38 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 12 Dec 2005 10:16:38 -0500
Subject: rpms/ircd-hybrid/FC-3 ircd-hybrid-7.2.0-help.diff, NONE,
	1.1 ircd-hybrid.spec, 1.5, 1.6
Message-ID: <200512121517.jBCFH8kc000563@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv516/FC-3

Modified Files:
	ircd-hybrid.spec 
Added Files:
	ircd-hybrid-7.2.0-help.diff 
Log Message:
auto-import ircd-hybrid-7.2.0-4 on branch FC-3 from ircd-hybrid-7.2.0-4.src.rpm

ircd-hybrid-7.2.0-help.diff:

--- NEW FILE ircd-hybrid-7.2.0-help.diff ---
--- ircd-hybrid-7.2.0/help/Makefile.old	2005-12-09 06:52:54.000000000 +0100
+++ ircd-hybrid-7.2.0/help/Makefile.in	2005-12-12 15:26:05.000000000 +0100
@@ -41,7 +41,8 @@
 	done
 	@for link in $(SYMLINKS); do \
 		rm -f $(uhelpdir)/$$link; \
-		ln -s $(ohelpdir)/$$link $(uhelpdir); \
+		cd $(uhelpdir); \
+		ln -s ../opers/$$link .; \
 	done
 
 distclean:


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/ircd-hybrid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ircd-hybrid.spec	9 Dec 2005 22:08:50 -0000	1.5
+++ ircd-hybrid.spec	12 Dec 2005 15:16:36 -0000	1.6
@@ -10,12 +10,13 @@
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
 Version: 7.2.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
+Patch0:  ircd-hybrid-7.2.0-help.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): fedora-usermgmt
@@ -32,24 +33,23 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
 # Change modules/autoload path (IRCD_PREFIX "/modules/autoload/" - by default)
 # Change modules path (IRCD_PREFIX "/modules/" - by default)
 %{__perl} -pi -e 's|(^#define ETCPATH) .*|$1 "%{_sysconfdir}/ircd"|g;
-                  s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g;
-		   s|(^#define AUTOMODPATH IRCD_PREFIX) .*|#define AUTOMODPATH "%{_libdir}/ircd/modules/autoload/"|g;
-                  s|(^#define MODPATH) .*|$1 "%{_libdir}/ircd/modules/"|g' \
+                  s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g' \
    include/defaults.h
 #Added for x86_64 arch support
 sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
-
 %build
 %configure \
+    --prefix=%{_libdir}/ircd \
     --sysconfdir=%{_sysconfdir}/ircd \
-   --with-nicklen=%{nicklen} \
+    --with-nicklen=%{nicklen} \
     --with-topiclen=%{topiclen} \
     --with-maxconn=%{maxconn}
 %{__make} %{?_smp_mflags}
@@ -57,8 +57,10 @@
 
 %install
 %{__rm} -rf %{buildroot}
+
 %makeinstall \
-    sysconfdir=%{buildroot}%{_sysconfdir}/ircd
+   prefix=%{buildroot}%{_libdir}/ircd \
+   sysconfdir=%{buildroot}%{_sysconfdir}/ircd
 
 %{__install} -m 0755 -D %{SOURCE1} %{buildroot}%{_initrddir}/ircd
 %{__install} -m 0640 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ircd
@@ -77,13 +79,9 @@
 %{__rm} -r   %{buildroot}%{_localstatedir}/logs/
 %{__mkdir_p} %{buildroot}%{_var}/log/ircd/
 
-chmod 755 %{buildroot}%{_prefix}/modules/*.so
-chmod 755 %{buildroot}%{_prefix}/modules/autoload/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd/modules/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd/modules/autoload/*.so
 
-# Move modules directory which we changed previously (same remark as above)
-%{__mkdir_p} %{buildroot}%{_libdir}/ircd/modules/
-%{__mv}      %{buildroot}%{_prefix}/modules/* \
-             %{buildroot}%{_libdir}/ircd/modules/.
 %{__mkdir_p} %{buildroot}%{_var}/lib/ircd
 
 %clean
@@ -120,15 +118,20 @@
 %{_sysconfdir}/rc.d/init.d/ircd
 %{_bindir}/ircd
 %{_bindir}/servlink
-%{_libdir}/ircd/
+%{_libdir}/ircd
 %{_libexecdir}/ircd/
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-%exclude %{_prefix}/help
 
 
 %changelog
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-4
+- Modify spec file to help files
+
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-3
+- Modify spec file to use configure correctly 
+
 * Fri Dec 09 2005 Eric Tanguy 7.2.0-2
 - Modify spec file to take into account the 7.2.0 update
 



From fedora-extras-commits at redhat.com  Mon Dec 12 15:19:07 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Dec 2005 10:19:07 -0500
Subject: rpms/sobby - New directory
Message-ID: <200512121519.jBCFJ7e8000752@cvs-int.fedora.redhat.com>

Author: lmacken

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

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




From fedora-extras-commits at redhat.com  Mon Dec 12 15:19:12 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Dec 2005 10:19:12 -0500
Subject: rpms/sobby/devel - New directory
Message-ID: <200512121519.jBCFJCKk000768@cvs-int.fedora.redhat.com>

Author: lmacken

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

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




From fedora-extras-commits at redhat.com  Mon Dec 12 15:19:49 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Dec 2005 10:19:49 -0500
Subject: rpms/sobby Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512121519.jBCFJnJU000803@cvs-int.fedora.redhat.com>

Author: lmacken

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 12 15:19:55 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Dec 2005 10:19:55 -0500
Subject: rpms/sobby/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512121519.jBCFJtNV000824@cvs-int.fedora.redhat.com>

Author: lmacken

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

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


--- NEW 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 Dec 12 15:20:49 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Dec 2005 10:20:49 -0500
Subject: rpms/sobby import.log,1.1,1.2
Message-ID: <200512121521.jBCFLJeN000933@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	import.log 
Log Message:
auto-import sobby-0.3.0-1.rc3 on branch devel from sobby-0.3.0-1.rc3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sobby/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Dec 2005 15:19:47 -0000	1.1
+++ import.log	12 Dec 2005 15:20:47 -0000	1.2
@@ -0,0 +1 @@
+sobby-0_3_0-1_rc3:HEAD:sobby-0.3.0-1.rc3.src.rpm:1134401036



From fedora-extras-commits at redhat.com  Mon Dec 12 15:20:55 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Dec 2005 10:20:55 -0500
Subject: rpms/sobby/devel sobby.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200512121521.jBCFLPBk000937@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore sources 
Added Files:
	sobby.spec 
Log Message:
auto-import sobby-0.3.0-1.rc3 on branch devel from sobby-0.3.0-1.rc3.src.rpm


--- NEW FILE sobby.spec ---
%define _rc rc3

Name:           sobby
Version:        0.3.0
Release:        1.%{_rc}%{?dist}
Summary:        Standalone obby server

Group:          Applications/Internet
License:        GPL
URL:            http://gobby.0x539.de
Source0:        http://releases.0x539.de/sobby/%{name}-%{version}%{_rc}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  obby-devel, glibmm24-devel

%description
Sobby is a standalone obby server.


%prep
%setup -q -n %{name}-%{version}%{_rc}


%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 README NEWS AUTHORS COPYING ChangeLog
%{_bindir}/sobby


%changelog
* Wed Dec 07 2005 Luke Macken  - 0.3.0-1.rc3
- Packaged for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sobby/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Dec 2005 15:19:53 -0000	1.1
+++ .cvsignore	12 Dec 2005 15:20:52 -0000	1.2
@@ -0,0 +1 @@
+sobby-0.3.0rc3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sobby/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Dec 2005 15:19:53 -0000	1.1
+++ sources	12 Dec 2005 15:20:52 -0000	1.2
@@ -0,0 +1 @@
+8c3538992f83527cfb9f0a42a9e2ed87  sobby-0.3.0rc3.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 15:21:54 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 12 Dec 2005 10:21:54 -0500
Subject: rpms/synce-gnomevfs - New directory
Message-ID: <200512121521.jBCFLs4x001003@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-gnomevfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv994/synce-gnomevfs

Log Message:
Directory /cvs/extras/rpms/synce-gnomevfs added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 12 15:22:00 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 12 Dec 2005 10:22:00 -0500
Subject: rpms/synce-gnomevfs/devel - New directory
Message-ID: <200512121522.jBCFM0tW001019@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-gnomevfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv994/synce-gnomevfs/devel

Log Message:
Directory /cvs/extras/rpms/synce-gnomevfs/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 12 15:22:22 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 12 Dec 2005 10:22:22 -0500
Subject: rpms/synce-gnomevfs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512121522.jBCFMMxC001056@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-gnomevfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1043

Added Files:
	Makefile import.log 
Log Message:
Setup of module synce-gnomevfs


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 12 15:22:28 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 12 Dec 2005 10:22:28 -0500
Subject: rpms/synce-gnomevfs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512121522.jBCFMSJr001077@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-gnomevfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1043/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module synce-gnomevfs


--- NEW 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 Dec 12 15:23:26 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 12 Dec 2005 10:23:26 -0500
Subject: rpms/synce-gnomevfs import.log,1.1,1.2
Message-ID: <200512121523.jBCFNuqu001159@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-gnomevfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1120

Modified Files:
	import.log 
Log Message:
auto-import synce-gnomevfs-0.9.0-1 on branch devel from synce-gnomevfs-0.9.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/synce-gnomevfs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Dec 2005 15:22:20 -0000	1.1
+++ import.log	12 Dec 2005 15:23:23 -0000	1.2
@@ -0,0 +1 @@
+synce-gnomevfs-0_9_0-1:HEAD:synce-gnomevfs-0.9.0-1.src.rpm:1134400993



From fedora-extras-commits at redhat.com  Mon Dec 12 15:23:31 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 12 Dec 2005 10:23:31 -0500
Subject: rpms/synce-gnomevfs/devel synce-gnomevfs-makefile.patch, NONE,
	1.1 synce-gnomevfs.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512121524.jBCFO1om001163@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-gnomevfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1120/devel

Modified Files:
	.cvsignore sources 
Added Files:
	synce-gnomevfs-makefile.patch synce-gnomevfs.spec 
Log Message:
auto-import synce-gnomevfs-0.9.0-1 on branch devel from synce-gnomevfs-0.9.0-1.src.rpm

synce-gnomevfs-makefile.patch:

--- NEW FILE synce-gnomevfs-makefile.patch ---
--- src/Makefile.am.orig	2005-08-23 01:29:41.000000000 +0200
+++ src/Makefile.am	2005-08-23 01:29:50.000000000 +0200
@@ -1,4 +1,4 @@
-AM_CFLAGS = -g -Wall -Werror
+AM_CFLAGS = -g -Wall
 module_flags = -export_dynamic -avoid-version -module -no-undefined
 
 INCLUDES=$(rapi_cflags) $(synce_cflags) $(VFS_CFLAGS)
--- src/Makefile.in.orig	2005-08-23 01:29:23.000000000 +0200
+++ src/Makefile.in	2005-08-23 01:29:39.000000000 +0200
@@ -187,7 +187,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AM_CFLAGS = -g -Wall -Werror
+AM_CFLAGS = -g -Wall
 module_flags = -export_dynamic -avoid-version -module -no-undefined
 INCLUDES = $(rapi_cflags) $(synce_cflags) $(VFS_CFLAGS)
 modulesconfdir = $(sysconfdir)/gnome-vfs-2.0/modules


--- NEW FILE synce-gnomevfs.spec ---
Name:           synce-gnomevfs
Version:        0.9.0
Release:        1
Summary:        Gnome-vfs module for synce

Group:          Applications/Communications
License:        MIT
URL:            http://synce.sourceforge.net/
Source0:        http://dl.sf.net/synce/synce-gnomevfs-0.9.0.tar.gz
Patch0:         synce-gnomevfs-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  synce-devel
BuildRequires:  gnome-vfs2-devel
BuildRequires:  ORBit2-devel
BuildRequires:  glib2-devel

Requires:       synce
Requires:       gnome-vfs2

%description
This is a gnome-vfs module that enables access to the Windows CE or Pocket
PC file system through the gnome-vfs functions.

%prep
%setup -q
%patch0

%build
%configure --disable-static --with-libsynce-include=%{_includedir} \
--with-libsynce-lib=%{_libdir} --with-librapi2-include=%{_includedir} \
--with-librapi2-lib=%{_libdir}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libsyncevfs.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog LICENSE NEWS
%{_bindir}/synce-in-computer-folder
%config(noreplace) %{_sysconfdir}/gnome-vfs-2.0/modules/synce-module.conf
%{_libdir}/gnome-vfs-2.0/modules/libsyncevfs.so
%{_datadir}/pixmaps/synce/synce-color.png
%{_datadir}/synce/synce-in-computer-folder.sh


%changelog
* Tue Aug 23 2005 Andreas Bierfert 
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synce-gnomevfs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Dec 2005 15:22:26 -0000	1.1
+++ .cvsignore	12 Dec 2005 15:23:29 -0000	1.2
@@ -0,0 +1 @@
+synce-gnomevfs-0.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synce-gnomevfs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Dec 2005 15:22:26 -0000	1.1
+++ sources	12 Dec 2005 15:23:29 -0000	1.2
@@ -0,0 +1 @@
+1fa8d653297331479edcd5d983a0f75e  synce-gnomevfs-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 15:31:59 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Dec 2005 10:31:59 -0500
Subject: owners owners.list,1.441,1.442
Message-ID: <200512121532.jBCFWT0B001244@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	owners.list 
Log Message:
Add sobby



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- owners.list	12 Dec 2005 13:15:38 -0000	1.441
+++ owners.list	12 Dec 2005 15:31:57 -0000	1.442
@@ -1079,6 +1079,7 @@
 Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net
 Fedora Extras|snort|An intrusion detection system|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org|
+Fedora Extras|sobby|Standalone obby server|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sodipodi|Vector-based drawing program|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|sopwith|SDL port of sopwith|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|SoQt|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 12 16:07:08 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 12 Dec 2005 11:07:08 -0500
Subject: rpms/verbiste/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 verbiste.spec, 1.7, 1.8
Message-ID: <200512121607.jBCG7cTO002985@cvs-int.fedora.redhat.com>

Author: icon

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

Modified Files:
	.cvsignore sources verbiste.spec 
Log Message:
Version 0.1.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/verbiste/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Oct 2005 02:34:17 -0000	1.5
+++ .cvsignore	12 Dec 2005 16:07:06 -0000	1.6
@@ -1 +1 @@
-verbiste-0.1.13.tar.gz
+verbiste-0.1.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/verbiste/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Oct 2005 02:34:17 -0000	1.5
+++ sources	12 Dec 2005 16:07:06 -0000	1.6
@@ -1 +1 @@
-972ae6c8136761e51755f6c193ab0626  verbiste-0.1.13.tar.gz
+8e19a1a0f6e1abdc9d34f025a02791f6  verbiste-0.1.14.tar.gz


Index: verbiste.spec
===================================================================
RCS file: /cvs/extras/rpms/verbiste/devel/verbiste.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- verbiste.spec	14 Oct 2005 02:34:17 -0000	1.7
+++ verbiste.spec	12 Dec 2005 16:07:06 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           verbiste
-Version:        0.1.13
+Version:        0.1.14
 Release:        1%{?dist}
 Summary:        French conjugation system
 
@@ -48,24 +48,24 @@
 
 
 %install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
-rm -rf %{buildroot}%{_defaultdocdir}
-rm -f %{buildroot}%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT%{_docdir}
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # This file gets created on x86_64 for no apparent reason.
 # It's owned by glibc-common.
-rm -f %{buildroot}%{_datadir}/locale/locale.alias
+rm -f $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias
 desktop-file-install \
   --delete-original                                     \
   --vendor fedora                                       \
-  --dir %{buildroot}%{_datadir}/applications            \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
   --add-category X-Fedora                               \
-  %{buildroot}%{_datadir}/applications/%{name}.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -101,6 +101,10 @@
 
 
 %changelog
+* Mon Dec 12 2005 Konstantin Ryabitsev  - 0.1.14-1
+- Version 0.1.14
+- Switch to RPM_BUILD_ROOT notation
+
 * Thu Oct 13 2005 Konstantin Ryabitsev  - 0.1.13-1
 - Version 0.1.13.
 



From fedora-extras-commits at redhat.com  Mon Dec 12 16:06:43 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 12 Dec 2005 11:06:43 -0500
Subject: rpms/verbiste/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 verbiste.spec, 1.8, 1.9
Message-ID: <200512121607.jBCG7lMN002990@cvs-int.fedora.redhat.com>

Author: icon

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

Modified Files:
	.cvsignore sources verbiste.spec 
Log Message:
Version 0.1.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/verbiste/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Oct 2005 02:32:37 -0000	1.5
+++ .cvsignore	12 Dec 2005 16:06:40 -0000	1.6
@@ -1 +1 @@
-verbiste-0.1.13.tar.gz
+verbiste-0.1.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/verbiste/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Oct 2005 02:32:37 -0000	1.5
+++ sources	12 Dec 2005 16:06:41 -0000	1.6
@@ -1 +1 @@
-972ae6c8136761e51755f6c193ab0626  verbiste-0.1.13.tar.gz
+8e19a1a0f6e1abdc9d34f025a02791f6  verbiste-0.1.14.tar.gz


Index: verbiste.spec
===================================================================
RCS file: /cvs/extras/rpms/verbiste/FC-4/verbiste.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- verbiste.spec	14 Oct 2005 02:32:37 -0000	1.8
+++ verbiste.spec	12 Dec 2005 16:06:41 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           verbiste
-Version:        0.1.13
+Version:        0.1.14
 Release:        1%{?dist}
 Summary:        French conjugation system
 
@@ -48,24 +48,24 @@
 
 
 %install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
-rm -rf %{buildroot}%{_defaultdocdir}
-rm -f %{buildroot}%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT%{_docdir}
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # This file gets created on x86_64 for no apparent reason.
 # It's owned by glibc-common.
-rm -f %{buildroot}%{_datadir}/locale/locale.alias
+rm -f $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias
 desktop-file-install \
   --delete-original                                     \
   --vendor fedora                                       \
-  --dir %{buildroot}%{_datadir}/applications            \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
   --add-category X-Fedora                               \
-  %{buildroot}%{_datadir}/applications/%{name}.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -101,6 +101,10 @@
 
 
 %changelog
+* Mon Dec 12 2005 Konstantin Ryabitsev  - 0.1.14-1
+- Version 0.1.14
+- Switch to RPM_BUILD_ROOT notation
+
 * Thu Oct 13 2005 Konstantin Ryabitsev  - 0.1.13-1
 - Version 0.1.13.
 



From fedora-extras-commits at redhat.com  Mon Dec 12 16:22:30 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 12 Dec 2005 11:22:30 -0500
Subject: rpms/kdesvn/FC-4 .cvsignore, 1.2, 1.3 kdesvn.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200512121623.jBCGN0kM003142@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
- New upstream version 0.7.1
- Remove desktop patch fixed upstream
- locolor icons no longer shipped



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Nov 2005 21:12:30 -0000	1.2
+++ .cvsignore	12 Dec 2005 16:22:28 -0000	1.3
@@ -1 +1 @@
-kdesvn-0.6.3.tar.gz
+kdesvn-0.7.1.tar.gz


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/kdesvn.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdesvn.spec	7 Nov 2005 21:12:30 -0000	1.1
+++ kdesvn.spec	12 Dec 2005 16:22:28 -0000	1.2
@@ -1,13 +1,12 @@
 Name:           kdesvn
-Version:        0.6.3
-Release:        2%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        A subversion client for KDE
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://www.alwins-world.de/programs/kdesvn/
 Source0:        http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{version}.tar.gz
-Patch0:         kdesvn-0.6.3-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs-devel, neon-devel
@@ -29,7 +28,6 @@
 
 %prep
 %setup -q
-%patch -p1
 
 
 %build
@@ -91,11 +89,14 @@
 %{_datadir}/icons/hicolor/32x32/apps/kdesvn.png
 %{_datadir}/icons/hicolor/48x48/apps/kdesvn.png
 %{_datadir}/icons/hicolor/64x64/apps/kdesvn.png
-%{_datadir}/icons/locolor/16x16/apps/kdesvn.png
-%{_datadir}/icons/locolor/32x32/apps/kdesvn.png
 
 
 %changelog
+* Fri Dec  9 2005 - Orion Poplawski  - 0.7.1-1
+- New upstream version 0.7.1
+- Remove desktop patch fixed upstream
+- locolor icons no longer shipped
+
 * Fri Nov  4 2005 - Orion Poplawski  - 0.6.3-2
 - Make use of buildroot consistant
 - Just BuildRequires the "desktop-file-utils" package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Nov 2005 21:12:30 -0000	1.2
+++ sources	12 Dec 2005 16:22:28 -0000	1.3
@@ -1 +1 @@
-03becccdf357f9a711897f8805050974  kdesvn-0.6.3.tar.gz
+46c8acbd008c066e9101bc80b4549487  kdesvn-0.7.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 16:37:30 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 12 Dec 2005 11:37:30 -0500
Subject: rpms/kdesvn/devel .cvsignore, 1.3, 1.4 kdesvn.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200512121638.jBCGc13g003314@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
New upstream version 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2005 16:02:55 -0000	1.3
+++ .cvsignore	12 Dec 2005 16:37:28 -0000	1.4
@@ -1 +1 @@
-kdesvn-0.7.0rc1.tar.gz
+kdesvn-0.7.1.tar.gz


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdesvn.spec	21 Nov 2005 20:28:13 -0000	1.3
+++ kdesvn.spec	12 Dec 2005 16:37:28 -0000	1.4
@@ -1,8 +1,8 @@
-%define srcver  0.7.0rc1
+%define srcver  0.7.1
 
 Name:           kdesvn
-Version:        0.7.0
-Release:        0.rc1%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        A subversion client for KDE
 
 Group:          Development/Tools
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Fri Dec  9 2005 - Orion Poplawski  - 0.7.1-1
+- New upstream version 0.7.1
+
 * Sun Nov 20 2005 - Orion Poplawski  - 0.7.0-0.rc1
 - New upstream version 0.7.0rc1
 - Remove desktop patch fixed upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2005 16:02:55 -0000	1.3
+++ sources	12 Dec 2005 16:37:28 -0000	1.4
@@ -1 +1 @@
-22c209806517549af51d4137f184e26f  kdesvn-0.7.0rc1.tar.gz
+46c8acbd008c066e9101bc80b4549487  kdesvn-0.7.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 16:38:34 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 12 Dec 2005 11:38:34 -0500
Subject: rpms/synce-gnomevfs/devel synce-gnomevfs.spec,1.1,1.2
Message-ID: <200512121639.jBCGd4NZ003344@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-gnomevfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3325

Modified Files:
	synce-gnomevfs.spec 
Log Message:
- add dist tag



Index: synce-gnomevfs.spec
===================================================================
RCS file: /cvs/extras/rpms/synce-gnomevfs/devel/synce-gnomevfs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synce-gnomevfs.spec	12 Dec 2005 15:23:29 -0000	1.1
+++ synce-gnomevfs.spec	12 Dec 2005 16:38:32 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           synce-gnomevfs
 Version:        0.9.0
-Release:        1
+Release:        2%{?dist}
 Summary:        Gnome-vfs module for synce
 
 Group:          Applications/Communications
@@ -53,5 +53,10 @@
 
 
 %changelog
+* Mon Dec 12 2005 Andreas Bierfert 
+0.9.0-2
+- add dist tag
+
 * Tue Aug 23 2005 Andreas Bierfert 
+0.9.0-1
 - Initial Release



From fedora-extras-commits at redhat.com  Mon Dec 12 18:41:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 13:41:03 -0500
Subject: rpms/moodle - New directory
Message-ID: <200512121841.jBCIf3Xx007278@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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




From fedora-extras-commits at redhat.com  Mon Dec 12 18:41:08 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 13:41:08 -0500
Subject: rpms/moodle/devel - New directory
Message-ID: <200512121841.jBCIf8ok007294@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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




From fedora-extras-commits at redhat.com  Mon Dec 12 18:41:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 13:41:39 -0500
Subject: rpms/moodle Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512121841.jBCIfdoE007329@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 12 18:41:44 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 13:41:44 -0500
Subject: rpms/moodle/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512121841.jBCIfiGu007348@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


--- NEW 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 Dec 12 18:56:18 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 12 Dec 2005 13:56:18 -0500
Subject: rpms/kdesvn/devel kdesvn-0.7.1-x.patch, NONE, 1.1 kdesvn.spec, 1.4,
	1.5 kdesve-0.7.0rc1-x.patch, 1.1, NONE
Message-ID: <200512121856.jBCIum5w007479@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	kdesvn.spec 
Added Files:
	kdesvn-0.7.1-x.patch 
Removed Files:
	kdesve-0.7.0rc1-x.patch 
Log Message:
New patch - only remove check for X11 includes for pre-modular X compat


kdesvn-0.7.1-x.patch:

--- NEW FILE kdesvn-0.7.1-x.patch ---
--- kdesvn-0.7.1/configure.x11	2005-11-25 12:05:40.000000000 -0700
+++ kdesvn-0.7.1/configure	2005-12-12 10:27:42.000000000 -0700
@@ -26637,90 +26637,6 @@
 
 
 
-if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
-  # First, try using that file with no special directory specified.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$x_direct_test_include>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /usr/X11/include          \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done
-fi
-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = NO
-
 if test "$ac_x_libraries" = NO; then
   # Check for the libraries.
 


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdesvn.spec	12 Dec 2005 16:37:28 -0000	1.4
+++ kdesvn.spec	12 Dec 2005 18:56:16 -0000	1.5
@@ -9,7 +9,7 @@
 License:        GPL
 URL:            http://www.alwins-world.de/programs/kdesvn/
 Source0:        http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{srcver}.tar.gz
-Patch0:         kdesve-0.7.0rc1-x.patch
+Patch0:         kdesvn-0.7.1-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs-devel, neon-devel
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q -n %{name}-%{srcver}
-%patch -p1
+%patch -p1 -b .x11
 
 
 %build


--- kdesve-0.7.0rc1-x.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Dec 12 19:47:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 14:47:59 -0500
Subject: rpms/moodle import.log,1.1,1.2
Message-ID: <200512121948.jBCJmTCH009435@cvs-int.fedora.redhat.com>

Author: ivazquez

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/moodle/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Dec 2005 18:41:37 -0000	1.1
+++ import.log	12 Dec 2005 19:47:57 -0000	1.2
@@ -0,0 +1 @@
+moodle-1_5_3-1:HEAD:moodle-1.5.3-1.src.rpm:1134416867



From fedora-extras-commits at redhat.com  Mon Dec 12 19:48:05 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 14:48:05 -0500
Subject: rpms/moodle/devel moodle-1.5.2-mimetex-fedora.patch, NONE,
	1.1 moodle-1.5.2-mimetex-linux.patch, NONE,
	1.1 moodle-README-rpm, NONE, 1.1 moodle-config.php, NONE,
	1.1 moodle-cron, NONE, 1.1 moodle.conf, NONE, 1.1 moodle.cron,
	NONE, 1.1 moodle.init, NONE, 1.1 moodle.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512121948.jBCJm5AV009427@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore sources 
Added Files:
	moodle-1.5.2-mimetex-fedora.patch 
	moodle-1.5.2-mimetex-linux.patch moodle-README-rpm 
	moodle-config.php moodle-cron moodle.conf moodle.cron 
	moodle.init moodle.spec 
Log Message:
auto-import moodle-1.5.3-1 on branch devel from moodle-1.5.3-1.src.rpm

moodle-1.5.2-mimetex-fedora.patch:

--- NEW FILE moodle-1.5.2-mimetex-fedora.patch ---
--- moodle/filter/tex/texdebug.php.mimetex-fedora	2005-10-10 16:27:00.000000000 -0400
+++ moodle/filter/tex/texdebug.php	2005-10-10 16:31:25.000000000 -0400
@@ -100,8 +100,8 @@
             if (file_exists($pathname)) {
                 unlink($pathname);
             }
-            $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.linux";
-            $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" ". escapeshellarg($texexp);
+            $commandpath="/var/www/cgi-bin/mimetex.cgi";
+            $cmd = "\"/var/www/cgi-bin/mimetex.cgi\" -e \"$pathname\" ". escapeshellarg($texexp);
             system($cmd, $status);
         }
         if ($return) {
--- moodle/filter/tex/texed.php.mimetex-fedora	2005-10-10 16:27:00.000000000 -0400
+++ moodle/filter/tex/texed.php	2005-10-10 16:31:35.000000000 -0400
@@ -23,7 +23,7 @@
             make_upload_directory($CFG->teximagedir);
         }
         $pathname = "$CFG->dataroot/$CFG->teximagedir/$image";
-        system("$CFG->dirroot/$CFG->texfilterdir/mimetex.linux -e $pathname -- ". escapeshellarg($texexp) );
+        system("/var/www/cgi-bin/mimetex.cgi -e $pathname -- ". escapeshellarg($texexp) );
         if (file_exists($pathname)) {
             $lastmodified = filemtime($pathname);
             header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastmodified) . " GMT");
--- moodle/filter/tex/pix.php.mimetex-fedora	2005-10-10 16:27:00.000000000 -0400
+++ moodle/filter/tex/pix.php	2005-10-10 16:30:51.000000000 -0400
@@ -41,7 +41,7 @@
             $texexp = preg_replace('!\r\n?!',' ',$texexp);
             $texexp = '\Large ' . $texexp;
 
-            $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" -- ". escapeshellarg($texexp);
+            $cmd = "\"/var/www/cgi-bin/mimetex.cgi\" -e \"$pathname\" -- ". escapeshellarg($texexp);
 
             system($cmd, $status);
         }

moodle-1.5.2-mimetex-linux.patch:

--- NEW FILE moodle-1.5.2-mimetex-linux.patch ---
--- web/filter/tex/texed.php.linux	2005-10-09 11:03:50.000000000 -0400
+++ web/filter/tex/texed.php	2005-10-09 11:04:14.000000000 -0400
@@ -23,20 +23,7 @@
             make_upload_directory($CFG->teximagedir);
         }
         $pathname = "$CFG->dataroot/$CFG->teximagedir/$image";
-        switch (PHP_OS) {
-            case "Linux":
-                system("$CFG->dirroot/$CFG->texfilterdir/mimetex.linux -e $pathname -- ". escapeshellarg($texexp) );
-            break;
-            case "WINNT":
-                case "WIN32":
-                case "Windows":
-                $texexp = str_replace('"','\"',$texexp);
-            system("$CFG->dirroot/$CFG->texfilterdir/mimetex.exe -e  $pathname -- \"$texexp\"");
-            break;
-            case "Darwin":
-                system("$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin -e $pathname -- ". escapeshellarg($texexp) );
-            break;
-        }
+        system("$CFG->dirroot/$CFG->texfilterdir/mimetex.linux -e $pathname -- ". escapeshellarg($texexp) );
         if (file_exists($pathname)) {
             $lastmodified = filemtime($pathname);
             header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastmodified) . " GMT");
--- web/filter/tex/texdebug.php.linux	2005-10-09 11:02:27.000000000 -0400
+++ web/filter/tex/texdebug.php	2005-10-09 11:03:19.000000000 -0400
@@ -100,34 +100,8 @@
             if (file_exists($pathname)) {
                 unlink($pathname);
             }
-            $commandpath = "";
-            $cmd = "";
-            switch (PHP_OS) {
-                case "Linux":
-                    $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.linux";           
-                $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" ". escapeshellarg($texexp);
-                break;
-                case "WINNT":
-                    case "WIN32":
-                    case "Windows":
-                    $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.exe";
-                $texexp = str_replace('"','\"',$texexp);
-                $cmd = str_replace(' ','^ ',$commandpath);
-                $cmd .= " ++ -e  \"$pathname\" \"$texexp\"";
-                break;
-                case "Darwin":
-                    $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin";
-                $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin\" -e \"$pathname\" ". escapeshellarg($texexp);
-                break;
-            }
-            if (!$cmd) {
-              if (is_executable("$CFG->dirroot/$CFG->texfilterdir/mimetex")) {   /// Use the custom binary
-                $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex";
-                $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex -e $pathname ". escapeshellarg($texexp);
-              } else {
-                error($error_message1);
-              }
-            }
+            $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.linux";
+            $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" ". escapeshellarg($texexp);
             system($cmd, $status);
         }
         if ($return) {
--- web/filter/tex/pix.php.linux	2005-10-09 10:59:13.000000000 -0400
+++ web/filter/tex/pix.php	2005-10-09 11:01:02.000000000 -0400
@@ -41,41 +41,8 @@
             $texexp = preg_replace('!\r\n?!',' ',$texexp);
             $texexp = '\Large ' . $texexp;
 
-            if ((PHP_OS == "WINNT") || (PHP_OS == "WIN32") || (PHP_OS == "Windows")) {
-                $texexp = str_replace('"','\"',$texexp);
-                $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex.exe";
-                $cmd = str_replace(' ','^ ',$cmd);
-                $cmd .= " ++ -e  \"$pathname\" -- \"$texexp\"";
-            } else if (is_executable("$CFG->dirroot/$CFG->texfilterdir/mimetex")) {   /// Use the custom binary
+            $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" -- ". escapeshellarg($texexp);
 
-                $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex -e $pathname -- ". escapeshellarg($texexp);
-
-            } else {                                                           /// Auto-detect the right TeX binary
-                switch (PHP_OS) {
-
-                    case "Linux":
-                        $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" -- ". escapeshellarg($texexp);
-                    break;
-
-                    case "Darwin":
-                        $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin\" -e \"$pathname\" -- ". escapeshellarg($texexp);
-                    break;
-
-                    default:      /// Nothing was found, so tell them how to fix it.
-                        if ($CFG->debug > 7) {
-                            echo "Make sure you have an appropriate MimeTeX binary here:\n\n";
-                            echo "    $CFG->dirroot/$CFG->texfilterdir/mimetex\n\n";
-                            echo "and that it has the right permissions set on it as executable program.\n\n";
-                            echo "You can get the latest binaries for your ".PHP_OS." platform from: \n\n";
-                            echo "    http://moodle.org/download/mimetex/";
-                        } else {
-                            echo "Mimetex executable was not found,\n";
-                            echo "Please turn on debug mode in site configuration to see more info here.";
-                        }
-                        die;
-                    break;
-                }
-            }
             system($cmd, $status);
         }
     }


--- NEW FILE moodle-README-rpm ---
Edit /var/www/moodle/web/config.php to the values you need to connect to your database. Once you've configured Moodle properly don't forget to run

 /sbin/service moodle start ; /sbin/chkconfig moodle on

in order to activate the Moodle cron job.


--- NEW FILE moodle-config.php ---
dbtype    = 'mysql'; // Valid values include: mysql postgres7
$CFG->dbhost    = '';
$CFG->dbname    = '';
$CFG->dbuser    = '';
$CFG->dbpass    = '';
$CFG->dbpersist =  false;
$CFG->prefix    = 'mdl_';

$CFG->wwwroot   = 'http://localhost/moodle';
$CFG->dirroot   = '/var/www/moodle/web';
$CFG->dataroot  = '/var/www/moodle/data';
$CFG->admin     = 'admin';

$CFG->directorypermissions = 00777;  // try 02777 on a server in Safe Mode

require_once("$CFG->dirroot/lib/setup.php");
// MAKE SURE WHEN YOU EDIT THIS FILE THAT THERE ARE NO SPACES, BLANK LINES,
// RETURNS, OR ANYTHING ELSE AFTER THE TWO CHARACTERS ON THE NEXT LINE.
?>


--- NEW FILE moodle-cron ---
#!/bin/sh

[ -f /var/lock/subsys/moodle ] && /usr/bin/php /var/www/moodle/web/admin/cron.php


--- NEW FILE moodle.conf ---
Alias /moodle /var/www/moodle/web

# Moodle public web pages - must be publically accessible

  Order allow,deny
  Allow from all


# Moodle private data - must NOT be publically accessible

  Order deny,allow
  Deny from all



--- NEW FILE moodle.cron ---
* * * * */5 apache /usr/sbin/moodle-cron


--- NEW FILE moodle.init ---
#!/bin/bash
#
# moodle        This shell script enables the cron job for Moodle
#
# Author:       Ignacio Vazquez-Abrams 
# Adapted from the yum initscript by Seth Vidal
#
# chkconfig: - 50 01
#
# description:  Enable the Moodle crom job
#

# source function library
. /etc/rc.d/init.d/functions

lockfile=/var/lock/subsys/moodle

RETVAL=0

start() {
	echo -n $"Enabling Moodle cron job: "
	touch "$lockfile" && success || failure
	RETVAL=$?
	echo
}

stop() {
	echo -n $"Disabling Moodle cron job: "
	rm -f "$lockfile" && success || failure
	RETVAL=$?
	echo
}

restart() {
	stop
	start
}

case "$1" in
  start)
	start
	;;
  stop) 
	stop
	;;
  restart|force-reload)
	restart
	;;
  reload)
	;;
  condrestart)
	[ -f "$lockfile" ] && restart
	;;
  status)
	if [ -f $lockfile ]; then
		echo $"Moodle cron job is enabled."
		RETVAL=0
	else
		echo $"Moodle cron job is disabled."
		RETVAL=3
	fi
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
	exit 1
esac

exit $RETVAL


--- NEW FILE moodle.spec ---
%define moodlewebdir %{_var}/www/moodle/web
%define moodledatadir %{_var}/www/moodle/data

# Suppress finding Perl libraries supplied by filter/algebra/*.p?
%define __perl_requires %{nil}
%define __perl_provides %{nil}

%define with_spellcheck 0

Name:           moodle
Version:        1.5.3
Release:        1
Summary:        A Course Management System

Group:          Applications/Publishing
License:        GPL
URL:            http://moodle.org/
Source0:        http://download.moodle.org/stable15/%{name}-%{version}.tgz
Source1:        moodle.conf
Source2:        moodle-config.php
Source3:        moodle.cron
Source4:        moodle-cron
Source5:        moodle.init
Source6:        moodle-README-rpm
Patch0:         moodle-1.5.2-mimetex-linux.patch
Patch1:         moodle-1.5.2-mimetex-fedora.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

#BuildRequires:  
Requires:       php-gd vixie-cron mimetex perl(lib)
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service

%description
Moodle is a course management system (CMS) - a free, Open Source software
package designed using sound pedagogical principles, to help educators create
effective online learning communities.

%package        af
Summary:        Moodle language pack for Afrikaans
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    af
This package contains the files needed to display Moodle in Afrikaans.

%files          af
%defattr (-,root,root,-)
%{moodlewebdir}/lang/af*

%package        ar
Summary:        Moodle language pack for Arabic
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ar
This package contains the files needed to display Moodle in Arabic.

%files          ar
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ar*

%package        be
Summary:        Moodle language pack for Byelorussian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    be
This package contains the files needed to display Moodle in Byelorussian.

%files          be
%defattr (-,root,root,-)
%{moodlewebdir}/lang/be*

%package        bg
Summary:        Moodle language pack for Bulgarian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    bg
This package contains the files needed to display Moodle in Bulgarian.

%files          bg
%defattr (-,root,root,-)
%{moodlewebdir}/lang/bg*

%package        bs
Summary:        Moodle language pack for Bosnian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    bs
This package contains the files needed to display Moodle in Bosnian.

%files          bs
%defattr (-,root,root,-)
%{moodlewebdir}/lang/bs*

%package        ca
Summary:        Moodle language pack for Catalan
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ca
This package contains the files needed to display Moodle in Catalan.

%files          ca
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ca*

%package        cs
Summary:        Moodle language pack for Czech
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    cs
This package contains the files needed to display Moodle in Czech.

%files          cs
%defattr (-,root,root,-)
%{moodlewebdir}/lang/cs*

%package        da
Summary:        Moodle language pack for Danish
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    da
This package contains the files needed to display Moodle in Danish.

%files          da
%defattr (-,root,root,-)
%{moodlewebdir}/lang/da*

%package        de
Summary:        Moodle language pack for German
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    de
This package contains the files needed to display Moodle in German.

%files          de
%defattr (-,root,root,-)
%{moodlewebdir}/lang/de*

%package        el
Summary:        Moodle language pack for Greek
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    el
This package contains the files needed to display Moodle in Greek.

%files          el
%defattr (-,root,root,-)
%{moodlewebdir}/lang/el*

%package        es
Summary:        Moodle language pack for Spanish
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    es
This package contains the files needed to display Moodle in Spanish.

%files          es
%defattr (-,root,root,-)
%{moodlewebdir}/lang/es*

%package        et
Summary:        Moodle language pack for Estonian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    et
This package contains the files needed to display Moodle in Estonian.

%files          et
%defattr (-,root,root,-)
%{moodlewebdir}/lang/et*

%package        eu
Summary:        Moodle language pack for Basque
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    eu
This package contains the files needed to display Moodle in Basque.

%files          eu
%defattr (-,root,root,-)
%{moodlewebdir}/lang/eu*

%package        fa
Summary:        Moodle language pack for Persian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    fa
This package contains the files needed to display Moodle in Persian.

%files          fa
%defattr (-,root,root,-)
%{moodlewebdir}/lang/fa*

%package        fi
Summary:        Moodle language pack for Finnish
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    fi
This package contains the files needed to display Moodle in Finnish.

%files          fi
%defattr (-,root,root,-)
%{moodlewebdir}/lang/fi*

%package        fr
Summary:        Moodle language pack for French
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    fr
This package contains the files needed to display Moodle in French.

%files          fr
%defattr (-,root,root,-)
%{moodlewebdir}/lang/fr*

%package        ga
Summary:        Moodle language pack for Irish
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ga
This package contains the files needed to display Moodle in Irish.

%files          ga
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ga*

%package        gl
Summary:        Moodle language pack for Galician
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    gl
This package contains the files needed to display Moodle in Galician.

%files          gl
%defattr (-,root,root,-)
%{moodlewebdir}/lang/gl*

%package        he
Summary:        Moodle language pack for Hebrew
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    he
This package contains the files needed to display Moodle in Hebrew.

%files          he
%defattr (-,root,root,-)
%{moodlewebdir}/lang/he*

%package        hu
Summary:        Moodle language pack for Hungarian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    hu
This package contains the files needed to display Moodle in Hungarian.

%files          hu
%defattr (-,root,root,-)
%{moodlewebdir}/lang/hu*

%package        id
Summary:        Moodle language pack for Indonesian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    id
This package contains the files needed to display Moodle in Indonesian.

%files          id
%defattr (-,root,root,-)
%{moodlewebdir}/lang/id*

%package        it
Summary:        Moodle language pack for Italian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    it
This package contains the files needed to display Moodle in Italian.

%files          it
%defattr (-,root,root,-)
%{moodlewebdir}/lang/it*

%package        ja
Summary:        Moodle language pack for Japanese
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ja
This package contains the files needed to display Moodle in Japanese.

%files          ja
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ja*

%package        ka
Summary:        Moodle language pack for Georgian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ka
This package contains the files needed to display Moodle in Georgian.

%files          ka
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ka*

%package        km
Summary:        Moodle language pack for Cambodian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    km
This package contains the files needed to display Moodle in Cambodian.

%files          km
%defattr (-,root,root,-)
%{moodlewebdir}/lang/km*

%package        kn
Summary:        Moodle language pack for Kannada
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    kn
This package contains the files needed to display Moodle in Kannada.

%files          kn
%defattr (-,root,root,-)
%{moodlewebdir}/lang/kn*

%package        ko
Summary:        Moodle language pack for Korean
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ko
This package contains the files needed to display Moodle in Korean.

%files          ko
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ko*

%package        lt
Summary:        Moodle language pack for Lithuanian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    lt
This package contains the files needed to display Moodle in Lithuanian.

%files          lt
%defattr (-,root,root,-)
%{moodlewebdir}/lang/lt*

%package        lv
Summary:        Moodle language pack for Latvian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    lv
This package contains the files needed to display Moodle in Latvian.

%files          lv
%defattr (-,root,root,-)
%{moodlewebdir}/lang/lv*

%package        mi
Summary:        Moodle language pack for Maori
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    mi
This package contains the files needed to display Moodle in Maori.

%files          mi
%defattr (-,root,root,-)
%{moodlewebdir}/lang/mi*

%package        ms
Summary:        Moodle language pack for Malay
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ms
This package contains the files needed to display Moodle in Malay.

%files          ms
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ms*

%package        nl
Summary:        Moodle language pack for Dutch
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    nl
This package contains the files needed to display Moodle in Dutch.

%files          nl
%defattr (-,root,root,-)
%{moodlewebdir}/lang/nl*

%package        no
Summary:        Moodle language pack for Norwegian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    no
This package contains the files needed to display Moodle in Norwegian.

%files          no
%defattr (-,root,root,-)
%{moodlewebdir}/lang/no*

%package        pl
Summary:        Moodle language pack for Polish
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    pl
This package contains the files needed to display Moodle in Polish.

%files          pl
%defattr (-,root,root,-)
%{moodlewebdir}/lang/pl*

%package        pt
Summary:        Moodle language pack for Portuguese
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    pt
This package contains the files needed to display Moodle in Portuguese.

%files          pt
%defattr (-,root,root,-)
%{moodlewebdir}/lang/pt*

%package        ro
Summary:        Moodle language pack for Romanian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ro
This package contains the files needed to display Moodle in Romanian.

%files          ro
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ro*

%package        ru
Summary:        Moodle language pack for Russian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ru
This package contains the files needed to display Moodle in Russian.

%files          ru
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ru*

%package        sk
Summary:        Moodle language pack for Slovak
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    sk
This package contains the files needed to display Moodle in Slovak.

%files          sk
%defattr (-,root,root,-)
%{moodlewebdir}/lang/sk*

%package        sl
Summary:        Moodle language pack for Slovenian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    sl
This package contains the files needed to display Moodle in Slovenian.

%files          sl
%defattr (-,root,root,-)
%{moodlewebdir}/lang/sl*

%package        sq
Summary:        Moodle language pack for Albanian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    sq
This package contains the files needed to display Moodle in Albanian.

%files          sq
%defattr (-,root,root,-)
%{moodlewebdir}/lang/sq*

%package        sr
Summary:        Moodle language pack for Serbian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    sr
This package contains the files needed to display Moodle in Serbian.

%files          sr
%defattr (-,root,root,-)
%{moodlewebdir}/lang/sr*

%package        sv
Summary:        Moodle language pack for Swedish
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    sv
This package contains the files needed to display Moodle in Swedish.

%files          sv
%defattr (-,root,root,-)
%{moodlewebdir}/lang/sv*

%package        th
Summary:        Moodle language pack for Thai
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    th
This package contains the files needed to display Moodle in Thai.

%files          th
%defattr (-,root,root,-)
%{moodlewebdir}/lang/th*

%package        tl
Summary:        Moodle language pack for Tagalog
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    tl
This package contains the files needed to display Moodle in Tagalog.

%files          tl
%defattr (-,root,root,-)
%{moodlewebdir}/lang/tl*

%package        tr
Summary:        Moodle language pack for Turkish
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    tr
This package contains the files needed to display Moodle in Turkish.

%files          tr
%defattr (-,root,root,-)
%{moodlewebdir}/lang/tr*

%package        uk
Summary:        Moodle language pack for Ukrainian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    uk
This package contains the files needed to display Moodle in Ukrainian.

%files          uk
%defattr (-,root,root,-)
%{moodlewebdir}/lang/uk*

%package        vi
Summary:        Moodle language pack for Vietnamese
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    vi
This package contains the files needed to display Moodle in Vietnamese.

%files          vi
%defattr (-,root,root,-)
%{moodlewebdir}/lang/vi*

%package        zh
Summary:        Moodle language pack for Chinese
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    zh
This package contains the files needed to display Moodle in Chinese.

%files          zh
%defattr (-,root,root,-)
%{moodlewebdir}/lang/zh*

%package        editor-spellcheck
Summary:        Spellcheck plugin for Moodle
Group:          Applications/Publishing
Requires:       %{name} = %{version}-%{release}
Requires:       perl(Encode) perl(Text::Aspell) perl(HTML::Parser)
Requires:       perl(HTML::Entities) perl(CGI)

%description    editor-spellcheck
This package contains the spellchecking plugin for Moodle's editor.

%prep
%setup -q -n %{name}
%patch0 -p1 -b .mimetex-linux
%patch1 -p1 -b .mimetex-fedora
cp %{SOURCE6} README-rpm
find $RPM_BUILD_DIR/%{name} -name \*.bak -exec rm {} \;
find $RPM_BUILD_DIR/%{name} -type f -exec chmod a-x {} \;
find $RPM_BUILD_DIR/%{name} -name \*.pl -exec chmod a+x {} \;
find $RPM_BUILD_DIR/%{name} -name \*.cgi -exec chmod a+x {} \;
sed -i 's/\r//' README.txt
sed -i 's/\r//' lib/editor/plugins/SpellChecker/spell-check-logic.cgi

%build
rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{moodlewebdir}
mkdir -p $RPM_BUILD_ROOT%{moodledatadir}
cp -a * $RPM_BUILD_ROOT%{moodlewebdir}
rm $RPM_BUILD_ROOT%{moodlewebdir}/README*
install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/moodle.conf
install -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{moodlewebdir}/config.php
install -p -D -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/moodle
install -p -D -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/moodle-cron
install -p -D -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/moodle
%if %{with_spellcheck} < 1
rm -rf $RPM_BUILD_ROOT/lib/editor/plugins/SpellChecker
%endif
find $RPM_BUILD_ROOT -name \*.mimetex-\* -exec rm {} \;

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add %{name}

%preun
if [ $1 = 0 ]; then
  /sbin/service %{name} stop >/dev/null 2>&1
  /sbin/chkconfig --del %{name}
fi

%files
%defattr(-,root,root,-)
%doc README* doc/COPYRIGHT.txt
%dir %{_var}/www/moodle
%{moodlewebdir}/[a-ce-km-z]*
%doc %{moodlewebdir}/doc
%{moodlewebdir}/lib
%exclude %{moodlewebdir}/lib/editor/plugins/SpellChecker
%{moodlewebdir}/login
%dir %{moodlewebdir}/lang
%{moodlewebdir}/lang/en*
%doc %{moodlewebdir}/lang/README
%attr(-,apache,apache) %{moodledatadir}
%config(noreplace) %{_sysconfdir}/cron.d/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/moodle.conf
%{_initrddir}/%{name}
%{_sbindir}/%{name}-cron

%if %{with_spellcheck}
%files editor-spellcheck
%defattr(-,root,root,-)
%{moodlewebdir}/lib/editor/plugins/SpellChecker
%endif

%changelog
* Sat Dec 10 2005 Ignacio Vazquez-Abrams  1.5.3-1
- Update to 1.5.3
- Split off spell check package due to lack of Text::Aspell

* Mon Oct 12 2005 Ignacio Vazquez-Abrams  1.5.2-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Dec 2005 18:41:42 -0000	1.1
+++ .cvsignore	12 Dec 2005 19:48:03 -0000	1.2
@@ -0,0 +1 @@
+moodle-1.5.3.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Dec 2005 18:41:42 -0000	1.1
+++ sources	12 Dec 2005 19:48:03 -0000	1.2
@@ -0,0 +1 @@
+52dd50298fc1dd8b1b6d8d499608cdd6  moodle-1.5.3.tgz



From fedora-extras-commits at redhat.com  Mon Dec 12 20:46:40 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 12 Dec 2005 15:46:40 -0500
Subject: rpms/krusader/FC-3 .cvsignore, 1.2, 1.3 krusader.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200512122047.jBCKlANr011965@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	.cvsignore krusader.spec sources 
Log Message:
- Updated to version 1.60.1 which fix CVE-2005-3856



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2005 16:09:51 -0000	1.2
+++ .cvsignore	12 Dec 2005 20:46:38 -0000	1.3
@@ -1 +1,2 @@
 krusader-1.60.0.tar.gz
+krusader-1.60.1.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-3/krusader.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- krusader.spec	24 Oct 2005 18:17:39 -0000	1.3
+++ krusader.spec	12 Dec 2005 20:46:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		krusader
-Version:	1.60.0
-Release:	4%{?dist}
+Version:	1.60.1
+Release:	1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -103,6 +103,9 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* 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
 - Added update-mime-database and gtk-update-icon-cache (bug #171547)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2005 16:09:51 -0000	1.2
+++ sources	12 Dec 2005 20:46:38 -0000	1.3
@@ -1 +1,2 @@
 95f7900799bbd2810e6ac06fbf628536  krusader-1.60.0.tar.gz
+18b3b6f247c08b76113bcb9f2c666a6a  krusader-1.60.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 20:51:12 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 12 Dec 2005 15:51:12 -0500
Subject: rpms/krusader/FC-4 .cvsignore, 1.2, 1.3 krusader.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200512122051.jBCKphi6012038@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	.cvsignore krusader.spec sources 
Log Message:
- Updated to version 1.60.1 which fix CVE-2005-3856



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2005 16:09:51 -0000	1.2
+++ .cvsignore	12 Dec 2005 20:51:10 -0000	1.3
@@ -1 +1,2 @@
 krusader-1.60.0.tar.gz
+krusader-1.60.1.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-4/krusader.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- krusader.spec	25 Oct 2005 11:34:19 -0000	1.3
+++ krusader.spec	12 Dec 2005 20:51:10 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		krusader
-Version:	1.60.0
-Release:	4%{?dist}
+Version:	1.60.1
+Release:	1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -103,6 +103,9 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* 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
 - Added update-mime-database and gtk-update-icon-cache (bug #171547)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2005 16:09:51 -0000	1.2
+++ sources	12 Dec 2005 20:51:10 -0000	1.3
@@ -1 +1,2 @@
 95f7900799bbd2810e6ac06fbf628536  krusader-1.60.0.tar.gz
+18b3b6f247c08b76113bcb9f2c666a6a  krusader-1.60.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 20:56:25 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 12 Dec 2005 15:56:25 -0500
Subject: rpms/krusader/devel .cvsignore, 1.2, 1.3 krusader.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200512122056.jBCKutZJ012129@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	.cvsignore krusader.spec sources 
Log Message:
- Updated to version 1.60.1 which fix CVE-2005-3856



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2005 16:09:51 -0000	1.2
+++ .cvsignore	12 Dec 2005 20:56:23 -0000	1.3
@@ -1 +1,2 @@
 krusader-1.60.0.tar.gz
+krusader-1.60.1.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- krusader.spec	24 Oct 2005 15:11:01 -0000	1.3
+++ krusader.spec	12 Dec 2005 20:56:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		krusader
-Version:	1.60.0
-Release:	4%{?dist}
+Version:	1.60.1
+Release:	1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -103,6 +103,9 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* 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
 - Added update-mime-database and gtk-update-icon-cache (bug #171547)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2005 16:09:51 -0000	1.2
+++ sources	12 Dec 2005 20:56:23 -0000	1.3
@@ -1 +1,2 @@
 95f7900799bbd2810e6ac06fbf628536  krusader-1.60.0.tar.gz
+18b3b6f247c08b76113bcb9f2c666a6a  krusader-1.60.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 21:05:22 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 16:05:22 -0500
Subject: rpms/moodle/devel moodle.cron,1.1,1.2 moodle.spec,1.1,1.2
Message-ID: <200512122106.jBCL6J9J013777@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	moodle.cron moodle.spec 
Log Message:
Small typo, plus disttag


Index: moodle.cron
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/moodle.cron,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- moodle.cron	12 Dec 2005 19:48:03 -0000	1.1
+++ moodle.cron	12 Dec 2005 21:05:20 -0000	1.2
@@ -1 +1 @@
-* * * * */5 apache /usr/sbin/moodle-cron
+*/5 * * * * apache /usr/sbin/moodle-cron


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- moodle.spec	12 Dec 2005 19:48:03 -0000	1.1
+++ moodle.spec	12 Dec 2005 21:05:20 -0000	1.2
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.5.3
-Release:        1
+Release:        1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing



From fedora-extras-commits at redhat.com  Mon Dec 12 21:08:11 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 16:08:11 -0500
Subject: owners owners.list,1.442,1.443
Message-ID: <200512122108.jBCL8fjv013813@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	owners.list 
Log Message:
moodle


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- owners.list	12 Dec 2005 15:31:57 -0000	1.442
+++ owners.list	12 Dec 2005 21:08:09 -0000	1.443
@@ -591,6 +591,7 @@
 Fedora Extras|moin-latex|LaTeX plugin for the MoinMoin wiki|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|monotone|A free, distributed version control system|roland at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|moodle|A Course Management System|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|moodss|Powerful modular monitoring graphical application|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 13 03:49:48 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 22:49:48 -0500
Subject: rpms/nsd - New directory
Message-ID: <200512130349.jBD3nmov024422@cvs-int.fedora.redhat.com>

Author: pwouters

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

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




From fedora-extras-commits at redhat.com  Tue Dec 13 03:49:53 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 22:49:53 -0500
Subject: rpms/nsd/devel - New directory
Message-ID: <200512130349.jBD3nr1S024438@cvs-int.fedora.redhat.com>

Author: pwouters

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

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




From fedora-extras-commits at redhat.com  Tue Dec 13 03:50:09 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 22:50:09 -0500
Subject: rpms/nsd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512130350.jBD3o9nD024477@cvs-int.fedora.redhat.com>

Author: pwouters

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 03:50:15 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 22:50:15 -0500
Subject: rpms/nsd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512130350.jBD3oFJ0024500@cvs-int.fedora.redhat.com>

Author: pwouters

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

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


--- NEW 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 Dec 13 03:50:59 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 22:50:59 -0500
Subject: rpms/nsd import.log,1.1,1.2
Message-ID: <200512130351.jBD3pUnR024585@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	import.log 
Log Message:
auto-import nsd-2.3.3-2 on branch devel from nsd-2.3.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nsd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 03:50:07 -0000	1.1
+++ import.log	13 Dec 2005 03:50:57 -0000	1.2
@@ -0,0 +1 @@
+nsd-2_3_3-2:HEAD:nsd-2.3.3-2.src.rpm:1134445935



From fedora-extras-commits at redhat.com  Tue Dec 13 03:51:05 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 22:51:05 -0500
Subject: rpms/nsd/devel nsd-2.3.3-checking.patch, NONE, 1.1 nsd-2.3.3.spec,
	NONE, 1.1 nsd.init, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512130351.jBD3p5dP024578@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	.cvsignore sources 
Added Files:
	nsd-2.3.3-checking.patch nsd-2.3.3.spec nsd.init 
Log Message:
auto-import nsd-2.3.3-2 on branch devel from nsd-2.3.3-2.src.rpm

nsd-2.3.3-checking.patch:

--- NEW FILE nsd-2.3.3-checking.patch ---
diff -r -u nsd-2.3.3.orig/zonec.c nsd-2.3.3/zonec.c
--- nsd-2.3.3.orig/zonec.c	2005-10-11 09:08:41.000000000 -0400
+++ nsd-2.3.3/zonec.c	2005-12-13 03:26:57.000000000 -0500
@@ -1231,12 +1231,17 @@
 	/* Check consistency of rrtype descriptor table.  */
 	{
 		int i;
-		for (i = 0; i < RRTYPE_DESCRIPTORS_LENGTH; ++i) {
+		for (i = 0; i < TYPE_DNSKEY; ++i) {
 			if (i != rrtype_descriptors[i].type) {
 				fprintf(stderr, "error: type descriptor entry '%d' does not match type '%d', fix the definition in dns.c\n", i, rrtype_descriptors[i].type);
 				abort();
 			}
 		}
+		/* and then we have a bunch of zeros and the SPF record */
+		if (rrtype_descriptors[TYPE_SPF].type != TYPE_SPF) {
+			fprintf(stderr, "error: type descriptor entry '%d' does not match type '%d', fix the definition in dns.c\n", i, rrtype_descriptors[i].type);
+		abort();
+		}
 	}
 #endif
 	


--- NEW FILE nsd-2.3.3.spec ---
Summary: NSD is a complete implementation of an authoritative DNS name server
Name: nsd
Version: 2.3.3
Release: 2%{?dist}
License: BSD-like
Url: http://open.nlnetlabs.nl/nsd/
Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
Source1: nsd.init
Patch0: nsd-2.3.3-checking.patch
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Requires: 
BuildRequires: flex

%description
NSD is a complete implementation of an authoritative DNS name server.
For further information about what NSD is and what NSD is not please
consult the REQUIREMENTS document which is a part of this distribution
(thanks to Olaf).

%prep
%setup -q 
%patch0 -p1 -b .checking.patch

%configure --enable-bind8-stats --enable-plugins \
           --enable-mmap --with-pidfile=/var/run/nsd.pid --with-ssl \
           --with-user=nsd

%build
%{__make} %{?_smp_mflags}

%install
# Not using their 'make install' since it uses install-sh which does not
# get the correct install path within the RPM_BUILD_ROOT
#%{__make} install
rm -rf %{buildroot}
install -d 0755 %{buildroot}/%{_sysconfdir}/nsd
install -d 0755 %{buildroot}/%{_sbindir}
install -d 0755 %{buildroot}/%{_mandir}/man8
install -d 0755 %{buildroot}/%{_initrddir}

install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf
install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones
install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd

install -m 0755 nsd zonec nsd-notify nsd-xfer %{buildroot}/%{_sbindir}
install -m 0755 nsdc.sh %{buildroot}/%{_sbindir}/nsdc
install -m 0644 *.8 %{buildroot}/%{_mandir}/man8

%clean
rm -rf ${RPM_BUILD_ROOT}

%files 
%defattr(-,root,root)
%doc README LICENSE NSD-DATABASE DIFFERENCES dbaccess.c TODO RELNOTES REQUIREMENTS
%dir %{_sysconfdir}/nsd/
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
%attr(0755,root,root) %{_initrddir}/%{name}
%{_sbindir}/*
%{_mandir}/*/*

%pre
if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
if [ $1 = 2 -a -f /var/run/%{name}.pid ]; then
	/sbin/service %{name} stop
fi
# "Everyone is doing it, so why can't we?" 
exit 0

%post
# do not activate daemon upon request. Fedora Extra policy

%preun
if [ -f /var/run/%{name}.pid ]
then
        /sbin/service %{name} stop > /dev/null 2>&1
fi
if [ $1 -eq 0 ]
then
        /sbin/chkconfig --del %{name} > /dev/null 2>&1
fi
# "Everyone is doing it, so why can't we?"
exit 0

%postun
if [ "$1" -ge "1" ]; then
  /sbin/service %{name} condrestart 2>&1 >/dev/null
fi

%changelog
* Mon Dec 12 2005 Paul Wouters  - 2.3.3
- upgraded to nsd-2.3.3

* Wed Dec  7 2005 Tom "spot" Callaway  - 2.3.2-2
- minor cleanups

* Mon Dec  5 2005 Paul Wouters  - 2.3.2-1
- Upgraded to 2.3.2. Changed post scripts to comply to Fedora
  Extras policies (eg do not start daemon on fresh install)

* Tue Oct  4 2005 Paul Wouters  - 2.3.1-1
- Initial version


--- NEW FILE nsd.init ---
#!/bin/bash
#
# nsd:         Starts the NSD Name Server Daemon
#
# chkconfig: - 11 89
# description:  NSD is a complete implementation of an authoritative \
#               DNS name server. 
# processname: /usr/sbin/nsd
# config: /etc/nsd/nsdc.config
#
### BEGIN INIT INFO
# Provides: nsd
# Required-Start: $syslog
# Default-Stop: 0 11 89
# Short-Description: Starts the NSD Name Server Daemon
# Description:  NSD is a complete implementation of an authoritative \
#               DNS name server.
### END INIT INFO

# Sanity checks.
[ -f /etc/nsd/nsdc.conf ] || exit 0
[ -f /etc/nsd/nsd.zones ] || exit 0
[ -x /usr/sbin/nsd ] || exit 0

#extra verbosity
#ZONEC_VERBOSE=-v

OTHER_NSD_OPTS=""

# Source function library.
. /etc/init.d/functions

. /etc/sysconfig/network

# Check that networking is configured.
[ ${NETWORKING} = "no" ] && exit 0

start() {
	/usr/sbin/nsdc rebuild >/dev/null
	/usr/sbin/nsdc update >/dev/null
	echo -n $"Starting nsd... "
	nsd $OTHER_NSD_OPTS
	RETVAL=$?
	echo
	/usr/sbin/nsdc notify
	touch /var/lock/subsys/nsd
	return $RETVAL
}

stop() {
	echo -n $"Shutting down nsd services: "
	killproc nsd
	RETVAL=$?
	if [ $RETVAL -eq 0 ] ; then
	  rm -f /var/lock/subsys/nsd
	  rm -f /var/run/nsd.pid
	fi
	echo
	return $RETVAL
}

restart() {
	stop
	start
}

RETVAL=0

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
	restart
	;;
  condrestart)
        [ -f /var/lock/subsys/nsd ] && restart || :
	;;
  status)
	/usr/sbin/nsdc running
	;;
  stats|reload|rebuild|running|update|notify)
	/usr/sbin/nsdc $1 
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}"
	exit 1
esac

exit $?


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 03:50:13 -0000	1.1
+++ .cvsignore	13 Dec 2005 03:51:03 -0000	1.2
@@ -0,0 +1 @@
+nsd-2.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 03:50:13 -0000	1.1
+++ sources	13 Dec 2005 03:51:03 -0000	1.2
@@ -0,0 +1 @@
+7e9f0ebfdf9dd29213170999cd60c20e  nsd-2.3.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 03:59:49 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 22:59:49 -0500
Subject: owners owners.list,1.443,1.444
Message-ID: <200512130400.jBD40JKX024716@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	owners.list 
Log Message:
added myself as maintainer for ldns and nsd in the owners.list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- owners.list	12 Dec 2005 21:08:09 -0000	1.443
+++ owners.list	13 Dec 2005 03:59:47 -0000	1.444
@@ -1279,3 +1279,5 @@
 Fedora Extras|yakuake|A Quake-like terminal application|dreadyman at gmail.com|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|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|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|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 13 04:00:20 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 12 Dec 2005 23:00:20 -0500
Subject: rpms/nmh/FC-4 nmh-1.1-annotate.patch,NONE,1.1 nmh.spec,1.9,1.10
Message-ID: <200512130400.jBD40pPM024748@cvs-int.fedora.redhat.com>

Author: bressers

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

Modified Files:
	nmh.spec 
Added Files:
	nmh-1.1-annotate.patch 
Log Message:
Fix repl's annotate.


nmh-1.1-annotate.patch:

--- NEW FILE nmh-1.1-annotate.patch ---
--- nmh-orig/uip/sendsbr.c	2005-12-12 15:51:52.000000000 -0500
+++ nmh/uip/sendsbr.c	2005-12-12 15:53:27.000000000 -0500
@@ -1020,7 +1020,7 @@
 	if (is_selected(mp, msgnum)) {
 	    if (debugsw)
 		advise (NULL, "annotate message %d", msgnum);
-	    annotate (m_name (msgnum), annotext, cp, inplace, 1, 0, 0);
+	    annotate (m_name (msgnum), annotext, cp, inplace, 1, -1, 0);
 	}
     }
 


Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/FC-4/nmh.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nmh.spec	5 Dec 2005 22:06:57 -0000	1.9
+++ nmh.spec	13 Dec 2005 04:00:18 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        12.fc4
+Release:        13.fc4
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 Patch0:         nmh-1.1-makefile.patch
 Patch1:         nmh-1.1-lock_file.patch
 Patch2:         nmh-1.1-empty-content-type.patch
+Patch3:         nmh-1.1-annotate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
@@ -32,6 +33,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 
 
 %build
@@ -66,6 +68,9 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Mon Dec 12 2005 Josh Bressers  0:1.1-13.fc4
+- Add a patch to allow repl to properly annotate messages.
+
 * Mon Dec 05 2005 Josh Bressers  0:1.1-12.fc4
 - Add a buildrequires on /bin/vi
 - Modify the sendmail buildrequires to use /usr/sbin/sendmail



From fedora-extras-commits at redhat.com  Tue Dec 13 04:00:26 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 12 Dec 2005 23:00:26 -0500
Subject: rpms/nmh/devel nmh-1.1-annotate.patch,NONE,1.1 nmh.spec,1.9,1.10
Message-ID: <200512130400.jBD40ugL024751@cvs-int.fedora.redhat.com>

Author: bressers

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

Modified Files:
	nmh.spec 
Added Files:
	nmh-1.1-annotate.patch 
Log Message:
Fix repl's annotate.


nmh-1.1-annotate.patch:

--- NEW FILE nmh-1.1-annotate.patch ---
--- nmh-orig/uip/sendsbr.c	2005-12-12 15:51:52.000000000 -0500
+++ nmh/uip/sendsbr.c	2005-12-12 15:53:27.000000000 -0500
@@ -1020,7 +1020,7 @@
 	if (is_selected(mp, msgnum)) {
 	    if (debugsw)
 		advise (NULL, "annotate message %d", msgnum);
-	    annotate (m_name (msgnum), annotext, cp, inplace, 1, 0, 0);
+	    annotate (m_name (msgnum), annotext, cp, inplace, 1, -1, 0);
 	}
     }
 


Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/devel/nmh.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nmh.spec	5 Dec 2005 22:07:03 -0000	1.9
+++ nmh.spec	13 Dec 2005 04:00:24 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        12.fc5
+Release:        13.fc5
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 Patch0:         nmh-1.1-makefile.patch
 Patch1:         nmh-1.1-lock_file.patch
 Patch2:         nmh-1.1-empty-content-type.patch
+Patch3:         nmh-1.1-annotate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
@@ -32,6 +33,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 
 
 %build
@@ -66,6 +68,9 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Mon Dec 12 2005 Josh Bressers  0:1.1-13.fc5
+- Add a patch to allow repl to properly annotate messages.
+
 * Mon Dec 05 2005 Josh Bressers  0:1.1-12.fc5
 - Add a buildrequires on /bin/vi
 - Modify the sendmail buildrequires to use /usr/sbin/sendmail



From fedora-extras-commits at redhat.com  Tue Dec 13 04:03:55 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 23:03:55 -0500
Subject: rpms/ldns - New directory
Message-ID: <200512130403.jBD43t4e026433@cvs-int.fedora.redhat.com>

Author: pwouters

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

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




From fedora-extras-commits at redhat.com  Tue Dec 13 04:04:13 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 23:04:13 -0500
Subject: rpms/ldns/devel - New directory
Message-ID: <200512130404.jBD44DDc026450@cvs-int.fedora.redhat.com>

Author: pwouters

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

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




From fedora-extras-commits at redhat.com  Tue Dec 13 04:04:51 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 23:04:51 -0500
Subject: rpms/ldns Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512130404.jBD44piY026484@cvs-int.fedora.redhat.com>

Author: pwouters

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 04:05:17 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 23:05:17 -0500
Subject: rpms/ldns/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512130405.jBD45H4X026502@cvs-int.fedora.redhat.com>

Author: pwouters

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

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


--- NEW 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 Dec 13 04:08:27 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 23:08:27 -0500
Subject: rpms/ldns/devel ldns.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200512130409.jBD493Jm026576@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	.cvsignore sources 
Added Files:
	ldns.spec 
Log Message:
auto-import ldns-1.0.0-5 on branch devel from ldns-1.0.0-5.src.rpm


--- NEW FILE ldns.spec ---
Summary: Lowlevel DNS(SEC) library with API
Name: ldns
Version: 1.0.0
Release: 5%{?dist}
License: BSD
Url: http://open.nlnetlabs.nl/%{name}/
Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool, autoconf, automake, gcc-c++, openssl-devel, doxygen

%description
ldns is a library with the aim to simplify DNS programing in C. All
lowlevel DNS/DNSSEC operations are supported. We also define a higher
level API which allows a programmer to (for instance) create or sign
packets.

%package devel
Summary: Development package that includes the ldns header files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, openssl-devel

%description devel
The devel package contains the ldns library and the include files

%prep
%setup -q 
rm config.sub config.guess
libtoolize
autoreconf

%configure


%build
%{__make} %{?_smp_mflags} allautoconf
%{__make} %{?_smp_mflags}
%{__make} %{?_smp_mflags} drill
%{__make} %{?_smp_mflags} examples
%{__make} %{?_smp_mflags} doc

%install
rm -rf %{buildroot}

export DESTDIR=%{buildroot}
%{__make} install
%{__make} examples-install
%{__make} install-doc
%{__make} drill-install
#remove doc stubs
rm -rf doc/.svn
#remove double set of man pages
rm -rf doc/man
# remove .la files
rm -rf %{buildroot}%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%files 
%defattr(-,root,root)
%{_libdir}/libldns*so
%{_bindir}/drill
%{_bindir}/ldns-*
%doc README LICENSE ROADMAP TODO 
%{_mandir}/*/*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libldns.a
%dir %{_includedir}/ldns/*
%doc doc Changelog COMPILE 

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Sun Dec 11 2005 Tom "spot" Callaway  1.0.0-5
- minor cleanups

* Wed Oct  5 2005 Paul Wouters  0.70_1205
- reworked for svn version

* Sun Sep 25 2005 Paul Wouters  - 0.70
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 04:05:15 -0000	1.1
+++ .cvsignore	13 Dec 2005 04:08:25 -0000	1.2
@@ -0,0 +1 @@
+ldns-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 04:05:15 -0000	1.1
+++ sources	13 Dec 2005 04:08:25 -0000	1.2
@@ -0,0 +1 @@
+bf8ff0868cacd2d4487ed1e28ea6c239  ldns-1.0.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 04:08:03 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 23:08:03 -0500
Subject: rpms/ldns import.log,1.1,1.2
Message-ID: <200512130409.jBD49BPs026579@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	import.log 
Log Message:
auto-import ldns-1.0.0-5 on branch devel from ldns-1.0.0-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ldns/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 04:04:49 -0000	1.1
+++ import.log	13 Dec 2005 04:08:01 -0000	1.2
@@ -0,0 +1 @@
+ldns-1_0_0-5:HEAD:ldns-1.0.0-5.src.rpm:1134446913



From fedora-extras-commits at redhat.com  Tue Dec 13 04:10:40 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 23:10:40 -0500
Subject: rpms/nsd/devel nsd.spec,NONE,1.1 nsd-2.3.3.spec,1.1,NONE
Message-ID: <200512130410.jBD4AesO026635@cvs-int.fedora.redhat.com>

Author: pwouters

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

Added Files:
	nsd.spec 
Removed Files:
	nsd-2.3.3.spec 
Log Message:
Renamed versioned spec to unversioned spec (eg nsd.spec)



--- NEW FILE nsd.spec ---
Summary: NSD is a complete implementation of an authoritative DNS name server
Name: nsd
Version: 2.3.3
Release: 2%{?dist}
License: BSD-like
Url: http://open.nlnetlabs.nl/nsd/
Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
Source1: nsd.init
Patch0: nsd-2.3.3-checking.patch
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Requires: 
BuildRequires: flex

%description
NSD is a complete implementation of an authoritative DNS name server.
For further information about what NSD is and what NSD is not please
consult the REQUIREMENTS document which is a part of this distribution
(thanks to Olaf).

%prep
%setup -q 
%patch0 -p1 -b .checking.patch

%configure --enable-bind8-stats --enable-plugins \
           --enable-mmap --with-pidfile=/var/run/nsd.pid --with-ssl \
           --with-user=nsd

%build
%{__make} %{?_smp_mflags}

%install
# Not using their 'make install' since it uses install-sh which does not
# get the correct install path within the RPM_BUILD_ROOT
#%{__make} install
rm -rf %{buildroot}
install -d 0755 %{buildroot}/%{_sysconfdir}/nsd
install -d 0755 %{buildroot}/%{_sbindir}
install -d 0755 %{buildroot}/%{_mandir}/man8
install -d 0755 %{buildroot}/%{_initrddir}

install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf
install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones
install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd

install -m 0755 nsd zonec nsd-notify nsd-xfer %{buildroot}/%{_sbindir}
install -m 0755 nsdc.sh %{buildroot}/%{_sbindir}/nsdc
install -m 0644 *.8 %{buildroot}/%{_mandir}/man8

%clean
rm -rf ${RPM_BUILD_ROOT}

%files 
%defattr(-,root,root)
%doc README LICENSE NSD-DATABASE DIFFERENCES dbaccess.c TODO RELNOTES REQUIREMENTS
%dir %{_sysconfdir}/nsd/
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
%attr(0755,root,root) %{_initrddir}/%{name}
%{_sbindir}/*
%{_mandir}/*/*

%pre
if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
if [ $1 = 2 -a -f /var/run/%{name}.pid ]; then
	/sbin/service %{name} stop
fi
# "Everyone is doing it, so why can't we?" 
exit 0

%post
# do not activate daemon upon request. Fedora Extra policy

%preun
if [ -f /var/run/%{name}.pid ]
then
        /sbin/service %{name} stop > /dev/null 2>&1
fi
if [ $1 -eq 0 ]
then
        /sbin/chkconfig --del %{name} > /dev/null 2>&1
fi
# "Everyone is doing it, so why can't we?"
exit 0

%postun
if [ "$1" -ge "1" ]; then
  /sbin/service %{name} condrestart 2>&1 >/dev/null
fi

%changelog
* Mon Dec 12 2005 Paul Wouters  - 2.3.3
- upgraded to nsd-2.3.3

* Wed Dec  7 2005 Tom "spot" Callaway  - 2.3.2-2
- minor cleanups

* Mon Dec  5 2005 Paul Wouters  - 2.3.2-1
- Upgraded to 2.3.2. Changed post scripts to comply to Fedora
  Extras policies (eg do not start daemon on fresh install)

* Tue Oct  4 2005 Paul Wouters  - 2.3.1-1
- Initial version


--- nsd-2.3.3.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 04:43:40 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 23:43:40 -0500
Subject: rpms/deskbar-applet/devel .cvsignore, 1.5, 1.6 deskbar-applet.spec,
	1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200512130444.jBD4iAVk027366@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27338

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Dec 2005 05:19:15 -0000	1.5
+++ .cvsignore	13 Dec 2005 04:43:38 -0000	1.6
@@ -1 +1 @@
-deskbar-applet-0.8.6.tar.bz2
+deskbar-applet-0.8.6.1.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- deskbar-applet.spec	9 Dec 2005 04:44:25 -0000	1.10
+++ deskbar-applet.spec	13 Dec 2005 04:43:38 -0000	1.11
@@ -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:        0.8.6
+Version:        0.8.6.1
 Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
@@ -59,6 +59,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Mon Dec 12 2005 Ignacio Vazquez-Abrams  0.8.6.1-1
+- Upstream update
+
 * Thu Dec  8 2005 Ignacio Vazquez-Abrams  0.8.6-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Dec 2005 05:19:15 -0000	1.5
+++ sources	13 Dec 2005 04:43:38 -0000	1.6
@@ -1 +1 @@
-67507881804181b749d5e317a76b91ee  deskbar-applet-0.8.6.tar.bz2
+6a4d4169cdb568f5555e3c824a856637  deskbar-applet-0.8.6.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Dec 13 07:33:56 2005
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 13 Dec 2005 02:33:56 -0500
Subject: rpms/monotone/FC-4 monotone.spec,1.11,1.12
Message-ID: <200512130734.jBD7YQGL032615@cvs-int.fedora.redhat.com>

Author: roland

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

Modified Files:
	monotone.spec 
Log Message:
Uncomment make check



Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- monotone.spec	12 Dec 2005 02:38:33 -0000	1.11
+++ monotone.spec	13 Dec 2005 07:33:54 -0000	1.12
@@ -65,7 +65,7 @@
 make %{?_smp_mflags}
 
 %check
-#make check || { cat testsuite.log; false; }
+make check || { cat testsuite.log; false; }
 
 %install
 rm -rf %{buildroot}



From fedora-extras-commits at redhat.com  Tue Dec 13 07:35:09 2005
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 13 Dec 2005 02:35:09 -0500
Subject: rpms/monotone/devel README.monotone-server, NONE, 1.1 .cvsignore,
	1.4, 1.5 monotone.init, 1.2, 1.3 monotone.spec, 1.6,
	1.7 monotone.sysconfig, 1.1, 1.2 sources, 1.4,
	1.5 monotone-xfail-if-root.patch, 1.1, NONE
Message-ID: <200512130735.jBD7Zd6k032646@cvs-int.fedora.redhat.com>

Author: roland

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

Modified Files:
	.cvsignore monotone.init monotone.spec monotone.sysconfig 
	sources 
Added Files:
	README.monotone-server 
Removed Files:
	monotone-xfail-if-root.patch 
Log Message:
0.24 update copied from FC-4 branch


--- NEW FILE README.monotone-server ---
The Fedora Extras build of monotone provides an extra RPM monotone-server.
This package is intended to make it easy to set up an unattended server
installation for Monotone's Netsync protocol (i.e. "monotone serve").

The package a standard Fedora-style init.d script with chkconfig support
for running the server, installed as /usr/sbin/monotone-server.
(This is just a symlink to monotone that the init script runs instead.
This enables matching "monotone-server" processes with ps to distinguish
server instances from people using monotone.)

The /etc/monotone directory serves as ~/.monotone for the server.  This
directory and its contents are not writable by the "monotone" user ID under
which the network server runs.  The database lives in /var/db/monotone,
which the "monotone" user ID must write to.

The init.d script will generate a private key for the server to use, if
none exists yet.  The key identification will be the host's FQDN (from
/bin/hostname -f).  You can use "service monotone genkey [IDENT]" to
generate the private key by hand and set up the unattended server to use
it, supplying a different key identification string if you like.

Before starting the server, the script will migrate an old database
format if you had a previous version of the monotone-server installation.
(This includes converting private keys from the old format.)
You can always do this explicitly with "service monotone migrate".

Access to the server is controlled by the /etc/monotone/read-permissions and
/etc/monotone/write-permissions files, unless you write your own Lua hooks
in /etc/monotone/monotonerc.  These files are not created or editted by the
RPM scripts, you must create them.  These files refer to key identification
strings for keys already the database.  Anyone allowed write access by the
netwrok server can put new keys in the database with "monotone push" using
the --key-to-push option.  To bootstrap this, /etc/monotone/write-permission
must allow some key and that key must be in the database already.  You can
put a key in the server's database easily with "service monotone import",
e.g. to import the public key for a private key in ~/.monotone/keys:

	monotone pubkey me at my.com | sudo service monotone import

For problems with this package or its scripts, please file bugs
at http://bugzilla.redhat.com/ for the "monotone" component
in th "Fedora Extras" product.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Oct 2005 03:45:52 -0000	1.4
+++ .cvsignore	13 Dec 2005 07:35:07 -0000	1.5
@@ -1 +1 @@
-monotone-0.23.tar.gz
+monotone-0.24.tar.gz


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monotone.init	4 Oct 2005 03:45:02 -0000	1.2
+++ monotone.init	13 Dec 2005 07:35:07 -0000	1.3
@@ -7,7 +7,7 @@
 # processname: monotone-server
 # pidfile: /var/run/monotone-server.pid
 # config: /etc/sysconfig/monotone
-# config: /etc/monotonerc
+# config: /etc/monotone/monotonerc
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -31,7 +31,7 @@
 random_passphrase()
 {
 	# As of 0.22, 32 chars is the maximum pass phrase length.
-	dd if=/dev/urandom count=1 2> /dev/null | md5sum |
+	dd if=/dev/urandom bs=32 count=1 2> /dev/null | md5sum |
 	{ read sum rest; echo $sum; }
 }
 
@@ -40,8 +40,16 @@
 # See how we were called.
 case "$1" in
   start)
-	[ -e $MONOTONE_DBFILE ] || { $0 init && $0 genkey; }
+	if [ -e $MONOTONE_DBFILE ]; then
+		$0 migrate
+	else
+		$0 init
+	fi
 	RETVAL=$?
+	if [ $RETVAL = 0 ] && [ "x`ls $MONOTONE_KEYDIR`" = x ]; then
+		$0 genkey
+		RETVAL=$?
+	fi
 	if [ $RETVAL = 0 ]; then
 		# Start daemon.
 		echo -n $"Starting monotone server: "
@@ -60,7 +68,7 @@
         ;;
   stop)
         # Stop daemons.
-        echo -n "Stopping monotone server: "
+        echo -n $"Stopping monotone server: "
         killproc $MTSERVER
         RETVAL=$?
         [ $RETVAL = 0 ] && rm -f /var/lock/subsys/monotone
@@ -78,7 +86,7 @@
 	RETVAL=$?
 	;;
   init)
-	echo -n $"Initializing $MONOTONE_DBFILE: "
+	echo -n $"Initializing database" "$MONOTONE_DBFILE" ": "
 	{ [ -d /var/db/monotone ] ||
  	  /usr/bin/install -o ${MONOTONE_USER:-monotone} \
 			   -g ${MONOTONE_GROUP:-monotone} \
@@ -91,7 +99,7 @@
 	echo
 	;;
   genkey)
-	MONOTONE_KEYID=${MONOTONE_KEYID:-`/bin/hostname -f`}
+	MONOTONE_KEYID=${2:-${MONOTONE_KEYID:-`/bin/hostname -f`}}
 	MONOTONE_PPFILE=${MONOTONE_PPFILE:-/var/db/monotone/passphrase.lua}
 	echo -n $"Generating RSA key for server $MONOTONE_KEYID"
 	tmp=/tmp/mtserver$$
@@ -106,9 +114,8 @@
   return "$passphrase"
 end
 EOF
-		/usr/bin/install -o ${MONOTONE_USER:-monotone} \
-		    		 -g ${MONOTONE_GROUP:-monotone} \
-				 -m 0600 $tmp ${MONOTONE_PPFILE}
+		/usr/bin/install -o root -g ${MONOTONE_GROUP:-monotone} \
+				 -m 0440 $tmp ${MONOTONE_PPFILE}
 	then
 		success $"key generation"
 	else
@@ -118,8 +125,47 @@
 	rm -f $tmp
 	echo
 	;;
+  migrate)
+  	oppfile=/var/db/monotone/passphrase.lua
+	RETVAL=0
+	if [ ! -e $MONOTONE_PPFILE ] && [ -e $oppfile ]; then
+		echo -n $"Moving old server passphrase file to new location: "
+		/usr/bin/install -o root -g ${MONOTONE_GROUP:-monotone} \
+				 -m 0440 $oppfile ${MONOTONE_PPFILE} &&
+		success $"move passphrase file" ||
+		failure $"move passphrase file"
+		RETVAL=$?
+		echo
+	fi
+	[ $RETVAL -eq 0 ] || exit $RETVAL
+	# Note this must run as root in case migration is writing
+	# into /etc/monotone/private-keys.
+	echo $"Checking database format in" "${MONOTONE_DBFILE}:"
+	(umask 027
+	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db migrate &&
+	 /bin/chgrp -R ${MONOTONE_GROUP:-monotone} $MONOTONE_KEYDIR)
+		success $"database check" ||
+		failure $"database check"
+	RETVAL=$?
+	echo
+	;;
+  # Use "monotone pubkey me at my.com | service monotone import"
+  # to import the first keys to enable in /etc/monotone/write-permission.
+  # Thereafter, those with write permission can add other keys via
+  # netsync with "monotone push --key-to-push=IDENT" and then IDENT
+  # can be used in the read-permission and write-permission files.
+  import)
+	echo -n $"Importing packets to monotone database: "
+	runuser -s /bin/bash - ${MONOTONE_USER:-monotone} -c "umask 007; \
+		$MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS read" &&
+		success $"packet import" ||
+		failure $"packet import"
+	RETVAL=$?
+	echo
+	;;
   *)
-	echo "Usage: $0 {start|stop|restart|status|condrestart|init|genkey}"
+	echo "\
+Usage: $0 {start|stop|restart|status|condrestart|init|import|genkey [IDENT]}"
 	RETVAL=1
 	;;
 esac


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- monotone.spec	4 Oct 2005 03:45:02 -0000	1.6
+++ monotone.spec	13 Dec 2005 07:35:07 -0000	1.7
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.23
+Version: 0.24
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -10,14 +10,12 @@
 Source0: http://www.venge.net/monotone/downloads/%{name}-%{version}.tar.gz
 Source1: monotone.init
 Source2: monotone.sysconfig
-
-Patch1: monotone-xfail-if-root.patch
+Source3: README.monotone-server
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
 BuildRequires: boost-devel >= 1.32.0
-BuildRequires: lua
 %if 1
 %define bundled_sqlite yes
 %else
@@ -25,6 +23,11 @@
 BuildRequires: sqlite-devel >= 3.2.7
 %define bundled_sqlite no
 %endif
+# monotone has local hacks in lua 5.0.2 as well, sigh.
+%define bundled_lua 1
+%if %{bundled_lua} == 0
+BuildRequires: lua
+%endif
 
 # The test suite needs cvs.
 BuildRequires: cvs
@@ -56,10 +59,9 @@
 %prep
 %setup -q
 
-%patch1 -p1
-
 %build
-%configure --with-bundled-lua=no --with-bundled-sqlite=%{bundled_sqlite}
+%configure --with-bundled-lua=%{bundled_lua} \
+	   --with-bundled-sqlite=%{bundled_sqlite}
 make %{?_smp_mflags}
 
 %check
@@ -84,14 +86,21 @@
 ln -snf ../bin/monotone %{buildroot}%{_sbindir}/monotone-server
 %{__install} -c -m 0555 %{SOURCE1} %{buildroot}/etc/init.d/monotone
 %{__install} -c -m 0644 %{SOURCE2} %{buildroot}/etc/sysconfig/monotone
-%{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotonerc
+%{__install} -d -m 0755 %{buildroot}/etc/monotone
+%{__install} -d -m 0750 %{buildroot}/etc/monotone/private-keys
 %{__install} -d -m 0770 %{buildroot}/var/db/monotone
 
 # These do not actually wind up in the package, due to %%ghost.
+%{__install} -c -m 0440 /dev/null %{buildroot}/etc/monotone/passphrase.lua
+%{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/read-permissions
+%{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/write-permissions
+%{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotone/monotonerc
 touch %{buildroot}/var/db/monotone/server.db
-touch %{buildroot}/var/db/monotone/passphrase.lua
+
+cp %{SOURCE3} .
 
 %clean
+rm -f README.monotone-server
 rm -rf %{buildroot}
 
 %post
@@ -118,14 +127,20 @@
 
 
 %files server
+%doc README.monotone-server
 %defattr(-,root,root,-)
 %{_sbindir}/monotone-server
 /etc/init.d/monotone
-%config(noreplace) /etc/sysconfig/monotone
-%config(noreplace) /etc/monotonerc
+%config /etc/sysconfig/monotone
+%dir %attr(0755,root,monotone) /etc/monotone
+%dir %attr(0750,root,monotone) /etc/monotone/private-keys
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/monotonerc
+%attr(0440,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/passphrase.lua
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/read-permissions
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/write-permissions
+ %attr(0750,root,monotone) /etc/monotone/private-keys
 %dir %attr(0770,monotone,monotone) /var/db/monotone
 %attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.db
-%attr(0600,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/passphrase.lua
 
 %pre server
 # Add the "monotone" user
@@ -136,6 +151,9 @@
 # Register the monotone service
 /sbin/chkconfig --add monotone
 
+# Restart the running server, which will update its db format when needed.
+/sbin/service monotone condrestart
+
 %preun server
 if [ $1 = 0 ]; then
 	/sbin/service monotone stop > /dev/null 2>&1
@@ -144,6 +162,9 @@
 
 
 %changelog
+* Sun Dec 11 2005 Roland McGrath  - 0.24-1
+- Updated for 0.24 release.
+
 * Mon Oct  3 2005 Roland McGrath  - 0.23-1
 - Updated for 0.23 release.
 


Index: monotone.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monotone.sysconfig	23 Aug 2005 07:04:05 -0000	1.1
+++ monotone.sysconfig	13 Dec 2005 07:35:07 -0000	1.2
@@ -1,9 +1,10 @@
-MONOTONERC=/etc/monotonerc
+MONOTONE_CONFDIR=/etc/monotone
+MONOTONE_KEYDIR=/etc/monotone/private-keys
 MONOTONE_DBFILE=/var/db/monotone/server.db
-MONOTONE_PPFILE=/var/db/monotone/passphrase.lua
+MONOTONE_PPFILE=/etc/monotone/passphrase.lua
 
-MONOTONE_RCOPTS="--norc --rcfile=$MONOTONERC"
-MONOTONE_DBOPTS="--db=$MONOTONE_DBFILE"
+MONOTONE_RCOPTS="--confdir=$MONOTONE_CONFDIR"
+MONOTONE_DBOPTS="--db=$MONOTONE_DBFILE --keydir=$MONOTONE_KEYDIR"
 MONOTONE_PPOPTS="--rcfile=$MONOTONE_PPFILE"
 
-MONOTONE_SERVE_OPTS="0.0.0.0 '*'"
+MONOTONE_SERVE_OPTS="'*'"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Oct 2005 03:45:02 -0000	1.4
+++ sources	13 Dec 2005 07:35:07 -0000	1.5
@@ -1 +1 @@
-6d9e909480c2be0b23e2820c3a42e6f1  monotone-0.23.tar.gz
+8193203c8b48104500d956f9e524bfcd  monotone-0.24.tar.gz


--- monotone-xfail-if-root.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 08:17:28 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:17:28 -0500
Subject: rpms/libopensync/FC-3 libopensync.spec, 1.2, 1.3 libopensync-32.conf,
	1.1, NONE libopensync-64.conf, 1.1, NONE
Message-ID: <200512130817.jBD8Hxqh002013@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	libopensync.spec 
Removed Files:
	libopensync-32.conf libopensync-64.conf 
Log Message:
- change handling of ld.conf.so files



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/libopensync.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync.spec	11 Dec 2005 23:44:53 -0000	1.2
+++ libopensync.spec	13 Dec 2005 08:17:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync
 Version:        0.18
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -8,8 +8,6 @@
 URL:            http://www.opensync.org/
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Source1:        libopensync-32.conf
-Source2:        libopensync-64.conf
 Patch0:         libopensync-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,11 +63,11 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 
-%ifarch x86_64
-install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-%else
-install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-%endif
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/opensync.conf << EOF
+%{_libdir}/opensync/
+%{_libdir}/opensync/formats/
+%{_libdir}/opensync/plugins/
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,6 +97,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert 
+0.18-5
+- change handling of ld.so.conf files
+
 * Sun Dec 11 2005 Andreas Bierfert 
 0.18-4
 - add dist


--- libopensync-32.conf DELETED ---


--- libopensync-64.conf DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 08:17:34 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:17:34 -0500
Subject: rpms/libopensync/FC-4 libopensync.spec, 1.2, 1.3 libopensync-32.conf,
	1.1, NONE libopensync-64.conf, 1.1, NONE
Message-ID: <200512130818.jBD8I4iv002016@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	libopensync.spec 
Removed Files:
	libopensync-32.conf libopensync-64.conf 
Log Message:
- change handling of ld.conf.so files



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-4/libopensync.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync.spec	11 Dec 2005 23:44:53 -0000	1.2
+++ libopensync.spec	13 Dec 2005 08:17:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync
 Version:        0.18
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -8,8 +8,6 @@
 URL:            http://www.opensync.org/
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Source1:        libopensync-32.conf
-Source2:        libopensync-64.conf
 Patch0:         libopensync-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,11 +63,11 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 
-%ifarch x86_64
-install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-%else
-install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-%endif
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/opensync.conf << EOF
+%{_libdir}/opensync/
+%{_libdir}/opensync/formats/
+%{_libdir}/opensync/plugins/
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,6 +97,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert 
+0.18-5
+- change handling of ld.so.conf files
+
 * Sun Dec 11 2005 Andreas Bierfert 
 0.18-4
 - add dist


--- libopensync-32.conf DELETED ---


--- libopensync-64.conf DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 08:17:39 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:17:39 -0500
Subject: rpms/libopensync/devel libopensync.spec, 1.2,
	1.3 libopensync-32.conf, 1.1, NONE libopensync-64.conf, 1.1, NONE
Message-ID: <200512130818.jBD8IA1L002019@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	libopensync.spec 
Removed Files:
	libopensync-32.conf libopensync-64.conf 
Log Message:
- change handling of ld.conf.so files



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync.spec	11 Dec 2005 23:44:53 -0000	1.2
+++ libopensync.spec	13 Dec 2005 08:17:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync
 Version:        0.18
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -8,8 +8,6 @@
 URL:            http://www.opensync.org/
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Source1:        libopensync-32.conf
-Source2:        libopensync-64.conf
 Patch0:         libopensync-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,11 +63,11 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 
-%ifarch x86_64
-install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-%else
-install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-%endif
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/opensync.conf << EOF
+%{_libdir}/opensync/
+%{_libdir}/opensync/formats/
+%{_libdir}/opensync/plugins/
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,6 +97,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert 
+0.18-5
+- change handling of ld.so.conf files
+
 * Sun Dec 11 2005 Andreas Bierfert 
 0.18-4
 - add dist


--- libopensync-32.conf DELETED ---


--- libopensync-64.conf DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 08:39:01 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:39:01 -0500
Subject: rpms/libopensync-plugin-palm - New directory
Message-ID: <200512130839.jBD8d1BF002193@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2184/libopensync-plugin-palm

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-palm added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 08:39:07 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:39:07 -0500
Subject: rpms/libopensync-plugin-palm/devel - New directory
Message-ID: <200512130839.jBD8d72j002209@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2184/libopensync-plugin-palm/devel

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-palm/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 08:39:28 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:39:28 -0500
Subject: rpms/libopensync-plugin-palm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512130839.jBD8dSFT002244@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2231

Added Files:
	Makefile import.log 
Log Message:
Setup of module libopensync-plugin-palm


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 08:39:34 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:39:34 -0500
Subject: rpms/libopensync-plugin-palm/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512130839.jBD8dYeM002267@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2231/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libopensync-plugin-palm


--- NEW 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 Dec 13 08:40:22 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:40:22 -0500
Subject: rpms/libopensync-plugin-palm import.log,1.1,1.2
Message-ID: <200512130840.jBD8erW0002355@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2314

Modified Files:
	import.log 
Log Message:
auto-import libopensync-plugin-palm-0.18-1 on branch devel from libopensync-plugin-palm-0.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 08:39:26 -0000	1.1
+++ import.log	13 Dec 2005 08:40:20 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-palm-0_18-1:HEAD:libopensync-plugin-palm-0.18-1.src.rpm:1134463211



From fedora-extras-commits at redhat.com  Tue Dec 13 08:40:28 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:40:28 -0500
Subject: rpms/libopensync-plugin-palm/devel
	libopensync-plugin-palm-Makefile.patch, NONE,
	1.1 libopensync-plugin-palm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512130840.jBD8ewV6002359@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2314/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libopensync-plugin-palm-Makefile.patch 
	libopensync-plugin-palm.spec 
Log Message:
auto-import libopensync-plugin-palm-0.18-1 on branch devel from libopensync-plugin-palm-0.18-1.src.rpm

libopensync-plugin-palm-Makefile.patch:

--- NEW FILE libopensync-plugin-palm-Makefile.patch ---
--- src/Makefile.in.orig	2005-11-29 13:42:25.000000000 +0100
+++ src/Makefile.in	2005-11-29 13:42:46.000000000 +0100
@@ -196,7 +196,7 @@
 configdir = @OPENSYNC_CONFIGDIR@
 formatsdir = @OPENSYNC_FORMATSDIR@
 opensyncheaderdir = @OPENSYNC_HEADERDIR@
-AM_CFLAGS = @PILOT_CFLAGS@ @PACKAGE_CFLAGS@ -Wall -Werror
+AM_CFLAGS = @PILOT_CFLAGS@ @PACKAGE_CFLAGS@ -Wall
 EXTRA_DIST = \
 	palm-sync
 
--- src/Makefile.am.orig	2005-11-29 13:42:19.000000000 +0100
+++ src/Makefile.am	2005-11-29 13:42:57.000000000 +0100
@@ -3,7 +3,7 @@
 formatsdir=@OPENSYNC_FORMATSDIR@
 opensyncheaderdir=@OPENSYNC_HEADERDIR@
 
-AM_CFLAGS = @PILOT_CFLAGS@ @PACKAGE_CFLAGS@ -Wall -Werror
+AM_CFLAGS = @PILOT_CFLAGS@ @PACKAGE_CFLAGS@ -Wall
 
 EXTRA_DIST = \
 	palm-sync


--- NEW FILE libopensync-plugin-palm.spec ---
Name:           libopensync-plugin-palm
Version:        0.18
Release:        1
Summary:        Palm 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
Patch0:         %{name}-Makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libopensync-devel
BuildRequires:  pilot-link-devel
%description
%{summary}

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

%description    devel
The %{name}-devel package contains the files needed for development
with %{name}.

%prep
%setup -q
%patch0

%build
%configure
# does not like smp flags
make


%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 AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/opensync/formats/palm*.so
%{_libdir}/opensync/plugins/palm*.so
%{_datadir}/opensync/defaults/palm-sync

%files devel
%defattr(-,root,root,-)
%{_includedir}/opensync-1.0/opensync/palm*.h

%changelog
* Fri Nov 25 2005 Andreas Bierfert  0.18-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 08:39:32 -0000	1.1
+++ .cvsignore	13 Dec 2005 08:40:26 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-palm-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 08:39:32 -0000	1.1
+++ sources	13 Dec 2005 08:40:26 -0000	1.2
@@ -0,0 +1 @@
+d1b7e52318676294d205e3bcf5281294  libopensync-plugin-palm-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 09:55:02 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 04:55:02 -0500
Subject: rpms/koffice/FC-4 koffice-krita-kisfilter.patch, NONE,
	1.1 koffice.spec, 1.10, 1.11
Message-ID: <200512130955.jBD9tWnB004797@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	koffice.spec 
Added Files:
	koffice-krita-kisfilter.patch 
Log Message:
- add krita compile fix


koffice-krita-kisfilter.patch:

--- NEW FILE koffice-krita-kisfilter.patch ---
--- krita/core/kis_filter_registry.h.orig	2005-12-13 10:49:29.000000000 +0100
+++ krita/core/kis_filter_registry.h	2005-12-13 10:49:50.000000000 +0100
@@ -26,7 +26,6 @@
 #include "kis_types.h"
 #include "kis_generic_registry.h"
 #include "kaction.h"
-#include "kis_filter.h"
 
 class QString;
 class KisView;


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- koffice.spec	8 Dec 2005 12:20:06 -0000	1.10
+++ koffice.spec	13 Dec 2005 09:55:00 -0000	1.11
@@ -13,6 +13,8 @@
 Patch0:         koffice-admin-gcc4isok.patch
 # CAN-2005-3193 see #175260
 Patch1:         koffice-CAN-2005-3193.diff
+
+Patch100:       koffice-krita-kisfilter.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -193,6 +195,7 @@
 %setup -q
 %patch0 -p1
 %patch1
+%patch100
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -749,6 +752,7 @@
 * Thu Dec 08 2005 Andreas Bierfert 
 1.4.2-2
 - fix CAN-2005-3193
+- add compile patch for krita
 
 * Fri Oct 14 2005 Andreas Bierfert 
 1.4.2-1



From fedora-extras-commits at redhat.com  Tue Dec 13 09:55:08 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 04:55:08 -0500
Subject: rpms/koffice/devel koffice-krita-kisfilter.patch, NONE,
	1.1 koffice.spec, 1.16, 1.17
Message-ID: <200512130955.jBD9tcCM004800@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	koffice.spec 
Added Files:
	koffice-krita-kisfilter.patch 
Log Message:
- add krita compile fix


koffice-krita-kisfilter.patch:

--- NEW FILE koffice-krita-kisfilter.patch ---
--- krita/core/kis_filter_registry.h.orig	2005-12-13 10:49:29.000000000 +0100
+++ krita/core/kis_filter_registry.h	2005-12-13 10:49:50.000000000 +0100
@@ -26,7 +26,6 @@
 #include "kis_types.h"
 #include "kis_generic_registry.h"
 #include "kaction.h"
-#include "kis_filter.h"
 
 class QString;
 class KisView;


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- koffice.spec	8 Dec 2005 12:24:10 -0000	1.16
+++ koffice.spec	13 Dec 2005 09:55:06 -0000	1.17
@@ -15,6 +15,8 @@
 # fix CAN-2005-3193 see #175260
 Patch1:         koffice-CAN-2005-3193.diff
 
+Patch100:       koffice-krita-kisfilter.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -195,6 +197,7 @@
 %setup -q
 %patch0 -p1
 %patch1
+%patch100
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -751,6 +754,7 @@
 * Thu Dec 08 2005 Andreas Bierfert 
 1.4.2-3
 - fix CAN-2005-3193
+- add krita compile fix
 
 * Thu Nov 10 2005 Andreas Bierfert 
 1.4.2-2



From fedora-extras-commits at redhat.com  Tue Dec 13 11:42:18 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Dec 2005 06:42:18 -0500
Subject: rpms/ipxripd - New directory
Message-ID: <200512131142.jBDBgIqh008321@cvs-int.fedora.redhat.com>

Author: buc

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

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




From fedora-extras-commits at redhat.com  Tue Dec 13 11:42:23 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Dec 2005 06:42:23 -0500
Subject: rpms/ipxripd/devel - New directory
Message-ID: <200512131142.jBDBgNcJ008337@cvs-int.fedora.redhat.com>

Author: buc

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

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




From fedora-extras-commits at redhat.com  Tue Dec 13 11:42:43 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Dec 2005 06:42:43 -0500
Subject: rpms/ipxripd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512131142.jBDBghEn008372@cvs-int.fedora.redhat.com>

Author: buc

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 11:42:48 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Dec 2005 06:42:48 -0500
Subject: rpms/ipxripd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512131142.jBDBgmun008393@cvs-int.fedora.redhat.com>

Author: buc

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

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


--- NEW 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 Dec 13 11:43:41 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Dec 2005 06:43:41 -0500
Subject: rpms/ipxripd import.log,1.1,1.2
Message-ID: <200512131144.jBDBiCwr008494@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	import.log 
Log Message:
auto-import ipxripd-0.8-2 on branch devel from ipxripd-0.8-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ipxripd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 11:42:41 -0000	1.1
+++ import.log	13 Dec 2005 11:43:39 -0000	1.2
@@ -0,0 +1 @@
+ipxripd-0_8-2:HEAD:ipxripd-0.8-2.src.rpm:1134474211



From fedora-extras-commits at redhat.com  Tue Dec 13 11:43:47 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Dec 2005 06:43:47 -0500
Subject: rpms/ipxripd/devel ipxripd-0.7-gcc3.patch, NONE,
	1.1 ipxripd-0.7-kernel2.6.patch, NONE,
	1.1 ipxripd-0.8-glibc2.1.patch, NONE, 1.1 ipxripd.init, NONE,
	1.1 ipxripd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512131143.jBDBhlpi008487@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	.cvsignore sources 
Added Files:
	ipxripd-0.7-gcc3.patch ipxripd-0.7-kernel2.6.patch 
	ipxripd-0.8-glibc2.1.patch ipxripd.init ipxripd.spec 
Log Message:
auto-import ipxripd-0.8-2 on branch devel from ipxripd-0.8-2.src.rpm

ipxripd-0.7-gcc3.patch:

--- NEW FILE ipxripd-0.7-gcc3.patch ---
diff -Nrbu ipxripd/ipxd.c ipxripd.OK/ipxd.c
--- ipxripd/ipxd.c	2004-08-03 15:36:01.000000000 +0400
+++ ipxripd.OK/ipxd.c	2004-08-03 15:35:33.000000000 +0400
@@ -19,6 +19,7 @@
 
 */
 
+#include 
 #include 
 #include 
 #include 
diff -Nrbu ipxripd/ipxd.h ipxripd.OK/ipxd.h
--- ipxripd/ipxd.h	1996-02-08 19:07:56.000000000 +0300
+++ ipxripd.OK/ipxd.h	2004-08-03 15:34:42.000000000 +0400
@@ -23,6 +23,7 @@
 #define _IPXD_H_
 
 #include 
+#include 
 #include 
 #include "ipxutil.h"
 #include "ipxkern.h"
@@ -55,7 +56,7 @@
 extern FILE *log_file;
 extern int passive;
 
-extern int check_request;
+extern volatile int check_request;
 
 struct ipx_interface *first_interface(void);
 struct ipx_interface *next_interface(struct ipx_interface *ifc);

ipxripd-0.7-kernel2.6.patch:

--- NEW FILE ipxripd-0.7-kernel2.6.patch ---
diff -Nrbu ipxripd/ipxkern.c ipxripd-OK/ipxkern.c
--- ipxripd/ipxkern.c	1996-02-01 19:56:07.000000000 +0300
+++ ipxripd-OK/ipxkern.c	2005-03-10 18:09:53.215272940 +0300
@@ -51,7 +51,9 @@
 	FILE *ipx_route;
 	char buf[512];
 
-	ipx_route = fopen("/proc/net/ipx_route", "r");
+	ipx_route = fopen("/proc/net/ipx/route", "r");
+	if (!ipx_route)
+		ipx_route = fopen("/proc/net/ipx_route", "r"); /* old kernels */
 
 	if (ipx_route == NULL)
 	{
@@ -109,7 +111,9 @@
 	FILE *ipx_ifc;
 	char buf[512];
 
-	ipx_ifc = fopen("/proc/net/ipx_interface", "r");
+	ipx_ifc = fopen("/proc/net/ipx/interface", "r");
+	if (!ipx_ifc)
+		ipx_ifc = fopen("/proc/net/ipx_interface", "r"); /*old kernels*/
 
 	if (ipx_ifc == NULL)
 	{

ipxripd-0.8-glibc2.1.patch:

--- NEW FILE ipxripd-0.8-glibc2.1.patch ---
diff -Nrbu ipxripd-0.8/ipxd.c ipxripd-0.8-OK/ipxd.c
--- ipxripd-0.8/ipxd.c	2001-07-01 01:07:34.000000000 +0400
+++ ipxripd-0.8-OK/ipxd.c	2005-10-13 16:19:25.000000000 +0400
@@ -333,8 +333,6 @@
 	struct itimerval itval;
 	int i;
 
-	log_file=stderr;
-	
 	LOG_ENTRY;
 	LOG_START;
 	fprintf(log_file,"Init start\n");
@@ -717,6 +715,7 @@
 int
 main(int argc,char** argv)
 {
+	log_file = stderr;
 	if (parse_cmdline(argc,argv))
 	{
 		daemonize();
diff -Nrbu ipxripd-0.8/ipxripd.c ipxripd-0.8-OK/ipxripd.c
--- ipxripd-0.8/ipxripd.c	2001-07-01 01:07:34.000000000 +0400
+++ ipxripd-0.8-OK/ipxripd.c	2005-10-13 16:18:07.000000000 +0400
@@ -39,7 +39,6 @@
 #include 
 #include 
 #include 
-#include 
 #include "ipxutil.h"
 #include "ipxkern.h"
 #include "ipxrip.h"
diff -Nrbu ipxripd-0.8/ipxsapd.c ipxripd-0.8-OK/ipxsapd.c
--- ipxripd-0.8/ipxsapd.c	2001-07-01 01:07:34.000000000 +0400
+++ ipxripd-0.8-OK/ipxsapd.c	2005-10-13 16:18:07.000000000 +0400
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 #include "ipxutil.h"
 #include "ipxkern.h"
 #include "ipxsap.h"
diff -Nrbu ipxripd-0.8/ipxutil.h ipxripd-0.8-OK/ipxutil.h
--- ipxripd-0.8/ipxutil.h	1996-02-01 19:58:48.000000000 +0300
+++ ipxripd-0.8-OK/ipxutil.h	2005-10-13 16:18:07.000000000 +0400
@@ -25,7 +25,7 @@
 #define __IPXUTIL_H__
 
 #include 
-#include 
+#include 
 
 #define IPX_MAX_ERROR	(255)
 #define IPX_THIS_NET 	(0)


--- NEW FILE ipxripd.init ---
#! /bin/sh
# chkconfig: - 55 55
# description: ipxripd is an implementation of Novell's RIP and SAP
#              protocols.
# processname: ipxd

# Source function library.
. /etc/rc.d/init.d/functions

# Get config.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

# See how we were called.
case "$1" in
  start)
	echo -n "Starting ipxd services: "
	daemon ipxd
	[ $? -eq 0 ] && touch /var/lock/subsys/ipxd
	echo
	;;
  stop)
	echo -n "Stopping ipxd services: "
	killproc ipxd
	rm -f /var/lock/subsys/ipxd
	echo
	;;
  status)
	status ipxd
	;;
  restart|reload)
	$0 stop
	$0 start
	;;
  condrestart)
	[ -f /var/lock/subsys/ipxd ] && $0 restart
	;;
  *)
	echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
	exit 1
esac

exit 0


--- NEW FILE ipxripd.spec ---
Summary: IPX RIP/SAP daemon - routing for IPX networks
Name: ipxripd
Version: 0.8
Release: 2%{?dist}
Group: System Environment/Daemons
License: GPL
URL: ftp://ftp.ibiblio.org/pub/Linux/system/filesystems/ncpfs/
Source0: ftp://ftp.ibiblio.org/pub/Linux/system/filesystems/ncpfs/ipxripd-%{version}.tar.gz
Source1: ipxripd.init
Patch0: ipxripd-0.8-glibc2.1.patch
Patch1: ipxripd-0.7-gcc3.patch
Patch2: ipxripd-0.7-kernel2.6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig, /sbin/service
Requires(postun): /sbin/service


%description
%{name} is an implementation of Novell's RIP and SAP protocols.
It automagically builds and updates IPX routing table in the Linux kernel.
%{name} can be useful to get a Linux box to act as an IPX router.


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


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_sbindir}
install -m755 ipxd $RPM_BUILD_ROOT%{_sbindir}

install -d $RPM_BUILD_ROOT%{_mandir}/man8
install -d $RPM_BUILD_ROOT%{_mandir}/man5
install -p ipxd.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p ipx_ticks.5 $RPM_BUILD_ROOT%{_mandir}/man5

install -d $RPM_BUILD_ROOT%{_initrddir}
install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ipxd


%post

/sbin/chkconfig --add ipxd


%preun
if [ $1 = 0 ]; then
   /sbin/service ipxd stop >/dev/null 2>&1
   /sbin/chkconfig --del ipxd
fi


%postun
if [ $1 != 0 ]; then
   /sbin/service ipxd condrestart >/dev/null 2>&1
fi


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README ipx_ticks ipxripd-*.lsm
%{_sbindir}/*
%{_initrddir}/*
%{_mandir}/*/*


%changelog
* Tue Dec 13 2005 Dmitry Butskoy  - 0.8-2
- spec file cleanups
- accepted for Fedora Extra (review by John Mahowald )

* Thu Oct 13 2005 Dmitry Butskoy  - 0.8-1
- upgrade to 0.8
- cleanups of initrd script

* Thu Mar 10 2005 Dmitry Butskoy  - 0.7-1
- add patch for kernel >= 2.6

* Tue Aug  3 2004 Dmitry Butskoy 
- replace old patches by new one from PLD distribution (common "glibc2.1.patch")
- add gcc3 compilation patch to build on Fedora Core 1

* Tue Dec 14 1999 Joerg Dorchain 
- added init script

* Wed Jul  8 1998 Andrzej K. Brandt 
- First version of the RPM package
- Added a quick and dirty hack to this thing to compile under glibc
  I tested it and it works fine



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipxripd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 11:42:46 -0000	1.1
+++ .cvsignore	13 Dec 2005 11:43:45 -0000	1.2
@@ -0,0 +1 @@
+ipxripd-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipxripd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 11:42:46 -0000	1.1
+++ sources	13 Dec 2005 11:43:45 -0000	1.2
@@ -0,0 +1 @@
+decd5c1eb2c763e25c7a2db3c385cdf0  ipxripd-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 11:48:25 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Dec 2005 06:48:25 -0500
Subject: owners owners.list,1.444,1.445
Message-ID: <200512131148.jBDBmtrw008599@cvs-int.fedora.redhat.com>

Author: buc

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

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- owners.list	13 Dec 2005 03:59:47 -0000	1.444
+++ owners.list	13 Dec 2005 11:48:23 -0000	1.445
@@ -393,6 +393,7 @@
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|iozone|A file system performance analysis tool|nhorman at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ip-sentinel|Tool to prevent unauthorized usage of IP addresses|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|ipxripd|IPX RIP/SAP daemon - routing for IPX networks|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|ipython|An enhanced interactive Python shell|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|ircd-hybrid|Internet Relay Chat Server|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|irssi|Modular text mode IRC client with Perl scripting|anvil at livna.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 13 12:11:14 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 13 Dec 2005 07:11:14 -0500
Subject: rpms/kasumi/FC-4 .cvsignore, 1.3, 1.4 kasumi.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200512131211.jBDCBqaC010304@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	.cvsignore kasumi.spec sources 
Log Message:
* Mon Dec 12 2005 Akira TAGOH  - 1.0-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kasumi/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2005 07:33:57 -0000	1.3
+++ .cvsignore	13 Dec 2005 12:11:10 -0000	1.4
@@ -1,2 +1,3 @@
 kasumi-0.9.tar.gz
 kasumi-0.10.tar.gz
+kasumi-1.0.tar.gz


Index: kasumi.spec
===================================================================
RCS file: /cvs/extras/rpms/kasumi/FC-4/kasumi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kasumi.spec	13 Oct 2005 07:33:57 -0000	1.3
+++ kasumi.spec	13 Dec 2005 12:11:10 -0000	1.4
@@ -1,5 +1,5 @@
 Name:    kasumi
-Version: 0.10
+Version: 1.0
 Release: 1%{?dist}
 
 License: GPL
@@ -52,10 +52,13 @@
 
 
 %changelog
+* Mon Dec 12 2005 Akira TAGOH  - 1.0-1
+- New upstream release.
+
 * Thu Oct 13 2005 Akira TAGOH  - 0.10-1
 - New upstream release.
 
-* Tue Aug 23 2005 Akira TAGOH  - 0.9-4.fc4
+* Tue Aug 23 2005 Akira TAGOH  - 0.9-4
 - sync from devel.
 
 * Tue Aug 16 2005 Akira TAGOH  - 0.9-3.fc5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kasumi/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2005 07:33:57 -0000	1.3
+++ sources	13 Dec 2005 12:11:10 -0000	1.4
@@ -1 +1 @@
-bfeba1ef78a15da7f180f04ec271f987  kasumi-0.10.tar.gz
+15314d8eaaf83abf5fd41b93be8ce91f  kasumi-1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 12:58:49 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Tue, 13 Dec 2005 07:58:49 -0500
Subject: rpms/blogtk/devel blogtk.spec,1.1,1.2
Message-ID: <200512131259.jBDCxJhA010635@cvs-int.fedora.redhat.com>

Author: pfrields

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

Modified Files:
	blogtk.spec 
Log Message:
Bring package in line with current fedora-rpmdevtools standards (1.1-5)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/devel/blogtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blogtk.spec	27 Sep 2005 22:48:15 -0000	1.1
+++ blogtk.spec	13 Dec 2005 12:58:47 -0000	1.2
@@ -1,27 +1,29 @@
-# Note to Fedora Extras reviewers: The developer is very inconsistent
-# about the capitalization of the program name.  I have erred on the
-# conservative side.
-Name:		blogtk
-Version:	1.1
-Release:	4%{?dist}
-Summary:	Gnome application for editing/maintaining blogs
-Group:		Applications/Internet
-License:	BSD
-URL:		http://blogtk.sourceforge.net
-Source0:	http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
+%{!?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:           blogtk
+Version:        1.1
+Release:        5%{?dist}
+Summary:        GNOME application for editing/maintaining blogs
+
+Group:          Applications/Internet
+License:        BSD
+URL:            http://blogtk.sourceforge.net
+Source0:        http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
 Source1:	BSD
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  pygtk2-devel >= 2.00
+BuildRequires:	glib2-devel
+BuildRequires:	desktop-file-utils
+Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
-BuildRequires:  pygtk2-devel >= 2.00
-BuildRequires:	glib2-devel
-BuildRequires:  desktop-file-utils
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
-
 %description
 BloGTK is a weblog posting client written in Python for any platform that
 supports Python and the GTK widget set. BloGTK allows you to connect to your
@@ -34,17 +36,19 @@
 
 
 %build
+# Developer does not use setup.py
+#CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 # Cope with developer's Makefile and Fedora standards
-%define pyver %(python -c "import sys; x = sys.version_info; print '%%s.%%s' %% (x[0], x[1])")
 install -m 755 -d $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 -d $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}
+install -m 755 -d $RPM_BUILD_ROOT/%{python_sitelib}/%{name}
 install -m 755 -d $RPM_BUILD_ROOT/%{_datadir}/{%{name},pixmaps/%{name}}
 install -m 755 src/* \
-	$RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}
+	$RPM_BUILD_ROOT/%{python_sitelib}/%{name}
 install -m 644 pixmaps/blogtk.glade \
 	$RPM_BUILD_ROOT/%{_datadir}/%{name}
 install -m 644 pixmaps/*.png $RPM_BUILD_ROOT/%{_datadir}/%{name}
@@ -55,7 +59,7 @@
 	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
 cat << EOF > $RPM_BUILD_ROOT/%{_bindir}/blogtk
 #!/bin/sh
-exec %{_libdir}/python%{pyver}/site-packages/%{name}/BloGTK.py
+exec %{python_sitelib}/%{name}/BloGTK.py
 EOF
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/blogtk
 desktop-file-install --vendor=fedora \
@@ -65,7 +69,7 @@
 	--add-category=Network \
 	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
 
-
+ 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -74,8 +78,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README BSD
 %{_bindir}/*
-%dir %{_libdir}/python%{pyver}/site-packages/%{name}
-%{_libdir}/python%{pyver}/site-packages/%{name}/*
+%dir %{python_sitelib}/%{name}
+%{python_sitelib}/%{name}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/fedora-blogtk.desktop
@@ -83,6 +87,9 @@
 
 
 %changelog
+* Tue Dec 13 2005 Paul W. Frields  - 1.1-5
+- Bring package in line with current fedora-rpmdevtools standards
+
 * Mon Aug 29 2005 Paul W. Frields  - 1.1-4
 - Add BSD license file
 



From fedora-extras-commits at redhat.com  Tue Dec 13 12:59:05 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Tue, 13 Dec 2005 07:59:05 -0500
Subject: rpms/blogtk/FC-3 blogtk.spec,1.1,1.2
Message-ID: <200512131259.jBDCxaqe010641@cvs-int.fedora.redhat.com>

Author: pfrields

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

Modified Files:
	blogtk.spec 
Log Message:
Bring package in line with current fedora-rpmdevtools standards (1.1-5)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/FC-3/blogtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blogtk.spec	27 Sep 2005 22:48:15 -0000	1.1
+++ blogtk.spec	13 Dec 2005 12:59:03 -0000	1.2
@@ -1,27 +1,29 @@
-# Note to Fedora Extras reviewers: The developer is very inconsistent
-# about the capitalization of the program name.  I have erred on the
-# conservative side.
-Name:		blogtk
-Version:	1.1
-Release:	4%{?dist}
-Summary:	Gnome application for editing/maintaining blogs
-Group:		Applications/Internet
-License:	BSD
-URL:		http://blogtk.sourceforge.net
-Source0:	http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
+%{!?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:           blogtk
+Version:        1.1
+Release:        5%{?dist}
+Summary:        GNOME application for editing/maintaining blogs
+
+Group:          Applications/Internet
+License:        BSD
+URL:            http://blogtk.sourceforge.net
+Source0:        http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
 Source1:	BSD
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  pygtk2-devel >= 2.00
+BuildRequires:	glib2-devel
+BuildRequires:	desktop-file-utils
+Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
-BuildRequires:  pygtk2-devel >= 2.00
-BuildRequires:	glib2-devel
-BuildRequires:  desktop-file-utils
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
-
 %description
 BloGTK is a weblog posting client written in Python for any platform that
 supports Python and the GTK widget set. BloGTK allows you to connect to your
@@ -34,17 +36,19 @@
 
 
 %build
+# Developer does not use setup.py
+#CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 # Cope with developer's Makefile and Fedora standards
-%define pyver %(python -c "import sys; x = sys.version_info; print '%%s.%%s' %% (x[0], x[1])")
 install -m 755 -d $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 -d $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}
+install -m 755 -d $RPM_BUILD_ROOT/%{python_sitelib}/%{name}
 install -m 755 -d $RPM_BUILD_ROOT/%{_datadir}/{%{name},pixmaps/%{name}}
 install -m 755 src/* \
-	$RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}
+	$RPM_BUILD_ROOT/%{python_sitelib}/%{name}
 install -m 644 pixmaps/blogtk.glade \
 	$RPM_BUILD_ROOT/%{_datadir}/%{name}
 install -m 644 pixmaps/*.png $RPM_BUILD_ROOT/%{_datadir}/%{name}
@@ -55,7 +59,7 @@
 	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
 cat << EOF > $RPM_BUILD_ROOT/%{_bindir}/blogtk
 #!/bin/sh
-exec %{_libdir}/python%{pyver}/site-packages/%{name}/BloGTK.py
+exec %{python_sitelib}/%{name}/BloGTK.py
 EOF
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/blogtk
 desktop-file-install --vendor=fedora \
@@ -65,7 +69,7 @@
 	--add-category=Network \
 	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
 
-
+ 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -74,8 +78,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README BSD
 %{_bindir}/*
-%dir %{_libdir}/python%{pyver}/site-packages/%{name}
-%{_libdir}/python%{pyver}/site-packages/%{name}/*
+%dir %{python_sitelib}/%{name}
+%{python_sitelib}/%{name}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/fedora-blogtk.desktop
@@ -83,6 +87,9 @@
 
 
 %changelog
+* Tue Dec 13 2005 Paul W. Frields  - 1.1-5
+- Bring package in line with current fedora-rpmdevtools standards
+
 * Mon Aug 29 2005 Paul W. Frields  - 1.1-4
 - Add BSD license file
 



From fedora-extras-commits at redhat.com  Tue Dec 13 12:59:11 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Tue, 13 Dec 2005 07:59:11 -0500
Subject: rpms/blogtk/FC-4 blogtk.spec,1.1,1.2
Message-ID: <200512131259.jBDCxfsW010645@cvs-int.fedora.redhat.com>

Author: pfrields

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

Modified Files:
	blogtk.spec 
Log Message:
Bring package in line with current fedora-rpmdevtools standards (1.1-5)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/FC-4/blogtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blogtk.spec	27 Sep 2005 22:48:15 -0000	1.1
+++ blogtk.spec	13 Dec 2005 12:59:09 -0000	1.2
@@ -1,27 +1,29 @@
-# Note to Fedora Extras reviewers: The developer is very inconsistent
-# about the capitalization of the program name.  I have erred on the
-# conservative side.
-Name:		blogtk
-Version:	1.1
-Release:	4%{?dist}
-Summary:	Gnome application for editing/maintaining blogs
-Group:		Applications/Internet
-License:	BSD
-URL:		http://blogtk.sourceforge.net
-Source0:	http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
+%{!?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:           blogtk
+Version:        1.1
+Release:        5%{?dist}
+Summary:        GNOME application for editing/maintaining blogs
+
+Group:          Applications/Internet
+License:        BSD
+URL:            http://blogtk.sourceforge.net
+Source0:        http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
 Source1:	BSD
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  pygtk2-devel >= 2.00
+BuildRequires:	glib2-devel
+BuildRequires:	desktop-file-utils
+Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
-BuildRequires:  pygtk2-devel >= 2.00
-BuildRequires:	glib2-devel
-BuildRequires:  desktop-file-utils
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
-
 %description
 BloGTK is a weblog posting client written in Python for any platform that
 supports Python and the GTK widget set. BloGTK allows you to connect to your
@@ -34,17 +36,19 @@
 
 
 %build
+# Developer does not use setup.py
+#CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 # Cope with developer's Makefile and Fedora standards
-%define pyver %(python -c "import sys; x = sys.version_info; print '%%s.%%s' %% (x[0], x[1])")
 install -m 755 -d $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 -d $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}
+install -m 755 -d $RPM_BUILD_ROOT/%{python_sitelib}/%{name}
 install -m 755 -d $RPM_BUILD_ROOT/%{_datadir}/{%{name},pixmaps/%{name}}
 install -m 755 src/* \
-	$RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}
+	$RPM_BUILD_ROOT/%{python_sitelib}/%{name}
 install -m 644 pixmaps/blogtk.glade \
 	$RPM_BUILD_ROOT/%{_datadir}/%{name}
 install -m 644 pixmaps/*.png $RPM_BUILD_ROOT/%{_datadir}/%{name}
@@ -55,7 +59,7 @@
 	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
 cat << EOF > $RPM_BUILD_ROOT/%{_bindir}/blogtk
 #!/bin/sh
-exec %{_libdir}/python%{pyver}/site-packages/%{name}/BloGTK.py
+exec %{python_sitelib}/%{name}/BloGTK.py
 EOF
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/blogtk
 desktop-file-install --vendor=fedora \
@@ -65,7 +69,7 @@
 	--add-category=Network \
 	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
 
-
+ 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -74,8 +78,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README BSD
 %{_bindir}/*
-%dir %{_libdir}/python%{pyver}/site-packages/%{name}
-%{_libdir}/python%{pyver}/site-packages/%{name}/*
+%dir %{python_sitelib}/%{name}
+%{python_sitelib}/%{name}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/fedora-blogtk.desktop
@@ -83,6 +87,9 @@
 
 
 %changelog
+* Tue Dec 13 2005 Paul W. Frields  - 1.1-5
+- Bring package in line with current fedora-rpmdevtools standards
+
 * Mon Aug 29 2005 Paul W. Frields  - 1.1-4
 - Add BSD license file
 



From fedora-extras-commits at redhat.com  Tue Dec 13 13:32:26 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 13 Dec 2005 08:32:26 -0500
Subject: rpms/paps/devel paps-0.6.1-makefile.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 paps.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200512131332.jBDDWuIh012538@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	.cvsignore paps.spec sources 
Added Files:
	paps-0.6.1-makefile.patch 
Log Message:
* Tue Dec 13 2005 Akira TAGOH  - 0.6.1-1
- New upstream release.
- paps-0.6.1-makefile.patch: applied to install docs on the proper dir.

paps-0.6.1-makefile.patch:

--- NEW FILE paps-0.6.1-makefile.patch ---
diff -ruN paps-0.6.1.orig/doc/Makefile.am paps-0.6.1/doc/Makefile.am
--- paps-0.6.1.orig/doc/Makefile.am	2005-12-13 22:16:48.000000000 +0900
+++ paps-0.6.1/doc/Makefile.am	2005-12-13 22:19:38.000000000 +0900
@@ -10,7 +10,7 @@
 
 EXTRA_DIST = Doxyfile example-output.png mainpage.h
 
-htmldir = share/doc/libpaps/html
+htmldir = $(datadir)/doc/paps-$(VERSION)/html
-install-data-hook:
-	mkdir -p $(prefix)/$(htmldir)
-	cp -dpR doxygen-html/* $(prefix)/$(htmldir)
+#install-data-hook:
+#	mkdir -p $(prefix)/$(htmldir)
+#	cp -dpR doxygen-html/* $(prefix)/$(htmldir)
diff -ruN paps-0.6.1.orig/src/Makefile.am paps-0.6.1/src/Makefile.am
--- paps-0.6.1.orig/src/Makefile.am	2005-12-13 22:16:48.000000000 +0900
+++ paps-0.6.1/src/Makefile.am	2005-12-13 22:18:55.000000000 +0900
@@ -1,4 +1,4 @@
-lib_LIBRARIES = libpaps.a
+noinst_LIBRARIES = libpaps.a
 libpaps_a_SOURCES = libpaps.c
 libpaps_a_inc_HEADERS = libpaps.h
 libpaps_a_incdir = $(includedir)
@@ -6,7 +6,7 @@
 bin_PROGRAMS = paps
 paps_CFLAGS  = -Wall 
 paps_SOURCES = paps.c
-paps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+paps_LDADD = $(noinst_LIBRARIES) $(all_libraries)
 paps_LDFLAGS = `pkg-config --libs pangoft2`
 paps_DEPENDENCIES = $(lib_LIBRARIES)
 
@@ -20,7 +20,7 @@
 
 
 test_libpaps_SOURCES = test_libpaps.c
-test_libpaps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+test_libpaps_LDADD = $(noinst_LIBRARIES) $(all_libraries)
 test_libpaps_LDFLAGS = `pkg-config --libs pangoft2`
 test_libpaps_DEPENDENCIES = $(lib_LIBRARIES) 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Nov 2005 06:28:10 -0000	1.3
+++ .cvsignore	13 Dec 2005 13:32:23 -0000	1.4
@@ -1,2 +1,6 @@
+*gz
+*bz2
+*rpm
 paps-0.3.tgz
 paps-0.5.tgz
+paps-0.6.1.tar.gz


Index: paps.spec
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paps.spec	4 Nov 2005 06:28:10 -0000	1.2
+++ paps.spec	13 Dec 2005 13:32:24 -0000	1.3
@@ -1,12 +1,13 @@
 Name:		paps
-Version:	0.5
+Version:	0.6.1
 Release:	1%{?dist}
 
 License:	LGPL
-URL:		http://imagic.weizmann.ac.il/~dov/freesw/paps/
-Source0:	http://imagic.weizmann.ac.il/~dov/freesw/paps/paps-%{version}.tgz
+URL:		http://paps.sourceforge.net/
+Source0:	http://paps.sourceforge.net/paps-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pango-devel
+Patch0:		paps-0.6.1-makefile.patch
 
 Summary:	Plain Text to PostScript converter
 Group:		Applications/Publishing
@@ -15,29 +16,38 @@
 
 
 %prep
-%setup -q -n paps
+%setup -q
+%patch0 -p1 -b .makefile
+aclocal
+automake
+autoconf
 
 
 %build
-make %{?_smp_mflags} CC="gcc $RPM_OPT_FLAGS"
+%configure
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m0755 paps $RPM_BUILD_ROOT%{_bindir}
 
+%makeinstall
+rm -rf $RPM_BUILD_ROOT%{_includedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%doc COPYING
+%doc AUTHORS COPYING.LIB README NEWS TODO
 %{_bindir}/paps
 
 
 %changelog
+* Tue Dec 13 2005 Akira TAGOH  - 0.6.1-1
+- New upstream release.
+- paps-0.6.1-makefile.patch: applied to install docs on the proper dir.
+
 * Fri Nov  4 2005 Akira TAGOH  - 0.5-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Nov 2005 06:28:10 -0000	1.3
+++ sources	13 Dec 2005 13:32:24 -0000	1.4
@@ -1 +1 @@
-85466c651087c70341ddf46dd9281722  paps-0.5.tgz
+9de11306b1db7c87e754b66e3328b212  paps-0.6.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 13:43:03 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 13 Dec 2005 08:43:03 -0500
Subject: rpms/nmh/FC-3 nmh-1.1-annotate.patch,NONE,1.1 nmh.spec,1.9,1.10
Message-ID: <200512131343.jBDDhXJO012643@cvs-int.fedora.redhat.com>

Author: bressers

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

Modified Files:
	nmh.spec 
Added Files:
	nmh-1.1-annotate.patch 
Log Message:
Fix repl's annotate switch.


nmh-1.1-annotate.patch:

--- NEW FILE nmh-1.1-annotate.patch ---
--- nmh-orig/uip/sendsbr.c	2005-12-12 15:51:52.000000000 -0500
+++ nmh/uip/sendsbr.c	2005-12-12 15:53:27.000000000 -0500
@@ -1020,7 +1020,7 @@
 	if (is_selected(mp, msgnum)) {
 	    if (debugsw)
 		advise (NULL, "annotate message %d", msgnum);
-	    annotate (m_name (msgnum), annotext, cp, inplace, 1, 0, 0);
+	    annotate (m_name (msgnum), annotext, cp, inplace, 1, -1, 0);
 	}
     }
 


Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/FC-3/nmh.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nmh.spec	5 Dec 2005 22:06:49 -0000	1.9
+++ nmh.spec	13 Dec 2005 13:43:01 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        12.fc3
+Release:        13.fc3
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 Patch0:         nmh-1.1-makefile.patch
 Patch1:         nmh-1.1-lock_file.patch
 Patch2:         nmh-1.1-empty-content-type.patch
+Patch3:         nmh-1.1-annotate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
@@ -32,6 +33,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 
 
 %build
@@ -66,6 +68,9 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Tue Dec 13 2005 Josh Bressers  0:1.1-13.fc3
+- Add a patch to allow repl to properly annotate messages.
+
 * Mon Dec 05 2005 Josh Bressers  0:1.1-12.fc3
 - Add a buildrequires on /bin/vi
 - Modify the sendmail buildrequires to use /usr/sbin/sendmail



From fedora-extras-commits at redhat.com  Tue Dec 13 13:46:22 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 08:46:22 -0500
Subject: rpms/libopensync/FC-3 libopensync-configure.patch, NONE,
	1.1 libopensync.spec, 1.3, 1.4
Message-ID: <200512131346.jBDDkqsQ012777@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	libopensync.spec 
Added Files:
	libopensync-configure.patch 
Log Message:
- patch configure for x86_64 python


libopensync-configure.patch:

--- NEW FILE libopensync-configure.patch ---
--- configure.orig	2005-12-13 14:35:40.000000000 +0100
+++ configure	2005-12-13 14:40:03.000000000 +0100
@@ -22352,7 +22352,7 @@
 if test "${am_cv_python_pythondir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
 fi
 echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/libopensync.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync.spec	13 Dec 2005 08:17:26 -0000	1.3
+++ libopensync.spec	13 Dec 2005 13:46:20 -0000	1.4
@@ -9,6 +9,7 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
+Patch1:         libopensync-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -41,6 +42,8 @@
 %prep
 %setup -q
 %patch0
+%patch1
+
 # some source files are marked executable
 for dir in opensync osengine; do
     cd %{_builddir}/%{name}-%{version}/$dir
@@ -100,6 +103,7 @@
 * Tue Dec 13 2005 Andreas Bierfert 
 0.18-5
 - change handling of ld.so.conf files
+- patch configure for x86_64 python
 
 * Sun Dec 11 2005 Andreas Bierfert 
 0.18-4



From fedora-extras-commits at redhat.com  Tue Dec 13 13:46:28 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 08:46:28 -0500
Subject: rpms/libopensync/FC-4 libopensync-configure.patch, NONE,
	1.1 libopensync.spec, 1.3, 1.4
Message-ID: <200512131346.jBDDkwVa012780@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	libopensync.spec 
Added Files:
	libopensync-configure.patch 
Log Message:
- patch configure for x86_64 python


libopensync-configure.patch:

--- NEW FILE libopensync-configure.patch ---
--- configure.orig	2005-12-13 14:35:40.000000000 +0100
+++ configure	2005-12-13 14:40:03.000000000 +0100
@@ -22352,7 +22352,7 @@
 if test "${am_cv_python_pythondir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
 fi
 echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-4/libopensync.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync.spec	13 Dec 2005 08:17:32 -0000	1.3
+++ libopensync.spec	13 Dec 2005 13:46:26 -0000	1.4
@@ -9,6 +9,7 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
+Patch1:         libopensync-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -41,6 +42,8 @@
 %prep
 %setup -q
 %patch0
+%patch1
+
 # some source files are marked executable
 for dir in opensync osengine; do
     cd %{_builddir}/%{name}-%{version}/$dir
@@ -100,6 +103,7 @@
 * Tue Dec 13 2005 Andreas Bierfert 
 0.18-5
 - change handling of ld.so.conf files
+- patch configure for x86_64 python
 
 * Sun Dec 11 2005 Andreas Bierfert 
 0.18-4



From fedora-extras-commits at redhat.com  Tue Dec 13 13:46:33 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 08:46:33 -0500
Subject: rpms/libopensync/devel libopensync-configure.patch, NONE,
	1.1 libopensync.spec, 1.3, 1.4
Message-ID: <200512131347.jBDDl4RX012783@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	libopensync.spec 
Added Files:
	libopensync-configure.patch 
Log Message:
- patch configure for x86_64 python


libopensync-configure.patch:

--- NEW FILE libopensync-configure.patch ---
--- configure.orig	2005-12-13 14:35:40.000000000 +0100
+++ configure	2005-12-13 14:40:03.000000000 +0100
@@ -22352,7 +22352,7 @@
 if test "${am_cv_python_pythondir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
 fi
 echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync.spec	13 Dec 2005 08:17:37 -0000	1.3
+++ libopensync.spec	13 Dec 2005 13:46:31 -0000	1.4
@@ -9,6 +9,7 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
+Patch1:         libopensync-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -41,6 +42,8 @@
 %prep
 %setup -q
 %patch0
+%patch1
+
 # some source files are marked executable
 for dir in opensync osengine; do
     cd %{_builddir}/%{name}-%{version}/$dir
@@ -100,6 +103,7 @@
 * Tue Dec 13 2005 Andreas Bierfert 
 0.18-5
 - change handling of ld.so.conf files
+- patch configure for x86_64 python
 
 * Sun Dec 11 2005 Andreas Bierfert 
 0.18-4



From fedora-extras-commits at redhat.com  Tue Dec 13 13:49:28 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue, 13 Dec 2005 08:49:28 -0500
Subject: rpms/nsd/devel nsd.spec,1.1,1.2
Message-ID: <200512131349.jBDDnx3I012903@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	nsd.spec 
Log Message:
Added dependancies on openssl (I thought this was in the base system)
and openssl-devel (should have been part of BuildRequires).



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsd.spec	13 Dec 2005 04:10:38 -0000	1.1
+++ nsd.spec	13 Dec 2005 13:49:26 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -9,8 +9,8 @@
 Patch0: nsd-2.3.3-checking.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#Requires: 
-BuildRequires: flex
+Requires: openssl
+BuildRequires: flex, openssl-devel
 
 %description
 NSD is a complete implementation of an authoritative DNS name server.



From fedora-extras-commits at redhat.com  Tue Dec 13 14:05:50 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue, 13 Dec 2005 09:05:50 -0500
Subject: rpms/nsd/devel nsd.spec,1.2,1.3
Message-ID: <200512131406.jBDE6LmA014676@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	nsd.spec 
Log Message:
bumped version



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsd.spec	13 Dec 2005 13:49:26 -0000	1.2
+++ nsd.spec	13 Dec 2005 14:05:48 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 14:05:52 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 13 Dec 2005 09:05:52 -0500
Subject: rpms/gtkwave/devel gtkwave.spec, 1.2, 1.3 sources, 1.3,
	1.4 .cvsignore, 1.3, 1.4
Message-ID: <200512131406.jBDE6hfH014685@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Update to 1.3.81



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtkwave.spec	27 Nov 2005 10:39:52 -0000	1.2
+++ gtkwave.spec	13 Dec 2005 14:05:50 -0000	1.3
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.80
+Version:		1.3.81
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Tue Dec 13 2005 Paul Howarth  1.3.81-1
+- update to 1.3.81
+
 * Sun Nov 27 2005 Paul Howarth  1.3.80-1
 - update to 1.3.80
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2005 10:39:52 -0000	1.3
+++ sources	13 Dec 2005 14:05:50 -0000	1.4
@@ -1 +1 @@
-039763bbb4cd593297eb3644e3e65c63  gtkwave-1.3.80.tgz
+3dfd17856187c816b533aec1e78e80cb  gtkwave-1.3.81.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2005 10:39:52 -0000	1.3
+++ .cvsignore	13 Dec 2005 14:05:50 -0000	1.4
@@ -1 +1 @@
-gtkwave-1.3.80.tgz
+gtkwave-1.3.81.tgz



From fedora-extras-commits at redhat.com  Tue Dec 13 14:09:48 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 13 Dec 2005 09:09:48 -0500
Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.2, 1.3 sources, 1.3,
	1.4 .cvsignore, 1.3, 1.4
Message-ID: <200512131410.jBDEAISZ014795@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtkwave.spec	27 Nov 2005 10:44:56 -0000	1.2
+++ gtkwave.spec	13 Dec 2005 14:09:46 -0000	1.3
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.80
+Version:		1.3.81
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Tue Dec 13 2005 Paul Howarth  1.3.81-1
+- update to 1.3.81
+
 * Sun Nov 27 2005 Paul Howarth  1.3.80-1
 - update to 1.3.80
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2005 10:44:56 -0000	1.3
+++ sources	13 Dec 2005 14:09:46 -0000	1.4
@@ -1 +1 @@
-039763bbb4cd593297eb3644e3e65c63  gtkwave-1.3.80.tgz
+3dfd17856187c816b533aec1e78e80cb  gtkwave-1.3.81.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2005 10:44:56 -0000	1.3
+++ .cvsignore	13 Dec 2005 14:09:46 -0000	1.4
@@ -1 +1 @@
-gtkwave-1.3.80.tgz
+gtkwave-1.3.81.tgz



From fedora-extras-commits at redhat.com  Tue Dec 13 14:12:20 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 13 Dec 2005 09:12:20 -0500
Subject: rpms/gtkwave/FC-3 gtkwave.spec, 1.2, 1.3 sources, 1.3,
	1.4 .cvsignore, 1.3, 1.4
Message-ID: <200512131412.jBDECoLG014870@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/gtkwave.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtkwave.spec	27 Nov 2005 10:49:17 -0000	1.2
+++ gtkwave.spec	13 Dec 2005 14:12:18 -0000	1.3
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.80
+Version:		1.3.81
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Tue Dec 13 2005 Paul Howarth  1.3.81-1
+- update to 1.3.81
+
 * Sun Nov 27 2005 Paul Howarth  1.3.80-1
 - update to 1.3.80
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2005 10:49:17 -0000	1.3
+++ sources	13 Dec 2005 14:12:18 -0000	1.4
@@ -1 +1 @@
-039763bbb4cd593297eb3644e3e65c63  gtkwave-1.3.80.tgz
+3dfd17856187c816b533aec1e78e80cb  gtkwave-1.3.81.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2005 10:49:17 -0000	1.3
+++ .cvsignore	13 Dec 2005 14:12:18 -0000	1.4
@@ -1 +1 @@
-gtkwave-1.3.80.tgz
+gtkwave-1.3.81.tgz



From fedora-extras-commits at redhat.com  Tue Dec 13 14:14:00 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:14:00 -0500
Subject: rpms/libopensync/devel libopensync-wrapper.patch, NONE,
	1.1 libopensync.spec, 1.4, 1.5
Message-ID: <200512131414.jBDEEU2I014961@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	libopensync.spec 
Added Files:
	libopensync-wrapper.patch 
Log Message:
- add wrapper compile patch (no Werror)


libopensync-wrapper.patch:

--- NEW FILE libopensync-wrapper.patch ---
--- wrapper/Makefile.am.orig	2005-12-13 15:05:22.000000000 +0100
+++ wrapper/Makefile.am	2005-12-13 15:06:07.000000000 +0100
@@ -1,10 +1,10 @@
 
-AM_CFLAGS = -Werror
+AM_CFLAGS = 
 
 INCLUDES= @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
 
 opensync_wrap.c: $(srcdir)/opensync.i
-	$(SWIG) -Werror -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
+	$(SWIG) -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
 
 EXTRA_DIST = opensync.i
 
--- wrapper/Makefile.in.orig	2005-12-13 15:05:26.000000000 +0100
+++ wrapper/Makefile.in	2005-12-13 15:06:27.000000000 +0100
@@ -222,7 +222,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AM_CFLAGS = -Werror
+AM_CFLAGS = 
 INCLUDES = @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
 EXTRA_DIST = opensync.i
 CLEANFILES = \
@@ -542,7 +542,7 @@
 
 
 opensync_wrap.c: $(srcdir)/opensync.i
-	$(SWIG) -Werror -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
+	$(SWIG) -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
 # 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:


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync.spec	13 Dec 2005 13:46:31 -0000	1.4
+++ libopensync.spec	13 Dec 2005 14:13:57 -0000	1.5
@@ -10,6 +10,7 @@
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
 Patch1:         libopensync-configure.patch
+Patch2:         libopensync-wrapper.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -43,6 +44,7 @@
 %setup -q
 %patch0
 %patch1
+%patch2
 
 # some source files are marked executable
 for dir in opensync osengine; do
@@ -104,6 +106,7 @@
 0.18-5
 - change handling of ld.so.conf files
 - patch configure for x86_64 python
+- add wrapper compile patch (no Werror)
 
 * Sun Dec 11 2005 Andreas Bierfert 
 0.18-4



From fedora-extras-commits at redhat.com  Tue Dec 13 14:21:37 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:21:37 -0500
Subject: rpms/libopensync-plugin-evolution2 - New directory
Message-ID: <200512131421.jBDELbIL015154@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15144/libopensync-plugin-evolution2

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-evolution2 added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:21:43 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:21:43 -0500
Subject: rpms/libopensync-plugin-evolution2/devel - New directory
Message-ID: <200512131421.jBDELhr3015181@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-serv15144/libopensync-plugin-evolution2/devel

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-evolution2/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:22:06 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:22:06 -0500
Subject: rpms/libopensync-plugin-evolution2 Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200512131422.jBDEM6JM015224@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15211

Added Files:
	Makefile import.log 
Log Message:
Setup of module libopensync-plugin-evolution2


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 14:22:11 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:22:11 -0500
Subject: rpms/libopensync-plugin-evolution2/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512131422.jBDEMB8W015243@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-serv15211/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libopensync-plugin-evolution2


--- NEW 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 Dec 13 14:21:42 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:21:42 -0500
Subject: rpms/wv2/devel wv2.spec,1.2,1.3
Message-ID: <200512131422.jBDEMCeg015246@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	wv2.spec 
Log Message:
- rebuild



Index: wv2.spec
===================================================================
RCS file: /cvs/extras/rpms/wv2/devel/wv2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wv2.spec	5 Jul 2005 10:47:40 -0000	1.2
+++ wv2.spec	13 Dec 2005 14:21:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           wv2
 Version:        0.2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A library which allows access to Microsoft?? Word files
 
 Group:          System Environment/Libraries
@@ -67,6 +67,9 @@
 %{_includedir}/wv2
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert  0.2.2-6
+- rebuild
+
 * Tue Jul 05 2005 Andreas Bierfert  0.2.2-5
 - add dist tag
 



From fedora-extras-commits at redhat.com  Tue Dec 13 14:22:56 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:22:56 -0500
Subject: rpms/libopensync-plugin-evolution2 import.log,1.1,1.2
Message-ID: <200512131423.jBDENQuX015421@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15339

Modified Files:
	import.log 
Log Message:
auto-import libopensync-plugin-evolution2-0.18-2 on branch devel from libopensync-plugin-evolution2-0.18-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 14:22:04 -0000	1.1
+++ import.log	13 Dec 2005 14:22:54 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-evolution2-0_18-2:HEAD:libopensync-plugin-evolution2-0.18-2.src.rpm:1134483765



From fedora-extras-commits at redhat.com  Tue Dec 13 14:23:01 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:23:01 -0500
Subject: rpms/libopensync-plugin-evolution2/devel
	libopensync-plugin-evolution2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512131423.jBDENWES015425@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-serv15339/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libopensync-plugin-evolution2.spec 
Log Message:
auto-import libopensync-plugin-evolution2-0.18-2 on branch devel from libopensync-plugin-evolution2-0.18-2.src.rpm


--- NEW FILE libopensync-plugin-evolution2.spec ---
Name:           libopensync-plugin-evolution2
Version:        0.18
Release:        2
Summary:        Evolution 2 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:  evolution-data-server-devel

%description
%{summary}

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

%description    devel
The %{name}-devel package contains the files
needed for development with %{name}.

%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 AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/opensync/plugins/evo2_sync.so
%{_datadir}/opensync/defaults/evo2-sync

%files devel
%defattr(-,root,root,-)
%{_includedir}/opensync-1.0/opensync/evo2_sync.h

%changelog
* Tue Dec 13 2005 Andreas Bierfert  0.18-2
- add missing BR

* Fri Nov 25 2005 Andreas Bierfert  0.18-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 14:22:09 -0000	1.1
+++ .cvsignore	13 Dec 2005 14:22:59 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-evolution2-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 14:22:09 -0000	1.1
+++ sources	13 Dec 2005 14:22:59 -0000	1.2
@@ -0,0 +1 @@
+64f182fa37483419ca09721dec2d6f1e  libopensync-plugin-evolution2-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 14:26:39 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:26:39 -0500
Subject: rpms/libopensync-plugin-file - New directory
Message-ID: <200512131426.jBDEQdLm015554@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15545/libopensync-plugin-file

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-file added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:26:45 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:26:45 -0500
Subject: rpms/libopensync-plugin-file/devel - New directory
Message-ID: <200512131426.jBDEQjTD015570@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15545/libopensync-plugin-file/devel

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-file/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:27:07 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:27:07 -0500
Subject: rpms/libopensync-plugin-file Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512131427.jBDER7fs015605@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15592

Added Files:
	Makefile import.log 
Log Message:
Setup of module libopensync-plugin-file


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 14:27:12 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:27:12 -0500
Subject: rpms/libopensync-plugin-file/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512131427.jBDERCAn015626@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15592/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libopensync-plugin-file


--- NEW 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 Dec 13 14:28:00 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:28:00 -0500
Subject: rpms/libopensync-plugin-file import.log,1.1,1.2
Message-ID: <200512131428.jBDESU7q015700@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15662

Modified Files:
	import.log 
Log Message:
auto-import libopensync-plugin-file-0.18-2 on branch devel from libopensync-plugin-file-0.18-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 14:27:05 -0000	1.1
+++ import.log	13 Dec 2005 14:27:58 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-file-0_18-2:HEAD:libopensync-plugin-file-0.18-2.src.rpm:1134484068



From fedora-extras-commits at redhat.com  Tue Dec 13 14:28:06 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:28:06 -0500
Subject: rpms/libopensync-plugin-file/devel libopensync-plugin-file.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512131428.jBDESabL015704@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15662/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libopensync-plugin-file.spec 
Log Message:
auto-import libopensync-plugin-file-0.18-2 on branch devel from libopensync-plugin-file-0.18-2.src.rpm


--- NEW FILE libopensync-plugin-file.spec ---
Name:           libopensync-plugin-file
Version:        0.18
Release:        2
Summary:        File 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:  gamin-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 AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/opensync/plugins/file_sync.so
%{_datadir}/opensync/defaults/file-sync

%changelog
* Tue Dec 13 2005 Andreas Bierfert  0.18-2
- add missing BR

* Fri Nov 25 2005 Andreas Bierfert  0.18-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 14:27:10 -0000	1.1
+++ .cvsignore	13 Dec 2005 14:28:03 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-file-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 14:27:10 -0000	1.1
+++ sources	13 Dec 2005 14:28:03 -0000	1.2
@@ -0,0 +1 @@
+a9ffd002169406fb31eee885c9742c26  libopensync-plugin-file-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 14:35:22 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:35:22 -0500
Subject: rpms/libopensync-plugin-python - New directory
Message-ID: <200512131435.jBDEZMdm015875@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15866/libopensync-plugin-python

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-python added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:35:27 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:35:27 -0500
Subject: rpms/libopensync-plugin-python/devel - New directory
Message-ID: <200512131435.jBDEZRwc015891@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15866/libopensync-plugin-python/devel

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-python/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:35:50 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:35:50 -0500
Subject: rpms/libopensync-plugin-python Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200512131435.jBDEZoVt015930@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15917

Added Files:
	Makefile import.log 
Log Message:
Setup of module libopensync-plugin-python


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 14:35:55 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:35:55 -0500
Subject: rpms/libopensync-plugin-python/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512131435.jBDEZtCK015951@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15917/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libopensync-plugin-python


--- NEW 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 Dec 13 14:36:43 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:36:43 -0500
Subject: rpms/libopensync-plugin-python import.log,1.1,1.2
Message-ID: <200512131437.jBDEbDhv016025@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15985

Modified Files:
	import.log 
Log Message:
auto-import libopensync-plugin-python-0.18-2 on branch devel from libopensync-plugin-python-0.18-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 14:35:48 -0000	1.1
+++ import.log	13 Dec 2005 14:36:40 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-python-0_18-2:HEAD:libopensync-plugin-python-0.18-2.src.rpm:1134484590



From fedora-extras-commits at redhat.com  Tue Dec 13 14:36:48 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:36:48 -0500
Subject: rpms/libopensync-plugin-python/devel libopensync-plugin-python.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512131437.jBDEbIjt016029@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15985/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libopensync-plugin-python.spec 
Log Message:
auto-import libopensync-plugin-python-0.18-2 on branch devel from libopensync-plugin-python-0.18-2.src.rpm


--- NEW FILE libopensync-plugin-python.spec ---
Name:           libopensync-plugin-python
Version:        0.18
Release:        2
Summary:        Python 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:  python-devel

%description
%{summary}

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

%description    devel
The %{name}-devel package contains the files
needed for development with %{name}.

%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 AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/opensync/plugins/python*.so
%{_libdir}/opensync/python-plugins/

%changelog
* Tue Dec 13 2005 Andreas Bierfert  0.18-2
- add missing BR
- own python-plugin dir

* Fri Nov 25 2005 Andreas Bierfert  0.18-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 14:35:53 -0000	1.1
+++ .cvsignore	13 Dec 2005 14:36:46 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-python-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 14:35:53 -0000	1.1
+++ sources	13 Dec 2005 14:36:46 -0000	1.2
@@ -0,0 +1 @@
+8030db5af7c9f8ca82a5dbd8657979fb  libopensync-plugin-python-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 14:56:54 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:56:54 -0500
Subject: rpms/synce-software-manager - New directory
Message-ID: <200512131456.jBDEus9S016701@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-software-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16689/synce-software-manager

Log Message:
Directory /cvs/extras/rpms/synce-software-manager added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:56:59 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:56:59 -0500
Subject: rpms/synce-software-manager/devel - New directory
Message-ID: <200512131456.jBDEuxF9016722@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-software-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16689/synce-software-manager/devel

Log Message:
Directory /cvs/extras/rpms/synce-software-manager/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:57:22 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:57:22 -0500
Subject: rpms/synce-software-manager Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512131457.jBDEvMCZ016788@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-software-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16773

Added Files:
	Makefile import.log 
Log Message:
Setup of module synce-software-manager


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 14:57:27 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:57:27 -0500
Subject: rpms/synce-software-manager/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512131457.jBDEvRjP016813@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-software-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16773/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module synce-software-manager


--- NEW 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 Dec 13 14:57:52 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:57:52 -0500
Subject: rpms/libopensync-plugin-evolution2/devel
	libopensync-plugin-evolution2.spec, 1.1, 1.2
Message-ID: <200512131458.jBDEwNpQ016927@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-serv16650

Modified Files:
	libopensync-plugin-evolution2.spec 
Log Message:
- add dist



Index: libopensync-plugin-evolution2.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/libopensync-plugin-evolution2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-evolution2.spec	13 Dec 2005 14:22:59 -0000	1.1
+++ libopensync-plugin-evolution2.spec	13 Dec 2005 14:57:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-evolution2
 Version:        0.18
-Release:        2
+Release:        3%{?dist}
 Summary:        Evolution 2 plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -58,6 +58,9 @@
 %{_includedir}/opensync-1.0/opensync/evo2_sync.h
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert  0.18-3
+- add dist
+
 * Tue Dec 13 2005 Andreas Bierfert  0.18-2
 - add missing BR
 



From fedora-extras-commits at redhat.com  Tue Dec 13 14:58:25 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:58:25 -0500
Subject: rpms/synce-software-manager import.log,1.1,1.2
Message-ID: <200512131458.jBDEwtq8017047@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-software-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16925

Modified Files:
	import.log 
Log Message:
auto-import synce-software-manager-0.9.0-3 on branch devel from synce-software-manager-0.9.0-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/synce-software-manager/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 14:57:20 -0000	1.1
+++ import.log	13 Dec 2005 14:58:23 -0000	1.2
@@ -0,0 +1 @@
+synce-software-manager-0_9_0-3:HEAD:synce-software-manager-0.9.0-3.src.rpm:1134485892



From fedora-extras-commits at redhat.com  Tue Dec 13 14:58:31 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:58:31 -0500
Subject: rpms/synce-software-manager/devel synce-software-manager.desktop,
	NONE, 1.1 synce-software-manager.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512131459.jBDEx1LX017055@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-software-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16925/devel

Modified Files:
	.cvsignore sources 
Added Files:
	synce-software-manager.desktop synce-software-manager.spec 
Log Message:
auto-import synce-software-manager-0.9.0-3 on branch devel from synce-software-manager-0.9.0-3.src.rpm


--- NEW FILE synce-software-manager.desktop ---
[Desktop Entry]
Name=synce-software-manager
Comment=Software Manager for synce devices
Exec=synce-software-manager
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE synce-software-manager.spec ---
Name:           synce-software-manager
Version:        0.9.0
Release:        3
Summary:        Software manager for use with synce

Group:          Applications/Communications
License:        MIT
URL:            http://synce.sourceforge.net/ 
Source0:        http://dl.sf.net/synce/synce-software-manager-0.9.0.tar.gz 
Source1:        synce-software-manager.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  synce-devel
BuildRequires:  libxml2-devel
BuildRequires:  zlib-devel
BuildRequires:  pango-devel
BuildRequires:  gtk2-devel
BuildRequires:  gnome-vfs2-devel
BuildRequires:  glib2-devel
BuildRequires:  libgnome-devel
BuildRequires:  libgnomeui-devel
BuildRequires:  libglade2-devel
BuildRequires:  atk-devel
BuildRequires:  libart_lgpl-devel
BuildRequires:  ORBit2-devel
BuildRequires:  desktop-file-utils

%description
%{summary}

%prep
%setup -q


%build
%configure --disable-static --with-librapi2-include=%{_includedir} \
--with-librapi2-lib=%{_libdir}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install \
  --vendor=fedora \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category=X-Fedora \
  %{SOURCE1}

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPYING
%{_bindir}/synce-software-manager
%{_datadir}/synce/synce_software_manager.glade
%{_datadir}/applications/*
%changelog
* Fri Dec 09 2005 Andreas Bierfert  0.9.0-3
- add .desktop file

* Thu Dec 08 2005 Jef Spaleta  0.9.0-2
- Specfile cleanups

* Tue Aug 23 2005 Andreas Bierfert  0.9.0-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synce-software-manager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 14:57:25 -0000	1.1
+++ .cvsignore	13 Dec 2005 14:58:29 -0000	1.2
@@ -0,0 +1 @@
+synce-software-manager-0.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synce-software-manager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 14:57:25 -0000	1.1
+++ sources	13 Dec 2005 14:58:29 -0000	1.2
@@ -0,0 +1 @@
+d9fd5f5dceff3e7eb0ded05d0a395f7e  synce-software-manager-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 15:00:32 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 10:00:32 -0500
Subject: rpms/synce-software-manager/devel synce-software-manager.spec, 1.1,
	1.2
Message-ID: <200512131501.jBDF122S018533@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-software-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17183

Modified Files:
	synce-software-manager.spec 
Log Message:
- add dist



Index: synce-software-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/synce-software-manager/devel/synce-software-manager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synce-software-manager.spec	13 Dec 2005 14:58:29 -0000	1.1
+++ synce-software-manager.spec	13 Dec 2005 15:00:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           synce-software-manager
 Version:        0.9.0
-Release:        3
+Release:        4%{?dist}
 Summary:        Software manager for use with synce
 
 Group:          Applications/Communications
@@ -61,6 +61,9 @@
 %{_datadir}/synce/synce_software_manager.glade
 %{_datadir}/applications/*
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert  0.9.0-4
+- add dist
+
 * Fri Dec 09 2005 Andreas Bierfert  0.9.0-3
 - add .desktop file
 



From fedora-extras-commits at redhat.com  Tue Dec 13 15:07:59 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Dec 2005 10:07:59 -0500
Subject: rpms/OpenSceneGraph/devel .cvsignore, 1.2, 1.3 OpenSceneGraph.spec,
	1.9, 1.10 sources, 1.2, 1.3
Message-ID: <200512131509.jBDF92kP018892@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Dec 2005 02:50:38 -0000	1.2
+++ .cvsignore	13 Dec 2005 15:07:53 -0000	1.3
@@ -1,2 +1,2 @@
-OSG_OP_OT-0.9.9.zip
-OpenSceneGraph-0.9.9.diff
+OSG_OP_OT-1.0.zip
+OpenSceneGraph-1.0.diff


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- OpenSceneGraph.spec	8 Dec 2005 11:11:30 -0000	1.9
+++ OpenSceneGraph.spec	13 Dec 2005 15:07:53 -0000	1.10
@@ -4,19 +4,20 @@
 # package are under the same license as the package itself.
 #
 
-%define apivers 0.9.9
+%define apivers 1.0
+%define srcvers 1.0
 
 Name:           OpenSceneGraph
-Version:        0.9.9
-Release:        5%{?dist}
+Version:        %{srcvers}
+Release:        1%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
 License:        OSGPL
 URL:            http://www.openscenegraph.org/
-Source0:        http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{version}.zip
+Source0:        http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{srcvers}.zip
 
-Patch0:		OpenSceneGraph-0.9.9.diff
+Patch0:		OpenSceneGraph-%{srcvers}.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,7 +47,7 @@
 for rapid development of graphics applications.
 
 %prep
-%setup -q -n OSG_OP_OT-%{version}
+%setup -q -n OSG_OP_OT-%{srcvers}
 %patch0 -p1
 
 # backup, we hack this file later
@@ -200,14 +201,18 @@
 %{_bindir}/osgbillboard
 %{_bindir}/osgblendequation
 %{_bindir}/osgcallback
+%{_bindir}/osgcamera
 %{_bindir}/osgcatch
 %{_bindir}/osgcameragroup
 %{_bindir}/osgclip
 %{_bindir}/osgcluster
 %{_bindir}/osgcopy
 %{_bindir}/osgcubemap
+%{_bindir}/osgdelaunay
+%{_bindir}/osgdepthpartition
 %{_bindir}/osgdepthshadow
 %{_bindir}/osgdistortion
+%{_bindir}/osgfbo
 %{_bindir}/osgforest
 %{_bindir}/osgfxbrowser
 %{_bindir}/osggeodemo
@@ -224,9 +229,11 @@
 %{_bindir}/osglogo
 %{_bindir}/osgmotionblur
 %{_bindir}/osgmovie
+%{_bindir}/osgmultiplecameras
 %{_bindir}/osgmultitexture
 %{_bindir}/osgoccluder
 %{_bindir}/osgpagedlod
+%{_bindir}/osgparametric
 %{_bindir}/osgparticle
 %{_bindir}/osgparticleeffects
 %{_bindir}/osgpbuffer
@@ -241,6 +248,7 @@
 %{_bindir}/osgscribe
 %{_bindir}/osgsequence
 %{_bindir}/osgshaders
+%{_bindir}/osgshaderterrain
 %{_bindir}/osgshadowtexture
 %{_bindir}/osgshape
 %{_bindir}/osgsimple
@@ -358,6 +366,9 @@
 %{_includedir}/Producer
 
 %changelog
+* Sat Dec 10 2005 Ralf Cors??pius  - 1.0-1
+- Upstream update.
+
 * Wed Dec 07 2005 Ralf Cors??pius  - 0.9.9-5
 - Try at getting this package buildable with modular X11.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Dec 2005 02:50:38 -0000	1.2
+++ sources	13 Dec 2005 15:07:53 -0000	1.3
@@ -1,2 +1,2 @@
-711773db3874320967091327473dbc31  OSG_OP_OT-0.9.9.zip
-b1d2366ab6db7c8102153bd262a4a145  OpenSceneGraph-0.9.9.diff
+dfb3eca46b32625602dabe9aa46c6b6f  OSG_OP_OT-1.0.zip
+c8dfb2766674965a367d5c3777c9738b  OpenSceneGraph-1.0.diff



From fedora-extras-commits at redhat.com  Tue Dec 13 15:09:40 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 10:09:40 -0500
Subject: rpms/libopensync-plugin-file/devel libopensync-plugin-file.spec, 1.1,
	1.2
Message-ID: <200512131510.jBDFABka018949@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18856

Modified Files:
	libopensync-plugin-file.spec 
Log Message:
- add dist



Index: libopensync-plugin-file.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/devel/libopensync-plugin-file.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-file.spec	13 Dec 2005 14:28:03 -0000	1.1
+++ libopensync-plugin-file.spec	13 Dec 2005 15:09:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-file
 Version:        0.18
-Release:        2
+Release:        3%{?dist}
 Summary:        File plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/opensync/defaults/file-sync
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert  0.18-3
+- add dist
+
 * Tue Dec 13 2005 Andreas Bierfert  0.18-2
 - add missing BR
 



From fedora-extras-commits at redhat.com  Tue Dec 13 15:12:13 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 10:12:13 -0500
Subject: rpms/libopensync-plugin-palm/devel libopensync-plugin-palm.spec, 1.1,
	1.2
Message-ID: <200512131512.jBDFChfv019018@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18984

Modified Files:
	libopensync-plugin-palm.spec 
Log Message:
- add dist



Index: libopensync-plugin-palm.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/devel/libopensync-plugin-palm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-palm.spec	13 Dec 2005 08:40:26 -0000	1.1
+++ libopensync-plugin-palm.spec	13 Dec 2005 15:12:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-palm
 Version:        0.18
-Release:        1
+Release:        2%{?dist}
 Summary:        Palm plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -60,5 +60,8 @@
 %{_includedir}/opensync-1.0/opensync/palm*.h
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert  0.18-2
+- add dist
+
 * Fri Nov 25 2005 Andreas Bierfert  0.18-1
 - initial version



From fedora-extras-commits at redhat.com  Tue Dec 13 15:50:45 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 10:50:45 -0500
Subject: rpms/digikam/devel digikam-0.8.0-modular-X.patch, NONE,
	1.1 digikam.spec, 1.5, 1.6
Message-ID: <200512131551.jBDFpGv6019230@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	digikam.spec 
Added Files:
	digikam-0.8.0-modular-X.patch 
Log Message:
- Add new paths for modular X.Org


digikam-0.8.0-modular-X.patch:

--- NEW FILE digikam-0.8.0-modular-X.patch ---
diff -urN digikam-0.8.0-orig/acinclude.m4 digikam-0.8.0/acinclude.m4
--- digikam-0.8.0-orig/acinclude.m4	2005-11-21 20:14:06.000000000 +0100
+++ digikam-0.8.0/acinclude.m4	2005-12-13 16:37:55.000000000 +0100
@@ -44,6 +44,7 @@
 [# Look for the header file in a standard set of common directories.
 # Check X11 before X11Rn because it is often a symlink to the current release.
   for ac_dir in               \
+    /usr/share/X11/include    \
     /usr/X11/include          \
     /usr/X11R6/include        \
     /usr/X11R5/include        \
@@ -104,6 +105,7 @@
 # First see if replacing the include by lib works.
 # Check X11 before X11Rn because it is often a symlink to the current release.
 for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
+    /usr/share/X11/lib${kdelibsuff}     \
     /usr/X11/lib${kdelibsuff}           \
     /usr/X11R6/lib${kdelibsuff}         \
     /usr/X11R5/lib${kdelibsuff}         \


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- digikam.spec	9 Dec 2005 15:53:16 -0000	1.5
+++ digikam.spec	13 Dec 2005 15:50:43 -0000	1.6
@@ -1,17 +1,18 @@
 Name:		digikam
 Version:	0.8.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		digikam-0.8.0-modular-X.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:	gettext autoconf
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -37,14 +38,15 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
+autoreconf
+
 %configure \
-	--with-extra-includes=/usr/share/X11/ \
-	--with-extra-libs=/usr/share/X11/ \
 	--disable-rpath \
 	--disable-debug
 make %{?_smp_mflags}
@@ -117,6 +119,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Work around for modular X.Org paths
 



From fedora-extras-commits at redhat.com  Tue Dec 13 15:55:31 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 10:55:31 -0500
Subject: rpms/libopensync-plugin-python/devel libopensync-plugin-python.spec,
	1.1, 1.2
Message-ID: <200512131556.jBDFu1tX019320@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19298

Modified Files:
	libopensync-plugin-python.spec 
Log Message:
- add dist



Index: libopensync-plugin-python.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/devel/libopensync-plugin-python.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-python.spec	13 Dec 2005 14:36:46 -0000	1.1
+++ libopensync-plugin-python.spec	13 Dec 2005 15:55:28 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-python
 Version:        0.18
-Release:        2
+Release:        3%{?dist}
 Summary:        Python plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -54,6 +54,9 @@
 %{_libdir}/opensync/python-plugins/
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert  0.18-3
+- add dist
+
 * Tue Dec 13 2005 Andreas Bierfert  0.18-2
 - add missing BR
 - own python-plugin dir



From fedora-extras-commits at redhat.com  Tue Dec 13 16:06:29 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 11:06:29 -0500
Subject: rpms/xemacs/devel xemacs-sitestart.el, 1.1, 1.2 xemacs.spec, 1.18,
	1.19
Message-ID: <200512131607.jBDG70ew021013@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	xemacs-sitestart.el xemacs.spec 
Log Message:
* 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).



Index: xemacs-sitestart.el
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs-sitestart.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xemacs-sitestart.el	1 Mar 2005 22:11:36 -0000	1.1
+++ xemacs-sitestart.el	13 Dec 2005 16:06:03 -0000	1.2
@@ -2,11 +2,6 @@
 ;;;
 ;;; The "-no-site-file" option to xemacs prevents this file from being loaded.
 
-;; fix default info path
-(setq Info-directory-list '("/usr/share/info/"
-			    "/usr/share/xemacs/xemacs-packages/info/"
-			    "/usr/share/xemacs/mule-packages/info/"))
-
 ;;; psgml catalog list
 (setq sgml-catalog-files
 	      (if (getenv "SGML_CATALOG_FILES")


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xemacs.spec	5 Dec 2005 17:27:05 -0000	1.18
+++ xemacs.spec	13 Dec 2005 16:06:27 -0000	1.19
@@ -447,6 +447,10 @@
 
 
 %changelog
+* 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).
+
 * Mon Dec  5 2005 Ville Skytt?? 
 - Fix typo in -info summary.
 - Point to main man page for xemacs-nox.



From fedora-extras-commits at redhat.com  Tue Dec 13 16:16:46 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 11:16:46 -0500
Subject: rpms/configure-thinkpad/devel configure-thinkpad.spec,1.9,1.10
Message-ID: <200512131617.jBDGHGau021130@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/configure-thinkpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21112

Modified Files:
	configure-thinkpad.spec 
Log Message:
Add note about KDE reserving /dev/thinkpad.


Index: configure-thinkpad.spec
===================================================================
RCS file: /cvs/extras/rpms/configure-thinkpad/devel/configure-thinkpad.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure-thinkpad.spec	6 Apr 2005 22:11:36 -0000	1.9
+++ configure-thinkpad.spec	13 Dec 2005 16:16:44 -0000	1.10
@@ -1,7 +1,10 @@
+# TODO: When running KDE, kded seems to grab /dev/thinkpad if it exists, so
+# we cannot access it.  Maybe add NotShowIn=KDE to the desktop entry unless
+# a better solution is found?
+
 Name:           configure-thinkpad
 Version:        0.9
 Release:        2
-
 Summary:        Graphical ThinkPad configuration utility
 
 Group:          Applications/System



From fedora-extras-commits at redhat.com  Tue Dec 13 16:23:29 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue, 13 Dec 2005 11:23:29 -0500
Subject: rpms/ldns/devel ldns.spec,1.1,1.2
Message-ID: <200512131623.jBDGNxhk021223@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	ldns.spec 
Log Message:
* Sun Dec 13 2005 Paul Wouters  1.0.0-6
- added a make clean for 2.3.3 since .o files were left behind upstream,
  causing failure on ppc platform



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ldns.spec	13 Dec 2005 04:08:25 -0000	1.1
+++ ldns.spec	13 Dec 2005 16:23:27 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.0.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -28,6 +28,8 @@
 rm config.sub config.guess
 libtoolize
 autoreconf
+# only for 2.3.3, since upstream left .o files in release
+make clean
 
 %configure
 
@@ -76,6 +78,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Dec 13 2005 Paul Wouters  1.0.0-6
+- added a make clean for 2.3.3 since .o files were left behind upstream,
+  causing failure on ppc platform
+
 * Sun Dec 11 2005 Tom "spot" Callaway  1.0.0-5
 - minor cleanups
 



From fedora-extras-commits at redhat.com  Tue Dec 13 16:25:48 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue, 13 Dec 2005 11:25:48 -0500
Subject: rpms/ldns/devel ldns.spec,1.2,1.3
Message-ID: <200512131626.jBDGQJLk021355@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	ldns.spec 
Log Message:
fixed version in changelog message.



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ldns.spec	13 Dec 2005 16:23:27 -0000	1.2
+++ ldns.spec	13 Dec 2005 16:25:46 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.0.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -79,7 +79,7 @@
 
 %changelog
 * Sun Dec 13 2005 Paul Wouters  1.0.0-6
-- added a make clean for 2.3.3 since .o files were left behind upstream,
+- added a make clean for 1.0.0 since .o files were left behind upstream,
   causing failure on ppc platform
 
 * Sun Dec 11 2005 Tom "spot" Callaway  1.0.0-5



From fedora-extras-commits at redhat.com  Tue Dec 13 16:55:33 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 13 Dec 2005 11:55:33 -0500
Subject: rpms/kdesvn/devel kdesvn-0.7.1-x.patch,1.1,1.2
Message-ID: <200512131656.jBDGu4iW023029@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	kdesvn-0.7.1-x.patch 
Log Message:
Don't error out on no X11 includes


kdesvn-0.7.1-x.patch:

Index: kdesvn-0.7.1-x.patch
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn-0.7.1-x.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdesvn-0.7.1-x.patch	12 Dec 2005 18:56:16 -0000	1.1
+++ kdesvn-0.7.1-x.patch	13 Dec 2005 16:55:31 -0000	1.2
@@ -1,5 +1,5 @@
 --- kdesvn-0.7.1/configure.x11	2005-11-25 12:05:40.000000000 -0700
-+++ kdesvn-0.7.1/configure	2005-12-12 10:27:42.000000000 -0700
++++ kdesvn-0.7.1/configure	2005-12-13 09:54:20.000000000 -0700
 @@ -26637,90 +26637,6 @@
  
  
@@ -91,3 +91,16 @@
  if test "$ac_x_libraries" = NO; then
    # Check for the libraries.
  
+@@ -26887,12 +26803,6 @@
+   kde_x_libraries=$ac_x_libraries
+ fi
+ 
+-if test "$kde_x_includes" = NO; then
+-  { { echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5
+-echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+ if test "$kde_x_libraries" = NO; then
+   { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
+ echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}



From fedora-extras-commits at redhat.com  Tue Dec 13 18:16:03 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue, 13 Dec 2005 13:16:03 -0500
Subject: rpms/nsd/devel nsd.spec,1.3,1.4
Message-ID: <200512131816.jBDIGXM9027015@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	nsd.spec 
Log Message:
* Tue Dec 13 2005 Paul Wouters  - 2.3.3-5
- Added BuildRequires for openssl-devel, removed Requires for openssl.



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsd.spec	13 Dec 2005 14:05:48 -0000	1.3
+++ nsd.spec	13 Dec 2005 18:16:01 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -9,7 +9,6 @@
 Patch0: nsd-2.3.3-checking.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: openssl
 BuildRequires: flex, openssl-devel
 
 %description
@@ -89,7 +88,10 @@
 fi
 
 %changelog
-* Mon Dec 12 2005 Paul Wouters  - 2.3.3
+* Tue Dec 13 2005 Paul Wouters  - 2.3.3-5
+- Added BuildRequires for openssl-devel, removed Requires for openssl.
+
+* Mon Dec 12 2005 Paul Wouters  - 2.3.3-4
 - upgraded to nsd-2.3.3
 
 * Wed Dec  7 2005 Tom "spot" Callaway  - 2.3.2-2



From fedora-extras-commits at redhat.com  Tue Dec 13 19:25:41 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 13 Dec 2005 14:25:41 -0500
Subject: rpms/gramps/devel .cvsignore, 1.11, 1.12 gramps.spec, 1.12,
	1.13 sources, 1.11, 1.12
Message-ID: <200512131926.jBDJQBbj028837@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
* Tue Dec 13 2005 Brian Pepple  - 2.0.9-2
- Make noarch. (#170974)
- Update to 2.0.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Sep 2005 23:12:40 -0000	1.11
+++ .cvsignore	13 Dec 2005 19:25:39 -0000	1.12
@@ -1 +1 @@
-gramps-2.0.8.tar.gz
+gramps-2.0.9.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gramps.spec	7 Sep 2005 23:12:40 -0000	1.12
+++ gramps.spec	13 Dec 2005 19:25:39 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           gramps
-Version:        2.0.8
+Version:        2.0.9
 Release:        2%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
@@ -8,6 +8,7 @@
 URL:            http://gramps.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -98,7 +99,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS ChangeLog FAQ INSTALL NEWS README TODO
-%{_bindir}/*
+%{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/application-registry/%{name}.applications
 %{_datadir}/%{name}/
@@ -112,6 +113,10 @@
 
 
 %changelog
+* Tue Dec 13 2005 Brian Pepple  - 2.0.9-2
+- Make noarch. (#170974)
+- Update to 2.0.9.
+
 * Wed Sep  7 2005 Brian Pepple  - 2.0.8-2
 - Update to 2.0.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Sep 2005 23:12:40 -0000	1.11
+++ sources	13 Dec 2005 19:25:39 -0000	1.12
@@ -1 +1 @@
-84f2659b292b5e2abc92a8d56148495b  gramps-2.0.8.tar.gz
+900646bf8c2cbf37e3fb81f5892d1141  gramps-2.0.9.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 19:27:50 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 13 Dec 2005 14:27:50 -0500
Subject: rpms/gramps/FC-4 .cvsignore, 1.11, 1.12 gramps.spec, 1.12,
	1.13 sources, 1.11, 1.12
Message-ID: <200512131928.jBDJSKY1028905@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
* Tue Dec 13 2005 Brian Pepple  - 2.0.9
- Make noarch. (#170974)
- Update to 2.0.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gramps/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Sep 2005 23:13:44 -0000	1.11
+++ .cvsignore	13 Dec 2005 19:27:48 -0000	1.12
@@ -1 +1 @@
-gramps-2.0.8.tar.gz
+gramps-2.0.9.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/FC-4/gramps.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gramps.spec	7 Sep 2005 23:13:44 -0000	1.12
+++ gramps.spec	13 Dec 2005 19:27:48 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           gramps
-Version:        2.0.8
+Version:        2.0.9
 Release:        1%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
@@ -8,6 +8,7 @@
 URL:            http://gramps.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -98,7 +99,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS ChangeLog FAQ INSTALL NEWS README TODO
-%{_bindir}/*
+%{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/application-registry/%{name}.applications
 %{_datadir}/%{name}/
@@ -112,6 +113,10 @@
 
 
 %changelog
+* Tue Dec 13 2005 Brian Pepple  - 2.0.9
+- Make noarch. (#170974)
+- Update to 2.0.9.
+
 * Wed Sep  7 2005 Brian Pepple  - 2.0.8-1
 - Update to 2.0.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gramps/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Sep 2005 23:13:44 -0000	1.11
+++ sources	13 Dec 2005 19:27:48 -0000	1.12
@@ -1 +1 @@
-84f2659b292b5e2abc92a8d56148495b  gramps-2.0.8.tar.gz
+900646bf8c2cbf37e3fb81f5892d1141  gramps-2.0.9.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 20:06:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Dec 2005 15:06:21 -0500
Subject: rpms/perl-IPC-Shareable - New directory
Message-ID: <200512132006.jBDK6L7a030677@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IPC-Shareable
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30668/perl-IPC-Shareable

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




From fedora-extras-commits at redhat.com  Tue Dec 13 20:06:28 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Dec 2005 15:06:28 -0500
Subject: rpms/perl-IPC-Shareable/devel - New directory
Message-ID: <200512132006.jBDK6SJI030693@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IPC-Shareable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30668/perl-IPC-Shareable/devel

Log Message:
Directory /cvs/extras/rpms/perl-IPC-Shareable/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 20:07:08 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Dec 2005 15:07:08 -0500
Subject: rpms/perl-IPC-Shareable Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512132007.jBDK78hn030728@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IPC-Shareable
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30715

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-IPC-Shareable


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 20:07:19 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Dec 2005 15:07:19 -0500
Subject: rpms/perl-IPC-Shareable/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512132007.jBDK7JKR030753@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IPC-Shareable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30715/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-IPC-Shareable


--- NEW 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 Dec 13 20:08:26 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Dec 2005 15:08:26 -0500
Subject: rpms/perl-IPC-Shareable/devel perl-IPC-Shareable.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512132008.jBDK8wGC030818@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IPC-Shareable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30781/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-IPC-Shareable.spec 
Log Message:
auto-import perl-IPC-Shareable-0.60-1 on branch devel from perl-IPC-Shareable-0.60-1.src.rpm


--- NEW FILE perl-IPC-Shareable.spec ---
Name:           perl-IPC-Shareable
Version:        0.60
Release:        1%{?dist}
Summary:        Share Perl variables between processes

Group:          Development/Libraries
License:        GPL
URL:            http://search.cpan.org/dist/IPC-Shareable/
Source0:        http://www.cpan.org/authors/id/B/BS/BSUGARS/IPC-Shareable-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
IPC::Shareable allows you to tie a variable to shared memory making it
easy to share the contents of that variable with other Perl processes.
Scalars, arrays, and hashes can be tied.  The variable being tied may
contain arbitrarily complex data structures - including references to
arrays, hashes of hashes, etc.


%prep
%setup -q -n IPC-Shareable-%{version}
find eg -type f | xargs chmod 644


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


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES COPYING CREDITS DISCLAIMER README TO_DO eg/
%{perl_vendorlib}/IPC/
%{_mandir}/man3/*.3*


%changelog
* Sat Oct 22 2005 Jose Pedro Oliveira  - 0.60-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Shareable/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 20:07:17 -0000	1.1
+++ .cvsignore	13 Dec 2005 20:08:24 -0000	1.2
@@ -0,0 +1 @@
+IPC-Shareable-0.60.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Shareable/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 20:07:17 -0000	1.1
+++ sources	13 Dec 2005 20:08:24 -0000	1.2
@@ -0,0 +1 @@
+51462dabfb4eec81e0b3417a9f9add4e  IPC-Shareable-0.60.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 20:08:00 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Dec 2005 15:08:00 -0500
Subject: rpms/perl-IPC-Shareable import.log,1.1,1.2
Message-ID: <200512132009.jBDK9HxD030821@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IPC-Shareable
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30781

Modified Files:
	import.log 
Log Message:
auto-import perl-IPC-Shareable-0.60-1 on branch devel from perl-IPC-Shareable-0.60-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Shareable/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 20:07:06 -0000	1.1
+++ import.log	13 Dec 2005 20:07:57 -0000	1.2
@@ -0,0 +1 @@
+perl-IPC-Shareable-0_60-1:HEAD:perl-IPC-Shareable-0.60-1.src.rpm:1134504469



From fedora-extras-commits at redhat.com  Tue Dec 13 20:24:04 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Dec 2005 15:24:04 -0500
Subject: owners owners.list,1.445,1.446
Message-ID: <200512132024.jBDKOZge030999@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	owners.list 
Log Message:
New component: perl-IPC-Shareable (#171638)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- owners.list	13 Dec 2005 11:48:23 -0000	1.445
+++ owners.list	13 Dec 2005 20:24:02 -0000	1.446
@@ -791,6 +791,7 @@
 Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Zlib|For bugs related to the perl-IO-Zlib component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IPC-Shareable|Share Perl variables between processes|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-SharedCache|Perl module to manage a cache in SysV IPC shared memory|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-ShareLite|Light-weight Perl interface to shared memory|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Jcode|Perl extension interface for converting Japanese text|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Dec 13 20:44:24 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 15:44:24 -0500
Subject: rpms/pcsc-tools - New directory
Message-ID: <200512132044.jBDKiO4K031151@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31142/pcsc-tools

Log Message:
Directory /cvs/extras/rpms/pcsc-tools added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 20:44:30 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 15:44:30 -0500
Subject: rpms/pcsc-tools/devel - New directory
Message-ID: <200512132044.jBDKiUMo031167@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31142/pcsc-tools/devel

Log Message:
Directory /cvs/extras/rpms/pcsc-tools/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 20:44:49 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 15:44:49 -0500
Subject: rpms/pcsc-tools Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512132044.jBDKin2V031202@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31189

Added Files:
	Makefile import.log 
Log Message:
Setup of module pcsc-tools


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 20:44:55 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 15:44:55 -0500
Subject: rpms/pcsc-tools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512132044.jBDKitp6031223@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31189/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pcsc-tools


--- NEW 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 Dec 13 20:45:45 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 15:45:45 -0500
Subject: rpms/pcsc-tools import.log,1.1,1.2
Message-ID: <200512132046.jBDKkGSi031318@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31270

Modified Files:
	import.log 
Log Message:
auto-import pcsc-tools-1.4.1-1 on branch devel from pcsc-tools-1.4.1-1.src.rpm
Initial import (#170905).


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 20:44:47 -0000	1.1
+++ import.log	13 Dec 2005 20:45:43 -0000	1.2
@@ -0,0 +1 @@
+pcsc-tools-1_4_1-1:HEAD:pcsc-tools-1.4.1-1.src.rpm:1134506739



From fedora-extras-commits at redhat.com  Tue Dec 13 20:45:51 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 15:45:51 -0500
Subject: rpms/pcsc-tools/devel pcsc-tools-gscriptor.desktop, NONE,
	1.1 pcsc-tools.spec, NONE, 1.1 smartcard_list.txt, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512132045.jBDKjplI031305@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31270/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pcsc-tools-gscriptor.desktop pcsc-tools.spec 
	smartcard_list.txt 
Log Message:
auto-import pcsc-tools-1.4.1-1 on branch devel from pcsc-tools-1.4.1-1.src.rpm
Initial import (#170905).


--- NEW FILE pcsc-tools-gscriptor.desktop ---
[Desktop Entry]
Name=Gscriptor
Comment=Send commands to smart cards
Exec=gscriptor
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Application;Utility;GTK;


--- NEW FILE pcsc-tools.spec ---
Name:           pcsc-tools
Version:        1.4.1
Release:        1%{?dist}
Summary:        Tools to be used with smart cards and PC/SC

Group:          Development/Tools
License:        GPL
URL:            http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
Source0:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/%{name}-%{version}.tar.gz
Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
Source2:        %{name}-gscriptor.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  pcsc-lite-devel
Requires:       pcsc-lite

%description
The pcsc-tools package contains some tools useful for a PC/SC user.
The tools provided are:
* pcsc_scan(1) scans available smart card readers and print detected
  events: card insertion with ATR, card removal;
* ATR_analysis(1) analyses a smart card ATR (Anwser To Reset)
* scriptor(1) Perl script to send commands to a smart card using a
  batch file or stdin;
* gscriptor(1) the same idea as scriptor(1) but with Perl-Gtk GUI.


%prep
%setup -q
sed -i -e 's/-O2 -g/$(RPM_OPT_FLAGS)/' Makefile
sed -i -e 's|/usr/lib/pcsc\b|%{_datadir}/pcsc|' ATR_analysis*
if ! pkg-config --atleast-version 1.2.9 libpcsclite ; then
sed -i -e 's/LPTSTR/LPSTR/' pcsc_scan.c
fi
iconv -f iso-8859-1 -t utf-8 %{SOURCE1} > smartcard_list.txt
cp -p %{SOURCE2} gscriptor.desktop


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT%{_prefix}
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pcsc
mv $RPM_BUILD_ROOT%{_prefix}/pcsc/* $RPM_BUILD_ROOT%{_datadir}/pcsc
rmdir $RPM_BUILD_ROOT%{_prefix}/pcsc
desktop-file-install \
  --vendor=fedora \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
  --mode=644 \
  --add-category=X-Fedora \
  gscriptor.desktop
# TODO: icon


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changelog LICENCE README TODO
%{_bindir}/*
%{_datadir}/applications/*gscriptor.desktop
%{_datadir}/pcsc/
%{_mandir}/man1/*.1*


%changelog
* Tue Dec 13 2005 Ville Skytt??  - 1.4.1-1
- Update smartcard_list.txt to 20051127 and convert it to UTF-8.
- Improve summary and description.
- Add "Application" desktop entry category for legacy distros.
- Drop BR: sed.

* Sat Oct 15 2005 Ville Skytt??  - 1.4.1-0.2
- Update smartcard_list.txt to 20051011.
- Specfile cleanups.

* Wed Oct  5 2005 Ville Skytt??  - 1.4.1-0.1
- 1.4.1, patched to compile with pcsc-lite < 1.2.9-beta4.
- Move smartcard_list.txt to %%{_datadir}/pcsc.
- Add menu entry for gscriptor.

* Sat May 28 2005 Ville Skytt??  - 1.3.3-0.1
- Rebuild for FC4.

* Thu Jul  1 2004 Ville Skytt??  - 0:1.3.3-0.fdr.4
- Requires pcsc-lite (not too useful without the daemon).
- Update smartcard_list.txt to 1.72.

* Thu May 27 2004 Ville Skytt??  - 0:1.3.3-0.fdr.3
- Due to use of pkg-config, BuildRequires pcsc-lite-devel >= 1.2.0 (bug 1282).
- Update smartcard_list.txt to 1.71 (bug 1282).

* Wed May 12 2004 Ville Skytt??  - 0:1.3.3-0.fdr.2
- Patch to get PC/SC Lite CFLAGS and libs from pkg-config.
- Update smartcard_list (1.70).

* Fri Apr  2 2004 Ville Skytt??  - 0:1.3.3-0.fdr.1
- Update to 1.3.3.

* Tue Feb 10 2004 Ville Skytt??  - 0:1.3.2-0.fdr.2
- Update smartcard_list (1.64).

* Wed Dec 17 2003 Ville Skytt??  - 0:1.3.2-0.fdr.1
- Update to 1.3.2.

* Thu Oct 30 2003 Ville Skytt??  - 0:1.3.1-0.fdr.1
- Update to 1.3.1.

* Sun Sep 14 2003 Ville Skytt??  - 0:1.3.0-0.fdr.4
- Own %%{_libdir}/pcsc.
- Spec cleanups.

* Sun Aug 31 2003 Ville Skytt??  - 0:1.3.0-0.fdr.3
- Updated smartcard_list.txt (1.43).

* Wed Aug 27 2003 Ville Skytt??  - 0:1.3.0-0.fdr.2
- Spec cleanups.

* Sun Jun  1 2003 Ville Skytt??  - 0:1.3.0-0.fdr.1
- Update to 1.3.0.

* Sun May 25 2003 Ville Skytt??  - 0:1.2.5-0.fdr.1
- Update to 1.2.5.

* Fri May 23 2003 Ville Skytt??  - 0:1.2.4-0.fdr.1
- First build.


--- NEW FILE smartcard_list.txt ---
#
#    smartcard_list.txt
#    Copyright (C) 2002-2005  Ludovic Rousseau
#
#    This program is free software; you can redistribute it and/or modify
#    it under the terms of the GNU General Public License as published by
#    the Free Software Foundation; either version 2 of the License, or
#    (at your option) any later version.
#
#    This program is distributed in the hope that it will be useful,
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
#    GNU General Public License for more details.
#
#    You should have received a copy of the GNU General Public License
#    along with this program; if not, write to the Free Software
#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
#    02111-1307  USA

#
# This list contains a match between an ATR and a card type
# The list is sorted for edition purposes
#
# You can get the latest version of this file from:
# http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools.html
#
# $Id: smartcard_list.txt,v 1.155 2005/11/27 16:44:55 rousseau Exp $
#

# syntax:
# ATR in regular expression form
# \t descriptive text
# \t descriptive text
# \t descriptive text
# empty line

3B 02 14 50
	Schlumberger Multiflex 3k

3B 02 53 01
	Gemplus GemClub Memo

3B 04 41 11 77 81
	Sample Mifare DESFire contactless smartcard from Phillips

3B 04 41 11 77 B1
	IBM JCOP 30 contactless

3B 04 49 32 43 2E
	German Health Insurance Card

3B 05 68 01 01 02 05
	Certinomis card (electronic certificates)

3B 09 41 04 11 DD 82 2F 00 00 88
	1k contactless Mifare

3B 0A 20 62 0C 01 4F 53 45 99 14 AA
	GSM-SIM BEN (1800MHz)

3B 0F 80 6A 16 32 46 49 53 45 53 8C E0 FF 07 90 00
	GSM-SIM Sonera (from 1998)

3B 0F FF C1 B5 CC 72 CA 00 00 ??
	Mifare Std 1K

3B 15 13 80 53 41 52 03
	Eutron CryptoIdentity (ATMEL AT903232C - 6464C Cryptographic
	processors, 64KB EEPROM, RSA 2048)

3B 15 94 C3 02 08 16 01
	GSM-SIM EMT (Estonia)

3B 16 94 71 01 01 00 27 00
	Cingular GSM SIM Card

3B 16 94 81 10 06 01 81 2F
	Schlumberger Cyberflex Access Augmented Crypto

3B 16 94 81 10 06 01 81 3F
	Schlumberger Cyberflex Access Crypto

3B 17 13 9C 12 02 01 01 07 40
	Schlumberger Cyberflex Access Developer 32k

3B 17 94 18 02 01 25 01 41 93
	AT&T Wireless GSM SIM Card

3B 17 94 89 01 02 01 02 41 87
	Vodafone/Omnitel 16K GSM SIM

3B 19 14 55 90 01 01 01 00 05 08 B0
	Schlumberger Multiflex 8k

3B 19 14 55 90 01 02 01 00 05 04 B0
	Schlumberger Multiflex 4k

3B 19 14 59 01 01 0F 01 00 05 08 B0
	Schlumberger Multiflex 8k

3B 19 94 31 02 05 10 45 98 01 02 4E
	GSM-SIM EMT (Estonia)

3B 1F 11 00 67 80 42 46 49 53 45 10 52 66 FF 81 90 00
	Nokia branded SC (Setec)

3B 1F 11 00 6A 01 38 46 49 53 45 10 8C 02 FF 07 90 00
	GSM-SIM Saunalahti (from 2004)

3B 1F 11 80 6A 16 32 46 49 53 45 15 8C E6 FF 07 90 00
	GSM SIM card - Tele2 Estonia - http://www.tele2.ee

3B 1F 11 80 6A 32 37 46 49 53 45 12 8C 02 FF 07 90 00
	GSM-SIM DNA Finland (from 2001)

3B 1F 11 80 6A 80 34 46 49 53 45 53 94 36 FF 07 90 00
	RSA SecurID 3100

3B 1F 94 00 6A 01 38 46 49 53 45 10 8C 02 FF 07 90 00
	GSM-SIM Saunalahti (from 2004)

3B 1F 94 80 6A 16 32 46 49 53 45 15 8C E6 FF 07 90 00
	GSM-SIM Sonera (from 2002)

3B 23 00 00 36 41 81
	Schlumberger Payflex 4k SAM

3B 23 00 35 11 80
	Schlumberger Payflex 1k User

3B 23 00 35 11 81
	Schlumberger Payflex 1k SAM

3B 23 00 35 13 80
	Schlumberger Cyberflex Access Campus

3B 23 00 35 13 FF
	Schlumberger MicroPayflex

3B 24 00 .. .. .. 45
	Conax

3B 24 00 30 42 30 30
	ComHem Digital-TV smartcard (Sweden)

3B 24 00 80 72 94 43
	MPCOS-3DES 64K \ EMV Filter (Gemplus)

3B 26 00 00 26 40 00 90 00
	Schlumberger, purse?

3B 26 00 11 04 5C 03 90 00
	Caixa Abierta (Barcelona, Spain) Cash/Visa Electron

3B 27 00 80 65 A2 .. 01 01 37
	Gemplus GemSAFE Smart Card (4K)

3B 27 00 80 65 A2 00 01 01 37
	Gemplus GemSAFE Card CSP v1.0

3B 27 00 80 65 A2 02 02 82 37
	Gemplus GPK2000s

3B 27 00 80 65 A2 02 03 82 37
	Gemplus GPK2000sp

3B 27 00 80 65 A2 04 01 01 37
	Gemplus GPK4000s

3B 27 00 80 65 A2 05 01 01 37
	Gemplus GPK4000sp

3B 27 00 80 65 A2 06 01 01 37
	GPK 4000, RSA 512 bits Sign, Unwrap 40 bits

3B 27 00 80 65 A2 0C 01 01 37
	Gemplus GPK4000

3B 27 00 80 65 A2 8C 3B 27 00
	GPK 4000, RSA 1024 bits Sign, Unwrap 256 bits

3B 29 00 80 72 A4 45 64 00 00 D0 15
	Moeda Electronica Bradesco (Gemplus MPCOS?) (Brasilia)

3B 29 00 80 72 A4 45 64 00 FF 00 10
	MPCOS-3DES 8K (Gemplus)

3B 2A 00 80 65 A2 01 00 00 00 72 D6 41
	MPCOS_EMV_1B

3B 2A 00 80 65 A2 01 00 00 00 72 D6 43
	MPCOS_EMV_4B

3B 2A 00 80 65 A2 01 .. .. .. 72 D6 41
	Gemplus MPCOS EMV 1 Byte sectors

3B 2A 00 80 65 A2 01 .. .. .. 72 D6 43
	Gemplus MPCOS EMV 4 Byte sectors

3B 32 15 00 06 80
	Schlumberger Multiflex 8k

3B 32 15 00 06 95
	Schlumberger Multiflex 8k DES

3B 37 11 00 46 4C 4F 4D 41 90 00
	SLE 4428

3B 3B .. 00 80 6. A[F,E] 03 0[C,D] .. .. 83 .. 90 00
	GemXplore Xpresso V3

3B 3B 11 00 80 65 AF 03 0C 01 6F 83 0F 90 00
	Gemplus GemX{plore,presso} V3-B1

3B 3B 11 00 80 69 AF 03 0C 01 6F 83 0[0,1] 90 00
	GemXplore'Xpresso V3 64K

3B 3B 94 00 80 65 AF 03 0D 01 74 83 0F 90 00
	Gemplus GemXplore Xpresso V3 B1P
	Mobistar SIM - Belgium (Gemplus)

3B 3C 94 00 4B 31 25 A2 10 13 14 47 83 83 90 00
	GSM SFR

3B 3F 11 00 6F AF 65 03 12 01 80 73 32 21 1B 83 0F 90 00
	GSM SIM card Orange J2RE postpaid

3B 3F 94 00 80 69 AF 03 07 06 67 09 97 0A 0E 83 3E 9F 16
	BASE SIM - Belgium (Gemplus)

3B 3F 95 00 80 65 AF 03 12 01 6F 73 32 21 1B 83 00 90 00
	Gemplus GemXpresso PRO 64 PK SIM

3B 3F 95 00 80 69 AF 03 0F 02 80 FF FF 06 0E 83 3E 9F 16
	AT&T Wireless GSM SIM Card

3B 63 00 00 36 41 80
	Schlumberger Payflex 4k User

3B 64 00 00 80 62 0. 51
	Setec SetCOS 5.1.0 EMV

3B 64 .. FF 80 62 .. A2
	JCOP20

3B 65 00 00 29 05 01 02 01
	ActivCard (Schlumberger) CyberFlex 64K V1

3B 65 00 00 58 01 01 00 80
	RBS Advanta Platinum Reserve Master Card

3B 65 00 00 9C 02 02 07 02
	US Department of Defense, TEST Common Access Card (CAC)
	Schlumberger Cyberflex Access #2

3B 65 00 00 9C 1[0,1] 01 01 03
	Schlumberger Cyberflex Palmera

3B 66 00 FF 4A 43 4F 50 30 33
	IBM JCOP 30

3B 67 00 00 00 00 00 00 00 90 00
	Axa Bank (Belgium) Mastercard Gold / Axa Bank Belgium
	MisterCash & Proton card
	VISA Card (emitted by Bank Card Company - Belgium)

3B 67 00 00 29 20 00 6F 78 90 00
	Postbank Chippas (chipknip) Netherlands

3B 67 00 00 2D 20 36 00 78 90 00
	Swedish cashcard, http://www.ida.liu.se/~TDDB31/Cashcard.pdf
	Bank Card (ING - Belgium)

3B 67 00 00 85 20 36 30 78 90 00
	Belgium Fortis Bank
	Belgium Keytrade Bank
	Belgium Post Bank

3B 67 00 00 9C 10 01 01 03 FF 07
	Schlumberger Cyberflex Palmera Protect

3B 67 00 00 A5 20 40 10 1F 90 00
	Swedish eLegitimation (eID) from Nordea Bank http://www.elegitimation.se/

3B 67 25 00 2A 20 00 4[0,5] 68 90 00
	Swedish cashcard (proton)

3B 67 25 00 62 24 33 03 ..
	Bull TB1000 ? (SAM for ATM in Luxemburg)

3B 68 00 00 56 53 44 43 4C 43 31 30
	VISA (Estonian), made by www.trueb.ch

3B 68 00 00 80 66 A2 06 02 01 32 0E
	Gemplus GemClub 1K

3B 69 00 00 24 94 01 02 01 00 01 01 A9
	Chipcard from SUN to be used in SunRay's
	370-4328-01 (31091)

3B 69 00 00 24 94 01 03 01 00 01 00 A9
	Schlumberger MicroPayflex S card

3B 69 00 00 50 01 01 04 01 00 01 01 A9
	Sample card given to all attendees of the CTST 2004 SmartCard Conference

3B 69 00 FF 53 6D 40 72 74 43 61 66 65
	G&D (Giesecke&Devrient) Sm at rtCaf?

3B 6A 00 00 80 31 C0 A1 02 03 01 32 81 16
	Lloyds TSB Visa Credit/Debit Card

3B 6A 00 00 80 65 A2 01 01 01 3D 72 D6 43
	GemSafe Xpresso 16k

3B 6A 00 00 80 66 A1 09 02 01 63 0E 90 00
	Danish Visa/Dankort

3B 6B 00 00 00 31 80 64 2D A0 02 0C 8C 61 27
	SmartEMV prototype

3B 6B 00 00 00 31 80 64 43 B0 02 00 8C 61 27
	Bull Odyssey 1.2 (Javacard 2.0)

3B 6B 00 00 80 65 B0 83 01 01 74 83 00 90 00
	GemXpresso Pro R3 with 64K EEPROM

3B 6B 00 00 80 65 B0 83 01 03 74 83 00 90 00
	Gemplus GemXpresso PRO 64 PK

3B 6B .. FF 80 62 .. A2 56 46 69 6E 45 49 44
	JCOP20 v2.x

3B 6C 00 00 10 10 10 30 00 00 00 00 00 00 00 00
	Datacard Group Aptura Development Card V1.1b

3B 6D 00 00 00 31 C0 71 D6 64 34 C7 01 00 84 90 00
	DeLaRue ProlifIC

3B 6D 00 00 00 31 C0 71 D6 64 34 C7 02 00 84 90 00
	Cybelys card (Thalys fidelity card)

3B 6D 00 00 00 31 C0 71 D6 64 38 D0 02 00 84 90 00
	EMV Visa Electron (Oberthur)

3B 6D 00 00 00 31 C0 71 D6 64 38 D0 03 00 84 90 00
	HSBC Visa/MasterCard credit card
	Barclay Card MasterCard

3B 6D 00 00 80 31 80 65 B0 06 01 01 77 83 00 90 00
	GemXpresso Lite: with EMV application

3B 6D 00 00 80 31 80 65 B0 43 01 00 77 83 00 90 00
	Gemplus GemXpresso Lite

3B 6D 00 FF 00 31 80 71 8E 64 48 D5 02 00 82 90 00
	Blue for Business, American Express at Business

3B 6E 00 00 00 31 80 71 86 65 01 67 02 A0 0A 83 90 00
	Australian ANZ First Visa Card from the ANZ
	(Australia and New Zealand) Bank

3B 6E 00 00 00 31 80 71 86 65 47 44 23 01 02 83 90 00
	Nat West Master Card

3B 6E 00 00 00 62 .. 43 57 41 56 41 4E 54 10 81 90 00
	Setec SetCOS 4.3.0

3B 6E 00 00 00 62 00 00 57 41 56 41 4E 54 10 81 90 00
	Setec SetCOS 5.1.0 EMV + AVANT

3B 6E 00 00 80 31 80 65 B0 03 01 01 5E 83 00 00 90 00
	FirstUSA Visa

3B 6E 00 00 80 31 80 65 B0 03 02 01 5E 83 00 00 90 00
	Gemplus GemXpresso 211is

3B 6E 00 FF 45 73 74 45 49 44 20 76 65 72 20 31 2E 30
	Estonian Identity Card (EstEID warm)

3B 6F 00 00 00 67 2. 43 46 49 53 45 12 52 66 FF 81 90 00
	Setec SetCOS 4.3.2

3B 6F 00 00 80 31 E0 5B 4E 4F 4B 00 00 00 00 00 00 02 00
	Norsk-Tipping (Buypass) Monodex card

3B 6F 00 00 80 31 E0 6B 04 06 03 04 40 55 55 55 55 55 55
	Blue American Express Card

3B 6F 00 00 80 5A 08 03 03 00 00 00 24 22 0E E7 82 90 00
	Navigo (contact mode)

3B 6F 00 00 80 5A 08 03 03 00 00 00 24 2A 4A 09 82 90 00
	Navigo (contact mode)

3B 6F 00 00 80 5A 08 03 03 00 00 00 24 2E C1 0D 82 90 00
	passe Navigo, carte int?grale RATP (French metro in Paris)

3B 6F 00 00 80 5A 0A 01 03 20 03 11 24 34 A3 C7 82 90 00
	Navigo Imagine R ((French metro in Paris)

3B 6F 00 FF 53 46 53 45 2D 43 58 33 32 32 2D 56 18 02 02
	Giesecke & Devrient SmartCafe Expert 2.0

3B 75 94 00 00 62 02 02 0[1-3] 01
	Schlumberger Cyberflex 32K e-gate

3B 76 11 00 00 00 9C 11 01 02 02
	Schlumberger Cyberflex Access 32K

3B 76 11 00 00 00 9C 11 01 02 03
	RSA SecureID 5100

3B 76 12 00 00 00 9C 11 01 03 03
	Precise BioMatch (TM) JavaCard (Schlumberger)
	www.precisebiometrics.com

3B 76 98 00 00 00 9C 11 01 01 02
	CyberFlex Access 32

3B 7A 94 00 00 80 65 A2 01 01 01 3D 72 D6 43
	Gemplus GemXpresso Pro R3 E32 PK

3B 7B .. 00 00 80 62 0. 51 56 46 69 6E 45 49 44
	Setec SetCOS 5.1.0

3B 7B 94 00 00 80 65 B0 83 01 0[1,3] 74 83 00 90 00
	Gemplus GemXpresso Pro R3 (E64 PK)

3B 7D 11 00 00 00 31 80 71 8E 64 52 D9 01 00 82 90 00 
	Oberthur Galactic V2

3B 7D 11 00 00 00 31 80 71 8E 64 77 E3 01 00 82 90 00
	Oberthur Cosmo 64k RSA v5

3B 7D 11 00 00 00 31 80 71 8E 64 77 E3 02 00 82 90 00
	Oberthur 64k v5/2.2.0

3B 7D 11 00 00 00 31 80 71 8E 64 86 D6 01 00 81 90 00
	DOD-CAC

3B 7D 18 00 00 00 31 80 71 8E 64 77 E3 01 00 82 90 00
	Oberthur 64k v4/2.1.1

3B 7D 94 00 00 80 31 80 65 B0 83 01 02 90 83 00 90 00
	Gem e-Seal
	(GemSafeXpresso 16k R3.2?)

3B 7D 94 00 00 80 31 80 65 B0 83 01 01 90 83 00 90 00
	GemSafeXpresso 16k R3.2

3B 7E 11 00 00 00 6A 11 63 54 08 30 24 01 .. .. 21 90 01
	Sagem Windows for smart cards

3B 7F 11 00 00 80 31 C0 52 21 57 64 02 18 19 53 83 83 90 00
	banking card (www.caixacatalunya.com)
	student id of Universitat  Autonoma de Barcelona

3B 7E 13 00 00 00 6A 11 63 54 05 48 .. .. .. 01 22 90 00
	Sagem Windows for smart cards

3B 7F 11 00 00 00 31 C0 53 CA C4 01 64 52 D9 04 00 82 90 00
	DoD CAC, Oberthur CosmopolIC V4

3B 7F 18 00 00 00 31 C0 73 9E 01 0B 64 52 D9 03 00 82 90 00
	Oberthur Galactic V3 (32k)

3B 7F 18 00 00 00 31 C0 73 9E 01 0B 64 52 D9 04 00 82 90 00
	Oberthur CosmopolIC

3B 7F 18 00 00 00 31 C0 73 9E 01 0B 64 52 D9 05 00 82 90 00
	Oberthur 32k BIO

3B 81 1F 00 CC 52
	eToken R2 2242

3B 81 80 01 80 80
	Mifare DESFire

3B 82 00 55 22
	GSM-SIM TELE2 Smart (Estonia, prepaid)

3B 82 81 31 76 43 C0 02 C5
	CardOS/M2 V2.01(SLE44CxxS)

3B 82 81 31 76 43 C1 03 C5
	i.ti (ticket card for Collogne/Bonn)
	CardOS M2 Combi V2.02 (SLE44R42S)

3B 83 00 12 10 96
	GSM-SIM T-Mobil D1 (900MHz)

3B 85 00 12 02 01 00 96
	GSM-SIM Victorvox D1 (900MHz)

3B 85 00 87 25 01 38 02
	GSM-SIM Viag Interkom E2 Loop GSM (1800MHz)

3B 85 00 87 25 01 39 00
	GSM-SIM Telfort (Netherlands) 900 MHz

3B 85 40 20 68 01 01 .. ..
	Schlumberger Cryptoflex 8k

3B 85 40 20 68 01 01 03 05
	Schlumberger Cryptoflex Key Generation

3B 85 40 20 68 01 01 05 01
	Schlumberger Cryptoflex 8k

3B 86 40 20 68 01 01 02 04 AC
	Activcard Gold, SchlumbergerSema Cryptoflex 8k

3B 86 80 01 4A 43 4F 50 33 30 12
	Mifare ProX T=CL

3B 87 81 31 40 43 4D 46 43 20 31 33 31 6F
	Telekom Paycard

3B 89 00 91 26 91 06 00 01 22 01 00
	BT Cellnet SIM

3B 89 40 14 47 47 32 36 4D 35 32 38 30
	GSM-SIM e-plus (1800MHz)

3B 8A 00 91 01 00 16 00 01 16 01 00 96
	GSM-SIM T-Mobil D1 (900MHz)

3B 8A 00 91 01 00 16 00 01 20 01 00 96
	GSM-SIM T-D1 prepaid (Xtra)

3B 8A 00 91 91 00 17 00 01 07 03 00 96
	T-Mobile prepaid 2G SIM

3B 8E 80 01 80 91 91 31 C0 64 77 E3 03 00 83 82 90 00 1C
	Belgian Passport

3B 90 95 80 1F C3 59
	Dai Nippon Printing Co., DNP Standard-J T3.1

3B 95 15 40 .. 68 01 02 .. ..
	Schlumberger CryptoFlex 8k v2

3B 95 18 40 FF 62 01 02 01 04
	Schlumberger Cryptoflex 32K e-gate

3B 95 18 40 FF 62 04 01 01 05
	Schlumberger CryptoFlex 32Ko V1

3B 95 18 40 FF 64 02 01 01 02
	Schlumberger CryptoFlex 32Ko

3B 95 94 40 FF 63 01 01 02 01
	Schlumberger Cryptoflex 16Ko

3B 98 13 40 0A A5 03 01 01 01 AD 13 11
	Belgium Electronic ID card

3B 99 94 00 91 08 91 06 00 01 06 06 00
	GSM-SIM Orange-UK (1800)

3B 9A 94 00 91 01 00 17 00 01 23 10 00 96
	GSM-SIM Victorvox D1 (900MHz)

3B 9A 94 00 91 01 00 17 00 01 23 11 00 96
	GSM-SIM Card T-D1 (900MHz)

3B 9B 95 80 1F 47 80 31 A0 73 BE 21 00 53 34 99 05 D0
	GSM-SIM EMT "Diil", prepaid (Estonia)

3B 9D 94 40 23 00 68 20 01 4D 69 6F 43 4F 53 00 90 00
	Miotec (http://www.miotec.fi) smartcard running Miocos 2.0 on an Atmel AT90SC646

3B 9E 95 80 1F C3 80 31 A0 73 BE 21 13 67 29 02 01 04 04 CD 39
	Hutchison/3 3G USIM
	J+ SWIM WIB UMTS SIM Test card
	  http://www.exceldata.es/microprocess/j%2Bswinwibusim.html

3B 9F 21 0E 49 52 44 45 54 4F 20 41 43 53 20 56 34 2E 31 9D
	Foxtel paytv decoder in Australia acs 4.1 Irdeto2

3B 9F .. 80 1F C3 00 68 1. 44 05 01 46 49 53 45 31 C8 .. 90 00 ..
	Setec SetCOS 4.4.1

3B 9F 94 40 1E 00 67 11 43 46 49 53 45 10 52 66 FF 81 90 00
	Setec / FINEID

3B 9F 94 40 1E 00 67 16 43 46 49 53 45 10 52 66 FF 81 90 00
	RSA SecurID 3100 or SETEC or a Utimaco Safeware Smartcard

3B 9F 94 40 1E 00 67 .. 43 46 49 53 45 10 52 66 FF 81 90 00
	SLE66CX160S running SETCOS 4.3.1

3B 9F 94 80 1F C3 00 68 10 44 05 01 46 49 53 45 31 C8 07 90 00 18
	SetCOS 4.3.0 32K RSA
	Instant EID IP2

3B 9F 95 80 1F C3 80 31 E0 73 FE 21 1B B3 E2 01 74 83 0F 90 00 88
	Gemplus GemXplore 3G USIM

3B 9F 96 80 1F C3 80 31 E0 73 FE 21 1B B3 E2 02 7E 83 0F 90 00 82
	Vodafone SIM Card (D2, 1800Mhz, Germany, Twincard, possibly others too?), manufactured by Gemplus (See stamp on the chip)

3B A7 00 40 .. 80 65 A2 08 .. .. ..
	Gemplus GemSAFE Smart Card (8K)

3B A7 00 40 14 80 65 A2 14 01 01 37
	Gemplus GPK4000sdo

3B A7 00 40 18 80 65 A2 08 01 01 52
	Gemplus GPK8000
	GemSAFE Smart Card (8K)

3B A7 00 40 18 80 65 A2 09 01 01 52
	Gemplus GPK16000

3B A7 00 40 18 80 65 A2 09 01 02 52
	Gemplus GPK16000

3B A7 00 40 18 80 65 A2 09 01 03 52
	Gemplus GemSAFE std (GPK16000?)

3B A8 00 81 71 46 5D 00 54 43 4F 53 31 2E 32 00 65
	Telesec TCOS 1.2

3B A8 00 81 71 46 5D 00 54 43 4F 53 31 2E 32 4B 2E
	CeloCom Card with TCOS 1.2

3B AA 00 40 14 47 47 32 47 54 35 53 34 38 30
	GSM-SIM Libertel (900MHz)

3B AA 00 40 80 53 4F 80 53 45 03 04 11 AA A3
	"open platform" ATMEGA "new Generation"
	http://www.masterixweb-italy.com/new/images/articoli/atmega.jpg

3B AB 00 81 31 40 45 80 31 C0 65 08 06 80 00 00 00 00 84
	Reloadable Visa Cash card (Schlumberger), Bank of America

3B AD 00 40 FF 80 31 80 65 B0 05 01 01 5E 83 00 90 00
	Dallas Semiconductor iButton
	JIB

3B B0 11 00 81 31 90 73 F2
	SamOS 2.7

3B B2 11 00 10 80 00 02
	AT88SC0204C (Atmel memory card)

3B B7 11 00 81 31 90 43 A5 .. .. .. .. .. .. ..
	Siemens CardOS/M V1.4 (SLE44C80S)

3B B7 11 00 81 31 90 53 B5 .. .. .. .. .. .. ..
	CardOS EM/V1.4 (SLE44CR80S)

3B B7 18 00 81 31 FE 65 53 50 4B 32 34 90 00 5A
	Giesecke & Devrient Starcos 2.4

3B B7 94 00 81 31 FE 65 53 50 4B 32 32 90 00 D0
	Giesecke & Devrient STARCOS SPK2.2

3B B7 94 00 81 31 FE 65 53 50 4B 32 33 90 00 D1
	Giesecke & Devrient Starcos 2.3
	Deutsche Bank WebSign (RSA-Card)

3B B9 94 00 40 14 47 47 33 4E 48 38 36 34 30
	GSM-SIM card of the Austrian mobile phone provider One, http://www.one.at
	Proximus SIM - Belgium (SetCOS?)

3B BA 13 00 81 31 86 5D 00 64 05 0A 02 01 31 80 90 00 8B
	Telesec TCOS 2 (SLE44)
	 Cryptokarte with RSA-Controller, T=1 Protocol

3B BA 14 00 81 31 86 5D 00 64 05 14 02 02 31 80 90 00 91
	Telesec TCOS 2 (SLE66)

3B BA 94 00 40 14
	GG3RS732S0 ?

3B BA 94 00 40 14 47 47 33 52 53 37 31 36 53 30
	GSM-SIM Viag Interkom E2 Loop (1800MHz)
	GSM-SIM card of the Austrian A1, http://www.a1.net/privat/home

3B BA 96 00 81 31 86 5D 00 64 05 60 02 03 31 80 90 00 66
	Telesec TCOS 2 (SLE66P)

3B BC 94 00 40 14 47 47 33 48 33 35 58 53 32 30 30 30
	GSM-SIM Era-PL
	T-Mobile GSM SIM Card

3B BC 94 00 40 14 47 47 33 48 33 35 58 56 32 30 30 30
	GSM SIM CARD 32K, Vodafone

3B BE 11 00 00 41 01 38 00 00 00 00 00 00 00 00 01 90 00
	ACS (Advanced Card System) ACOS-1

3B BE 11 00 00 41 01 38 00 00 00 00 00 00 00 00 02 90 00
	ACS (Advanced Card System) ACOS-1 8K

3B BE 11 00 00 41 01 38 01 00 03 00 00 00 00 00 02 90 00
	ACOS2 test card from ACS reading off a ACR38U

3B BF 11 00 81 31 FE 45 45 50 41 00 00 00 00 21 00 93 42 00 00 00 00 01
	Austrian BankCard (Old Version - ca. 2004)

3B BF 11 00 81 31 FE 45 45 50 41 00 00 00 00 26 24 68 30 00 00 00 00 AB
	Austrian BankCard  (Maestro + Quick) (New Version, since 02/2005,
	with Digital-Signature etc.)

3B BF 11 00 81 31 .. 45 45 50 41 00 00 00 00 .. .. .. .. 00 00 .. .. ..
	Austrian Quick E-purse

3B BD 18 00 81 31 FE 45 80 51 02 67 04 14 B1 01 01 02 00 81 05 3D
	Austrian "e-Card" (=Health Card), BRANDNEW (since 06/2005)
	special Version of Starcos 3.1

3B BF 11 00 C0 10 31 FE 44 53 4D 40 52 54 20 43 41 46 45 20 31 2E 31 43 C1
	Giesecke&Devrient SmartCafe 1.1

3B BF 18 00 80 31 70 35 53 54 41 52 43 4F 53 20 53 32 31 20 43 90 00 9B
	Giesecke & Devrient STARCOS S2.1

3B BF 18 00 81 31 70 55 53 54 41 52 43 4F 53 20 53 32 31 20 43 90 00 FA
	Giesecke & Devrient STARCOS S2.1

3B BF 18 00 C0 20 31 70 52 53 54 41 52 43 4F 53 20 53 32 31 20 43 90 00 9C
	Giesecke & Devrient SPK 2.1 C

3B BF 94 00 81 31 FE 65 45 4C 55 20 41 75 73 74 72 69 61 20 31 2E 32 38
	A-Trust: trust-sign (Old Version, ca. 2002) for Digital Signature etc.
	A-Trust: a-sign-premium (ca. 2004) "B?rgerkarte" ("Citizen-Card")
	for Identifikation, Digital Signature etc.
	("should be" Starcos 2.3)

3B BF 94 00 81 31 FE 65 45 4C 55 20 41 75 73 74 72 69 61 20 31 2E 32 38

3B D0 A8 FF 81 F1 FB 24 00 1F C3 F4
	Philips DESFire SAM

3B D6 18 00 81 B1 80 7D 1F 03 80 51 00 61 10 30 8F
	ASECard Crypto, http://www.athena-scs.com/product.asp?pid=8

3B DB 11 FF 50 00 FF 00 00 00 00 00 00 00 07 92 16 03
	NEC V-WAY64 v2.1

3B E0 00 00 81 31 20 40 30
	SmarTEC

3B E2 00 00 40 20 49 ..
	Schlumberger Cryptoflex 4k

3B E2 00 00 40 20 49 05
	Schlumberger Cryptoflex DES

3B E2 00 00 40 20 49 06
	Schlumberger Cryptoflex

3B E2 00 00 40 20 49 07
	Schlumberger Cryptoflex Key Generation

3B E2 00 FF C1 10 31 FE 55 C8 02 9C
	Aladdin eToken PRO (USB token)
	Siemens CardOS M4.0

3B E3 00 FF 91 81 71 26 44 00 01 13 20 2D
	Metrebus Card
	(used in Rome to store personal information and Atac subscription.
	Atac is the public transport company of the city of Rome.)
	http://www.atac.roma.it/smart/smart.asp?A=2&S=22&PR=4&LNG=2

3B E6 00 FF 81 31 FE 45 4A 43 4F 50 30 33 07
	IBM JCOP 30/16

3B E6 00 FF 81 31 FE 45 4A 43 4F 50 31 30 05
	IBM JCOP 10/16

3B E6 00 FF 81 31 FE 45 4A 43 4F 50 32 30 06
	IBM JCOP 20/16
	or Datakey Smart Card Model 330J
	(http://www.datakey.com/products/smart_cards/products_sc_330j.shtml)

3B E6 00 FF 81 31 FE 45 4A 43 4F 50 32 31 07
	IBM JCOP ID21

3B E6 00 FF 81 31 FE 45 4A 43 4F 50 33 30 07
	Mifare ProX T=1

3B E6 00 FF 81 31 FE 45 4A 43 4F 50 33 31 06
	IBM JCOP 30/31bio (contact interface)

3B E9 00 00 81 31 FE 45 4A 43 4F 50 34 31 56 32 32 A7
	IBM JCOP v2.2 41

3B E9 00 FF C1 10 31 FE 55 C8 01 20 50 4E 34 30 31 32 AD
	Siemens CardOS/M 3.0 (SLE66CX160S)

3B EA 00 FF 81 31 20 75 00 64 05 14 01 02 31 00 90 00 27
	GCOS-MDK

3B EA 00 FF 81 31 FE 45 54 55 42 2D 43 4B 01 03 01 00 7B
	Technische Universit?t Berlin - Campus Karte
	Maybe Sm at rtCaf? Expert 2.0 (Giesecke & Devrient)
	or GemXpresso 211 PK (Gemplus)
	Includes a Mifare-Chip (1 KB - Memory-Chip)

3B EB 00 00 81 31 42 45 4E 4C 43 68 53 43 4B 30 34 30 31 2B
	Dutch University accesscard & Electronic purse & telphone card

3B EB 00 00 81 31 42 45 4E 4C 43 68 69 70 70 65 72 30 31 0A
	Dutch Post (Chipper)

3B EC 00 FF 81 31 FE 45 A0 00 00 00 56 33 33 30 4A 33 06 00 A1
	Datakey model 330J card, www.datakey.com
	http://www.hmk.de/downloads/datakey/Model_330J_Smart_Card.pdf
	Model 330J JavaCard v2.1.1
	Global Platform v2.0.1 specifications.
	JCCOS operating system applet (Java-based Cryptographic Card
	Operating System)

3B EF 00 00 40 14 80 25 43 45 52 45 53 57 01 16 01 01 03 90 00
	Electronic Identification Card from the FNMT, the Spanish Official
	Certification Authority

3B EF 00 FF 81 31 20 45 42 61 73 69 63 43 61 72 64 20 5A 43 32 2E 33 BD
	ZeitControl BasicCard Enhanced 2.3

3B EF 00 FF 81 31 20 45 42 61 73 69 63 43 61 72 64 20 5A 43 33 2E 33 BC
	Electronic Purse (Elton Senegal)

3B EF 00 FF 81 31 20 75 42 61 73 69 63 43 61 72 64 20 5A 43 33 2E 33 8C
	ZeitControl BasicCard Enhanced 3.3

3B EF 00 FF 81 31 20 75 42 61 73 69 63 43 61 72 64 20 5A 43 33 2E 37 88
	ZeitControl BasicCard Enhanced 3.7

3B EF 00 FF 81 31 20 75 42 61 73 69 63 43 61 72 64 20 5A 43 33 2E 39 86
	ZeitControl BasicCard Enhanced 3.9

3B EF 00 FF 81 31 42 45 .* 38
	UNI-Card

3B EF 00 FF 81 31 50 45 42 61 73 69 63 43 61 72 64 20 5A 43 31 2E 31 CC
	ZeitControl BasicCard Compact 1.1

3B EF 00 FF 81 31 50 45 65 63 .. .. .. .. .. .. .. .. .. .. .. .. .. ..
	GeldKarte v2 (Germany)

3B EF 00 FF 81 31 50 45 65 63 00 00 00 00 00 00 00 00 00 00 00 00 00 00
	Geldkarte v2

3B EF 00 FF 81 31 52 45 4D 46 43 20 49 42 4D 20 34 30 48 39 36 30 31 FB
	IBM MFC 3.5 file system smart card
	(Card from the book "Smart Card Application Development Using Java")

3B EF 00 FF 81 31 60 45 65 63 04 02 11 00 00 00 00 00 A5 32 A5 01 11 B6
	GledKarte
	Siemens M3-Module with a Motorola SC-28.
	G&D (Giesecke&Devrient) Geldkarten-OS mit der Version 11

3B EF 00 FF 81 31 60 45 65 63 06 03 14 02 50 00 06 51 08 11 5E 01 41 90
	Geldkarte from Deutsche Bank, Thomson-Chip

3B EF 00 FF 81 31 66 45 49 42 4D 20 4D 46 43 34 30 30 32 30 38 33 31 A1
	IBM MFC 4.1 file system smart card
	Card from the book "Smart Card Application Development Using Java"
	authors: Uwe Hansmann, Martin. S. Nicklous, Thomas Sch?ck, Achim Schneider, Frank Seliger

3B EF 00 FF 81 31 66 45 65 63 20 20 49 42 4D 20 33 2E 31 20 20 20 20
	IBM eCash

3B EF 00 FF 81 31 66 45 65 63 20 20 49 42 4D 20 33 2E 31 20 20 20 20 CF
	IBM eCash

3B EF 00 FF 81 31 86 45 49 42 4D 20 4D 46 43 34 30 30 30 30 38 33 31 43
	ComCard MFC 4.1

3B EF 00 FF 81 31 FE 45 65 63 11 04 01 02 80 00 0F 27 40 00 03 01 00 E1
	Postbank Geldkarte

3B EF 00 FF 81 31 FE 45 65 63 11 04 01 02 80 00 0F 46 20 04 23 01 00 C4
	Postbank ec/Maestro (Germany)

3B EF 00 FF 81 31 FE 45 80 31 C0 6B 49 42 4D 20 4A 65 74 5A 20 4D 32 39
	UBS Internet Card (IBM JetZ M2)

3B F2 98 00 FF C1 10 31 FE 55 C8 03 15
	Siemens CardOS M 4.01 (SLE66CX320P)

3B F2 18 00 02 C1 0A 31 FE 58 C8 08 74
	Siemens CardOS V4.3B

3B F2 18 00 02 C1 0A 31 FE 55 C8 07 76
	Siemens CardOS V4.3

3B F2 18 00 02 C1 0A 31 FE 58 C8 09 75
	 Siemens CardOS V4.2B

3B F2 18 00 FF C1 0A 31 FE 55 C8 06 8A
	Siemens CardOS M 4.2 (SLE66CX642P)

3B F2 98 00 FF C1 10 31 FE 55 C8 04 12
	CardOS M4.01a (SLE66CX322P)

3B F5 91 00 FF 91 81 71 FE 40 00 41 08 00 00 00 0D
	Contactless Mifare

3B F5 91 00 FF 91 81 71 FE 40 00 41 88 00 00 00 8D
	Contactless Mifare 1k or 4k

3B F6 18 00 FF 81 31 FE 45 4A 43 4F 50 32 30 0E
	IBM JCOP20

3B F6 18 00 FF 81 31 FE 45 4A 43 4F 50 33 31 0E
	IBM JCOP BIO31

3B FA 11 00 02 40 60 43 C6 02 F8 03 03 00 00 90 00
	DeLaRue DX(?)

3B FA 13 00 FF 81 31 80 45 00 31 C1 73 C0 01 00 00 90 00 B1
	OpenPGP

3B FA 94 00 00 81 31 20 43 80 65 A2 01 01 01 3D 72 D6 43 21
	GemXpresso Pro R3 32PK (MPCOS, T=1)

3B FB 13 00 FF 81 31 80 75 5A 43 36 2E 35 20 52 45 56 20 43 64
	ZeitControl BasicCard 6.5, multiapplication with 30 kByte EEPROM

3B FB 13 00 FF 81 31 80 75 5A 43 35 2E 35 20 52 45 56 20 47 63
	ZeitControl BasicCard 5.5

3B FB 13 00 FF C0 80 31 80 75 5A 43 35 2E 34 20 52 45 56 20 41 A5
	ZeitControl BasicCard Professional 5.4 Revision A

3B FB 98 00 FF C1 10 31 FE 55 00 64 05 20 47 03 31 80 00 90 00 F3
	Gemplus GemGate 32K
	distributed by Postecert (www.postecert.it) to legally sign documents

3B FC 98 00 FF C1 10 31 FE 55 C8 03 49 6E 66 6F 63 61 6D 65 72 65 28
	New Card Infocamere (Italy) series 1402...
	 http://www.card.infocamere.it/
	 Siemens Informatica - Siemens M4.01a
	 chip Infineon SLE66CX322P (CC EAL5)
	 Memory EEPROM: 32KB
	 Operating system CARDOS
	 Max numero dei tentativi PIN: 3
	 Pin: da 5 a 8 digit
	 Unblocked by tool CARDOS API 2.2

3B FD 18 00 00 80 31 FE 45 00 31 80 71 8E 64 52 D9 04 00 81 90 00 5B
	Oberthur Card Systems, authentIC

3B FD 94 00 00 81 31 60 65 80 31 C0 69 4D 54 43 4F 53 73 01 01 11 E0
	MTCOS Light, http://www.masktech.de/products/mtcoslight/index.html

3B FE 94 00 FF 80 B1 FA 45 1F 03 45 73 74 45 49 44 20 76 65 72 20 31 2E 30 43
	ESTEID Estonian Identity Card (EstEID cold)

3B FF 11 00 00 81 31 FE 4D 80 25 A0 00 00 00 56 57 44 4B 33 33 30 06 00 D0
	Datakey 32K PKI Smart Card Model 330
	(http://www.datakey.com/products/smart_cards/products_sc_330.shtml)

3B FF 11 00 00 81 71 40 42 00 00 21 01 31 42 52 00 0[0,5] 63 .. .. .. .. 90 00.*
	Smart Card "The Smart Way to Login"
	Used on Acer TravelMate to secure boot

3B FF 11 00 02 40 64 80 69 A2 07 01 03 57 00 00 FF 00 83 00 90 00
	Gemplus GemXpresso

3B FF 13 00 FF 81 31 FE 45 65 63 11 04 50 02 80 00 08 54 00 04 23 05 02 A5
	Maestrocard/Geldkarte (Stadtsparkasse Haltern, Germany)

3B FF 13 00 FF 81 31 FE 5D 80 25 A0 00 00 00 56 57 44 4B 33 32 30 05 00 3F
	Datakey DCOS model 320

3B FF 18 00 FF 81 31 3C 45 65 63 0D 02 31 02 50 00 10 90 00 26 00 04 10 09
	Maestrocard/Geldkarte (Postbank, Germany)

3B FF 18 00 FF 81 31 3C 45 65 63 0D 02 31 02 50 00 10 90 01 55 00 04 10 7B
	Volksbank VR-BankCard (GeldKarte)

3B FF 18 00 FF 81 31 3C 45 65 63 0D 02 31 02 50 00 10 90 07 88 00 04 10 A0
	HBCI-Karte (Berliner Sparkasse, Germany)

3B FF 18 00 FF 81 31 3C 45 65 63 0D 02 31 02 50 00 10 90 05 29 00 04 10 03
	Geldkarte/HBCI(DDV-1) (Stadtsparkasse Vorpommern, Germany)

3B FF 18 00 FF 81 31 3C 45 65 63 0D 02 31 02 50 00 10 90 14 06 00 04 10 3D
	Geldkarte/HBCI(DDV-1) (Staedtische Sparkasse Offenbach, Germany)

3B FF 18 00 FF 81 31 3C 45 65 63 0D 02 31 02 80 00 12 24 30 00 20 04 10 59
	Geldkarte (Germany)

3B FF 18 00 FF 81 31 50 45 65 63 .. .. .. .. .. .. .. .. .. .. .. .. .. ..
	GeldKarte v3 (Germany)

3B FF 18 00 FF 81 31 FE 45 65 63 0D 04 50 02 80 00 08 90 09 70 00 05 00 2A
	Landesbank baden-W?rttemberg Geldkarte

3B FF 18 00 FF 81 31 FE 45 65 63 11 06 40 02 50 00 10 05 50 03 10 05 00 43
	HBCI-Karte (Bordesholmer Sparkasse, Germany)

3B FF 18 00 FF 81 31 FE 45 65 63 11 06 40 02 50 00 10 27 80 03 25 05 00 84
	Volksbank VR-BankCard (GeldKarte)

3B FF 94 00 FF 80 B1 FE 45 1F 03 00 68 D2 76 00 00 28 FF 05 1E 31 80 00 90 00 23
	D-Trust Signature Card (www.d-trust.net):
	- Citizencard of the People of Ulm in Germany (B?rgerkarte)
	- Qualified Electronic Signature Card (Qualifizierte Signaturkarte)

3B FF 95 00 FF 40 0A 80 31 00 73 1A 21 13 57 4A 50 48 60 31 41 47
	Vodafone 64 KB SIM with Javacard

3B FF 95 00 FF 40 0A 80 31 E8 73 F6 21 13 67 4A 47 48 60 31 42 00
	Giesecke & Devrient STARSIM

3F 05 DC 20 FC 00 01
	DigiCash Facility Card

3F 28 00 00 11 14 00 03 68 90 00
	SIMEMU - a DIY GSM SIM card - http://simemu.cjb.net/

3F 2D 00 27 A0 51 82 7D 00 00 00 52 00 0C 90 00
	Porta Moedas Multibanco (Portugeese electronic purse)

3F 2F 00 80 59 AF 02 01 01 30 00 00 0A 0E 83 06 9F 12
	Gemplus GemXplore

3F 2F 00 80 69 AE 02 02 01 36 00 00 0A 0E 83 3E 9F 16
	GSM-SIM e-plus (1800MHz)

3F 2F 00 80 69 AF 02 04 01 36 00 02 0A 0E 83 3E 9F 16
	GSM-SIM D2 CallYa (900MHz)

3F 2F 00 80 69 AF 03 07 03 52 00 00 0A 0E 83 3E 9F 16
	GemXplore 98 V1 16K

3F 2F 00 80 69 AF 03 07 03 52 00 0D 0A 0E 83 3E 9F 16
	GSM-SIM Debitel D2 (900MHz)

3F 2F 00 80 69 AF 03 07 03 5A 00 15 0A 0E 83 3E 9F 16
	Virgin Mobile SIM (Gemplus)

3F 67 25 00 21 20 00 0F 78 90 00
	Bank Nederlandse Gemeenten, BNG Data Services

3F 65 25 .. .. 04 6C 90 .0
	Carte Bancaire (french banking card)

3F 65 25 00 2[2,C] 09 [F,6]9 90 00
	Sesam Vitale (french health card)

3F 65 25 00 2B 09 62 90 00
	Coinamatic SmartyCity smartcard

3F 65 25 00 2B 09 EB 90 00
	Bull Scot 5

3F 65 25 00 52 09 6A 90 00
	French carte Vitale

3F 65 25 08 22 04 68 90 00
	France Telecom card (ex Pastel card)

3F 65 25 08 33 04 20 90 00
	D-Trust card

3F 65 35 64 02 04 6C 90 40
	Postcard (Switzerland)

3F 67 25 00 26 14 00 20 68 90 00
	Pay-TV card from Casema Cable Television, Netherland

3F 67 25 00 2A 20 00 0F 68 90 00
	Carte Grand Voyageur (SNCF : french train company)

3F 67 25 00 2A 20 00 40 68 9F 00
	Swiss Cash card

3F 67 25 00 2A 20 00 4[0,1] 68 90 00
	Dutch ChipKnip, Proton
	(chip Bull CC 60 V1, Bull CC 60 V2 or Bull CC 1000)

3F 67 25 04 21 20 00 07 68 90 00
	Philips TB100 (C-MOS chip)

3F 67 2F 04 11 20 00 00 68 90 00
	BULL HN ITALIA 06/92 - 100.000 - 64MP
	La Sapienza - Universita' di Roma

3F 69 00 00 24 AF 01 70 01 01 FF 90 00
	French GSM SIM card (900MHz)

3F 6C 00 00 24 A0 30 00 FF 00 00 01 00 04 90 00
	Gemplus MCOS 16K DES Sample Card

3F 6C 00 00 25 A0 30 89 76 00 00 04 01 0C 90 00
	MCOS 24k EEPROM

3F 6D 00 00 80 31 80 65 B0 05 01 02 5E 83 00 90 00
	Gemplus GemXpresso 211PK or 211PK-IS

3F 77 18 25 00 29 14 00 62 68 90 00
	Viaccess card

3F 78 12 25 01 40 B0 03 4A 50 20 48 55
	DSS/DTV H

3F 7E 11 25 05 40 B0 08 00 00 4D 59 00 00 00 53 4B 0B 07
	BSkyB Series 11 (DSS satellite TV card)

3F 7F 13 25 03 38 B0 04 FF FF 4A 50 00 00 29 48 55 .. .. ..
	DSS/DTV HU

3F 78 13 25 03 40 B0 20 FF FF 4A 50 00
	DSS/DTV P4

3F FF 95 00 FF 91 81 71 A0 47 00 44 4E 41 53 50 30 31 30 20 52 65 76 41 32 30 48
	DSS/DISH ROM10

3F FF 95 00 FF 91 81 71 A0 47 00 44 4E 41 53 50 30 31 30 20 52 65 76 41 32 31 49
	PayTV card for DishNetwork Sat receiver http://www.dishnetwork.com/

3F FF 95 00 FF 91 81 71 A0 47 00 44 4E 41 53 50 30 31 31 20 52 65 76 42
	NTL digial TV card (Nagravision)

3F FF 95 00 FF 91 81 71 A0 47 00 44 4E 41 53 50 30 31 31 20 52 65 76 42 30 36 4E
	Telewest Broadband (Nagravision)

# do not delete


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 20:44:52 -0000	1.1
+++ .cvsignore	13 Dec 2005 20:45:49 -0000	1.2
@@ -0,0 +1 @@
+pcsc-tools-1.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 20:44:52 -0000	1.1
+++ sources	13 Dec 2005 20:45:49 -0000	1.2
@@ -0,0 +1 @@
+517cb2a5e6d3170f408cc7550223ed89  pcsc-tools-1.4.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 20:51:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 15:51:31 -0500
Subject: owners owners.list,1.446,1.447
Message-ID: <200512132052.jBDKq11p031461@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	owners.list 
Log Message:
+pcsc-tools, Cc perl devel list on pcsc-perl.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- owners.list	13 Dec 2005 20:24:02 -0000	1.446
+++ owners.list	13 Dec 2005 20:51:28 -0000	1.447
@@ -665,7 +665,8 @@
 Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|pcsc-tools|Tools to be used with smart cards and PC/SC|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 13 21:18:33 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Tue, 13 Dec 2005 16:18:33 -0500
Subject: rpms/gnomesword/devel .cvsignore, 1.2, 1.3 gnomesword.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200512132119.jBDLJ3eh000993@cvs-int.fedora.redhat.com>

Author: mpeters

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

Modified Files:
	.cvsignore gnomesword.spec sources 
Log Message:
New upstream version, compiles against rawhide gtkhtml3
Does not work (segmentation fault) so no build request in rawhide until that
is resolved. But it does compile.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jun 2005 12:04:31 -0000	1.2
+++ .cvsignore	13 Dec 2005 21:18:31 -0000	1.3
@@ -1 +1,2 @@
 gnomesword-2.1.2.tar.gz
+gnomesword-2.1.3.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnomesword.spec	15 Sep 2005 12:48:30 -0000	1.5
+++ gnomesword.spec	13 Dec 2005 21:18:31 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           gnomesword           
-Version:        2.1.2
-Release:        2.3%{?dist}
+Version:        2.1.3
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-Patch0:         gnomesword-2.1.2-gettext64.patch
+#Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -15,16 +15,13 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-spell
-BuildRequires:  gtkhtml3-devel
+BuildRequires:  gtkhtml3-devel >= 3.6
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
-# currently broken on x86_64
-# ExcludeArch:    x86_64
-# for x86_64
-%ifarch x86_64
-BuildRequires:  libtool automake autoconf
-%endif
+#%%ifarch x86_64
+#BuildRequires:  libtool automake autoconf
+#%%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -39,16 +36,16 @@
 
 %prep
 %setup -q
-%ifarch x86_64
-%patch0 -p1 -b .gettext64 
-%endif
+#%%ifarch x86_64
+#%%patch0 -p1 -b .gettext64 
+#%%endif
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
-%ifarch x86_64
-libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
-%endif
+#%%ifarch x86_64
+#libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
+#%%endif
 %configure
 make %{?_smp_mflags}
 
@@ -85,11 +82,16 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS ChangeLog NEWS README TODO
 %_bindir/gnomesword2
+%_datadir/gnomesword
 %_datadir/pixmaps/gnomesword
 %_datadir/applications/fedora-gnomesword.desktop
 
 
 %changelog
+* Tue Dec 13 2005 Michael A. Peters  - 2.1.3-1
+- New upstream version, works with gtkhtml3-3.8
+- disable x86_64 patch
+
 * Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.3
 - trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
 - 160186


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jun 2005 12:04:31 -0000	1.2
+++ sources	13 Dec 2005 21:18:31 -0000	1.3
@@ -1 +1,2 @@
 ce1171f19a40256cfdd31f42c979d91c  gnomesword-2.1.2.tar.gz
+b9bb8f16890feb2371d06982505fdbc2  gnomesword-2.1.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 21:52:46 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 13 Dec 2005 16:52:46 -0500
Subject: fedora-security/audit fc4,1.104,1.105 fc5,1.15,1.16
Message-ID: <200512132153.jBDLrGqT001173@cvs-int.fedora.redhat.com>

Author: bressers

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

Modified Files:
	fc4 fc5 
Log Message:
Add outstanding CVE ids.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- fc4	12 Dec 2005 14:10:01 -0000	1.104
+++ fc4	13 Dec 2005 21:52:44 -0000	1.105
@@ -3,6 +3,8 @@
 
 ** are items that need attention
 
+CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
+CVE-2005-4154 ignore (php) don't install untrusted pear packages
 CVE-2005-4077 backport (curl) [since FEDORA-2005-1129]
 CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3193 VULNERABLE (xpdf)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fc5	12 Dec 2005 14:10:01 -0000	1.15
+++ fc5	13 Dec 2005 21:52:44 -0000	1.16
@@ -12,6 +12,8 @@
 
 ** are items that need attention
 
+CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
+CVE-2005-4154 ignore (php) don't install untrusted pear packages
 CVE-2005-4077 VULNERABLE (curl)
 CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3193 VULNERABLE (xpdf)



From fedora-extras-commits at redhat.com  Tue Dec 13 21:54:24 2005
From: fedora-extras-commits at redhat.com (Robert Theisen (trobert))
Date: Tue, 13 Dec 2005 16:54:24 -0500
Subject: web/html/download mirrors.php,1.31,1.32
Message-ID: <200512132154.jBDLss7m001234@cvs-int.fedora.redhat.com>

Author: trobert

Update of /cvs/fedora/web/html/download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1179

Modified Files:
	mirrors.php 
Log Message:
Added coblitz.planet-lab.org links for several geos



Index: mirrors.php
===================================================================
RCS file: /cvs/fedora/web/html/download/mirrors.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mirrors.php	22 Nov 2005 21:33:51 -0000	1.31
+++ mirrors.php	13 Dec 2005 21:54:22 -0000	1.32
@@ -87,6 +87,7 @@
 	    
  • http://srl.cs.jhu.edu/YUM/fedora-core/
    • 
 	    
  •  rsync://srl.cs.jhu.edu/YUM/fedora-core/
    • 
 	    
  • http://fedora.secs.oakland.edu/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
         
 	
 	
  • USA West
@@ -123,6 +124,7 @@
 	    
  • ftp://ftp.applios.net/pub/fedora/linux/core
    • 
 	    
  • ftp://calserv.unl.edu/pub/linux/fedora/linux/core/
    • 
 	    
  • ftp://mirrors.imagi.net/fedora/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Canada
@@ -275,6 +277,7 @@
 	    
  • ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/
    • 
 	    
  • http://download.atrpms.net/mirrors/fedoracore/
    • 
 	    
  • ftp://ftp.fu-berlin.de/linux/fedora/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Greece
@@ -460,6 +463,7 @@
 	    
  • http://mirror.poundhost.com/fedora.redhat.com/
    • 
 	    
  • ftp://mirror.poundhost.com/pub/fedora.redhat.com/
    • 
 	    
  • ftp://ftp2.newnet.co.uk/pub/fedora/linux/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
      
@@ -528,6 +532,7 @@
 	   
  • rsync://ftp.nara.wide.ad.jp/fedora/
    • 
 	   
  • ftp://ftp.dti.ad.jp/pub/Linux/Fedora/core/
    • 
 	   
  • http://ftp.dti.ad.jp/pub/Linux/Fedora/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Korea
@@ -536,6 +541,7 @@
 	   
  • rsync://ftp.kreonet.re.kr/fedora/core/
    • 
 	   
  • ftp://mirror.hostway.co.kr/pub/fedora/
    • 
 	   
  • ftp://ftp.kaist.ac.kr/pub/fedora/linux/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Malaysia



From fedora-extras-commits at redhat.com  Tue Dec 13 21:55:34 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 13 Dec 2005 16:55:34 -0500
Subject: rpms/libsafe/devel README, NONE, 1.1 Makefile, 1.2,
	NONE libsafe-2.0-16.spec, 1.7, NONE libsafe-2.0-16c.patch, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200512132155.jBDLtYvQ001288@cvs-int.fedora.redhat.com>

Author: wtogami

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

Added Files:
	README 
Removed Files:
	Makefile libsafe-2.0-16.spec libsafe-2.0-16c.patch sources 
Log Message:
libsafe is removed from FE4+ because it is redundant to gcc FORTIFY_SOURCE and stack protector.



--- NEW FILE README ---
libsafe is removed from FE4+ because it is redundant to gcc FORTIFY_SOURCE and stack protector.


--- Makefile DELETED ---


--- libsafe-2.0-16.spec DELETED ---


--- libsafe-2.0-16c.patch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 21:56:02 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 13 Dec 2005 16:56:02 -0500
Subject: rpms/libsafe/FC-4 README, NONE, 1.1 Makefile, 1.2, NONE branch, 1.1,
	NONE libsafe-2.0-16.spec, 1.7, NONE libsafe-2.0-16c.patch, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200512132156.jBDLu2eu001347@cvs-int.fedora.redhat.com>

Author: wtogami

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

Added Files:
	README 
Removed Files:
	Makefile branch libsafe-2.0-16.spec libsafe-2.0-16c.patch 
	sources 
Log Message:
libsafe is removed from FE4+ because it is redundant to gcc FORTIFY_SOURCE and stack protector.



--- NEW FILE README ---
libsafe is removed from FE4+ because it is redundant to gcc FORTIFY_SOURCE and stack protector.


--- Makefile DELETED ---


--- branch DELETED ---


--- libsafe-2.0-16.spec DELETED ---


--- libsafe-2.0-16c.patch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 22:06:56 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 17:06:56 -0500
Subject: rpms/tla/devel tla.spec,1.17,1.18
Message-ID: <200512132207.jBDM7QMs003015@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	tla.spec 
Log Message:
* Tue Dec 13 2005 Ville Skytt??  - 1.3.3-2
- Rebuild against new OpenSSL.



Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tla.spec	13 Jun 2005 17:07:15 -0000	1.17
+++ tla.spec	13 Dec 2005 22:06:39 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           tla
 Version:        1.3.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
@@ -71,7 +71,10 @@
 %{_bindir}/tla
 
 %changelog
-* Mon Jun 13 2005 Shahms E. King  - 0.1.3.3-1
+* Tue Dec 13 2005 Ville Skytt??  - 1.3.3-2
+- Rebuild against new OpenSSL.
+
+* Mon Jun 13 2005 Shahms E. King  - 1.3.3-1
 - Update to new upstream version
 
 * Sun May 22 2005 Jeremy Katz  - 1.3.2



From fedora-extras-commits at redhat.com  Tue Dec 13 22:12:01 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 13 Dec 2005 17:12:01 -0500
Subject: rpms/kdesvn/FC-4 kdesvn-0.6.3-desktop.patch,1.1,NONE
Message-ID: <200512132212.jBDMC1PK003088@cvs-int.fedora.redhat.com>

Author: orion

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

Removed Files:
	kdesvn-0.6.3-desktop.patch 
Log Message:
Fixed upstream



--- kdesvn-0.6.3-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 22:16:36 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 13 Dec 2005 17:16:36 -0500
Subject: rpms/kdesvn/devel kdesvn-0.7.1-x.patch,1.2,1.3
Message-ID: <200512132217.jBDMH612003207@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	kdesvn-0.7.1-x.patch 
Log Message:
Revert to full patch that works on FC5


kdesvn-0.7.1-x.patch:

Index: kdesvn-0.7.1-x.patch
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn-0.7.1-x.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdesvn-0.7.1-x.patch	13 Dec 2005 16:55:31 -0000	1.2
+++ kdesvn-0.7.1-x.patch	13 Dec 2005 22:16:34 -0000	1.3
@@ -1,9 +1,36 @@
---- kdesvn-0.7.1/configure.x11	2005-11-25 12:05:40.000000000 -0700
-+++ kdesvn-0.7.1/configure	2005-12-13 09:54:20.000000000 -0700
-@@ -26637,90 +26637,6 @@
- 
+--- kdesvn-0.7.1/configure.orig	2005-11-11 14:25:22.000000000 -0700
++++ kdesvn-0.7.1/configure	2005-11-21 13:16:23.000000000 -0700
+@@ -26605,535 +26605,6 @@
  
+ fi;
  
+-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
+-
+-echo "$as_me:$LINENO: checking for X" >&5
+-echo $ECHO_N "checking for X... $ECHO_C" >&6
+-
+-if test "${kde_cv_have_x+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  # One or both of the vars are not set, and there is no cached value.
+-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
+-   kde_x_includes=NO
+-else
+-   kde_x_includes=$x_includes
+-fi
+-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
+-   kde_x_libraries=NO
+-else
+-   kde_x_libraries=$x_libraries
+-fi
+-
+-# below we use the standard autoconf calls
+-ac_x_libraries=$kde_x_libraries
+-ac_x_includes=$kde_x_includes
+-
+-
+-
+-
 -if test "$ac_x_includes" = NO; then
 -  # Guess where to find include files, by looking for this one X11 .h file.
 -  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
@@ -88,19 +115,424 @@
 -rm -f conftest.err conftest.$ac_ext
 -fi # $ac_x_includes = NO
 -
- if test "$ac_x_libraries" = NO; then
-   # Check for the libraries.
- 
-@@ -26887,12 +26803,6 @@
-   kde_x_libraries=$ac_x_libraries
- fi
- 
+-if test "$ac_x_libraries" = NO; then
+-  # Check for the libraries.
+-
+-  test -z "$x_direct_test_library" && x_direct_test_library=Xt
+-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
+-
+-  # See if we find them without any special options.
+-  # Don't add to $LIBS permanently.
+-  ac_save_LIBS="$LIBS"
+-  LIBS="-l$x_direct_test_library $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-${x_direct_test_function}()
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  LIBS="$ac_save_LIBS"
+-# We can link X programs with no special library path.
+-ac_x_libraries=
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-LIBS="$ac_save_LIBS"
+-# First see if replacing the include by lib works.
+-# Check X11 before X11Rn because it is often a symlink to the current release.
+-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
+-    /usr/X11/lib${kdelibsuff}           \
+-    /usr/X11R6/lib${kdelibsuff}         \
+-    /usr/X11R5/lib${kdelibsuff}         \
+-    /usr/X11R4/lib${kdelibsuff}         \
+-                                        \
+-    /usr/lib${kdelibsuff}/X11           \
+-    /usr/lib${kdelibsuff}/X11R6         \
+-    /usr/lib${kdelibsuff}/X11R5         \
+-    /usr/lib${kdelibsuff}/X11R4         \
+-                                        \
+-    /usr/local/X11/lib${kdelibsuff}     \
+-    /usr/local/X11R6/lib${kdelibsuff}   \
+-    /usr/local/X11R5/lib${kdelibsuff}   \
+-    /usr/local/X11R4/lib${kdelibsuff}   \
+-                                        \
+-    /usr/local/lib${kdelibsuff}/X11     \
+-    /usr/local/lib${kdelibsuff}/X11R6   \
+-    /usr/local/lib${kdelibsuff}/X11R5   \
+-    /usr/local/lib${kdelibsuff}/X11R4   \
+-                                        \
+-    /usr/X386/lib${kdelibsuff}          \
+-    /usr/x386/lib${kdelibsuff}          \
+-    /usr/XFree86/lib${kdelibsuff}/X11   \
+-                                        \
+-    /usr/lib${kdelibsuff}               \
+-    /usr/local/lib${kdelibsuff}         \
+-    /usr/unsupported/lib${kdelibsuff}   \
+-    /usr/athena/lib${kdelibsuff}        \
+-    /usr/local/x11r5/lib${kdelibsuff}   \
+-    /usr/lpp/Xamples/lib${kdelibsuff}   \
+-    /lib/usr/lib${kdelibsuff}/X11       \
+-                                        \
+-    /usr/openwin/lib${kdelibsuff}       \
+-    /usr/openwin/share/lib${kdelibsuff} \
+-    ; \
+-do
+-  for ac_extension in a so sl; do
+-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
+-      ac_x_libraries=$ac_dir
+-      break 2
+-    fi
+-  done
+-done
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi # $ac_x_libraries = NO
+-
+-case "$host" in
+-mips-sgi-irix6*)
+-  ;;
+-*-*-solaris*)
+-  ;;
+-*)
+-  rm -fr conftest.dir
+-if mkdir conftest.dir; then
+-  cd conftest.dir
+-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+-  cat >Imakefile <<'_ACEOF'
+-acfindx:
+-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+-_ACEOF
+-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+-    for ac_extension in a so sl; do
+-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+-	 test -f $ac_im_libdir/libX11.$ac_extension; then
+-	ac_im_usrlibdir=$ac_im_libdir; break
+-      fi
+-    done
+-    # Screen out bogus values from the imake configuration.  They are
+-    # bogus both because they are the default anyway, and because
+-    # using them would break gcc on systems where it needs fixed includes.
+-    case $ac_im_incroot in
+-	/usr/include) ;;
+-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+-    esac
+-    case $ac_im_usrlibdir in
+-	/usr/lib | /lib) ;;
+-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+-    esac
+-  fi
+-  cd ..
+-  rm -fr conftest.dir
+-fi
+-
+-  if test -z "$ac_x_includes"; then
+-    ac_x_includes="."
+-  fi
+-  if test -z "$ac_x_libraries"; then
+-    ac_x_libraries="/usr/lib${kdelibsuff}"
+-  fi
+-esac
+-#from now on we use our own again
+-
+-# when the user already gave --x-includes, we ignore
+-# what the standard autoconf macros told us.
+-if test "$kde_x_includes" = NO; then
+-  kde_x_includes=$ac_x_includes
+-fi
+-
+-# for --x-libraries too
+-if test "$kde_x_libraries" = NO; then
+-  kde_x_libraries=$ac_x_libraries
+-fi
+-
 -if test "$kde_x_includes" = NO; then
 -  { { echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5
 -echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
 -
- if test "$kde_x_libraries" = NO; then
-   { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
- echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}
+-if test "$kde_x_libraries" = NO; then
+-  { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
+-echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+-# Record where we found X for the cache.
+-kde_cv_have_x="have_x=yes \
+-         kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
+-
+-fi
+-
+-eval "$kde_cv_have_x"
+-
+-if test "$have_x" != yes; then
+-  echo "$as_me:$LINENO: result: $have_x" >&5
+-echo "${ECHO_T}$have_x" >&6
+-  no_x=yes
+-else
+-  echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
+-echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
+-fi
+-
+-if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
+-  X_INCLUDES=""
+-  x_includes=".";  else
+-  x_includes=$kde_x_includes
+-  X_INCLUDES="-I$x_includes"
+-fi
+-
+-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
+-  X_LDFLAGS=""
+-  x_libraries="/usr/lib";  else
+-  x_libraries=$kde_x_libraries
+-  X_LDFLAGS="-L$x_libraries"
+-fi
+-all_includes="$X_INCLUDES"
+-all_libraries="$X_LDFLAGS"
+-
+-# Check for libraries that X11R6 Xt/Xaw programs need.
+-ac_save_LDFLAGS="$LDFLAGS"
+-LDFLAGS="$LDFLAGS $X_LDFLAGS"
+-# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+-# check for ICE first), but we must link in the order -lSM -lICE or
+-# we get undefined symbols.  So assume we have SM if we have ICE.
+-# These have to be linked with before -lX11, unlike the other
+-# libraries we check for below, so use a different variable.
+-#  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
+-echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char IceConnectionNumber ();
+-int
+-main ()
+-{
+-IceConnectionNumber ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_ICE_IceConnectionNumber=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_ICE_IceConnectionNumber=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+-  LIBSM="-lSM -lICE"
+-fi
+-
+-LDFLAGS="$ac_save_LDFLAGS"
+-
+-LIB_X11='-lX11 $(LIBSOCKET)'
+-
+-echo "$as_me:$LINENO: checking for libXext" >&5
+-echo $ECHO_N "checking for libXext... $ECHO_C" >&6
+-if test "${kde_cv_have_libXext+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-kde_ldflags_safe="$LDFLAGS"
+-kde_libs_safe="$LIBS"
+-
+-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
+-LIBS="-lXext -lX11 $LIBSOCKET"
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include 
+-#ifdef STDC_HEADERS
+-# include 
+-#endif
+-
+-int
+-main ()
+-{
+-
+-printf("hello Xext\n");
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  kde_cv_have_libXext=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-kde_cv_have_libXext=no
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-
+-LDFLAGS=$kde_ldflags_safe
+-LIBS=$kde_libs_safe
+-
+-fi
+-
+-
+-echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
+-echo "${ECHO_T}$kde_cv_have_libXext" >&6
+-
+-if test "$kde_cv_have_libXext" = "no"; then
+-  { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
+-can't find it itself, we stop here assuming that make wouldn't find
+-them either." >&5
+-echo "$as_me: error: We need a working libXext to proceed. Since configure
+-can't find it itself, we stop here assuming that make wouldn't find
+-them either." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+-LIB_XEXT="-lXext"
+-QTE_NORTTI=""
+-
+-elif test "$kde_use_qt_emb" = "yes"; then
+-    CPPFLAGS=-DQWS
+-  CXXFLAGS="$CXXFLAGS -fno-rtti"
+-  QTE_NORTTI="-fno-rtti -DQWS"
+-  X_PRE_LIBS=""
+-  LIB_X11=""
+-  LIB_XEXT=""
+-  LIB_XRENDER=""
+-  LIBSM=""
+-  X_INCLUDES=""
+-  X_LDFLAGS=""
+-  x_includes=""
+-  x_libraries=""
+-elif test "$kde_use_qt_mac" = "yes"; then
+-      CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
+-  CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
+-  X_PRE_LIBS=""
+-  LIB_X11=""
+-  LIB_XEXT=""
+-  LIB_XRENDER=""
+-  LIBSM=""
+-  X_INCLUDES=""
+-  X_LDFLAGS=""
+-  x_includes=""
+-  x_libraries=""
+-fi
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ 
+ 
+   LIBPTHREAD=""



From fedora-extras-commits at redhat.com  Tue Dec 13 22:30:53 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Tue, 13 Dec 2005 17:30:53 -0500
Subject: CVSROOT avail,1.18,1.19
Message-ID: <200512132231.jBDMVNij003438@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3416

Modified Files:
	avail 
Log Message:
let gdk fix his mess :)


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- avail	7 Dec 2005 18:03:02 -0000	1.18
+++ avail	13 Dec 2005 22:30:51 -0000	1.19
@@ -13,7 +13,7 @@
 # Lock down the CVSROOT directory so ACLs make sense
 unavail | | CVSROOT
 # Access to all files to policy setters
-avail | notting,sopwith,wtogami,katzj | CVSROOT
+avail | notting,sopwith,wtogami,katzj,gdk | CVSROOT
 # trusted developers that can add modules
 avail | | CVSROOT/modules
 avail | kwade | CVSROOT/avail



From fedora-extras-commits at redhat.com  Tue Dec 13 22:34:01 2005
From: fedora-extras-commits at redhat.com (Robert Theisen (trobert))
Date: Tue, 13 Dec 2005 17:34:01 -0500
Subject: web/html/download mirrors.php,1.32,1.33
Message-ID: <200512132234.jBDMYVv0003478@cvs-int.fedora.redhat.com>

Author: trobert

Update of /cvs/fedora/web/html/download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3452

Modified Files:
	mirrors.php 
Log Message:
Updated link for mymirror.asiaosc.org



Index: mirrors.php
===================================================================
RCS file: /cvs/fedora/web/html/download/mirrors.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mirrors.php	13 Dec 2005 21:54:22 -0000	1.32
+++ mirrors.php	13 Dec 2005 22:33:59 -0000	1.33
@@ -546,7 +546,7 @@
 	
    • 
 	
  • Malaysia
 	
 	
    • 
 	
  • New Zealand



From fedora-extras-commits at redhat.com  Tue Dec 13 22:40:13 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 17:40:13 -0500
Subject: rpms/digikam/devel digikam.spec,1.6,1.7
Message-ID: <200512132240.jBDMehNZ003565@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	digikam.spec 
Log Message:
- Try to build for modular X.Org



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- digikam.spec	13 Dec 2005 15:50:43 -0000	1.6
+++ digikam.spec	13 Dec 2005 22:40:11 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -12,7 +12,7 @@
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	gettext autoconf
+BuildRequires:	gettext autoconf libXt-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -48,7 +48,8 @@
 
 %configure \
 	--disable-rpath \
-	--disable-debug
+	--disable-debug \
+	--with-extra-libs=%{_libdir}
 make %{?_smp_mflags}
 
 %install
@@ -119,6 +120,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Add new paths for modular X.Org
 



From fedora-extras-commits at redhat.com  Tue Dec 13 22:54:36 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 17:54:36 -0500
Subject: rpms/digikam/devel digikam.spec, 1.7,
	1.8 digikam-0.8.0-modular-X.patch, 1.1, NONE
Message-ID: <200512132255.jBDMt6G4003644@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	digikam.spec 
Removed Files:
	digikam-0.8.0-modular-X.patch 
Log Message:
- Last chance to make it right (modular X.Org)



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- digikam.spec	13 Dec 2005 22:40:11 -0000	1.7
+++ digikam.spec	13 Dec 2005 22:54:34 -0000	1.8
@@ -1,18 +1,17 @@
 Name:		digikam
 Version:	0.8.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		digikam-0.8.0-modular-X.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	gettext autoconf libXt-devel
+BuildRequires:	libXt-devel libtiff-devel gettext
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -48,8 +47,7 @@
 
 %configure \
 	--disable-rpath \
-	--disable-debug \
-	--with-extra-libs=%{_libdir}
+	--disable-debug
 make %{?_smp_mflags}
 
 %install
@@ -120,6 +118,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Try to build for modular X.Org
 


--- digikam-0.8.0-modular-X.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 22:56:57 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 17:56:57 -0500
Subject: rpms/digikam/devel digikam.spec,1.8,1.9
Message-ID: <200512132257.jBDMvR9i003721@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	digikam.spec 
Log Message:
- Too fast, remove %patch macro



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- digikam.spec	13 Dec 2005 22:54:34 -0000	1.8
+++ digikam.spec	13 Dec 2005 22:56:54 -0000	1.9
@@ -37,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh



From fedora-extras-commits at redhat.com  Tue Dec 13 22:58:53 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 17:58:53 -0500
Subject: rpms/digikam/devel digikam.spec,1.9,1.10
Message-ID: <200512132259.jBDMxNeS003795@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	digikam.spec 
Log Message:
- Remove patch



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- digikam.spec	13 Dec 2005 22:56:54 -0000	1.9
+++ digikam.spec	13 Dec 2005 22:58:51 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -117,6 +117,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Dec 13 2005 Marcin Garski  0.8.0-6
+- Remove patch
+
 * Tue Dec 13 2005 Marcin Garski  0.8.0-5
 - Last chance to make it right (modular X.Org)
 



From fedora-extras-commits at redhat.com  Tue Dec 13 23:09:15 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 13 Dec 2005 18:09:15 -0500
Subject: rpms/kdesvn/devel kdesvn.spec,1.5,1.6
Message-ID: <200512132309.jBDN9kP9005521@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	kdesvn.spec 
Log Message:
Add apr-devel BuildRequires



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdesvn.spec	12 Dec 2005 18:56:16 -0000	1.5
+++ kdesvn.spec	13 Dec 2005 23:09:12 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           kdesvn
 Version:        0.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A subversion client for KDE
 
 Group:          Development/Tools
@@ -12,7 +12,7 @@
 Patch0:         kdesvn-0.7.1-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  subversion-devel, kdelibs-devel, neon-devel
+BuildRequires:  subversion-devel, kdelibs-devel, neon-devel, apr-devel
 BuildRequires:  desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Tue Dec 13 2005 - Orion Poplawski  - 0.7.1-2
+- Add apr-devel BuildRequires
+
 * Fri Dec  9 2005 - Orion Poplawski  - 0.7.1-1
 - New upstream version 0.7.1
 



From fedora-extras-commits at redhat.com  Tue Dec 13 23:15:19 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 18:15:19 -0500
Subject: rpms/digikam/devel digikam.spec,1.10,1.11
Message-ID: <200512132315.jBDNFnih005699@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	digikam.spec 
Log Message:
- Remove autoreconf



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- digikam.spec	13 Dec 2005 22:58:51 -0000	1.10
+++ digikam.spec	13 Dec 2005 23:15:17 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -42,8 +42,6 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
-autoreconf
-
 %configure \
 	--disable-rpath \
 	--disable-debug
@@ -117,6 +115,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Dec 13 2005 Marcin Garski  0.8.0-7
+- Remove autoreconf
+
 * Tue Dec 13 2005 Marcin Garski  0.8.0-6
 - Remove patch
 



From fedora-extras-commits at redhat.com  Tue Dec 13 23:16:08 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:16:08 -0500
Subject: rpms/synce-trayicon - New directory
Message-ID: <200512132316.jBDNG8W6005757@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5745/synce-trayicon

Log Message:
Directory /cvs/extras/rpms/synce-trayicon added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 23:16:13 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:16:13 -0500
Subject: rpms/synce-trayicon/devel - New directory
Message-ID: <200512132316.jBDNGDvj005777@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5745/synce-trayicon/devel

Log Message:
Directory /cvs/extras/rpms/synce-trayicon/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 23:16:40 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:16:40 -0500
Subject: rpms/synce-trayicon Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512132316.jBDNGeB9005814@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5801

Added Files:
	Makefile import.log 
Log Message:
Setup of module synce-trayicon


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 23:16:45 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:16:45 -0500
Subject: rpms/synce-trayicon/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512132316.jBDNGjFd005835@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5801/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module synce-trayicon


--- NEW 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 Dec 13 23:17:48 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:17:48 -0500
Subject: rpms/synce-trayicon import.log,1.1,1.2
Message-ID: <200512132318.jBDNIIaa005931@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5874

Modified Files:
	import.log 
Log Message:
auto-import synce-trayicon-0.9.0-3 on branch devel from synce-trayicon-0.9.0-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/synce-trayicon/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 23:16:38 -0000	1.1
+++ import.log	13 Dec 2005 23:17:46 -0000	1.2
@@ -0,0 +1 @@
+synce-trayicon-0_9_0-3:HEAD:synce-trayicon-0.9.0-3.src.rpm:1134515854



From fedora-extras-commits at redhat.com  Tue Dec 13 23:17:53 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:17:53 -0500
Subject: rpms/synce-trayicon/devel synce-trayicon.desktop, NONE,
	1.1 synce-trayicon.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512132318.jBDNIOmo005943@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5874/devel

Modified Files:
	.cvsignore sources 
Added Files:
	synce-trayicon.desktop synce-trayicon.spec 
Log Message:
auto-import synce-trayicon-0.9.0-3 on branch devel from synce-trayicon-0.9.0-3.src.rpm


--- NEW FILE synce-trayicon.desktop ---
[Desktop Entry]
Name=synce-trayicon
Comment=Showing synce device information in the system tray
Exec=synce-trayicon
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE synce-trayicon.spec ---
Name:           synce-trayicon
Version:        0.9.0
Release:        3
Summary:        Tray icon for use with gnome and synce

Group:          Applications/Communications
License:        GPL
URL:            http://synce.sourceforge.net/
Source0:        http://dl.sf.net/synce/synce-trayicon-0.9.0.tar.gz
Source1:        synce-trayicon.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  synce-devel
BuildRequires:  libgnomeui-devel
BuildRequires:  libgtop2-devel
BuildRequires:  libxml2-devel
BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils

%description
%{summary}

%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
#make install DESTDIR=$RPM_BUILD_ROOT
%makeinstall
%find_lang synce-trayicon

desktop-file-install \
  --vendor=fedora \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category=X-Fedora \
  %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f synce-trayicon.lang
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/synce-trayicon
%{_datadir}/synce/synce_trayicon_properties.glade
%{_datadir}/pixmaps/synce/*.png
%{_datadir}/applications/*

%changelog
* Tue Dec 13 2005 Andreas Bierfert 
0.9.0-3
- add desktop file

* Mon Dec 12 2005 Andreas Bierfert 
0.9.0-2
- fix BR

* Tue Aug 23 2005 Andreas Bierfert 
0.9.0-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synce-trayicon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 23:16:43 -0000	1.1
+++ .cvsignore	13 Dec 2005 23:17:51 -0000	1.2
@@ -0,0 +1 @@
+synce-trayicon-0.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synce-trayicon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 23:16:43 -0000	1.1
+++ sources	13 Dec 2005 23:17:51 -0000	1.2
@@ -0,0 +1 @@
+b639e3f681d01d69e6a1c703ab4fc8e8  synce-trayicon-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 23:18:16 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 13 Dec 2005 18:18:16 -0500
Subject: rpms/kdesvn/devel kdesvn.spec,1.6,1.7
Message-ID: <200512132318.jBDNIkVi005972@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	kdesvn.spec 
Log Message:
Make that apr-util-devel!



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdesvn.spec	13 Dec 2005 23:09:12 -0000	1.6
+++ kdesvn.spec	13 Dec 2005 23:18:14 -0000	1.7
@@ -12,7 +12,7 @@
 Patch0:         kdesvn-0.7.1-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  subversion-devel, kdelibs-devel, neon-devel, apr-devel
+BuildRequires:  subversion-devel, kdelibs-devel, neon-devel, apr-util-devel
 BuildRequires:  desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -97,7 +97,7 @@
 
 %changelog
 * Tue Dec 13 2005 - Orion Poplawski  - 0.7.1-2
-- Add apr-devel BuildRequires
+- Add apr-util-devel BuildRequires
 
 * Fri Dec  9 2005 - Orion Poplawski  - 0.7.1-1
 - New upstream version 0.7.1



From fedora-extras-commits at redhat.com  Tue Dec 13 23:21:21 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:21:21 -0500
Subject: rpms/synce-trayicon/devel synce-trayicon.desktop, 1.1,
	1.2 synce-trayicon.spec, 1.1, 1.2
Message-ID: <200512132321.jBDNLqtL006044@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6014

Modified Files:
	synce-trayicon.desktop synce-trayicon.spec 
Log Message:
- add dist
- tune desktop file



Index: synce-trayicon.desktop
===================================================================
RCS file: /cvs/extras/rpms/synce-trayicon/devel/synce-trayicon.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synce-trayicon.desktop	13 Dec 2005 23:17:51 -0000	1.1
+++ synce-trayicon.desktop	13 Dec 2005 23:21:19 -0000	1.2
@@ -1,5 +1,7 @@
 [Desktop Entry]
 Name=synce-trayicon
+GenericName=Tray icon for SynCE devices
+Icon=synce/synce-color-small.png
 Comment=Showing synce device information in the system tray
 Exec=synce-trayicon
 Terminal=false


Index: synce-trayicon.spec
===================================================================
RCS file: /cvs/extras/rpms/synce-trayicon/devel/synce-trayicon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synce-trayicon.spec	13 Dec 2005 23:17:51 -0000	1.1
+++ synce-trayicon.spec	13 Dec 2005 23:21:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           synce-trayicon
 Version:        0.9.0
-Release:        3
+Release:        4%{?dist}
 Summary:        Tray icon for use with gnome and synce
 
 Group:          Applications/Communications
@@ -53,6 +53,11 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Dec 14 2005 Andreas Bierfert 
+0.9.0-4
+- add dist
+- fix desktop file
+
 * Tue Dec 13 2005 Andreas Bierfert 
 0.9.0-3
 - add desktop file



From fedora-extras-commits at redhat.com  Tue Dec 13 23:28:16 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 18:28:16 -0500
Subject: rpms/krusader/devel krusader.spec,1.4,1.5
Message-ID: <200512132328.jBDNSk1m006126@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	krusader.spec 
Log Message:
- Fix for modular X.Org



Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- krusader.spec	12 Dec 2005 20:56:23 -0000	1.4
+++ krusader.spec	13 Dec 2005 23:28:14 -0000	1.5
@@ -15,7 +15,7 @@
 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:	libXt-devel gettext
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -103,6 +103,9 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Tue Dec 13 23:29:34 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 18:29:34 -0500
Subject: rpms/krusader/devel krusader.spec,1.5,1.6
Message-ID: <200512132330.jBDNU5WN006181@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	krusader.spec 
Log Message:
- Typo



Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- krusader.spec	13 Dec 2005 23:28:14 -0000	1.5
+++ krusader.spec	13 Dec 2005 23:29:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		krusader
 Version:	1.60.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File



From fedora-extras-commits at redhat.com  Tue Dec 13 23:31:36 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:31:36 -0500
Subject: owners owners.list,1.447,1.448
Message-ID: <200512132332.jBDNW6oL006261@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	owners.list 
Log Message:
- add libopensync
- add libopensync-plugin-evolution2
- add libopensync-plugin-file
- add libopensync-plugin-palm
- add libopensync-plugin-python
- add synce-gnomevfs
- add synce-software-manager
- add synce-trayicon



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- owners.list	13 Dec 2005 20:51:28 -0000	1.447
+++ owners.list	13 Dec 2005 23:31:34 -0000	1.448
@@ -505,6 +505,11 @@
 Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|liboil|Library of Optimized Inner Loops, CPU optimized functions|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|libol|Support library for syslog-ng|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
+Fedora Extras|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-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|
 Fedora Extras|libosip|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libotr|Off-The-Record Messaging library and toolkit|paul at xtdnet.nl|extras-qa at fedoraproject.org|
@@ -1114,6 +1119,9 @@
 Fedora Extras|sylpheed|GTK+ based, lightweight, and fast email client|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|synaptic|Graphical frontend for APT package manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|synce|For bugs related to the synce component|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|synce-gnomevfs|Gnome-vfs module for synce|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|synce-software-manager|Software manager for use with synce|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|synce-trayicon|Tray icon for use with gnome and synce|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|synergy|Mouse and keyboard sharing utility|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|system-config-control|Centralized tool for Fedora configuration utilities|ankit644 at yahoo.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 13 23:47:59 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 18:47:59 -0500
Subject: rpms/krusader/devel krusader.spec,1.6,1.7
Message-ID: <200512132348.jBDNmTm6006335@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	krusader.spec 
Log Message:
- Add to BR libacl-devel



Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- krusader.spec	13 Dec 2005 23:29:32 -0000	1.6
+++ krusader.spec	13 Dec 2005 23:47:57 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		krusader
 Version:	1.60.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -14,8 +14,8 @@
 
 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:	libXt-devel gettext
+BuildRequires:	libXt-devel libpng-devel libselinux-devel libacl-devel
+BuildRequires:	automake desktop-file-utils gettext
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -103,6 +103,9 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Tue Dec 13 23:57:27 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 18:57:27 -0500
Subject: rpms/digikam/devel digikam-0.8.0-gcc41.patch, NONE, 1.1 digikam.spec,
	1.11, 1.12
Message-ID: <200512132357.jBDNvvj8006447@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	digikam.spec 
Added Files:
	digikam-0.8.0-gcc41.patch 
Log Message:
- Fix compile on GCC 4.1


digikam-0.8.0-gcc41.patch:

--- NEW FILE digikam-0.8.0-gcc41.patch ---
diff -urN digikam-0.8.0-orig/digikam/digikam/albumdb.h digikam-0.8.0/digikam/digikam/albumdb.h
--- digikam-0.8.0-orig/digikam/digikam/albumdb.h	2005-11-21 20:14:05.000000000 +0100
+++ digikam-0.8.0/digikam/digikam/albumdb.h	2005-12-14 00:52:52.000000000 +0100
@@ -436,7 +436,7 @@
      * @param albumID the id of the albumdb
      * @return the url of the albumdb
      */
-    QString AlbumDB::getAlbumURL(int albumID);
+    QString getAlbumURL(int albumID);
 
     /**
      * Returns the average date of all images for that album.


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- digikam.spec	13 Dec 2005 23:15:17 -0000	1.11
+++ digikam.spec	13 Dec 2005 23:57:25 -0000	1.12
@@ -1,12 +1,13 @@
 Name:		digikam
 Version:	0.8.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		digikam-0.8.0-gcc41.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
@@ -37,6 +38,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -115,6 +117,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Remove autoreconf
 



From fedora-extras-commits at redhat.com  Wed Dec 14 00:16:33 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 19:16:33 -0500
Subject: rpms/digikam/devel digikam.spec,1.12,1.13
Message-ID: <200512140017.jBE0H3kd008247@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	digikam.spec 
Log Message:
- Add libidn-devel to BR



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- digikam.spec	13 Dec 2005 23:57:25 -0000	1.12
+++ digikam.spec	14 Dec 2005 00:16:31 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -12,7 +12,7 @@
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	libXt-devel libtiff-devel gettext
+BuildRequires:	libXt-devel libtiff-devel libidn-devel gettext
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -117,6 +117,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Fix compile on GCC 4.1
 



From fedora-extras-commits at redhat.com  Wed Dec 14 00:28:54 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 19:28:54 -0500
Subject: rpms/digikam/devel digikam.spec,1.13,1.14
Message-ID: <200512140029.jBE0TTd1008346@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	digikam.spec 
Log Message:
- Add libacl-devel to BR



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- digikam.spec	14 Dec 2005 00:16:31 -0000	1.13
+++ digikam.spec	14 Dec 2005 00:28:52 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -12,7 +12,7 @@
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	libXt-devel libtiff-devel libidn-devel gettext
+BuildRequires:	libXt-devel libtiff-devel libidn-devel libacl-devel gettext
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -117,6 +117,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Add libidn-devel to BR
 



From fedora-extras-commits at redhat.com  Wed Dec 14 00:47:46 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 19:47:46 -0500
Subject: rpms/digikam/devel digikam.spec,1.14,1.15
Message-ID: <200512140048.jBE0mGtQ008421@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	digikam.spec 
Log Message:
- Add libart_lgpl-devel and gamin-devel to BR



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- digikam.spec	14 Dec 2005 00:28:52 -0000	1.14
+++ digikam.spec	14 Dec 2005 00:47:43 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -13,6 +13,7 @@
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
 BuildRequires:	libXt-devel libtiff-devel libidn-devel libacl-devel gettext
+BuildRequires:	libart_lgpl-devel gamin-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -117,6 +118,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Add libacl-devel to BR
 



From fedora-extras-commits at redhat.com  Wed Dec 14 02:37:50 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 13 Dec 2005 21:37:50 -0500
Subject: rpms/nmh/FC-3 nmh-1.1-context_read.patch, NONE, 1.1 nmh.spec, 1.10,
	1.11
Message-ID: <200512140238.jBE2cLvE012159@cvs-int.fedora.redhat.com>

Author: bressers

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

Modified Files:
	nmh.spec 
Added Files:
	nmh-1.1-context_read.patch 
Log Message:
Add a patch to prevent multiple reads to read_context from squashing
mhn.defaults settings.


nmh-1.1-context_read.patch:

--- NEW FILE nmh-1.1-context_read.patch ---
diff -urNp nmh-orig/sbr/context_read.c nmh/sbr/context_read.c
--- nmh-orig/sbr/context_read.c	2005-12-13 21:13:07.000000000 -0500
+++ nmh/sbr/context_read.c	2005-12-13 21:13:54.000000000 -0500
@@ -39,6 +39,13 @@ context_read (void)
     register	FILE		*ib;		/* profile and context file pointer */
 
     /*
+     *  If this routine _is_ called again (despite the wanings in the
+     *  comments above), return immediately.
+     */
+    if ( m_defs != 0 )
+        return;
+
+    /*
      *	Find user's home directory.  Try the HOME environment variable first,
      *	the home directory field in the password file if that's not found.
      */


Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/FC-3/nmh.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nmh.spec	13 Dec 2005 13:43:01 -0000	1.10
+++ nmh.spec	14 Dec 2005 02:37:48 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        13.fc3
+Release:        14.fc3
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Patch1:         nmh-1.1-lock_file.patch
 Patch2:         nmh-1.1-empty-content-type.patch
 Patch3:         nmh-1.1-annotate.patch
+Patch4:         nmh-1.1-context_read.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
@@ -34,6 +35,7 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -68,6 +70,10 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Tue Dec 13 2005 Josh Bressers  0:1.1-14.fc3
+- Add a patch to prevent multiple calls to context_read from squashing
+  settings.
+
 * Tue Dec 13 2005 Josh Bressers  0:1.1-13.fc3
 - Add a patch to allow repl to properly annotate messages.
 



From fedora-extras-commits at redhat.com  Wed Dec 14 02:37:56 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 13 Dec 2005 21:37:56 -0500
Subject: rpms/nmh/FC-4 nmh-1.1-context_read.patch, NONE, 1.1 nmh.spec, 1.10,
	1.11
Message-ID: <200512140238.jBE2cRYi012162@cvs-int.fedora.redhat.com>

Author: bressers

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

Modified Files:
	nmh.spec 
Added Files:
	nmh-1.1-context_read.patch 
Log Message:
Add a patch to prevent multiple reads to read_context from squashing
mhn.defaults settings.


nmh-1.1-context_read.patch:

--- NEW FILE nmh-1.1-context_read.patch ---
diff -urNp nmh-orig/sbr/context_read.c nmh/sbr/context_read.c
--- nmh-orig/sbr/context_read.c	2005-12-13 21:13:07.000000000 -0500
+++ nmh/sbr/context_read.c	2005-12-13 21:13:54.000000000 -0500
@@ -39,6 +39,13 @@ context_read (void)
     register	FILE		*ib;		/* profile and context file pointer */
 
     /*
+     *  If this routine _is_ called again (despite the wanings in the
+     *  comments above), return immediately.
+     */
+    if ( m_defs != 0 )
+        return;
+
+    /*
      *	Find user's home directory.  Try the HOME environment variable first,
      *	the home directory field in the password file if that's not found.
      */


Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/FC-4/nmh.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nmh.spec	13 Dec 2005 04:00:18 -0000	1.10
+++ nmh.spec	14 Dec 2005 02:37:54 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        13.fc4
+Release:        14.fc4
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Patch1:         nmh-1.1-lock_file.patch
 Patch2:         nmh-1.1-empty-content-type.patch
 Patch3:         nmh-1.1-annotate.patch
+Patch4:         nmh-1.1-context_read.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
@@ -34,6 +35,7 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -68,6 +70,10 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Tue Dec 13 2005 Josh Bressers  0:1.1-14.fc4
+- Add a patch to prevent multiple calls to context_read from squashing
+  settings.
+
 * Mon Dec 12 2005 Josh Bressers  0:1.1-13.fc4
 - Add a patch to allow repl to properly annotate messages.
 



From fedora-extras-commits at redhat.com  Wed Dec 14 02:38:02 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 13 Dec 2005 21:38:02 -0500
Subject: rpms/nmh/devel nmh-1.1-context_read.patch, NONE, 1.1 nmh.spec, 1.10,
	1.11
Message-ID: <200512140238.jBE2cWnb012165@cvs-int.fedora.redhat.com>

Author: bressers

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

Modified Files:
	nmh.spec 
Added Files:
	nmh-1.1-context_read.patch 
Log Message:
Add a patch to prevent multiple reads to read_context from squashing
mhn.defaults settings.


nmh-1.1-context_read.patch:

--- NEW FILE nmh-1.1-context_read.patch ---
diff -urNp nmh-orig/sbr/context_read.c nmh/sbr/context_read.c
--- nmh-orig/sbr/context_read.c	2005-12-13 21:13:07.000000000 -0500
+++ nmh/sbr/context_read.c	2005-12-13 21:13:54.000000000 -0500
@@ -39,6 +39,13 @@ context_read (void)
     register	FILE		*ib;		/* profile and context file pointer */
 
     /*
+     *  If this routine _is_ called again (despite the wanings in the
+     *  comments above), return immediately.
+     */
+    if ( m_defs != 0 )
+        return;
+
+    /*
      *	Find user's home directory.  Try the HOME environment variable first,
      *	the home directory field in the password file if that's not found.
      */


Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/devel/nmh.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nmh.spec	13 Dec 2005 04:00:24 -0000	1.10
+++ nmh.spec	14 Dec 2005 02:38:00 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        13.fc5
+Release:        14.fc5
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Patch1:         nmh-1.1-lock_file.patch
 Patch2:         nmh-1.1-empty-content-type.patch
 Patch3:         nmh-1.1-annotate.patch
+Patch4:         nmh-1.1-context_read.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
@@ -34,6 +35,7 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -68,6 +70,10 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Tue Dec 13 2005 Josh Bressers  0:1.1-14.fc5
+- Add a patch to prevent multiple calls to context_read from squashing
+  settings.
+
 * Mon Dec 12 2005 Josh Bressers  0:1.1-13.fc5
 - Add a patch to allow repl to properly annotate messages.
 



From fedora-extras-commits at redhat.com  Wed Dec 14 03:37:14 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 13 Dec 2005 22:37:14 -0500
Subject: rpms/munin - New directory
Message-ID: <200512140337.jBE3bEBV015190@cvs-int.fedora.redhat.com>

Author: kevin

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

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




From fedora-extras-commits at redhat.com  Wed Dec 14 03:37:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 13 Dec 2005 22:37:20 -0500
Subject: rpms/munin/devel - New directory
Message-ID: <200512140337.jBE3bK9Q015206@cvs-int.fedora.redhat.com>

Author: kevin

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

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




From fedora-extras-commits at redhat.com  Wed Dec 14 03:37:31 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 13 Dec 2005 22:37:31 -0500
Subject: rpms/munin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512140337.jBE3bVOQ015241@cvs-int.fedora.redhat.com>

Author: kevin

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 14 03:37:37 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 13 Dec 2005 22:37:37 -0500
Subject: rpms/munin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512140337.jBE3bbes015262@cvs-int.fedora.redhat.com>

Author: kevin

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

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


--- NEW 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 Dec 14 03:38:01 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 13 Dec 2005 22:38:01 -0500
Subject: rpms/munin import.log,1.1,1.2
Message-ID: <200512140338.jBE3cVi5015333@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	import.log 
Log Message:
auto-import munin-1.2.4-2.fc5 on branch devel from munin-1.2.4-2.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/munin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Dec 2005 03:37:29 -0000	1.1
+++ import.log	14 Dec 2005 03:37:59 -0000	1.2
@@ -0,0 +1 @@
+munin-1_2_4-2_fc5:HEAD:munin-1.2.4-2.fc5.src.rpm:1134531472



From fedora-extras-commits at redhat.com  Wed Dec 14 03:38:06 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 13 Dec 2005 22:38:06 -0500
Subject: rpms/munin/devel munin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200512140338.jBE3c6O9015326@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	.cvsignore sources 
Added Files:
	munin.spec 
Log Message:
auto-import munin-1.2.4-2.fc5 on branch devel from munin-1.2.4-2.fc5.src.rpm


--- NEW FILE munin.spec ---
Name:      munin
Version:   1.2.4
Release:   2%{?dist}
Summary:   Network-wide graphing framework (grapher/gatherer)
License:   GPL
Group:     System Environment/Daemons
URL:       http://munin.projects.linpro.no/

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

Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
BuildArchitectures: noarch
Provides: perl(RRDs)
Requires: perl-HTML-Template
Requires: perl-Net-Server
Requires: rrdtool
Requires: logrotate
Requires(pre):		fedora-usermgmt >= 0.7
Requires(postun):	fedora-usermgmt >= 0.7

%description
Munin is a highly flexible and powerful solution used to create graphs of
virtually everything imaginable throughout your network, while still
maintaining a rattling ease of installation and configuration.

This package contains the grapher/gatherer. You will only need one instance of
it in your network. It will periodically poll all the nodes in your network
it's aware of for data, which it in turn will use to create graphs and HTML
pages, suitable for viewing with your graphical web browser of choice.

Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent
RRDtool. 

%package node
Group: System Environment/Daemons
Summary: Network-wide graphing framework (node)
BuildArchitectures: noarch
Requires: perl-Net-Server
Requires: procps >= 2.0.7
Requires: sysstat
Requires(pre):		fedora-usermgmt >= 0.7
Requires(postun):	fedora-usermgmt >= 0.7
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service

%description node
Munin is a highly flexible and powerful solution used to create graphs of
virtually everything imaginable throughout your network, while still
maintaining a rattling ease of installation and configuration.

This package contains node software. You should install it on all the nodes
in your network. It will know how to extract all sorts of data from the
node it runs on, and will wait for the gatherer to request this data for
further processing.

It includes a range of plugins capable of extracting common values such as
cpu usage, network usage, load average, and so on. Creating your own plugins
which are capable of extracting other system-specific values is very easy,
and is often done in a matter of minutes. You can also create plugins which
relay information from other devices in your network that can't run Munin,
such as a switch or a server running another operating system, by using
SNMP or similar technology.

Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent
RRDtool. 

%prep
%setup -q
rm -rf %{buildroot}
mkdir -p %{buildroot}

%build

# htmldoc and html2text are not available for Red Hat. Quick hack with perl:
# Skip the PDFs.
perl -pi -e 's,htmldoc munin,cat munin, or s,html(2text|doc),# $&,' Makefile
perl -pi -e 's,\$\(INSTALL.+\.(pdf|txt) \$\(DOCDIR,# $&,' Makefile
make 	CONFIG=dists/redhat/Makefile.config build

%install

## Node
make 	CONFIG=dists/redhat/Makefile.config \
	DOCDIR=%{buildroot}%{_docdir}/%{name}-%{version} \
	MANDIR=%{buildroot}%{_mandir} \
	DESTDIR=%{buildroot} \
    	install-main install-node-non-snmp install-node-plugins install-doc install-man

mkdir -p %{buildroot}/etc/rc.d/init.d
mkdir -p %{buildroot}/etc/munin/plugins
mkdir -p %{buildroot}/etc/munin/plugin-conf.d
mkdir -p %{buildroot}/etc/logrotate.d
mkdir -p %{buildroot}/var/lib/munin
mkdir -p %{buildroot}/var/log/munin

# 
# don't enable munin-node by default. 
#
cat dists/redhat/munin-node.rc | sed -e 's/2345/\-/' > %{buildroot}/etc/rc.d/init.d/munin-node
chmod 755 %{buildroot}/etc/rc.d/init.d/munin-node

install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/
install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/plugin-conf.d/munin-node
install -m0644 dists/debian/munin.logrotate %{buildroot}/etc/logrotate.d/munin
install -m0644 dists/debian/munin-node.logrotate %{buildroot}/etc/logrotate.d/munin-node

# 
# remove the Net::SNMP and Sybase plugins for now, as they need perl modules 
# that are not in extras. We can readd them when/if those modules are added. 
#
rm -f %{buildroot}/usr/share/munin/plugins/pm3users_
rm -f %{buildroot}/usr/share/munin/plugins/snmp_*
rm -f %{buildroot}/usr/share/munin/plugins/sybase_space

## Server
make 	CONFIG=dists/redhat/Makefile.config \
	DESTDIR=%{buildroot} \
	install-main

mkdir -p %{buildroot}/var/www/html/munin
mkdir -p %{buildroot}/var/log/munin
mkdir -p %{buildroot}/etc/cron.d

install -m 0644 dists/redhat/munin.cron.d %{buildroot}/etc/cron.d/munin
install -m 0644 server/style.css %{buildroot}/var/www/html/munin
install -m 0644 ChangeLog %{buildroot}%{_docdir}/%{name}-%{version}/ChangeLog

%clean
rm -rf $RPM_BUILD_ROOT

#
# node package scripts
# uid 18 is the next uid in http://fedoraproject.org/wiki/PackageUserRegistry
#
%pre node
/usr/sbin/fedora-groupadd 18 -r munin &>/dev/null || :
/usr/sbin/fedora-useradd 18 -r -s /sbin/nologin -d /var/lib/munin -M \
                            -c 'Munin user' -g munin munin &>/dev/null || :

%post node
/sbin/chkconfig --add munin-node
/usr/sbin/munin-node-configure --shell | sh

%preun node
test "$1" != 0 || %{_initrddir}/munin-node stop &>/dev/null || :
test "$1" != 0 || /sbin/chkconfig --del munin-node

%postun node
test "$1" != 0 || /usr/sbin/fedora-userdel munin &>/dev/null || :
test "$1" != 0 || /usr/sbin/fedora-groupdel munin &>/dev/null || :

# 
# main package scripts
# uid 18 is the next uid in http://fedoraproject.org/wiki/PackageUserRegistry
#
%pre
/usr/sbin/fedora-groupadd 18 -r munin &>/dev/null || :
/usr/sbin/fedora-useradd 18 -r -s /sbin/nologin -d /var/lib/munin -M \
                            -c 'Munin user' -g munin munin &>/dev/null || :

%postun
test "$1" != 0 || /usr/sbin/fedora-userdel munin &>/dev/null || :
test "$1" != 0 || /usr/sbin/fedora-groupdel munin &>/dev/null || :
 
%files
%defattr(-, root, root)
%doc %{_docdir}/%{name}-%{version}/README.api
%doc %{_docdir}/%{name}-%{version}/README.plugins
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/ChangeLog
%doc %{_docdir}/%{name}-%{version}/README-apache-cgi
%{_bindir}/munin-cron
%{_datadir}/munin/munin-graph
%{_datadir}/munin/munin-html
%{_datadir}/munin/munin-limits
%{_datadir}/munin/munin-update
%{_libdir}/perl5/*perl/5.*/Munin.pm
/var/www/html/munin/cgi/munin-cgi-graph
%dir /etc/munin/templates
%dir /etc/munin
%config(noreplace) /etc/munin/templates/*
%config(noreplace) /etc/cron.d/munin
%config(noreplace) /etc/munin/munin.conf
%config(noreplace) /etc/logrotate.d/munin

%attr(-, munin, munin) %dir /var/lib/munin
%attr(-, munin, munin) %dir /var/run/munin
%attr(-, munin, munin) %dir /var/log/munin
%attr(-, munin, munin) %dir /var/www/html/munin
%attr(-, root, root) %dir /var/www/html/munin/cgi
%attr(-, root, root) /var/www/html/munin/style.css
%doc %{_mandir}/man8/munin-graph*
%doc %{_mandir}/man8/munin-update*
%doc %{_mandir}/man8/munin-limits*
%doc %{_mandir}/man8/munin-html*
%doc %{_mandir}/man8/munin-cron*
%doc %{_mandir}/man5/munin.conf*

%files node
%defattr(-, root, root)
%config(noreplace) /etc/munin/munin-node.conf
%config(noreplace) /etc/munin/plugin-conf.d/munin-node
%config(noreplace) /etc/logrotate.d/munin-node
/etc/rc.d/init.d/munin-node
%config(noreplace) /etc/munin/plugins.conf
%{_sbindir}/munin-run
%{_sbindir}/munin-node
%{_sbindir}/munin-node-configure
%dir /var/log/munin
%dir %{_datadir}/munin
%dir /etc/munin/plugins
%dir /etc/munin
%dir /var/lib/munin
%dir %attr(-, munin, munin) /var/lib/munin/plugin-state
%{_datadir}/munin/plugins/*
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/munin-doc.html
%doc %{_docdir}/%{name}-%{version}/munin-faq.html
%doc %{_mandir}/man8/munin-run*
%doc %{_mandir}/man8/munin-node*
%doc %{_mandir}/man5/munin-node*

%changelog
* Mon Dec 12 2005 Kevin Fenzi  - 1.2.4-2
- Removed plugins that require Net-SNMP and Sybase 

* Tue Dec  6 2005 Kevin Fenzi  - 1.2.4-1
- Inital cleanup for fedora-extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Dec 2005 03:37:34 -0000	1.1
+++ .cvsignore	14 Dec 2005 03:38:04 -0000	1.2
@@ -0,0 +1 @@
+munin_1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Dec 2005 03:37:34 -0000	1.1
+++ sources	14 Dec 2005 03:38:04 -0000	1.2
@@ -0,0 +1 @@
+f91f5d96c01d8527db1d2f4b3f0f4cc5  munin_1.2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 03:41:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 13 Dec 2005 22:41:18 -0500
Subject: owners owners.list,1.448,1.449
Message-ID: <200512140341.jBE3fmNb015398@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	owners.list 
Log Message:
add munin



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- owners.list	13 Dec 2005 23:31:34 -0000	1.448
+++ owners.list	14 Dec 2005 03:41:15 -0000	1.449
@@ -601,6 +601,7 @@
 Fedora Extras|moodss|Powerful modular monitoring graphical application|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Dec 14 07:59:10 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 14 Dec 2005 02:59:10 -0500
Subject: rpms/gnumeric/devel gnumeric.spec,1.12,1.13
Message-ID: <200512140759.jBE7xelR023077@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	gnumeric.spec 
Log Message:
Switch to core version of libgsf now Core has 1.13


Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnumeric.spec	30 Nov 2005 18:42:26 -0000	1.12
+++ gnumeric.spec	14 Dec 2005 07:59:08 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:        A spreadsheet program for GNOME.
 Name:     	gnumeric
 Version: 	1.6.1
-Release: 	1
+Release: 	2
 Epoch:		1
 License:	GPL
 Group:		Applications/Productivity
@@ -18,12 +18,12 @@
 BuildRequires:  libgnomeui-devel >= 2.4.0
 BuildRequires:  libgnomeprintui22-devel >= 2.8.2
 BuildRequires:  python-devel
-BuildRequires:  libgsf113-devel >= 1.13.2
+BuildRequires:  libgsf-devel >= 1.13.2
 BuildRequires:  automake autoconf libtool
 BuildRequires:  intltool scrollkeeper gettext
 BuildRequires:  libgnomedb-devel >= 1.0.4
 BuildRequires:  pygtk2-devel >= 2.6.0
-BuildRequires:  goffice-devel >= 0.1.2
+BuildRequires:  goffice-devel >= 0.1.2-3
 BuildRequires:  guile-devel
 Patch0: gnumeric-1.6.1-desktop.patch
 Patch1: gnumeric-1.4.1-excelcrash.patch
@@ -50,7 +50,6 @@
 %build
 libtoolize --force --copy && aclocal && autoconf
 export mllibname=%{_lib}
-export PKG_CONFIG_PATH=%{_libdir}/libgsf-1.13/lib/pkgconfig
 %configure --without-gb --enable-ssindex
 
 OLD_PO_FILE_INPUT=yes make
@@ -133,6 +132,10 @@
 %{_datadir}/gnumeric/%{version}/idl/*.idl
 
 %changelog
+* Thu Dec  8 2005 Hans de Goede  1:1.6.1-2
+- Switch to core version of libgsf now Core has 1.13 instead of using special
+  Extras libgsf113 version.
+
 * Sat Nov 26 2005 Hans de Goede  1:1.6.1-1
 - new upstream stable version 1.6.1
 - drop 2 integrated patches



From fedora-extras-commits at redhat.com  Wed Dec 14 09:30:43 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 14 Dec 2005 04:30:43 -0500
Subject: fedora-security/audit fc4,1.105,1.106 fc5,1.16,1.17
Message-ID: <200512140931.jBE9VE81027064@cvs-int.fedora.redhat.com>

Author: mjc

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

Modified Files:
	fc4 fc5 
Log Message:
Update for today



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- fc4	13 Dec 2005 21:52:44 -0000	1.105
+++ fc4	14 Dec 2005 09:30:41 -0000	1.106
@@ -1,12 +1,13 @@
-Up to date CVE as of CVE email 20051211
+Up to date CVE as of CVE email 20051213
 Up to date FC4 as of 20051211
 
 ** are items that need attention
 
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
-CVE-2005-4077 backport (curl) [since FEDORA-2005-1129]
+CVE-2005-4077 backport (curl) [since FEDORA-2005-1137]
 CVE-2005-3651 VULNERABLE (ethereal)
+CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)
 CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
@@ -216,7 +217,7 @@
 CVE-2005-2360 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655]
 CVE-2005-2353 ignore (thunderbird) debug mode only
 CVE-2005-2337 version (ruby, fixed 1.8.3) [since FEDORA-2005-936]
-CVE-2005-2335 backport (fetchmail) [since FEDORA-2005-613]
+CVE-2005-2335 version (fetchmail, fixed 6.2.5.2) [since FEDORA-2005-1108] was backport since FEDORA-2005-613
 CVE-2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 CVE-2005-2270 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fc5	13 Dec 2005 21:52:44 -0000	1.16
+++ fc5	14 Dec 2005 09:30:41 -0000	1.17
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20051211
+Up to date CVE as of CVE email 20051213
 Up to date FC5 as of FC5-Test1-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -16,6 +16,7 @@
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
 CVE-2005-4077 VULNERABLE (curl)
 CVE-2005-3651 VULNERABLE (ethereal)
+CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)
 CVE-2005-3193 VULNERABLE (tetex)
@@ -220,7 +221,7 @@
 CVE-2005-2360 version (ethereal, fixed 0.10.12)
 CVE-2005-2353 ignore (thunderbird) debug mode only
 CVE-2005-2337 version (ruby, fixed 1.8.3)
-CVE-2005-2335 version (fetchmail, fixed 6.2.5.1)
+CVE-2005-2335 version (fetchmail, fixed 6.2.5.2)
 CVE-2005-2270 version (firefox, fixed 1.0.5)
 CVE-2005-2270 version (mozilla, fixed 1.7.9)
 CVE-2005-2270 version (thunderbird, fixed 1.0.5)



From fedora-extras-commits at redhat.com  Wed Dec 14 09:44:53 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 14 Dec 2005 04:44:53 -0500
Subject: rpms/inkscape/FC-4 inkscape.spec, 1.13,
	1.14 inkscape-0.41-64bit.patch, 1.2, NONE inkscape-gcc4.patch,
	1.1, NONE
Message-ID: <200512140945.jBE9jNA3027122@cvs-int.fedora.redhat.com>

Author: denis

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

Modified Files:
	inkscape.spec 
Removed Files:
	inkscape-0.41-64bit.patch inkscape-gcc4.patch 
Log Message:
Update to 0.43. Removed unused patches.


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-4/inkscape.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- inkscape.spec	29 Jul 2005 13:51:35 -0000	1.13
+++ inkscape.spec	14 Dec 2005 09:44:50 -0000	1.14
@@ -1,13 +1,12 @@
 Name:           inkscape
-Version:        0.42
-Release:        2%{?dist}
+Version:        0.43
+Release:        1%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://inkscape.sourceforge.net/
 Source0:        http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2
-Patch0:         inkscape-0.42-gettext-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  atk-devel
@@ -18,6 +17,7 @@
 BuildRequires:  gtkmm24-devel
 BuildRequires:  libart_lgpl-devel >= 2.3.10
 BuildRequires:  libgnomeprintui22-devel >= 2.2.0
+BuildRequires:  libgnomeprint22-devel
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libsigc++20-devel
@@ -50,7 +50,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dgettext
 
 
 %build
@@ -59,9 +58,13 @@
 --with-xinerama                \
 --enable-static=no             \
 --with-python                  \
+--with-perl                    \
+--with-gnome-vfs               \
 --with-inkjar
-#temporarily disabled until I can look into it further
-#--with-gnome-print             \
+# turned off, seems very unstable at this point
+#--enable-inkboard             \
+# temporarily disabled until I can look into it further
+#--with-gnome-print            \
 
 make %{?_smp_mflags}
 
@@ -92,7 +95,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README HACKING
+%doc AUTHORS COPYING ChangeLog NEWS README
 %doc %{_mandir}/man1/*
 %{_bindir}/*
 %{_datadir}/%{name}/


--- inkscape-0.41-64bit.patch DELETED ---


--- inkscape-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 14 09:45:44 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Dec 2005 04:45:44 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.25,1.26
Message-ID: <200512140946.jBE9kEe0027148@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	Inventor.spec 
Log Message:
- Remove BR: libXext-devel (Impl. R'd by openmotif-devel).
- Remove BR: xorg-x11-proto-devel (PR #175256).



Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Inventor.spec	8 Dec 2005 08:45:37 -0000	1.25
+++ Inventor.spec	14 Dec 2005 09:45:41 -0000	1.26
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        15%{?dist}
+Release:        16%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -43,9 +43,6 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  libGL-devel
 BuildRequires:	libGLw-devel
-BuildRequires:	libXext-devel
-# Work around to RH shipping libXext without headers
-BuildRequires:  xorg-x11-proto-devel
 # Work around to xorg-x11-proto-devel missing to require X11/Xauth.h
 BuildRequires:	libXau-devel
 # FIXME: Why is libXi required?
@@ -100,8 +97,6 @@
 Requires:	InventorXt = %{version}-%{release}
 Requires:	Inventor-devel = %{version}-%{release}
 Requires:	pkgconfig
-# PR 175256: Missing openmotif-devel dep
-Requires:	xorg-x11-proto-devel
 Requires:	openmotif-devel
 
 %description    -n InventorXt-devel
@@ -317,6 +312,10 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Wed Dec 14 2005 Ralf Corsepius  - 2.1.5-16
+- Remove BR: libXext-devel (Impl. R'd by openmotif-devel).
+- Remove BR: xorg-x11-proto-devel (PR #175256).
+
 * Thu Dec 8 2005 Ralf Corsepius  - 2.1.5-15
 - Further modular X fixes.
 - Reflect modular X pkgconfigs.



From fedora-extras-commits at redhat.com  Wed Dec 14 09:51:44 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 14 Dec 2005 04:51:44 -0500
Subject: rpms/gdesklets import.log,1.2,1.3
Message-ID: <200512140952.jBE9qEtI027242@cvs-int.fedora.redhat.com>

Author: luya

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

Modified Files:
	import.log 
Log Message:
auto-import gdesklets-0.35.2-22 on branch devel from gdesklets-0.35.2-22.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	7 Dec 2005 22:14:44 -0000	1.2
+++ import.log	14 Dec 2005 09:51:42 -0000	1.3
@@ -1 +1,2 @@
 gdesklets-0_35_2-20:HEAD:gdesklets-0.35.2-20.src.rpm:1133993681
+gdesklets-0_35_2-22:HEAD:gdesklets-0.35.2-22.src.rpm:1134553897



From fedora-extras-commits at redhat.com  Wed Dec 14 09:51:49 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 14 Dec 2005 04:51:49 -0500
Subject: rpms/gdesklets/devel gdesklets.spec,1.1,1.2
Message-ID: <200512140952.jBE9qJij027245@cvs-int.fedora.redhat.com>

Author: luya

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

Modified Files:
	gdesklets.spec 
Log Message:
auto-import gdesklets-0.35.2-22 on branch devel from gdesklets-0.35.2-22.src.rpm


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdesklets.spec	7 Dec 2005 22:14:49 -0000	1.1
+++ gdesklets.spec	14 Dec 2005 09:51:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.2
-Release:        20%{?dist}
+Release:        22%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -12,17 +12,16 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
-############################################################################
-#
-# Starting from 0.35.x, gDesklets no longer requires GConf. Future maintainers
-# must avoid using it.
-#
-##########################################################################
+#############################################################
+#							    #
+# Starting from 0.35.x, gDesklets no longer requires GConf. #
+#							    #
+#############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1
+BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
-BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0
-# Requires:	gnome-python2-gconf >= 2.6.0
+BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
+Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
@@ -35,27 +34,23 @@
 tiny displays that sit on your desktop such as status meters, icon
 bars, weather sensors, news tickers.
 
+
 %prep
 %setup -q -n gDesklets-%{version}
 %patch0 -p1 
 
 %build
 
+
 %configure \
-  --disable-schemas-install
+ --disable-schemas-install
 make %{?_smp_mflags}
 
-
-#%_install
-#rm -rf ${RPM_BUILD_ROOT}
-#make -e install DESTDIR=${RPM_BUILD_ROOT}
-
 %install
-[ -n $RPM_BUILD_ROOT -a $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
-env DESTDIR=$RPM_BUILD_ROOT make -e install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
-
 desktop-file-install --vendor=fedora  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
   --add-category X-Fedora \
@@ -64,7 +59,6 @@
   --add-category Utility \
         data/%{name}.desktop
 
-
 mkdir -p  ${RPM_BUILD_ROOT}{%{_bindir},%{_datadir}/%{name}/data/}
 ln -sf ../../../../%{_datadir}/pixmaps/%{name}.png ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/data/%{name}.png
 ln -sf ../../%{_libdir}/%{name}/%{name} ${RPM_BUILD_ROOT}%{_bindir}/%{name}
@@ -85,7 +79,7 @@
 
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %files -f %{name}.lang
@@ -105,6 +99,14 @@
 
 
 %changelog
+* Wed Dec 14 2005 Luya Tshimbalanga  - 0.35.2-22
+- Added desktop-file-utils for build requirement
+- Clean up
+
+* Tue Dec 6 2005 Luya Tshimbalanga  - 0.35.2-21
+- Removed unnecessary comment  
+- More clean up
+
 * Tue Dec 6 2005 Luya Tshimbalanga  - 0.35.2-20
 - Clean up 
 - Fixed the right path for symbolic link



From fedora-extras-commits at redhat.com  Wed Dec 14 09:52:56 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 14 Dec 2005 04:52:56 -0500
Subject: rpms/inkscape/FC-4 .cvsignore, 1.6, 1.7 inkscape.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <200512140953.jBE9rQEj027308@cvs-int.fedora.redhat.com>

Author: denis

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

Modified Files:
	.cvsignore inkscape.spec sources 
Log Message:
Update to 0.43. Removed unused patches.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jul 2005 13:51:35 -0000	1.6
+++ .cvsignore	14 Dec 2005 09:52:54 -0000	1.7
@@ -1,2 +1 @@
-inkscape-0.42.tar.bz2
-inkscape-0.42.tar.bz2.sig
+inkscape-0.43.tar.bz2


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-4/inkscape.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- inkscape.spec	14 Dec 2005 09:44:50 -0000	1.14
+++ inkscape.spec	14 Dec 2005 09:52:54 -0000	1.15
@@ -17,7 +17,6 @@
 BuildRequires:  gtkmm24-devel
 BuildRequires:  libart_lgpl-devel >= 2.3.10
 BuildRequires:  libgnomeprintui22-devel >= 2.2.0
-BuildRequires:  libgnomeprint22-devel
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libsigc++20-devel
@@ -105,6 +104,11 @@
 
 
 %changelog
+* Wed Dec 14 2005 Denis Leroy  - 0.43-1
+- Update to 0.43
+- Enabled Perl script execution
+- Gettext patch no longer necessary, fixed upstream
+
 * Fri Jul 29 2005 Michael Schwendt  - 0.42-2
 - Extend ngettext/dgettext patch for x86_64 build.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jul 2005 13:51:35 -0000	1.6
+++ sources	14 Dec 2005 09:52:54 -0000	1.7
@@ -1,2 +1 @@
-4af587b942647bf9e27861e2238844c8  inkscape-0.42.tar.bz2
-e0a299ff70044fd9a424961bd3ad8c13  inkscape-0.42.tar.bz2.sig
+97c606182f5e177eef70c1e8a55efc1f  inkscape-0.43.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 14 09:58:45 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 14 Dec 2005 04:58:45 -0500
Subject: rpms/tla/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tla.spec, 1.18,
	1.19 tla-sysneon.patch, 1.3, NONE
Message-ID: <200512140959.jBE9xFUD027402@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore sources tla.spec 
Removed Files:
	tla-sysneon.patch 
Log Message:
* Wed Dec 14 2005 Ville Skytt??  - 1.3.3-2
- Apply 1.3.3-3 patchset from Debian; includes system neon patch, adds
  man page and hopefully fixes ppc segfaults etc.
- Specfile cleanups.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Jun 2005 17:07:15 -0000	1.8
+++ .cvsignore	14 Dec 2005 09:58:41 -0000	1.9
@@ -1,2 +1,3 @@
 tla-1.3.3.tar.gz
 tla-1.3.3.tar.gz.sig
+tla_1.3.3-3.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Jun 2005 17:07:15 -0000	1.8
+++ sources	14 Dec 2005 09:58:43 -0000	1.9
@@ -1,2 +1,3 @@
 61d5dea41e071f78a8319401ee07ab0b  tla-1.3.3.tar.gz
 2e176f99458250c04c6cbdb2f71b6b27  tla-1.3.3.tar.gz.sig
+feb23c5632fec91307f29738ec246c12  tla_1.3.3-3.diff.gz


Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tla.spec	13 Dec 2005 22:06:39 -0000	1.18
+++ tla.spec	14 Dec 2005 09:58:43 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           tla
 Version:        1.3.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
@@ -10,7 +10,7 @@
 Source1:        http://ftp.gnu.org/gnu/gnu-arch/%{name}-%{version}.tar.gz.sig
 # Patch0 from SuSE 9.1's tla-1.2-15
 Patch0:         tla-1.2pre0-posix.patch
-Patch1:         tla-sysneon.patch
+Patch1:         http://ftp.debian.org/debian/pool/main/t/tla/tla_1.3.3-3.diff.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +38,6 @@
 %build
 mkdir src/=build
 cd src/=build
-#export CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
 ../configure \
   --prefix=%{_prefix} --with-install-link-tools=yes --with-cc=%{__cc}
 make CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)" # %{?_smp_mflags} # 1.[23] is not parallel build clean
@@ -47,18 +46,20 @@
 mkdir -p docs-tla/html
 (cd ../docs-tla; find .  -name \*.css -o -name \*.html | xargs tar -cf- ) | \
 (cd docs-tla/html; tar -xf-)
+cd ../..
+
+mkdir debian/tmp
+PATH="`pwd`/src/=build/tla/tla:$PATH" perl debian/generate-manpage.pl tla.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd src/=build
-make install destdir=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
+make -C src/=build install \
+    destdir=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
+install -Dpm 644 debian/tmp/tla.1 $RPM_BUILD_ROOT%{_mandir}/man1/tla.1
+rm $RPM_BUILD_ROOT%{_bindir}/awiki
 
-%check || :
-cd src/=build
-make test CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
-
-# don't install "awiki"
-rm $RPM_BUILD_ROOT%{_prefix}/bin/awiki
+%check
+make -C src/=build test CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,8 +70,14 @@
 %{_bindir}/make-links
 %{_bindir}/remove-links
 %{_bindir}/tla
+%{_mandir}/man1/tla.1*
 
 %changelog
+* Wed Dec 14 2005 Ville Skytt??  - 1.3.3-2
+- Apply 1.3.3-3 patchset from Debian; includes system neon patch, adds
+  man page and hopefully fixes ppc segfaults etc.
+- Specfile cleanups.
+
 * Tue Dec 13 2005 Ville Skytt??  - 1.3.3-2
 - Rebuild against new OpenSSL.
 


--- tla-sysneon.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 14 10:00:44 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 14 Dec 2005 05:00:44 -0500
Subject: rpms/tla/devel tla.spec,1.19,1.20
Message-ID: <200512141001.jBEA1Eh3028995@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	tla.spec 
Log Message:
...


Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tla.spec	14 Dec 2005 09:58:43 -0000	1.19
+++ tla.spec	14 Dec 2005 10:00:42 -0000	1.20
@@ -73,7 +73,7 @@
 %{_mandir}/man1/tla.1*
 
 %changelog
-* Wed Dec 14 2005 Ville Skytt??  - 1.3.3-2
+* 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.
 - Specfile cleanups.



From fedora-extras-commits at redhat.com  Wed Dec 14 10:08:21 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 14 Dec 2005 05:08:21 -0500
Subject: rpms/inkscape/FC-4 inkscape-0.42-gettext-x86_64.patch,1.1,NONE
Message-ID: <200512141008.jBEA8L16029125@cvs-int.fedora.redhat.com>

Author: denis

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

Removed Files:
	inkscape-0.42-gettext-x86_64.patch 
Log Message:
Update to 0.43. Removed unused patches.


--- inkscape-0.42-gettext-x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 14 10:15:48 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 14 Dec 2005 05:15:48 -0500
Subject: owners owners.list,1.449,1.450
Message-ID: <200512141016.jBEAGIq3029330@cvs-int.fedora.redhat.com>

Author: denis

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

Modified Files:
	owners.list 
Log Message:
Taking ownership of inkscape


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- owners.list	14 Dec 2005 03:41:15 -0000	1.449
+++ owners.list	14 Dec 2005 10:15:46 -0000	1.450
@@ -387,7 +387,7 @@
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org|
-Fedora Extras|inkscape|A vector-based drawing program using SVG|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|inkscape|A vector-based drawing program using SVG|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Dec 14 10:37:40 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 14 Dec 2005 05:37:40 -0500
Subject: owners owners.list,1.450,1.451
Message-ID: <200512141038.jBEAcA5W029403@cvs-int.fedora.redhat.com>

Author: denis

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

Modified Files:
	owners.list 
Log Message:
Updated my email address to be consistent with Fedora Account system


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -r1.450 -r1.451
--- owners.list	14 Dec 2005 10:15:46 -0000	1.450
+++ owners.list	14 Dec 2005 10:37:38 -0000	1.451
@@ -234,15 +234,15 @@
 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|compton at pcompton.com|extras-qa at fedoraproject.org|
-Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denisleroy at yahoo.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|
 Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gcfilms|Movies collections management|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gcl|GNU Common Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -270,7 +270,7 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 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)|denisleroy at yahoo.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|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|
@@ -296,7 +296,7 @@
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-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|denisleroy at yahoo.com|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|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|compton at pcompton.com|extras-qa at fedoraproject.org|
@@ -333,8 +333,8 @@
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -387,7 +387,7 @@
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org|
-Fedora Extras|inkscape|A vector-based drawing program using SVG|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
@@ -477,15 +477,15 @@
 Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm20|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm24|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm20|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm24|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libgnomedb|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libgsf113|GNOME Structured File library 1.13|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libibverbs|A library for direct userspace use of InfiniBand|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libid3tag|ID3 tag manipulation library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -523,7 +523,7 @@
 Fedora Extras|libsexy|Funky fresh graphical widgets for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
-Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++|Typesafe Signal Framework for C++|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Dec 14 11:42:17 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 14 Dec 2005 06:42:17 -0500
Subject: fedora-security/audit fc4,1.106,1.107 fc5,1.17,1.18
Message-ID: <200512141142.jBEBglYc031179@cvs-int.fedora.redhat.com>

Author: mjc

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

Modified Files:
	fc4 fc5 
Log Message:
Deal with kernel



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- fc4	14 Dec 2005 09:30:41 -0000	1.106
+++ fc4	14 Dec 2005 11:42:15 -0000	1.107
@@ -7,6 +7,7 @@
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
 CVE-2005-4077 backport (curl) [since FEDORA-2005-1137]
 CVE-2005-3651 VULNERABLE (ethereal)
+CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)
@@ -65,7 +66,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 VULNERABLE (kernel)
+CVE-2005-3257 backport (kernel, fixed 2.6.15) [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]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fc5	14 Dec 2005 09:30:41 -0000	1.17
+++ fc5	14 Dec 2005 11:42:15 -0000	1.18
@@ -16,6 +16,7 @@
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
 CVE-2005-4077 VULNERABLE (curl)
 CVE-2005-3651 VULNERABLE (ethereal)
+CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)



From fedora-extras-commits at redhat.com  Wed Dec 14 14:24:30 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 14 Dec 2005 09:24:30 -0500
Subject: rpms/tinyerp/FC-3 tinyerp.spec,1.7,1.8
Message-ID: <200512141425.jBEEP0fB004041@cvs-int.fedora.redhat.com>

Author: sharkcz

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

Modified Files:
	tinyerp.spec 
Log Message:
 - added fedora-usermgmt as Requires(postun) of the server package
 - changed shell for the tinyerp user to /bin/bash



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tinyerp.spec	11 Dec 2005 12:18:39 -0000	1.7
+++ tinyerp.spec	14 Dec 2005 14:24:27 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -38,6 +38,7 @@
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
 Requires(pre):	fedora-usermgmt
+Requires(postun):	fedora-usermgmt
 
 %description server
 Server components for Tiny ERP.
@@ -106,7 +107,7 @@
 
 %pre server
 /usr/sbin/fedora-groupadd 13 -r tinyerp &>/dev/null || :
-/usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
+/usr/sbin/fedora-useradd 13 -r -s /bin/bash -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
 exit 0
@@ -130,6 +131,10 @@
 
 
 %changelog
+* Wed Dec 14 2005 Dan Horak  3.1.1-5
+- added Requires(postun) to the -server package (Ville Skytt??)
+- tinyerp user requires a real shell
+
 * Sun Dec 11 2005 Dan Horak  3.1.1-4
 - moved Requires(pre) to the -server package (Ville Skytt??)
 



From fedora-extras-commits at redhat.com  Wed Dec 14 14:26:19 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 14 Dec 2005 09:26:19 -0500
Subject: rpms/tinyerp/FC-4 tinyerp.spec,1.9,1.10
Message-ID: <200512141426.jBEEQnR2004070@cvs-int.fedora.redhat.com>

Author: sharkcz

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

Modified Files:
	tinyerp.spec 
Log Message:
 - added fedora-usermgmt as Requires(postun) of the server package
 - changed shell for the tinyerp user to /bin/bash



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tinyerp.spec	11 Dec 2005 12:20:51 -0000	1.9
+++ tinyerp.spec	14 Dec 2005 14:26:17 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -38,6 +38,7 @@
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
 Requires(pre):	fedora-usermgmt
+Requires(postun):	fedora-usermgmt
 
 %description server
 Server components for Tiny ERP.
@@ -106,7 +107,7 @@
 
 %pre server
 /usr/sbin/fedora-groupadd 13 -r tinyerp &>/dev/null || :
-/usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
+/usr/sbin/fedora-useradd 13 -r -s /bin/bash -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
 exit 0
@@ -130,6 +131,10 @@
 
 
 %changelog
+* Wed Dec 14 2005 Dan Horak  3.1.1-5
+- added Requires(postun) to the -server package (Ville Skytt??)
+- tinyerp user requires a real shell
+
 * Sun Dec 11 2005 Dan Horak  3.1.1-4
 - moved Requires(pre) to the -server package (Ville Skytt??)
 



From fedora-extras-commits at redhat.com  Wed Dec 14 15:17:07 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 14 Dec 2005 10:17:07 -0500
Subject: rpms/perl-Set-IntSpan/FC-4 .cvsignore, 1.3,
	1.4 perl-Set-IntSpan.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200512141517.jBEFHc8B005905@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Set-IntSpan/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5859/FC-4

Modified Files:
	.cvsignore perl-Set-IntSpan.spec sources 
Log Message:
* Wed Dec 14 2005 Ville Skytt??  - 1.09-1
- 1.09.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-IntSpan/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Oct 2005 06:33:25 -0000	1.3
+++ .cvsignore	14 Dec 2005 15:17:05 -0000	1.4
@@ -1 +1 @@
-Set-IntSpan-1.08.tar.gz
+Set-IntSpan-1.09.tar.gz


Index: perl-Set-IntSpan.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-IntSpan/FC-4/perl-Set-IntSpan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Set-IntSpan.spec	16 Oct 2005 06:33:25 -0000	1.6
+++ perl-Set-IntSpan.spec	14 Dec 2005 15:17:05 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Set-IntSpan
-Version:        1.08
+Version:        1.09
 Release:        1%{?dist}
 Summary:        Perl module for managing sets of integers
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Dec 14 2005 Ville Skytt??  - 1.09-1
+- 1.09.
+
 * Sun Oct 16 2005 Ville Skytt??  - 1.08-1
 - 1.08 (#170944).
 - Specfile cleanups.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-IntSpan/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Oct 2005 06:33:25 -0000	1.3
+++ sources	14 Dec 2005 15:17:05 -0000	1.4
@@ -1 +1 @@
-9d44f23bd2e4f3852e53f703f73fc699  Set-IntSpan-1.08.tar.gz
+161b53631199cc9baf7c7f96ad68a31c  Set-IntSpan-1.09.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 15:17:13 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 14 Dec 2005 10:17:13 -0500
Subject: rpms/perl-Set-IntSpan/devel .cvsignore, 1.3,
	1.4 perl-Set-IntSpan.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200512141517.jBEFHhfu005910@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Set-IntSpan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5859/devel

Modified Files:
	.cvsignore perl-Set-IntSpan.spec sources 
Log Message:
* Wed Dec 14 2005 Ville Skytt??  - 1.09-1
- 1.09.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-IntSpan/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Oct 2005 06:33:26 -0000	1.3
+++ .cvsignore	14 Dec 2005 15:17:11 -0000	1.4
@@ -1 +1 @@
-Set-IntSpan-1.08.tar.gz
+Set-IntSpan-1.09.tar.gz


Index: perl-Set-IntSpan.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-IntSpan/devel/perl-Set-IntSpan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Set-IntSpan.spec	16 Oct 2005 06:33:26 -0000	1.6
+++ perl-Set-IntSpan.spec	14 Dec 2005 15:17:11 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Set-IntSpan
-Version:        1.08
+Version:        1.09
 Release:        1%{?dist}
 Summary:        Perl module for managing sets of integers
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Dec 14 2005 Ville Skytt??  - 1.09-1
+- 1.09.
+
 * Sun Oct 16 2005 Ville Skytt??  - 1.08-1
 - 1.08 (#170944).
 - Specfile cleanups.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-IntSpan/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Oct 2005 06:33:26 -0000	1.3
+++ sources	14 Dec 2005 15:17:11 -0000	1.4
@@ -1 +1 @@
-9d44f23bd2e4f3852e53f703f73fc699  Set-IntSpan-1.08.tar.gz
+161b53631199cc9baf7c7f96ad68a31c  Set-IntSpan-1.09.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 15:55:21 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 14 Dec 2005 10:55:21 -0500
Subject: rpms/ufsparse/devel sources,1.3,1.4 ufsparse.spec,1.5,1.6
Message-ID: <200512141555.jBEFtpK8006183@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	sources ufsparse.spec 
Log Message:
Update to new upstream sources, which contain some new libraries.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Oct 2005 13:21:47 -0000	1.3
+++ sources	14 Dec 2005 15:55:19 -0000	1.4
@@ -1 +1 @@
-78d824bc3261569e3e8c3e4a280ff44d  UFsparse.tar.gz
+8fabcd1b918612cb181bd8935d728ca2  UFsparse.tar.gz


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ufsparse.spec	25 Oct 2005 13:21:47 -0000	1.5
+++ ufsparse.spec	14 Dec 2005 15:55:19 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           ufsparse
-Version:        0.91
-Release:        2%{?dist}
+Version:        0.92
+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/Oct10_2005/UFsparse.tar.gz
+Source0:        http://www.cise.ufl.edu/research/sparse/beta/Dec8_2005/UFsparse.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  blas-devel
@@ -16,12 +16,13 @@
 ufsparse is a collection of libraries for computations involving sparse
 matrices.  The package includes the following libraries:
   AMD         approximate minimum degree ordering
+  BTF         permutation to block triangular form (beta)
   COLAMD      column approximate minimum degree ordering
   CCOLAMD     constrained column approximate minimum degree ordering
   CHOLMOD     sparse Cholesky factorization
   KLU         sparse LU factorization, primarily for circuit simulation
   UMFPACK     sparse LU factorization
-
+  UFconfig    configuration file for all the above packages.
 
 
 %package devel
@@ -63,6 +64,23 @@
   ln -sf libamd.so.%{amd_version} libamd.so
 popd
 
+%define btf_version 0.7
+%define btf_version_major 0
+pushd BTF
+  pushd Lib
+    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libbtf.a
+    gcc -shared -Wl,-soname,libbtf.so.%{btf_version_major} -o libbtf.so.%{btf_version} `ls *.o`
+  popd
+  cp Lib/*.a Lib/*.so* ../Lib
+  cp Include/*.h ../Include
+  mkdir ../Doc/BTF/
+  cp README.txt Doc/lesser.txt ../Doc/BTF/
+popd
+pushd Lib
+  ln -sf libbtf.so.%{btf_version} libbtf.so.%{btf_version_major}
+  ln -sf libbtf.so.%{btf_version} libbtf.so
+popd
+
 %define ccolamd_version 1.0
 %define ccolamd_version_major 1
 pushd CCOLAMD
@@ -78,8 +96,8 @@
   ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so
 popd
 
-%define cholmod_version 0.7
-%define cholmod_version_major 0
+%define cholmod_version 1.0
+%define cholmod_version_major 1
 ### CHOLMOD can also be compiled to use the METIS library, but it is not
 ### used here because its licensing terms exclude it from Fedora Extras.
 ### To compile with METIS, change the definition below to
@@ -122,6 +140,25 @@
   ln -sf libcolamd.so.%{colamd_version} libcolamd.so
 popd
 
+%define klu_version 0.7
+%define klu_version_major 0
+pushd KLU
+  pushd Lib
+    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libklu.a
+    gcc -shared -Wl,-soname,libklu.so.%{klu_version_major} -o libklu.so.%{klu_version} `ls *.o`
+  popd
+  cp Lib/*.a Lib/*.so* ../Lib
+  cp Include/*.h ../Include
+  mkdir ../Doc/KLU/
+  cp README.txt Doc/lesser.txt ../Doc/KLU/
+  mkdir ../Devel/KLU/
+  cp Doc/thesis.pdf Doc/README ../Devel/KLU/
+popd
+pushd Lib
+  ln -sf libklu.so.%{klu_version} libklu.so.%{klu_version_major}
+  ln -sf libklu.so.%{klu_version} libklu.so
+popd
+
 %define ldl_version 1.2
 %define ldl_version_major 1
 pushd LDL
@@ -196,6 +233,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Tue Oct 25 2005 Quentin Spencer  0.92-1
+- Update to Dec 8 2005 version.
+
 * Tue Oct 25 2005 Quentin Spencer  0.91-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Dec 14 15:56:09 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 14 Dec 2005 10:56:09 -0500
Subject: rpms/ufsparse/devel ufsparse.spec,1.6,1.7
Message-ID: <200512141556.jBEFud76006217@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	ufsparse.spec 
Log Message:
Oops, wrong date in changelog.


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ufsparse.spec	14 Dec 2005 15:55:19 -0000	1.6
+++ ufsparse.spec	14 Dec 2005 15:56:07 -0000	1.7
@@ -233,7 +233,7 @@
 %{_libdir}/lib*.so
 
 %changelog
-* Tue Oct 25 2005 Quentin Spencer  0.92-1
+* Wed Dec 14 2005 Quentin Spencer  0.92-1
 - Update to Dec 8 2005 version.
 
 * Tue Oct 25 2005 Quentin Spencer  0.91-2



From fedora-extras-commits at redhat.com  Wed Dec 14 16:12:42 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 14 Dec 2005 11:12:42 -0500
Subject: rpms/abcde/devel .cvsignore, 1.7, 1.8 abcde.spec, 1.8, 1.9 sources,
	1.7, 1.8 abcde-2.3.99-conf.patch, 1.1, NONE
Message-ID: <200512141613.jBEGDCfW007917@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore abcde.spec sources 
Removed Files:
	abcde-2.3.99-conf.patch 
Log Message:
* Wed Dec 14 2005 Ville Skytt??  - 2.3.99.2-1
- 2.3.99.2, config file fixes mostly applied upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Dec 2005 13:10:30 -0000	1.7
+++ .cvsignore	14 Dec 2005 16:12:39 -0000	1.8
@@ -1 +1 @@
-abcde_2.3.99.orig.tar.gz
+abcde_2.3.99.2-1.tar.gz


Index: abcde.spec
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/abcde.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abcde.spec	10 Dec 2005 13:10:30 -0000	1.8
+++ abcde.spec	14 Dec 2005 16:12:39 -0000	1.9
@@ -1,14 +1,13 @@
 Name:           abcde
-Version:        2.3.99
+Version:        2.3.99.2
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
 Group:          Applications/Multimedia
 License:        GPL or Artistic
 URL:            http://www.hispalinux.es/~data/abcde.php
-Source0:        http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
+Source0:        http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}-1.tar.gz
 Patch0:         %{name}-2.1.19-inst.patch
-Patch1:         %{name}-2.3.99-conf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -28,8 +27,8 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1
-sed -i 's/normalize-audio/normalize/g' abcde*
+sed -i -e 's/normalize-audio/normalize/g' abcde*
+sed -i -e 's/^#NOGAP$/#NOGAP=y/' abcde.conf
 
 
 %install
@@ -45,7 +44,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING FAQ README TODO USEPIPES changelog examples/
+%doc COPYING FAQ README TODO USEPIPES debian/changelog examples/
 %config(noreplace) %{_sysconfdir}/abcde.conf
 %{_bindir}/abcde
 %{_bindir}/cddb-tool
@@ -54,6 +53,9 @@
 
 
 %changelog
+* Wed Dec 14 2005 Ville Skytt??  - 2.3.99.2-1
+- 2.3.99.2, config file fixes mostly applied upstream.
+
 * Sat Dec 10 2005 Ville Skytt??  - 2.3.99-1
 - 2.3.99, minor config file fixes.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Dec 2005 13:10:30 -0000	1.7
+++ sources	14 Dec 2005 16:12:39 -0000	1.8
@@ -1 +1 @@
-1310c7d2319dbee4baa27e8deeedc776  abcde_2.3.99.orig.tar.gz
+c76a00786096f89d6b0aa6c052410f67  abcde_2.3.99.2-1.tar.gz


--- abcde-2.3.99-conf.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 14 16:15:59 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 14 Dec 2005 11:15:59 -0500
Subject: rpms/cernlib/FC-4 115-rsrtnt64-goto-outer-block.dpatch, NONE,
	1.1 116-fix-fconc64-spaghetti-code.dpatch, NONE,
	1.1 117-fix-optimizer-bug-in-gphot.dpatch, NONE,
	1.1 211-fix-comis-on-amd64.dpatch, NONE,
	1.1 211-fix-comis-on-ia64.dpatch, NONE,
	1.1 cernlib_2005.05.09.dfsg-3.diff, NONE,
	1.1 304-update-Imake-config-files.dpatch, 1.1,
	1.2 307-use-canonical-cfortran.dpatch, 1.1,
	1.2 315-fixes-for-MacOSX.dpatch, 1.2,
	1.3 701-patch-hbook-comis-Imakefiles.dpatch, 1.1,
	1.2 cernlib.m4, 1.1, 1.2 cernlib.spec, 1.14, 1.15 paw.README,
	1.2, 1.3 211-fix-comis-on-64-bit-arches.dpatch, 1.1,
	NONE cernlib-rsrtnt64_goto_outer_block.diff, 1.1,
	NONE cernlib_2005.05.09.dfsg-2.diff, 1.1, NONE
Message-ID: <200512141615.jBEGFxEV007995@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	304-update-Imake-config-files.dpatch 
	307-use-canonical-cfortran.dpatch 315-fixes-for-MacOSX.dpatch 
	701-patch-hbook-comis-Imakefiles.dpatch cernlib.m4 
	cernlib.spec paw.README 
Added Files:
	115-rsrtnt64-goto-outer-block.dpatch 
	116-fix-fconc64-spaghetti-code.dpatch 
	117-fix-optimizer-bug-in-gphot.dpatch 
	211-fix-comis-on-amd64.dpatch 211-fix-comis-on-ia64.dpatch 
	cernlib_2005.05.09.dfsg-3.diff 
Removed Files:
	211-fix-comis-on-64-bit-arches.dpatch 
	cernlib-rsrtnt64_goto_outer_block.diff 
	cernlib_2005.05.09.dfsg-2.diff 
Log Message:
- use newer debian patchset

retry build on x86_64, who knows...



--- NEW FILE 115-rsrtnt64-goto-outer-block.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 115-rsrtnt64-goto-outer-block.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch from Patrice Dumas  to fix spaghetti code in
## DP: rsrtnt64.F that breaks linking step on Itanium.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/b/rsrtnt64.F cernlib-2005.05.09.dfsg/src/mathlib/gen/b/rsrtnt64.F
--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/b/rsrtnt64.F	1996-04-01 10:01:51.000000000 -0500
+++ cernlib-2005.05.09.dfsg/src/mathlib/gen/b/rsrtnt64.F	2005-12-06 11:22:08.500724891 -0500
@@ -117,8 +117,15 @@
         ENDIF
        ELSE
         IF(N .EQ. 1) THEN
-         ASSIGN 11 TO JMP1
-         GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    11    IF(K .EQ. 0) THEN
           H=H
          ELSEIF(K .EQ. 1) THEN
@@ -174,14 +181,28 @@
            H=2*((H1+B*U)/RT(U)-(H1+B*V)/RT(V))/DELTA
            LB1=11
           ELSEIF(K .EQ. 2) THEN
-           ASSIGN 12 TO JMP1
-           GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    12      H1=DELTA-B**2
            H2=2*A*B
            H=(((H1*U-H2)/RT(U)-(H1*V-H2)/RT(V))/DELTA+H)/C
           ELSEIF(K .EQ. 3) THEN
-           ASSIGN 13 TO JMP1
-           GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    13      H1=C*DELTA
            G1=A*C
            G2=3*B**2
@@ -217,8 +238,32 @@
         ENDIF
        ELSE
         IF(N .EQ. 1) THEN
-         ASSIGN 21 TO JMP2
-         GO TO 20
+      IF(C .EQ. 0) THEN
+       IF(B .EQ. 0) THEN
+        H=LOG(ABS(V/U))/SQRT(A)
+       ELSE
+        IF(A .LT. 0) THEN
+         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
+        ELSE
+         WA=SQRT(A)
+         WU=SQRT(A+B*U)
+         WV=SQRT(A+B*V)
+         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
+        ENDIF
+       ENDIF
+      ELSE
+       A2=2*A
+       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
+        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
+     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
+       ELSEIF(DELTA .EQ. 0) THEN
+        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
+        IF(U*V .GT. 0) H=SIGN(H,U)
+       ELSE
+        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
+        IF(U .LT. 0 .AND. V .LT. 0) H=-H
+       ENDIF
+      ENDIF
    21    IF(K .EQ. -1) THEN
           H=H
          ELSEIF(K .EQ. -2) THEN
@@ -257,8 +302,32 @@
            IF(U. LT. -X0) H=-H
           ENDIF
          ELSE
-          ASSIGN 22 TO JMP2
-          GO TO 20
+      IF(C .EQ. 0) THEN
+       IF(B .EQ. 0) THEN
+        H=LOG(ABS(V/U))/SQRT(A)
+       ELSE
+        IF(A .LT. 0) THEN
+         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
+        ELSE
+         WA=SQRT(A)
+         WU=SQRT(A+B*U)
+         WV=SQRT(A+B*V)
+         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
+        ENDIF
+       ENDIF
+      ELSE
+       A2=2*A
+       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
+        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
+     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
+       ELSEIF(DELTA .EQ. 0) THEN
+        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
+        IF(U*V .GT. 0) H=SIGN(H,U)
+       ELSE
+        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
+        IF(U .LT. 0 .AND. V .LT. 0) H=-H
+       ENDIF
+      ENDIF
    22     IF(K .EQ. -1) THEN
            H1=B*C
            H2=B**2-2*A*C
@@ -287,46 +356,7 @@
         ENDIF
        ENDIF
       ENDIF
-      GO TO 9
-
-   10 C2=2*C
-      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
-       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
-     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
-      ELSEIF(DELTA .EQ. 0) THEN
-       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
-      ELSE
-       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
-      ENDIF
-      GO TO JMP1, (11,12,13)
 
-   20 IF(C .EQ. 0) THEN
-       IF(B .EQ. 0) THEN
-        H=LOG(ABS(V/U))/SQRT(A)
-       ELSE
-        IF(A .LT. 0) THEN
-         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
-        ELSE
-         WA=SQRT(A)
-         WU=SQRT(A+B*U)
-         WV=SQRT(A+B*V)
-         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
-        ENDIF
-       ENDIF
-      ELSE
-       A2=2*A
-       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
-        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
-     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
-       ELSEIF(DELTA .EQ. 0) THEN
-        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
-        IF(U*V .GT. 0) H=SIGN(H,U)
-       ELSE
-        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
-        IF(U .LT. 0 .AND. V .LT. 0) H=-H
-       ENDIF
-      ENDIF
-      GO TO JMP2, (21,22)
 
     9 RES=SIGN(R1,V1-U1)*H
       LRL=LLL


--- NEW FILE 116-fix-fconc64-spaghetti-code.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 116-fix-fconc64-spaghetti-code.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Work around FTBFS on ia64 with recent binutils, apparently caused
## DP: by assignment of goto labels in this file.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/c/fconc64.F cernlib-2005.05.09.dfsg/src/mathlib/gen/c/fconc64.F
--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/c/fconc64.F	1996-04-01 10:02:04.000000000 -0500
+++ cernlib-2005.05.09.dfsg/src/mathlib/gen/c/fconc64.F	2005-12-12 12:58:23.885981128 -0500
@@ -190,15 +190,167 @@
       A=HF*((HF-FM)-TI)
       B=HF*((HF-FM)+TI)
       C=HF
-      ASSIGN 1 TO JP
-      GO TO 20
+   20 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 21 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 1
+       DO 22 J = 1,3
+       V(J-1)=V(J)
+   22  U(J-1)=U(J)
+   21  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 23 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 1
+   23  CONTINUE
+      END IF
+      GO TO 24
     1 R1=R
       R1=R1/ABS(CGM(A+HF))**2
       A=HF*((TH-FM)-TI)
       B=HF*((TH-FM)+TI)
       C=TH
-      ASSIGN 2 TO JP
-      GO TO 20
+  120 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 121 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 2
+       DO 122 J = 1,3
+       V(J-1)=V(J)
+  122  U(J-1)=U(J)
+  121  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 123 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 2
+  123  CONTINUE
+      END IF
+      GO TO 24
     2 R2=R
       FC=RPI*(R1-2*X*R2/ABS(CGM(A-HF))**2)
       IF(LM1) FC=2*FC/SQRT(1-X1)
@@ -209,8 +361,84 @@
       A=(HF+FM)-TI
       B=(HF+FM)+TI
       C=FM+1
-      ASSIGN 3 TO JP
-      GO TO 20
+  220 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 221 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 3
+       DO 222 J = 1,3
+       V(J-1)=V(J)
+  222  U(J-1)=U(J)
+  221  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 223 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 3
+  223  CONTINUE
+      END IF
+      GO TO 24
     3 FC=R
       IF(LM1) FC=SIGN(HF,1-X)*(TAU**2+HF**2)*SQRT(ABS(X**2-1))*FC
       GO TO 99
@@ -220,15 +448,7 @@
       A=HF*((HF-FM)-TI)
       B=HF*((TH-FM)-TI)
       C=1-TI
-      ASSIGN 4 TO JP
-      GO TO 20
-    4 R1=EXP((TI-HF)*LOG(X+X)+CLG(1+TI)-CLG((TH-FM)+TI))*
-     1        R*((HF-FM)+TI)/TI
-      FC=RPW*R1
-      IF(LM1) FC=FC/SQRT(1-X1)
-      GO TO 99
-
-   20 IF(LTA) THEN
+  320 IF(LTA) THEN
        Y=-X1
        Y2=Y**2
        Y3=Y*Y2
@@ -257,7 +477,7 @@
        U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
 
        R=1
-       DO 21 N = 3,NMAX
+       DO 321 N = 3,NMAX
        FN=N
        RR=R
        H(1)=FN-1
@@ -289,23 +509,29 @@
        V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
        U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
        R=U(3)/V(3)
-       IF(ABS(R-RR) .LT. EPS) GO TO JP, (1,2,3,4)
-       DO 22 J = 1,3
+       IF(ABS(R-RR) .LT. EPS) GO TO 4
+       DO 322 J = 1,3
        V(J-1)=V(J)
-   22  U(J-1)=U(J)
-   21  CONTINUE
+  322  U(J-1)=U(J)
+  321  CONTINUE
       ELSE
        W(1)=X1*A*B/C
        R=1+W(1)
-       DO 23 N = 1,NMAX
+       DO 323 N = 1,NMAX
        FN=N
        RR=R
        W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
        R=R+W(1)
-       IF(ABS(R-RR) .LT. EPS) GO TO JP, (1,2,3,4)
-   23  CONTINUE
+       IF(ABS(R-RR) .LT. EPS) GO TO 4
+  323  CONTINUE
       END IF
-      FC=0
+      GO TO 24
+    4 R1=EXP((TI-HF)*LOG(X+X)+CLG(1+TI)-CLG((TH-FM)+TI))*
+     1        R*((HF-FM)+TI)/TI
+      FC=RPW*R1
+      IF(LM1) FC=FC/SQRT(1-X1)
+      GO TO 99
+   24 FC=0
       WRITE(ERRTXT,102) X
       CALL MTLPRT(NAME,'C331.2',ERRTXT)
 #if defined(CERNLIB_DOUBLE)


--- NEW FILE 117-fix-optimizer-bug-in-gphot.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 117-fix-optimizer-bug-in-gphot.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch by Harald Vogt  to work around compiler
## DP: optimization problems in src/geant321/gphys/gphot.F.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gphys/gphot.F cernlib-2005.05.09.dfsg/src/geant321/gphys/gphot.F
--- cernlib-2005.05.09.dfsg~/src/geant321/gphys/gphot.F	1995-10-24 06:21:29.000000000 -0400
+++ cernlib-2005.05.09.dfsg/src/geant321/gphys/gphot.F	2005-12-07 15:01:52.558184613 -0500
@@ -240,7 +240,7 @@
                   ELSE
 C Radiative shell decay
                      JS = JFN+1+2*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 40 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
@@ -296,7 +296,7 @@
                   ELSE
 c Nonradiative decay
                      JS = JFN+1+3*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 60 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN


--- NEW FILE 211-fix-comis-on-amd64.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-amd64.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Large patch from Harald Vogt  to make PAW and Paw++ work
## DP: (at least when statically linked) on 64-bit architectures.
## DP: Slightly modified in an attempt to keep ABI compatibility of the
## DP: dynamic libraries; not that it matters much as they don't work well
## DP: when dynamically linked on 64-bit anyway.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/hbook.h cernlib-2005.05.09.dfsg/src/cfortran/hbook.h
--- cernlib-2005.05.09.dfsg~/src/cfortran/hbook.h	1999-11-15 17:01:12.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/cfortran/hbook.h	2005-12-09 13:27:45.465589336 +0000
@@ -489,6 +489,10 @@
 #define HBALLOC(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
         CCALLSFSUB11(HBALLOC,hballoc,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PINT,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
 
+PROTOCCALLSFSUB11(HBALLOC64,hballoc64,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PLONG,PINT)
+#define HBALLOC64(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
+        CCALLSFSUB11(HBALLOC64,hballoc64,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PLONG,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
+
 PROTOCCALLSFSUB1(HBFREE,hbfree,INT)
 #define HBFREE(LUN) CCALLSFSUB1(HBFREE,hbfree,INT,LUN)
 
@@ -508,6 +512,13 @@
 #define HGNTBF(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)\
         CCALLSFSUB6(HGNTBF,hgntbf,INT,ZTRINGV,INTV,INT,INT,PINT,IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
 
+PROTOCCALLSFSUB6(HGNTBF64,hgntbf64,INT,ZTRINGV,LONGV,INT,INT,PINT)
+/* fix the element length of VAR to 32 */
+#define hgntbf64_ELEMS_2          ZTRINGV_ARGS(4)
+#define hgntbf64_ELEMLEN_2        ZTRINGV_NUM(32)
+#define HGNTBF64(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)\
+        CCALLSFSUB6(HGNTBF64,hgntbf64,INT,ZTRINGV,LONGV,INT,INT,PINT,IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
+
 PROTOCCALLSFSUB1(HGTDIR,hgtdir,PSTRING)
 #define HGTDIR(CHDIR) CCALLSFSUB1(HGTDIR,hgtdir,PSTRING,CHDIR)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/cspack/hcntpar.inc cernlib-2005.05.09.dfsg/src/packlib/cspack/cspack/hcntpar.inc
--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/cspack/hcntpar.inc	1996-03-08 15:44:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/cspack/cspack/hcntpar.inc	2005-12-09 13:27:45.465589336 +0000
@@ -22,7 +22,7 @@
      +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
      +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
      +          ZARIND=11, ZIBLOK=8,  ZNBLOK=10, ZIBANK=9,  ZIFTMP=11,
-     +          ZITMP=10,  ZNTMP=5,   ZNTMP1=3,  ZLINK=6)
+     +          ZITMP=10,  ZNTMP=5,   ZNTMP1=4,  ZLINK=6)
 *
 
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hbook/hcntpar.inc cernlib-2005.05.09.dfsg/src/packlib/hbook/hbook/hcntpar.inc
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hbook/hcntpar.inc	1996-01-16 17:07:52.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hbook/hcntpar.inc	2005-12-09 13:27:46.373451320 +0000
@@ -24,7 +24,7 @@
      +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
      +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
      +          ZARIND=11, ZIBLOK=8,  ZNBLOK=10, ZIBANK=9,  ZIFTMP=11,
-     +          ZID=12,    ZITMP=10,  ZNTMP=6,   ZNTMP1=3,  ZLINK=6)
+     +          ZID=12,    ZITMP=10,  ZNTMP=6,   ZNTMP1=4,  ZLINK=6)
 *
 
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hballoc.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hballoc.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hballoc.F	1996-01-16 17:07:56.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hballoc.F	2005-12-09 13:27:46.617414232 +0000
@@ -42,3 +42,26 @@
       ENDIF
 *
       END
+*
+*     64-bit version (separate to preserve ABI compatibility)
+      SUBROUTINE HBALLOC64(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,
+     +                     IBASE,IOFF,NUSE)
+*
+      CHARACTER*(*)  CHDIR, VAR, BLOCK
+      INTEGER        IDN, ITYPE, ISIZE, NELEM, NUSE, IFIRST, IBASE(1)
+      INTEGER*8      IBUF(1), IOFF
+*
+      LC = LENOCC(CHDIR)
+      LV = LENOCC(VAR)
+      LB = LENOCC(BLOCK)
+*
+      CALL HBALLO1(IDN, CHDIR, LC, VAR, LV, BLOCK, LB, ITYPE, ISIZE,
+     +             IFIRST, NELEM, IBUF, NUSE)
+*
+      IF (NUSE .EQ. 0) THEN
+         IOFF = 0
+      ELSE
+         IOFF = IBUF(1) - %LOC(IBASE(1))/4
+      ENDIF
+*
+      END
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hbnt.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hbnt.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hbnt.F	1996-01-16 17:07:56.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hbnt.F	2005-12-09 13:27:46.644410128 +0000
@@ -269,11 +269,13 @@
  ************************************************************************
  *      *         *                                                     *
  *   1  *         *     Number of variables to be read out              *
- *      *         *     *** For every variable 3 words (ZNTMP1) ***     *
+ *      *         *     *** For every variable 4 words (ZNTMP1) ***     *
  *   2  *         *     Index of variable in LNAME bank                 *
  *   3  *         *     Offset of variable in LNAME bank (INDX-1)*ZNADDR*
  *   4  *         *     Offset in dynamically allocated buffer (only    *
  *      *         *     used via HGNTBF) otherwise 0                    *
+ *   5  *         *     spare (used in 64 bit architectures for upper   *
+ *      *         *     address part)                                   *
  ************************************************************************
 #endif
 *
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgnt2.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgnt2.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgnt2.F	1999-03-05 15:42:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgnt2.F	2005-12-09 13:27:46.644410128 +0000
@@ -34,7 +34,13 @@
 #include "hbook/hcrecv.inc"
 *
       CHARACTER*(*) VAR1(*)
+#if defined(CERNLIB_QMLXIA64)
+      INTEGER*8     IVOFF(*), IOFFST, IOFFSTT
+      INTEGER       IOFFSTV(2)
+      EQUIVALENCE   (IOFFSTV, IOFFSTT)
+#else
       INTEGER       IVOFF(*)
+#endif
       CHARACTER*32  VAR
       INTEGER       ILOGIC, HNMPTR
       LOGICAL       LOGIC, INDVAR, ALLVAR, USEBUF, CHKOFF
@@ -452,10 +458,15 @@
          IQ(LTMP1+JTMP+1)      = IOFF
          IF (USEBUF) THEN
             IF (IEDIF .EQ. 0) THEN
-               IQ(LTMP1+JTMP+2) = IOFFST
+               IOFFSTT = IOFFST
             ELSE
-               IQ(LTMP1+JTMP+2) = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
+               IOFFSTT = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
             ENDIF
+            IQ(LTMP1+JTMP+2) = IOFFSTT
+#if defined(CERNLIB_QMLXIA64)
+*           store upper part of 64 bit address
+            IQ(LTMP1+JTMP+3) = IOFFSTV(2)
+#endif
          ELSE
             IQ(LTMP1+JTMP+2)   = 0
          ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntbf.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntbf.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntbf.F	1996-01-16 17:07:57.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntbf.F	2005-12-09 13:27:46.645409976 +0000
@@ -26,3 +26,13 @@
       CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
 *
       END
+*
+*     64-bit version (separate to preserve ABI compatibility)
+      SUBROUTINE HGNTBF64(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
+      CHARACTER*(*) VAR(*)
+      INTEGER*8     IOFFST(*)
+*
+      NVAR1 = -NVAR
+      CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
+*
+      END
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntf.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntf.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntf.F	1999-03-05 15:42:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntf.F	2005-12-09 13:27:46.645409976 +0000
@@ -37,6 +37,13 @@
       INTEGER       ILOGIC
       LOGICAL       LOGIC, INDVAR, USEBUF
       EQUIVALENCE  (LOGIC, ILOGIC)
+
+#if defined(CERNLIB_QMLXIA64)
+      INTEGER*8     IOFFST, IOFFSTT
+      INTEGER       IOFFSTV(2)
+      EQUIVALENCE   (IOFFSTV, IOFFSTT)
+#endif
+
 *
 #include "hbook/jbyt.inc"
 *
@@ -76,6 +83,12 @@
          INDX   = IQ(LTMP1+JTMP)
          IOFF   = IQ(LTMP1+JTMP+1)
          IOFFST = IQ(LTMP1+JTMP+2)
+#if defined(CERNLIB_QMLXIA64)
+*        fetch full 64 bit address
+         IOFFSTV(1) = IQ(LTMP1+JTMP+2)
+         IOFFSTV(2) = IQ(LTMP1+JTMP+3)
+         IOFFST     = IOFFSTT
+#endif
          IF (IOFFST .EQ. 0) THEN
             USEBUF = .FALSE.
          ELSE
@@ -442,10 +455,15 @@
 *
          IF (USEBUF) THEN
             IF (IEDIF .EQ. 0) THEN
-               IQ(LTMP1+JTMP+2) = IOFFST
+               IOFFSTT = IOFFST
             ELSE
-               IQ(LTMP1+JTMP+2) = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
+               IOFFSTT = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
             ENDIF
+            IQ(LTMP1+JTMP+2) = IOFFSTT
+#if defined(CERNLIB_QMLXIA64)
+*           store upper part of 64 bit address
+            IQ(LTMP1+JTMP+3) = IOFFSTV(2)
+#endif
          ELSE
             IQ(LTMP1+JTMP+2) = 0
          ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c
--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c	2005-12-09 13:27:46.645409976 +0000
@@ -44,7 +44,25 @@
    DummyDef
 #endif
 {
+#if defined(CERNLIB_QMLXIA64)
+   const unsigned long long int mask=0x00000000ffffffff;
+   static unsigned long long int base=1;
+   unsigned long long int jadr=(unsigned long long int) iadr;
+   unsigned long long int jadrl = (mask & jadr);
+
+   if (base == 1) {
+     base = (~mask & jadr);
+   } else if(base != (~mask & jadr)) {
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+     printf("locb_() Warning: changing base from %lx to %lx!!!\n",
+     	   base, (~mask & jadr));
+     printf("This may result in program crash or incorrect results\n");
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+   }
+   return ((int) jadrl);
+#else
    return( (int) iadr );
+#endif
 }
 /*> END <----------------------------------------------------------*/
 #ifdef CERNLIB_TCGEN_LOCB
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/zbook/code/zjump.c cernlib-2005.05.09.dfsg/src/packlib/zbook/code/zjump.c
--- cernlib-2005.05.09.dfsg~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/zbook/code/zjump.c	2005-12-09 13:27:46.971360424 +0000
@@ -7,6 +7,9 @@
  *
  */
 #include "zbook/pilot_c.h"
+#if defined(CERNLIB_QMLXIA64)
+static void (*target)();
+#endif
 #if defined(CERNLIB_UNIX)
 #if defined(CERNLIB_QX_SC)
 zjump_(name,p1,p2,p3,p4)
@@ -18,8 +21,23 @@
 ZJUMP(name,p1,p2,p3,p4)
 #endif
 char *p1, *p2, *p3, *p4;
+
+/*  LP64 compatibility:
+    name is taken from a Fortran array and therefore its address is 32 bit
+    which has to be converted to a 64 bit address to satisfy void (*) (H. Vogt) */
+
+#if defined(CERNLIB_QMLXIA64)
+int *name;
+{
+  long jadr;
+  jadr   = *name;  /* convert int to long */
+  target = (void (*)())jadr;
+  (*target)(p1, p2, p3, p4);
+}
+#else
 void (**name)();
 {
    (**name)(p1, p2, p3, p4);
 }
 #endif
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.05.09.dfsg/src/packlib/zebra/test/brztest/btest2.F
--- cernlib-2005.05.09.dfsg~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/zebra/test/brztest/btest2.F	2005-12-09 13:27:46.971360424 +0000
@@ -29,6 +29,15 @@
 ********************************************************************************
 *
       COMMON/CRZT/IXSTOR,IXDIV,IFENCE(2),LEV,LEVIN,BLVECT(30000)
+
+*     LP64 compatibility:
+*     For 64-bit pointer systems put local variables referenced by LOCF
+*     in a dummy named common block to keep addresses in the program region.
+*     see also: packlib/ffread/test/main.F (H. Vogt)
+
+#if defined(CERNLIB_QMLXIA64)
+      COMMON /TEST64/LBANK
+#endif
       DIMENSION LQ(999),IQ(999),Q(999)
       EQUIVALENCE (IQ(1),Q(1),LQ(9)),(LQ(1),LEV)
 C
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile	2005-12-09 13:27:38.969576880 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile	2005-12-09 13:27:46.971360424 +0000
@@ -50,6 +50,10 @@
 SRCS_F := $(SRCS_F) cscrexec.F
 #endif
 
+#if defined(CERNLIB_QMLXIA64)
+SRCS_F := $(SRCS_F) csrtgpl.F csitgpl.F
+#endif
+
 #if defined(CERNLIB_OLD)
 SRCS_F := $(SRCS_F) cspdir.F csrmbk.F
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F	1996-02-26 17:16:25.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F	2005-12-09 13:27:46.972360272 +0000
@@ -17,8 +17,14 @@
       INTEGER CSLTGP,CSITGP
       CHARACTER*32 NAME
 #include "comis/cstab.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       INTEGER CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      INTEGER*8 CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)
       NAME=CHNAME
       NC=LENOCC(NAME)
       CALL CSCHID(NAME(:NC))
@@ -26,21 +32,39 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
+#endif
+#endif
+#if defined(CERNLIB_SHL)
           ELSE
             I=0
           ENDIF
         ENDIF
       ELSE
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+        IF(IADGPL.NE.0)THEN
+          IFCS=-2
+          ITYPGP=-2
+          I=CSITGPL(IPVS)
+        ENDIF
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
           I=CSITGP(IPVS)
         ENDIF
+#endif
       END IF
       CSADDR=I
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csinit.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csinit.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csinit.F	2005-04-18 15:41:04.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csinit.F	2005-12-09 13:27:46.972360272 +0000
@@ -64,6 +64,9 @@
 #if defined(CERNLIB_SHL)
 #include "comis/cshlnm.inc"
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+#endif
 #if defined(CERNLIB_PAW)
 #include "paw/pcmode.inc"
 #include "comis/cshfill.inc"
@@ -159,6 +162,9 @@
       ICHMINU=ICHAR('-')
       ICHPLUS=ICHAR('+')
       ICHCOMM=ICHAR(',')
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+      IPIADGV=0
+#endif
 #if defined(CERNLIB_PAW)
       CALL CSPAWI
       MODHFI=0
@@ -211,8 +217,8 @@
 #endif
 #if (defined(CERNLIB_LINUX))
       ITMPLEN=CSTMPD(CHPATH, 256)
-      CHF77 ='g77 -c'
-      CHCC  ='cc -c'
+      CHF77 ='g77 -c -fPIC'
+      CHCC  ='cc -c -fPIC'
 #endif
 #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
       ITMPLEN=CSTMPD(CHPATH, 256)
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csintx.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csintx.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csintx.F	1996-12-05 09:50:37.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csintx.F	2005-12-09 13:27:46.973360120 +0000
@@ -38,6 +38,9 @@
 #if defined(CERNLIB_PAW)
 #include "comis/cskucs.inc"
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_ALPHA_OSF))
       INTEGER CSTRCMP
 #endif
@@ -1105,6 +1108,32 @@
       ENDIF
 #endif
 #if (!defined(CERNLIB_VAX))&&(!defined(CERNLIB_APOLLO))
+#if defined(CERNLIB_QMLXIA64)
+      IF(IQ(IP+KSIFCS).EQ.-2)THEN
+*Dynamic linker may give long addresses
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ENDIF
+#else
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NPAR,IDA(IOFSPL))
       ELSEIF(ITP.EQ.2)THEN
@@ -1115,6 +1144,7 @@
         DCSRES=CSCALD(IADGP,NPAR,IDA(IOFSPL))
       ENDIF
 #endif
+#endif
       IPC=IPC+4
       GO TO 999
 *NUM I
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csitgpl.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csitgpl.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csitgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csitgpl.F	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,32 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZU:  1.16/16 04/10/93  12.14.52  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+      INTEGER FUNCTION CSITGPL(IP)
+***------------------------------
+*   it is last routine from the tables-set.
+***-----------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cspnts.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab64.inc"
+      I=MHLOC(KSIDP+NWIDEN)
+      IQ(I)=0
+      IQ(I+1)=NCIDEN
+      DO 1 K=1,NWIDEN
+        IQ(I+KSIDP-1+K)=IDEN(K)
+   1  CONTINUE
+      CALL CSRTGPL(I)
+      IF(IP.EQ.0)THEN
+        IPGP=I
+      ELSE
+        IQ(IP)=I
+      ENDIF
+      CSITGP=I
+      END
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cskcal.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cskcal.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cskcal.F	1996-12-05 09:50:39.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cskcal.F	2005-12-09 13:27:46.973360120 +0000
@@ -31,6 +31,9 @@
 #include "comis/cstab.inc"
 #include "comis/csfres.inc"
 #include "comis/cssysd.inc"
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
       CHARACTER PRONAME*32
       INTEGER CSCALI
       DOUBLE PRECISION CSCALD
@@ -232,6 +235,34 @@
         I2=I2+KS
         I=I+1
  9203 CONTINUE
+#if defined(CERNLIB_QMLXIA64)
+*  Dynamic linker may give long addresses
+      IF (IFCS.EQ.-2)THEN
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ENDIF
+#else
 *      IT=IABS(ITYPGP)
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NOPAR,IF77PL(1))
@@ -245,6 +276,7 @@
       ENDIF
 *+SELF,IF=UNIX,IF=-SGI,IF=-IBMRT,IF=-DECS,IF=-HPUX,IF=-SUN,IF=-MSDOS.
 #endif
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_STDUNIX))
       I=1
       DO 9203 K=ITA-NPAR+1,ITA
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cslink.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cslink.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cslink.F	1996-02-26 17:16:17.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cslink.F	2005-12-09 13:27:46.973360120 +0000
@@ -21,10 +21,15 @@
 #include "comis/cstab.inc"
 #include "comis/cspnts.inc"
 #include "comis/cslun.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       CHARACTER*(KLENID) FNNAME
       INTEGER CS_GET_FUNC
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      CHARACTER*(KLENID) FNNAME
+      INTEGER*8 CS_GET_FUNC
+#endif
          COMMON/CSGSCM/IGS,JGS,NGS,CSJUNK(3)
       IF(ISTLIB.EQ.0 .AND. ITBS.EQ.0)RETURN
    2  I=IPGP
@@ -60,12 +65,20 @@
 #if defined(CERNLIB_SHL)
           CALL CSGTIDP(I,FNNAME,NC)
           CALL CUTOL(FNNAME(1:NC))
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(FNNAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+          ENDIF
+#else
           IADGP=CS_GET_FUNC(FNNAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
           ENDIF
 #endif
+#endif
           IP=0
         ENDIF
       ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csrtgpl.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csrtgpl.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csrtgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csrtgpl.F	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,31 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZ :  1.18/14 10/01/95  15.41.06  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+
+      SUBROUTINE CSRTGPL(I)
+***--------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab.inc"
+#include "comis/cstab64.inc"
+
+      IPIADGV = IPIADGV + 1
+      IF (IPIADGV .GT. MAXIAD64)  THEN
+        WRITE (*,'(2a,I4)') 'to much addresses for dynamik linking, ',
+     &                      'limit is ', MAXIAD64
+        WRITE (*,'(2a)') 'increase MAXIAD64 in cstab64.inc and ',
+     &                    'recompile COMIS'
+
+        STOP
+      END IF
+      IADGPLV(IPIADGV) = IADGPL
+      IADGP            = IPIADGV
+      CALL CCOPYA(IADGP,IQ(I+2),KSIDP-2)
+      END
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/comis/cstab64.inc cernlib-2005.05.09.dfsg/src/pawlib/comis/comis/cstab64.inc
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/comis/cstab64.inc	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/comis/cstab64.inc	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,10 @@
+*
+*
+* cstab64.inc
+*
+      PARAMETER (MAXIAD64=100) !maximum number of shared objects
+      INTEGER*8 IADGPL,IADGPLV(MAXIAD64)
+      INTEGER   IADGPL1, IADGPL2
+      COMMON /CSTB64/ IADGPL,IADGPLV
+      COMMON /CSTB64I/ IPIADGV
+      EQUIVALENCE (IADGPL, IADGPL1)
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c	1997-09-02 15:50:38.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c	2005-12-09 13:27:46.974359968 +0000
@@ -33,11 +33,25 @@
 #else
 void ccopys_(ja,jb,nn)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *nn;
+{
+  int i,n; char *a,*b;
+  n=*nn; a=*ja; b=*jb;
+#else
      char **ja, **jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+#endif
   if ( a >= b )
      for ( i=0; inext = f->first_proc;
          f->first_proc = p;
+         if (debug_level > 0) printf("function pointer is: %p\n", p->funcptr);
          return (void *)(p->funcptr);
       }
      f = f->next;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c	2004-10-27 09:01:54.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c	2005-12-09 13:27:46.974359968 +0000
@@ -32,8 +32,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 double cscald_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -46,10 +45,41 @@
     int CSCALD (name,n,p)
 #  endif
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscald_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+double cscald_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[16];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = *fptr + (unsigned long)jumpad_;
+   /* if ( *fptr > 0 ) ptr = 0; */
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  double (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
+#endif
    double d;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c	2004-10-22 12:42:40.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c	2005-12-09 13:27:46.974359968 +0000
@@ -29,8 +29,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 int cscali_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -39,10 +38,41 @@
 #if defined(CERNLIB_QXCAPT)
 int type_of_call CSCALI (name,n,p)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscali_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+int cscali_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[16];
+{
+   int jumpad_();
+   int (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   /* if ( *fptr > 0 ) ptr = 0; */
+   ptr += *fptr;
+   name = (int (*)())ptr;
+/*    printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  int (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
+#endif
    int i;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c	2004-10-22 12:03:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c	2005-12-09 13:27:46.974359968 +0000
@@ -35,7 +35,7 @@
 #endif
 
 
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 float cscalr_ (name,n,p)
 #endif
 
@@ -51,11 +51,51 @@
 # endif
 #endif
 
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscalr_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+/* Additional note: g77 generates code such that it expects REAL functions
+ * to return "double".  Hence C functions to be used in FORTRAN as REAL
+ * must return "double", and declarations of REAL FORTRAN functions in C files
+ * must also return "double".  On most architectures one can get away with
+ * using "float" instead, but not on amd64 ... see
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15397
+ * 
+ * -- Kevin McCarty
+ */
+	
+#if defined(CERNLIB_QMLXIA64)
+double cscalr_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ int pin[16];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscalr - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+   double r;
+#else
  float (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
    float r;
+#endif
    switch (*n)
    {
       case 0:
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c	1997-09-02 15:50:44.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 13:27:46.975359816 +0000
@@ -36,6 +36,27 @@
 #else
 int cstrcmp_(ja,na,jb,nb)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *na, *nb;
+{
+
+  int i,la,lb,k; char *a,*b;
+  if ( *na >= *nb )
+     {
+      a=*ja; b=*jb; la=*na; lb=*nb; k=1;
+      }
+  else
+    {
+      a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
+     }
+#else
      char **ja, **jb;
      int *na, *nb;
 {
@@ -48,6 +69,7 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+#endif
   for ( i=0; i b[i]) ? k : -k ); }
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/c_hcntpar.h cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/c_hcntpar.h
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/c_hcntpar.h	1996-04-23 18:37:45.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/c_hcntpar.h	2005-12-09 13:27:46.975359816 +0000
@@ -47,7 +47,7 @@
 #define ZID	12
 #define ZITMP	10
 #define ZNTMP	6
-#define ZNTMP1	3
+#define ZNTMP1	4
 #define ZLINK	6
 
 #endif	/*	CERN_C_HCNTPAR	*/
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_execute.c cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_execute.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_execute.c	2001-09-18 13:41:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_execute.c	2005-12-09 13:31:01.495788216 +0000
@@ -184,12 +184,19 @@
 					/* all definitions for the stack */
 #undef INIT_STACK_TO_NULL		/* are kept together in this file */
 
+#if defined(CERNLIB_QMLXIA64)
+# undef HBALLOC
+# undef HGNTBF
+# define HBALLOC HBALLOC64
+# define HGNTBF HGNTBF64
+#endif
+
 /* extern functions */
 extern void qp_exec_evt( QueryExe *, long, long, QPCmd *, int *);
 
 typedef		char	tName[MAX_NAME_LEN+1];
 tName		*namelist;
-int		*offsetlist;
+long		*offsetlist;
 int		*indexlist;
 
 
@@ -245,7 +252,23 @@
 	char		ntname[MAX_NAME_LEN+6];
 	int		i, ierr, indx, itype, isize, ielem;
 	Int32 *		addr;
-	int		ibase[1], ioff, nuse;
+
+	/* LP64 compatibility:
+	   - use static for ibase (at least) because its address is stored
+	     as Int32 in structure CWNBlock
+	     static takes ibase from the stack and puts it the code area.
+	   - use type long for ioff and offsetlist[i]
+	     (for 32 bit architectures type long is 4 Bytes as it is used
+	      also in packlib/hbook/chbook/halloc.c in hballo1 !)
+	   The x86-64 ABI has the code area in the 32 bit address space
+	   but addresses to the stack and to dynamically allocated areas
+	   may and will be above the 32 bit address space (below 0x80000000000).
+	   See also: http://www.x86-64.org/documentation/abi-0.96.pdf
+	   (H. Vogt, Oct. 2005) */
+
+	static int	ibase[1];
+	long		ioff;
+	int		nuse;
 	int		id = qe->id;
 	char *		path = qe->path;
 	char *		title;
@@ -286,7 +309,11 @@
 	CWNBlock = (RefCWN *) calloc( CWNCount + 1, sizeof( RefCWN ) );
 	qp_assert( MAX_NAME_LEN == 32 ); /* see hbook.h (HGNTBF) */
 	namelist = (tName *) calloc( CWNCount + 1, sizeof(tName) );
-	offsetlist = (int *) calloc( CWNCount + 1, sizeof(int) );
+
+	/* offsetlist should be of type long (see above) (H. Vogt, Oct. 2005) */
+
+	offsetlist = (long *) calloc( CWNCount + 1, sizeof(long) );
+
 	indexlist = (int *) calloc( CWNCount + 1, sizeof(int) );
 	qp_assert(
 		CWNBlock != 0 &&
@@ -381,6 +408,7 @@
 						offsetlist[nt_load_cnt]=
 						CWNBlock[index].p -
 						PAWC.iq_eqv;
+
 						strncpy(
 						namelist[nt_load_cnt],
 						vi->name,
@@ -871,8 +899,21 @@
 			if ( cmd->u.scan.pawpp ) {
 				char	buf[33];
 
+				/* for LP64 ABI matlab and matrow are 64 bit pointer, type is void*  
+				   but PCADDR.jmlab and PCADDR.jmrow are of type int
+				   see: c_pcaddr.h and qp_command.h
+				   it is related to CWNBlock -> see above (H. Vogt)*/
+
+#if defined(CERNLIB_QMLXIA64)
+				unsigned long long int	 myjmlab, myjmrow;
+				myjmlab = PCADDR.jmlab;
+				myjmrow = PCADDR.jmrow;
+				c->matlab = (TableCallBack) myjmlab;
+				c->matrow = (TableCallBack) myjmrow;
+#else
 				c->matlab = (TableCallBack) PCADDR.jmlab;
 				c->matrow = (TableCallBack) PCADDR.jmrow;
+#endif
 
 				qp_assert( qe->nexpr <= MAX_OUTSTR );
 
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_hbook_if.c cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_hbook_if.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_hbook_if.c	1999-07-05 15:43:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_hbook_if.c	2005-12-09 13:27:46.976359664 +0000
@@ -149,7 +149,15 @@
 	int	idn, idtmp;
 	int	icycle;
 	int	ierr;
-	int     izero = 0;
+
+	/* LP64 compatibility:
+	   use static for izero because its address is fetched by hbname_
+	   using locb and locb expects 32 bit addresses only.
+	   static takes izero from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int     izero = 0;
 
 	/* split string into  path, id and cycle */
 


--- NEW FILE 211-fix-comis-on-ia64.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-ia64.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Further patch building on Harald Vogt's amd64 patch that should
## DP: fix PAW on Itanium Linux.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c	2005-12-09 09:45:33.649333472 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c	2005-12-09 10:01:36.149011280 +0000
@@ -39,12 +39,32 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium, the situation is even worse.  Itanium architecture is such
+ * that the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ * -- Kevin McCarty
+ */
+	
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+# if defined (__ia64__)
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a +
+	  (((unsigned long)a > 0x80000000) ? autobase : 0x6000000000000000);
+  b = (unsigned long)b +
+	  (((unsigned long)b > 0x80000000) ? autobase : 0x6000000000000000);
+# endif
 #else
      char **ja, **jb;
      int *nn;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 09:45:33.650333320 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 10:05:36.432482640 +0000
@@ -42,6 +42,19 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium, the situation is even worse.  Itanium architecture is such
+ * that the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ * -- Kevin McCarty
+ */
+
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *na, *nb;
@@ -56,6 +69,13 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+# if defined (__ia64__)
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a +
+          (((unsigned long)a > 0x80000000) ? autobase : 0x6000000000000000);
+  b = (unsigned long)b +
+          (((unsigned long)b > 0x80000000) ? autobase : 0x6000000000000000);
+# endif
 #else
      char **ja, **jb;
      int *na, *nb;

cernlib_2005.05.09.dfsg-3.diff:

--- NEW FILE cernlib_2005.05.09.dfsg-3.diff ---
--- cernlib-2005.05.09.dfsg.orig/debian/control
+++ cernlib-2005.05.09.dfsg/debian/control
@@ -0,0 +1,896 @@
+Source: cernlib
+Maintainer: Kevin B. McCarty 
+Standards-Version: 3.6.2
+Priority: optional
+Section: science
+Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin
+
+Package: cernlib-base
+Architecture: all
+Section: devel
+Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev
+Description: script to determine Cernlib library dependencies
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This package includes the "cernlib" script that lists the command-line
+ options needed for linking against Cernlib libraries.  The script has
+ been rewritten from the upstream version to calculate
+ dependencies recursively.  Also included are a README.Debian with a summary
+ of changes made to Cernlib to fit it into Debian packaging practices,
+ and a contributed set of Autoconf macros to test for Cernlib libraries.
+
+Package: cernlib-core-dev
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit
+Description: Cernlib development headers, tools, and static libraries
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides the header files and static libraries likely to be
+ wanted by developers using the Cern libraries who are not interested
+ specifically in high energy physics.  It also provides the Cernlib
+ development tools DZedit and KUIPC.  Cernlib analysis programs may be
+ obtained by installing the cernlib-core metapackage.
+
+Package: cernlib-core
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos
+Description: Cernlib main libraries and programs
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides the libraries and analysis tools (e.g. PAW) likely
+ to be wanted by most users of the Cern libraries who are not interested
+ specifically in high energy physics.  You cannot do program development by
+ installing only this metapackage; development libraries and tools may
+ be obtained by installing the cernlib-core-dev metapackage or individual
+ lib*-dev packages.
+
+Package: cernlib-extras
+Architecture: all
+Priority: extra
+Section: science
+Depends: cernlib-base (= ${Source-Version}), pawserv, zftp
+Description: miscellaneous Cernlib programs unlikely to be used by many
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides a few additional Cernlib programs not included
+ in any other Cernlib metapackage.  Very few people are likely to be
+ interested in them; currently they include zftp, pawserv and zserv.
+ Notice that the latter two programs run as daemons through inetd and may
+ reduce your system's security!
+ .
+ Installing this package along with the "cernlib" metapackage will supply
+ a complete set of all Cernlib programs and libraries included in Debian.
+
+Package: cernlib-montecarlo
+Architecture: all
+Section: science
+Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev
+Recommends: libisajet758-2-dev
+Description: Cernlib Monte Carlo libraries
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides various Monte Carlo libraries included in Cernlib
+ (both shared and static).  Likely only physicists will be interested in
+ these packages.  Note that the Geant 3.21 program is not included, but it may
+ be obtained by also installing the geant321 Debian package.
+ .
+ Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are
+ not available within Debian due to licensing issues; see the README.Debian
+ file in the montecarlo-base package for information on obtaining them.
+ .
+ Additionally, the Isajet library is not available on the m68k architecture
+ due to a compiler flaw.
+
+Package: cernlib
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev
+Description: almost complete set of Debian Cernlib packages
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides almost all of the programs and libraries contained
+ in Cernlib.  Most people will likely want only a subset of these.  A few
+ extra Cernlib programs, not of interest to many people, may be obtained via
+ the cernlib-extras metapackage.
+
+Package: dzedit
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: libpacklib1-dev
+Description: Cernlib's ZEBRA documentation editor
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system
+ developed at CERN.  ZEBRA, part of the Packlib library, permits a developer to
+ create complex data structures in the FORTRAN 77 language; the DZDOC system
+ allows the developer to generate and maintain documentation of ZEBRA data
+ structures.
+
+Package: geant321-data
+Architecture: all
+Section: science
+Depends: cernlib-base
+Description: [Physics] Data for Geant 3.21 detector simulator
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes data files for use by Geant.
+
+Package: geant321-doc
+Architecture: all
+Section: doc
+Depends: cernlib-base
+Description: [Physics] Documentation for Geant 3.21
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes some documentation about Geant.
+
+Package: geant321
+Architecture: all
+Section: science
+Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77
+Suggests: kxterm, geant321-doc
+Description: [Physics] Particle detector description and simulation tool
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes gxint, the script used to perform this linking step.
+
+Package: kuipc
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, cernlib-base
+Recommends: libpacklib1-dev
+Suggests: libpacklib1-lesstif-dev
+Description: Cernlib's Kit for a User Interface Package (KUIP) compiler
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify
+ the writing of a program's user interface code.  It takes as
+ input a Command Definition File (CDF) that describes the
+ commands to be understood by the program, and outputs C or FORTRAN code that
+ makes the appropriate function calls to set up the user interface.  This
+ code can then be compiled and linked with the rest of the program.  Since
+ the generated code uses KUIP routines, the program must also be linked
+ against the Packlib library that contains them.
+ .
+ KUIPC is no longer actively developed, so aside from its use in the build
+ process of Cernlib, it is of mainly historical interest.
+
+Package: kxterm
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}, cernlib-base
+Description: Cernlib's KUIP terminal emulator
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ KXterm is a terminal emulator which combines the best features from
+ the (now defunct) Apollo DM pads (like: input and transcript
[...20906 lines suppressed...]
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ./pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, C??? hai"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "M??y ph???c v??? c???n ch???y t??? tr??nh inetd"
+
+#. Type: select
+#. Description
+#: ./pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr "G??i tin n??y bao g???m c??? hai tr??nh n???n (d??mon) pawserv (m?? cho ph??p m??y t??? xa ?????c t???p tin ?????a ph????ng trong khi ch???y PAW/Paw++) v?? tr??nh n???n zserv (m?? cho ph??p m??y t??? xa ????ng nh???p d??ng giao th???c ZFTP c???a CERN). C??? hai tr??nh ph???c v??? n??y ???????c ch???y t??? tr??nh n???n inetd; b???n c?? th??? hi???u l???c m???t hay c??? hai ??i???u. Tuy nhi??n, tr??? b???n c???n thi???t l??m vi???c r???t ?????c bi???t, r???t c?? th??? l?? b???n s??? mu???n hi???u l???c ch??? tr??nh pawserv."
--- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po
+++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po
@@ -0,0 +1,55 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib\n"
+"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-05-26 16:05-0300\n"
+"Last-Translator: Andr? Lu?s Lopes \n"
+"Language-Team: Debian-BR Project \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Ambos"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servidores a serem executados a partir do inetd"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr ""
+"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos "
+"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv "
+"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP "
+"do CERN). Esses servidores s?o executados a partir do inetd; voc? "
+"pode habilitar cada um deles separadamente ou ambos. A menos que voc? "
+"possua necessidades bastante especializadas, voc? provavelmente ir? "
+"desejar habilitar somente o pawserv."
--- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po
+++ cernlib-2005.05.09.dfsg/debian/po/sv.po
@@ -0,0 +1,53 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib 2005.05.09-4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-10-06 23:50+0200\n"
+"Last-Translator: Daniel Nylander \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, B?da"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servrar som ska k?ras fr?n inetd"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr ""
+"Detta paket inkluderar b?de pawserver-daemonen (till?ter fj?rrsystem att "
+"l?sa lokala filer n?r PAW/Paw++ k?rs) och zserv-daemonen (till?ter fj?rrsystem "
+"att logga in med CERN's ZFTP-protokoll).  Dessa servrar k?rs fr?n inetd; du m?ste "
+"aktivera n?gon eller b?da av dom. Om du inte har speciella krav s? r?cker det gott "
+"om pawserv aktiveras."
+
--- cernlib-2005.05.09.dfsg.orig/debian/po/es.po
+++ cernlib-2005.05.09.dfsg/debian/po/es.po
@@ -0,0 +1,55 @@
+# cernlib po-debconf translation to Spanish
+# Copyright (C) 2005 Software in the Public Interest
+# This file is distributed under the same license as the cernlib package.
+#
+# Changes:
+#  - Initial translation
+#         C??sar G??mez Mart??n 
+#
+#   Traductores, si no conoce el formato PO, merece la pena leer la
+#   documentaci??n de gettext, especialmente las secciones dedicadas a este
+#   formato, por ejemplo ejecutando:
+#          info -n '(gettext)PO Files'
+#          info -n '(gettext)Header Entry'
+# Equipo de traducci??n al espa??ol, por favor, lean antes de traducir
+# los siguientes documentos:
+#
+#  - El proyecto de traducci??n de Debian al espa??ol
+#    http://www.debian.org/intl/spanish/
+#    especialmente las notas de traducci??n en
+#    http://www.debian.org/intl/spanish/notas
+#
+#  - La gu??a de traducci??n de po's de debconf:
+#    /usr/share/doc/po-debconf/README-trans
+#    o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-09-01 17:49+0100\n"
+"Last-Translator: C??sar G??mez Mart??n \n"
+"Language-Team: Debian l10n spanish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: SPAIN\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Type: select
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Ambos"
+
+#. Type: select
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servidores a ejecutar desde inetd"
+
+#. Type: select
+#: ../pawserv.templates.master:6
+msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol).  These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv."
+msgstr "Este paquete incluye el demonio pawserv (permite a las m??quinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++)  y el demonio zserv (permite a las m??quinas remotas conectarse a trav??s del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo m??s probable es que s??lo quiera habilitar pawserv."
+


Index: 304-update-Imake-config-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/304-update-Imake-config-files.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 304-update-Imake-config-files.dpatch	9 Dec 2005 16:09:19 -0000	1.1
+++ 304-update-Imake-config-files.dpatch	14 Dec 2005 16:15:57 -0000	1.2
@@ -7,25 +7,17 @@
 ## DP: to support most Linux architectures.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/Imake.cf /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/Imake.cf
---- cernlib-2005.05.09/src/config/Imake.cf	2004-10-05 11:54:40.000000000 -0400
-+++ /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/Imake.cf	2005-06-09 10:47:36.470829080 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.cf cernlib-2005.05.09.dfsg/src/config/Imake.cf
+--- cernlib-2005.05.09.dfsg~/src/config/Imake.cf	2004-10-05 11:54:40.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/Imake.cf	2005-12-12 09:42:08.529220732 -0500
 @@ -1,24 +1,10 @@
 -/* $Id$
 - *
 - * $Log$
-- * Revision 1.1  2005/12/09 16:09:19  pertusus
-- * - use new debian patchset
-- * - enable 64 bit fixes patch
-- * - remove the BSD in the licence because there is no library nor binary
-- *   under a BSD licence and someone could get the idea that there is
-- *   some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
-- *   because of cfortran
-- * - update with newer debian patchset for cernlib, fix licence issues
-- * - build shared libraries
-- * - simplify the scripts modifications
+- * Revision 1.2  2005/12/14 16:15:57  pertusus
+- * - use newer debian patchset
 - *
-- * sync with devel
+- * retry build on x86_64, who knows...
 - *
 - * Revision 1.5  2004/10/05 15:54:40  mclareni
 - * Add configuration file linux-lp64 for Linux 64-bit pointer systems like AMD Opteron and Intel IA64.
@@ -1280,9 +1272,9 @@
  
  #ifndef MacroIncludeFile
  XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
-diff -urNad cernlib-2005.05.09/src/config/linux.cf /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/linux.cf
---- cernlib-2005.05.09/src/config/linux.cf	2004-10-05 11:56:45.000000000 -0400
-+++ /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/linux.cf	2005-06-09 10:47:36.471828868 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/linux.cf cernlib-2005.05.09.dfsg/src/config/linux.cf
+--- cernlib-2005.05.09.dfsg~/src/config/linux.cf	2004-10-05 11:56:45.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/linux.cf	2005-12-12 09:42:42.505976387 -0500
 @@ -65,20 +65,20 @@
  #define OSVendor		/**/
  #define OSMajorVersion		2
@@ -1308,7 +1300,7 @@
  #endif
  #define HasPutenv		YES
  #define HasShm			YES
-@@ -94,38 +94,300 @@
+@@ -94,38 +94,302 @@
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
@@ -1599,6 +1591,8 @@
 +#  define OptimizedCDebugFlags  OptimizationLevel
 +# endif
 +# define LinuxMachineDefines    -D__x86_64__
++# define DefaultFCOptions       -fno-automatic \
++                                -fno-second-underscore -fugly-complex
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 +# define CernlibMachineDefines  -DCERNLIB_QMLXIA64
@@ -1623,7 +1617,7 @@
  /* Some of these man page defaults are overriden in the above OS sections */
  #ifndef ManSuffix
  # define ManSuffix	1x
-@@ -160,7 +422,7 @@
+@@ -160,7 +424,7 @@
  #define FortranSaveFlags	/* */ /* Everything static !? */
  #define OptimisedFortranFlags   -g -pc 64 -tp p6
  #define DefaultFCOptions        -Msave -fpic -Kieee
@@ -1632,7 +1626,7 @@
  
  #else
  
-@@ -171,19 +433,18 @@
+@@ -171,19 +435,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1664,7 +1658,7 @@
   
  #else
  
-@@ -194,19 +455,18 @@
+@@ -194,19 +457,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1696,7 +1690,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */
-@@ -221,17 +481,32 @@
+@@ -221,17 +483,32 @@
  /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */
  /*  Adapted to CERN style GF. 20-Sep-96 */
  
@@ -1732,7 +1726,7 @@
  
  # endif
  # endif
-@@ -251,7 +526,7 @@
+@@ -251,7 +528,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */


Index: 307-use-canonical-cfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/307-use-canonical-cfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 307-use-canonical-cfortran.dpatch	9 Dec 2005 16:09:19 -0000	1.1
+++ 307-use-canonical-cfortran.dpatch	14 Dec 2005 16:15:57 -0000	1.2
@@ -6,10 +6,10 @@
 ## DP: Debian package of cfortran, version 4.4-6.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.doc /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc
---- cernlib-2005.05.09/src/cfortran/cfortran.doc	1998-12-11 12:17:09.000000000 -0500
-+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc	2004-12-10 10:47:33.000000000 -0500
-@@ -195,7 +195,7 @@
+diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc	1998-12-11 17:17:09.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc	2005-12-09 18:01:09.000000000 +0000
+@@ -195,13 +195,13 @@
  HP9000> f77 -c cfortex.f
  HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest
  
@@ -18,7 +18,28 @@
  HP9000> # #define hpuxFortran800
  HP9000> cc -c -Aa -DhpuxFortran800 cfortest.c
  HP9000> f77 +800 -o cfortest cfortest.o cfortex.f
-@@ -643,7 +643,7 @@
+ 
+ f2c> # In the following, 'CC' is any C compiler.
+-f2c> f2c -R cfortex.f
++f2c> f2c cfortex.f
+ f2c> CC -o cfortest -Df2cFortran cfortest.c cfortex.c -lf2c  &&  cfortest
+ 
+ Portland Group $ # Presumably other C compilers also work.
+@@ -533,9 +533,10 @@
+ FORTRAN_REAL thus corresponds to FORTRAN's REAL on all machines, including t3e.
+ 
+ 
+-o f2c
+-  f2c, by default promotes REAL functions to double. cfortran.h does not (yet)
+-support this, so the f2c -R option must be used to turn this promotion off.
++o f2c / g77
++  f2c and g77 by default promote REAL functions to double.  As of December 9,
++2005, the Debian package of cfortran supports this behavior, so the f2c -R
++option must *NOT* be used to turn this promotion off.
+ 
+ o f2c
+ [Thanks to Dario Autiero for pointing out the following.]
+@@ -643,7 +644,7 @@
     [For an ancient math.h on a 386 or sparc, get similar from a new math.h.]
     #ifdef mc68000     /* 5 lines Copyright (c) 1988 by Sun Microsystems, Inc. */
     #define FLOATFUNCTIONTYPE	int
@@ -27,7 +48,7 @@
     #define ASSIGNFLOAT(x,y)	*(int *)(&x) = y
     #endif
  
-@@ -874,7 +874,7 @@
+@@ -874,7 +875,7 @@
  works everywhere and would seem to be an obvious choice.
  
  
@@ -36,7 +57,7 @@
  
  cfortran.h encourages the exact specification of the type and dimension of
  array parameters because it allows the C compiler to detect errors in the
-@@ -1835,7 +1835,7 @@
+@@ -1835,7 +1836,7 @@
  
  Unlike all other C compilers supported by cfortran.h,
  'gcc -traditional' promotes to double all functions returning float
@@ -45,7 +66,7 @@
  
  /* m.c */
  #include 
-@@ -2017,8 +2017,9 @@
+@@ -2017,8 +2018,9 @@
  
  THIS PACKAGE, I.E. CFORTRAN.H, THIS DOCUMENT, AND THE CFORTRAN.H EXAMPLE
  PROGRAMS ARE PROPERTY OF THE AUTHOR WHO RESERVES ALL RIGHTS. THIS PACKAGE AND
@@ -57,16 +78,16 @@
  - YOU MUST ACCOMPANY ANY COPIES OR DISTRIBUTION WITH THIS (UNALTERED) NOTICE.
  - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA 
    (E.G. TAPE, DISK, COMPUTER, PAPER.)
-diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.h /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h
---- cernlib-2005.05.09/src/cfortran/cfortran.h	2002-09-11 13:05:51.000000000 -0400
-+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h	2004-12-10 10:47:34.000000000 -0500
+diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h	2002-09-11 17:05:51.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h	2005-12-09 18:01:09.000000000 +0000
 @@ -1,4 +1,4 @@
 -/* cfortran.h  4.4_cernlib2002 */
 +/* cfortran.h  4.4 */
  /* http://www-zeus.desy.de/~burow/cfortran/                   */
  /* Burkhard Burow  burow at desy.de                 1990 - 2002. */
  
-@@ -11,6 +11,32 @@
+@@ -11,6 +11,35 @@
     MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE.
  */
  
@@ -94,12 +115,15 @@
 +
 +      Nov 2003: If __INTEL_COMPILER or INTEL_COMPILER defined, also define
 +                f2cFortran (KMCCARTY)
++      Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN
++                returning "double" in C.  This was one of the items on
++		Burkhard's TODO list. (KMCCARTY)
 + *******/
 +
  /* 
    Avoid symbols already used by compilers and system *.h:
    __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c
-@@ -75,7 +101,8 @@
+@@ -75,7 +104,8 @@
  
  /* Remainder of cfortran.h depends on the Fortran compiler. */
  
@@ -109,7 +133,7 @@
  #define f2cFortran
  #endif
  
-@@ -90,6 +117,27 @@
+@@ -90,6 +120,27 @@
                             Support f2c or f77 with gcc, vcc with f2c. 
                             f77 with vcc works, missing link magic for f77 I/O.*/
  #endif
@@ -137,7 +161,7 @@
  #if defined(__hpux)             /* 921107: Use __hpux instead of __hp9000s300 */
  #define       hpuxFortran       /*         Should also allow hp9000s7/800 use.*/
  #endif
-@@ -131,6 +179,7 @@
+@@ -131,6 +182,7 @@
  #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
  /* If your compiler barfs on ' #error', replace # with the trigraph for #     */
   #error "cfortran.h:  Can't find your environment among:\
@@ -145,7 +169,7 @@
      - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...)     \
      - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000     \
      - VAX   VMS CC 3.1 and FORTRAN 5.4.                                  \
-@@ -151,7 +200,8 @@
+@@ -151,7 +203,8 @@
      - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran          \
      - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \
      - Absoft Pro Fortran: Use #define AbsoftProFortran \
@@ -155,7 +179,7 @@
  /* Compiler must throw us out at this point! */
  #endif
  #endif
-@@ -164,7 +214,8 @@
+@@ -164,7 +217,8 @@
  
  /* Throughout cfortran.h we use: UN = Uppercase Name.  LN = Lowercase Name.   */
  
@@ -165,7 +189,7 @@
  #define CFC_(UN,LN)            _(LN,_)      /* Lowercase FORTRAN symbols.     */
  #define orig_fcallsc(UN,LN)    CFC_(UN,LN)
  #else 
-@@ -268,7 +319,8 @@
+@@ -268,7 +322,8 @@
  #endif
  
  #ifndef apolloFortran
@@ -175,7 +199,7 @@
  #define CF_NULL_PROTO
  #else                                         /* HP doesn't understand #elif. */
  /* Without ANSI prototyping, Apollo promotes float functions to double.    */
-@@ -512,7 +564,7 @@
+@@ -512,7 +567,7 @@
                      *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO)  ),   \
    (F).dsc$a_a0    =  ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length          ,(F))
  
@@ -184,7 +208,7 @@
  #define _NUM_ELEMS      -1
  #define _NUM_ELEM_ARG   -2
  #define NUM_ELEMS(A)    A,_NUM_ELEMS
-@@ -540,7 +592,8 @@
+@@ -540,7 +595,8 @@
  }
  return (int)num;
  }
@@ -194,3 +218,56 @@
  /*-------------------------------------------------------------------------*/
  
  /*           UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS       */
+@@ -1451,7 +1507,12 @@
+ #define      BYTE_cfPU(A)   CFextern INTEGER_BYTE      FCALLSC_QUALIFIER A
+ #define    DOUBLE_cfPU(A)   CFextern DOUBLE_PRECISION  FCALLSC_QUALIFIER A
+ #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define     FLOAT_cfPU(A)   CFextern DOUBLE_PRECISION  FCALLSC_QUALIFIER A
++#else
+ #define     FLOAT_cfPU(A)   CFextern FORTRAN_REAL      FCALLSC_QUALIFIER A
++#endif
+ #else				   	                   
+ #define     FLOAT_cfPU(A)   CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A
+ #endif				   	                   
+@@ -2088,7 +2149,12 @@
+ #ifndef __CF__KnR
+ /* The void is req'd by the Apollo, to make this an ANSI function declaration.
+    The Apollo promotes K&R float functions to double. */
+-#define   FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define FLOAT_cfFZ(UN,LN) DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#else
++#define FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#endif
+ #ifdef vmsFortran
+ #define  STRING_cfFZ(UN,LN) void  FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS
+ #else
+@@ -2104,7 +2170,12 @@
+ #endif
+ #else
+ #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define   FLOAT_cfFZ(UN,LN) DOUBLE_PRECISION  FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#else
+ #define   FLOAT_cfFZ(UN,LN) FORTRAN_REAL      FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#endif
+ #else
+ #define   FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)(
+ #endif
+@@ -2118,7 +2189,12 @@
+ #define    BYTE_cfF(UN,LN)     BYTE_cfFZ(UN,LN)
+ #define  DOUBLE_cfF(UN,LN)   DOUBLE_cfFZ(UN,LN)
+ #ifndef __CF_KnR
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define   FLOAT_cfF(UN,LN)  DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#else
+ #define   FLOAT_cfF(UN,LN)  FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#endif
+ #else
+ #define   FLOAT_cfF(UN,LN)    FLOAT_cfFZ(UN,LN)
+ #endif


Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 315-fixes-for-MacOSX.dpatch	9 Dec 2005 17:28:12 -0000	1.2
+++ 315-fixes-for-MacOSX.dpatch	14 Dec 2005 16:15:57 -0000	1.3
@@ -6,9 +6,25 @@
 ## DP: and run on OS X.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/Imake.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules
---- cernlib-2005.05.09/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/Imakefile	2005-12-07 14:47:34.141148558 -0500
+@@ -7,8 +7,12 @@
+ SUBDIRS= $(LIBDIRS) patchy cfortran
+ 
+ #ifdef CERNLIB_UNIX
++#ifdef CERNLIB_MACOSX
++SUBDIRS:= $(SUBDIRS) scripts
++#else
+ SUBDIRS:= $(SUBDIRS) scripts mgr
+ #endif
++#endif
+ 
+ InstallLibSubdirs($(LIBDIRS))
+ 
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
+--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2005-12-07 14:47:34.139148983 -0500
 @@ -2171,7 +2171,7 @@
  #define CppScriptTarget(dst,src,defs,deplist)				@@\
  dst::  src deplist							@@\
@@ -27,9 +43,9 @@
  									@@\
  clean::									@@\
  	RemoveFiles(dst)
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf
---- cernlib-2005.05.09/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.cf cernlib-2005.05.09.dfsg/src/config/MacOSX.cf
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.cf	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,170 @@
 +XCOMM platform:  $SFO: MOSXS.cf,v 1.0 95/11/19 23:21:00 sl Exp $
 +
@@ -201,9 +217,9 @@
 +/* End  CERNLIB changes */
 +
 +
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules
---- cernlib-2005.05.09/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.rules cernlib-2005.05.09.dfsg/src/config/MacOSX.rules
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.rules	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,123 @@
 +XCOMM $XConsortium: MOSXS.rules,v 1.1 97/12/12 15:34:45 sl Exp $
 +
@@ -328,9 +344,9 @@
 +#endif
 +
 +
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.tmpl /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl
---- cernlib-2005.05.09/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.tmpl cernlib-2005.05.09.dfsg/src/config/MacOSX.tmpl
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.tmpl	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,67 @@
 +XCOMM $XConsortium: MOSXS.tmpl,v 1.2 97/12/12 19:07:12 sl Exp $
 +
@@ -399,9 +415,9 @@
 +#define SharedFSRev F
 +SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
 +
-diff -urNad cernlib-2005.05.09/src/config/site.def /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def
---- cernlib-2005.05.09/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/site.def cernlib-2005.05.09.dfsg/src/config/site.def
+--- cernlib-2005.05.09.dfsg~/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/site.def	2005-12-07 14:47:34.140148771 -0500
 @@ -99,9 +99,7 @@
  /*   if it is already defined and false, undef it! */
  /* do not use shift by default
@@ -413,9 +429,9 @@
  #undef CERNLIB_SHIFT
  #endif
  #endif
-diff -urNad cernlib-2005.05.09/src/geant321/gxint/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile
---- cernlib-2005.05.09/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gxint/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gxint/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/geant321/gxint/Imakefile	2005-12-07 14:47:34.140148771 -0500
 @@ -30,7 +30,7 @@
  
  gxint321.f:  gxint.F
@@ -425,25 +441,9 @@
  
  install.lib:: $(CERN_LIBDIR)/gxint.f
  
-diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile
---- cernlib-2005.05.09/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile	2005-06-09 15:52:06.471072296 -0400
-@@ -7,8 +7,12 @@
- SUBDIRS= $(LIBDIRS) patchy cfortran
- 
- #ifdef CERNLIB_UNIX
-+#ifdef CERNLIB_MACOSX
-+SUBDIRS:= $(SUBDIRS) scripts
-+#else
- SUBDIRS:= $(SUBDIRS) scripts mgr
- #endif
-+#endif
- 
- InstallLibSubdirs($(LIBDIRS))
- 
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F
---- cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c327m.F cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c327m.F
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c327m.F	2005-12-07 14:47:34.141148558 -0500
 @@ -92,7 +92,11 @@
  #endif
        ENDIF
@@ -456,9 +456,9 @@
         IF(IDS .EQ. 1) THEN
        ERRMAX=MAX(ERRMAX,ABS(H1-T1))
        LTEST= LTEST .AND. ERRMAX .LE.  TSTERR
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F
---- cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c342m.F cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c342m.F
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c342m.F	2005-12-07 14:47:34.141148558 -0500
 @@ -70,7 +70,11 @@
  #endif
        END IF
@@ -471,9 +471,9 @@
        ERMAX= MAX(ERMAX,ABS(R1-T1))
        IF(IDS .EQ. 3 .OR. IDS .EQ. 4) THEN
         WRITE(LOUT,'(1X,F10.3,2F25.16,1P,D10.1)') SX,R,T,ABS(R1-T1)
-diff -urNad cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile
---- cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/data/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/data/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/data/Imakefile	2005-12-07 14:47:34.141148558 -0500
 @@ -1,11 +1,11 @@
  
  .SUFFIXES:
@@ -488,9 +488,9 @@
  
  PackageDirFileTarget(cojets.dat)
  
-diff -urNad cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile
---- cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/data/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/data/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/data/Imakefile	2005-12-07 14:47:34.141148558 -0500
 @@ -1,9 +1,9 @@
  
  .SUFFIXES:
@@ -503,9 +503,9 @@
  
  PackageDirFileTarget(isajet.dat)
  
-diff -urNad cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c
---- cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/sysreq/log.c cernlib-2005.05.09.dfsg/src/packlib/cspack/sysreq/log.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/cspack/sysreq/log.c	2005-12-07 14:47:34.142148345 -0500
 @@ -80,7 +80,7 @@
  static int pid;                 /* process identifier                   */
  static int logfd ;              /* logging file descriptor              */
@@ -515,9 +515,9 @@
  extern int syslog();
  #endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX */
  extern char *getenv();
-diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
---- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:51:53.621804393 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.05.09.dfsg/src/packlib/cspack/tcpaw/tcpaw.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c	2005-12-07 14:47:25.920897902 -0500
++++ cernlib-2005.05.09.dfsg/src/packlib/cspack/tcpaw/tcpaw.c	2005-12-07 14:47:34.146147494 -0500
 @@ -2569,7 +2569,7 @@
  #if !defined(IBM) && !defined(_WIN32)
  /* I provide "getpass" myself as standard version truncates to 8 characters */
@@ -559,9 +559,9 @@
 +  return result;
 +}
 +#endif /* CERNLIB_MACOSX */
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c
---- cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernbit/z268/systems.c cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernbit/z268/systems.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernbit/z268/systems.c	2005-12-07 14:47:34.146147494 -0500
 @@ -200,7 +200,7 @@
  || defined(_IBMR2) \
  || defined(__convexc__) \
@@ -571,9 +571,9 @@
  
    void systems_( command, buf, buflen, l, chars, rc, ovflw )
  
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/d704fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/d704fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-12-07 14:47:34.146147494 -0500
 @@ -4,6 +4,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -585,9 +585,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f002fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f002fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-12-07 14:47:34.146147494 -0500
 @@ -10,6 +10,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -599,9 +599,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f003fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f003fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -11,6 +11,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -613,9 +613,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f004fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f004fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -6,6 +6,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -627,9 +627,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f010fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f010fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -7,6 +7,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -641,9 +641,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  	 
  
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f011fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f011fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -7,6 +7,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -655,9 +655,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h
---- cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	2005-06-09 15:52:06.487068895 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kuip/kuip/ksys.h cernlib-2005.05.09.dfsg/src/packlib/kuip/kuip/ksys.h
+--- cernlib-2005.05.09.dfsg~/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kuip/kuip/ksys.h	2005-12-07 14:47:34.147147281 -0500
 @@ -188,6 +188,17 @@
  #endif
  
@@ -676,15 +676,15 @@
  #ifdef MSDOS
  #  define MACHINE_NAME "IBMPC"
  #  define OS_NAME "MSDOS"
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
---- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F	2005-12-07 14:47:25.807921944 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F	2005-12-07 14:55:23.810167859 -0500
 @@ -38,7 +38,12 @@
              IFCS=-2
              CALL CSRTGPL(I)
  #else
-+c     thanks to Keisuke Fujii for this patch for OS X
-+#if defined(CERNLIB_MACOSX)
++c     thanks to Keisuke Fujii for this patch for OS X            
++#if defined (CERNLIB_MACOSX)
 +          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else
            IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
@@ -696,7 +696,7 @@
            I=CSITGPL(IPVS)
          ENDIF
  #else
-+#if defined(CERNLIB_MACOSX)
++#if defined (CERNLIB_MACOSX)
 +        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else
          IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
@@ -704,9 +704,9 @@
          IF(IADGP.NE.0)THEN
            IFCS=-2
            ITYPGP=-2
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
---- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:51:53.524825013 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:57:50.699841388 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cscrexec.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cscrexec.F
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cscrexec.F	2005-12-07 14:47:25.687947476 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cscrexec.F	2005-12-07 14:47:34.148147068 -0500
 @@ -82,11 +82,19 @@
        IF(FEXT.EQ.'.c')THEN
          L=LENOCC(CHCC)
@@ -743,9 +743,9 @@
  #endif
  #if defined(CERNLIB_ALPHA_OSF)
          CHLINE=                   'ld -shared -o '
-diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
---- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/programs/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/paw/programs/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/pawlib/paw/programs/Imakefile	2005-12-07 14:47:34.148147068 -0500
 @@ -9,7 +9,7 @@
  EXTRA_LDOPTIONS=-Wl,-E
  #endif


Index: 701-patch-hbook-comis-Imakefiles.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/701-patch-hbook-comis-Imakefiles.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 701-patch-hbook-comis-Imakefiles.dpatch	9 Dec 2005 16:09:19 -0000	1.1
+++ 701-patch-hbook-comis-Imakefiles.dpatch	14 Dec 2005 16:15:57 -0000	1.2
@@ -6,9 +6,9 @@
 ## DP: 701 dpatch (a shell script).
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/packlib/hbook/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile
---- cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
-+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	2005-06-10 17:04:08.866020136 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/code/Imakefile cernlib-2005.05.09.dfsg/src/packlib/hbook/code/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/hbook/code/Imakefile	2005-12-07 14:59:31.519940694 -0500
 @@ -19,8 +19,8 @@
  	hgn.F hgnf.F hgnpar.F hgstat.F hhipar.F hhxye.F hi.F \ @@\
  	hictoi.F hid1.F hid2.F hidall.F hidopt.F hidpos.F hie.F  \ @@\
@@ -20,9 +20,9 @@
  	hkind.F hknul1.F hknuli.F hlabel.F hlabeq.F hlabnb.F \ @@\
  	hlattr.F hlccmp.F hldir.F hldir1.F hldir2.F hldirt.F \ @@\
  	hlgnxt.F hlhcmp.F hlimit.F hllsq.F hlnext.F hlocat.F \ @@\
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
---- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:02:24.843306185 -0400
-+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:05:09.955931988 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile	2005-12-07 14:59:22.782783593 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile	2005-12-07 14:59:31.519940694 -0500
 @@ -37,7 +37,8 @@
  	csspar.F cssubr.F cssvpt.F cstadv.F cstarr.F csterr.F cstext.F \ @@\
  	cstfrf.F cstinf.F cstlgb.F cstlog.F cstpar.F cstran.F cstrer.F \ @@\


Index: cernlib.m4
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib.m4	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib.m4	14 Dec 2005 16:15:57 -0000	1.2
@@ -1,6 +1,6 @@
 dnl                                                      -*- Autoconf -*- 
 dnl  autoconf macros for the cernlib libraries
-dnl  Copyright (C) 2004 Patrice Dumas
+dnl  Copyright (C) 2004, 2005 Patrice Dumas
 dnl
 dnl  This program is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
@@ -16,28 +16,33 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-dnl A basic axample of the macros usage:
+dnl A basic axample of the macro usage:
 dnl 
-dnl AC_CERNLIB
-dnl AC_LIB_CERNLIB(kernlib,CLTOU)
-dnl AC_LIB_CERNLIB(mathlib,GAUSS)
-dnl LIBS="$CERNLIB_LIBS $LIBS"
-
-dnl The macro AC_CERNLIB tries to determine the cernlib location and
-dnl whether the linking should be static or not. It should be called once and
-dnl before a particular cernlib library is detected with the second macro.
+dnl AC_LIB_CERNLIB(kernlib,CLTOU,
+dnl [
+dnl    AC_LIB_CERNLIB(mathlib,GAUSS,[LIBS="$CERNLIB_LIBS $LIBS"])
+dnl ])
+
+dnl
 dnl --with-static-cernlib forces the static or dynamic linking.
 dnl --with-cernlib gives the location of cernlib.
 dnl
-dnl If the type of linking isn't forced it is detected as follow:
-dnl - if the environment variable CERNLIB exists it is assumed to be the
+dnl If the type of linking isn't specified it is assumed to be static.
+dnl
+dnl For static linking:
+dnl - if the binary program 'cernlib-static' or 'cernlib' is in the path it is 
+dnl   assumed that a static linking using the information reported by that 
+dnl   script is wanted.
+dnl - otherwise if the environment variable CERNLIB exists it is assumed to be the
 dnl   location of the static library.
 dnl - otherwise if the environment variable CERN_ROOT exists it is assumed 
 dnl   that CERN_ROOT/lib is the location of the static library.
-dnl - otherwise if the binary program 'cernlib' is in the path it is assumed 
-dnl   that a static linking using the information reported by that binary is 
-dnl   wanted.
-dnl - otherwise a dynamic linking is performed.
+dnl - otherwise a simple linking is performed.
+dnl 
+dnl If a dynamic linking is selected:
+dnl - if the binary program 'cernlib' is in the path it is assumed that it is the 
+dnl   debian script and it is called with -dy.
+dnl - otherwise a simple linking is performed.
 dnl
 dnl AC_LIB_CERNLIB ([LIBRARY = kernlib], [FUNCTION = CLTOU], [ACTION-IF-FOUND],
 dnl          [ACTION-IF-NOT-FOUND]) 
@@ -53,7 +58,7 @@
 # statically linked or not.
 AC_DEFUN([AC_CERNLIB], [
 CERNLIB_LIB_PATH=
-CERNLIB_STATIC=
+CERNLIB_STATIC=yes
 AC_ARG_WITH(static_cernlib,
 [  --with-static-cernlib             link statically with the cernlib],
 [  CERNLIB_STATIC=$withval      ])
@@ -64,27 +69,24 @@
 
 
 if test "z$CERNLIB_STATIC" != "zno"; then    
-    CERNLIB_BIN=no
+    CERNLIB_STATIC=yes
     if test "z$CERNLIB_LIB_PATH" = z; then
-        if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
-            CERNLIB_LIB_PATH=$CERNLIB
-            CERNLIB_STATIC="yes"
-            AC_MSG_NOTICE([using the CERNLIB environment variable for cernlib location])
-        elif test "z$CERN_ROOT" != z -a -d "$CERN_ROOT/lib"; then
-            CERNLIB_LIB_PATH=$CERN_ROOT/lib
-            CERNLIB_STATIC="yes"
-            AC_MSG_NOTICE([using the CERN_ROOT environment variable for cernlib location])
-        fi
-        if test "z$CERNLIB_LIB_PATH" = "z"; then
+        AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no)
+        if test $CERNLIB_BIN = no; then
             AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
-            if test $CERNLIB_BIN != no; then
-                CERNLIB_STATIC="yes"
+        fi
+        if test $CERNLIB_BIN = no; then
+            if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
+               CERNLIB_LIB_PATH=$CERNLIB
+               AC_MSG_NOTICE([using the CERNLIB environment variable for cernlib location])
+            elif test "z$CERN_ROOT" != z -a -d "$CERN_ROOT/lib"; then
+                CERNLIB_LIB_PATH=$CERN_ROOT/lib
+                AC_MSG_NOTICE([using the CERN_ROOT environment variable for cernlib location])
             fi
         fi
     fi
-fi
-
-if test "z$CERNLIB_STATIC" != "zyes"; then
+else
+    AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
     if test "z$CERNLIB_LIB_PATH" != z; then
          LDFLAGS="$LDFLAGS -L$CERNLIB_LIB_PATH"
     fi
@@ -95,6 +97,7 @@
 #          [ACTION-IF-NOT-FOUND]) 
 # check for a function in a library of the cernlib
 AC_DEFUN([AC_LIB_CERNLIB], [
+AC_REQUIRE([AC_CERNLIB])
 
 cernlib_lib_ok="no"
 
@@ -110,10 +113,12 @@
     cern_func=$2
 fi
 
+save_CERNLIB_LIBS=$CERNLIB_LIBS
+save_LIBS=$LIBS
+
 if test "z$CERNLIB_STATIC" = "zyes"; then
     cernlib_lib_static_found=no
     AC_MSG_NOTICE([cernlib: linking with a static $cern_library])
-    save_CERNLIB_LIBS="$CERNLIB_LIBS"
     if test "z$CERNLIB_BIN" != "zno"; then
         cernlib_bin_out=`$CERNLIB_BIN $cern_library`
         CERNLIB_LIBS="$cernlib_bin_out $CERNLIB_LIBS"
@@ -127,37 +132,34 @@
     fi
     if test "z$cernlib_lib_static_found" = zno; then
         AC_MSG_WARN([cannot determine the cernlib location for static linking])
+    fi
+else
+    AC_MSG_NOTICE([trying a dynamical link with $cern_library])
+    if test "z$CERNLIB_BIN" != "zno"; then
+        # try link with debian cernlib script with -dy
+        cernlib_bin_out=`$CERNLIB_BIN -dy $cern_library`
+        CERNLIB_LIBS="$cernlib_bin_out $CERNLIB_LIBS"
     else
+        CERNLIB_LIBS="-l$cern_library $CERNLIB_LIBS"
+    fi
+fi
+
 dnl now try the link
-        AC_LANG_PUSH(Fortran 77)
-        save_LIBS="$LIBS"; LIBS="$CERNLIB_LIBS $LIBS"
-        AC_LINK_IFELSE([      program main
+LIBS="$CERNLIB_LIBS $LIBS"
+AC_LANG_PUSH(Fortran 77)
+AC_LINK_IFELSE([      program main
       call $cern_func
       end
 ], 
-        [ 
-            cernlib_lib_ok=yes
-        ],
-        [
-            CERNLIB_LIBS="$save_CERNLIB_LIBS"
-        ])
-        LIBS="$save_LIBS"
-        AC_LANG_POP(Fortran 77)
-    fi
-else
-    AC_MSG_NOTICE([trying a dynamical link with $cern_library])
-dnl FIXME ther could also be something like
-dnl save_LIBS="$LIBS"; LIBS="$CERNLIB_LIBS $LIBS"
-dnl CERNLIB_LIBS="-l$cern_library $CERNLIB_LIBS" 
-dnl LIBS="$save_LIBS"
-    AC_CHECK_LIB([$cern_library], [$cern_func],
-       [ 
-         AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
-         LIBS="-l$1 $LIBS"
-
-         cernlib_lib_ok=yes 
-       ])
-fi
+[ 
+    cernlib_lib_ok=yes
+],
+[
+    CERNLIB_LIBS=$save_CERNLIB_LIBS
+])
+AC_LANG_POP(Fortran 77)
+LIBS=$save_LIBS
+AC_SUBST([CERNLIB_LIBS])
 
 AS_IF([test x"$cernlib_lib_ok" = xyes],
       [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_CERNLIB_${cern_library}_${cern_func}))


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cernlib.spec	12 Dec 2005 10:01:28 -0000	1.14
+++ cernlib.spec	14 Dec 2005 16:15:57 -0000	1.15
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.3
+Release:       9%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -23,7 +23,7 @@
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # f771 segfaults on x86_64
-ExcludeArch:   x86_64
+#ExcludeArch:   x86_64
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -66,7 +66,7 @@
 Source201: cernlib-deadpool.txt
 
 # debian patchset
-Patch0: cernlib_2005.05.09.dfsg-2.diff
+Patch0: cernlib_2005.05.09.dfsg-3.diff
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: 001-fix-missing-fluka.dpatch
@@ -89,6 +89,9 @@
 # a workaround for cups. Applied in doubt.
 Patch113: 113-cups-postscript-fix.dpatch
 Patch114: 114-install-scripts-properly.dpatch
+Patch115: 115-rsrtnt64-goto-outer-block.dpatch
+Patch116: 116-fix-fconc64-spaghetti-code.dpatch
+Patch117: 117-fix-optimizer-bug-in-gphot.dpatch
 Patch200: 200-comis-allow-special-chars-in-path.dpatch
 Patch201: 201-update-kuip-helper-apps.dpatch
 Patch202: 202-fix-includes-in-minuit-example.dpatch
@@ -102,8 +105,9 @@
 Patch208: 208-fix-redundant-packlib-dependencies.dpatch
 Patch209: 209-ignore-unneeded-headers-in-kmutil.c.dpatch
 Patch210: 210-improve-cfortran-header-files.dpatch
-# disabled in the debian patchset, enabled here
-Patch211: 211-fix-comis-on-64-bit-arches.dpatch
+# split in newer debian patchset
+Patch2110: 211-fix-comis-on-amd64.dpatch
+Patch2111: 211-fix-comis-on-ia64.dpatch
 Patch300: 300-skip-duplicate-lenocc.dpatch
 # Use another approach, see cernlib-enforce-FHS
 # Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -183,7 +187,6 @@
 Patch1203: cernlib-hwuli2_use_dimag.diff 
 Patch1204: cernlib-hwhiga_use_dimag.diff
 Patch1205: cernlib-gfortran.diff 
-Patch1206: cernlib-rsrtnt64_goto_outer_block.diff
 Patch1207: cernlib-v107z0_X_before_string.diff
 
 %description
@@ -311,6 +314,9 @@
 %patch -P 112 -p1
 %patch -P 113 -p1
 %patch -P 114 -p1
+%patch -P 115 -p1
+%patch -P 116 -p1
+%patch -P 117 -p1
 %patch -P 200 -p1
 %patch -P 201 -p1
 %patch -P 202 -p1
@@ -322,7 +328,8 @@
 %patch -P 208 -p1
 %patch -P 209 -p1
 %patch -P 210 -p1
-%patch -P 211 -p1
+%patch -P 2110 -p1
+%patch -P 2111 -p1
 %patch -P 300 -p1
 #%patch -P 301 -p1
 #%patch -P 302 -p1
@@ -691,6 +698,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Wed Dec 14 2005 Patrice Dumas  - 2005-9
+- use new debian patchset
+
 * Fri Dec  9 2005 Patrice Dumas  - 2005-8.3
 - use new debian patchset
 - enable 64 bit fixes patch


Index: paw.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/paw.README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paw.README	9 Dec 2005 16:09:19 -0000	1.2
+++ paw.README	14 Dec 2005 16:15:57 -0000	1.3
@@ -41,11 +41,6 @@
 
 to the beginning of them.
 
-5) 64-bit issues
-
-Note that this package is not yet fully functional on 64-bit machines, as the
-COMIS portion of Pawlib does not yet work correctly on those architectures.
-
 -- Kevin McCarty , Tue, 22 Nov 2005
 
 Adapted to the rpm package by 


--- 211-fix-comis-on-64-bit-arches.dpatch DELETED ---


--- cernlib-rsrtnt64_goto_outer_block.diff DELETED ---


--- cernlib_2005.05.09.dfsg-2.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 14 16:17:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 14 Dec 2005 11:17:19 -0500
Subject: rpms/liboil/devel .cvsignore, 1.5, 1.6 liboil.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200512141617.jBEGHnd9008077@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore liboil.spec sources 
Log Message:
Update to 0.3.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liboil/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Nov 2005 15:27:55 -0000	1.5
+++ .cvsignore	14 Dec 2005 16:17:17 -0000	1.6
@@ -1 +1 @@
-liboil-0.3.5.tar.gz
+liboil-0.3.6.tar.gz


Index: liboil.spec
===================================================================
RCS file: /cvs/extras/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- liboil.spec	14 Nov 2005 09:30:29 -0000	1.11
+++ liboil.spec	14 Dec 2005 16:17:17 -0000	1.12
@@ -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
+* 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.
 - Parallel make seems to have worked for 0.3.5 on devel, but just in case...


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liboil/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Nov 2005 15:27:55 -0000	1.5
+++ sources	14 Dec 2005 16:17:17 -0000	1.6
@@ -1 +1 @@
-f365f0a4cc31b2ff029e37deccb09ff6  liboil-0.3.5.tar.gz
+a36b2d9cc71d75d814d7bdca2263290f  liboil-0.3.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 16:17:55 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 14 Dec 2005 11:17:55 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.15,1.16
Message-ID: <200512141618.jBEGIPvV008097@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
forgot to remove a %patch



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cernlib.spec	14 Dec 2005 16:15:57 -0000	1.15
+++ cernlib.spec	14 Dec 2005 16:17:53 -0000	1.16
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       9%{?dist}
+Release:       9%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -463,7 +463,6 @@
 # use gfortran
 #%patch -P 1205
 # workaround gfortran bug
-%patch -P 1206
 %patch -P 1207
 
 # remove CVS directories
@@ -698,7 +697,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Wed Dec 14 2005 Patrice Dumas  - 2005-9
+* Wed Dec 14 2005 Patrice Dumas  - 2005-9.1
 - use new debian patchset
 
 * Fri Dec  9 2005 Patrice Dumas  - 2005-8.3



From fedora-extras-commits at redhat.com  Wed Dec 14 16:32:32 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 14 Dec 2005 11:32:32 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.16,1.17
Message-ID: <200512141633.jBEGX32P008204@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
Still a f771 segfault on x86_64



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cernlib.spec	14 Dec 2005 16:17:53 -0000	1.16
+++ cernlib.spec	14 Dec 2005 16:32:30 -0000	1.17
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       9%{?dist}.1
+Release:       9%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -23,7 +23,7 @@
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # f771 segfaults on x86_64
-#ExcludeArch:   x86_64
+ExcludeArch:   x86_64
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -697,7 +697,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Wed Dec 14 2005 Patrice Dumas  - 2005-9.1
+* Wed Dec 14 2005 Patrice Dumas  - 2005-9.2
 - use new debian patchset
 
 * Fri Dec  9 2005 Patrice Dumas  - 2005-8.3



From fedora-extras-commits at redhat.com  Wed Dec 14 16:33:21 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 14 Dec 2005 11:33:21 -0500
Subject: rpms/python-quixote/FC-4 .cvsignore, 1.6, 1.7 python-quixote.spec,
	1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200512141633.jBEGXqIg008304@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-serv8223/FC-4

Modified Files:
	.cvsignore python-quixote.spec sources 
Log Message:
Update to new upstream verion 2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Oct 2005 20:31:53 -0000	1.6
+++ .cvsignore	14 Dec 2005 16:33:19 -0000	1.7
@@ -1 +1 @@
-Quixote-2.3.tar.gz
+Quixote-2.4.tar.gz


Index: python-quixote.spec
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/FC-4/python-quixote.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-quixote.spec	19 Oct 2005 20:31:53 -0000	1.7
+++ python-quixote.spec	14 Dec 2005 16:33:19 -0000	1.8
@@ -3,7 +3,7 @@
 %define srcname Quixote
 
 Name:           python-quixote
-Version:        2.3
+Version:        2.4
 Release:        1%{?dist}
 Summary:        A highly Pythonic Web application framework
 
@@ -70,6 +70,9 @@
 %ghost %{python_sitearch}/quixote/html/*.pyo
 
 %changelog
+* Wed Dec 14 2005 Shahms E. King  2.4-2
+- update to new upstream 2.4
+
 * Wed Oct 19 2005 Shahms E. King  2.3-1
 - update to new upstream 2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Oct 2005 20:31:53 -0000	1.6
+++ sources	14 Dec 2005 16:33:19 -0000	1.7
@@ -1 +1 @@
-ad947a8f4d8c8f48e8bd6f0572a755b0  Quixote-2.3.tar.gz
+5dc36613faba7dee6c8c6d24c1334303  Quixote-2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 16:33:27 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 14 Dec 2005 11:33:27 -0500
Subject: rpms/python-quixote/devel .cvsignore, 1.6, 1.7 python-quixote.spec,
	1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200512141633.jBEGXvNX008311@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	.cvsignore python-quixote.spec sources 
Log Message:
Update to new upstream verion 2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Oct 2005 20:31:54 -0000	1.6
+++ .cvsignore	14 Dec 2005 16:33:25 -0000	1.7
@@ -1 +1 @@
-Quixote-2.3.tar.gz
+Quixote-2.4.tar.gz


Index: python-quixote.spec
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/python-quixote.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-quixote.spec	19 Oct 2005 20:31:54 -0000	1.7
+++ python-quixote.spec	14 Dec 2005 16:33:25 -0000	1.8
@@ -3,7 +3,7 @@
 %define srcname Quixote
 
 Name:           python-quixote
-Version:        2.3
+Version:        2.4
 Release:        1%{?dist}
 Summary:        A highly Pythonic Web application framework
 
@@ -70,6 +70,9 @@
 %ghost %{python_sitearch}/quixote/html/*.pyo
 
 %changelog
+* Wed Dec 14 2005 Shahms E. King  2.4-2
+- update to new upstream 2.4
+
 * Wed Oct 19 2005 Shahms E. King  2.3-1
 - update to new upstream 2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Oct 2005 20:31:54 -0000	1.6
+++ sources	14 Dec 2005 16:33:25 -0000	1.7
@@ -1 +1 @@
-ad947a8f4d8c8f48e8bd6f0572a755b0  Quixote-2.3.tar.gz
+5dc36613faba7dee6c8c6d24c1334303  Quixote-2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 16:52:28 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 14 Dec 2005 11:52:28 -0500
Subject: rpms/cernlib/devel 115-rsrtnt64-goto-outer-block.dpatch, NONE,
	1.1 116-fix-fconc64-spaghetti-code.dpatch, NONE,
	1.1 117-fix-optimizer-bug-in-gphot.dpatch, NONE,
	1.1 211-fix-comis-on-amd64.dpatch, NONE,
	1.1 211-fix-comis-on-ia64.dpatch, NONE,
	1.1 304-update-Imake-config-files.dpatch, 1.2,
	1.3 307-use-canonical-cfortran.dpatch, 1.1,
	1.2 315-fixes-for-MacOSX.dpatch, 1.2,
	1.3 701-patch-hbook-comis-Imakefiles.dpatch, 1.1,
	1.2 cernlib.m4, 1.1, 1.2 cernlib.spec, 1.8, 1.9 paw.README,
	1.2, 1.3 211-fix-comis-on-64-bit-arches.dpatch, 1.1,
	NONE cernlib-rsrtnt64_goto_outer_block.diff, 1.1,
	NONE cernlib_2005.05.09.dfsg-2.diff, 1.1, NONE
Message-ID: <200512141652.jBEGqS4q008479@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	304-update-Imake-config-files.dpatch 
	307-use-canonical-cfortran.dpatch 315-fixes-for-MacOSX.dpatch 
	701-patch-hbook-comis-Imakefiles.dpatch cernlib.m4 
	cernlib.spec paw.README 
Added Files:
	115-rsrtnt64-goto-outer-block.dpatch 
	116-fix-fconc64-spaghetti-code.dpatch 
	117-fix-optimizer-bug-in-gphot.dpatch 
	211-fix-comis-on-amd64.dpatch 211-fix-comis-on-ia64.dpatch 
Removed Files:
	211-fix-comis-on-64-bit-arches.dpatch 
	cernlib-rsrtnt64_goto_outer_block.diff 
	cernlib_2005.05.09.dfsg-2.diff 
Log Message:
- use new debian patchset 




--- NEW FILE 115-rsrtnt64-goto-outer-block.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 115-rsrtnt64-goto-outer-block.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch from Patrice Dumas  to fix spaghetti code in
## DP: rsrtnt64.F that breaks linking step on Itanium.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/b/rsrtnt64.F cernlib-2005.05.09.dfsg/src/mathlib/gen/b/rsrtnt64.F
--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/b/rsrtnt64.F	1996-04-01 10:01:51.000000000 -0500
+++ cernlib-2005.05.09.dfsg/src/mathlib/gen/b/rsrtnt64.F	2005-12-06 11:22:08.500724891 -0500
@@ -117,8 +117,15 @@
         ENDIF
        ELSE
         IF(N .EQ. 1) THEN
-         ASSIGN 11 TO JMP1
-         GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    11    IF(K .EQ. 0) THEN
           H=H
          ELSEIF(K .EQ. 1) THEN
@@ -174,14 +181,28 @@
            H=2*((H1+B*U)/RT(U)-(H1+B*V)/RT(V))/DELTA
            LB1=11
           ELSEIF(K .EQ. 2) THEN
-           ASSIGN 12 TO JMP1
-           GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    12      H1=DELTA-B**2
            H2=2*A*B
            H=(((H1*U-H2)/RT(U)-(H1*V-H2)/RT(V))/DELTA+H)/C
           ELSEIF(K .EQ. 3) THEN
-           ASSIGN 13 TO JMP1
-           GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    13      H1=C*DELTA
            G1=A*C
            G2=3*B**2
@@ -217,8 +238,32 @@
         ENDIF
        ELSE
         IF(N .EQ. 1) THEN
-         ASSIGN 21 TO JMP2
-         GO TO 20
+      IF(C .EQ. 0) THEN
+       IF(B .EQ. 0) THEN
+        H=LOG(ABS(V/U))/SQRT(A)
+       ELSE
+        IF(A .LT. 0) THEN
+         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
+        ELSE
+         WA=SQRT(A)
+         WU=SQRT(A+B*U)
+         WV=SQRT(A+B*V)
+         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
+        ENDIF
+       ENDIF
+      ELSE
+       A2=2*A
+       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
+        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
+     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
+       ELSEIF(DELTA .EQ. 0) THEN
+        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
+        IF(U*V .GT. 0) H=SIGN(H,U)
+       ELSE
+        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
+        IF(U .LT. 0 .AND. V .LT. 0) H=-H
+       ENDIF
+      ENDIF
    21    IF(K .EQ. -1) THEN
           H=H
          ELSEIF(K .EQ. -2) THEN
@@ -257,8 +302,32 @@
            IF(U. LT. -X0) H=-H
           ENDIF
          ELSE
-          ASSIGN 22 TO JMP2
-          GO TO 20
+      IF(C .EQ. 0) THEN
+       IF(B .EQ. 0) THEN
+        H=LOG(ABS(V/U))/SQRT(A)
+       ELSE
+        IF(A .LT. 0) THEN
+         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
+        ELSE
+         WA=SQRT(A)
+         WU=SQRT(A+B*U)
+         WV=SQRT(A+B*V)
+         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
+        ENDIF
+       ENDIF
+      ELSE
+       A2=2*A
+       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
+        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
+     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
+       ELSEIF(DELTA .EQ. 0) THEN
+        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
+        IF(U*V .GT. 0) H=SIGN(H,U)
+       ELSE
+        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
+        IF(U .LT. 0 .AND. V .LT. 0) H=-H
+       ENDIF
+      ENDIF
    22     IF(K .EQ. -1) THEN
            H1=B*C
            H2=B**2-2*A*C
@@ -287,46 +356,7 @@
         ENDIF
        ENDIF
       ENDIF
-      GO TO 9
-
-   10 C2=2*C
-      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
-       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
-     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
-      ELSEIF(DELTA .EQ. 0) THEN
-       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
-      ELSE
-       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
-      ENDIF
-      GO TO JMP1, (11,12,13)
 
-   20 IF(C .EQ. 0) THEN
-       IF(B .EQ. 0) THEN
-        H=LOG(ABS(V/U))/SQRT(A)
-       ELSE
-        IF(A .LT. 0) THEN
-         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
-        ELSE
-         WA=SQRT(A)
-         WU=SQRT(A+B*U)
-         WV=SQRT(A+B*V)
-         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
-        ENDIF
-       ENDIF
-      ELSE
-       A2=2*A
-       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
-        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
-     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
-       ELSEIF(DELTA .EQ. 0) THEN
-        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
-        IF(U*V .GT. 0) H=SIGN(H,U)
-       ELSE
-        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
-        IF(U .LT. 0 .AND. V .LT. 0) H=-H
-       ENDIF
-      ENDIF
-      GO TO JMP2, (21,22)
 
     9 RES=SIGN(R1,V1-U1)*H
       LRL=LLL


--- NEW FILE 116-fix-fconc64-spaghetti-code.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 116-fix-fconc64-spaghetti-code.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Work around FTBFS on ia64 with recent binutils, apparently caused
## DP: by assignment of goto labels in this file.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/c/fconc64.F cernlib-2005.05.09.dfsg/src/mathlib/gen/c/fconc64.F
--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/c/fconc64.F	1996-04-01 10:02:04.000000000 -0500
+++ cernlib-2005.05.09.dfsg/src/mathlib/gen/c/fconc64.F	2005-12-12 12:58:23.885981128 -0500
@@ -190,15 +190,167 @@
       A=HF*((HF-FM)-TI)
       B=HF*((HF-FM)+TI)
       C=HF
-      ASSIGN 1 TO JP
-      GO TO 20
+   20 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 21 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 1
+       DO 22 J = 1,3
+       V(J-1)=V(J)
+   22  U(J-1)=U(J)
+   21  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 23 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 1
+   23  CONTINUE
+      END IF
+      GO TO 24
     1 R1=R
       R1=R1/ABS(CGM(A+HF))**2
       A=HF*((TH-FM)-TI)
       B=HF*((TH-FM)+TI)
       C=TH
-      ASSIGN 2 TO JP
-      GO TO 20
+  120 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 121 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 2
+       DO 122 J = 1,3
+       V(J-1)=V(J)
+  122  U(J-1)=U(J)
+  121  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 123 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 2
+  123  CONTINUE
+      END IF
+      GO TO 24
     2 R2=R
       FC=RPI*(R1-2*X*R2/ABS(CGM(A-HF))**2)
       IF(LM1) FC=2*FC/SQRT(1-X1)
@@ -209,8 +361,84 @@
       A=(HF+FM)-TI
       B=(HF+FM)+TI
       C=FM+1
-      ASSIGN 3 TO JP
-      GO TO 20
+  220 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 221 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 3
+       DO 222 J = 1,3
+       V(J-1)=V(J)
+  222  U(J-1)=U(J)
+  221  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 223 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 3
+  223  CONTINUE
+      END IF
+      GO TO 24
     3 FC=R
       IF(LM1) FC=SIGN(HF,1-X)*(TAU**2+HF**2)*SQRT(ABS(X**2-1))*FC
       GO TO 99
@@ -220,15 +448,7 @@
       A=HF*((HF-FM)-TI)
       B=HF*((TH-FM)-TI)
       C=1-TI
-      ASSIGN 4 TO JP
-      GO TO 20
-    4 R1=EXP((TI-HF)*LOG(X+X)+CLG(1+TI)-CLG((TH-FM)+TI))*
-     1        R*((HF-FM)+TI)/TI
-      FC=RPW*R1
-      IF(LM1) FC=FC/SQRT(1-X1)
-      GO TO 99
-
-   20 IF(LTA) THEN
+  320 IF(LTA) THEN
        Y=-X1
        Y2=Y**2
        Y3=Y*Y2
@@ -257,7 +477,7 @@
        U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
 
        R=1
-       DO 21 N = 3,NMAX
+       DO 321 N = 3,NMAX
        FN=N
        RR=R
        H(1)=FN-1
@@ -289,23 +509,29 @@
        V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
        U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
        R=U(3)/V(3)
-       IF(ABS(R-RR) .LT. EPS) GO TO JP, (1,2,3,4)
-       DO 22 J = 1,3
+       IF(ABS(R-RR) .LT. EPS) GO TO 4
+       DO 322 J = 1,3
        V(J-1)=V(J)
-   22  U(J-1)=U(J)
-   21  CONTINUE
+  322  U(J-1)=U(J)
+  321  CONTINUE
       ELSE
        W(1)=X1*A*B/C
        R=1+W(1)
-       DO 23 N = 1,NMAX
+       DO 323 N = 1,NMAX
        FN=N
        RR=R
        W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
        R=R+W(1)
-       IF(ABS(R-RR) .LT. EPS) GO TO JP, (1,2,3,4)
-   23  CONTINUE
+       IF(ABS(R-RR) .LT. EPS) GO TO 4
+  323  CONTINUE
       END IF
-      FC=0
+      GO TO 24
+    4 R1=EXP((TI-HF)*LOG(X+X)+CLG(1+TI)-CLG((TH-FM)+TI))*
+     1        R*((HF-FM)+TI)/TI
+      FC=RPW*R1
+      IF(LM1) FC=FC/SQRT(1-X1)
+      GO TO 99
+   24 FC=0
       WRITE(ERRTXT,102) X
       CALL MTLPRT(NAME,'C331.2',ERRTXT)
 #if defined(CERNLIB_DOUBLE)


--- NEW FILE 117-fix-optimizer-bug-in-gphot.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 117-fix-optimizer-bug-in-gphot.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch by Harald Vogt  to work around compiler
## DP: optimization problems in src/geant321/gphys/gphot.F.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gphys/gphot.F cernlib-2005.05.09.dfsg/src/geant321/gphys/gphot.F
--- cernlib-2005.05.09.dfsg~/src/geant321/gphys/gphot.F	1995-10-24 06:21:29.000000000 -0400
+++ cernlib-2005.05.09.dfsg/src/geant321/gphys/gphot.F	2005-12-07 15:01:52.558184613 -0500
@@ -240,7 +240,7 @@
                   ELSE
 C Radiative shell decay
                      JS = JFN+1+2*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 40 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
@@ -296,7 +296,7 @@
                   ELSE
 c Nonradiative decay
                      JS = JFN+1+3*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 60 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN


--- NEW FILE 211-fix-comis-on-amd64.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-amd64.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Large patch from Harald Vogt  to make PAW and Paw++ work
## DP: (at least when statically linked) on 64-bit architectures.
## DP: Slightly modified in an attempt to keep ABI compatibility of the
## DP: dynamic libraries; not that it matters much as they don't work well
## DP: when dynamically linked on 64-bit anyway.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/hbook.h cernlib-2005.05.09.dfsg/src/cfortran/hbook.h
--- cernlib-2005.05.09.dfsg~/src/cfortran/hbook.h	1999-11-15 17:01:12.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/cfortran/hbook.h	2005-12-09 13:27:45.465589336 +0000
@@ -489,6 +489,10 @@
 #define HBALLOC(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
         CCALLSFSUB11(HBALLOC,hballoc,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PINT,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
 
+PROTOCCALLSFSUB11(HBALLOC64,hballoc64,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PLONG,PINT)
+#define HBALLOC64(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
+        CCALLSFSUB11(HBALLOC64,hballoc64,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PLONG,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
+
 PROTOCCALLSFSUB1(HBFREE,hbfree,INT)
 #define HBFREE(LUN) CCALLSFSUB1(HBFREE,hbfree,INT,LUN)
 
@@ -508,6 +512,13 @@
 #define HGNTBF(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)\
         CCALLSFSUB6(HGNTBF,hgntbf,INT,ZTRINGV,INTV,INT,INT,PINT,IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
 
+PROTOCCALLSFSUB6(HGNTBF64,hgntbf64,INT,ZTRINGV,LONGV,INT,INT,PINT)
+/* fix the element length of VAR to 32 */
+#define hgntbf64_ELEMS_2          ZTRINGV_ARGS(4)
+#define hgntbf64_ELEMLEN_2        ZTRINGV_NUM(32)
+#define HGNTBF64(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)\
+        CCALLSFSUB6(HGNTBF64,hgntbf64,INT,ZTRINGV,LONGV,INT,INT,PINT,IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
+
 PROTOCCALLSFSUB1(HGTDIR,hgtdir,PSTRING)
 #define HGTDIR(CHDIR) CCALLSFSUB1(HGTDIR,hgtdir,PSTRING,CHDIR)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/cspack/hcntpar.inc cernlib-2005.05.09.dfsg/src/packlib/cspack/cspack/hcntpar.inc
--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/cspack/hcntpar.inc	1996-03-08 15:44:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/cspack/cspack/hcntpar.inc	2005-12-09 13:27:45.465589336 +0000
@@ -22,7 +22,7 @@
      +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
      +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
      +          ZARIND=11, ZIBLOK=8,  ZNBLOK=10, ZIBANK=9,  ZIFTMP=11,
-     +          ZITMP=10,  ZNTMP=5,   ZNTMP1=3,  ZLINK=6)
+     +          ZITMP=10,  ZNTMP=5,   ZNTMP1=4,  ZLINK=6)
 *
 
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hbook/hcntpar.inc cernlib-2005.05.09.dfsg/src/packlib/hbook/hbook/hcntpar.inc
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hbook/hcntpar.inc	1996-01-16 17:07:52.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hbook/hcntpar.inc	2005-12-09 13:27:46.373451320 +0000
@@ -24,7 +24,7 @@
      +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
      +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
      +          ZARIND=11, ZIBLOK=8,  ZNBLOK=10, ZIBANK=9,  ZIFTMP=11,
-     +          ZID=12,    ZITMP=10,  ZNTMP=6,   ZNTMP1=3,  ZLINK=6)
+     +          ZID=12,    ZITMP=10,  ZNTMP=6,   ZNTMP1=4,  ZLINK=6)
 *
 
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hballoc.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hballoc.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hballoc.F	1996-01-16 17:07:56.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hballoc.F	2005-12-09 13:27:46.617414232 +0000
@@ -42,3 +42,26 @@
       ENDIF
 *
       END
+*
+*     64-bit version (separate to preserve ABI compatibility)
+      SUBROUTINE HBALLOC64(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,
+     +                     IBASE,IOFF,NUSE)
+*
+      CHARACTER*(*)  CHDIR, VAR, BLOCK
+      INTEGER        IDN, ITYPE, ISIZE, NELEM, NUSE, IFIRST, IBASE(1)
+      INTEGER*8      IBUF(1), IOFF
+*
+      LC = LENOCC(CHDIR)
+      LV = LENOCC(VAR)
+      LB = LENOCC(BLOCK)
+*
+      CALL HBALLO1(IDN, CHDIR, LC, VAR, LV, BLOCK, LB, ITYPE, ISIZE,
+     +             IFIRST, NELEM, IBUF, NUSE)
+*
+      IF (NUSE .EQ. 0) THEN
+         IOFF = 0
+      ELSE
+         IOFF = IBUF(1) - %LOC(IBASE(1))/4
+      ENDIF
+*
+      END
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hbnt.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hbnt.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hbnt.F	1996-01-16 17:07:56.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hbnt.F	2005-12-09 13:27:46.644410128 +0000
@@ -269,11 +269,13 @@
  ************************************************************************
  *      *         *                                                     *
  *   1  *         *     Number of variables to be read out              *
- *      *         *     *** For every variable 3 words (ZNTMP1) ***     *
+ *      *         *     *** For every variable 4 words (ZNTMP1) ***     *
  *   2  *         *     Index of variable in LNAME bank                 *
  *   3  *         *     Offset of variable in LNAME bank (INDX-1)*ZNADDR*
  *   4  *         *     Offset in dynamically allocated buffer (only    *
  *      *         *     used via HGNTBF) otherwise 0                    *
+ *   5  *         *     spare (used in 64 bit architectures for upper   *
+ *      *         *     address part)                                   *
  ************************************************************************
 #endif
 *
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgnt2.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgnt2.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgnt2.F	1999-03-05 15:42:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgnt2.F	2005-12-09 13:27:46.644410128 +0000
@@ -34,7 +34,13 @@
 #include "hbook/hcrecv.inc"
 *
       CHARACTER*(*) VAR1(*)
+#if defined(CERNLIB_QMLXIA64)
+      INTEGER*8     IVOFF(*), IOFFST, IOFFSTT
+      INTEGER       IOFFSTV(2)
+      EQUIVALENCE   (IOFFSTV, IOFFSTT)
+#else
       INTEGER       IVOFF(*)
+#endif
       CHARACTER*32  VAR
       INTEGER       ILOGIC, HNMPTR
       LOGICAL       LOGIC, INDVAR, ALLVAR, USEBUF, CHKOFF
@@ -452,10 +458,15 @@
          IQ(LTMP1+JTMP+1)      = IOFF
          IF (USEBUF) THEN
             IF (IEDIF .EQ. 0) THEN
-               IQ(LTMP1+JTMP+2) = IOFFST
+               IOFFSTT = IOFFST
             ELSE
-               IQ(LTMP1+JTMP+2) = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
+               IOFFSTT = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
             ENDIF
+            IQ(LTMP1+JTMP+2) = IOFFSTT
+#if defined(CERNLIB_QMLXIA64)
+*           store upper part of 64 bit address
+            IQ(LTMP1+JTMP+3) = IOFFSTV(2)
+#endif
          ELSE
             IQ(LTMP1+JTMP+2)   = 0
          ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntbf.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntbf.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntbf.F	1996-01-16 17:07:57.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntbf.F	2005-12-09 13:27:46.645409976 +0000
@@ -26,3 +26,13 @@
       CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
 *
       END
+*
+*     64-bit version (separate to preserve ABI compatibility)
+      SUBROUTINE HGNTBF64(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
+      CHARACTER*(*) VAR(*)
+      INTEGER*8     IOFFST(*)
+*
+      NVAR1 = -NVAR
+      CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
+*
+      END
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntf.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntf.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntf.F	1999-03-05 15:42:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntf.F	2005-12-09 13:27:46.645409976 +0000
@@ -37,6 +37,13 @@
       INTEGER       ILOGIC
       LOGICAL       LOGIC, INDVAR, USEBUF
       EQUIVALENCE  (LOGIC, ILOGIC)
+
+#if defined(CERNLIB_QMLXIA64)
+      INTEGER*8     IOFFST, IOFFSTT
+      INTEGER       IOFFSTV(2)
+      EQUIVALENCE   (IOFFSTV, IOFFSTT)
+#endif
+
 *
 #include "hbook/jbyt.inc"
 *
@@ -76,6 +83,12 @@
          INDX   = IQ(LTMP1+JTMP)
          IOFF   = IQ(LTMP1+JTMP+1)
          IOFFST = IQ(LTMP1+JTMP+2)
+#if defined(CERNLIB_QMLXIA64)
+*        fetch full 64 bit address
+         IOFFSTV(1) = IQ(LTMP1+JTMP+2)
+         IOFFSTV(2) = IQ(LTMP1+JTMP+3)
+         IOFFST     = IOFFSTT
+#endif
          IF (IOFFST .EQ. 0) THEN
             USEBUF = .FALSE.
          ELSE
@@ -442,10 +455,15 @@
 *
          IF (USEBUF) THEN
             IF (IEDIF .EQ. 0) THEN
-               IQ(LTMP1+JTMP+2) = IOFFST
+               IOFFSTT = IOFFST
             ELSE
-               IQ(LTMP1+JTMP+2) = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
+               IOFFSTT = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
             ENDIF
+            IQ(LTMP1+JTMP+2) = IOFFSTT
+#if defined(CERNLIB_QMLXIA64)
+*           store upper part of 64 bit address
+            IQ(LTMP1+JTMP+3) = IOFFSTV(2)
+#endif
          ELSE
             IQ(LTMP1+JTMP+2) = 0
          ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c
--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c	2005-12-09 13:27:46.645409976 +0000
@@ -44,7 +44,25 @@
    DummyDef
 #endif
 {
+#if defined(CERNLIB_QMLXIA64)
+   const unsigned long long int mask=0x00000000ffffffff;
+   static unsigned long long int base=1;
+   unsigned long long int jadr=(unsigned long long int) iadr;
+   unsigned long long int jadrl = (mask & jadr);
+
+   if (base == 1) {
+     base = (~mask & jadr);
+   } else if(base != (~mask & jadr)) {
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+     printf("locb_() Warning: changing base from %lx to %lx!!!\n",
+     	   base, (~mask & jadr));
+     printf("This may result in program crash or incorrect results\n");
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+   }
+   return ((int) jadrl);
+#else
    return( (int) iadr );
+#endif
 }
 /*> END <----------------------------------------------------------*/
 #ifdef CERNLIB_TCGEN_LOCB
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/zbook/code/zjump.c cernlib-2005.05.09.dfsg/src/packlib/zbook/code/zjump.c
--- cernlib-2005.05.09.dfsg~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/zbook/code/zjump.c	2005-12-09 13:27:46.971360424 +0000
@@ -7,6 +7,9 @@
  *
  */
 #include "zbook/pilot_c.h"
+#if defined(CERNLIB_QMLXIA64)
+static void (*target)();
+#endif
 #if defined(CERNLIB_UNIX)
 #if defined(CERNLIB_QX_SC)
 zjump_(name,p1,p2,p3,p4)
@@ -18,8 +21,23 @@
 ZJUMP(name,p1,p2,p3,p4)
 #endif
 char *p1, *p2, *p3, *p4;
+
+/*  LP64 compatibility:
+    name is taken from a Fortran array and therefore its address is 32 bit
+    which has to be converted to a 64 bit address to satisfy void (*) (H. Vogt) */
+
+#if defined(CERNLIB_QMLXIA64)
+int *name;
+{
+  long jadr;
+  jadr   = *name;  /* convert int to long */
+  target = (void (*)())jadr;
+  (*target)(p1, p2, p3, p4);
+}
+#else
 void (**name)();
 {
    (**name)(p1, p2, p3, p4);
 }
 #endif
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.05.09.dfsg/src/packlib/zebra/test/brztest/btest2.F
--- cernlib-2005.05.09.dfsg~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/zebra/test/brztest/btest2.F	2005-12-09 13:27:46.971360424 +0000
@@ -29,6 +29,15 @@
 ********************************************************************************
 *
       COMMON/CRZT/IXSTOR,IXDIV,IFENCE(2),LEV,LEVIN,BLVECT(30000)
+
+*     LP64 compatibility:
+*     For 64-bit pointer systems put local variables referenced by LOCF
+*     in a dummy named common block to keep addresses in the program region.
+*     see also: packlib/ffread/test/main.F (H. Vogt)
+
+#if defined(CERNLIB_QMLXIA64)
+      COMMON /TEST64/LBANK
+#endif
       DIMENSION LQ(999),IQ(999),Q(999)
       EQUIVALENCE (IQ(1),Q(1),LQ(9)),(LQ(1),LEV)
 C
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile	2005-12-09 13:27:38.969576880 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile	2005-12-09 13:27:46.971360424 +0000
@@ -50,6 +50,10 @@
 SRCS_F := $(SRCS_F) cscrexec.F
 #endif
 
+#if defined(CERNLIB_QMLXIA64)
+SRCS_F := $(SRCS_F) csrtgpl.F csitgpl.F
+#endif
+
 #if defined(CERNLIB_OLD)
 SRCS_F := $(SRCS_F) cspdir.F csrmbk.F
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F	1996-02-26 17:16:25.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F	2005-12-09 13:27:46.972360272 +0000
@@ -17,8 +17,14 @@
       INTEGER CSLTGP,CSITGP
       CHARACTER*32 NAME
 #include "comis/cstab.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       INTEGER CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      INTEGER*8 CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)
       NAME=CHNAME
       NC=LENOCC(NAME)
       CALL CSCHID(NAME(:NC))
@@ -26,21 +32,39 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
+#endif
+#endif
+#if defined(CERNLIB_SHL)
           ELSE
             I=0
           ENDIF
         ENDIF
       ELSE
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+        IF(IADGPL.NE.0)THEN
+          IFCS=-2
+          ITYPGP=-2
+          I=CSITGPL(IPVS)
+        ENDIF
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
           I=CSITGP(IPVS)
         ENDIF
+#endif
       END IF
       CSADDR=I
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csinit.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csinit.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csinit.F	2005-04-18 15:41:04.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csinit.F	2005-12-09 13:27:46.972360272 +0000
@@ -64,6 +64,9 @@
 #if defined(CERNLIB_SHL)
 #include "comis/cshlnm.inc"
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+#endif
 #if defined(CERNLIB_PAW)
 #include "paw/pcmode.inc"
 #include "comis/cshfill.inc"
@@ -159,6 +162,9 @@
       ICHMINU=ICHAR('-')
       ICHPLUS=ICHAR('+')
       ICHCOMM=ICHAR(',')
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+      IPIADGV=0
+#endif
 #if defined(CERNLIB_PAW)
       CALL CSPAWI
       MODHFI=0
@@ -211,8 +217,8 @@
 #endif
 #if (defined(CERNLIB_LINUX))
       ITMPLEN=CSTMPD(CHPATH, 256)
-      CHF77 ='g77 -c'
-      CHCC  ='cc -c'
+      CHF77 ='g77 -c -fPIC'
+      CHCC  ='cc -c -fPIC'
 #endif
 #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
       ITMPLEN=CSTMPD(CHPATH, 256)
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csintx.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csintx.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csintx.F	1996-12-05 09:50:37.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csintx.F	2005-12-09 13:27:46.973360120 +0000
@@ -38,6 +38,9 @@
 #if defined(CERNLIB_PAW)
 #include "comis/cskucs.inc"
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_ALPHA_OSF))
       INTEGER CSTRCMP
 #endif
@@ -1105,6 +1108,32 @@
       ENDIF
 #endif
 #if (!defined(CERNLIB_VAX))&&(!defined(CERNLIB_APOLLO))
+#if defined(CERNLIB_QMLXIA64)
+      IF(IQ(IP+KSIFCS).EQ.-2)THEN
+*Dynamic linker may give long addresses
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ENDIF
+#else
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NPAR,IDA(IOFSPL))
       ELSEIF(ITP.EQ.2)THEN
@@ -1115,6 +1144,7 @@
         DCSRES=CSCALD(IADGP,NPAR,IDA(IOFSPL))
       ENDIF
 #endif
+#endif
       IPC=IPC+4
       GO TO 999
 *NUM I
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csitgpl.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csitgpl.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csitgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csitgpl.F	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,32 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZU:  1.16/16 04/10/93  12.14.52  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+      INTEGER FUNCTION CSITGPL(IP)
+***------------------------------
+*   it is last routine from the tables-set.
+***-----------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cspnts.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab64.inc"
+      I=MHLOC(KSIDP+NWIDEN)
+      IQ(I)=0
+      IQ(I+1)=NCIDEN
+      DO 1 K=1,NWIDEN
+        IQ(I+KSIDP-1+K)=IDEN(K)
+   1  CONTINUE
+      CALL CSRTGPL(I)
+      IF(IP.EQ.0)THEN
+        IPGP=I
+      ELSE
+        IQ(IP)=I
+      ENDIF
+      CSITGP=I
+      END
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cskcal.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cskcal.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cskcal.F	1996-12-05 09:50:39.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cskcal.F	2005-12-09 13:27:46.973360120 +0000
@@ -31,6 +31,9 @@
 #include "comis/cstab.inc"
 #include "comis/csfres.inc"
 #include "comis/cssysd.inc"
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
       CHARACTER PRONAME*32
       INTEGER CSCALI
       DOUBLE PRECISION CSCALD
@@ -232,6 +235,34 @@
         I2=I2+KS
         I=I+1
  9203 CONTINUE
+#if defined(CERNLIB_QMLXIA64)
+*  Dynamic linker may give long addresses
+      IF (IFCS.EQ.-2)THEN
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ENDIF
+#else
 *      IT=IABS(ITYPGP)
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NOPAR,IF77PL(1))
@@ -245,6 +276,7 @@
       ENDIF
 *+SELF,IF=UNIX,IF=-SGI,IF=-IBMRT,IF=-DECS,IF=-HPUX,IF=-SUN,IF=-MSDOS.
 #endif
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_STDUNIX))
       I=1
       DO 9203 K=ITA-NPAR+1,ITA
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cslink.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cslink.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cslink.F	1996-02-26 17:16:17.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cslink.F	2005-12-09 13:27:46.973360120 +0000
@@ -21,10 +21,15 @@
 #include "comis/cstab.inc"
 #include "comis/cspnts.inc"
 #include "comis/cslun.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       CHARACTER*(KLENID) FNNAME
       INTEGER CS_GET_FUNC
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      CHARACTER*(KLENID) FNNAME
+      INTEGER*8 CS_GET_FUNC
+#endif
          COMMON/CSGSCM/IGS,JGS,NGS,CSJUNK(3)
       IF(ISTLIB.EQ.0 .AND. ITBS.EQ.0)RETURN
    2  I=IPGP
@@ -60,12 +65,20 @@
 #if defined(CERNLIB_SHL)
           CALL CSGTIDP(I,FNNAME,NC)
           CALL CUTOL(FNNAME(1:NC))
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(FNNAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+          ENDIF
+#else
           IADGP=CS_GET_FUNC(FNNAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
           ENDIF
 #endif
+#endif
           IP=0
         ENDIF
       ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csrtgpl.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csrtgpl.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csrtgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csrtgpl.F	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,31 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZ :  1.18/14 10/01/95  15.41.06  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+
+      SUBROUTINE CSRTGPL(I)
+***--------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab.inc"
+#include "comis/cstab64.inc"
+
+      IPIADGV = IPIADGV + 1
+      IF (IPIADGV .GT. MAXIAD64)  THEN
+        WRITE (*,'(2a,I4)') 'to much addresses for dynamik linking, ',
+     &                      'limit is ', MAXIAD64
+        WRITE (*,'(2a)') 'increase MAXIAD64 in cstab64.inc and ',
+     &                    'recompile COMIS'
+
+        STOP
+      END IF
+      IADGPLV(IPIADGV) = IADGPL
+      IADGP            = IPIADGV
+      CALL CCOPYA(IADGP,IQ(I+2),KSIDP-2)
+      END
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/comis/cstab64.inc cernlib-2005.05.09.dfsg/src/pawlib/comis/comis/cstab64.inc
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/comis/cstab64.inc	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/comis/cstab64.inc	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,10 @@
+*
+*
+* cstab64.inc
+*
+      PARAMETER (MAXIAD64=100) !maximum number of shared objects
+      INTEGER*8 IADGPL,IADGPLV(MAXIAD64)
+      INTEGER   IADGPL1, IADGPL2
+      COMMON /CSTB64/ IADGPL,IADGPLV
+      COMMON /CSTB64I/ IPIADGV
+      EQUIVALENCE (IADGPL, IADGPL1)
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c	1997-09-02 15:50:38.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c	2005-12-09 13:27:46.974359968 +0000
@@ -33,11 +33,25 @@
 #else
 void ccopys_(ja,jb,nn)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *nn;
+{
+  int i,n; char *a,*b;
+  n=*nn; a=*ja; b=*jb;
+#else
      char **ja, **jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+#endif
   if ( a >= b )
      for ( i=0; inext = f->first_proc;
          f->first_proc = p;
+         if (debug_level > 0) printf("function pointer is: %p\n", p->funcptr);
          return (void *)(p->funcptr);
       }
      f = f->next;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c	2004-10-27 09:01:54.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c	2005-12-09 13:27:46.974359968 +0000
@@ -32,8 +32,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 double cscald_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -46,10 +45,41 @@
     int CSCALD (name,n,p)
 #  endif
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscald_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+double cscald_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[16];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = *fptr + (unsigned long)jumpad_;
+   /* if ( *fptr > 0 ) ptr = 0; */
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  double (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
+#endif
    double d;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c	2004-10-22 12:42:40.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c	2005-12-09 13:27:46.974359968 +0000
@@ -29,8 +29,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 int cscali_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -39,10 +38,41 @@
 #if defined(CERNLIB_QXCAPT)
 int type_of_call CSCALI (name,n,p)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscali_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+int cscali_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[16];
+{
+   int jumpad_();
+   int (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   /* if ( *fptr > 0 ) ptr = 0; */
+   ptr += *fptr;
+   name = (int (*)())ptr;
+/*    printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  int (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
+#endif
    int i;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c	2004-10-22 12:03:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c	2005-12-09 13:27:46.974359968 +0000
@@ -35,7 +35,7 @@
 #endif
 
 
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 float cscalr_ (name,n,p)
 #endif
 
@@ -51,11 +51,51 @@
 # endif
 #endif
 
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscalr_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+/* Additional note: g77 generates code such that it expects REAL functions
+ * to return "double".  Hence C functions to be used in FORTRAN as REAL
+ * must return "double", and declarations of REAL FORTRAN functions in C files
+ * must also return "double".  On most architectures one can get away with
+ * using "float" instead, but not on amd64 ... see
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15397
+ * 
+ * -- Kevin McCarty
+ */
+	
+#if defined(CERNLIB_QMLXIA64)
+double cscalr_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ int pin[16];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscalr - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+   double r;
+#else
  float (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
    float r;
+#endif
    switch (*n)
    {
       case 0:
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c	1997-09-02 15:50:44.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 13:27:46.975359816 +0000
@@ -36,6 +36,27 @@
 #else
 int cstrcmp_(ja,na,jb,nb)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *na, *nb;
+{
+
+  int i,la,lb,k; char *a,*b;
+  if ( *na >= *nb )
+     {
+      a=*ja; b=*jb; la=*na; lb=*nb; k=1;
+      }
+  else
+    {
+      a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
+     }
+#else
      char **ja, **jb;
      int *na, *nb;
 {
@@ -48,6 +69,7 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+#endif
   for ( i=0; i b[i]) ? k : -k ); }
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/c_hcntpar.h cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/c_hcntpar.h
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/c_hcntpar.h	1996-04-23 18:37:45.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/c_hcntpar.h	2005-12-09 13:27:46.975359816 +0000
@@ -47,7 +47,7 @@
 #define ZID	12
 #define ZITMP	10
 #define ZNTMP	6
-#define ZNTMP1	3
+#define ZNTMP1	4
 #define ZLINK	6
 
 #endif	/*	CERN_C_HCNTPAR	*/
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_execute.c cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_execute.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_execute.c	2001-09-18 13:41:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_execute.c	2005-12-09 13:31:01.495788216 +0000
@@ -184,12 +184,19 @@
 					/* all definitions for the stack */
 #undef INIT_STACK_TO_NULL		/* are kept together in this file */
 
+#if defined(CERNLIB_QMLXIA64)
+# undef HBALLOC
+# undef HGNTBF
+# define HBALLOC HBALLOC64
+# define HGNTBF HGNTBF64
+#endif
+
 /* extern functions */
 extern void qp_exec_evt( QueryExe *, long, long, QPCmd *, int *);
 
 typedef		char	tName[MAX_NAME_LEN+1];
 tName		*namelist;
-int		*offsetlist;
+long		*offsetlist;
 int		*indexlist;
 
 
@@ -245,7 +252,23 @@
 	char		ntname[MAX_NAME_LEN+6];
 	int		i, ierr, indx, itype, isize, ielem;
 	Int32 *		addr;
-	int		ibase[1], ioff, nuse;
+
+	/* LP64 compatibility:
+	   - use static for ibase (at least) because its address is stored
+	     as Int32 in structure CWNBlock
+	     static takes ibase from the stack and puts it the code area.
+	   - use type long for ioff and offsetlist[i]
+	     (for 32 bit architectures type long is 4 Bytes as it is used
+	      also in packlib/hbook/chbook/halloc.c in hballo1 !)
+	   The x86-64 ABI has the code area in the 32 bit address space
+	   but addresses to the stack and to dynamically allocated areas
+	   may and will be above the 32 bit address space (below 0x80000000000).
+	   See also: http://www.x86-64.org/documentation/abi-0.96.pdf
+	   (H. Vogt, Oct. 2005) */
+
+	static int	ibase[1];
+	long		ioff;
+	int		nuse;
 	int		id = qe->id;
 	char *		path = qe->path;
 	char *		title;
@@ -286,7 +309,11 @@
 	CWNBlock = (RefCWN *) calloc( CWNCount + 1, sizeof( RefCWN ) );
 	qp_assert( MAX_NAME_LEN == 32 ); /* see hbook.h (HGNTBF) */
 	namelist = (tName *) calloc( CWNCount + 1, sizeof(tName) );
-	offsetlist = (int *) calloc( CWNCount + 1, sizeof(int) );
+
+	/* offsetlist should be of type long (see above) (H. Vogt, Oct. 2005) */
+
+	offsetlist = (long *) calloc( CWNCount + 1, sizeof(long) );
+
 	indexlist = (int *) calloc( CWNCount + 1, sizeof(int) );
 	qp_assert(
 		CWNBlock != 0 &&
@@ -381,6 +408,7 @@
 						offsetlist[nt_load_cnt]=
 						CWNBlock[index].p -
 						PAWC.iq_eqv;
+
 						strncpy(
 						namelist[nt_load_cnt],
 						vi->name,
@@ -871,8 +899,21 @@
 			if ( cmd->u.scan.pawpp ) {
 				char	buf[33];
 
+				/* for LP64 ABI matlab and matrow are 64 bit pointer, type is void*  
+				   but PCADDR.jmlab and PCADDR.jmrow are of type int
+				   see: c_pcaddr.h and qp_command.h
+				   it is related to CWNBlock -> see above (H. Vogt)*/
+
+#if defined(CERNLIB_QMLXIA64)
+				unsigned long long int	 myjmlab, myjmrow;
+				myjmlab = PCADDR.jmlab;
+				myjmrow = PCADDR.jmrow;
+				c->matlab = (TableCallBack) myjmlab;
+				c->matrow = (TableCallBack) myjmrow;
+#else
 				c->matlab = (TableCallBack) PCADDR.jmlab;
 				c->matrow = (TableCallBack) PCADDR.jmrow;
+#endif
 
 				qp_assert( qe->nexpr <= MAX_OUTSTR );
 
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_hbook_if.c cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_hbook_if.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_hbook_if.c	1999-07-05 15:43:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_hbook_if.c	2005-12-09 13:27:46.976359664 +0000
@@ -149,7 +149,15 @@
 	int	idn, idtmp;
 	int	icycle;
 	int	ierr;
-	int     izero = 0;
+
+	/* LP64 compatibility:
+	   use static for izero because its address is fetched by hbname_
+	   using locb and locb expects 32 bit addresses only.
+	   static takes izero from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int     izero = 0;
 
 	/* split string into  path, id and cycle */
 


--- NEW FILE 211-fix-comis-on-ia64.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-ia64.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Further patch building on Harald Vogt's amd64 patch that should
## DP: fix PAW on Itanium Linux.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c	2005-12-09 09:45:33.649333472 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c	2005-12-09 10:01:36.149011280 +0000
@@ -39,12 +39,32 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium, the situation is even worse.  Itanium architecture is such
+ * that the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ * -- Kevin McCarty
+ */
+	
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+# if defined (__ia64__)
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a +
+	  (((unsigned long)a > 0x80000000) ? autobase : 0x6000000000000000);
+  b = (unsigned long)b +
+	  (((unsigned long)b > 0x80000000) ? autobase : 0x6000000000000000);
+# endif
 #else
      char **ja, **jb;
      int *nn;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 09:45:33.650333320 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 10:05:36.432482640 +0000
@@ -42,6 +42,19 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium, the situation is even worse.  Itanium architecture is such
+ * that the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ * -- Kevin McCarty
+ */
+
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *na, *nb;
@@ -56,6 +69,13 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+# if defined (__ia64__)
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a +
+          (((unsigned long)a > 0x80000000) ? autobase : 0x6000000000000000);
+  b = (unsigned long)b +
+          (((unsigned long)b > 0x80000000) ? autobase : 0x6000000000000000);
+# endif
 #else
      char **ja, **jb;
      int *na, *nb;


Index: 304-update-Imake-config-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/304-update-Imake-config-files.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 304-update-Imake-config-files.dpatch	30 Nov 2005 23:17:11 -0000	1.2
+++ 304-update-Imake-config-files.dpatch	14 Dec 2005 16:52:26 -0000	1.3
@@ -7,15 +7,15 @@
 ## DP: to support most Linux architectures.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/Imake.cf /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/Imake.cf
---- cernlib-2005.05.09/src/config/Imake.cf	2004-10-05 11:54:40.000000000 -0400
-+++ /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/Imake.cf	2005-06-09 10:47:36.470829080 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.cf cernlib-2005.05.09.dfsg/src/config/Imake.cf
+--- cernlib-2005.05.09.dfsg~/src/config/Imake.cf	2004-10-05 11:54:40.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/Imake.cf	2005-12-12 09:42:08.529220732 -0500
 @@ -1,24 +1,10 @@
 -/* $Id$
 - *
 - * $Log$
-- * Revision 1.2  2005/11/30 23:17:11  pertusus
-- * Don't expand keywords
+- * Revision 1.3  2005/12/14 16:52:26  pertusus
+- * - use new debian patchset
 - *
 - * Revision 1.5  2004/10/05 15:54:40  mclareni
 - * Add configuration file linux-lp64 for Linux 64-bit pointer systems like AMD Opteron and Intel IA64.
@@ -1270,9 +1270,9 @@
  
  #ifndef MacroIncludeFile
  XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
-diff -urNad cernlib-2005.05.09/src/config/linux.cf /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/linux.cf
---- cernlib-2005.05.09/src/config/linux.cf	2004-10-05 11:56:45.000000000 -0400
-+++ /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/linux.cf	2005-06-09 10:47:36.471828868 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/linux.cf cernlib-2005.05.09.dfsg/src/config/linux.cf
+--- cernlib-2005.05.09.dfsg~/src/config/linux.cf	2004-10-05 11:56:45.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/linux.cf	2005-12-12 09:42:42.505976387 -0500
 @@ -65,20 +65,20 @@
  #define OSVendor		/**/
  #define OSMajorVersion		2
@@ -1298,7 +1298,7 @@
  #endif
  #define HasPutenv		YES
  #define HasShm			YES
-@@ -94,38 +94,300 @@
+@@ -94,38 +94,302 @@
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
@@ -1589,6 +1589,8 @@
 +#  define OptimizedCDebugFlags  OptimizationLevel
 +# endif
 +# define LinuxMachineDefines    -D__x86_64__
++# define DefaultFCOptions       -fno-automatic \
++                                -fno-second-underscore -fugly-complex
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 +# define CernlibMachineDefines  -DCERNLIB_QMLXIA64
@@ -1613,7 +1615,7 @@
  /* Some of these man page defaults are overriden in the above OS sections */
  #ifndef ManSuffix
  # define ManSuffix	1x
-@@ -160,7 +422,7 @@
+@@ -160,7 +424,7 @@
  #define FortranSaveFlags	/* */ /* Everything static !? */
  #define OptimisedFortranFlags   -g -pc 64 -tp p6
  #define DefaultFCOptions        -Msave -fpic -Kieee
@@ -1622,7 +1624,7 @@
  
  #else
  
-@@ -171,19 +433,18 @@
+@@ -171,19 +435,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1654,7 +1656,7 @@
   
  #else
  
-@@ -194,19 +455,18 @@
+@@ -194,19 +457,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1686,7 +1688,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */
-@@ -221,17 +481,32 @@
+@@ -221,17 +483,32 @@
  /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */
  /*  Adapted to CERN style GF. 20-Sep-96 */
  
@@ -1722,7 +1724,7 @@
  
  # endif
  # endif
-@@ -251,7 +526,7 @@
+@@ -251,7 +528,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */


Index: 307-use-canonical-cfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/307-use-canonical-cfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 307-use-canonical-cfortran.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 307-use-canonical-cfortran.dpatch	14 Dec 2005 16:52:26 -0000	1.2
@@ -6,10 +6,10 @@
 ## DP: Debian package of cfortran, version 4.4-6.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.doc /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc
---- cernlib-2005.05.09/src/cfortran/cfortran.doc	1998-12-11 12:17:09.000000000 -0500
-+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc	2004-12-10 10:47:33.000000000 -0500
-@@ -195,7 +195,7 @@
+diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc	1998-12-11 17:17:09.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc	2005-12-09 18:01:09.000000000 +0000
+@@ -195,13 +195,13 @@
  HP9000> f77 -c cfortex.f
  HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest
  
@@ -18,7 +18,28 @@
  HP9000> # #define hpuxFortran800
  HP9000> cc -c -Aa -DhpuxFortran800 cfortest.c
  HP9000> f77 +800 -o cfortest cfortest.o cfortex.f
-@@ -643,7 +643,7 @@
+ 
+ f2c> # In the following, 'CC' is any C compiler.
+-f2c> f2c -R cfortex.f
++f2c> f2c cfortex.f
+ f2c> CC -o cfortest -Df2cFortran cfortest.c cfortex.c -lf2c  &&  cfortest
+ 
+ Portland Group $ # Presumably other C compilers also work.
+@@ -533,9 +533,10 @@
+ FORTRAN_REAL thus corresponds to FORTRAN's REAL on all machines, including t3e.
+ 
+ 
+-o f2c
+-  f2c, by default promotes REAL functions to double. cfortran.h does not (yet)
+-support this, so the f2c -R option must be used to turn this promotion off.
++o f2c / g77
++  f2c and g77 by default promote REAL functions to double.  As of December 9,
++2005, the Debian package of cfortran supports this behavior, so the f2c -R
++option must *NOT* be used to turn this promotion off.
+ 
+ o f2c
+ [Thanks to Dario Autiero for pointing out the following.]
+@@ -643,7 +644,7 @@
     [For an ancient math.h on a 386 or sparc, get similar from a new math.h.]
     #ifdef mc68000     /* 5 lines Copyright (c) 1988 by Sun Microsystems, Inc. */
     #define FLOATFUNCTIONTYPE	int
@@ -27,7 +48,7 @@
     #define ASSIGNFLOAT(x,y)	*(int *)(&x) = y
     #endif
  
-@@ -874,7 +874,7 @@
+@@ -874,7 +875,7 @@
  works everywhere and would seem to be an obvious choice.
  
  
@@ -36,7 +57,7 @@
  
  cfortran.h encourages the exact specification of the type and dimension of
  array parameters because it allows the C compiler to detect errors in the
-@@ -1835,7 +1835,7 @@
+@@ -1835,7 +1836,7 @@
  
  Unlike all other C compilers supported by cfortran.h,
  'gcc -traditional' promotes to double all functions returning float
@@ -45,7 +66,7 @@
  
  /* m.c */
  #include 
-@@ -2017,8 +2017,9 @@
+@@ -2017,8 +2018,9 @@
  
  THIS PACKAGE, I.E. CFORTRAN.H, THIS DOCUMENT, AND THE CFORTRAN.H EXAMPLE
  PROGRAMS ARE PROPERTY OF THE AUTHOR WHO RESERVES ALL RIGHTS. THIS PACKAGE AND
@@ -57,16 +78,16 @@
  - YOU MUST ACCOMPANY ANY COPIES OR DISTRIBUTION WITH THIS (UNALTERED) NOTICE.
  - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA 
    (E.G. TAPE, DISK, COMPUTER, PAPER.)
-diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.h /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h
---- cernlib-2005.05.09/src/cfortran/cfortran.h	2002-09-11 13:05:51.000000000 -0400
-+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h	2004-12-10 10:47:34.000000000 -0500
+diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h	2002-09-11 17:05:51.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h	2005-12-09 18:01:09.000000000 +0000
 @@ -1,4 +1,4 @@
 -/* cfortran.h  4.4_cernlib2002 */
 +/* cfortran.h  4.4 */
  /* http://www-zeus.desy.de/~burow/cfortran/                   */
  /* Burkhard Burow  burow at desy.de                 1990 - 2002. */
  
-@@ -11,6 +11,32 @@
+@@ -11,6 +11,35 @@
     MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE.
  */
  
@@ -94,12 +115,15 @@
 +
 +      Nov 2003: If __INTEL_COMPILER or INTEL_COMPILER defined, also define
 +                f2cFortran (KMCCARTY)
++      Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN
++                returning "double" in C.  This was one of the items on
++		Burkhard's TODO list. (KMCCARTY)
 + *******/
 +
  /* 
    Avoid symbols already used by compilers and system *.h:
    __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c
-@@ -75,7 +101,8 @@
+@@ -75,7 +104,8 @@
  
  /* Remainder of cfortran.h depends on the Fortran compiler. */
  
@@ -109,7 +133,7 @@
  #define f2cFortran
  #endif
  
-@@ -90,6 +117,27 @@
+@@ -90,6 +120,27 @@
                             Support f2c or f77 with gcc, vcc with f2c. 
                             f77 with vcc works, missing link magic for f77 I/O.*/
  #endif
@@ -137,7 +161,7 @@
  #if defined(__hpux)             /* 921107: Use __hpux instead of __hp9000s300 */
  #define       hpuxFortran       /*         Should also allow hp9000s7/800 use.*/
  #endif
-@@ -131,6 +179,7 @@
+@@ -131,6 +182,7 @@
  #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
  /* If your compiler barfs on ' #error', replace # with the trigraph for #     */
   #error "cfortran.h:  Can't find your environment among:\
@@ -145,7 +169,7 @@
      - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...)     \
      - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000     \
      - VAX   VMS CC 3.1 and FORTRAN 5.4.                                  \
-@@ -151,7 +200,8 @@
+@@ -151,7 +203,8 @@
      - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran          \
      - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \
      - Absoft Pro Fortran: Use #define AbsoftProFortran \
@@ -155,7 +179,7 @@
  /* Compiler must throw us out at this point! */
  #endif
  #endif
-@@ -164,7 +214,8 @@
+@@ -164,7 +217,8 @@
  
  /* Throughout cfortran.h we use: UN = Uppercase Name.  LN = Lowercase Name.   */
  
@@ -165,7 +189,7 @@
  #define CFC_(UN,LN)            _(LN,_)      /* Lowercase FORTRAN symbols.     */
  #define orig_fcallsc(UN,LN)    CFC_(UN,LN)
  #else 
-@@ -268,7 +319,8 @@
+@@ -268,7 +322,8 @@
  #endif
  
  #ifndef apolloFortran
@@ -175,7 +199,7 @@
  #define CF_NULL_PROTO
  #else                                         /* HP doesn't understand #elif. */
  /* Without ANSI prototyping, Apollo promotes float functions to double.    */
-@@ -512,7 +564,7 @@
+@@ -512,7 +567,7 @@
                      *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO)  ),   \
    (F).dsc$a_a0    =  ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length          ,(F))
  
@@ -184,7 +208,7 @@
  #define _NUM_ELEMS      -1
  #define _NUM_ELEM_ARG   -2
  #define NUM_ELEMS(A)    A,_NUM_ELEMS
-@@ -540,7 +592,8 @@
+@@ -540,7 +595,8 @@
  }
  return (int)num;
  }
@@ -194,3 +218,56 @@
  /*-------------------------------------------------------------------------*/
  
  /*           UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS       */
+@@ -1451,7 +1507,12 @@
+ #define      BYTE_cfPU(A)   CFextern INTEGER_BYTE      FCALLSC_QUALIFIER A
+ #define    DOUBLE_cfPU(A)   CFextern DOUBLE_PRECISION  FCALLSC_QUALIFIER A
+ #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define     FLOAT_cfPU(A)   CFextern DOUBLE_PRECISION  FCALLSC_QUALIFIER A
++#else
+ #define     FLOAT_cfPU(A)   CFextern FORTRAN_REAL      FCALLSC_QUALIFIER A
++#endif
+ #else				   	                   
+ #define     FLOAT_cfPU(A)   CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A
+ #endif				   	                   
+@@ -2088,7 +2149,12 @@
+ #ifndef __CF__KnR
+ /* The void is req'd by the Apollo, to make this an ANSI function declaration.
+    The Apollo promotes K&R float functions to double. */
+-#define   FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define FLOAT_cfFZ(UN,LN) DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#else
++#define FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#endif
+ #ifdef vmsFortran
+ #define  STRING_cfFZ(UN,LN) void  FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS
+ #else
+@@ -2104,7 +2170,12 @@
+ #endif
+ #else
+ #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define   FLOAT_cfFZ(UN,LN) DOUBLE_PRECISION  FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#else
+ #define   FLOAT_cfFZ(UN,LN) FORTRAN_REAL      FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#endif
+ #else
+ #define   FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)(
+ #endif
+@@ -2118,7 +2189,12 @@
+ #define    BYTE_cfF(UN,LN)     BYTE_cfFZ(UN,LN)
+ #define  DOUBLE_cfF(UN,LN)   DOUBLE_cfFZ(UN,LN)
+ #ifndef __CF_KnR
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define   FLOAT_cfF(UN,LN)  DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#else
+ #define   FLOAT_cfF(UN,LN)  FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#endif
+ #else
+ #define   FLOAT_cfF(UN,LN)    FLOAT_cfFZ(UN,LN)
+ #endif


Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 315-fixes-for-MacOSX.dpatch	9 Dec 2005 20:39:08 -0000	1.2
+++ 315-fixes-for-MacOSX.dpatch	14 Dec 2005 16:52:26 -0000	1.3
@@ -6,9 +6,25 @@
 ## DP: and run on OS X.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/Imake.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules
---- cernlib-2005.05.09/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/Imakefile	2005-12-07 14:47:34.141148558 -0500
+@@ -7,8 +7,12 @@
+ SUBDIRS= $(LIBDIRS) patchy cfortran
+ 
+ #ifdef CERNLIB_UNIX
++#ifdef CERNLIB_MACOSX
++SUBDIRS:= $(SUBDIRS) scripts
++#else
+ SUBDIRS:= $(SUBDIRS) scripts mgr
+ #endif
++#endif
+ 
+ InstallLibSubdirs($(LIBDIRS))
+ 
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
+--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2005-12-07 14:47:34.139148983 -0500
 @@ -2171,7 +2171,7 @@
  #define CppScriptTarget(dst,src,defs,deplist)				@@\
  dst::  src deplist							@@\
@@ -27,9 +43,9 @@
  									@@\
  clean::									@@\
  	RemoveFiles(dst)
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf
---- cernlib-2005.05.09/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.cf cernlib-2005.05.09.dfsg/src/config/MacOSX.cf
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.cf	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,170 @@
 +XCOMM platform:  $SFO: MOSXS.cf,v 1.0 95/11/19 23:21:00 sl Exp $
 +
@@ -201,9 +217,9 @@
 +/* End  CERNLIB changes */
 +
 +
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules
---- cernlib-2005.05.09/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.rules cernlib-2005.05.09.dfsg/src/config/MacOSX.rules
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.rules	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,123 @@
 +XCOMM $XConsortium: MOSXS.rules,v 1.1 97/12/12 15:34:45 sl Exp $
 +
@@ -328,9 +344,9 @@
 +#endif
 +
 +
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.tmpl /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl
---- cernlib-2005.05.09/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.tmpl cernlib-2005.05.09.dfsg/src/config/MacOSX.tmpl
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.tmpl	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,67 @@
 +XCOMM $XConsortium: MOSXS.tmpl,v 1.2 97/12/12 19:07:12 sl Exp $
 +
@@ -399,9 +415,9 @@
 +#define SharedFSRev F
 +SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
 +
-diff -urNad cernlib-2005.05.09/src/config/site.def /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def
---- cernlib-2005.05.09/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/site.def cernlib-2005.05.09.dfsg/src/config/site.def
+--- cernlib-2005.05.09.dfsg~/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/site.def	2005-12-07 14:47:34.140148771 -0500
 @@ -99,9 +99,7 @@
  /*   if it is already defined and false, undef it! */
  /* do not use shift by default
@@ -413,9 +429,9 @@
  #undef CERNLIB_SHIFT
  #endif
  #endif
-diff -urNad cernlib-2005.05.09/src/geant321/gxint/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile
---- cernlib-2005.05.09/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gxint/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gxint/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/geant321/gxint/Imakefile	2005-12-07 14:47:34.140148771 -0500
 @@ -30,7 +30,7 @@
  
  gxint321.f:  gxint.F
@@ -425,25 +441,9 @@
  
  install.lib:: $(CERN_LIBDIR)/gxint.f
  
-diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile
---- cernlib-2005.05.09/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile	2005-06-09 15:52:06.471072296 -0400
-@@ -7,8 +7,12 @@
- SUBDIRS= $(LIBDIRS) patchy cfortran
- 
- #ifdef CERNLIB_UNIX
-+#ifdef CERNLIB_MACOSX
-+SUBDIRS:= $(SUBDIRS) scripts
-+#else
- SUBDIRS:= $(SUBDIRS) scripts mgr
- #endif
-+#endif
- 
- InstallLibSubdirs($(LIBDIRS))
- 
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F
---- cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c327m.F cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c327m.F
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c327m.F	2005-12-07 14:47:34.141148558 -0500
 @@ -92,7 +92,11 @@
  #endif
        ENDIF
@@ -456,9 +456,9 @@
         IF(IDS .EQ. 1) THEN
        ERRMAX=MAX(ERRMAX,ABS(H1-T1))
        LTEST= LTEST .AND. ERRMAX .LE.  TSTERR
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F
---- cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c342m.F cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c342m.F
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c342m.F	2005-12-07 14:47:34.141148558 -0500
 @@ -70,7 +70,11 @@
  #endif
        END IF
@@ -471,9 +471,9 @@
        ERMAX= MAX(ERMAX,ABS(R1-T1))
        IF(IDS .EQ. 3 .OR. IDS .EQ. 4) THEN
         WRITE(LOUT,'(1X,F10.3,2F25.16,1P,D10.1)') SX,R,T,ABS(R1-T1)
-diff -urNad cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile
---- cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/data/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/data/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/data/Imakefile	2005-12-07 14:47:34.141148558 -0500
 @@ -1,11 +1,11 @@
  
  .SUFFIXES:
@@ -488,9 +488,9 @@
  
  PackageDirFileTarget(cojets.dat)
  
-diff -urNad cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile
---- cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/data/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/data/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/data/Imakefile	2005-12-07 14:47:34.141148558 -0500
 @@ -1,9 +1,9 @@
  
  .SUFFIXES:
@@ -503,9 +503,9 @@
  
  PackageDirFileTarget(isajet.dat)
  
-diff -urNad cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c
---- cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/sysreq/log.c cernlib-2005.05.09.dfsg/src/packlib/cspack/sysreq/log.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/cspack/sysreq/log.c	2005-12-07 14:47:34.142148345 -0500
 @@ -80,7 +80,7 @@
  static int pid;                 /* process identifier                   */
  static int logfd ;              /* logging file descriptor              */
@@ -515,9 +515,9 @@
  extern int syslog();
  #endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX */
  extern char *getenv();
-diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
---- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:51:53.621804393 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.05.09.dfsg/src/packlib/cspack/tcpaw/tcpaw.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c	2005-12-07 14:47:25.920897902 -0500
++++ cernlib-2005.05.09.dfsg/src/packlib/cspack/tcpaw/tcpaw.c	2005-12-07 14:47:34.146147494 -0500
 @@ -2569,7 +2569,7 @@
  #if !defined(IBM) && !defined(_WIN32)
  /* I provide "getpass" myself as standard version truncates to 8 characters */
@@ -559,9 +559,9 @@
 +  return result;
 +}
 +#endif /* CERNLIB_MACOSX */
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c
---- cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernbit/z268/systems.c cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernbit/z268/systems.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernbit/z268/systems.c	2005-12-07 14:47:34.146147494 -0500
 @@ -200,7 +200,7 @@
  || defined(_IBMR2) \
  || defined(__convexc__) \
@@ -571,9 +571,9 @@
  
    void systems_( command, buf, buflen, l, chars, rc, ovflw )
  
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/d704fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/d704fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-12-07 14:47:34.146147494 -0500
 @@ -4,6 +4,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -585,9 +585,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f002fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f002fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-12-07 14:47:34.146147494 -0500
 @@ -10,6 +10,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -599,9 +599,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f003fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f003fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -11,6 +11,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -613,9 +613,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f004fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f004fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -6,6 +6,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -627,9 +627,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f010fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f010fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -7,6 +7,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -641,9 +641,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  	 
  
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f011fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f011fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -7,6 +7,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -655,9 +655,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h
---- cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	2005-06-09 15:52:06.487068895 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kuip/kuip/ksys.h cernlib-2005.05.09.dfsg/src/packlib/kuip/kuip/ksys.h
+--- cernlib-2005.05.09.dfsg~/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kuip/kuip/ksys.h	2005-12-07 14:47:34.147147281 -0500
 @@ -188,6 +188,17 @@
  #endif
  
@@ -676,15 +676,15 @@
  #ifdef MSDOS
  #  define MACHINE_NAME "IBMPC"
  #  define OS_NAME "MSDOS"
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
---- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F	2005-12-07 14:47:25.807921944 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F	2005-12-07 14:55:23.810167859 -0500
 @@ -38,7 +38,12 @@
              IFCS=-2
              CALL CSRTGPL(I)
  #else
-+c     thanks to Keisuke Fujii for this patch for OS X
-+#if defined(CERNLIB_MACOSX)
++c     thanks to Keisuke Fujii for this patch for OS X            
++#if defined (CERNLIB_MACOSX)
 +          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else
            IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
@@ -696,7 +696,7 @@
            I=CSITGPL(IPVS)
          ENDIF
  #else
-+#if defined(CERNLIB_MACOSX)
++#if defined (CERNLIB_MACOSX)
 +        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else
          IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
@@ -704,9 +704,9 @@
          IF(IADGP.NE.0)THEN
            IFCS=-2
            ITYPGP=-2
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
---- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:51:53.524825013 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:57:50.699841388 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cscrexec.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cscrexec.F
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cscrexec.F	2005-12-07 14:47:25.687947476 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cscrexec.F	2005-12-07 14:47:34.148147068 -0500
 @@ -82,11 +82,19 @@
        IF(FEXT.EQ.'.c')THEN
          L=LENOCC(CHCC)
@@ -743,9 +743,9 @@
  #endif
  #if defined(CERNLIB_ALPHA_OSF)
          CHLINE=                   'ld -shared -o '
-diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
---- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/programs/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/paw/programs/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/pawlib/paw/programs/Imakefile	2005-12-07 14:47:34.148147068 -0500
 @@ -9,7 +9,7 @@
  EXTRA_LDOPTIONS=-Wl,-E
  #endif


Index: 701-patch-hbook-comis-Imakefiles.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/701-patch-hbook-comis-Imakefiles.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 701-patch-hbook-comis-Imakefiles.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 701-patch-hbook-comis-Imakefiles.dpatch	14 Dec 2005 16:52:26 -0000	1.2
@@ -6,9 +6,9 @@
 ## DP: 701 dpatch (a shell script).
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/packlib/hbook/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile
---- cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
-+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	2005-06-10 17:04:08.866020136 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/code/Imakefile cernlib-2005.05.09.dfsg/src/packlib/hbook/code/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/hbook/code/Imakefile	2005-12-07 14:59:31.519940694 -0500
 @@ -19,8 +19,8 @@
  	hgn.F hgnf.F hgnpar.F hgstat.F hhipar.F hhxye.F hi.F \ @@\
  	hictoi.F hid1.F hid2.F hidall.F hidopt.F hidpos.F hie.F  \ @@\
@@ -20,9 +20,9 @@
  	hkind.F hknul1.F hknuli.F hlabel.F hlabeq.F hlabnb.F \ @@\
  	hlattr.F hlccmp.F hldir.F hldir1.F hldir2.F hldirt.F \ @@\
  	hlgnxt.F hlhcmp.F hlimit.F hllsq.F hlnext.F hlocat.F \ @@\
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
---- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:02:24.843306185 -0400
-+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:05:09.955931988 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile	2005-12-07 14:59:22.782783593 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile	2005-12-07 14:59:31.519940694 -0500
 @@ -37,7 +37,8 @@
  	csspar.F cssubr.F cssvpt.F cstadv.F cstarr.F csterr.F cstext.F \ @@\
  	cstfrf.F cstinf.F cstlgb.F cstlog.F cstpar.F cstran.F cstrer.F \ @@\


Index: cernlib.m4
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib.m4	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib.m4	14 Dec 2005 16:52:26 -0000	1.2
@@ -1,6 +1,6 @@
 dnl                                                      -*- Autoconf -*- 
 dnl  autoconf macros for the cernlib libraries
-dnl  Copyright (C) 2004 Patrice Dumas
+dnl  Copyright (C) 2004, 2005 Patrice Dumas
 dnl
 dnl  This program is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
@@ -16,28 +16,33 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-dnl A basic axample of the macros usage:
+dnl A basic axample of the macro usage:
 dnl 
-dnl AC_CERNLIB
-dnl AC_LIB_CERNLIB(kernlib,CLTOU)
-dnl AC_LIB_CERNLIB(mathlib,GAUSS)
-dnl LIBS="$CERNLIB_LIBS $LIBS"
-
-dnl The macro AC_CERNLIB tries to determine the cernlib location and
-dnl whether the linking should be static or not. It should be called once and
-dnl before a particular cernlib library is detected with the second macro.
+dnl AC_LIB_CERNLIB(kernlib,CLTOU,
+dnl [
+dnl    AC_LIB_CERNLIB(mathlib,GAUSS,[LIBS="$CERNLIB_LIBS $LIBS"])
+dnl ])
+
+dnl
 dnl --with-static-cernlib forces the static or dynamic linking.
 dnl --with-cernlib gives the location of cernlib.
 dnl
-dnl If the type of linking isn't forced it is detected as follow:
-dnl - if the environment variable CERNLIB exists it is assumed to be the
+dnl If the type of linking isn't specified it is assumed to be static.
+dnl
+dnl For static linking:
+dnl - if the binary program 'cernlib-static' or 'cernlib' is in the path it is 
+dnl   assumed that a static linking using the information reported by that 
+dnl   script is wanted.
+dnl - otherwise if the environment variable CERNLIB exists it is assumed to be the
 dnl   location of the static library.
 dnl - otherwise if the environment variable CERN_ROOT exists it is assumed 
 dnl   that CERN_ROOT/lib is the location of the static library.
-dnl - otherwise if the binary program 'cernlib' is in the path it is assumed 
-dnl   that a static linking using the information reported by that binary is 
-dnl   wanted.
-dnl - otherwise a dynamic linking is performed.
+dnl - otherwise a simple linking is performed.
+dnl 
+dnl If a dynamic linking is selected:
+dnl - if the binary program 'cernlib' is in the path it is assumed that it is the 
+dnl   debian script and it is called with -dy.
+dnl - otherwise a simple linking is performed.
 dnl
 dnl AC_LIB_CERNLIB ([LIBRARY = kernlib], [FUNCTION = CLTOU], [ACTION-IF-FOUND],
 dnl          [ACTION-IF-NOT-FOUND]) 
@@ -53,7 +58,7 @@
 # statically linked or not.
 AC_DEFUN([AC_CERNLIB], [
 CERNLIB_LIB_PATH=
-CERNLIB_STATIC=
+CERNLIB_STATIC=yes
 AC_ARG_WITH(static_cernlib,
 [  --with-static-cernlib             link statically with the cernlib],
 [  CERNLIB_STATIC=$withval      ])
@@ -64,27 +69,24 @@
 
 
 if test "z$CERNLIB_STATIC" != "zno"; then    
-    CERNLIB_BIN=no
+    CERNLIB_STATIC=yes
     if test "z$CERNLIB_LIB_PATH" = z; then
-        if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
-            CERNLIB_LIB_PATH=$CERNLIB
-            CERNLIB_STATIC="yes"
-            AC_MSG_NOTICE([using the CERNLIB environment variable for cernlib location])
-        elif test "z$CERN_ROOT" != z -a -d "$CERN_ROOT/lib"; then
-            CERNLIB_LIB_PATH=$CERN_ROOT/lib
-            CERNLIB_STATIC="yes"
-            AC_MSG_NOTICE([using the CERN_ROOT environment variable for cernlib location])
-        fi
-        if test "z$CERNLIB_LIB_PATH" = "z"; then
+        AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no)
+        if test $CERNLIB_BIN = no; then
             AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
-            if test $CERNLIB_BIN != no; then
-                CERNLIB_STATIC="yes"
+        fi
+        if test $CERNLIB_BIN = no; then
+            if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
+               CERNLIB_LIB_PATH=$CERNLIB
+               AC_MSG_NOTICE([using the CERNLIB environment variable for cernlib location])
+            elif test "z$CERN_ROOT" != z -a -d "$CERN_ROOT/lib"; then
+                CERNLIB_LIB_PATH=$CERN_ROOT/lib
+                AC_MSG_NOTICE([using the CERN_ROOT environment variable for cernlib location])
             fi
         fi
     fi
-fi
-
-if test "z$CERNLIB_STATIC" != "zyes"; then
+else
+    AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
     if test "z$CERNLIB_LIB_PATH" != z; then
          LDFLAGS="$LDFLAGS -L$CERNLIB_LIB_PATH"
     fi
@@ -95,6 +97,7 @@
 #          [ACTION-IF-NOT-FOUND]) 
 # check for a function in a library of the cernlib
 AC_DEFUN([AC_LIB_CERNLIB], [
+AC_REQUIRE([AC_CERNLIB])
 
 cernlib_lib_ok="no"
 
@@ -110,10 +113,12 @@
     cern_func=$2
 fi
 
+save_CERNLIB_LIBS=$CERNLIB_LIBS
+save_LIBS=$LIBS
+
 if test "z$CERNLIB_STATIC" = "zyes"; then
     cernlib_lib_static_found=no
     AC_MSG_NOTICE([cernlib: linking with a static $cern_library])
-    save_CERNLIB_LIBS="$CERNLIB_LIBS"
     if test "z$CERNLIB_BIN" != "zno"; then
         cernlib_bin_out=`$CERNLIB_BIN $cern_library`
         CERNLIB_LIBS="$cernlib_bin_out $CERNLIB_LIBS"
@@ -127,37 +132,34 @@
     fi
     if test "z$cernlib_lib_static_found" = zno; then
         AC_MSG_WARN([cannot determine the cernlib location for static linking])
+    fi
+else
+    AC_MSG_NOTICE([trying a dynamical link with $cern_library])
+    if test "z$CERNLIB_BIN" != "zno"; then
+        # try link with debian cernlib script with -dy
+        cernlib_bin_out=`$CERNLIB_BIN -dy $cern_library`
+        CERNLIB_LIBS="$cernlib_bin_out $CERNLIB_LIBS"
     else
+        CERNLIB_LIBS="-l$cern_library $CERNLIB_LIBS"
+    fi
+fi
+
 dnl now try the link
-        AC_LANG_PUSH(Fortran 77)
-        save_LIBS="$LIBS"; LIBS="$CERNLIB_LIBS $LIBS"
-        AC_LINK_IFELSE([      program main
+LIBS="$CERNLIB_LIBS $LIBS"
+AC_LANG_PUSH(Fortran 77)
+AC_LINK_IFELSE([      program main
       call $cern_func
       end
 ], 
-        [ 
-            cernlib_lib_ok=yes
-        ],
-        [
-            CERNLIB_LIBS="$save_CERNLIB_LIBS"
-        ])
-        LIBS="$save_LIBS"
-        AC_LANG_POP(Fortran 77)
-    fi
-else
-    AC_MSG_NOTICE([trying a dynamical link with $cern_library])
-dnl FIXME ther could also be something like
-dnl save_LIBS="$LIBS"; LIBS="$CERNLIB_LIBS $LIBS"
-dnl CERNLIB_LIBS="-l$cern_library $CERNLIB_LIBS" 
-dnl LIBS="$save_LIBS"
-    AC_CHECK_LIB([$cern_library], [$cern_func],
-       [ 
-         AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
-         LIBS="-l$1 $LIBS"
-
-         cernlib_lib_ok=yes 
-       ])
-fi
+[ 
+    cernlib_lib_ok=yes
+],
+[
+    CERNLIB_LIBS=$save_CERNLIB_LIBS
+])
+AC_LANG_POP(Fortran 77)
+LIBS=$save_LIBS
+AC_SUBST([CERNLIB_LIBS])
 
 AS_IF([test x"$cernlib_lib_ok" = xyes],
       [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_CERNLIB_${cern_library}_${cern_func}))


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cernlib.spec	9 Dec 2005 20:39:08 -0000	1.8
+++ cernlib.spec	14 Dec 2005 16:52:26 -0000	1.9
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.1
+Release:       9%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -66,7 +66,7 @@
 Source201: cernlib-deadpool.txt
 
 # debian patchset
-Patch0: cernlib_2005.05.09.dfsg-2.diff
+Patch0: cernlib_2005.05.09.dfsg-3.diff
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: 001-fix-missing-fluka.dpatch
@@ -89,6 +89,9 @@
 # a workaround for cups. Applied in doubt.
 Patch113: 113-cups-postscript-fix.dpatch
 Patch114: 114-install-scripts-properly.dpatch
+Patch115: 115-rsrtnt64-goto-outer-block.dpatch
+Patch116: 116-fix-fconc64-spaghetti-code.dpatch
+Patch117: 117-fix-optimizer-bug-in-gphot.dpatch
 Patch200: 200-comis-allow-special-chars-in-path.dpatch
 Patch201: 201-update-kuip-helper-apps.dpatch
 Patch202: 202-fix-includes-in-minuit-example.dpatch
@@ -102,8 +105,9 @@
 Patch208: 208-fix-redundant-packlib-dependencies.dpatch
 Patch209: 209-ignore-unneeded-headers-in-kmutil.c.dpatch
 Patch210: 210-improve-cfortran-header-files.dpatch
-# disabled in the debian patchset, enabled here
-Patch211: 211-fix-comis-on-64-bit-arches.dpatch
+# split in newer debian patchset
+Patch2110: 211-fix-comis-on-amd64.dpatch
+Patch2111: 211-fix-comis-on-ia64.dpatch
 Patch300: 300-skip-duplicate-lenocc.dpatch
 # Use another approach, see cernlib-enforce-FHS
 # Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -183,7 +187,6 @@
 Patch1203: cernlib-hwuli2_use_dimag.diff 
 Patch1204: cernlib-hwhiga_use_dimag.diff
 Patch1205: cernlib-gfortran.diff 
-Patch1206: cernlib-rsrtnt64_goto_outer_block.diff
 Patch1207: cernlib-v107z0_X_before_string.diff
 
 %description
@@ -313,6 +316,9 @@
 %patch -P 112 -p1
 %patch -P 113 -p1
 %patch -P 114 -p1
+%patch -P 115 -p1
+%patch -P 116 -p1
+%patch -P 117 -p1
 %patch -P 200 -p1
 %patch -P 201 -p1
 %patch -P 202 -p1
@@ -324,7 +330,8 @@
 %patch -P 208 -p1
 %patch -P 209 -p1
 %patch -P 210 -p1
-%patch -P 211 -p1
+%patch -P 2110 -p1
+%patch -P 2111 -p1
 %patch -P 300 -p1
 #%patch -P 301 -p1
 #%patch -P 302 -p1
@@ -458,7 +465,6 @@
 # use gfortran
 #%patch -P 1205
 # workaround gfortran bug
-%patch -P 1206
 %patch -P 1207
 
 # remove CVS directories
@@ -693,6 +699,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Wed Dec 14 2005 Patrice Dumas  - 2005-9
+- use new debian patchset
+
 * Fri Dec  9 2005 Patrice Dumas  - 2005-8.1
 - use new debian patchset
 - enable 64 bit fixes patch


Index: paw.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/paw.README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paw.README	30 Nov 2005 22:01:01 -0000	1.2
+++ paw.README	14 Dec 2005 16:52:26 -0000	1.3
@@ -41,11 +41,6 @@
 
 to the beginning of them.
 
-5) 64-bit issues
-
-Note that this package is not yet fully functional on 64-bit machines, as the
-COMIS portion of Pawlib does not yet work correctly on those architectures.
-
 -- Kevin McCarty , Tue, 22 Nov 2005
 
 Adapted to the rpm package by 


--- 211-fix-comis-on-64-bit-arches.dpatch DELETED ---


--- cernlib-rsrtnt64_goto_outer_block.diff DELETED ---


--- cernlib_2005.05.09.dfsg-2.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 14 17:02:38 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed, 14 Dec 2005 12:02:38 -0500
Subject: CVSROOT avail,1.19,1.20
Message-ID: <200512141703.jBEH38hd010184@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10169

Modified Files:
	avail 
Log Message:
Updating avail for new directory structure.


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- avail	13 Dec 2005 22:30:51 -0000	1.19
+++ avail	14 Dec 2005 17:02:35 -0000	1.20
@@ -22,27 +22,27 @@
 unavail | | web
 avail | tfox,notting,sopwith,gdk,katzj,kwade | web
 avail | havill,hp,nman64,ivazquez | web
-avail | katzj | web/html/projects/anaconda-installer
-avail | bfox | web/html/projects/config-tools
-avail | blizzard,krh | web/html/projects/desktop
-avail | wcohen | web/html/projects/additional-projects/benchmarks
-avail | sopwith,dwalsh,kwade | web/html/projects/selinux
-avail | ezannoni | web/html/projects/additional-projects/gdb
-avail | alikins,trobert | web/html/download
-avail | llch | web/html/projects/i18n
-avail | sarahs | web/html/projects/translations
-avail | harald | web/html/projects/config-tools
+avail | katzj | web/html/About/Projects/anaconda-installer
+#avail | bfox | web/html/projects/config-tools
+avail | blizzard,krh | web/html/About/Projects/desktop
+#avail | wcohen | web/html/projects/additional-projects/benchmarks
+avail | sopwith,dwalsh,kwade | web/html/About/Projects
+#avail | ezannoni | web/html/projects/additional-projects/gdb
+avail | alikins,trobert | web/html/Download
+avail | llch | web/html/About/Projects/i18n
+avail | sarahs | web/html/About/Projects/translations
+#avail | harald | web/html/projects/config-tools
 avail | kwade,pfrields | web/html/docs
-avail | sarahs | web/html/participate/translation-faq
-avail | sarahs | web/html/participate/translation-guide
-avail | sarahs | web/html/participate/translation-windows
-avail | dmalcolm | web/html/projects/stateless
+avail | sarahs | web/html/docs/translation-faq
+avail | sarahs | web/html/docs/translation-guide
+avail | sarahs | web/html/docs/translation-windows
+avail | dmalcolm | web/html/About/Projects/stateless
 avail | dmalcolm | web/html/docs/stateless
 avail | riel | web/html/docs/virtualisation
-avail | riel | web/html/projects/virtualisation
-avail | ezannoni | web/html/projects/systemtap
+avail | riel | web/html/About/Projects/virtualisation
+#avail | ezannoni | web/html/projects/systemtap
 avail | harald | web/html/docs/udev
-avail | cfeist | web/html/projects/cluster
+#avail | cfeist | web/html/projects/cluster
 
 unavail | | fedora-security
 avail | mjc,bressers,jorton,notting,sopwith,katzj | fedora-security



From fedora-extras-commits at redhat.com  Wed Dec 14 17:44:07 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 14 Dec 2005 12:44:07 -0500
Subject: rpms/synaptic/devel synaptic.spec,1.13,1.14
Message-ID: <200512141744.jBEHicd2010336@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	synaptic.spec 
Log Message:
Rebuild for new openssl and apt



Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- synaptic.spec	18 Aug 2005 18:15:25 -0000	1.13
+++ synaptic.spec	14 Dec 2005 17:44:05 -0000	1.14
@@ -2,7 +2,7 @@
 
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
-Version: 0.57.2
+Version: 0.57.3
 Release: 2%{?dist}
 
 License: GPL
@@ -99,6 +99,9 @@
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Wed Dec 14 2005 Deji Akingunola  - 0.57.2-3
+- Rebuild for new openssl and apt in devel.
+
 * Wed Aug 17 2005 Ville Skytt??  - 0.57.2-2
 - Rebuild for new libcairo in devel.
 



From fedora-extras-commits at redhat.com  Wed Dec 14 17:46:56 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 14 Dec 2005 12:46:56 -0500
Subject: rpms/synaptic/devel synaptic.spec,1.14,1.15
Message-ID: <200512141747.jBEHlQvw010362@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	synaptic.spec 
Log Message:
Bump the release field and not the version



Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- synaptic.spec	14 Dec 2005 17:44:05 -0000	1.14
+++ synaptic.spec	14 Dec 2005 17:46:54 -0000	1.15
@@ -2,7 +2,7 @@
 
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
-Version: 0.57.3
+Version: 0.57.2
 Release: 2%{?dist}
 
 License: GPL



From fedora-extras-commits at redhat.com  Wed Dec 14 17:51:20 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 14 Dec 2005 12:51:20 -0500
Subject: rpms/synaptic/devel synaptic.spec,1.15,1.16
Message-ID: <200512141751.jBEHppEL010432@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	synaptic.spec 
Log Message:
Oops, sorry. Doing it right this time



Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- synaptic.spec	14 Dec 2005 17:46:54 -0000	1.15
+++ synaptic.spec	14 Dec 2005 17:51:18 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
 Version: 0.57.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group: Applications/System



From fedora-extras-commits at redhat.com  Wed Dec 14 17:51:49 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 14 Dec 2005 12:51:49 -0500
Subject: rpms/xchat-gnome/devel xchat-gnome-323944.patch, NONE,
	1.1 xchat-gnome.spec, 1.6, 1.7
Message-ID: <200512141752.jBEHqKmC010475@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-gnome-323944.patch 
Log Message:
* Wed Dec 14 2005 Brian Pepple  - 0.7-4
- Add patch to fix #175751. 


xchat-gnome-323944.patch:

--- NEW FILE xchat-gnome-323944.patch ---
Index: xchat-gnome-0.7/src/fe-gnome/navigation-tree.c
===================================================================
--- xchat-gnome-0.7/src/fe-gnome/navigation-tree.c	(revision 9898)
+++ xchat-gnome-0.7/src/fe-gnome/navigation-tree.c	(working copy)
@@ -1060,6 +1060,9 @@
 	gpointer *s;
 	session *sess;
 
+	if (gui.server_tree == NULL)
+		return;
+
 	treeview = GTK_TREE_VIEW (glade_xml_get_widget (gui.xml, "userlist"));
 
 	if (gui.server_tree->current_path != NULL)


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xchat-gnome.spec	30 Nov 2005 16:43:43 -0000	1.6
+++ xchat-gnome.spec	14 Dec 2005 17:51:47 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:           xchat-gnome
 Version:        0.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -15,6 +15,7 @@
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-datadir.patch
 Patch1:		%{name}-config.patch
+Patch2:		%{name}-323944.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -53,6 +54,7 @@
 %setup -q
 %patch0 -p1 -b .datadir
 %patch1 -p1 -b .config
+%patch2 -p1 -b .323944
 
 
 %build
@@ -148,6 +150,9 @@
 
 
 %changelog
+* Wed Dec 14 2005 Brian Pepple  - 0.7-4
+- Add patch to fix #175751. 
+
 * Wed Nov 30 2005 Brian Pepple  - 0.7-3
 - Disable dbus support, until FE Bug #174592 is fixed.
 



From fedora-extras-commits at redhat.com  Wed Dec 14 18:18:47 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 14 Dec 2005 13:18:47 -0500
Subject: rpms/cernlib/devel cernlib_2005.05.09.dfsg-3.diff, NONE,
	1.1 cernlib.spec, 1.9, 1.10
Message-ID: <200512141818.jBEIIlou012216@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Added Files:
	cernlib_2005.05.09.dfsg-3.diff 
Log Message:
forgot to add cernlib_2005.05.09.dfsg-3.diff


cernlib_2005.05.09.dfsg-3.diff:

--- NEW FILE cernlib_2005.05.09.dfsg-3.diff ---
--- cernlib-2005.05.09.dfsg.orig/debian/control
+++ cernlib-2005.05.09.dfsg/debian/control
@@ -0,0 +1,896 @@
+Source: cernlib
+Maintainer: Kevin B. McCarty 
+Standards-Version: 3.6.2
+Priority: optional
+Section: science
+Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin
+
+Package: cernlib-base
+Architecture: all
+Section: devel
+Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev
+Description: script to determine Cernlib library dependencies
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This package includes the "cernlib" script that lists the command-line
+ options needed for linking against Cernlib libraries.  The script has
+ been rewritten from the upstream version to calculate
+ dependencies recursively.  Also included are a README.Debian with a summary
+ of changes made to Cernlib to fit it into Debian packaging practices,
+ and a contributed set of Autoconf macros to test for Cernlib libraries.
+
+Package: cernlib-core-dev
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit
+Description: Cernlib development headers, tools, and static libraries
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides the header files and static libraries likely to be
+ wanted by developers using the Cern libraries who are not interested
+ specifically in high energy physics.  It also provides the Cernlib
+ development tools DZedit and KUIPC.  Cernlib analysis programs may be
+ obtained by installing the cernlib-core metapackage.
+
+Package: cernlib-core
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos
+Description: Cernlib main libraries and programs
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides the libraries and analysis tools (e.g. PAW) likely
+ to be wanted by most users of the Cern libraries who are not interested
+ specifically in high energy physics.  You cannot do program development by
+ installing only this metapackage; development libraries and tools may
+ be obtained by installing the cernlib-core-dev metapackage or individual
+ lib*-dev packages.
+
+Package: cernlib-extras
+Architecture: all
+Priority: extra
+Section: science
+Depends: cernlib-base (= ${Source-Version}), pawserv, zftp
+Description: miscellaneous Cernlib programs unlikely to be used by many
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides a few additional Cernlib programs not included
+ in any other Cernlib metapackage.  Very few people are likely to be
+ interested in them; currently they include zftp, pawserv and zserv.
+ Notice that the latter two programs run as daemons through inetd and may
+ reduce your system's security!
+ .
+ Installing this package along with the "cernlib" metapackage will supply
+ a complete set of all Cernlib programs and libraries included in Debian.
+
+Package: cernlib-montecarlo
+Architecture: all
+Section: science
+Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev
+Recommends: libisajet758-2-dev
+Description: Cernlib Monte Carlo libraries
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides various Monte Carlo libraries included in Cernlib
+ (both shared and static).  Likely only physicists will be interested in
+ these packages.  Note that the Geant 3.21 program is not included, but it may
+ be obtained by also installing the geant321 Debian package.
+ .
+ Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are
+ not available within Debian due to licensing issues; see the README.Debian
+ file in the montecarlo-base package for information on obtaining them.
+ .
+ Additionally, the Isajet library is not available on the m68k architecture
+ due to a compiler flaw.
+
+Package: cernlib
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev
+Description: almost complete set of Debian Cernlib packages
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides almost all of the programs and libraries contained
+ in Cernlib.  Most people will likely want only a subset of these.  A few
+ extra Cernlib programs, not of interest to many people, may be obtained via
+ the cernlib-extras metapackage.
+
+Package: dzedit
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: libpacklib1-dev
+Description: Cernlib's ZEBRA documentation editor
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system
+ developed at CERN.  ZEBRA, part of the Packlib library, permits a developer to
+ create complex data structures in the FORTRAN 77 language; the DZDOC system
+ allows the developer to generate and maintain documentation of ZEBRA data
+ structures.
+
+Package: geant321-data
+Architecture: all
+Section: science
+Depends: cernlib-base
+Description: [Physics] Data for Geant 3.21 detector simulator
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes data files for use by Geant.
+
+Package: geant321-doc
+Architecture: all
+Section: doc
+Depends: cernlib-base
+Description: [Physics] Documentation for Geant 3.21
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes some documentation about Geant.
+
+Package: geant321
+Architecture: all
+Section: science
+Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77
+Suggests: kxterm, geant321-doc
+Description: [Physics] Particle detector description and simulation tool
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes gxint, the script used to perform this linking step.
+
+Package: kuipc
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, cernlib-base
+Recommends: libpacklib1-dev
+Suggests: libpacklib1-lesstif-dev
+Description: Cernlib's Kit for a User Interface Package (KUIP) compiler
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify
+ the writing of a program's user interface code.  It takes as
+ input a Command Definition File (CDF) that describes the
+ commands to be understood by the program, and outputs C or FORTRAN code that
+ makes the appropriate function calls to set up the user interface.  This
+ code can then be compiled and linked with the rest of the program.  Since
+ the generated code uses KUIP routines, the program must also be linked
+ against the Packlib library that contains them.
+ .
+ KUIPC is no longer actively developed, so aside from its use in the build
+ process of Cernlib, it is of mainly historical interest.
+
+Package: kxterm
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}, cernlib-base
+Description: Cernlib's KUIP terminal emulator
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ KXterm is a terminal emulator which combines the best features from
+ the (now defunct) Apollo DM pads (like: input and transcript
[...20906 lines suppressed...]
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ./pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, C??? hai"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "M??y ph???c v??? c???n ch???y t??? tr??nh inetd"
+
+#. Type: select
+#. Description
+#: ./pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr "G??i tin n??y bao g???m c??? hai tr??nh n???n (d??mon) pawserv (m?? cho ph??p m??y t??? xa ?????c t???p tin ?????a ph????ng trong khi ch???y PAW/Paw++) v?? tr??nh n???n zserv (m?? cho ph??p m??y t??? xa ????ng nh???p d??ng giao th???c ZFTP c???a CERN). C??? hai tr??nh ph???c v??? n??y ???????c ch???y t??? tr??nh n???n inetd; b???n c?? th??? hi???u l???c m???t hay c??? hai ??i???u. Tuy nhi??n, tr??? b???n c???n thi???t l??m vi???c r???t ?????c bi???t, r???t c?? th??? l?? b???n s??? mu???n hi???u l???c ch??? tr??nh pawserv."
--- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po
+++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po
@@ -0,0 +1,55 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib\n"
+"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-05-26 16:05-0300\n"
+"Last-Translator: Andr? Lu?s Lopes \n"
+"Language-Team: Debian-BR Project \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Ambos"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servidores a serem executados a partir do inetd"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr ""
+"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos "
+"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv "
+"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP "
+"do CERN). Esses servidores s?o executados a partir do inetd; voc? "
+"pode habilitar cada um deles separadamente ou ambos. A menos que voc? "
+"possua necessidades bastante especializadas, voc? provavelmente ir? "
+"desejar habilitar somente o pawserv."
--- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po
+++ cernlib-2005.05.09.dfsg/debian/po/sv.po
@@ -0,0 +1,53 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib 2005.05.09-4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-10-06 23:50+0200\n"
+"Last-Translator: Daniel Nylander \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, B?da"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servrar som ska k?ras fr?n inetd"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr ""
+"Detta paket inkluderar b?de pawserver-daemonen (till?ter fj?rrsystem att "
+"l?sa lokala filer n?r PAW/Paw++ k?rs) och zserv-daemonen (till?ter fj?rrsystem "
+"att logga in med CERN's ZFTP-protokoll).  Dessa servrar k?rs fr?n inetd; du m?ste "
+"aktivera n?gon eller b?da av dom. Om du inte har speciella krav s? r?cker det gott "
+"om pawserv aktiveras."
+
--- cernlib-2005.05.09.dfsg.orig/debian/po/es.po
+++ cernlib-2005.05.09.dfsg/debian/po/es.po
@@ -0,0 +1,55 @@
+# cernlib po-debconf translation to Spanish
+# Copyright (C) 2005 Software in the Public Interest
+# This file is distributed under the same license as the cernlib package.
+#
+# Changes:
+#  - Initial translation
+#         C??sar G??mez Mart??n 
+#
+#   Traductores, si no conoce el formato PO, merece la pena leer la
+#   documentaci??n de gettext, especialmente las secciones dedicadas a este
+#   formato, por ejemplo ejecutando:
+#          info -n '(gettext)PO Files'
+#          info -n '(gettext)Header Entry'
+# Equipo de traducci??n al espa??ol, por favor, lean antes de traducir
+# los siguientes documentos:
+#
+#  - El proyecto de traducci??n de Debian al espa??ol
+#    http://www.debian.org/intl/spanish/
+#    especialmente las notas de traducci??n en
+#    http://www.debian.org/intl/spanish/notas
+#
+#  - La gu??a de traducci??n de po's de debconf:
+#    /usr/share/doc/po-debconf/README-trans
+#    o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-09-01 17:49+0100\n"
+"Last-Translator: C??sar G??mez Mart??n \n"
+"Language-Team: Debian l10n spanish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: SPAIN\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Type: select
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Ambos"
+
+#. Type: select
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servidores a ejecutar desde inetd"
+
+#. Type: select
+#: ../pawserv.templates.master:6
+msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol).  These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv."
+msgstr "Este paquete incluye el demonio pawserv (permite a las m??quinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++)  y el demonio zserv (permite a las m??quinas remotas conectarse a trav??s del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo m??s probable es que s??lo quiera habilitar pawserv."
+


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cernlib.spec	14 Dec 2005 16:52:26 -0000	1.9
+++ cernlib.spec	14 Dec 2005 18:18:45 -0000	1.10
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       9%{?dist}
+Release:       9%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -699,7 +699,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Wed Dec 14 2005 Patrice Dumas  - 2005-9
+* Wed Dec 14 2005 Patrice Dumas  - 2005-9.1
 - use new debian patchset
 
 * Fri Dec  9 2005 Patrice Dumas  - 2005-8.1



From fedora-extras-commits at redhat.com  Wed Dec 14 18:49:39 2005
From: fedora-extras-commits at redhat.com (Robert Theisen (trobert))
Date: Wed, 14 Dec 2005 13:49:39 -0500
Subject: web/html/Download mirrors.php,1.1,1.2
Message-ID: <200512141850.jBEIo9Ra012323@cvs-int.fedora.redhat.com>

Author: trobert

Update of /cvs/fedora/web/html/Download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12305

Modified Files:
	mirrors.php 
Log Message:
Added new sites and corrected a couple of old site paths.



Index: mirrors.php
===================================================================
RCS file: /cvs/fedora/web/html/Download/mirrors.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mirrors.php	29 Nov 2005 17:32:36 -0000	1.1
+++ mirrors.php	14 Dec 2005 18:49:37 -0000	1.2
@@ -87,6 +87,7 @@
 	    
  • http://srl.cs.jhu.edu/YUM/fedora-core/
    • 
 	    
  •  rsync://srl.cs.jhu.edu/YUM/fedora-core/
    • 
 	    
  • http://fedora.secs.oakland.edu/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
         
 	
 	
  • USA West
@@ -123,6 +124,7 @@
 	    
  • ftp://ftp.applios.net/pub/fedora/linux/core
    • 
 	    
  • ftp://calserv.unl.edu/pub/linux/fedora/linux/core/
    • 
 	    
  • ftp://mirrors.imagi.net/fedora/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Canada
@@ -275,6 +277,7 @@
 	    
  • ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/
    • 
 	    
  • http://download.atrpms.net/mirrors/fedoracore/
    • 
 	    
  • ftp://ftp.fu-berlin.de/linux/fedora/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Greece
@@ -460,6 +463,7 @@
 	    
  • http://mirror.poundhost.com/fedora.redhat.com/
    • 
 	    
  • ftp://mirror.poundhost.com/pub/fedora.redhat.com/
    • 
 	    
  • ftp://ftp2.newnet.co.uk/pub/fedora/linux/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
      
@@ -528,6 +532,7 @@
 	   
  • rsync://ftp.nara.wide.ad.jp/fedora/
    • 
 	   
  • ftp://ftp.dti.ad.jp/pub/Linux/Fedora/core/
    • 
 	   
  • http://ftp.dti.ad.jp/pub/Linux/Fedora/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Korea
@@ -536,11 +541,12 @@
 	   
  • rsync://ftp.kreonet.re.kr/fedora/core/
    • 
 	   
  • ftp://mirror.hostway.co.kr/pub/fedora/
    • 
 	   
  • ftp://ftp.kaist.ac.kr/pub/fedora/linux/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Malaysia
 	
 	
    • 
 	
  • New Zealand
@@ -561,8 +567,8 @@
 	
 	
    • 
      



From fedora-extras-commits at redhat.com  Wed Dec 14 19:21:29 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 14 Dec 2005 14:21:29 -0500
Subject: rpms/SDL_ttf/devel SDL_ttf-2.0.7-freetype-internals.patch, NONE,
	1.1 SDL_ttf.spec, 1.8, 1.9
Message-ID: <200512141921.jBEJLx0k014046@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	SDL_ttf.spec 
Added Files:
	SDL_ttf-2.0.7-freetype-internals.patch 
Log Message:
* Wed Dec 14 2005 Brian Pepple  - 2.0.7-3
- Add patch for Bug #171020.


SDL_ttf-2.0.7-freetype-internals.patch:

--- NEW FILE SDL_ttf-2.0.7-freetype-internals.patch ---
--- SDL_ttf-2.0.7/SDL_ttf.c.freetype-internals	2005-10-17 09:05:19.000000000 -0400
+++ SDL_ttf-2.0.7/SDL_ttf.c	2005-10-17 09:05:36.000000000 -0400
@@ -48,7 +48,6 @@
 #include 
 #include 
 */
-#include 
 
 #ifndef FT_OPEN_STREAM
 #define FT_OPEN_STREAM ft_open_stream
@@ -275,7 +274,6 @@
 	}
 	memset(stream, 0, sizeof(*stream));
 
-	stream->memory = library->memory;
 	stream->read = RWread;
 	stream->descriptor.pointer = src;
 	stream->pos = (unsigned long)position;


Index: SDL_ttf.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_ttf/devel/SDL_ttf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SDL_ttf.spec	29 Sep 2005 19:57:18 -0000	1.8
+++ SDL_ttf.spec	14 Dec 2005 19:21:27 -0000	1.9
@@ -1,12 +1,13 @@
 Name:		SDL_ttf
 Version:	2.0.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Simple DirectMedia Layer TrueType Font library
 
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.libsdl.org/projects/SDL_ttf/
 Source0:	http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz
+Patch1:		%{name}-%{version}-freetype-internals.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	SDL-devel >= 1.2.4
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .freetype
 
 
 %build
@@ -70,6 +72,9 @@
 
 
 %changelog
+* Wed Dec 14 2005 Brian Pepple  - 2.0.7-3
+- Add patch for Bug #171020.
+
 * Thu Sep 29 2005 Brian Pepple  - 2.0.7-2
 - General spec formatting changes.
 - Rebuild for FC4 upgrade path.



From fedora-extras-commits at redhat.com  Wed Dec 14 19:23:16 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 14 Dec 2005 14:23:16 -0500
Subject: rpms/munin/FC-3 munin.spec,1.1,1.2
Message-ID: <200512141923.jBEJNkJT014116@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	munin.spec 
Log Message:
Fixed libdir messup to allow builds on x86_64



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-3/munin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- munin.spec	14 Dec 2005 03:38:04 -0000	1.1
+++ munin.spec	14 Dec 2005 19:23:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -175,7 +175,7 @@
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
-%{_libdir}/perl5/*perl/5.*/Munin.pm
+%{perl_vendorlib}/Munin.pm
 /var/www/html/munin/cgi/munin-cgi-graph
 %dir /etc/munin/templates
 %dir /etc/munin
@@ -222,6 +222,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
+- Fixed libdir messup to allow builds on x86_64
+
 * Mon Dec 12 2005 Kevin Fenzi  - 1.2.4-2
 - Removed plugins that require Net-SNMP and Sybase 
 



From fedora-extras-commits at redhat.com  Wed Dec 14 19:26:09 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 14 Dec 2005 14:26:09 -0500
Subject: rpms/munin/FC-4 munin.spec,1.1,1.2
Message-ID: <200512141926.jBEJQdOL014185@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	munin.spec 
Log Message:
Fixed libdir messup to allow builds on x86_64



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-4/munin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- munin.spec	14 Dec 2005 03:38:04 -0000	1.1
+++ munin.spec	14 Dec 2005 19:26:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -175,7 +175,7 @@
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
-%{_libdir}/perl5/*perl/5.*/Munin.pm
+%{perl_vendorlib}/Munin.pm
 /var/www/html/munin/cgi/munin-cgi-graph
 %dir /etc/munin/templates
 %dir /etc/munin
@@ -222,6 +222,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
+- Fixed libdir messup to allow builds on x86_64
+
 * Mon Dec 12 2005 Kevin Fenzi  - 1.2.4-2
 - Removed plugins that require Net-SNMP and Sybase 
 



From fedora-extras-commits at redhat.com  Wed Dec 14 19:27:29 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 14 Dec 2005 14:27:29 -0500
Subject: rpms/munin/devel munin.spec,1.1,1.2
Message-ID: <200512141927.jBEJRxVR014254@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	munin.spec 
Log Message:
Fixed libdir messup to allow builds on x86_64



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- munin.spec	14 Dec 2005 03:38:04 -0000	1.1
+++ munin.spec	14 Dec 2005 19:27:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -175,7 +175,7 @@
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
-%{_libdir}/perl5/*perl/5.*/Munin.pm
+%{perl_vendorlib}/Munin.pm
 /var/www/html/munin/cgi/munin-cgi-graph
 %dir /etc/munin/templates
 %dir /etc/munin
@@ -222,6 +222,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
+- Fixed libdir messup to allow builds on x86_64
+
 * Mon Dec 12 2005 Kevin Fenzi  - 1.2.4-2
 - Removed plugins that require Net-SNMP and Sybase 
 



From fedora-extras-commits at redhat.com  Wed Dec 14 20:37:54 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Wed, 14 Dec 2005 15:37:54 -0500
Subject: rpms/xscorch/devel xscorch.spec,1.1,1.2
Message-ID: <200512142038.jBEKcOEK016328@cvs-int.fedora.redhat.com>

Author: mgarski

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

Modified Files:
	xscorch.spec 
Log Message:
- Prepare for modular X.Org



Index: xscorch.spec
===================================================================
RCS file: /cvs/extras/rpms/xscorch/devel/xscorch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xscorch.spec	27 Aug 2005 16:25:13 -0000	1.1
+++ xscorch.spec	14 Dec 2005 20:37:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xscorch
 Version:	0.2.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A Scorched Earth clone
 
 Group:		Amusements/Games
@@ -13,7 +13,7 @@
 Patch2:		xscorch-0.2.0-termcap.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xorg-x11-devel gtk2-devel >= 2.4.0 desktop-file-utils
+BuildRequires:	libX11-devel libXpm-devel gtk2-devel >= 2.4.0 desktop-file-utils
 #BuildRequires:	readline-devel
 
 %description
@@ -56,6 +56,9 @@
 %{_datadir}/applications/*xscorch.desktop
 
 %changelog
+* 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
 - Disable network
 - Patch fixing stack smashing



From fedora-extras-commits at redhat.com  Wed Dec 14 21:07:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 14 Dec 2005 16:07:25 -0500
Subject: rpms/lirc/devel .cvsignore, 1.6, 1.7 lirc.spec, 1.9, 1.10 sources,
	1.6, 1.7 lirc-0.8.0pre1-2615usb.patch, 1.1,
	NONE lirc-cvs20051129.patch, 1.1, NONE
Message-ID: <200512142107.jBEL7uQm018123@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore lirc.spec sources 
Removed Files:
	lirc-0.8.0pre1-2615usb.patch lirc-cvs20051129.patch 
Log Message:
* Wed Dec 14 2005 Ville Skytt??  - 0.8.0-0.2.pre2
- 0.8.0pre2, kernel >= 2.6.15 USB patch applied upstream.
- lirc_clientd renamed to lircrcd.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Nov 2005 08:58:17 -0000	1.6
+++ .cvsignore	14 Dec 2005 21:07:23 -0000	1.7
@@ -1 +1 @@
-lirc-0.8.0pre1.tar.bz2
+lirc-0.8.0pre2.tar.bz2


Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lirc.spec	29 Nov 2005 08:58:17 -0000	1.9
+++ lirc.spec	14 Dec 2005 21:07:23 -0000	1.10
@@ -16,19 +16,17 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        0.2.pre1%{?dist}
+Release:        0.2.pre2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre1.tar.bz2
+Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre2.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
-Patch1:         %{name}-cvs20051129.patch
-Patch2:         %{name}-0.8.0pre1-2615usb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{!?_with_modules:1}
@@ -78,18 +76,24 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre1
+%setup -q -n %{name}-%{version}pre2
 %patch0 -p1
-%patch1 -p1
-%patch2
+
+# *cough*
 echo %{kver} | grep -q _FC5 && \
-   sed -i -e s/2,6,15/2,6,14/ drivers/lirc_{dev,imon,sasem}/lirc_*.c # *cough*
+   sed -i -e 's/KERNEL_VERSION(2,\s*6,\s*15)/KERNEL_VERSION(2,6,14)/' \
+   drivers/kcompat.h drivers/lirc_{imon,sasem}/lirc_*.c
+
 chmod 644 contrib/*
-# cmdir: unknown symbols
+
+sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
+
+# cmdir: unknown symbols (cmdir_{read,write}, set_tx_channels)
 # gpio: missing drivers/media/video/{bttv,bttvp}.h in kernel-devel
 for drv in cmdir gpio ; do
   sed -i -e "/^\\s*(lirc_dev lirc_$drv)/d" -e "/^\\s*lirc_$drv/d" configure*
 done
+
 touch -r aclocal.m4 configure.in # avoid autofoo re-run
 
 
@@ -179,7 +183,7 @@
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
 %{_libdir}/liblirc_client.so.*
-%{_mandir}/man1/ir*.1*
+%{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
 %{_mandir}/man8/lirc*d.8*
 %ghost /dev/lirc*
@@ -198,6 +202,10 @@
 
 
 %changelog
+* Wed Dec 14 2005 Ville Skytt??  - 0.8.0-0.2.pre2
+- 0.8.0pre2, kernel >= 2.6.15 USB patch applied upstream.
+- lirc_clientd renamed to lircrcd.
+
 * Tue Nov 29 2005 Ville Skytt??  - 0.8.0-0.2.pre1
 - Pull security fix for the new lirc_clientd from upstream CVS, and
   while at it, some other useful post-0.8.0pre1 changes.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Nov 2005 08:58:17 -0000	1.6
+++ sources	14 Dec 2005 21:07:23 -0000	1.7
@@ -1 +1 @@
-d115ec757ee1f3b25071f24c8256ee31  lirc-0.8.0pre1.tar.bz2
+80aaee5c1b5815f115b1e14d49f36cd5  lirc-0.8.0pre2.tar.bz2


--- lirc-0.8.0pre1-2615usb.patch DELETED ---


--- lirc-cvs20051129.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 14 21:09:20 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 14 Dec 2005 16:09:20 -0500
Subject: rpms/perl-MailTools/devel perl-MailTools.spec,1.11,1.12
Message-ID: <200512142110.jBELA3R1018161@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MailTools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18139

Modified Files:
	perl-MailTools.spec 
Log Message:
* Wed Dec 14 2005 Ville Skytt??  - 1.67-2
- Fix demo scripts.
- Sync with fedora-rpmdevtools' perl spec template.



Index: perl-MailTools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-MailTools.spec	1 Jul 2005 11:16:47 -0000	1.11
+++ perl-MailTools.spec	14 Dec 2005 21:09:15 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:        Various mail-related perl modules
 Name:           perl-MailTools
 Version:        1.67
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -10,8 +10,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(Net::Domain), perl(Net::SMTP)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl(Net::Domain)
+BuildRequires:  perl(Net::SMTP)
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 MailTools is a set of Perl modules related to mail applications.
@@ -19,26 +21,31 @@
 
 %prep
 %setup -q -n MailTools-%{version}
+cd examples
+for file in *.PL ; do %{__perl} $file ; done ; chmod -x *_demo
+rm *.PL # yeah, causes warnings from MakeMaker, but we don't care
+cd ..
 
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
-%{__rm} -rf "$RPM_BUILD_ROOT"
-%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-%{_bindir}/find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} -f {} ';'
-%{_bindir}/find $RPM_BUILD_ROOT -type d -depth -exec %{__rmdir} {} 2>/dev/null ';'
+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
+%check
+make test
 
 
 %clean
-%{__rm} -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 
 %files
@@ -50,6 +57,10 @@
 
 
 %changelog
+* Wed Dec 14 2005 Ville Skytt??  - 1.67-2
+- Fix demo scripts.
+- Sync with fedora-rpmdevtools' perl spec template.
+
 * Fri Jul  1 2005 Paul Howarth  - 1.67-1
 - update to 1.67 (#161830)
 - assume perl_vendorlib is set
@@ -58,7 +69,7 @@
 - use macros consistently
 - add dist tag
 
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Apr  7 2005 Michael Schwendt  - 1.66-2
 - rebuilt
 
 * Sat Jan 22 2005 Ville Skytt??  - 0:1.66-1



From fedora-extras-commits at redhat.com  Wed Dec 14 22:08:47 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 14 Dec 2005 17:08:47 -0500
Subject: rpms/gramps/devel gramps.spec,1.13,1.14
Message-ID: <200512142209.jBEM9H6O020050@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	gramps.spec 
Log Message:
* Wed Dec 14 2005 Brian Pepple  - 2.0.9-3
- Add requires for gnome-python2-gnomeprint.



Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gramps.spec	13 Dec 2005 19:25:39 -0000	1.13
+++ gramps.spec	14 Dec 2005 22:08:45 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gramps
 Version:        2.0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -27,6 +27,7 @@
 Requires:       gnome-python2-gconf
 Requires:       gnome-python2-gnomevfs
 Requires:       gnome-python2
+Requires:	gnome-python2-gnomeprint
 Requires:       ImageMagick
 Requires:       pygtk2
 Requires:       pygtk2-libglade
@@ -113,6 +114,9 @@
 
 
 %changelog
+* Wed Dec 14 2005 Brian Pepple  - 2.0.9-3
+- Add requires for gnome-python2-gnomeprint.
+
 * Tue Dec 13 2005 Brian Pepple  - 2.0.9-2
 - Make noarch. (#170974)
 - Update to 2.0.9.



From fedora-extras-commits at redhat.com  Wed Dec 14 22:12:15 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 14 Dec 2005 17:12:15 -0500
Subject: rpms/gramps/FC-4 gramps.spec,1.13,1.14
Message-ID: <200512142212.jBEMCkhH020150@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	gramps.spec 
Log Message:
* Wed Dec 14 2005 Brian Pepple  - 2.0.9-2
- Add requires for gnome-python2-gnomeprint.



Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/FC-4/gramps.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gramps.spec	13 Dec 2005 19:27:48 -0000	1.13
+++ gramps.spec	14 Dec 2005 22:12:10 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gramps
 Version:        2.0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -27,6 +27,7 @@
 Requires:       gnome-python2-gconf
 Requires:       gnome-python2-gnomevfs
 Requires:       gnome-python2
+Requires:	gnome-python2-gnomeprint
 Requires:       ImageMagick
 Requires:       pygtk2
 Requires:       pygtk2-libglade
@@ -113,7 +114,10 @@
 
 
 %changelog
-* Tue Dec 13 2005 Brian Pepple  - 2.0.9
+* Wed Dec 14 2005 Brian Pepple  - 2.0.9-2
+- Add requires for gnome-python2-gnomeprint.
+
+* Tue Dec 13 2005 Brian Pepple  - 2.0.9-1
 - Make noarch. (#170974)
 - Update to 2.0.9.
 



From fedora-extras-commits at redhat.com  Wed Dec 14 22:20:16 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 14 Dec 2005 17:20:16 -0500
Subject: rpms/rlog - New directory
Message-ID: <200512142220.jBEMKGn1020267@cvs-int.fedora.redhat.com>

Author: peter

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

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




From fedora-extras-commits at redhat.com  Wed Dec 14 22:20:18 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 14 Dec 2005 17:20:18 -0500
Subject: rpms/rlog/devel - New directory
Message-ID: <200512142220.jBEMKIXP020276@cvs-int.fedora.redhat.com>

Author: peter

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

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




From fedora-extras-commits at redhat.com  Wed Dec 14 22:20:48 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 14 Dec 2005 17:20:48 -0500
Subject: rpms/rlog Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512142220.jBEMKmvk020315@cvs-int.fedora.redhat.com>

Author: peter

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 14 22:20:53 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 14 Dec 2005 17:20:53 -0500
Subject: rpms/rlog/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512142220.jBEMKrTE020336@cvs-int.fedora.redhat.com>

Author: peter

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

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


--- NEW 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 Dec 14 22:22:13 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 14 Dec 2005 17:22:13 -0500
Subject: rpms/rlog import.log,1.1,1.2
Message-ID: <200512142222.jBEMMhSG020418@cvs-int.fedora.redhat.com>

Author: peter

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rlog/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Dec 2005 22:20:45 -0000	1.1
+++ import.log	14 Dec 2005 22:22:10 -0000	1.2
@@ -0,0 +1 @@
+rlog-1_3_7-1:HEAD:rlog-1.3.7-1.src.rpm:1134598919



From fedora-extras-commits at redhat.com  Wed Dec 14 22:22:18 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 14 Dec 2005 17:22:18 -0500
Subject: rpms/rlog/devel rlog-1.3.7.tgz.asc, NONE, 1.1 rlog.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512142222.jBEMMm2J020427@cvs-int.fedora.redhat.com>

Author: peter

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

Modified Files:
	.cvsignore sources 
Added Files:
	rlog-1.3.7.tgz.asc rlog.spec 
Log Message:
auto-import rlog-1.3.7-1 on branch devel from rlog-1.3.7-1.src.rpm


--- NEW FILE rlog-1.3.7.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQBDRBfiWp20Ay6vTYARApsUAJ9xRj/7QGqOGN7ETfq70BRMWGrX/wCeKOEE
2JPWA1g2WavJZYtvLP+XZT0=
=ryRv
-----END PGP SIGNATURE-----


--- NEW FILE rlog.spec ---
Name: 		rlog
Summary: 	Runtime Logging for C++
Version: 	1.3.7
Release: 	1%{?dist}
License: 	LGPL
Group: 		Development/Libraries
Url: 		http://arg0.net/wiki/rlog
Source0: 	http://arg0.net/users/vgough/download/%{name}-%{version}.tgz
Source1:	http://arg0.net/users/vgough/download/%{name}-%{version}.tgz.asc
%ifarch i386
BuildRequires:	valgrind
%endif
Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
RLog provides a flexible message logging facility for C++ programs and
libraries.  It is meant to be fast enough to leave in production code.

%package devel
Summary:	Runtime Logging for C++ - development files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig
BuildRequires:	doxygen tetex-latex

%description devel
Files needed for developing apps using rlog

%prep
%setup -q
%{__rm} -rf docs/html
%{__rm} -rf docs/latex

%build
%configure \
	--disable-static \
%ifarch i386
	--enable-valgrind
%else
	--disable-valgrind
%endif
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
%{__rm} -f %{buildroot}/%{_libdir}/*.la
%{__rm} -rf %{buildroot}/%{_docdir}/rlog

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

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

%files
%defattr(-,root,root,-)
%{_libdir}/librlog.so.*
%doc README AUTHORS COPYING 

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/pkgconfig/*
%{_libdir}/librlog.so
%doc docs/html docs/latex/refman.pdf

%changelog
* Sun Nov 13 2005 Peter Lemenkov  1.3.7-1
- Initial build for FC-Extras
- Release v1.3.7

* Mon Nov 8 2004 Valient Gough 
- Release v1.3.5
- Add initial attempt at Win32 support (due to help from Vadim Zeitlin)
- Fixes to build on Suse 9.2 (replaced old KDE based autoconf scripts)
- Add "info" channel, and rInfo() macro.
* Mon May 31 2004 Valient Gough 
- Release v1.3.4
- Portibility changes to allow rlog to build with older C++ compilers and on
  non-x86 computers.
- Add extra ERROR_FMT() macro which allows format string to be passed on Error
  construction.
- Add valgrind support to allow valgrind trace from any assert when running
  under valgrind.
- Update admin dir.
* Sat Mar 13 2004 Valient Gough 
- Release v1.3.1
- added pkg-config file librlog.pc
- changed license to LGPL
- added rAssertSilent macro
- fixes for special case checks of printf attribute
* Sat Feb 8 2004 Valient Gough 
- Release v1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rlog/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Dec 2005 22:20:51 -0000	1.1
+++ .cvsignore	14 Dec 2005 22:22:16 -0000	1.2
@@ -0,0 +1 @@
+rlog-1.3.7.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rlog/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Dec 2005 22:20:51 -0000	1.1
+++ sources	14 Dec 2005 22:22:16 -0000	1.2
@@ -0,0 +1 @@
+a3bc4e4d9d2b838fdc32e6de64270b68  rlog-1.3.7.tgz



From fedora-extras-commits at redhat.com  Wed Dec 14 22:30:02 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 14 Dec 2005 17:30:02 -0500
Subject: owners owners.list,1.451,1.452
Message-ID: <200512142230.jBEMUWIa020503@cvs-int.fedora.redhat.com>

Author: peter

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

Modified Files:
	owners.list 
Log Message:

Added info about rlog.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -r1.451 -r1.452
--- owners.list	14 Dec 2005 10:37:38 -0000	1.451
+++ owners.list	14 Dec 2005 22:30:00 -0000	1.452
@@ -1035,6 +1035,7 @@
 Fedora Extras|R-hdf5|R Interface to the NCSA HDF5 library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|extras-qa at fedoraproject.org|
+Fedora Extras|rlog|Runtime Logging for C++|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|R-mAr|R module to evaluate functions for multivariate AutoRegressive analysis|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|roundup|Simple and flexible issue-tracking system|redhat at flyn.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Dec 14 23:07:43 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 14 Dec 2005 18:07:43 -0500
Subject: rpms/kdesvn/devel kdesvn.spec,1.7,1.8
Message-ID: <200512142308.jBEN8DMm022284@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	kdesvn.spec 
Log Message:
Specify apr-1-config and apu-1-config to configure



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdesvn.spec	13 Dec 2005 23:18:14 -0000	1.7
+++ kdesvn.spec	14 Dec 2005 23:07:40 -0000	1.8
@@ -12,7 +12,7 @@
 Patch0:         kdesvn-0.7.1-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  subversion-devel, kdelibs-devel, neon-devel, apr-util-devel
+BuildRequires:  subversion-devel, kdelibs-devel, neon-devel
 BuildRequires:  desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -37,7 +37,8 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-%configure --disable-rpath --with-svn-lib=%{_libdir}
+%configure --disable-rpath --with-svn-lib=%{_libdir} \
+           --with-apr-config=apr-1-config --with-apu-config=apu-1-config
 make %{?_smp_mflags}
 
 
@@ -97,7 +98,7 @@
 
 %changelog
 * Tue Dec 13 2005 - Orion Poplawski  - 0.7.1-2
-- Add apr-util-devel BuildRequires
+- Specify apr-1-config and apu-1-config to configure
 
 * Fri Dec  9 2005 - Orion Poplawski  - 0.7.1-1
 - New upstream version 0.7.1



From fedora-extras-commits at redhat.com  Wed Dec 14 23:09:26 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Wed, 14 Dec 2005 18:09:26 -0500
Subject: rpms/sword/devel sword.spec,1.6,1.7
Message-ID: <200512142309.jBEN9uZw022313@cvs-int.fedora.redhat.com>

Author: mpeters

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

Modified Files:
	sword.spec 
Log Message:
Needs a rebuild in devel branch



Index: sword.spec
===================================================================
RCS file: /cvs/extras/rpms/sword/devel/sword.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sword.spec	21 Nov 2005 17:47:03 -0000	1.6
+++ sword.spec	14 Dec 2005 23:09:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           sword           
 Version:        1.5.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
@@ -29,7 +29,7 @@
 %package devel
 Summary:  Development files for the sword project
 Group:    Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
 
 %description devel
 This package contains the development headers and libraries for the
@@ -46,7 +46,8 @@
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make 
+#%%{?_smp_mflags} sometimes causes build failure
 
 
 %install
@@ -86,6 +87,11 @@
 
 
 %changelog
+* Wed Dec 14 2005 Michael A. Peters  - 1.5.8-6
+- rebuild in devel branch with new compiler suite
+- remove specific release from devel requires of main package
+- do not build with %%{_smp_mflags}
+
 * Mon Nov 21 2005 Michael A. Peters  - 1.5.8-5
 - disable static library
 



From fedora-extras-commits at redhat.com  Wed Dec 14 23:16:02 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Wed, 14 Dec 2005 18:16:02 -0500
Subject: rpms/gnomesword/FC-4 .cvsignore, 1.2, 1.3 gnomesword.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200512142316.jBENGWnt022428@cvs-int.fedora.redhat.com>

Author: mpeters

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

Modified Files:
	.cvsignore gnomesword.spec sources 
Log Message:
New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jun 2005 12:04:31 -0000	1.2
+++ .cvsignore	14 Dec 2005 23:16:00 -0000	1.3
@@ -1 +1,2 @@
 gnomesword-2.1.2.tar.gz
+gnomesword-2.1.5.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-4/gnomesword.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnomesword.spec	15 Sep 2005 12:28:14 -0000	1.5
+++ gnomesword.spec	14 Dec 2005 23:16:00 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           gnomesword           
-Version:        2.1.2
-Release:        2.3%{?dist}
+Version:        2.1.5
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-Patch0:         gnomesword-2.1.2-gettext64.patch
+#Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -15,16 +15,13 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-spell
-BuildRequires:  gtkhtml3-devel
+BuildRequires:  gtkhtml3-devel >= 3.6
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
-# currently broken on x86_64
-# ExcludeArch:    x86_64
-# for x86_64
-%ifarch x86_64
-BuildRequires:  libtool automake autoconf
-%endif
+#%%ifarch x86_64
+#BuildRequires:  libtool automake autoconf
+#%%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -39,16 +36,17 @@
 
 %prep
 %setup -q
-%ifarch x86_64
-%patch0 -p1 -b .gettext64 
-%endif
+#%%ifarch x86_64
+#%%patch0 -p1 -b .gettext64 
+#%%endif
+
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
-%ifarch x86_64
-libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
-%endif
+#%%ifarch x86_64
+#libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
+#%%endif
 %configure
 make %{?_smp_mflags}
 
@@ -85,11 +83,16 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS ChangeLog NEWS README TODO
 %_bindir/gnomesword2
+%_datadir/gnomesword
 %_datadir/pixmaps/gnomesword
 %_datadir/applications/fedora-gnomesword.desktop
 
 
 %changelog
+* Wed Dec 14 2005 Michael A. Peters  - 2.1.5-1
+- New upstream version, works with gtkhtml3-3.8
+- disable x86_64 patch
+
 * Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.3
 - trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
 - 160186


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jun 2005 12:04:31 -0000	1.2
+++ sources	14 Dec 2005 23:16:00 -0000	1.3
@@ -1 +1,2 @@
 ce1171f19a40256cfdd31f42c979d91c  gnomesword-2.1.2.tar.gz
+61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 23:30:17 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Wed, 14 Dec 2005 18:30:17 -0500
Subject: rpms/gnomesword/FC-3 gnomesword.spec,1.5,1.6 sources,1.2,1.3
Message-ID: <200512142330.jBENUlFs022536@cvs-int.fedora.redhat.com>

Author: mpeters

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

Modified Files:
	gnomesword.spec sources 
Log Message:
upstream update, including ability to build against rawhide gtkhtml3



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-3/gnomesword.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnomesword.spec	15 Sep 2005 23:33:47 -0000	1.5
+++ gnomesword.spec	14 Dec 2005 23:30:15 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           gnomesword           
-Version:        2.1.2
-Release:        2.3%{?dist}
+Version:        2.1.5
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-Patch0:         gnomesword-2.1.2-gettext64.patch
+#Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -15,16 +15,13 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-spell
-BuildRequires:  gtkhtml3-devel
+BuildRequires:  gtkhtml3-devel >= 3.6
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
-# currently broken on x86_64
-# ExcludeArch:    x86_64
-# for x86_64
-%ifarch x86_64
-BuildRequires:  libtool automake autoconf
-%endif
+#%%ifarch x86_64
+#BuildRequires:  libtool automake autoconf
+#%%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -39,16 +36,17 @@
 
 %prep
 %setup -q
-%ifarch x86_64
-%patch0 -p1 -b .gettext64 
-%endif
+#%%ifarch x86_64
+#%%patch0 -p1 -b .gettext64 
+#%%endif
+
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
-%ifarch x86_64
-libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
-%endif
+#%%ifarch x86_64
+#libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
+#%%endif
 %configure
 make %{?_smp_mflags}
 
@@ -85,11 +83,16 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS ChangeLog NEWS README TODO
 %_bindir/gnomesword2
+%_datadir/gnomesword
 %_datadir/pixmaps/gnomesword
 %_datadir/applications/fedora-gnomesword.desktop
 
 
 %changelog
+* Wed Dec 14 2005 Michael A. Peters  - 2.1.5-1
+- New upstream version, works with gtkhtml3-3.8
+- disable x86_64 patch
+
 * Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.3
 - trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
 - 160186


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jun 2005 12:04:31 -0000	1.2
+++ sources	14 Dec 2005 23:30:15 -0000	1.3
@@ -1 +1,2 @@
 ce1171f19a40256cfdd31f42c979d91c  gnomesword-2.1.2.tar.gz
+61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 23:30:22 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Wed, 14 Dec 2005 18:30:22 -0500
Subject: rpms/gnomesword/devel gnomesword.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200512142330.jBENUrL7022540@cvs-int.fedora.redhat.com>

Author: mpeters

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

Modified Files:
	gnomesword.spec sources 
Log Message:
upstream update, including ability to build against rawhide gtkhtml3



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnomesword.spec	13 Dec 2005 21:18:31 -0000	1.6
+++ gnomesword.spec	14 Dec 2005 23:30:20 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           gnomesword           
-Version:        2.1.3
+Version:        2.1.5
 Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
@@ -39,6 +39,7 @@
 #%%ifarch x86_64
 #%%patch0 -p1 -b .gettext64 
 #%%endif
+
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
@@ -88,7 +89,7 @@
 
 
 %changelog
-* Tue Dec 13 2005 Michael A. Peters  - 2.1.3-1
+* Wed Dec 14 2005 Michael A. Peters  - 2.1.5-1
 - New upstream version, works with gtkhtml3-3.8
 - disable x86_64 patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Dec 2005 21:18:31 -0000	1.3
+++ sources	14 Dec 2005 23:30:20 -0000	1.4
@@ -1,2 +1,2 @@
 ce1171f19a40256cfdd31f42c979d91c  gnomesword-2.1.2.tar.gz
-b9bb8f16890feb2371d06982505fdbc2  gnomesword-2.1.3.tar.gz
+61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 23:41:37 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 14 Dec 2005 18:41:37 -0500
Subject: rpms/mlmmj/FC-4 .cvsignore, 1.5, 1.6 mlmmj.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <200512142342.jBENg7aD022670@cvs-int.fedora.redhat.com>

Author: mfleming

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

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Thu Dec 15 2005 Michael Fleming  1.2.9-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jun 2005 03:14:33 -0000	1.5
+++ .cvsignore	14 Dec 2005 23:41:35 -0000	1.6
@@ -1 +1 @@
-mlmmj-1.2.8.tar.bz2
+mlmmj-1.2.9.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/mlmmj.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mlmmj.spec	21 Jun 2005 03:14:33 -0000	1.12
+++ mlmmj.spec	14 Dec 2005 23:41:35 -0000	1.13
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.8
+Version: 1.2.9
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Thu Dec 15 2005 Michael Fleming  1.2.9-1
+- New upstream release
+
 * Tue Jun 21 2005 Michael Fleming  1.2.8-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Jun 2005 03:14:33 -0000	1.5
+++ sources	14 Dec 2005 23:41:35 -0000	1.6
@@ -1 +1 @@
-778a236716df9511670dddfccfa1d257  mlmmj-1.2.8.tar.bz2
+6011ba93fa907289b4ed3d4c3552a90e  mlmmj-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 00:07:06 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 14 Dec 2005 19:07:06 -0500
Subject: rpms/mlmmj/devel .cvsignore, 1.6, 1.7 mlmmj.spec, 1.14, 1.15 sources,
	1.6, 1.7
Message-ID: <200512150007.jBF07aFB026121@cvs-int.fedora.redhat.com>

Author: mfleming

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

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Thu Dec 15 2005 Michael Fleming  1.2.9-1
- New upstream stable release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Oct 2005 11:20:26 -0000	1.6
+++ .cvsignore	15 Dec 2005 00:06:39 -0000	1.7
@@ -1 +1 @@
-mlmmj-1.2.9-RC1.tar.bz2
+mlmmj-1.2.9.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mlmmj.spec	10 Oct 2005 11:20:26 -0000	1.14
+++ mlmmj.spec	15 Dec 2005 00:06:39 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
 Version: 1.2.9
-Release: 0.rc1%{?dist}
+Release: 1.%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}-RC1.tar.bz2
@@ -19,7 +19,7 @@
 
 %prep
 
-%setup -n %{name}-%{version}-RC1
+%setup
 
 %build
 %configure
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Thu Dec 15 2005 Michael Fleming  1.2.9-1
+- New upstream stable release
+
 * Mon Oct 10 2005 Michael Fleming  1.2.9-0.rc1
 - New upstream release candidate
 - Fixed typo in the Description that I hope noone noticed.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Oct 2005 11:20:26 -0000	1.6
+++ sources	15 Dec 2005 00:06:39 -0000	1.7
@@ -1 +1 @@
-57710086f9a346cda83db905d6038297  mlmmj-1.2.9-RC1.tar.bz2
+6011ba93fa907289b4ed3d4c3552a90e  mlmmj-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 00:15:13 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 14 Dec 2005 19:15:13 -0500
Subject: rpms/mlmmj/devel mlmmj.spec,1.15,1.16
Message-ID: <200512150015.jBF0FihR026218@cvs-int.fedora.redhat.com>

Author: mfleming

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

Modified Files:
	mlmmj.spec 
Log Message:
* Thu Dec 15 2005 Michael Fleming  1.2.9-2
- New upstream stable release
- Fix Release tag



Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mlmmj.spec	15 Dec 2005 00:06:39 -0000	1.15
+++ mlmmj.spec	15 Dec 2005 00:14:58 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
 Version: 1.2.9
-Release: 1.%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}-RC1.tar.bz2
@@ -48,8 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
-* Thu Dec 15 2005 Michael Fleming  1.2.9-1
+* Thu Dec 15 2005 Michael Fleming  1.2.9-2
 - New upstream stable release
+- Fix Release tag
 
 * Mon Oct 10 2005 Michael Fleming  1.2.9-0.rc1
 - New upstream release candidate



From fedora-extras-commits at redhat.com  Thu Dec 15 03:05:16 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:05:16 -0500
Subject: rpms/xfce4-battery-plugin - New directory
Message-ID: <200512150305.jBF35GPM032486@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32477/xfce4-battery-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-battery-plugin added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:05:32 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:05:32 -0500
Subject: rpms/xfce4-battery-plugin/devel - New directory
Message-ID: <200512150305.jBF35Wio032502@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32477/xfce4-battery-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-battery-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:06:55 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:06:55 -0500
Subject: rpms/xfce4-battery-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512150306.jBF36tie032557@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32527/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-battery-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:06:54 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:06:54 -0500
Subject: rpms/xfce4-battery-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512150306.jBF36suO032554@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32527

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-battery-plugin


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:10:05 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:10:05 -0500
Subject: rpms/xfce4-battery-plugin/devel GPL, NONE,
	1.1 xfce4-battery-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512150310.jBF3A59d032643@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32611/devel

Modified Files:
	.cvsignore sources 
Added Files:
	GPL xfce4-battery-plugin.spec 
Log Message:
auto-import xfce4-battery-plugin-0.3.0-3.fc4 on branch devel from xfce4-battery-plugin-0.3.0-3.fc4.src.rpm


--- NEW FILE GPL ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    
    Copyright (C)   

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year  name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  , 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.


--- NEW FILE xfce4-battery-plugin.spec ---
Name:		xfce4-battery-plugin
Version:	0.3.0
Release:	3%{?dist}
Summary:	Battery 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.gz
Source1:	GPL
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxml2-devel

%description
A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.

%prep
%setup -q

%build
%configure --disable-static
make

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

# replace wrong BSD license with a copy of GPL
%__cp %{SOURCE1} COPYING

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Sat Nov 19 2005 Christoph Wickert  - 0.3.0-3
- Use %{?_smp_mflags}.
- Replace wrong BSD license with a copy of the GPL (#173105).

* Mon Nov 14 2005 Christoph Wickert  - 0.3.0-2
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.3.0-1.fc4.cw
- Update to 0.3.0.
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.2.0-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.2.0-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 03:06:52 -0000	1.1
+++ .cvsignore	15 Dec 2005 03:10:03 -0000	1.2
@@ -0,0 +1 @@
+xfce4-battery-plugin-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 03:06:52 -0000	1.1
+++ sources	15 Dec 2005 03:10:03 -0000	1.2
@@ -0,0 +1 @@
+04e121df1ff264281e56e12a8ff5f155  xfce4-battery-plugin-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 03:09:48 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:09:48 -0500
Subject: rpms/xfce4-battery-plugin import.log,1.1,1.2
Message-ID: <200512150310.jBF3AsOE032654@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32611

Modified Files:
	import.log 
Log Message:
auto-import xfce4-battery-plugin-0.3.0-3.fc4 on branch devel from xfce4-battery-plugin-0.3.0-3.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 03:06:29 -0000	1.1
+++ import.log	15 Dec 2005 03:09:46 -0000	1.2
@@ -0,0 +1 @@
+xfce4-battery-plugin-0_3_0-3_fc4:HEAD:xfce4-battery-plugin-0.3.0-3.fc4.src.rpm:1134616160



From fedora-extras-commits at redhat.com  Thu Dec 15 03:16:20 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:16:20 -0500
Subject: rpms/xfce4-showdesktop-plugin - New directory
Message-ID: <200512150316.jBF3GKXb000363@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv354/xfce4-showdesktop-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-showdesktop-plugin added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:16:25 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:16:25 -0500
Subject: rpms/xfce4-showdesktop-plugin/devel - New directory
Message-ID: <200512150316.jBF3GPFS000379@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv354/xfce4-showdesktop-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-showdesktop-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:16:44 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:16:44 -0500
Subject: rpms/xfce4-showdesktop-plugin Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200512150316.jBF3Gixc000414@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv401

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-showdesktop-plugin


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:16:49 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:16:49 -0500
Subject: rpms/xfce4-showdesktop-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512150316.jBF3Gn2O000435@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv401/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-showdesktop-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:17:44 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:17:44 -0500
Subject: rpms/xfce4-showdesktop-plugin import.log,1.1,1.2
Message-ID: <200512150318.jBF3IEYZ000505@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv469

Modified Files:
	import.log 
Log Message:
auto-import xfce4-showdesktop-plugin-0.4.0-4.fc4 on branch devel from xfce4-showdesktop-plugin-0.4.0-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-showdesktop-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 03:16:42 -0000	1.1
+++ import.log	15 Dec 2005 03:17:42 -0000	1.2
@@ -0,0 +1 @@
+xfce4-showdesktop-plugin-0_4_0-4_fc4:HEAD:xfce4-showdesktop-plugin-0.4.0-4.fc4.src.rpm:1134616651



From fedora-extras-commits at redhat.com  Thu Dec 15 03:17:49 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:17:49 -0500
Subject: rpms/xfce4-showdesktop-plugin/devel xfce4-showdesktop-plugin.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512150318.jBF3IJ67000509@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv469/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-showdesktop-plugin.spec 
Log Message:
auto-import xfce4-showdesktop-plugin-0.4.0-4.fc4 on branch devel from xfce4-showdesktop-plugin-0.4.0-4.fc4.src.rpm


--- NEW FILE xfce4-showdesktop-plugin.spec ---
Name:		xfce4-showdesktop-plugin
Version:	0.4.0
Release:	4%{?dist}
Summary:	Show-Desktop plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildRequires:  gettext

%description
This is a little Xfce plugin, to minimize and unminimize all windows on the
current workspace. You can unhide all windows with a left-click, or just 
unhide the last window group with a middle click.

%prep
%setup -q -n %{name}

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang xfce4-showdesktop

%clean
rm -rf $RPM_BUILD_ROOT

%files -f xfce4-showdesktop.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.4.0-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.4.0-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.4.0-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.4.0-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.4.0-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-showdesktop-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 03:16:47 -0000	1.1
+++ .cvsignore	15 Dec 2005 03:17:47 -0000	1.2
@@ -0,0 +1 @@
+xfce4-showdesktop-plugin-0.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-showdesktop-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 03:16:47 -0000	1.1
+++ sources	15 Dec 2005 03:17:47 -0000	1.2
@@ -0,0 +1 @@
+4cf1da73f50a81088bc03ad9222821a9  xfce4-showdesktop-plugin-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 03:19:48 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:19:48 -0500
Subject: rpms/xfce4-taskbar-plugin - New directory
Message-ID: <200512150319.jBF3Jm3A000603@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv594/xfce4-taskbar-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-taskbar-plugin added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:19:53 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:19:53 -0500
Subject: rpms/xfce4-taskbar-plugin/devel - New directory
Message-ID: <200512150319.jBF3JrCn000619@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv594/xfce4-taskbar-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-taskbar-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:20:12 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:20:12 -0500
Subject: rpms/xfce4-taskbar-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512150320.jBF3KC8B000675@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv662

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-taskbar-plugin


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:20:18 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:20:18 -0500
Subject: rpms/xfce4-taskbar-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512150320.jBF3KI26000696@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv662/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-taskbar-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:21:06 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:21:06 -0500
Subject: rpms/xfce4-taskbar-plugin import.log,1.1,1.2
Message-ID: <200512150321.jBF3LbTS000771@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv734

Modified Files:
	import.log 
Log Message:
auto-import xfce4-taskbar-plugin-0.2.2-4.fc4 on branch devel from xfce4-taskbar-plugin-0.2.2-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskbar-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 03:20:10 -0000	1.1
+++ import.log	15 Dec 2005 03:21:04 -0000	1.2
@@ -0,0 +1 @@
+xfce4-taskbar-plugin-0_2_2-4_fc4:HEAD:xfce4-taskbar-plugin-0.2.2-4.fc4.src.rpm:1134616857



From fedora-extras-commits at redhat.com  Thu Dec 15 03:21:12 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:21:12 -0500
Subject: rpms/xfce4-taskbar-plugin/devel xfce4-taskbar-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512150321.jBF3LgJt000775@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv734/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-taskbar-plugin.spec 
Log Message:
auto-import xfce4-taskbar-plugin-0.2.2-4.fc4 on branch devel from xfce4-taskbar-plugin-0.2.2-4.fc4.src.rpm


--- NEW FILE xfce4-taskbar-plugin.spec ---
Name:		xfce4-taskbar-plugin
Version:	0.2.2
Release:	4%{?dist}
Summary:	Tasklist plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
A tasklist plugin for the Xfce panel. The size of the taskbar can be changed 
via the properties dialog. It includes an "expand the panel to fill the screen"
feature.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%doc AUTHORS COPYING ChangeLog README
%defattr(-,root,root,-)
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.2.2-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.2.2-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.2.2-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.2.2-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.2.2-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskbar-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 03:20:16 -0000	1.1
+++ .cvsignore	15 Dec 2005 03:21:10 -0000	1.2
@@ -0,0 +1 @@
+xfce4-taskbar-plugin-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskbar-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 03:20:16 -0000	1.1
+++ sources	15 Dec 2005 03:21:10 -0000	1.2
@@ -0,0 +1 @@
+06ad356d728cadd8e78a12ec86235593  xfce4-taskbar-plugin-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 03:44:44 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:44:44 -0500
Subject: rpms/xfce4-notes-plugin - New directory
Message-ID: <200512150344.jBF3ii6j000933@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv924/xfce4-notes-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-notes-plugin added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:44:49 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:44:49 -0500
Subject: rpms/xfce4-notes-plugin/devel - New directory
Message-ID: <200512150344.jBF3inrn000949@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv924/xfce4-notes-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-notes-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:45:09 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:45:09 -0500
Subject: rpms/xfce4-notes-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512150345.jBF3j9nD000986@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv973

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-notes-plugin


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:45:14 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:45:14 -0500
Subject: rpms/xfce4-notes-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512150345.jBF3jEsh001007@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv973/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-notes-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:46:07 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:46:07 -0500
Subject: rpms/xfce4-notes-plugin import.log,1.1,1.2
Message-ID: <200512150346.jBF3kc3S001081@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1043

Modified Files:
	import.log 
Log Message:
auto-import xfce4-notes-plugin-0.11.1-2.fc4 on branch devel from xfce4-notes-plugin-0.11.1-2.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 03:45:07 -0000	1.1
+++ import.log	15 Dec 2005 03:46:05 -0000	1.2
@@ -0,0 +1 @@
+xfce4-notes-plugin-0_11_1-2_fc4:HEAD:xfce4-notes-plugin-0.11.1-2.fc4.src.rpm:1134618356



From fedora-extras-commits at redhat.com  Thu Dec 15 03:46:13 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:46:13 -0500
Subject: rpms/xfce4-notes-plugin/devel xfce4-notes-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512150346.jBF3khcp001085@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1043/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-notes-plugin.spec 
Log Message:
auto-import xfce4-notes-plugin-0.11.1-2.fc4 on branch devel from xfce4-notes-plugin-0.11.1-2.fc4.src.rpm


--- NEW FILE xfce4-notes-plugin.spec ---
Name:		xfce4-notes-plugin
Version:	0.11.1
Release:	2%{?dist}
Summary:	Notes plugin 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.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
This plugin provides sticky notes for your desktop. You can create a note by 
clicking on the customizable icon with the middle button of your mouse, 
show/hide the notes using the left one, edit the titlebar, change the notes 
background color and much more.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/xfce4/panel-plugins/*.so
%{_datadir}/xfce4/*

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.11.1-2
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.11.1-1
- Initial Fedora Extras version.
- Update to 0.11.1.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.10.0-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.10.0-1.fc4.cw
- Rebuild for Core 4.

* Thu Apr 14 2005 Christoph Wickert  - 0.10.0-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 03:45:12 -0000	1.1
+++ .cvsignore	15 Dec 2005 03:46:11 -0000	1.2
@@ -0,0 +1 @@
+xfce4-notes-plugin-0.11.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 03:45:12 -0000	1.1
+++ sources	15 Dec 2005 03:46:11 -0000	1.2
@@ -0,0 +1 @@
+bc663b4be052ba184898b553141f08e3  xfce4-notes-plugin-0.11.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 03:48:32 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:48:32 -0500
Subject: rpms/xfce4-modemlights-plugin - New directory
Message-ID: <200512150348.jBF3mWk3001172@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1163/xfce4-modemlights-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-modemlights-plugin added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:48:37 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:48:37 -0500
Subject: rpms/xfce4-modemlights-plugin/devel - New directory
Message-ID: <200512150348.jBF3mboX001189@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1163/xfce4-modemlights-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-modemlights-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:48:56 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:48:56 -0500
Subject: rpms/xfce4-modemlights-plugin Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200512150348.jBF3muDZ001224@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1211

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-modemlights-plugin


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:49:01 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:49:01 -0500
Subject: rpms/xfce4-modemlights-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512150349.jBF3n1Sb001245@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1211/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-modemlights-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:49:52 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:49:52 -0500
Subject: rpms/xfce4-modemlights-plugin import.log,1.1,1.2
Message-ID: <200512150350.jBF3oMXa001326@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1283

Modified Files:
	import.log 
Log Message:
auto-import xfce4-modemlights-plugin-0.1.1-3.fc4 on branch devel from xfce4-modemlights-plugin-0.1.1-3.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 03:48:54 -0000	1.1
+++ import.log	15 Dec 2005 03:49:50 -0000	1.2
@@ -0,0 +1 @@
+xfce4-modemlights-plugin-0_1_1-3_fc4:HEAD:xfce4-modemlights-plugin-0.1.1-3.fc4.src.rpm:1134618582



From fedora-extras-commits at redhat.com  Thu Dec 15 03:49:58 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:49:58 -0500
Subject: rpms/xfce4-modemlights-plugin/devel xfce4-modemlights-plugin.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512150350.jBF3oSZw001330@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1283/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-modemlights-plugin.spec 
Log Message:
auto-import xfce4-modemlights-plugin-0.1.1-3.fc4 on branch devel from xfce4-modemlights-plugin-0.1.1-3.fc4.src.rpm


--- NEW FILE xfce4-modemlights-plugin.spec ---
Name: 		xfce4-modemlights-plugin
Version: 	0.1.1
Release: 	3%{?dist}
Summary: 	Modemlights 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.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
A Xfce4 panel applet intended to simplify establishing a ppp connection via 
a modem.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/xfce4/panel-plugins/*.so
%{_datadir}/xfce4/*

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.1.1-3
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.1.1-2
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.1.1-1.fc4.cw
- Initial Fedora Extras version.
- Update to 0.1.1
- Add libxml2 BuildReqs.

* Sat Jul 30 2005 Christoph Wickert  - 0.1.0-1.fc4.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 03:48:59 -0000	1.1
+++ .cvsignore	15 Dec 2005 03:49:55 -0000	1.2
@@ -0,0 +1 @@
+xfce4-modemlights-plugin-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 03:48:59 -0000	1.1
+++ sources	15 Dec 2005 03:49:55 -0000	1.2
@@ -0,0 +1 @@
+7f7bafc619f6422e0d8b7b72eb53859a  xfce4-modemlights-plugin-0.1.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 03:51:52 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:51:52 -0500
Subject: rpms/xfce4-minicmd-plugin - New directory
Message-ID: <200512150351.jBF3pqrC001425@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1416/xfce4-minicmd-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-minicmd-plugin added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:51:57 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:51:57 -0500
Subject: rpms/xfce4-minicmd-plugin/devel - New directory
Message-ID: <200512150351.jBF3pvf0001441@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1416/xfce4-minicmd-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-minicmd-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:52:19 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:52:19 -0500
Subject: rpms/xfce4-minicmd-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512150352.jBF3qJke001483@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1470

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-minicmd-plugin


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:52:24 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:52:24 -0500
Subject: rpms/xfce4-minicmd-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512150352.jBF3qOth001504@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1470/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-minicmd-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:53:15 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:53:15 -0500
Subject: rpms/xfce4-minicmd-plugin import.log,1.1,1.2
Message-ID: <200512150353.jBF3rjxS001584@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1545

Modified Files:
	import.log 
Log Message:
auto-import xfce4-minicmd-plugin-0.3.0-4.fc4 on branch devel from xfce4-minicmd-plugin-0.3.0-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 03:52:17 -0000	1.1
+++ import.log	15 Dec 2005 03:53:12 -0000	1.2
@@ -0,0 +1 @@
+xfce4-minicmd-plugin-0_3_0-4_fc4:HEAD:xfce4-minicmd-plugin-0.3.0-4.fc4.src.rpm:1134618784



From fedora-extras-commits at redhat.com  Thu Dec 15 03:53:20 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:53:20 -0500
Subject: rpms/xfce4-minicmd-plugin/devel xfce4-minicmd-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512150353.jBF3rofP001588@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1545/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-minicmd-plugin.spec 
Log Message:
auto-import xfce4-minicmd-plugin-0.3.0-4.fc4 on branch devel from xfce4-minicmd-plugin-0.3.0-4.fc4.src.rpm


--- NEW FILE xfce4-minicmd-plugin.spec ---
Name:		xfce4-minicmd-plugin
Version:	0.3.0
Release:	4%{?dist}
Summary:	Mini command-line plugin 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.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
A mini command-line plugin for the Xfce panel. You can execute programs by 
typing their names in the widget and hitting Enter or Ctrl+Enter. The latter 
runs the command in a terminal. It maintains history which is shared with 
xfrun4. This history can be accessed by Up and Down keys.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.3.0-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.3.0-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.3.0-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.3.0-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.3.0-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 03:52:22 -0000	1.1
+++ .cvsignore	15 Dec 2005 03:53:18 -0000	1.2
@@ -0,0 +1 @@
+xfce4-minicmd-plugin-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 03:52:22 -0000	1.1
+++ sources	15 Dec 2005 03:53:18 -0000	1.2
@@ -0,0 +1 @@
+fe52a8ed8451ed41366d5b4abb2dbf9e  xfce4-minicmd-plugin-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 04:39:30 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 23:39:30 -0500
Subject: rpms/xfce4-wavelan-plugin - New directory
Message-ID: <200512150439.jBF4dUaN003433@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3424/xfce4-wavelan-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-wavelan-plugin added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 04:39:35 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 23:39:35 -0500
Subject: rpms/xfce4-wavelan-plugin/devel - New directory
Message-ID: <200512150439.jBF4dZGY003449@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3424/xfce4-wavelan-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-wavelan-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 04:39:54 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 23:39:54 -0500
Subject: rpms/xfce4-wavelan-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512150439.jBF4dsdR003485@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3471

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-wavelan-plugin


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 15 04:40:00 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 23:40:00 -0500
Subject: rpms/xfce4-wavelan-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512150440.jBF4e0Ow003506@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3471/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-wavelan-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Dec 15 04:40:50 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 23:40:50 -0500
Subject: rpms/xfce4-wavelan-plugin import.log,1.1,1.2
Message-ID: <200512150441.jBF4fK3j003584@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3542

Modified Files:
	import.log 
Log Message:
auto-import xfce4-wavelan-plugin-0.4.1-4.fc4 on branch devel from xfce4-wavelan-plugin-0.4.1-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 04:39:52 -0000	1.1
+++ import.log	15 Dec 2005 04:40:48 -0000	1.2
@@ -0,0 +1 @@
+xfce4-wavelan-plugin-0_4_1-4_fc4:HEAD:xfce4-wavelan-plugin-0.4.1-4.fc4.src.rpm:1134621640



From fedora-extras-commits at redhat.com  Thu Dec 15 04:40:56 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 23:40:56 -0500
Subject: rpms/xfce4-wavelan-plugin/devel xfce4-wavelan-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512150441.jBF4fQ07003588@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3542/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-wavelan-plugin.spec 
Log Message:
auto-import xfce4-wavelan-plugin-0.4.1-4.fc4 on branch devel from xfce4-wavelan-plugin-0.4.1-4.fc4.src.rpm


--- NEW FILE xfce4-wavelan-plugin.spec ---
Name:		xfce4-wavelan-plugin
Version:	0.4.1
Release:	4%{?dist}
Summary:	WaveLAN plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
A plugin for the Xfce panel that monitors a wireless LAN interface. It 
displays stats for signal state, signal quality and network name (SSID).

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.4.1-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.4.1-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.4.1-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.4.1-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.4.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 04:39:58 -0000	1.1
+++ .cvsignore	15 Dec 2005 04:40:53 -0000	1.2
@@ -0,0 +1 @@
+xfce4-wavelan-plugin-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 04:39:58 -0000	1.1
+++ sources	15 Dec 2005 04:40:53 -0000	1.2
@@ -0,0 +1 @@
+5ca7df0f3bfe3ee67e2a1fd6c7b60eb0  xfce4-wavelan-plugin-0.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 04:50:34 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Wed, 14 Dec 2005 23:50:34 -0500
Subject: rpms/nsd/devel nsd.spec,1.4,1.5
Message-ID: <200512150451.jBF4p5Af003652@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	nsd.spec 
Log Message:
* Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
- Moved pid file to /var/run/nsd/nsd.pid.
- Use %{_localstatedir} instead of "/var"



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsd.spec	13 Dec 2005 18:16:01 -0000	1.4
+++ nsd.spec	15 Dec 2005 04:50:32 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -22,7 +22,7 @@
 %patch0 -p1 -b .checking.patch
 
 %configure --enable-bind8-stats --enable-plugins \
-           --enable-mmap --with-pidfile=/var/run/nsd.pid --with-ssl \
+           --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
            --with-user=nsd
 
 %build
@@ -37,6 +37,7 @@
 install -d 0755 %{buildroot}/%{_sbindir}
 install -d 0755 %{buildroot}/%{_mandir}/man8
 install -d 0755 %{buildroot}/%{_initrddir}
+install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name}
 
 install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf
 install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones
@@ -56,12 +57,13 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
+%attr(0700,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /var/run/%{name}.pid ]; then
+if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
 	/sbin/service %{name} stop
 fi
 # "Everyone is doing it, so why can't we?" 
@@ -71,7 +73,7 @@
 # do not activate daemon upon request. Fedora Extra policy
 
 %preun
-if [ -f /var/run/%{name}.pid ]
+if [ -f /%{_localstatedir}/run/%{name}/%{name}.pid ]
 then
         /sbin/service %{name} stop > /dev/null 2>&1
 fi
@@ -88,6 +90,10 @@
 fi
 
 %changelog
+* Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
+- Moved pid file to /var/run/nsd/nsd.pid.
+- Use %{_localstatedir} instead of "/var"
+
 * Tue Dec 13 2005 Paul Wouters  - 2.3.3-5
 - Added BuildRequires for openssl-devel, removed Requires for openssl.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 04:52:16 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Wed, 14 Dec 2005 23:52:16 -0500
Subject: rpms/nsd/FC-4 nsd.spec,1.3,1.4
Message-ID: <200512150452.jBF4qlu1003724@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	nsd.spec 
Log Message:
* Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
- Moved pid file to /var/run/nsd/nsd.pid.
- Use %{_localstatedir} instead of "/var"



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsd.spec	13 Dec 2005 14:05:48 -0000	1.3
+++ nsd.spec	15 Dec 2005 04:52:14 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -9,7 +9,6 @@
 Patch0: nsd-2.3.3-checking.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: openssl
 BuildRequires: flex, openssl-devel
 
 %description
@@ -23,7 +22,7 @@
 %patch0 -p1 -b .checking.patch
 
 %configure --enable-bind8-stats --enable-plugins \
-           --enable-mmap --with-pidfile=/var/run/nsd.pid --with-ssl \
+           --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
            --with-user=nsd
 
 %build
@@ -38,6 +37,7 @@
 install -d 0755 %{buildroot}/%{_sbindir}
 install -d 0755 %{buildroot}/%{_mandir}/man8
 install -d 0755 %{buildroot}/%{_initrddir}
+install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name}
 
 install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf
 install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones
@@ -57,12 +57,13 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
+%attr(0700,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /var/run/%{name}.pid ]; then
+if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
 	/sbin/service %{name} stop
 fi
 # "Everyone is doing it, so why can't we?" 
@@ -72,7 +73,7 @@
 # do not activate daemon upon request. Fedora Extra policy
 
 %preun
-if [ -f /var/run/%{name}.pid ]
+if [ -f /%{_localstatedir}/run/%{name}/%{name}.pid ]
 then
         /sbin/service %{name} stop > /dev/null 2>&1
 fi
@@ -89,7 +90,14 @@
 fi
 
 %changelog
-* Mon Dec 12 2005 Paul Wouters  - 2.3.3
+* Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
+- Moved pid file to /var/run/nsd/nsd.pid.
+- Use %{_localstatedir} instead of "/var"
+
+* Tue Dec 13 2005 Paul Wouters  - 2.3.3-5
+- Added BuildRequires for openssl-devel, removed Requires for openssl.
+
+* Mon Dec 12 2005 Paul Wouters  - 2.3.3-4
 - upgraded to nsd-2.3.3
 
 * Wed Dec  7 2005 Tom "spot" Callaway  - 2.3.2-2



From fedora-extras-commits at redhat.com  Thu Dec 15 04:53:20 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Wed, 14 Dec 2005 23:53:20 -0500
Subject: rpms/nsd/FC-3 nsd.spec,1.3,1.4
Message-ID: <200512150453.jBF4rpOl003796@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	nsd.spec 
Log Message:
* Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
- Moved pid file to /var/run/nsd/nsd.pid.
- Use %{_localstatedir} instead of "/var"



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsd.spec	13 Dec 2005 14:05:48 -0000	1.3
+++ nsd.spec	15 Dec 2005 04:53:18 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -9,7 +9,6 @@
 Patch0: nsd-2.3.3-checking.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: openssl
 BuildRequires: flex, openssl-devel
 
 %description
@@ -23,7 +22,7 @@
 %patch0 -p1 -b .checking.patch
 
 %configure --enable-bind8-stats --enable-plugins \
-           --enable-mmap --with-pidfile=/var/run/nsd.pid --with-ssl \
+           --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
            --with-user=nsd
 
 %build
@@ -38,6 +37,7 @@
 install -d 0755 %{buildroot}/%{_sbindir}
 install -d 0755 %{buildroot}/%{_mandir}/man8
 install -d 0755 %{buildroot}/%{_initrddir}
+install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name}
 
 install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf
 install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones
@@ -57,12 +57,13 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
+%attr(0700,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /var/run/%{name}.pid ]; then
+if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
 	/sbin/service %{name} stop
 fi
 # "Everyone is doing it, so why can't we?" 
@@ -72,7 +73,7 @@
 # do not activate daemon upon request. Fedora Extra policy
 
 %preun
-if [ -f /var/run/%{name}.pid ]
+if [ -f /%{_localstatedir}/run/%{name}/%{name}.pid ]
 then
         /sbin/service %{name} stop > /dev/null 2>&1
 fi
@@ -89,7 +90,14 @@
 fi
 
 %changelog
-* Mon Dec 12 2005 Paul Wouters  - 2.3.3
+* Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
+- Moved pid file to /var/run/nsd/nsd.pid.
+- Use %{_localstatedir} instead of "/var"
+
+* Tue Dec 13 2005 Paul Wouters  - 2.3.3-5
+- Added BuildRequires for openssl-devel, removed Requires for openssl.
+
+* Mon Dec 12 2005 Paul Wouters  - 2.3.3-4
 - upgraded to nsd-2.3.3
 
 * Wed Dec  7 2005 Tom "spot" Callaway  - 2.3.2-2



From fedora-extras-commits at redhat.com  Thu Dec 15 04:57:06 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 14 Dec 2005 23:57:06 -0500
Subject: rpms/tcldom - New directory
Message-ID: <200512150457.jBF4v6gg004009@cvs-int.fedora.redhat.com>

Author: wart

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

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




From fedora-extras-commits at redhat.com  Thu Dec 15 04:57:11 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 14 Dec 2005 23:57:11 -0500
Subject: rpms/tcldom/devel - New directory
Message-ID: <200512150457.jBF4vBoe004025@cvs-int.fedora.redhat.com>

Author: wart

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

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




From fedora-extras-commits at redhat.com  Thu Dec 15 04:57:23 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 14 Dec 2005 23:57:23 -0500
Subject: rpms/tcldom Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512150457.jBF4vNFA004060@cvs-int.fedora.redhat.com>

Author: wart

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 15 04:57:28 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 14 Dec 2005 23:57:28 -0500
Subject: rpms/tcldom/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512150457.jBF4vSw3004081@cvs-int.fedora.redhat.com>

Author: wart

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

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


--- NEW 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 Dec 15 04:57:56 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 14 Dec 2005 23:57:56 -0500
Subject: rpms/tcldom import.log,1.1,1.2
Message-ID: <200512150458.jBF4wQjk004170@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	import.log 
Log Message:
auto-import tcldom-3.1-2 on branch devel from tcldom-3.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tcldom/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 04:57:20 -0000	1.1
+++ import.log	15 Dec 2005 04:57:54 -0000	1.2
@@ -0,0 +1 @@
+tcldom-3_1-2:HEAD:tcldom-3.1-2.src.rpm:1134622670



From fedora-extras-commits at redhat.com  Thu Dec 15 04:58:02 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 14 Dec 2005 23:58:02 -0500
Subject: rpms/tcldom/devel tcldom.patch, NONE, 1.1 tcldom.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512150458.jBF4w2bX004163@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	.cvsignore sources 
Added Files:
	tcldom.patch tcldom.spec 
Log Message:
auto-import tcldom-3.1-2 on branch devel from tcldom-3.1-2.src.rpm

tcldom.patch:

--- NEW FILE tcldom.patch ---
diff -Naur --exclude '*.swp' tcldom-3.1/library/dom.tcl tcldom-3.1.new/library/dom.tcl
--- tcldom-3.1/library/dom.tcl	2004-02-25 12:10:28.000000000 -0800
+++ tcldom-3.1.new/library/dom.tcl	2005-12-13 14:57:29.000000000 -0800
@@ -15,9 +15,9 @@
 
 # We need the xml package, so that we get Name defined
 
-package require xml 3.0
+package require xml 3.1
 
-package provide dom::tcl 3.0
+package provide dom::tcl 3.1
 
 # Define generic constants
 
diff -Naur --exclude '*.swp' tcldom-3.1/library/xmlswitch.tcl tcldom-3.1.new/library/xmlswitch.tcl
--- tcldom-3.1/library/xmlswitch.tcl	2003-12-08 20:56:43.000000000 -0800
+++ tcldom-3.1.new/library/xmlswitch.tcl	2005-12-13 14:57:55.000000000 -0800
@@ -17,8 +17,8 @@
 
 # We need the xml, dom and xpath packages
 
-package require xml 3.0
-package require dom 3.0
+package require xml 3.1
+package require dom 3.1
 package require xpath 1.0
 
 namespace eval xmlswitch {
diff -Naur --exclude '*.swp' tcldom-3.1/src/configure tcldom-3.1.new/src/configure
--- tcldom-3.1/src/configure	2003-04-04 14:07:50.000000000 -0800
+++ tcldom-3.1.new/src/configure	2005-11-27 13:50:34.000000000 -0800
@@ -1898,10 +1898,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
diff -Naur --exclude '*.swp' tcldom-3.1/src-libxml2/configure tcldom-3.1.new/src-libxml2/configure
--- tcldom-3.1/src-libxml2/configure	2005-11-03 22:36:59.000000000 -0800
+++ tcldom-3.1.new/src-libxml2/configure	2005-11-27 13:40:37.000000000 -0800
@@ -1539,10 +1539,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
@@ -5330,9 +5332,11 @@
 
 LIBXML2_LIBDIR=""
 for d in 		\
+    $libdir     	\
     $with_xml2lib	\
     $exec_prefix/lib	\
     /usr/lib		\
+    /usr/lib64		\
     /usr/local/lib
 do
     if test -f "$d/libxml2.so" ; then
diff -Naur --exclude '*.swp' tcldom-3.1/src-libxml2/configure.in tcldom-3.1.new/src-libxml2/configure.in
--- tcldom-3.1/src-libxml2/configure.in	2005-05-20 07:07:35.000000000 -0700
+++ tcldom-3.1.new/src-libxml2/configure.in	2005-11-27 13:40:08.000000000 -0800
@@ -233,9 +233,11 @@
 
 LIBXML2_LIBDIR=""
 for d in 		\
+    $libdir      	\
     $with_xml2lib	\
     $exec_prefix/lib	\
     /usr/lib		\
+    /usr/lib64		\
     /usr/local/lib
 do
     if test -f "$d/libxml2.so" ; then
diff -Naur --exclude '*.swp' tcldom-3.1/tclconfig/tcl.m4 tcldom-3.1.new/tclconfig/tcl.m4
--- tcldom-3.1/tclconfig/tcl.m4	2003-12-03 12:18:44.000000000 -0800
+++ tcldom-3.1.new/tclconfig/tcl.m4	2005-11-27 13:37:00.000000000 -0800
@@ -73,10 +73,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


--- NEW FILE tcldom.spec ---
Summary: TclDOM is a package that provides a DOM binding for the Tcl scripting language
Name: tcldom
Version: 3.1
Release: 2%{?dist}
License: BSD
Group: Development/Libraries
URL:	http://tclxml.sourceforge.net/
Source: http://dl.sf.net/tclxml/tcldom-3.1.tar.gz
Patch0: tcldom.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcl tcl-devel libxml2-devel tclxml-devel
Requires: tcl tclxml tcllib libxml2

%description
This package provides a DOM binding for Tcl.  It provides one of the following
implementations:
    *     A Tcl-only implementation (slow, but no compilation required),
    *     A wrapper for the Gnome libxml2 library [http://xmlsoft.org/]
          (also fast and compatiable with TclXSLT/libxslt
          [http://tclxml.sourceforge.net/tclxslt.html]).

%package libxml2
Summary: The Tcl dom parser built with the libxml2 xml parser
Group: Development/Libraries
Requires: tcldom = %{version} tclxml-libxml2
%description libxml2
This package provides an optimized Tcl dom parser built with the libxml2
xml parser.

%package devel
Summary: The Tcl dom parser development files
Group: Development/Libraries
Requires: tcldom = %{version} tclxml-devel
%description devel
Development headers and libraries needed to link new applications against
tcldom.

%prep
%setup -q
%patch0 -p1
%{__sed} -i 's/\r//' examples/tkxmllint.tcl

%build
cd src-libxml2
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
# We have to hand-install the base Tcl files since the configure script
# doesn't take care of that.
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}
install -m 0644 library/*.tcl $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}
sed -e 's/@VERSION@/%{version}/' < library/pkgIndex.tcl.in > $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/pkgIndex.tcl

cd src-libxml2
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_datadir}/%{name}%{version}
%doc ChangeLog README MANIFEST RELNOTES LICENSE
%doc docs/* examples/*

%files libxml2
%defattr(-,root,root)
%dir %{_libdir}/%{name}_libxml2%{version}
%{_libdir}/%{name}_libxml2%{version}/*.tcl
%{_libdir}/%{name}_libxml2%{version}/*.so

%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/%{name}libxml2Config.sh
%{_libdir}/%{name}_libxml2%{version}/*.a

%changelog
* Tue Dec 13 2005 Wart  - 3.1-2
- Update patch to fix version numbers that weren't updated upstream
* Sun Nov 27 2005 Wart  - 3.1-1
- Update to new upstream sources.
* Sat Nov 26 2005 Wart  - 3.0-2
- Minor spec file changes to remove rpmlint warnings
* Fri Jun 17 2005 Wart  - 3.0-1
- New spec file to conform to Fedora Core 4 standards.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcldom/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 04:57:26 -0000	1.1
+++ .cvsignore	15 Dec 2005 04:58:00 -0000	1.2
@@ -0,0 +1 @@
+tcldom-3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcldom/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 04:57:26 -0000	1.1
+++ sources	15 Dec 2005 04:58:00 -0000	1.2
@@ -0,0 +1 @@
+b5af0e29e5cf2109d1f1a9b1a6ec2d81  tcldom-3.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 05:16:10 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 15 Dec 2005 00:16:10 -0500
Subject: rpms/munin/devel munin.spec,1.2,1.3
Message-ID: <200512150516.jBF5GfNT005885@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	munin.spec 
Log Message:
Fixed ownership for /var/lib/munin in node subpackage



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- munin.spec	14 Dec 2005 19:27:27 -0000	1.2
+++ munin.spec	15 Dec 2005 05:16:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -211,7 +211,7 @@
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
 %dir /etc/munin
-%dir /var/lib/munin
+%attr(-, munin, munin) %dir /var/lib/munin
 %dir %attr(-, munin, munin) /var/lib/munin/plugin-state
 %{_datadir}/munin/plugins/*
 %doc %{_docdir}/%{name}-%{version}/COPYING
@@ -223,6 +223,9 @@
 
 %changelog
 * Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
+- Fixed ownership for /var/lib/munin in node subpackage
+
+* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
 - Fixed libdir messup to allow builds on x86_64
 
 * Mon Dec 12 2005 Kevin Fenzi  - 1.2.4-2



From fedora-extras-commits at redhat.com  Thu Dec 15 05:19:46 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 15 Dec 2005 00:19:46 -0500
Subject: rpms/munin/FC-4 munin.spec,1.2,1.3
Message-ID: <200512150520.jBF5KGOt005955@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	munin.spec 
Log Message:
Fixed ownership for /var/lib/munin in node subpackage



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-4/munin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- munin.spec	14 Dec 2005 19:26:07 -0000	1.2
+++ munin.spec	15 Dec 2005 05:19:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -211,7 +211,7 @@
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
 %dir /etc/munin
-%dir /var/lib/munin
+%attr(-, munin, munin) %dir /var/lib/munin
 %dir %attr(-, munin, munin) /var/lib/munin/plugin-state
 %{_datadir}/munin/plugins/*
 %doc %{_docdir}/%{name}-%{version}/COPYING
@@ -222,6 +222,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-4
+- Fixed ownership for /var/lib/munin in node subpackage
+
 * Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
 - Fixed libdir messup to allow builds on x86_64
 



From fedora-extras-commits at redhat.com  Thu Dec 15 05:22:08 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 15 Dec 2005 00:22:08 -0500
Subject: rpms/munin/FC-3 munin.spec,1.2,1.3
Message-ID: <200512150522.jBF5MdId006022@cvs-int.fedora.redhat.com>

Author: kevin

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

Modified Files:
	munin.spec 
Log Message:
Fixed ownership for /var/lib/munin in node subpackage



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-3/munin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- munin.spec	14 Dec 2005 19:23:14 -0000	1.2
+++ munin.spec	15 Dec 2005 05:22:06 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -211,7 +211,7 @@
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
 %dir /etc/munin
-%dir /var/lib/munin
+%attr(-, munin, munin) %dir /var/lib/munin
 %dir %attr(-, munin, munin) /var/lib/munin/plugin-state
 %{_datadir}/munin/plugins/*
 %doc %{_docdir}/%{name}-%{version}/COPYING
@@ -222,6 +222,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-4
+- Fixed ownership for /var/lib/munin in node subpackage
+
 * Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
 - Fixed libdir messup to allow builds on x86_64
 



From fedora-extras-commits at redhat.com  Thu Dec 15 05:31:52 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 15 Dec 2005 00:31:52 -0500
Subject: owners owners.list,1.452,1.453
Message-ID: <200512150532.jBF5WMTM006100@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	owners.list 
Log Message:
Added entry for tcldom




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- owners.list	14 Dec 2005 22:30:00 -0000	1.452
+++ owners.list	15 Dec 2005 05:31:50 -0000	1.453
@@ -1133,6 +1133,7 @@
 Fedora Extras|taarich|Display Hebrew date|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 15 06:45:17 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 15 Dec 2005 01:45:17 -0500
Subject: rpms/kawa/devel kawa.spec,1.2,1.3
Message-ID: <200512150645.jBF6jlVc008126@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	kawa.spec 
Log Message:
Increment revision.  Build with gcc 4.1



Index: kawa.spec
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/kawa.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kawa.spec	8 Oct 2005 23:18:15 -0000	1.2
+++ kawa.spec	15 Dec 2005 06:45:14 -0000	1.3
@@ -5,14 +5,14 @@
 %define nversion 1.8
 %define dversion 1.8
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://www.gnu.org/software/kawa/
 Source0: %{name}-%{nversion}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{nversion}-%{release}-root
-BuildPrereq: gcc-java >= 3.3.0
-Requires: libgcj >= 3.3.0
+BuildPrereq: gcc-java >= 4.1.0
+Requires: libgcj >= 4.1.0
 BuildRequires:    texinfo
 BuildRequires:    readline-devel
 BuildRequires:    ant >= 1.6
@@ -84,6 +84,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Nov 14 2005 Anthony Green  - 1:1.8-2
+- Rebuild with GCC 4.1.
+
 * Sat Oct  8 2005 Anthony Green  - 1:1.8-1
 - Upgrade to 1.8.
 - Add qexo man page.



From fedora-extras-commits at redhat.com  Thu Dec 15 06:50:08 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 15 Dec 2005 01:50:08 -0500
Subject: rpms/kawa/devel kawa.spec,1.3,1.4
Message-ID: <200512150650.jBF6oc09008210@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	kawa.spec 
Log Message:
Rev 3



Index: kawa.spec
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/kawa.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kawa.spec	15 Dec 2005 06:45:14 -0000	1.3
+++ kawa.spec	15 Dec 2005 06:50:06 -0000	1.4
@@ -5,7 +5,7 @@
 %define nversion 1.8
 %define dversion 1.8
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://www.gnu.org/software/kawa/
@@ -84,7 +84,7 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
-* Wed Nov 14 2005 Anthony Green  - 1:1.8-2
+* Wed Nov 14 2005 Anthony Green  - 1:1.8-3
 - Rebuild with GCC 4.1.
 
 * Sat Oct  8 2005 Anthony Green  - 1:1.8-1



From fedora-extras-commits at redhat.com  Thu Dec 15 06:54:38 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 15 Dec 2005 01:54:38 -0500
Subject: rpms/jogl/devel jogl.spec,1.12,1.13
Message-ID: <200512150655.jBF6t8C9008293@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	jogl.spec 
Log Message:
Increment revision.  Build with GCC 4.1.



Index: jogl.spec
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jogl.spec	19 Nov 2005 23:42:50 -0000	1.12
+++ jogl.spec	15 Dec 2005 06:54:36 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           jogl
 Version:        1.1.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Java bindings for the OpenGL API
 
 Group:          System Environment/Libraries
@@ -107,6 +107,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sat Dec 14 2005 Anthony Green  - 0:1.1.1-12
+- Build with GCC 4.1.
+
 * Sat Nov 19 2005 Anthony Green  - 0:1.1.1-11
 - Add Patch3 for X change.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 07:43:55 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 15 Dec 2005 02:43:55 -0500
Subject: rpms/mlmmj/devel mlmmj.spec,1.16,1.17
Message-ID: <200512150744.jBF7iQ6c010173@cvs-int.fedora.redhat.com>

Author: mfleming

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

Modified Files:
	mlmmj.spec 
Log Message:
Fix the broken Source: line in the spec, entirely my fault.



Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mlmmj.spec	15 Dec 2005 00:14:58 -0000	1.16
+++ mlmmj.spec	15 Dec 2005 07:43:52 -0000	1.17
@@ -3,10 +3,10 @@
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
 Version: 1.2.9
-Release: 2%{?dist}
+Release: 2.1%{?dist}
 License: MIT
 Group: Applications/Internet
-Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}-RC1.tar.bz2
+Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: smtpdaemon
 URL: http://mlmmj.mmj.dk/
@@ -48,7 +48,7 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
-* Thu Dec 15 2005 Michael Fleming  1.2.9-2
+* Thu Dec 15 2005 Michael Fleming  1.2.9-2.1
 - New upstream stable release
 - Fix Release tag
 



From fedora-extras-commits at redhat.com  Thu Dec 15 07:47:44 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 15 Dec 2005 02:47:44 -0500
Subject: rpms/sobby/FC-3 .cvsignore, 1.2, 1.3 sobby.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200512150748.jBF7mEdX010322@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore sobby.spec sources 
Log Message:
* Thu Dec 15 2005 Luke Macken  - 0.2.0-1
- Regress package to 0.2.0 for FC-{3,4}




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2005 15:20:52 -0000	1.2
+++ .cvsignore	15 Dec 2005 07:47:42 -0000	1.3
@@ -1 +1 @@
-sobby-0.3.0rc3.tar.gz
+sobby-0.2.0.tar.gz


Index: sobby.spec
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-3/sobby.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sobby.spec	12 Dec 2005 15:20:52 -0000	1.1
+++ sobby.spec	15 Dec 2005 07:47:42 -0000	1.2
@@ -1,14 +1,12 @@
-%define _rc rc3
-
 Name:           sobby
-Version:        0.3.0
-Release:        1.%{_rc}%{?dist}
+Version:        0.2.0
+Release:        2%{?dist}
 Summary:        Standalone obby server
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gobby.0x539.de
-Source0:        http://releases.0x539.de/sobby/%{name}-%{version}%{_rc}.tar.gz
+Source0:        http://releases.0x539.de/sobby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  obby-devel, glibmm24-devel
@@ -18,7 +16,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{_rc}
+%setup -q
 
 
 %build
@@ -42,5 +40,8 @@
 
 
 %changelog
+* Thu Dec 15 2005 Luke Macken  - 0.2.0-2
+- Regress package to 0.2.0 for FC-{3,4}
+
 * Wed Dec 07 2005 Luke Macken  - 0.3.0-1.rc3
 - Packaged for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2005 15:20:52 -0000	1.2
+++ sources	15 Dec 2005 07:47:42 -0000	1.3
@@ -1 +1 @@
-8c3538992f83527cfb9f0a42a9e2ed87  sobby-0.3.0rc3.tar.gz
+68e740d9ad051e7939de29fa2c28da56  sobby-0.2.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 07:51:55 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 15 Dec 2005 02:51:55 -0500
Subject: rpms/mlmmj/FC-3 .cvsignore, 1.5, 1.6 mlmmj.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <200512150752.jBF7qPZN010436@cvs-int.fedora.redhat.com>

Author: mfleming

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

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Thu Dec 15 2005 Michael Fleming  1.2.9-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jun 2005 04:06:00 -0000	1.5
+++ .cvsignore	15 Dec 2005 07:51:53 -0000	1.6
@@ -1 +1 @@
-mlmmj-1.2.8.tar.bz2
+mlmmj-1.2.9.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/mlmmj.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mlmmj.spec	21 Jun 2005 04:06:00 -0000	1.12
+++ mlmmj.spec	15 Dec 2005 07:51:53 -0000	1.13
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.8
+Version: 1.2.9
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Thu Dec 15 2005 Michael Fleming  1.2.9-1
+- New upstream release
+
 * Tue Jun 21 2005 Michael Fleming  1.2.8-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Jun 2005 04:06:00 -0000	1.5
+++ sources	15 Dec 2005 07:51:53 -0000	1.6
@@ -1 +1 @@
-778a236716df9511670dddfccfa1d257  mlmmj-1.2.8.tar.bz2
+6011ba93fa907289b4ed3d4c3552a90e  mlmmj-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 08:19:09 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 03:19:09 -0500
Subject: rpms/koffice/devel koffice-krita-kisclipboard.patch, NONE,
	1.1 koffice.spec, 1.17, 1.18
Message-ID: <200512150819.jBF8JeTp012160@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	koffice.spec 
Added Files:
	koffice-krita-kisclipboard.patch 
Log Message:
- more krita compile fixes


koffice-krita-kisclipboard.patch:

--- NEW FILE koffice-krita-kisclipboard.patch ---
--- branches/koffice/1.4/koffice/krita/core/kis_clipboard.h	2005/05/27 09:18:23	418647
+++ branches/koffice/1.4/koffice/krita/core/kis_clipboard.h	2005/10/18 12:57:53	471689
@@ -35,7 +35,7 @@
 
 public:
 
-	virtual KisClipboard::~KisClipboard();
+	virtual ~KisClipboard();
 
 	static KisClipboard* instance();


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- koffice.spec	13 Dec 2005 09:55:06 -0000	1.17
+++ koffice.spec	15 Dec 2005 08:19:07 -0000	1.18
@@ -16,7 +16,7 @@
 Patch1:         koffice-CAN-2005-3193.diff
 
 Patch100:       koffice-krita-kisfilter.patch
-
+Patch101:       koffice-krita-kisclipboard.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -198,6 +198,7 @@
 %patch0 -p1
 %patch1
 %patch100
+%patch101 -p4
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -754,7 +755,7 @@
 * Thu Dec 08 2005 Andreas Bierfert 
 1.4.2-3
 - fix CAN-2005-3193
-- add krita compile fix
+- add krita compile fixs
 
 * Thu Nov 10 2005 Andreas Bierfert 
 1.4.2-2



From fedora-extras-commits at redhat.com  Thu Dec 15 09:05:15 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 04:05:15 -0500
Subject: rpms/koffice/devel koffice-kspread.patch, NONE, 1.1 koffice.spec,
	1.18, 1.19
Message-ID: <200512150905.jBF95qEo014256@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	koffice.spec 
Added Files:
	koffice-kspread.patch 
Log Message:
- add kspread compile fixes


koffice-kspread.patch:

--- NEW FILE koffice-kspread.patch ---
--- branches/koffice/1.4/koffice/kspread/kspread_cell.h	2005/05/27 09:18:23	418647
+++ branches/koffice/1.4/koffice/kspread/kspread_cell.h	2005/10/18 15:34:45	471722
@@ -596,7 +596,7 @@
      *
      * @return the cell that decides the format for the cell in question.
      */
-    KSpreadCell *KSpreadCell::ultimateObscuringCell() const;
+    KSpreadCell *ultimateObscuringCell() const;
 
     /**
      * @return the obscuring cell list (might be empty)


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- koffice.spec	15 Dec 2005 08:19:07 -0000	1.18
+++ koffice.spec	15 Dec 2005 09:05:08 -0000	1.19
@@ -17,6 +17,7 @@
 
 Patch100:       koffice-krita-kisfilter.patch
 Patch101:       koffice-krita-kisclipboard.patch
+Patch102:       koffice-kspread.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -199,6 +200,7 @@
 %patch1
 %patch100
 %patch101 -p4
+%patch102 -p4
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -755,7 +757,8 @@
 * Thu Dec 08 2005 Andreas Bierfert 
 1.4.2-3
 - fix CAN-2005-3193
-- add krita compile fixs
+- add krita compile fixes
+- add kspread compile fixes
 
 * Thu Nov 10 2005 Andreas Bierfert 
 1.4.2-2



From fedora-extras-commits at redhat.com  Thu Dec 15 10:04:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 15 Dec 2005 05:04:25 -0500
Subject: rpms/liboil/FC-4 .cvsignore, 1.4, 1.5 liboil.spec, 1.9, 1.10 sources,
	1.4, 1.5
Message-ID: <200512151004.jBFA4taS018540@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore liboil.spec sources 
Log Message:
Update FC-4 branch to 0.3.6 too.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liboil/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 19:06:01 -0000	1.4
+++ .cvsignore	15 Dec 2005 10:04:15 -0000	1.5
@@ -1 +1 @@
-liboil-0.3.5.tar.gz
+liboil-0.3.6.tar.gz


Index: liboil.spec
===================================================================
RCS file: /cvs/extras/rpms/liboil/FC-4/liboil.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- liboil.spec	14 Nov 2005 09:30:23 -0000	1.9
+++ liboil.spec	15 Dec 2005 10:04:16 -0000	1.10
@@ -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
+* 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.
 - Parallel make seems to have worked for 0.3.5 on devel, but just in case...


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liboil/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 19:06:01 -0000	1.4
+++ sources	15 Dec 2005 10:04:16 -0000	1.5
@@ -1 +1 @@
-f365f0a4cc31b2ff029e37deccb09ff6  liboil-0.3.5.tar.gz
+a36b2d9cc71d75d814d7bdca2263290f  liboil-0.3.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 10:13:58 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 05:13:58 -0500
Subject: rpms/WindowMaker/devel WindowMaker.spec,1.14,1.15
Message-ID: <200512151013.jBFADwL9018635@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	WindowMaker.spec 
Log Message:
- finish modular x integration



Index: WindowMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WindowMaker.spec	25 Nov 2005 08:30:18 -0000	1.14
+++ WindowMaker.spec	15 Dec 2005 10:13:44 -0000	1.15
@@ -22,6 +22,8 @@
 BuildRequires:  libXpm-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  automake14 libtool
 
 %package devel
 Summary:	libraries needed for WindowMaker.
@@ -62,7 +64,8 @@
 NLSDIR="%{_datadir}/locale"
 export LINGUAS NLSDIR GNUSTEP_LOCAL_ROOT
 %configure --enable-gnome --enable-kde --enable-usermenu --enable-xinerama \
---enable-fast-install --enable-modelock
+--enable-fast-install --enable-modelock --x-includes=%{_includedir} \
+--x-libraries=%{_libdir}
 
 make %{?_smp_mflags}
 



From fedora-extras-commits at redhat.com  Thu Dec 15 10:16:33 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 05:16:33 -0500
Subject: rpms/koffice/devel koffice-kexi.patch, NONE, 1.1 koffice.spec, 1.19,
	1.20
Message-ID: <200512151017.jBFAH3pa018769@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	koffice.spec 
Added Files:
	koffice-kexi.patch 
Log Message:
- add kexi compile fixes


koffice-kexi.patch:

--- NEW FILE koffice-kexi.patch ---
--- branches/koffice/1.4/koffice/kexi/migration/mysql/mysqlmigrate.h	2005/05/27 09:18:23	418647
+++ branches/koffice/1.4/koffice/kexi/migration/mysql/mysqlmigrate.h	2005/10/18 15:34:45	471722
@@ -60,7 +60,7 @@
 			~MySQLMigrate();
 			//Constructor
 			MySQLMigrate();
-			MySQLMigrate::MySQLMigrate(QObject *parent, const char *name, const QStringList& args = QStringList());
+			MySQLMigrate(QObject *parent, const char *name, const QStringList& args = QStringList());
 			
 			KexiDB::Field::Type type(const QString& table, const MYSQL_FIELD* t);
 			
@@ -69,8 +69,8 @@
 			
 			QStringList examineEnumField(const QString& table,
 			                             const MYSQL_FIELD* fld);
-			void MySQLMigrate::getConstraints(int mysqlConstraints, KexiDB::Field* fld);
-			void MySQLMigrate::getOptions(int flags, KexiDB::Field* fld);
+			void getConstraints(int mysqlConstraints, KexiDB::Field* fld);
+			void getOptions(int flags, KexiDB::Field* fld);
 
 		/*! driver's static version information, it is automatically implemented
 		 in implementation using KEXIDB_DRIVER macro (see driver_p.h) */


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- koffice.spec	15 Dec 2005 09:05:08 -0000	1.19
+++ koffice.spec	15 Dec 2005 10:16:31 -0000	1.20
@@ -18,6 +18,7 @@
 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 ;)
@@ -201,6 +202,7 @@
 %patch100
 %patch101 -p4
 %patch102 -p4
+%patch103 -p4
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -757,8 +759,10 @@
 * Thu Dec 08 2005 Andreas Bierfert 
 1.4.2-3
 - fix CAN-2005-3193
-- add krita compile fixes
-- add kspread compile fixes
+- gcc 4.1.0:
+    - add krita compile fixes
+    - add kspread compile fixes
+    - add kexi compile fixes
 
 * Thu Nov 10 2005 Andreas Bierfert 
 1.4.2-2



From fedora-extras-commits at redhat.com  Thu Dec 15 11:18:16 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 15 Dec 2005 06:18:16 -0500
Subject: rpms/uim/devel uim-init.el, NONE, 1.1 uim.spec, 1.20,
	1.21 uim-0.4.6-dont-require-devel-pkgs.patch, 1.1,
	NONE uim-0.4.6-fix-typo-in-configure.patch, 1.1,
	NONE uim-0.4.6-multilib.patch, 1.1, NONE
Message-ID: <200512151118.jBFBIkVO020690@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	uim.spec 
Added Files:
	uim-init.el 
Removed Files:
	uim-0.4.6-dont-require-devel-pkgs.patch 
	uim-0.4.6-fix-typo-in-configure.patch uim-0.4.6-multilib.patch 
Log Message:
* Thu Dec 15 2005 Akira TAGOH  - 1.0.0-0.1.alpha
- New upstream release.
- added uim-m17n package. (#175600)
- added uim-el package.
- uim-0.4.6-dont-require-devel-pkgs.patch: removed.


--- NEW FILE uim-init.el ---
(require 'uim-leim)

(add-to-list 'load-path "/usr/share/emacs/site-lisp/uim-el")
(setq uim-el-agent "/usr/bin/uim-el-agent")
;(setq uim-candidate-display-inline t)
;(setq default-input-method "japanese-anthy-uim")


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- uim.spec	30 Sep 2005 08:40:52 -0000	1.20
+++ uim.spec	15 Dec 2005 11:18:13 -0000	1.21
@@ -2,23 +2,25 @@
 %define inst_xinput for llcc in %{uim_locale}; do alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim 50 ; done
 %define uninst_xinput for llcc in %{uim_locale}; do alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim ; done
 
-Summary:	A multilingual input method library
 Name:		uim
-Version:	0.4.9.1
-Release:	1%{?dist}
+Version:	1.0.0
+Release:	0.1.alpha%{?dist}
 License:	GPL/BSD
-Group:		System Environment/Libraries
 URL:		http://uim.freedesktop.org/
-Source0:	http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz
-Source1:	xinput.d-uim
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
-BuildRequires:	anthy-devel Canna-devel
+BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
+BuildRequires:	emacs
+Source0:	http://uim.freedesktop.org/release/%{name}-%{version}-alpha.tar.gz
+Source1:	xinput.d-uim
+Source2:	uim-init.el
+
+
+Summary:	A multilingual input method library
+Group:		System Environment/Libraries
 Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
 Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
 
-Patch2:		uim-0.4.6-dont-require-devel-pkgs.patch
-
 %package	devel
 Summary:	Development files for the Uim library
 Group:		Development/Libraries
@@ -43,6 +45,17 @@
 Group:		User Interface/Desktops
 Requires:	uim = %{version}-%{release}
 
+%package	el
+Summary:	Emacs support for Uim
+Group:		System Environment/Libraries
+Requires:	%{name}-el-common = %{version}
+Requires:	emacs-common
+
+%package	el-common
+Summary:	Common package for Emacsen support for Uim
+Group:		System Environment/Libraries
+Requires:	uim = %{version}-%{release}
+
 %package	anthy
 Summary:	Anthy support for Uim
 Group:		System Environment/Libraries
@@ -67,6 +80,13 @@
 Requires(post):	gtk2
 Requires(postun): gtk2
 
+%package	m17n
+Summary:	m17n-lib support for Uim
+Group:		System Environment/Libraries
+Requires:	uim = %{version}-%{release}
+Requires(post):	gtk2
+Requires(postun): gtk2
+
 %description
 Uim is a multilingual input method library. Uim aims to
 provide secure and useful input methods for all
@@ -110,6 +130,12 @@
 
 This package provides the Qt IM module and helper programs.
 
+%description	el
+This package provides Emacs support.
+
+%description	el-common
+This package provides an utility to use Emacsen support for Uim.
+
 %description	anthy
 This package provides support for Anthy, a Japanese input method.
 
@@ -119,19 +145,18 @@
 %description	skk
 This package provides support for SKK, a Japanese input method.
 
+%description	m17n
+This package provides support for m17n-lib, which allows input of
+many languages using the input table map from m17n-db.
+
 %define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules )
 
 %prep
-%setup -q
-%patch2 -p1 -b .dlopen
+%setup -q -n %{name}-%{version}-alpha
 
-# patch creation:
-libtoolize --force && aclocal-1.9 -I m4 && autoheader && automake-1.9 --foreign && autoconf
-# touch uim/config.h.in, otherwise autoheader will run again
-touch uim/config.h.in
 
 %build
-%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule --without-scim
+%configure --with-canna --with-anthy --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
 make
 
 %install
@@ -141,10 +166,13 @@
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim
+install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/
 
 %find_lang %{name}
+%find_lang uim-chardict-qt
 
-find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk)" > scm.list
+find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|m17n)" > scm.list
 cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
 
 # compress large doc
@@ -210,21 +238,29 @@
 	%{gtk_im_update}
 fi
 
+%post	m17n
+umask 022
+%{gtk_im_update}
+
+%postun m17n
+umask 022
+if [ $1 = 0 ]; then
+	%{gtk_im_update}
+fi
+
 %files -f %{name}.lang
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog* NEWS README
-%lang(ja) %doc README.ja
 %{_bindir}/uim-fep*
-%{_bindir}/uim-helper-server
 %{_bindir}/uim-module-manager
 %{_bindir}/uim-sh
 %{_bindir}/uim-xim
 %{_libdir}/lib*.so.*
 %dir %{_datadir}/uim
-%{_datadir}/uim/tables
 %{_sysconfdir}/X11/xinit/xinput.d
 %dir %{_libdir}/uim
 %{_libdir}/uim/plugin/libuim-custom-enabler.so
+%{_libexecdir}/uim-helper-server
 %{_datadir}/uim/pixmaps
 %{_datadir}/uim/helperdata
 %{_mandir}/man1/uim-xim.1*
@@ -241,8 +277,6 @@
 
 %files	gtk2
 %defattr (-, root, root)
-%{_bindir}/uim-candwin-gtk
-%{_bindir}/uim-helper-candwin-gtk
 %{_bindir}/uim-helper-toolbar-gtk
 %{_bindir}/uim-helper-toolbar-gtk-systray
 %{_bindir}/uim-pref-gtk
@@ -251,6 +285,7 @@
 %{_bindir}/uim-im-switcher-gtk
 %{_bindir}/uim-input-pad-ja
 %{_libdir}/gtk-2.0/2.*/immodules
+%{_libexecdir}/uim-candwin-gtk
 %exclude %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a
 %dir %{_datadir}/uim
 %{_datadir}/applications/uim.desktop
@@ -261,16 +296,27 @@
 %{_libexecdir}/uim-toolbar-applet
 %{_libdir}/bonobo/servers/GNOME_UimApplet.server
 
-%files	qt
+%files	-f uim-chardict-qt.lang qt
 %defattr (-, root, root)
-%{_bindir}/uim-candwin-qt
 %{_bindir}/uim-chardict-qt
 %{_bindir}/uim-im-switcher-qt
 %{_bindir}/uim-pref-qt
 %{_bindir}/uim-toolbar-qt
 %{_libdir}/qt-3.*/plugins/inputmethods
+%{_libexecdir}/uim-candwin-qt
 %exclude %{_libdir}/qt-3.*/plugins/inputmethods/lib*.*a
 
+%files	el
+%defattr (-, root, root)
+%doc emacs/COPYING emacs/README
+%lang(ja) %doc emacs/README.ja
+%{_datadir}/emacs/site-lisp/uim-el
+%{_datadir}/emacs/site-lisp/site-start.d/uim-init.el
+
+%files el-common
+%defattr (-, root, root)
+%{_bindir}/uim-el-agent
+
 %files	anthy
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-anthy.so
@@ -289,7 +335,19 @@
 %dir %{_datadir}/uim
 %{_datadir}/uim/skk*.scm
 
+%files m17n
+%defattr (-, root, root)
+%{_libdir}/uim/plugin/libuim-m17nlib.so
+%dir %{_datadir}/uim
+%{_datadir}/uim/m17nlib.scm
+
 %changelog
+* Thu Dec 15 2005 Akira TAGOH  - 1.0.0-0.1.alpha
+- New upstream release.
+- added uim-m17n package. (#175600)
+- added uim-el package.
+- uim-0.4.6-dont-require-devel-pkgs.patch: removed.
+
 * Fri Sep 30 2005 Akira TAGOH  - 0.4.9.1-1
 - New upstream release.
 


--- uim-0.4.6-dont-require-devel-pkgs.patch DELETED ---


--- uim-0.4.6-fix-typo-in-configure.patch DELETED ---


--- uim-0.4.6-multilib.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec 15 11:32:12 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 15 Dec 2005 06:32:12 -0500
Subject: rpms/uim/devel .cvsignore,1.10,1.11 sources,1.9,1.10
Message-ID: <200512151132.jBFBWha7020801@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Sep 2005 08:40:52 -0000	1.10
+++ .cvsignore	15 Dec 2005 11:32:10 -0000	1.11
@@ -9,3 +9,4 @@
 uim-0.4.7.1.tar.gz
 uim-0.4.8.tar.gz
 uim-0.4.9.1.tar.gz
+uim-1.0.0-alpha.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2005 08:40:52 -0000	1.9
+++ sources	15 Dec 2005 11:32:10 -0000	1.10
@@ -1 +1 @@
-0e2625cc926917d7864c4d0c341c535a  uim-0.4.9.1.tar.gz
+9c277a46e16a0bf90d72aabbf8094cfc  uim-1.0.0-alpha.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 12:07:10 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 15 Dec 2005 07:07:10 -0500
Subject: rpms/cernlib/FC-3 115-rsrtnt64-goto-outer-block.dpatch, NONE,
	1.1 116-fix-fconc64-spaghetti-code.dpatch, NONE,
	1.1 117-fix-optimizer-bug-in-gphot.dpatch, NONE,
	1.1 211-fix-comis-on-amd64.dpatch, NONE,
	1.1 211-fix-comis-on-ia64.dpatch, NONE,
	1.1 cernlib_2005.05.09.dfsg-3.diff, NONE,
	1.1 304-update-Imake-config-files.dpatch, 1.1,
	1.2 307-use-canonical-cfortran.dpatch, 1.1,
	1.2 315-fixes-for-MacOSX.dpatch, 1.2,
	1.3 701-patch-hbook-comis-Imakefiles.dpatch, 1.1,
	1.2 cernlib.m4, 1.1, 1.2 cernlib.spec, 1.11, 1.12 paw.README,
	1.2, 1.3 211-fix-comis-on-64-bit-arches.dpatch, 1.1,
	NONE cernlib-rsrtnt64_goto_outer_block.diff, 1.1,
	NONE cernlib_2005.05.09.dfsg-2.diff, 1.1, NONE
Message-ID: <200512151207.jBFC7AjL022505@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	304-update-Imake-config-files.dpatch 
	307-use-canonical-cfortran.dpatch 315-fixes-for-MacOSX.dpatch 
	701-patch-hbook-comis-Imakefiles.dpatch cernlib.m4 
	cernlib.spec paw.README 
Added Files:
	115-rsrtnt64-goto-outer-block.dpatch 
	116-fix-fconc64-spaghetti-code.dpatch 
	117-fix-optimizer-bug-in-gphot.dpatch 
	211-fix-comis-on-amd64.dpatch 211-fix-comis-on-ia64.dpatch 
	cernlib_2005.05.09.dfsg-3.diff 
Removed Files:
	211-fix-comis-on-64-bit-arches.dpatch 
	cernlib-rsrtnt64_goto_outer_block.diff 
	cernlib_2005.05.09.dfsg-2.diff 
Log Message:
- use new debian patchset




--- NEW FILE 115-rsrtnt64-goto-outer-block.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 115-rsrtnt64-goto-outer-block.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch from Patrice Dumas  to fix spaghetti code in
## DP: rsrtnt64.F that breaks linking step on Itanium.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/b/rsrtnt64.F cernlib-2005.05.09.dfsg/src/mathlib/gen/b/rsrtnt64.F
--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/b/rsrtnt64.F	1996-04-01 10:01:51.000000000 -0500
+++ cernlib-2005.05.09.dfsg/src/mathlib/gen/b/rsrtnt64.F	2005-12-06 11:22:08.500724891 -0500
@@ -117,8 +117,15 @@
         ENDIF
        ELSE
         IF(N .EQ. 1) THEN
-         ASSIGN 11 TO JMP1
-         GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    11    IF(K .EQ. 0) THEN
           H=H
          ELSEIF(K .EQ. 1) THEN
@@ -174,14 +181,28 @@
            H=2*((H1+B*U)/RT(U)-(H1+B*V)/RT(V))/DELTA
            LB1=11
           ELSEIF(K .EQ. 2) THEN
-           ASSIGN 12 TO JMP1
-           GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    12      H1=DELTA-B**2
            H2=2*A*B
            H=(((H1*U-H2)/RT(U)-(H1*V-H2)/RT(V))/DELTA+H)/C
           ELSEIF(K .EQ. 3) THEN
-           ASSIGN 13 TO JMP1
-           GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    13      H1=C*DELTA
            G1=A*C
            G2=3*B**2
@@ -217,8 +238,32 @@
         ENDIF
        ELSE
         IF(N .EQ. 1) THEN
-         ASSIGN 21 TO JMP2
-         GO TO 20
+      IF(C .EQ. 0) THEN
+       IF(B .EQ. 0) THEN
+        H=LOG(ABS(V/U))/SQRT(A)
+       ELSE
+        IF(A .LT. 0) THEN
+         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
+        ELSE
+         WA=SQRT(A)
+         WU=SQRT(A+B*U)
+         WV=SQRT(A+B*V)
+         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
+        ENDIF
+       ENDIF
+      ELSE
+       A2=2*A
+       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
+        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
+     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
+       ELSEIF(DELTA .EQ. 0) THEN
+        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
+        IF(U*V .GT. 0) H=SIGN(H,U)
+       ELSE
+        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
+        IF(U .LT. 0 .AND. V .LT. 0) H=-H
+       ENDIF
+      ENDIF
    21    IF(K .EQ. -1) THEN
           H=H
          ELSEIF(K .EQ. -2) THEN
@@ -257,8 +302,32 @@
            IF(U. LT. -X0) H=-H
           ENDIF
          ELSE
-          ASSIGN 22 TO JMP2
-          GO TO 20
+      IF(C .EQ. 0) THEN
+       IF(B .EQ. 0) THEN
+        H=LOG(ABS(V/U))/SQRT(A)
+       ELSE
+        IF(A .LT. 0) THEN
+         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
+        ELSE
+         WA=SQRT(A)
+         WU=SQRT(A+B*U)
+         WV=SQRT(A+B*V)
+         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
+        ENDIF
+       ENDIF
+      ELSE
+       A2=2*A
+       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
+        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
+     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
+       ELSEIF(DELTA .EQ. 0) THEN
+        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
+        IF(U*V .GT. 0) H=SIGN(H,U)
+       ELSE
+        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
+        IF(U .LT. 0 .AND. V .LT. 0) H=-H
+       ENDIF
+      ENDIF
    22     IF(K .EQ. -1) THEN
            H1=B*C
            H2=B**2-2*A*C
@@ -287,46 +356,7 @@
         ENDIF
        ENDIF
       ENDIF
-      GO TO 9
-
-   10 C2=2*C
-      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
-       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
-     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
-      ELSEIF(DELTA .EQ. 0) THEN
-       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
-      ELSE
-       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
-      ENDIF
-      GO TO JMP1, (11,12,13)
 
-   20 IF(C .EQ. 0) THEN
-       IF(B .EQ. 0) THEN
-        H=LOG(ABS(V/U))/SQRT(A)
-       ELSE
-        IF(A .LT. 0) THEN
-         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
-        ELSE
-         WA=SQRT(A)
-         WU=SQRT(A+B*U)
-         WV=SQRT(A+B*V)
-         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
-        ENDIF
-       ENDIF
-      ELSE
-       A2=2*A
-       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
-        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
-     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
-       ELSEIF(DELTA .EQ. 0) THEN
-        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
-        IF(U*V .GT. 0) H=SIGN(H,U)
-       ELSE
-        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
-        IF(U .LT. 0 .AND. V .LT. 0) H=-H
-       ENDIF
-      ENDIF
-      GO TO JMP2, (21,22)
 
     9 RES=SIGN(R1,V1-U1)*H
       LRL=LLL


--- NEW FILE 116-fix-fconc64-spaghetti-code.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 116-fix-fconc64-spaghetti-code.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Work around FTBFS on ia64 with recent binutils, apparently caused
## DP: by assignment of goto labels in this file.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/c/fconc64.F cernlib-2005.05.09.dfsg/src/mathlib/gen/c/fconc64.F
--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/c/fconc64.F	1996-04-01 10:02:04.000000000 -0500
+++ cernlib-2005.05.09.dfsg/src/mathlib/gen/c/fconc64.F	2005-12-12 12:58:23.885981128 -0500
@@ -190,15 +190,167 @@
       A=HF*((HF-FM)-TI)
       B=HF*((HF-FM)+TI)
       C=HF
-      ASSIGN 1 TO JP
-      GO TO 20
+   20 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 21 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 1
+       DO 22 J = 1,3
+       V(J-1)=V(J)
+   22  U(J-1)=U(J)
+   21  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 23 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 1
+   23  CONTINUE
+      END IF
+      GO TO 24
     1 R1=R
       R1=R1/ABS(CGM(A+HF))**2
       A=HF*((TH-FM)-TI)
       B=HF*((TH-FM)+TI)
       C=TH
-      ASSIGN 2 TO JP
-      GO TO 20
+  120 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 121 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 2
+       DO 122 J = 1,3
+       V(J-1)=V(J)
+  122  U(J-1)=U(J)
+  121  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 123 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 2
+  123  CONTINUE
+      END IF
+      GO TO 24
     2 R2=R
       FC=RPI*(R1-2*X*R2/ABS(CGM(A-HF))**2)
       IF(LM1) FC=2*FC/SQRT(1-X1)
@@ -209,8 +361,84 @@
       A=(HF+FM)-TI
       B=(HF+FM)+TI
       C=FM+1
-      ASSIGN 3 TO JP
-      GO TO 20
+  220 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 221 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 3
+       DO 222 J = 1,3
+       V(J-1)=V(J)
+  222  U(J-1)=U(J)
+  221  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 223 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 3
+  223  CONTINUE
+      END IF
+      GO TO 24
     3 FC=R
       IF(LM1) FC=SIGN(HF,1-X)*(TAU**2+HF**2)*SQRT(ABS(X**2-1))*FC
       GO TO 99
@@ -220,15 +448,7 @@
       A=HF*((HF-FM)-TI)
       B=HF*((TH-FM)-TI)
       C=1-TI
-      ASSIGN 4 TO JP
-      GO TO 20
-    4 R1=EXP((TI-HF)*LOG(X+X)+CLG(1+TI)-CLG((TH-FM)+TI))*
-     1        R*((HF-FM)+TI)/TI
-      FC=RPW*R1
-      IF(LM1) FC=FC/SQRT(1-X1)
-      GO TO 99
-
-   20 IF(LTA) THEN
+  320 IF(LTA) THEN
        Y=-X1
        Y2=Y**2
        Y3=Y*Y2
@@ -257,7 +477,7 @@
        U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
 
        R=1
-       DO 21 N = 3,NMAX
+       DO 321 N = 3,NMAX
        FN=N
        RR=R
        H(1)=FN-1
@@ -289,23 +509,29 @@
        V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
        U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
        R=U(3)/V(3)
-       IF(ABS(R-RR) .LT. EPS) GO TO JP, (1,2,3,4)
-       DO 22 J = 1,3
+       IF(ABS(R-RR) .LT. EPS) GO TO 4
+       DO 322 J = 1,3
        V(J-1)=V(J)
-   22  U(J-1)=U(J)
-   21  CONTINUE
+  322  U(J-1)=U(J)
+  321  CONTINUE
       ELSE
        W(1)=X1*A*B/C
        R=1+W(1)
-       DO 23 N = 1,NMAX
+       DO 323 N = 1,NMAX
        FN=N
        RR=R
        W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
        R=R+W(1)
-       IF(ABS(R-RR) .LT. EPS) GO TO JP, (1,2,3,4)
-   23  CONTINUE
+       IF(ABS(R-RR) .LT. EPS) GO TO 4
+  323  CONTINUE
       END IF
-      FC=0
+      GO TO 24
+    4 R1=EXP((TI-HF)*LOG(X+X)+CLG(1+TI)-CLG((TH-FM)+TI))*
+     1        R*((HF-FM)+TI)/TI
+      FC=RPW*R1
+      IF(LM1) FC=FC/SQRT(1-X1)
+      GO TO 99
+   24 FC=0
       WRITE(ERRTXT,102) X
       CALL MTLPRT(NAME,'C331.2',ERRTXT)
 #if defined(CERNLIB_DOUBLE)


--- NEW FILE 117-fix-optimizer-bug-in-gphot.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 117-fix-optimizer-bug-in-gphot.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch by Harald Vogt  to work around compiler
## DP: optimization problems in src/geant321/gphys/gphot.F.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gphys/gphot.F cernlib-2005.05.09.dfsg/src/geant321/gphys/gphot.F
--- cernlib-2005.05.09.dfsg~/src/geant321/gphys/gphot.F	1995-10-24 06:21:29.000000000 -0400
+++ cernlib-2005.05.09.dfsg/src/geant321/gphys/gphot.F	2005-12-07 15:01:52.558184613 -0500
@@ -240,7 +240,7 @@
                   ELSE
 C Radiative shell decay
                      JS = JFN+1+2*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 40 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
@@ -296,7 +296,7 @@
                   ELSE
 c Nonradiative decay
                      JS = JFN+1+3*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 60 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN


--- NEW FILE 211-fix-comis-on-amd64.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-amd64.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Large patch from Harald Vogt  to make PAW and Paw++ work
## DP: (at least when statically linked) on 64-bit architectures.
## DP: Slightly modified in an attempt to keep ABI compatibility of the
## DP: dynamic libraries; not that it matters much as they don't work well
## DP: when dynamically linked on 64-bit anyway.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/hbook.h cernlib-2005.05.09.dfsg/src/cfortran/hbook.h
--- cernlib-2005.05.09.dfsg~/src/cfortran/hbook.h	1999-11-15 17:01:12.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/cfortran/hbook.h	2005-12-09 13:27:45.465589336 +0000
@@ -489,6 +489,10 @@
 #define HBALLOC(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
         CCALLSFSUB11(HBALLOC,hballoc,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PINT,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
 
+PROTOCCALLSFSUB11(HBALLOC64,hballoc64,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PLONG,PINT)
+#define HBALLOC64(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
+        CCALLSFSUB11(HBALLOC64,hballoc64,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PLONG,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
+
 PROTOCCALLSFSUB1(HBFREE,hbfree,INT)
 #define HBFREE(LUN) CCALLSFSUB1(HBFREE,hbfree,INT,LUN)
 
@@ -508,6 +512,13 @@
 #define HGNTBF(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)\
         CCALLSFSUB6(HGNTBF,hgntbf,INT,ZTRINGV,INTV,INT,INT,PINT,IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
 
+PROTOCCALLSFSUB6(HGNTBF64,hgntbf64,INT,ZTRINGV,LONGV,INT,INT,PINT)
+/* fix the element length of VAR to 32 */
+#define hgntbf64_ELEMS_2          ZTRINGV_ARGS(4)
+#define hgntbf64_ELEMLEN_2        ZTRINGV_NUM(32)
+#define HGNTBF64(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)\
+        CCALLSFSUB6(HGNTBF64,hgntbf64,INT,ZTRINGV,LONGV,INT,INT,PINT,IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
+
 PROTOCCALLSFSUB1(HGTDIR,hgtdir,PSTRING)
 #define HGTDIR(CHDIR) CCALLSFSUB1(HGTDIR,hgtdir,PSTRING,CHDIR)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/cspack/hcntpar.inc cernlib-2005.05.09.dfsg/src/packlib/cspack/cspack/hcntpar.inc
--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/cspack/hcntpar.inc	1996-03-08 15:44:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/cspack/cspack/hcntpar.inc	2005-12-09 13:27:45.465589336 +0000
@@ -22,7 +22,7 @@
      +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
      +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
      +          ZARIND=11, ZIBLOK=8,  ZNBLOK=10, ZIBANK=9,  ZIFTMP=11,
-     +          ZITMP=10,  ZNTMP=5,   ZNTMP1=3,  ZLINK=6)
+     +          ZITMP=10,  ZNTMP=5,   ZNTMP1=4,  ZLINK=6)
 *
 
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hbook/hcntpar.inc cernlib-2005.05.09.dfsg/src/packlib/hbook/hbook/hcntpar.inc
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hbook/hcntpar.inc	1996-01-16 17:07:52.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hbook/hcntpar.inc	2005-12-09 13:27:46.373451320 +0000
@@ -24,7 +24,7 @@
      +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
      +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
      +          ZARIND=11, ZIBLOK=8,  ZNBLOK=10, ZIBANK=9,  ZIFTMP=11,
-     +          ZID=12,    ZITMP=10,  ZNTMP=6,   ZNTMP1=3,  ZLINK=6)
+     +          ZID=12,    ZITMP=10,  ZNTMP=6,   ZNTMP1=4,  ZLINK=6)
 *
 
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hballoc.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hballoc.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hballoc.F	1996-01-16 17:07:56.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hballoc.F	2005-12-09 13:27:46.617414232 +0000
@@ -42,3 +42,26 @@
       ENDIF
 *
       END
+*
+*     64-bit version (separate to preserve ABI compatibility)
+      SUBROUTINE HBALLOC64(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,
+     +                     IBASE,IOFF,NUSE)
+*
+      CHARACTER*(*)  CHDIR, VAR, BLOCK
+      INTEGER        IDN, ITYPE, ISIZE, NELEM, NUSE, IFIRST, IBASE(1)
+      INTEGER*8      IBUF(1), IOFF
+*
+      LC = LENOCC(CHDIR)
+      LV = LENOCC(VAR)
+      LB = LENOCC(BLOCK)
+*
+      CALL HBALLO1(IDN, CHDIR, LC, VAR, LV, BLOCK, LB, ITYPE, ISIZE,
+     +             IFIRST, NELEM, IBUF, NUSE)
+*
+      IF (NUSE .EQ. 0) THEN
+         IOFF = 0
+      ELSE
+         IOFF = IBUF(1) - %LOC(IBASE(1))/4
+      ENDIF
+*
+      END
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hbnt.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hbnt.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hbnt.F	1996-01-16 17:07:56.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hbnt.F	2005-12-09 13:27:46.644410128 +0000
@@ -269,11 +269,13 @@
  ************************************************************************
  *      *         *                                                     *
  *   1  *         *     Number of variables to be read out              *
- *      *         *     *** For every variable 3 words (ZNTMP1) ***     *
+ *      *         *     *** For every variable 4 words (ZNTMP1) ***     *
  *   2  *         *     Index of variable in LNAME bank                 *
  *   3  *         *     Offset of variable in LNAME bank (INDX-1)*ZNADDR*
  *   4  *         *     Offset in dynamically allocated buffer (only    *
  *      *         *     used via HGNTBF) otherwise 0                    *
+ *   5  *         *     spare (used in 64 bit architectures for upper   *
+ *      *         *     address part)                                   *
  ************************************************************************
 #endif
 *
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgnt2.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgnt2.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgnt2.F	1999-03-05 15:42:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgnt2.F	2005-12-09 13:27:46.644410128 +0000
@@ -34,7 +34,13 @@
 #include "hbook/hcrecv.inc"
 *
       CHARACTER*(*) VAR1(*)
+#if defined(CERNLIB_QMLXIA64)
+      INTEGER*8     IVOFF(*), IOFFST, IOFFSTT
+      INTEGER       IOFFSTV(2)
+      EQUIVALENCE   (IOFFSTV, IOFFSTT)
+#else
       INTEGER       IVOFF(*)
+#endif
       CHARACTER*32  VAR
       INTEGER       ILOGIC, HNMPTR
       LOGICAL       LOGIC, INDVAR, ALLVAR, USEBUF, CHKOFF
@@ -452,10 +458,15 @@
          IQ(LTMP1+JTMP+1)      = IOFF
          IF (USEBUF) THEN
             IF (IEDIF .EQ. 0) THEN
-               IQ(LTMP1+JTMP+2) = IOFFST
+               IOFFSTT = IOFFST
             ELSE
-               IQ(LTMP1+JTMP+2) = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
+               IOFFSTT = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
             ENDIF
+            IQ(LTMP1+JTMP+2) = IOFFSTT
+#if defined(CERNLIB_QMLXIA64)
+*           store upper part of 64 bit address
+            IQ(LTMP1+JTMP+3) = IOFFSTV(2)
+#endif
          ELSE
             IQ(LTMP1+JTMP+2)   = 0
          ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntbf.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntbf.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntbf.F	1996-01-16 17:07:57.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntbf.F	2005-12-09 13:27:46.645409976 +0000
@@ -26,3 +26,13 @@
       CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
 *
       END
+*
+*     64-bit version (separate to preserve ABI compatibility)
+      SUBROUTINE HGNTBF64(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
+      CHARACTER*(*) VAR(*)
+      INTEGER*8     IOFFST(*)
+*
+      NVAR1 = -NVAR
+      CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
+*
+      END
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntf.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntf.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntf.F	1999-03-05 15:42:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntf.F	2005-12-09 13:27:46.645409976 +0000
@@ -37,6 +37,13 @@
       INTEGER       ILOGIC
       LOGICAL       LOGIC, INDVAR, USEBUF
       EQUIVALENCE  (LOGIC, ILOGIC)
+
+#if defined(CERNLIB_QMLXIA64)
+      INTEGER*8     IOFFST, IOFFSTT
+      INTEGER       IOFFSTV(2)
+      EQUIVALENCE   (IOFFSTV, IOFFSTT)
+#endif
+
 *
 #include "hbook/jbyt.inc"
 *
@@ -76,6 +83,12 @@
          INDX   = IQ(LTMP1+JTMP)
          IOFF   = IQ(LTMP1+JTMP+1)
          IOFFST = IQ(LTMP1+JTMP+2)
+#if defined(CERNLIB_QMLXIA64)
+*        fetch full 64 bit address
+         IOFFSTV(1) = IQ(LTMP1+JTMP+2)
+         IOFFSTV(2) = IQ(LTMP1+JTMP+3)
+         IOFFST     = IOFFSTT
+#endif
          IF (IOFFST .EQ. 0) THEN
             USEBUF = .FALSE.
          ELSE
@@ -442,10 +455,15 @@
 *
          IF (USEBUF) THEN
             IF (IEDIF .EQ. 0) THEN
-               IQ(LTMP1+JTMP+2) = IOFFST
+               IOFFSTT = IOFFST
             ELSE
-               IQ(LTMP1+JTMP+2) = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
+               IOFFSTT = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
             ENDIF
+            IQ(LTMP1+JTMP+2) = IOFFSTT
+#if defined(CERNLIB_QMLXIA64)
+*           store upper part of 64 bit address
+            IQ(LTMP1+JTMP+3) = IOFFSTV(2)
+#endif
          ELSE
             IQ(LTMP1+JTMP+2) = 0
          ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c
--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c	2005-12-09 13:27:46.645409976 +0000
@@ -44,7 +44,25 @@
    DummyDef
 #endif
 {
+#if defined(CERNLIB_QMLXIA64)
+   const unsigned long long int mask=0x00000000ffffffff;
+   static unsigned long long int base=1;
+   unsigned long long int jadr=(unsigned long long int) iadr;
+   unsigned long long int jadrl = (mask & jadr);
+
+   if (base == 1) {
+     base = (~mask & jadr);
+   } else if(base != (~mask & jadr)) {
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+     printf("locb_() Warning: changing base from %lx to %lx!!!\n",
+     	   base, (~mask & jadr));
+     printf("This may result in program crash or incorrect results\n");
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+   }
+   return ((int) jadrl);
+#else
    return( (int) iadr );
+#endif
 }
 /*> END <----------------------------------------------------------*/
 #ifdef CERNLIB_TCGEN_LOCB
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/zbook/code/zjump.c cernlib-2005.05.09.dfsg/src/packlib/zbook/code/zjump.c
--- cernlib-2005.05.09.dfsg~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/zbook/code/zjump.c	2005-12-09 13:27:46.971360424 +0000
@@ -7,6 +7,9 @@
  *
  */
 #include "zbook/pilot_c.h"
+#if defined(CERNLIB_QMLXIA64)
+static void (*target)();
+#endif
 #if defined(CERNLIB_UNIX)
 #if defined(CERNLIB_QX_SC)
 zjump_(name,p1,p2,p3,p4)
@@ -18,8 +21,23 @@
 ZJUMP(name,p1,p2,p3,p4)
 #endif
 char *p1, *p2, *p3, *p4;
+
+/*  LP64 compatibility:
+    name is taken from a Fortran array and therefore its address is 32 bit
+    which has to be converted to a 64 bit address to satisfy void (*) (H. Vogt) */
+
+#if defined(CERNLIB_QMLXIA64)
+int *name;
+{
+  long jadr;
+  jadr   = *name;  /* convert int to long */
+  target = (void (*)())jadr;
+  (*target)(p1, p2, p3, p4);
+}
+#else
 void (**name)();
 {
    (**name)(p1, p2, p3, p4);
 }
 #endif
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.05.09.dfsg/src/packlib/zebra/test/brztest/btest2.F
--- cernlib-2005.05.09.dfsg~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/zebra/test/brztest/btest2.F	2005-12-09 13:27:46.971360424 +0000
@@ -29,6 +29,15 @@
 ********************************************************************************
 *
       COMMON/CRZT/IXSTOR,IXDIV,IFENCE(2),LEV,LEVIN,BLVECT(30000)
+
+*     LP64 compatibility:
+*     For 64-bit pointer systems put local variables referenced by LOCF
+*     in a dummy named common block to keep addresses in the program region.
+*     see also: packlib/ffread/test/main.F (H. Vogt)
+
+#if defined(CERNLIB_QMLXIA64)
+      COMMON /TEST64/LBANK
+#endif
       DIMENSION LQ(999),IQ(999),Q(999)
       EQUIVALENCE (IQ(1),Q(1),LQ(9)),(LQ(1),LEV)
 C
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile	2005-12-09 13:27:38.969576880 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile	2005-12-09 13:27:46.971360424 +0000
@@ -50,6 +50,10 @@
 SRCS_F := $(SRCS_F) cscrexec.F
 #endif
 
+#if defined(CERNLIB_QMLXIA64)
+SRCS_F := $(SRCS_F) csrtgpl.F csitgpl.F
+#endif
+
 #if defined(CERNLIB_OLD)
 SRCS_F := $(SRCS_F) cspdir.F csrmbk.F
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F	1996-02-26 17:16:25.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F	2005-12-09 13:27:46.972360272 +0000
@@ -17,8 +17,14 @@
       INTEGER CSLTGP,CSITGP
       CHARACTER*32 NAME
 #include "comis/cstab.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       INTEGER CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      INTEGER*8 CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)
       NAME=CHNAME
       NC=LENOCC(NAME)
       CALL CSCHID(NAME(:NC))
@@ -26,21 +32,39 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
+#endif
+#endif
+#if defined(CERNLIB_SHL)
           ELSE
             I=0
           ENDIF
         ENDIF
       ELSE
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+        IF(IADGPL.NE.0)THEN
+          IFCS=-2
+          ITYPGP=-2
+          I=CSITGPL(IPVS)
+        ENDIF
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
           I=CSITGP(IPVS)
         ENDIF
+#endif
       END IF
       CSADDR=I
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csinit.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csinit.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csinit.F	2005-04-18 15:41:04.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csinit.F	2005-12-09 13:27:46.972360272 +0000
@@ -64,6 +64,9 @@
 #if defined(CERNLIB_SHL)
 #include "comis/cshlnm.inc"
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+#endif
 #if defined(CERNLIB_PAW)
 #include "paw/pcmode.inc"
 #include "comis/cshfill.inc"
@@ -159,6 +162,9 @@
       ICHMINU=ICHAR('-')
       ICHPLUS=ICHAR('+')
       ICHCOMM=ICHAR(',')
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+      IPIADGV=0
+#endif
 #if defined(CERNLIB_PAW)
       CALL CSPAWI
       MODHFI=0
@@ -211,8 +217,8 @@
 #endif
 #if (defined(CERNLIB_LINUX))
       ITMPLEN=CSTMPD(CHPATH, 256)
-      CHF77 ='g77 -c'
-      CHCC  ='cc -c'
+      CHF77 ='g77 -c -fPIC'
+      CHCC  ='cc -c -fPIC'
 #endif
 #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
       ITMPLEN=CSTMPD(CHPATH, 256)
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csintx.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csintx.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csintx.F	1996-12-05 09:50:37.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csintx.F	2005-12-09 13:27:46.973360120 +0000
@@ -38,6 +38,9 @@
 #if defined(CERNLIB_PAW)
 #include "comis/cskucs.inc"
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_ALPHA_OSF))
       INTEGER CSTRCMP
 #endif
@@ -1105,6 +1108,32 @@
       ENDIF
 #endif
 #if (!defined(CERNLIB_VAX))&&(!defined(CERNLIB_APOLLO))
+#if defined(CERNLIB_QMLXIA64)
+      IF(IQ(IP+KSIFCS).EQ.-2)THEN
+*Dynamic linker may give long addresses
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ENDIF
+#else
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NPAR,IDA(IOFSPL))
       ELSEIF(ITP.EQ.2)THEN
@@ -1115,6 +1144,7 @@
         DCSRES=CSCALD(IADGP,NPAR,IDA(IOFSPL))
       ENDIF
 #endif
+#endif
       IPC=IPC+4
       GO TO 999
 *NUM I
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csitgpl.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csitgpl.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csitgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csitgpl.F	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,32 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZU:  1.16/16 04/10/93  12.14.52  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+      INTEGER FUNCTION CSITGPL(IP)
+***------------------------------
+*   it is last routine from the tables-set.
+***-----------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cspnts.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab64.inc"
+      I=MHLOC(KSIDP+NWIDEN)
+      IQ(I)=0
+      IQ(I+1)=NCIDEN
+      DO 1 K=1,NWIDEN
+        IQ(I+KSIDP-1+K)=IDEN(K)
+   1  CONTINUE
+      CALL CSRTGPL(I)
+      IF(IP.EQ.0)THEN
+        IPGP=I
+      ELSE
+        IQ(IP)=I
+      ENDIF
+      CSITGP=I
+      END
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cskcal.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cskcal.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cskcal.F	1996-12-05 09:50:39.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cskcal.F	2005-12-09 13:27:46.973360120 +0000
@@ -31,6 +31,9 @@
 #include "comis/cstab.inc"
 #include "comis/csfres.inc"
 #include "comis/cssysd.inc"
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
       CHARACTER PRONAME*32
       INTEGER CSCALI
       DOUBLE PRECISION CSCALD
@@ -232,6 +235,34 @@
         I2=I2+KS
         I=I+1
  9203 CONTINUE
+#if defined(CERNLIB_QMLXIA64)
+*  Dynamic linker may give long addresses
+      IF (IFCS.EQ.-2)THEN
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ENDIF
+#else
 *      IT=IABS(ITYPGP)
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NOPAR,IF77PL(1))
@@ -245,6 +276,7 @@
       ENDIF
 *+SELF,IF=UNIX,IF=-SGI,IF=-IBMRT,IF=-DECS,IF=-HPUX,IF=-SUN,IF=-MSDOS.
 #endif
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_STDUNIX))
       I=1
       DO 9203 K=ITA-NPAR+1,ITA
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cslink.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cslink.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cslink.F	1996-02-26 17:16:17.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cslink.F	2005-12-09 13:27:46.973360120 +0000
@@ -21,10 +21,15 @@
 #include "comis/cstab.inc"
 #include "comis/cspnts.inc"
 #include "comis/cslun.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       CHARACTER*(KLENID) FNNAME
       INTEGER CS_GET_FUNC
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      CHARACTER*(KLENID) FNNAME
+      INTEGER*8 CS_GET_FUNC
+#endif
          COMMON/CSGSCM/IGS,JGS,NGS,CSJUNK(3)
       IF(ISTLIB.EQ.0 .AND. ITBS.EQ.0)RETURN
    2  I=IPGP
@@ -60,12 +65,20 @@
 #if defined(CERNLIB_SHL)
           CALL CSGTIDP(I,FNNAME,NC)
           CALL CUTOL(FNNAME(1:NC))
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(FNNAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+          ENDIF
+#else
           IADGP=CS_GET_FUNC(FNNAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
           ENDIF
 #endif
+#endif
           IP=0
         ENDIF
       ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csrtgpl.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csrtgpl.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csrtgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csrtgpl.F	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,31 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZ :  1.18/14 10/01/95  15.41.06  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+
+      SUBROUTINE CSRTGPL(I)
+***--------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab.inc"
+#include "comis/cstab64.inc"
+
+      IPIADGV = IPIADGV + 1
+      IF (IPIADGV .GT. MAXIAD64)  THEN
+        WRITE (*,'(2a,I4)') 'to much addresses for dynamik linking, ',
+     &                      'limit is ', MAXIAD64
+        WRITE (*,'(2a)') 'increase MAXIAD64 in cstab64.inc and ',
+     &                    'recompile COMIS'
+
+        STOP
+      END IF
+      IADGPLV(IPIADGV) = IADGPL
+      IADGP            = IPIADGV
+      CALL CCOPYA(IADGP,IQ(I+2),KSIDP-2)
+      END
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/comis/cstab64.inc cernlib-2005.05.09.dfsg/src/pawlib/comis/comis/cstab64.inc
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/comis/cstab64.inc	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/comis/cstab64.inc	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,10 @@
+*
+*
+* cstab64.inc
+*
+      PARAMETER (MAXIAD64=100) !maximum number of shared objects
+      INTEGER*8 IADGPL,IADGPLV(MAXIAD64)
+      INTEGER   IADGPL1, IADGPL2
+      COMMON /CSTB64/ IADGPL,IADGPLV
+      COMMON /CSTB64I/ IPIADGV
+      EQUIVALENCE (IADGPL, IADGPL1)
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c	1997-09-02 15:50:38.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c	2005-12-09 13:27:46.974359968 +0000
@@ -33,11 +33,25 @@
 #else
 void ccopys_(ja,jb,nn)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *nn;
+{
+  int i,n; char *a,*b;
+  n=*nn; a=*ja; b=*jb;
+#else
      char **ja, **jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+#endif
   if ( a >= b )
      for ( i=0; inext = f->first_proc;
          f->first_proc = p;
+         if (debug_level > 0) printf("function pointer is: %p\n", p->funcptr);
          return (void *)(p->funcptr);
       }
      f = f->next;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c	2004-10-27 09:01:54.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c	2005-12-09 13:27:46.974359968 +0000
@@ -32,8 +32,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 double cscald_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -46,10 +45,41 @@
     int CSCALD (name,n,p)
 #  endif
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscald_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+double cscald_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[16];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = *fptr + (unsigned long)jumpad_;
+   /* if ( *fptr > 0 ) ptr = 0; */
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  double (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
+#endif
    double d;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c	2004-10-22 12:42:40.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c	2005-12-09 13:27:46.974359968 +0000
@@ -29,8 +29,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 int cscali_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -39,10 +38,41 @@
 #if defined(CERNLIB_QXCAPT)
 int type_of_call CSCALI (name,n,p)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscali_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+int cscali_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[16];
+{
+   int jumpad_();
+   int (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   /* if ( *fptr > 0 ) ptr = 0; */
+   ptr += *fptr;
+   name = (int (*)())ptr;
+/*    printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  int (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
+#endif
    int i;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c	2004-10-22 12:03:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c	2005-12-09 13:27:46.974359968 +0000
@@ -35,7 +35,7 @@
 #endif
 
 
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 float cscalr_ (name,n,p)
 #endif
 
@@ -51,11 +51,51 @@
 # endif
 #endif
 
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscalr_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+/* Additional note: g77 generates code such that it expects REAL functions
+ * to return "double".  Hence C functions to be used in FORTRAN as REAL
+ * must return "double", and declarations of REAL FORTRAN functions in C files
+ * must also return "double".  On most architectures one can get away with
+ * using "float" instead, but not on amd64 ... see
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15397
+ * 
+ * -- Kevin McCarty
+ */
+	
+#if defined(CERNLIB_QMLXIA64)
+double cscalr_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ int pin[16];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscalr - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+   double r;
+#else
  float (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
    float r;
+#endif
    switch (*n)
    {
       case 0:
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c	1997-09-02 15:50:44.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 13:27:46.975359816 +0000
@@ -36,6 +36,27 @@
 #else
 int cstrcmp_(ja,na,jb,nb)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *na, *nb;
+{
+
+  int i,la,lb,k; char *a,*b;
+  if ( *na >= *nb )
+     {
+      a=*ja; b=*jb; la=*na; lb=*nb; k=1;
+      }
+  else
+    {
+      a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
+     }
+#else
      char **ja, **jb;
      int *na, *nb;
 {
@@ -48,6 +69,7 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+#endif
   for ( i=0; i b[i]) ? k : -k ); }
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/c_hcntpar.h cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/c_hcntpar.h
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/c_hcntpar.h	1996-04-23 18:37:45.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/c_hcntpar.h	2005-12-09 13:27:46.975359816 +0000
@@ -47,7 +47,7 @@
 #define ZID	12
 #define ZITMP	10
 #define ZNTMP	6
-#define ZNTMP1	3
+#define ZNTMP1	4
 #define ZLINK	6
 
 #endif	/*	CERN_C_HCNTPAR	*/
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_execute.c cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_execute.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_execute.c	2001-09-18 13:41:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_execute.c	2005-12-09 13:31:01.495788216 +0000
@@ -184,12 +184,19 @@
 					/* all definitions for the stack */
 #undef INIT_STACK_TO_NULL		/* are kept together in this file */
 
+#if defined(CERNLIB_QMLXIA64)
+# undef HBALLOC
+# undef HGNTBF
+# define HBALLOC HBALLOC64
+# define HGNTBF HGNTBF64
+#endif
+
 /* extern functions */
 extern void qp_exec_evt( QueryExe *, long, long, QPCmd *, int *);
 
 typedef		char	tName[MAX_NAME_LEN+1];
 tName		*namelist;
-int		*offsetlist;
+long		*offsetlist;
 int		*indexlist;
 
 
@@ -245,7 +252,23 @@
 	char		ntname[MAX_NAME_LEN+6];
 	int		i, ierr, indx, itype, isize, ielem;
 	Int32 *		addr;
-	int		ibase[1], ioff, nuse;
+
+	/* LP64 compatibility:
+	   - use static for ibase (at least) because its address is stored
+	     as Int32 in structure CWNBlock
+	     static takes ibase from the stack and puts it the code area.
+	   - use type long for ioff and offsetlist[i]
+	     (for 32 bit architectures type long is 4 Bytes as it is used
+	      also in packlib/hbook/chbook/halloc.c in hballo1 !)
+	   The x86-64 ABI has the code area in the 32 bit address space
+	   but addresses to the stack and to dynamically allocated areas
+	   may and will be above the 32 bit address space (below 0x80000000000).
+	   See also: http://www.x86-64.org/documentation/abi-0.96.pdf
+	   (H. Vogt, Oct. 2005) */
+
+	static int	ibase[1];
+	long		ioff;
+	int		nuse;
 	int		id = qe->id;
 	char *		path = qe->path;
 	char *		title;
@@ -286,7 +309,11 @@
 	CWNBlock = (RefCWN *) calloc( CWNCount + 1, sizeof( RefCWN ) );
 	qp_assert( MAX_NAME_LEN == 32 ); /* see hbook.h (HGNTBF) */
 	namelist = (tName *) calloc( CWNCount + 1, sizeof(tName) );
-	offsetlist = (int *) calloc( CWNCount + 1, sizeof(int) );
+
+	/* offsetlist should be of type long (see above) (H. Vogt, Oct. 2005) */
+
+	offsetlist = (long *) calloc( CWNCount + 1, sizeof(long) );
+
 	indexlist = (int *) calloc( CWNCount + 1, sizeof(int) );
 	qp_assert(
 		CWNBlock != 0 &&
@@ -381,6 +408,7 @@
 						offsetlist[nt_load_cnt]=
 						CWNBlock[index].p -
 						PAWC.iq_eqv;
+
 						strncpy(
 						namelist[nt_load_cnt],
 						vi->name,
@@ -871,8 +899,21 @@
 			if ( cmd->u.scan.pawpp ) {
 				char	buf[33];
 
+				/* for LP64 ABI matlab and matrow are 64 bit pointer, type is void*  
+				   but PCADDR.jmlab and PCADDR.jmrow are of type int
+				   see: c_pcaddr.h and qp_command.h
+				   it is related to CWNBlock -> see above (H. Vogt)*/
+
+#if defined(CERNLIB_QMLXIA64)
+				unsigned long long int	 myjmlab, myjmrow;
+				myjmlab = PCADDR.jmlab;
+				myjmrow = PCADDR.jmrow;
+				c->matlab = (TableCallBack) myjmlab;
+				c->matrow = (TableCallBack) myjmrow;
+#else
 				c->matlab = (TableCallBack) PCADDR.jmlab;
 				c->matrow = (TableCallBack) PCADDR.jmrow;
+#endif
 
 				qp_assert( qe->nexpr <= MAX_OUTSTR );
 
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_hbook_if.c cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_hbook_if.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_hbook_if.c	1999-07-05 15:43:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_hbook_if.c	2005-12-09 13:27:46.976359664 +0000
@@ -149,7 +149,15 @@
 	int	idn, idtmp;
 	int	icycle;
 	int	ierr;
-	int     izero = 0;
+
+	/* LP64 compatibility:
+	   use static for izero because its address is fetched by hbname_
+	   using locb and locb expects 32 bit addresses only.
+	   static takes izero from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int     izero = 0;
 
 	/* split string into  path, id and cycle */
 


--- NEW FILE 211-fix-comis-on-ia64.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-ia64.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Further patch building on Harald Vogt's amd64 patch that should
## DP: fix PAW on Itanium Linux.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c	2005-12-09 09:45:33.649333472 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c	2005-12-09 10:01:36.149011280 +0000
@@ -39,12 +39,32 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium, the situation is even worse.  Itanium architecture is such
+ * that the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ * -- Kevin McCarty
+ */
+	
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+# if defined (__ia64__)
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a +
+	  (((unsigned long)a > 0x80000000) ? autobase : 0x6000000000000000);
+  b = (unsigned long)b +
+	  (((unsigned long)b > 0x80000000) ? autobase : 0x6000000000000000);
+# endif
 #else
      char **ja, **jb;
      int *nn;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 09:45:33.650333320 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 10:05:36.432482640 +0000
@@ -42,6 +42,19 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium, the situation is even worse.  Itanium architecture is such
+ * that the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ * -- Kevin McCarty
+ */
+
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *na, *nb;
@@ -56,6 +69,13 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+# if defined (__ia64__)
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a +
+          (((unsigned long)a > 0x80000000) ? autobase : 0x6000000000000000);
+  b = (unsigned long)b +
+          (((unsigned long)b > 0x80000000) ? autobase : 0x6000000000000000);
+# endif
 #else
      char **ja, **jb;
      int *na, *nb;

cernlib_2005.05.09.dfsg-3.diff:

--- NEW FILE cernlib_2005.05.09.dfsg-3.diff ---
--- cernlib-2005.05.09.dfsg.orig/debian/control
+++ cernlib-2005.05.09.dfsg/debian/control
@@ -0,0 +1,896 @@
+Source: cernlib
+Maintainer: Kevin B. McCarty 
+Standards-Version: 3.6.2
+Priority: optional
+Section: science
+Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin
+
+Package: cernlib-base
+Architecture: all
+Section: devel
+Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev
+Description: script to determine Cernlib library dependencies
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This package includes the "cernlib" script that lists the command-line
+ options needed for linking against Cernlib libraries.  The script has
+ been rewritten from the upstream version to calculate
+ dependencies recursively.  Also included are a README.Debian with a summary
+ of changes made to Cernlib to fit it into Debian packaging practices,
+ and a contributed set of Autoconf macros to test for Cernlib libraries.
+
+Package: cernlib-core-dev
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit
+Description: Cernlib development headers, tools, and static libraries
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides the header files and static libraries likely to be
+ wanted by developers using the Cern libraries who are not interested
+ specifically in high energy physics.  It also provides the Cernlib
+ development tools DZedit and KUIPC.  Cernlib analysis programs may be
+ obtained by installing the cernlib-core metapackage.
+
+Package: cernlib-core
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos
+Description: Cernlib main libraries and programs
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides the libraries and analysis tools (e.g. PAW) likely
+ to be wanted by most users of the Cern libraries who are not interested
+ specifically in high energy physics.  You cannot do program development by
+ installing only this metapackage; development libraries and tools may
+ be obtained by installing the cernlib-core-dev metapackage or individual
+ lib*-dev packages.
+
+Package: cernlib-extras
+Architecture: all
+Priority: extra
+Section: science
+Depends: cernlib-base (= ${Source-Version}), pawserv, zftp
+Description: miscellaneous Cernlib programs unlikely to be used by many
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides a few additional Cernlib programs not included
+ in any other Cernlib metapackage.  Very few people are likely to be
+ interested in them; currently they include zftp, pawserv and zserv.
+ Notice that the latter two programs run as daemons through inetd and may
+ reduce your system's security!
+ .
+ Installing this package along with the "cernlib" metapackage will supply
+ a complete set of all Cernlib programs and libraries included in Debian.
+
+Package: cernlib-montecarlo
+Architecture: all
+Section: science
+Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev
+Recommends: libisajet758-2-dev
+Description: Cernlib Monte Carlo libraries
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides various Monte Carlo libraries included in Cernlib
+ (both shared and static).  Likely only physicists will be interested in
+ these packages.  Note that the Geant 3.21 program is not included, but it may
+ be obtained by also installing the geant321 Debian package.
+ .
+ Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are
+ not available within Debian due to licensing issues; see the README.Debian
+ file in the montecarlo-base package for information on obtaining them.
+ .
+ Additionally, the Isajet library is not available on the m68k architecture
+ due to a compiler flaw.
+
+Package: cernlib
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev
+Description: almost complete set of Debian Cernlib packages
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides almost all of the programs and libraries contained
+ in Cernlib.  Most people will likely want only a subset of these.  A few
+ extra Cernlib programs, not of interest to many people, may be obtained via
+ the cernlib-extras metapackage.
+
+Package: dzedit
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: libpacklib1-dev
+Description: Cernlib's ZEBRA documentation editor
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system
+ developed at CERN.  ZEBRA, part of the Packlib library, permits a developer to
+ create complex data structures in the FORTRAN 77 language; the DZDOC system
+ allows the developer to generate and maintain documentation of ZEBRA data
+ structures.
+
+Package: geant321-data
+Architecture: all
+Section: science
+Depends: cernlib-base
+Description: [Physics] Data for Geant 3.21 detector simulator
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes data files for use by Geant.
+
+Package: geant321-doc
+Architecture: all
+Section: doc
+Depends: cernlib-base
+Description: [Physics] Documentation for Geant 3.21
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes some documentation about Geant.
+
+Package: geant321
+Architecture: all
+Section: science
+Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77
+Suggests: kxterm, geant321-doc
+Description: [Physics] Particle detector description and simulation tool
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes gxint, the script used to perform this linking step.
+
+Package: kuipc
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, cernlib-base
+Recommends: libpacklib1-dev
+Suggests: libpacklib1-lesstif-dev
+Description: Cernlib's Kit for a User Interface Package (KUIP) compiler
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify
+ the writing of a program's user interface code.  It takes as
+ input a Command Definition File (CDF) that describes the
+ commands to be understood by the program, and outputs C or FORTRAN code that
+ makes the appropriate function calls to set up the user interface.  This
+ code can then be compiled and linked with the rest of the program.  Since
+ the generated code uses KUIP routines, the program must also be linked
+ against the Packlib library that contains them.
+ .
+ KUIPC is no longer actively developed, so aside from its use in the build
+ process of Cernlib, it is of mainly historical interest.
+
+Package: kxterm
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}, cernlib-base
+Description: Cernlib's KUIP terminal emulator
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ KXterm is a terminal emulator which combines the best features from
+ the (now defunct) Apollo DM pads (like: input and transcript
[...20906 lines suppressed...]
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ./pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, C??? hai"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "M??y ph???c v??? c???n ch???y t??? tr??nh inetd"
+
+#. Type: select
+#. Description
+#: ./pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr "G??i tin n??y bao g???m c??? hai tr??nh n???n (d??mon) pawserv (m?? cho ph??p m??y t??? xa ?????c t???p tin ?????a ph????ng trong khi ch???y PAW/Paw++) v?? tr??nh n???n zserv (m?? cho ph??p m??y t??? xa ????ng nh???p d??ng giao th???c ZFTP c???a CERN). C??? hai tr??nh ph???c v??? n??y ???????c ch???y t??? tr??nh n???n inetd; b???n c?? th??? hi???u l???c m???t hay c??? hai ??i???u. Tuy nhi??n, tr??? b???n c???n thi???t l??m vi???c r???t ?????c bi???t, r???t c?? th??? l?? b???n s??? mu???n hi???u l???c ch??? tr??nh pawserv."
--- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po
+++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po
@@ -0,0 +1,55 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib\n"
+"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-05-26 16:05-0300\n"
+"Last-Translator: Andr? Lu?s Lopes \n"
+"Language-Team: Debian-BR Project \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Ambos"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servidores a serem executados a partir do inetd"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr ""
+"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos "
+"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv "
+"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP "
+"do CERN). Esses servidores s?o executados a partir do inetd; voc? "
+"pode habilitar cada um deles separadamente ou ambos. A menos que voc? "
+"possua necessidades bastante especializadas, voc? provavelmente ir? "
+"desejar habilitar somente o pawserv."
--- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po
+++ cernlib-2005.05.09.dfsg/debian/po/sv.po
@@ -0,0 +1,53 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib 2005.05.09-4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-10-06 23:50+0200\n"
+"Last-Translator: Daniel Nylander \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, B?da"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servrar som ska k?ras fr?n inetd"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr ""
+"Detta paket inkluderar b?de pawserver-daemonen (till?ter fj?rrsystem att "
+"l?sa lokala filer n?r PAW/Paw++ k?rs) och zserv-daemonen (till?ter fj?rrsystem "
+"att logga in med CERN's ZFTP-protokoll).  Dessa servrar k?rs fr?n inetd; du m?ste "
+"aktivera n?gon eller b?da av dom. Om du inte har speciella krav s? r?cker det gott "
+"om pawserv aktiveras."
+
--- cernlib-2005.05.09.dfsg.orig/debian/po/es.po
+++ cernlib-2005.05.09.dfsg/debian/po/es.po
@@ -0,0 +1,55 @@
+# cernlib po-debconf translation to Spanish
+# Copyright (C) 2005 Software in the Public Interest
+# This file is distributed under the same license as the cernlib package.
+#
+# Changes:
+#  - Initial translation
+#         C??sar G??mez Mart??n 
+#
+#   Traductores, si no conoce el formato PO, merece la pena leer la
+#   documentaci??n de gettext, especialmente las secciones dedicadas a este
+#   formato, por ejemplo ejecutando:
+#          info -n '(gettext)PO Files'
+#          info -n '(gettext)Header Entry'
+# Equipo de traducci??n al espa??ol, por favor, lean antes de traducir
+# los siguientes documentos:
+#
+#  - El proyecto de traducci??n de Debian al espa??ol
+#    http://www.debian.org/intl/spanish/
+#    especialmente las notas de traducci??n en
+#    http://www.debian.org/intl/spanish/notas
+#
+#  - La gu??a de traducci??n de po's de debconf:
+#    /usr/share/doc/po-debconf/README-trans
+#    o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-09-01 17:49+0100\n"
+"Last-Translator: C??sar G??mez Mart??n \n"
+"Language-Team: Debian l10n spanish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: SPAIN\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Type: select
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Ambos"
+
+#. Type: select
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servidores a ejecutar desde inetd"
+
+#. Type: select
+#: ../pawserv.templates.master:6
+msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol).  These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv."
+msgstr "Este paquete incluye el demonio pawserv (permite a las m??quinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++)  y el demonio zserv (permite a las m??quinas remotas conectarse a trav??s del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo m??s probable es que s??lo quiera habilitar pawserv."
+


Index: 304-update-Imake-config-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/304-update-Imake-config-files.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 304-update-Imake-config-files.dpatch	9 Dec 2005 15:57:06 -0000	1.1
+++ 304-update-Imake-config-files.dpatch	15 Dec 2005 12:07:03 -0000	1.2
@@ -7,25 +7,15 @@
 ## DP: to support most Linux architectures.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/Imake.cf /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/Imake.cf
---- cernlib-2005.05.09/src/config/Imake.cf	2004-10-05 11:54:40.000000000 -0400
-+++ /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/Imake.cf	2005-06-09 10:47:36.470829080 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.cf cernlib-2005.05.09.dfsg/src/config/Imake.cf
+--- cernlib-2005.05.09.dfsg~/src/config/Imake.cf	2004-10-05 11:54:40.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/Imake.cf	2005-12-12 09:42:08.529220732 -0500
 @@ -1,24 +1,10 @@
 -/* $Id$
 - *
 - * $Log$
-- * Revision 1.1  2005/12/09 15:57:06  pertusus
-- * - update with newer debian patchset for cernlib, fix licence issues
-- * - remove the BSD in the licence because there is no library nor binary
-- *   under a BSD licence and someone could get the idea that there is
-- *   some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
-- *   because of cfortran
-- * - don't use the include.tar.gz source, instead get include files from
-- *   the source files
-- * - build shared libraries
-- * - simplify the scripts modifications
-- *
-- * sync with devel, except 64 bit fixes
+- * Revision 1.2  2005/12/15 12:07:03  pertusus
+- * - use new debian patchset
 - *
 - * Revision 1.5  2004/10/05 15:54:40  mclareni
 - * Add configuration file linux-lp64 for Linux 64-bit pointer systems like AMD Opteron and Intel IA64.
@@ -1280,9 +1270,9 @@
  
  #ifndef MacroIncludeFile
  XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
-diff -urNad cernlib-2005.05.09/src/config/linux.cf /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/linux.cf
---- cernlib-2005.05.09/src/config/linux.cf	2004-10-05 11:56:45.000000000 -0400
-+++ /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/linux.cf	2005-06-09 10:47:36.471828868 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/linux.cf cernlib-2005.05.09.dfsg/src/config/linux.cf
+--- cernlib-2005.05.09.dfsg~/src/config/linux.cf	2004-10-05 11:56:45.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/linux.cf	2005-12-12 09:42:42.505976387 -0500
 @@ -65,20 +65,20 @@
  #define OSVendor		/**/
  #define OSMajorVersion		2
@@ -1308,7 +1298,7 @@
  #endif
  #define HasPutenv		YES
  #define HasShm			YES
-@@ -94,38 +94,300 @@
+@@ -94,38 +94,302 @@
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
@@ -1599,6 +1589,8 @@
 +#  define OptimizedCDebugFlags  OptimizationLevel
 +# endif
 +# define LinuxMachineDefines    -D__x86_64__
++# define DefaultFCOptions       -fno-automatic \
++                                -fno-second-underscore -fugly-complex
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 +# define CernlibMachineDefines  -DCERNLIB_QMLXIA64
@@ -1623,7 +1615,7 @@
  /* Some of these man page defaults are overriden in the above OS sections */
  #ifndef ManSuffix
  # define ManSuffix	1x
-@@ -160,7 +422,7 @@
+@@ -160,7 +424,7 @@
  #define FortranSaveFlags	/* */ /* Everything static !? */
  #define OptimisedFortranFlags   -g -pc 64 -tp p6
  #define DefaultFCOptions        -Msave -fpic -Kieee
@@ -1632,7 +1624,7 @@
  
  #else
  
-@@ -171,19 +433,18 @@
+@@ -171,19 +435,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1664,7 +1656,7 @@
   
  #else
  
-@@ -194,19 +455,18 @@
+@@ -194,19 +457,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1696,7 +1688,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */
-@@ -221,17 +481,32 @@
+@@ -221,17 +483,32 @@
  /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */
  /*  Adapted to CERN style GF. 20-Sep-96 */
  
@@ -1732,7 +1724,7 @@
  
  # endif
  # endif
-@@ -251,7 +526,7 @@
+@@ -251,7 +528,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */


Index: 307-use-canonical-cfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/307-use-canonical-cfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 307-use-canonical-cfortran.dpatch	9 Dec 2005 15:57:06 -0000	1.1
+++ 307-use-canonical-cfortran.dpatch	15 Dec 2005 12:07:03 -0000	1.2
@@ -6,10 +6,10 @@
 ## DP: Debian package of cfortran, version 4.4-6.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.doc /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc
---- cernlib-2005.05.09/src/cfortran/cfortran.doc	1998-12-11 12:17:09.000000000 -0500
-+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc	2004-12-10 10:47:33.000000000 -0500
-@@ -195,7 +195,7 @@
+diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc	1998-12-11 17:17:09.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc	2005-12-09 18:01:09.000000000 +0000
+@@ -195,13 +195,13 @@
  HP9000> f77 -c cfortex.f
  HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest
  
@@ -18,7 +18,28 @@
  HP9000> # #define hpuxFortran800
  HP9000> cc -c -Aa -DhpuxFortran800 cfortest.c
  HP9000> f77 +800 -o cfortest cfortest.o cfortex.f
-@@ -643,7 +643,7 @@
+ 
+ f2c> # In the following, 'CC' is any C compiler.
+-f2c> f2c -R cfortex.f
++f2c> f2c cfortex.f
+ f2c> CC -o cfortest -Df2cFortran cfortest.c cfortex.c -lf2c  &&  cfortest
+ 
+ Portland Group $ # Presumably other C compilers also work.
+@@ -533,9 +533,10 @@
+ FORTRAN_REAL thus corresponds to FORTRAN's REAL on all machines, including t3e.
+ 
+ 
+-o f2c
+-  f2c, by default promotes REAL functions to double. cfortran.h does not (yet)
+-support this, so the f2c -R option must be used to turn this promotion off.
++o f2c / g77
++  f2c and g77 by default promote REAL functions to double.  As of December 9,
++2005, the Debian package of cfortran supports this behavior, so the f2c -R
++option must *NOT* be used to turn this promotion off.
+ 
+ o f2c
+ [Thanks to Dario Autiero for pointing out the following.]
+@@ -643,7 +644,7 @@
     [For an ancient math.h on a 386 or sparc, get similar from a new math.h.]
     #ifdef mc68000     /* 5 lines Copyright (c) 1988 by Sun Microsystems, Inc. */
     #define FLOATFUNCTIONTYPE	int
@@ -27,7 +48,7 @@
     #define ASSIGNFLOAT(x,y)	*(int *)(&x) = y
     #endif
  
-@@ -874,7 +874,7 @@
+@@ -874,7 +875,7 @@
  works everywhere and would seem to be an obvious choice.
  
  
@@ -36,7 +57,7 @@
  
  cfortran.h encourages the exact specification of the type and dimension of
  array parameters because it allows the C compiler to detect errors in the
-@@ -1835,7 +1835,7 @@
+@@ -1835,7 +1836,7 @@
  
  Unlike all other C compilers supported by cfortran.h,
  'gcc -traditional' promotes to double all functions returning float
@@ -45,7 +66,7 @@
  
  /* m.c */
  #include 
-@@ -2017,8 +2017,9 @@
+@@ -2017,8 +2018,9 @@
  
  THIS PACKAGE, I.E. CFORTRAN.H, THIS DOCUMENT, AND THE CFORTRAN.H EXAMPLE
  PROGRAMS ARE PROPERTY OF THE AUTHOR WHO RESERVES ALL RIGHTS. THIS PACKAGE AND
@@ -57,16 +78,16 @@
  - YOU MUST ACCOMPANY ANY COPIES OR DISTRIBUTION WITH THIS (UNALTERED) NOTICE.
  - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA 
    (E.G. TAPE, DISK, COMPUTER, PAPER.)
-diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.h /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h
---- cernlib-2005.05.09/src/cfortran/cfortran.h	2002-09-11 13:05:51.000000000 -0400
-+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h	2004-12-10 10:47:34.000000000 -0500
+diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h	2002-09-11 17:05:51.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h	2005-12-09 18:01:09.000000000 +0000
 @@ -1,4 +1,4 @@
 -/* cfortran.h  4.4_cernlib2002 */
 +/* cfortran.h  4.4 */
  /* http://www-zeus.desy.de/~burow/cfortran/                   */
  /* Burkhard Burow  burow at desy.de                 1990 - 2002. */
  
-@@ -11,6 +11,32 @@
+@@ -11,6 +11,35 @@
     MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE.
  */
  
@@ -94,12 +115,15 @@
 +
 +      Nov 2003: If __INTEL_COMPILER or INTEL_COMPILER defined, also define
 +                f2cFortran (KMCCARTY)
++      Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN
++                returning "double" in C.  This was one of the items on
++		Burkhard's TODO list. (KMCCARTY)
 + *******/
 +
  /* 
    Avoid symbols already used by compilers and system *.h:
    __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c
-@@ -75,7 +101,8 @@
+@@ -75,7 +104,8 @@
  
  /* Remainder of cfortran.h depends on the Fortran compiler. */
  
@@ -109,7 +133,7 @@
  #define f2cFortran
  #endif
  
-@@ -90,6 +117,27 @@
+@@ -90,6 +120,27 @@
                             Support f2c or f77 with gcc, vcc with f2c. 
                             f77 with vcc works, missing link magic for f77 I/O.*/
  #endif
@@ -137,7 +161,7 @@
  #if defined(__hpux)             /* 921107: Use __hpux instead of __hp9000s300 */
  #define       hpuxFortran       /*         Should also allow hp9000s7/800 use.*/
  #endif
-@@ -131,6 +179,7 @@
+@@ -131,6 +182,7 @@
  #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
  /* If your compiler barfs on ' #error', replace # with the trigraph for #     */
   #error "cfortran.h:  Can't find your environment among:\
@@ -145,7 +169,7 @@
      - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...)     \
      - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000     \
      - VAX   VMS CC 3.1 and FORTRAN 5.4.                                  \
-@@ -151,7 +200,8 @@
+@@ -151,7 +203,8 @@
      - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran          \
      - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \
      - Absoft Pro Fortran: Use #define AbsoftProFortran \
@@ -155,7 +179,7 @@
  /* Compiler must throw us out at this point! */
  #endif
  #endif
-@@ -164,7 +214,8 @@
+@@ -164,7 +217,8 @@
  
  /* Throughout cfortran.h we use: UN = Uppercase Name.  LN = Lowercase Name.   */
  
@@ -165,7 +189,7 @@
  #define CFC_(UN,LN)            _(LN,_)      /* Lowercase FORTRAN symbols.     */
  #define orig_fcallsc(UN,LN)    CFC_(UN,LN)
  #else 
-@@ -268,7 +319,8 @@
+@@ -268,7 +322,8 @@
  #endif
  
  #ifndef apolloFortran
@@ -175,7 +199,7 @@
  #define CF_NULL_PROTO
  #else                                         /* HP doesn't understand #elif. */
  /* Without ANSI prototyping, Apollo promotes float functions to double.    */
-@@ -512,7 +564,7 @@
+@@ -512,7 +567,7 @@
                      *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO)  ),   \
    (F).dsc$a_a0    =  ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length          ,(F))
  
@@ -184,7 +208,7 @@
  #define _NUM_ELEMS      -1
  #define _NUM_ELEM_ARG   -2
  #define NUM_ELEMS(A)    A,_NUM_ELEMS
-@@ -540,7 +592,8 @@
+@@ -540,7 +595,8 @@
  }
  return (int)num;
  }
@@ -194,3 +218,56 @@
  /*-------------------------------------------------------------------------*/
  
  /*           UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS       */
+@@ -1451,7 +1507,12 @@
+ #define      BYTE_cfPU(A)   CFextern INTEGER_BYTE      FCALLSC_QUALIFIER A
+ #define    DOUBLE_cfPU(A)   CFextern DOUBLE_PRECISION  FCALLSC_QUALIFIER A
+ #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define     FLOAT_cfPU(A)   CFextern DOUBLE_PRECISION  FCALLSC_QUALIFIER A
++#else
+ #define     FLOAT_cfPU(A)   CFextern FORTRAN_REAL      FCALLSC_QUALIFIER A
++#endif
+ #else				   	                   
+ #define     FLOAT_cfPU(A)   CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A
+ #endif				   	                   
+@@ -2088,7 +2149,12 @@
+ #ifndef __CF__KnR
+ /* The void is req'd by the Apollo, to make this an ANSI function declaration.
+    The Apollo promotes K&R float functions to double. */
+-#define   FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define FLOAT_cfFZ(UN,LN) DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#else
++#define FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#endif
+ #ifdef vmsFortran
+ #define  STRING_cfFZ(UN,LN) void  FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS
+ #else
+@@ -2104,7 +2170,12 @@
+ #endif
+ #else
+ #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define   FLOAT_cfFZ(UN,LN) DOUBLE_PRECISION  FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#else
+ #define   FLOAT_cfFZ(UN,LN) FORTRAN_REAL      FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#endif
+ #else
+ #define   FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)(
+ #endif
+@@ -2118,7 +2189,12 @@
+ #define    BYTE_cfF(UN,LN)     BYTE_cfFZ(UN,LN)
+ #define  DOUBLE_cfF(UN,LN)   DOUBLE_cfFZ(UN,LN)
+ #ifndef __CF_KnR
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define   FLOAT_cfF(UN,LN)  DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#else
+ #define   FLOAT_cfF(UN,LN)  FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#endif
+ #else
+ #define   FLOAT_cfF(UN,LN)    FLOAT_cfFZ(UN,LN)
+ #endif


Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 315-fixes-for-MacOSX.dpatch	9 Dec 2005 17:31:10 -0000	1.2
+++ 315-fixes-for-MacOSX.dpatch	15 Dec 2005 12:07:03 -0000	1.3
@@ -6,9 +6,25 @@
 ## DP: and run on OS X.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/Imake.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules
---- cernlib-2005.05.09/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/Imakefile	2005-12-07 14:47:34.141148558 -0500
+@@ -7,8 +7,12 @@
+ SUBDIRS= $(LIBDIRS) patchy cfortran
+ 
+ #ifdef CERNLIB_UNIX
++#ifdef CERNLIB_MACOSX
++SUBDIRS:= $(SUBDIRS) scripts
++#else
+ SUBDIRS:= $(SUBDIRS) scripts mgr
+ #endif
++#endif
+ 
+ InstallLibSubdirs($(LIBDIRS))
+ 
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
+--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2005-12-07 14:47:34.139148983 -0500
 @@ -2171,7 +2171,7 @@
  #define CppScriptTarget(dst,src,defs,deplist)				@@\
  dst::  src deplist							@@\
@@ -27,9 +43,9 @@
  									@@\
  clean::									@@\
  	RemoveFiles(dst)
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf
---- cernlib-2005.05.09/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.cf cernlib-2005.05.09.dfsg/src/config/MacOSX.cf
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.cf	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,170 @@
 +XCOMM platform:  $SFO: MOSXS.cf,v 1.0 95/11/19 23:21:00 sl Exp $
 +
@@ -201,9 +217,9 @@
 +/* End  CERNLIB changes */
 +
 +
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules
---- cernlib-2005.05.09/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.rules cernlib-2005.05.09.dfsg/src/config/MacOSX.rules
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.rules	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,123 @@
 +XCOMM $XConsortium: MOSXS.rules,v 1.1 97/12/12 15:34:45 sl Exp $
 +
@@ -328,9 +344,9 @@
 +#endif
 +
 +
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.tmpl /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl
---- cernlib-2005.05.09/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.tmpl cernlib-2005.05.09.dfsg/src/config/MacOSX.tmpl
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.tmpl	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,67 @@
 +XCOMM $XConsortium: MOSXS.tmpl,v 1.2 97/12/12 19:07:12 sl Exp $
 +
@@ -399,9 +415,9 @@
 +#define SharedFSRev F
 +SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
 +
-diff -urNad cernlib-2005.05.09/src/config/site.def /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def
---- cernlib-2005.05.09/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/site.def cernlib-2005.05.09.dfsg/src/config/site.def
+--- cernlib-2005.05.09.dfsg~/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/site.def	2005-12-07 14:47:34.140148771 -0500
 @@ -99,9 +99,7 @@
  /*   if it is already defined and false, undef it! */
  /* do not use shift by default
@@ -413,9 +429,9 @@
  #undef CERNLIB_SHIFT
  #endif
  #endif
-diff -urNad cernlib-2005.05.09/src/geant321/gxint/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile
---- cernlib-2005.05.09/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gxint/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gxint/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/geant321/gxint/Imakefile	2005-12-07 14:47:34.140148771 -0500
 @@ -30,7 +30,7 @@
  
  gxint321.f:  gxint.F
@@ -425,25 +441,9 @@
  
  install.lib:: $(CERN_LIBDIR)/gxint.f
  
-diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile
---- cernlib-2005.05.09/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile	2005-06-09 15:52:06.471072296 -0400
-@@ -7,8 +7,12 @@
- SUBDIRS= $(LIBDIRS) patchy cfortran
- 
- #ifdef CERNLIB_UNIX
-+#ifdef CERNLIB_MACOSX
-+SUBDIRS:= $(SUBDIRS) scripts
-+#else
- SUBDIRS:= $(SUBDIRS) scripts mgr
- #endif
-+#endif
- 
- InstallLibSubdirs($(LIBDIRS))
- 
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F
---- cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c327m.F cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c327m.F
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c327m.F	2005-12-07 14:47:34.141148558 -0500
 @@ -92,7 +92,11 @@
  #endif
        ENDIF
@@ -456,9 +456,9 @@
         IF(IDS .EQ. 1) THEN
        ERRMAX=MAX(ERRMAX,ABS(H1-T1))
        LTEST= LTEST .AND. ERRMAX .LE.  TSTERR
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F
---- cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c342m.F cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c342m.F
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c342m.F	2005-12-07 14:47:34.141148558 -0500
 @@ -70,7 +70,11 @@
  #endif
        END IF
@@ -471,9 +471,9 @@
        ERMAX= MAX(ERMAX,ABS(R1-T1))
        IF(IDS .EQ. 3 .OR. IDS .EQ. 4) THEN
         WRITE(LOUT,'(1X,F10.3,2F25.16,1P,D10.1)') SX,R,T,ABS(R1-T1)
-diff -urNad cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile
---- cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/data/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/data/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/data/Imakefile	2005-12-07 14:47:34.141148558 -0500
 @@ -1,11 +1,11 @@
  
  .SUFFIXES:
@@ -488,9 +488,9 @@
  
  PackageDirFileTarget(cojets.dat)
  
-diff -urNad cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile
---- cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/data/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/data/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/data/Imakefile	2005-12-07 14:47:34.141148558 -0500
 @@ -1,9 +1,9 @@
  
  .SUFFIXES:
@@ -503,9 +503,9 @@
  
  PackageDirFileTarget(isajet.dat)
  
-diff -urNad cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c
---- cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/sysreq/log.c cernlib-2005.05.09.dfsg/src/packlib/cspack/sysreq/log.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/cspack/sysreq/log.c	2005-12-07 14:47:34.142148345 -0500
 @@ -80,7 +80,7 @@
  static int pid;                 /* process identifier                   */
  static int logfd ;              /* logging file descriptor              */
@@ -515,9 +515,9 @@
  extern int syslog();
  #endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX */
  extern char *getenv();
-diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
---- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:51:53.621804393 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.05.09.dfsg/src/packlib/cspack/tcpaw/tcpaw.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c	2005-12-07 14:47:25.920897902 -0500
++++ cernlib-2005.05.09.dfsg/src/packlib/cspack/tcpaw/tcpaw.c	2005-12-07 14:47:34.146147494 -0500
 @@ -2569,7 +2569,7 @@
  #if !defined(IBM) && !defined(_WIN32)
  /* I provide "getpass" myself as standard version truncates to 8 characters */
@@ -559,9 +559,9 @@
 +  return result;
 +}
 +#endif /* CERNLIB_MACOSX */
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c
---- cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernbit/z268/systems.c cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernbit/z268/systems.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernbit/z268/systems.c	2005-12-07 14:47:34.146147494 -0500
 @@ -200,7 +200,7 @@
  || defined(_IBMR2) \
  || defined(__convexc__) \
@@ -571,9 +571,9 @@
  
    void systems_( command, buf, buflen, l, chars, rc, ovflw )
  
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/d704fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/d704fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-12-07 14:47:34.146147494 -0500
 @@ -4,6 +4,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -585,9 +585,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f002fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f002fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-12-07 14:47:34.146147494 -0500
 @@ -10,6 +10,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -599,9 +599,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f003fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f003fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -11,6 +11,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -613,9 +613,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f004fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f004fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -6,6 +6,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -627,9 +627,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f010fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f010fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -7,6 +7,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -641,9 +641,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  	 
  
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f011fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f011fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -7,6 +7,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -655,9 +655,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h
---- cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	2005-06-09 15:52:06.487068895 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kuip/kuip/ksys.h cernlib-2005.05.09.dfsg/src/packlib/kuip/kuip/ksys.h
+--- cernlib-2005.05.09.dfsg~/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kuip/kuip/ksys.h	2005-12-07 14:47:34.147147281 -0500
 @@ -188,6 +188,17 @@
  #endif
  
@@ -676,15 +676,15 @@
  #ifdef MSDOS
  #  define MACHINE_NAME "IBMPC"
  #  define OS_NAME "MSDOS"
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
---- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F	2005-12-07 14:47:25.807921944 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F	2005-12-07 14:55:23.810167859 -0500
 @@ -38,7 +38,12 @@
              IFCS=-2
              CALL CSRTGPL(I)
  #else
-+c     thanks to Keisuke Fujii for this patch for OS X
-+#if defined(CERNLIB_MACOSX)
++c     thanks to Keisuke Fujii for this patch for OS X            
++#if defined (CERNLIB_MACOSX)
 +          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else
            IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
@@ -696,7 +696,7 @@
            I=CSITGPL(IPVS)
          ENDIF
  #else
-+#if defined(CERNLIB_MACOSX)
++#if defined (CERNLIB_MACOSX)
 +        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else
          IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
@@ -704,9 +704,9 @@
          IF(IADGP.NE.0)THEN
            IFCS=-2
            ITYPGP=-2
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
---- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:51:53.524825013 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:57:50.699841388 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cscrexec.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cscrexec.F
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cscrexec.F	2005-12-07 14:47:25.687947476 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cscrexec.F	2005-12-07 14:47:34.148147068 -0500
 @@ -82,11 +82,19 @@
        IF(FEXT.EQ.'.c')THEN
          L=LENOCC(CHCC)
@@ -743,9 +743,9 @@
  #endif
  #if defined(CERNLIB_ALPHA_OSF)
          CHLINE=                   'ld -shared -o '
-diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
---- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/programs/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/paw/programs/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/pawlib/paw/programs/Imakefile	2005-12-07 14:47:34.148147068 -0500
 @@ -9,7 +9,7 @@
  EXTRA_LDOPTIONS=-Wl,-E
  #endif


Index: 701-patch-hbook-comis-Imakefiles.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/701-patch-hbook-comis-Imakefiles.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 701-patch-hbook-comis-Imakefiles.dpatch	9 Dec 2005 15:57:06 -0000	1.1
+++ 701-patch-hbook-comis-Imakefiles.dpatch	15 Dec 2005 12:07:03 -0000	1.2
@@ -6,9 +6,9 @@
 ## DP: 701 dpatch (a shell script).
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/packlib/hbook/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile
---- cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
-+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	2005-06-10 17:04:08.866020136 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/code/Imakefile cernlib-2005.05.09.dfsg/src/packlib/hbook/code/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/hbook/code/Imakefile	2005-12-07 14:59:31.519940694 -0500
 @@ -19,8 +19,8 @@
  	hgn.F hgnf.F hgnpar.F hgstat.F hhipar.F hhxye.F hi.F \ @@\
  	hictoi.F hid1.F hid2.F hidall.F hidopt.F hidpos.F hie.F  \ @@\
@@ -20,9 +20,9 @@
  	hkind.F hknul1.F hknuli.F hlabel.F hlabeq.F hlabnb.F \ @@\
  	hlattr.F hlccmp.F hldir.F hldir1.F hldir2.F hldirt.F \ @@\
  	hlgnxt.F hlhcmp.F hlimit.F hllsq.F hlnext.F hlocat.F \ @@\
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
---- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:02:24.843306185 -0400
-+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:05:09.955931988 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile	2005-12-07 14:59:22.782783593 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile	2005-12-07 14:59:31.519940694 -0500
 @@ -37,7 +37,8 @@
  	csspar.F cssubr.F cssvpt.F cstadv.F cstarr.F csterr.F cstext.F \ @@\
  	cstfrf.F cstinf.F cstlgb.F cstlog.F cstpar.F cstran.F cstrer.F \ @@\


Index: cernlib.m4
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib.m4	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib.m4	15 Dec 2005 12:07:03 -0000	1.2
@@ -1,6 +1,6 @@
 dnl                                                      -*- Autoconf -*- 
 dnl  autoconf macros for the cernlib libraries
-dnl  Copyright (C) 2004 Patrice Dumas
+dnl  Copyright (C) 2004, 2005 Patrice Dumas
 dnl
 dnl  This program is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
@@ -16,28 +16,33 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-dnl A basic axample of the macros usage:
+dnl A basic axample of the macro usage:
 dnl 
-dnl AC_CERNLIB
-dnl AC_LIB_CERNLIB(kernlib,CLTOU)
-dnl AC_LIB_CERNLIB(mathlib,GAUSS)
-dnl LIBS="$CERNLIB_LIBS $LIBS"
-
-dnl The macro AC_CERNLIB tries to determine the cernlib location and
-dnl whether the linking should be static or not. It should be called once and
-dnl before a particular cernlib library is detected with the second macro.
+dnl AC_LIB_CERNLIB(kernlib,CLTOU,
+dnl [
+dnl    AC_LIB_CERNLIB(mathlib,GAUSS,[LIBS="$CERNLIB_LIBS $LIBS"])
+dnl ])
+
+dnl
 dnl --with-static-cernlib forces the static or dynamic linking.
 dnl --with-cernlib gives the location of cernlib.
 dnl
-dnl If the type of linking isn't forced it is detected as follow:
-dnl - if the environment variable CERNLIB exists it is assumed to be the
+dnl If the type of linking isn't specified it is assumed to be static.
+dnl
+dnl For static linking:
+dnl - if the binary program 'cernlib-static' or 'cernlib' is in the path it is 
+dnl   assumed that a static linking using the information reported by that 
+dnl   script is wanted.
+dnl - otherwise if the environment variable CERNLIB exists it is assumed to be the
 dnl   location of the static library.
 dnl - otherwise if the environment variable CERN_ROOT exists it is assumed 
 dnl   that CERN_ROOT/lib is the location of the static library.
-dnl - otherwise if the binary program 'cernlib' is in the path it is assumed 
-dnl   that a static linking using the information reported by that binary is 
-dnl   wanted.
-dnl - otherwise a dynamic linking is performed.
+dnl - otherwise a simple linking is performed.
+dnl 
+dnl If a dynamic linking is selected:
+dnl - if the binary program 'cernlib' is in the path it is assumed that it is the 
+dnl   debian script and it is called with -dy.
+dnl - otherwise a simple linking is performed.
 dnl
 dnl AC_LIB_CERNLIB ([LIBRARY = kernlib], [FUNCTION = CLTOU], [ACTION-IF-FOUND],
 dnl          [ACTION-IF-NOT-FOUND]) 
@@ -53,7 +58,7 @@
 # statically linked or not.
 AC_DEFUN([AC_CERNLIB], [
 CERNLIB_LIB_PATH=
-CERNLIB_STATIC=
+CERNLIB_STATIC=yes
 AC_ARG_WITH(static_cernlib,
 [  --with-static-cernlib             link statically with the cernlib],
 [  CERNLIB_STATIC=$withval      ])
@@ -64,27 +69,24 @@
 
 
 if test "z$CERNLIB_STATIC" != "zno"; then    
-    CERNLIB_BIN=no
+    CERNLIB_STATIC=yes
     if test "z$CERNLIB_LIB_PATH" = z; then
-        if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
-            CERNLIB_LIB_PATH=$CERNLIB
-            CERNLIB_STATIC="yes"
-            AC_MSG_NOTICE([using the CERNLIB environment variable for cernlib location])
-        elif test "z$CERN_ROOT" != z -a -d "$CERN_ROOT/lib"; then
-            CERNLIB_LIB_PATH=$CERN_ROOT/lib
-            CERNLIB_STATIC="yes"
-            AC_MSG_NOTICE([using the CERN_ROOT environment variable for cernlib location])
-        fi
-        if test "z$CERNLIB_LIB_PATH" = "z"; then
+        AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no)
+        if test $CERNLIB_BIN = no; then
             AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
-            if test $CERNLIB_BIN != no; then
-                CERNLIB_STATIC="yes"
+        fi
+        if test $CERNLIB_BIN = no; then
+            if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
+               CERNLIB_LIB_PATH=$CERNLIB
+               AC_MSG_NOTICE([using the CERNLIB environment variable for cernlib location])
+            elif test "z$CERN_ROOT" != z -a -d "$CERN_ROOT/lib"; then
+                CERNLIB_LIB_PATH=$CERN_ROOT/lib
+                AC_MSG_NOTICE([using the CERN_ROOT environment variable for cernlib location])
             fi
         fi
     fi
-fi
-
-if test "z$CERNLIB_STATIC" != "zyes"; then
+else
+    AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
     if test "z$CERNLIB_LIB_PATH" != z; then
          LDFLAGS="$LDFLAGS -L$CERNLIB_LIB_PATH"
     fi
@@ -95,6 +97,7 @@
 #          [ACTION-IF-NOT-FOUND]) 
 # check for a function in a library of the cernlib
 AC_DEFUN([AC_LIB_CERNLIB], [
+AC_REQUIRE([AC_CERNLIB])
 
 cernlib_lib_ok="no"
 
@@ -110,10 +113,12 @@
     cern_func=$2
 fi
 
+save_CERNLIB_LIBS=$CERNLIB_LIBS
+save_LIBS=$LIBS
+
 if test "z$CERNLIB_STATIC" = "zyes"; then
     cernlib_lib_static_found=no
     AC_MSG_NOTICE([cernlib: linking with a static $cern_library])
-    save_CERNLIB_LIBS="$CERNLIB_LIBS"
     if test "z$CERNLIB_BIN" != "zno"; then
         cernlib_bin_out=`$CERNLIB_BIN $cern_library`
         CERNLIB_LIBS="$cernlib_bin_out $CERNLIB_LIBS"
@@ -127,37 +132,34 @@
     fi
     if test "z$cernlib_lib_static_found" = zno; then
         AC_MSG_WARN([cannot determine the cernlib location for static linking])
+    fi
+else
+    AC_MSG_NOTICE([trying a dynamical link with $cern_library])
+    if test "z$CERNLIB_BIN" != "zno"; then
+        # try link with debian cernlib script with -dy
+        cernlib_bin_out=`$CERNLIB_BIN -dy $cern_library`
+        CERNLIB_LIBS="$cernlib_bin_out $CERNLIB_LIBS"
     else
+        CERNLIB_LIBS="-l$cern_library $CERNLIB_LIBS"
+    fi
+fi
+
 dnl now try the link
-        AC_LANG_PUSH(Fortran 77)
-        save_LIBS="$LIBS"; LIBS="$CERNLIB_LIBS $LIBS"
-        AC_LINK_IFELSE([      program main
+LIBS="$CERNLIB_LIBS $LIBS"
+AC_LANG_PUSH(Fortran 77)
+AC_LINK_IFELSE([      program main
       call $cern_func
       end
 ], 
-        [ 
-            cernlib_lib_ok=yes
-        ],
-        [
-            CERNLIB_LIBS="$save_CERNLIB_LIBS"
-        ])
-        LIBS="$save_LIBS"
-        AC_LANG_POP(Fortran 77)
-    fi
-else
-    AC_MSG_NOTICE([trying a dynamical link with $cern_library])
-dnl FIXME ther could also be something like
-dnl save_LIBS="$LIBS"; LIBS="$CERNLIB_LIBS $LIBS"
-dnl CERNLIB_LIBS="-l$cern_library $CERNLIB_LIBS" 
-dnl LIBS="$save_LIBS"
-    AC_CHECK_LIB([$cern_library], [$cern_func],
-       [ 
-         AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
-         LIBS="-l$1 $LIBS"
-
-         cernlib_lib_ok=yes 
-       ])
-fi
+[ 
+    cernlib_lib_ok=yes
+],
+[
+    CERNLIB_LIBS=$save_CERNLIB_LIBS
+])
+AC_LANG_POP(Fortran 77)
+LIBS=$save_LIBS
+AC_SUBST([CERNLIB_LIBS])
 
 AS_IF([test x"$cernlib_lib_ok" = xyes],
       [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_CERNLIB_${cern_library}_${cern_func}))


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cernlib.spec	12 Dec 2005 10:04:04 -0000	1.11
+++ cernlib.spec	15 Dec 2005 12:07:03 -0000	1.12
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.4
+Release:       9%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -65,7 +65,7 @@
 Source201: cernlib-deadpool.txt
 
 # debian patchset
-Patch0: cernlib_2005.05.09.dfsg-2.diff
+Patch0: cernlib_2005.05.09.dfsg-3.diff
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: 001-fix-missing-fluka.dpatch
@@ -88,6 +88,9 @@
 # a workaround for cups. Applied in doubt.
 Patch113: 113-cups-postscript-fix.dpatch
 Patch114: 114-install-scripts-properly.dpatch
+Patch115: 115-rsrtnt64-goto-outer-block.dpatch
+Patch116: 116-fix-fconc64-spaghetti-code.dpatch
+Patch117: 117-fix-optimizer-bug-in-gphot.dpatch
 Patch200: 200-comis-allow-special-chars-in-path.dpatch
 Patch201: 201-update-kuip-helper-apps.dpatch
 Patch202: 202-fix-includes-in-minuit-example.dpatch
@@ -101,8 +104,9 @@
 Patch208: 208-fix-redundant-packlib-dependencies.dpatch
 Patch209: 209-ignore-unneeded-headers-in-kmutil.c.dpatch
 Patch210: 210-improve-cfortran-header-files.dpatch
-# disabled in the debian patchset, enabled here
-Patch211: 211-fix-comis-on-64-bit-arches.dpatch
+# split in newer debian patchset
+Patch2110: 211-fix-comis-on-amd64.dpatch
+Patch2111: 211-fix-comis-on-ia64.dpatch
 Patch300: 300-skip-duplicate-lenocc.dpatch
 # Use another approach, see cernlib-enforce-FHS
 # Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -182,7 +186,6 @@
 Patch1203: cernlib-hwuli2_use_dimag.diff 
 Patch1204: cernlib-hwhiga_use_dimag.diff
 Patch1205: cernlib-gfortran.diff 
-Patch1206: cernlib-rsrtnt64_goto_outer_block.diff
 Patch1207: cernlib-v107z0_X_before_string.diff
 
 %description
@@ -310,6 +313,9 @@
 %patch -P 112 -p1
 %patch -P 113 -p1
 %patch -P 114 -p1
+%patch -P 115 -p1
+%patch -P 116 -p1
+%patch -P 117 -p1
 %patch -P 200 -p1
 %patch -P 201 -p1
 %patch -P 202 -p1
@@ -321,7 +327,8 @@
 %patch -P 208 -p1
 %patch -P 209 -p1
 %patch -P 210 -p1
-%patch -P 211 -p1
+%patch -P 2110 -p1
+%patch -P 2111 -p1
 %patch -P 300 -p1
 #%patch -P 301 -p1
 #%patch -P 302 -p1
@@ -455,7 +462,6 @@
 # use gfortran
 #%patch -P 1205
 # workaround gfortran bug
-%patch -P 1206
 %patch -P 1207
 
 # remove CVS directories
@@ -690,6 +696,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Wed Dec 14 2005 Patrice Dumas  - 2005-9
+- use new debian patchset
+
 * Fri Dec  9 2005 Patrice Dumas  - 2005-8.4
 - update with newer debian patchset for cernlib, fix licence issues
 - enable 64 bit fixes patch


Index: paw.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/paw.README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paw.README	9 Dec 2005 15:57:06 -0000	1.2
+++ paw.README	15 Dec 2005 12:07:04 -0000	1.3
@@ -41,11 +41,6 @@
 
 to the beginning of them.
 
-5) 64-bit issues
-
-Note that this package is not yet fully functional on 64-bit machines, as the
-COMIS portion of Pawlib does not yet work correctly on those architectures.
-
 -- Kevin McCarty , Tue, 22 Nov 2005
 
 Adapted to the rpm package by 


--- 211-fix-comis-on-64-bit-arches.dpatch DELETED ---


--- cernlib-rsrtnt64_goto_outer_block.diff DELETED ---


--- cernlib_2005.05.09.dfsg-2.diff DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec 15 12:53:38 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 15 Dec 2005 07:53:38 -0500
Subject: rpms/Coin2/devel Coin2.spec,1.20,1.21
Message-ID: <200512151254.jBFCs8Nw022769@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	Coin2.spec 
Log Message:
- More hacks for modular X11.



Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Coin2.spec	21 Nov 2005 09:35:04 -0000	1.20
+++ Coin2.spec	15 Dec 2005 12:53:36 -0000	1.21
@@ -13,7 +13,7 @@
 Summary: High-level 3D visualization library
 Name: Coin2
 Version: 2.4.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -33,8 +33,6 @@
 BuildRequires: libGL-devel
 # Missing in libGL-devel, libXext-devel
 BuildRequires: libX11-devel
-# Missing in libXext-devel
-BuildRequires: xorg-x11-proto-devel
 
 BuildRequires: zlib-devel
 BuildRequires: bzip2-devel
@@ -52,9 +50,13 @@
 
 %package devel
 Summary: Development files for Coin
-Requires: %{name} = %{version}-%{release}
-Requires: xorg-x11-devel zlib-devel bzip2-devel
 Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: zlib-devel bzip2-devel
+Requires: libGLU-devel
+Requires: libGL-devel
+# Missing in libGL-devel, libXext-devel
+BuildRequires: libX11-devel
 
 %description devel
 Development package for Coin
@@ -120,6 +122,9 @@
 %doc %{coin_htmldir}
 
 %changelog
+* Thu Dec 15 2005 Ralf Corsepius  - 2.4.4-5
+- More hacks for modular X11.
+
 * Mon Nov 21 2005 Ralf Corsepius  - 2.4.4-4
 - Try to work around modular X having broken package deps.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 13:20:46 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 15 Dec 2005 08:20:46 -0500
Subject: rpms/Coin2/devel Coin-2.4.4-gcc-4.1.diff,NONE,1.1
Message-ID: <200512151320.jBFDKk23024659@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Added Files:
	Coin-2.4.4-gcc-4.1.diff 
Log Message:
New.

Coin-2.4.4-gcc-4.1.diff:

--- NEW FILE Coin-2.4.4-gcc-4.1.diff ---
--- Coin-2.4.4.orig/src/nodes/SoExtSelection.cpp	2005-06-09 13:35:44.000000000 +0200
+++ Coin-2.4.4/src/nodes/SoExtSelection.cpp	2005-12-15 14:14:54.000000000 +0100
@@ -348,7 +348,7 @@
     SbList coords;
     SoTimerSensor * updatetimer;
 
-    SelectionState::SelectionState(SoExtSelection * t)
+    SelectionState(SoExtSelection * t)
     {
       this->updatetimer = new SoTimerSensor(&SoExtSelectionP::timercallback, t);
       this->updatetimer->setBaseTime(SbTime::zero());
@@ -356,7 +356,7 @@
       this->reset();
     }
 
-    SelectionState::~SelectionState()
+    ~SelectionState()
     {
       delete this->updatetimer;
     }



From fedora-extras-commits at redhat.com  Thu Dec 15 13:21:48 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 15 Dec 2005 08:21:48 -0500
Subject: rpms/Coin2/devel Coin2.spec,1.21,1.22
Message-ID: <200512151322.jBFDMIPh024701@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	Coin2.spec 
Log Message:
GCC-4.1 fixes


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Coin2.spec	15 Dec 2005 12:53:36 -0000	1.21
+++ Coin2.spec	15 Dec 2005 13:21:46 -0000	1.22
@@ -23,6 +23,7 @@
 
 Patch0: coin-2.3.0-simage-soname.diff
 Patch1: coin-2.3.0-openal-soname.diff
+Patch2: Coin2-2.4.4-gcc-4.1.diff
 Patch5: coin-2.3.0-man3.diff
 
 BuildRequires: libGLU-devel
@@ -65,6 +66,7 @@
 %setup -q -n Coin-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch5 -p1
 
 sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \
@@ -124,6 +126,7 @@
 %changelog
 * Thu Dec 15 2005 Ralf Corsepius  - 2.4.4-5
 - More hacks for modular X11.
+- Add Coin-2.4.4-gcc-4.1.diff.
 
 * Mon Nov 21 2005 Ralf Corsepius  - 2.4.4-4
 - Try to work around modular X having broken package deps.



From fedora-extras-commits at redhat.com  Thu Dec 15 13:35:44 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Thu, 15 Dec 2005 08:35:44 -0500
Subject: rpms/ghdl/devel .cvsignore, 1.2, 1.3 ghdl.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200512151336.jBFDaEQQ024774@cvs-int.fedora.redhat.com>

Author: sailer

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

Modified Files:
	.cvsignore ghdl.spec sources 
Log Message:
update to svn35



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Nov 2005 11:19:29 -0000	1.2
+++ .cvsignore	15 Dec 2005 13:35:42 -0000	1.3
@@ -1,2 +1,5 @@
 gcc-core-4.0.2.tar.bz2
 ghdl-0.21dev.tar.bz2
+ghdl-0.20-svn35.patch
+ghdl-imagef64fix.patch
+ghdl-0.20.tar.bz2


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghdl.spec	2 Dec 2005 16:40:11 -0000	1.3
+++ ghdl.spec	15 Dec 2005 13:35:42 -0000	1.4
@@ -1,10 +1,10 @@
 %define gccver 4.0.2
-%define versuffix dev
+%define ghdlver 0.20
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.21
-Release: 0.24svn.3%{?dist}
+Release: 0.35svn.1%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -12,15 +12,17 @@
 # check out the SVN repo
 # cd translate/gcc/
 # ./dist.sh sources
-Source0: http://ghdl.free.fr/ghdl-%{version}%{versuffix}.tar.bz2
+Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
-Patch0: ghdl-0.21-infodirentry.patch
+Patch0: ghdl-0.20-svn35.patch
+Patch1: ghdl-0.21-infodirentry.patch
+Patch2: ghdl-imagef64fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+Requires: gcc
 # gcc-gnat missing on ppc: Bug 174720
-# mock does not install glibc-devel.i386 on x86_64, therefore
 ExcludeArch: ppc
 
 # Make sure we don't use clashing namespaces
@@ -51,8 +53,12 @@
 
 %prep
 %setup -q -n gcc-%{gccver} -T -b 1 -a 0
-%{__mv} ghdl-%{version}%{versuffix}/vhdl gcc/
-%patch0 -p0
+pushd ghdl-%{ghdlver}
+%patch0 -p1
+%patch2 -p0 -b .imgf64
+%{__mv} vhdl ../gcc/
+popd
+%patch1 -p0
 
 %build
 %{__mkdir} obj-%{gcc_target_platform}
@@ -95,7 +101,7 @@
 	--mandir=%{_mandir} \
 	--infodir=%{_infodir} \
 	--enable-languages=vhdl \
-	--disable-multilib \
+	%{!?_without_mock:--disable-multilib} \
 %ifarch sparc
 	--host=%{gcc_target_platform} \
 	--build=%{gcc_target_platform} \
@@ -112,6 +118,8 @@
 	--host=%{gcc_target_platform}
 %endif
 
+%{__mkdir} -p gcc/vhdl
+%{__cp} ../gcc/vhdl/grt/grt.ver gcc/vhdl
 # Parallel make doesn't work, so not using %{?_smp_mflags}
 %{__make}
 
@@ -121,6 +129,37 @@
 %{__rm} -rf %{buildroot}
 %{__make} -C obj-%{gcc_target_platform} DESTDIR=%{buildroot} install
 
+%ifarch x86_64
+pushd obj-%{gcc_target_platform}/gcc/vhdl
+P32=%{buildroot}/%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib/32/
+%{__install} -d -o 0 -g 0 ${P32}
+make ghdllibs-clean
+%if %{!?_without_mock:0}%{?_without_mock:1}
+make grt-clean
+make GRT_FLAGS=-m32 GRT_TARGET_OBJS="i386.o linux.o times.o" ghdllib
+make grt.lst
+%{__install} -m 644 libgrt.a ${P32}/libgrt.a
+%{__install} -m 644 grt.lst ${P32}/grt.lst
+%{__install} -m 644 grt.ver ${P32}/grt.ver
+%endif
+PDIR=`pwd`
+pushd ${P32}/../..
+%{__install} -d -o 0 -g 0 lib/32/v93
+%{__install} -d -o 0 -g 0 lib/32/v87
+%{__make} -f ${PDIR}/Makefile REL_DIR=../../../.. \
+         LIBSRC_DIR="src" LIB93_DIR=lib/32/v93 LIB87_DIR=lib/32/v87 \
+         ANALYZE="${PDIR}/../ghdl -a -m32 --GHDL1=${PDIR}/../ghdl1 --ieee=none" \
+         std.v93 std.v87 ieee.v93 ieee.v87 synopsys.v93 synopsys.v87 mentor.v93
+popd
+../ghdl1 -m32 --std=87 -quiet -o std_standard.s --compile-standard
+../xgcc -m32 -c -o std_standard.o std_standard.s
+%{__mv} std_standard.o ${P32}/v87/std/std_standard.o
+../ghdl1 -m32 --std=93 -quiet -o std_standard.s --compile-standard
+../xgcc -m32 -c -o std_standard.o std_standard.s
+%{__mv} std_standard.o ${P32}/v93/std/std_standard.o
+popd
+%endif
+
 # Add additional libraries to link
 (
 echo "-lm"
@@ -145,6 +184,11 @@
 	.%{_exec_prefix}/lib/libmudflap.* \
 	.%{_exec_prefix}/lib/libmudflapth.* \
 	.%{_libdir}/32/libiberty.a
+# Remove crt/libgcc, as ghdl invokes the native gcc to perform the linking
+%{__rm} -f \
+	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/crt* \
+	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/libgc* \
+	.%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/{cc1,collect2}
 
 # Remove directory hierarchies not to be packaged
 %{__rm} -rf \
@@ -166,7 +210,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ghdl-%{version}%{versuffix}/COPYING
+%doc ghdl-%{ghdlver}/COPYING
 %{_bindir}/ghdl
 %{_infodir}/ghdl.info.gz
 # Need to own directory %{_libdir}/gcc even though we only want the
@@ -177,6 +221,18 @@
 %{_libexecdir}/gcc/
 
 %changelog
+* Thu Dec 15 2005 Thomas Sailer  - 0.21-0.35svn.1
+- update to svn35 for more x86_64 "Ada cannot portably call C vararg functions"
+  fixes
+- first stab at -m32 library building
+
+* Sat Dec 10 2005 Thomas Sailer  - 0.21-0.33svn.1
+- update to svn33, to fix x86_64 issues (real'image, -m32)
+- rpmbuild option --without mock enables multilib builds
+
+* Mon Dec  5 2005 Thomas Sailer  - 0.21-0.24svn.3
+- disable multilib and remove exclude of x86_64
+
 * Thu Dec  1 2005 Thomas Sailer  - 0.21-0.24svn.2
 - Exclude ppc because gcc-gnat is missing
 - Exclude x86_64 because of mock build issues


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Nov 2005 11:19:29 -0000	1.2
+++ sources	15 Dec 2005 13:35:42 -0000	1.3
@@ -1,2 +1,5 @@
 f7781398ada62ba255486673e6274b26  gcc-core-4.0.2.tar.bz2
 93d0d169eaca9119fa2eb3302f1a7ecc  ghdl-0.21dev.tar.bz2
+9903c648fb586c3abed0d3c9d574a1bb  ghdl-0.20-svn35.patch
+d7302c5e11b51ffec0ada78ee5f3764f  ghdl-imagef64fix.patch
+7d761a9469115e05dc965d68d9760f5b  ghdl-0.20.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 13:40:22 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 15 Dec 2005 08:40:22 -0500
Subject: rpms/meanwhile/devel .cvsignore, 1.4, 1.5 meanwhile.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200512151340.jBFDeqEp024839@cvs-int.fedora.redhat.com>

Author: jwboyer

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

Modified Files:
	.cvsignore meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Oct 2005 19:10:16 -0000	1.4
+++ .cvsignore	15 Dec 2005 13:40:20 -0000	1.5
@@ -1 +1 @@
-meanwhile-0.5.0.tar.gz
+meanwhile-1.0.0.tar.gz


Index: meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/meanwhile.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- meanwhile.spec	30 Oct 2005 19:10:16 -0000	1.4
+++ meanwhile.spec	15 Dec 2005 13:40:20 -0000	1.5
@@ -6,13 +6,12 @@
 Summary:	Lotus Sametime Community Client library
 License:	LGPL
 Group:		Applications/Internet
-Version:	0.5.0
+Version:	1.0.0
 Release:	1%{?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)
-BuildRequires: glib2-devel, gmp-devel, doxygen
-Requires: gmp
+BuildRequires: glib2-devel, doxygen
 
 %description
 The heart of the Meanwhile Project is the Meanwhile library, providing the
@@ -78,6 +77,10 @@
 %{_datadir}/doc/%{name}-doc-%{version}/
 
 %changelog
+* Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.0.0-1
+- Update to latest release
+- gmp and gmp-devel are no longer required since meanwhile uses mpi now
+
 * Sat Oct 29 2005 - jwboyer at jdub.homelinux.org 0.5.0-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Oct 2005 19:10:16 -0000	1.4
+++ sources	15 Dec 2005 13:40:20 -0000	1.5
@@ -1 +1 @@
-302229afe751c7bf889b13f276581dfc  meanwhile-0.5.0.tar.gz
+d1b78beabcb0f4255635edf772d63e52  meanwhile-1.0.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 13:42:09 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 15 Dec 2005 08:42:09 -0500
Subject: rpms/meanwhile/FC-4 .cvsignore, 1.4, 1.5 meanwhile.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200512151342.jBFDgerl024923@cvs-int.fedora.redhat.com>

Author: jwboyer

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

Modified Files:
	.cvsignore meanwhile.spec sources 
Log Message:
Update to latest release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Oct 2005 19:09:55 -0000	1.4
+++ .cvsignore	15 Dec 2005 13:42:07 -0000	1.5
@@ -1 +1 @@
-meanwhile-0.5.0.tar.gz
+meanwhile-1.0.0.tar.gz


Index: meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/meanwhile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- meanwhile.spec	30 Oct 2005 19:09:55 -0000	1.3
+++ meanwhile.spec	15 Dec 2005 13:42:07 -0000	1.4
@@ -6,13 +6,12 @@
 Summary:	Lotus Sametime Community Client library
 License:	LGPL
 Group:		Applications/Internet
-Version:	0.5.0
+Version:	1.0.0
 Release:	1%{?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)
-BuildRequires: glib2-devel, gmp-devel, doxygen
-Requires: gmp
+BuildRequires: glib2-devel, doxygen
 
 %description
 The heart of the Meanwhile Project is the Meanwhile library, providing the
@@ -78,6 +77,10 @@
 %{_datadir}/doc/%{name}-doc-%{version}/
 
 %changelog
+* Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.0.0-1
+- Update to latest release
+- gmp and gmp-devel are no longer required since meanwhile uses mpi now
+
 * Sat Oct 29 2005 - jwboyer at jdub.homelinux.org 0.5.0-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Oct 2005 19:09:55 -0000	1.4
+++ sources	15 Dec 2005 13:42:07 -0000	1.5
@@ -1 +1 @@
-302229afe751c7bf889b13f276581dfc  meanwhile-0.5.0.tar.gz
+d1b78beabcb0f4255635edf772d63e52  meanwhile-1.0.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 13:43:16 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 15 Dec 2005 08:43:16 -0500
Subject: rpms/gaim-meanwhile/devel .cvsignore, 1.5, 1.6 gaim-meanwhile.spec,
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200512151343.jBFDhkoD024994@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24972

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Oct 2005 19:14:53 -0000	1.5
+++ .cvsignore	15 Dec 2005 13:43:14 -0000	1.6
@@ -1 +1 @@
-gaim-meanwhile-1.2.5.tar.gz
+gaim-meanwhile-1.2.6.tar.gz


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gaim-meanwhile.spec	30 Oct 2005 19:14:53 -0000	1.6
+++ gaim-meanwhile.spec	15 Dec 2005 13:43:14 -0000	1.7
@@ -6,13 +6,13 @@
 Summary:	Lotus Sametime Community Client plugin for Gaim
 License:	GPL
 Group:		Applications/Internet
-Version:	1.2.5
+Version:	1.2.6
 Release:	1%{?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)
 BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 0.5.0
-Requires: gaim >= 1.2.1, meanwhile >= 0.5.0, meanwhile < 0.6.0
+Requires: gaim >= 1.2.1, meanwhile < 2.0.0
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
@@ -39,6 +39,9 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.2.6-1
+- Update to latest release
+
 * Sun Oct 30 2005 - jwboyer at jdub.homelinux.org 1.2.5-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Oct 2005 19:14:53 -0000	1.5
+++ sources	15 Dec 2005 13:43:14 -0000	1.6
@@ -1 +1 @@
-23cb1450dc6ecd2cb827bc9d1ec7048d  gaim-meanwhile-1.2.5.tar.gz
+215adb1af37e700f54a4b890788c587d  gaim-meanwhile-1.2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 13:44:45 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 15 Dec 2005 08:44:45 -0500
Subject: rpms/gaim-meanwhile/FC-4 .cvsignore, 1.5, 1.6 gaim-meanwhile.spec,
	1.6, 1.7 sources, 1.6, 1.7
Message-ID: <200512151345.jBFDjFWe025077@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25043

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Oct 2005 19:14:48 -0000	1.5
+++ .cvsignore	15 Dec 2005 13:44:43 -0000	1.6
@@ -1 +1 @@
-gaim-meanwhile-1.2.5.tar.gz
+gaim-meanwhile-1.2.6.tar.gz


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gaim-meanwhile.spec	30 Oct 2005 19:14:48 -0000	1.6
+++ gaim-meanwhile.spec	15 Dec 2005 13:44:43 -0000	1.7
@@ -6,13 +6,13 @@
 Summary:	Lotus Sametime Community Client plugin for Gaim
 License:	GPL
 Group:		Applications/Internet
-Version:	1.2.5
+Version:	1.2.6
 Release:	1%{?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)
 BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 0.5.0
-Requires: gaim >= 1.2.1, meanwhile >= 0.5.0, meanwhile < 0.6.0
+Requires: gaim >= 1.2.1, meanwhile < 2.0.0
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
@@ -39,6 +39,9 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.2.6-1
+- Update to latest release
+
 * Sun Oct 30 2005 - jwboyer at jdub.homelinux.org 1.2.5-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Oct 2005 19:14:48 -0000	1.6
+++ sources	15 Dec 2005 13:44:43 -0000	1.7
@@ -1 +1 @@
-23cb1450dc6ecd2cb827bc9d1ec7048d  gaim-meanwhile-1.2.5.tar.gz
+215adb1af37e700f54a4b890788c587d  gaim-meanwhile-1.2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 13:45:30 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 08:45:30 -0500
Subject: rpms/koffice/devel koffice.spec,1.20,1.21
Message-ID: <200512151346.jBFDk2RH025147@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	koffice.spec 
Log Message:
- with modular x libxslt-devel needs to be pulled in



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- koffice.spec	15 Dec 2005 10:16:31 -0000	1.20
+++ koffice.spec	15 Dec 2005 13:45:28 -0000	1.21
@@ -58,7 +58,8 @@
 BuildRequires:  doxygen
 BuildRequires:  graphviz-devel
 BuildRequires:  aspell-devel
-BuildRequireS:  libacl-devel
+BuildRequires:  libacl-devel
+BuildRequires:  libxslt-devel
 
 %description
 KOffice - Integrated Office Suite



From fedora-extras-commits at redhat.com  Thu Dec 15 13:46:10 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 15 Dec 2005 08:46:10 -0500
Subject: rpms/Coin2/devel Coin2.spec,1.22,1.23
Message-ID: <200512151346.jBFDkeEO025202@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	Coin2.spec 
Log Message:
Fix typo.


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Coin2.spec	15 Dec 2005 13:21:46 -0000	1.22
+++ Coin2.spec	15 Dec 2005 13:46:07 -0000	1.23
@@ -23,7 +23,7 @@
 
 Patch0: coin-2.3.0-simage-soname.diff
 Patch1: coin-2.3.0-openal-soname.diff
-Patch2: Coin2-2.4.4-gcc-4.1.diff
+Patch2: Coin-2.4.4-gcc-4.1.diff
 Patch5: coin-2.3.0-man3.diff
 
 BuildRequires: libGLU-devel



From fedora-extras-commits at redhat.com  Thu Dec 15 13:51:38 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 08:51:38 -0500
Subject: rpms/orange/devel orange.spec,1.1,1.2
Message-ID: <200512151352.jBFDq8f4025288@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	orange.spec 
Log Message:
- rebuild



Index: orange.spec
===================================================================
RCS file: /cvs/extras/rpms/orange/devel/orange.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- orange.spec	24 Nov 2005 23:38:26 -0000	1.1
+++ orange.spec	15 Dec 2005 13:51:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           orange
 Version:        0.3
-Release:        0.cvs20051118%{?dist}
+Release:        0.cvs20051118%{?dist}.1
 Summary:        Squeeze out installable Microsoft cabinet files
 
 Group:          Applications/Communications
@@ -71,6 +71,9 @@
 %{_includedir}/liborange.h
 
 %changelog
+* Thu Dec 15 2005 Andreas Bierfert 
+- rebuild
+
 * Fri Nov 18 2005 Christian Iseli  0.3-0
 - grab latest from CVS to use libgsf instead of obsolete libole2
 



From fedora-extras-commits at redhat.com  Thu Dec 15 14:24:14 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 15 Dec 2005 09:24:14 -0500
Subject: rpms/gaim-meanwhile/devel gaim-meanwhile.spec,1.7,1.8
Message-ID: <200512151424.jBFEOjh7027049@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27031

Modified Files:
	gaim-meanwhile.spec 
Log Message:
Fix meanwhile requires


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gaim-meanwhile.spec	15 Dec 2005 13:43:14 -0000	1.7
+++ gaim-meanwhile.spec	15 Dec 2005 14:24:02 -0000	1.8
@@ -7,12 +7,12 @@
 License:	GPL
 Group:		Applications/Internet
 Version:	1.2.6
-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)
-BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 0.5.0
-Requires: gaim >= 1.2.1, meanwhile < 2.0.0
+BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 1.0.0
+Requires: gaim >= 1.2.1, meanwhile >= 1.0.0, meanwhile < 2.0.0
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
@@ -39,6 +39,9 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Thu Dec 15 2005 - jwboyer at jdub.homelinux.org 1.2.6-2
+- Fix meanwhile requires
+
 * Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.2.6-1
 - Update to latest release
 



From fedora-extras-commits at redhat.com  Thu Dec 15 14:33:18 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 15 Dec 2005 09:33:18 -0500
Subject: rpms/gaim-meanwhile/FC-4 gaim-meanwhile.spec,1.7,1.8
Message-ID: <200512151433.jBFEXmF1027156@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27138

Modified Files:
	gaim-meanwhile.spec 
Log Message:
Fix meanwhile requires


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gaim-meanwhile.spec	15 Dec 2005 13:44:43 -0000	1.7
+++ gaim-meanwhile.spec	15 Dec 2005 14:33:16 -0000	1.8
@@ -7,12 +7,12 @@
 License:	GPL
 Group:		Applications/Internet
 Version:	1.2.6
-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)
-BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 0.5.0
-Requires: gaim >= 1.2.1, meanwhile < 2.0.0
+BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 1.0.0
+Requires: gaim >= 1.2.1, meanwhile >= 1.0.0, meanwhile < 2.0.0
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
@@ -39,6 +39,9 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Thu Dec 15 2005 - jwboyer at jdub.homelinux.org 1.2.6-2
+- Fix meanwhile requires
+
 * Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.2.6-1
 - Update to latest release
 



From fedora-extras-commits at redhat.com  Thu Dec 15 14:42:41 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 09:42:41 -0500
Subject: rpms/libAfterImage/devel libAfterImage.spec,1.2,1.3
Message-ID: <200512151443.jBFEhCrQ027275@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	libAfterImage.spec 
Log Message:
- modular X



Index: libAfterImage.spec
===================================================================
RCS file: /cvs/extras/rpms/libAfterImage/devel/libAfterImage.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libAfterImage.spec	20 Aug 2005 13:26:23 -0000	1.2
+++ libAfterImage.spec	15 Dec 2005 14:42:39 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libAfterImage
 Version:        1.07
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A generic image manipulation library
 
 Group:          System Environment/Libraries
@@ -12,14 +12,13 @@
 Patch1:         libAfterImage-afterimage-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xorg-x11-devel
 BuildRequires:  freetype-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libungif-devel
 BuildRequires:  libjpeg-devel
-
+BuildRequires:  libX11-devel
 %description
 libAfterImage   is a generic image manipulation library. It was initially
 implemented to address AfterStep Window Manager's needs for image handling,
@@ -44,7 +43,7 @@
 Requires: libtiff-devel
 Requires: libjpeg-devel
 Requires: libpng-devel
-Requires: xorg-x11-devel
+Requires: libx11-devel
 
 %description devel
 The %{name}-devel package contains the files needed for development with
@@ -59,7 +58,7 @@
 %configure --enable-i18n --enable-sharedlibs \
 --with-xpm --without-builtin-ungif --disable-staticlibs --enable-glx \
 --without-afterbase --disable-mmx-optimization \
---x-includes=%{_prefix}/X11R6/include --x-libraries=%{_prefix}/X11R6/%{_lib} \
+--x-includes=%{_includedir} --x-libraries=%{_libdir}
 
 make CCFLAGS="-DNO_DEBUG_OUTPUT -fPIC $RPM_OPT_FLAGS" %{?_smp_mflags} \
 LIBAFTERIMAGE_PATH=../
@@ -93,6 +92,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Dec 15 2005 Andreas Bierfert 
+1.07-5
+- modular X
+
 * Sat Aug 20 2005 Andreas Bierfert 
 1.07-4
 - add -fPIC



From fedora-extras-commits at redhat.com  Thu Dec 15 14:44:57 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 09:44:57 -0500
Subject: rpms/gnome-applet-timer/devel .cvsignore, 1.2,
	1.3 gnome-applet-timer.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512151445.jBFEjRiW027348@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-serv27317

Modified Files:
	.cvsignore gnome-applet-timer.spec sources 
Log Message:
update to 1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Sep 2005 15:16:22 -0000	1.2
+++ .cvsignore	15 Dec 2005 14:44:55 -0000	1.3
@@ -1 +1 @@
-timer-applet-1.1.1.tar.gz
+timer-applet-1.2.tar.gz


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-applet-timer.spec	22 Sep 2005 16:31:23 -0000	1.2
+++ gnome-applet-timer.spec	15 Dec 2005 14:44:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
-Version:        1.1.1
-Release:        9%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -31,28 +31,12 @@
 %configure
 make %{?_smp_mflags}
 
-# Part one of omf install hack
-sed -i 's!!!' help/C/timer-applet-C.omf
-sed -i 's!!!' help/fr/timer-applet-fr.omf
-
-# Part one of libexec install hack
-sed -i 's!!!' GNOME_TimerApplet.server
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # For GConf apps: prevent schemas from being installed at this stage
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Part two of omf install hack
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-install -m 0644 -p help/C/timer-applet-C.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-install -m 0644 -p help/fr/timer-applet-fr.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-
-# Part two of libexec install hack
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
-mv ${RPM_BUILD_ROOT}%{_bindir}/timer-applet ${RPM_BUILD_ROOT}%{_libexecdir}/timer-applet
-
 %find_lang timer-applet
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -105,6 +89,10 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Wed Dec 15 2005 Christoph Wickert  - 1.2-1
+- Update to 1.2.
+- Remove all specfile hacks, problems are fixed upstream.
+
 * Thu Sep 22 2005 Christoph Wickert  - 1.1.1-9
 - Increase release due to tag collision.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2005 15:16:22 -0000	1.2
+++ sources	15 Dec 2005 14:44:55 -0000	1.3
@@ -1 +1 @@
-db9dacfa6bd35904dc88740764b1750e  timer-applet-1.1.1.tar.gz
+00dfc31e32a9a4cad3084b78a49c8a40  timer-applet-1.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 15:07:38 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 10:07:38 -0500
Subject: rpms/gnome-applet-timer/FC-4 .cvsignore, 1.2,
	1.3 gnome-applet-timer.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512151508.jBFF89xQ029134@cvs-int.fedora.redhat.com>

Author: cwickert

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

Modified Files:
	.cvsignore gnome-applet-timer.spec sources 
Log Message:
update to 1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Sep 2005 15:16:22 -0000	1.2
+++ .cvsignore	15 Dec 2005 15:07:36 -0000	1.3
@@ -1 +1 @@
-timer-applet-1.1.1.tar.gz
+timer-applet-1.2.tar.gz


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-4/gnome-applet-timer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-applet-timer.spec	22 Sep 2005 17:03:13 -0000	1.2
+++ gnome-applet-timer.spec	15 Dec 2005 15:07:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
-Version:        1.1.1
-Release:        9%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -31,28 +31,12 @@
 %configure
 make %{?_smp_mflags}
 
-# Part one of omf install hack
-sed -i 's!!!' help/C/timer-applet-C.omf
-sed -i 's!!!' help/fr/timer-applet-fr.omf
-
-# Part one of libexec install hack
-sed -i 's!!!' GNOME_TimerApplet.server
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # For GConf apps: prevent schemas from being installed at this stage
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Part two of omf install hack
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-install -m 0644 -p help/C/timer-applet-C.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-install -m 0644 -p help/fr/timer-applet-fr.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-
-# Part two of libexec install hack
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
-mv ${RPM_BUILD_ROOT}%{_bindir}/timer-applet ${RPM_BUILD_ROOT}%{_libexecdir}/timer-applet
-
 %find_lang timer-applet
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -105,6 +89,10 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Wed Dec 15 2005 Christoph Wickert  - 1.2-1
+- Update to 1.2.
+- Remove all specfile hacks, problems are fixed upstream.
+
 * Thu Sep 22 2005 Christoph Wickert  - 1.1.1-9
 - Increase release due to tag collision.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2005 15:16:22 -0000	1.2
+++ sources	15 Dec 2005 15:07:36 -0000	1.3
@@ -1 +1 @@
-db9dacfa6bd35904dc88740764b1750e  timer-applet-1.1.1.tar.gz
+00dfc31e32a9a4cad3084b78a49c8a40  timer-applet-1.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 15:08:57 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Dec 2005 10:08:57 -0500
Subject: rpms/kmymoney2/FC-4 kmymoney2.spec,1.3,1.4
Message-ID: <200512151508.jBFF8v1E029231@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Log Message:
change >= conditionals to >



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/kmymoney2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmymoney2.spec	14 Nov 2005 17:35:12 -0000	1.3
+++ kmymoney2.spec	15 Dec 2005 15:08:35 -0000	1.4
@@ -1,9 +1,9 @@
 
-%if "%{?fedora}" >= "3"
+%if "%{?fedora}" > "2"
 %define _with_ofxbanking --with-ofxbanking
 %endif
 
-%if "%{?rhel}" >= "4"
+%if "%{?rhel}" > "3"
 %define _with_ofxbanking --with-ofxbanking
 %endif
 



From fedora-extras-commits at redhat.com  Thu Dec 15 15:08:30 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Dec 2005 10:08:30 -0500
Subject: rpms/kmymoney2/FC-3 kmymoney2.spec,1.3,1.4
Message-ID: <200512151509.jBFF90Wp029238@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Log Message:
change >= conditionals to >



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/kmymoney2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmymoney2.spec	14 Nov 2005 17:35:07 -0000	1.3
+++ kmymoney2.spec	15 Dec 2005 15:08:28 -0000	1.4
@@ -1,9 +1,9 @@
 
-%if "%{?fedora}" >= "3"
+%if "%{?fedora}" > "2"
 %define _with_ofxbanking --with-ofxbanking
 %endif
 
-%if "%{?rhel}" >= "4"
+%if "%{?rhel}" > "3"
 %define _with_ofxbanking --with-ofxbanking
 %endif
 



From fedora-extras-commits at redhat.com  Thu Dec 15 15:08:15 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Dec 2005 10:08:15 -0500
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.3,1.4
Message-ID: <200512151509.jBFF9J78029247@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Log Message:
change >= conditionals to >



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmymoney2.spec	14 Nov 2005 17:35:17 -0000	1.3
+++ kmymoney2.spec	15 Dec 2005 15:08:12 -0000	1.4
@@ -1,9 +1,9 @@
 
-%if "%{?fedora}" >= "3"
+%if "%{?fedora}" > "2"
 %define _with_ofxbanking --with-ofxbanking
 %endif
 
-%if "%{?rhel}" >= "4"
+%if "%{?rhel}" > "3"
 %define _with_ofxbanking --with-ofxbanking
 %endif
 



From fedora-extras-commits at redhat.com  Thu Dec 15 15:10:00 2005
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Thu, 15 Dec 2005 10:10:00 -0500
Subject: rpms/nedit/devel nedit.spec,1.3,1.4
Message-ID: <200512151510.jBFFAUgt029276@cvs-int.fedora.redhat.com>

Author: jnovy

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

Modified Files:
	nedit.spec 
Log Message:
- rebuilt to fix X dependency



Index: nedit.spec
===================================================================
RCS file: /cvs/extras/rpms/nedit/devel/nedit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nedit.spec	17 Oct 2005 08:16:21 -0000	1.3
+++ nedit.spec	15 Dec 2005 15:09:57 -0000	1.4
@@ -5,7 +5,7 @@
 Summary: A GUI text editor for systems with X and Motif.
 Name: nedit
 Version: 5.5
-Release: 5
+Release: 6
 Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2
 Source1: nedit.desktop
 Source2: nedit-icon.png
@@ -80,6 +80,9 @@
 %endif
 
 %changelog
+* Thu Dec 15 2005 Jindrich Novy  5.5-6
+- rebuilt to fix X dependencies
+
 * Mon Oct 10 2005 Jindrich Novy  5.5-5
 - update nedit file locations to new xorg standards (#167208, #170937)
 - rename nc to nedit-client to avoid conflict with netcat and



From fedora-extras-commits at redhat.com  Thu Dec 15 15:11:47 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:11:47 -0500
Subject: rpms/chmlib - New directory
Message-ID: <200512151511.jBFFBlsH029327@cvs-int.fedora.redhat.com>

Author: peter

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

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




From fedora-extras-commits at redhat.com  Thu Dec 15 15:11:53 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:11:53 -0500
Subject: rpms/chmlib/devel - New directory
Message-ID: <200512151511.jBFFBrED029346@cvs-int.fedora.redhat.com>

Author: peter

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

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




From fedora-extras-commits at redhat.com  Thu Dec 15 15:13:05 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:13:05 -0500
Subject: rpms/chmlib Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512151513.jBFFD5jj029391@cvs-int.fedora.redhat.com>

Author: peter

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 15 15:13:24 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:13:24 -0500
Subject: rpms/chmlib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512151513.jBFFDPhh029410@cvs-int.fedora.redhat.com>

Author: peter

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

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


--- NEW 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 Dec 15 15:14:31 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 10:14:31 -0500
Subject: rpms/gnome-applet-timer/FC-3 .cvsignore, 1.2,
	1.3 gnome-applet-timer.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512151515.jBFFFApa029466@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29437

Modified Files:
	.cvsignore gnome-applet-timer.spec sources 
Log Message:
update to 1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Sep 2005 15:16:22 -0000	1.2
+++ .cvsignore	15 Dec 2005 15:14:24 -0000	1.3
@@ -1 +1 @@
-timer-applet-1.1.1.tar.gz
+timer-applet-1.2.tar.gz


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-3/gnome-applet-timer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-applet-timer.spec	22 Sep 2005 17:06:25 -0000	1.2
+++ gnome-applet-timer.spec	15 Dec 2005 15:14:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
-Version:        1.1.1
-Release:        9%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -31,28 +31,12 @@
 %configure
 make %{?_smp_mflags}
 
-# Part one of omf install hack
-sed -i 's!!!' help/C/timer-applet-C.omf
-sed -i 's!!!' help/fr/timer-applet-fr.omf
-
-# Part one of libexec install hack
-sed -i 's!!!' GNOME_TimerApplet.server
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # For GConf apps: prevent schemas from being installed at this stage
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Part two of omf install hack
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-install -m 0644 -p help/C/timer-applet-C.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-install -m 0644 -p help/fr/timer-applet-fr.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-
-# Part two of libexec install hack
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
-mv ${RPM_BUILD_ROOT}%{_bindir}/timer-applet ${RPM_BUILD_ROOT}%{_libexecdir}/timer-applet
-
 %find_lang timer-applet
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -105,6 +89,10 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Wed Dec 15 2005 Christoph Wickert  - 1.2-1
+- Update to 1.2.
+- Remove all specfile hacks, problems are fixed upstream.
+
 * Thu Sep 22 2005 Christoph Wickert  - 1.1.1-9
 - Increase release due to tag collision.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2005 15:16:22 -0000	1.2
+++ sources	15 Dec 2005 15:14:24 -0000	1.3
@@ -1 +1 @@
-db9dacfa6bd35904dc88740764b1750e  timer-applet-1.1.1.tar.gz
+00dfc31e32a9a4cad3084b78a49c8a40  timer-applet-1.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 15:16:05 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:16:05 -0500
Subject: rpms/chmlib import.log,1.1,1.2
Message-ID: <200512151516.jBFFGanJ029590@cvs-int.fedora.redhat.com>

Author: peter

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/chmlib/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 15:13:03 -0000	1.1
+++ import.log	15 Dec 2005 15:16:03 -0000	1.2
@@ -0,0 +1 @@
+chmlib-0_37_4-1:HEAD:chmlib-0.37.4-1.src.rpm:1134659729



From fedora-extras-commits at redhat.com  Thu Dec 15 15:16:11 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:16:11 -0500
Subject: rpms/chmlib/devel chmlib.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512151516.jBFFGfrm029596@cvs-int.fedora.redhat.com>

Author: peter

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

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


--- NEW FILE chmlib.spec ---
Name: 		chmlib
Summary: 	Library for dealing with ITSS/CHM format files
Version: 	0.37.4
Release: 	1
License: 	LGPL
Group: 		Development/Libraries
Url: 		http://66.93.236.84/~jedwin/projects/chmlib/
Source: 	http://66.93.236.84/~jedwin/projects/chmlib/%{name}-%{version}.tgz
Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
CHMLIB is a library for dealing with ITSS/CHM format files. Right now, it is 
a very simple library, but sufficient for dealing with all of the .chm files 
I've come across. Due to the fairly well-designed indexing built into this 
particular file format, even a small library is able to gain reasonably good 
performance indexing into ITSS archives.

%package devel
Summary:	Library for dealing with ITSS/CHM format files - development files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Files needed for developing apps using chmlib.

%prep
%setup -q -n chmlib-0.37

%build
%configure --disable-static
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
%{__rm} -f %{buildroot}/%{_libdir}/*.la

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

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

%files
%defattr(-,root,root,-)
%{_libdir}/libchm.so.*
%doc README AUTHORS COPYING NEWS

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

%changelog

* Sat Nov 12 2005 Peter Lemenkov  0.37.4-1
- Initial build for FC-Extras



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 15:13:19 -0000	1.1
+++ .cvsignore	15 Dec 2005 15:16:09 -0000	1.2
@@ -0,0 +1 @@
+chmlib-0.37.4.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 15:13:19 -0000	1.1
+++ sources	15 Dec 2005 15:16:09 -0000	1.2
@@ -0,0 +1 @@
+458c14c7a38c441263e6984924a05b24  chmlib-0.37.4.tgz



From fedora-extras-commits at redhat.com  Thu Dec 15 15:22:52 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:22:52 -0500
Subject: owners owners.list,1.453,1.454
Message-ID: <200512151523.jBFFNMQd029727@cvs-int.fedora.redhat.com>

Author: peter

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

Modified Files:
	owners.list 
Log Message:

Added chmlib-module.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- owners.list	15 Dec 2005 05:31:50 -0000	1.453
+++ owners.list	15 Dec 2005 15:22:50 -0000	1.454
@@ -96,6 +96,7 @@
 Fedora Extras|cgoban|X board for playing go|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
+Fedora Extras|chmlib|Library for dealing with ITSS/CHM format files|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|clamav|End-user tools for the Clam Antivirus scanner|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 15 15:23:37 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 10:23:37 -0500
Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec,1.3,1.4
Message-ID: <200512151524.jBFFO7Nh029756@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-serv29733

Modified Files:
	gnome-applet-timer.spec 
Log Message:
Bump release due to tag collision in Core 4


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applet-timer.spec	15 Dec 2005 14:44:55 -0000	1.3
+++ gnome-applet-timer.spec	15 Dec 2005 15:23:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -89,6 +89,9 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Wed 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
 - Update to 1.2.
 - Remove all specfile hacks, problems are fixed upstream.



From fedora-extras-commits at redhat.com  Thu Dec 15 15:25:32 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 10:25:32 -0500
Subject: rpms/gnome-applet-timer/FC-4 gnome-applet-timer.spec,1.3,1.4
Message-ID: <200512151526.jBFFQ3UK029788@cvs-int.fedora.redhat.com>

Author: cwickert

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

Modified Files:
	gnome-applet-timer.spec 
Log Message:
Bump release due to tag collision in Core 4


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-4/gnome-applet-timer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applet-timer.spec	15 Dec 2005 15:07:36 -0000	1.3
+++ gnome-applet-timer.spec	15 Dec 2005 15:25:30 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -89,6 +89,9 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Wed 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
 - Update to 1.2.
 - Remove all specfile hacks, problems are fixed upstream.



From fedora-extras-commits at redhat.com  Thu Dec 15 15:29:45 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:29:45 -0500
Subject: rpms/chmlib/devel chmlib.spec,1.1,1.2
Message-ID: <200512151530.jBFFUGAT029844@cvs-int.fedora.redhat.com>

Author: peter

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

Modified Files:
	chmlib.spec 
Log Message:

Added missing dist tag.




Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chmlib.spec	15 Dec 2005 15:16:09 -0000	1.1
+++ chmlib.spec	15 Dec 2005 15:29:43 -0000	1.2
@@ -1,7 +1,7 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.37.4
-Release: 	1
+Release: 	1%{?dist}
 License: 	LGPL
 Group: 		Development/Libraries
 Url: 		http://66.93.236.84/~jedwin/projects/chmlib/



From fedora-extras-commits at redhat.com  Thu Dec 15 15:48:30 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 10:48:30 -0500
Subject: rpms/gnome-applet-timer/FC-3 gnome-applet-timer.spec,1.3,1.4
Message-ID: <200512151549.jBFFn0Zn030036@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30003

Modified Files:
	gnome-applet-timer.spec 
Log Message:
Bump release due to tag collision in Core 4


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-3/gnome-applet-timer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applet-timer.spec	15 Dec 2005 15:14:24 -0000	1.3
+++ gnome-applet-timer.spec	15 Dec 2005 15:48:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -89,6 +89,9 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Wed 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
 - Update to 1.2.
 - Remove all specfile hacks, problems are fixed upstream.



From fedora-extras-commits at redhat.com  Thu Dec 15 15:49:01 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 10:49:01 -0500
Subject: rpms/nsd/devel nsd.spec,1.5,1.6
Message-ID: <200512151549.jBFFnWuK030053@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	nsd.spec 
Log Message:
* Thu Dec 15 2005 Paul Wouters  - 2.3.3-7
- chkconfig and attribute  changes as proposed by Dmitry Butskoy



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsd.spec	15 Dec 2005 04:50:32 -0000	1.5
+++ nsd.spec	15 Dec 2005 15:48:59 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -29,10 +29,10 @@
 %{__make} %{?_smp_mflags}
 
 %install
+rm -rf %{buildroot}
 # Not using their 'make install' since it uses install-sh which does not
 # get the correct install path within the RPM_BUILD_ROOT
 #%{__make} install
-rm -rf %{buildroot}
 install -d 0755 %{buildroot}/%{_sysconfdir}/nsd
 install -d 0755 %{buildroot}/%{_sbindir}
 install -d 0755 %{buildroot}/%{_mandir}/man8
@@ -51,7 +51,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %files 
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README LICENSE NSD-DATABASE DIFFERENCES dbaccess.c TODO RELNOTES REQUIREMENTS
 %dir %{_sysconfdir}/nsd/
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
@@ -70,19 +70,13 @@
 exit 0
 
 %post
-# do not activate daemon upon request. Fedora Extra policy
+/sbin/chkconfig --add %{name}
 
 %preun
-if [ -f /%{_localstatedir}/run/%{name}/%{name}.pid ]
-then
+if [ $1 -eq 0 ]; then
         /sbin/service %{name} stop > /dev/null 2>&1
+        /sbin/chkconfig --del %{name} 
 fi
-if [ $1 -eq 0 ]
-then
-        /sbin/chkconfig --del %{name} > /dev/null 2>&1
-fi
-# "Everyone is doing it, so why can't we?"
-exit 0
 
 %postun
 if [ "$1" -ge "1" ]; then
@@ -90,6 +84,9 @@
 fi
 
 %changelog
+* Thu Dec 15 2005 Paul Wouters  - 2.3.3-7
+- chkconfig and attribute  changes as proposed by Dmitry Butskoy
+
 * Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
 - Moved pid file to /var/run/nsd/nsd.pid.
 - Use %{_localstatedir} instead of "/var"



From fedora-extras-commits at redhat.com  Thu Dec 15 15:50:33 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 10:50:33 -0500
Subject: rpms/aterm/devel aterm.spec,1.10,1.11
Message-ID: <200512151551.jBFFp3Pt030095@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	aterm.spec 
Log Message:
- modular X



Index: aterm.spec
===================================================================
RCS file: /cvs/extras/rpms/aterm/devel/aterm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- aterm.spec	20 Aug 2005 09:00:49 -0000	1.10
+++ aterm.spec	15 Dec 2005 15:50:31 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           aterm
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Afterstep XVT, VT102 emulator for the X Window system
 Group:          User Interface/X
@@ -10,9 +10,11 @@
 Source1:        aterm.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:  xorg-x11-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libAfterImage-devel
+BuildRequires:  libXt-devel
+BuildRequires:  libXext-devel
+BuildRequires:  mesa-libGL-devel
 
 %description
 aterm,  version  1.00 is  a colour vt102 terminal emulator, based on
@@ -31,7 +33,8 @@
 --enable-next-scroll --enable-utmp --enable-wtmp \
 --enable-menubar --enable-graphics -enable-kanji \
 --enable-big5 --enable-greek --enable-ttygid \
---enable-xgetdefault --with-term=xterm --with-x
+--enable-xgetdefault --with-term=xterm \
+--x-includes=%{_includedir} --x-libraries=%{_libdir}
 
 make %{?_smp_mflags}
 



From fedora-extras-commits at redhat.com  Thu Dec 15 16:14:08 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 11:14:08 -0500
Subject: rpms/libAfterImage/devel libAfterImage.spec,1.3,1.4
Message-ID: <200512151614.jBFGEd8K031872@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	libAfterImage.spec 
Log Message:
- fix typo



Index: libAfterImage.spec
===================================================================
RCS file: /cvs/extras/rpms/libAfterImage/devel/libAfterImage.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libAfterImage.spec	15 Dec 2005 14:42:39 -0000	1.3
+++ libAfterImage.spec	15 Dec 2005 16:14:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libAfterImage
 Version:        1.07
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A generic image manipulation library
 
 Group:          System Environment/Libraries
@@ -43,7 +43,7 @@
 Requires: libtiff-devel
 Requires: libjpeg-devel
 Requires: libpng-devel
-Requires: libx11-devel
+Requires: libX11-devel
 
 %description devel
 The %{name}-devel package contains the files needed for development with
@@ -93,6 +93,10 @@
 
 %changelog
 * Thu Dec 15 2005 Andreas Bierfert 
+1.07-6
+- fix typo
+
+* Thu Dec 15 2005 Andreas Bierfert 
 1.07-5
 - modular X
 



From fedora-extras-commits at redhat.com  Thu Dec 15 16:21:54 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 11:21:54 -0500
Subject: rpms/nsd/FC-3 nsd.spec,1.4,1.5
Message-ID: <200512151622.jBFGMOEw031947@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	nsd.spec 
Log Message:
* Thu Dec 15 2005 Paul Wouters  - 2.3.3-7
- chkconfig and attribute  changes as proposed by Dmitry Butskoy



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsd.spec	15 Dec 2005 04:53:18 -0000	1.4
+++ nsd.spec	15 Dec 2005 16:21:52 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -29,10 +29,10 @@
 %{__make} %{?_smp_mflags}
 
 %install
+rm -rf %{buildroot}
 # Not using their 'make install' since it uses install-sh which does not
 # get the correct install path within the RPM_BUILD_ROOT
 #%{__make} install
-rm -rf %{buildroot}
 install -d 0755 %{buildroot}/%{_sysconfdir}/nsd
 install -d 0755 %{buildroot}/%{_sbindir}
 install -d 0755 %{buildroot}/%{_mandir}/man8
@@ -51,7 +51,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %files 
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README LICENSE NSD-DATABASE DIFFERENCES dbaccess.c TODO RELNOTES REQUIREMENTS
 %dir %{_sysconfdir}/nsd/
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
@@ -70,19 +70,13 @@
 exit 0
 
 %post
-# do not activate daemon upon request. Fedora Extra policy
+/sbin/chkconfig --add %{name}
 
 %preun
-if [ -f /%{_localstatedir}/run/%{name}/%{name}.pid ]
-then
+if [ $1 -eq 0 ]; then
         /sbin/service %{name} stop > /dev/null 2>&1
+        /sbin/chkconfig --del %{name} 
 fi
-if [ $1 -eq 0 ]
-then
-        /sbin/chkconfig --del %{name} > /dev/null 2>&1
-fi
-# "Everyone is doing it, so why can't we?"
-exit 0
 
 %postun
 if [ "$1" -ge "1" ]; then
@@ -90,6 +84,9 @@
 fi
 
 %changelog
+* Thu Dec 15 2005 Paul Wouters  - 2.3.3-7
+- chkconfig and attribute  changes as proposed by Dmitry Butskoy
+
 * Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
 - Moved pid file to /var/run/nsd/nsd.pid.
 - Use %{_localstatedir} instead of "/var"



From fedora-extras-commits at redhat.com  Thu Dec 15 16:24:10 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 11:24:10 -0500
Subject: rpms/nsd/FC-4 nsd.spec,1.4,1.5
Message-ID: <200512151624.jBFGOe4H032081@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	nsd.spec 
Log Message:
* Thu Dec 15 2005 Paul Wouters  - 2.3.3-7
- chkconfig and attribute  changes as proposed by Dmitry Butskoy



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsd.spec	15 Dec 2005 04:52:14 -0000	1.4
+++ nsd.spec	15 Dec 2005 16:24:07 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -29,10 +29,10 @@
 %{__make} %{?_smp_mflags}
 
 %install
+rm -rf %{buildroot}
 # Not using their 'make install' since it uses install-sh which does not
 # get the correct install path within the RPM_BUILD_ROOT
 #%{__make} install
-rm -rf %{buildroot}
 install -d 0755 %{buildroot}/%{_sysconfdir}/nsd
 install -d 0755 %{buildroot}/%{_sbindir}
 install -d 0755 %{buildroot}/%{_mandir}/man8
@@ -51,7 +51,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %files 
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README LICENSE NSD-DATABASE DIFFERENCES dbaccess.c TODO RELNOTES REQUIREMENTS
 %dir %{_sysconfdir}/nsd/
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
@@ -70,19 +70,13 @@
 exit 0
 
 %post
-# do not activate daemon upon request. Fedora Extra policy
+/sbin/chkconfig --add %{name}
 
 %preun
-if [ -f /%{_localstatedir}/run/%{name}/%{name}.pid ]
-then
+if [ $1 -eq 0 ]; then
         /sbin/service %{name} stop > /dev/null 2>&1
+        /sbin/chkconfig --del %{name} 
 fi
-if [ $1 -eq 0 ]
-then
-        /sbin/chkconfig --del %{name} > /dev/null 2>&1
-fi
-# "Everyone is doing it, so why can't we?"
-exit 0
 
 %postun
 if [ "$1" -ge "1" ]; then
@@ -90,6 +84,9 @@
 fi
 
 %changelog
+* Thu Dec 15 2005 Paul Wouters  - 2.3.3-7
+- chkconfig and attribute  changes as proposed by Dmitry Butskoy
+
 * Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
 - Moved pid file to /var/run/nsd/nsd.pid.
 - Use %{_localstatedir} instead of "/var"



From fedora-extras-commits at redhat.com  Thu Dec 15 16:24:46 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 15 Dec 2005 11:24:46 -0500
Subject: rpms/plplot/devel plplot.spec,1.5,1.6
Message-ID: <200512151625.jBFGPHQY032104@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	plplot.spec 
Log Message:
Rebuild for gcc 4.1



Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plplot.spec	30 Aug 2005 15:53:16 -0000	1.5
+++ plplot.spec	15 Dec 2005 16:24:44 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           plplot
 Version:        5.5.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -308,6 +308,9 @@
 %{_datadir}/plplot%{version}/examples/tk/
 
 %changelog
+* Thu Dec 15 2005 - Orion Poplawski  - 5.5.3-9
+- Rebuild for gcc 4.1
+
 * Tue Aug 30 2005 - Orion Poplawski  - 5.5.3-8
 - Re-enable java on ppc - should be fixed in upstream rawhide
 



From fedora-extras-commits at redhat.com  Thu Dec 15 16:27:00 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 15 Dec 2005 11:27:00 -0500
Subject: rpms/tla/FC-4 tla.spec,1.17,1.18
Message-ID: <200512151627.jBFGRU3E032210@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	tla.spec 
Log Message:
Don't build on PPC



Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/FC-4/tla.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tla.spec	13 Jun 2005 17:08:03 -0000	1.17
+++ tla.spec	15 Dec 2005 16:26:58 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           tla
 Version:        1.3.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
@@ -16,6 +16,7 @@
 
 BuildRequires:  neon-devel, which
 Requires:       tar, diffutils, patch
+ExcludeArch:    ppc
 
 %description
 Arch is a really nifty revision control system. It's "whole-tree changeset
@@ -71,6 +72,9 @@
 %{_bindir}/tla
 
 %changelog
+* Thu Dec 15 2005 Shahms E. King  - 1.3.3-2
+- Don't build on PPC on FC4 as it fails
+
 * Mon Jun 13 2005 Shahms E. King  - 0.1.3.3-1
 - Update to new upstream version
 



From fedora-extras-commits at redhat.com  Thu Dec 15 16:28:27 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu, 15 Dec 2005 11:28:27 -0500
Subject: fedora-security/audit fc4,1.107,1.108 fc5,1.18,1.19
Message-ID: <200512151628.jBFGSvMn032296@cvs-int.fedora.redhat.com>

Author: mjc

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

Modified Files:
	fc4 fc5 
Log Message:
Updates for 20051214



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- fc4	14 Dec 2005 11:42:15 -0000	1.107
+++ fc4	15 Dec 2005 16:28:25 -0000	1.108
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20051213
-Up to date FC4 as of 20051211
+Up to date CVE as of CVE email 20051214
+Up to date FC4 as of 20051214
 
 ** are items that need attention
 
@@ -9,21 +9,24 @@
 CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
+CVE-2005-3193 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)
 CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3193 backport (poppler) [since FEDORA-2005-1132]
+CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3192 VULNERABLE (xpdf)
 CVE-2005-3192 VULNERABLE (kdegraphics)
 CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3192 backport (poppler) [since FEDORA-2005-1132]
+CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3191 VULNERABLE (xpdf)
 CVE-2005-3191 VULNERABLE (kdegraphics)
 CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3191 backport (poppler) [since FEDORA-2005-1132]
 CVE-2005-3964 VULNERABLE (openmotif) bz#174815
-CVE-2005-3962 backport (perl) [since FEDORA-2005-1113]
-CVE-2005-3912 backport (perl) [since FEDORA-2005-1113]
+CVE-2005-3962 backport (perl) [since FEDORA-2005-1144]
+CVE-2005-3912 backport (perl) [since FEDORA-2005-1144]
 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)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fc5	14 Dec 2005 11:42:15 -0000	1.18
+++ fc5	15 Dec 2005 16:28:25 -0000	1.19
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20051213
+Up to date CVE as of CVE email 20051214
 Up to date FC5 as of FC5-Test1-RC
 
 1. Removed packages with security issues that are no longer in FC5 



From fedora-extras-commits at redhat.com  Thu Dec 15 16:30:38 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 11:30:38 -0500
Subject: rpms/nsd/FC-4 nsd.spec,1.5,1.6
Message-ID: <200512151631.jBFGV8c7032354@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	nsd.spec 
Log Message:
bump version



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsd.spec	15 Dec 2005 16:24:07 -0000	1.5
+++ nsd.spec	15 Dec 2005 16:30:36 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 16:40:57 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 15 Dec 2005 11:40:57 -0500
Subject: rpms/mod_auth_pam/devel mod_auth_pam.spec,1.3,1.4
Message-ID: <200512151641.jBFGfRkN032517@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-serv32499

Modified Files:
	mod_auth_pam.spec 
Log Message:
Bump for Apache 2.2.0


Index: mod_auth_pam.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_auth_pam/devel/mod_auth_pam.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_auth_pam.spec	7 Oct 2005 13:56:21 -0000	1.3
+++ mod_auth_pam.spec	15 Dec 2005 16:40:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           mod_auth_pam
 Version:        1.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PAM authentication module for Apache
 
 Group:          System Environment/Daemons
@@ -52,6 +52,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Thu Dec 15 2005 Ignacio Vazquez-Abrams  1.1.1-3
+- Bump for Apache 2.2.0
+
 * Fri Oct  7 2005 Ignacio Vazquez-Abrams  1.1.1-2
 - Use include instead of pam_stack
 



From fedora-extras-commits at redhat.com  Thu Dec 15 17:17:54 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 15 Dec 2005 12:17:54 -0500
Subject: rpms/tla/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tla.spec, 1.18,
	1.19 tla-sysneon.patch, 1.3, NONE
Message-ID: <200512151718.jBFHIPmU001794@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	.cvsignore sources tla.spec 
Removed Files:
	tla-sysneon.patch 
Log Message:
Backport Ville's patches from devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tla/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Jun 2005 17:08:03 -0000	1.8
+++ .cvsignore	15 Dec 2005 17:17:52 -0000	1.9
@@ -1,2 +1,3 @@
 tla-1.3.3.tar.gz
 tla-1.3.3.tar.gz.sig
+tla_1.3.3-3.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tla/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Jun 2005 17:08:03 -0000	1.8
+++ sources	15 Dec 2005 17:17:52 -0000	1.9
@@ -1,2 +1,3 @@
 61d5dea41e071f78a8319401ee07ab0b  tla-1.3.3.tar.gz
 2e176f99458250c04c6cbdb2f71b6b27  tla-1.3.3.tar.gz.sig
+feb23c5632fec91307f29738ec246c12  tla_1.3.3-3.diff.gz


Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/FC-4/tla.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tla.spec	15 Dec 2005 16:26:58 -0000	1.18
+++ tla.spec	15 Dec 2005 17:17:52 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           tla
 Version:        1.3.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
@@ -10,13 +10,12 @@
 Source1:        http://ftp.gnu.org/gnu/gnu-arch/%{name}-%{version}.tar.gz.sig
 # Patch0 from SuSE 9.1's tla-1.2-15
 Patch0:         tla-1.2pre0-posix.patch
-Patch1:         tla-sysneon.patch
+Patch1:         http://ftp.debian.org/debian/pool/main/t/tla/tla_1.3.3-3.diff.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  neon-devel, which
 Requires:       tar, diffutils, patch
-ExcludeArch:    ppc
 
 %description
 Arch is a really nifty revision control system. It's "whole-tree changeset
@@ -39,7 +38,6 @@
 %build
 mkdir src/=build
 cd src/=build
-#export CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
 ../configure \
   --prefix=%{_prefix} --with-install-link-tools=yes --with-cc=%{__cc}
 make CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)" # %{?_smp_mflags} # 1.[23] is not parallel build clean
@@ -48,18 +46,20 @@
 mkdir -p docs-tla/html
 (cd ../docs-tla; find .  -name \*.css -o -name \*.html | xargs tar -cf- ) | \
 (cd docs-tla/html; tar -xf-)
+cd ../..
+
+mkdir debian/tmp
+PATH="`pwd`/src/=build/tla/tla:$PATH" perl debian/generate-manpage.pl tla.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd src/=build
-make install destdir=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
+make -C src/=build install \
+    destdir=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
+install -Dpm 644 debian/tmp/tla.1 $RPM_BUILD_ROOT%{_mandir}/man1/tla.1
+rm $RPM_BUILD_ROOT%{_bindir}/awiki
 
-%check || :
-cd src/=build
-make test CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
-
-# don't install "awiki"
-rm $RPM_BUILD_ROOT%{_prefix}/bin/awiki
+%check
+make -C src/=build test CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,12 +70,18 @@
 %{_bindir}/make-links
 %{_bindir}/remove-links
 %{_bindir}/tla
+%{_mandir}/man1/tla.1*
 
 %changelog
-* Thu Dec 15 2005 Shahms E. King  - 1.3.3-2
-- Don't build on PPC on FC4 as it fails
+* 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.
+- Specfile cleanups.
+
+* Tue Dec 13 2005 Ville Skytt??  - 1.3.3-2
+- Rebuild against new OpenSSL.
 
-* Mon Jun 13 2005 Shahms E. King  - 0.1.3.3-1
+* Mon Jun 13 2005 Shahms E. King  - 1.3.3-1
 - Update to new upstream version
 
 * Sun May 22 2005 Jeremy Katz  - 1.3.2


--- tla-sysneon.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec 15 17:52:43 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Dec 2005 12:52:43 -0500
Subject: rpms/kile/devel kile.spec,1.20,1.21
Message-ID: <200512151753.jBFHrE1Q002008@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kile.spec 
Log Message:
use handier loop for icon handling



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kile.spec	10 Nov 2005 19:23:53 -0000	1.20
+++ kile.spec	15 Dec 2005 17:52:41 -0000	1.21
@@ -96,13 +96,17 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 



From fedora-extras-commits at redhat.com  Thu Dec 15 17:52:49 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Dec 2005 12:52:49 -0500
Subject: rpms/kile/FC-3 kile.spec,1.14,1.15
Message-ID: <200512151753.jBFHrJiV002026@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kile.spec 
Log Message:
use handier loop for icon handling



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/kile.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kile.spec	10 Nov 2005 19:23:42 -0000	1.14
+++ kile.spec	15 Dec 2005 17:52:47 -0000	1.15
@@ -96,13 +96,17 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 



From fedora-extras-commits at redhat.com  Thu Dec 15 17:52:54 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Dec 2005 12:52:54 -0500
Subject: rpms/kile/FC-4 kile.spec,1.18,1.19
Message-ID: <200512151753.jBFHrPvo002038@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kile.spec 
Log Message:
use handier loop for icon handling



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-4/kile.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kile.spec	10 Nov 2005 19:23:47 -0000	1.18
+++ kile.spec	15 Dec 2005 17:52:52 -0000	1.19
@@ -96,13 +96,17 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 



From fedora-extras-commits at redhat.com  Thu Dec 15 17:53:15 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 15 Dec 2005 12:53:15 -0500
Subject: rpms/amarok/FC-4 amarok.spec,1.33,1.34
Message-ID: <200512151753.jBFHrj7G002041@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amarok.spec 
Log Message:
- touch icon dir on %post and %postun


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- amarok.spec	9 Dec 2005 10:24:48 -0000	1.33
+++ amarok.spec	15 Dec 2005 17:53:13 -0000	1.34
@@ -149,6 +149,7 @@
 %post
 /sbin/ldconfig
 # update icon themes if necessary
+touch --no-create %{_datadir}/icons/crystalsvg || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
     # needed because amarok 1.2 puts icon in hicolor
@@ -160,6 +161,7 @@
 %postun
 /sbin/ldconfig
 # update icon themes if necessary
+touch --no-create %{_datadir}/icons/crystalsvg || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 fi



From fedora-extras-commits at redhat.com  Thu Dec 15 17:53:21 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 15 Dec 2005 12:53:21 -0500
Subject: rpms/amarok/devel amarok.spec,1.31,1.32
Message-ID: <200512151753.jBFHrpAB002044@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amarok.spec 
Log Message:
- touch icon dir on %post and %postun


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- amarok.spec	9 Dec 2005 10:24:54 -0000	1.31
+++ amarok.spec	15 Dec 2005 17:53:19 -0000	1.32
@@ -149,6 +149,7 @@
 %post
 /sbin/ldconfig
 # update icon themes if necessary
+touch --no-create %{_datadir}/icons/crystalsvg || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
     # needed because amarok 1.2 puts icon in hicolor
@@ -160,6 +161,7 @@
 %postun
 /sbin/ldconfig
 # update icon themes if necessary
+touch --no-create %{_datadir}/icons/crystalsvg || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 fi



From fedora-extras-commits at redhat.com  Thu Dec 15 18:25:20 2005
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 15 Dec 2005 13:25:20 -0500
Subject: rpms/pdftk/devel pdftk.spec,1.1,1.2
Message-ID: <200512151825.jBFIPpb9003811@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Modified Files:
	pdftk.spec 
Log Message:

  Description:
    Rebuilt becouse broken deps.
    Remove strange '//SID ' comment.




Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/pdftk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pdftk.spec	3 Aug 2005 17:51:01 -0000	1.1
+++ pdftk.spec	15 Dec 2005 18:25:18 -0000	1.2
@@ -1,11 +1,12 @@
 Summary: 	The PDF Tool Kit
 Name: 		pdftk
 Version: 	1.12
-Release: 	3
+Release: 	4
 License:	GPL
 URL: 		http://www.accesspdf.com/pdftk/
 Source0: 	http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2
 Source1:        gpl.txt
+Patch1:         pdftk-1.12-rmsid.patch
 Group: 		Applications/Publishing
 BuildRoot: 	%{_tmppath}/%{name}-root
 BuildRequires:	gcc-java
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .org
 
 %build
 unset CLASSPATH && cd pdftk && make -f Makefile.RedHat && cd -
@@ -54,6 +56,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Dec 15 2005 Jochen Schmitt  1.12-4
+- Rebuild
+- Remove strange '//SID' comment.
+
 * Sun Jul 31 2005 Jochen Schmitt  1.12-3
 - Add literal GPL text as Source1
 



From fedora-extras-commits at redhat.com  Thu Dec 15 18:32:57 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 13:32:57 -0500
Subject: rpms/nethack-vultures/FC-3 .cvsignore, 1.2,
	1.3 nethack-vultures.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512151833.jBFIXSkA003962@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3879/FC-3

Modified Files:
	.cvsignore nethack-vultures.spec sources 
Log Message:
Upgraded to 1.11




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Nov 2005 02:16:56 -0000	1.2
+++ .cvsignore	15 Dec 2005 18:32:55 -0000	1.3
@@ -1 +1 @@
-vultures-1.10.1-full.tar.bz2
+vultures-1.11.0-full.tar.bz2


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack-vultures.spec	22 Nov 2005 19:46:49 -0000	1.2
+++ nethack-vultures.spec	15 Dec 2005 18:32:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.10.1
-Release:        1.0%{?dist}
+Version:        1.11.0
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -36,7 +36,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2
-%patch3
 sed -i -e 's|/usr/games/lib/nethackdir|%{_prefix}/games/vultureseye|g' \
     nethack/doc/{nethack,recover}.6 nethack/include/config.h
 sed -i -e 's|/var/lib/games/nethack|%{_var}/games/vultureseye|g' \
@@ -162,7 +161,12 @@
 
 
 %changelog
-* Mon Nov 21 2005 Karen Pease  - 1.10.1-0.5
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
+- Upgraded the tarball to the latest release
+- Upped the version
+- Removed a patch that's now part of the source
+
+* Mon Nov 21 2005 Karen Pease  - 1.10.1-1%{?dist}
 - Made it so I don't have to manually tinker with revisions between dists
 - Using a 1.x release
 - Removed excess tarball


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Nov 2005 02:16:56 -0000	1.2
+++ sources	15 Dec 2005 18:32:55 -0000	1.3
@@ -1 +1 @@
-5a6b99e6159e358757991a6221871b89  vultures-1.10.1-full.tar.bz2
+1c9957f9c46bd1bbb096a111f04a2f48  vultures-1.11.0-full.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 18:33:03 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 13:33:03 -0500
Subject: rpms/nethack-vultures/FC-4 .cvsignore, 1.2,
	1.3 nethack-vultures.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200512151833.jBFIXXaW003967@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-serv3879/FC-4

Modified Files:
	.cvsignore nethack-vultures.spec sources 
Log Message:
Upgraded to 1.11




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Nov 2005 02:16:56 -0000	1.2
+++ .cvsignore	15 Dec 2005 18:33:01 -0000	1.3
@@ -1 +1 @@
-vultures-1.10.1-full.tar.bz2
+vultures-1.11.0-full.tar.bz2


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-vultures.spec	22 Nov 2005 19:46:56 -0000	1.3
+++ nethack-vultures.spec	15 Dec 2005 18:33:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.10.1
-Release:        1.0%{?dist}
+Version:        1.11.0
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -36,7 +36,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2
-%patch3
 sed -i -e 's|/usr/games/lib/nethackdir|%{_prefix}/games/vultureseye|g' \
     nethack/doc/{nethack,recover}.6 nethack/include/config.h
 sed -i -e 's|/var/lib/games/nethack|%{_var}/games/vultureseye|g' \
@@ -162,7 +161,12 @@
 
 
 %changelog
-* Mon Nov 21 2005 Karen Pease  - 1.10.1-0.5
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
+- Upgraded the tarball to the latest release
+- Upped the version
+- Removed a patch that's now part of the source
+
+* Mon Nov 21 2005 Karen Pease  - 1.10.1-1%{?dist}
 - Made it so I don't have to manually tinker with revisions between dists
 - Using a 1.x release
 - Removed excess tarball


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Nov 2005 02:16:56 -0000	1.2
+++ sources	15 Dec 2005 18:33:01 -0000	1.3
@@ -1 +1 @@
-5a6b99e6159e358757991a6221871b89  vultures-1.10.1-full.tar.bz2
+1c9957f9c46bd1bbb096a111f04a2f48  vultures-1.11.0-full.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 18:33:08 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 13:33:08 -0500
Subject: rpms/nethack-vultures/devel .cvsignore, 1.2,
	1.3 nethack-vultures.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200512151833.jBFIXdLp003972@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3879/devel

Modified Files:
	.cvsignore nethack-vultures.spec sources 
Log Message:
Upgraded to 1.11




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Nov 2005 02:16:56 -0000	1.2
+++ .cvsignore	15 Dec 2005 18:33:06 -0000	1.3
@@ -1 +1 @@
-vultures-1.10.1-full.tar.bz2
+vultures-1.11.0-full.tar.bz2


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-vultures.spec	22 Nov 2005 19:47:04 -0000	1.3
+++ nethack-vultures.spec	15 Dec 2005 18:33:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.10.1
-Release:        1.0%{?dist}
+Version:        1.11.0
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -10,7 +10,6 @@
 Patch0:         %{name}-1.10.1-optflags.patch
 Patch1:         %{name}-1.10.1-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
-Patch3:         %{name}-1.10.1-log2stderr.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -36,7 +35,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2
-%patch3
 sed -i -e 's|/usr/games/lib/nethackdir|%{_prefix}/games/vultureseye|g' \
     nethack/doc/{nethack,recover}.6 nethack/include/config.h
 sed -i -e 's|/var/lib/games/nethack|%{_var}/games/vultureseye|g' \
@@ -162,7 +160,12 @@
 
 
 %changelog
-* Mon Nov 21 2005 Karen Pease  - 1.10.1-0.5
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
+- Upgraded the tarball to the latest release
+- Upped the version
+- Removed a patch that's now part of the source
+
+* Mon Nov 21 2005 Karen Pease  - 1.10.1-1%{?dist}
 - Made it so I don't have to manually tinker with revisions between dists
 - Using a 1.x release
 - Removed excess tarball


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Nov 2005 02:16:56 -0000	1.2
+++ sources	15 Dec 2005 18:33:06 -0000	1.3
@@ -1 +1 @@
-5a6b99e6159e358757991a6221871b89  vultures-1.10.1-full.tar.bz2
+1c9957f9c46bd1bbb096a111f04a2f48  vultures-1.11.0-full.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 18:35:04 2005
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 15 Dec 2005 13:35:04 -0500
Subject: rpms/pdftk/devel pdftk-1.12-rmsid.patch,NONE,1.1
Message-ID: <200512151835.jBFIZ4Cl004001@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Added Files:
	pdftk-1.12-rmsid.patch 
Log Message:

  Description:
   Added forgotten patch.


pdftk-1.12-rmsid.patch:

--- NEW FILE pdftk-1.12-rmsid.patch ---
--- pdftk-1.12/java_libs/com/lowagie/text/pdf/codec/PngImage.java.org	2005-12-15 18:28:24.000000000 +0100
+++ pdftk-1.12/java_libs/com/lowagie/text/pdf/codec/PngImage.java	2005-12-15 18:29:04.000000000 +0100
@@ -93,7 +93,7 @@
 
 import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.Image;
-//SID import com.lowagie.text.ImgRaw;
+import com.lowagie.text.ImgRaw;
 import com.lowagie.text.pdf.ByteBuffer;
 import com.lowagie.text.pdf.PdfArray;
 import com.lowagie.text.pdf.PdfDictionary;



From fedora-extras-commits at redhat.com  Thu Dec 15 18:42:49 2005
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 15 Dec 2005 13:42:49 -0500
Subject: rpms/pdftk/devel pdftk.spec,1.2,1.3
Message-ID: <200512151843.jBFIhJlQ004325@cvs-int.fedora.redhat.com>

Author: s4504kr

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

Modified Files:
	pdftk.spec 
Log Message:

  Description:
    Change release number becouse trouble with cvs tagging.



Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/pdftk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pdftk.spec	15 Dec 2005 18:25:18 -0000	1.2
+++ pdftk.spec	15 Dec 2005 18:42:46 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: 	The PDF Tool Kit
 Name: 		pdftk
 Version: 	1.12
-Release: 	4
+Release: 	5
 License:	GPL
 URL: 		http://www.accesspdf.com/pdftk/
 Source0: 	http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2
@@ -56,7 +56,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Thu Dec 15 2005 Jochen Schmitt  1.12-4
+* Thu Dec 15 2005 Jochen Schmitt  1.12-5
 - Rebuild
 - Remove strange '//SID' comment.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 18:47:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 15 Dec 2005 13:47:39 -0500
Subject: rpms/sqlite/FC-3 sqlite.spec,1.10,1.11
Message-ID: <200512151848.jBFImASv004413@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	sqlite.spec 
Log Message:
Add tcl BR


Index: sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/sqlite/FC-3/sqlite.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sqlite.spec	23 Apr 2005 07:22:42 -0000	1.10
+++ sqlite.spec	15 Dec 2005 18:47:37 -0000	1.11
@@ -8,7 +8,7 @@
 Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
 Patch0: sqlite-3.1.2-doc.patch
 Obsoletes: sqlite3 sqlite3-devel
-BuildRequires: ncurses-devel readline-devel
+BuildRequires: ncurses-devel readline-devel tcl
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -107,8 +107,8 @@
 %endif
 
 %changelog
-* Sat Apr 23 2005 Ignacio Vazquez-Abrams  3.1.2-0.4
-- Bump
+* Thu Dec 15 2005 Ignacio Vazquez-Abrams  3.1.2-0.4
+- Add tcl BR
 
 * Tue Apr 19 2005 Ignacio Vazquez-Abrams  3.1.2-0.3
 - Release drop



From fedora-extras-commits at redhat.com  Thu Dec 15 18:48:20 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 15 Dec 2005 13:48:20 -0500
Subject: rpms/amarok/FC-4 amarok.spec,1.34,1.35
Message-ID: <200512151848.jBFImolj004453@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amarok.spec 
Log Message:
- really fix bug 175841


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- amarok.spec	15 Dec 2005 17:53:13 -0000	1.34
+++ amarok.spec	15 Dec 2005 18:48:18 -0000	1.35
@@ -147,23 +147,18 @@
 
 
 %post
-/sbin/ldconfig
 # update icon themes if necessary
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-    # needed because amarok 1.2 puts icon in hicolor
-    # and the RPM did not update the cache on uninstall
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 # update icon themes if necessary
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
 
@@ -178,7 +173,7 @@
 %{_bindir}/amarok
 %{_bindir}/amarokapp
 %{_datadir}/apps/%{name}
-%{_datadir}/icons/*/*/*
+%{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop



From fedora-extras-commits at redhat.com  Thu Dec 15 18:48:26 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 15 Dec 2005 13:48:26 -0500
Subject: rpms/amarok/devel amarok.spec,1.32,1.33
Message-ID: <200512151848.jBFImu0l004456@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amarok.spec 
Log Message:
- really fix bug 175841


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- amarok.spec	15 Dec 2005 17:53:19 -0000	1.32
+++ amarok.spec	15 Dec 2005 18:48:24 -0000	1.33
@@ -147,23 +147,18 @@
 
 
 %post
-/sbin/ldconfig
 # update icon themes if necessary
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-    # needed because amarok 1.2 puts icon in hicolor
-    # and the RPM did not update the cache on uninstall
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 # update icon themes if necessary
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
 
@@ -178,7 +173,7 @@
 %{_bindir}/amarok
 %{_bindir}/amarokapp
 %{_datadir}/apps/%{name}
-%{_datadir}/icons/*/*/*
+%{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop



From fedora-extras-commits at redhat.com  Thu Dec 15 19:09:28 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 15 Dec 2005 14:09:28 -0500
Subject: rpms/amarok/devel amarok.spec,1.33,1.34
Message-ID: <200512151909.jBFJ9wRZ006174@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amarok.spec 
Log Message:
- add BR: kdebase-devel to help kde-redhat


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- amarok.spec	15 Dec 2005 18:48:24 -0000	1.33
+++ amarok.spec	15 Dec 2005 19:09:26 -0000	1.34
@@ -28,6 +28,7 @@
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
+BuildRequires:  kdebase-devel
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif



From fedora-extras-commits at redhat.com  Thu Dec 15 19:09:00 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 15 Dec 2005 14:09:00 -0500
Subject: rpms/amarok/FC-4 amarok.spec,1.35,1.36
Message-ID: <200512151910.jBFJA04i006175@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amarok.spec 
Log Message:
- add BR: kdebase-devel to help kde-redhat


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- amarok.spec	15 Dec 2005 18:48:18 -0000	1.35
+++ amarok.spec	15 Dec 2005 19:08:57 -0000	1.36
@@ -28,6 +28,7 @@
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
+BuildRequires:  kdebase-devel
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif



From fedora-extras-commits at redhat.com  Thu Dec 15 19:13:34 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 14:13:34 -0500
Subject: rpms/l2tpd - New directory
Message-ID: <200512151913.jBFJDYn8006270@cvs-int.fedora.redhat.com>

Author: pwouters

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

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




From fedora-extras-commits at redhat.com  Thu Dec 15 19:13:40 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 14:13:40 -0500
Subject: rpms/l2tpd/devel - New directory
Message-ID: <200512151913.jBFJDeZI006286@cvs-int.fedora.redhat.com>

Author: pwouters

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

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




From fedora-extras-commits at redhat.com  Thu Dec 15 19:13:58 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 14:13:58 -0500
Subject: rpms/l2tpd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512151913.jBFJDwrh006321@cvs-int.fedora.redhat.com>

Author: pwouters

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 15 19:14:04 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 14:14:04 -0500
Subject: rpms/l2tpd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512151914.jBFJE4kU006342@cvs-int.fedora.redhat.com>

Author: pwouters

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

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


--- NEW 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 Dec 15 19:15:30 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 14:15:30 -0500
Subject: rpms/l2tpd import.log,1.1,1.2
Message-ID: <200512151916.jBFJG0DO006559@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	import.log 
Log Message:
auto-import l2tpd-0.69-0.1.20051030.2 on branch devel from l2tpd-0.69-0.1.20051030.2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/l2tpd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 19:13:56 -0000	1.1
+++ import.log	15 Dec 2005 19:15:28 -0000	1.2
@@ -0,0 +1 @@
+l2tpd-0_69-0_1_20051030_2:HEAD:l2tpd-0.69-0.1.20051030.2.src.rpm:1134674205



From fedora-extras-commits at redhat.com  Thu Dec 15 19:15:35 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 14:15:35 -0500
Subject: rpms/l2tpd/devel l2tpd-async-sync.patch, NONE,
	1.1 l2tpd-changelog.patch, NONE, 1.1 l2tpd-chapsecrets.sample,
	NONE, 1.1 l2tpd-gcc4-fixes.patch, NONE,
	1.1 l2tpd-log-strerr.patch, NONE, 1.1 l2tpd-log.patch, NONE,
	1.1 l2tpd-max-retries.patch, NONE, 1.1 l2tpd-moredebug.patch,
	NONE, 1.1 l2tpd-move-pty-logic.patch, NONE,
	1.1 l2tpd-nodebug-default.patch, NONE, 1.1 l2tpd-options.l2tpd,
	NONE, 1.1 l2tpd-patents.patch, NONE, 1.1 l2tpd-socket.patch,
	NONE, 1.1 l2tpd-solaris.patch, NONE, 1.1 l2tpd-stopccn.patch,
	NONE, 1.1 l2tpd-uaddr.patch, NONE, 1.1 l2tpd-version.patch,
	NONE, 1.1 l2tpd.conf, NONE, 1.1 l2tpd.init, NONE,
	1.1 l2tpd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512151915.jBFJFZ4I006524@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	.cvsignore sources 
Added Files:
	l2tpd-async-sync.patch l2tpd-changelog.patch 
	l2tpd-chapsecrets.sample l2tpd-gcc4-fixes.patch 
	l2tpd-log-strerr.patch l2tpd-log.patch l2tpd-max-retries.patch 
	l2tpd-moredebug.patch l2tpd-move-pty-logic.patch 
	l2tpd-nodebug-default.patch l2tpd-options.l2tpd 
	l2tpd-patents.patch l2tpd-socket.patch l2tpd-solaris.patch 
	l2tpd-stopccn.patch l2tpd-uaddr.patch l2tpd-version.patch 
	l2tpd.conf l2tpd.init l2tpd.spec 
Log Message:
auto-import l2tpd-0.69-0.1.20051030.2 on branch devel from l2tpd-0.69-0.1.20051030.2.src.rpm

l2tpd-async-sync.patch:

--- NEW FILE l2tpd-async-sync.patch ---
diff-tree b240ad8ce83e0a0dbee533cb2862a5eafb937504 (from e64441dcd5c020067921fb370c738aeb20de7dd8)
Author: Michael Richardson 
Date:   Fri Nov 25 13:04:50 2005 -0500

    async/sync conversion routines must be ready for possibility
    that the read will block due to routing loops

diff --git a/call.c b/call.c
--- a/call.c
+++ b/call.c
@@ -97,88 +97,112 @@ int read_packet (struct buffer *buf, int
     static unsigned char rbuf[MAX_RECV_SIZE];
     static int pos = 0;
     static int max = 0;
     int res;
     int errors = 0;
+
     /* Read a packet, doing async->sync conversion if necessary */
     p = buf->start;
     while (1)
     {
         if (pos >= max)
         {
-            max = read (fd, rbuf, sizeof (rbuf));
+            max = read(fd, rbuf, sizeof (rbuf));
             res = max;
             pos = 0;
         }
         else
         {
             res = 1;
         }
+
         c = rbuf[pos++];
+
+	/* if there was a short read, then see what is about */
         if (res < 1)
         {
             if (res == 0)
             {
                 /*
                    * Hmm..  Nothing to read.  It happens
                  */
+		pos=0;
+		max=0;
                 return 0;
-/*			} else if ((errno == EINTR ) || (errno == EAGAIN)) { */
             }
             else if ((errno == EIO) || (errno == EINTR) || (errno == EAGAIN))
             {
 
                 /*
                    * Oops, we were interrupted!
                    * Or, we ran out of data too soon
                    * anyway, we discared whatever it is we
                    * have
                  */
+		pos=0;
+		max=0;
                 return 0;
             }
             errors++;
             l2tp_log (LOG_DEBUG, "%s: Error %d (%s)\n", __FUNCTION__, errno,
                  strerror (errno));
             if (errors > 10)
             {
                 l2tp_log (LOG_DEBUG,
                      "%s: Too many errors.  Declaring call dead.\n",
                      __FUNCTION__);
+		pos=0;
+		max=0;
                 return -errno;
             }
             continue;
         }
+
         switch (c)
         {
         case PPP_FLAG:
             if (escape)
             {
                 l2tp_log (LOG_DEBUG, "%s: got an escaped PPP_FLAG\n",
                      __FUNCTION__);
+		pos=0;
+		max=0;
                 return -EINVAL;
             }
+
             if (convert)
             {
-                if (!buf->len)
+                if (buf->len == 0) {
+		    /* if the buffer is empty, then we have the beginning
+		     * of a packet, not the end
+		     */
                     break;
-                /* Drop the FCS */
+		}
+		
+                /* must be the end, drop the FCS */
                 buf->len -= 2;
             }
             else
             {
+		/* if there is space, then insert the byte */
                 if (buf->len < buf->maxlen)
                 {
                     *p = c;
                     p++;
                     buf->len++;
                 }
             }
+
+	    /* return what we have now */
             return buf->len;
+
         case PPP_ESCAPE:
             escape = PPP_TRANS;
             if (convert)
                 break;
+
+	    /* fall through */
         default:
             if (convert)
                 c ^= escape;
             escape = 0;
             if (buf->len < buf->maxlen)
@@ -187,10 +211,12 @@ int read_packet (struct buffer *buf, int
                 p++;
                 buf->len++;
                 break;
             };
             l2tp_log (LOG_WARN, "%s: read overrun\n", __FUNCTION__);
+	    pos=0;
+	    max=0;
             return -EINVAL;
         }
     }
 
     /* I should never get here */

l2tpd-changelog.patch:

--- NEW FILE l2tpd-changelog.patch ---
--- l2tpd-0.69cvs20051030/CHANGELOG.Xelerance	1969-12-31 19:00:00.000000000 -0500
+++ l2tpd/CHANGELOG.Xelerance	2005-11-27 18:50:17.000000000 -0500
@@ -0,0 +1,16 @@
+changes to the sourceforge.net sources by Xelerance
+
+- fixes for gcc 4.xx compilation
+- various debugging added, but debugging should not be on by default
+- async/sync conversion routines must be ready for possibility that the read
+  will block due to routing loops
+- refactor control socket handling.
+- use man page in doc/
+- move all logic about pty usage to pty.c try ptmx first. if it fails try
+  legacy ptys
+- rename log() to l2tp_log(), as "log" is a math function.
+- First version managed by Xelerance, called xl2tpd.
+- if we aren't deamonized, then log to stderr.
+- added install: and DESTDIR support 
+
+


--- NEW FILE l2tpd-chapsecrets.sample ---
# Secrets for authentication using CHAP
# client        server  secret                  IP addresses
jacco           *       "mysecret"              192.168.1.128/25
*               jacco   "mysecret"              192.168.1.128/25
sam             *       "rumpelstiltskin"       192.168.1.5
*               sam     "rumpelstiltskin"       192.168.1.5


l2tpd-gcc4-fixes.patch:

--- NEW FILE l2tpd-gcc4-fixes.patch ---
diff-tree a30a4defe933ca15aea4986535664774520ec9fa (from f09c91543dc84206a7a82db62bab09b8a52da44a)
Author: Michael Richardson 
Date:   Fri Nov 25 14:18:37 2005 -0500

    fixes for gcc 4.xx
    (cherry picked from bfbd2c3c96ffc17453427ea3ea62c70572be5cae commit)

diff --git a/aaa.c b/aaa.c
--- a/aaa.c
+++ b/aaa.c
@@ -23,11 +23,11 @@
 
 extern void bufferDump (char *, int);
 
 /* FIXME: Accounting? */
 
-static struct addr_ent *uaddr[ADDR_HASH_SIZE];
+struct addr_ent *uaddr[ADDR_HASH_SIZE];
 
 void init_addr ()
 {
     int x;
     for (x = 0; x < ADDR_HASH_SIZE; x++)
@@ -45,11 +45,11 @@ static int ip_used (unsigned int addr)
         tmp = tmp->next;
     }
     return 0;
 }
 
-void mk_challenge (char *c, int length)
+void mk_challenge (unsigned char *c, int length)
 {
     get_entropy(c, length);
 
     /* int x;
     int *s = (int *) c;
@@ -131,11 +131,11 @@ unsigned int get_addr (struct iprange *i
         ipr = ipr->next;
     }
     return 0;
 }
 
-int get_secret (char *us, char *them, char *secret, int size)
+int get_secret (char *us, char *them, unsigned char *secret, int size)
 {
     FILE *f;
     char buf[STRLEN];
     char *u, *t, *s;
     int num = 0;
@@ -204,11 +204,11 @@ int get_secret (char *us, char *them, ch
 #ifdef DEBUG_AUTH
             l2tp_log (LOG_DEBUG,
                  "%s: we are '%s', they are '%s', secret is '%s'\n",
                  __FUNCTION__, u, t, s);
 #endif
-            strncpy (secret, s, size);
+            strncpy ((char *)secret, s, size);
             fclose(f);
             return -1;
         }
     }
     fclose(f);
@@ -249,10 +249,11 @@ int handle_challenge (struct tunnel *t, 
         if (t->lac->peername[0])
             them = t->lac->peername;
         else
             them = t->hostname;
     }
+
     if (!get_secret (us, them, chal->secret, sizeof (chal->secret)))
     {
         l2tp_log (LOG_DEBUG, "%s: no secret found for us='%s' and them='%s'\n",
              __FUNCTION__, us, them);
         return -1;
@@ -270,11 +271,11 @@ int handle_challenge (struct tunnel *t, 
 #endif
 
     memset (chal->response, 0, MD_SIG_SIZE);
     MD5Init (&chal->md5);
     MD5Update (&chal->md5, &chal->ss, 1);
-    MD5Update (&chal->md5, chal->secret, strlen (chal->secret));
+    MD5Update (&chal->md5, chal->secret, strlen ((char *)chal->secret));
     MD5Update (&chal->md5, chal->challenge, chal->chal_len);
     MD5Final (chal->response, &chal->md5);
 #ifdef DEBUG_AUTH
     l2tp_log (LOG_DEBUG, "response is %X%X%X%X to '%s' and %X%X%X%X, %d\n",
          *((int *) &chal->response[0]),
@@ -366,11 +367,11 @@ void encrypt_avp (struct buffer *buf, _u
     struct avp_hdr *new_hdr =
         (struct avp_hdr *) (buf->start + buf->len - len);
     struct avp_hdr *old_hdr =
         (struct avp_hdr *) (buf->start + buf->len - len + 2);
     _u16 length, flags, attr;   /* New length, old flags */
-    char *ptr, *end;
+    unsigned char *ptr, *end;
     int cnt;
     unsigned char digest[MD_SIG_SIZE];
     unsigned char *previous_segment;
 
     /* FIXME: Should I pad more randomly? Right now I pad to nearest 16 bytes */
@@ -390,17 +391,17 @@ void encrypt_avp (struct buffer *buf, _u
     /* Back to the beginning of real data, including the original length AVP */
 
     MD5Init (&t->chal_them.md5);
     MD5Update (&t->chal_them.md5, (void *) &attr, 2);
     MD5Update (&t->chal_them.md5, t->chal_them.secret,
-               strlen (t->chal_them.secret));
+               strlen ((char *)t->chal_them.secret));
     MD5Update (&t->chal_them.md5, t->chal_them.vector, VECTOR_SIZE);
     MD5Final (digest, &t->chal_them.md5);
 
     /* Though not a "MUST" in the spec, our subformat length is always a multiple of 16 */
-    ptr = ((char *) new_hdr) + sizeof (struct avp_hdr);
-    end = ((char *) new_hdr) + length;
+    ptr = ((unsigned char *) new_hdr) + sizeof (struct avp_hdr);
+    end = ((unsigned char *) new_hdr) + length;
     previous_segment = ptr;
     while (ptr < end)
     {
 #if DEBUG_HIDDEN
         l2tp_log (LOG_DEBUG, "%s: The digest to be XOR'ed\n", __FUNCTION__);
@@ -418,11 +419,11 @@ void encrypt_avp (struct buffer *buf, _u
 #endif
         if (ptr < end)
         {
             MD5Init (&t->chal_them.md5);
             MD5Update (&t->chal_them.md5, t->chal_them.secret,
-                       strlen (t->chal_them.secret));
+                       strlen ((char *)t->chal_them.secret));
             MD5Update (&t->chal_them.md5, previous_segment, MD_SIG_SIZE);
             MD5Final (digest, &t->chal_them.md5);
         }
         previous_segment = ptr;
     }
@@ -433,17 +434,17 @@ int decrypt_avp (char *buf, struct tunne
     /* Decrypts a hidden AVP pointed to by buf.  The
        new header will be exptected to be two characters
        offset from the old */
     int cnt = 0;
     int len, olen, flags;
-    char digest[MD_SIG_SIZE];
+    unsigned char digest[MD_SIG_SIZE];
     char *ptr, *end;
     _u16 attr;
     struct avp_hdr *old_hdr = (struct avp_hdr *) buf;
     struct avp_hdr *new_hdr = (struct avp_hdr *) (buf + 2);
     int saved_segment_len;      /* maybe less 16; may be used if the cipher is longer than 16 octets */
-    char saved_segment[MD_SIG_SIZE];
+    unsigned char saved_segment[MD_SIG_SIZE];
     ptr = ((char *) old_hdr) + sizeof (struct avp_hdr);
     olen = old_hdr->length & 0x0FFF;
     end = buf + olen;
     if (!t->chal_us.vector)
     {
@@ -456,11 +457,11 @@ int decrypt_avp (char *buf, struct tunne
        have to be more careful than when encrypting */
     attr = ntohs (old_hdr->attr);
     MD5Init (&t->chal_us.md5);
     MD5Update (&t->chal_us.md5, (void *) &attr, 2);
     MD5Update (&t->chal_us.md5, t->chal_us.secret,
-               strlen (t->chal_us.secret));
+               strlen ((char *)t->chal_us.secret));
     MD5Update (&t->chal_us.md5, t->chal_us.vector, t->chal_us.vector_len);
     MD5Final (digest, &t->chal_us.md5);
 #ifdef DEBUG_HIDDEN
     l2tp_log (LOG_DEBUG, "attribute is %d and challenge is: ", attr);
     print_challenge (&t->chal_us);
@@ -471,11 +472,11 @@ int decrypt_avp (char *buf, struct tunne
     {
         if (cnt >= MD_SIG_SIZE)
         {
             MD5Init (&t->chal_us.md5);
             MD5Update (&t->chal_us.md5, t->chal_us.secret,
-                       strlen (t->chal_us.secret));
+                       strlen ((char *)t->chal_us.secret));
             MD5Update (&t->chal_us.md5, saved_segment, MD_SIG_SIZE);
             MD5Final (digest, &t->chal_us.md5);
             cnt = 0;
         }
         /* at the beginning of each segment, we save the current segment (16 octets or less) of cipher 
diff --git a/aaa.h b/aaa.h
--- a/aaa.h
+++ b/aaa.h
@@ -50,7 +50,7 @@ extern struct lns *get_lns (struct tunne
 extern unsigned int get_addr (struct iprange *);
 extern void reserve_addr (unsigned int);
 extern void unreserve_addr (unsigned int);
 extern void init_addr ();
 extern int handle_challenge (struct tunnel *, struct challenge *);
-extern void mk_challenge (char *, int);
+extern void mk_challenge (unsigned char *, int);
 #endif
diff --git a/avp.h b/avp.h
--- a/avp.h
+++ b/avp.h
@@ -112,11 +112,11 @@ extern int ignore_avp (struct tunnel *, 
 extern int seq_reqd_avp (struct tunnel *, struct call *, void *, int);
 extern int challenge_avp (struct tunnel *, struct call *, void *, int);
 extern int chalresp_avp (struct tunnel *, struct call *, void *, int);
 extern int rand_vector_avp (struct tunnel *, struct call *, void *, int);
 
-extern int add_challenge_avp (struct buffer *, char *, int);
+extern int add_challenge_avp (struct buffer *, unsigned char *, int);
 extern int add_avp_rws (struct buffer *, _u16);
 extern int add_tunnelid_avp (struct buffer *, _u16);
 extern int add_vendor_avp (struct buffer *);
 extern int add_hostname_avp (struct buffer *, const char *);
 extern int add_firmware_avp (struct buffer *);
@@ -135,10 +135,10 @@ extern int add_callid_avp (struct buffer
 #else
 extern int add_callid_avp (struct buffer *, _u16);
 #endif
 extern int add_ppd_avp (struct buffer *, _u16);
 extern int add_seqreqd_avp (struct buffer *);
-extern int add_chalresp_avp (struct buffer *, char *, int);
-extern int add_randvect_avp (struct buffer *, char *, int);
+extern int add_chalresp_avp (struct buffer *, unsigned char *, int);
+extern int add_randvect_avp (struct buffer *, unsigned char *, int);
 extern int add_minbps_avp (struct buffer *buf, int speed);      /* jz: needed for outgoing call */
 extern int add_maxbps_avp (struct buffer *buf, int speed);      /* jz: needed for outgoing call */
 extern int add_number_avp (struct buffer *buf, char *no);       /* jz: needed for outgoing call */
diff --git a/avpsend.c b/avpsend.c
--- a/avpsend.c
+++ b/avpsend.c
@@ -125,27 +125,27 @@ int add_avp_rws (struct buffer *buf, _u1
     ptr->s0 = htons (rws);
     buf->len += 0x8;
     return 0;
 }
 
-int add_challenge_avp (struct buffer *buf, char *c, int len)
+int add_challenge_avp (struct buffer *buf, unsigned char *c, int len)
 {
     add_header(buf, (0x6 + len), 0xB);
     memcpy((char *) (buf->start + buf->len + sizeof(struct avp_hdr)), c, len);
     buf->len += 0x6 + len;
     return 0;
 }
 
-int add_chalresp_avp (struct buffer *buf, char *c, int len)
+int add_chalresp_avp (struct buffer *buf, unsigned char *c, int len)
 {
     add_header(buf, (0x6 + len), 0xD);
     memcpy((char *) (buf->start + buf->len + sizeof(struct avp_hdr)), c, len);
     buf->len += 0x6 + len;
     return 0;
 }
 
-int add_randvect_avp (struct buffer *buf, char *c, int len)
+int add_randvect_avp (struct buffer *buf, unsigned char *c, int len)
 {
     add_header(buf, (0x6 + len), 0x24);
     memcpy((char *) (buf->start + buf->len + sizeof(struct avp_hdr)), c, len);
     buf->len += 0x6 + len;
     return 0;
diff --git a/call.c b/call.c
--- a/call.c
+++ b/call.c
@@ -502,11 +502,11 @@ void destroy_call (struct call *c)
 }
 
 
 struct call *new_call (struct tunnel *parent)
 {
-    char entropy_buf[2] = "\0";
+    unsigned char entropy_buf[2] = "\0";
     struct call *tmp = malloc (sizeof (struct call));
 
     if (!tmp)
         return NULL;
     tmp->tx_pkts = 0;
diff --git a/l2tp.h b/l2tp.h
--- a/l2tp.h
+++ b/l2tp.h
@@ -214,11 +214,11 @@ extern void control_xmit (void *);
 extern int ppd;
 extern int switch_io;           /* jz */
 extern int control_fd;
 extern int start_pppd (struct call *c, struct ppp_opts *);
 extern void magic_lac_dial (void *);
-extern int get_entropy (char *, int);
+extern int get_entropy (unsigned char *, int);
 
 #ifndef MIN
 #define MIN(a,b) (((a)<(b)) ? (a) : (b))
 #endif
 #endif
diff --git a/l2tpd.c b/l2tpd.c
--- a/l2tpd.c
+++ b/l2tpd.c
@@ -731,11 +731,11 @@ void lac_disconnect (int tid)
 }
 
 struct tunnel *new_tunnel ()
 {
     struct tunnel *tmp = malloc (sizeof (struct tunnel));
-    char entropy_buf[2] = "\0";
+    unsigned char entropy_buf[2] = "\0";
     if (!tmp)
         return NULL;
     tmp->control_seq_num = 0;
     tmp->control_rec_seq_num = 0;
     tmp->cLr = 0;
diff --git a/misc.c b/misc.c
--- a/misc.c
+++ b/misc.c
@@ -90,22 +90,22 @@ inline void recycle_buf (struct buffer *
     b->start = b->rstart;
     b->len = b->maxlen;
 }
 
 #define bufferDumpWIDTH 16
-void bufferDump (char *buf, int buflen)
+void bufferDump (unsigned char *buf, int buflen)
 {
     int i = 0, j = 0;
     /* we need TWO characters to DISPLAY ONE byte */
-    unsigned char line[2 * bufferDumpWIDTH + 1], *c;
+    char line[2 * bufferDumpWIDTH + 1], *c;
 
     for (i = 0; i < buflen / bufferDumpWIDTH; i++)
     {
         c = line;
         for (j = 0; j < bufferDumpWIDTH; j++)
         {
-            sprintf (c, "%02x ", (buf[i * bufferDumpWIDTH + j]) & 0xff);
+	  sprintf (c, "%02x ", (buf[i * bufferDumpWIDTH + j]) & 0xff);
             c++;
             c++;                /* again two characters to display ONE byte */
         }
         *c = '\0';
         l2tp_log (LOG_WARN, "%s: buflen=%d, buffer[%d]: *%s*\n", __FUNCTION__,
@@ -242,11 +242,11 @@ void opt_destroy (struct ppp_opts *optio
 int get_egd_entropy(char *buf, int count)
 {
     return -1;
 }
 
-int get_sys_entropy(char *buf, int count)
+int get_sys_entropy(unsigned char *buf, int count)
 {
     /*
      * This way of filling buf with rand() generated data is really
      * fairly inefficient from a function call point of view...rand()
      * returns four bytes of data (on most systems, sizeof(int))
@@ -263,11 +263,11 @@ int get_sys_entropy(char *buf, int count
     bufferDump (buf, count);
 #endif
     return count;
 }
 
-int get_dev_entropy(char *buf, int count)
+int get_dev_entropy(unsigned char *buf, int count)
 {
     int devrandom;
     ssize_t entropy_amount;
 
     devrandom = open ("/dev/urandom", O_RDONLY | O_NONBLOCK);
@@ -283,11 +283,11 @@ int get_dev_entropy(char *buf, int count
     entropy_amount = read(devrandom, buf, count);
     close(devrandom);
     return entropy_amount;
 }
 
-int get_entropy (char *buf, int count)
+int get_entropy (unsigned char *buf, int count)
 {
     if (rand_source == RAND_SYS)
     {
         return get_sys_entropy(buf, count);
     }
diff --git a/network.c b/network.c
--- a/network.c
+++ b/network.c
@@ -33,11 +33,11 @@ int kernel_support;             /* Kerne
 
 
 int init_network (void)
 {
     long arg;
-    int length = sizeof (server);
+    unsigned int length = sizeof (server);
     gethostname (hostname, sizeof (hostname));
     server.sin_family = AF_INET;
     server.sin_addr.s_addr = gconfig.listenaddr; 
     server.sin_port = htons (gconfig.port);
     if ((server_socket = socket (PF_INET, SOCK_DGRAM, 0)) < 0)
@@ -304,21 +304,25 @@ void network_thread ()
 {
     /*
      * We loop forever waiting on either data from the ppp drivers or from
      * our network socket.  Control handling is no longer done here.
      */
-    int fromlen;                /* Length of the address */
+    unsigned int fromlen;                /* Length of the address */
     int tunnel, call;           /* Tunnel and call */
     int recvsize;               /* Length of data received */
     struct buffer *buf;         /* Payload buffer */
     struct call *c, *sc;        /* Call to send this off to */
     struct tunnel *st;          /* Tunnel */
     fd_set readfds;             /* Descriptors to watch for reading */
     int max;                    /* Highest fd */
     struct timeval tv;          /* Timeout for select */
     /* This one buffer can be recycled for everything except control packets */
     buf = new_buf (MAX_RECV_SIZE);
+
+    tunnel = 0;
+    call = 0;
+
     for (;;)
     {
         max = build_fdset (&readfds);
         tv.tv_sec = 1;
         tv.tv_usec = 0;

l2tpd-log-strerr.patch:

--- NEW FILE l2tpd-log-strerr.patch ---
diff-tree a07fa321367d2640217391b12b9cc393a4c61869 (from 95c2f93c9ec71103a75f8657c417759e2a553839)
Author: Michael Richardson 
Date:   Tue Nov 22 23:21:40 2005 -0500

    if we aren't deamonized, then log to stderr.

diff --git a/misc.c b/misc.c
--- a/misc.c
+++ b/misc.c
@@ -27,20 +27,33 @@
 # include 
 #endif
 #include 
 #include "l2tp.h"
 
+void init_log()
+{
+    static int logopen=0;
+    
+    if(!logopen) {
+	openlog (BINARY, LOG_PID, LOG_DAEMON);
+    }
+}
 
 void l2tp_log (int level, const char *fmt, ...)
 {
     char buf[256];
     va_list args;
     va_start (args, fmt);
     vsnprintf (buf, sizeof (buf), fmt, args);
     va_end (args);
-    openlog (BINARY, LOG_PID, LOG_DAEMON);
-    syslog (level, "%s", buf);
+    
+    if(gconfig.daemon) {
+	init_log();
+	syslog (level, "%s", buf);
+    } else {
+	fprintf(stderr, "l2tpd[%d]: %s", getpid(), buf);
+    }
 }
 
 void set_error (struct call *c, int error, const char *fmt, ...)
 {
     va_list args;

l2tpd-log.patch:

--- NEW FILE l2tpd-log.patch ---
diff-tree 752fcab3fb646b8db314575fdd902aaf40f96f38 (from ce2515775cecaedc26eef65c30c7eb2153af6982)
Author: Michael Richardson 
Date:   Mon Nov 21 04:14:48 2005 -0500

    merge of log->l2tp_log cherry pick

diff --git a/aaa.c b/aaa.c
--- a/aaa.c
+++ b/aaa.c
@@ -140,11 +140,11 @@ int get_secret (char *us, char *them, ch
     char *u, *t, *s;
     int num = 0;
     f = fopen (gconfig.authfile, "r");
     if (!f)
     {
-        log (LOG_WARN, "%s : Unable to open '%s' for authentication\n",
+        l2tp_log (LOG_WARN, "%s : Unable to open '%s' for authentication\n",
              __FUNCTION__, gconfig.authfile);
         return 0;
     }
     while (!feof (f))
     {
@@ -164,11 +164,11 @@ int get_secret (char *us, char *them, ch
         while (*u && (*u < 33))
             u++;
         /* us */
         if (!*u)
         {
-            log (LOG_WARN,
+            l2tp_log (LOG_WARN,
                  "%s: Invalid authentication info (no us), line %d\n",
                  __FUNCTION__, num);
             continue;
         }
         t = u;
@@ -178,11 +178,11 @@ int get_secret (char *us, char *them, ch
         while (*t && (*t < 33))
             t++;
         /* them */
         if (!*t)
         {
-            log (LOG_WARN,
+            l2tp_log (LOG_WARN,
                  "%s: Invalid authentication info (nothem), line %d\n",
                  __FUNCTION__, num);
             continue;
         }
         s = t;
@@ -191,20 +191,20 @@ int get_secret (char *us, char *them, ch
         *(s++) = 0;
         while (*s && (*s < 33))
             s++;
         if (!*s)
         {
-            log (LOG_WARN,
+            l2tp_log (LOG_WARN,
                  "%s: Invalid authentication info (no secret), line %d\n",
                  __FUNCTION__, num);
             continue;
         }
         if ((!strcasecmp (u, us) || !strcasecmp (u, "*")) &&
             (!strcasecmp (t, them) || !strcasecmp (t, "*")))
         {
 #ifdef DEBUG_AUTH
-            log (LOG_DEBUG,
+            l2tp_log (LOG_DEBUG,
                  "%s: we are '%s', they are '%s', secret is '%s'\n",
                  __FUNCTION__, u, t, s);
 #endif
             strncpy (secret, s, size);
             fclose(f);
@@ -219,16 +219,16 @@ int handle_challenge (struct tunnel *t, 
 {
     char *us;
     char *them;
     if (!t->lns && !t->lac)
     {
-        log (LOG_DEBUG, "%s: No LNS or LAC to handle challenge!\n",
+        l2tp_log (LOG_DEBUG, "%s: No LNS or LAC to handle challenge!\n",
              __FUNCTION__);
         return -1;
     }
 #ifdef DEBUG_AUTH
-    log (LOG_DEBUG, "%s: making response for tunnel: %d\n", __FUNCTION__,
+    l2tp_log (LOG_DEBUG, "%s: making response for tunnel: %d\n", __FUNCTION__,
          t->ourtid);
 #endif
     if (t->lns)
     {
         if (t->lns->hostname[0])
@@ -251,34 +251,34 @@ int handle_challenge (struct tunnel *t, 
         else
             them = t->hostname;
     }
     if (!get_secret (us, them, chal->secret, sizeof (chal->secret)))
     {
-        log (LOG_DEBUG, "%s: no secret found for us='%s' and them='%s'\n",
+        l2tp_log (LOG_DEBUG, "%s: no secret found for us='%s' and them='%s'\n",
              __FUNCTION__, us, them);
         return -1;
     }
 
 #if DEBUG_AUTH
-    log (LOG_DEBUG, "*%s: Here comes the chal->ss:\n", __FUNCTION__);
+    l2tp_log (LOG_DEBUG, "*%s: Here comes the chal->ss:\n", __FUNCTION__);
     bufferDump (&chal->ss, 1);
 
-    log (LOG_DEBUG, "%s: Here comes the secret\n", __FUNCTION__);
+    l2tp_log (LOG_DEBUG, "%s: Here comes the secret\n", __FUNCTION__);
     bufferDump (chal->secret, strlen (chal->secret));
 
-    log (LOG_DEBUG, "%s: Here comes the challenge\n", __FUNCTION__);
+    l2tp_log (LOG_DEBUG, "%s: Here comes the challenge\n", __FUNCTION__);
     bufferDump (chal->challenge, chal->chal_len);
 #endif
 
     memset (chal->response, 0, MD_SIG_SIZE);
     MD5Init (&chal->md5);
     MD5Update (&chal->md5, &chal->ss, 1);
     MD5Update (&chal->md5, chal->secret, strlen (chal->secret));
     MD5Update (&chal->md5, chal->challenge, chal->chal_len);
     MD5Final (chal->response, &chal->md5);
 #ifdef DEBUG_AUTH
-    log (LOG_DEBUG, "response is %X%X%X%X to '%s' and %X%X%X%X, %d\n",
+    l2tp_log (LOG_DEBUG, "response is %X%X%X%X to '%s' and %X%X%X%X, %d\n",
          *((int *) &chal->response[0]),
          *((int *) &chal->response[4]),
          *((int *) &chal->response[8]),
          *((int *) &chal->response[12]),
          chal->secret,
@@ -317,11 +317,11 @@ struct lns *get_lns (struct tunnel *t)
         {
             if ((ntohl (t->peer.sin_addr.s_addr) >= ntohl (ipr->start)) &&
                 (ntohl (t->peer.sin_addr.s_addr) <= ntohl (ipr->end)))
             {
 #ifdef DEBUG_AAA
-                log (LOG_DEBUG,
+                l2tp_log (LOG_DEBUG,
                      "get_lns: Rule %s to %s, sense %s matched %s\n",
                      IPADDY (ipr->start), IPADDY (ipr->end),
                      (ipr->sense ? "allow" : "deny"), IPADDY (t->peer.sin_addr.s_addr));
 #endif
                 allow = ipr->sense;
@@ -345,18 +345,18 @@ struct lns *get_lns (struct tunnel *t)
 
 #ifdef DEBUG_HIDDEN
 void print_md5 (void *md5)
 {
     int *i = (int *) md5;
-    log (LOG_DEBUG, "%X%X%X%X\n", i[0], i[1], i[2], i[3], i[4]);
+    l2tp_log (LOG_DEBUG, "%X%X%X%X\n", i[0], i[1], i[2], i[3], i[4]);
 }
 
 inline void print_challenge (struct challenge *chal)
 {
-    log (LOG_DEBUG, "vector: ");
+    l2tp_log (LOG_DEBUG, "vector: ");
     print_md5 (chal->vector);
-    log (LOG_DEBUG, "secret: %s\n", chal->secret);
+    l2tp_log (LOG_DEBUG, "secret: %s\n", chal->secret);
 }
 #endif
 void encrypt_avp (struct buffer *buf, _u16 len, struct tunnel *t)
 {
     /* Encrypts an AVP of len, at data.  We assume there
@@ -401,21 +401,21 @@ void encrypt_avp (struct buffer *buf, _u
     end = ((char *) new_hdr) + length;
     previous_segment = ptr;
     while (ptr < end)
     {
 #if DEBUG_HIDDEN
-        log (LOG_DEBUG, "%s: The digest to be XOR'ed\n", __FUNCTION__);
+        l2tp_log (LOG_DEBUG, "%s: The digest to be XOR'ed\n", __FUNCTION__);
         bufferDump (digest, MD_SIG_SIZE);
-        log (LOG_DEBUG, "%s: The plaintext to be XOR'ed\n", __FUNCTION__);
+        l2tp_log (LOG_DEBUG, "%s: The plaintext to be XOR'ed\n", __FUNCTION__);
         bufferDump (ptr, MD_SIG_SIZE);
 #endif
         for (cnt = 0; cnt < MD_SIG_SIZE; cnt++, ptr++)
         {
             *ptr = *ptr ^ digest[cnt];
         }
 #if DEBUG_HIDDEN
-        log (LOG_DEBUG, "%s: The result of XOR\n", __FUNCTION__);
+        l2tp_log (LOG_DEBUG, "%s: The result of XOR\n", __FUNCTION__);
         bufferDump (previous_segment, MD_SIG_SIZE);
 #endif
         if (ptr < end)
         {
             MD5Init (&t->chal_them.md5);
@@ -445,11 +445,11 @@ int decrypt_avp (char *buf, struct tunne
     ptr = ((char *) old_hdr) + sizeof (struct avp_hdr);
     olen = old_hdr->length & 0x0FFF;
     end = buf + olen;
     if (!t->chal_us.vector)
     {
-        log (LOG_DEBUG,
+        l2tp_log (LOG_DEBUG,
              "decrypt_avp: Hidden bit set, but no random vector specified!\n");
[...4088 lines suppressed...]
     {
-        log (LOG_WARN, "%s: called on NULL buffer!\n", __FUNCTION__);
+        l2tp_log (LOG_WARN, "%s: called on NULL buffer!\n", __FUNCTION__);
         return;
     }
 
     buf->retries++;
     t = buf->tunnel;
@@ -170,11 +170,11 @@ void control_xmit (void *b)
     if (t)
     {
         if (ns < t->cLr)
         {
 #ifdef DEBUG_CONTROL_XMIT
-            log (LOG_DEBUG, "%s: Tossing packet %d\n", __FUNCTION__, ns);
+            l2tp_log (LOG_DEBUG, "%s: Tossing packet %d\n", __FUNCTION__, ns);
 #endif
             /* Okay, it's been received.  Let's toss it now */
             toss (buf);
             return;
         }
@@ -187,19 +187,19 @@ void control_xmit (void *b)
          */
         if (t)
         {
             if (t->self->needclose)
             {
-                log (LOG_DEBUG,
+                l2tp_log (LOG_DEBUG,
                      "Unable to deliver closing message for tunnel %d. Destroying anyway.\n",
                      t->ourtid);
                 t->self->needclose = 0;
                 t->self->closing = -1;
             }
             else
             {
-                log (LOG_NOTICE,
+                l2tp_log (LOG_NOTICE,
                      "Maximum retries exceeded for tunnel %d.  Closing.\n",
                      t->ourtid);
                 strcpy (t->self->errormsg, "Timeout");
                 t->self->needclose = -1;
             }
@@ -214,11 +214,11 @@ void control_xmit (void *b)
          */
         tv.tv_sec = 1;
         tv.tv_usec = 0;
         schedule (tv, control_xmit, buf);
 #ifdef DEBUG_CONTROL_XMIT
-        log (LOG_DEBUG, "%s: Scheduling and transmitting packet %d\n",
+        l2tp_log (LOG_DEBUG, "%s: Scheduling and transmitting packet %d\n",
              __FUNCTION__, ns);
 #endif
         udp_xmit (buf);
     }
 }
@@ -277,11 +277,11 @@ int build_fdset (fd_set *readfds)
 		 * closing, check if the tunnel needs to be closed too
 		 */
 		if (tun->self->needclose ^ tun->self->closing)
 		{
 			if (gconfig.debug_tunnel)
-				log (LOG_DEBUG, "%s: closing down tunnel %d\n",
+				l2tp_log (LOG_DEBUG, "%s: closing down tunnel %d\n",
 						__FUNCTION__, tun->ourtid);
 			call_close (tun->self);
 			/* Reset the while loop
 			 * and check for NULL */
 			tun = tunnels.head;
@@ -345,26 +345,26 @@ void network_thread ()
             if (recvsize < MIN_PAYLOAD_HDR_LEN)
             {
                 if (recvsize < 0)
                 {
                     if (errno != EAGAIN)
-                        log (LOG_WARN,
+                        l2tp_log (LOG_WARN,
                              "%s: recvfrom returned error %d (%s)\n",
                              __FUNCTION__, errno, strerror (errno));
                 }
                 else
                 {
-                    log (LOG_WARN, "%s: received too small a packet\n",
+                    l2tp_log (LOG_WARN, "%s: received too small a packet\n",
                          __FUNCTION__);
                 }
             }
             else
             {
                 buf->len = recvsize;
                 if (gconfig.debug_network)
                 {
-                    log (LOG_DEBUG, "%s: recv packet from %s, size = %d, "
+                    l2tp_log (LOG_DEBUG, "%s: recv packet from %s, size = %d, "
 							"tunnel = %d, call = %d\n", __FUNCTION__,
 							inet_ntoa (from.sin_addr), recvsize, tunnel, call);
                 }
                 if (gconfig.packet_dump)
                 {
@@ -388,17 +388,17 @@ void network_thread ()
                          * this from closing the tunnel, if we get a call on a valid
                          * tunnel, but not with a valid CID, we'll just send a ZLB
                          * to ack receiving the packet.
                          */
                         if (gconfig.debug_tunnel)
-                            log (LOG_DEBUG,
+                            l2tp_log (LOG_DEBUG,
                                  "%s: no such call %d on tunnel %d.  Sending special ZLB\n",
                                  __FUNCTION__);
                         handle_special (buf, c, call);
                     }
                     else
-                        log (LOG_DEBUG,
+                        l2tp_log (LOG_DEBUG,
                              "%s: unable to find call or tunnel to handle packet.  call = %d, tunnel = %d Dumping.\n",
                              __FUNCTION__, call, tunnel);
 
                 }
                 else
@@ -407,11 +407,11 @@ void network_thread ()
                     /* Handle the packet */
                     c->container->chal_us.vector = NULL;
                     if (handle_packet (buf, c->container, c))
                     {
                         if (gconfig.debug_tunnel)
-                            log (LOG_DEBUG, "%s: bad packet\n", __FUNCTION__);
+                            l2tp_log (LOG_DEBUG, "%s: bad packet\n", __FUNCTION__);
                     };
                     if (c->cnu)
                     {
                         /* Send Zero Byte Packet */
                         control_zlb (buf, c->container, c);
@@ -431,11 +431,11 @@ void network_thread ()
                 {
                     /* Got some payload to send */
                     int result;
                     recycle_payload (buf, sc->container->peer);
 #ifdef DEBUG_FLOW_MORE
-                    log (LOG_DEBUG, "%s: rws = %d, pSs = %d, pLr = %d\n",
+                    l2tp_log (LOG_DEBUG, "%s: rws = %d, pSs = %d, pLr = %d\n",
                          __FUNCTION__, sc->rws, sc->pSs, sc->pLr);
 #endif
 /*					if ((sc->rws>0) && (sc->pSs > sc->pLr + sc->rws) && !sc->rbit) {
 #ifdef DEBUG_FLOW
 						log(LOG_DEBUG, "%s: throttling payload (call = %d, tunnel = %d, Lr = %d, Ss = %d, rws = %d)!\n",__FUNCTION__,
@@ -472,11 +472,11 @@ void network_thread ()
                         udp_xmit (buf);
                         recycle_payload (buf, sc->container->peer);
                     }
                     if (result != 0)
                     {
-                        log (LOG_WARN,
+                        l2tp_log (LOG_WARN,
                              "%s: tossing read packet, error = %s (%d).  Closing call.\n",
                              __FUNCTION__, strerror (-result), -result);
                         strcpy (sc->errormsg, strerror (-result));
                         sc->needclose = -1;
                     }
diff --git a/pty.c b/pty.c
--- a/pty.c
+++ b/pty.c
@@ -55,8 +55,8 @@ int getPtyMaster (char *tty10, char *tty
                 *tty01 = *p01;
                 return fd;
             }
         }
     }
-    log (LOG_CRIT, "%s: No more free pseudo-tty's\n", __FUNCTION__);
+    l2tp_log (LOG_CRIT, "%s: No more free pseudo-tty's\n", __FUNCTION__);
     return -1;
 }
diff --git a/scheduler.c b/scheduler.c
--- a/scheduler.c
+++ b/scheduler.c
@@ -54,11 +54,11 @@ void alarm_handler (int signal)
     static int cnt = 0;
     cnt++;
     if (cnt != 1)
     {
         /* Whoa, we got called from within ourselves! */
-        log (LOG_DEBUG, "%s : Whoa... cnt = %d\n", __FUNCTION__, cnt);
+        l2tp_log (LOG_DEBUG, "%s : Whoa... cnt = %d\n", __FUNCTION__, cnt);
         return;
     }
     while (events)
     {
         gettimeofday (&now, NULL);
@@ -87,11 +87,11 @@ void alarm_handler (int signal)
             then.tv_sec -= 1;
             then.tv_usec += 1000000;
         }
         if ((then.tv_sec <= 0) && (then.tv_usec <= 0))
         {
-            log (LOG_WARN, "%s: Whoa...  Scheduling for <=0 time???\n",
+            l2tp_log (LOG_WARN, "%s: Whoa...  Scheduling for <=0 time???\n",
                  __FUNCTION__);
         }
         else
         {
             itv.it_interval = zero;

l2tpd-max-retries.patch:

--- NEW FILE l2tpd-max-retries.patch ---
diff --git a/l2tp.h b/l2tp.h
--- a/l2tp.h
+++ b/l2tp.h
@@ -88,11 +88,16 @@ struct payload_hdr
                                    a zero byte packet */
 
 #define PAYLOAD_BUF 10          /* Provide 10 expansion bytes
                                    so we can "decompress" the
                                    payloads and simplify coding */
-#define DEFAULT_MAX_RETRIES 5   /* Recommended value from spec */
+#if 1
+#define DEFAULT_MAX_RETRIES 5    /* Recommended value from spec */
+#else
+#define DEFAULT_MAX_RETRIES 95   /* give us more time to debug */
+#endif
+
 #define DEFAULT_RWS_SIZE   4    /* Default max outstanding 
                                    control packets in queue */
 #define DEFAULT_TX_BPS		10000000        /* For outgoing calls, report this speed */
 #define DEFAULT_RX_BPS		10000000
 #define DEFAULT_MAX_BPS		10000000        /* jz: outgoing calls max bps */

l2tpd-moredebug.patch:

--- NEW FILE l2tpd-moredebug.patch ---
diff-tree a61da5a7451135f3504012f68bb7307abaf42657 (from 7493cefcda7a70ce3da5f244ef2df4782c551c87)
Author: Michael Richardson 
Date:   Fri Nov 25 13:06:02 2005 -0500

    various debugging added

diff --git a/control.c b/control.c
--- a/control.c
+++ b/control.c
@@ -1545,11 +1545,11 @@ inline int write_packet (struct buffer *
     static unsigned char wbuf[MAX_RECV_SIZE];
     int pos = 0;
 
     if (c->fd < 0)
     {
-        if (DEBUG)
+        if (DEBUG || 1)
             l2tp_log (LOG_DEBUG, "%s: tty is not open yet.\n", __FUNCTION__);
         return -EIO;
     }
     /*
      * Skip over header 
@@ -1561,11 +1561,10 @@ inline int write_packet (struct buffer *
     c->rx_bytes += buf->len;
 
     /*
      * FIXME:  What about offset?
      */
-
     while (!convert)
     {
         /* We are given async frames, so write them
            directly to the tty */
         err = write (c->fd, buf->start, buf->len);
@@ -1633,22 +1632,31 @@ inline int write_packet (struct buffer *
         }
         wbuf[pos++] = e;
 
     }
     wbuf[pos++] = PPP_FLAG;
+
+#if 0
+    if(DEBUG) {
+      l2tp_log(LOG_DEBUG, "after sync->async, expanded %d->%d\n",
+	       buf->len, pos);
+    }
+#endif
+
     x = write (c->fd, wbuf, pos);
     if (x < pos)
     {
+      if (DEBUG)
+	l2tp_log (LOG_WARN, "%s: %s(%d)\n", __FUNCTION__, strerror (errno),
+		  errno);
+
         if (!(errno == EINTR) && !(errno == EAGAIN))
         {
             /*
                * I guess pppd died.  we'll pretend
                * everything ended normally
              */
-            if (DEBUG)
-                l2tp_log (LOG_WARN, "%s: %s(%d)\n", __FUNCTION__, strerror (errno),
-                     errno);
             c->needclose = -1;
             c->fd = -1;
             return -EIO;
         }
     }

l2tpd-move-pty-logic.patch:

--- NEW FILE l2tpd-move-pty-logic.patch ---
diff-tree 95c2f93c9ec71103a75f8657c417759e2a553839 (from c61f0a0bd1a0c8029b7770e20950aa83c79a9a1f)
Author: Michael Richardson 
Date:   Tue Nov 22 23:21:29 2005 -0500

    move all logic about pty usage to pty.c
    try ptmx first. if it fails try legacy ptys

diff --git a/l2tpd.c b/l2tpd.c
--- a/l2tpd.c
+++ b/l2tpd.c
@@ -288,11 +288,11 @@ void death_handler (int signal)
 }
 
 int start_pppd (struct call *c, struct ppp_opts *opts)
 {
     /* char a, b; */
-    char *tty;
+    char tty[512];
     char *stropt[80];
     struct ppp_opts *p;
 #ifdef USE_KERNEL
     struct l2tp_call_opts co;
 #endif
@@ -337,71 +337,35 @@ int start_pppd (struct call *c, struct p
         snprintf (stropt[pos], 10, "%d", co.id);
         pos++;
         stropt[pos] = NULL;
     }
     else
-    {
 #endif
-	c->fd = open("/dev/ptmx", O_RDWR);
-	if (c->fd == -1)
-	{
-		l2tp_log (LOG_WARN, "%s: unable to open /dev/ptmx to allocate pty\n",
-				__FUNCTION__);
-		return -EINVAL;
-	} else
-	{
-	    if (grantpt(c->fd))
-	    {
-		l2tp_log (LOG_WARN, "%s: unable to grantpt() on pty\n",
-				__FUNCTION__);
-		close(c->fd);
-		return -EINVAL;
-	    }
-	    if (unlockpt(c->fd))
-	    {
-		l2tp_log (LOG_WARN, "%s: unable to unlockpt() on pty\n",
-			__FUNCTION__);
-		close(c->fd);
-		return -EINVAL;
-	    }
-	    tty = ptsname(c->fd);
-	    if (tty == NULL)
-	    {
-		l2tp_log (LOG_WARN, "%s: unable to obtain name of slave tty\n",
-			__FUNCTION__);
-		close(c->fd);
-		return -EINVAL;
-	    }
-	}
-	
-	
- /*	if ((c->fd = getPtyMaster (&a, &b)) < 0)
+    {
+	if ((c->fd = getPtyMaster (tty, sizeof(tty))) < 0)
         {
             l2tp_log (LOG_WARN, "%s: unable to allocate pty, abandoning!\n",
-                 __FUNCTION__);
+		      __FUNCTION__);
             return -EINVAL;
-        } */
+        } 
 
         /* set fd opened above to not echo so we don't see read our own packets
            back of the file descriptor that we just wrote them to */
         tcgetattr (c->fd, &ptyconf);
         *(c->oldptyconf) = ptyconf;
         ptyconf.c_cflag &= ~(ICANON | ECHO);
         ptyconf.c_lflag &= ~ECHO;
         tcsetattr (c->fd, TCSANOW, &ptyconf);
 
-/*        snprintf (tty, sizeof (tty), "/dev/tty%c%c", a, b); */
         fd2 = open (tty, O_RDWR);
         if (fd2 < 0) {
             l2tp_log (LOG_WARN, "unable to open tty %s, cannot start pppd", tty);
             return -EINVAL;
         }
 	stropt[pos++] = strdup(tty);	
 	stropt[pos] = NULL;
-#ifdef USE_KERNEL
     }
-#endif
 
 #ifdef DEBUG_PPPD
     l2tp_log (LOG_DEBUG, "%s: I'm running:  ", __FUNCTION__);
     for (x = 0; stropt[x]; x++)
     {
@@ -1151,11 +1115,11 @@ void init (int argc,char *argv[])
     if (init_config ())
     {
         l2tp_log (LOG_CRIT, "%s: Unable to load config file\n", __FUNCTION__);
         exit (1);
     }
-    if (uname (&uts))
+    if (uname (&uts)<0)
     {
         l2tp_log (LOG_CRIT, "%s : Unable to determine host system\n",
              __FUNCTION__);
         exit (1);
     }
diff --git a/misc.h b/misc.h
--- a/misc.h
+++ b/misc.h
@@ -71,11 +71,11 @@ extern void udppush_handler (int);
 extern int addfcs (struct buffer *buf);
 extern inline void swaps (void *, int);
 extern void do_packet_dump (struct buffer *);
 extern void status (const char *fmt, ...);
 extern void status_handler (int signal);
-extern int getPtyMaster (char *a, char *b);
+extern int getPtyMaster(char *, int);
 extern void do_control (void);
 extern void recycle_buf (struct buffer *);
 extern void safe_copy (char *, char *, int);
 extern void opt_destroy (struct ppp_opts *);
 extern struct ppp_opts *add_opt (struct ppp_opts *, char *, ...);
diff --git a/pty.c b/pty.c
--- a/pty.c
+++ b/pty.c
@@ -12,12 +12,24 @@
  * Pseudo-pty allocation routines...  Concepts and code borrowed
  * from pty-redir by Magosanyi Arpad.
  *
  */
 
-#include "l2tp.h"
+#define _ISOC99_SOURCE
+#define _XOPEN_SOURCE
+#define _BSD_SOURCE
+#define _XOPEN_SOURCE_EXTENDED
+
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
+#include "l2tp.h"
+
+
 
 #ifdef SOLARIS
 #define PTY00 "/dev/ptyXX"
 #define PTY10 "pqrstuvwxyz"
 #define PTY01 "0123456789abcdef"
@@ -33,11 +45,11 @@
 #define PTY00 "/dev/ptyXX"
 #define PTY10 "p"
 #define PTY01 "0123456789abcdefghijklmnopqrstuv"
 #endif
 
-int getPtyMaster (char *tty10, char *tty01)
+int getPtyMaster_pty (char *tty10, char *tty01)
 {
     char *p10;
     char *p01;
     static char dev[] = PTY00;
     int fd;
@@ -58,5 +70,70 @@ int getPtyMaster (char *tty10, char *tty
         }
     }
     l2tp_log (LOG_CRIT, "%s: No more free pseudo-tty's\n", __FUNCTION__);
     return -1;
 }
+
+int getPtyMaster_ptmx(char *ttybuf, int ttybuflen)
+{
+    int fd;
+    char *tty;
+
+    fd = open("/dev/ptmx", O_RDWR);
+    if (fd == -1)
+    {
+	l2tp_log (LOG_WARN, "%s: unable to open /dev/ptmx to allocate pty\n",
+		  __FUNCTION__);
+	return -EINVAL;
+    }
+
+    /* change the onwership */
+    if (grantpt(fd))
+    {
+	l2tp_log (LOG_WARN, "%s: unable to grantpt() on pty\n",
+		  __FUNCTION__);
+	close(fd);
+	return -EINVAL;
+    }
+
+    if (unlockpt(fd))
+    {
+	l2tp_log (LOG_WARN, "%s: unable to unlockpt() on pty\n",
+		  __FUNCTION__);
+	close(fd);
+	return -EINVAL;
+    }
+
+    tty = ptsname(fd);
+    if (tty == NULL)
+    {
+	l2tp_log (LOG_WARN, "%s: unable to obtain name of slave tty\n",
+		  __FUNCTION__);
+	close(fd);
+	return -EINVAL;
+    }
+    ttybuf[0]='\0';
+    strncat(ttybuf, tty, ttybuflen);
+
+    return fd;
+}
+	
+int getPtyMaster(char *ttybuf, int ttybuflen)
+{
+    int fd = getPtyMaster_ptmx(ttybuf, ttybuflen);
+    char a, b;
+    
+    if(fd >= 0) {
+	return fd;
+    }
+
+    l2tp_log (LOG_WARN, "%s: failed to use pts -- using legacy ptys\n", __FUNCTION__);
+    fd = getPtyMaster_pty(&a,&b);
+    
+    if(fd >= 0) {
+	snprintf(ttybuf, ttybuflen, "/dev/tty%c%c", a, b);
+	return fd;
+    }
+
+    return -EINVAL;
+}
+	

l2tpd-nodebug-default.patch:

--- NEW FILE l2tpd-nodebug-default.patch ---
diff-tree 30715d7b0838372bd42ecd9fb6b9c708d522e72d (from b240ad8ce83e0a0dbee533cb2862a5eafb937504)
Author: Michael Richardson 
Date:   Fri Nov 25 13:05:21 2005 -0500

    debugging should not be on by default

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -24,11 +24,11 @@
 # -DTEST_HIDDEN makes Assigned Call ID sent as a hidden AVP
 #
 # Also look at the top of network.c for some other (eventually to 
 # become runtime options) debugging flags
 #
-DFLAGS= -g -O2 -DDEBUG_PPPD -DDEBUG_PAYLOAD
+DFLAGS= -g -O2 
 #
 # Uncomment the next line for Linux
 #
 OSFLAGS= -DLINUX
 #


--- NEW FILE l2tpd-options.l2tpd ---
ipcp-accept-local
ipcp-accept-remote
ms-dns  192.168.1.1
ms-dns  192.168.1.3
ms-wins 192.168.1.2
ms-wins 192.168.1.4
noccp
auth
crtscts
idle 1800
mtu 1410
mru 1410
nodefaultroute
debug
lock
proxyarp
connect-delay 5000

l2tpd-patents.patch:

--- NEW FILE l2tpd-patents.patch ---
--- l2tpd-0.69cvs20051030/README.patents	1969-12-31 19:00:00.000000000 -0500
+++ l2tpd/README.patents	2005-11-27 19:45:38.000000000 -0500
@@ -0,0 +1,50 @@
+
+http://www.ietf.org/ietf/IPR/CISCO-L2TP
+
+The following was received on March 2, 1999 from
+Andy Valencia  (vandys at cisco.com)
+
+Cisco has a patent pending that may relate to this proposed standard. If
+this proposed standard is adopted by IETF and any patents issue to Cisco or
+its subsidiaries with claims that are necessary for practicing this
+standard, any party will be able to obtain the right to implement, use and
+distribute the technology or works when implementing, using or distributing
+technology based upon the specific specification(s) under openly specified,
+reasonable, non-discriminatory terms.
+
+
+Requests may be sent to:
+
+Robert Barr
+Suite 280
+2882 Sand Hill Road
+Menlo Park Ca 94025
+
+Phone: 650-926-6205
+
+
+Note: On July 30, 1999, we were informed that the patent office had assigned 
+      the number 5,918,019 for the patent
+
+--------------------------
+Cisco allows anyone to use their patent as long as it is IETF RFC
+compliant. This is Cisco's standard policy on patents for their IETF
+work. In fact, their statement was made before being awarded the
+patent. They complied fully with the IPR disclosure policy of the
+IETF. The IETF does not release RFC's that are limited or in any way
+discriminatory in their use. The patent holder (in this case Ciso)
+agree to a royalty free, unrevocable use of their patent as needed for
+implementing the IETF standards.
+
+If there were any limitations on the implementation and use of L2TP,
+the L2TP working group would not exist any more, and no new protocol
+additions or changes would be accepted as RFC standard.
+
+The L2TP became an IETF standard, see http://www.ietf.org/rfc/rfc2661.txt
+
+Notice the RFC was issued after the disclosure for IPR by Cisco, so
+the IETF fully knew about the patent and confirmed that there were no
+restrictions before it issued the RFC.
+
+   --- Paul Wouters 
+

l2tpd-socket.patch:

--- NEW FILE l2tpd-socket.patch ---
diff --git a/l2tpd.c b/l2tpd.c
--- a/l2tpd.c
+++ b/l2tpd.c
@@ -58,10 +58,12 @@ int control_fd;                 /* descr
 char *args;
 
 char *dial_no_tmp;              /* jz: Dialnumber for Outgoing Call */
 int switch_io = 0;              /* jz: Switch for Incoming or Outgoing Call */
 
+static void open_controlfd(void);
+
 void init_tunnel_list (struct tunnel_list *t)
 {
     t->head = NULL;
     t->count = 0;
     t->calls = 0;
@@ -353,10 +356,14 @@ int start_pppd (struct call *c, struct p
         tcgetattr (c->fd, &ptyconf);
         *(c->oldptyconf) = ptyconf;
         ptyconf.c_cflag &= ~(ICANON | ECHO);
         ptyconf.c_lflag &= ~ECHO;
         tcsetattr (c->fd, TCSANOW, &ptyconf);
+	if(fcntl(c->fd, F_SETFL, O_NONBLOCK)!=0) {
+	    l2tp_log(LOG_WARN, "failed to set nonblock: %s\n", strerror(errno));
+	    return -EINVAL;
+	}
 
         fd2 = open (tty, O_RDWR);
         if (fd2 < 0) {
             l2tp_log (LOG_WARN, "unable to open tty %s, cannot start pppd", tty);
             return -EINVAL;
@@ -809,170 +818,176 @@ void do_control ()
     char *tmp_ptr;              /* jz: use by the strtok function */
     struct lac *lac;
     int call;
     int tunl;
     int cnt = -1;
-    while (cnt)
+    int done = 0;
+
+    buf[0]='\0';
+
+    while (!done)
     {
-        cnt = read (control_fd, buf, sizeof (buf));
-        if (cnt > 0)
-        {
-            if (buf[cnt - 1] == '\n')
-                buf[--cnt] = 0;
+	cnt = read (control_fd, buf, sizeof (buf));
+	if (cnt <= 0)
+	{
+	    if(cnt < 0 && errno != EINTR) {
+		perror("controlfd");
+	    }
+	    done=1;
+	    break;
+	}
+
+	if (buf[cnt - 1] == '\n')
+	    buf[--cnt] = 0;
 #ifdef DEBUG_CONTROL
-            l2tp_log (LOG_DEBUG, "%s: Got message %s (%d bytes long)\n",
-                 __FUNCTION__, buf, cnt);
+	l2tp_log (LOG_DEBUG, "%s: Got message %s (%d bytes long)\n",
+		  __FUNCTION__, buf, cnt);
 #endif
-            switch (buf[0])
-            {
-            case 't':
-                host = strchr (buf, ' ') + 1;
+	switch (buf[0])
+	{
+	case 't':
+	    host = strchr (buf, ' ') + 1;
 #ifdef DEBUG_CONTROL
-                l2tp_log (LOG_DEBUG, "%s: Attempting to tunnel to %s\n",
-                     __FUNCTION__, host);
+	    l2tp_log (LOG_DEBUG, "%s: Attempting to tunnel to %s\n",
+		      __FUNCTION__, host);
 #endif
-                l2tp_call (host, UDP_LISTEN_PORT, NULL, NULL);
-                break;
-            case 'c':
-
-                switch_io = 1;  /* jz: Switch for Incoming - Outgoing Calls */
-
-                tunstr = strchr (buf, ' ') + 1;
-                lac = laclist;
-                while (lac)
-                {
-                    if (!strcasecmp (lac->entname, tunstr))
-                    {
-                        lac->active = -1;
-                        lac->rtries = 0;
-                        if (!lac->c)
-                            magic_lac_dial (lac);
-                        else
-                            l2tp_log (LOG_DEBUG,
-                                 "Session '%s' already active!\n", lac->entname);
-                        break;
-                    }
-                    lac = lac->next;
-                }
-                if (lac)
-                    break;
-                tunl = atoi (tunstr);
-                if (!tunl)
-                {
-                    l2tp_log (LOG_DEBUG, "No such tunnel '%s'\n", tunstr);
-                    break;
-                }
+	    l2tp_call (host, UDP_LISTEN_PORT, NULL, NULL);
+	    break;
+	case 'c':
+	    switch_io = 1;  /* jz: Switch for Incoming - Outgoing Calls */
+	    
+	    tunstr = strchr (buf, ' ') + 1;
+	    lac = laclist;
+	    while (lac && strcasecmp (lac->entname, tunstr)!=0)
+	    {
+		lac = lac->next;
+	    }
+
+	    if(lac) {
+		lac->active = -1;
+		lac->rtries = 0;
+		if (!lac->c)
+		    magic_lac_dial (lac);
+		else {
+		    l2tp_log (LOG_DEBUG,
+			      "Session '%s' already active!\n", lac->entname);
+		}
+		break;
+	    }
+
+	    /* did not find a tunnel by name, look by number */
+	    tunl = atoi (tunstr);
+	    if (!tunl)
+	    {
+		l2tp_log (LOG_DEBUG, "No such tunnel '%s'\n", tunstr);
+		break;
+	    }
 #ifdef DEBUG_CONTROL
-                l2tp_log (LOG_DEBUG, "%s: Attempting to call on tunnel %d\n",
-                     __FUNCTION__, tunl);
+	    l2tp_log (LOG_DEBUG, "%s: Attempting to call on tunnel %d\n",
+		      __FUNCTION__, tunl);
 #endif
-                lac_call (tunl, NULL, NULL);
-                break;
-
-            case 'o':          /* jz: option 'o' for doing a outgoing call */
-
-                switch_io = 0;  /* jz: Switch for incoming - outgoing Calls */
-
-                sub_str = strchr (buf, ' ') + 1;
-
-                tunstr = strtok (sub_str, " "); /* jz: using strtok function to get */
-                tmp_ptr = strtok (NULL, " ");   /*     params out of the pipe       */
-                strcpy (dial_no_tmp, tmp_ptr);
-
-                lac = laclist;
-                while (lac)
-                {
-                    if (!strcasecmp (lac->entname, tunstr))
-                    {
-                        lac->active = -1;
-                        lac->rtries = 0;
-                        if (!lac->c)
-                            magic_lac_dial (lac);
-                        else
-                            l2tp_log (LOG_DEBUG,
-                                 "Session '%s' already active!\n",
-                                lac->entname);
-                        break;
-                    }
-                    lac = lac->next;
-                }
-                if (lac)
-                    break;
-                tunl = atoi (tunstr);
-                if (!tunl)
-                {
-                    l2tp_log (LOG_DEBUG, "No such tunnel '%s'\n", tunstr);
-                    break;
-                }
+	    lac_call (tunl, NULL, NULL);
+	    break;
+	    
+	case 'o':          /* jz: option 'o' for doing a outgoing call */
+	    switch_io = 0;  /* jz: Switch for incoming - outgoing Calls */
+	    
+	    sub_str = strchr (buf, ' ') + 1;
+	    tunstr = strtok (sub_str, " "); /* jz: using strtok function to get */
+	    tmp_ptr = strtok (NULL, " ");   /*     params out of the pipe       */
+	    strcpy (dial_no_tmp, tmp_ptr);
+	    
+	    lac = laclist;
+	    while (lac && strcasecmp (lac->entname, tunstr)!=0)
+	    {
+		lac = lac->next;
+	    }
+
+	    if(lac) {
+		lac->active = -1;
+		lac->rtries = 0;
+		if (!lac->c)
+		    magic_lac_dial (lac);
+		else
+		    l2tp_log (LOG_DEBUG,
+			      "Session '%s' already active!\n",
+			      lac->entname);
+		break;
+	    }
+
+	    /* did not find a tunnel by name, look by number */
+	    tunl = atoi (tunstr);
+	    if (!tunl)
+	    {
+		l2tp_log (LOG_DEBUG, "No such tunnel '%s'\n", tunstr);
+		break;
+	    }
 #ifdef DEBUG_CONTROL
-                l2tp_log (LOG_DEBUG, "%s: Attempting to call on tunnel %d\n",
-                     __FUNCTION__, tunl);
+	    l2tp_log (LOG_DEBUG, "%s: Attempting to call on tunnel %d\n",
+		      __FUNCTION__, tunl);
 #endif
-                lac_call (tunl, NULL, NULL);
-                break;
-
-            case 'h':
-                callstr = strchr (buf, ' ') + 1;
-                call = atoi (callstr);
+	    lac_call (tunl, NULL, NULL);
+	    break;
+	    
+	case 'h':
+	    callstr = strchr (buf, ' ') + 1;
+	    call = atoi (callstr);
 #ifdef DEBUG_CONTROL
-                l2tp_log (LOG_DEBUG, "%s: Attempting to hangup call %d\n", __FUNCTION__,
-                     call);
+	    l2tp_log (LOG_DEBUG, "%s: Attempting to hangup call %d\n", __FUNCTION__,
+		      call);
 #endif
-                lac_hangup (call);
-                break;
-            case 'd':
-                tunstr = strchr (buf, ' ') + 1;
-                lac = laclist;
-                while (lac)
-                {
-                    if (!strcasecmp (lac->entname, tunstr))
-                    {
-                        lac->active = 0;
-                        lac->rtries = 0;
-                        if (lac->t)
-                            lac_disconnect (lac->t->ourtid);
-                        else
-                            l2tp_log (LOG_DEBUG, "Session '%s' not up\n",
-                                 lac->entname);
-                        break;
-                    }
-                    lac = lac->next;
-                }
-                if (lac)
-                    break;
-                tunl = atoi (tunstr);
-                if (!tunl)
-                {
-                    l2tp_log (LOG_DEBUG, "No such tunnel '%s'\n",
-                         tunstr);
-                    break;
-                }
+	    lac_hangup (call);
+	    break;
+
+	case 'd':
+	    tunstr = strchr (buf, ' ') + 1;
+	    lac = laclist;
+	    while (lac)
+	    {
+		if (!strcasecmp (lac->entname, tunstr))
+		{
+		    lac->active = 0;
+		    lac->rtries = 0;
+		    if (lac->t)
+			lac_disconnect (lac->t->ourtid);
+		    else
+			l2tp_log (LOG_DEBUG, "Session '%s' not up\n",
+				  lac->entname);
+		    break;
+		}
+		lac = lac->next;
+	    }
+	    if (lac)
+		break;
+	    tunl = atoi (tunstr);
+	    if (!tunl)
+	    {
+		l2tp_log (LOG_DEBUG, "No such tunnel '%s'\n",
+			  tunstr);
+		break;
+	    }
 #ifdef DEBUG_CONTROL
-                l2tp_log (LOG_DEBUG, "%s: Attempting to disconnect tunnel %d\n",
-                     __FUNCTION__, tunl);
+	    l2tp_log (LOG_DEBUG, "%s: Attempting to disconnect tunnel %d\n",
+		      __FUNCTION__, tunl);
 #endif
-                lac_disconnect (tunl);
-                break;
-            case 's':
-                show_status ();
-                break;
-            default:
-                l2tp_log (LOG_DEBUG, "Unknown command %c\n",
-                     buf[0]);
-            }
-        }
+	    lac_disconnect (tunl);
+	    break;
+	case 's':
+	    show_status ();
+	    break;
+	default:
+	    l2tp_log (LOG_DEBUG, "Unknown command %c\n",
+		      buf[0]);
+	}
     }
-    /* Otherwise select goes nuts */
+
+    /* Otherwise select goes nuts. Yeah, this just seems wrong */
     close (control_fd);
-    control_fd = open (gconfig.controlfile, O_RDONLY | O_NONBLOCK, 0600);
-    if (control_fd < 0)
-    {
-        l2tp_log (LOG_CRIT, "%s: Unable to open %s for reading.",
-             __FUNCTION__, gconfig.controlfile);
-    }
+    open_controlfd();
 }
 
+
 void usage(void) {
     printf("Usage: l2tpd -D -c [config file] -s [secret file] -p [pid file] -C [control file]\n");
     printf("\n");
     exit(1);
 }
@@ -1037,12 +1052,11 @@ void init_args(int argc, char *argv[]) {
 }
 
 
 void daemonize() {
     int pid=0;
-    int i,l;
-    char buf[STRLEN];
+    int i;
 
 #ifndef CONFIG_SNAPGEAR
     if((pid = fork()) < 0) {
         l2tp_log(LOG_LOG, "%s: Unable to fork ()\n",__FUNCTION__);
         close(server_socket);
@@ -1060,10 +1074,16 @@ void daemonize() {
             l2tp_log(LOG_LOG, "Redirect of stdout to /dev/null failed\n");
         if (dup2(0, 2) == -1)
             l2tp_log(LOG_LOG, "Redirect of stderr to /dev/null failed\n");
     }
 #endif
+}
+
+void consider_pidfile() {
+    int pid=0;
+    int i,l;
+    char buf[STRLEN];
 
     /* Read previous pid file. */
     i = open(gconfig.pidfile,O_RDONLY);
     if (i < 0) {
         /* l2tp_log(LOG_LOG, "%s: Unable to read pid file [%s]\n",
@@ -1098,11 +1118,27 @@ void daemonize() {
         write (i, buf, strlen(buf));
         close (i);
     }
 }
 
-
+static void open_controlfd() 
+{
+    control_fd = open (gconfig.controlfile, O_RDONLY | O_NONBLOCK, 0600);
+    if (control_fd < 0)
+    {
+        l2tp_log (LOG_CRIT, "%s: Unable to open %s for reading.\n",
+             __FUNCTION__, gconfig.controlfile);
+        exit (1);
+    }
+   
+    /* turn off O_NONBLOCK */
+    if(fcntl(control_fd, F_SETFL, O_RDONLY)==-1) {
+	l2tp_log(LOG_CRIT, "Can not turn off nonblocking mode for controlfd: %s\n",
+		 strerror(errno));
+	exit(1);
+    }
+}
 
 void init (int argc,char *argv[])
 {
     struct lac *lac;
     struct in_addr listenaddr;
@@ -1124,26 +1160,28 @@ void init (int argc,char *argv[])
         exit (1);
     }
     init_tunnel_list (&tunnels);
     if (init_network ())
         exit (1);
+
     if (gconfig.daemon)
 	daemonize ();
+
+    consider_pidfile();
+
     signal (SIGTERM, &death_handler);
     signal (SIGINT, &death_handler);
     signal (SIGCHLD, &child_handler);
     signal (SIGUSR1, &status_handler);
     signal (SIGHUP, &null_handler);
     init_scheduler ();
+
+    unlink(gconfig.controlfile);
     mkfifo (gconfig.controlfile, 0600);
-    control_fd = open (gconfig.controlfile, O_RDONLY | O_NONBLOCK, 0600);
-    if (control_fd < 0)
-    {
-        l2tp_log (LOG_CRIT, "%s: Unable to open %s for reading.",
-             __FUNCTION__, gconfig.controlfile);
-        exit (1);
-    }
+
+    open_controlfd();
+
     l2tp_log (LOG_LOG, "l2tpd version " SERVER_VERSION " started on %s PID:%d\n",
          hostname, getpid ());
     l2tp_log (LOG_LOG,
          "Written by Mark Spencer, Copyright (C) 1998, Adtran, Inc.\n");
     l2tp_log (LOG_LOG, "Forked by Scott Balmos and David Stipp, (C) 2001\n");

l2tpd-solaris.patch:

--- NEW FILE l2tpd-solaris.patch ---
diff-tree 4b265089250fa45cf123fc52a6b9492200913e33 (from 6b5bd2833d12585f2cf5d4c128438bb94ccd5a89)
Author: Michael Richardson 
Date:   Tue Nov 22 23:19:11 2005 -0500

    add comments for what to do on Solaris

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -24,11 +24,11 @@
 # -DTEST_HIDDEN makes Assigned Call ID sent as a hidden AVP
 #
 # Also look at the top of network.c for some other (eventually to 
 # become runtime options) debugging flags
 #
-#DFLAGS= -g -O2 -DDEBUG_PPPD
+DFLAGS= -g -O2 -DDEBUG_PPPD -DDEBUG_PAYLOAD
 #
 # Uncomment the next line for Linux
 #
 OSFLAGS= -DLINUX
 #
@@ -43,10 +43,11 @@ OSFLAGS= -DLINUX
 # Uncomment the next line for Solaris. For solaris, at least,
 # we don't want to specify -I/usr/include because it is in
 # the basic search path, and will over-ride some gcc-specific
 # include paths and cause problems.
 #
+#CC=gcc
 #OSFLAGS= -DSOLARIS
 #OSLIBS= -lnsl -lsocket
 #
 # Feature flags
 #
@@ -56,11 +57,12 @@ OSFLAGS= -DLINUX
 FFLAGS= -DIP_ALLOCATION
 
 CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(FFLAGS)
 HDRS=l2tp.h avp.h misc.h control.h call.h scheduler.h file.h aaa.h md5.h
 OBJS=l2tpd.o pty.o misc.o control.o avp.o call.o network.o avpsend.o scheduler.o file.o aaa.o md5.o
-#LIBS= $(OSLIB) # -lefence # efence for malloc checking
+SRCS=${OBJS:.o=.c} ${HDRS}
+#LIBS= $(OSLIBS) # -lefence # efence for malloc checking
 EXEC=l2tpd
 BINDIR=/usr/sbin
 
 all: $(EXEC)
 
@@ -74,5 +76,7 @@ romfs:
 	$(ROMFSINST) /bin/$(EXEC)
 
 install: ${EXEC}
 	install --mode=0755 ${EXEC} ${DESTDIR}${BINDIR}
 
+TAGS:	${SRCS}
+	etags ${SRCS}

l2tpd-stopccn.patch:

--- NEW FILE l2tpd-stopccn.patch ---
diff-tree c61f0a0bd1a0c8029b7770e20950aa83c79a9a1f (from 4b265089250fa45cf123fc52a6b9492200913e33)
Author: Michael Richardson 
Date:   Tue Nov 22 23:20:38 2005 -0500

    l2tp-patches/l2tpd-MSL2TP-StopCCN - make sure we compare against correct cid

diff --git a/control.c b/control.c
--- a/control.c
+++ b/control.c
@@ -666,16 +666,17 @@ int control_finish (struct tunnel *t, st
                 l2tp_log (LOG_DEBUG,
                      "%s: Peer tried to disconnect without specifying tunnel ID\n",
                      __FUNCTION__);
             return -EINVAL;
         }
-        if ((t->qtid != t->tid) && (t->tid > 0))
+
+        if ((t->qtid != t->ourtid) && (t->ourtid > 0))
         {
             if (DEBUG)
                 l2tp_log (LOG_DEBUG,
                      "%s: Peer tried to disconnect with invalid TID (%d != %d)\n",
-                     __FUNCTION__, t->qtid, t->tid);
+                     __FUNCTION__, t->qtid, t->ourtid);
             return -EINVAL;
         }
         /* In case they're disconnecting immediately after SCCN */
         if (!t->tid)
             t->tid = t->qtid;
@@ -1067,18 +1068,20 @@ int control_finish (struct tunnel *t, st
                          "%s: Unable to determine call to be disconnected.\n",
                          __FUNCTION__);
                 return -EINVAL;
             }
         }
-        else
+        else {
             p = c;
-        if ((c->qcid != p->cid) && p->cid > 0)
+	}
+
+        if ((c->qcid != p->cid) && p->ourcid > 0)
         {
             if (DEBUG)
                 l2tp_log (LOG_DEBUG,
                      "%s: Peer tried to disconnect with invalid CID (%d != %d)\n",
-                     __FUNCTION__, c->qcid, c->cid);
+                     __FUNCTION__, c->qcid, c->ourcid);
             return -EINVAL;
         }
         c->qcid = -1;
         if (c->result < 0)
         {

l2tpd-uaddr.patch:

--- NEW FILE l2tpd-uaddr.patch ---
diff-tree f09c91543dc84206a7a82db62bab09b8a52da44a (from df3ccc3ddfa5af6d0950f3308b546809947117fb)
Author: Michael Richardson 
Date:   Fri Nov 25 13:41:36 2005 -0500

    remove definition of uaddr[] --- it is not needed at present
    (cherry picked from 148ec348a69f28608d2bc671e96222a4c595d83d commit)

diff --git a/aaa.h b/aaa.h
--- a/aaa.h
+++ b/aaa.h
@@ -45,11 +45,10 @@ struct challenge
     unsigned int vector_len;
     int state;                  /* What state is challenge in? */
 };
 
 extern struct lns *get_lns (struct tunnel *);
-extern struct addr_ent *uaddr[];
 extern unsigned int get_addr (struct iprange *);
 extern void reserve_addr (unsigned int);
 extern void unreserve_addr (unsigned int);
 extern void init_addr ();
 extern int handle_challenge (struct tunnel *, struct challenge *);

l2tpd-version.patch:

--- NEW FILE l2tpd-version.patch ---
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -58,10 +58,11 @@ FFLAGS= -DIP_ALLOCATION
 CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(FFLAGS)
 HDRS=l2tp.h avp.h misc.h control.h call.h scheduler.h file.h aaa.h md5.h
 OBJS=l2tpd.o pty.o misc.o control.o avp.o call.o network.o avpsend.o scheduler.o file.o aaa.o md5.o
 #LIBS= $(OSLIB) # -lefence # efence for malloc checking
 EXEC=l2tpd
+BINDIR=/usr/sbin
 
 all: $(EXEC)
 
 clean:
 	rm -f $(OBJS) $(EXEC)
@@ -70,5 +71,8 @@ $(EXEC): $(OBJS) $(HDRS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
 
 romfs:
 	$(ROMFSINST) /bin/$(EXEC)
 
+install: ${EXEC}
+	install --mode=0755 ${EXEC} ${DESTDIR}${BINDIR}
+
diff --git a/l2tp.h b/l2tp.h
--- a/l2tp.h
+++ b/l2tp.h
@@ -34,12 +34,12 @@ typedef unsigned long long _u64;
 #include "common.h"
 
 #define CONTROL_PIPE "/var/run/l2tp-control"
 
 #define BINARY "l2tpd"
-#define SERVER_VERSION "0.69"
-#define VENDOR_NAME "l2tpd.org"
+#define SERVER_VERSION "0.69-FedoraExtra"
+#define VENDOR_NAME "FedoraExtra"
 #ifndef PPPD
 #define PPPD		"/usr/sbin/pppd"
 #endif
 #define CALL_PPP_OPTS "defaultroute"
 #define FIRMWARE_REV	0x0690  /* Revision of our firmware (software, in this case) */


--- NEW FILE l2tpd.conf ---
;
; This is a minimal sample l2tpd configuration file for use
; with L2TP over IPsec.
;
; The idea is to provide an L2TP daemon to which remote Windows L2TP/IPsec
; clients connect. In this example, the internal (protected) network 
; is 192.168.1.0/24.  A special IP range within this network is reserved
; for the remote clients: 192.168.1.128/25
; (i.e. 192.168.1.128 ... 192.168.1.254)
;
; The listen-addr parameter can be used if you want to bind the L2TP daemon
; to a specific IP address instead of to all interfaces. For instance,
; you could bind it to the interface of the internal LAN (e.g. 192.168.1.98
; in the example below). Yet another IP address (local ip, e.g. 192.168.1.99)
; will be used by l2tpd as its address on pppX interfaces.

[global]
; listen-addr = 192.168.1.98

[lns default]
ip range = 192.168.1.128-192.168.1.254
local ip = 192.168.1.99
require chap = yes
refuse pap = yes
require authentication = yes
name = LinuxVPNserver
ppp debug = yes
pppoptfile = /etc/ppp/options.l2tpd
length bit = yes


--- NEW FILE l2tpd.init ---
#!/bin/sh
#
# l2tpd		This shell script takes care of starting and stopping l2tpd.
#
# chkconfig: - 80 30
# description:	Layer 2 Tunnelling Protocol Daemon (RFC 2661)
#
# processname:	l2tpd
# config:	/etc/l2tpd/l2tpd.conf
# pidfile:	/var/run/l2tpd.pid

#Servicename
SERVICE=l2tpd

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

if [ ${NETWORKING} = "no" ]
then
	exit 0
fi

[ -x /usr/sbin/$SERVICE ] || exit 0

RETVAL=0

start() {
	echo -n "Starting $SERVICE: "
	daemon $SERVICE
	RETVAL=$?
	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
	echo ""
	return $RETVAL
}

stop() {
	echo -n "Stopping $SERVICE: "
	killproc $SERVICE
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$SERVICE
	return $RETVAL
}

restart() {
	stop
	start
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
	status $SERVICE
	RETVAL=$?
	;;
  restart|reload)
	restart
	;;
  condrestart)
	[ -f /var/lock/subsys/$SERVICE ] && restart || :
	;;
  *)
	echo "Usage: $SERVICE {start|stop|status|restart|reload|condrestart}"
	exit 1
esac


--- NEW FILE l2tpd.spec ---
%define cvs    20051030

Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
Name: l2tpd
Version: 0.69
Release: 0.1.%{cvs}.2
License: GPL
Url: http://sourceforge.net/projects/%{name}/
Group: System Environment/Daemons

# cvs is not available as tar ball on sourceforge.
# For cvs se: http://sourceforge.net/cvs/?group_id=18217
Source0: %{name}-%{version}.%{cvs}.tar.gz
Source1: %{name}.init
Source2: %{name}.conf
Source3: %{name}-options.l2tpd
Source4: %{name}-chapsecrets.sample

Patch0: %{name}-log.patch
Patch1: %{name}-version.patch
Patch2: %{name}-solaris.patch
Patch3: %{name}-stopccn.patch
Patch4: %{name}-move-pty-logic.patch
Patch5: %{name}-log-strerr.patch
Patch6: %{name}-socket.patch
Patch7: %{name}-async-sync.patch
Patch8: %{name}-nodebug-default.patch
Patch9: %{name}-moredebug.patch
Patch10: %{name}-max-retries.patch
Patch11: %{name}-uaddr.patch
Patch12: %{name}-gcc4-fixes.patch
Patch13: %{name}-changelog.patch
Patch14: %{name}-patents.patch

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

Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig, /sbin/service
Requires(postun): /sbin/service

%description
l2tpd is an implementation of the Layer 2 Tunnelling Protocol (RFC 2661).
L2TP allows you to tunnel PPP over UDP. Some ISPs use L2TP to tunnel user
sessions from dial-in servers (modem banks, ADSL DSLAMs) to back-end PPP
servers. Another important application is Virtual Private Networks where
the IPsec protocol is used to secure the L2TP connection (L2TP/IPsec,
RFC 3193). The L2TP/IPsec protocol is mainly used by Windows and 
Mac OS X clients. On Linux, l2tpd can be used in combination with IPsec
implementations such as FreeS/WAN, Openswan, Strongswan and KAME.
Example configuration files for such a setup are included in this RPM.

l2tpd works by opening a pseudo-tty for communicating with pppd.
It runs completely in userspace.


%prep
%setup -q -n %{name}-%{version}.%{cvs}
%patch0 -p1 -b .log
%patch1 -p1 -b .version
%patch2 -p1 -b .solaris
%patch3 -p1 -b .stopccn
%patch4 -p1 -b .move-pty-logic
%patch5 -p1 -b .log-strerr
%patch6 -p1 -b .socket
%patch7 -p1 -b .async-sync
%patch8 -p1 -b .nodebug-default
%patch9 -p1 -b .moredebug
%patch10 -p1 -b .max-retries
%patch11 -p1 -b .uaddr
%patch12 -p1 -b .gcc4-fixes
%patch13 -p1 -b .changelog
%patch14 -p1 -b .patents

%build
make DFLAGS="$RPM_OPT_FLAGS -DDEBUG_PPPD -DDEBUG_CONTROL -DDEBUG_ENTROPY"
# Fix DOS file
tr -d '\r' CREDITS.new && mv -f CREDITS.new CREDITS

%install
rm -rf %{buildroot}
# There's no 'install' rule in the Makefile, so let's do it manually
install -d %{buildroot}%{_sbindir}
install -m755 %{name} %{buildroot}%{_sbindir}
install -d %{buildroot}%{_mandir}/{man5,man8}
install -m644 doc/%{name}.conf.5 %{buildroot}%{_mandir}/man5
install -m644 doc/l2tp-secrets.5 %{buildroot}%{_mandir}/man5/
install -m644 doc/%{name}.8 %{buildroot}%{_mandir}/man8
install -d %{buildroot}%{_sysconfdir}/{%{name},ppp,ipsec.d}
install -m644 doc/%{name}.conf.sample %{buildroot}%{_sysconfdir}/%{name}/
install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/ppp/options.l2tpd
install -m600 doc/l2tp-secrets.sample %{buildroot}%{_sysconfdir}/%{name}/l2tp-secrets
install -d %{buildroot}%{_initrddir}
install -m755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
install -m644 %{SOURCE4} .

%clean
rm -rf %{buildroot}

%post
/sbin/chkconfig --add %{name}

%preun
if [ $1 -eq 0 ]; then
        /sbin/service %{name} stop > /dev/null 2>&1
        /sbin/chkconfig --del %{name}
fi

%postun
if [ $1 -ge 1 ]; then
  /sbin/service %{name} condrestart 2>&1 >/dev/null
fi

%files
%defattr(-,root,root,-)
%doc BUGS CHANGELOG CREDITS LICENSE README TODO doc/rfc2661.txt 
%doc CHANGELOG.Xelerance README.patents l2tpd-chapsecrets.sample
%{_sbindir}/%{name}
%{_mandir}/*/*
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/*
%config(noreplace) %{_sysconfdir}/ppp/*
%attr(0755,root,root)  %{_initrddir}/%{name}


%changelog
* Wed Dec 14 2005 Paul Wouters  0.69-0.1.20051030
- incorporated fixes from Dmitry Butskoy

* Sun Nov 27 2005 Paul Wouters  0.69.20051030
- Pulled up sourceforget.net CVS fixes.
- various debugging added, but debugging should not be on by default.
- async/sync conversion routines must be ready for possibility that the read
  will block due to routing loops.
- refactor control socket handling.
- move all logic about pty usage to pty.c. Try ptmx first, if it fails try
  legacy ptys
- rename log() to l2tp_log(), as "log" is a math function.
- if we aren't deamonized, then log to stderr.
- added install: and DESTDIR support.

* Thu Oct 20 2005 Paul Wouters  0.69-13
- Removed suse/mandrake specifics. Comply for Fedora Extras guidelines

* Tue Jun 21 2005 Jacco de Leeuw  0.69-12jdl
- Added log() patch by Paul Wouters so that l2tpd compiles on FC4.

* Sat Jun 4 2005 Jacco de Leeuw 
- l2tpd.org has been hijacked. Project moved back to SourceForge:
  http://l2tpd.sourceforge.net 

* Tue May 3 2005 Jacco de Leeuw 
- Small Makefile fixes. Explicitly use gcc instead of cc. 
  Network services library was not linked on Solaris due to typo.

* Thu Mar 17 2005 Jacco de Leeuw  0.69-11jdl
- Choosing between SysV or BSD style ptys is now configurable through
  a compile-time boolean "unix98pty".

* Fri Feb 4 2005 Jacco de Leeuw 
- Added code from Roaring Penguin (rp-l2tp) to support SysV-style ptys.
  Requires the N_HDLC kernel module. 

* Fri Nov 26 2004 Jacco de Leeuw 
- Updated the README.

* Wed Nov 10 2004 Jacco de Leeuw  0.69-10jdl
- Patch by Marald Klein and Roger Luethi. Fixes writing PID file.
  (http://l2tpd.graffl.net/msg01790.html)
  Long overdue. Rereleasing 10jdl.

* Tue Nov 9 2004 Jacco de Leeuw  0.69-10jdl
- [SECURITY FIX] Added fix from Debian because of a bss-based
  buffer overflow.
  (http://www.mail-archive.com/l2tpd-devel at l2tpd.org/msg01071.html)
- Mandrake's FreeS/WAN, Openswan and Strongswan RPMS use configuration
  directories /etc/{freeswan,openswan,strongswan}. Install our
  configuration files to /etc/ipsec.d and create symbolic links in
  those directories.

* Tue Aug 18 2004 Jacco de Leeuw 
- Removed 'leftnexthop=' lines. Not relevant for recent versions
  of FreeS/WAN and derivates.

* Tue Jan 20 2004 Jacco de Leeuw   0.69-9jdl
- Added "noccp" because of too much MPPE/CCP messages sometimes.

* Wed Dec 31 2003 Jacco de Leeuw 
- Added patch in order to prevent StopCCN messages.

* Sat Aug 23 2003 Jacco de Leeuw 
- MTU/MRU 1410 seems to be the lowest possible for MSL2TP.
  For Windows 2000/XP it doesn't seem to matter.
- Typo in l2tpd.conf (192.168.128/25).

* Fri Aug 8 2003 Jacco de Leeuw   0.69-8jdl
- Added MTU/MRU 1400 to options.l2tpd. I don't know the optimal
  value but some apps had problems with the default value.

* Fri Aug 1 2003 Jacco de Leeuw 
- Added workaround for the missing hostname bug in the MSL2TP client
  ('Specify your hostname', error 629: "You have been disconnected
  from the computer you are dialing").

* Thu Jul 20 2003 Jacco de Leeuw   0.69-7jdl
- Added the "listen-addr" global parameter for l2tpd.conf. By
  default, the daemon listens on *all* interfaces. Use
  "listen-addr" if you want it to bind to one specific
  IP address (interface), for security reasons. (See also:
  http://www.jacco2.dds.nl/networking/freeswan-l2tp.html#Firewallwarning)
- Explained in l2tpd.conf that two different IP addresses should be
  used for 'listen-addr' and 'local ip'.
- Modified init script. Upgrades should work better now. You
  still need to start/chkconfig l2tpd manually.
- Renamed the example Openswan .conf files to better reflect
  the situation. There are two variants using different portselectors.
  Previously I thought Windows 2000/XP used portselector 17/0
  and the rest used 17/1701. But with the release of an updated 
  IPsec client by Microsoft, it turns out that 17/0 must have
  been a mistake: the updated client now also uses 17/1701.

* Mon Apr 10 2003 Jacco de Leeuw   0.69-6jdl
- Changed sample chap-secrets to be valid only for specific
  IP addresses.

* Thu Mar 13 2003 Bernhard Thoni 
- Adjustments for SuSE8.x (thanks, Bernhard!)
- Added sample chap-secrets.

* Thu Mar 6 2003 Jacco de Leeuw  0.69-5jdl
- Replaced Dominique's patch by Damion de Soto's, which does not
  depend on the N_HDLC kernel module. 

* Wed Feb 26 2003 Jacco de Leeuw  0.69-4jdl
- Seperate example config files for Win9x (MSL2TP) and Win2K/XP
  due to left/rightprotoport differences.
  Fixing preun for Red Hat.

* Mon Feb 3 2003 Jacco de Leeuw  0.69-3jdl
- Mandrake uses /etc/freeswan/ instead of /etc/ipsec.d/
  Error fixed: source6 was used for both PSK and CERT.

* Wed Jan 29 2003 Jacco de Leeuw  0.69-3jdl
- Added Dominique Cressatti's pty patch in another attempt to
  prevent the Windows 2000 Professional "loopback detected" error.
  Seems to work!

* Wed Dec 25 2002 Jacco de Leeuw  0.69-2jdl
- Added 'connect-delay' to PPP parameters in an attempt to
  prevent the Windows 2000 Professional "loopback detected" error.
  Didn't seem to work.

* Fri Dec 13 2002 Jacco de Leeuw  0.69-1jdl
- Did not build on Red Hat 8.0. Solved by adding comments(?!).
  Bug detected in spec file: chkconfig --list l2tpd does not work
  on Red Hat 8.0. Not important enough to look into yet.

* Sun Nov 17 2002 Jacco de Leeuw  0.69-1jdl
- Tested on Red Hat, required some changes. No gprintf. Used different
  pty patch, otherwise wouldn't run. Added buildroot sanity check.

* Sun Nov 10 2002 Jacco de Leeuw 
- Specfile adapted from Mandrake Cooker. The original RPM can be
  retrieved through:
  http://www.rpmfind.net/linux/rpm2html/search.php?query=l2tpd
- Config path changed from /etc/l2tp/ to /etc/l2tpd/ 
  (Seems more logical and rp-l2tp already uses /etc/l2tp/).
- Do not run at boot or install. The original RPM uses a config file
  which is completely commented out, but it still starts l2tpd on all
  interfaces. Could be a security risk. This RPM does not start l2tpd,
  the sysadmin has to edit the config file and start l2tpd explicitly.
- Renamed patches to start with l2tpd-
- Added dependencies for pppd, glibc-devel.
- Use %{name} as much as possible.
- l2tp-secrets contains passwords, thus should not be world readable.
- Removed dependency on rpm-helper.

* Mon Oct 21 2002 Lenny Cartier  0.69-3mdk
- from Per ?yvind Karlsen  :
 - PreReq and Requires
 - Fix preun_service

* Thu Oct 17 2002 Per ?yvind Karlsen  0.69-2mdk
- Move l2tpd from /usr/bin to /usr/sbin
- Added SysV initscript
- Patch0
- Patch1

* Thu Oct 17 2002 Per ?yvind Karlsen  0.69-1mdk
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/l2tpd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 19:14:02 -0000	1.1
+++ .cvsignore	15 Dec 2005 19:15:33 -0000	1.2
@@ -0,0 +1 @@
+l2tpd-0.69.20051030.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/l2tpd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 19:14:02 -0000	1.1
+++ sources	15 Dec 2005 19:15:33 -0000	1.2
@@ -0,0 +1 @@
+36144b856b70d58bdb4ac4805cb71bb2  l2tpd-0.69.20051030.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 19:18:54 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:18:54 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures-1.11.0-optflags.patch,
	NONE, 1.1 nethack-vultures.spec, 1.3, 1.4
Message-ID: <200512151919.jBFJJOFG006676@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6617/FC-3

Modified Files:
	nethack-vultures.spec 
Added Files:
	nethack-vultures-1.11.0-optflags.patch 
Log Message:
Fixed (?) some broken patches.



nethack-vultures-1.11.0-optflags.patch:

--- NEW FILE nethack-vultures-1.11.0-optflags.patch ---
--- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
@@ -164,7 +164,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -g -I../include -I../win/vultures/
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
 LFLAGS = 
 
 # The Qt and Be window systems are written in C++, while the rest of
--- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
@@ -89,7 +89,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -O -I../include -I../win/vultures -DVULTURESEYE
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures -DVULTURESEYE
 LFLAGS =
 
 LIBS =
--- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
@@ -157,7 +157,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -g -O -I../include -I../win/vultures
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
 LFLAGS =
 
 # Only used for the Gnome interface.
--- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
@@ -89,7 +89,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -O -I../include -I../win/vultures -DVULTURESCLAW
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures -DVULTURESCLAW
 LFLAGS =
 
 LIBS =


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-vultures.spec	15 Dec 2005 18:32:55 -0000	1.3
+++ nethack-vultures.spec	15 Dec 2005 19:18:52 -0000	1.4
@@ -7,10 +7,9 @@
 License:        NetHack General Public License
 URL:            http://www.darkarts.co.za/projects/vultures/
 Source0:        http://www.darkarts.co.za/projects/vultures/downloads/vultures-%{version}/vultures-%{version}-full.tar.bz2
-Patch0:         %{name}-1.10.1-optflags.patch
+Patch0:         %{name}-1.11.0-optflags.patch
 Patch1:         %{name}-1.10.1-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
-Patch3:         %{name}-1.10.1-log2stderr.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -161,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
+- Forgot to update the patches previously; done.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
 - Upgraded the tarball to the latest release
 - Upped the version



From fedora-extras-commits at redhat.com  Thu Dec 15 19:19:00 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:19:00 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures-1.11.0-optflags.patch,
	NONE, 1.1 nethack-vultures.spec, 1.4, 1.5
Message-ID: <200512151919.jBFJJU4r006679@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-serv6617/FC-4

Modified Files:
	nethack-vultures.spec 
Added Files:
	nethack-vultures-1.11.0-optflags.patch 
Log Message:
Fixed (?) some broken patches.



nethack-vultures-1.11.0-optflags.patch:

--- NEW FILE nethack-vultures-1.11.0-optflags.patch ---
--- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
@@ -164,7 +164,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -g -I../include -I../win/vultures/
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
 LFLAGS = 
 
 # The Qt and Be window systems are written in C++, while the rest of
--- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
@@ -89,7 +89,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -O -I../include -I../win/vultures -DVULTURESEYE
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures -DVULTURESEYE
 LFLAGS =
 
 LIBS =
--- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
@@ -157,7 +157,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -g -O -I../include -I../win/vultures
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
 LFLAGS =
 
 # Only used for the Gnome interface.
--- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
@@ -89,7 +89,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -O -I../include -I../win/vultures -DVULTURESCLAW
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures -DVULTURESCLAW
 LFLAGS =
 
 LIBS =


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nethack-vultures.spec	15 Dec 2005 18:33:01 -0000	1.4
+++ nethack-vultures.spec	15 Dec 2005 19:18:57 -0000	1.5
@@ -7,10 +7,9 @@
 License:        NetHack General Public License
 URL:            http://www.darkarts.co.za/projects/vultures/
 Source0:        http://www.darkarts.co.za/projects/vultures/downloads/vultures-%{version}/vultures-%{version}-full.tar.bz2
-Patch0:         %{name}-1.10.1-optflags.patch
+Patch0:         %{name}-1.11.0-optflags.patch
 Patch1:         %{name}-1.10.1-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
-Patch3:         %{name}-1.10.1-log2stderr.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -161,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
+- Forgot to update the patches previously; done.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
 - Upgraded the tarball to the latest release
 - Upped the version



From fedora-extras-commits at redhat.com  Thu Dec 15 19:19:05 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:19:05 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures-1.11.0-optflags.patch,
	NONE, 1.1 nethack-vultures.spec, 1.4, 1.5
Message-ID: <200512151919.jBFJJZk3006682@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6617/devel

Modified Files:
	nethack-vultures.spec 
Added Files:
	nethack-vultures-1.11.0-optflags.patch 
Log Message:
Fixed (?) some broken patches.



nethack-vultures-1.11.0-optflags.patch:

--- NEW FILE nethack-vultures-1.11.0-optflags.patch ---
--- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
@@ -164,7 +164,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -g -I../include -I../win/vultures/
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
 LFLAGS = 
 
 # The Qt and Be window systems are written in C++, while the rest of
--- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
@@ -89,7 +89,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -O -I../include -I../win/vultures -DVULTURESEYE
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures -DVULTURESEYE
 LFLAGS =
 
 LIBS =
--- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
@@ -157,7 +157,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -g -O -I../include -I../win/vultures
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
 LFLAGS =
 
 # Only used for the Gnome interface.
--- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
@@ -89,7 +89,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -O -I../include -I../win/vultures -DVULTURESCLAW
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures -DVULTURESCLAW
 LFLAGS =
 
 LIBS =


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nethack-vultures.spec	15 Dec 2005 18:33:06 -0000	1.4
+++ nethack-vultures.spec	15 Dec 2005 19:19:03 -0000	1.5
@@ -1,13 +1,13 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
 License:        NetHack General Public License
 URL:            http://www.darkarts.co.za/projects/vultures/
 Source0:        http://www.darkarts.co.za/projects/vultures/downloads/vultures-%{version}/vultures-%{version}-full.tar.bz2
-Patch0:         %{name}-1.10.1-optflags.patch
+Patch0:         %{name}-1.11.0-optflags.patch
 Patch1:         %{name}-1.10.1-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
+- Forgot to update the patches previously; done.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
 - Upgraded the tarball to the latest release
 - Upped the version



From fedora-extras-commits at redhat.com  Thu Dec 15 19:20:39 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:20:39 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.4,1.5
Message-ID: <200512151921.jBFJL9fF006816@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6782/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Forgot to up the revision




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nethack-vultures.spec	15 Dec 2005 19:18:52 -0000	1.4
+++ nethack-vultures.spec	15 Dec 2005 19:20:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games



From fedora-extras-commits at redhat.com  Thu Dec 15 19:20:44 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:20:44 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.5,1.6
Message-ID: <200512151921.jBFJLFm0006819@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-serv6782/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Forgot to up the revision




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nethack-vultures.spec	15 Dec 2005 19:18:57 -0000	1.5
+++ nethack-vultures.spec	15 Dec 2005 19:20:42 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games



From fedora-extras-commits at redhat.com  Thu Dec 15 19:23:31 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 14:23:31 -0500
Subject: owners owners.list,1.454,1.455
Message-ID: <200512151924.jBFJO69A006966@cvs-int.fedora.redhat.com>

Author: pwouters

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

Modified Files:
	owners.list 
Log Message:
Added package l2tpd.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -r1.454 -r1.455
--- owners.list	15 Dec 2005 15:22:50 -0000	1.454
+++ owners.list	15 Dec 2005 19:23:29 -0000	1.455
@@ -1296,3 +1296,4 @@
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|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|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
+Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 15 19:25:57 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 15 Dec 2005 14:25:57 -0500
Subject: rpms/naim/devel .cvsignore, 1.3, 1.4 naim.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200512151926.jBFJQRmj007013@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore naim.spec sources 
Log Message:
* Thu Dec 15 2005 Luke Macken  0.11.8.1-1
- Bump to 0.11.8.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/naim/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2005 23:21:10 -0000	1.3
+++ .cvsignore	15 Dec 2005 19:25:55 -0000	1.4
@@ -1 +1 @@
-naim-0.11.8.tar.bz2
+naim-0.11.8.1.tar.bz2


Index: naim.spec
===================================================================
RCS file: /cvs/extras/rpms/naim/devel/naim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- naim.spec	2 Oct 2005 23:21:10 -0000	1.4
+++ naim.spec	15 Dec 2005 19:25:55 -0000	1.5
@@ -1,5 +1,5 @@
 Name: naim
-Version: 0.11.8
+Version: 0.11.8.1
 Release: 1%{?dist}
 Summary: An ncurses-based console AIM, ICQ, IRC, and Lily client
 
@@ -38,6 +38,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Dec 15 2005 Luke Macken  0.11.8.1-1
+- Bump to 0.11.8.1
+
 * Sun Oct 02 2005 Luke Macken  0.11.8-1
 - Bumped to 0.11.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/naim/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2005 23:21:10 -0000	1.3
+++ sources	15 Dec 2005 19:25:55 -0000	1.4
@@ -1 +1 @@
-e66f29057ffc4016e814134b8d1f8681  naim-0.11.8.tar.bz2
+beb0a3b2bcb45cfe9b84075dced494b8  naim-0.11.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 19:45:49 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:45:49 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures-1.11.0-optflags.patch,
	1.1, 1.2 nethack-vultures.spec, 1.5, 1.6
Message-ID: <200512151946.jBFJkJI9007146@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7075/FC-3

Modified Files:
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Darn, I didn't get that patch right :(  this should do it.



nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:18:52 -0000	1.1
+++ nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:45:47 -0000	1.2
@@ -1,16 +1,16 @@
---- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
-@@ -164,7 +164,7 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
--CFLAGS = -g -I../include -I../win/vultures/
+--- vultures-1.11.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+@@ -153,7 +153,7 @@
+ 
+ # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+ VULTURESCFLAGS = -Wall -g
+-CFLAGS = -g -I../include -I ../win/vultures/
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-1.11.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,19 +20,19 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
-@@ -157,7 +157,7 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
+--- vultures-1.11.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+@@ -147,7 +157,7 @@
+
+ # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+ VULTURESCFLAGS = -g -O -Wall
 -CFLAGS = -g -O -I../include -I../win/vultures
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-1.11.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nethack-vultures.spec	15 Dec 2005 19:20:37 -0000	1.5
+++ nethack-vultures.spec	15 Dec 2005 19:45:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-3
+- Didn't quite get that patch right.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
 - Forgot to update the patches previously; done.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 19:45:55 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:45:55 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures-1.11.0-optflags.patch,
	1.1, 1.2 nethack-vultures.spec, 1.6, 1.7
Message-ID: <200512151946.jBFJkQAs007150@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-serv7075/FC-4

Modified Files:
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Darn, I didn't get that patch right :(  this should do it.



nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:18:57 -0000	1.1
+++ nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:45:52 -0000	1.2
@@ -1,16 +1,16 @@
---- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
-@@ -164,7 +164,7 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
--CFLAGS = -g -I../include -I../win/vultures/
+--- vultures-1.11.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+@@ -153,7 +153,7 @@
+ 
+ # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+ VULTURESCFLAGS = -Wall -g
+-CFLAGS = -g -I../include -I ../win/vultures/
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-1.11.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,19 +20,19 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
-@@ -157,7 +157,7 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
+--- vultures-1.11.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+@@ -147,7 +157,7 @@
+
+ # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+ VULTURESCFLAGS = -g -O -Wall
 -CFLAGS = -g -O -I../include -I../win/vultures
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-1.11.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nethack-vultures.spec	15 Dec 2005 19:20:42 -0000	1.6
+++ nethack-vultures.spec	15 Dec 2005 19:45:52 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-3
+- Didn't quite get that patch right.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
 - Forgot to update the patches previously; done.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 19:46:00 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:46:00 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures-1.11.0-optflags.patch,
	1.1, 1.2 nethack-vultures.spec, 1.5, 1.6
Message-ID: <200512151946.jBFJkUPS007154@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7075/devel

Modified Files:
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Darn, I didn't get that patch right :(  this should do it.



nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:19:03 -0000	1.1
+++ nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:45:58 -0000	1.2
@@ -1,16 +1,16 @@
---- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
-@@ -164,7 +164,7 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
--CFLAGS = -g -I../include -I../win/vultures/
+--- vultures-1.11.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+@@ -153,7 +153,7 @@
+ 
+ # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+ VULTURESCFLAGS = -Wall -g
+-CFLAGS = -g -I../include -I ../win/vultures/
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-1.11.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,19 +20,19 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
-@@ -157,7 +157,7 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
+--- vultures-1.11.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+@@ -147,7 +157,7 @@
+
+ # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+ VULTURESCFLAGS = -g -O -Wall
 -CFLAGS = -g -O -I../include -I../win/vultures
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-1.11.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nethack-vultures.spec	15 Dec 2005 19:19:03 -0000	1.5
+++ nethack-vultures.spec	15 Dec 2005 19:45:58 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-3
+- Didn't quite get that patch right.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
 - Forgot to update the patches previously; done.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 20:19:36 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 15 Dec 2005 15:19:36 -0500
Subject: rpms/sobby/FC-4 .cvsignore, 1.2, 1.3 sobby.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200512152020.jBFKK6NU009007@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore sobby.spec sources 
Log Message:
* Thu Dec 15 2005 Luke Macken  - 0.2.0-2
- Regress package to 0.2.0 for FC-{3,4}




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2005 15:20:52 -0000	1.2
+++ .cvsignore	15 Dec 2005 20:19:34 -0000	1.3
@@ -1 +1 @@
-sobby-0.3.0rc3.tar.gz
+sobby-0.2.0.tar.gz


Index: sobby.spec
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-4/sobby.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sobby.spec	12 Dec 2005 15:20:52 -0000	1.1
+++ sobby.spec	15 Dec 2005 20:19:34 -0000	1.2
@@ -1,14 +1,12 @@
-%define _rc rc3
-
 Name:           sobby
-Version:        0.3.0
-Release:        1.%{_rc}%{?dist}
+Version:        0.2.0
+Release:        2%{?dist}
 Summary:        Standalone obby server
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gobby.0x539.de
-Source0:        http://releases.0x539.de/sobby/%{name}-%{version}%{_rc}.tar.gz
+Source0:        http://releases.0x539.de/sobby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  obby-devel, glibmm24-devel
@@ -18,7 +16,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{_rc}
+%setup -q
 
 
 %build
@@ -42,5 +40,8 @@
 
 
 %changelog
+* Thu Dec 15 2005 Luke Macken  - 0.2.0-2
+- Regress package to 0.2.0 for FC-{3,4}
+
 * Wed Dec 07 2005 Luke Macken  - 0.3.0-1.rc3
 - Packaged for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2005 15:20:52 -0000	1.2
+++ sources	15 Dec 2005 20:19:34 -0000	1.3
@@ -1 +1 @@
-8c3538992f83527cfb9f0a42a9e2ed87  sobby-0.3.0rc3.tar.gz
+68e740d9ad051e7939de29fa2c28da56  sobby-0.2.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 20:46:58 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 15:46:58 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures-1.11.0-optflags.patch,
	1.2, 1.3 nethack-vultures.spec, 1.6, 1.7
Message-ID: <200512152047.jBFKlSQZ009187@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9122/FC-3

Modified Files:
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Ah, the follies of tweaking patches by hand.  I tested this time, I swear,
it works!  :)



nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:45:47 -0000	1.2
+++ nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:46:56 -0000	1.3
@@ -1,16 +1,16 @@
---- vultures-1.11.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -153,7 +153,7 @@
  
  # VULTURESCFLAGS will be passed to the sub-makefile for vultures
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -147,7 +157,7 @@
 
  # VULTURESCFLAGS will be passed to the sub-makefile for vultures
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nethack-vultures.spec	15 Dec 2005 19:45:47 -0000	1.6
+++ nethack-vultures.spec	15 Dec 2005 20:46:56 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-4
+- Once again with the patch - ah, the folly of doing diffs by hand.  Last error.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-3
 - Didn't quite get that patch right.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 20:47:04 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 15:47:04 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures-1.11.0-optflags.patch,
	1.2, 1.3 nethack-vultures.spec, 1.7, 1.8
Message-ID: <200512152047.jBFKlYjg009191@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-serv9122/FC-4

Modified Files:
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Ah, the follies of tweaking patches by hand.  I tested this time, I swear,
it works!  :)



nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:45:52 -0000	1.2
+++ nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:47:02 -0000	1.3
@@ -1,16 +1,16 @@
---- vultures-1.11.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -153,7 +153,7 @@
  
  # VULTURESCFLAGS will be passed to the sub-makefile for vultures
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -147,7 +157,7 @@
 
  # VULTURESCFLAGS will be passed to the sub-makefile for vultures
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nethack-vultures.spec	15 Dec 2005 19:45:52 -0000	1.7
+++ nethack-vultures.spec	15 Dec 2005 20:47:02 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-4
+- Once again with the patch - ah, the folly of doing diffs by hand.  Last error.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-3
 - Didn't quite get that patch right.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 20:47:09 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 15:47:09 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures-1.11.0-optflags.patch,
	1.2, 1.3 nethack-vultures.spec, 1.6, 1.7
Message-ID: <200512152047.jBFKldl4009195@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9122/devel

Modified Files:
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Ah, the follies of tweaking patches by hand.  I tested this time, I swear,
it works!  :)



nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:45:58 -0000	1.2
+++ nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:47:07 -0000	1.3
@@ -1,16 +1,16 @@
---- vultures-1.11.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -153,7 +153,7 @@
  
  # VULTURESCFLAGS will be passed to the sub-makefile for vultures
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -147,7 +157,7 @@
 
  # VULTURESCFLAGS will be passed to the sub-makefile for vultures
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nethack-vultures.spec	15 Dec 2005 19:45:58 -0000	1.6
+++ nethack-vultures.spec	15 Dec 2005 20:47:07 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-4
+- Once again with the patch - ah, the folly of doing diffs by hand.  Last error.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-3
 - Didn't quite get that patch right.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 21:54:08 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 15 Dec 2005 16:54:08 -0500
Subject: rpms/xchat-gnome/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xchat-gnome.spec, 1.7, 1.8 xchat-gnome-323944.patch, 1.1,
	NONE xchat-gnome-datadir.patch, 1.1, NONE
Message-ID: <200512152154.jBFLsc4v011517@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore sources xchat-gnome.spec 
Removed Files:
	xchat-gnome-323944.patch xchat-gnome-datadir.patch 
Log Message:
* Thu Dec 15 2005 Brian Pepple  - 0.8-01.rc1
- Update to 0.8rc1.
- Drop documentation removed from upstream tarball.
- Drop depreciated config options.
- Enable dbus support.
- Drop 323944 patch, since it's been applied upstream.
- Drop datadir patch, since it's been applied upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2005 19:49:40 -0000	1.3
+++ .cvsignore	15 Dec 2005 21:54:05 -0000	1.4
@@ -1 +1 @@
-xchat-gnome-0.7.tar.bz2
+xchat-gnome-0.8rc1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2005 19:49:40 -0000	1.3
+++ sources	15 Dec 2005 21:54:05 -0000	1.4
@@ -1 +1 @@
-a5f0940ee6389d58222a04facca0aa0d  xchat-gnome-0.7.tar.bz2
+9e43be1379796baf270e417202ef6c95  xchat-gnome-0.8rc1.tar.bz2


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xchat-gnome.spec	14 Dec 2005 17:51:47 -0000	1.7
+++ xchat-gnome.spec	15 Dec 2005 21:54:05 -0000	1.8
@@ -1,21 +1,19 @@
 %if "%fedora" >= "5"
-    %define with_dbus 0
+    %define with_dbus 1
 %else
     %define with_dbus 0
 %endif
 
 Name:           xchat-gnome
-Version:        0.7
-Release:        4%{?dist}
+Version:        0.8
+Release:        0.1.rc1%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://%{name}.navi.cx/
-Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-datadir.patch
-Patch1:		%{name}-config.patch
-Patch2:		%{name}-323944.patch
+Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}rc1.tar.bz2
+Patch0:		%{name}-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -51,24 +49,12 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .datadir
-%patch1 -p1 -b .config
-%patch2 -p1 -b .323944
+%setup -q -n %{name}-%{version}rc1
+%patch0 -p1 -b .config
 
 
 %build
-%configure --disable-gtkfe	\
-	   --disable-tcl	\
-	   --enable-ipv6	\
-	   --enable-shm		\
-	   --disable-libnotify	\
-%if %{with_dbus}
-	   --enable-dbus	
-%else
-	   --disable-dbus
-%endif
-
+%configure --disable-tcl
 make %{?_smp_mflags}
 
 
@@ -79,17 +65,13 @@
 %find_lang %{name}
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{l,}a
 
 desktop-file-install --vendor fedora --delete-original	\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
 	--add-category X-Fedora				\
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-# Remove duplicate files from xchat package.
-rm $RPM_BUILD_ROOT%{_datadir}/applications/xchat.desktop
-rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/xchat.png
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -133,7 +115,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING faq.html README plugins/plugin20.html
+%doc COPYING AUTHORS
 %doc plugins/perl/xchat2-perldocs.html
 %{_bindir}/%{name}
 %{_sysconfdir}/gconf/schemas/*.schemas
@@ -145,11 +127,19 @@
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/plugins/
 %if %{with_dbus}
-%{_bindir}/xchat-remote
+%{_bindir}/%{name}-remote
 %endif
 
 
 %changelog
+* Thu Dec 15 2005 Brian Pepple  - 0.8-01.rc1
+- Update to 0.8rc1.
+- Drop documentation removed from upstream tarball.
+- Drop depreciated config options.
+- Enable dbus support.
+- Drop 323944 patch, since it's been applied upstream.
+- Drop datadir patch, since it's been applied upstream.
+
 * Wed Dec 14 2005 Brian Pepple  - 0.7-4
 - Add patch to fix #175751. 
 


--- xchat-gnome-323944.patch DELETED ---


--- xchat-gnome-datadir.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec 15 22:36:15 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 15 Dec 2005 17:36:15 -0500
Subject: rpms/mod_security/devel mod_security.spec,1.8,1.9
Message-ID: <200512152236.jBFMaj1h013819@cvs-int.fedora.redhat.com>

Author: mfleming

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

Modified Files:
	mod_security.spec 
Log Message:
* Fri Dec 16 2005 Michael Fleming  1.9.1-2
- Bump for new httpd



Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_security.spec	1 Dec 2005 11:32:58 -0000	1.8
+++ mod_security.spec	15 Dec 2005 22:36:12 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
 Version: 1.9.1
-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 Dec 16 2005 Michael Fleming  1.9.1-2
+- Bump for new httpd
+
 * Thu Dec 1 2005 Michael Fleming  1.9.1-1
 - New release 1.9.1 
 



From fedora-extras-commits at redhat.com  Thu Dec 15 22:38:28 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 17:38:28 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures-1.11.0-config.patch,
	NONE, 1.1 nethack-vultures.spec, 1.7, 1.8
Message-ID: <200512152238.jBFMcSbg013872@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13855/FC-3

Modified Files:
	nethack-vultures.spec 
Added Files:
	nethack-vultures-1.11.0-config.patch 
Log Message:
Fixed and tested patch 2, tested patch 3 (no errors)



nethack-vultures-1.11.0-config.patch:

--- NEW FILE nethack-vultures-1.11.0-config.patch ---
--- vultures-1.11.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
+++ vultures-1.11.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
@@ -150,10 +150,10 @@
 
 #ifndef WIZARD		/* allow for compile-time or Makefile changes */
 # ifndef KR1ED
-#  define WIZARD  "wizard" /* the person allowed to use the -D option */
+#  define WIZARD  "games" /* the person allowed to use the -D option */
 # else
 #  define WIZARD
-#  define WIZARD_NAME "wizard"
+#  define WIZARD_NAME "games"
 # endif
 #endif
 
@@ -176,8 +176,8 @@
 
 #ifdef UNIX
 /* path and file name extension for compression program */
-#define COMPRESS "/usr/bin/compress"   /* Lempel-Ziv compression */                                      
-#define COMPRESS_EXTENSION ".Z"        /* compress's extension */                                        
+#define COMPRESS "/usr/bin/bzip2"
+#define COMPRESS_EXTENSION ".bz2"
 /* An example of one alternative you might want to use: */
 /* #define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */                                
 /* #define COMPRESS_EXTENSION ".gz" */     /* normal gzip extension */                                   
@@ -192,7 +192,7 @@
  *	a tar-like file, thus making a neater installation.  See *conf.h
  *	for detailed configuration.
  */
-/* #define DLB */  /* not supported on all platforms */
+#define DLB  /* not supported on all platforms */
 
 /*
  *	Defining INSURANCE slows down level changes, but allows games that
@@ -221,7 +221,7 @@
  * since the user might create files in a directory of his choice.
  * Of course SECURE is meaningful only if HACKDIR is defined.
  */
-/* #define SECURE */	/* do setuid(getuid()) after chdir() */
+#define SECURE	/* do setuid(getuid()) after chdir() */
 
 /*
  * If it is desirable to limit the number of people that can play Hack
@@ -307,7 +307,7 @@
  * functions that have been macroized.
  */
 
-/* #define VISION_TABLES */ /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
 #ifndef VISION_TABLES
 # ifndef NO_MACRO_CPATH
 #  define MACRO_CPATH	/* use clear_path macros instead of functions */
@@ -345,7 +345,7 @@
 #endif
 
 #define EXP_ON_BOTL	/* Show experience on bottom line */
-/* #define SCORE_ON_BOTL */	/* added by Gary Erickson (erickson at ucivax) */
+#define SCORE_ON_BOTL	/* added by Gary Erickson (erickson at ucivax) */
 
 /*
  * Section 5:  EXPERIMENTAL STUFF
--- vultures-1.11.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
+++ vultures-1.11.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
@@ -37,7 +37,7 @@
 #define NETWORK		/* if running on a networked system */
 			/* e.g. Suns sharing a playground through NFS */
 /* #define SUNOS4 */	/* SunOS 4.x */
-/* #define LINUX */     /* Another Unix clone */
+#define LINUX		/* Another Unix clone */
 /* #define CYGWIN32 */	/* Unix on Win32 -- use with case sensitive defines */
 /* #define GENIX */	/* Yet Another Unix Clone */
 /* #define HISX */	/* Bull Unix for XPS Machines */
@@ -102,7 +102,7 @@
  * If you want the static parts of your playground on a read-only file
  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  */
-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
+#define VAR_PLAYGROUND "/var/lib/games/nethack"
 
 
 /*
@@ -204,7 +204,7 @@
  * You can also include any other strange options your compress needs.
  * If you have a normal compress, just leave it commented out.
  */
-/* #define COMPRESS_OPTIONS "-q" */
+#define COMPRESS_OPTIONS "-q9"
 #endif
 
 #define FCMASK	0660	/* file creation mask */
--- vultures-1.11.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.11.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
@@ -206,10 +206,10 @@
 
 #ifndef WIZARD		/* allow for compile-time or Makefile changes */
 # ifndef KR1ED
-#  define WIZARD  "wizard" /* the person allowed to use the -D option */
+#  define WIZARD  "games" /* the person allowed to use the -D option */
 # else
 #  define WIZARD
-#  define WIZARD_NAME "wizard"
+#  define WIZARD_NAME "games"
 # endif
 #endif
 
@@ -234,8 +234,8 @@
 
 #ifdef UNIX
 /* path and file name extension for compression program */
-# define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
-# define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
+#define COMPRESS "/usr/bin/bzip2"
+#define COMPRESS_EXTENSION ".bz2"
 
 /* An example of one alternative you might want to use: */
 /* # define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */
@@ -253,7 +253,7 @@
  *	a tar-like file, thus making a neater installation.  See *conf.h
  *	for detailed configuration.
  */
-/* #define DLB */             /* not supported on all platforms */
+#define DLB  /* not supported on all platforms */
 
 /*
  *	Defining INSURANCE slows down level changes, but allows games that
@@ -275,7 +275,7 @@
 #  ifdef __APPLE__
 #    define HACKDIR "nethackdir"      /* nethack directory */
 #  else
-#    define HACKDIR "."
+#    define HACKDIR "/usr/games/lib/nethackdir"
 #  endif
 # endif
 
@@ -286,7 +286,7 @@
  * since the user might create files in a directory of his choice.
  * Of course SECURE is meaningful only if HACKDIR is defined.
  */
-/* #define SECURE */	/* do setuid(getuid()) after chdir() */
+#define SECURE	/* do setuid(getuid()) after chdir() */
 
 /*
  * If it is desirable to limit the number of people that can play Hack
@@ -374,7 +374,7 @@
  * functions that have been macroized.
  */
 /* WAC Can be defined under DJGPP,  even though it's DOS*/
-/*#define VISION_TABLES */ /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
 #ifndef VISION_TABLES
 # ifndef NO_MACRO_CPATH
 #  define MACRO_CPATH	/* use clear_path macros instead of functions */
@@ -467,7 +467,7 @@
 #endif
 
 #define EXP_ON_BOTL	/* Show experience on bottom line */
-/* #define SCORE_ON_BOTL */	/* added by Gary Erickson (erickson at ucivax) */
+#define SCORE_ON_BOTL	/* added by Gary Erickson (erickson at ucivax) */
 /* #define BORG */            /* Works only under DOS */
 /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
 /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
--- vultures-1.11.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.11.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
@@ -38,7 +38,7 @@
 #define NETWORK		/* if running on a networked system */
 			/* e.g. Suns sharing a playground through NFS */
 /* #define SUNOS4 */	/* SunOS 4.x */
-/* #define LINUX */	/* Another Unix clone */
+#define LINUX	/* Another Unix clone */
 /* #define CYGWIN32 */	/* Unix on Win32 -- use with case sensitive defines */
 /* #define GENIX */	/* Yet Another Unix Clone */
 /* #define HISX */	/* Bull Unix for XPS Machines */
@@ -174,7 +174,7 @@
  * If you want the static parts of your playground on a read-only file
  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  */
-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
+#define VAR_PLAYGROUND "/var/lib/games/nethack"
 
 
 
@@ -267,7 +267,7 @@
  * You can also include any other strange options your compress needs.
  * If you have a normal compress, just leave it commented out.
  */
-/* #define COMPRESS_OPTIONS "-q" */
+#define COMPRESS_OPTIONS "-q9"
 #endif
 
 #define FCMASK	0660	/* file creation mask */


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nethack-vultures.spec	15 Dec 2005 20:46:56 -0000	1.7
+++ nethack-vultures.spec	15 Dec 2005 22:38:26 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -8,7 +8,7 @@
 URL:            http://www.darkarts.co.za/projects/vultures/
 Source0:        http://www.darkarts.co.za/projects/vultures/downloads/vultures-%{version}/vultures-%{version}-full.tar.bz2
 Patch0:         %{name}-1.11.0-optflags.patch
-Patch1:         %{name}-1.10.1-config.patch
+Patch1:         %{name}-1.11.0-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-5
+- That patch was fixed, but.. the folly of not checking all patches  :P
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-4
 - Once again with the patch - ah, the folly of doing diffs by hand.  Last error.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 22:38:34 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 17:38:34 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures-1.11.0-config.patch,
	NONE, 1.1 nethack-vultures.spec, 1.8, 1.9
Message-ID: <200512152238.jBFMcYS1013891@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-serv13855/FC-4

Modified Files:
	nethack-vultures.spec 
Added Files:
	nethack-vultures-1.11.0-config.patch 
Log Message:
Fixed and tested patch 2, tested patch 3 (no errors)



nethack-vultures-1.11.0-config.patch:

--- NEW FILE nethack-vultures-1.11.0-config.patch ---
--- vultures-1.11.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
+++ vultures-1.11.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
@@ -150,10 +150,10 @@
 
 #ifndef WIZARD		/* allow for compile-time or Makefile changes */
 # ifndef KR1ED
-#  define WIZARD  "wizard" /* the person allowed to use the -D option */
+#  define WIZARD  "games" /* the person allowed to use the -D option */
 # else
 #  define WIZARD
-#  define WIZARD_NAME "wizard"
+#  define WIZARD_NAME "games"
 # endif
 #endif
 
@@ -176,8 +176,8 @@
 
 #ifdef UNIX
 /* path and file name extension for compression program */
-#define COMPRESS "/usr/bin/compress"   /* Lempel-Ziv compression */                                      
-#define COMPRESS_EXTENSION ".Z"        /* compress's extension */                                        
+#define COMPRESS "/usr/bin/bzip2"
+#define COMPRESS_EXTENSION ".bz2"
 /* An example of one alternative you might want to use: */
 /* #define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */                                
 /* #define COMPRESS_EXTENSION ".gz" */     /* normal gzip extension */                                   
@@ -192,7 +192,7 @@
  *	a tar-like file, thus making a neater installation.  See *conf.h
  *	for detailed configuration.
  */
-/* #define DLB */  /* not supported on all platforms */
+#define DLB  /* not supported on all platforms */
 
 /*
  *	Defining INSURANCE slows down level changes, but allows games that
@@ -221,7 +221,7 @@
  * since the user might create files in a directory of his choice.
  * Of course SECURE is meaningful only if HACKDIR is defined.
  */
-/* #define SECURE */	/* do setuid(getuid()) after chdir() */
+#define SECURE	/* do setuid(getuid()) after chdir() */
 
 /*
  * If it is desirable to limit the number of people that can play Hack
@@ -307,7 +307,7 @@
  * functions that have been macroized.
  */
 
-/* #define VISION_TABLES */ /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
 #ifndef VISION_TABLES
 # ifndef NO_MACRO_CPATH
 #  define MACRO_CPATH	/* use clear_path macros instead of functions */
@@ -345,7 +345,7 @@
 #endif
 
 #define EXP_ON_BOTL	/* Show experience on bottom line */
-/* #define SCORE_ON_BOTL */	/* added by Gary Erickson (erickson at ucivax) */
+#define SCORE_ON_BOTL	/* added by Gary Erickson (erickson at ucivax) */
 
 /*
  * Section 5:  EXPERIMENTAL STUFF
--- vultures-1.11.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
+++ vultures-1.11.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
@@ -37,7 +37,7 @@
 #define NETWORK		/* if running on a networked system */
 			/* e.g. Suns sharing a playground through NFS */
 /* #define SUNOS4 */	/* SunOS 4.x */
-/* #define LINUX */     /* Another Unix clone */
+#define LINUX		/* Another Unix clone */
 /* #define CYGWIN32 */	/* Unix on Win32 -- use with case sensitive defines */
 /* #define GENIX */	/* Yet Another Unix Clone */
 /* #define HISX */	/* Bull Unix for XPS Machines */
@@ -102,7 +102,7 @@
  * If you want the static parts of your playground on a read-only file
  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  */
-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
+#define VAR_PLAYGROUND "/var/lib/games/nethack"
 
 
 /*
@@ -204,7 +204,7 @@
  * You can also include any other strange options your compress needs.
  * If you have a normal compress, just leave it commented out.
  */
-/* #define COMPRESS_OPTIONS "-q" */
+#define COMPRESS_OPTIONS "-q9"
 #endif
 
 #define FCMASK	0660	/* file creation mask */
--- vultures-1.11.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.11.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
@@ -206,10 +206,10 @@
 
 #ifndef WIZARD		/* allow for compile-time or Makefile changes */
 # ifndef KR1ED
-#  define WIZARD  "wizard" /* the person allowed to use the -D option */
+#  define WIZARD  "games" /* the person allowed to use the -D option */
 # else
 #  define WIZARD
-#  define WIZARD_NAME "wizard"
+#  define WIZARD_NAME "games"
 # endif
 #endif
 
@@ -234,8 +234,8 @@
 
 #ifdef UNIX
 /* path and file name extension for compression program */
-# define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
-# define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
+#define COMPRESS "/usr/bin/bzip2"
+#define COMPRESS_EXTENSION ".bz2"
 
 /* An example of one alternative you might want to use: */
 /* # define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */
@@ -253,7 +253,7 @@
  *	a tar-like file, thus making a neater installation.  See *conf.h
  *	for detailed configuration.
  */
-/* #define DLB */             /* not supported on all platforms */
+#define DLB  /* not supported on all platforms */
 
 /*
  *	Defining INSURANCE slows down level changes, but allows games that
@@ -275,7 +275,7 @@
 #  ifdef __APPLE__
 #    define HACKDIR "nethackdir"      /* nethack directory */
 #  else
-#    define HACKDIR "."
+#    define HACKDIR "/usr/games/lib/nethackdir"
 #  endif
 # endif
 
@@ -286,7 +286,7 @@
  * since the user might create files in a directory of his choice.
  * Of course SECURE is meaningful only if HACKDIR is defined.
  */
-/* #define SECURE */	/* do setuid(getuid()) after chdir() */
+#define SECURE	/* do setuid(getuid()) after chdir() */
 
 /*
  * If it is desirable to limit the number of people that can play Hack
@@ -374,7 +374,7 @@
  * functions that have been macroized.
  */
 /* WAC Can be defined under DJGPP,  even though it's DOS*/
-/*#define VISION_TABLES */ /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
 #ifndef VISION_TABLES
 # ifndef NO_MACRO_CPATH
 #  define MACRO_CPATH	/* use clear_path macros instead of functions */
@@ -467,7 +467,7 @@
 #endif
 
 #define EXP_ON_BOTL	/* Show experience on bottom line */
-/* #define SCORE_ON_BOTL */	/* added by Gary Erickson (erickson at ucivax) */
+#define SCORE_ON_BOTL	/* added by Gary Erickson (erickson at ucivax) */
 /* #define BORG */            /* Works only under DOS */
 /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
 /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
--- vultures-1.11.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.11.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
@@ -38,7 +38,7 @@
 #define NETWORK		/* if running on a networked system */
 			/* e.g. Suns sharing a playground through NFS */
 /* #define SUNOS4 */	/* SunOS 4.x */
-/* #define LINUX */	/* Another Unix clone */
+#define LINUX	/* Another Unix clone */
 /* #define CYGWIN32 */	/* Unix on Win32 -- use with case sensitive defines */
 /* #define GENIX */	/* Yet Another Unix Clone */
 /* #define HISX */	/* Bull Unix for XPS Machines */
@@ -174,7 +174,7 @@
  * If you want the static parts of your playground on a read-only file
  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  */
-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
+#define VAR_PLAYGROUND "/var/lib/games/nethack"
 
 
 
@@ -267,7 +267,7 @@
  * You can also include any other strange options your compress needs.
  * If you have a normal compress, just leave it commented out.
  */
-/* #define COMPRESS_OPTIONS "-q" */
+#define COMPRESS_OPTIONS "-q9"
 #endif
 
 #define FCMASK	0660	/* file creation mask */


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nethack-vultures.spec	15 Dec 2005 20:47:02 -0000	1.8
+++ nethack-vultures.spec	15 Dec 2005 22:38:32 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -8,7 +8,7 @@
 URL:            http://www.darkarts.co.za/projects/vultures/
 Source0:        http://www.darkarts.co.za/projects/vultures/downloads/vultures-%{version}/vultures-%{version}-full.tar.bz2
 Patch0:         %{name}-1.11.0-optflags.patch
-Patch1:         %{name}-1.10.1-config.patch
+Patch1:         %{name}-1.11.0-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-5
+- That patch was fixed, but.. the folly of not checking all patches  :P
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-4
 - Once again with the patch - ah, the folly of doing diffs by hand.  Last error.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 22:38:39 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 17:38:39 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures-1.11.0-config.patch,
	NONE, 1.1 nethack-vultures.spec, 1.7, 1.8
Message-ID: <200512152238.jBFMcdMf013910@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13855/devel

Modified Files:
	nethack-vultures.spec 
Added Files:
	nethack-vultures-1.11.0-config.patch 
Log Message:
Fixed and tested patch 2, tested patch 3 (no errors)



nethack-vultures-1.11.0-config.patch:

--- NEW FILE nethack-vultures-1.11.0-config.patch ---
--- vultures-1.11.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
+++ vultures-1.11.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
@@ -150,10 +150,10 @@
 
 #ifndef WIZARD		/* allow for compile-time or Makefile changes */
 # ifndef KR1ED
-#  define WIZARD  "wizard" /* the person allowed to use the -D option */
+#  define WIZARD  "games" /* the person allowed to use the -D option */
 # else
 #  define WIZARD
-#  define WIZARD_NAME "wizard"
+#  define WIZARD_NAME "games"
 # endif
 #endif
 
@@ -176,8 +176,8 @@
 
 #ifdef UNIX
 /* path and file name extension for compression program */
-#define COMPRESS "/usr/bin/compress"   /* Lempel-Ziv compression */                                      
-#define COMPRESS_EXTENSION ".Z"        /* compress's extension */                                        
+#define COMPRESS "/usr/bin/bzip2"
+#define COMPRESS_EXTENSION ".bz2"
 /* An example of one alternative you might want to use: */
 /* #define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */                                
 /* #define COMPRESS_EXTENSION ".gz" */     /* normal gzip extension */                                   
@@ -192,7 +192,7 @@
  *	a tar-like file, thus making a neater installation.  See *conf.h
  *	for detailed configuration.
  */
-/* #define DLB */  /* not supported on all platforms */
+#define DLB  /* not supported on all platforms */
 
 /*
  *	Defining INSURANCE slows down level changes, but allows games that
@@ -221,7 +221,7 @@
  * since the user might create files in a directory of his choice.
  * Of course SECURE is meaningful only if HACKDIR is defined.
  */
-/* #define SECURE */	/* do setuid(getuid()) after chdir() */
+#define SECURE	/* do setuid(getuid()) after chdir() */
 
 /*
  * If it is desirable to limit the number of people that can play Hack
@@ -307,7 +307,7 @@
  * functions that have been macroized.
  */
 
-/* #define VISION_TABLES */ /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
 #ifndef VISION_TABLES
 # ifndef NO_MACRO_CPATH
 #  define MACRO_CPATH	/* use clear_path macros instead of functions */
@@ -345,7 +345,7 @@
 #endif
 
 #define EXP_ON_BOTL	/* Show experience on bottom line */
-/* #define SCORE_ON_BOTL */	/* added by Gary Erickson (erickson at ucivax) */
+#define SCORE_ON_BOTL	/* added by Gary Erickson (erickson at ucivax) */
 
 /*
  * Section 5:  EXPERIMENTAL STUFF
--- vultures-1.11.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
+++ vultures-1.11.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
@@ -37,7 +37,7 @@
 #define NETWORK		/* if running on a networked system */
 			/* e.g. Suns sharing a playground through NFS */
 /* #define SUNOS4 */	/* SunOS 4.x */
-/* #define LINUX */     /* Another Unix clone */
+#define LINUX		/* Another Unix clone */
 /* #define CYGWIN32 */	/* Unix on Win32 -- use with case sensitive defines */
 /* #define GENIX */	/* Yet Another Unix Clone */
 /* #define HISX */	/* Bull Unix for XPS Machines */
@@ -102,7 +102,7 @@
  * If you want the static parts of your playground on a read-only file
  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  */
-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
+#define VAR_PLAYGROUND "/var/lib/games/nethack"
 
 
 /*
@@ -204,7 +204,7 @@
  * You can also include any other strange options your compress needs.
  * If you have a normal compress, just leave it commented out.
  */
-/* #define COMPRESS_OPTIONS "-q" */
+#define COMPRESS_OPTIONS "-q9"
 #endif
 
 #define FCMASK	0660	/* file creation mask */
--- vultures-1.11.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.11.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
@@ -206,10 +206,10 @@
 
 #ifndef WIZARD		/* allow for compile-time or Makefile changes */
 # ifndef KR1ED
-#  define WIZARD  "wizard" /* the person allowed to use the -D option */
+#  define WIZARD  "games" /* the person allowed to use the -D option */
 # else
 #  define WIZARD
-#  define WIZARD_NAME "wizard"
+#  define WIZARD_NAME "games"
 # endif
 #endif
 
@@ -234,8 +234,8 @@
 
 #ifdef UNIX
 /* path and file name extension for compression program */
-# define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
-# define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
+#define COMPRESS "/usr/bin/bzip2"
+#define COMPRESS_EXTENSION ".bz2"
 
 /* An example of one alternative you might want to use: */
 /* # define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */
@@ -253,7 +253,7 @@
  *	a tar-like file, thus making a neater installation.  See *conf.h
  *	for detailed configuration.
  */
-/* #define DLB */             /* not supported on all platforms */
+#define DLB  /* not supported on all platforms */
 
 /*
  *	Defining INSURANCE slows down level changes, but allows games that
@@ -275,7 +275,7 @@
 #  ifdef __APPLE__
 #    define HACKDIR "nethackdir"      /* nethack directory */
 #  else
-#    define HACKDIR "."
+#    define HACKDIR "/usr/games/lib/nethackdir"
 #  endif
 # endif
 
@@ -286,7 +286,7 @@
  * since the user might create files in a directory of his choice.
  * Of course SECURE is meaningful only if HACKDIR is defined.
  */
-/* #define SECURE */	/* do setuid(getuid()) after chdir() */
+#define SECURE	/* do setuid(getuid()) after chdir() */
 
 /*
  * If it is desirable to limit the number of people that can play Hack
@@ -374,7 +374,7 @@
  * functions that have been macroized.
  */
 /* WAC Can be defined under DJGPP,  even though it's DOS*/
-/*#define VISION_TABLES */ /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
 #ifndef VISION_TABLES
 # ifndef NO_MACRO_CPATH
 #  define MACRO_CPATH	/* use clear_path macros instead of functions */
@@ -467,7 +467,7 @@
 #endif
 
 #define EXP_ON_BOTL	/* Show experience on bottom line */
-/* #define SCORE_ON_BOTL */	/* added by Gary Erickson (erickson at ucivax) */
+#define SCORE_ON_BOTL	/* added by Gary Erickson (erickson at ucivax) */
 /* #define BORG */            /* Works only under DOS */
 /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
 /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
--- vultures-1.11.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.11.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
@@ -38,7 +38,7 @@
 #define NETWORK		/* if running on a networked system */
 			/* e.g. Suns sharing a playground through NFS */
 /* #define SUNOS4 */	/* SunOS 4.x */
-/* #define LINUX */	/* Another Unix clone */
+#define LINUX	/* Another Unix clone */
 /* #define CYGWIN32 */	/* Unix on Win32 -- use with case sensitive defines */
 /* #define GENIX */	/* Yet Another Unix Clone */
 /* #define HISX */	/* Bull Unix for XPS Machines */
@@ -174,7 +174,7 @@
  * If you want the static parts of your playground on a read-only file
  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  */
-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
+#define VAR_PLAYGROUND "/var/lib/games/nethack"
 
 
 
@@ -267,7 +267,7 @@
  * You can also include any other strange options your compress needs.
  * If you have a normal compress, just leave it commented out.
  */
-/* #define COMPRESS_OPTIONS "-q" */
+#define COMPRESS_OPTIONS "-q9"
 #endif
 
 #define FCMASK	0660	/* file creation mask */


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nethack-vultures.spec	15 Dec 2005 20:47:07 -0000	1.7
+++ nethack-vultures.spec	15 Dec 2005 22:38:37 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -8,7 +8,7 @@
 URL:            http://www.darkarts.co.za/projects/vultures/
 Source0:        http://www.darkarts.co.za/projects/vultures/downloads/vultures-%{version}/vultures-%{version}-full.tar.bz2
 Patch0:         %{name}-1.11.0-optflags.patch
-Patch1:         %{name}-1.10.1-config.patch
+Patch1:         %{name}-1.11.0-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-5
+- That patch was fixed, but.. the folly of not checking all patches  :P
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-4
 - Once again with the patch - ah, the folly of doing diffs by hand.  Last error.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 22:53:40 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 17:53:40 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.8,1.9
Message-ID: <200512152254.jBFMsAnF014149@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14092/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Added in BuildReq for SDL_image-devel now that we use png instead of pcx.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nethack-vultures.spec	15 Dec 2005 22:38:26 -0000	1.8
+++ nethack-vultures.spec	15 Dec 2005 22:53:38 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -14,6 +14,7 @@
 
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_image-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
 BuildRequires:  flex
@@ -160,6 +161,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-6
+- SDL image devel required for build to complete properly.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-5
 - That patch was fixed, but.. the folly of not checking all patches  :P
 



From fedora-extras-commits at redhat.com  Thu Dec 15 22:53:46 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 17:53:46 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.9,1.10
Message-ID: <200512152254.jBFMsGE5014152@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-serv14092/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Added in BuildReq for SDL_image-devel now that we use png instead of pcx.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nethack-vultures.spec	15 Dec 2005 22:38:32 -0000	1.9
+++ nethack-vultures.spec	15 Dec 2005 22:53:43 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -14,6 +14,7 @@
 
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_image-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
 BuildRequires:  flex
@@ -160,6 +161,12 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-6
+- SDL image devel required for build to complete properly.
+
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-5
+- That patch was fixed, but.. the folly of not checking all patches  :P
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-5
 - That patch was fixed, but.. the folly of not checking all patches  :P
 



From fedora-extras-commits at redhat.com  Thu Dec 15 22:53:51 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 17:53:51 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.8,1.9
Message-ID: <200512152254.jBFMsLHe014155@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14092/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Added in BuildReq for SDL_image-devel now that we use png instead of pcx.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nethack-vultures.spec	15 Dec 2005 22:38:37 -0000	1.8
+++ nethack-vultures.spec	15 Dec 2005 22:53:49 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -14,6 +14,7 @@
 
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_image-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
 BuildRequires:  flex
@@ -160,6 +161,12 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-6
+- SDL image devel required for build to complete properly.
+
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-6
+- SDL image devel required for build to complete properly.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-5
 - That patch was fixed, but.. the folly of not checking all patches  :P
 



From fedora-extras-commits at redhat.com  Thu Dec 15 23:15:26 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 18:15:26 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.9,1.10
Message-ID: <200512152315.jBFNFv21016069@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16019/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Added in libpng-devel dependency.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nethack-vultures.spec	15 Dec 2005 22:53:38 -0000	1.9
+++ nethack-vultures.spec	15 Dec 2005 23:15:24 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -15,6 +15,7 @@
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_image-devel
+BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
 BuildRequires:  flex
@@ -161,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-7
+- Apparently we're using libpng-devel now also (nobody told me)
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-6
 - SDL image devel required for build to complete properly.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 23:15:32 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 18:15:32 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.10,1.11
Message-ID: <200512152316.jBFNG2cH016072@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-serv16019/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Added in libpng-devel dependency.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nethack-vultures.spec	15 Dec 2005 22:53:43 -0000	1.10
+++ nethack-vultures.spec	15 Dec 2005 23:15:30 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -15,6 +15,7 @@
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_image-devel
+BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
 BuildRequires:  flex
@@ -161,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-7
+- Apparently we're using libpng-devel now also (nobody told me)
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-6
 - SDL image devel required for build to complete properly.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 23:15:37 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 18:15:37 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.9,1.10
Message-ID: <200512152316.jBFNG8RG016075@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16019/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Added in libpng-devel dependency.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nethack-vultures.spec	15 Dec 2005 22:53:49 -0000	1.9
+++ nethack-vultures.spec	15 Dec 2005 23:15:35 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -15,6 +15,7 @@
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_image-devel
+BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
 BuildRequires:  flex
@@ -161,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-7
+- Apparently we're using libpng-devel now also (nobody told me)
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-6
 - SDL image devel required for build to complete properly.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 23:20:22 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu, 15 Dec 2005 18:20:22 -0500
Subject: owners owners.list,1.455,1.456
Message-ID: <200512152320.jBFNKrlW016215@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	owners.list 
Log Message:
remove broken e-mail address


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -r1.455 -r1.456
--- owners.list	15 Dec 2005 19:23:29 -0000	1.455
+++ owners.list	15 Dec 2005 23:20:20 -0000	1.456
@@ -158,7 +158,7 @@
 Fedora Extras|drivel|A journal or "blog" client|katzj at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|bescoto at stanford.edu|extras-qa at fedoraproject.org|
+Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|dvdisaster|CD/DVD media data loss/scratch/aging protection|dmitry at butskoy.name|extras-qa at fedoraproject.org|carsten at dvdisaster.de
 Fedora Extras|dxpc|A Differential X Protocol Compressor|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 15 23:49:04 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 18:49:04 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.10,1.11
Message-ID: <200512152349.jBFNnY0e016511@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16461/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Forgot to relocate docs for postbuild




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nethack-vultures.spec	15 Dec 2005 23:15:24 -0000	1.10
+++ nethack-vultures.spec	15 Dec 2005 23:49:02 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -124,7 +124,7 @@
 %files
 %defattr(-,root,root,-)
 %doc nethack/README nethack/dat/license nethack/dat/history nethack/dat/*help
-%doc slashem/readme.txt slashem/history.txt slashem/slamfaq.txt vultures/win/jtp/gamedata/manual/
+%doc slashem/readme.txt slashem/history.txt slashem/slamfaq.txt vultures/gamedata/manual/
 %{_bindir}/vultures*
 %dir %{_prefix}/games/vultureseye/
 %{_prefix}/games/vultureseye/config/
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-8
+- Forgot to relocate moved docs for postbuild.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-7
 - Apparently we're using libpng-devel now also (nobody told me)
 



From fedora-extras-commits at redhat.com  Thu Dec 15 23:49:09 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 18:49:09 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.11,1.12
Message-ID: <200512152349.jBFNneWm016514@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-serv16461/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Forgot to relocate docs for postbuild




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nethack-vultures.spec	15 Dec 2005 23:15:30 -0000	1.11
+++ nethack-vultures.spec	15 Dec 2005 23:49:07 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -124,7 +124,7 @@
 %files
 %defattr(-,root,root,-)
 %doc nethack/README nethack/dat/license nethack/dat/history nethack/dat/*help
-%doc slashem/readme.txt slashem/history.txt slashem/slamfaq.txt vultures/win/jtp/gamedata/manual/
+%doc slashem/readme.txt slashem/history.txt slashem/slamfaq.txt vultures/gamedata/manual/
 %{_bindir}/vultures*
 %dir %{_prefix}/games/vultureseye/
 %{_prefix}/games/vultureseye/config/
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-8
+- Forgot to relocate moved docs for postbuild.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-7
 - Apparently we're using libpng-devel now also (nobody told me)
 



From fedora-extras-commits at redhat.com  Thu Dec 15 23:49:15 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 18:49:15 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.10,1.11
Message-ID: <200512152349.jBFNnjlf016517@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16461/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Forgot to relocate docs for postbuild




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nethack-vultures.spec	15 Dec 2005 23:15:35 -0000	1.10
+++ nethack-vultures.spec	15 Dec 2005 23:49:13 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -124,7 +124,7 @@
 %files
 %defattr(-,root,root,-)
 %doc nethack/README nethack/dat/license nethack/dat/history nethack/dat/*help
-%doc slashem/readme.txt slashem/history.txt slashem/slamfaq.txt vultures/win/jtp/gamedata/manual/
+%doc slashem/readme.txt slashem/history.txt slashem/slamfaq.txt vultures/gamedata/manual/
 %{_bindir}/vultures*
 %dir %{_prefix}/games/vultureseye/
 %{_prefix}/games/vultureseye/config/
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-8
+- Forgot to relocate moved docs for postbuild.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-7
 - Apparently we're using libpng-devel now also (nobody told me)
 



From fedora-extras-commits at redhat.com  Fri Dec 16 01:17:13 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Thu, 15 Dec 2005 20:17:13 -0500
Subject: rpms/gnome-sudoku/FC-4 .cvsignore, 1.2, 1.3 gnome-sudoku.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200512160117.jBG1HiNR020266@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20244

Modified Files:
	.cvsignore gnome-sudoku.spec sources 
Log Message:
Updated to 0.4.0-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2005 13:12:04 -0000	1.2
+++ .cvsignore	16 Dec 2005 01:17:11 -0000	1.3
@@ -1 +1 @@
-gnome-sudoku-0.3.4.tar.gz
+gnome-sudoku-0.4.0.tar.gz


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/gnome-sudoku.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-sudoku.spec	12 Dec 2005 13:12:04 -0000	1.1
+++ gnome-sudoku.spec	16 Dec 2005 01:17:11 -0000	1.2
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gnome-sudoku
-Version:        0.3.4
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Paul W. Frields  - 0.4.0-1
+- Update to 0.4.0
+
 * Sun Dec 11 2005 Paul W. Frields  - 0.3.4-1
 - Fix to fedora-rpmdevtools standards
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2005 13:12:04 -0000	1.2
+++ sources	16 Dec 2005 01:17:11 -0000	1.3
@@ -1 +1 @@
-6b411c8f925b0f9ce0ac195400c08f6a  gnome-sudoku-0.3.4.tar.gz
+49690532247bf9c5786655036e8cec92  gnome-sudoku-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 16 01:18:55 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Thu, 15 Dec 2005 20:18:55 -0500
Subject: rpms/gnome-sudoku/devel .cvsignore, 1.2, 1.3 gnome-sudoku.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200512160119.jBG1JQNO020306@cvs-int.fedora.redhat.com>

Author: pfrields

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

Modified Files:
	.cvsignore gnome-sudoku.spec sources 
Log Message:
Updated to 0.4.0-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2005 13:12:04 -0000	1.2
+++ .cvsignore	16 Dec 2005 01:18:53 -0000	1.3
@@ -1 +1 @@
-gnome-sudoku-0.3.4.tar.gz
+gnome-sudoku-0.4.0.tar.gz


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/gnome-sudoku.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-sudoku.spec	12 Dec 2005 13:12:04 -0000	1.1
+++ gnome-sudoku.spec	16 Dec 2005 01:18:53 -0000	1.2
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gnome-sudoku
-Version:        0.3.4
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Paul W. Frields  - 0.4.0-1
+- Update to 0.4.0
+
 * Sun Dec 11 2005 Paul W. Frields  - 0.3.4-1
 - Fix to fedora-rpmdevtools standards
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2005 13:12:04 -0000	1.2
+++ sources	16 Dec 2005 01:18:53 -0000	1.3
@@ -1 +1 @@
-6b411c8f925b0f9ce0ac195400c08f6a  gnome-sudoku-0.3.4.tar.gz
+49690532247bf9c5786655036e8cec92  gnome-sudoku-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 16 02:19:37 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 15 Dec 2005 21:19:37 -0500
Subject: rpms/uim/devel uim.spec,1.21,1.22
Message-ID: <200512160220.jBG2K7k1022114@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	uim.spec 
Log Message:
add X dependencies.


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- uim.spec	15 Dec 2005 11:18:13 -0000	1.21
+++ uim.spec	16 Dec 2005 02:19:35 -0000	1.22
@@ -8,6 +8,7 @@
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libXft-devel libX11-devel
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
 BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
 BuildRequires:	emacs
@@ -156,7 +157,7 @@
 
 
 %build
-%configure --with-canna --with-anthy --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
+%configure --with-x --with-xft --with-canna --with-anthy --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
 make
 
 %install



From fedora-extras-commits at redhat.com  Fri Dec 16 04:07:15 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 15 Dec 2005 23:07:15 -0500
Subject: rpms/uim/devel uim.spec,1.22,1.23
Message-ID: <200512160407.jBG47jpk025651@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	uim.spec 
Log Message:
add X dependencies.


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- uim.spec	16 Dec 2005 02:19:35 -0000	1.22
+++ uim.spec	16 Dec 2005 04:06:54 -0000	1.23
@@ -8,7 +8,7 @@
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libXft-devel libX11-devel
+BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
 BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
 BuildRequires:	emacs



From fedora-extras-commits at redhat.com  Fri Dec 16 04:30:10 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 23:30:10 -0500
Subject: rpms/xfce4-clipman-plugin - New directory
Message-ID: <200512160430.jBG4UAmP025794@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25785/xfce4-clipman-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-clipman-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 04:30:16 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 23:30:16 -0500
Subject: rpms/xfce4-clipman-plugin/devel - New directory
Message-ID: <200512160430.jBG4UGSo025810@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25785/xfce4-clipman-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-clipman-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 04:30:49 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 23:30:49 -0500
Subject: rpms/xfce4-clipman-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512160430.jBG4Un02025845@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25832

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-clipman-plugin


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec 16 04:30:55 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 23:30:55 -0500
Subject: rpms/xfce4-clipman-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512160430.jBG4UtkY025866@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25832/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-clipman-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec 16 04:32:01 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 23:32:01 -0500
Subject: rpms/xfce4-clipman-plugin import.log,1.1,1.2
Message-ID: <200512160432.jBG4WWMX025938@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25900

Modified Files:
	import.log 
Log Message:
auto-import xfce4-clipman-plugin-0.4.1-4.fc4 on branch devel from xfce4-clipman-plugin-0.4.1-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Dec 2005 04:30:47 -0000	1.1
+++ import.log	16 Dec 2005 04:31:59 -0000	1.2
@@ -0,0 +1 @@
+xfce4-clipman-plugin-0_4_1-4_fc4:HEAD:xfce4-clipman-plugin-0.4.1-4.fc4.src.rpm:1134707507



From fedora-extras-commits at redhat.com  Fri Dec 16 04:32:12 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 23:32:12 -0500
Subject: rpms/xfce4-clipman-plugin/devel xfce4-clipman-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512160432.jBG4WgVS025942@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25900/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-clipman-plugin.spec 
Log Message:
auto-import xfce4-clipman-plugin-0.4.1-4.fc4 on branch devel from xfce4-clipman-plugin-0.4.1-4.fc4.src.rpm


--- NEW FILE xfce4-clipman-plugin.spec ---
Name:		xfce4-clipman-plugin
Version:	0.4.1
Release:	4%{?dist}
Summary:	Clipboard manager plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
This is a simple cliboard history for Xfce panel. It includes a "Clear 
clipboard" option, and a drag-and-drop paste feature.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.4.1-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.4.1-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.4.1-2.fc4.cw
- Update to 0.4.1.
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.4.1-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.4.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Dec 2005 04:30:53 -0000	1.1
+++ .cvsignore	16 Dec 2005 04:32:10 -0000	1.2
@@ -0,0 +1 @@
+xfce4-clipman-plugin-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Dec 2005 04:30:53 -0000	1.1
+++ sources	16 Dec 2005 04:32:10 -0000	1.2
@@ -0,0 +1 @@
+664f6ca8500d8f240289c27d7bf4f419  xfce4-clipman-plugin-0.4.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 16 08:54:45 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 16 Dec 2005 03:54:45 -0500
Subject: rpms/bochs/devel bochs.spec,1.10,1.11
Message-ID: <200512160855.jBG8tFGY000633@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	bochs.spec 
Log Message:
* Fri Dec 16 2005 Ville Skytt??  - 2.2.1-2
- Adapt to modular X.
- Fix build with g++ 4.1.0.
- Conditionalize wxGTK build and default it to off (build failures w/2.6.x).
- Use sed instead of dos2unix and perl during build.



Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bochs.spec	10 Jul 2005 16:14:58 -0000	1.10
+++ bochs.spec	16 Dec 2005 08:54:43 -0000	1.11
@@ -1,6 +1,9 @@
+%bcond_with     debugger
+%bcond_with     wx
+
 Name:           bochs
 Version:        2.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Portable x86 PC emulator
 
 Group:          Applications/Emulators
@@ -14,12 +17,16 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  docbook-utils
-BuildRequires:  wxGTK2-devel
+BuildRequires:  libXt-devel
+BuildRequires:  libXpm-devel
 BuildRequires:  ncurses-devel
-BuildRequires:  dos2unix
-BuildRequires:  %{__perl}
 BuildRequires:  SDL-devel
-%{?_with_debugger:BuildRequires: readline-devel}
+%if %{with wx}
+BuildRequires:  wxGTK-devel
+%endif
+%if %{with debugger}
+BuildRequires:  readline-devel
+%endif
 
 %description
 Bochs is a portable x86 PC emulation software package that emulates
@@ -43,17 +50,22 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+cp -p %{SOURCE1} .
+
 # Uh-oh, great!
-%{__perl} -pi -e \
-  's|wx_needs_gtk2=0|wx_needs_gtk2=1| ;
-   s|/opt/gnome/include/|%{_includedir}/|' \
+sed -i \
+  -e 's|wx_needs_gtk2=0|wx_needs_gtk2=1|' \
+  -e 's|/opt/gnome/include/|%{_includedir}/|' \
   configure*
+
 # Fix up some man page paths.
-%{__perl} -pi -e \
-  's|/usr/local/share/doc/bochs\b|%{_docdir}/%{name}-%{version}| ;
-   s|/usr/local/share/|%{_datadir}/|' \
+sed -i \
+  -e 's|/usr/local/share/doc/bochs/|%{_docdir}/%{name}-%{version}/|' \
+  -e 's|/usr/local/share/|%{_datadir}/|' \
   doc/man/*.*
-cp -p %{SOURCE1} .
+
+# Fix build error with g++ 4.1.0
+sed -i -e '/#ifndef PARANOID/,/#endif/d' iodev/harddrv.h
 
 
 %build
@@ -66,7 +78,7 @@
   --enable-pci \
   --enable-4meg-pages \
   --enable-pae \
-  %{?_with_debugger:--enable-debugger} \
+  %{?with_debugger:--enable-debugger} \
   --enable-all-optimizations \
   --enable-vbe \
   --enable-3dnow \
@@ -78,14 +90,14 @@
   --with-term \
   --with-rfb \
   --with-sdl \
-  --with-wx
+  --with%{!?with_wx:out}-wx
 
 make %{?_smp_mflags}
 make unpack_dlx
 
 # This needs to be done after "make unpack_dlx".
 %{__patch} -p0 < %{PATCH2}
-dos2unix dlxlinux/readme.txt dlxlinux/bochsrc.txt
+sed -i -e 's/\r//' dlxlinux/readme.txt dlxlinux/bochsrc.txt
 
 
 %install
@@ -122,6 +134,12 @@
 
 
 %changelog
+* Fri Dec 16 2005 Ville Skytt??  - 2.2.1-2
+- Adapt to modular X.
+- Fix build with g++ 4.1.0.
+- Conditionalize wxGTK build and default it to off (build failures w/2.6.x).
+- Use sed instead of dos2unix and perl during build.
+
 * Sat Jul  9 2005 Ville Skytt??  - 2.2.1-1
 - 2.2.1, precision patch applied upstream.
 



From fedora-extras-commits at redhat.com  Fri Dec 16 09:00:48 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri, 16 Dec 2005 04:00:48 -0500
Subject: fedora-security/audit fc4,1.108,1.109 fc5,1.19,1.20
Message-ID: <200512160901.jBG91L6T002358@cvs-int.fedora.redhat.com>

Author: mjc

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

Modified Files:
	fc4 fc5 
Log Message:
Add cpio CVE



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- fc4	15 Dec 2005 16:28:25 -0000	1.108
+++ fc4	16 Dec 2005 09:00:46 -0000	1.109
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
 CVE-2005-4077 backport (curl) [since FEDORA-2005-1137]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fc5	15 Dec 2005 16:28:25 -0000	1.19
+++ fc5	16 Dec 2005 09:00:46 -0000	1.20
@@ -12,6 +12,7 @@
 
 ** are items that need attention
 
+CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
 CVE-2005-4077 VULNERABLE (curl)



From fedora-extras-commits at redhat.com  Fri Dec 16 09:12:48 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 16 Dec 2005 04:12:48 -0500
Subject: rpms/perl-Class-ErrorHandler - New directory
Message-ID: <200512160912.jBG9Cmtc002757@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-ErrorHandler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2748/perl-Class-ErrorHandler

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




From fedora-extras-commits at redhat.com  Fri Dec 16 09:13:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 16 Dec 2005 04:13:12 -0500
Subject: rpms/perl-Class-ErrorHandler/devel - New directory
Message-ID: <200512160913.jBG9DCi3002783@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-ErrorHandler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2748/perl-Class-ErrorHandler/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-ErrorHandler/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 09:14:21 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 16 Dec 2005 04:14:21 -0500
Subject: rpms/perl-Class-ErrorHandler Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512160914.jBG9ELwj002819@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-ErrorHandler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2806

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-ErrorHandler


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 16 09:14:38 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 16 Dec 2005 04:14:38 -0500
Subject: rpms/perl-Class-ErrorHandler/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512160914.jBG9Ecwl002838@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-ErrorHandler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2806/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-ErrorHandler


--- NEW 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 Dec 16 09:17:13 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 16 Dec 2005 04:17:13 -0500
Subject: rpms/perl-Class-ErrorHandler import.log,1.1,1.2
Message-ID: <200512160918.jBG9I4jK003151@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-ErrorHandler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2944

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-ErrorHandler-0.01-2 on branch devel from perl-Class-ErrorHandler-0.01-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-ErrorHandler/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Dec 2005 09:14:19 -0000	1.1
+++ import.log	16 Dec 2005 09:17:11 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-ErrorHandler-0_01-2:HEAD:perl-Class-ErrorHandler-0.01-2.src.rpm:1134724560



From fedora-extras-commits at redhat.com  Fri Dec 16 09:17:32 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 16 Dec 2005 04:17:32 -0500
Subject: rpms/perl-Class-ErrorHandler/devel perl-Class-ErrorHandler.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512160918.jBG9I44J003152@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-ErrorHandler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2944/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-ErrorHandler.spec 
Log Message:
auto-import perl-Class-ErrorHandler-0.01-2 on branch devel from perl-Class-ErrorHandler-0.01-2.src.rpm


--- NEW FILE perl-Class-ErrorHandler.spec ---
Name:           perl-Class-ErrorHandler
Version:        0.01
Release:        2%{?dist}
Summary:        Class::ErrorHandler Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Class-ErrorHandler/
Source0:        http://www.cpan.org/modules/by-module/Class/Class-ErrorHandler-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is Class::ErrorHandler, a base class for classes that need to do
error handling (which is, probably, most of them).

%prep
%setup -q -n Class-ErrorHandler-%{version}

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

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README COPYING Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Sep 17 2005 Steven Pritchard  0.01-2
- Include license files.

* Fri Aug 26 2005 Steven Pritchard  0.01-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-ErrorHandler/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Dec 2005 09:14:35 -0000	1.1
+++ .cvsignore	16 Dec 2005 09:17:30 -0000	1.2
@@ -0,0 +1 @@
+Class-ErrorHandler-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-ErrorHandler/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Dec 2005 09:14:35 -0000	1.1
+++ sources	16 Dec 2005 09:17:30 -0000	1.2
@@ -0,0 +1 @@
+6a07ad34dfcdf510677f92e47643976d  Class-ErrorHandler-0.01.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 16 09:19:33 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Fri, 16 Dec 2005 04:19:33 -0500
Subject: rpms/xlockmore/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xlockmore.spec, 1.7, 1.8
Message-ID: <200512160920.jBG9K5Zl003226@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	.cvsignore sources xlockmore.spec 
Log Message:
* Fri Dec 16 2005 Adrian Reber  - 5.20.1-1
- updated to 5.20.1
- changes for modular X
- removed "GENTOO" hack



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Sep 2005 20:51:55 -0000	1.5
+++ .cvsignore	16 Dec 2005 09:19:31 -0000	1.6
@@ -1 +1 @@
-xlockmore-5.19.tar.bz2
+xlockmore-5.20.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2005 20:51:55 -0000	1.5
+++ sources	16 Dec 2005 09:19:31 -0000	1.6
@@ -1 +1 @@
-c80ae7689bf8683033ec08b652e24d83  xlockmore-5.19.tar.bz2
+f70b24437d44cfa10ca259d00608deef  xlockmore-5.20.1.tar.bz2


Index: xlockmore.spec
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/xlockmore.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xlockmore.spec	6 Sep 2005 20:51:55 -0000	1.7
+++ xlockmore.spec	16 Dec 2005 09:19:31 -0000	1.8
@@ -1,16 +1,17 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.19
+Version: 5.20.1
 Release: 1%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.19.tar.bz2
+Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.20.1.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
-BuildRequires: xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
-BuildRequires: desktop-file-utils
+BuildRequires: mesa-libGL-devel mesa-libGLU-devel
+BuildRequires: desktop-file-utils libXdmcp-devel
 BuildRequires: openmotif-devel gtk2-devel
+BuildRequires: libXau-devel
 
 %description
 Locks the local X display until a password is entered.
@@ -39,7 +40,7 @@
 %build
 %configure \
 	--with-crypt --enable-pam --enable-syslog --disable-setuid
-%{__make} %{?_smp_mflags} CFLAGS+=" -DGENTOO "
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
@@ -104,6 +105,11 @@
 %{_bindir}/xglock
 
 %changelog
+* Fri Dec 16 2005 Adrian Reber  - 5.20.1-1
+- updated to 5.20.1
+- changes for modular X
+- removed "GENTOO" hack
+
 * Sun Aug 21 2005 Adrian Reber  - 5.19-1
 - updated to 5.19
 - upstream included a fix for (BZ #161740), but "GENTOO" needs



From fedora-extras-commits at redhat.com  Fri Dec 16 09:25:28 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 16 Dec 2005 04:25:28 -0500
Subject: owners owners.list,1.456,1.457
Message-ID: <200512160926.jBG9Q0cD003351@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3302

Modified Files:
	owners.list 
Log Message:
Add perl-Class-ErrorHandler


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -r1.456 -r1.457
--- owners.list	15 Dec 2005 23:20:20 -0000	1.456
+++ owners.list	16 Dec 2005 09:25:26 -0000	1.457
@@ -717,6 +717,7 @@
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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|extras-orphan at fedoraproject.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-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



From fedora-extras-commits at redhat.com  Fri Dec 16 09:29:22 2005
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 16 Dec 2005 04:29:22 -0500
Subject: rpms/allegro/devel allegro.spec,1.17,1.18
Message-ID: <200512160929.jBG9Trl1003428@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3410/allegro/devel

Modified Files:
	allegro.spec 
Log Message:
* Fri Dec 16 2005 Jindrich Novy  4.2.0-2
- update dependencies for the new modular X
- disable _smp_mflags to workaround build failure caused
  by bad dependencies




Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- allegro.spec	19 Nov 2005 08:09:07 -0000	1.17
+++ allegro.spec	16 Dec 2005 09:29:20 -0000	1.18
@@ -16,7 +16,7 @@
 Patch2:         allegro-4.0.3-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
-BuildRequires:  libX11-devel
+BuildRequires:  libX11-devel, libXext-devel, libXau, libXdmcp
 
 %description
 Allegro is a cross-platform library intended for use in computer games
@@ -45,7 +45,8 @@
 Summary(it):    Una libreria per la programmazione di videogiochi
 Summary(cz):    Knihovna pro programov??n?? her
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, XFree86-devel
+Requires:       %{name} = %{version}-%{release}, libX11-devel
+Requires:       libXext-devel, libXau, libXdmcp
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -125,9 +126,11 @@
 %endif
   --enable-svgalib=no
 %ifnarch %{ix86}
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -DALLEGRO_USE_C -I%{_includedir}/kde/artsc"
+#make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -DALLEGRO_USE_C -I%{_includedir}/kde/artsc"
+make CFLAGS="$RPM_OPT_FLAGS -DALLEGRO_USE_C -I%{_includedir}/kde/artsc"
 %else
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/kde/artsc"
+#make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/kde/artsc"
+make CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/kde/artsc"
 %endif
 MKDATA_PRELOAD=../../lib/unix/liballeg-%{version}.so \
   DAT=../../tools/dat sh misc/mkdata.sh
@@ -201,8 +204,10 @@
 
 
 %changelog
-* Sat Nov 19 2005 Jindrich Novy  4.2.0-2
+* Fri Dec 16 2005 Jindrich Novy  4.2.0-2
 - update dependencies for the new modular X
+- disable _smp_mflags to workaround build failure caused
+  by bad dependencies
 
 * Wed May 25 2005 Jindrich Novy  4.2.0-1
 - update to 4.2.0



From fedora-extras-commits at redhat.com  Fri Dec 16 11:03:22 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 16 Dec 2005 06:03:22 -0500
Subject: rpms/uim/devel .cvsignore, 1.11, 1.12 sources, 1.10, 1.11 uim.spec,
	1.23, 1.24
Message-ID: <200512161104.jBGB4EfJ006923@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6901

Modified Files:
	.cvsignore sources uim.spec 
Log Message:
* Fri Dec 16 2005 Akira TAGOH  - 1.0.0-0.2.beta
- updates to 1.0.0-beta.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	15 Dec 2005 11:32:10 -0000	1.11
+++ .cvsignore	16 Dec 2005 11:03:20 -0000	1.12
@@ -10,3 +10,4 @@
 uim-0.4.8.tar.gz
 uim-0.4.9.1.tar.gz
 uim-1.0.0-alpha.tar.gz
+uim-1.0.0-beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Dec 2005 11:32:10 -0000	1.10
+++ sources	16 Dec 2005 11:03:20 -0000	1.11
@@ -1 +1 @@
-9c277a46e16a0bf90d72aabbf8094cfc  uim-1.0.0-alpha.tar.gz
+c68b7a8544551bd5b65df03dcb46d9e3  uim-1.0.0-beta.tar.gz


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- uim.spec	16 Dec 2005 04:06:54 -0000	1.23
+++ uim.spec	16 Dec 2005 11:03:20 -0000	1.24
@@ -4,7 +4,7 @@
 
 Name:		uim
 Version:	1.0.0
-Release:	0.1.alpha%{?dist}
+Release:	0.2.beta%{?dist}
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,7 +12,7 @@
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
 BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
 BuildRequires:	emacs
-Source0:	http://uim.freedesktop.org/release/%{name}-%{version}-alpha.tar.gz
+Source0:	http://uim.freedesktop.org/release/%{name}-%{version}-beta.tar.gz
 Source1:	xinput.d-uim
 Source2:	uim-init.el
 
@@ -153,7 +153,7 @@
 %define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules )
 
 %prep
-%setup -q -n %{name}-%{version}-alpha
+%setup -q -n %{name}-%{version}-beta
 
 
 %build
@@ -343,6 +343,9 @@
 %{_datadir}/uim/m17nlib.scm
 
 %changelog
+* Fri Dec 16 2005 Akira TAGOH  - 1.0.0-0.2.beta
+- updates to 1.0.0-beta.
+
 * Thu Dec 15 2005 Akira TAGOH  - 1.0.0-0.1.alpha
 - New upstream release.
 - added uim-m17n package. (#175600)



From fedora-extras-commits at redhat.com  Fri Dec 16 11:24:09 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:24:09 -0500
Subject: rpms/perl-DBD-XBase - New directory
Message-ID: <200512161124.jBGBO9AI007108@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7099/perl-DBD-XBase

Log Message:
Directory /cvs/extras/rpms/perl-DBD-XBase added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 11:24:15 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:24:15 -0500
Subject: rpms/perl-DBD-XBase/devel - New directory
Message-ID: <200512161124.jBGBOF93007124@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7099/perl-DBD-XBase/devel

Log Message:
Directory /cvs/extras/rpms/perl-DBD-XBase/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 11:24:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:24:35 -0500
Subject: rpms/perl-DBD-XBase Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512161124.jBGBOZrg007161@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7148

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-DBD-XBase


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DBD-XBase
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec 16 11:24:40 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:24:40 -0500
Subject: rpms/perl-DBD-XBase/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512161124.jBGBOeOt007180@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7148/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DBD-XBase


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec 16 11:25:15 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:25:15 -0500
Subject: rpms/perl-DBD-XBase import.log,1.1,1.2
Message-ID: <200512161125.jBGBPj41007250@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7214

Modified Files:
	import.log 
Log Message:
auto-import perl-DBD-XBase-0.241-1 on branch devel from perl-DBD-XBase-0.241-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-XBase/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Dec 2005 11:24:33 -0000	1.1
+++ import.log	16 Dec 2005 11:25:13 -0000	1.2
@@ -0,0 +1 @@
+perl-DBD-XBase-0_241-1:HEAD:perl-DBD-XBase-0.241-1.src.rpm:1134732304



From fedora-extras-commits at redhat.com  Fri Dec 16 11:25:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:25:21 -0500
Subject: rpms/perl-DBD-XBase/devel perl-DBD-XBase.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512161125.jBGBPpsZ007254@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7214/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-DBD-XBase.spec 
Log Message:
auto-import perl-DBD-XBase-0.241-1 on branch devel from perl-DBD-XBase-0.241-1.src.rpm


--- NEW FILE perl-DBD-XBase.spec ---
Name:           perl-DBD-XBase
Version:        0.241
Release:        1%{?dist}
Summary:        Perl module for reading and writing the dbf files

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/DBD-XBase/
Source0:        http://www.cpan.org/authors/id/J/JA/JANPAZ/DBD-XBase-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(DBI)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module can read and write XBase database files, known as dbf in
dBase and FoxPro world. It also transparently reads memo fields from
the dbt, fpt and smt files and works with index files (ndx, ntx, mdx, idx,
cdx and SDBM). This module XBase.pm provides simple native interface
to XBase files. For DBI compliant database access, see DBD::XBase and
DBI modules and their man pages.


%prep
%setup -q -n DBD-XBase-%{version}
chmod a-x eg/*table

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README ToDo driver_characteristics new-XBase
%doc eg/
%{_bindir}/*
%{perl_vendorlib}/DBD/
%{perl_vendorlib}/XBase*
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3*


%changelog
* Sat Nov 05 2005 Jose Pedro Oliveira  - 0.241-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-XBase/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Dec 2005 11:24:38 -0000	1.1
+++ .cvsignore	16 Dec 2005 11:25:18 -0000	1.2
@@ -0,0 +1 @@
+DBD-XBase-0.241.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-XBase/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Dec 2005 11:24:38 -0000	1.1
+++ sources	16 Dec 2005 11:25:18 -0000	1.2
@@ -0,0 +1 @@
+ed36f8722f09406d35c8af801fa78c3b  DBD-XBase-0.241.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 16 11:40:42 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:40:42 -0500
Subject: rpms/perl-DBD-XBase/devel DBD-XBase-0.241-indexdump.PL.patch, NONE,
	1.1 perl-DBD-XBase.spec, 1.1, 1.2
Message-ID: <200512161141.jBGBfDIe007381@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7360

Modified Files:
	perl-DBD-XBase.spec 
Added Files:
	DBD-XBase-0.241-indexdump.PL.patch 
Log Message:
Patch to remove the duplicate shebang line in bin/indexdump (#175895)

DBD-XBase-0.241-indexdump.PL.patch:

--- NEW FILE DBD-XBase-0.241-indexdump.PL.patch ---
diff -ruN DBD-XBase-0.241-orig/bin/indexdump.PL DBD-XBase-0.241/bin/indexdump.PL
--- DBD-XBase-0.241-orig/bin/indexdump.PL	2001-01-22 19:46:19.000000000 +0000
+++ DBD-XBase-0.241/bin/indexdump.PL	2005-12-16 11:15:55.000000000 +0000
@@ -14,8 +14,6 @@
 
 print OUT <<'EOBODY';
 
-#!/usr/bin/perl -w 
-
 use strict;
 use XBase::Index;
 use Getopt::Long;


Index: perl-DBD-XBase.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-XBase/devel/perl-DBD-XBase.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-DBD-XBase.spec	16 Dec 2005 11:25:18 -0000	1.1
+++ perl-DBD-XBase.spec	16 Dec 2005 11:40:40 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           perl-DBD-XBase
 Version:        0.241
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl module for reading and writing the dbf files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/DBD-XBase/
 Source0:        http://www.cpan.org/authors/id/J/JA/JANPAZ/DBD-XBase-%{version}.tar.gz
+Patch0:         DBD-XBase-0.241-indexdump.PL.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -24,6 +25,7 @@
 
 %prep
 %setup -q -n DBD-XBase-%{version}
+%patch0 -p1
 chmod a-x eg/*table
 
 %build
@@ -59,5 +61,8 @@
 
 
 %changelog
+* Fri Dec 16 2005 Jose Pedro Oliveira  - 0.241-2
+- Patch to remove the duplicate shebang line in bin/indexdump (#175895).
+
 * Sat Nov 05 2005 Jose Pedro Oliveira  - 0.241-1
 - First build.



From fedora-extras-commits at redhat.com  Fri Dec 16 11:44:30 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:44:30 -0500
Subject: owners owners.list,1.457,1.458
Message-ID: <200512161145.jBGBj0nF007428@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7410

Modified Files:
	owners.list 
Log Message:
New package: perl-DBD-XBase (#175895)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -r1.457 -r1.458
--- owners.list	16 Dec 2005 09:25:26 -0000	1.457
+++ owners.list	16 Dec 2005 11:44:28 -0000	1.458
@@ -741,6 +741,7 @@
 Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-DBD-XBase|Perl module for reading and writing the dbf files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-DBSchema|Database-independent schema objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-SearchBuilder|Encapsulate SQL queries and rows in simple perl objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Dec 16 13:40:46 2005
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 16 Dec 2005 08:40:46 -0500
Subject: rpms/yumex/FC-4 .cvsignore, 1.8, 1.9 sources, 1.10, 1.11 yumex.spec,
	1.10, 1.11
Message-ID: <200512161341.jBGDfHJq011173@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11151

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 0.44-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Oct 2005 12:23:47 -0000	1.8
+++ .cvsignore	16 Dec 2005 13:40:44 -0000	1.9
@@ -1 +1 @@
-yumex-0.42-7.tar.gz
+yumex-0.44-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	31 Oct 2005 08:22:30 -0000	1.10
+++ sources	16 Dec 2005 13:40:44 -0000	1.11
@@ -1 +1 @@
-362336685b1d6114df22e805a1511f60  yumex-0.42-9.tar.gz
+e7812008ac74652f58f8b87691f44f20  yumex-0.44-1.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-4/yumex.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- yumex.spec	31 Oct 2005 08:22:30 -0000	1.10
+++ yumex.spec	16 Dec 2005 13:40:44 -0000	1.11
@@ -1,8 +1,8 @@
-%define   build_v 9
+%define   build_v 1
 
 Name:     yumex
-Version:  0.42
-Release:  9.0%{?dist}
+Version:  0.44
+Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,14 +67,31 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Mon Oct 31 2005 Tim Lauridsen  - 0.42-8.0
-- Release 0.42-9.0
-- Removed syntax error in yumbase.py.
-* Mon Oct 31 2005 Tim Lauridsen  - 0.42-8.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
+- Release 0.43-10.0
+* Sat Dec 10 2005 Tim Lauridsen  - 0.43-9.0
+- Release 0.43-9.0
+* Wed Nov 23 2005 Tim Lauridsen  - 0.43-8.0
+- Release 0.43-8.0
+* Wed Nov 23 2005 Tim Lauridsen  - 0.43-7.0
+- Release 0.43-7.0
+* Fri Nov 18 2005 Tim Lauridsen  - 0.43-6.0
+- Release 0.43-6.0
+* Thu Nov 17 2005 Tim Lauridsen  - 0.43-5.0
+- Release 0.43-5.0
+* Wed Nov 16 2005 Tim Lauridsen  - 0.43-4.0
+- Release 0.43-4.0
+* Thu Nov 8 2005 Tim Lauridsen  - 0.43-3.0
+- Release 0.43-3.0
+* Thu Nov 7 2005 Tim Lauridsen  - 0.43-2.0
+- Release 0.43-2.0
+* Thu Nov 7 2005 Tim Lauridsen  - 0.43-1.0
+- Release 0.43-1.0
+- Lot of changes, check the ChangeLog
+* Thu Oct 13 2005 Tim Lauridsen  - 0.42-8.0
 - Release 0.42-8.0
-- Updated french traslation
-- Added Italien translation.
-- Added ETA truncation fix patches (Thanks to Dennis Cranston)
 * Thu Oct 13 2005 Tim Lauridsen  - 0.42-7.0
 - Release 0.42-7.0
 - Changed Requires: yum to >= 2.4



From fedora-extras-commits at redhat.com  Fri Dec 16 14:31:19 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Fri, 16 Dec 2005 09:31:19 -0500
Subject: rpms/l2tpd/devel l2tpd.spec,1.1,1.2
Message-ID: <200512161431.jBGEVnk8012948@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/l2tpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12930

Modified Files:
	l2tpd.spec 
Log Message:
* Fri Dec 16 2005 Paul Wouters  0.69-0.2.20051030
- Added dist tag and fixed version numbers



Index: l2tpd.spec
===================================================================
RCS file: /cvs/extras/rpms/l2tpd/devel/l2tpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- l2tpd.spec	15 Dec 2005 19:15:33 -0000	1.1
+++ l2tpd.spec	16 Dec 2005 14:31:17 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: l2tpd
 Version: 0.69
-Release: 0.1.%{cvs}.2
+Release: 0.2.%{cvs}%{?dist}
 License: GPL
 Url: http://sourceforge.net/projects/%{name}/
 Group: System Environment/Daemons
@@ -125,6 +125,9 @@
 
 
 %changelog
+* Fri Dec 16 2005 Paul Wouters  0.69-0.2.20051030
+- Added dist tag and fixed version numbers
+
 * Wed Dec 14 2005 Paul Wouters  0.69-0.1.20051030
 - incorporated fixes from Dmitry Butskoy
 



From fedora-extras-commits at redhat.com  Fri Dec 16 15:33:52 2005
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 16 Dec 2005 10:33:52 -0500
Subject: rpms/nedit/devel nedit-5.4-makefiles.patch, 1.1, 1.2 nedit.spec, 1.4,
	1.5
Message-ID: <200512161534.jBGFYNgI014800@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/nedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14777/nedit/devel

Modified Files:
	nedit-5.4-makefiles.patch nedit.spec 
Log Message:
* Thu Dec 16 2005 Jindrich Novy  5.5-6
- fix openmotif dependencies
- build with modular X



nedit-5.4-makefiles.patch:

Index: nedit-5.4-makefiles.patch
===================================================================
RCS file: /cvs/extras/rpms/nedit/devel/nedit-5.4-makefiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nedit-5.4-makefiles.patch	27 Jul 2005 08:46:29 -0000	1.1
+++ nedit-5.4-makefiles.patch	16 Dec 2005 15:33:50 -0000	1.2
@@ -12,12 +12,12 @@
  # add -DHAVE__XMVERSIONSTRING to CFLAGS
  #
 -CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
-+CFLAGS=$(RPM_OPT_FLAGS) -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
++CFLAGS=-I/usr/X11R6/include $(RPM_OPT_FLAGS) -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DBUILD_UNTESTED_NEDIT
  
  ARFLAGS=-urs
  
 -LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
-+LIBS= -L/usr/X11R6/$(LIB) -lXm -Xmu -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
++LIBS= -lXm -lXmu -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
  
  include Makefile.common
  


Index: nedit.spec
===================================================================
RCS file: /cvs/extras/rpms/nedit/devel/nedit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nedit.spec	15 Dec 2005 15:09:57 -0000	1.4
+++ nedit.spec	16 Dec 2005 15:33:50 -0000	1.5
@@ -19,7 +19,7 @@
 License: GPL
 Group: Applications/Editors
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: openmotif-devel >= 2.2.3
+BuildRequires: openmotif-devel >= 2.2.3, libXau-devel, libXpm-devel
 %if %{desktop_file}
 BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
 %endif
@@ -39,7 +39,9 @@
 %patch5 -p1 -b .nc-manfix
 
 %build
-make linux LIB=%{_lib}
+make linux LIB=%{_lib} << EOF
+
+EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,8 +82,9 @@
 %endif
 
 %changelog
-* Thu Dec 15 2005 Jindrich Novy  5.5-6
-- rebuilt to fix X dependencies
+* Thu Dec 16 2005 Jindrich Novy  5.5-6
+- fix openmotif dependencies
+- build with modular X
 
 * Mon Oct 10 2005 Jindrich Novy  5.5-5
 - update nedit file locations to new xorg standards (#167208, #170937)



From fedora-extras-commits at redhat.com  Fri Dec 16 16:39:24 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri, 16 Dec 2005 11:39:24 -0500
Subject: rpms/krecipes/FC-3 krecipes.spec,1.7,1.8
Message-ID: <200512161639.jBGGdtpM016692@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16674

Modified Files:
	krecipes.spec 
Log Message:
Update to 0.9.1



Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-3/krecipes.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- krecipes.spec	1 Dec 2005 04:03:33 -0000	1.7
+++ krecipes.spec	16 Dec 2005 16:39:22 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           krecipes
-Version:        0.9
-Release:        2%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
@@ -9,7 +9,7 @@
 Source0:        http://download.sourceforge.net/krecipes/krecipes-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel > 3.1, sqlite-devel, desktop-file-utils
+BuildRequires:  kdelibs-devel > 3.1, sqlite-devel, desktop-file-utils, libacl-devel
 Requires:       kdebase >= 3.1
 
 patch0:		krecipes-gcc4.patch
@@ -81,9 +81,11 @@
 %{_datadir}/mimelnk/*/*.desktop
 
 %changelog
-* Wed Nov 11 2005 Dennis Gilmore  - 0.9-2
+* Sun Dec 04 2005 Dennis Gilmore  - 0.9.1-1
+- Update to 0.9.1 fixes bug in creation of new mysql databses
+* Wed Nov 30 2005 Dennis Gilmore  - 0.9-2
 - fix missing files
-* Wed Nov 11 2005 Dennis Gilmore  - 0.9-1
+* Wed Nov 30 2005 Dennis Gilmore  - 0.9-1
 - update to 0.9
 * Sat Oct 20 2005 Dennis Gilmore  - 0.8.1-3%{?dist}
 - add BuildRequires desktop-file-utils  http://fedoraproject.org/wiki/QAChecklist



From fedora-extras-commits at redhat.com  Fri Dec 16 16:57:14 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Fri, 16 Dec 2005 11:57:14 -0500
Subject: common Makefile.common,1.34,1.35
Message-ID: <200512161657.jBGGviUu017517@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17393

Modified Files:
	Makefile.common 
Log Message:
patch from enrico to allow the use of alternative plague client binary



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile.common	14 Oct 2005 18:26:06 -0000	1.34
+++ Makefile.common	16 Dec 2005 16:57:12 -0000	1.35
@@ -81,6 +81,7 @@
 CURL	?= $(shell if test -f /usr/bin/curl ; then echo "curl -H Pragma: -O -R -S --fail --show-error" ; fi)
 WGET	?= $(shell if test -f /usr/bin/wget ; then echo "wget -nd -m" ; fi)
 CLIENT	?= $(if $(CURL),$(CURL),$(if $(WGET),$(WGET)))
+PLAGUE_CLIENT ?= /usr/bin/plague-client
 
 # RPM with all the overrides in place; you can override this in your
 # .cvsextrasrc also, to use a default rpm setup
@@ -330,12 +331,12 @@
 	popd >/dev/null)
 
 build plague: $(COMMON_DIR)/branches
-	@if [ ! -x /usr/bin/plague-client ]; then echo "Must have plague-client installed - see http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup"; exit 1; fi
+	@if [ ! -x $(PLAGUE_CLIENT) ]; then echo "Must have plague-client installed - see http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup"; exit 1; fi
 	@if [ -z "$(TARGET)" -a ! -d CVS ]; then echo "Must be in a branch subdirectory"; exit 1; fi
 
 	@cvs status -v $(SPECFILE) 2>/dev/null | grep -q $(TAG); ret=$$? ;\
 	if [ $$ret -ne 0 ]; then echo "$(SPECFILE) not tagged with tag $(TAG)"; exit 1;  fi
-	/usr/bin/plague-client build $(NAME) $(TAG) $(TARGET)
+	$(PLAGUE_CLIENT) build $(NAME) $(TAG) $(TARGET)
 
 
 # "make new | less" to see what has changed since the last tag was assigned



From fedora-extras-commits at redhat.com  Fri Dec 16 17:27:26 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Fri, 16 Dec 2005 12:27:26 -0500
Subject: rpms/gnome-sudoku/FC-4 gnome-sudoku.spec,1.2,1.3
Message-ID: <200512161727.jBGHRuiH019675@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19641/FC-4

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix missing Requires: gnome-python2-gconf (thanks to Paul Dickson) (#175911)


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/gnome-sudoku.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-sudoku.spec	16 Dec 2005 01:17:11 -0000	1.2
+++ gnome-sudoku.spec	16 Dec 2005 17:27:24 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
@@ -17,7 +17,7 @@
 BuildRequires:	gnome-python2-gnomeprint, python-imaging
 BuildRequires:	desktop-file-utils
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:   gnome-python2-gnomeprint, python-imaging
+Requires:   gnome-python2-gnomeprint, python-imaging, gnome-python2-gconf
 
 %description
 GNOME Sudoku is a Japanese logic puzzle game.  GNOME Sudoku takes care
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Fri Dec 16 2005 Paul W. Frields  - 0.4.0-2
+- Fix missing Requires: gnome-python2-gconf (thanks to Paul Dickson) (#175911)
+
 * Thu Dec 15 2005 Paul W. Frields  - 0.4.0-1
 - Update to 0.4.0
 



From fedora-extras-commits at redhat.com  Fri Dec 16 17:27:32 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Fri, 16 Dec 2005 12:27:32 -0500
Subject: rpms/gnome-sudoku/devel gnome-sudoku.spec,1.2,1.3
Message-ID: <200512161728.jBGHS2q0019678@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19641/devel

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix missing Requires: gnome-python2-gconf (thanks to Paul Dickson) (#175911)


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/gnome-sudoku.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-sudoku.spec	16 Dec 2005 01:18:53 -0000	1.2
+++ gnome-sudoku.spec	16 Dec 2005 17:27:30 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
@@ -17,7 +17,7 @@
 BuildRequires:	gnome-python2-gnomeprint, python-imaging
 BuildRequires:	desktop-file-utils
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:   gnome-python2-gnomeprint, python-imaging
+Requires:   gnome-python2-gnomeprint, python-imaging, gnome-python2-gconf
 
 %description
 GNOME Sudoku is a Japanese logic puzzle game.  GNOME Sudoku takes care
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Fri Dec 16 2005 Paul W. Frields  - 0.4.0-2
+- Fix missing Requires: gnome-python2-gconf (thanks to Paul Dickson) (#175911)
+
 * Thu Dec 15 2005 Paul W. Frields  - 0.4.0-1
 - Update to 0.4.0
 



From fedora-extras-commits at redhat.com  Fri Dec 16 17:46:45 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri, 16 Dec 2005 12:46:45 -0500
Subject: rpms/krecipes/FC-3 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200512161747.jBGHlGkx019862@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19842

Modified Files:
	.cvsignore sources 
Log Message:
Make sure new source is in FC3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2005 03:36:05 -0000	1.3
+++ .cvsignore	16 Dec 2005 17:46:43 -0000	1.4
@@ -1 +1 @@
-krecipes-0.9.tar.gz
+krecipes-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2005 03:36:05 -0000	1.3
+++ sources	16 Dec 2005 17:46:43 -0000	1.4
@@ -1 +1 @@
-ee1a1463946c63788ff8eeea302a7506  krecipes-0.9.tar.gz
+7414fd5210561801ba04ee3dad6561d9  krecipes-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 16 18:29:32 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 16 Dec 2005 13:29:32 -0500
Subject: rpms/kdesvn/FC-4 kdesvn.spec,1.2,1.3
Message-ID: <200512161830.jBGIU2KU021809@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21791

Modified Files:
	kdesvn.spec 
Log Message:
Add missing files not detected by mock



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/kdesvn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdesvn.spec	12 Dec 2005 16:22:28 -0000	1.2
+++ kdesvn.spec	16 Dec 2005 18:29:26 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           kdesvn
 Version:        0.7.1
-Release:        1%{?dist}
-Summary:        A subversion client for KDE
+Release:        2%{?dist}
+Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
 License:        GPL
@@ -51,6 +51,8 @@
 %find_lang %{name} || touch %{name}.lang
 #Fix doc link
 ln -sf ../common $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/en/%{name}
+#Don't conflict with kdebase
+rm $RPM_BUILD_ROOT%{_datadir)/services/svn*.protocol
 
 
 %clean
@@ -79,19 +81,23 @@
 %doc AUTHORS ChangeLog COPYING GPL.txt
 %{_bindir}/kdesvn
 %{_bindir}/kdesvnaskpass
-%{_libdir}/kde3/libkdesvnpart.*
+%{_libdir}/kde3/*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/kdesvn/
 %{_datadir}/apps/kdesvnpart/
+%{_datadir}/apps/konqueror/servicemenus/kdesvn*.desktop
 %{_datadir}/config.kcfg/kdesvn_part.kcfg
 %{_datadir}/doc/HTML/en/kdesvn/
-%{_datadir}/icons/hicolor/16x16/apps/kdesvn.png
-%{_datadir}/icons/hicolor/32x32/apps/kdesvn.png
-%{_datadir}/icons/hicolor/48x48/apps/kdesvn.png
-%{_datadir}/icons/hicolor/64x64/apps/kdesvn.png
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/hicolor/*/*/*.svgz
+%{_datadir}/services/kded/kdesvnd.desktop
+%{_datadir}/services/ksvn*.protocol
 
 
 %changelog
+* Fri Dec 16 2005 - Orion Poplawski  - 0.7.1-2
+- Add missing files not detected by mock
+
 * Fri Dec  9 2005 - Orion Poplawski  - 0.7.1-1
 - New upstream version 0.7.1
 - Remove desktop patch fixed upstream



From fedora-extras-commits at redhat.com  Fri Dec 16 18:33:39 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Fri, 16 Dec 2005 13:33:39 -0500
Subject: rpms/gnome-sudoku/FC-4 gnome-sudoku-0.4.0-pygtk2-nofs.patch, NONE,
	1.1 gnome-sudoku.spec, 1.3, 1.4
Message-ID: <200512161834.jBGIY9hs021901@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21880

Modified Files:
	gnome-sudoku.spec 
Added Files:
	gnome-sudoku-0.4.0-pygtk2-nofs.patch 
Log Message:
Add patch to fix full screen option, publish 0.4.0-3

gnome-sudoku-0.4.0-pygtk2-nofs.patch:

--- NEW FILE gnome-sudoku-0.4.0-pygtk2-nofs.patch ---
diff -uNr gnome-sudoku-0.4.0-original/src/lib/gnome_sudoku.py gnome-sudoku-0.4.0/src/lib/gnome_sudoku.py
--- gnome-sudoku-0.4.0-original/src/lib/gnome_sudoku.py	2005-12-16 13:03:38.000000000 -0500
+++ gnome-sudoku-0.4.0/src/lib/gnome_sudoku.py	2005-12-16 13:04:28.000000000 -0500
@@ -168,7 +168,7 @@
             ('ZoomOut',gtk.STOCK_ZOOM_OUT,'_Decrease size',
              'minus','Decrease the size of numbers and squares.',
              self.zoom_out_cb),
-            ('FullScreen',gtk.STOCK_FULLSCREEN,None,
+            ('FullScreen',None,'_Full screen',
              'F11',None,self.full_screen_cb),
             ('PuzzleInfo',gtk.STOCK_ABOUT,'Puzzle _Statistics',
              None,'Show statistics about current puzzle',


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/gnome-sudoku.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-sudoku.spec	16 Dec 2005 17:27:24 -0000	1.3
+++ gnome-sudoku.spec	16 Dec 2005 18:33:37 -0000	1.4
@@ -3,13 +3,14 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,6 +27,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # Fix one hardcoding instance
 sed -i 's!/usr/local!%{_prefix}!g' src/lib/game_selector.py
 # This must be something internal to the developer's system
@@ -65,6 +67,9 @@
 
 
 %changelog
+* Fri Dec 16 2005 Paul W. Frields  - 0.4.0-3
+- Fix broken full screen option
+
 * Fri Dec 16 2005 Paul W. Frields  - 0.4.0-2
 - Fix missing Requires: gnome-python2-gconf (thanks to Paul Dickson) (#175911)
 



From fedora-extras-commits at redhat.com  Fri Dec 16 18:42:19 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 16 Dec 2005 13:42:19 -0500
Subject: rpms/kdesvn/FC-4 kdesvn.spec,1.3,1.4
Message-ID: <200512161842.jBGIgoie021971@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21951

Modified Files:
	kdesvn.spec 
Log Message:
FIx typo



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/kdesvn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdesvn.spec	16 Dec 2005 18:29:26 -0000	1.3
+++ kdesvn.spec	16 Dec 2005 18:42:17 -0000	1.4
@@ -52,7 +52,7 @@
 #Fix doc link
 ln -sf ../common $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/en/%{name}
 #Don't conflict with kdebase
-rm $RPM_BUILD_ROOT%{_datadir)/services/svn*.protocol
+rm $RPM_BUILD_ROOT%{_datadir}/services/svn*.protocol
 
 
 %clean



From fedora-extras-commits at redhat.com  Fri Dec 16 21:34:48 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri, 16 Dec 2005 16:34:48 -0500
Subject: rpms/nmh/devel nmh.spec,1.11,1.12
Message-ID: <200512162135.jBGLZIQW027450@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/extras/rpms/nmh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27432

Modified Files:
	nmh.spec 
Log Message:
Add the -fno-builtin-strcasecmp cflag when building.



Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/devel/nmh.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nmh.spec	14 Dec 2005 02:38:00 -0000	1.11
+++ nmh.spec	16 Dec 2005 21:34:46 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        14.fc5
+Release:        15.fc5
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -39,6 +39,7 @@
 
 
 %build
+CFLAGS='-fno-builtin-strcasecmp'
 %configure \
             --sysconfdir=%{_sysconfdir}/nmh \
             --libdir=%{_libdir}/nmh \
@@ -70,6 +71,9 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Fri Dec 16 2005 Josh Bressers  0:1.1-15.fc5
+- Add the -fno-builtin-strcasecmp cflag.
+
 * Tue Dec 13 2005 Josh Bressers  0:1.1-14.fc5
 - Add a patch to prevent multiple calls to context_read from squashing
   settings.



From fedora-extras-commits at redhat.com  Fri Dec 16 22:26:52 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:26:52 -0500
Subject: rpms/xfce4-xkb-plugin - New directory
Message-ID: <200512162226.jBGMQqdM029283@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29274/xfce4-xkb-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-xkb-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 22:26:58 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:26:58 -0500
Subject: rpms/xfce4-xkb-plugin/devel - New directory
Message-ID: <200512162226.jBGMQwnj029299@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29274/xfce4-xkb-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-xkb-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 22:27:18 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:27:18 -0500
Subject: rpms/xfce4-xkb-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512162227.jBGMRIea029334@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29321

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-xkb-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-xkb-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec 16 22:27:24 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:27:24 -0500
Subject: rpms/xfce4-xkb-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512162227.jBGMROZx029355@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29321/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-xkb-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec 16 22:28:29 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:28:29 -0500
Subject: rpms/xfce4-xkb-plugin import.log,1.1,1.2
Message-ID: <200512162228.jBGMSxdF029427@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29391

Modified Files:
	import.log 
Log Message:
auto-import xfce4-xkb-plugin-0.3.2-4.fc4 on branch devel from xfce4-xkb-plugin-0.3.2-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Dec 2005 22:27:16 -0000	1.1
+++ import.log	16 Dec 2005 22:28:27 -0000	1.2
@@ -0,0 +1 @@
+xfce4-xkb-plugin-0_3_2-4_fc4:HEAD:xfce4-xkb-plugin-0.3.2-4.fc4.src.rpm:1134772099



From fedora-extras-commits at redhat.com  Fri Dec 16 22:28:35 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:28:35 -0500
Subject: rpms/xfce4-xkb-plugin/devel xfce4-xkb-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512162229.jBGMT5kw029431@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29391/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-xkb-plugin.spec 
Log Message:
auto-import xfce4-xkb-plugin-0.3.2-4.fc4 on branch devel from xfce4-xkb-plugin-0.3.2-4.fc4.src.rpm


--- NEW FILE xfce4-xkb-plugin.spec ---
Name:		xfce4-xkb-plugin
Version:	0.3.2
Release:	4%{?dist}
Summary:	XKB layout switcher for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
keyboard layout, and refreshes when layout changes. The layout can be 
switched by simply clicking on the plugin. For now the keyboard layouts 
cannot be configured from the plugin itself, they should be set in the 
XF86Config file or some other way (e.g. setxkbmap).

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so
%dir %{_datadir}/xfce4/xkb/
%dir %{_datadir}/xfce4/xkb/flags
%{_datadir}/xfce4/xkb/flags/*.png

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.3.2-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.3.2-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.3.2-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.3.2-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.3.2-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Dec 2005 22:27:22 -0000	1.1
+++ .cvsignore	16 Dec 2005 22:28:33 -0000	1.2
@@ -0,0 +1 @@
+xfce4-xkb-plugin-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Dec 2005 22:27:22 -0000	1.1
+++ sources	16 Dec 2005 22:28:33 -0000	1.2
@@ -0,0 +1 @@
+b233819d685ab3b7f4a47c2da9fb6936  xfce4-xkb-plugin-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 16 22:33:10 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:33:10 -0500
Subject: rpms/xfce4-systemload-plugin - New directory
Message-ID: <200512162233.jBGMXAmh029531@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29522/xfce4-systemload-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-systemload-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 22:33:15 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:33:15 -0500
Subject: rpms/xfce4-systemload-plugin/devel - New directory
Message-ID: <200512162233.jBGMXFws029547@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29522/xfce4-systemload-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-systemload-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 22:33:35 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:33:35 -0500
Subject: rpms/xfce4-systemload-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512162233.jBGMXZPr029584@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29571

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-systemload-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-systemload-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec 16 22:33:41 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:33:41 -0500
Subject: rpms/xfce4-systemload-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512162233.jBGMXfYb029605@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29571/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-systemload-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec 16 22:34:37 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:34:37 -0500
Subject: rpms/xfce4-systemload-plugin import.log,1.1,1.2
Message-ID: <200512162235.jBGMZ7nf029676@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29640

Modified Files:
	import.log 
Log Message:
auto-import xfce4-systemload-plugin-0.3.6-4.fc4 on branch devel from xfce4-systemload-plugin-0.3.6-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Dec 2005 22:33:33 -0000	1.1
+++ import.log	16 Dec 2005 22:34:34 -0000	1.2
@@ -0,0 +1 @@
+xfce4-systemload-plugin-0_3_6-4_fc4:HEAD:xfce4-systemload-plugin-0.3.6-4.fc4.src.rpm:1134772466



From fedora-extras-commits at redhat.com  Fri Dec 16 22:34:42 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:34:42 -0500
Subject: rpms/xfce4-systemload-plugin/devel xfce4-systemload-plugin.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512162235.jBGMZCnW029680@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29640/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-systemload-plugin.spec 
Log Message:
auto-import xfce4-systemload-plugin-0.3.6-4.fc4 on branch devel from xfce4-systemload-plugin-0.3.6-4.fc4.src.rpm


--- NEW FILE xfce4-systemload-plugin.spec ---
Name:		xfce4-systemload-plugin
Version:	0.3.6
Release:	4%{?dist}
Summary:	Systemload monitor for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildRequires:	gettext

%description
A system-load monitor plugin for the Xfce panel. It displays the current CPU 
load, the memory in use, the swap space and the system uptime.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang xfce4-systemload

%clean
rm -rf $RPM_BUILD_ROOT

%files -f xfce4-systemload.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.3.6-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.3.6-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.3.6-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.3.6-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.3.6-1.fc3.cw
- Updated to version 0.3.6.

* Wed Apr 13 2005 Christoph Wickert  - 0.3.4-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Dec 2005 22:33:38 -0000	1.1
+++ .cvsignore	16 Dec 2005 22:34:40 -0000	1.2
@@ -0,0 +1 @@
+xfce4-systemload-plugin-0.3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Dec 2005 22:33:38 -0000	1.1
+++ sources	16 Dec 2005 22:34:40 -0000	1.2
@@ -0,0 +1 @@
+fd73efa3bd7a73e3f5fdf8d4ed848c1f  xfce4-systemload-plugin-0.3.6.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 17 02:12:20 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 21:12:20 -0500
Subject: owners owners.list,1.458,1.459
Message-ID: <200512170212.jBH2CoVs006816@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6793

Modified Files:
	owners.list 
Log Message:
add xfce4-battery-plugin, xfce4-showdesktop-plugin, xfce4-taskbar-plugin, xfce4-notes-plugin, xfce4-modemlights-plugin, xfce4-minicmd-plugin, xfce4-wavelan-plugin, xfce4-clipman-plugin, xfce4-xkb-plugin, xfce4-systemload-plugin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -r1.458 -r1.459
--- owners.list	16 Dec 2005 11:44:28 -0000	1.458
+++ owners.list	17 Dec 2005 02:12:17 -0000	1.459
@@ -1239,19 +1239,29 @@
 Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-appfinder|Appfinder for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-battery-plugin|Battery monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-clipman-plugin|Clipboard manager plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-minicmd-plugin|Mini command-line plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-showdesktop-plugin|Show-Desktop plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-systemload-plugin|Systemload monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-systray|Systray for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-taskbar-plugin|Tasklist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-toys|Small Xfce4 applications|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-trigger-launcher|Trigger launcher for Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-wavelan-plugin|WaveLAN plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-weather-plugin|Weather plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-windowlist-plugin|Windowlist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-xkb-plugin|XKB layout switcher for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xmms-plugin|Control XMMS from the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-plugins|Plugins for multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 17 02:57:11 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 16 Dec 2005 21:57:11 -0500
Subject: rpms/meanwhile/devel .cvsignore, 1.5, 1.6 meanwhile.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200512170257.jBH2vfiA006980@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6946

Modified Files:
	.cvsignore meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Dec 2005 13:40:20 -0000	1.5
+++ .cvsignore	17 Dec 2005 02:57:09 -0000	1.6
@@ -1 +1 @@
-meanwhile-1.0.0.tar.gz
+meanwhile-1.0.1.tar.gz


Index: meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/meanwhile.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- meanwhile.spec	15 Dec 2005 13:40:20 -0000	1.5
+++ meanwhile.spec	17 Dec 2005 02:57:09 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:	Lotus Sametime Community Client library
 License:	LGPL
 Group:		Applications/Internet
-Version:	1.0.0
+Version:	1.0.1
 Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
@@ -77,6 +77,10 @@
 %{_datadir}/doc/%{name}-doc-%{version}/
 
 %changelog
+* Fri Dec 16 2005 - jwboyer at jdub.homelinux.org 1.0.1-1
+- Update to latest release
+- Fixes mpi conflict with mozilla-nss
+
 * Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.0.0-1
 - Update to latest release
 - gmp and gmp-devel are no longer required since meanwhile uses mpi now


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Dec 2005 13:40:20 -0000	1.5
+++ sources	17 Dec 2005 02:57:09 -0000	1.6
@@ -1 +1 @@
-d1b78beabcb0f4255635edf772d63e52  meanwhile-1.0.0.tar.gz
+85587678afdf7bf1f5ea3bdefec093ba  meanwhile-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 17 02:59:00 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 16 Dec 2005 21:59:00 -0500
Subject: rpms/meanwhile/FC-4 .cvsignore, 1.5, 1.6 meanwhile.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200512170259.jBH2xUV4007046@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7024

Modified Files:
	.cvsignore meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Dec 2005 13:42:07 -0000	1.5
+++ .cvsignore	17 Dec 2005 02:58:58 -0000	1.6
@@ -1 +1 @@
-meanwhile-1.0.0.tar.gz
+meanwhile-1.0.1.tar.gz


Index: meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/meanwhile.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- meanwhile.spec	15 Dec 2005 13:42:07 -0000	1.4
+++ meanwhile.spec	17 Dec 2005 02:58:58 -0000	1.5
@@ -6,7 +6,7 @@
 Summary:	Lotus Sametime Community Client library
 License:	LGPL
 Group:		Applications/Internet
-Version:	1.0.0
+Version:	1.0.1
 Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
@@ -77,6 +77,10 @@
 %{_datadir}/doc/%{name}-doc-%{version}/
 
 %changelog
+* Fri Dec 16 2005 - jwboyer at jdub.homelinux.org 1.0.1-1
+- Update to latest release
+- Fixes mpi conflict with mozilla-nss
+
 * Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.0.0-1
 - Update to latest release
 - gmp and gmp-devel are no longer required since meanwhile uses mpi now


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Dec 2005 13:42:07 -0000	1.5
+++ sources	17 Dec 2005 02:58:58 -0000	1.6
@@ -1 +1 @@
-d1b78beabcb0f4255635edf772d63e52  meanwhile-1.0.0.tar.gz
+85587678afdf7bf1f5ea3bdefec093ba  meanwhile-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 17 05:03:40 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 17 Dec 2005 00:03:40 -0500
Subject: owners owners.list,1.459,1.460
Message-ID: <200512170504.jBH54AdA012188@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10578

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -r1.459 -r1.460
--- owners.list	17 Dec 2005 02:12:17 -0000	1.459
+++ owners.list	17 Dec 2005 05:03:29 -0000	1.460
@@ -96,7 +96,6 @@
 Fedora Extras|cgoban|X board for playing go|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
-Fedora Extras|chmlib|Library for dealing with ITSS/CHM format files|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|clamav|End-user tools for the Clam Antivirus scanner|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -158,7 +157,7 @@
 Fedora Extras|drivel|A journal or "blog" client|katzj at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|bescoto at stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|dvdisaster|CD/DVD media data loss/scratch/aging protection|dmitry at butskoy.name|extras-qa at fedoraproject.org|carsten at dvdisaster.de
 Fedora Extras|dxpc|A Differential X Protocol Compressor|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -235,16 +234,17 @@
 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|compton at pcompton.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|galeon|GNOME2 Web browser based on Mozilla|denisleroy at yahoo.com|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|
 Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gcfilms|Movies collections management|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gcl|GNU Common Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gdesklets|Advanced architecture for desktop applets|luya256 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|general|For bugs not specific to any single component.|dkl at redhat.com|extras-qa at fedoraproject.org|
@@ -271,7 +271,7 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 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|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|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|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|
@@ -297,7 +297,7 @@
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-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|gnome-vfsmm26|C++ wrapper for gnome-vfs|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnugo|Text based go program|compton at pcompton.com|extras-qa at fedoraproject.org|
@@ -334,8 +334,8 @@
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -388,7 +388,7 @@
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org|
-Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|inkscape|A vector-based drawing program using SVG|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
@@ -478,15 +478,15 @@
 Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm20|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm24|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm20|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm24|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|libgnomedb|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|libgsf113|GNOME Structured File library 1.13|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libibverbs|A library for direct userspace use of InfiniBand|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libid3tag|ID3 tag manipulation library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -524,7 +524,7 @@
 Fedora Extras|libsexy|Funky fresh graphical widgets for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
-Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++|Typesafe Signal Framework for C++|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org|
@@ -717,7 +717,6 @@
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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|extras-orphan at fedoraproject.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-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
@@ -741,7 +740,6 @@
 Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-DBD-XBase|Perl module for reading and writing the dbf files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-DBSchema|Database-independent schema objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-SearchBuilder|Encapsulate SQL queries and rows in simple perl objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1038,7 +1036,6 @@
 Fedora Extras|R-hdf5|R Interface to the NCSA HDF5 library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|extras-qa at fedoraproject.org|
-Fedora Extras|rlog|Runtime Logging for C++|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|R-mAr|R module to evaluate functions for multivariate AutoRegressive analysis|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|roundup|Simple and flexible issue-tracking system|redhat at flyn.org|extras-qa at fedoraproject.org|
@@ -1136,7 +1133,6 @@
 Fedora Extras|taarich|Display Hebrew date|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
-Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
@@ -1239,29 +1235,19 @@
 Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-appfinder|Appfinder for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-battery-plugin|Battery monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-clipman-plugin|Clipboard manager plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-minicmd-plugin|Mini command-line plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-showdesktop-plugin|Show-Desktop plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-systemload-plugin|Systemload monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-systray|Systray for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-taskbar-plugin|Tasklist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-toys|Small Xfce4 applications|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-trigger-launcher|Trigger launcher for Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-wavelan-plugin|WaveLAN plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-weather-plugin|Weather plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-windowlist-plugin|Windowlist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-xkb-plugin|XKB layout switcher for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xmms-plugin|Control XMMS from the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-plugins|Plugins for multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1308,4 +1294,3 @@
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|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|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
-Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 17 06:10:38 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 17 Dec 2005 01:10:38 -0500
Subject: owners owners.list,1.460,1.461
Message-ID: <200512170611.jBH6B8Mn014060@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14019

Modified Files:
	owners.list 
Log Message:
Restore the broken entries


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -r1.460 -r1.461
--- owners.list	17 Dec 2005 05:03:29 -0000	1.460
+++ owners.list	17 Dec 2005 06:10:35 -0000	1.461
@@ -96,6 +96,7 @@
 Fedora Extras|cgoban|X board for playing go|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
+Fedora Extras|chmlib|Library for dealing with ITSS/CHM format files|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|clamav|End-user tools for the Clam Antivirus scanner|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -157,7 +158,7 @@
 Fedora Extras|drivel|A journal or "blog" client|katzj at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|bescoto at stanford.edu|extras-qa at fedoraproject.org|
+Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|dvdisaster|CD/DVD media data loss/scratch/aging protection|dmitry at butskoy.name|extras-qa at fedoraproject.org|carsten at dvdisaster.de
 Fedora Extras|dxpc|A Differential X Protocol Compressor|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -234,15 +235,15 @@
 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|compton at pcompton.com|extras-qa at fedoraproject.org|
-Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denisleroy at yahoo.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|
 Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gcfilms|Movies collections management|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gcl|GNU Common Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdesklets|Advanced architecture for desktop applets|luya256 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -271,7 +272,7 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 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)|denisleroy at yahoo.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|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|
@@ -297,7 +298,7 @@
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-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|denisleroy at yahoo.com|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|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|compton at pcompton.com|extras-qa at fedoraproject.org|
@@ -334,8 +335,8 @@
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -388,7 +389,7 @@
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org|
-Fedora Extras|inkscape|A vector-based drawing program using SVG|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
@@ -478,15 +479,15 @@
 Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm20|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm24|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm20|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm24|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libgnomedb|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libgsf113|GNOME Structured File library 1.13|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libibverbs|A library for direct userspace use of InfiniBand|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libid3tag|ID3 tag manipulation library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -524,7 +525,7 @@
 Fedora Extras|libsexy|Funky fresh graphical widgets for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
-Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++|Typesafe Signal Framework for C++|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org|
@@ -717,6 +718,7 @@
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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|extras-orphan at fedoraproject.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-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
@@ -740,6 +742,7 @@
 Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-DBD-XBase|Perl module for reading and writing the dbf files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-DBSchema|Database-independent schema objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-SearchBuilder|Encapsulate SQL queries and rows in simple perl objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1036,6 +1039,7 @@
 Fedora Extras|R-hdf5|R Interface to the NCSA HDF5 library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|extras-qa at fedoraproject.org|
+Fedora Extras|rlog|Runtime Logging for C++|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|R-mAr|R module to evaluate functions for multivariate AutoRegressive analysis|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|roundup|Simple and flexible issue-tracking system|redhat at flyn.org|extras-qa at fedoraproject.org|
@@ -1133,6 +1137,7 @@
 Fedora Extras|taarich|Display Hebrew date|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
@@ -1235,19 +1240,29 @@
 Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-appfinder|Appfinder for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-battery-plugin|Battery monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-clipman-plugin|Clipboard manager plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-minicmd-plugin|Mini command-line plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-showdesktop-plugin|Show-Desktop plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-systemload-plugin|Systemload monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-systray|Systray for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-taskbar-plugin|Tasklist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-toys|Small Xfce4 applications|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-trigger-launcher|Trigger launcher for Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-wavelan-plugin|WaveLAN plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-weather-plugin|Weather plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-windowlist-plugin|Windowlist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-xkb-plugin|XKB layout switcher for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xmms-plugin|Control XMMS from the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-plugins|Plugins for multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1294,3 +1309,4 @@
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|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|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
+Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 17 08:21:52 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:21:52 -0500
Subject: rpms/fuse-encfs - New directory
Message-ID: <200512170821.jBH8LqfH017710@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-encfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17701/fuse-encfs

Log Message:
Directory /cvs/extras/rpms/fuse-encfs added to the repository




From fedora-extras-commits at redhat.com  Sat Dec 17 08:21:58 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:21:58 -0500
Subject: rpms/fuse-encfs/devel - New directory
Message-ID: <200512170821.jBH8LwU7017726@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-encfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17701/fuse-encfs/devel

Log Message:
Directory /cvs/extras/rpms/fuse-encfs/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Dec 17 08:22:18 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:22:18 -0500
Subject: rpms/fuse-encfs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512170822.jBH8MIwb017762@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-encfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17748

Added Files:
	Makefile import.log 
Log Message:
Setup of module fuse-encfs


--- NEW FILE Makefile ---
# Top level Makefile for module fuse-encfs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 17 08:22:24 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:22:24 -0500
Subject: rpms/fuse-encfs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512170822.jBH8MOBD017782@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-encfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17748/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fuse-encfs


--- NEW 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 Dec 17 08:23:54 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:23:54 -0500
Subject: rpms/fuse-encfs import.log,1.1,1.2
Message-ID: <200512170824.jBH8OOVT017856@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-encfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17819

Modified Files:
	import.log 
Log Message:
auto-import fuse-encfs-1.2.5-1 on branch devel from fuse-encfs-1.2.5-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse-encfs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Dec 2005 08:22:16 -0000	1.1
+++ import.log	17 Dec 2005 08:23:52 -0000	1.2
@@ -0,0 +1 @@
+fuse-encfs-1_2_5-1:HEAD:fuse-encfs-1.2.5-1.src.rpm:1134807820



From fedora-extras-commits at redhat.com  Sat Dec 17 08:24:00 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:24:00 -0500
Subject: rpms/fuse-encfs/devel fuse-encfs.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512170824.jBH8O0Tu017849@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-encfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17819/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fuse-encfs.spec 
Log Message:
auto-import fuse-encfs-1.2.5-1 on branch devel from fuse-encfs-1.2.5-1.src.rpm


--- NEW FILE fuse-encfs.spec ---
Name: 		fuse-encfs
Version: 	1.2.5
Release: 	1
Summary: 	Encrypted pass-thru filesystem in userspace 	
License: 	GPL
Group: 		System Environment/Kernel
Url: 		http://arg0.net/wiki/encfs
Source: 	http://arg0.net/vgough/download/encfs-%{version}-1.tgz
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: 	rlog-devel >= 1.3
BuildRequires: 	openssl-devel
BuildRequires: 	fuse-devel >= 2.2

%description
EncFS implements an encrypted filesystem in userspace using FUSE.  FUSE
provides a Linux kernel module which allows virtual filesystems to be written
in userspace.  EncFS encrypts all data and filenames in the filesystem and
passes access through to the underlying filesystem.  Similar to CFS except that
it does not use NFS. 

%prep
%setup -q -n encfs-%{version}

%build
%configure --disable-static
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%makeinstall
%{__rm} -f %{buildroot}/%{_libdir}/*.la

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog README
%{_bindir}/*
%{_libdir}/libencfs.so*
%{_datadir}/locale/*/LC_MESSAGES/encfs.mo
%{_mandir}/man1/*

%changelog
* Fri Dec 16 2005 Peter Lemenkov  1.2.5-1
- Initial build for FE
* Fri Nov 11 2005 Valient Gough 
- Release 1.2.5
- Fix race condition when using newer versions of GCC.  Fixes problem reported
  by Chris at x.nu.
- add encfssh script, thanks to David Rosenstrauch
* Fri Aug 26 2005 Valient Gough 
- Release 1.2.4
- fix segfault if small invalid filenames were encountered in the encrypted
  directory, reported by paulgfx.
- try and detect if user tries to mount the filesystem over the top of the
  encrypted directory, problem reported by paulgfx.
- environment variable ENCFS5_CONFIG can be used to override the location of
  the .encfs5 configuration file.
- add encfsctl 'export' command, patch from Janne Hellsten
  
* Tue Apr 19 2005 Valient Gough 
- Release 1.2.1
- add --public mount option
- add --stdinpass option to read password from stdin for scripting
- import latest rosetta translation updates

* Thu Feb 10 2005 Valient Gough 
- Release 1.2.0
- Fix bug with MAC headers and files > 2GB, reported by Damian Frank
- Fix bug with external password interface which could result in problems
  communicating with external password program.  Found by Olivier Dournaux.
- Switch to FUSE 2.2 API -- support for FUSE 1.x has been dropped.
- Add support for inode numbering pass-thru (when used 'use_ino' option to
  fuse).  This allows encoded filesystem to use the same inode numbers as the
  underlying filesystem.

* Wed Jan 12 2005 Valient Gough 
- Release 1.1.11
- add internationalization support.  Thanks to lots of contributors, there are
  translations for serveral languages.
- added workaround for libfuse mount failure with FUSE 1.4
- fix compile failure with FUSE 1.4

* Mon Nov 8 2004 Valient Gough 
- Release 1.1.10
- fix problems with recursive rename
- fix incorrect error codes from xattr functions

* Tue Aug 15 2004 Valient Gough 
- Release 1.1.9
- fix another rename bug (affected filesystems with 'paranoia' configuration)

* Mon Aug 14 2004 Valient Gough 
- Release 1.1.8
- Improve MAC block header processing.

* Sat Aug 12 2004 Valient Gough 
- Release 1.1.7
- fix bug in truncate() for unopened files.

* Mon Aug 9 2004 Valient Gough 
- Release 1.1.6
- fix header IV creation when truncate() used to create files.
- add support for IV chaining to old 0.x filesystem support code (useful for
  systems with old OpenSSL, like RedHat 7.x).

* Tue Jul 22 2004 Valient Gough 
- Release 1.1.5

* Sat Jul 10 2004 Valient Gough 
- Release 1.1.4
- add external password prompt support.

* Thu Jun 24 2004 Valient Gough 
- Release 1.1.3

* Fri May 28 2004 Valient Gough 
- Release 1.1.2
- Fix bug affecting filesystems with small empty directories (like XFS)
- Updates to recursive rename code to undo all changes on failure.
- Fix OpenSSL dependency path inclusion in build.

* Wed May 19 2004 Valient Gough 
- Release 1.1.1
- Fix MAC header memory size allocation error.
- Add file rename-while-open support needed for Evolution.

* Thu May 13 2004 Valient Gough 
- Second release candidate for version 1.1
- Add support for block mode filename encryption.
- Add support for per-file initialization vectors.
- Add support for directory IV chaining for per-directory initialization
  vectors.
- Add support for per-block MAC headers for file contents.
- Backward compatibility support dropped for filesystems created by version
  0.x.  Maintains backward compatible support for versions 1.0.x.

* Sun Apr 4 2004 Valient Gough 
- Release 1.0.5
- Allow truncate call to extend file (only shrinking was supported)

* Fri Mar 26 2004 Valient Gough 
- Release 1.0.4
- Large speed improvement.
- Add support for FUSE major version 2 API.

* Thu Mar 18 2004 Valient Gough 
- Release 1.0.3
- Fix bugs in truncation and padding code.

* Sat Mar 13 2004 Valient Gough 
- Release 1.0.2
- Use pkg-config to check for OpenSSL and RLog build settings
- Add support for '--' argument to encfs to pass arbitrary options to FUSE /
  fusermount.
- Add man pages.

* Tue Mar 2 2004 Valient Gough 
- Release 1.0.1
- Fix problem with using OpenSSL's EVP_BytesToKey function with variable
  key length ciphers like Blowfish, as it would only generate 128 bit keys.
- Some configure script changes to make it possible to use --with-extra-include
  configure option to pick up any necessary directories for OpenSSL.

* Fri Feb 27 2004 Valient Gough 
- Release 1.0
- Added some pre-defined configuration options at startup to make filesystem
  creation a bit more user friendly.

* Mon Feb 23 2004 Valient Gough 
- Merge development branch to mainline.  Source modularized to make it easier
  to support different algorithms.
- Added encfsctl program which can show information about an encrypted
  directory and can change the user password used to store the volume key.
- Added support for AES and BlowFish with user specified keys and block sizes
  (when building with OpenSSL >= 0.9.7).
- Backward compatible with old format, but new filesystems store configuration
  information in a new format which is not readable by old encfs versions.

* Sat Feb 7 2004 Valient Gough 
- Improved performance by fixing cache bug which caused cached data to not be
  used as often as it could have been.  Random seek performance improved by
  600% according to Bonnie++ benchmark.
- Fixed bugs preventing files larger then 2GB.  Limit should now be around
  128GB (untested - I don't have that much drive space).  > 2GB also requires
  recent version of FUSE module (from Feb 6 or later) and an underlying
  filesystem which supports large files.
- Release 0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse-encfs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Dec 2005 08:22:22 -0000	1.1
+++ .cvsignore	17 Dec 2005 08:23:58 -0000	1.2
@@ -0,0 +1 @@
+encfs-1.2.5-1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse-encfs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Dec 2005 08:22:22 -0000	1.1
+++ sources	17 Dec 2005 08:23:58 -0000	1.2
@@ -0,0 +1 @@
+f2d92d1f8e82f72cd0dd4cf9eea736c6  encfs-1.2.5-1.tgz



From fedora-extras-commits at redhat.com  Sat Dec 17 08:28:21 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:28:21 -0500
Subject: owners owners.list,1.461,1.462
Message-ID: <200512170828.jBH8SpXE017923@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17905

Modified Files:
	owners.list 
Log Message:

Added fuse-encfs




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -r1.461 -r1.462
--- owners.list	17 Dec 2005 06:10:35 -0000	1.461
+++ owners.list	17 Dec 2005 08:28:19 -0000	1.462
@@ -223,6 +223,7 @@
 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|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|fwbuilder|Firewall Builder|sgrubb at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 17 08:31:43 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:31:43 -0500
Subject: rpms/fuse-encfs/devel fuse-encfs.spec,1.1,1.2
Message-ID: <200512170832.jBH8WDgJ017954@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-encfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17934

Modified Files:
	fuse-encfs.spec 
Log Message:

Added missing dist-tag. Small cleanup (added space between last changelog 
entry and all others entries).




Index: fuse-encfs.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse-encfs/devel/fuse-encfs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fuse-encfs.spec	17 Dec 2005 08:23:58 -0000	1.1
+++ fuse-encfs.spec	17 Dec 2005 08:31:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		fuse-encfs
 Version: 	1.2.5
-Release: 	1
+Release: 	1%{?dist}
 Summary: 	Encrypted pass-thru filesystem in userspace 	
 License: 	GPL
 Group: 		System Environment/Kernel
@@ -48,6 +48,7 @@
 %changelog
 * Fri Dec 16 2005 Peter Lemenkov  1.2.5-1
 - Initial build for FE
+
 * Fri Nov 11 2005 Valient Gough 
 - Release 1.2.5
 - Fix race condition when using newer versions of GCC.  Fixes problem reported



From fedora-extras-commits at redhat.com  Sat Dec 17 09:24:19 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 17 Dec 2005 04:24:19 -0500
Subject: owners owners.list,1.462,1.463
Message-ID: <200512170924.jBH9OnIs020220@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20202

Modified Files:
	owners.list 
Log Message:
directfb back to thomas at apestaart.org


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -r1.462 -r1.463
--- owners.list	17 Dec 2005 08:28:19 -0000	1.462
+++ owners.list	17 Dec 2005 09:24:17 -0000	1.463
@@ -148,7 +148,7 @@
 Fedora Extras|digikamimageplugins|Plugins for Digikam|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|dillo|Very small and fast GUI web browser|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|diradmin|User control management tool for LDAP directories|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|djvulibre|DjVu viewers, encoders and utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|dkms|Dynamic Kernel Module Support (DKMS) method for installing module RPMS|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|tcallawa at redhat.com,gary_lerhaupt at dell.com
 Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 17 10:16:20 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 17 Dec 2005 05:16:20 -0500
Subject: rpms/scim-skk/FC-4 .cvsignore, 1.4, 1.5 scim-skk.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200512171016.jBHAGo99022011@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21987

Modified Files:
	.cvsignore scim-skk.spec sources 
Log Message:
update to 0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Dec 2005 14:54:50 -0000	1.4
+++ .cvsignore	17 Dec 2005 10:16:18 -0000	1.5
@@ -1 +1 @@
-scim-skk-0.5.0.tar.gz
+scim-skk-0.5.1.tar.gz


Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scim-skk.spec	2 Dec 2005 14:54:50 -0000	1.7
+++ scim-skk.spec	17 Dec 2005 10:16:18 -0000	1.8
@@ -1,5 +1,5 @@
-Name:		scim-skk
-Version:	0.5.0
+Name:	    scim-skk
+Version:	0.5.1
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -50,7 +50,10 @@
 
 
 %changelog
-* Fri Dec 2 2005 Ryo Dairiki  - 0.4.0-1
+* Sat Dec 17 2005 Ryo Dairiki  - 0.5.1-1
+- update to 0.5.1
+
+* Fri Dec 2 2005 Ryo Dairiki  - 0.5.0-1
 - update to 0.5.0
 
 * Tue Nov 1 2005 Ryo Diairki  - 0.4.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Dec 2005 14:54:50 -0000	1.4
+++ sources	17 Dec 2005 10:16:18 -0000	1.5
@@ -1 +1 @@
-37467db3142c5ae980a1bf67c6f422e9  scim-skk-0.5.0.tar.gz
+b2371a62949667f8f2d92b69a65b213d  scim-skk-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 17 10:17:03 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 17 Dec 2005 05:17:03 -0500
Subject: rpms/scim-skk/devel scim-skk.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <200512171017.jBHAHXjg022066@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22017

Modified Files:
	scim-skk.spec sources 
Log Message:
update to 0.5.1



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scim-skk.spec	2 Dec 2005 14:58:20 -0000	1.7
+++ scim-skk.spec	17 Dec 2005 10:17:01 -0000	1.8
@@ -1,5 +1,5 @@
-Name:		scim-skk
-Version:	0.5.0
+Name:	    scim-skk
+Version:	0.5.1
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -50,7 +50,10 @@
 
 
 %changelog
-* Fri Dec 2 2005 Ryo Dairiki  - 0.4.0-1
+* Sat Dec 17 2005 Ryo Dairiki  - 0.5.1-1
+- update to 0.5.1
+
+* Fri Dec 2 2005 Ryo Dairiki  - 0.5.0-1
 - update to 0.5.0
 
 * Tue Nov 1 2005 Ryo Diairki  - 0.4.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Dec 2005 15:12:19 -0000	1.4
+++ sources	17 Dec 2005 10:17:01 -0000	1.5
@@ -1 +1 @@
-37467db3142c5ae980a1bf67c6f422e9  scim-skk-0.5.0.tar.gz
+b2371a62949667f8f2d92b69a65b213d  scim-skk-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 17 10:19:42 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 17 Dec 2005 05:19:42 -0500
Subject: rpms/scim-skk/FC-3 scim-skk.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200512171020.jBHAKCAq022134@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22114

Modified Files:
	scim-skk.spec sources 
Log Message:
update to 0.5.1



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scim-skk.spec	3 Dec 2005 01:02:57 -0000	1.8
+++ scim-skk.spec	17 Dec 2005 10:19:39 -0000	1.9
@@ -1,5 +1,5 @@
-Name:		scim-skk
-Version:	0.5.0
+Name:	    scim-skk
+Version:	0.5.1
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -7,9 +7,10 @@
 License:	GPL
 URL:		http://scim-imengine.sourceforge.jp/
 Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
-Patch0:	gtkComboBox.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:	gtkComboBox.patch
+
 Requires:		scim skkdic
 BuildRequires:	scim-devel
 
@@ -52,7 +53,10 @@
 
 
 %changelog
-* Fri Dec 2 2005 Ryo Dairiki  - 0.4.0-1
+* Sat Dec 17 2005 Ryo Dairiki  - 0.5.1-1
+- update to 0.5.1
+
+* Fri Dec 2 2005 Ryo Dairiki  - 0.5.0-1
 - update to 0.5.0
 - patch for gtk-2.4; There is no gtk_combo_box_get_active_text for gtk-2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Dec 2005 15:15:59 -0000	1.4
+++ sources	17 Dec 2005 10:19:39 -0000	1.5
@@ -1 +1 @@
-37467db3142c5ae980a1bf67c6f422e9  scim-skk-0.5.0.tar.gz
+b2371a62949667f8f2d92b69a65b213d  scim-skk-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 17 10:53:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 17 Dec 2005 05:53:50 -0500
Subject: rpms/perl-Net-IP/devel .cvsignore, 1.6, NONE Makefile, 1.2,
	NONE perl-Net-IP.spec, 1.9, NONE sources, 1.6, NONE
Message-ID: <200512171053.jBHAro2H022491@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Net-IP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22481/devel

Removed Files:
	.cvsignore Makefile perl-Net-IP.spec sources 
Log Message:
Remove devel branch, included in FC5.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-Net-IP.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Dec 17 16:26:25 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 17 Dec 2005 11:26:25 -0500
Subject: owners owners.list,1.463,1.464
Message-ID: <200512171626.jBHGQtWb000723@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv702

Modified Files:
	owners.list 
Log Message:
Changing ownership of perl-Class-ErrorHandler


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -r1.463 -r1.464
--- owners.list	17 Dec 2005 09:24:17 -0000	1.463
+++ owners.list	17 Dec 2005 16:26:23 -0000	1.464
@@ -719,7 +719,7 @@
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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|extras-orphan at fedoraproject.org|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-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



From fedora-extras-commits at redhat.com  Sun Dec 18 01:38:18 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sat, 17 Dec 2005 20:38:18 -0500
Subject: rpms/glibmm24/devel .cvsignore, 1.5, 1.6 glibmm.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200512180138.jBI1cmbO016640@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glibmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16618

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to 2.8.3, fixed g++ 4.1 compile.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Nov 2005 09:16:53 -0000	1.5
+++ .cvsignore	18 Dec 2005 01:38:16 -0000	1.6
@@ -1 +1 @@
-glibmm-2.8.2.tar.bz2
+glibmm-2.8.3.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- glibmm.spec	26 Nov 2005 09:16:53 -0000	1.8
+++ glibmm.spec	18 Dec 2005 01:38:16 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           glibmm24
-Version:        2.8.2
+Version:        2.8.3
 Release:        1
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -76,6 +76,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Sat Dec 17 2005 Denis Leroy  - 2.8.3-1
+- Update to 2.8.3
+
 * Fri Nov 25 2005 Denis Leroy  - 2.8.2-1
 - Update to 2.8.2
 - Disabled static libraries


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Nov 2005 09:16:53 -0000	1.6
+++ sources	18 Dec 2005 01:38:16 -0000	1.7
@@ -1 +1 @@
-063102917d424b420725586efb62491b  glibmm-2.8.2.tar.bz2
+6a915615fb1158a2d761d5777dcd16dc  glibmm-2.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 18 03:00:17 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sat, 17 Dec 2005 22:00:17 -0500
Subject: rpms/inkscape/devel inkscape-0.43-null-conversion.patch, NONE,
	1.1 inkscape-0.43-qualification.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 inkscape.spec, 1.23, 1.24 sources, 1.7,
	1.8 inkscape-0.42-gettext-x86_64.patch, 1.1, NONE
Message-ID: <200512180300.jBI30HuC018583@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/inkscape/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18562

Modified Files:
	.cvsignore inkscape.spec sources 
Added Files:
	inkscape-0.43-null-conversion.patch 
	inkscape-0.43-qualification.patch 
Removed Files:
	inkscape-0.42-gettext-x86_64.patch 
Log Message:
- Update to 0.43
- Added 2 patches to fix g++ 4.1 compilation issues
- Enabled new jabber/loudmouth-based inkboard feature


inkscape-0.43-null-conversion.patch:

--- NEW FILE inkscape-0.43-null-conversion.patch ---
--- src/ui/dialog/align-and-distribute.cpp
+++ src/ui/dialog/align-and-distribute.cpp
@@ -955,7 +955,7 @@
         break;
 
     } // end of switch statement
-    return NULL;
+    return (std::list::iterator)NULL;
 }
 
 AlignAndDistribute::AlignTarget AlignAndDistribute::getAlignTarget()const {

inkscape-0.43-qualification.patch:

--- NEW FILE inkscape-0.43-qualification.patch ---
--- src/dialogs/tiledialog.h
+++ src/dialogs/tiledialog.h
@@ -58,7 +58,7 @@
     /**
      * Respond to selection change
      */
-    void TileDialog::updateSelection();
+    void updateSelection();
 
 
     /**
--- src/extension/internal/ps.h
+++ src/extension/internal/ps.h
@@ -36,10 +36,10 @@
 
 	void print_bpath (SVGOStringStream &os, const NArtBpath *bp);
 
-	void PrintPS::print_fill_style (SVGOStringStream &os, const SPStyle *style, const NRRect *pbox);
-	void PrintPS::print_stroke_style (SVGOStringStream &os, const SPStyle *style);
+	void print_fill_style (SVGOStringStream &os, const SPStyle *style, const NRRect *pbox);
+	void print_stroke_style (SVGOStringStream &os, const SPStyle *style);
 
-	const char* PrintPS::PSFontName (const SPStyle *style);
+	const char* PSFontName (const SPStyle *style);
 
 	unsigned int print_image (FILE *ofp, guchar *px, unsigned int width, unsigned int height, unsigned int rs,
 				       const NRMatrix *transform);
--- src/jabber_whiteboard/pedroxmpp.cpp
+++ src/jabber_whiteboard/pedroxmpp.cpp
@@ -614,7 +614,7 @@
     static void hash(unsigned char *dataIn,
                      unsigned long len, unsigned char *digest);
 
-    static DOMString Md5::hashHex(unsigned char *dataIn, unsigned long len);
+    static DOMString hashHex(unsigned char *dataIn, unsigned long len);
 
     /**
      *  Initialize the context (also zeroizes contents)
--- src/jabber_whiteboard/pedroxmpp.h
+++ src/jabber_whiteboard/pedroxmpp.h
@@ -746,7 +746,7 @@
      *
      */
     virtual std::vector
-          XmppClient::groupChatGetUserList(const DOMString &groupJid);
+          groupChatGetUserList(const DOMString &groupJid);
 
     /**
      *
--- src/libavoid/connector.h
+++ src/libavoid/connector.h
@@ -59,7 +59,7 @@
         bool isInitialised(void);
         void unInitialise(void);
         void setCallback(void (*cb)(void *), void *ptr);
-        void ConnRef::handleInvalid(void);
+        void handleInvalid(void);
         int generatePath(Point p0, Point p1);
         void makePathInvalid(void);
         
--- src/livarot/Path.h
+++ src/livarot/Path.h
@@ -198,7 +198,7 @@
   cut_position*    CurvilignToPosition(int nbCv,double* cvAbs,int &nbCut);
   cut_position    PointToCurvilignPosition(NR::Point const &pos) const;
   //Should this take a cut_position as a param?
-  double           Path::PositionToLength(int piece, double t);
+  double           PositionToLength(int piece, double t);
   
   // caution: not tested on quadratic b-splines, most certainly buggy
   void             ConvertPositionsToMoveTo(int nbPos,cut_position* poss);
--- src/ui/dialog/aboutbox.h
+++ src/ui/dialog/aboutbox.h
@@ -28,7 +28,7 @@
 class AboutBoxChild: public Gtk::Dialog
 {
 public:
-    AboutBoxChild::AboutBoxChild(Gtk::Window& parent, gchar * title)
+    AboutBoxChild(Gtk::Window& parent, gchar * title)
         : Gtk::Dialog(title,parent) {};
 protected:
     virtual void         on_response(int response_id);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Sep 2005 10:46:13 -0000	1.7
+++ .cvsignore	18 Dec 2005 03:00:15 -0000	1.8
@@ -1,2 +1 @@
-inkscape-0.42.2.tar.bz2
-inkscape-0.42.2.tar.bz2.sig
+inkscape-0.43.tar.bz2


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- inkscape.spec	26 Sep 2005 20:22:14 -0000	1.23
+++ inkscape.spec	18 Dec 2005 03:00:15 -0000	1.24
@@ -1,14 +1,15 @@
 Name:           inkscape
-Version:        0.42.2
-Release:        2%{?dist}
+Version:        0.43
+Release:        1%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://inkscape.sourceforge.net/
 Source0:        http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2
-Patch0:         inkscape-0.42-gettext-x86_64.patch
-Patch1:         inkscape-0.42-GC-check.patch
+Patch0:         inkscape-0.42-GC-check.patch
+Patch1:         inkscape-0.43-null-conversion.patch
+Patch2:         inkscape-0.43-qualification.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  atk-devel
@@ -28,6 +29,7 @@
 BuildRequires:  perl-XML-Parser
 BuildRequires:  pkgconfig
 BuildRequires:  python-devel
+BuildRequires:  loudmouth-devel
 Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -51,19 +53,19 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dgettext
-%patch1 -p1 -b .GC-check
+%patch0 -p1 -b .GC-check
+%patch1 -p0 -b .nullconv
+%patch2 -p0 -b .qualif
 
 
 %build
-%configure                     \
---disable-dependency-tracking  \
---with-xinerama                \
---enable-static=no             \
---with-python                  \
---with-inkjar
-#temporarily disabled until I can look into it further
-#--with-gnome-print             \
+%configure		\
+--enable-static=no	\
+--with-python		\
+--with-perl		\
+--with-inkjar		\
+--with-gnome-vfs	\
+--enable-inkboard
 
 make %{?_smp_mflags}
 
@@ -94,7 +96,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README HACKING
+%doc AUTHORS COPYING ChangeLog NEWS README
 %doc %{_mandir}/man1/*
 %{_bindir}/*
 %{_datadir}/%{name}/
@@ -104,6 +106,11 @@
 
 
 %changelog
+* Sat Dec 17 2005 Denis Leroy  - 0.43-1
+- Update to 0.43
+- Added 2 patches to fix g++ 4.1 compilation issues
+- Enabled new jabber/loudmouth-based inkboard feature
+
 * Mon Sep 26 2005 Denis Leroy  - 0.42.2-2
 - rebuilt with newer glibmm
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Sep 2005 10:46:13 -0000	1.7
+++ sources	18 Dec 2005 03:00:15 -0000	1.8
@@ -1,2 +1 @@
-a27172087018e850e92e97e52b5dad08  inkscape-0.42.2.tar.bz2
-40858e2f3f205525929076c9cb3ea075  inkscape-0.42.2.tar.bz2.sig
+97c606182f5e177eef70c1e8a55efc1f  inkscape-0.43.tar.bz2


--- inkscape-0.42-gettext-x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Dec 18 03:16:39 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 17 Dec 2005 22:16:39 -0500
Subject: rpms/qps/devel qps-1.9.11.gcc41.patch,NONE,1.1 qps.spec,1.2,1.3
Message-ID: <200512180317.jBI3HAK9020273@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/qps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20252

Modified Files:
	qps.spec 
Added Files:
	qps-1.9.11.gcc41.patch 
Log Message:
Fix compilation with GCC 4.1 and add COPYING file.


qps-1.9.11.gcc41.patch:

--- NEW FILE qps-1.9.11.gcc41.patch ---
diff -Nurp qps-1.9.11.orig/htable.h qps-1.9.11/htable.h
--- qps-1.9.11.orig/htable.h	2005-11-12 07:32:30.000000000 +0100
+++ qps-1.9.11/htable.h	2005-12-18 03:43:55.000000000 +0100
@@ -76,7 +76,7 @@ class TableBody : public QtTableView
     Q_OBJECT
 public:
     TableBody(HeadedTable *parent = 0);
-    void TableBody::drawGhostCol(int x, int w);
+    void drawGhostCol(int x, int w);
 //DEL	void setProcview(Procview *p) { procview = p ; }
 
 protected slots:
diff -Nurp qps-1.9.11.orig/infobar.h qps-1.9.11/infobar.h
--- qps-1.9.11.orig/infobar.h	2005-05-07 12:51:42.000000000 +0200
+++ qps-1.9.11/infobar.h	2005-12-18 03:44:35.000000000 +0100
@@ -85,7 +85,7 @@ class CpuLabel : public QFrame
 {
     Q_OBJECT
 public:
-    CpuLabel::CpuLabel(QWidget *parent, int cpus);
+    CpuLabel(QWidget *parent, int cpus);
 
     void setValue(int cpu, int field, unsigned long value)
         { values(cpu, field) = value; }
diff -Nurp qps-1.9.11.orig/qps.h qps-1.9.11/qps.h
--- qps-1.9.11.orig/qps.h	2005-11-12 07:32:30.000000000 +0100
+++ qps-1.9.11/qps.h	2005-12-18 03:45:24.000000000 +0100
@@ -34,7 +34,7 @@ class ControlBar : public QFrame
 {
 	Q_OBJECT
 	public:
-		ControlBar::ControlBar(QWidget *parent);
+		ControlBar(QWidget *parent);
 		QPushButton *updateButton() { return b_update; }
 		void setMode(bool treemode);
 	
@@ -60,7 +60,7 @@ class StatusBar : public QStatusBar
 {
 	Q_OBJECT
 	public:
-		StatusBar::StatusBar(QWidget *parent);
+		StatusBar(QWidget *parent);
     		void refresh();
     		void update(int n);
 


Index: qps.spec
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/qps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qps.spec	12 Nov 2005 11:06:54 -0000	1.2
+++ qps.spec	18 Dec 2005 03:16:37 -0000	1.3
@@ -1,13 +1,14 @@
 Name:           qps
 Version:        1.9.11
-Release:        1%{?dist}
+Release:        2.1%{?dist}
 Summary:        Visual process status monitor
 
 Group:          Applications/System
 License:        GPL
 URL:            http://qps.kldp.net/
-Source0:        http://kldp.net/frs/download.php/2930/qps-1.9.11.tar.gz
+Source0:        http://kldp.net/frs/download.php/2935/qps-1.9.11-2.tar.gz
 Source1:        qps.desktop
+Patch0:         qps-1.9.11.gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -46,7 +48,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES
+%doc CHANGES COPYING
 %{_bindir}/qps
 %{_datadir}/applications/*qps.desktop
 %{_datadir}/pixmaps/qps.xpm
@@ -54,6 +56,14 @@
 
 
 %changelog
+* Sun Dec 18 2005 Dawid Gajownik  - 1.9.11-2.1
+- Fix compilation with GCC 4.1
+- Use funny release tag because tarball name contains `-' character
+- Add COPYING file
+
+* Sat Nov 12 2005 Dawid Gajownik  - 1.9.11-2
+- Increase release tag (always do `cvs ci' before `make tag' ;) )
+
 * Sat Nov 12 2005 Dawid Gajownik  - 1.9.11-1
 - Update to 1.9.11.
 



From fedora-extras-commits at redhat.com  Sun Dec 18 03:23:11 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 17 Dec 2005 22:23:11 -0500
Subject: rpms/qps/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200512180323.jBI3NgMn020416@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/qps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20368

Modified Files:
	.cvsignore sources 
Log Message:
New release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Nov 2005 11:06:53 -0000	1.3
+++ .cvsignore	18 Dec 2005 03:23:09 -0000	1.4
@@ -1 +1 @@
-qps-1.9.11.tar.gz
+qps-1.9.11-2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Nov 2005 11:06:54 -0000	1.3
+++ sources	18 Dec 2005 03:23:09 -0000	1.4
@@ -1 +1 @@
-c094cd755ebe5f1c923f5ede5e96affc  qps-1.9.11.tar.gz
+6cfb346a51a8dd8cff62cac754387d93  qps-1.9.11-2.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 18 06:15:37 2005
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Sun, 18 Dec 2005 01:15:37 -0500
Subject: rpms/monotone/devel monotone-0.24-gcc41.patch, NONE,
	1.1 monotone.spec, 1.7, 1.8
Message-ID: <200512180616.jBI6G7P6025687@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25666

Modified Files:
	monotone.spec 
Added Files:
	monotone-0.24-gcc41.patch 
Log Message:
Patched to work with gcc 4.1.

monotone-0.24-gcc41.patch:

--- NEW FILE monotone-0.24-gcc41.patch ---
2005-12-17  Roland McGrath  

	* work.hh (struct file_itemizer): Remove extraneous qualifier on
	visit_file declaration.
	* app_state.hh (class app_state): Remove extraneous qualifier on
	set_restriction declaration.

--- monotone-0.24/app_state.hh
+++ monotone-0.24/app_state.hh
@@ -88,9 +88,9 @@ public:
   void require_working_copy(std::string const & explanation = "");
   void create_working_copy(system_path const & dir);
 
-  void app_state::set_restriction(path_set const & valid_paths, 
-                             std::vector const & paths,
-                             bool respect_ignore = true);
+  void set_restriction(path_set const & valid_paths,
+		       std::vector const & paths,
+		       bool respect_ignore = true);
   bool restriction_includes(file_path const & path);
 
   // Set the branch name.  If you only invoke set_branch, the branch
--- monotone-0.24/work.hh
+++ monotone-0.24/work.hh
@@ -56,7 +56,7 @@ struct file_itemizer : public tree_walke
   path_set & ignored;
   file_itemizer(app_state & a, path_set & k, path_set & u, path_set & i) 
     : app(a), known(k), unknown(u), ignored(i) {}
-  virtual void file_itemizer::visit_file(file_path const & path);
+  virtual void visit_file(file_path const & path);
 };
 
 void 


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- monotone.spec	13 Dec 2005 07:35:07 -0000	1.7
+++ monotone.spec	18 Dec 2005 06:15:35 -0000	1.8
@@ -1,6 +1,6 @@
 Name: monotone
 Version: 0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -12,6 +12,8 @@
 Source2: monotone.sysconfig
 Source3: README.monotone-server
 
+Patch1: monotone-0.24-gcc41.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
@@ -59,6 +61,8 @@
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
 	   --with-bundled-sqlite=%{bundled_sqlite}
@@ -162,6 +166,9 @@
 
 
 %changelog
+* Sat Dec 17 2005 Roland McGrath  - 0.24-2
+- Patched to work with gcc 4.1.
+
 * Sun Dec 11 2005 Roland McGrath  - 0.24-1
 - Updated for 0.24 release.
 



From fedora-extras-commits at redhat.com  Sun Dec 18 09:10:58 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 04:10:58 -0500
Subject: rpms/inkscape/FC-3 .cvsignore, 1.6, 1.7 inkscape.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200512180911.jBI9BZeM031239@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/inkscape/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31215

Modified Files:
	.cvsignore inkscape.spec sources 
Log Message:
Update to 0.43


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jul 2005 13:51:35 -0000	1.6
+++ .cvsignore	18 Dec 2005 09:10:54 -0000	1.7
@@ -1,2 +1 @@
-inkscape-0.42.tar.bz2
-inkscape-0.42.tar.bz2.sig
+inkscape-0.43.tar.bz2


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-3/inkscape.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- inkscape.spec	29 Jul 2005 13:51:35 -0000	1.6
+++ inkscape.spec	18 Dec 2005 09:10:54 -0000	1.7
@@ -1,13 +1,12 @@
 Name:           inkscape
-Version:        0.42
-Release:        2%{?dist}
+Version:        0.43
+Release:        1%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://inkscape.sourceforge.net/
 Source0:        http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2
-Patch0:         inkscape-0.42-gettext-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  atk-devel
@@ -50,7 +49,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dgettext
 
 
 %build
@@ -92,7 +90,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README HACKING
+%doc AUTHORS COPYING ChangeLog NEWS README
 %doc %{_mandir}/man1/*
 %{_bindir}/*
 %{_datadir}/%{name}/
@@ -102,6 +100,10 @@
 
 
 %changelog
+* Sat Dec 17 2005 Denis Leroy  - 0.43-1
+- Update to 0.43
+- Remove obsolete x86_64 patch
+
 * Fri Jul 29 2005 Michael Schwendt  - 0.42-2
 - Extend ngettext/dgettext patch for x86_64 build.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jul 2005 13:51:35 -0000	1.6
+++ sources	18 Dec 2005 09:10:54 -0000	1.7
@@ -1,2 +1 @@
-4af587b942647bf9e27861e2238844c8  inkscape-0.42.tar.bz2
-e0a299ff70044fd9a424961bd3ad8c13  inkscape-0.42.tar.bz2.sig
+97c606182f5e177eef70c1e8a55efc1f  inkscape-0.43.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 18 10:10:52 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sun, 18 Dec 2005 05:10:52 -0500
Subject: rpms/gdesklets/devel gdesklets.spec,1.2,1.3
Message-ID: <200512181011.jBIABNqN004288@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4267

Modified Files:
	gdesklets.spec 
Log Message:

updated spec



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdesklets.spec	14 Dec 2005 09:51:47 -0000	1.2
+++ gdesklets.spec	18 Dec 2005 10:10:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.2
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -18,7 +18,7 @@
 #							    #
 #############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0
+BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0, libXau-devel
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
@@ -99,7 +99,11 @@
 
 
 %changelog
-* Wed Dec 14 2005 Luya Tshimbalanga  - 0.35.2-22
+* Sun Dec 18 2005 Luya Tshimbalanga  - 0.35.2-23.fc5
+- Added libXau on BuildRequires
+
+* Wed Dec 14 2005 Luya Tshimbalanga
+  - 0.35.2-22
 - Added desktop-file-utils for build requirement
 - Clean up
 



From fedora-extras-commits at redhat.com  Sun Dec 18 10:32:13 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sun, 18 Dec 2005 05:32:13 -0500
Subject: rpms/gdesklets/devel gdesklets.spec,1.3,1.4
Message-ID: <200512181032.jBIAWhWQ004452@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4434

Modified Files:
	gdesklets.spec 
Log Message:

spec updated: added libXdmcp-devel to support modular X



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdesklets.spec	18 Dec 2005 10:10:50 -0000	1.3
+++ gdesklets.spec	18 Dec 2005 10:32:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.2
-Release:        23%{?dist}
+Release:        24%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -15,11 +15,13 @@
 #############################################################
 #							    #
 # Starting from 0.35.x, gDesklets no longer requires GConf. #
+# Added some X development package to support modular X     #
 #							    #
 #############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0, libXau-devel
+BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
+BuildRequires: libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -100,7 +102,10 @@
 
 %changelog
 * Sun Dec 18 2005 Luya Tshimbalanga  - 0.35.2-23.fc5
-- Added libXau on BuildRequires
+- Added libXdmcp-devel on BuildRequires
+
+* Sun Dec 18 2005 Luya Tshimbalanga  - 0.35.2-23.fc5
+- Added libXau-devel on BuildRequires
 
 * Wed Dec 14 2005 Luya Tshimbalanga
   - 0.35.2-22



From fedora-extras-commits at redhat.com  Sun Dec 18 16:25:06 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 18 Dec 2005 11:25:06 -0500
Subject: rpms/jpgraph/FC-4 .cvsignore, 1.4, 1.5 jpgraph.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512181625.jBIGPa2v014989@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/jpgraph/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14948/FC-4

Modified Files:
	.cvsignore jpgraph.spec sources 
Log Message:
- version 2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jpgraph/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Aug 2005 10:04:45 -0000	1.4
+++ .cvsignore	18 Dec 2005 16:25:04 -0000	1.5
@@ -1 +1 @@
-jpgraph-1.19.tar.gz
+jpgraph-2.0.tar.gz


Index: jpgraph.spec
===================================================================
RCS file: /cvs/extras/rpms/jpgraph/FC-4/jpgraph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jpgraph.spec	23 Aug 2005 10:04:51 -0000	1.6
+++ jpgraph.spec	18 Dec 2005 16:25:04 -0000	1.7
@@ -1,9 +1,9 @@
 Name:           jpgraph
 Summary:        Object oriented graph drawing class library for PHP
-Version:        1.19
+Version:        2.0
 Release:        1%{?dist}
 
-Source0:        http://members.chello.se/jpgraph/jpgdownloads/jpgraph-1.19.tar.gz
+Source0:        http://members.chello.se/jpgraph/jpgdownloads/jpgraph-2.0.tar.gz
 License:        QPL
 URL:            http://www.aditus.nu/jpgraph/
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 %doc docs/* src/Examples
 
 %changelog
+* Sun Dec 18 2005 Aurelien Bompard  2.0-1
+- version 2.0
+
 * Tue Aug 09 2005 Aurelien Bompard  1.19-1
 - version 1.19
 - fix requires


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jpgraph/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Aug 2005 10:04:51 -0000	1.4
+++ sources	18 Dec 2005 16:25:04 -0000	1.5
@@ -1 +1 @@
-fc364e1b56dea32bdace47411085cd72  jpgraph-1.19.tar.gz
+343c355a5c50cdbae49706cba20083ea  jpgraph-2.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 18 16:25:13 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 18 Dec 2005 11:25:13 -0500
Subject: rpms/jpgraph/devel .cvsignore, 1.4, 1.5 jpgraph.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512181625.jBIGPhDG014994@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/jpgraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14948/devel

Modified Files:
	.cvsignore jpgraph.spec sources 
Log Message:
- version 2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jpgraph/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Aug 2005 10:04:52 -0000	1.4
+++ .cvsignore	18 Dec 2005 16:25:10 -0000	1.5
@@ -1 +1 @@
-jpgraph-1.19.tar.gz
+jpgraph-2.0.tar.gz


Index: jpgraph.spec
===================================================================
RCS file: /cvs/extras/rpms/jpgraph/devel/jpgraph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jpgraph.spec	23 Aug 2005 10:04:52 -0000	1.6
+++ jpgraph.spec	18 Dec 2005 16:25:10 -0000	1.7
@@ -1,9 +1,9 @@
 Name:           jpgraph
 Summary:        Object oriented graph drawing class library for PHP
-Version:        1.19
+Version:        2.0
 Release:        1%{?dist}
 
-Source0:        http://members.chello.se/jpgraph/jpgdownloads/jpgraph-1.19.tar.gz
+Source0:        http://members.chello.se/jpgraph/jpgdownloads/jpgraph-2.0.tar.gz
 License:        QPL
 URL:            http://www.aditus.nu/jpgraph/
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 %doc docs/* src/Examples
 
 %changelog
+* Sun Dec 18 2005 Aurelien Bompard  2.0-1
+- version 2.0
+
 * Tue Aug 09 2005 Aurelien Bompard  1.19-1
 - version 1.19
 - fix requires


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jpgraph/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Aug 2005 10:04:52 -0000	1.4
+++ sources	18 Dec 2005 16:25:10 -0000	1.5
@@ -1 +1 @@
-fc364e1b56dea32bdace47411085cd72  jpgraph-1.19.tar.gz
+343c355a5c50cdbae49706cba20083ea  jpgraph-2.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 18 18:13:41 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:13:41 -0500
Subject: rpms/xmlrpc-c - New directory
Message-ID: <200512181813.jBIIDfbb018561@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/xmlrpc-c

Log Message:
Directory /cvs/extras/rpms/xmlrpc-c added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 18 18:13:46 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:13:46 -0500
Subject: rpms/xmlrpc-c/devel - New directory
Message-ID: <200512181813.jBIIDkMI018577@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/xmlrpc-c/devel

Log Message:
Directory /cvs/extras/rpms/xmlrpc-c/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 18 18:14:08 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:14:08 -0500
Subject: rpms/xmlrpc-c Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512181814.jBIIE8nZ018612@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18599

Added Files:
	Makefile import.log 
Log Message:
Setup of module xmlrpc-c


--- NEW FILE Makefile ---
# Top level Makefile for module xmlrpc-c
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 18 18:14:14 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:14:14 -0500
Subject: rpms/xmlrpc-c/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512181814.jBIIEEsO018631@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18599/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xmlrpc-c


--- NEW 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 Dec 18 18:15:58 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:15:58 -0500
Subject: rpms/xmlrpc-c import.log,1.1,1.2
Message-ID: <200512181816.jBIIGSSQ018720@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18677

Modified Files:
	import.log 
Log Message:
auto-import xmlrpc-c-1.04-1 on branch devel from xmlrpc-c-1.04-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Dec 2005 18:14:06 -0000	1.1
+++ import.log	18 Dec 2005 18:15:56 -0000	1.2
@@ -0,0 +1 @@
+xmlrpc-c-1_04-1:HEAD:xmlrpc-c-1.04-1.src.rpm:1134929746



From fedora-extras-commits at redhat.com  Sun Dec 18 18:16:04 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:16:04 -0500
Subject: rpms/xmlrpc-c/devel xmlrpc-c-1.04-libxml2.patch, NONE,
	1.1 xmlrpc-c-1.04-namespace.patch, NONE, 1.1 xmlrpc-c.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512181816.jBIIG40B018713@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18677/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xmlrpc-c-1.04-libxml2.patch xmlrpc-c-1.04-namespace.patch 
	xmlrpc-c.spec 
Log Message:
auto-import xmlrpc-c-1.04-1 on branch devel from xmlrpc-c-1.04-1.src.rpm

xmlrpc-c-1.04-libxml2.patch:

--- NEW FILE xmlrpc-c-1.04-libxml2.patch ---
--- xmlrpc-c-1.04/src/xmlrpc_libxml2.c.builderr	2005-12-12 10:05:46.000000000 +0100
+++ xmlrpc-c-1.04/src/xmlrpc_libxml2.c	2005-12-12 10:11:57.000000000 +0100
@@ -147,7 +147,7 @@
 **  documentation on each function works.
 */
 
-char *xml_element_name (xml_element *elem)
+char const *xml_element_name (xml_element const * const elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return elem->_name;
@@ -167,13 +167,13 @@
     return XMLRPC_TYPED_MEM_BLOCK_CONTENTS(char, &elem->_cdata);
 }
 
-size_t xml_element_children_size (xml_element *elem)
+size_t xml_element_children_size (xml_element const *elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return XMLRPC_TYPED_MEM_BLOCK_SIZE(xml_element*, &elem->_children);
 }
 
-xml_element **xml_element_children (xml_element *elem)
+xml_element **xml_element_children (xml_element const *elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return XMLRPC_TYPED_MEM_BLOCK_CONTENTS(xml_element*, &elem->_children);
@@ -410,13 +410,13 @@
     XMLRPC_ASSERT(context.root != NULL);
     XMLRPC_ASSERT(context.current == NULL);
 
-    *resultP = context.root;
+    *resultPP = context.root;
 
  cleanup:
     if (parser)
         xmlFreeParserCtxt(parser);
 
-    if (env->fault_occurred) {
+    if (envP->fault_occurred) {
         if (context.root)
             xml_element_free(context.root);
     }

xmlrpc-c-1.04-namespace.patch:

--- NEW FILE xmlrpc-c-1.04-namespace.patch ---
--- xmlrpc-c-1.04/src/cpp/libwww.cpp.namespace	2005-11-10 03:24:26.000000000 +0100
+++ xmlrpc-c-1.04/src/cpp/libwww.cpp	2005-12-15 21:03:48.000000000 +0100
@@ -32,7 +32,7 @@
 using namespace xmlrpc_c;
 
 
-namespace {
+namespace xmlrpc_c {
 
 carriageParm_libwww0::carriageParm_libwww0(
     string const serverUrl
--- xmlrpc-c-1.04/src/cpp/wininet.cpp.namespace	2005-11-10 03:24:26.000000000 +0100
+++ xmlrpc-c-1.04/src/cpp/wininet.cpp	2005-12-15 21:04:01.000000000 +0100
@@ -32,7 +32,7 @@
 using namespace xmlrpc_c;
 
 
-namespace {
+namespace xmlrpc_c {
 
 carriageParm_wininet0::carriageParm_wininet0(
     string const serverUrl


--- NEW FILE xmlrpc-c.spec ---
%global _includedir		%_includedir/%name

%{!?release_func:%global release_func() %1%{?dist}}

Summary:	A lightweight RPC library based on XML and HTTP
Name:		xmlrpc-c
Version:	1.04
Release:	%release_func 1
License:	BSD/PSF -- see COPYING
Group:		System Environment/Libraries
URL:	 	http://xmlrpc-c.sourceforge.net/
Source0:	http://dl.sourceforge.net/sourceforge/xmlrpc-c/%name-%version.tgz
Patch0:		xmlrpc-c-1.04-libxml2.patch
Patch1:		xmlrpc-c-1.04-namespace.patch
BuildRoot:	%_tmppath/%name-%version-%release-root
#BuildRequires:	w3c-libwww-devel
BuildRequires:	curl-devel libxml2-devel

%package devel
Summary:	Development files for xmlrpc-c based programs
Group:		Development/Libraries
Requires:	%name = %version-%release
Requires:	libxml2-devel curl-devel

%package apps
Summary:	Sample XML-RPC applications
Group:		Applications/Internet


%description
XML-RPC is a quick-and-easy way to make procedure calls over the
Internet. It converts the procedure call into XML document, sends it
to a remote server using HTTP, and gets back the response as XML.

This library provides a modular implementation of XML-RPC for C and
C++.


%description devel
Static libraries and header files for writing XML-RPC applications in
C and C++.


%description apps
XML-RPC is a quick-and-easy way to make procedure calls over the
Internet. It converts the procedure call into XML document, sends it
to a remote server using HTTP, and gets back the response as XML.

This package contains some handy XML-RPC demo applications.


%prep
%setup -q
%patch0 -p1 -b .libxml2
%patch1 -p1 -b .namespace

## workaround bugs in the buildsystem
rm -f src/cpp/srcdir transport_config.h

## not needed...
rm doc/{INSTALL,configure_doc}


%build
%configure --enable-libxml2-backend --disable-libwww-client

sed -i -e 's!-L/usr/%_lib\s\s*!!g;
	   s!-L/usr/%_lib"!"!g;
	   s!\(the_\S*rpath=\)\"..*\"!\1!g' xmlrpc-c-config

%__make \
	CFLAGS_COMMON="-DNDEBUG -fno-common $RPM_OPT_FLAGS"	\
	CXXFLAGS_COMMON="-DNDEBUG $RPM_OPT_FLAGS"		\
	#%{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
%__make DESTDIR="$RPM_BUILD_ROOT" install

%__install -d -m0755 $RPM_BUILD_ROOT%_mandir/man1

F=tools/xml-rpc-api2cpp/xml-rpc-api2cpp
./libtool --mode=install %__install -p -m755 $F $RPM_BUILD_ROOT/%_bindir/
%__install -p -m0644 $F.1 $RPM_BUILD_ROOT%_mandir/man1/

for i in $RPM_BUILD_ROOT%_libdir/*.a; do
	test ! -e "${i%%.a}.so" || rm -f $i
done

rm -f $RPM_BUILD_ROOT%_libdir/*.la


%clean
rm -rf $RPM_BUILD_ROOT


%post   -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc doc/*
%_libdir/*.so.*


%files devel
%defattr(-,root,root,-)
%_bindir/xmlrpc-c-config
%_includedir
%_libdir/*.so
%_libdir/*.a


%files apps
%defattr(-,root,root,-)
%doc tools/xmlrpc/xmlrpc.html
%doc tools/xmlrpc_transport/xmlrpc_transport.html
%_mandir/man1/*
%_bindir/xmlrpc
%_bindir/xmlrpc_transport
%_bindir/xml-rpc-api2cpp


%changelog
* Sun Dec 18 2005 Enrico Scholz  - 1.04-1
- added libxml2-devel and openssl-devel Requires: for the -devel
  subpackage
- ship doc/* instead of doc
- initial Fedora Extras package (review 175840)

* Thu Dec 15 2005 Enrico Scholz  - 1.04-0.1
- disabled w3c-libwww because it does not exist anymore in FC5 and
  seems to be unmaintained upstream
- added missing libxml2-devel
- cleaned up list of %%doc files
- fixed gcc4.1 build issues
- removed static libraries when there exists a corresponding dynamic one


* Tue Aug  2 2005 Enrico Scholz  - 1.03.02-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2005 18:14:12 -0000	1.1
+++ .cvsignore	18 Dec 2005 18:16:01 -0000	1.2
@@ -0,0 +1 @@
+xmlrpc-c-1.04.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2005 18:14:12 -0000	1.1
+++ sources	18 Dec 2005 18:16:01 -0000	1.2
@@ -0,0 +1 @@
+fc96628803ca72ebd86527039e4155df  xmlrpc-c-1.04.tgz



From fedora-extras-commits at redhat.com  Sun Dec 18 18:20:09 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:20:09 -0500
Subject: owners owners.list,1.464,1.465
Message-ID: <200512181820.jBIIKdRb018791@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18770

Modified Files:
	owners.list 
Log Message:
added xmlrpc-c


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -r1.464 -r1.465
--- owners.list	17 Dec 2005 16:26:23 -0000	1.464
+++ owners.list	18 Dec 2005 18:20:07 -0000	1.465
@@ -1311,3 +1311,4 @@
 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|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|
+Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP!enrico.scholz at informatik.tu-chemnitz.de!extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Dec 18 18:25:50 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:25:50 -0500
Subject: rpms/xmlrpc-c/FC-4 - New directory
Message-ID: <200512181825.jBIIPooL018819@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18810/FC-4

Log Message:
Directory /cvs/extras/rpms/xmlrpc-c/FC-4 added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 18 18:28:21 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:28:21 -0500
Subject: rpms/xmlrpc-c/FC-4 xmlrpc-c.spec, NONE,
	1.1 xmlrpc-c-1.04-namespace.patch, NONE,
	1.1 xmlrpc-c-1.04-libxml2.patch, NONE, 1.1 sources, NONE,
	1.1 Makefile, NONE, 1.1 .cvsignore, NONE, 1.1
Message-ID: <200512181828.jBIISLQ5018883@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18866/FC-4

Added Files:
	xmlrpc-c.spec xmlrpc-c-1.04-namespace.patch 
	xmlrpc-c-1.04-libxml2.patch sources Makefile .cvsignore 
Log Message:
added FC-4 branch (copied from devel/)



--- NEW FILE xmlrpc-c.spec ---
%global _includedir		%_includedir/%name

%{!?release_func:%global release_func() %1%{?dist}}

Summary:	A lightweight RPC library based on XML and HTTP
Name:		xmlrpc-c
Version:	1.04
Release:	%release_func 1
License:	BSD/PSF -- see COPYING
Group:		System Environment/Libraries
URL:	 	http://xmlrpc-c.sourceforge.net/
Source0:	http://dl.sourceforge.net/sourceforge/xmlrpc-c/%name-%version.tgz
Patch0:		xmlrpc-c-1.04-libxml2.patch
Patch1:		xmlrpc-c-1.04-namespace.patch
BuildRoot:	%_tmppath/%name-%version-%release-root
#BuildRequires:	w3c-libwww-devel
BuildRequires:	curl-devel libxml2-devel

%package devel
Summary:	Development files for xmlrpc-c based programs
Group:		Development/Libraries
Requires:	%name = %version-%release
Requires:	libxml2-devel curl-devel

%package apps
Summary:	Sample XML-RPC applications
Group:		Applications/Internet


%description
XML-RPC is a quick-and-easy way to make procedure calls over the
Internet. It converts the procedure call into XML document, sends it
to a remote server using HTTP, and gets back the response as XML.

This library provides a modular implementation of XML-RPC for C and
C++.


%description devel
Static libraries and header files for writing XML-RPC applications in
C and C++.


%description apps
XML-RPC is a quick-and-easy way to make procedure calls over the
Internet. It converts the procedure call into XML document, sends it
to a remote server using HTTP, and gets back the response as XML.

This package contains some handy XML-RPC demo applications.


%prep
%setup -q
%patch0 -p1 -b .libxml2
%patch1 -p1 -b .namespace

## workaround bugs in the buildsystem
rm -f src/cpp/srcdir transport_config.h

## not needed...
rm doc/{INSTALL,configure_doc}


%build
%configure --enable-libxml2-backend --disable-libwww-client

sed -i -e 's!-L/usr/%_lib\s\s*!!g;
	   s!-L/usr/%_lib"!"!g;
	   s!\(the_\S*rpath=\)\"..*\"!\1!g' xmlrpc-c-config

%__make \
	CFLAGS_COMMON="-DNDEBUG -fno-common $RPM_OPT_FLAGS"	\
	CXXFLAGS_COMMON="-DNDEBUG $RPM_OPT_FLAGS"		\
	#%{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
%__make DESTDIR="$RPM_BUILD_ROOT" install

%__install -d -m0755 $RPM_BUILD_ROOT%_mandir/man1

F=tools/xml-rpc-api2cpp/xml-rpc-api2cpp
./libtool --mode=install %__install -p -m755 $F $RPM_BUILD_ROOT/%_bindir/
%__install -p -m0644 $F.1 $RPM_BUILD_ROOT%_mandir/man1/

for i in $RPM_BUILD_ROOT%_libdir/*.a; do
	test ! -e "${i%%.a}.so" || rm -f $i
done

rm -f $RPM_BUILD_ROOT%_libdir/*.la


%clean
rm -rf $RPM_BUILD_ROOT


%post   -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc doc/*
%_libdir/*.so.*


%files devel
%defattr(-,root,root,-)
%_bindir/xmlrpc-c-config
%_includedir
%_libdir/*.so
%_libdir/*.a


%files apps
%defattr(-,root,root,-)
%doc tools/xmlrpc/xmlrpc.html
%doc tools/xmlrpc_transport/xmlrpc_transport.html
%_mandir/man1/*
%_bindir/xmlrpc
%_bindir/xmlrpc_transport
%_bindir/xml-rpc-api2cpp


%changelog
* Sun Dec 18 2005 Enrico Scholz  - 1.04-1
- added libxml2-devel and openssl-devel Requires: for the -devel
  subpackage
- ship doc/* instead of doc
- initial Fedora Extras package (review 175840)

* Thu Dec 15 2005 Enrico Scholz  - 1.04-0.1
- disabled w3c-libwww because it does not exist anymore in FC5 and
  seems to be unmaintained upstream
- added missing libxml2-devel
- cleaned up list of %%doc files
- fixed gcc4.1 build issues
- removed static libraries when there exists a corresponding dynamic one


* Tue Aug  2 2005 Enrico Scholz  - 1.03.02-1
- Initial build.

xmlrpc-c-1.04-namespace.patch:

--- NEW FILE xmlrpc-c-1.04-namespace.patch ---
--- xmlrpc-c-1.04/src/cpp/libwww.cpp.namespace	2005-11-10 03:24:26.000000000 +0100
+++ xmlrpc-c-1.04/src/cpp/libwww.cpp	2005-12-15 21:03:48.000000000 +0100
@@ -32,7 +32,7 @@
 using namespace xmlrpc_c;
 
 
-namespace {
+namespace xmlrpc_c {
 
 carriageParm_libwww0::carriageParm_libwww0(
     string const serverUrl
--- xmlrpc-c-1.04/src/cpp/wininet.cpp.namespace	2005-11-10 03:24:26.000000000 +0100
+++ xmlrpc-c-1.04/src/cpp/wininet.cpp	2005-12-15 21:04:01.000000000 +0100
@@ -32,7 +32,7 @@
 using namespace xmlrpc_c;
 
 
-namespace {
+namespace xmlrpc_c {
 
 carriageParm_wininet0::carriageParm_wininet0(
     string const serverUrl

xmlrpc-c-1.04-libxml2.patch:

--- NEW FILE xmlrpc-c-1.04-libxml2.patch ---
--- xmlrpc-c-1.04/src/xmlrpc_libxml2.c.builderr	2005-12-12 10:05:46.000000000 +0100
+++ xmlrpc-c-1.04/src/xmlrpc_libxml2.c	2005-12-12 10:11:57.000000000 +0100
@@ -147,7 +147,7 @@
 **  documentation on each function works.
 */
 
-char *xml_element_name (xml_element *elem)
+char const *xml_element_name (xml_element const * const elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return elem->_name;
@@ -167,13 +167,13 @@
     return XMLRPC_TYPED_MEM_BLOCK_CONTENTS(char, &elem->_cdata);
 }
 
-size_t xml_element_children_size (xml_element *elem)
+size_t xml_element_children_size (xml_element const *elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return XMLRPC_TYPED_MEM_BLOCK_SIZE(xml_element*, &elem->_children);
 }
 
-xml_element **xml_element_children (xml_element *elem)
+xml_element **xml_element_children (xml_element const *elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return XMLRPC_TYPED_MEM_BLOCK_CONTENTS(xml_element*, &elem->_children);
@@ -410,13 +410,13 @@
     XMLRPC_ASSERT(context.root != NULL);
     XMLRPC_ASSERT(context.current == NULL);
 
-    *resultP = context.root;
+    *resultPP = context.root;
 
  cleanup:
     if (parser)
         xmlFreeParserCtxt(parser);
 
-    if (env->fault_occurred) {
+    if (envP->fault_occurred) {
         if (context.root)
             xml_element_free(context.root);
     }


--- NEW FILE sources ---
fc96628803ca72ebd86527039e4155df  xmlrpc-c-1.04.tgz


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE .cvsignore ---
xmlrpc-c-*.tgz



From fedora-extras-commits at redhat.com  Sun Dec 18 18:59:18 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:59:18 -0500
Subject: rpms/xmlrpc-c/FC-4 branch,NONE,1.1
Message-ID: <200512181859.jBIIxIP6019145@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19134/FC-4

Added Files:
	branch 
Log Message:
initial checkin



--- NEW FILE branch ---
FC-4



From fedora-extras-commits at redhat.com  Sun Dec 18 19:07:41 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 14:07:41 -0500
Subject: rpms/inkscape/FC-3 inkscape-0.42-gettext-x86_64.patch,1.1,NONE
Message-ID: <200512181907.jBIJ7fW4020892@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/inkscape/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20882

Removed Files:
	inkscape-0.42-gettext-x86_64.patch 
Log Message:
Removed unused patch


--- inkscape-0.42-gettext-x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Dec 18 20:10:53 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 15:10:53 -0500
Subject: rpms/gcdmaster/devel - New directory
Message-ID: <200512182010.jBIKArkX022778@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22754/gcdmaster/devel

Log Message:
Directory /cvs/extras/rpms/gcdmaster/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 18 20:10:53 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 15:10:53 -0500
Subject: rpms/gcdmaster - New directory
Message-ID: <200512182010.jBIKArrU022782@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22754/gcdmaster

Log Message:
Directory /cvs/extras/rpms/gcdmaster added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 18 20:11:39 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 15:11:39 -0500
Subject: rpms/gcdmaster Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512182011.jBIKBdMG022836@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22815

Added Files:
	Makefile import.log 
Log Message:
Setup of module gcdmaster


--- NEW FILE Makefile ---
# Top level Makefile for module gcdmaster
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 18 20:11:56 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 15:11:56 -0500
Subject: rpms/gcdmaster/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512182011.jBIKBu8J022861@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22815/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gcdmaster


--- NEW 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 Dec 18 20:12:49 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 15:12:49 -0500
Subject: rpms/gcdmaster import.log,1.1,1.2
Message-ID: <200512182013.jBIKDJs2022960@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22905

Modified Files:
	import.log 
Log Message:
auto-import gcdmaster-1.2.1-3 on branch devel from gcdmaster-1.2.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Dec 2005 20:11:37 -0000	1.1
+++ import.log	18 Dec 2005 20:12:47 -0000	1.2
@@ -0,0 +1 @@
+gcdmaster-1_2_1-3:HEAD:gcdmaster-1.2.1-3.src.rpm:1134936764



From fedora-extras-commits at redhat.com  Sun Dec 18 20:12:54 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 18 Dec 2005 15:12:54 -0500
Subject: rpms/tinyerp/FC-4 tinyerp-server.logrotate, NONE, 1.1 tinyerp-server,
	1.1, 1.2 tinyerp.spec, 1.10, 1.11
Message-ID: <200512182013.jBIKDO3L022964@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22840

Modified Files:
	tinyerp-server tinyerp.spec 
Added Files:
	tinyerp-server.logrotate 
Log Message:
 - reverted shell change
 - improved startup script, suggested by Enrico Scholz
 - added log rotation



--- NEW FILE tinyerp-server.logrotate ---
/var/log/tinyerp/*.log {
    copytruncate
    missingok
    notifempty
}


Index: tinyerp-server
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-server	20 Nov 2005 18:40:53 -0000	1.1
+++ tinyerp-server	18 Dec 2005 20:12:51 -0000	1.2
@@ -29,38 +29,22 @@
 RETVAL=0
 
 start() {
-    # create temporary startup script to get pid of the server process
-    cat > /tmp/tinyerp-server.run << EOF
-/usr/bin/tinyerp-server $OPTS >> /var/log/tinyerp/tinyerp-server.log 2>&1 &
-echo \$! > /tmp/tinyerp-server.pid
-EOF
-    chmod 0755 /tmp/tinyerp-server.run
-    
     echo -n $"Starting $prog: "
-    su -l tinyerp -c "/tmp/tinyerp-server.run"
+    daemon --user tinyerp --check tinyerp-server "/usr/bin/setsid /usr/bin/tinyerp-server $OPTS &"
+
     RETVAL=$?
-    
-    if [ $RETVAL -eq 0 ]; then
-        mv /tmp/tinyerp-server.pid /var/run
-	
-        touch /var/lock/subsys/tinyerp-server
-        echo_success
-        echo
-    else
-	echo_failure
-	echo
-    fi
-    rm -f /tmp/tinyerp-server.run
+    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tinyerp-server
+    echo
     return $RETVAL
 }
 
 stop() {
     echo -n  $"Stopping $prog: "
-    kill -TERM `cat /var/run/tinyerp-server.pid` > /dev/null 2>&1
+    kill -TERM `cat /var/spool/tinyerp/tinyerp-server.pid` > /dev/null 2>&1
     RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
     	rm -f /var/lock/subsys/tinyerp-server
-    	rm -f /var/run/tinyerp-server.pid
+    	rm -f /var/spool/tinyerp/tinyerp-server.pid
 
 	echo_success
 	echo 


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tinyerp.spec	14 Dec 2005 14:26:17 -0000	1.10
+++ tinyerp.spec	18 Dec 2005 20:12:51 -0000	1.11
@@ -13,6 +13,7 @@
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
+Source5:	tinyerp-server.logrotate
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
@@ -79,6 +80,7 @@
 
 install -m 644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tinyerp-server.conf
 install -m 755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/tinyerp-server
+install -m 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tinyerp-server
 mkdir -p $RPM_BUILD_ROOT/var/log/tinyerp
 mkdir -p $RPM_BUILD_ROOT/var/spool/tinyerp
 
@@ -100,6 +102,7 @@
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
 %config(noreplace) %{_sysconfdir}/tinyerp-server.conf
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
+%{_sysconfdir}/logrotate.d/tinyerp-server
 %{_bindir}/tinyerp-server
 %{python_sitelib}/tinyerp-server/   
 %{_defaultdocdir}/%{name}-server-%{version}/
@@ -107,7 +110,7 @@
 
 %pre server
 /usr/sbin/fedora-groupadd 13 -r tinyerp &>/dev/null || :
-/usr/sbin/fedora-useradd 13 -r -s /bin/bash -d /var/spool/tinyerp -M \
+/usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
 exit 0
@@ -131,9 +134,10 @@
 
 
 %changelog
-* Wed Dec 14 2005 Dan Horak  3.1.1-5
+* Sun Dec 18 2005 Dan Horak  3.1.1-5
 - added Requires(postun) to the -server package (Ville Skytt??)
-- tinyerp user requires a real shell
+- improved startup script, suggested by Enrico Scholz
+- added log rotation
 
 * Sun Dec 11 2005 Dan Horak  3.1.1-4
 - moved Requires(pre) to the -server package (Ville Skytt??)



From fedora-extras-commits at redhat.com  Sun Dec 18 20:12:54 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 15:12:54 -0500
Subject: rpms/gcdmaster/devel gcdmaster.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512182013.jBIKDP87022968@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22905/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gcdmaster.spec 
Log Message:
auto-import gcdmaster-1.2.1-3 on branch devel from gcdmaster-1.2.1-3.src.rpm


--- NEW FILE gcdmaster.spec ---
Name:		gcdmaster
Version:	1.2.1
Release:        3%{?dist}
Summary:	A Gnome2 Disk-At-Once (DAO) Audio CD writer

Group:		Applications/Multimedia
License:	GPL
URL:            http://cdrdao.sourceforge.net/
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:	http://easynews.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.bz2
Requires:       cdrdao
BuildRequires:	gtkmm24-devel
BuildRequires:	libgnomeuimm26-devel
BuildRequires:  libsigc++20-devel
BuildRequires:  libvorbis-devel >= 1.0
BuildRequires:  desktop-file-utils
BuildRequires:  cdrecord-devel
BuildRequires:  libao-devel
Requires(post):   shared-mime-info desktop-file-utils
Requires(postun): shared-mime-info desktop-file-utils

%description
Gcdmaster is a GNOME2 GUI front-end to cdrdao that makes it easy to
visualize and manipulate audio information before burning it onto
CD. Its features include: cut/copy/paste of sound samples, track marks
edition and silence insertion.


%prep
%setup -q -n cdrdao-%{version}


%build
%configure --with-scglib=sys %{!?_with_mp3: --without-mp3-support}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
rm -f $RPM_BUILD_ROOT%{_bindir}/cdrdao
rm -f $RPM_BUILD_ROOT%{_bindir}/*toc*
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/cdrdao*
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/cue2toc*
rm -fr $RPM_BUILD_ROOT%{_datadir}/cdrdao 
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

desktop-file-install \
  --vendor fedora \
  --mode 644 \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --delete-original \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :


%postun
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING CREDITS ChangeLog README README.PlexDAE
%{_bindir}/gcdmaster
%{_datadir}/gcdmaster
%{_datadir}/applications/*.desktop
%{_datadir}/mime-info/gcdmaster*
%{_datadir}/mime/packages/gcdmaster.xml
%{_datadir}/application-registry/gcdmaster.applications
%{_datadir}/pixmaps/*
%{_mandir}/man1/gcdmaster*

%changelog
* Sat Dec 17 2005 Denis Leroy  - 1.2.1-3
- Added user macro to enable mp3 support

* Sat Dec 17 2005 Denis Leroy  - 1.2.1-2
- Removed unneeded doc entries
- Leave mp3 support in auto-detection

* Sat Nov 26 2005 Denis Leroy  - 1.2.1-1
- Initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2005 20:11:53 -0000	1.1
+++ .cvsignore	18 Dec 2005 20:12:52 -0000	1.2
@@ -0,0 +1 @@
+cdrdao-1.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2005 20:11:53 -0000	1.1
+++ sources	18 Dec 2005 20:12:52 -0000	1.2
@@ -0,0 +1 @@
+f93f3e68ec5b53ec1a776df73a1def60  cdrdao-1.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 18 20:14:39 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 18 Dec 2005 15:14:39 -0500
Subject: rpms/tinyerp/FC-4 tinyerp-server.patch,1.2,1.3
Message-ID: <200512182015.jBIKF9J5023024@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23000

Modified Files:
	tinyerp-server.patch 
Log Message:
 - new server patch with improved startup script


tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-server.patch	28 Nov 2005 14:43:00 -0000	1.2
+++ tinyerp-server.patch	18 Dec 2005 20:14:37 -0000	1.3
@@ -11,7 +11,7 @@
  Maintainer: Tiny.be
 diff -Nru tinyerp-server-3.1.1.orig/setup.py tinyerp-server-3.1.1/setup.py
 --- tinyerp-server-3.1.1.orig/setup.py	2005-09-18 16:16:19.000000000 +0200
-+++ tinyerp-server-3.1.1/setup.py	2005-11-28 15:30:50.000000000 +0100
++++ tinyerp-server-3.1.1/setup.py	2005-12-18 20:51:56.000000000 +0100
 @@ -21,7 +21,7 @@
  opj = os.path.join
  
@@ -33,3 +33,14 @@
                glob.glob('doc/i18n/*')),
               (opj('lib', 'python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'addons', 'custom'),
                glob.glob('bin/addons/custom/*xml') + 
+@@ -104,8 +104,9 @@
+ # create startup script
+ start_script = \
+ "#!/bin/sh\n\
++echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\
+ cd %s/lib/python%s/site-packages/tinyerp-server\n\
+-exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable)
++exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable)
+ # write script
+ f = open('tinyerp-server', 'w')
+ f.write(start_script)



From fedora-extras-commits at redhat.com  Sun Dec 18 20:19:14 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 18 Dec 2005 15:19:14 -0500
Subject: rpms/tinyerp/FC-3 tinyerp-server.logrotate, NONE, 1.1 tinyerp-server,
	1.1, 1.2 tinyerp-server.patch, 1.2, 1.3 tinyerp.spec, 1.8, 1.9
Message-ID: <200512182019.jBIKJjb1023125@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23099

Modified Files:
	tinyerp-server tinyerp-server.patch tinyerp.spec 
Added Files:
	tinyerp-server.logrotate 
Log Message:
 - reverted shell change
 - improved init.d script, suggested by Enrico Scholz
 - added log rotation
 - new server patch with improved startup script



--- NEW FILE tinyerp-server.logrotate ---
/var/log/tinyerp/*.log {
    copytruncate
    missingok
    notifempty
}


Index: tinyerp-server
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-server	27 Nov 2005 09:26:58 -0000	1.1
+++ tinyerp-server	18 Dec 2005 20:19:12 -0000	1.2
@@ -29,38 +29,22 @@
 RETVAL=0
 
 start() {
-    # create temporary startup script to get pid of the server process
-    cat > /tmp/tinyerp-server.run << EOF
-/usr/bin/tinyerp-server $OPTS >> /var/log/tinyerp/tinyerp-server.log 2>&1 &
-echo \$! > /tmp/tinyerp-server.pid
-EOF
-    chmod 0755 /tmp/tinyerp-server.run
-    
     echo -n $"Starting $prog: "
-    su -l tinyerp -c "/tmp/tinyerp-server.run"
+    daemon --user tinyerp --check tinyerp-server "/usr/bin/setsid /usr/bin/tinyerp-server $OPTS &"
+
     RETVAL=$?
-    
-    if [ $RETVAL -eq 0 ]; then
-        mv /tmp/tinyerp-server.pid /var/run
-	
-        touch /var/lock/subsys/tinyerp-server
-        echo_success
-        echo
-    else
-	echo_failure
-	echo
-    fi
-    rm -f /tmp/tinyerp-server.run
+    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tinyerp-server
+    echo
     return $RETVAL
 }
 
 stop() {
     echo -n  $"Stopping $prog: "
-    kill -TERM `cat /var/run/tinyerp-server.pid` > /dev/null 2>&1
+    kill -TERM `cat /var/spool/tinyerp/tinyerp-server.pid` > /dev/null 2>&1
     RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
     	rm -f /var/lock/subsys/tinyerp-server
-    	rm -f /var/run/tinyerp-server.pid
+    	rm -f /var/spool/tinyerp/tinyerp-server.pid
 
 	echo_success
 	echo 

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-server.patch	28 Nov 2005 14:40:32 -0000	1.2
+++ tinyerp-server.patch	18 Dec 2005 20:19:12 -0000	1.3
@@ -11,7 +11,7 @@
  Maintainer: Tiny.be
 diff -Nru tinyerp-server-3.1.1.orig/setup.py tinyerp-server-3.1.1/setup.py
 --- tinyerp-server-3.1.1.orig/setup.py	2005-09-18 16:16:19.000000000 +0200
-+++ tinyerp-server-3.1.1/setup.py	2005-11-28 15:30:50.000000000 +0100
++++ tinyerp-server-3.1.1/setup.py	2005-12-18 20:51:56.000000000 +0100
 @@ -21,7 +21,7 @@
  opj = os.path.join
  
@@ -33,3 +33,14 @@
                glob.glob('doc/i18n/*')),
               (opj('lib', 'python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'addons', 'custom'),
                glob.glob('bin/addons/custom/*xml') + 
+@@ -104,8 +104,9 @@
+ # create startup script
+ start_script = \
+ "#!/bin/sh\n\
++echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\
+ cd %s/lib/python%s/site-packages/tinyerp-server\n\
+-exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable)
++exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable)
+ # write script
+ f = open('tinyerp-server', 'w')
+ f.write(start_script)


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tinyerp.spec	14 Dec 2005 14:24:27 -0000	1.8
+++ tinyerp.spec	18 Dec 2005 20:19:12 -0000	1.9
@@ -13,6 +13,7 @@
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
+Source5:	tinyerp-server.logrotate
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
@@ -79,6 +80,7 @@
 
 install -m 644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tinyerp-server.conf
 install -m 755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/tinyerp-server
+install -m 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tinyerp-server
 mkdir -p $RPM_BUILD_ROOT/var/log/tinyerp
 mkdir -p $RPM_BUILD_ROOT/var/spool/tinyerp
 
@@ -100,6 +102,7 @@
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
 %config(noreplace) %{_sysconfdir}/tinyerp-server.conf
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
+%{_sysconfdir}/logrotate.d/tinyerp-server
 %{_bindir}/tinyerp-server
 %{python_sitelib}/tinyerp-server/   
 %{_defaultdocdir}/%{name}-server-%{version}/
@@ -107,7 +110,7 @@
 
 %pre server
 /usr/sbin/fedora-groupadd 13 -r tinyerp &>/dev/null || :
-/usr/sbin/fedora-useradd 13 -r -s /bin/bash -d /var/spool/tinyerp -M \
+/usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
 exit 0
@@ -131,9 +134,10 @@
 
 
 %changelog
-* Wed Dec 14 2005 Dan Horak  3.1.1-5
+* Sun Dec 18 2005 Dan Horak  3.1.1-5
 - added Requires(postun) to the -server package (Ville Skytt??)
-- tinyerp user requires a real shell
+- improved startup script, suggested by Enrico Scholz
+- added log rotation
 
 * Sun Dec 11 2005 Dan Horak  3.1.1-4
 - moved Requires(pre) to the -server package (Ville Skytt??)



From fedora-extras-commits at redhat.com  Sun Dec 18 20:26:50 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 15:26:50 -0500
Subject: owners owners.list,1.465,1.466
Message-ID: <200512182027.jBIKRKM4023265@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23247

Modified Files:
	owners.list 
Log Message:
Imported gcdmaster


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -r1.465 -r1.466
--- owners.list	18 Dec 2005 18:20:07 -0000	1.465
+++ owners.list	18 Dec 2005 20:26:48 -0000	1.466
@@ -240,6 +240,7 @@
 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|
 Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gcfilms|Movies collections management|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gcl|GNU Common Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Dec 18 20:37:18 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 18 Dec 2005 15:37:18 -0500
Subject: rpms/cvsgraph/devel cvsgraph-1.6.0-config.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 cvsgraph.spec, 1.9, 1.10 sources, 1.5,
	1.6 cvsgraph-config.patch, 1.2, NONE
Message-ID: <200512182037.jBIKbmSl023335@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cvsgraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23310

Modified Files:
	.cvsignore cvsgraph.spec sources 
Added Files:
	cvsgraph-1.6.0-config.patch 
Removed Files:
	cvsgraph-config.patch 
Log Message:
* Sun Dec 18 2005 Ville Skytt??  - 1.6.0-1
- 1.6.0.


cvsgraph-1.6.0-config.patch:

--- NEW FILE cvsgraph-1.6.0-config.patch ---
--- cvsgraph.conf.orig	2005-12-18 03:07:47.000000000 +0200
+++ cvsgraph.conf	2005-12-18 22:30:41.000000000 +0200
@@ -124,8 +124,8 @@
 #	CVS/RCS repository can be found
 # cvsmodule 
 #
-cvsroot		= "/home/bertho/tmp/cvstest";
-cvsmodule	= "ttt";
+cvsroot		= "/var/cvs";
+cvsmodule	= "";
 
 # color_bg 
 #	The background color of the image
@@ -175,7 +175,7 @@
 #	Sets the error/warning message font
 msg_color	= "#800000";
 msg_font	= medium;
-msg_ttfont	= "/dos/windows/fonts/ariali.ttf";
+msg_ttfont	= "/usr/share/fonts/bitstream-vera/VeraIt.ttf";
 msg_ttsize	= 11.0;
 
 # parse_logs 
@@ -206,7 +206,7 @@
 #	tags will be shown.
 #	Note: tags matched with merge_from/merge_to will still be displayed.
 tag_font	= medium;
-tag_ttfont	= "/dos/windows/fonts/ariali.ttf";
+tag_ttfont	= "/usr/share/fonts/bitstream-vera/VeraIt.ttf";
 tag_ttsize	= 11.0;
 tag_color	= "#007000";
 #tag_ignore	= "(test|alpha)_release";
@@ -245,7 +245,7 @@
 #
 #rev_hidenumber = false;
 rev_font	= giant;
-rev_ttfont	= "/dos/windows/fonts/arial.ttf";
+rev_ttfont	= "/usr/share/fonts/bitstream-vera/Vera.ttf";
 rev_ttsize	= 12.0;
 rev_idtext	= [ "state" == "dead" "(Dead %R)" "%R" ];
 #rev_color	= "#000000";
@@ -262,7 +262,7 @@
 #rev_text	= "%d";	# or "%d\n%a, %s" for author and state too
 rev_text	= [ "state" == "dead" "Died %d\nMaybe alive in other branch" "%d" ];
 rev_text_font	= tiny;
-rev_text_ttfont	= "/dos/windows/fonts/times.ttf";
+rev_text_ttfont	= "/usr/share/fonts/bitstream-vera/VeraSe.ttf";
 rev_text_ttsize	= 9.0;
 rev_text_color	= "#500020";
 rev_maxtags	= 25;
@@ -373,11 +373,11 @@
 #	tag. This option you would normally want to set from the
 #	command line with the -O option.
 branch_font	= medium;
-branch_ttfont	= "/dos/windows/fonts/arialbd.ttf";
+branch_ttfont	= "/usr/share/fonts/bitstream-vera/VeraBd.ttf";
 branch_ttsize	= 18.0;
 branch_tag_color= "#000080";
 branch_tag_font	= medium;
-branch_tag_ttfont = "/dos/windows/fonts/arialbi.ttf";
+branch_tag_ttfont = "/usr/share/fonts/bitstream-vera/VeraBI.ttf";
 branch_tag_ttsize = 14.0;
 branch_color	= "#0000c0";
 branch_bgcolor	= "#ffffc0";
@@ -408,7 +408,7 @@
 title_x		= 10;
 title_y		= 5;
 title_font	= small;
-title_ttfont	= "/dos/windows/fonts/times.ttf";
+title_ttfont	= "/usr/share/fonts/bitstream-vera/VeraSe.ttf";
 title_ttsize	= 10.0;
 title_align	= left;
 title_color	= "#800000";


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cvsgraph/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Aug 2005 16:24:05 -0000	1.5
+++ .cvsignore	18 Dec 2005 20:37:16 -0000	1.6
@@ -1 +1 @@
-cvsgraph-1.5.2.tar.gz
+cvsgraph-1.6.0.tar.gz


Index: cvsgraph.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsgraph/devel/cvsgraph.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cvsgraph.spec	30 Aug 2005 16:24:05 -0000	1.9
+++ cvsgraph.spec	18 Dec 2005 20:37:16 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           cvsgraph
-Version:        1.5.2
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        CVS/RCS repository grapher
 
@@ -8,7 +8,7 @@
 URL:            http://www.akhphd.au.dk/~bertho/cvsgraph/
 Source0:        http://www.akhphd.au.dk/~bertho/cvsgraph/release/%{name}-%{version}.tar.gz
 Source1:        %{name}-httpd.conf
-Patch0:         %{name}-config.patch
+Patch0:         %{name}-1.6.0-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gd-devel
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Sun Dec 18 2005 Ville Skytt??  - 1.6.0-1
+- 1.6.0.
+
 * Tue Aug 30 2005 Ville Skytt??  - 1.5.2-1
 - 1.5.2.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cvsgraph/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Aug 2005 16:24:05 -0000	1.5
+++ sources	18 Dec 2005 20:37:16 -0000	1.6
@@ -1 +1 @@
-095a779d7977ae0c12f456ed119af6f6  cvsgraph-1.5.2.tar.gz
+d8919dc9617ab4cf8bf658b7fbd1df0e  cvsgraph-1.6.0.tar.gz


--- cvsgraph-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Dec 18 21:53:49 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 18 Dec 2005 16:53:49 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.4, 1.5 rxvt-unicode.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512182154.jBILsJ9j025268@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-serv25208/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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Oct 2005 21:53:19 -0000	1.4
+++ .cvsignore	18 Dec 2005 21:53:46 -0000	1.5
@@ -1 +1 @@
-rxvt-unicode-5.8.tar.bz2
+rxvt-unicode-5.9.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rxvt-unicode.spec	25 Oct 2005 21:53:19 -0000	1.6
+++ rxvt-unicode.spec	18 Dec 2005 21:53:46 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        5.8
+Version:        5.9
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sun Dec 18 2005 Andreas Bierfert 
+5.9-1
+- version upgrade
+
 * Tue Oct 25 2005 Andreas Bierfert 
 5.8-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Oct 2005 21:53:19 -0000	1.4
+++ sources	18 Dec 2005 21:53:46 -0000	1.5
@@ -1 +1 @@
-cb650f9f5c195f01da0834d0bc9f6ade  rxvt-unicode-5.8.tar.bz2
+c160e8199d71324d789657c6d1092a4e  rxvt-unicode-5.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 18 21:53:54 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 18 Dec 2005 16:53:54 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.4, 1.5 rxvt-unicode.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512182154.jBILsOsd025273@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-serv25208/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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Oct 2005 21:53:20 -0000	1.4
+++ .cvsignore	18 Dec 2005 21:53:52 -0000	1.5
@@ -1 +1 @@
-rxvt-unicode-5.8.tar.bz2
+rxvt-unicode-5.9.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rxvt-unicode.spec	25 Oct 2005 21:53:20 -0000	1.6
+++ rxvt-unicode.spec	18 Dec 2005 21:53:52 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        5.8
+Version:        5.9
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sun Dec 18 2005 Andreas Bierfert 
+5.9-1
+- version upgrade
+
 * Tue Oct 25 2005 Andreas Bierfert 
 5.8-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Oct 2005 21:53:20 -0000	1.4
+++ sources	18 Dec 2005 21:53:52 -0000	1.5
@@ -1 +1 @@
-cb650f9f5c195f01da0834d0bc9f6ade  rxvt-unicode-5.8.tar.bz2
+c160e8199d71324d789657c6d1092a4e  rxvt-unicode-5.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 18 21:54:00 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 18 Dec 2005 16:54:00 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.4, 1.5 rxvt-unicode.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <200512182154.jBILsUcj025278@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25208/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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Oct 2005 21:53:20 -0000	1.4
+++ .cvsignore	18 Dec 2005 21:53:58 -0000	1.5
@@ -1 +1 @@
-rxvt-unicode-5.8.tar.bz2
+rxvt-unicode-5.9.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rxvt-unicode.spec	28 Nov 2005 21:45:52 -0000	1.9
+++ rxvt-unicode.spec	18 Dec 2005 21:53:58 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
-Version:        5.8
-Release:        2%{?dist}
+Version:        5.9
+Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -70,6 +70,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sun Dec 18 2005 Andreas Bierfert 
+5.9-1
+- version upgrade
+
 * Fri Nov 25 2005 Andreas Bierfert 
 5.8-2
 - modular xorg integration


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Oct 2005 21:53:20 -0000	1.4
+++ sources	18 Dec 2005 21:53:58 -0000	1.5
@@ -1 +1 @@
-cb650f9f5c195f01da0834d0bc9f6ade  rxvt-unicode-5.8.tar.bz2
+c160e8199d71324d789657c6d1092a4e  rxvt-unicode-5.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 18 22:47:41 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Sun, 18 Dec 2005 17:47:41 -0500
Subject: rpms/ghdl/devel .cvsignore, 1.3, 1.4 ghdl.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200512182248.jBIMmCPV027152@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27130

Modified Files:
	.cvsignore ghdl.spec sources 
Log Message:
update to 0.21



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Dec 2005 13:35:42 -0000	1.3
+++ .cvsignore	18 Dec 2005 22:47:39 -0000	1.4
@@ -3,3 +3,4 @@
 ghdl-0.20-svn35.patch
 ghdl-imagef64fix.patch
 ghdl-0.20.tar.bz2
+ghdl-0.21.tar.bz2


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ghdl.spec	15 Dec 2005 13:35:42 -0000	1.4
+++ ghdl.spec	18 Dec 2005 22:47:39 -0000	1.5
@@ -1,10 +1,10 @@
 %define gccver 4.0.2
-%define ghdlver 0.20
+%define ghdlver 0.21
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.21
-Release: 0.35svn.1%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -14,9 +14,7 @@
 # ./dist.sh sources
 Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
-Patch0: ghdl-0.20-svn35.patch
-Patch1: ghdl-0.21-infodirentry.patch
-Patch2: ghdl-imagef64fix.patch
+Patch0: ghdl-0.21-infodirentry.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo
 Requires(post): /sbin/install-info
@@ -54,11 +52,9 @@
 %prep
 %setup -q -n gcc-%{gccver} -T -b 1 -a 0
 pushd ghdl-%{ghdlver}
-%patch0 -p1
-%patch2 -p0 -b .imgf64
 %{__mv} vhdl ../gcc/
 popd
-%patch1 -p0
+%patch0 -p0
 
 %build
 %{__mkdir} obj-%{gcc_target_platform}
@@ -118,8 +114,8 @@
 	--host=%{gcc_target_platform}
 %endif
 
-%{__mkdir} -p gcc/vhdl
-%{__cp} ../gcc/vhdl/grt/grt.ver gcc/vhdl
+#{__mkdir} -p gcc/vhdl
+#{__cp} ../gcc/vhdl/grt/grt.ver gcc/vhdl
 # Parallel make doesn't work, so not using %{?_smp_mflags}
 %{__make}
 
@@ -221,6 +217,9 @@
 %{_libexecdir}/gcc/
 
 %changelog
+* Sun Dec 18 2005 Thomas Sailer  - 0.21-1
+- update to 0.21
+
 * Thu Dec 15 2005 Thomas Sailer  - 0.21-0.35svn.1
 - update to svn35 for more x86_64 "Ada cannot portably call C vararg functions"
   fixes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Dec 2005 13:35:42 -0000	1.3
+++ sources	18 Dec 2005 22:47:39 -0000	1.4
@@ -1,5 +1,2 @@
 f7781398ada62ba255486673e6274b26  gcc-core-4.0.2.tar.bz2
-93d0d169eaca9119fa2eb3302f1a7ecc  ghdl-0.21dev.tar.bz2
-9903c648fb586c3abed0d3c9d574a1bb  ghdl-0.20-svn35.patch
-d7302c5e11b51ffec0ada78ee5f3764f  ghdl-imagef64fix.patch
-7d761a9469115e05dc965d68d9760f5b  ghdl-0.20.tar.bz2
+a0ebb9b4ea9d33e67e6ae9768d10eb3a  ghdl-0.21.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 18 23:07:00 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Sun, 18 Dec 2005 18:07:00 -0500
Subject: rpms/ghdl/FC-4 .cvsignore, 1.2, 1.3 ghdl.spec, 1.4, 1.5 sources, 1.2,
	1.3
Message-ID: <200512182307.jBIN7pNA028878@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28853

Modified Files:
	.cvsignore ghdl.spec sources 
Log Message:
update to 0.21



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghdl/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Nov 2005 11:19:29 -0000	1.2
+++ .cvsignore	18 Dec 2005 23:06:54 -0000	1.3
@@ -1,2 +1,3 @@
 gcc-core-4.0.2.tar.bz2
 ghdl-0.21dev.tar.bz2
+ghdl-0.21.tar.bz2


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/FC-4/ghdl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ghdl.spec	5 Dec 2005 21:11:11 -0000	1.4
+++ ghdl.spec	18 Dec 2005 23:06:54 -0000	1.5
@@ -1,10 +1,10 @@
 %define gccver 4.0.2
-%define versuffix dev
+%define ghdlver 0.21
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.21
-Release: 0.24svn.3%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -12,15 +12,15 @@
 # check out the SVN repo
 # cd translate/gcc/
 # ./dist.sh sources
-Source0: http://ghdl.free.fr/ghdl-%{version}%{versuffix}.tar.bz2
+Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
 Patch0: ghdl-0.21-infodirentry.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+Requires: gcc
 # gcc-gnat missing on ppc: Bug 174720
-# mock does not install glibc-devel.i386 on x86_64, therefore
 ExcludeArch: ppc
 
 # Make sure we don't use clashing namespaces
@@ -51,7 +51,9 @@
 
 %prep
 %setup -q -n gcc-%{gccver} -T -b 1 -a 0
-%{__mv} ghdl-%{version}%{versuffix}/vhdl gcc/
+pushd ghdl-%{ghdlver}
+%{__mv} vhdl ../gcc/
+popd
 %patch0 -p0
 
 %build
@@ -95,7 +97,7 @@
 	--mandir=%{_mandir} \
 	--infodir=%{_infodir} \
 	--enable-languages=vhdl \
-	--disable-multilib \
+	%{!?_without_mock:--disable-multilib} \
 %ifarch sparc
 	--host=%{gcc_target_platform} \
 	--build=%{gcc_target_platform} \
@@ -121,6 +123,37 @@
 %{__rm} -rf %{buildroot}
 %{__make} -C obj-%{gcc_target_platform} DESTDIR=%{buildroot} install
 
+%ifarch x86_64
+pushd obj-%{gcc_target_platform}/gcc/vhdl
+P32=%{buildroot}/%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib/32/
+%{__install} -d -o 0 -g 0 ${P32}
+make ghdllibs-clean
+%if %{!?_without_mock:0}%{?_without_mock:1}
+make grt-clean
+make GRT_FLAGS=-m32 GRT_TARGET_OBJS="i386.o linux.o times.o" ghdllib
+make grt.lst
+%{__install} -m 644 libgrt.a ${P32}/libgrt.a
+%{__install} -m 644 grt.lst ${P32}/grt.lst
+%{__install} -m 644 grt.ver ${P32}/grt.ver
+%endif
+PDIR=`pwd`
+pushd ${P32}/../..
+%{__install} -d -o 0 -g 0 lib/32/v93
+%{__install} -d -o 0 -g 0 lib/32/v87
+%{__make} -f ${PDIR}/Makefile REL_DIR=../../../.. \
+         LIBSRC_DIR="src" LIB93_DIR=lib/32/v93 LIB87_DIR=lib/32/v87 \
+         ANALYZE="${PDIR}/../ghdl -a -m32 --GHDL1=${PDIR}/../ghdl1 --ieee=none" \
+         std.v93 std.v87 ieee.v93 ieee.v87 synopsys.v93 synopsys.v87 mentor.v93
+popd
+../ghdl1 -m32 --std=87 -quiet -o std_standard.s --compile-standard
+../xgcc -m32 -c -o std_standard.o std_standard.s
+%{__mv} std_standard.o ${P32}/v87/std/std_standard.o
+../ghdl1 -m32 --std=93 -quiet -o std_standard.s --compile-standard
+../xgcc -m32 -c -o std_standard.o std_standard.s
+%{__mv} std_standard.o ${P32}/v93/std/std_standard.o
+popd
+%endif
+
 # Add additional libraries to link
 (
 echo "-lm"
@@ -145,6 +178,11 @@
 	.%{_exec_prefix}/lib/libmudflap.* \
 	.%{_exec_prefix}/lib/libmudflapth.* \
 	.%{_libdir}/32/libiberty.a
+# Remove crt/libgcc, as ghdl invokes the native gcc to perform the linking
+%{__rm} -f \
+	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/crt* \
+	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/libgc* \
+	.%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/{cc1,collect2}
 
 # Remove directory hierarchies not to be packaged
 %{__rm} -rf \
@@ -166,7 +204,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ghdl-%{version}%{versuffix}/COPYING
+%doc ghdl-%{ghdlver}/COPYING
 %{_bindir}/ghdl
 %{_infodir}/ghdl.info.gz
 # Need to own directory %{_libdir}/gcc even though we only want the
@@ -177,6 +215,18 @@
 %{_libexecdir}/gcc/
 
 %changelog
+* Sun Dec 18 2005 Thomas Sailer  - 0.21-1
+- update to 0.21
+
+* Thu Dec 15 2005 Thomas Sailer  - 0.21-0.35svn.1
+- update to svn35 for more x86_64 "Ada cannot portably call C vararg functions"
+  fixes
+- first stab at -m32 library building
+
+* Sat Dec 10 2005 Thomas Sailer  - 0.21-0.33svn.1
+- update to svn33, to fix x86_64 issues (real'image, -m32)
+- rpmbuild option --without mock enables multilib builds
+
 * Mon Dec  5 2005 Thomas Sailer  - 0.21-0.24svn.3
 - disable multilib and remove exclude of x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghdl/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Nov 2005 11:19:29 -0000	1.2
+++ sources	18 Dec 2005 23:06:54 -0000	1.3
@@ -1,2 +1,2 @@
 f7781398ada62ba255486673e6274b26  gcc-core-4.0.2.tar.bz2
-93d0d169eaca9119fa2eb3302f1a7ecc  ghdl-0.21dev.tar.bz2
+a0ebb9b4ea9d33e67e6ae9768d10eb3a  ghdl-0.21.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 19 02:12:31 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 18 Dec 2005 21:12:31 -0500
Subject: rpms/xchat-gnome/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xchat-gnome.spec, 1.8, 1.9
Message-ID: <200512190213.jBJ2D1CN001702@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1680

Modified Files:
	.cvsignore sources xchat-gnome.spec 
Log Message:
* Sun Dec 18 2005 Brian Pepple  - 0.8-01.rc1
- Update to 0.8rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Dec 2005 21:54:05 -0000	1.4
+++ .cvsignore	19 Dec 2005 02:12:29 -0000	1.5
@@ -1 +1 @@
-xchat-gnome-0.8rc1.tar.bz2
+xchat-gnome-0.8rc2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Dec 2005 21:54:05 -0000	1.4
+++ sources	19 Dec 2005 02:12:29 -0000	1.5
@@ -1 +1 @@
-9e43be1379796baf270e417202ef6c95  xchat-gnome-0.8rc1.tar.bz2
+46b06c1b88fbf20799568e0c10af8ed5  xchat-gnome-0.8rc2.tar.bz2


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xchat-gnome.spec	15 Dec 2005 21:54:05 -0000	1.8
+++ xchat-gnome.spec	19 Dec 2005 02:12:29 -0000	1.9
@@ -6,13 +6,13 @@
 
 Name:           xchat-gnome
 Version:        0.8
-Release:        0.1.rc1%{?dist}
+Release:        0.1.rc2%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://%{name}.navi.cx/
-Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}rc1.tar.bz2
+Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}rc2.tar.bz2
 Patch0:		%{name}-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -49,7 +49,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 %patch0 -p1 -b .config
 
 
@@ -132,6 +132,9 @@
 
 
 %changelog
+* Sun Dec 18 2005 Brian Pepple  - 0.8-01.rc1
+- Update to 0.8rc2.
+
 * Thu Dec 15 2005 Brian Pepple  - 0.8-01.rc1
 - Update to 0.8rc1.
 - Drop documentation removed from upstream tarball.



From fedora-extras-commits at redhat.com  Mon Dec 19 02:14:42 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun, 18 Dec 2005 21:14:42 -0500
Subject: rpms/ldns/devel ldns.spec,1.3,1.4
Message-ID: <200512190215.jBJ2FC6R001735@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1713

Modified Files:
	ldns.spec 
Log Message:
* Sun Dec 18 2005 Paul Wouters  1.0.0-7
- Patched 'make clean' target to get rid of object files shipped with 1.0.0



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ldns.spec	13 Dec 2005 16:25:46 -0000	1.3
+++ ldns.spec	19 Dec 2005 02:14:40 -0000	1.4
@@ -5,6 +5,7 @@
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
+Patch0: %{name}-clean.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, autoconf, automake, gcc-c++, openssl-devel, doxygen
@@ -25,21 +26,25 @@
 
 %prep
 %setup -q 
+
+%patch0 -b .clean
+
 rm config.sub config.guess
 libtoolize
 autoreconf
-# only for 2.3.3, since upstream left .o files in release
+# only for 1.0.0, since upstream left .o files in release
 make clean
 
 %configure
 
 
 %build
-%{__make} %{?_smp_mflags} allautoconf
-%{__make} %{?_smp_mflags}
-%{__make} %{?_smp_mflags} drill
-%{__make} %{?_smp_mflags} examples
-%{__make} %{?_smp_mflags} doc
+make %{?_smp_mflags} clean
+make %{?_smp_mflags} allautoconf
+make %{?_smp_mflags}
+make %{?_smp_mflags} drill
+make %{?_smp_mflags} examples
+make %{?_smp_mflags} doc
 
 %install
 rm -rf %{buildroot}
@@ -78,8 +83,11 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Dec 18 2005 Paul Wouters  1.0.0-7
+- Patched 'make clean' target to get rid of object files shipped with 1.0.0
+
 * Sun Dec 13 2005 Paul Wouters  1.0.0-6
-- added a make clean for 1.0.0 since .o files were left behind upstream,
+- added a make clean for 2.3.3 since .o files were left behind upstream,
   causing failure on ppc platform
 
 * Sun Dec 11 2005 Tom "spot" Callaway  1.0.0-5



From fedora-extras-commits at redhat.com  Mon Dec 19 02:37:29 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun, 18 Dec 2005 21:37:29 -0500
Subject: rpms/ldns/devel ldns.spec,1.4,1.5
Message-ID: <200512190238.jBJ2c00g001810@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1792

Modified Files:
	ldns.spec 
Log Message:
* Sun Dec 18 2005 Paul Wouters  1.0.0-8
- Cannot use make clean because there are no Makefiles. Use hardcoded rm.



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ldns.spec	19 Dec 2005 02:14:40 -0000	1.4
+++ ldns.spec	19 Dec 2005 02:37:27 -0000	1.5
@@ -5,7 +5,6 @@
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
-Patch0: %{name}-clean.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, autoconf, automake, gcc-c++, openssl-devel, doxygen
@@ -26,14 +25,13 @@
 
 %prep
 %setup -q 
-
-%patch0 -b .clean
+# only for 1.0.0, since upstream left .o files in release and 'make clean'
+# won't work without the Makefile.
+rm drill/*.o
 
 rm config.sub config.guess
 libtoolize
 autoreconf
-# only for 1.0.0, since upstream left .o files in release
-make clean
 
 %configure
 
@@ -83,6 +81,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Dec 18 2005 Paul Wouters  1.0.0-8
+- Cannot use make clean because there are no Makefiles. Use hardcoded rm.
+
 * Sun Dec 18 2005 Paul Wouters  1.0.0-7
 - Patched 'make clean' target to get rid of object files shipped with 1.0.0
 



From fedora-extras-commits at redhat.com  Mon Dec 19 02:39:16 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun, 18 Dec 2005 21:39:16 -0500
Subject: rpms/ldns/devel ldns.spec,1.5,1.6
Message-ID: <200512190239.jBJ2dkt4002138@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1917

Modified Files:
	ldns.spec 
Log Message:
Forgot to increase release number



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ldns.spec	19 Dec 2005 02:37:27 -0000	1.5
+++ ldns.spec	19 Dec 2005 02:39:14 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.0.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 19 09:14:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 19 Dec 2005 04:14:15 -0500
Subject: rpms/moin/FC-4 moin-1.3.5-xml_newline.patch, NONE, 1.1 moin.spec,
	1.4, 1.5
Message-ID: <200512190915.jBJ9FEEQ015752@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/moin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15661/FC-4

Modified Files:
	moin.spec 
Added Files:
	moin-1.3.5-xml_newline.patch 
Log Message:
Include fix for XML output from Tommy Reynolds.


moin-1.3.5-xml_newline.patch:

--- NEW FILE moin-1.3.5-xml_newline.patch ---
diff -Naupr moin-1.3.5.orig/MoinMoin/formatter/xml_docbook.py moin-1.3.5/MoinMoin/formatter/xml_docbook.py
--- moin-1.3.5.orig/MoinMoin/formatter/xml_docbook.py	2005-07-26 20:46:50.000000000 +0200
+++ moin-1.3.5/MoinMoin/formatter/xml_docbook.py	2005-12-19 10:06:34.000000000 +0100
@@ -98,7 +98,7 @@ class Formatter(FormatterBase):
 
     def linebreak(self, preformatted=1):
         if preformatted:
-            self.text('\\n')
+            self.text('\n')
         else:
             #this should not happen
             #self.text('CRAP') 


Index: moin.spec
===================================================================
RCS file: /cvs/extras/rpms/moin/FC-4/moin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moin.spec	16 Aug 2005 14:25:26 -0000	1.4
+++ moin.spec	19 Dec 2005 09:14:11 -0000	1.5
@@ -1,16 +1,17 @@
 Summary: MoinMoin is a Python clone of WikiWiki
 Name:    moin
 Version: 1.3.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:   Applications/Internet
 URL:     http://moinmoin.wikiwikiweb.de/
 Source0: http://dl.sf.net/moin/moin-%{version}.tar.gz
 Source1: README-rpm
-Patch:   moin-1.3.5-config.patch
+Patch0:  moin-1.3.5-config.patch
+Patch1:  moin-1.3.5-xml_newline.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
-BuildRequires: python
+BuildRequires: python, dos2unix
 
 %description
 A WikiWikiWeb is a collaborative hypertext environment, with an emphasis on
@@ -21,7 +22,10 @@
 
 %prep
 %setup -q
-%patch -p1 -b .config
+%patch0 -p1 -b .config
+# This is required, as patch gets confused by the ^Ms otherwise
+dos2unix MoinMoin/formatter/xml_docbook.py
+%patch1 -p1 -b .xml_newline
 
 
 %build
@@ -48,6 +52,10 @@
 
 
 %changelog
+* 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.
+
 * Mon Aug 15 2005 Matthias Saou  1.3.5-2
 - Fix python modules path from _libdir to _prefix/lib so that build works on
   64bit systems too.



From fedora-extras-commits at redhat.com  Mon Dec 19 09:14:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 19 Dec 2005 04:14:42 -0500
Subject: rpms/moin/devel moin-1.3.5-xml_newline.patch, NONE, 1.1 moin.spec,
	1.4, 1.5
Message-ID: <200512190915.jBJ9Fg5G015924@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/moin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15661/devel

Modified Files:
	moin.spec 
Added Files:
	moin-1.3.5-xml_newline.patch 
Log Message:
Include fix for XML output from Tommy Reynolds.


moin-1.3.5-xml_newline.patch:

--- NEW FILE moin-1.3.5-xml_newline.patch ---
diff -Naupr moin-1.3.5.orig/MoinMoin/formatter/xml_docbook.py moin-1.3.5/MoinMoin/formatter/xml_docbook.py
--- moin-1.3.5.orig/MoinMoin/formatter/xml_docbook.py	2005-07-26 20:46:50.000000000 +0200
+++ moin-1.3.5/MoinMoin/formatter/xml_docbook.py	2005-12-19 10:06:34.000000000 +0100
@@ -98,7 +98,7 @@ class Formatter(FormatterBase):
 
     def linebreak(self, preformatted=1):
         if preformatted:
-            self.text('\\n')
+            self.text('\n')
         else:
             #this should not happen
             #self.text('CRAP') 


Index: moin.spec
===================================================================
RCS file: /cvs/extras/rpms/moin/devel/moin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moin.spec	16 Aug 2005 14:44:54 -0000	1.4
+++ moin.spec	19 Dec 2005 09:14:40 -0000	1.5
@@ -1,16 +1,17 @@
 Summary: MoinMoin is a Python clone of WikiWiki
 Name:    moin
 Version: 1.3.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:   Applications/Internet
 URL:     http://moinmoin.wikiwikiweb.de/
 Source0: http://dl.sf.net/moin/moin-%{version}.tar.gz
 Source1: README-rpm
-Patch:   moin-1.3.5-config.patch
+Patch0:  moin-1.3.5-config.patch
+Patch1:  moin-1.3.5-xml_newline.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
-BuildRequires: python
+BuildRequires: python, dos2unix
 
 %description
 A WikiWikiWeb is a collaborative hypertext environment, with an emphasis on
@@ -21,7 +22,10 @@
 
 %prep
 %setup -q
-%patch -p1 -b .config
+%patch0 -p1 -b .config
+# This is required, as patch gets confused by the ^Ms otherwise
+dos2unix MoinMoin/formatter/xml_docbook.py
+%patch1 -p1 -b .xml_newline
 
 
 %build
@@ -48,6 +52,10 @@
 
 
 %changelog
+* 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.
+
 * Mon Aug 15 2005 Matthias Saou  1.3.5-2
 - Fix python modules path from _libdir to _prefix/lib so that build works on
   64bit systems too.



From fedora-extras-commits at redhat.com  Mon Dec 19 09:17:29 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 19 Dec 2005 04:17:29 -0500
Subject: rpms/dia/devel dia.spec,1.3,1.4
Message-ID: <200512190917.jBJ9HxLY015957@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15938

Modified Files:
	dia.spec 
Log Message:
rh#176003# pre/post


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dia.spec	20 Oct 2005 15:33:51 -0000	1.3
+++ dia.spec	19 Dec 2005 09:17:27 -0000	1.4
@@ -5,7 +5,7 @@
 Name: 		dia
 Summary:	A diagram drawing program.
 Version:	0.94
-Release:	16
+Release:	17
 Epoch:		1
 Source:		ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
 Group:		Applications/Multimedia
@@ -16,7 +16,8 @@
 Requires:	glib2, gtk2, libgnome, libgnomeui, libart_lgpl, libxslt
 Requires:	scrollkeeper, freetype >= %{freetype_version}
 Requires:       /usr/share/desktop-menu-patches/redhat-diagrams.desktop
-Prereq:         /usr/bin/scrollkeeper-update
+Requires(post): /usr/bin/scrollkeeper-update
+Requires(postun): /usr/bin/scrollkeeper-update
 
 BuildRequires:	libxml2-devel >= %{libxml2_version}, intltool > 0.21
 BuildRequires:	pango-devel >= %{pango_version}
@@ -112,6 +113,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon Dec 19 2005 Caolan McNamara  1:0.94-17
+- rh#176003# rejig Pre/Post
+
 * Thu Oct 20 2005 Caolan McNamara  1:0.94-16
 
 * Mon Oct 17 2005 Caolan McNamara 



From fedora-extras-commits at redhat.com  Mon Dec 19 09:44:53 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 19 Dec 2005 04:44:53 -0500
Subject: fedora-security/audit fc4,1.109,1.110
Message-ID: <200512190945.jBJ9jNcW016229@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16209

Modified Files:
	fc4 
Log Message:
Weekend updates



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- fc4	16 Dec 2005 09:00:46 -0000	1.109
+++ fc4	19 Dec 2005 09:44:50 -0000	1.110
@@ -1,28 +1,28 @@
-Up to date CVE as of CVE email 20051214
-Up to date FC4 as of 20051214
+Up to date CVE as of CVE email 20051218
+Up to date FC4 as of 20051218
 
 ** are items that need attention
 
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
-CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
+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-4077 backport (curl) [since FEDORA-2005-1137]
 CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
 CVE-2005-3193 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3193 VULNERABLE (xpdf)
-CVE-2005-3193 VULNERABLE (kdegraphics)
+CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3193 backport (poppler) [since FEDORA-2005-1132]
 CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3192 VULNERABLE (xpdf)
-CVE-2005-3192 VULNERABLE (kdegraphics)
+CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3192 backport (poppler) [since FEDORA-2005-1132]
 CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3191 VULNERABLE (xpdf)
-CVE-2005-3191 VULNERABLE (kdegraphics)
+CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3191 backport (poppler) [since FEDORA-2005-1132]
 CVE-2005-3964 VULNERABLE (openmotif) bz#174815
@@ -190,7 +190,7 @@
 CVE-2005-2498 version (php xml_rpc, fixed 1.4.0) [since FEDORA-2005-810]
 CVE-2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch
 CVE-2005-2495 backport (xorg-x11) [since FEDORA-2005-894]
-CVE-2005-2494 VULNERABLE (kdebase, fixed after 3.4.2) bz#166997
+CVE-2005-2494 version (kdebase, fixed after 3.4.2) [since FEDORA-2005-1152]
 CVE-2005-2491 ignore (python, fc4 python does not contain pcre)
 CVE-2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803]
 CVE-2005-2491 ignore (httpd, pcre uses system pcre)
@@ -254,7 +254,7 @@
 CVE-2005-2104 version (sysreport, fixed 1.4.1-5) [since FEDORA-2005-1071]
 CVE-2005-2103 version (gaim, fixed 1.5.0) [since FEDORA-2005-751]
 CVE-2005-2102 version (gaim, fixed 1.5.0) [since FEDORA-2005-751]
-CVE-2005-2101 backport (kdeedu) [since FEDORA-2005-744]
+CVE-2005-2101 version (kdeedu, fixed after 3.4.2) [since FEDORA-2005-1158] was backport since FEDORA-2005-744
 CVE-2005-2100 version (kernel, not upstream) only RHEL4
 CVE-2005-2099 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820]
 CVE-2005-2098 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820]



From fedora-extras-commits at redhat.com  Mon Dec 19 09:52:32 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 19 Dec 2005 04:52:32 -0500
Subject: rpms/gtkmm24/FC-4 gtkmm-2.6.5-devhelp.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 gtkmm.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200512190953.jBJ9r2Ce016273@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gtkmm24/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16248

Modified Files:
	.cvsignore gtkmm.spec sources 
Added Files:
	gtkmm-2.6.5-devhelp.patch 
Log Message:
Update to 2.6.5, fixed devhelp documentation pashs

gtkmm-2.6.5-devhelp.patch:

--- NEW FILE gtkmm-2.6.5-devhelp.patch ---
--- gtkmm-2.6.5.origt/docs/reference/doxygen_to_devhelp.xsl	2005-12-18 23:38:23.000000000 -0800
+++ gtkmm-2.6.5/docs/reference/doxygen_to_devhelp.xsl	2004-01-02 01:56:46.000000000 -0800
@@ -5,7 +5,7 @@
 
 
 
-../../../doc/gtkmm-2.4/docs/reference/html/
+reference/html/
 
 
    - 2.6.5-1
+- Update to 2.6.5
+- Fixed devhelp documentation paths
+
 * Fri Apr 29 2005 Denis Leroy  - 2.6.2-2
 - Disabled building of demo and examples
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Apr 2005 22:36:05 -0000	1.5
+++ sources	19 Dec 2005 09:52:29 -0000	1.6
@@ -1 +1 @@
-c1ffa447172b16d1ee787b1c69379c30  gtkmm-2.6.2.tar.bz2
+b7c3e15de77c58c309adb68aff51b34c  gtkmm-2.6.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 19 09:53:48 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 19 Dec 2005 04:53:48 -0500
Subject: rpms/libsigc++20/FC-4 .cvsignore, 1.3, 1.4 libsigc++.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512190954.jBJ9sIgv016321@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libsigc++20/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16299

Modified Files:
	.cvsignore libsigc++.spec sources 
Log Message:
Update to 2.0.16


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsigc++20/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Apr 2005 21:39:37 -0000	1.3
+++ .cvsignore	19 Dec 2005 09:53:46 -0000	1.4
@@ -1 +1 @@
-libsigc++-2.0.11.tar.bz2
+libsigc++-2.0.16.tar.bz2


Index: libsigc++.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigc++20/FC-4/libsigc++.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsigc++.spec	28 Apr 2005 21:39:37 -0000	1.6
+++ libsigc++.spec	19 Dec 2005 09:53:46 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           libsigc++20
-Version:        2.0.11
+Version:        2.0.16
 Release:        1
 
 Summary:        Typesafe signal framework for C++
@@ -81,6 +81,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Sun Dec 18 2005 Denis Leroy  - 2.0.16-1
+- Update to 2.0.16
+
 * Sat Apr  9 2005 Denis Leroy  - 2.0.11-1
 - Upgrade to version 2.0.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsigc++20/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Apr 2005 21:39:37 -0000	1.4
+++ sources	19 Dec 2005 09:53:46 -0000	1.5
@@ -1 +1 @@
-9e28167ebe664593c9222092e2a51d06  libsigc++-2.0.11.tar.bz2
+bd997b35a420861259a68d5f27a7592e  libsigc++-2.0.16.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 19 10:06:14 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 19 Dec 2005 05:06:14 -0500
Subject: rpms/bittorrent/devel bittorrent.spec, 1.32, 1.33 sources, 1.15,
	1.16 .cvsignore, 1.15, 1.16
Message-ID: <200512191006.jBJA6n7E018044@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18019

Modified Files:
	bittorrent.spec sources .cvsignore 
Log Message:
Update to 4.2.2



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- bittorrent.spec	6 Dec 2005 11:51:49 -0000	1.32
+++ bittorrent.spec	19 Dec 2005 10:06:12 -0000	1.33
@@ -3,7 +3,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        4.2.1
+Version:        4.2.2
 Release:        1%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
@@ -217,6 +217,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Mon Dec 19 2005 Paul Howarth  4.2.2-1
+- Update to 4.2.2
+
 * Tue Dec  6 2005 Paul Howarth  4.2.1-1
 - Update to 4.2.1
 - Source now at www.bittorrent.com rather than sourceforge


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Dec 2005 11:51:49 -0000	1.15
+++ sources	19 Dec 2005 10:06:12 -0000	1.16
@@ -1 +1 @@
-0deb2e083e95206a9e601ff6ca35b826  BitTorrent-4.2.1.tar.gz
+2a85715b8ef0335ecc9e8ad91860231b  BitTorrent-4.2.2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	6 Dec 2005 11:51:49 -0000	1.15
+++ .cvsignore	19 Dec 2005 10:06:12 -0000	1.16
@@ -1 +1 @@
-BitTorrent-4.2.1.tar.gz
+BitTorrent-4.2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 19 10:09:11 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 19 Dec 2005 05:09:11 -0500
Subject: rpms/bittorrent/FC-4 bittorrent.spec, 1.17, 1.18 sources, 1.9,
	1.10 .cvsignore, 1.9, 1.10
Message-ID: <200512191009.jBJA9BaR018118@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18096

Modified Files:
	bittorrent.spec sources .cvsignore 
Log Message:
resync with devel



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-4/bittorrent.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bittorrent.spec	6 Dec 2005 11:54:20 -0000	1.17
+++ bittorrent.spec	19 Dec 2005 10:08:56 -0000	1.18
@@ -3,7 +3,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        4.2.1
+Version:        4.2.2
 Release:        1%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
@@ -217,6 +217,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Mon Dec 19 2005 Paul Howarth  4.2.2-1
+- Update to 4.2.2
+
 * Tue Dec  6 2005 Paul Howarth  4.2.1-1
 - Update to 4.2.1
 - Source now at www.bittorrent.com rather than sourceforge


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 Dec 2005 11:54:20 -0000	1.9
+++ sources	19 Dec 2005 10:08:56 -0000	1.10
@@ -1 +1 @@
-0deb2e083e95206a9e601ff6ca35b826  BitTorrent-4.2.1.tar.gz
+2a85715b8ef0335ecc9e8ad91860231b  BitTorrent-4.2.2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	6 Dec 2005 11:54:20 -0000	1.9
+++ .cvsignore	19 Dec 2005 10:08:56 -0000	1.10
@@ -1 +1 @@
-BitTorrent-4.2.1.tar.gz
+BitTorrent-4.2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 19 10:11:58 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 19 Dec 2005 05:11:58 -0500
Subject: rpms/bittorrent/FC-3 bittorrent.spec, 1.12, 1.13 sources, 1.9,
	1.10 .cvsignore, 1.9, 1.10
Message-ID: <200512191012.jBJACSuo018217@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18187

Modified Files:
	bittorrent.spec sources .cvsignore 
Log Message:
resync with devel



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/bittorrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bittorrent.spec	6 Dec 2005 11:58:36 -0000	1.12
+++ bittorrent.spec	19 Dec 2005 10:11:55 -0000	1.13
@@ -3,7 +3,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        4.2.1
+Version:        4.2.2
 Release:        1%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
@@ -217,6 +217,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Mon Dec 19 2005 Paul Howarth  4.2.2-1
+- Update to 4.2.2
+
 * Tue Dec  6 2005 Paul Howarth  4.2.1-1
 - Update to 4.2.1
 - Source now at www.bittorrent.com rather than sourceforge


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 Dec 2005 11:56:32 -0000	1.9
+++ sources	19 Dec 2005 10:11:55 -0000	1.10
@@ -1 +1 @@
-0deb2e083e95206a9e601ff6ca35b826  BitTorrent-4.2.1.tar.gz
+2a85715b8ef0335ecc9e8ad91860231b  BitTorrent-4.2.2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	6 Dec 2005 11:56:32 -0000	1.9
+++ .cvsignore	19 Dec 2005 10:11:55 -0000	1.10
@@ -1 +1 @@
-BitTorrent-4.2.1.tar.gz
+BitTorrent-4.2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 19 15:24:51 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 19 Dec 2005 10:24:51 -0500
Subject: rpms/x3270/devel x3270.spec,1.16,1.17
Message-ID: <200512191525.jBJFPMP8027985@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/x3270/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27963

Modified Files:
	x3270.spec 
Log Message:
- test build without modular-X patch


Index: x3270.spec
===================================================================
RCS file: /cvs/extras/rpms/x3270/devel/x3270.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- x3270.spec	23 Nov 2005 14:45:12 -0000	1.16
+++ x3270.spec	19 Dec 2005 15:24:48 -0000	1.17
@@ -5,7 +5,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.4p6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -86,7 +86,7 @@
 chmod +x gccmakedep
 export PATH="$PATH:`pwd`"
 xmkmf
-patch -p1 < %{PATCH5}
+#patch -p1 < %{PATCH5}
 make Makefiles
 make includes
 make depend
@@ -203,6 +203,9 @@
 %{_mandir}/man1/c3270*
 
 %changelog
+* Mon Dec 19 2005 Karsten Hopp  3.3.4p6-4
+- test build without modular-X patch
+
 * Wed Nov 23 2005 Karsten Hopp  3.3.4p6-3
 - update release again
 



From fedora-extras-commits at redhat.com  Mon Dec 19 15:57:24 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 19 Dec 2005 10:57:24 -0500
Subject: rpms/enca/devel .cvsignore, 1.3, 1.4 enca.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200512191557.jBJFvs86028200@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28174

Modified Files:
	.cvsignore enca.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enca/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Nov 2005 14:51:57 -0000	1.3
+++ .cvsignore	19 Dec 2005 15:57:22 -0000	1.4
@@ -1 +1 @@
-enca-1.8.tar.bz2
+enca-1.9.tar.bz2


Index: enca.spec
===================================================================
RCS file: /cvs/extras/rpms/enca/devel/enca.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- enca.spec	28 Nov 2005 14:51:57 -0000	1.2
+++ enca.spec	19 Dec 2005 15:57:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name: enca
 Summary: Character set analyzer and detector
-Version: 1.8
+Version: 1.9
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Text
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Dmitry Butskoy  - 1.9-1
+- upgrade to 1.9
+
 * Mon Nov 28 2005 Dmitry Butskoy  - 1.8-1
 - upgrade to 1.8
 - update description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enca/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Nov 2005 14:51:57 -0000	1.3
+++ sources	19 Dec 2005 15:57:22 -0000	1.4
@@ -1 +1 @@
-c7ca49601dd80d0300bbb80d5121cf75  enca-1.8.tar.bz2
+b3581e28d68d452286fb0bfe58bed3b3  enca-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 19 16:15:09 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 19 Dec 2005 11:15:09 -0500
Subject: rpms/enca/FC-4 enca.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200512191615.jBJGFdDM029908@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29887

Modified Files:
	enca.spec sources 
Log Message:



Index: enca.spec
===================================================================
RCS file: /cvs/extras/rpms/enca/FC-4/enca.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- enca.spec	28 Nov 2005 15:11:54 -0000	1.2
+++ enca.spec	19 Dec 2005 16:15:06 -0000	1.3
@@ -1,6 +1,6 @@
 Name: enca
 Summary: Character set analyzer and detector
-Version: 1.8
+Version: 1.9
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Text
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Dmitry Butskoy  - 1.9-1
+- upgrade to 1.9
+
 * Mon Nov 28 2005 Dmitry Butskoy  - 1.8-1
 - upgrade to 1.8
 - update description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enca/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Nov 2005 15:11:54 -0000	1.3
+++ sources	19 Dec 2005 16:15:06 -0000	1.4
@@ -1 +1 @@
-c7ca49601dd80d0300bbb80d5121cf75  enca-1.8.tar.bz2
+b3581e28d68d452286fb0bfe58bed3b3  enca-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 19 16:16:02 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 19 Dec 2005 11:16:02 -0500
Subject: rpms/kdesvn/devel kdesvn.spec,1.8,1.9
Message-ID: <200512191616.jBJGGWYf029992@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29918

Modified Files:
	kdesvn.spec 
Log Message:
- Add missing files not detected by mock
- Add patch to fix gcc41 compile error



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdesvn.spec	14 Dec 2005 23:07:40 -0000	1.8
+++ kdesvn.spec	19 Dec 2005 16:16:00 -0000	1.9
@@ -2,14 +2,15 @@
 
 Name:           kdesvn
 Version:        0.7.1
-Release:        2%{?dist}
-Summary:        A subversion client for KDE
+Release:        3%{?dist}
+Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://www.alwins-world.de/programs/kdesvn/
 Source0:        http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{srcver}.tar.gz
 Patch0:         kdesvn-0.7.1-x.patch
+Patch1:         kdesvn-0.7.1-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs-devel, neon-devel
@@ -32,6 +33,7 @@
 %prep
 %setup -q -n %{name}-%{srcver}
 %patch -p1 -b .x11
+%patch1 -p1 -b .gcc41
 
 
 %build
@@ -56,6 +58,8 @@
 %find_lang %{name} || touch %{name}.lang
 #Fix doc link
 ln -sf ../common $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/en/%{name}
+#Don't conflict with kdebase
+rm $RPM_BUILD_ROOT%{_datadir}/services/svn*.protocol
 
 
 %clean
@@ -84,19 +88,24 @@
 %doc AUTHORS ChangeLog COPYING GPL.txt
 %{_bindir}/kdesvn
 %{_bindir}/kdesvnaskpass
-%{_libdir}/kde3/libkdesvnpart.*
+%{_libdir}/kde3/*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/kdesvn/
 %{_datadir}/apps/kdesvnpart/
+%{_datadir}/apps/konqueror/servicemenus/kdesvn*.desktop
 %{_datadir}/config.kcfg/kdesvn_part.kcfg
 %{_datadir}/doc/HTML/en/kdesvn/
-%{_datadir}/icons/hicolor/16x16/apps/kdesvn.png
-%{_datadir}/icons/hicolor/32x32/apps/kdesvn.png
-%{_datadir}/icons/hicolor/48x48/apps/kdesvn.png
-%{_datadir}/icons/hicolor/64x64/apps/kdesvn.png
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/hicolor/*/*/*.svgz
+%{_datadir}/services/kded/kdesvnd.desktop
+%{_datadir}/services/ksvn*.protocol
 
 
 %changelog
+* Fri Dec 16 2005 - Orion Poplawski  - 0.7.1-3
+- Add missing files not detected by mock
+- Add patch to fix gcc41 compile error
+
 * Tue Dec 13 2005 - Orion Poplawski  - 0.7.1-2
 - Specify apr-1-config and apu-1-config to configure
 



From fedora-extras-commits at redhat.com  Mon Dec 19 16:16:22 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 19 Dec 2005 11:16:22 -0500
Subject: rpms/enca/FC-3 enca.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200512191616.jBJGGqL8030034@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29973

Modified Files:
	enca.spec sources 
Log Message:



Index: enca.spec
===================================================================
RCS file: /cvs/extras/rpms/enca/FC-3/enca.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- enca.spec	28 Nov 2005 15:13:23 -0000	1.2
+++ enca.spec	19 Dec 2005 16:16:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name: enca
 Summary: Character set analyzer and detector
-Version: 1.8
+Version: 1.9
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Text
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Dmitry Butskoy  - 1.9-1
+- upgrade to 1.9
+
 * Mon Nov 28 2005 Dmitry Butskoy  - 1.8-1
 - upgrade to 1.8
 - update description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enca/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Nov 2005 15:13:23 -0000	1.3
+++ sources	19 Dec 2005 16:16:20 -0000	1.4
@@ -1 +1 @@
-c7ca49601dd80d0300bbb80d5121cf75  enca-1.8.tar.bz2
+b3581e28d68d452286fb0bfe58bed3b3  enca-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 19 16:20:39 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 19 Dec 2005 11:20:39 -0500
Subject: rpms/kdesvn/devel kdesvn-0.7.1-gcc41.patch,NONE,1.1
Message-ID: <200512191620.jBJGKdJ7030101@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30088

Added Files:
	kdesvn-0.7.1-gcc41.patch 
Log Message:
patch to fix gcc41 compile error


kdesvn-0.7.1-gcc41.patch:

--- NEW FILE kdesvn-0.7.1-gcc41.patch ---
--- kdesvn-0.7.1/src/svncpp/targets.hpp.orig	2005-12-14 16:09:29.000000000 -0700
+++ kdesvn-0.7.1/src/svncpp/targets.hpp	2005-12-14 16:13:21.000000000 -0700
@@ -78,7 +78,7 @@
      * Constructor. Convert stringlist into target list.
      * @param targets
      */
-    Targets::Targets(const QStringList&targets);
+    Targets (const QStringList & targets);
 
     /**
      * Copy Constructor



From fedora-extras-commits at redhat.com  Mon Dec 19 17:22:39 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Mon, 19 Dec 2005 12:22:39 -0500
Subject: owners owners.list,1.466,1.467
Message-ID: <200512191723.jBJHN9ra032064@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32044

Modified Files:
	owners.list 
Log Message:
s,!,|,


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -r1.466 -r1.467
--- owners.list	18 Dec 2005 20:26:48 -0000	1.466
+++ owners.list	19 Dec 2005 17:22:37 -0000	1.467
@@ -1312,4 +1312,4 @@
 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|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|
-Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP!enrico.scholz at informatik.tu-chemnitz.de!extras-qa at fedoraproject.org|
+Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 19 17:48:45 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 12:48:45 -0500
Subject: rpms/lapack/FC-4 lapack.spec,1.8,1.9
Message-ID: <200512191749.jBJHnFEE000886@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lapack/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv847/FC-4

Modified Files:
	lapack.spec 
Log Message:

Bump for gcc4.1.



Index: lapack.spec
===================================================================
RCS file: /cvs/extras/rpms/lapack/FC-4/lapack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lapack.spec	15 Nov 2005 15:45:38 -0000	1.8
+++ lapack.spec	19 Dec 2005 17:48:43 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: The LAPACK libraries for numerical linear algebra.
 Name: lapack
 Version: 3.0
-Release: 35%{?dist}
+Release: 36%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
@@ -164,6 +164,9 @@
 %{_libdir}/libblas*.a
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  3.0-36
+- bump for gcc4.1
+
 * Tue Nov 15 2005 Tom "spot" Callaway  3.0-35
 - try not to patch files that do not exist
 



From fedora-extras-commits at redhat.com  Mon Dec 19 17:48:50 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 12:48:50 -0500
Subject: rpms/lapack/devel lapack.spec,1.8,1.9
Message-ID: <200512191749.jBJHnLqD000891@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lapack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv847/devel

Modified Files:
	lapack.spec 
Log Message:

Bump for gcc4.1.



Index: lapack.spec
===================================================================
RCS file: /cvs/extras/rpms/lapack/devel/lapack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lapack.spec	15 Nov 2005 15:45:43 -0000	1.8
+++ lapack.spec	19 Dec 2005 17:48:48 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: The LAPACK libraries for numerical linear algebra.
 Name: lapack
 Version: 3.0
-Release: 35%{?dist}
+Release: 36%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
@@ -164,6 +164,9 @@
 %{_libdir}/libblas*.a
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  3.0-36
+- bump for gcc4.1
+
 * Tue Nov 15 2005 Tom "spot" Callaway  3.0-35
 - try not to patch files that do not exist
 



From fedora-extras-commits at redhat.com  Mon Dec 19 18:06:17 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:06:17 -0500
Subject: rpms/openslp/FC-4 openslp.spec,1.9,1.10
Message-ID: <200512191808.jBJI88i4002754@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/openslp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2698/FC-4

Modified Files:
	openslp.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  1.2.1-4
- make %postun safer



Index: openslp.spec
===================================================================
RCS file: /cvs/extras/rpms/openslp/FC-4/openslp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openslp.spec	16 Nov 2005 17:02:24 -0000	1.9
+++ openslp.spec	19 Dec 2005 18:06:13 -0000	1.10
@@ -1,9 +1,8 @@
-# $Id$
 
 Summary: Open implementation of Service Location Protocol V2
 Name:    openslp
 Version: 1.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   System Environment/Libraries
 License: BSD
@@ -141,8 +140,12 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  1.2.1-4
+- make %%postun safer
+
 * Wed Nov 16 2005 Rex Dieter  1.2.1-3
-- rebuild for new openssl
+- rebuild (for new openssl)
+- make %%postun safer
 
 * Fri Oct 21 2005 Rex Dieter  1.2.1-2
 - -fPIC (for x86_64)



From fedora-extras-commits at redhat.com  Mon Dec 19 18:05:56 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:05:56 -0500
Subject: rpms/openslp/FC-3 openslp.spec,1.6,1.7
Message-ID: <200512191807.jBJI7o3i002750@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/openslp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2698/FC-3

Modified Files:
	openslp.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  1.2.1-4
- make %postun safer



Index: openslp.spec
===================================================================
RCS file: /cvs/extras/rpms/openslp/FC-3/openslp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openslp.spec	16 Nov 2005 17:02:01 -0000	1.6
+++ openslp.spec	19 Dec 2005 18:05:54 -0000	1.7
@@ -1,9 +1,8 @@
-# $Id$
 
 Summary: Open implementation of Service Location Protocol V2
 Name:    openslp
 Version: 1.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   System Environment/Libraries
 License: BSD
@@ -141,8 +140,12 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  1.2.1-4
+- make %%postun safer
+
 * Wed Nov 16 2005 Rex Dieter  1.2.1-3
-- rebuild for new openssl
+- rebuild (for new openssl)
+- make %%postun safer
 
 * Fri Oct 21 2005 Rex Dieter  1.2.1-2
 - -fPIC (for x86_64)



From fedora-extras-commits at redhat.com  Mon Dec 19 18:06:53 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:06:53 -0500
Subject: rpms/openslp/devel openslp.spec,1.10,1.11
Message-ID: <200512191808.jBJI88TZ002753@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/openslp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2698/devel

Modified Files:
	openslp.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  1.2.1-4
- make %postun safer



Index: openslp.spec
===================================================================
RCS file: /cvs/extras/rpms/openslp/devel/openslp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openslp.spec	16 Nov 2005 17:02:49 -0000	1.10
+++ openslp.spec	19 Dec 2005 18:06:51 -0000	1.11
@@ -1,9 +1,8 @@
-# $Id$
 
 Summary: Open implementation of Service Location Protocol V2
 Name:    openslp
 Version: 1.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   System Environment/Libraries
 License: BSD
@@ -141,8 +140,12 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  1.2.1-4
+- make %%postun safer
+
 * Wed Nov 16 2005 Rex Dieter  1.2.1-3
-- rebuild for new openssl
+- rebuild (for new openssl)
+- make %%postun safer
 
 * Fri Oct 21 2005 Rex Dieter  1.2.1-2
 - -fPIC (for x86_64)



From fedora-extras-commits at redhat.com  Mon Dec 19 18:09:04 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:09:04 -0500
Subject: rpms/libtunepimp/devel libtunepimp.spec,1.2,1.3
Message-ID: <200512191809.jBJI9cW1002809@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2762/devel

Modified Files:
	libtunepimp.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0-4
- -tools: fix Req: %name dependancy



Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtunepimp.spec	28 Nov 2005 16:08:37 -0000	1.2
+++ libtunepimp.spec	19 Dec 2005 18:09:02 -0000	1.3
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp 
 Version: 0.4.0 
-Release: 3%{?dist}
+Release: 4%{?dist}
 # README.LGPL implies that it's not completely lgpl, yet.
 License: GPL
 Group: 	 System Environment/Libraries
@@ -32,7 +32,7 @@
 %package tools
 Summary: MusicBrainz tagging tools 
 Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{version}
+Requires: %{name} = %{version}-%{release}
 Obsoletes: trm < %{version}-%{release}
 Provides:  trm = %{version}-%{release}
 %description tools
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0-4
+- -tools: fix Req: %%name dependancy
+
 * Mon Nov 28 2005 Rex Dieter  0.4.0-3
 - -tools: split out %%_bindir bits (to be multi-arch friendly)
 



From fedora-extras-commits at redhat.com  Mon Dec 19 18:08:44 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:08:44 -0500
Subject: rpms/libtunepimp/FC-4 libtunepimp.spec,1.2,1.3
Message-ID: <200512191809.jBJI9nbh002813@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2762/FC-4

Modified Files:
	libtunepimp.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0-4
- -tools: fix Req: %name dependancy



Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-4/libtunepimp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtunepimp.spec	28 Nov 2005 16:08:11 -0000	1.2
+++ libtunepimp.spec	19 Dec 2005 18:08:42 -0000	1.3
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp 
 Version: 0.4.0 
-Release: 3%{?dist}
+Release: 4%{?dist}
 # README.LGPL implies that it's not completely lgpl, yet.
 License: GPL
 Group: 	 System Environment/Libraries
@@ -32,7 +32,7 @@
 %package tools
 Summary: MusicBrainz tagging tools 
 Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{version}
+Requires: %{name} = %{version}-%{release}
 Obsoletes: trm < %{version}-%{release}
 Provides:  trm = %{version}-%{release}
 %description tools
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0-4
+- -tools: fix Req: %%name dependancy
+
 * Mon Nov 28 2005 Rex Dieter  0.4.0-3
 - -tools: split out %%_bindir bits (to be multi-arch friendly)
 



From fedora-extras-commits at redhat.com  Mon Dec 19 18:10:32 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 19 Dec 2005 13:10:32 -0500
Subject: rpms/atlas/devel atlas.spec,1.4,1.5
Message-ID: <200512191811.jBJIB4wG002956@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/atlas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2900

Modified Files:
	atlas.spec 
Log Message:
Rebuild for gcc 4.1.


Index: atlas.spec
===================================================================
RCS file: /cvs/extras/rpms/atlas/devel/atlas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- atlas.spec	10 Oct 2005 15:19:06 -0000	1.4
+++ atlas.spec	19 Dec 2005 18:10:30 -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
@@ -537,6 +537,9 @@
 %endif
 
 %changelog
+* Mon Dec 19 2005 Quentin Spencer  3.6.0-9
+- Rebuild for gcc 4.1.
+
 * 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  Mon Dec 19 18:14:27 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:14:27 -0500
Subject: rpms/kasablanca/FC-3 kasablanca.spec,1.7,1.8
Message-ID: <200512191814.jBJIEv5L003146@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3096/FC-3

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
- %post/%postun: nicer icon bits



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-3/kasablanca.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kasablanca.spec	16 Nov 2005 17:09:01 -0000	1.7
+++ kasablanca.spec	19 Dec 2005 18:14:25 -0000	1.8
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -81,12 +81,17 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-  
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 %postun 
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 
 
 %files -f %{name}.lang
@@ -100,8 +105,11 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
+- %%post/%%postun: nicer icon bits
+
 * Wed Nov 16 2005 Rex Dieter  0.4.0.2-4 
-- rebuild for new openssl
+- rebuild for new openssl (fc5)
 
 * Thu Nov 10 2005 Rex Dieter  0.4.0.2-3
 - abs->relative symlinks



From fedora-extras-commits at redhat.com  Mon Dec 19 18:14:32 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:14:32 -0500
Subject: rpms/kasablanca/FC-4 kasablanca.spec,1.7,1.8
Message-ID: <200512191815.jBJIF3l2003151@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3096/FC-4

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
- %post/%postun: nicer icon bits



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-4/kasablanca.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kasablanca.spec	16 Nov 2005 17:09:08 -0000	1.7
+++ kasablanca.spec	19 Dec 2005 18:14:30 -0000	1.8
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -81,12 +81,17 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-  
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 %postun 
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 
 
 %files -f %{name}.lang
@@ -100,8 +105,11 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
+- %%post/%%postun: nicer icon bits
+
 * Wed Nov 16 2005 Rex Dieter  0.4.0.2-4 
-- rebuild for new openssl
+- rebuild for new openssl (fc5)
 
 * Thu Nov 10 2005 Rex Dieter  0.4.0.2-3
 - abs->relative symlinks



From fedora-extras-commits at redhat.com  Mon Dec 19 18:14:38 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:14:38 -0500
Subject: rpms/kasablanca/devel kasablanca.spec,1.7,1.8
Message-ID: <200512191815.jBJIF8Zh003154@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3096/devel

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
- %post/%postun: nicer icon bits



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kasablanca.spec	16 Nov 2005 17:09:25 -0000	1.7
+++ kasablanca.spec	19 Dec 2005 18:14:36 -0000	1.8
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -81,12 +81,17 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-  
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 %postun 
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 
 
 %files -f %{name}.lang
@@ -100,8 +105,11 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
+- %%post/%%postun: nicer icon bits
+
 * Wed Nov 16 2005 Rex Dieter  0.4.0.2-4 
-- rebuild for new openssl
+- rebuild for new openssl (fc5)
 
 * Thu Nov 10 2005 Rex Dieter  0.4.0.2-3
 - abs->relative symlinks



From fedora-extras-commits at redhat.com  Mon Dec 19 18:29:20 2005
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Mon, 19 Dec 2005 13:29:20 -0500
Subject: owners owners.list,1.467,1.468
Message-ID: <200512191829.jBJITonv003490@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3465

Modified Files:
	owners.list 
Log Message:
Changing owners for fwbuilder and libfwbuilder



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- owners.list	19 Dec 2005 17:22:37 -0000	1.467
+++ owners.list	19 Dec 2005 18:29:18 -0000	1.468
@@ -225,7 +225,7 @@
 Fedora Extras|fuse|File System in Userspace|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|fwbuilder|Firewall Builder|sgrubb at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|fyre|A tool for creating artwork from chaotic functions|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org|
@@ -477,7 +477,7 @@
 Fedora Extras|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|libeXosip2|A library that hides the complexity of using the SIP protocol|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org|
 Fedora Extras|libfac|An extension to Singular-factory|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|libfwbuilder|Firewall Builder API|sgrubb at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|libfwbuilder|Firewall Builder API|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 19 18:30:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 19 Dec 2005 13:30:35 -0500
Subject: rpms/syslog-ng/devel syslog-ng.spec,1.9,1.10
Message-ID: <200512191831.jBJIV52D003524@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/syslog-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3502

Modified Files:
	syslog-ng.spec 
Log Message:
Provides syslog instead of sysklogd (#172885).


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- syslog-ng.spec	30 Nov 2005 15:57:02 -0000	1.9
+++ syslog-ng.spec	19 Dec 2005 18:30:33 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:             syslog-ng
 Version:          1.6.9
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Syslog replacement daemon
 
 Group:            System Environment/Daemons
@@ -25,12 +25,7 @@
 #
 # Keep initscripts and vixie-cron happy
 #
-# rpm -e sysklogd
-# error: removing these packages would break dependencies:
-#        sysklogd >= 1.3.31 is needed by initscripts-6.67-1
-#        sysklogd >= 1.3.33-6 is needed by vixie-cron-3.0.1-64
-#
-Provides:         sysklogd = 1.4.1-99
+Provides:         syslog
 
 %description
 syslog-ng, as the name shows, is a syslogd replacement, but with new 
@@ -119,6 +114,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Jose Pedro Oliveira  - 1.6.9-2
+- Provides syslog instead of sysklogd (#172885).
+
 * Wed Nov 30 2005 Jose Pedro Oliveira  - 1.6.9-1
 - Build conflict statement
   (see: https://lists.balabit.hu/pipermail/syslog-ng/2005-June/007630.html)
@@ -260,4 +258,4 @@
 * Sun Dec 08 2002 Richard E. Perlotto II  1.5.23-1
 - Updated file with notes and PGP signatures
 
-# vim:set ai ts=4 sw=4:
+# vim:set ai ts=4 sw=4 sts=4:



From fedora-extras-commits at redhat.com  Mon Dec 19 19:34:44 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 14:34:44 -0500
Subject: rpms/xforms/devel xforms.spec,1.11,1.12
Message-ID: <200512191935.jBJJZEr3005508@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xforms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5486

Modified Files:
	xforms.spec 
Log Message:
modular X fixes



Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xforms.spec	17 Oct 2005 19:26:33 -0000	1.11
+++ xforms.spec	19 Dec 2005 19:34:41 -0000	1.12
@@ -1,4 +1,3 @@
-# $Id$
 
 Name:    xforms
 Summary: XForms toolkit library
@@ -14,8 +13,10 @@
 
 BuildRequires: libjpeg-devel
 BuildRequires: libGL-devel
-# coming soon
-# BuildRequires: libXpm-devel
+%if "%{?fedora}" > "4"
+BuildRequires: libXpm-devel
+%define x_deps libX11-devel
+%endif
 
 # import/export: png, sgi (optional?)
 Requires: netpbm-progs
@@ -36,6 +37,7 @@
 Summary: Development files for the XForms toolkit library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: %{?x_deps}%{!?x_deps:XFree86-devel}
 %description devel
 %{summary}.
 
@@ -86,6 +88,10 @@
 
 
 %changelog 
+* Mon Dec 19 2005 Rex Dieter  1.0.90-4
+- BR: libXpm-devel
+- -devel: Req: libX11-devel 
+
 * Mon Oct 17 2005 Rex Dieter  1.0.90-3
 - BR: libGL-devel
 - #BR: libXpm-devel (coming soon)



From fedora-extras-commits at redhat.com  Mon Dec 19 20:26:21 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 19 Dec 2005 15:26:21 -0500
Subject: rpms/nautilus-sendto/devel Makefile, 1.1, NONE nautilus-sendto.spec,
	1.1, NONE sources, 1.2, NONE
Message-ID: <200512192026.jBJKQLrk007757@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nautilus-sendto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7737

Removed Files:
	Makefile nautilus-sendto.spec sources 
Log Message:
nautilus-sendto has been sent to FC5.



--- Makefile DELETED ---


--- nautilus-sendto.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Dec 19 20:32:38 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 19 Dec 2005 15:32:38 -0500
Subject: rpms/ufsparse/devel ufsparse-0.92-Makefile-patch, NONE,
	1.1 ufsparse.spec, 1.7, 1.8
Message-ID: <200512192033.jBJKX82w007852@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ufsparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7833

Modified Files:
	ufsparse.spec 
Added Files:
	ufsparse-0.92-Makefile-patch 
Log Message:
Add patch0. Fails on x86_64 without it.


--- NEW FILE ufsparse-0.92-Makefile-patch ---
--- LDL/Makefile.~1~	2005-11-15 12:35:51.000000000 -0600
+++ LDL/Makefile	2005-12-19 14:22:39.000000000 -0600
@@ -6,6 +6,8 @@
 
 include ../UFconfig/UFconfig.mk
 
+C = $(CC) $(CFLAGS)
+
 all: intro libldl.a ldlsimple ldlmain ldlamd
 
 intro:
@@ -24,7 +26,7 @@
 #-------------------------------------------------------------------------------
 
 libldl.a: ldl.c ldl.h
-	$(CC) -c -O ldl.c -o ldl.o
+	$(C) -c ldl.c -o ldl.o
 	$(AR) libldl.a ldl.o
 	- $(RANLIB) libldl.a
 
@@ -33,18 +35,18 @@
 #-------------------------------------------------------------------------------
 
 ldlmain:  ldlmain.c libldl.a
-	$(CC) -O ldlmain.c libldl.a -o ldlmain -lm
+	$(C)  ldlmain.c libldl.a -o ldlmain -lm
 	- ./ldlmain > my_ldlmain.out
 	- diff ldlmain.out my_ldlmain.out
 
 ldlsimple:  ldlsimple.c libldl.a
-	$(CC) -O ldlsimple.c libldl.a -o ldlsimple -lm
+	$(C) ldlsimple.c libldl.a -o ldlsimple -lm
 	- ./ldlsimple > my_ldlsimple.out
 	- diff ldlsimple.out my_ldlsimple.out
 
 ldlamd:  ldlmain.c libldl.a
 	- make -C ../AMD
-	- $(CC) -O -I../AMD/Include -L../AMD/Lib -DUSE_AMD ldlmain.c -lamd libldl.a -o ldlamd -lm
+	- $(C) -I../AMD/Include -L../AMD/Lib -DUSE_AMD ldlmain.c -lamd libldl.a -o ldlamd -lm
 	- ./ldlamd > my_ldlamd.out
 	- diff ldlamd.out my_ldlamd.out
 


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ufsparse.spec	14 Dec 2005 15:56:07 -0000	1.7
+++ ufsparse.spec	19 Dec 2005 20:32:36 -0000	1.8
@@ -1,12 +1,13 @@
 Name:           ufsparse
 Version:        0.92
-Release:        1%{?dist}
+Release:        2%{?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
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q -n UFsparse
+%patch -p0
 chmod -R a+r *
 
 %build
@@ -233,6 +235,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Wed Dec 14 2005 Quentin Spencer  0.92-2
+- Add patch0--fixes LDL/Makefile so CFLAGS are used when compiling ldl.a.
+
 * Wed Dec 14 2005 Quentin Spencer  0.92-1
 - Update to Dec 8 2005 version.
 



From fedora-extras-commits at redhat.com  Mon Dec 19 21:17:15 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 16:17:15 -0500
Subject: rpms/xforms/devel xforms.spec,1.12,1.13
Message-ID: <200512192117.jBJLHkq6009728@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xforms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9710

Modified Files:
	xforms.spec 
Log Message:
Release++



Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xforms.spec	19 Dec 2005 19:34:41 -0000	1.12
+++ xforms.spec	19 Dec 2005 21:17:13 -0000	1.13
@@ -2,7 +2,7 @@
 Name:    xforms
 Summary: XForms toolkit library
 Version: 1.0.90
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: LGPL
 Group:   System Environment/Libraries



From fedora-extras-commits at redhat.com  Mon Dec 19 21:21:37 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 19 Dec 2005 16:21:37 -0500
Subject: rpms/plt-scheme/FC-4 .cvsignore, 1.4, 1.5 plt-scheme.spec, 1.12,
	1.13 sources, 1.4, 1.5
Message-ID: <200512192122.jBJLM7Wg009804@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9782

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version 300


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Nov 2005 01:39:52 -0000	1.4
+++ .cvsignore	19 Dec 2005 21:21:34 -0000	1.5
@@ -1 +1 @@
-plt-299.400-src-unix.tgz
+plt-300-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-4/plt-scheme.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plt-scheme.spec	26 Nov 2005 01:39:52 -0000	1.12
+++ plt-scheme.spec	19 Dec 2005 21:21:34 -0000	1.13
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        299.400
+Version:        300
 Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/299.400/plt/plt-299.400-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/300/plt/plt-300-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,8 +55,6 @@
 %build
 cd src
 %configure --enable-gl --enable-xrender --enable-xft
-# increase default font size
-#sed -i -e "s|fsize = 10|fsize = 12|" wxxt/src/Application/AppMain.cc
 make %{?_smp_mflags}
 
 
@@ -86,6 +84,9 @@
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes
 
+# get-base.ss causes error during install
+find $RPM_BUILD_ROOT%{_libdir}/plt -name get-base\* | xargs rm -f
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
@@ -129,6 +130,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Gerard Milmeister  - 300-1
+- New Version 300
+
 * Sat Nov 26 2005 Gerard Milmeister  - 299.400-1
 - New Version 299.400
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Nov 2005 01:39:52 -0000	1.4
+++ sources	19 Dec 2005 21:21:34 -0000	1.5
@@ -1 +1 @@
-fb79312397d11c456d6ee32b695f7fbb  plt-299.400-src-unix.tgz
+0e1d7d5dd06b3c290faa2d609e3df43f  plt-300-src-unix.tgz



From fedora-extras-commits at redhat.com  Mon Dec 19 21:25:13 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 16:25:13 -0500
Subject: rpms/kasablanca/FC-4 kasablanca.spec,1.8,1.9
Message-ID: <200512192126.jBJLQDIC009927@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9856/FC-4

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0.2-6
- fix for modular X
- workaround kdelibs-devel missing deps (#176159)



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-4/kasablanca.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kasablanca.spec	19 Dec 2005 18:14:30 -0000	1.8
+++ kasablanca.spec	19 Dec 2005 21:25:11 -0000	1.9
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 5%{?dist}
+Release: 5%{?dist}.1
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -14,6 +14,11 @@
 BuildRequires: desktop-file-utils
 BuildRequires: openssl-devel
 BuildRequires: kdelibs-devel >= 6:3.3
+# Workaround for kdelibs-devel missing deps:
+# http://bugzilla.redhat.com/bugzilla/176159
+%if "%{?fedora}" > "4"
+BuildRequires: xorg-x11-proto-devel libXt-devel
+%endif
 
 %description
 Kasablanca is an ftp client for KDE, among its features are currently 
@@ -105,6 +110,10 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0.2-6
+- fix for modular X
+- workaround kdelibs-devel missing deps (#176159)
+
 * Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
 - %%post/%%postun: nicer icon bits
 



From fedora-extras-commits at redhat.com  Mon Dec 19 21:25:44 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 16:25:44 -0500
Subject: rpms/kasablanca/FC-4 kasablanca.spec,1.9,1.10
Message-ID: <200512192126.jBJLQE46009930@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9893/FC-4

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0.2-6
- fix for modular X
- workaround kdelibs-devel missing deps (#176159)



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-4/kasablanca.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kasablanca.spec	19 Dec 2005 21:25:11 -0000	1.9
+++ kasablanca.spec	19 Dec 2005 21:25:42 -0000	1.10
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 5%{?dist}.1
+Release: 6%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 



From fedora-extras-commits at redhat.com  Mon Dec 19 21:25:18 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 16:25:18 -0500
Subject: rpms/kasablanca/devel kasablanca.spec,1.8,1.9
Message-ID: <200512192126.jBJLQI1P009933@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9856/devel

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0.2-6
- fix for modular X
- workaround kdelibs-devel missing deps (#176159)



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kasablanca.spec	19 Dec 2005 18:14:36 -0000	1.8
+++ kasablanca.spec	19 Dec 2005 21:25:16 -0000	1.9
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 5%{?dist}
+Release: 5%{?dist}.1
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -14,6 +14,11 @@
 BuildRequires: desktop-file-utils
 BuildRequires: openssl-devel
 BuildRequires: kdelibs-devel >= 6:3.3
+# Workaround for kdelibs-devel missing deps:
+# http://bugzilla.redhat.com/bugzilla/176159
+%if "%{?fedora}" > "4"
+BuildRequires: xorg-x11-proto-devel libXt-devel
+%endif
 
 %description
 Kasablanca is an ftp client for KDE, among its features are currently 
@@ -105,6 +110,10 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0.2-6
+- fix for modular X
+- workaround kdelibs-devel missing deps (#176159)
+
 * Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
 - %%post/%%postun: nicer icon bits
 



From fedora-extras-commits at redhat.com  Mon Dec 19 21:25:49 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 16:25:49 -0500
Subject: rpms/kasablanca/devel kasablanca.spec,1.9,1.10
Message-ID: <200512192126.jBJLQJBF009936@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9893/devel

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0.2-6
- fix for modular X
- workaround kdelibs-devel missing deps (#176159)



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kasablanca.spec	19 Dec 2005 21:25:16 -0000	1.9
+++ kasablanca.spec	19 Dec 2005 21:25:47 -0000	1.10
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 5%{?dist}.1
+Release: 6%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 



From fedora-extras-commits at redhat.com  Mon Dec 19 21:28:37 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 19 Dec 2005 16:28:37 -0500
Subject: rpms/plt-scheme/FC-3 .cvsignore, 1.3, 1.4 plt-scheme.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200512192129.jBJLT79w010178@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10138/FC-3

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version 300


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Nov 2005 01:39:46 -0000	1.3
+++ .cvsignore	19 Dec 2005 21:28:35 -0000	1.4
@@ -1 +1 @@
-plt-299.400-src-unix.tgz
+plt-300-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-3/plt-scheme.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plt-scheme.spec	26 Nov 2005 01:42:50 -0000	1.7
+++ plt-scheme.spec	19 Dec 2005 21:28:35 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        299.400
-Release:        2%{?dist}
+Version:        300
+Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/299.400/plt/plt-299.400-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/300/plt/plt-300-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,8 +54,6 @@
 %build
 cd src
 %configure --enable-gl --enable-xrender --enable-xft
-# increase default font size
-#sed -i -e "s|fsize = 10|fsize = 12|" wxxt/src/Application/AppMain.cc
 make %{?_smp_mflags}
 
 %install
@@ -83,6 +81,8 @@
 
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes
+# get-base.ss causes error during install
+find $RPM_BUILD_ROOT%{_libdir}/plt -name get-base\* | xargs rm -f
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Gerard Milmeister  - 300-1
+- New Version 300
+
 * Sat Nov 26 2005 Gerard Milmeister  - 299.400-1
 - New Version 299.400
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Nov 2005 01:39:46 -0000	1.4
+++ sources	19 Dec 2005 21:28:35 -0000	1.5
@@ -1 +1 @@
-fb79312397d11c456d6ee32b695f7fbb  plt-299.400-src-unix.tgz
+0e1d7d5dd06b3c290faa2d609e3df43f  plt-300-src-unix.tgz



From fedora-extras-commits at redhat.com  Mon Dec 19 21:28:43 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 19 Dec 2005 16:28:43 -0500
Subject: rpms/plt-scheme/devel .cvsignore, 1.3, 1.4 plt-scheme.spec, 1.18,
	1.19 sources, 1.4, 1.5
Message-ID: <200512192129.jBJLTDdi010183@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10138/devel

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version 300


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Nov 2005 01:39:57 -0000	1.3
+++ .cvsignore	19 Dec 2005 21:28:40 -0000	1.4
@@ -1 +1 @@
-plt-299.400-src-unix.tgz
+plt-300-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plt-scheme.spec	26 Nov 2005 01:39:57 -0000	1.18
+++ plt-scheme.spec	19 Dec 2005 21:28:40 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        299.400
+Version:        300
 Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/299.400/plt/plt-299.400-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/300/plt/plt-300-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 Patch1:		plt-xft.patch
@@ -68,8 +68,6 @@
 %build
 cd src
 %configure --enable-gl --enable-xrender --enable-xft
-# increase default font size
-#sed -i -e "s|fsize = 10|fsize = 12|" wxxt/src/Application/AppMain.cc
 make %{?_smp_mflags}
 
 
@@ -98,6 +96,8 @@
 
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes
+# get-base.ss causes error during install
+find $RPM_BUILD_ROOT%{_libdir}/plt -name get-base\* | xargs rm -f
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Gerard Milmeister  - 300-1
+- New Version 300
+
 * Sat Nov 26 2005 Gerard Milmeister  - 299.400-1
 - New Version 299.400
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Nov 2005 01:39:57 -0000	1.4
+++ sources	19 Dec 2005 21:28:40 -0000	1.5
@@ -1 +1 @@
-fb79312397d11c456d6ee32b695f7fbb  plt-299.400-src-unix.tgz
+0e1d7d5dd06b3c290faa2d609e3df43f  plt-300-src-unix.tgz



From fedora-extras-commits at redhat.com  Mon Dec 19 21:36:25 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 16:36:25 -0500
Subject: rpms/libtunepimp/devel libtunepimp-0.4.0-gcc41.patch, NONE,
	1.1 libtunepimp.spec, 1.3, 1.4 libtunepimp-0.3.0-gcc4.patch,
	1.1, NONE
Message-ID: <200512192136.jBJLatSY010399@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10374

Modified Files:
	libtunepimp.spec 
Added Files:
	libtunepimp-0.4.0-gcc41.patch 
Removed Files:
	libtunepimp-0.3.0-gcc4.patch 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0-5
- update gcc4 patch


libtunepimp-0.4.0-gcc41.patch:

--- NEW FILE libtunepimp-0.4.0-gcc41.patch ---
--- libtunepimp-0.4.0/include/tunepimp/metadata.h.gcc41	2005-11-11 17:45:45.000000000 -0600
+++ libtunepimp-0.4.0/include/tunepimp/metadata.h	2005-12-19 15:32:25.000000000 -0600
@@ -59,7 +59,7 @@
     // This is only used in case of TRM collision
     int           numTRMIds;
 
-    Metadata::Metadata(void) 
+    Metadata(void) 
     { 
         trackNum = 0; 
         duration = 0; 
@@ -72,11 +72,11 @@
         totalInSet = 0;
     };
 
-    Metadata::~Metadata(void) 
+    ~Metadata(void) 
     {
     }
 
-    Metadata &Metadata::operator=(const Metadata &other)
+    Metadata &operator=(const Metadata &other)
     {
         artist = other.artist;
         sortName = other.sortName;
@@ -104,7 +104,7 @@
         return *this;
     };
 
-    bool Metadata::isEmpty(void)
+    bool isEmpty(void)
     {
         return (artist.empty() && album.empty() && track.empty() &&
             trackNum == 0 && duration == 0 && fileTrm.empty() &&
@@ -112,7 +112,7 @@
             sortName.empty() && fileFormat.empty());
     }
 
-    bool Metadata::operator==(const Metadata &other)
+    bool operator==(const Metadata &other)
     {
         if (artist == other.artist &&
             album == other.album &&
@@ -140,7 +140,7 @@
         return false;
     };
 
-    void Metadata::clear(void)
+    void clear(void)
     {
         artist = "";
         album = "";
@@ -164,7 +164,7 @@
         totalInSet = 0;
     }
 
-    void Metadata::readFromC(const metadata_t *mdata)
+    void readFromC(const metadata_t *mdata)
     {
         artist = mdata->artist;
         sortName = mdata->sortName;
@@ -190,7 +190,7 @@
         totalInSet = mdata->totalInSet;
     }
 
-    void Metadata::writeToC(metadata_t *mdata) const
+    void writeToC(metadata_t *mdata) const
     {
         memset(mdata, 0, sizeof(metadata_t));
 
@@ -218,7 +218,7 @@
         mdata->totalInSet = totalInSet;
     }
 
-    void Metadata::print(void)
+    void print(void)
     {
         printf("artist: '%s'\n", artist.c_str());
         printf("sortName: '%s'\n", sortName.c_str());


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libtunepimp.spec	19 Dec 2005 18:09:02 -0000	1.3
+++ libtunepimp.spec	19 Dec 2005 21:36:23 -0000	1.4
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp 
 Version: 0.4.0 
-Release: 4%{?dist}
+Release: 5%{?dist}
 # README.LGPL implies that it's not completely lgpl, yet.
 License: GPL
 Group: 	 System Environment/Libraries
@@ -10,7 +10,7 @@
 Source:	 http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-0.4.0.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: libtunepimp-0.3.0-gcc4.patch
+Patch1:  libtunepimp-0.4.0-gcc41.patch
 
 BuildRequires: readline-devel
 BuildRequires: libvorbis-devel
@@ -42,7 +42,7 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .gcc4
+%patch1 -p1 -b .gcc41
 
 
 %build
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0-5
+- update gcc4 patch
+
 * Mon Dec 19 2005 Rex Dieter  0.4.0-4
 - -tools: fix Req: %%name dependancy
 


--- libtunepimp-0.3.0-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Dec 19 22:23:07 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 19 Dec 2005 17:23:07 -0500
Subject: rpms/octave/devel octave.spec,1.26,1.27
Message-ID: <200512192223.jBJMNidF012226@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12207

Modified Files:
	octave.spec 
Log Message:
Rebuild for gcc 4.1.


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- octave.spec	1 Dec 2005 14:57:44 -0000	1.26
+++ octave.spec	19 Dec 2005 22:23:04 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           octave
 Version:        2.9.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Quentin Spencer  2.9.4-4
+- Rebuild for gcc 4.1.
+
 * Thu Dec  1 2005 Quentin Spencer  2.9.4-3
 - Make sure patch applies correctly before building!
 



From fedora-extras-commits at redhat.com  Mon Dec 19 22:29:07 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 19 Dec 2005 17:29:07 -0500
Subject: rpms/new - New directory
Message-ID: <200512192229.jBJMT7q3012305@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/new
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12296/new

Log Message:
Directory /cvs/extras/rpms/new added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 19 22:29:13 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 19 Dec 2005 17:29:13 -0500
Subject: rpms/new/devel - New directory
Message-ID: <200512192229.jBJMTDwL012321@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12296/new/devel

Log Message:
Directory /cvs/extras/rpms/new/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 19 22:29:27 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 19 Dec 2005 17:29:27 -0500
Subject: rpms/new Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512192229.jBJMTRjc012356@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/new
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12343

Added Files:
	Makefile import.log 
Log Message:
Setup of module new


--- NEW FILE Makefile ---
# Top level Makefile for module new
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 19 22:29:36 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 19 Dec 2005 17:29:36 -0500
Subject: rpms/new/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512192229.jBJMTaHc012375@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12343/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module new


--- NEW 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 Dec 19 22:30:14 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 19 Dec 2005 17:30:14 -0500
Subject: rpms/new import.log,1.1,1.2
Message-ID: <200512192230.jBJMUiMS012445@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/new
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12409

Modified Files:
	import.log 
Log Message:
auto-import new-1.3.5-2 on branch devel from new-1.3.5-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/new/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Dec 2005 22:29:25 -0000	1.1
+++ import.log	19 Dec 2005 22:30:12 -0000	1.2
@@ -0,0 +1 @@
+new-1_3_5-2:HEAD:new-1.3.5-2.src.rpm:1135031407



From fedora-extras-commits at redhat.com  Mon Dec 19 22:30:20 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 19 Dec 2005 17:30:20 -0500
Subject: rpms/new/devel new.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200512192230.jBJMUouN012449@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12409/devel

Modified Files:
	.cvsignore sources 
Added Files:
	new.spec 
Log Message:
auto-import new-1.3.5-2 on branch devel from new-1.3.5-2.src.rpm


--- NEW FILE new.spec ---
Summary: A simple template system
Name: new
Version: 1.3.5
Release: 2
License: GPL
Group: Development/Tools
Source: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://www.flyn.org
Requires: zlib
BuildRequires: glib2-devel, zlib-devel

%description
New is a template system, especially useful in conjunction with a 
simple text editor such as vi. The user maintains templates which 
may contain format strings. At run time, new replaces the format 
strings in a template with appropriate values to create a new file.

For example, given the following template:


//   FILE: %%(FILE)
// AUTHOR: %%(FULLNAME)
//   DATE: %%(DATE)

// Copyright (C) 1999 %(FULLNAME) %(EMAIL)
// All rights reserved.
new will create:


//   FILE: foo.cpp
// AUTHOR: W. Michael Petullo
//   DATE: 11 September 1999

// Copyright (C) 1999 W. Michael Petullo new at flyn.org
// All rights reserved.
on my computer.

The program understands plaintext or gziped template files.

Building new also creates a shared library, libnewtemplate, which 
allows the programmer access to new's functionality.

%package devel
Summary: Files needed to develop applications using new's libraries
Group: Development/Libraries
Requires: new = %{version}-%{release}
Requires: glib2-devel, zlib-devel

%description devel
New is a template system, especially useful in conjunction with a
simple text editor such as vi. The user maintains templates which may
contain format strings. At run time, new replaces the format strings in
a template with appropriate values to create a new file.  This package
provides the libraries, include files, and other resources needed for
developing applications using new's API.

%prep


%setup


%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
rm -f ${RPM_BUILD_ROOT}/usr/lib/libnewfmt_ptrn.a
rm -f ${RPM_BUILD_ROOT}/usr/lib/libnewfmt_ptrn.la
rm -f ${RPM_BUILD_ROOT}/usr/lib/libnewtemplate.a
rm -f ${RPM_BUILD_ROOT}/usr/lib/libnewtemplate.la



%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%{_bindir}/*
%{_libdir}/lib*.so.*
%{_datadir}/new
%{_mandir}/*/*
%doc	AUTHORS COPYING ChangeLog INSTALL README

%files devel
%{_libdir}/pkgconfig/new.pc
%{_includedir}/new
%{_libdir}/lib*.so


%changelog
* Tue Dec 13 2005 W. Michael Petullo  - 1.3.5-2
   - Broke out -devel package.
   - Simplifies %files block.
   - Don't use %doc %{_mandir}.
   - No empty NEWS or FAQ.

* Sun Dec 11 2005 W. Michael Petullo  - 1.3.5-1
   - Updated to new 1.3.5.






Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/new/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Dec 2005 22:29:34 -0000	1.1
+++ .cvsignore	19 Dec 2005 22:30:18 -0000	1.2
@@ -0,0 +1 @@
+new-1.3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/new/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Dec 2005 22:29:34 -0000	1.1
+++ sources	19 Dec 2005 22:30:18 -0000	1.2
@@ -0,0 +1 @@
+916a0ccdc842f11a15e3c4e2bf9048f8  new-1.3.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 19 22:33:13 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 19 Dec 2005 17:33:13 -0500
Subject: owners owners.list,1.468,1.469
Message-ID: <200512192233.jBJMXhWq012512@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12494

Modified Files:
	owners.list 
Log Message:
Added entry for new.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- owners.list	19 Dec 2005 18:29:18 -0000	1.468
+++ owners.list	19 Dec 2005 22:33:11 -0000	1.469
@@ -629,6 +629,7 @@
 Fedora Extras|netmask|Utility for determining network masks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|NetworkManager-vpnc|NetworkManager VPN integration for vpnc|davidz at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|neverball|Roll a ball through an obstacle course|nos at utelsystems.com|extras-qa at fedoraproject.org|
+Fedora Extras|new|A simple template system|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|newpg|Temporary project to work on GnuPG extensions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|newscache|Free cache server for USENET News|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 19 23:49:07 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 18:49:07 -0500
Subject: rpms/scalapack/FC-3 scalapack.spec,1.6,1.7
Message-ID: <200512192349.jBJNnbta014505@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/scalapack/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14455/FC-3

Modified Files:
	scalapack.spec 
Log Message:

gcc4.1



Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scalapack.spec	15 May 2005 18:40:34 -0000	1.6
+++ scalapack.spec	19 Dec 2005 23:49:05 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
@@ -72,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  1.7-8
+- rebuild for gcc4.1
+
 * Sun May 15 2005 Tom "spot" Callaway  1.7-7
 - 64 bit library fix
 



From fedora-extras-commits at redhat.com  Mon Dec 19 23:49:13 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 18:49:13 -0500
Subject: rpms/scalapack/FC-4 scalapack.spec,1.8,1.9
Message-ID: <200512192349.jBJNnhID014508@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/scalapack/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14455/FC-4

Modified Files:
	scalapack.spec 
Log Message:

gcc4.1



Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scalapack.spec	15 May 2005 18:40:34 -0000	1.8
+++ scalapack.spec	19 Dec 2005 23:49:11 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
@@ -72,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  1.7-8
+- rebuild for gcc4.1
+
 * Sun May 15 2005 Tom "spot" Callaway  1.7-7
 - 64 bit library fix
 



From fedora-extras-commits at redhat.com  Mon Dec 19 23:49:18 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 18:49:18 -0500
Subject: rpms/scalapack/devel scalapack.spec,1.8,1.9
Message-ID: <200512192349.jBJNnm9b014511@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/scalapack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14455/devel

Modified Files:
	scalapack.spec 
Log Message:

gcc4.1



Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scalapack.spec	15 May 2005 18:40:34 -0000	1.8
+++ scalapack.spec	19 Dec 2005 23:49:16 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
@@ -72,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  1.7-8
+- rebuild for gcc4.1
+
 * Sun May 15 2005 Tom "spot" Callaway  1.7-7
 - 64 bit library fix
 



From fedora-extras-commits at redhat.com  Tue Dec 20 00:05:51 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 19:05:51 -0500
Subject: rpms/blacs/FC-4 blacs.spec,1.14,1.15
Message-ID: <200512200007.jBK07BPM016344@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16273/FC-4

Modified Files:
	blacs.spec 
Log Message:

gcc4.1 rebuild



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- blacs.spec	31 Jul 2005 13:51:39 -0000	1.14
+++ blacs.spec	20 Dec 2005 00:05:49 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -107,6 +107,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  1.1-18
+- rebuild for gcc4.1
+
 * Sun Jul 31 2005 Tom "spot" Callaway  1.1-17
 - fix g77 for FC-3 spec
 



From fedora-extras-commits at redhat.com  Tue Dec 20 00:05:24 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 19:05:24 -0500
Subject: rpms/blacs/FC-3 blacs.spec,1.14,1.15
Message-ID: <200512200007.jBK07Bmn016343@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16273/FC-3

Modified Files:
	blacs.spec 
Log Message:

gcc4.1 rebuild



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- blacs.spec	31 Jul 2005 13:51:39 -0000	1.14
+++ blacs.spec	20 Dec 2005 00:05:22 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -107,6 +107,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  1.1-18
+- rebuild for gcc4.1
+
 * Sun Jul 31 2005 Tom "spot" Callaway  1.1-17
 - fix g77 for FC-3 spec
 



From fedora-extras-commits at redhat.com  Tue Dec 20 00:06:19 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 19:06:19 -0500
Subject: rpms/blacs/devel blacs.spec,1.14,1.15
Message-ID: <200512200008.jBK07cxI016359@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16273/devel

Modified Files:
	blacs.spec 
Log Message:

gcc4.1 rebuild



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- blacs.spec	31 Jul 2005 13:51:40 -0000	1.14
+++ blacs.spec	20 Dec 2005 00:06:17 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -107,6 +107,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  1.1-18
+- rebuild for gcc4.1
+
 * Sun Jul 31 2005 Tom "spot" Callaway  1.1-17
 - fix g77 for FC-3 spec
 



From fedora-extras-commits at redhat.com  Tue Dec 20 03:14:59 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 19 Dec 2005 22:14:59 -0500
Subject: rpms/scim-fcitx/devel - New directory
Message-ID: <200512200314.jBK3Exh6021889@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21866/scim-fcitx/devel

Log Message:
Directory /cvs/extras/rpms/scim-fcitx/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 03:14:56 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 19 Dec 2005 22:14:56 -0500
Subject: rpms/scim-fcitx - New directory
Message-ID: <200512200315.jBK3Euc3021876@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21866/scim-fcitx

Log Message:
Directory /cvs/extras/rpms/scim-fcitx added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 03:15:33 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 19 Dec 2005 22:15:33 -0500
Subject: rpms/scim-fcitx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512200315.jBK3FXOY021949@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21927

Added Files:
	Makefile import.log 
Log Message:
Setup of module scim-fcitx


--- NEW FILE Makefile ---
# Top level Makefile for module scim-fcitx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 20 03:15:54 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 19 Dec 2005 22:15:54 -0500
Subject: rpms/scim-fcitx/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512200315.jBK3Fshq021979@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21927/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module scim-fcitx


--- NEW 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 Dec 20 03:16:44 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 19 Dec 2005 22:16:44 -0500
Subject: rpms/scim-fcitx import.log,1.1,1.2
Message-ID: <200512200317.jBK3HFxm022050@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22014

Modified Files:
	import.log 
Log Message:
auto-import scim-fcitx-3.1.1-2 on branch devel from scim-fcitx-3.1.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Dec 2005 03:15:30 -0000	1.1
+++ import.log	20 Dec 2005 03:16:42 -0000	1.2
@@ -0,0 +1 @@
+scim-fcitx-3_1_1-2:HEAD:scim-fcitx-3.1.1-2.src.rpm:1135048595



From fedora-extras-commits at redhat.com  Tue Dec 20 03:16:50 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 19 Dec 2005 22:16:50 -0500
Subject: rpms/scim-fcitx/devel scim-fcitx.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512200317.jBK3HKGO022054@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22014/devel

Modified Files:
	.cvsignore sources 
Added Files:
	scim-fcitx.spec 
Log Message:
auto-import scim-fcitx-3.1.1-2 on branch devel from scim-fcitx-3.1.1-2.src.rpm


--- NEW FILE scim-fcitx.spec ---
Name:           scim-fcitx
Version:        3.1.1
Release:        2%{?dist}
Summary:        FCITX Input Method Engine for SCIM

Group:          System Environment/Libraries
License:        GPL
URL:            http://www.scim-im.org/projects/imengines/
Source0:        http://dl.sourceforge.net/scim/%{name}.%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  scim-devel
Requires:	scim

%description
scim-fcitx is a port of the fcitx Chinese input method for the SCIM input
method platform.  It provides Wubi, Erbi, Cangjie, and Pinyin styles of input.


%package tools
Summary:    Fcitx tables tools
Group:      Development/Libraries

%description tools
This package contains input table tools from fcitx.


%prep
%setup -q -n fcitx


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=${RPM_BUILD_ROOT} install

rm $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/IMEngine/fcitx.la


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING README ChangeLog
%{_libdir}/scim-1.0/IMEngine/fcitx.so
%{_datadir}/scim/fcitx
%{_datadir}/scim/icons/fcitx


%files tools
%defattr(-, root, root)
%{_bindir}/*


%changelog
* Tue Dec 20 2005 Jens Petersen  - 3.1.1-2
- package cleanup (John Mahowald)

* Wed Oct  5 2005 Jens Petersen  - 3.1.1-1
- initial packaging for Fedora Extras.

* Mon Jun 20 2005 Jens Petersen 
- rebuild against scim-1.3.1

* Tue Jun 14 2005 Jens Petersen 
- initial build

* Thu May  5 2005 Haojun Bao 
- first release of scim-fcitx.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Dec 2005 03:15:39 -0000	1.1
+++ .cvsignore	20 Dec 2005 03:16:48 -0000	1.2
@@ -0,0 +1 @@
+scim-fcitx.3.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Dec 2005 03:15:39 -0000	1.1
+++ sources	20 Dec 2005 03:16:48 -0000	1.2
@@ -0,0 +1 @@
+781dc96ebce31e2949ecb0c3c1c769f6  scim-fcitx.3.1.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Dec 20 03:24:41 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 19 Dec 2005 22:24:41 -0500
Subject: owners owners.list,1.469,1.470
Message-ID: <200512200325.jBK3PBRc022175@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22157

Modified Files:
	owners.list 
Log Message:
add scim-fcitx



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -r1.469 -r1.470
--- owners.list	19 Dec 2005 22:33:11 -0000	1.469
+++ owners.list	20 Dec 2005 03:24:39 -0000	1.470
@@ -1065,6 +1065,7 @@
 Fedora Extras|scim|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-chewing|SCIM IMEngine for Traditional Chinese|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|scim-fcitx|fcitx SCIM IMEngine for Simplified Chinese|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-hangul|SCIM IMEngine for Korean Hangul|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-input-pad|SCIM On-screen Input Pad|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|scim-m17n|m17n-lib input method for SCIM|petersen at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 20 10:12:31 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 20 Dec 2005 05:12:31 -0500
Subject: fedora-security/audit fc4,1.110,1.111 fc5,1.20,1.21
Message-ID: <200512201012.jBKACVvw002730@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2707

Modified Files:
	fc4 fc5 
Log Message:
More fc4 releases and CVE feed entries



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- fc4	19 Dec 2005 09:44:50 -0000	1.110
+++ fc4	20 Dec 2005 10:12:13 -0000	1.111
@@ -1,12 +1,17 @@
-Up to date CVE as of CVE email 20051218
-Up to date FC4 as of 20051218
+Up to date CVE as of CVE email 20051219
+Up to date FC4 as of 20051219
 
 ** are items that need attention
 
+CVE-2005-4348 VULNERABLE (fetchmail)
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 backport (sudo) [since FEDORA-2005-1147] was ignore only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
+CVE-2005-4153 VULNERABLE (mailman)
+CVE-2005-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-4077 backport (curl) [since FEDORA-2005-1137]
+CVE-2005-3896 ignore (mozilla) recoverable DoS only
 CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
@@ -14,17 +19,17 @@
 CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169]
 CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3193 backport (poppler) [since FEDORA-2005-1132]
+CVE-2005-3193 backport (poppler) [since FEDORA-2005-1171]
 CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169]
 CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3192 backport (poppler) [since FEDORA-2005-1132]
+CVE-2005-3192 backport (poppler) [since FEDORA-2005-1171]
 CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169]
 CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3191 backport (poppler) [since FEDORA-2005-1132]
+CVE-2005-3191 backport (poppler) [since FEDORA-2005-1171]
 CVE-2005-3964 VULNERABLE (openmotif) bz#174815
 CVE-2005-3962 backport (perl) [since FEDORA-2005-1144]
 CVE-2005-3912 backport (perl) [since FEDORA-2005-1144]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fc5	16 Dec 2005 09:00:46 -0000	1.20
+++ fc5	20 Dec 2005 10:12:13 -0000	1.21
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20051214
+Up to date CVE as of CVE email 20051219
 Up to date FC5 as of FC5-Test1-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -12,10 +12,15 @@
 
 ** are items that need attention
 
+CVE-2005-4348 VULNERABLE (fetchmail, fixed 6.2.5.5, fixed 6.3.1)
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
+CVE-2005-4153 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-4077 VULNERABLE (curl)
+CVE-2005-3896 ignore (mozilla) recoverable DoS only
 CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)



From fedora-extras-commits at redhat.com  Tue Dec 20 12:10:52 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:10:52 -0500
Subject: rpms/grads - New directory
Message-ID: <200512201210.jBKCAq9I006382@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6364/grads

Log Message:
Directory /cvs/extras/rpms/grads added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 12:11:16 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:11:16 -0500
Subject: rpms/grads/devel - New directory
Message-ID: <200512201211.jBKCBGmH006406@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6364/grads/devel

Log Message:
Directory /cvs/extras/rpms/grads/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 12:11:38 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:11:38 -0500
Subject: rpms/grads Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512201211.jBKCBcMj006443@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6430

Added Files:
	Makefile import.log 
Log Message:
Setup of module grads


--- NEW FILE Makefile ---
# Top level Makefile for module grads
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 20 12:11:44 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:11:44 -0500
Subject: rpms/grads/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512201211.jBKCBiwr006462@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6430/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module grads


--- NEW 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 Dec 20 12:16:23 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:16:23 -0500
Subject: rpms/grads import.log,1.1,1.2
Message-ID: <200512201216.jBKCGrpQ006603@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6550

Modified Files:
	import.log 
Log Message:
auto-import grads-1.9b4-4 on branch devel from grads-1.9b4-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/grads/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Dec 2005 12:11:36 -0000	1.1
+++ import.log	20 Dec 2005 12:16:21 -0000	1.2
@@ -0,0 +1 @@
+grads-1_9b4-4:HEAD:grads-1.9b4-4.src.rpm:1135080969



From fedora-extras-commits at redhat.com  Tue Dec 20 12:16:29 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:16:29 -0500
Subject: rpms/grads/devel NOTICE.wgrib, NONE, 1.1 grads-README.xorg, NONE,
	1.1 grads-build_fixes.diff, NONE,
	1.1 grads-conditionnal_lats.diff, NONE,
	1.1 grads-copyright_summary, NONE, 1.1 grads-remove-files,
	NONE, 1.1 grads-removed-files-list, NONE, 1.1 grads.spec, NONE,
	1.1 grads_dap-no_lats.patch, NONE, 1.1 libdap.m4, NONE,
	1.1 libnc-dap.m4, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512201216.jBKCGT5a006591@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6550/devel

Modified Files:
	.cvsignore sources 
Added Files:
	NOTICE.wgrib grads-README.xorg grads-build_fixes.diff 
	grads-conditionnal_lats.diff grads-copyright_summary 
	grads-remove-files grads-removed-files-list grads.spec 
	grads_dap-no_lats.patch libdap.m4 libnc-dap.m4 
Log Message:
auto-import grads-1.9b4-4 on branch devel from grads-1.9b4-4.src.rpm


--- NEW FILE NOTICE.wgrib ---
The following files are placed into the public domain.  While
you could legally do anything you want with the code, telling
the world that you wrote it would be uncool.  Selling it would
be really uncool.  The code was written for NMC/NCAR Reanalysis 
and may not work GRIB files from other sources.  The code,
as usual, is not warranteed to be fit for any purpose what so ever.
Use at your own risk.


	Wesley Ebisuzaki November 25, 1995



BDS_unpack.c
bds.h
bms.h
cnames.c
cnames.h
gds.h
grib.h
ibm2flt.c
intpower.c
pds3.h
readgrib.c
seekgrib.c
testbin.c
wgrib.c




--- NEW FILE grads-README.xorg ---
You should enable the BackingStore capability of your X server if you want 
to avoid that windows on top of the grads window erase the grads window
content. With xorg, you should put the following in the Device section of
xorg.conf:

	Option      "BackingStore" "True"

With this option, xorg will use more CPU.

grads-build_fixes.diff:

--- NEW FILE grads-build_fixes.diff ---
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/acinclude.m4 grads-1.9b4/acinclude.m4
--- grads-1.9b4-orig/acinclude.m4	2003-10-02 16:01:15.000000000 +0200
+++ grads-1.9b4/acinclude.m4	2005-08-16 12:08:41.000000000 +0200
@@ -165,10 +165,10 @@
 dnl 		   enabled, just calls AC_CHECK_LIB. If not, checks for the presence
 dnl		   of a file "libname.a" in the supplibs directory. 
 dnl  args:	   library-name, extra-libs, action-if-found, action-if-not-found
-AC_DEFUN(GA_CHECK_LIB,
+AC_DEFUN([GA_CHECK_LIB],
 [
   if test "${ga_dyn_supplibs}" = "yes" ; then
-     AC_CHECK_LIB($1, $2, $3, $4)
+     AC_CHECK_LIB([$1], [$2], [$3], [$4], [$5])
   else 
      AC_MSG_CHECKING([for lib$1.a in supplibs])
      if test -f "${ga_supplib_dir}/lib/lib$1.a" ; then
@@ -249,7 +249,39 @@
   GA_UNSET_FLAGS
 ])
 
+dnl GA_CHECK_NEW_GUI : Checks whether GrADS can be built with GUI features 
+dnl  		      	enabled. Check libsx without freq.
+dnl  args : 		action-if-yes, action-if-no
+AC_DEFUN([GA_CHECK_NEW_GUI],
+[
+  # Check libs and headers for GUI widgets
+  GA_SET_FLAGS([$X_CFLAGS], [$X_LIBS])
 
+  ga_check_new_gui="no"
+  AC_CHECK_HEADER([libsx.h],
+  [ AC_CHECK_LIB([Xt],[main],
+    [ AC_CHECK_LIB([Xaw],[main],
+      [ AC_CHECK_LIB([Xmu],[main],
+	  [ GA_CHECK_LIB([sx],[GetFile],
+	    [ ga_check_new_gui="yes"
+            ],
+	    [ ga_check_new_gui="no"
+            ],
+            [-lXaw -lXmu -lXt])
+        ])
+      ])
+    ])
+  ])
+  if test $ga_check_new_gui = "yes" ; then
+    $1 
+    true #dummy command
+  else
+    $2
+    true #dummy command
+  fi
+
+  GA_UNSET_FLAGS
+])
 
 dnl GA_CHECK_GD : Checks whether GrADS can be built with printim command 
 dnl  		      	enabled.
@@ -324,7 +356,7 @@
 AC_DEFUN(GA_CHECK_NC,
 [
   # Check libs and headers for netCDF support
-  GA_SET_FLAGS([-I{ga_supplib_dir}/include/nc])
+  GA_SET_FLAGS([-I${ga_supplib_dir}/include/nc])
 
   ga_check_nc="no"
   AC_CHECK_HEADER(udunits.h,
@@ -356,7 +388,7 @@
 AC_DEFUN(GA_CHECK_HDF,
 [
   # Check libs and headers for HDF support
-  GA_SET_FLAGS([-I{ga_supplib_dir}/include/hdf])
+  GA_SET_FLAGS([-I${ga_supplib_dir}/include/hdf])
 
   ga_check_hdf="no"
   AC_CHECK_HEADER(udunits.h,
@@ -394,7 +426,7 @@
 AC_DEFUN(GA_CHECK_DODS,
 [
   # Check libs and headers for DODS support
-  GA_SET_FLAGS([-I{ga_supplib_dir}/include/dods])
+  GA_SET_FLAGS([-I${ga_supplib_dir}/include/dods])
 
   ga_check_dods="no"
   AC_CHECK_HEADER(udunits.h,
Seulement dans grads-1.9b4: autom4te.cache
Seulement dans grads-1.9b4: autoscan.log
Seulement dans grads-1.9b4: config.h.in
Seulement dans grads-1.9b4: config.log
Seulement dans grads-1.9b4: config.status
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/configure.in grads-1.9b4/configure.in
--- grads-1.9b4-orig/configure.in	2005-05-23 17:04:40.000000000 +0200
+++ grads-1.9b4/configure.in	2005-08-16 12:05:01.000000000 +0200
@@ -274,14 +274,24 @@
 
 
 use_gui=no
+use_new_gui=no
 if test "$with_gui" != "no" ; then
    echo "Check GrADS GUI support..."
    GA_CHECK_GUI([use_gui=yes])
+   if test $use_gui = no; then
+      GA_CHECK_NEW_GUI([use_new_gui=yes; use_gui=yes])
+   fi
 fi
 if test $use_gui = "yes" ; then
   AC_DEFINE(USEGUI, 1, [Enable GUI widgets]) 
   echo "+ GUI enabled"
-  GA_SET_LIB_VAR(gui_libs, [sx freq])
+  if test $use_new_gui = no; then
+    GA_SET_LIB_VAR(gui_libs, [sx freq])
+    AC_DEFINE(USEFREQ, 1, [Use GetFile from freq])
+  else
+    GA_SET_LIB_VAR([gui_libs], [sx])
+    AC_DEFINE(USEFREQ, 0, [Use GetFile from freq])
+  fi
   gui_libs="$gui_libs -lXaw -lXmu -lXt $guilibadd"
   AC_SUBST(gui_libs)
 else
@@ -383,15 +393,25 @@
 
 
 use_dods=no
+dods_ncdap=no
 if test "$with_dods" != "no" ; then
   GA_CHECK_DODS([use_dods=yes])
+  if test "z$use_dods" = "zno" -a "${ga_dyn_supplibs}" = "yes" ; then
+  AC_CHECK_HEADER([udunits.h],
+  [ AC_CHECK_HEADER([netcdf.h],
+    [ GA_CHECK_LIB([udunits], [utInit],
+       [AC_CHECK_NC_DODS([dods_ncdap=yes; use_dods=yes])])
+    ])
+  ])
+  fi
 fi
 
 if test $use_dods = "yes" ; then
 
     extra_bins="$extra_bins gradsdods"
-    GA_SET_LIB_VAR(dods_libs, [udunits www rx z])
-
+    if test "z$dods_ncdap" = "zno" ; then
+       GA_SET_LIB_VAR(dods_libs, [udunits www rx z])
+    fi
 
     GA_CHECK_LIB(gadods, main, [use_gadods=yes], [use_gadods=no])
     if test $use_gadods = "yes" ; then	
@@ -404,7 +424,11 @@
        echo "+ gradsdods (OPeNDAP/netCDF) build enabled - gridded interface only"
     fi
 
-    dods_libs="$dods_rep_libs $dods_rep_libs $dods_libs"
+    if test "z$dods_ncdap" = "zyes" ; then
+       dods_libs="$NC_DAP_LIBS -ludunits"
+    else
+       dods_libs="$dods_rep_libs $dods_rep_libs $dods_libs"
+    fi
     AC_SUBST(dods_libs)
     AC_SUBST(gadods_def)
 else
Seulement dans grads-1.9b4: configure.scan
Seulement dans grads-1.9b4: grads-1.9b4.tar.gz
Seulement dans grads-1.9b4: grads.spec
Seulement dans grads-1.9b4: libdap.m4
Seulement dans grads-1.9b4: libnc-dap.m4
Seulement dans grads-1.9b4: Makefile
Seulement dans grads-1.9b4/src: bufrscan
Seulement dans grads-1.9b4/src: bufrscan.o
Seulement dans grads-1.9b4/src: bufrstn.o
Seulement dans grads-1.9b4/src: buildinfo.h
Seulement dans grads-1.9b4/src: config.h
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/config.h.in grads-1.9b4/src/config.h.in
--- grads-1.9b4-orig/src/config.h.in	2004-12-15 22:00:03.000000000 +0100
+++ grads-1.9b4/src/config.h.in	2005-08-16 12:05:39.000000000 +0200
@@ -88,6 +88,9 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Use GetFile from freq */
+#undef USEFREQ
+
 /* Enable GUI widgets */
 #undef USEGUI
 
Seulement dans grads-1.9b4/src: config.h.in~
Seulement dans grads-1.9b4/src: fgbds.o
Seulement dans grads-1.9b4/src: fgutil.o
Seulement dans grads-1.9b4/src: gabufr.o
Seulement dans grads-1.9b4/src: gabufrtbl.o
Seulement dans grads-1.9b4/src: gacfg-c.o
Seulement dans grads-1.9b4/src: gacfg-dods.o
Seulement dans grads-1.9b4/src: gacfg-hdf.o
Seulement dans grads-1.9b4/src: gacfg-nc.o
Seulement dans grads-1.9b4/src: gaddes-c.o
Seulement dans grads-1.9b4/src: gaddes-dods.o
Seulement dans grads-1.9b4/src: gaddes-hdf.o
Seulement dans grads-1.9b4/src: gaddes-nc.o
Seulement dans grads-1.9b4/src: gaddes.sa.o
Seulement dans grads-1.9b4/src: gaexpr.o
Seulement dans grads-1.9b4/src: gafunc.o
Seulement dans grads-1.9b4/src: gagmap.o
Seulement dans grads-1.9b4/src: gagui.o
Seulement dans grads-1.9b4/src: gagx.o
Seulement dans grads-1.9b4/src: gaio-c.o
Seulement dans grads-1.9b4/src: gaio-dods.o
Seulement dans grads-1.9b4/src: gaio-hdf.o
Seulement dans grads-1.9b4/src: gaio-nc.o
Seulement dans grads-1.9b4/src: galats.o
Seulement dans grads-1.9b4/src: gamach.o
Seulement dans grads-1.9b4/src: gasdf-dods.o
Seulement dans grads-1.9b4/src: gasdf-hdf.o
Seulement dans grads-1.9b4/src: gasdf-nc.o
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gauser.c grads-1.9b4/src/gauser.c
--- grads-1.9b4-orig/src/gauser.c	2005-05-18 20:51:01.000000000 +0200
+++ grads-1.9b4/src/gauser.c	2005-08-16 11:33:49.000000000 +0200
@@ -42,6 +42,7 @@
 #endif
 
 /* int gxhpng (char *, int, int, int, int); */
+int gxhpng (char *, int, int, int, int, char *, char *, int) ;
 
 /*mf 971022 --- expose Mike Fiorino's global struct to these routines for warning level setting mf*/
 extern struct gamfcmn mfcmn;
Seulement dans grads-1.9b4/src: gauser-c.o
Seulement dans grads-1.9b4/src: gauser-dods.o
Seulement dans grads-1.9b4/src: gauser-hdf.o
Seulement dans grads-1.9b4/src: gauser-nc.o
Seulement dans grads-1.9b4/src: gautil.o
Seulement dans grads-1.9b4/src: gautil.sa.o
Seulement dans grads-1.9b4/src: gd13gif.o
Seulement dans grads-1.9b4/src: gradsc
Seulement dans grads-1.9b4/src: gradsdods
Seulement dans grads-1.9b4/src: gradshdf
Seulement dans grads-1.9b4/src: gradsnc
Seulement dans grads-1.9b4/src: grads.o
Seulement dans grads-1.9b4/src: gribmap
Seulement dans grads-1.9b4/src: gribmap.o
Seulement dans grads-1.9b4/src: gribscan
Seulement dans grads-1.9b4/src: gribscan.o
Seulement dans grads-1.9b4/src: gscrpt.o
Seulement dans grads-1.9b4/src: gsgui.o
Seulement dans grads-1.9b4/src: gxchpl.o
Seulement dans grads-1.9b4/src: gxcntr.o
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gxdxwd.c grads-1.9b4/src/gxdxwd.c
--- grads-1.9b4-orig/src/gxdxwd.c	2002-10-28 20:08:33.000000000 +0100
+++ grads-1.9b4/src/gxdxwd.c	2005-08-16 11:33:49.000000000 +0200
@@ -6,6 +6,7 @@
 #include 
 #endif
 
+#include 
 #include 
 #include 
 
@@ -22,7 +23,7 @@
  *              writting.
  */
 
-char *calloc();
+/* char *calloc(); */
 
 #include "X11/XWDFile.h"
 
Seulement dans grads-1.9b4/src: gxdxwd.o
Seulement dans grads-1.9b4/src: gxeps
Seulement dans grads-1.9b4/src: gxeps.o
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gxhpng.c grads-1.9b4/src/gxhpng.c
--- grads-1.9b4-orig/src/gxhpng.c	2004-03-12 17:14:04.000000000 +0100
+++ grads-1.9b4/src/gxhpng.c	2005-08-16 11:33:49.000000000 +0200
@@ -379,6 +379,11 @@
 	
 int gdCompareInt(const void *a, const void *b);
 
+int gdCompareInt(const void *a, const void *b)
+{
+	return (*(const int *)a) - (*(const int *)b);
+}
+
 /* Version of gdImageFilledPolygon to invoke my local 
    version of gdImageLne.  Nothing else changed... B.Doty 5/31/01 */
 
Seulement dans grads-1.9b4/src: gxmeta.o
Seulement dans grads-1.9b4/src: gxmeta.sa.o
Seulement dans grads-1.9b4/src: gxps
Seulement dans grads-1.9b4/src: gxps.o
Seulement dans grads-1.9b4/src: gxshad.o
Seulement dans grads-1.9b4/src: gxstrm.o
Seulement dans grads-1.9b4/src: gxsubs.o
Seulement dans grads-1.9b4/src: gxtran
Seulement dans grads-1.9b4/src: gxtran.o
Seulement dans grads-1.9b4/src: gxwmap.o
Seulement dans grads-1.9b4/src: gxX.o
Seulement dans grads-1.9b4/src: latsgribmap.o
Seulement dans grads-1.9b4/src: latsgrib.o
Seulement dans grads-1.9b4/src: latsint.o
Seulement dans grads-1.9b4/src: latsnc-nc.o
Seulement dans grads-1.9b4/src: latsnc.o
Seulement dans grads-1.9b4/src: lats.o
Seulement dans grads-1.9b4/src: latsstat.o
Seulement dans grads-1.9b4/src: latstime.o
Seulement dans grads-1.9b4/src: Makefile
Seulement dans grads-1.9b4/src: stamp-h
Seulement dans grads-1.9b4/src: stamp-h1
Seulement dans grads-1.9b4/src: stnmap
Seulement dans grads-1.9b4/src: stnmap.o
Seulement dans grads-1.9b4/src: wgrib
Seulement dans grads-1.9b4/src: wgrib.o

grads-conditionnal_lats.diff:

--- NEW FILE grads-conditionnal_lats.diff ---
--- grads-1.9b4/src/Makefile.am.old	2005-12-13 00:02:38.000000000 +0100
+++ grads-1.9b4/src/Makefile.am	2005-12-13 00:02:10.000000000 +0100
@@ -63,7 +67,7 @@
 hdr_lats            = lats.h latsint.h latsparm.h latstime.h \
                       fgrib.h fgrib_init.h 
 noinst_HEADERS	    = $(hdr_core) $(hdr_x11) $(hdr_sdf) $(hdr_png) $(hdr_gui) \
-                      $(hdr_lats) $(hdr_img) $(hdr_pc) $(hdr_bufr)
+                      $(hdr_pc) $(hdr_bufr)
 
 # Get rid of buildinfo.h on "make distclean"
 DISTCLEANFILES	       = buildinfo.h
@@ -198,10 +198,13 @@
 
 # Object files that should not be reused by the other GrADS binaries,
 # plus libraries needed by this GrADS binary
-gradsnc_LDADD	       = latsnc-nc.o gaddes-nc.o gacfg-nc.o gaio-nc.o \
+gradsnc_LDADD	       = gaddes-nc.o gacfg-nc.o gaio-nc.o \
 			gauser-nc.o gasdf-nc.o \
 			$(common_ldadd) \
 			$(nc_libs)
+if USELATS
+gradsnc_LDADD        += latsnc-nc.o
+endif
 
 # Custom compilation for object files specific to this GrADS binary
 COMPILE_NC 		= $(COMPILE) -I$(supp_include_dir)/nc \
@@ -296,11 +299,14 @@
 
 # Object files that should not be reused by the other GrADS binaries,
 # plus libraries needed by this GrADS binary
-gradsdods_LDADD	       = latsnc-nc.o gaddes-dods.o gacfg-dods.o gaio-dods.o \
+gradsdods_LDADD	       = gaddes-dods.o gacfg-dods.o gaio-dods.o \
 			gauser-dods.o gasdf-dods.o \
 			$(common_ldadd) \
 			$(dods_libs) \
 			$(dods_darwin_libs)
+if USELATS
+gradsdods_LDADD        += latsnc-nc.o
+endif
 
 # Custom compilation for object files specific to this GrADS binary
 COMPILE_DODS 		= $(COMPILE) -I$(supp_include_dir)/dods \


--- NEW FILE grads-copyright_summary ---
Here is an analysis of grads copyrights and licences.

Free software licences (complying with the OSI definition of Open Source)
and files.

A: the GPL

B: the most common netpbm licence (similar with BSD/MIT)

** Permission to use, copy, modify, and distribute this software and its
** documentation for any purpose and without fee is hereby granted, provided
** that the above copyright notice appear in all copies and that both that
** copyright notice and this permission notice appear in supporting
** documentation.  This software is provided "as is" without express or
** implied warranty.

C: miGIF licence (similar with BSD/MIT)

 * Permission to use, copy, modify, and distribute this software and its
 * documentation for any purpose and without fee is hereby granted, provided
 * that the above copyright notice appear in all copies and that both that
 * copyright notice and this permission notice appear in supporting
 * documentation.  This software is provided "AS IS." The Hutchison Avenue 
 * Software Corporation disclaims all warranties, either express or implied, 
 * including but not limited to implied warranties of merchantability and 
 * fitness for a particular purpose, with respect to this code and accompanying
 * documentation. 

D: gd.h permissive licence

        Permission granted to use this code in any fashion provided
        that this notice is retained and any alterations are
        labeled as such. It is requested, but not required, that
        you share extensions to this module with us so that we
        can incorporate them into new versions. */

E: gd licence like of gxeps

 * * Permission has been granted to copy and distribute gxeps in any 
 * context, including a commercial application, provided that this notice 
 * is present in user-accessible supporting documentation.
 * 
 * This does not affect your ownership of the derived work itself, and 
 * the intent
 * is to assure proper credit for the authors of gxeps, not to interfere
 * with your productive use of gxeps. If you have questions, ask. 
 * "Derived works" includes all programs that utilize gxeps.
 * Credit must be given in user-accessible documentation.
 * 
 * Permission to use, copy, modify, and distribute this software and its 
 * documentation for any purpose and without fee is hereby granted, provided 
 * that the above copyright notice appear in all copies and that both that 
 * copyright notice and this permission notice appear in supporting 
 * documentation.  This software is provided "as is" without express or 
 * implied warranty.

F: public domain, as said in a mail by Matthias Munnich

G: permissive licence (like BSD/MIT)

/* |   Permission to use, copy, modify, and distribute this software   | */
/* |   and its documentation for any purpose and without fee is hereby | */
/* |   granted, provided that the above copyright notice appear in all | */
/* |   copies and that both that copyright notice and this permission  | */
/* |   notice appear in supporting documentation.  This software is    | */
/* |   provided "as is" without express or implied warranty.           | */

H: public domain for wgrib

The following files are placed into the public domain.  While
you could legally do anything you want with the code, telling
the world that you wrote it would be uncool.  Selling it would
be really uncool.  The code was written for NMC/NCAR Reanalysis 
and may not work GRIB files from other sources.  The code,
as usual, is not warranteed to be fit for any purpose what so ever.
Use at your own risk.

I: public domain. From a mail sent by Don Hooper:

    Julia Collins and I are University of Colorado employees stationed 
    at NOAA, a U.S. federal government agency.  Thus, we do our work on 
    federal government computers.  Thus, all of our work is in the public 
    domain. [...] I've no idea why there is no notation to this effect in 
    gasdf.c, gasdf.h, or gasdf_std_time.h. In any case, it's the same as 
    with wgrib.c, written by another person affilliated with NOAA. U.S. 
    federal government stuff is public domain, period.

IGES means Brian Doty and IGES for most if not all files (haven't verified).

bufrscan.c      (A)             IGES
bufrstn.c       (A)             IGES
dodstn.c        (A)             IGES
gabufr.c        (A)             IGES
gabufrtbl.c     (A)             IGES
gaddes.c        (A)             IGES
gaexpr.c        (A)             IGES
gafunc.c        (A)             IGES
gagmap.c        (A)             IGES
gagmap.h        (A)             IGES
gagx.c          (A)             IGES
gaio.c          (A)             IGES
gamach.c        (A)             IGES
gasdf.c         (I)             Don Hooper
gasdf.h         (I)             Julia Collins and Don Hooper
gasdf_std_time.h (I)             Julia Collins
gauser.c        (A)             IGES
gautil.c        (A)             IGES
gd13gif.c       (B)             Jef Poskanzer
                (C)             Hutchison Avenue Software Corporation
gd13gif.h       (D)             Cold Spring Harbor Labs
grads.c         (A)             IGES
grads.h         (A)             IGES
gribmap.c       (A)             IGES
gscrpt.c        (A)             IGES
gs.h            (A)             IGES
gxchpl.c        (A)             IGES
gxcntr.c        (A)             IGES
gxeps.c         (E)             Matthias Munnich 
gxgif.c         (F)             Matthias Munnich
                (D)             Cold Spring Harbor Labs
                (B)             Jef Poskanzer
                (G)             David Koblas
gx.h            (A)             IGES
gxhpng.c        (A)             Matthias Munnich and Brian Doty
gxmeta.c        (A)             IGES
gxps.c          (A)             IGES
gxshad.c        (A)             IGES
gxstrm.c        (A)             IGES
gxsubs.c        (A)             IGES
gxtran.c        (A)             IGES
gxwmap.c        (A)             IGES
gxX.c           (A)             IGES
wgrib.c         (H)             public domain
wx.h            (A)             IGES  
gs-mode.el      (A)             Joe Wielgosz
ctl-mode.el     (A)             Joe Wielgosz
doc/*           (A)             IGES           haven't checked all the files!


========================================================================

??:  no copyright and no licence

fgrib.h         (??)
fgrib_init.h    (??)
galats.c        (??)
gribscan.c      (??)
gvt.h           (??)
gxdxwd.c        (??)
gxmap.h         (??)    small file
latsgribmap.c   (??)
mtable.c        (??)    small file
pcx11e.h        (??)    small file


=======================================================================

The following are non free licences and non free files. Some parts of the
files may be under a free licence described above, though.

?:  no licence. The file isn't free because there is no licence.

Z: cannot be sold for profit

 *   Permission is granted to any individual or institution to use,
 *   copy, or redistribute this software so long as it is not sold for
 *   profit, and provided this notice is retained. 

Y: cannot be redistributed

 *              This software may not be distributed to others without
 *              permission of the author.


fgbds.c            (?)             Mike Fiorino 
fgutil.c           (?)             Wesley Ebisuzaki
gacfg.c            (A)             IGES
                   (Z)             Arlindo da Silva
gagui.c            (Z)             Arlindo da Silva
gaimg.c            (Z)             Arlindo da Silva
gaimg.h            (Z)             Arlindo da Silva      small file
gsgui.c            (Z)             Arlindo da Silva
gstmp.c            (?)             Mike Fiorino and ?
lats.c             (Y)             Regents of the University of California
latsgrib.c         (Y)             Regents of the University of California
lats.h             (Y)             Regents of the University of California
latsint.c          (Y)             Regents of the University of California
latsint.h          (Y)             Regents of the University of California
latsnc.c           (Y)             Regents of the University of California
latsparm.h         (Y)             Regents of the University of California 
latsstat.c         (Y)             Regents of the University of California
latstime.c         (Y)             Regents of the University of California
latstime.h         (Y)             Regents of the University of California
pcx11e.c           (?)             Arlindo da Silva based on Xlibemu



--- NEW FILE grads-remove-files ---
#!/bin/bash

set -e
cd .

name=grads
ver=1.9b4
package=$name-$ver
tar_file=$name-src-$ver.tar.gz

echo Unpacking compressed source from $tar_file
tar xzf $tar_file
for bad_file in `cat grads-removed-files-list`; do
	rm -f $package/src/$bad_file
done

echo Repacking $tar_file
tar czf $tar_file $package
rm -rf $package

exit 0



--- NEW FILE grads-removed-files-list ---
fgbds.c  
fgutil.c
gagui.c  
gaimg.c 
gaimg.h 
gsgui.c 
gstmp.c 
lats.c    
latsgrib.c 
lats.h    
latsint.c
latsint.h  
latsnc.c   
latsparm.h 
latsstat.c 
latstime.c 
latstime.h 
pcx11e.c   



--- NEW FILE grads.spec ---
Name:           grads
Version:        1.9b4
Release:        4
Summary:        Tool for easy acces, manipulation, and visualization of data

Group:          Applications/Engineering
License:        GPL
URL:            http://grads.iges.org/grads/grads.html
Source0:        ftp://grads.iges.org/grads/1.9/grads-src-%{version}.tar.gz
# opendap/DODS detection
Source3:        libdap.m4
Source4:        libnc-dap.m4
# the copyright notice for wgrib
Source2:        NOTICE.wgrib
# Copyrights explanation
Source6:        grads-copyright_summary
# README telling to turn BackingStore true
Source5:        grads-README.xorg
# Use these files to remove files with GPL incompatible licences. In the
# SOURCES directory with grads tarball and grads-removed-files-list, do
# sh grads-remove-files
Source100:      grads-remove-files
Source101:      grads-removed-files-list

Patch:          grads-build_fixes.diff
Patch1:         grads_dap-no_lats.patch
Patch2:         grads-conditionnal_lats.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  hdf-devel udunits-devel netcdf-devel 
#BuildRequires:  opendap-devel
BuildRequires:  libdap-devel libnc-dap-devel
BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
BuildRequires:  ncurses-devel libpng-devel
#Requires:       

%description
The Grid Analysis and Display System (GrADS) is an interactive desktop tool
that is used for easy access, manipulation, and visualization of earth science
data. The format of the data may be either binary, GRIB, NetCDF, or HDF-SDS
(Scientific Data Sets). GrADS has been implemented worldwide on a variety of
commonly used operating systems and is freely distributed over the Internet.

%prep
%setup -q
%patch -p1
%patch -P 1 -p1
%patch -P 2 -p1
# change path to datas to %{_datadir}/%{name}
sed -i -e 's@/usr/local/lib/grads@%{_datadir}/%{name}@' src/gx.h
# copy grib notice
cp %{SOURCE2} .
cp %{SOURCE6} .
# concatenate autoconf m4 files
cat %{SOURCE3} %{SOURCE4} acinclude.m4 > acinclude.m4.new
cp acinclude.m4.new acinclude.m4
# README for use with xorg
cp %{SOURCE5} README.xorg
# fix perms
chmod a-x src/*.c src/*.h
chmod a-x COPYRIGHT
find doc -type f -exec chmod a-x \{\} \;
find data -type f -exec chmod a-x \{\} \;


%build
./bootstrap
%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs

make %{?_smp_mflags}
cp -r doc html

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%{__install} -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__install} -m644 data/*.dat data/*res $RPM_BUILD_ROOT%{_datadir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/bufrscan
%{_bindir}/gradsc
%{_bindir}/gradsdods
%{_bindir}/gradshdf
%{_bindir}/gradsnc
%{_bindir}/gribmap
%{_bindir}/gribscan
%{_bindir}/gxeps
%{_bindir}/gxps
%{_bindir}/gxtran
%{_bindir}/stnmap
%{_bindir}/wgrib
%{_datadir}/grads/

%doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary

%changelog
* Tue Dec 13 2005 Patrice Dumas  1.9b4-4
- simplify handling of data, as they are in the tarball

* Tue Dec 13 2005 Patrice Dumas  1.9b4-3
- remove files with GPL incompatible licences

* Tue Aug 16 2005 Patrice Dumas  1.9b4-2
- use libsx without freq

* Fri Aug 12 2005 Patrice Dumas  1.9b4-1
- initial release

grads_dap-no_lats.patch:

--- NEW FILE grads_dap-no_lats.patch ---
diff -Naur grads-1.9b4/src/gacfg.c grads-1.9b4_new/src/gacfg.c
--- grads-1.9b4/src/gacfg.c   2005-05-18 14:29:17.000000000 +0000
+++ grads-1.9b4_new/src/gacfg.c 2005-11-03 13:18:45.000000000 +0000
@@ -32,6 +32,7 @@
  */
 
 #include 
+#include 
 #include "grads.h"
 #include "buildinfo.h"
 
diff -Naur grads-1.9b4/src/gaexpr.c grads-1.9b4_new/src/gaexpr.c
--- grads-1.9b4/src/gaexpr.c  2005-05-18 14:48:36.000000000 +0000
+++ grads-1.9b4_new/src/gaexpr.c        2005-11-03 11:22:27.000000000 +0000
@@ -13,6 +13,7 @@
 #endif
 
 #include 
+#include 
 #include 
 #include "grads.h"
 
diff -Naur grads-1.9b4/src/gaio.c grads-1.9b4_new/src/gaio.c
--- grads-1.9b4/src/gaio.c    2005-05-23 17:59:01.000000000 +0000
+++ grads-1.9b4_new/src/gaio.c  2005-11-03 11:37:35.000000000 +0000
@@ -22,6 +22,7 @@
 #include "grads.h"
 #include 
 #include 
+#include 
 #if USESDF == 1
 #include 
 #if USEHDF == 1
diff -Naur grads-1.9b4/src/gasdf.c grads-1.9b4_new/src/gasdf.c
--- grads-1.9b4/src/gasdf.c   2005-05-18 14:29:17.000000000 +0000
+++ grads-1.9b4_new/src/gasdf.c 2005-11-04 10:02:05.000000000 +0000
@@ -5785,7 +5785,11 @@
   /* Turn off automatic error handling. */
   ncopts = 0;
 
+#if USEHDF == 1
   if (ncattname (cdfid, varid, attnum, name) == -1) {
+#else
+  if (nc_inq_attname(cdfid, varid, attnum, name) == -1) {
+#endif
     ncopts = oldncopts ;
     return Failure;
   }
@@ -5813,10 +5817,23 @@
   /* Turn off automatic error handling. */
   ncopts = 0;
 
+#if USEHDF == 1
   if (ncattinq (cdfid, varid, aname, atype, alen) == -1) {
     ncopts = oldncopts ;
     return Failure;
   }
+#else
+  if (nc_inq_atttype(cdfid, varid, aname, atype) != NC_NOERR) {
+    ncopts = oldncopts ;
+    return Failure;
+  }
+  size_t templen;
+  if (nc_inq_attlen(cdfid, varid, aname, &templen) != NC_NOERR) {
+    ncopts = oldncopts ;
+    return Failure;
+  }
+  *alen = (int) templen;
+#endif
 
   /* Allocate space for values. */
   if ((*atype == NC_BYTE) || (*atype == NC_CHAR))  {
@@ -5831,6 +5848,7 @@
     *adata = (double *) malloc (sizeof (double) * *alen);
   }  else {
     ncopts = oldncopts ;
+    printf("UNKNOWN TYPE HERE !\n");
     return Failure;
   }
 
@@ -5840,10 +5858,65 @@
   }
 
   /* Retrieve values. */
+#if USEHDF == 1
   if (ncattget (cdfid, varid, aname, (void *) (*adata)) == -1) {
     ncopts = oldncopts ;
     return Failure;
   }
+#else
+  switch (*atype)
+  {
+     case NC_BYTE:
+       if (nc_get_att_uchar(cdfid, varid, aname, (unsigned char *) *adata) != NC_NOERR)
+       {
+         ncopts = oldncopts ;
+         return Failure;
+       }
+       break;
+     case NC_CHAR:
+       if (nc_get_att_text(cdfid, varid, aname, (char *) *adata) != NC_NOERR)
+       {
+         ncopts = oldncopts ;
+         return Failure;
+       }
+       break;
+     case NC_SHORT:
+       if (nc_get_att_short(cdfid, varid, aname, (short *) *adata) != NC_NOERR)
+       {
+         ncopts = oldncopts ;
+         return Failure;
+       }
+       break;
+     case NC_LONG:
+       if (nc_get_att_int(cdfid, varid, aname, (int *) *adata) != NC_NOERR)
+       {
+         ncopts = oldncopts ;
+         return Failure;
+       }
+       break;
+     case NC_FLOAT:
+       if (nc_get_att_float(cdfid, varid, aname, (float *) *adata) != NC_NOERR)
+       {
+         ncopts = oldncopts ;
+         return Failure;
+       }
+       break;
+     case NC_DOUBLE:
+       if (nc_get_att_double(cdfid, varid, aname, (double *) *adata) != NC_NOERR)
+       {
+         ncopts = oldncopts ;
+         return Failure;
+       }
+       break;
+     default:
+       if (nc_get_att_text(cdfid, varid, aname, (char *) *adata) != NC_NOERR)
+       {
+         ncopts = oldncopts ;
+         return Failure;
+       }
+       break;
+  }
+#endif
 
   /* If character, set last byte to null. */
   if (*atype == NC_CHAR)  {
diff -Naur grads-1.9b4/src/gxdxwd.c grads-1.9b4_new/src/gxdxwd.c
--- grads-1.9b4/src/gxdxwd.c  2002-10-28 19:08:33.000000000 +0000
+++ grads-1.9b4_new/src/gxdxwd.c        2005-11-03 13:37:45.000000000 +0000
@@ -7,6 +7,7 @@
 #endif
 
 #include 
+#include 
 #include 
 
 #include 
@@ -92,6 +91,7 @@
     int bw;
     Window dummywin;
     XWDFileHeader header;
+    char mytmp[64];
 
     
     /*
@@ -232,7 +232,8 @@
      * Write out the color maps, if any
      */
 
-    if (debug) outl("xwd: Dumping %d colors.\n", ncolors);
+    sprintf(mytmp, "xwd: Dumping %d colors.\n", ncolors);
+    if (debug) outl(mytmp);
 /*
     {
     int icineca=0;
diff -Naur grads-1.9b4/src/gxeps.c grads-1.9b4_new/src/gxeps.c
--- grads-1.9b4/src/gxeps.c   2004-02-27 14:42:11.000000000 +0000
+++ grads-1.9b4_new/src/gxeps.c 2005-11-03 14:45:16.000000000 +0000
@@ -6,6 +6,8 @@
 #include 
 #endif
 
+#include 
+
 /***********************************************************
  * GXEPS a grads metafile to PostScript converter
  * Copyright (c) 1999 - 2001 Matthias Munnich
diff -Naur grads-1.9b4/src/gxhpng.c grads-1.9b4_new/src/gxhpng.c
--- grads-1.9b4/src/gxhpng.c  2004-03-12 16:14:04.000000000 +0000
+++ grads-1.9b4_new/src/gxhpng.c        2005-11-03 11:56:53.000000000 +0000
@@ -6,7 +6,6 @@
 #include 
 #endif
 
-
 /* Rasterize current metafile buffer via gd library.  Loosly based
    on the gxpng utility:
 
@@ -455,7 +452,7 @@
                                im->polyInts[ints++] = (y-y1) * (x2-x1) / (y2-y1) + x1;
			}
		}
-		qsort(im->polyInts, ints, sizeof(int), gdCompareInt);
+		qsort(im->polyInts, ints, sizeof(int), (void *) gdCompareInt);

		for (i=0; (i < (ints)); i+=2) {
                        gdImageLne(im, im->polyInts[i], y,
diff -Naur grads-1.9b4/src/gxX.c grads-1.9b4_new/src/gxX.c
--- grads-1.9b4/src/gxX.c     2005-05-18 14:29:17.000000000 +0000
+++ grads-1.9b4_new/src/gxX.c   2005-11-03 11:28:15.000000000 +0000
@@ -270,7 +270,7 @@
 
   /* Set up icon pixmap */
 
-  icon_pixmap = XCreateBitmapFromData(display, win, icon_bitmap_bits,
+  icon_pixmap = XCreateBitmapFromData(display, win, (char *) icon_bitmap_bits,
                 icon_bitmap_width, icon_bitmap_height);
 
   /* Set standard properties */
@@ -402,7 +402,7 @@
   if (xfnam) flist = XListFonts (display, xfnam, 1, &i);
   else flist = NULL;
   if (flist==NULL) {
-    flist = XListFonts (display, "-adobe-helvetica-bold-r-normal--??-100*", 1, &i);
+    flist = XListFonts (display, "-adobe-helvetica-bold-r-normal-*-100*", 1, &i);
   }
   if (flist==NULL) {
     flist = XListFonts (display, "-adobe-helvetica-bold-r-normal-*-120*", 1, &i);
@@ -418,7 +418,7 @@
   if (xfnam) flist = XListFonts (display, xfnam, 1, &i);
   else flist = NULL;
   if (flist==NULL) {
-    flist = XListFonts (display, "-adobe-helvetica-bold-o-normal--??-100*", 1, &i);
+    flist = XListFonts (display, "-adobe-helvetica-bold-o-normal-*-100*", 1, &i);
   }
   if (flist==NULL) {
     flist = XListFonts (display, "-adobe-helvetica-bold-o-normal-*-120*", 1, &i);
@@ -3267,7 +3267,7 @@
   }
 
   if (typ>1) {
-    stipple_pixmap = XCreateBitmapFromData(display, win, bitmap_bits,
+    stipple_pixmap = XCreateBitmapFromData(display, win, (char *) bitmap_bits,
		     bitmap_width, bitmap_height);
     XSetStipple(display, gc, stipple_pixmap);
     XSetFillStyle(display, gc, FillStippled);


--- NEW FILE libdap.m4 ---
# Configure macros for Libdap
# Patrice Dumas 2005 based on freetype2.m4 from Marcelo Magallon 2001-10-26, 
# based on gtk.m4 by Owen Taylor
# AC_CHECK_DODS is also based on code from gdal configure.in

# AC_CHECK_LIBDAP([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libdap and define DAP_CFLAGS and DAP_LIBS.
# Check that the version is above MINIMUM-VERSION 
# use when linking with a c++ aware linker, with a c linker you may also
# need -lstdc++

AC_DEFUN([AC_CHECK_LIBDAP],
[
  AC_PATH_PROG([DAP_CONFIG], [dap-config], [no])
  dap_min_version=m4_if([$1], [], [3.5.0], [$1])
  AC_MSG_CHECKING([for libdap version >= $dap_min_version])
  dap_no=""
  if test "$DAP_CONFIG" = "no" ; then
     dap_no=yes
  else
     dap_config_major_version=`$DAP_CONFIG --version | sed 's/^libdap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\1/'`
     dap_config_minor_version=`$DAP_CONFIG --version | sed 's/^libdap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\2/'`
     dap_config_micro_version=`$DAP_CONFIG --version | sed 's/^libdap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\2/'`
     dap_min_major_version=`echo $dap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
     dap_min_minor_version=`echo $dap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
     dap_min_micro_version=`echo $dap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`

     dap_config_is_lt=""
     if test $dap_config_major_version -lt $dap_min_major_version ; then
       dap_config_is_lt=yes
     else
       if test $dap_config_major_version -eq $dap_min_major_version ; then
         if test $dap_config_minor_version -lt $dap_min_minor_version ; then
           dap_config_is_lt=yes
         else
           if test $dap_config_minor_version -eq $dap_min_minor_version ; then
             if test $dap_config_micro_version -lt $dap_min_micro_version ; then
               dap_config_is_lt=yes
             fi
           fi
         fi
       fi
     fi
     if test x$dap_config_is_lt = xyes ; then
       dap_no=yes
     else
       DAP_LIBS="`$DAP_CONFIG --libs`"
       DAP_CFLAGS="`$DAP_CONFIG --cflags`"
     fi
   fi
   if test x$dap_no = x ; then
     AC_MSG_RESULT([yes])
     m4_if([$2], [], [:], [$2])
   else
     AC_MSG_RESULT([no])
     if test "$DAP_CONFIG" = "no" ; then
     AC_MSG_NOTICE([The dap-config script could not be found.])
     else
       if test x$dap_config_is_lt = xyes ; then
         AC_MSG_NOTICE([the installed libdap library is too old.])
       fi
     fi
     DAP_LIBS=""
     DAP_CFLAGS=""
     m4_if([$3], [], [:], [$3])
   fi
   AC_SUBST([DAP_CFLAGS])
   AC_SUBST([DAP_LIBS])
]) 

# AC_CHECK_DODS([ ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libdap or older versions. Define DAP_CFLAGS and DAP_LIBS and
# optionnaly DAP_ROOT

AC_DEFUN([AC_CHECK_DODS],
[
  AC_ARG_WITH(dods_root,
    [  --with-dods-root[=ARG] DODS root fallback ],
    ,,)

  ac_dods_ok='no'
  AC_CHECK_LIBDAP([],[ac_dods_ok='yes'],[ac_dods_ok='no'])
  if test "z$ac_dods_ok" = "zno" ; then
     AC_PATH_PROG([OPENDAP_CONFIG], [opendap-config], [no])
     AC_MSG_CHECKING([for libdap with opendap-config])
     if test "$OPENDAP_CONFIG" = "no" ; then
       ac_dods_ok='no'
        AC_MSG_RESULT([no])
     else
       DAP_LIBS="`$OPENDAP_CONFIG --libs`"
       DAP_CFLAGS="`$OPENDAP_CONFIG --cflags`"
       ac_dods_ok='yes'
        AC_MSG_RESULT([yes])
     fi
  fi 
  DAP_ROOT=
  if test "z$ac_dods_ok" = "zno" ; then
    AC_MSG_CHECKING(DODS specific root)
    if test -z "$with_dods_root" -o "$with_dods_root" = "no"; then
      AC_MSG_RESULT(disabled)
    else
      AC_MSG_RESULT([$with_dods_root])
      DODS_ROOT=$with_dods_root
      DODS_LIB=$with_dods_root/lib
      DODS_INC=$with_dods_root/include
      DODS_BIN=$with_dods_root/bin

      dnl Add the DODS libraries to LIBS
      if test -x $DODS_BIN/opendap-config ; then 
        dnl OPeNDAP 3.4 and earlier lack opendap-config, but use it if avail.
        DAP_LIBS="`$DODS_BIN/opendap-config --libs`"
        DAP_CFLAGS="`$DODS_BIN/opendap-config --cflags`"
        ac_dods_ok='yes'
      else
        dnl Otherwise try to put things together in a more primitive way.
        DAP_LIBS="-L$DODS_LIB -ldap++ -lpthread"
        DAP_CFLAGS="-I$DODS_INC"
      
        ac_dods_curl='yes'
        dnl Add curl to LIBS; it might be local to DODS or generally installed
        AC_MSG_CHECKING([For curl and libxml2])
        if test -x $DODS_BIN/curl-config; then
            DAP_LIBS="$DAP_LIBS  `$DODS_BIN/curl-config --libs`"
        elif which curl-config > /dev/null 2>&1; then
            DAP_LIBS="$DAP_LIBS  `curl-config --libs`"
        else
            AC_MSG_WARN([You gave a dods root, but I can't find curl!])
            ac_dods_curl='no'
        fi
        
        ac_dods_xml2='yes'
        if test -x $DODS_BIN/xml2-config; then
            DAP_LIBS="$DAP_LIBS `$DODS_BIN/xml2-config --libs`"
        elif which xml2-config > /dev/null 2>&1; then
            DAP_LIBS="$DAP_LIBS  `xml2-config --libs`"
        else
            AC_MSG_WARN([You gave a dods root, but I can't find xml2!])
            ac_dods_xml2='no'
        fi
        AC_LANG_PUSH([C++])
        if test $ac_dods_xml2 = 'yes' -a $ac_dods_curl = 'yes'; then
          AC_MSG_RESULT([yes]) 
          dnl We check that linking is succesfull
          ac_save_LIBS="$LIBS"
          ac_save_CFLAGS="$CFLAGS"
          LIBS="$LIBS $DAP_LIBS"
          CFLAGS="$CFLAGS $DAP_CFLAGS"
          AC_MSG_NOTICE([Checking for DODS with curl and libxml2])
          AC_CHECK_LIB([dap++],[main],[ac_dods_ok='yes'],[ac_dods_ok='no'])
          LIBS=$ac_save_LIBS
          CFLAGS=$ac_save_CFLAGS
          if test "z$ac_dods_ok" = "zno"; then
            DAP_LIBS="$DAP_LIBS -lrx"
            ac_save_LIBS="$LIBS"
            ac_save_CFLAGS="$CFLAGS"
            LIBS="$LIBS $DAP_LIBS"
            CFLAGS="$CFLAGS $DAP_CFLAGS"
            AC_MSG_NOTICE([Checking for DODS with curl, libxml2 and librx])
            AC_CHECK_LIB([dap++],[main],[ac_dods_ok='yes'],[ac_dods_ok='no'])
            LIBS=$ac_save_LIBS
            CFLAGS=$ac_save_CFLAGS
          fi
        else
           AC_MSG_RESULT([no]) 
        fi
        if test $ac_dods_ok = 'no'; then
           dnl assume it is an old version of DODS
           AC_MSG_NOTICE([Checking for DODS with libwww and librx])
           DAP_LIBS="-L$DODS_LIB -lwww -ldap++ -lpthread -lrx"
           DAP_CFLAGS="-I$DODS_INC"
           ac_save_LIBS="$LIBS"
           ac_save_CFLAGS="$CFLAGS"
           LIBS="$LIBS $DAP_LIBS"
           CFLAGS="$CFLAGS $DAP_CFLAGS"
           AC_CHECK_LIB([dap++],[main],[ac_dods_ok='yes'],[ac_dods_ok='no'])
           LIBS=$ac_save_LIBS
           CFLAGS=$ac_save_CFLAGS
        fi
        AC_LANG_POP
      fi
      
      AC_MSG_CHECKING([for DODS in a specific root])
      if test "z$ac_dods_ok" = "zyes"; then
        AC_MSG_RESULT([yes])
        AC_MSG_NOTICE([setting DAP_ROOT directory to $DODS_ROOT])
        DAP_ROOT="$DODS_ROOT"
      else
        AC_MSG_RESULT([no])
      fi
    fi
  fi
  if test "x$ac_dods_ok" = "xyes" ; then
     m4_if([$1], [], [:], [$1])
  else
     DAP_LIBS=""
     DAP_CFLAGS=""
     m4_if([$2], [], [:], [$2])
  fi
  AC_SUBST([DAP_CFLAGS])
  AC_SUBST([DAP_LIBS])
  AC_SUBST([DAP_ROOT])
])


--- NEW FILE libnc-dap.m4 ---
# Configure macro for Libnc-dap
# Patrice Dumas 2005 based on freetype2.m4 from Marcelo Magallon 2001-10-26, 
# based on gtk.m4 by Owen Taylor

# AC_CHECK_LIBNC_DAP([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libnc-dap and define NC_DAP_CFLAGS and NC_DAP_LIBS.
# Check that the version is above MINIMUM-VERSION 

AC_DEFUN([AC_CHECK_LIBNC_DAP],
[
  AC_PATH_PROG([NC_DAP_CONFIG], [ncdap-config], [no])
  ncdap_min_version=m4_if([$1], [], [3.5.0], [$1])
  AC_MSG_CHECKING([for libnc-dap version >= $ncdap_min_version])
  ncdap_no=""
  if test "$NC_DAP_CONFIG" = "no" ; then
     ncdap_no=yes
  else
     ncdap_config_major_version=`$NC_DAP_CONFIG --version | sed 's/^libnc-dap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\1/'`
     ncdap_config_minor_version=`$NC_DAP_CONFIG --version | sed 's/^libnc-dap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\2/'`
     ncdap_config_micro_version=`$NC_DAP_CONFIG --version | sed 's/^libnc-dap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\2/'`
     ncdap_min_major_version=`echo $ncdap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
     ncdap_min_minor_version=`echo $ncdap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
     ncdap_min_micro_version=`echo $ncdap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`

     ncdap_config_is_lt=""
     if test $ncdap_config_major_version -lt $ncdap_min_major_version ; then
       ncdap_config_is_lt=yes
     else
       if test $ncdap_config_major_version -eq $ncdap_min_major_version ; then
         if test $ncdap_config_minor_version -lt $ncdap_min_minor_version ; then
           ncdap_config_is_lt=yes
         else
           if test $ncdap_config_minor_version -eq $ncdap_min_minor_version ; then
             if test $ncdap_config_micro_version -lt $ncdap_min_micro_version ; then
               ncdap_config_is_lt=yes
             fi
           fi
         fi
       fi
     fi
     if test x$ncdap_config_is_lt = xyes ; then
       ncdap_no=yes
     else
       NC_DAP_LIBS="`$NC_DAP_CONFIG --libs`"
       NC_DAP_CFLAGS="`$NC_DAP_CONFIG --cflags`"
     fi
   fi
   if test x$ncdap_no = x ; then
     AC_MSG_RESULT([yes])
     m4_if([$2], [], [:], [$2])
   else
     AC_MSG_RESULT([no])
     if test "$NC_DAP_CONFIG" = "no" ; then
     AC_MSG_NOTICE([The ncdap-config script could not be found.])
     else
       if test x$ncdap_config_is_lt = xyes ; then
         AC_MSG_NOTICE([the installed libnc-dap library is too old.])
       fi
     fi
     NC_DAP_LIBS=""
     NC_DAP_CFLAGS=""
     m4_if([$3], [], [:], [$3])
     
   fi
   AC_SUBST([NC_DAP_CFLAGS])
   AC_SUBST([NC_DAP_LIBS])
]) 


# AC_FC_CHECK_LIBNC_DAP([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libnc-dap and define NC_DAP_FFLAGS and NC_DAP_FLIBS with flags
# for fortran.
# Check that the version is above MINIMUM-VERSION 

AC_DEFUN([AC_FC_CHECK_LIBNC_DAP],
[
  libnc_fc_dap_ok="no"
  AC_CHECK_LIBNC_DAP([$1],[libnc_fc_dap_ok="yes"],[libnc_fc_dap_ok="no"])
  if test $libnc_fc_dap_ok = "yes"; then
     NC_DAP_FLIBS="`$NC_DAP_CONFIG --flibs`"
     NC_DAP_FFLAGS="$NC_DAP_CFLAGS"
     m4_if([$2], [], [:], [$2])
  else
     m4_if([$3], [], [:], [$3])
     NC_DAP_FLIBS=""
     NC_DAP_FFLAGS=""
  fi
  AC_SUBST([NC_DAP_FFLAGS])
  AC_SUBST([NC_DAP_FLIBS])
])


# AC_CHECK_NC_DODS([ ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libnc-dap or older versions. Define NC_DAP_CFLAGS and NC_DAP_LIBS.
# use AC_CHECK_DODS if the flags cannot be found easily

AC_DEFUN([AC_CHECK_NC_DODS],
[
  ac_ncdods_ok='no'
  AC_CHECK_LIBNC_DAP([],[ac_ncdods_ok='yes'],[ac_ncdods_ok='no'])
  if test "z$ac_ncdods_ok" = "zno" ; then
     AC_PATH_PROG([OPENNC_DAP_CONFIG], [opendap-config], [no])
     AC_MSG_CHECKING([for libnc-dap with opendap-config])
     if test "$OPENNC_DAP_CONFIG" = "no" ; then
       ac_ncdods_ok='no'
       AC_MSG_RESULT([no])
     else
       NC_DAP_LIBS="`$OPENNC_DAP_CONFIG --libs-nc`"
       NC_DAP_CFLAGS="`$OPENNC_DAP_CONFIG --cflags`"
       ac_ncdods_ok='yes'
       AC_MSG_RESULT([yes])
     fi
  fi 
  if test "z$ac_ncdods_ok" = "zno" ; then
     ac_ncdods_dap_ok='no'
     AC_CHECK_DODS([ac_ncdods_dap_ok='yes'],[ac_ncdods_dap_ok='no'])
     if test "z$ac_ncdods_dap_ok" = 'zyes'; then
        NC_DAP_LIBS="$DAP_LIBS -lnc-dods -ldap++"
        NC_DAP_CFLAGS="$DAP_CFLAGS"
        AC_LANG_PUSH([C++])
        dnl We check that linking is succesfull
        ac_save_LIBS="$LIBS"
        ac_save_CFLAGS="$CFLAGS"
        LIBS="$LIBS $NC_DAP_LIBS"
        CFLAGS="$CFLAGS $NC_DAP_CFLAGS"
        AC_CHECK_FUNC([nc_open],[ac_ncdods_ok='yes'],[ac_ncdods_ok='no'])
        LIBS=$ac_save_LIBS
        CFLAGS=$ac_save_CFLAGS
        AC_LANG_POP
     fi
  fi
  if test "x$ac_ncdods_ok" = "xyes" ; then
     m4_if([$1], [], [:], [$1])
  else
     NC_DAP_LIBS=""
     NC_DAP_CFLAGS=""
     m4_if([$2], [], [:], [$2])
  fi
  AC_SUBST([NC_DAP_CFLAGS])
  AC_SUBST([NC_DAP_LIBS])
])


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Dec 2005 12:11:41 -0000	1.1
+++ .cvsignore	20 Dec 2005 12:16:26 -0000	1.2
@@ -0,0 +1 @@
+grads-src-1.9b4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Dec 2005 12:11:41 -0000	1.1
+++ sources	20 Dec 2005 12:16:26 -0000	1.2
@@ -0,0 +1 @@
+22e04f84df73d4aa72fe468c7f43b1c3  grads-src-1.9b4.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 20 12:26:21 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:26:21 -0500
Subject: rpms/grads/devel grads.spec,1.1,1.2
Message-ID: <200512201226.jBKCQpB5006685@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6662

Modified Files:
	grads.spec 
Log Message:
add dist tag



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grads.spec	20 Dec 2005 12:16:26 -0000	1.1
+++ grads.spec	20 Dec 2005 12:26:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        4
+Release:        4%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering



From fedora-extras-commits at redhat.com  Tue Dec 20 12:31:10 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:31:10 -0500
Subject: owners owners.list,1.470,1.471
Message-ID: <200512201231.jBKCVe2K006790@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6760

Modified Files:
	owners.list 
Log Message:
add grads



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -r1.470 -r1.471
--- owners.list	20 Dec 2005 03:24:39 -0000	1.470
+++ owners.list	20 Dec 2005 12:31:08 -0000	1.471
@@ -321,6 +321,7 @@
 Fedora Extras|gputils|Development utilities for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gquilt|A PyGTK wrapper for quilt|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|gqview|Image browser and viewer|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
+Fedora Extras|grads|Tool for easy acces, manipulation, and visualization of data|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gramps|Genealogical Research and Analysis Management Programming System|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|graphviz|Graph Visualization Tools|oliver at linux-kernel.at|extras-qa at fedoraproject.org|ellson at research.att.com
 Fedora Extras|graveman|A frontend for cdrtools, dvd+rw-tools and sox|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 20 13:32:55 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 08:32:55 -0500
Subject: rpms/gnupg2/devel .cvsignore, 1.7, 1.8 gnupg2.spec, 1.29,
	1.30 sources, 1.8, 1.9
Message-ID: <200512201333.jBKDXP7P008618@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8596

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Tue Dec 20 2005 Rex Dieter  1.9.20-1
- 1.9.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Oct 2005 15:35:58 -0000	1.7
+++ .cvsignore	20 Dec 2005 13:32:53 -0000	1.8
@@ -1,2 +1,2 @@
-gnupg-1.9.19.tar.bz2
-gnupg-1.9.19.tar.bz2.sig
+gnupg-1.9.20.tar.bz2
+gnupg-1.9.20.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnupg2.spec	1 Dec 2005 21:01:48 -0000	1.29
+++ gnupg2.spec	20 Dec 2005 13:32:53 -0000	1.30
@@ -4,10 +4,11 @@
 # it can use other implementations too (including non-pcsc ones).
 %define pcsc_lib libpcsclite.so.0
 
-Summary: GNU utility for secure communication and data storage
+Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.19
-Release: 8%{?dist}
+Version: 1.9.20
+Release: 1%{?dist}
+
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
@@ -36,7 +37,7 @@
 # Hard-code libksba-0.9.11 for now (x86_64 'make check' fails)
 #BuildRequires: libksba-devel = 0.9.11
 #else
-BuildRequires: libksba-devel >= 0.9.12
+BuildRequires: libksba-devel >= 0.9.13
 #endif
 
 BuildRequires: gettext
@@ -74,9 +75,9 @@
 %patch1 -p1 -b .lvalue
 %patch2 -p1 -b .testverbose
 
-%ifarch x86_64
-sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
-%endif
+#ifarch x86_64
+#sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
+#endif
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
@@ -84,9 +85,9 @@
 %build
 
 %configure \
-  --disable-dependency-tracking \
   --disable-rpath \
-  --enable-gpg
+  --disable-dependency-tracking \
+  --enable-gpg 
 
 make %{?_smp_mflags}
 
@@ -95,7 +96,7 @@
 ## Allows for better debugability (doesn't work, fixme)
 # echo "debug-allow-core-dumps" >> tests/gpgsm.conf
 # (sometimes?) expect one failure (reported upstream)
-#make check ||:
+make check ||:
 
 
 %install
@@ -104,6 +105,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # enable auto-startup/shutdown of gpg-agent 
+# Keep an eye on http://bugzilla.redhat.com/bugzilla/175744, in case these dirs go away or change
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
 install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/env/
 install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{_prefix}/shutdown/
@@ -124,7 +126,7 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 #docs say to install suid root, but we won't, for now.
 #attr(4755,root,root) %{_bindir}/gpg2
@@ -134,6 +136,7 @@
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
 %{_bindir}/gpgkey2ssh
+%{_bindir}/gpgparsemail
 %{_bindir}/gpgsm*
 %{_bindir}/kbxutil
 %{_bindir}/scdaemon
@@ -153,6 +156,9 @@
 
 
 %changelog
+* Tue Dec 20 2005 Rex Dieter  1.9.20-1
+- 1.9.20
+
 * Thu Dec 01 2005 Rex Dieter  1.9.19-8
 - include gpg-agent-(startup|shutdown) scripts (#136533)
 - BR: libksba-devel >= 1.9.12 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Oct 2005 15:35:58 -0000	1.8
+++ sources	20 Dec 2005 13:32:53 -0000	1.9
@@ -1,2 +1,2 @@
-8084256a61aa90e0173d436bf1e6f82b  gnupg-1.9.19.tar.bz2
-9646e2b0f68474c5b1c8d37a09fb56d1  gnupg-1.9.19.tar.bz2.sig
+93899203fc0530f03e146d49b65c1e28  gnupg-1.9.20.tar.bz2
+76e3a5c1ac153c24a4fd3e0e83b0e9f6  gnupg-1.9.20.tar.bz2.sig



From fedora-extras-commits at redhat.com  Tue Dec 20 14:11:15 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Tue, 20 Dec 2005 09:11:15 -0500
Subject: rpms/pybliographer/FC-4 gnome-python.patch, NONE,
	1.1 pybliographer.patch, 1.1, 1.2 pybliographer.spec, 1.9, 1.10
Message-ID: <200512201411.jBKEBFSA010415@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10347/FC-4

Modified Files:
	pybliographer.patch pybliographer.spec 
Added Files:
	gnome-python.patch 
Log Message:
Applying patches from upstream


gnome-python.patch:

--- NEW FILE gnome-python.patch ---
--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/Editor.py	2005-10-13 18:11:13.000000000 +0200
+++ pybliographer-1.2.7/Pyblio/GnomeUI/Editor.py	2005-12-19 13:36:35.000000000 +0100
@@ -352,24 +352,24 @@
         if text != '':
             try: day = int (text)
             except ValueError:
-                ui.gnome_error_dialog_parented (_("Invalid day field in date"),
-                                                self.day.get_toplevel ())
+                ui.error_dialog_parented (_("Invalid day field in date"),
+                                          self.day.get_toplevel ())
                 return -1
         
         text = string.strip (self.month.get_chars (0, -1)).encode ('latin-1')
         if text != '':
             try: month = int (text)
             except ValueError, err:
-                ui.gnome_error_dialog_parented (_("Invalid month field in date"),
-                                                self.day.get_toplevel ())
+                ui.error_dialog_parented (_("Invalid month field in date"),
+                                          self.day.get_toplevel ())
                 return -1
         
         text = string.strip (self.year.get_chars (0, -1)).encode ('latin-1')
         if text != '':
             try: year = int (text)
             except ValueError: 
-                ui.gnome_error_dialog_parented (_("Invalid year field in date"),
-                                                self.day.get_toplevel ())
+                ui.error_dialog_parented (_("Invalid year field in date"),
+                                          self.day.get_toplevel ())
                 return -1
         
         if self.initial == (day, month, year): return 0
@@ -381,8 +381,8 @@
         try:
             entry [self.field] = Fields.Date ((year, month, day))
         except Exceptions.DateError, error:
-            ui.gnome_error_dialog_parented (str (error),
-                                            self.day.get_toplevel ())
+            ui.error_dialog_parented (str (error),
+                                      self.day.get_toplevel ())
             return -1
         return 1
 
@@ -903,7 +903,7 @@
             modified = True
         else:
             if not key_re.match (key):
-                ui.gnome_error_dialog_parented (
+                ui.error_dialog_parented (
                     _("Invalid key format"), self.w.get_toplevel ())
                 return None
 
@@ -911,7 +911,7 @@
 
             if key != self.entry.key:
                 if database.has_key (key):
-                     ui.gnome_error_dialog_parented (
+                     ui.error_dialog_parented (
                          _("Key `%s' already exists") % str (key.key),
                          self.w.get_toplevel ())
                      return None
@@ -928,7 +928,7 @@
             except UnicodeError:
                 f = Types.get_field (item.field)
                 
-                ui.gnome_error_dialog_parented (
+                ui.error_dialog_parented (
                     _("The `%s' field contains a non Latin-1 symbol") %
                     f.name, self.w.get_toplevel ())
                 return None
@@ -998,7 +998,7 @@
             text = text.encode ('latin-1')
 
         except UnicodeError:
-            ui.gnome_error_dialog_parented (
+            ui.error_dialog_parented (
                 _("Your text contains non Latin-1 symbols"),
                 self.w.get_toplevel ())
             return None

pybliographer.patch:

Index: pybliographer.patch
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-4/pybliographer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pybliographer.patch	15 Oct 2005 21:56:03 -0000	1.1
+++ pybliographer.patch	20 Dec 2005 14:11:13 -0000	1.2
@@ -1,13 +1,112 @@
+--- pybliographer-1.2.7-orig/Pyblio/Format/BibTeX.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/Format/BibTeX.py	2005-12-09 13:33:04.000000000 +0100
+@@ -425,7 +425,7 @@
+             else:
+                 if self.dict.has_key (entry.key):
+                     errors.append (_("%s:%d: key `%s' already defined") % (
+-                        str (self.key), entry.line, entry.key.key))
++                        repr (self.key), entry.line, repr (entry.key.key)))
+                 else:
+                     self.dict [entry.key] = entry
+ 
+--- pybliographer-1.2.7-orig/Pyblio/Format/Medline.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/Format/Medline.py	2005-12-09 13:33:04.000000000 +0100
+@@ -111,7 +111,7 @@
+                 first, last, lineage = [], [], []
+                 
+                 for part in string.split (au, ' '):
+-                    if part == string.upper (part):
++		    if part.isupper ():
+                         # in upper-case, this is a first name
+                         if len (last) > 0:
+                             first.append (part)
+@@ -130,7 +130,7 @@
+                     first = first [0:1]
+ 
+                 if len (first) > 0:
+-                    first = string.join (first [0], '.') + '.'
++                    first = string.join (first [0], '. ') + '.'
+                 else:
+                     first = None
+ 
+@@ -158,8 +158,6 @@
+         for f in table.keys ():
+             f_mapped = one_to_one.get(f, 'medline-%s' %(f.lower()))
+             text_type = Types.get_field(f_mapped).type
+-            print 'MEDLINE: field name %s has type %s' %(
+-                f_mapped, text_type)
+             norm [f_mapped] = text_type (string.join (table [f], " ; "))
+         
+         return Base.Entry (None, type, norm)
+@@ -302,3 +300,8 @@
+ Autoload.register ('format', 'Medline', {'open'  : opener,
+                                          'write' : writer,
+                                          'iter'  : iterator})
++
++### Local Variables:
++### Mode: python
++### py-master-file : "ut_medline.py"
++### End:
+--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/Document.py	2005-10-13 18:11:17.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/GnomeUI/Document.py	2005-12-09 13:33:04.000000000 +0100
+@@ -1052,7 +1052,6 @@
+             try:
+                 self.lyx = LyX.LyXClient ()
+             except IOError, msg:
+-                msg = msg [1].decode (enc)
+                 self.w.error (_("Can't connect to LyX:\n%s") % msg)
+                 return
+ 
+--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/FileSelector.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/GnomeUI/FileSelector.py	2005-12-19 11:58:43.000000000 +0100
+@@ -87,11 +87,13 @@
+ 	    liste = Autoload.available ('format')
+ 	    liste.sort ()
+ 
+-	    self.formats = [ None ]
++	    self.formats = []
+ 
+ 	    if has_auto:
+ 		self.menu.append_text (_(' - According to file suffix - '))
+ 		self.ftype = None
++                self.formats.append(None)
++                
+ 	    else:
+ 		self.ftype = liste [0]
+ 
+--- pybliographer-1.2.7-orig/Pyblio/LyX.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/LyX.py	2005-12-09 13:33:05.000000000 +0100
+@@ -33,14 +33,14 @@
+         pin = os.path.expanduser (base + '.in')
+         try:
+             ans = os.stat (pin)
+-        except os.error:
+-            raise IOError, (-1, _("no input pipe `%s'") % pin)
++        except OSError, msg:
++            raise IOError (_("no input pipe `%s'") % pin)
+         
+         pout = os.path.expanduser (base + '.out')
+         try:
+             ans = os.stat (pout)
+         except os.error:
+-            raise IOError, (-1, _("no output pipe `%s'") % pout)
++            raise IOError (_("no output pipe `%s'") % pout)
+ 
+         def noaction (* arg): return
+         
 --- pybliographer-1.2.7-orig/setup-check.py	2005-10-13 18:11:19.000000000 +0200
-+++ pybliographer-1.2.7/setup-check.py	2005-10-15 23:27:16.000000000 +0200
-@@ -86,8 +86,8 @@
++++ pybliographer-1.2.7/setup-check.py	2005-10-18 12:04:58.000000000 +0200
+@@ -86,9 +86,10 @@
  
      error ('unexpected error')
  
 -if gtk.pygtk_version < (2,4,0):
 -    error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
-+#if gtk.pygtk_version < (2,4,0):
-+#    error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
-     
+-    
++else:
++    if gtk.pygtk_version < (2,4,0):
++        error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
++
  
  try:
+     import _recode


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-4/pybliographer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pybliographer.spec	15 Oct 2005 21:56:03 -0000	1.9
+++ pybliographer.spec	20 Dec 2005 14:11:13 -0000	1.10
@@ -1,11 +1,12 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
 Version: 1.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.7.tar.gz
 Patch0: pybliographer.patch
+Patch1: gnome-python.patch
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -44,6 +45,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -154,6 +156,9 @@
 
 
 %changelog
+* Tue Dec 20 2005 Zoltan Kota  - 1.2.7-2
+- add patches for fixing different bugs
+
 * Fri Oct 15 2005 Zoltan Kota  - 1.2.7-1
 - update to 1.2.7
 - drop gnome-help.patch, fixed upstream



From fedora-extras-commits at redhat.com  Tue Dec 20 14:11:09 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Tue, 20 Dec 2005 09:11:09 -0500
Subject: rpms/pybliographer/FC-3 pybliographer.patch, 1.1,
	1.2 pybliographer.spec, 1.6, 1.7
Message-ID: <200512201411.jBKEBeSW010449@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10347/FC-3

Modified Files:
	pybliographer.patch pybliographer.spec 
Log Message:
Applying patches from upstream


pybliographer.patch:

Index: pybliographer.patch
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-3/pybliographer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pybliographer.patch	15 Oct 2005 21:56:03 -0000	1.1
+++ pybliographer.patch	20 Dec 2005 14:11:07 -0000	1.2
@@ -1,13 +1,112 @@
+--- pybliographer-1.2.7-orig/Pyblio/Format/BibTeX.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/Format/BibTeX.py	2005-12-09 13:33:04.000000000 +0100
+@@ -425,7 +425,7 @@
+             else:
+                 if self.dict.has_key (entry.key):
+                     errors.append (_("%s:%d: key `%s' already defined") % (
+-                        str (self.key), entry.line, entry.key.key))
++                        repr (self.key), entry.line, repr (entry.key.key)))
+                 else:
+                     self.dict [entry.key] = entry
+ 
+--- pybliographer-1.2.7-orig/Pyblio/Format/Medline.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/Format/Medline.py	2005-12-09 13:33:04.000000000 +0100
+@@ -111,7 +111,7 @@
+                 first, last, lineage = [], [], []
+                 
+                 for part in string.split (au, ' '):
+-                    if part == string.upper (part):
++		    if part.isupper ():
+                         # in upper-case, this is a first name
+                         if len (last) > 0:
+                             first.append (part)
+@@ -130,7 +130,7 @@
+                     first = first [0:1]
+ 
+                 if len (first) > 0:
+-                    first = string.join (first [0], '.') + '.'
++                    first = string.join (first [0], '. ') + '.'
+                 else:
+                     first = None
+ 
+@@ -158,8 +158,6 @@
+         for f in table.keys ():
+             f_mapped = one_to_one.get(f, 'medline-%s' %(f.lower()))
+             text_type = Types.get_field(f_mapped).type
+-            print 'MEDLINE: field name %s has type %s' %(
+-                f_mapped, text_type)
+             norm [f_mapped] = text_type (string.join (table [f], " ; "))
+         
+         return Base.Entry (None, type, norm)
+@@ -302,3 +300,8 @@
+ Autoload.register ('format', 'Medline', {'open'  : opener,
+                                          'write' : writer,
+                                          'iter'  : iterator})
++
++### Local Variables:
++### Mode: python
++### py-master-file : "ut_medline.py"
++### End:
+--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/Document.py	2005-10-13 18:11:17.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/GnomeUI/Document.py	2005-12-09 13:33:04.000000000 +0100
+@@ -1052,7 +1052,6 @@
+             try:
+                 self.lyx = LyX.LyXClient ()
+             except IOError, msg:
+-                msg = msg [1].decode (enc)
+                 self.w.error (_("Can't connect to LyX:\n%s") % msg)
+                 return
+ 
+--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/FileSelector.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/GnomeUI/FileSelector.py	2005-12-19 11:58:43.000000000 +0100
+@@ -87,11 +87,13 @@
+ 	    liste = Autoload.available ('format')
+ 	    liste.sort ()
+ 
+-	    self.formats = [ None ]
++	    self.formats = []
+ 
+ 	    if has_auto:
+ 		self.menu.append_text (_(' - According to file suffix - '))
+ 		self.ftype = None
++                self.formats.append(None)
++                
+ 	    else:
+ 		self.ftype = liste [0]
+ 
+--- pybliographer-1.2.7-orig/Pyblio/LyX.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/LyX.py	2005-12-09 13:33:05.000000000 +0100
+@@ -33,14 +33,14 @@
+         pin = os.path.expanduser (base + '.in')
+         try:
+             ans = os.stat (pin)
+-        except os.error:
+-            raise IOError, (-1, _("no input pipe `%s'") % pin)
++        except OSError, msg:
++            raise IOError (_("no input pipe `%s'") % pin)
+         
+         pout = os.path.expanduser (base + '.out')
+         try:
+             ans = os.stat (pout)
+         except os.error:
+-            raise IOError, (-1, _("no output pipe `%s'") % pout)
++            raise IOError (_("no output pipe `%s'") % pout)
+ 
+         def noaction (* arg): return
+         
 --- pybliographer-1.2.7-orig/setup-check.py	2005-10-13 18:11:19.000000000 +0200
-+++ pybliographer-1.2.7/setup-check.py	2005-10-15 23:27:16.000000000 +0200
-@@ -86,8 +86,8 @@
++++ pybliographer-1.2.7/setup-check.py	2005-10-18 12:04:58.000000000 +0200
+@@ -86,9 +86,10 @@
  
      error ('unexpected error')
  
 -if gtk.pygtk_version < (2,4,0):
 -    error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
-+#if gtk.pygtk_version < (2,4,0):
-+#    error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
-     
+-    
++else:
++    if gtk.pygtk_version < (2,4,0):
++        error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
++
  
  try:
+     import _recode


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-3/pybliographer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pybliographer.spec	15 Oct 2005 21:56:03 -0000	1.6
+++ pybliographer.spec	20 Dec 2005 14:11:07 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
 Version: 1.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.7.tar.gz
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Tue Dec 20 2005 Zoltan Kota  - 1.2.7-2
+- add patch for fixing different bugs
+
 * Fri Oct 15 2005 Zoltan Kota  - 1.2.7-1
 - update to 1.2.7
 - drop gnome-help.patch, fixed upstream



From fedora-extras-commits at redhat.com  Tue Dec 20 14:11:20 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Tue, 20 Dec 2005 09:11:20 -0500
Subject: rpms/pybliographer/devel gnome-python.patch, NONE,
	1.1 pybliographer.patch, 1.1, 1.2 pybliographer.spec, 1.10, 1.11
Message-ID: <200512201411.jBKEBK7i010438@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10347/devel

Modified Files:
	pybliographer.patch pybliographer.spec 
Added Files:
	gnome-python.patch 
Log Message:
Applying patches from upstream


gnome-python.patch:

--- NEW FILE gnome-python.patch ---
--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/Editor.py	2005-10-13 18:11:13.000000000 +0200
+++ pybliographer-1.2.7/Pyblio/GnomeUI/Editor.py	2005-12-19 13:36:35.000000000 +0100
@@ -352,24 +352,24 @@
         if text != '':
             try: day = int (text)
             except ValueError:
-                ui.gnome_error_dialog_parented (_("Invalid day field in date"),
-                                                self.day.get_toplevel ())
+                ui.error_dialog_parented (_("Invalid day field in date"),
+                                          self.day.get_toplevel ())
                 return -1
         
         text = string.strip (self.month.get_chars (0, -1)).encode ('latin-1')
         if text != '':
             try: month = int (text)
             except ValueError, err:
-                ui.gnome_error_dialog_parented (_("Invalid month field in date"),
-                                                self.day.get_toplevel ())
+                ui.error_dialog_parented (_("Invalid month field in date"),
+                                          self.day.get_toplevel ())
                 return -1
         
         text = string.strip (self.year.get_chars (0, -1)).encode ('latin-1')
         if text != '':
             try: year = int (text)
             except ValueError: 
-                ui.gnome_error_dialog_parented (_("Invalid year field in date"),
-                                                self.day.get_toplevel ())
+                ui.error_dialog_parented (_("Invalid year field in date"),
+                                          self.day.get_toplevel ())
                 return -1
         
         if self.initial == (day, month, year): return 0
@@ -381,8 +381,8 @@
         try:
             entry [self.field] = Fields.Date ((year, month, day))
         except Exceptions.DateError, error:
-            ui.gnome_error_dialog_parented (str (error),
-                                            self.day.get_toplevel ())
+            ui.error_dialog_parented (str (error),
+                                      self.day.get_toplevel ())
             return -1
         return 1
 
@@ -903,7 +903,7 @@
             modified = True
         else:
             if not key_re.match (key):
-                ui.gnome_error_dialog_parented (
+                ui.error_dialog_parented (
                     _("Invalid key format"), self.w.get_toplevel ())
                 return None
 
@@ -911,7 +911,7 @@
 
             if key != self.entry.key:
                 if database.has_key (key):
-                     ui.gnome_error_dialog_parented (
+                     ui.error_dialog_parented (
                          _("Key `%s' already exists") % str (key.key),
                          self.w.get_toplevel ())
                      return None
@@ -928,7 +928,7 @@
             except UnicodeError:
                 f = Types.get_field (item.field)
                 
-                ui.gnome_error_dialog_parented (
+                ui.error_dialog_parented (
                     _("The `%s' field contains a non Latin-1 symbol") %
                     f.name, self.w.get_toplevel ())
                 return None
@@ -998,7 +998,7 @@
             text = text.encode ('latin-1')
 
         except UnicodeError:
-            ui.gnome_error_dialog_parented (
+            ui.error_dialog_parented (
                 _("Your text contains non Latin-1 symbols"),
                 self.w.get_toplevel ())
             return None

pybliographer.patch:

Index: pybliographer.patch
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pybliographer.patch	15 Oct 2005 21:56:04 -0000	1.1
+++ pybliographer.patch	20 Dec 2005 14:11:18 -0000	1.2
@@ -1,13 +1,112 @@
+--- pybliographer-1.2.7-orig/Pyblio/Format/BibTeX.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/Format/BibTeX.py	2005-12-09 13:33:04.000000000 +0100
+@@ -425,7 +425,7 @@
+             else:
+                 if self.dict.has_key (entry.key):
+                     errors.append (_("%s:%d: key `%s' already defined") % (
+-                        str (self.key), entry.line, entry.key.key))
++                        repr (self.key), entry.line, repr (entry.key.key)))
+                 else:
+                     self.dict [entry.key] = entry
+ 
+--- pybliographer-1.2.7-orig/Pyblio/Format/Medline.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/Format/Medline.py	2005-12-09 13:33:04.000000000 +0100
+@@ -111,7 +111,7 @@
+                 first, last, lineage = [], [], []
+                 
+                 for part in string.split (au, ' '):
+-                    if part == string.upper (part):
++		    if part.isupper ():
+                         # in upper-case, this is a first name
+                         if len (last) > 0:
+                             first.append (part)
+@@ -130,7 +130,7 @@
+                     first = first [0:1]
+ 
+                 if len (first) > 0:
+-                    first = string.join (first [0], '.') + '.'
++                    first = string.join (first [0], '. ') + '.'
+                 else:
+                     first = None
+ 
+@@ -158,8 +158,6 @@
+         for f in table.keys ():
+             f_mapped = one_to_one.get(f, 'medline-%s' %(f.lower()))
+             text_type = Types.get_field(f_mapped).type
+-            print 'MEDLINE: field name %s has type %s' %(
+-                f_mapped, text_type)
+             norm [f_mapped] = text_type (string.join (table [f], " ; "))
+         
+         return Base.Entry (None, type, norm)
+@@ -302,3 +300,8 @@
+ Autoload.register ('format', 'Medline', {'open'  : opener,
+                                          'write' : writer,
+                                          'iter'  : iterator})
++
++### Local Variables:
++### Mode: python
++### py-master-file : "ut_medline.py"
++### End:
+--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/Document.py	2005-10-13 18:11:17.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/GnomeUI/Document.py	2005-12-09 13:33:04.000000000 +0100
+@@ -1052,7 +1052,6 @@
+             try:
+                 self.lyx = LyX.LyXClient ()
+             except IOError, msg:
+-                msg = msg [1].decode (enc)
+                 self.w.error (_("Can't connect to LyX:\n%s") % msg)
+                 return
+ 
+--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/FileSelector.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/GnomeUI/FileSelector.py	2005-12-19 11:58:43.000000000 +0100
+@@ -87,11 +87,13 @@
+ 	    liste = Autoload.available ('format')
+ 	    liste.sort ()
+ 
+-	    self.formats = [ None ]
++	    self.formats = []
+ 
+ 	    if has_auto:
+ 		self.menu.append_text (_(' - According to file suffix - '))
+ 		self.ftype = None
++                self.formats.append(None)
++                
+ 	    else:
+ 		self.ftype = liste [0]
+ 
+--- pybliographer-1.2.7-orig/Pyblio/LyX.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/LyX.py	2005-12-09 13:33:05.000000000 +0100
+@@ -33,14 +33,14 @@
+         pin = os.path.expanduser (base + '.in')
+         try:
+             ans = os.stat (pin)
+-        except os.error:
+-            raise IOError, (-1, _("no input pipe `%s'") % pin)
++        except OSError, msg:
++            raise IOError (_("no input pipe `%s'") % pin)
+         
+         pout = os.path.expanduser (base + '.out')
+         try:
+             ans = os.stat (pout)
+         except os.error:
+-            raise IOError, (-1, _("no output pipe `%s'") % pout)
++            raise IOError (_("no output pipe `%s'") % pout)
+ 
+         def noaction (* arg): return
+         
 --- pybliographer-1.2.7-orig/setup-check.py	2005-10-13 18:11:19.000000000 +0200
-+++ pybliographer-1.2.7/setup-check.py	2005-10-15 23:27:16.000000000 +0200
-@@ -86,8 +86,8 @@
++++ pybliographer-1.2.7/setup-check.py	2005-10-18 12:04:58.000000000 +0200
+@@ -86,9 +86,10 @@
  
      error ('unexpected error')
  
 -if gtk.pygtk_version < (2,4,0):
 -    error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
-+#if gtk.pygtk_version < (2,4,0):
-+#    error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
-     
+-    
++else:
++    if gtk.pygtk_version < (2,4,0):
++        error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
++
  
  try:
+     import _recode


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pybliographer.spec	15 Oct 2005 21:56:04 -0000	1.10
+++ pybliographer.spec	20 Dec 2005 14:11:18 -0000	1.11
@@ -1,11 +1,12 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
 Version: 1.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.7.tar.gz
 Patch0: pybliographer.patch
+Patch1: gnome-python.patch
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -44,6 +45,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -154,6 +156,9 @@
 
 
 %changelog
+* Tue Dec 20 2005 Zoltan Kota  - 1.2.7-2
+- add patches for fixing different bugs
+
 * Fri Oct 15 2005 Zoltan Kota  - 1.2.7-1
 - update to 1.2.7
 - drop gnome-help.patch, fixed upstream



From fedora-extras-commits at redhat.com  Tue Dec 20 14:22:40 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:22:40 -0500
Subject: rpms/gift - New directory
Message-ID: <200512201422.jBKEMeLb010633@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10623/gift

Log Message:
Directory /cvs/extras/rpms/gift added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 14:22:46 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:22:46 -0500
Subject: rpms/gift/devel - New directory
Message-ID: <200512201422.jBKEMkAn010649@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10623/gift/devel

Log Message:
Directory /cvs/extras/rpms/gift/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 14:22:57 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:22:57 -0500
Subject: rpms/gift Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512201422.jBKEMv2I010684@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10671

Added Files:
	Makefile import.log 
Log Message:
Setup of module gift


--- NEW FILE Makefile ---
# Top level Makefile for module gift
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 20 14:23:05 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:23:05 -0500
Subject: rpms/gift/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512201423.jBKEN57H010707@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10671/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gift


--- NEW 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 Dec 20 14:24:37 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:24:37 -0500
Subject: rpms/gift import.log,1.1,1.2
Message-ID: <200512201425.jBKEP7MH010825@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10784

Modified Files:
	import.log 
Log Message:
auto-import gift-0.11.8.1-3 on branch devel from gift-0.11.8.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gift/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Dec 2005 14:22:55 -0000	1.1
+++ import.log	20 Dec 2005 14:24:34 -0000	1.2
@@ -0,0 +1 @@
+gift-0_11_8_1-3:HEAD:gift-0.11.8.1-3.src.rpm:1135088659



From fedora-extras-commits at redhat.com  Tue Dec 20 14:24:42 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:24:42 -0500
Subject: rpms/gift/devel gift-0.11.8.1-gcc4.patch, NONE, 1.1 gift.spec, NONE,
	1.1 giftd.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512201424.jBKEOgKL010818@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10784/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gift-0.11.8.1-gcc4.patch gift.spec giftd.sh 
Log Message:
auto-import gift-0.11.8.1-3 on branch devel from gift-0.11.8.1-3.src.rpm

gift-0.11.8.1-gcc4.patch:

--- NEW FILE gift-0.11.8.1-gcc4.patch ---
--- gift-0.11.8.1/src/plugin.c.gcc4	2004-11-11 20:52:16.000000000 -0600
+++ gift-0.11.8.1/src/plugin.c	2005-06-27 13:56:32.000000000 -0500
@@ -128,11 +128,11 @@
 	size_t  msgwr = 0;                                                     \
 	va_list args;                                                          \
 	if (pfx1)                                                              \
-		msgwr += snprintf (APPENDMSG, "%s: ", STRING_NOTNULL(pfx1));       \
+		msgwr += snprintf (msg + msgwr, sizeof (msg) - msgwr - 1, "%s: ", STRING_NOTNULL(pfx1));       \
 	if (pfx2)                                                              \
-		msgwr += snprintf (APPENDMSG, "[%s]: ", STRING_NOTNULL(pfx2));     \
+		msgwr += snprintf (msg + msgwr, sizeof (msg) - msgwr - 1, "[%s]: ", STRING_NOTNULL(pfx2));     \
 	va_start (args, fmt);                                                  \
-	vsnprintf (APPENDMSG, fmt, args);                                      \
+	vsnprintf (msg + msgwr, sizeof (msg) - msgwr - 1, fmt, args);                                      \
 	va_end (args);
 
 static int wrapper_dbg (Protocol *p, char *fmt, ...)


--- NEW FILE gift.spec ---

%if "%{?fedora}" > "2"
%define _enable_libmagic --enable-libmagic
%endif

%if "%{?rhel}" > "3"
%define _enable_libmagic --enable-libmagic
%endif

Name:	 gift
Summary: Daemon for communicating with filesharing protocols
Version: 0.11.8.1
Release: 3%{?dist} 

License: GPL
Group:	 System Environment/Daemons
URL: 	 http://gift.sourceforge.net/
Source:	 http://dl.sourceforge.net/sourceforge/gift/gift-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch1: gift-0.11.8.1-gcc4.patch

# Wrapper for auto-launch gift-setup for first-time users 
Source1: giftd.sh

BuildRequires: libtool
%if "%{?fedora}" >= "4"
BuildRequires: libtool-ltdl-devel
%endif
BuildRequires: libvorbis-devel
BuildRequires: ImageMagick-devel 
%{?_enable_libmagic:BuildRequires: file > 4.0 }

%description
giFT is a modular daemon capable of abstracting the communication between
the end user and specific filesharing protocols (peer-to-peer or otherwise).

%package devel
Summary: Headers and library files for %{name} 
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
%{summary}.


%prep
%setup -q

%patch1 -p1 -b .gcc4


%build
%configure %{?_enable_libmagic} 

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT
 
## Move giftd out of the way, replace with wrapper
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mv $RPM_BUILD_ROOT%{_bindir}/giftd $RPM_BUILD_ROOT%{_sbindir}/
install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/giftd


## Create/own plugin dir
mkdir -p $RPM_BUILD_ROOT%{_libdir}/giFT

## Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc README AUTHORS COPYING HACKING INSTALL QUICKSTART TODO
%{_bindir}/gift*
%{_sbindir}/giftd
%{_datadir}/giFT/
%{_libdir}/giFT/
%{_libdir}/lib*.so.*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Wed Dec 14 2005 Rex Dieter  0.11.8.1-3
- --enable-libmagic (on platforms where file > 4 available)

* Tue Dec 13 2005 Rex Dieter  0.11.8.1-2
- Summary: Capitalize
- BR: file (libmagic)

* Thu Dec 08 2005 Rex Dieter  0.11.8.1-1
- cleanup for Fedora Extras

* Mon Nov 07 2005 Rex Dieter  0.11.8.1-0.lvn.2
- -devel: BR: pkgconfig

* Mon Nov 29 2004 Rex Dieter  0.11.8.1-0.lvn.1
- 0.11.8.1

* Wed Nov 17 2004 Rex Dieter  0.11.8-0.lvn.1
- 0.11.8

* Mon Nov 1 2004 Rex Dieter  0.11.7-0.lvn.3
- fix linking (libgiftproto).  Ugly, ugly hack... proper fix pending

* Wed Oct 27 2004 Rex Dieter  0.11.7-0.lvn.2
- BR: libtool

* Tue Sep 28 2004 Rex Dieter  0.11.7-0.lvn.1
- 0.11.7

* Thu Jul 29 2004 Rex Dieter  0.11.6-0.lvn.2
- use giftd wrapper to auto-launch gift-setup for first-time users

* Thu Jul 29 2004 Rex Dieter  0.11.6-0.lvn.1
- adjust Release tag for livna.org submission

* Fri Jul 23 2004 Rex Dieter  0.11.6-0.fdr.3
- remove include files from main pkg
- create/own plugindir: %%_libdir/giFT

* Thu Jul 22 2004 Rex Dieter  0.11.6-0.fdr.2
- Group: System Environment/Daemons

* Thu Jul 22 2004 Rex Dieter  0.11.6-0.fdr.1
- 0.11.6
- fedora'ize
- -devel sup-pkg

* Mon Dec 29 2003 Dries Verachtert  0.11.5-1.dries
- first packaging for Fedora Core 1



--- NEW FILE giftd.sh ---
#!/bin/bash

GIFTD=/usr/sbin/giftd

# Try first using X(term)
if [ ! -d ~/.giFT ]; then
  # naive attempt to run only run one instance per user (hopefully).
  LOCKFILE=/var/tmp/gift-setup.${UID}.lock
  echo $$ > $LOCKFILE ||:
  # Try first using X(term), then fallback to console
  if [ ! -z "${DISPLAY}" ]; then 
    xterm -e gift-setup || gift-setup
  else
    gift-setup
  fi
  rm -f $LOCKFILE
fi

# Hopefully we're good to go now
exec ${GIFTD} 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Dec 2005 14:23:01 -0000	1.1
+++ .cvsignore	20 Dec 2005 14:24:40 -0000	1.2
@@ -0,0 +1 @@
+gift-0.11.8.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Dec 2005 14:23:01 -0000	1.1
+++ sources	20 Dec 2005 14:24:40 -0000	1.2
@@ -0,0 +1 @@
+1c70477af403af142359d07ee4a03348  gift-0.11.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Dec 20 14:25:50 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:25:50 -0500
Subject: rpms/gift-openft - New directory
Message-ID: <200512201425.jBKEPo8n010919@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10910/gift-openft

Log Message:
Directory /cvs/extras/rpms/gift-openft added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 14:25:56 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:25:56 -0500
Subject: rpms/gift-openft/devel - New directory
Message-ID: <200512201425.jBKEPuGX010935@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10910/gift-openft/devel

Log Message:
Directory /cvs/extras/rpms/gift-openft/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 14:26:17 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:26:17 -0500
Subject: rpms/gift-openft Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512201426.jBKEQHEH010970@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957

Added Files:
	Makefile import.log 
Log Message:
Setup of module gift-openft


--- NEW FILE Makefile ---
# Top level Makefile for module gift-openft
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 20 14:26:22 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:26:22 -0500
Subject: rpms/gift-openft/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512201426.jBKEQMfY010991@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gift-openft


--- NEW 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 Dec 20 14:26:42 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:26:42 -0500
Subject: rpms/gift-openft import.log,1.1,1.2
Message-ID: <200512201427.jBKERCtc011070@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11030

Modified Files:
	import.log 
Log Message:
auto-import gift-openft-0.2.1.6-2 on branch devel from gift-openft-0.2.1.6-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gift-openft/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Dec 2005 14:26:15 -0000	1.1
+++ import.log	20 Dec 2005 14:26:40 -0000	1.2
@@ -0,0 +1 @@
+gift-openft-0_2_1_6-2:HEAD:gift-openft-0.2.1.6-2.src.rpm:1135088786



From fedora-extras-commits at redhat.com  Tue Dec 20 14:26:47 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:26:47 -0500
Subject: rpms/gift-openft/devel gift-openft-0.2.1.6-lib64.patch, NONE,
	1.1 gift-openft.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200512201427.jBKERIvk011075@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11030/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gift-openft-0.2.1.6-lib64.patch gift-openft.spec 
Log Message:
auto-import gift-openft-0.2.1.6-2 on branch devel from gift-openft-0.2.1.6-2.src.rpm

gift-openft-0.2.1.6-lib64.patch:

--- NEW FILE gift-openft-0.2.1.6-lib64.patch ---
--- gift-openft-0.2.1.6/configure.lib64	2005-04-30 19:05:57.000000000 -0500
+++ gift-openft-0.2.1.6/configure	2005-11-09 09:14:58.000000000 -0600
@@ -20198,7 +20198,7 @@
 
    fi
 
-   plugindir=${prefix}/lib/giFT
+   plugindir=${libdir}/giFT
 
 
    datadir=${prefix}/share/giFT


--- NEW FILE gift-openft.spec ---

Summary: Openft plugin for giFT 
Name:	 gift-openft	
Version: 0.2.1.6
Release: 2%{?dist}

License: GPL
Group:	 System Environment/Libraries
URL: 	 http://gift.sourceforge.net/
Source:	 http://dl.sourceforge.net/sourceforge/gift/gift-openft-0.2.1.6.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch1: gift-openft-0.2.1.6-lib64.patch

BuildRequires: gift-devel
BuildRequires: zlib-devel
BuildRequires: db4-devel

%description
%{summary}.


%prep
%setup -q

%patch1 -p1 -b .lib64


%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 README AUTHORS ChangeLog COPYING NEWS TODO
%{_libdir}/giFT/libOpenFT.*
%{_datadir}/giFT/OpenFT/


%changelog
* Mon Dec 19 2005 Rex Dieter  0.2.1.6-1
- cleanup for Fedora Extras

* Wed Nov 09 2005 Rex Dieter  0.2.1.6-0.lvn.2
- lib64 patch

* Mon Jun 27 2005 Rex Dieter  0.2.1.6-0.lvn.1
- 0.2.1.6

* Tue Dec 07 2004 Rex Dieter  0.2.1.5-0.lvn.1
- 0.2.1.5

* Mon Aug 02 2004 Rex Dieter  0.2.1.4-0.lvn.1
- 0.2.1.4

* Thu Jul 29 2004 Rex Dieter  0.2.1.3-0.lvn.1
- fdr -> lvn

* Thu Jul 22 2004 Rex Dieter  0.2.1.3-0.fdr.1
- 0.2.1.3
- fedora'ize

* Mon Dec 29 2003 Dries Verachtert  0.2.1.2-1.dries
- first packaging for Fedora Core 1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gift-openft/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Dec 2005 14:26:20 -0000	1.1
+++ .cvsignore	20 Dec 2005 14:26:45 -0000	1.2
@@ -0,0 +1 @@
+gift-openft-0.2.1.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gift-openft/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Dec 2005 14:26:20 -0000	1.1
+++ sources	20 Dec 2005 14:26:45 -0000	1.2
@@ -0,0 +1 @@
+6661f01304246a29aeabda113691ca93  gift-openft-0.2.1.6.tar.bz2



From fedora-extras-commits at redhat.com  Tue Dec 20 14:29:15 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:29:15 -0500
Subject: owners owners.list,1.471,1.472
Message-ID: <200512201429.jBKETj53011156@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11132

Modified Files:
	owners.list 
Log Message:
+gift,gift-openft



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -r1.471 -r1.472
--- owners.list	20 Dec 2005 12:31:08 -0000	1.471
+++ owners.list	20 Dec 2005 14:29:13 -0000	1.472
@@ -261,6 +261,8 @@
 Fedora Extras|ghex|A binary editor for GNOME|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|giblib|Simple library and a wrapper for imlib2|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gif2png|A GIF to PNG converter|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+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 osdl.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 20 14:47:57 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 20 Dec 2005 09:47:57 -0500
Subject: rpms/xmms/devel xmms-1.2.10-gcc4.patch,1.1,1.2 xmms.spec,1.11,1.12
Message-ID: <200512201448.jBKEmSak011250@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11227

Modified Files:
	xmms-1.2.10-gcc4.patch xmms.spec 
Log Message:
Update gcc4 fix patch.


xmms-1.2.10-gcc4.patch:

Index: xmms-1.2.10-gcc4.patch
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms-1.2.10-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmms-1.2.10-gcc4.patch	6 Apr 2005 04:57:33 -0000	1.1
+++ xmms-1.2.10-gcc4.patch	20 Dec 2005 14:47:55 -0000	1.2
@@ -9,3 +9,16 @@
  extern irConfig ircfg;
  extern gboolean irconf_is_going;
  
+--- xmms-1.2.10/xmms/sm.c.orig	2004-01-11 18:33:00.000000000 +0100
++++ xmms-1.2.10/xmms/sm.c	2004-04-12 22:44:28.000000000 +0200
+@@ -147,8 +147,9 @@
+ 
+ #else
+ 
+-void sm_init(int argc, char **argv, const char *previous_session_id)
++const char * sm_init(int argc, char **argv, const char *previous_session_id)
+ {
++	return NULL;
+ }
+ 
+ void sm_cleanup(void)


Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xmms.spec	7 Dec 2005 12:00:03 -0000	1.11
+++ xmms.spec	20 Dec 2005 14:47:55 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: The X MultiMedia System, a media player
 Name: xmms
 Version: 1.2.10
-Release: 18%{?dist}
+Release: 18.1%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -147,6 +147,9 @@
 %{_datadir}/aclocal/xmms.m4
 
 %changelog
+* Tue Dec 20 2005 Matthias Saou  1:1.2.10-18.1
+- Update gcc4 patch to include fix for xmms.org bug #1730, fixes FC5 build.
+
 * Sat May 28 2005 Matthias Saou  1:1.2.10-18
 - Build with explicit --with-pic to fix compilation of flac plugin on
   x86_64.



From fedora-extras-commits at redhat.com  Tue Dec 20 15:13:09 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 10:13:09 -0500
Subject: rpms/apollon - New directory
Message-ID: <200512201513.jBKFD98h013036@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/apollon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13027/apollon

Log Message:
Directory /cvs/extras/rpms/apollon added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 15:13:15 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 10:13:15 -0500
Subject: rpms/apollon/devel - New directory
Message-ID: <200512201513.jBKFDFrJ013052@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/apollon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13027/apollon/devel

Log Message:
Directory /cvs/extras/rpms/apollon/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 15:13:33 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 10:13:33 -0500
Subject: rpms/apollon Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512201513.jBKFDXWH013087@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/apollon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13074

Added Files:
	Makefile import.log 
Log Message:
Setup of module apollon


--- NEW FILE Makefile ---
# Top level Makefile for module apollon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 20 15:13:39 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 10:13:39 -0500
Subject: rpms/apollon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512201513.jBKFDdBW013108@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/apollon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13074/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module apollon


--- NEW 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 Dec 20 15:14:03 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 10:14:03 -0500
Subject: rpms/apollon import.log,1.1,1.2
Message-ID: <200512201514.jBKFEXRi013190@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/apollon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13147

Modified Files:
	import.log 
Log Message:
auto-import apollon-1.0.1-3 on branch devel from apollon-1.0.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/apollon/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Dec 2005 15:13:31 -0000	1.1
+++ import.log	20 Dec 2005 15:14:01 -0000	1.2
@@ -0,0 +1 @@
+apollon-1_0_1-3:HEAD:apollon-1.0.1-3.src.rpm:1135091627



From fedora-extras-commits at redhat.com  Tue Dec 20 15:14:08 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 10:14:08 -0500
Subject: rpms/apollon/devel apollon-1.0.1-dtfix.patch, NONE, 1.1 apollon.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512201514.jBKFE8Ua013181@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/apollon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13147/devel

Modified Files:
	.cvsignore sources 
Added Files:
	apollon-1.0.1-dtfix.patch apollon.spec 
Log Message:
auto-import apollon-1.0.1-3 on branch devel from apollon-1.0.1-3.src.rpm

apollon-1.0.1-dtfix.patch:

--- NEW FILE apollon-1.0.1-dtfix.patch ---
--- apollon-1.0.1/apollon/Apollon.desktop.dtfix	2004-10-13 11:33:15.000000000 -0500
+++ apollon-1.0.1/apollon/Apollon.desktop	2004-10-14 07:06:42.225421680 -0500
@@ -1,16 +1,13 @@
 [Desktop Entry]
-Name=Apollon File Sharing Client
-Name[de]=Apollon, Tauschb??rse
+Name=Apollon
 Comment=The ultimate file sharing program for Linux - OpenFT, Gnutella, FastTrack (Kazaa)
-Comment[de]=Das ultimative Tauschb?rsenprogramm f?r Linux - OpenFT, Gnutella, Fasttrack (Kazaa)
-GenericName=Apollon File Sharing Client
-GenericName[de]=Apollon, Tauschb??rse
+GenericName=File Sharing Client
 Exec=apollon
 Type=Application
 Encoding=UTF-8
 Terminal=false
 Icon=apollon
-Categories=Application;Qt;KDE;Network;FileTransfer
+Categories=Application;Qt;KDE;Network;FileTransfer;
 StartupNotify=true
 StartupWMClass=apollon
 


--- NEW FILE apollon.spec ---

Summary: Filesharing client
Name:	 apollon
Version: 1.0.1
Release: 3%{?dist}

License: GPL
Group: 	 Applications/Internet
URL: 	 http://apollon.sourceforge.net/
Source:	 http://dl.sourceforge.net/sourceforge/apollon/apollon-1.0.1.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Fix Name/GenericName, append ; to Categories, 
# remove lines containing non UTF-8 chars ([de] entries)
Patch1: apollon-1.0.1-dtfix.patch 

BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: gift-devel

BuildRequires: qt-devel >= 1:3.3
BuildRequires: kdelibs-devel >= 6:3.3
# Hack/woraround kdelibs-devel bug: https://bugzilla.redhat.com/bugzilla/170602
BuildRequires: libacl-devel

%description
A filesharing client which uses giFT.


%prep
%setup -q 

%patch1 -p1 -b .dtfix



%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include

%configure \
  --disable-rpath \
  --disable-debug --disable-warnings \
  --disable-dependency-tracking --enable-final

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --delete-original --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category Application \
  --add-category X-Fedora \
  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop

## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
  if [ -d $lang_dir ]; then
    lang=$(basename $lang_dir)
    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
    # replace absolute symlinks with relative ones
    pushd $lang_dir
      for i in *; do
        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
      done
    popd
  fi
done
fi

## Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/ldconfig
for icon_theme in crystalsvg hicolor ; do
  touch --no-create %{_datadir}/icons/${icon_theme} ||:
  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done

%postun
/sbin/ldconfig
for icon_theme in crystalsvg hicolor ; do
  touch --no-create %{_datadir}/icons/${icon_theme} ||:
  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done


%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/apollon
%{_libdir}/libapollon.*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/crystalsvg/*/*/*
%{_datadir}/icons/hicolor/*/*/*


%changelog
* Tue Dec 20 2005 Rex Dieter  1.0.1-3
- BR: libacl-devel (workaround kdelibs bug #170602)

* Mon Dec 19 2005 Rex Dieter  1.0.1-2 
- more %%doc's: AUTHORS ChangeLog COPYING TODO 
- drop %%_libdir/lib*.la

* Thu Dec 08 2005 Rex Dieter  1.0.1-1 
- cleanup for Fedora Extras

* Wed Oct 13 2004 Rex Dieter  1.0.1-0.lvn.1
- 1.0.1

* Tue Sep 28 2004 Rex Dieter  1.0-0.lvn.1
- 1.0
- .desktop: touchup Name/GenericName

* Thu Jul 29 2004 Rex Dieter  0.9.4-0.lvn.1
- fdr -> lvn

* Thu Jul 22 2004 Rex Dieter  0.9.4-0.fdr.1
- 0.9.4(-1)
- fedora'ize

* Thu Feb 25 2004 Dries Verachtert  0.9.2-3
- moved the apollon menu entry to 'more internet applications'
  bug found by Sindre Pedersen Bj??rda, thanks!

* Wed Feb 25 2004 Dries Verachtert  0.9.2-2
- removed the dependencies on gift plugins
  bug found by Sindre Pedersen Bj??rda, thanks!

* Wed Feb 4 2004 Dries Verachtert  0.9.2-1
- update to version 0.9.2

* Sat Jan 10 2004 Dries Verachtert  0.9.1-2
- spec file cleanup
- other desktop file

* Mon Dec 29 2003 Dries Verachtert  0.9.1-1
- first packaging for Fedora Core 1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apollon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Dec 2005 15:13:36 -0000	1.1
+++ .cvsignore	20 Dec 2005 15:14:06 -0000	1.2
@@ -0,0 +1 @@
+apollon-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apollon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Dec 2005 15:13:36 -0000	1.1
+++ sources	20 Dec 2005 15:14:06 -0000	1.2
@@ -0,0 +1 @@
+835d783691b1c75cf772042d72d51d82  apollon-1.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Dec 20 15:22:03 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 10:22:03 -0500
Subject: owners owners.list,1.472,1.473
Message-ID: <200512201522.jBKFMXNM013292@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13274

Modified Files:
	owners.list 
Log Message:
+apollon



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -r1.472 -r1.473
--- owners.list	20 Dec 2005 14:29:13 -0000	1.472
+++ owners.list	20 Dec 2005 15:22:01 -0000	1.473
@@ -34,6 +34,7 @@
 Fedora Extras|apel|A Portable Emacs Library|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|apg|Automated Password Generator for random password generation|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|apmud|Power Management daemon for Apple laptops|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|apollon|Filesharing client|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 20 15:24:28 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Tue, 20 Dec 2005 10:24:28 -0500
Subject: rpms/ghdl/devel ghdl-svn38.patch,NONE,1.1 ghdl.spec,1.5,1.6
Message-ID: <200512201524.jBKFOSKo013315@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13301

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-svn38.patch 
Log Message:
update to SVN38, to fix ghw writer bug


ghdl-svn38.patch:

--- NEW FILE ghdl-svn38.patch ---
diff -urN ghdl-0.21/vhdl/ghdl.texi ghdl-0.22dev/vhdl/ghdl.texi
--- ghdl-0.21/vhdl/ghdl.texi	2005-12-12 03:21:55.000000000 +0100
+++ ghdl-0.22dev/vhdl/ghdl.texi	2005-12-20 16:18:45.000000000 +0100
@@ -4,10 +4,14 @@
 @settitle GHDL guide
 @c %**end of header
 
+ at direntry
+* ghdl: (ghdl).         VHDL compiler.
+ at end direntry
+
 @titlepage
 @title GHDL guide
 @subtitle GHDL, a VHDL compiler
- at subtitle For GHDL version 0.21 (Sokcho edition)
+ at subtitle For GHDL version 0.22 (Sokcho edition)
 @author Tristan Gingold
 @c The following two commands start the copyright page.
 @page
diff -urN ghdl-0.21/vhdl/grt/config/win32.c ghdl-0.22dev/vhdl/grt/config/win32.c
--- ghdl-0.21/vhdl/grt/config/win32.c	2005-12-12 03:39:16.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/config/win32.c	2005-12-20 16:18:50.000000000 +0100
@@ -1,5 +1,5 @@
-/*  GRT stack implementation for Win32
-    Copyright (C) 2004, 2005 Felix Bertram.
+/*  GRT stack implementation for Win32 using fibers.
+    Copyright (C) 2005 Tristan Gingold.
 
     GHDL 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
@@ -16,139 +16,74 @@
     Software Foundation, 59 Temple Place - Suite 330, Boston, MA
     02111-1307, USA.
 */
-//-----------------------------------------------------------------------------
-// Project:     GHDL - VHDL Simulator
-// Description: Win32 port of stacks package
-// Note:        Tristan's original i386/Linux used assembly-code 
-//              to manually switch stacks for performance reasons.
-// History:     2004feb09, FB, created.
-//-----------------------------------------------------------------------------
 
 #include 
-//#include 
-//#include 
-//#include 
-
-
-//#define INFO printf
-#define INFO (void)
-
-// GHDL names an endless loop calling FUNC with ARG a 'stack'
-// at a given time, only one stack may be 'executed'
-typedef struct 
-{	HANDLE              thread;         // stack's thread
-	HANDLE              mutex;          // mutex to suspend/resume thread
-	void                (*Func)(void*); // stack's FUNC
-	void*               Arg;            // ARG passed to FUNC
-} Stack_Type_t, *Stack_Type;
+#include 
 
-Stack_Type_t      main_stack_context;
-extern Stack_Type grt_stack_main_stack;
+struct stack_type
+{
+  LPVOID fiber; //  Win fiber.
+  void (*func)(void *);  // Function
+  void *arg; //  Function argument.
+};
+
+static struct stack_type  main_stack_context;
+extern void grt_set_main_stack (struct stack_type *stack);
 
-//------------------------------------------------------------------------------
 void grt_stack_init(void)
-// Initialize the stacks package.
-// This may adjust stack sizes.
-// Must be called after grt.options.decode.
-// => procedure Stack_Init;
-{	INFO("grt_stack_init\n");
-	INFO("  main_stack_context=0x%08x\n", &main_stack_context);
-
-	// create event. reset event, as we are currently running
-	main_stack_context.mutex = CreateEvent(NULL,  // lpsa
-	                                       FALSE, // fManualReset
-	                                       FALSE, // fInitialState
-	                                       NULL); // lpszEventName
-
-	grt_stack_main_stack= &main_stack_context;
-}
-
-//------------------------------------------------------------------------------
-static unsigned long __stdcall grt_stack_loop(void* pv_myStack)
-{
-	Stack_Type myStack= (Stack_Type)pv_myStack;
-
-	INFO("grt_stack_loop\n");
-	
-	INFO("  myStack=0x%08x\n", myStack);
-
-	// block until event becomes set again.
-	// this happens when this stack is enabled for the first time
-	WaitForSingleObject(myStack->mutex, INFINITE);
-	
-	// run stack's function in endless loop
-	while(1)
-	{	INFO("  call 0x%08x with 0x%08x\n", myStack->Func, myStack->Arg);
-		myStack->Func(myStack->Arg);
-	}
-	
-	// we never get here...
-	return 0;
-}
-
-//------------------------------------------------------------------------------
-Stack_Type grt_stack_create(void* Func, void* Arg) 
-// Create a new stack, which on first execution will call FUNC with
-// an argument ARG.
-// => function Stack_Create (Func : Address; Arg : Address) return Stack_Type;
-{  	Stack_Type newStack;
-	DWORD      m_IDThread; // Thread's ID (dummy)
-
-	INFO("grt_stack_create\n");
-	INFO("  call 0x%08x with 0x%08x\n", Func, Arg);
-			
-	newStack= malloc(sizeof(Stack_Type_t));
-	
-	// init function and argument
-	newStack->Func= Func;
-	newStack->Arg=  Arg;
-	
-	// create event. reset event, so that thread will blocked in grt_stack_loop
-	newStack->mutex= CreateEvent(NULL,  // lpsa
-	                             FALSE, // fManualReset
-	                             FALSE, // fInitialState
-	                             NULL); // lpszEventName
-	
-	INFO("  newStack=0x%08x\n", newStack);
-	
-	// create thread, which executes grt_stack_loop
-	newStack->thread= CreateThread(NULL,           // lpsa
-	                               0,              // cbStack
-	                               grt_stack_loop, // lpStartAddr
-	                               newStack,       // lpvThreadParm
-	                               0,              // fdwCreate
-	                               &m_IDThread);   // lpIDThread
-	
-	return newStack;
-}
-
-//------------------------------------------------------------------------------
-void grt_stack_switch(Stack_Type To, Stack_Type From)
-// Resume stack TO and save the current context to the stack pointed by
-// CUR.
-// => procedure Stack_Switch (To : Stack_Type; From : Stack_Type);
-{	INFO("grt_stack_switch\n");
-	INFO("  from 0x%08x to 0x%08x\n", From, To);
-	
-	// set 'To' event. this will make the other thread either
-	// - start for first time in grt_stack_loop
-	// - resume at WaitForSingleObject below
-	SetEvent(To->mutex);
-		
-	// block until 'From' event becomes set again
-	// as we are running, our event is reset and we block here
-	// when stacks are switched, with above SetEvent, we may proceed
-	WaitForSingleObject(From->mutex, INFINITE);
-}
-
-//------------------------------------------------------------------------------
-void grt_stack_delete(Stack_Type Stack)
-// Delete stack STACK, which must not be currently executed.
-// => procedure Stack_Delete (Stack : Stack_Type);
-{	INFO("grt_stack_delete\n");
+{
+  main_stack_context.fiber = ConvertThreadToFiber (NULL);
+  if (main_stack_context.fiber == NULL)
+    {
+      fprintf (stderr, "convertThreadToFiber failed (err=%lu)\n",
+	       GetLastError ());
+      abort ();
+    }
+  grt_set_main_stack (&main_stack_context);
+}
+
+static VOID __stdcall
+grt_stack_loop (void *v_stack)
+{
+  struct stack_type *stack = (struct stack_type *)v_stack;
+  while (1)
+    {
+      (*stack->func)(stack->arg);
+    }
+}
+
+struct stack_type *
+grt_stack_create (void (*func)(void *), void *arg) 
+{
+  struct stack_type *res;
+
+  res = malloc (sizeof (struct stack_type));
+  if (res == NULL)
+    return NULL;
+  res->func = func;
+  res->arg = arg;
+  res->fiber = CreateFiber (0, &grt_stack_loop, res);
+  if (res->fiber == NULL)
+    {
+      free (res);
+      return NULL;
+    }
+  return res;
+}
+
+void
+grt_stack_switch (struct stack_type *to, struct stack_type *from)
+{
+  SwitchToFiber (to->fiber);
+}
+
+void
+grt_stack_delete (struct stack_type *stack)
+{
+  DeleteFiber (stack->fiber);
+  stack->fiber = NULL;
 }
 
-//----------------------------------------------------------------------------
 #ifndef WITH_GNAT_RUN_TIME
 void __gnat_raise_storage_error(void)
 {
@@ -161,6 +96,3 @@
 }
 #endif
 
-//----------------------------------------------------------------------------
-// end of file
-
diff -urN ghdl-0.21/vhdl/grt/ghwlib.c ghdl-0.22dev/vhdl/grt/ghwlib.c
--- ghdl-0.21/vhdl/grt/ghwlib.c	2005-12-07 06:29:04.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/ghwlib.c	2005-12-20 16:18:50.000000000 +0100
@@ -1214,16 +1214,31 @@
   return 0;
 }
 
+static const char *
+ghw_get_lit (union ghw_type *type, int e)
+{
+  if (e >= type->en.nbr || e < 0)
+    return "??";
+  else
+    return type->en.lits[e];
+}
+
+static void
+ghw_disp_lit (union ghw_type *type, int e)
+{
+  printf ("%s (%d)", ghw_get_lit (type, e), e);
+}
+
 void
 ghw_disp_value (union ghw_val *val, union ghw_type *type)
 {
   switch (ghw_get_base_type (type)->kind)
     {
     case ghdl_rtik_type_b2:
-      printf ("%s (%d)", type->en.lits[val->b2], val->b2);
+      ghw_disp_lit (type, val->b2);
       break;
     case ghdl_rtik_type_e8:
-      printf ("%s (%d)", type->en.lits[val->e8], val->e8);
+      ghw_disp_lit (type, val->e8);
       break;
     case ghdl_rtik_type_i32:
       printf ("%d", val->i32);
@@ -1582,10 +1597,14 @@
 }
 
 void
-ghw_disp_range (union ghw_range *rng)
+ghw_disp_range (union ghw_type *type, union ghw_range *rng)
 {
   switch (rng->kind)
     {
+    case ghdl_rtik_type_e8:
+      printf ("%s %s %s", ghw_get_lit (type, rng->e8.left),
+	      ghw_get_dir (rng->e8.dir), ghw_get_lit (type, rng->e8.right));
+      break;
     case ghdl_rtik_type_i32:
     case ghdl_rtik_type_p32:
       printf ("%d %s %d",
@@ -1657,7 +1676,7 @@
 	printf ("subtype %s is ", s->name);
 	ghw_disp_typename (h, s->base);
 	printf (" range ");
-	ghw_disp_range (s->rng);
+	ghw_disp_range (s->base, s->rng);
 	printf (";\n");
       }
       break;
@@ -1692,7 +1711,7 @@
 	  {
 	    if (i != 0)
 	      printf (", ");
-	    ghw_disp_range (a->rngs[i]);
+	    ghw_disp_range ((union ghw_type *)a->base, a->rngs[i]);
 	  }
 	printf (");\n");
       }
diff -urN ghdl-0.21/vhdl/grt/ghwlib.h ghdl-0.22dev/vhdl/grt/ghwlib.h
--- ghdl-0.21/vhdl/grt/ghwlib.h	2005-12-07 06:27:09.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/ghwlib.h	2005-12-20 16:18:50.000000000 +0100
@@ -390,7 +390,8 @@
 
 const char *ghw_get_dir (int is_downto);
 
-void ghw_disp_range (union ghw_range *rng);
+/* Note: TYPE must be a base type (used only to display literals).  */
+void ghw_disp_range (union ghw_type *type, union ghw_range *rng);
 
 void ghw_disp_type (struct ghw_handler *h, union ghw_type *t);
 
diff -urN ghdl-0.21/vhdl/grt/grt-signals.adb ghdl-0.22dev/vhdl/grt/grt-signals.adb
--- ghdl-0.21/vhdl/grt/grt-signals.adb	2005-11-18 03:13:36.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/grt-signals.adb	2005-12-20 16:18:50.000000000 +0100
@@ -1095,15 +1095,6 @@
          when others =>
             Internal_Error ("ghdl_create_signal_attribute");
       end case;
---       Sig_Instance_Name := new Ghdl_Instance_Name_Type'
---         (Kind => Ghdl_Name_Signal,
---          Name => null,
---          Parent => null,
---          Brother => null,
---          Sig_Mode => Mode,
---          Sig_Kind => Kind_Signal_No,
---        Sig_Indexes => (First => Sig_Table.Last + 1, Last => Sig_Table.Last),
---          Sig_Type_Desc => Sig_Type);
       --  Note: bit and boolean are both mode_b2.
       Res := Create_Signal
         (Mode_B2, Value_Union'(Mode => Mode_B2, B2 => True),
diff -urN ghdl-0.21/vhdl/grt/grt-waves.adb ghdl-0.22dev/vhdl/grt/grt-waves.adb
--- ghdl-0.21/vhdl/grt/grt-waves.adb	2005-12-07 05:50:07.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/grt-waves.adb	2005-12-20 16:18:50.000000000 +0100
@@ -785,6 +785,15 @@
    Nbr_Scope_Signals : Natural := 0;
    Nbr_Dumped_Signals : Natural := 0;
 
+   --  This is only valid during write_hierarchy.
+   function Get_Signal_Number (Sig : Ghdl_Signal_Ptr) return Natural
+   is
+      function To_Integer_Address is new Ada.Unchecked_Conversion
+        (Ghdl_Signal_Ptr, Integer_Address);
+   begin
+      return Natural (To_Integer_Address (Sig.Alink));
+   end Get_Signal_Number;
+
    procedure Write_Signal_Number (Val_Addr : Address;
                                   Val_Name : Vstring;
                                   Val_Type : Ghdl_Rti_Access)
@@ -792,20 +801,28 @@
       pragma Unreferenced (Val_Name);
       pragma Unreferenced (Val_Type);
 
-      function To_Integer_Address is new Ada.Unchecked_Conversion
-        (Ghdl_Signal_Ptr, Integer_Address);
+      Num : Natural;
+
       function To_Ghdl_Signal_Ptr is new Ada.Unchecked_Conversion
         (Source => Integer_Address, Target => Ghdl_Signal_Ptr);
       Sig : Ghdl_Signal_Ptr;
    begin
+      --  Convert to signal.
       Sig := To_Ghdl_Signal_Ptr (To_Addr_Acc (Val_Addr).all);
-      if not Sig.Flags.Is_Dumped then
-         Sig.Flags.Is_Dumped := True;
+
+      --  Get signal number.
+      Num := Get_Signal_Number (Sig);
+
+      --  If the signal number is 0, then assign a valid signal number.
+      if Num = 0 then
          Nbr_Dumped_Signals := Nbr_Dumped_Signals + 1;
-         Sig.Flink := To_Ghdl_Signal_Ptr
+         Sig.Alink := To_Ghdl_Signal_Ptr
            (Integer_Address (Nbr_Dumped_Signals));
+         Num := Nbr_Dumped_Signals;
       end if;
-      Wave_Put_ULEB128 (Ghdl_E32 (To_Integer_Address (Sig.Flink)));
+
+      --  Do the real job: write the signal number.
+      Wave_Put_ULEB128 (Ghdl_E32 (Num));
    end Write_Signal_Number;
 
    procedure Foreach_Scalar_Signal_Number is new
@@ -1370,13 +1387,18 @@
       Table_Initial => 32,
       Table_Increment => 100);
 
+   function Get_Dump_Entry (N : Natural) return Ghdl_Signal_Ptr is
+   begin
+      return Dump_Table.Table (N);
+   end Get_Dump_Entry;
+
    procedure Write_Hierarchy (Root : VhpiHandleT)
    is
       N : Natural;
    begin
-      --  Check Flink is 0.
+      --  Check Alink is 0.
       for I in Sig_Table.First .. Sig_Table.Last loop
-         if Sig_Table.Table (I).Flink /= null then
+         if Sig_Table.Table (I).Alink /= null then
             Internal_Error ("wave.write_hierarchy");
          end if;
       end loop;
@@ -1393,15 +1415,20 @@
       Wave_Put_Byte (0);
 
       Dump_Table.Set_Last (Nbr_Dumped_Signals);
+      for I in Dump_Table.First .. Dump_Table.Last loop
+         Dump_Table.Table (I) := null;
+      end loop;
 
       --  Save and clear.
-      N := 0;
       for I in Sig_Table.First .. Sig_Table.Last loop
-         if Sig_Table.Table (I).Flags.Is_Dumped then
-            N := N + 1;
+         N := Get_Signal_Number (Sig_Table.Table (I));
+         if N /= 0 then
+            if Dump_Table.Table (N) /= null then
+               Internal_Error ("wave.write_hierarchy(2)");
+            end if;
             Dump_Table.Table (N) := Sig_Table.Table (I);
+            Sig_Table.Table (I).Alink := null;
          end if;
-         Sig_Table.Table (I).Flink := null;
       end loop;
    end Write_Hierarchy;
 
diff -urN ghdl-0.21/vhdl/version.ads ghdl-0.22dev/vhdl/version.ads
--- ghdl-0.21/vhdl/version.ads	2005-12-18 14:07:38.000000000 +0100
+++ ghdl-0.22dev/vhdl/version.ads	2005-12-20 16:18:55.000000000 +0100
@@ -1,4 +1,4 @@
 package Version is
    Ghdl_Version : constant String :=
-      "GHDL 0.21 (20051218) [Sokcho edition]";
+      "GHDL 0.22dev (20051220) [Sokcho edition]";
 end Version;


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ghdl.spec	18 Dec 2005 22:47:39 -0000	1.5
+++ ghdl.spec	20 Dec 2005 15:24:26 -0000	1.6
@@ -3,8 +3,8 @@
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
-Version: 0.21
-Release: 1%{?dist}
+Version: 0.22
+Release: 0.svn38.0%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -14,7 +14,7 @@
 # ./dist.sh sources
 Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
-Patch0: ghdl-0.21-infodirentry.patch
+Patch0: ghdl-svn38.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo
 Requires(post): /sbin/install-info
@@ -52,9 +52,9 @@
 %prep
 %setup -q -n gcc-%{gccver} -T -b 1 -a 0
 pushd ghdl-%{ghdlver}
+%patch0 -p1
 %{__mv} vhdl ../gcc/
 popd
-%patch0 -p0
 
 %build
 %{__mkdir} obj-%{gcc_target_platform}
@@ -114,8 +114,6 @@
 	--host=%{gcc_target_platform}
 %endif
 
-#{__mkdir} -p gcc/vhdl
-#{__cp} ../gcc/vhdl/grt/grt.ver gcc/vhdl
 # Parallel make doesn't work, so not using %{?_smp_mflags}
 %{__make}
 



From fedora-extras-commits at redhat.com  Tue Dec 20 16:42:06 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Tue, 20 Dec 2005 11:42:06 -0500
Subject: rpms/ghdl/devel ghdl.spec, 1.6, 1.7 ghdl-0.21-infodirentry.patch,
	1.1, NONE
Message-ID: <200512201642.jBKGga0d015137@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15119

Modified Files:
	ghdl.spec 
Removed Files:
	ghdl-0.21-infodirentry.patch 
Log Message:
remove local patch now in upstream repo



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ghdl.spec	20 Dec 2005 15:24:26 -0000	1.6
+++ ghdl.spec	20 Dec 2005 16:42:04 -0000	1.7
@@ -4,7 +4,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.22
-Release: 0.svn38.0%{?dist}
+Release: 0.38svn.0%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/


--- ghdl-0.21-infodirentry.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 20 16:56:26 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 20 Dec 2005 11:56:26 -0500
Subject: rpms/bittorrent/devel bittorrent-4.2.2-no-version-check.patch, NONE,
	1.1 bittorrent.spec, 1.33, 1.34
Message-ID: <200512201656.jBKGuvti015244@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15223

Modified Files:
	bittorrent.spec 
Added Files:
	bittorrent-4.2.2-no-version-check.patch 
Log Message:
Add patch to prevent phoning home for new version checks


bittorrent-4.2.2-no-version-check.patch:

--- NEW FILE bittorrent-4.2.2-no-version-check.patch ---
--- BitTorrent-4.2.2/BitTorrent/NewVersion.py	2005-12-20 11:44:41.737788953 +0000
+++ BitTorrent-4.2.2/BitTorrent/NewVersion.py	2005-12-20 11:49:49.318965734 +0000
@@ -101,6 +101,9 @@
 
 
     def get(self):
+        self.debug('Version check skipped for RPM package')
+        return
+
         try:
             self.get_available()
         except BTFailure, e:


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- bittorrent.spec	19 Dec 2005 10:06:12 -0000	1.33
+++ bittorrent.spec	20 Dec 2005 16:56:24 -0000	1.34
@@ -4,7 +4,7 @@
 
 Name:           bittorrent
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
@@ -15,6 +15,7 @@
 Source2:        bittorrent.png
 Source3:	btseed.init
 Source4:	bttrack.init
+Patch0:		bittorrent-4.2.2-no-version-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q -n BitTorrent-%{version}
+%patch0 -p1
 %{__sed} -i "s#appdir = .*#appdir = '%{name}-%{version}'#" \
 	BitTorrent/platform.py
 %{__sed} -i "s#public_key_file = .*#public_key_file = open('%{pkidir}/bittorrent/public.key', 'rb')#" \
@@ -217,6 +219,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Tue Dec 20 2005 Paul Howarth  4.2.2-2
+- Add patch to prevent phoning home for new version checks
+
 * Mon Dec 19 2005 Paul Howarth  4.2.2-1
 - Update to 4.2.2
 



From fedora-extras-commits at redhat.com  Tue Dec 20 17:03:15 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 20 Dec 2005 12:03:15 -0500
Subject: rpms/bittorrent/FC-4 bittorrent-4.2.2-no-version-check.patch, NONE,
	1.1 bittorrent.spec, 1.18, 1.19
Message-ID: <200512201703.jBKH3o4S016925@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904

Modified Files:
	bittorrent.spec 
Added Files:
	bittorrent-4.2.2-no-version-check.patch 
Log Message:
resync with devel


bittorrent-4.2.2-no-version-check.patch:

--- NEW FILE bittorrent-4.2.2-no-version-check.patch ---
--- BitTorrent-4.2.2/BitTorrent/NewVersion.py	2005-12-20 11:44:41.737788953 +0000
+++ BitTorrent-4.2.2/BitTorrent/NewVersion.py	2005-12-20 11:49:49.318965734 +0000
@@ -101,6 +101,9 @@
 
 
     def get(self):
+        self.debug('Version check skipped for RPM package')
+        return
+
         try:
             self.get_available()
         except BTFailure, e:


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-4/bittorrent.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bittorrent.spec	19 Dec 2005 10:08:56 -0000	1.18
+++ bittorrent.spec	20 Dec 2005 17:03:08 -0000	1.19
@@ -4,7 +4,7 @@
 
 Name:           bittorrent
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
@@ -15,6 +15,7 @@
 Source2:        bittorrent.png
 Source3:	btseed.init
 Source4:	bttrack.init
+Patch0:		bittorrent-4.2.2-no-version-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q -n BitTorrent-%{version}
+%patch0 -p1
 %{__sed} -i "s#appdir = .*#appdir = '%{name}-%{version}'#" \
 	BitTorrent/platform.py
 %{__sed} -i "s#public_key_file = .*#public_key_file = open('%{pkidir}/bittorrent/public.key', 'rb')#" \
@@ -217,6 +219,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Tue Dec 20 2005 Paul Howarth  4.2.2-2
+- Add patch to prevent phoning home for new version checks
+
 * Mon Dec 19 2005 Paul Howarth  4.2.2-1
 - Update to 4.2.2
 



From fedora-extras-commits at redhat.com  Tue Dec 20 17:09:00 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 20 Dec 2005 12:09:00 -0500
Subject: rpms/bittorrent/FC-3 bittorrent-4.2.2-no-version-check.patch, NONE,
	1.1 bittorrent.spec, 1.13, 1.14
Message-ID: <200512201709.jBKH9Yvl017002@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16978

Modified Files:
	bittorrent.spec 
Added Files:
	bittorrent-4.2.2-no-version-check.patch 
Log Message:
resync with devel


bittorrent-4.2.2-no-version-check.patch:

--- NEW FILE bittorrent-4.2.2-no-version-check.patch ---
--- BitTorrent-4.2.2/BitTorrent/NewVersion.py	2005-12-20 11:44:41.737788953 +0000
+++ BitTorrent-4.2.2/BitTorrent/NewVersion.py	2005-12-20 11:49:49.318965734 +0000
@@ -101,6 +101,9 @@
 
 
     def get(self):
+        self.debug('Version check skipped for RPM package')
+        return
+
         try:
             self.get_available()
         except BTFailure, e:


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/bittorrent.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bittorrent.spec	19 Dec 2005 10:11:55 -0000	1.13
+++ bittorrent.spec	20 Dec 2005 17:08:58 -0000	1.14
@@ -4,7 +4,7 @@
 
 Name:           bittorrent
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
@@ -15,6 +15,7 @@
 Source2:        bittorrent.png
 Source3:	btseed.init
 Source4:	bttrack.init
+Patch0:		bittorrent-4.2.2-no-version-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q -n BitTorrent-%{version}
+%patch0 -p1
 %{__sed} -i "s#appdir = .*#appdir = '%{name}-%{version}'#" \
 	BitTorrent/platform.py
 %{__sed} -i "s#public_key_file = .*#public_key_file = open('%{pkidir}/bittorrent/public.key', 'rb')#" \
@@ -217,6 +219,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Tue Dec 20 2005 Paul Howarth  4.2.2-2
+- Add patch to prevent phoning home for new version checks
+
 * Mon Dec 19 2005 Paul Howarth  4.2.2-1
 - Update to 4.2.2
 



From fedora-extras-commits at redhat.com  Tue Dec 20 17:15:21 2005
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 20 Dec 2005 12:15:21 -0500
Subject: rpms/yumex/devel .cvsignore, 1.6, 1.7 sources, 1.9, 1.10 yumex.spec,
	1.9, 1.10
Message-ID: <200512201715.jBKHFpFu017121@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17097

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 0.45-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Oct 2005 08:08:45 -0000	1.6
+++ .cvsignore	20 Dec 2005 17:15:19 -0000	1.7
@@ -1 +1 @@
-yumex-0.42-9.tar.gz
+yumex-0.45-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	31 Oct 2005 08:08:45 -0000	1.9
+++ sources	20 Dec 2005 17:15:19 -0000	1.10
@@ -1 +1 @@
-362336685b1d6114df22e805a1511f60  yumex-0.42-9.tar.gz
+ada14317266254793e180a4e32c5408a  yumex-0.45-1.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- yumex.spec	31 Oct 2005 08:08:45 -0000	1.9
+++ yumex.spec	20 Dec 2005 17:15:19 -0000	1.10
@@ -1,8 +1,8 @@
-%define   build_v 9
+%define   build_v 1
 
 Name:     yumex
-Version:  0.42
-Release:  9.0%{?dist}
+Version:  0.45
+Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -16,7 +16,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 
-Requires: yum >= 2.4
+Requires: yum >= 2.5
 Requires: pygtk2
 Requires: usermode
 Requires: pygtk2-libglade
@@ -67,14 +67,36 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Mon Oct 31 2005 Tim Lauridsen  - 0.42-8.0
-- Release 0.42-9.0
-- Removed syntax error in yumbase.py.
-* Mon Oct 31 2005 Tim Lauridsen  - 0.42-8.0
+* Tue Dec 20 2005 Tim Lauridsen  - 0.44-1.0
+- Development Release 0.45-1.0
+- Changed to work with yum 2.5.0
+- Requires: yum >= 2.5
+- Same features as 0.44-1.0, but uses yum 2.5.0 API 
+* Thu Dec 15 2005 Tim Lauridsen  - 0.44-1.0
+- Public Release 0.44-1.0
+* Sun Dec 11 2005 Tim Lauridsen  - 0.43-10.0
+- Release 0.43-10.0
+* Sat Dec 10 2005 Tim Lauridsen  - 0.43-9.0
+- Release 0.43-9.0
+* Wed Nov 23 2005 Tim Lauridsen  - 0.43-8.0
+- Release 0.43-8.0
+* Wed Nov 23 2005 Tim Lauridsen  - 0.43-7.0
+- Release 0.43-7.0
+* Fri Nov 18 2005 Tim Lauridsen  - 0.43-6.0
+- Release 0.43-6.0
+* Thu Nov 17 2005 Tim Lauridsen  - 0.43-5.0
+- Release 0.43-5.0
+* Wed Nov 16 2005 Tim Lauridsen  - 0.43-4.0
+- Release 0.43-4.0
+* Thu Nov 8 2005 Tim Lauridsen  - 0.43-3.0
+- Release 0.43-3.0
+* Thu Nov 7 2005 Tim Lauridsen  - 0.43-2.0
+- Release 0.43-2.0
+* Thu Nov 7 2005 Tim Lauridsen  - 0.43-1.0
+- Release 0.43-1.0
+- Lot of changes, check the ChangeLog
+* Thu Oct 13 2005 Tim Lauridsen  - 0.42-8.0
 - Release 0.42-8.0
-- Updated french traslation
-- Added Italien translation.
-- Added ETA truncation fix patches (Thanks to Dennis Cranston)
 * Thu Oct 13 2005 Tim Lauridsen  - 0.42-7.0
 - Release 0.42-7.0
 - Changed Requires: yum to >= 2.4



From fedora-extras-commits at redhat.com  Tue Dec 20 19:10:03 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue, 20 Dec 2005 14:10:03 -0500
Subject: CVSROOT avail,1.20,1.21
Message-ID: <200512201911.jBKJB4DK020843@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20820

Modified Files:
	avail 
Log Message:
Adding ender.


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- avail	14 Dec 2005 17:02:35 -0000	1.20
+++ avail	20 Dec 2005 19:10:01 -0000	1.21
@@ -21,7 +21,7 @@
 # Fedora Web site
 unavail | | web
 avail | tfox,notting,sopwith,gdk,katzj,kwade | web
-avail | havill,hp,nman64,ivazquez | web
+avail | havill,hp,nman64,ivazquez,jkeating | web
 avail | katzj | web/html/About/Projects/anaconda-installer
 #avail | bfox | web/html/projects/config-tools
 avail | blizzard,krh | web/html/About/Projects/desktop



From fedora-extras-commits at redhat.com  Tue Dec 20 21:50:45 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue, 20 Dec 2005 16:50:45 -0500
Subject: CVSROOT avail,1.21,1.22
Message-ID: <200512202151.jBKLpFQg025653@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25605/CVSROOT

Modified Files:
	avail 
Log Message:
Adding tchung to edit the News area.


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- avail	20 Dec 2005 19:10:01 -0000	1.21
+++ avail	20 Dec 2005 21:50:42 -0000	1.22
@@ -52,5 +52,6 @@
 avail | pfrields | web/html/participate/documentation-guide
 avail | pfrields,mjohnson | web/html/participate/documentation-quick-start
 avail | pfrields | web/html/participate/developers-guide
+avail | tchung | web/html/News
 
 



From fedora-extras-commits at redhat.com  Tue Dec 20 21:50:56 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 16:50:56 -0500
Subject: rpms/cernlib/devel cernlib.spec,1.10,1.11
Message-ID: <200512202151.jBKLpS13025656@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25634

Modified Files:
	cernlib.spec 
Log Message:
* Tue Dec 20 2005 Patrice Dumas  - 2005-10
- add file in /etc/ld.so.conf.d required for dynamic linking



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cernlib.spec	14 Dec 2005 18:18:45 -0000	1.10
+++ cernlib.spec	20 Dec 2005 21:50:55 -0000	1.11
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       9%{?dist}.1
+Release:       10%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -625,6 +625,9 @@
 	cp -Rp $dir $base_include/
 done
 
+%{__install} -d -m755 $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo %{_libdir}/cernlib/%{version}/lib > $RPM_BUILD_ROOT/etc/ld.so.conf.d/cernlib-%{version}-%{_arch}.conf
+
 find $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} -name Imakefile -exec rm -f \{\} \;
 rm -f $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/ntuple/*.c
 
@@ -637,6 +640,7 @@
 
 %files
 %defattr(-,root,root,-)
+/etc/ld.so.conf.d/*
 %dir %{_libdir}/cernlib/
 %dir %{_libdir}/cernlib/%{version}
 %dir %{_libdir}/cernlib/%{version}/lib
@@ -699,6 +703,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Dec 20 2005 Patrice Dumas  - 2005-10
+- add file in /etc/ld.so.conf.d required for dynamic linking
+
 * Wed Dec 14 2005 Patrice Dumas  - 2005-9.1
 - use new debian patchset
 



From fedora-extras-commits at redhat.com  Tue Dec 20 21:54:01 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 16:54:01 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.17,1.18
Message-ID: <200512202154.jBKLsYYO025725@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25703

Modified Files:
	cernlib.spec 
Log Message:
* Tue Dec 20 2005 Patrice Dumas  - 2005-10
- add file in /etc/ld.so.conf.d required for dynamic linking



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cernlib.spec	14 Dec 2005 16:32:30 -0000	1.17
+++ cernlib.spec	20 Dec 2005 21:54:01 -0000	1.18
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       9%{?dist}.2
+Release:       10%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -623,6 +623,9 @@
 	cp -Rp $dir $base_include/
 done
 
+%{__install} -d -m755 $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo %{_libdir}/cernlib/%{version}/lib > $RPM_BUILD_ROOT/etc/ld.so.conf.d/cernlib-%{version}-%{_arch}.conf
+
 find $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} -name Imakefile -exec rm -f \{\} \;
 rm -f $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/ntuple/*.c
 
@@ -635,6 +638,7 @@
 
 %files
 %defattr(-,root,root,-)
+/etc/ld.so.conf.d/*
 %dir %{_libdir}/cernlib/
 %dir %{_libdir}/cernlib/%{version}
 %dir %{_libdir}/cernlib/%{version}/lib
@@ -697,6 +701,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Dec 20 2005 Patrice Dumas  - 2005-10
+- add file in /etc/ld.so.conf.d required for dynamic linking
+
 * Wed Dec 14 2005 Patrice Dumas  - 2005-9.2
 - use new debian patchset
 



From fedora-extras-commits at redhat.com  Tue Dec 20 21:54:45 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 16:54:45 -0500
Subject: rpms/cernlib/FC-3 cernlib.spec,1.12,1.13
Message-ID: <200512202155.jBKLtHnB025794@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25731

Modified Files:
	cernlib.spec 
Log Message:
* Tue Dec 20 2005 Patrice Dumas  - 2005-10
- add file in /etc/ld.so.conf.d required for dynamic linking



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cernlib.spec	15 Dec 2005 12:07:03 -0000	1.12
+++ cernlib.spec	20 Dec 2005 21:54:45 -0000	1.13
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -622,6 +622,9 @@
 	cp -Rp $dir $base_include/
 done
 
+%{__install} -d -m755 $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo %{_libdir}/cernlib/%{version}/lib > $RPM_BUILD_ROOT/etc/ld.so.conf.d/cernlib-%{version}-%{_arch}.conf
+
 find $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} -name Imakefile -exec rm -f \{\} \;
 rm -f $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/ntuple/*.c
 
@@ -634,6 +637,7 @@
 
 %files
 %defattr(-,root,root,-)
+/etc/ld.so.conf.d/*
 %dir %{_libdir}/cernlib/
 %dir %{_libdir}/cernlib/%{version}
 %dir %{_libdir}/cernlib/%{version}/lib
@@ -696,6 +700,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Dec 20 2005 Patrice Dumas  - 2005-10
+- add file in /etc/ld.so.conf.d required for dynamic linking
+
 * Wed Dec 14 2005 Patrice Dumas  - 2005-9
 - use new debian patchset
 



From fedora-extras-commits at redhat.com  Tue Dec 20 22:27:24 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 20 Dec 2005 17:27:24 -0500
Subject: fedora-security/audit fc4,1.111,1.112 fc5,1.21,1.22
Message-ID: <200512202227.jBKMRsOn027596@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27576

Modified Files:
	fc4 fc5 
Log Message:
Deal with the fetchmail update.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- fc4	20 Dec 2005 10:12:13 -0000	1.111
+++ fc4	20 Dec 2005 22:27:22 -0000	1.112
@@ -3,7 +3,7 @@
 
 ** are items that need attention
 
-CVE-2005-4348 VULNERABLE (fetchmail)
+CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187]
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 backport (sudo) [since FEDORA-2005-1147] was ignore only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fc5	20 Dec 2005 10:12:13 -0000	1.21
+++ fc5	20 Dec 2005 22:27:22 -0000	1.22
@@ -12,7 +12,7 @@
 
 ** are items that need attention
 
-CVE-2005-4348 VULNERABLE (fetchmail, fixed 6.2.5.5, fixed 6.3.1)
+CVE-2005-4348 version (fetchmail, fixed 6.3.1)
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages



From fedora-extras-commits at redhat.com  Tue Dec 20 22:46:50 2005
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 20 Dec 2005 17:46:50 -0500
Subject: web/html/About/schedule index.php,1.2,1.3
Message-ID: <200512202247.jBKMlKpH027686@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/web/html/About/schedule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27662

Modified Files:
	index.php 
Log Message:
Adjusted schedule to show latest slip.



Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/About/schedule/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.php	6 Dec 2005 06:53:30 -0000	1.2
+++ index.php	20 Dec 2005 22:46:47 -0000	1.3
@@ -45,26 +45,26 @@
      		test1 release
 
    
 
    19December9January 2006
  test2 devel freeze, String change deadline (data provided)
    
      		
 
    
 
    23December16January 2006
  test2 release, string build freeze (builds completed)
 
    
 
    16January 20066February 2006
  Translation deadline (data provided)
    
      test3 devel freeze
      		
 
    
 
    23January 200613February 2006
  test3 release, translation build freeze (builds completed)
 
    
 
    Continual freeze, only critical bugs fixed until release
 
    
 
    13February 20066March 2006
  Absolute devel freeze
 
    
 
    27February 200615March 2006
  Release open, announced
 
    
 
    Revision 0.37.22005-12-28PaulWFrields
    
+	  
    
+	    Minor revision updating entity names and incorporating
+	    variablelist.
+	  
    
 	
    
 
 /etc/yum.repos.d and end with the suffix
       .repo.  Below is an example configuration
       file.
-    
    +    
     [mirror]
 name=Fedora Core $releasever - $basearch - Base
 baseurl=http://server.mydomain.net/mirror/fedora/linux/core/$releasever/$basearch


Index: sn-planning-and-setup.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/mirror/sn-planning-and-setup.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sn-planning-and-setup.php	27 Nov 2005 17:18:38 -0000	1.1
+++ sn-planning-and-setup.php	28 Dec 2005 18:54:16 -0000	1.2
@@ -8,7 +8,7 @@
 ?>
 
 
    2. Planning and Setup
    Prev   Next
    2. Planning and Setup
    2.1. The Distribution Structure
    
-	The Fedora distribution, which is the collection of all Fedora-related
+	The Fedora distribution, which is the collection of all Fedora-related
 	files, uses the directory tree in Example 1, “Fedora directory tree”. It may include multiple
 	versions of Fedora Core. The tree design makes it easier to "trim"
 	unnecessary or undesired files.  When you set up a mirror,
@@ -73,7 +73,7 @@
 	folder contains images of the CD-ROM version of the
 	distribution.
       
    [Note]RPM packages
    
-	  RPM, originally the Red Hat Package Manager and now
+	  RPM, originally the Red Hat Package Manager and now
 	  the RPM Package Manager, is not just a file format. RPM is
 	  also a system that tracks and interconnects software and
 	  version information. The RPM system is quite popular, and many
@@ -111,8 +111,8 @@
 cd /var/www/mirror/fedora/linux/core/4/i386/os/Fedora
 ln ../../SRPMS SRPMS
 
    
-	The documentation for anaconda, the Fedora Core installation program, calls this directory
-	structure an exploded tree. This is because the package data on each CD is extracted,
+	The documentation for anaconda, the Fedora Core installation program, calls this directory
+	structure an exploded tree. This is because the package data on each CD is extracted,
 	or exploded, to a large directory tree with a predetermined structure.
 	The anaconda installer expects this structure
 	to some extent.
@@ -301,19 +301,19 @@
 	  use some of the command line switches to improve performance and
 	  feedback. The switches -PHav enable the following
 	  rsync features:
-	
    • 
-	      -P — recover partially-downloaded files,
-	      and show a progress meter
-	    
    • 
-	      -H — preserve hard links
-	    
    • 
-	      -a — recurse all directories, and preserve
-	      as much file information as possible, including timestamps,
-	      ownership, permissions, device files (if you are running as root),
-	      and soft links
-	    
    • 
-	      -v — give verbose feedback to the screen
-	    
    
+	
    -P
    
+		recover partially-downloaded files, and show a progress
+		meter
+	      
    -H
    
+		preserve hard links
+	      
    -a
    
+		recurse all directories, and preserve as much file
+		information as possible, including timestamps,
+		ownership, permissions, device files (if you are running
+		as root), and soft links
+	      
    -v
    
+		give verbose feedback to the screen
+	      
    
 	  Remove the -v switch if you run this mirroring
 	  process as part of a script, or have no need to monitor progress. The
 	  following example mirrors all available versions of Fedora Core from an


Index: sn-server-config.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/mirror/sn-server-config.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sn-server-config.php	27 Nov 2005 17:18:38 -0000	1.1
+++ sn-server-config.php	28 Dec 2005 18:54:16 -0000	1.2
@@ -66,7 +66,7 @@
         create the configuration file
         /etc/httpd/conf.d/mirror.conf. The
         following listing is an example:
-       
    +       
     # The name at which the mirror will be shared, 
 # followed by the name of the root directory of that tree.
 Alias /mirror /var/www/mirror
@@ -103,12 +103,12 @@
           you build your mirror in another directory, you may need to
           modify the SELinux policy.
         
    3.3. Solving Dependencies
    
-	Every RPM package has a header that contains all
+	Every RPM package has a header that contains all
 	the vital information about that package. This information
 	includes name, version and release, contents, the capabilities
 	provided by the package, and any prerequisites. These
 	prerequisites may include
-	dependencies. A dependency is a requirement for one or more
+	dependencies. A dependency is a requirement for one or more
 	additional packages.
       
    
 	Packages installed without satisfying their dependencies may not
@@ -119,7 +119,7 @@
 	automatically, providing an improved user experience.
       
    
       The Yellow Dog Updater Modified, or
-	yum, is a Python-based system for computing and solving
+	yum, is a Python-based system for computing and solving
 	RPM dependencies. A yum client retrieves a
 	cache of headers from its repository server, as well as a list
 	of available RPM packages and their exact locations on the
@@ -144,7 +144,7 @@
 	to http://fedora.redhat.com/docs/yum/.
       
    3.4. Configuring Repositories
    
       A yum
-	repository is a collection of packages on a server which
+	repository is a collection of packages on a server which
 	supports yum clients. Repositories can serve
 	both types of clients if desired.
       
    



From fedora-extras-commits at redhat.com  Wed Dec 28 19:12:41 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 28 Dec 2005 14:12:41 -0500
Subject: fedora-rpmdevtools fedora-rpmdevtools.spec,1.80,1.81
Message-ID: <200512281913.jBSJDBiO003829@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3811

Modified Files:
	fedora-rpmdevtools.spec 
Log Message:
Update spectool to 1.0.5.


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- fedora-rpmdevtools.spec	26 Oct 2005 21:20:12 -0000	1.80
+++ fedora-rpmdevtools.spec	28 Dec 2005 19:12:39 -0000	1.81
@@ -1,6 +1,6 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.4
+%define spectool_version   1.0.5
 
 Name:           fedora-rpmdevtools
 Version:        1.3
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Ville Skytt?? 
+- Update spectool to 1.0.5.
+
 * Thu Oct 27 2005 Ville Skytt??  - 1.3-1
 - check-rpaths-worker: detect when RPATH references the parent directory
   of an absolute path (#169298, Enrico Scholz).



From fedora-extras-commits at redhat.com  Wed Dec 28 19:13:56 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 28 Dec 2005 14:13:56 -0500
Subject: fedora-rpmdevtools fedora-rpmdevtools.spec,1.81,1.82
Message-ID: <200512281914.jBSJEQx5003858@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3840

Modified Files:
	fedora-rpmdevtools.spec 
Log Message:
Add bugzilla reference for spectool update.


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- fedora-rpmdevtools.spec	28 Dec 2005 19:12:39 -0000	1.81
+++ fedora-rpmdevtools.spec	28 Dec 2005 19:13:54 -0000	1.82
@@ -128,7 +128,7 @@
 
 %changelog
 * Wed Dec 28 2005 Ville Skytt?? 
-- Update spectool to 1.0.5.
+- Update spectool to 1.0.5 (#162253).
 
 * Thu Oct 27 2005 Ville Skytt??  - 1.3-1
 - check-rpaths-worker: detect when RPATH references the parent directory



From fedora-extras-commits at redhat.com  Wed Dec 28 19:16:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 28 Dec 2005 14:16:31 -0500
Subject: fedora-rpmdevtools fedora-rpmdevtools.spec, 1.82,
	1.83 spectemplate-minimal.spec, 1.5,
	1.6 spectemplate-perl.spec, 1.11,
	1.12 spectemplate-python.spec, 1.6, 1.7
Message-ID: <200512281917.jBSJH177003914@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3890

Modified Files:
	fedora-rpmdevtools.spec spectemplate-minimal.spec 
	spectemplate-perl.spec spectemplate-python.spec 
Log Message:
Add disttags to spec templates.


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- fedora-rpmdevtools.spec	28 Dec 2005 19:13:54 -0000	1.82
+++ fedora-rpmdevtools.spec	28 Dec 2005 19:16:29 -0000	1.83
@@ -129,6 +129,7 @@
 %changelog
 * Wed Dec 28 2005 Ville Skytt?? 
 - Update spectool to 1.0.5 (#162253).
+- Add disttags to spec templates.
 
 * Thu Oct 27 2005 Ville Skytt??  - 1.3-1
 - check-rpaths-worker: detect when RPATH references the parent directory


Index: spectemplate-minimal.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/spectemplate-minimal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- spectemplate-minimal.spec	14 Dec 2004 23:26:46 -0000	1.5
+++ spectemplate-minimal.spec	28 Dec 2005 19:16:29 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           
 Version:        
-Release:        1
+Release:        1%{?dist}
 Summary:        
 
 Group:          


Index: spectemplate-perl.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/spectemplate-perl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- spectemplate-perl.spec	6 Oct 2005 15:59:38 -0000	1.11
+++ spectemplate-perl.spec	28 Dec 2005 19:16:29 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           
 Version:        
-Release:        1
+Release:        1%{?dist}
 Summary:        
 
 Group:          Development/Libraries


Index: spectemplate-python.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/spectemplate-python.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- spectemplate-python.spec	14 Dec 2004 23:26:46 -0000	1.6
+++ spectemplate-python.spec	28 Dec 2005 19:16:29 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           
 Version:        
-Release:        1
+Release:        1%{?dist}
 Summary:        
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Wed Dec 28 19:19:58 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 28 Dec 2005 14:19:58 -0500
Subject: fedora-rpmdevtools fedora-rpmdevtools.spec,1.83,1.84
Message-ID: <200512281920.jBSJKTbS003953@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3935

Modified Files:
	fedora-rpmdevtools.spec 
Log Message:
spectool requires wget.


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- fedora-rpmdevtools.spec	28 Dec 2005 19:16:29 -0000	1.83
+++ fedora-rpmdevtools.spec	28 Dec 2005 19:19:56 -0000	1.84
@@ -20,7 +20,7 @@
 Provides:       spectool = %{spectool_version}
 Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
-Requires:       rpm-python, python, cpio, sed, perl
+Requires:       rpm-python, python, cpio, sed, perl, wget
 # Minimal RPM build requirements
 Requires:       rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch
 Requires:       diffutils, gzip, bzip2, unzip
@@ -128,7 +128,7 @@
 
 %changelog
 * Wed Dec 28 2005 Ville Skytt?? 
-- Update spectool to 1.0.5 (#162253).
+- Update spectool to 1.0.5 (#162253), require wget for it.
 - Add disttags to spec templates.
 
 * Thu Oct 27 2005 Ville Skytt??  - 1.3-1



From fedora-extras-commits at redhat.com  Wed Dec 28 19:49:58 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 14:49:58 -0500
Subject: rpms/clisp/devel .cvsignore, 1.2, 1.3 clisp.spec, 1.4, 1.5 sources, 
	1.3, 1.4
Message-ID: <200512281950.jBSJofql004079@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4056

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.36


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2005 18:26:10 -0000	1.2
+++ .cvsignore	28 Dec 2005 19:49:58 -0000	1.3
@@ -1 +1 @@
-clisp-2.34.tar.bz2
+clisp-2.36.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- clisp.spec	29 Aug 2005 23:12:18 -0000	1.4
+++ clisp.spec	28 Dec 2005 19:49:58 -0000	1.5
@@ -1,16 +1,16 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.35
+Version:	2.36
 Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.35.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.36.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, XFree86-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
-ExcludeArch:	ppc ppc64
+#ExcludeArch:	ppc ppc64
 
 
 %description
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Gerard Milmeister  - 2.36-1
+- New Version 2.36
+
 * Tue Aug 30 2005 Gerard Milmeister  - 2.35-1
 - New Version 2.35
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2005 23:12:18 -0000	1.3
+++ sources	28 Dec 2005 19:49:58 -0000	1.4
@@ -1 +1 @@
-a8e3136c4ecfb5deb65fe53e22ca2c07  clisp-2.35.tar.bz2
+b6b5f6b7e6d0ce9f42bc07d59fbddc09  clisp-2.36.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 28 19:54:33 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 14:54:33 -0500
Subject: rpms/abcm2ps/devel .cvsignore, 1.7, 1.8 abcm2ps.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200512281955.jBSJt6cP004200@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4162

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Nov 2005 19:52:03 -0000	1.7
+++ .cvsignore	28 Dec 2005 19:54:33 -0000	1.8
@@ -1,2 +1,2 @@
-abcm2ps-4.12.2.tar.gz
+abcm2ps-4.12.3.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- abcm2ps.spec	30 Nov 2005 19:52:03 -0000	1.7
+++ abcm2ps.spec	28 Dec 2005 19:54:33 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.2
+Version:        4.12.3
 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.2.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.3.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
+* Wed Dec 28 2005 Gerard Milmeister  - 4.12.3-1
+- New Version 4.12.3
+
 * Wed Nov 30 2005 Gerard Milmeister  - 4.12.2-1
 - New Version 4.12.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Nov 2005 19:52:03 -0000	1.7
+++ sources	28 Dec 2005 19:54:33 -0000	1.8
@@ -1,2 +1,2 @@
-906cfebc1255a4db39e93c8bf213f37c  abcm2ps-4.12.2.tar.gz
+dce1d84f6da39e7e95e2873d598f94b9  abcm2ps-4.12.3.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Wed Dec 28 20:00:37 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 28 Dec 2005 15:00:37 -0500
Subject: rpms/htop/devel .cvsignore, 1.2, 1.3 htop.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200512282001.jBSK19Mg005895@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/htop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4261/devel

Modified Files:
	.cvsignore htop.spec sources 
Log Message:
Update to version 0.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2005 17:12:07 -0000	1.2
+++ .cvsignore	28 Dec 2005 20:00:37 -0000	1.3
@@ -1 +1 @@
-htop-0.5.4.tar.gz
+htop-0.6.tar.gz


Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/htop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- htop.spec	11 Nov 2005 17:12:07 -0000	1.1
+++ htop.spec	28 Dec 2005 20:00:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           htop
-Version:        0.5.4
-Release:        2%{?dist}
+Version:        0.6
+Release:        1%{?dist}
 Summary:        Interactive process viewer
 
 Group:          Applications/System
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Dawid Gajownik  - 0.6-1
+- Version 0.6
+
 * Fri Nov 11 2005 Dawid Gajownik  - 0.5.4-2
 - Don't use superflous CFLAGS variable (Dmitry Butskoy)
 - Don't include AUTHORS and NEWS files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2005 17:12:07 -0000	1.2
+++ sources	28 Dec 2005 20:00:37 -0000	1.3
@@ -1 +1 @@
-9bd650ea78418227b9661a58889a4c2a  htop-0.5.4.tar.gz
+f4aeafa0111805a92d4d2ead907bc8e5  htop-0.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 20:00:31 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 28 Dec 2005 15:00:31 -0500
Subject: rpms/htop/FC-4 .cvsignore, 1.2, 1.3 htop.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <200512282001.jBSK13XJ005767@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/htop/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4261/FC-4

Modified Files:
	.cvsignore htop.spec sources 
Log Message:
Update to version 0.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2005 17:12:07 -0000	1.2
+++ .cvsignore	28 Dec 2005 20:00:31 -0000	1.3
@@ -1 +1 @@
-htop-0.5.4.tar.gz
+htop-0.6.tar.gz


Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-4/htop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- htop.spec	11 Nov 2005 17:12:07 -0000	1.1
+++ htop.spec	28 Dec 2005 20:00:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           htop
-Version:        0.5.4
-Release:        2%{?dist}
+Version:        0.6
+Release:        1%{?dist}
 Summary:        Interactive process viewer
 
 Group:          Applications/System
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Dawid Gajownik  - 0.6-1
+- Version 0.6
+
 * Fri Nov 11 2005 Dawid Gajownik  - 0.5.4-2
 - Don't use superflous CFLAGS variable (Dmitry Butskoy)
 - Don't include AUTHORS and NEWS files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2005 17:12:07 -0000	1.2
+++ sources	28 Dec 2005 20:00:31 -0000	1.3
@@ -1 +1 @@
-9bd650ea78418227b9661a58889a4c2a  htop-0.5.4.tar.gz
+f4aeafa0111805a92d4d2ead907bc8e5  htop-0.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 20:23:33 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 15:23:33 -0500
Subject: rpms/clisp/devel clisp.spec,1.5,1.6
Message-ID: <200512282024.jBSKO6AF006191@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6173

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- clisp.spec	28 Dec 2005 19:49:58 -0000	1.5
+++ clisp.spec	28 Dec 2005 20:23:33 -0000	1.6
@@ -1,15 +1,16 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
 Source:		http://download.sourceforge.net/clisp/clisp-2.36.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	readline-devel, XFree86-devel, gettext, pcre-devel, postgresql-devel
+BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
+BuildRequires:	libSM-devel, libICE-devel, libX11-devel, libXext-devel, libXpm-devel
 #ExcludeArch:	ppc ppc64
 
 



From fedora-extras-commits at redhat.com  Wed Dec 28 20:41:57 2005
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Wed, 28 Dec 2005 15:41:57 -0500
Subject: rpms/dejavu-fonts import.log,1.19,1.20
Message-ID: <200512282042.jBSKgTbn006317@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6283

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.1-1.fc5 on branch devel from dejavu-fonts-2.1-1.fc5.src.rpm
2.1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- import.log	13 Nov 2005 16:22:18 -0000	1.19
+++ import.log	28 Dec 2005 20:41:56 -0000	1.20
@@ -16,3 +16,4 @@
 dejavu-fonts-2_0-1_fc3:FC-3:dejavu-fonts-2.0-1.fc3.src.rpm:1131898093
 dejavu-fonts-2_0-1_fc4:FC-4:dejavu-fonts-2.0-1.fc4.src.rpm:1131898337
 dejavu-fonts-2_0-1_fc5:HEAD:dejavu-fonts-2.0-1.fc5.src.rpm:1131898927
+dejavu-fonts-2_1-1_fc5:HEAD:dejavu-fonts-2.1-1.fc5.src.rpm:1135802501



From fedora-extras-commits at redhat.com  Wed Dec 28 20:42:02 2005
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Wed, 28 Dec 2005 15:42:02 -0500
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.6, 1.7 dejavu-fonts.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200512282042.jBSKgZbM006322@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6283/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.1-1.fc5 on branch devel from dejavu-fonts-2.1-1.fc5.src.rpm
2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Nov 2005 16:03:01 -0000	1.6
+++ .cvsignore	28 Dec 2005 20:42:02 -0000	1.7
@@ -1 +1 @@
-dejavu-ttf-2.0.tar.gz
+dejavu-ttf-2.1.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dejavu-fonts.spec	13 Nov 2005 16:03:01 -0000	1.6
+++ dejavu-fonts.spec	28 Dec 2005 20:42:02 -0000	1.7
@@ -2,7 +2,7 @@
 %define fontdir         %{_datadir}/fonts/dejavu
 
 Name:      dejavu-fonts
-Version:   2.0
+Version:   2.1
 Release:   1%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
@@ -56,12 +56,16 @@
 %defattr(0644,root,root,0755)
 %doc *.txt AUTHORS BUGS LICENSE NEWS README
 
+
 %dir %{fontdir}
 %{fontdir}/*.ttf
 %ghost %{fontdir}/fonts.cache-1
 %ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Wed Dec 28 2005 Nicolas Mailhot  2.1-1
+- 2.1
+
 * Sun Nov 13 2005 Nicolas Mailhot  2.0-1
 - 2.0!
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Nov 2005 16:03:01 -0000	1.6
+++ sources	28 Dec 2005 20:42:02 -0000	1.7
@@ -1 +1 @@
-3982b3eed3f03054349f6640d407045c  dejavu-ttf-2.0.tar.gz
+3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 20:43:49 2005
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Wed, 28 Dec 2005 15:43:49 -0500
Subject: rpms/dejavu-fonts import.log,1.20,1.21
Message-ID: <200512282044.jBSKiMvP006424@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6390

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.1-1.fc4 on branch FC-4 from dejavu-fonts-2.1-1.fc4.src.rpm
2.1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- import.log	28 Dec 2005 20:41:56 -0000	1.20
+++ import.log	28 Dec 2005 20:43:49 -0000	1.21
@@ -17,3 +17,4 @@
 dejavu-fonts-2_0-1_fc4:FC-4:dejavu-fonts-2.0-1.fc4.src.rpm:1131898337
 dejavu-fonts-2_0-1_fc5:HEAD:dejavu-fonts-2.0-1.fc5.src.rpm:1131898927
 dejavu-fonts-2_1-1_fc5:HEAD:dejavu-fonts-2.1-1.fc5.src.rpm:1135802501
+dejavu-fonts-2_1-1_fc4:FC-4:dejavu-fonts-2.1-1.fc4.src.rpm:1135802614



From fedora-extras-commits at redhat.com  Wed Dec 28 20:43:55 2005
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Wed, 28 Dec 2005 15:43:55 -0500
Subject: rpms/dejavu-fonts/FC-4 .cvsignore, 1.6, 1.7 dejavu-fonts.spec, 1.5, 
	1.6 sources, 1.6, 1.7
Message-ID: <200512282044.jBSKiRPP006429@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6390/FC-4

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.1-1.fc4 on branch FC-4 from dejavu-fonts-2.1-1.fc4.src.rpm
2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Nov 2005 16:12:32 -0000	1.6
+++ .cvsignore	28 Dec 2005 20:43:55 -0000	1.7
@@ -1 +1 @@
-dejavu-ttf-2.0.tar.gz
+dejavu-ttf-2.1.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dejavu-fonts.spec	13 Nov 2005 16:12:32 -0000	1.5
+++ dejavu-fonts.spec	28 Dec 2005 20:43:55 -0000	1.6
@@ -2,7 +2,7 @@
 %define fontdir         %{_datadir}/fonts/dejavu
 
 Name:      dejavu-fonts
-Version:   2.0
+Version:   2.1
 Release:   1%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
@@ -56,12 +56,16 @@
 %defattr(0644,root,root,0755)
 %doc *.txt AUTHORS BUGS LICENSE NEWS README
 
+
 %dir %{fontdir}
 %{fontdir}/*.ttf
 %ghost %{fontdir}/fonts.cache-1
 %ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Wed Dec 28 2005 Nicolas Mailhot  2.1-1
+- 2.1
+
 * Sun Nov 13 2005 Nicolas Mailhot  2.0-1
 - 2.0!
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Nov 2005 16:12:32 -0000	1.6
+++ sources	28 Dec 2005 20:43:55 -0000	1.7
@@ -1 +1 @@
-3982b3eed3f03054349f6640d407045c  dejavu-ttf-2.0.tar.gz
+3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 20:44:36 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 15:44:36 -0500
Subject: rpms/clisp/devel clisp.spec,1.6,1.7
Message-ID: <200512282045.jBSKj8u3006495@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6464

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- clisp.spec	28 Dec 2005 20:23:33 -0000	1.6
+++ clisp.spec	28 Dec 2005 20:44:36 -0000	1.7
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -10,7 +10,17 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
-BuildRequires:	libSM-devel, libICE-devel, libX11-devel, libXext-devel, libXpm-devel
+BuildRequires:  libICE-devel
+BuildRequires:  libSM-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXaw-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXft-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libXrender-devel
+BuildRequires:  libXt-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libGLU-devel
 #ExcludeArch:	ppc ppc64
 
 



From fedora-extras-commits at redhat.com  Wed Dec 28 20:45:48 2005
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Wed, 28 Dec 2005 15:45:48 -0500
Subject: rpms/dejavu-fonts import.log,1.21,1.22
Message-ID: <200512282046.jBSKkKpN006592@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6558

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.1-1.fc3 on branch FC-3 from dejavu-fonts-2.1-1.fc3.src.rpm
2.1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- import.log	28 Dec 2005 20:43:49 -0000	1.21
+++ import.log	28 Dec 2005 20:45:48 -0000	1.22
@@ -18,3 +18,4 @@
 dejavu-fonts-2_0-1_fc5:HEAD:dejavu-fonts-2.0-1.fc5.src.rpm:1131898927
 dejavu-fonts-2_1-1_fc5:HEAD:dejavu-fonts-2.1-1.fc5.src.rpm:1135802501
 dejavu-fonts-2_1-1_fc4:FC-4:dejavu-fonts-2.1-1.fc4.src.rpm:1135802614
+dejavu-fonts-2_1-1_fc3:FC-3:dejavu-fonts-2.1-1.fc3.src.rpm:1135802732



From fedora-extras-commits at redhat.com  Wed Dec 28 20:45:54 2005
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Wed, 28 Dec 2005 15:45:54 -0500
Subject: rpms/dejavu-fonts/FC-3 .cvsignore, 1.6, 1.7 dejavu-fonts.spec, 1.5, 
	1.6 sources, 1.6, 1.7
Message-ID: <200512282046.jBSKkQYl006597@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6558/FC-3

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.1-1.fc3 on branch FC-3 from dejavu-fonts-2.1-1.fc3.src.rpm
2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Nov 2005 16:09:02 -0000	1.6
+++ .cvsignore	28 Dec 2005 20:45:53 -0000	1.7
@@ -1 +1 @@
-dejavu-ttf-2.0.tar.gz
+dejavu-ttf-2.1.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/dejavu-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dejavu-fonts.spec	13 Nov 2005 16:09:02 -0000	1.5
+++ dejavu-fonts.spec	28 Dec 2005 20:45:53 -0000	1.6
@@ -2,7 +2,7 @@
 %define fontdir         %{_datadir}/fonts/dejavu
 
 Name:      dejavu-fonts
-Version:   2.0
+Version:   2.1
 Release:   1%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
@@ -56,12 +56,16 @@
 %defattr(0644,root,root,0755)
 %doc *.txt AUTHORS BUGS LICENSE NEWS README
 
+
 %dir %{fontdir}
 %{fontdir}/*.ttf
 %ghost %{fontdir}/fonts.cache-1
 %ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Wed Dec 28 2005 Nicolas Mailhot  2.1-1
+- 2.1
+
 * Sun Nov 13 2005 Nicolas Mailhot  2.0-1
 - 2.0!
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Nov 2005 16:09:02 -0000	1.6
+++ sources	28 Dec 2005 20:45:53 -0000	1.7
@@ -1 +1 @@
-3982b3eed3f03054349f6640d407045c  dejavu-ttf-2.0.tar.gz
+3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 22:28:22 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 28 Dec 2005 17:28:22 -0500
Subject: rpms/htop/FC-4 htop.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200512282228.jBSMSsod010567@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/htop/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10523/FC-4

Modified Files:
	htop.spec sources 
Log Message:
Upstream updated tarball with a small bug fix without increasing
release number. We'll need to rebuild it once again. Lesson for
today: don't try to be faster than the light ;)



Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-4/htop.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- htop.spec	28 Dec 2005 20:00:31 -0000	1.2
+++ htop.spec	28 Dec 2005 22:28:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           htop
 Version:        0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interactive process viewer
 
 Group:          Applications/System
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Dawid Gajownik  - 0.6-2
+- Rebuild with updated tarball
+
 * Wed Dec 28 2005 Dawid Gajownik  - 0.6-1
 - Version 0.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Dec 2005 20:00:31 -0000	1.3
+++ sources	28 Dec 2005 22:28:22 -0000	1.4
@@ -1 +1 @@
-f4aeafa0111805a92d4d2ead907bc8e5  htop-0.6.tar.gz
+c00b1dba101569a055ed260e06a25596  htop-0.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 22:28:28 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 28 Dec 2005 17:28:28 -0500
Subject: rpms/htop/devel htop.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200512282229.jBSMT0U4010571@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/htop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10523/devel

Modified Files:
	htop.spec sources 
Log Message:
Upstream updated tarball with a small bug fix without increasing
release number. We'll need to rebuild it once again. Lesson for
today: don't try to be faster than the light ;)



Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/htop.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- htop.spec	28 Dec 2005 20:00:37 -0000	1.2
+++ htop.spec	28 Dec 2005 22:28:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           htop
 Version:        0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interactive process viewer
 
 Group:          Applications/System
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Dawid Gajownik  - 0.6-2
+- Rebuild with updated tarball
+
 * Wed Dec 28 2005 Dawid Gajownik  - 0.6-1
 - Version 0.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Dec 2005 20:00:37 -0000	1.3
+++ sources	28 Dec 2005 22:28:28 -0000	1.4
@@ -1 +1 @@
-f4aeafa0111805a92d4d2ead907bc8e5  htop-0.6.tar.gz
+c00b1dba101569a055ed260e06a25596  htop-0.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 22:34:07 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 17:34:07 -0500
Subject: rpms/clisp/devel clisp.spec,1.7,1.8
Message-ID: <200512282234.jBSMYdrj010673@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10654

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- clisp.spec	28 Dec 2005 20:44:36 -0000	1.7
+++ clisp.spec	28 Dec 2005 22:34:06 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -19,8 +19,7 @@
 BuildRequires:  libXmu-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  libXt-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:  mesa-libGLU-devel
+BuildRequires:	imake
 #ExcludeArch:	ppc ppc64
 
 



From fedora-extras-commits at redhat.com  Wed Dec 28 22:38:04 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 17:38:04 -0500
Subject: rpms/clisp/FC-3 .cvsignore,1.2,1.3 clisp.spec,1.6,1.7
Message-ID: <200512282238.jBSMca44010736@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10717

Modified Files:
	.cvsignore clisp.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2005 18:26:10 -0000	1.2
+++ .cvsignore	28 Dec 2005 22:38:04 -0000	1.3
@@ -1 +1 @@
-clisp-2.34.tar.bz2
+clisp-2.36.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- clisp.spec	29 Aug 2005 23:11:53 -0000	1.6
+++ clisp.spec	28 Dec 2005 22:38:04 -0000	1.7
@@ -1,14 +1,14 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.35
-Release: 	1%{?dist}
+Version:	2.36
+Release: 	4%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.35.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.36.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	readline-devel, XFree86-devel, gettext, pcre-devel
+BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 
 %description
@@ -109,6 +109,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Gerard Milmeister  - 2.36-1
+- New Version 2.36
+
 * Tue Aug 30 2005 Gerard Milmeister  - 2.35-1
 - New Version 2.35
 



From fedora-extras-commits at redhat.com  Wed Dec 28 22:41:01 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 17:41:01 -0500
Subject: rpms/clisp/FC-3 clisp.spec,1.7,1.8 sources,1.3,1.4
Message-ID: <200512282241.jBSMfXc2010823@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10780

Modified Files:
	clisp.spec sources 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- clisp.spec	28 Dec 2005 22:38:04 -0000	1.7
+++ clisp.spec	28 Dec 2005 22:41:01 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 
 Group:		Development/Languages
 License:	GPL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2005 23:11:53 -0000	1.3
+++ sources	28 Dec 2005 22:41:01 -0000	1.4
@@ -1 +1 @@
-a8e3136c4ecfb5deb65fe53e22ca2c07  clisp-2.35.tar.bz2
+b6b5f6b7e6d0ce9f42bc07d59fbddc09  clisp-2.36.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 28 22:48:56 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 17:48:56 -0500
Subject: rpms/clisp/FC-4 .cvsignore, 1.3, 1.4 clisp.spec, 1.9, 1.10 sources, 
	1.3, 1.4
Message-ID: <200512282249.jBSMnSg9010919@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10898

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Aug 2005 22:54:14 -0000	1.3
+++ .cvsignore	28 Dec 2005 22:48:56 -0000	1.4
@@ -1 +1 @@
-clisp-2.35.tar.bz2
+clisp-2.36.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- clisp.spec	29 Aug 2005 23:09:11 -0000	1.9
+++ clisp.spec	28 Dec 2005 22:48:56 -0000	1.10
@@ -1,14 +1,14 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.35
-Release: 	3%{?dist}
+Version:	2.36
+Release: 	4%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.35.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.36.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	readline-devel, XFree86-devel, gettext, pcre-devel, postgresql-devel
+BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 ExcludeArch:	ppc ppc64
 
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Gerard Milmeister  - 2.36-1
+- New Version 2.36
+
 * Tue Aug 30 2005 Gerard Milmeister  - 2.35-1
 - New Version 2.35
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2005 22:54:14 -0000	1.3
+++ sources	28 Dec 2005 22:48:56 -0000	1.4
@@ -1 +1 @@
-a8e3136c4ecfb5deb65fe53e22ca2c07  clisp-2.35.tar.bz2
+b6b5f6b7e6d0ce9f42bc07d59fbddc09  clisp-2.36.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 28 22:52:17 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 17:52:17 -0500
Subject: rpms/clisp/FC-4 clisp.spec,1.10,1.11
Message-ID: <200512282252.jBSMqnP7010982@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10965

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- clisp.spec	28 Dec 2005 22:48:56 -0000	1.10
+++ clisp.spec	28 Dec 2005 22:52:17 -0000	1.11
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -10,7 +10,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
-ExcludeArch:	ppc ppc64
+BuildRequires:  xorg-x11-devel
+#ExcludeArch:	ppc ppc64
 
 
 %description



From fedora-extras-commits at redhat.com  Wed Dec 28 22:53:13 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 17:53:13 -0500
Subject: rpms/clisp/FC-3 clisp.spec,1.8,1.9
Message-ID: <200512282253.jBSMrjQ4011047@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11026

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- clisp.spec	28 Dec 2005 22:41:01 -0000	1.8
+++ clisp.spec	28 Dec 2005 22:53:12 -0000	1.9
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -10,6 +10,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
+BuildRequires:	XFree86-devel
 
 %description
 ANSI Common Lisp is a high-level, general-purpose programming



From fedora-extras-commits at redhat.com  Wed Dec 28 23:04:27 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 18:04:27 -0500
Subject: rpms/clisp/FC-4 clisp.spec,1.11,1.12
Message-ID: <200512282305.jBSN5LFG012750@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12733

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- clisp.spec	28 Dec 2005 22:52:17 -0000	1.11
+++ clisp.spec	28 Dec 2005 23:04:04 -0000	1.12
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -11,7 +11,7 @@
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 BuildRequires:  xorg-x11-devel
-#ExcludeArch:	ppc ppc64
+ExcludeArch:	ppc ppc64
 
 
 %description



From fedora-extras-commits at redhat.com  Wed Dec 28 23:06:20 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 18:06:20 -0500
Subject: rpms/clisp/FC-3 clisp.spec,1.9,1.10
Message-ID: <200512282306.jBSN6i5t012809@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12790

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- clisp.spec	28 Dec 2005 22:53:12 -0000	1.9
+++ clisp.spec	28 Dec 2005 23:06:20 -0000	1.10
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -11,6 +11,7 @@
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 BuildRequires:	XFree86-devel
+ExcludeArch:	x86_64
 
 %description
 ANSI Common Lisp is a high-level, general-purpose programming



From fedora-extras-commits at redhat.com  Wed Dec 28 23:07:47 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 18:07:47 -0500
Subject: rpms/clisp/devel clisp.spec,1.8,1.9
Message-ID: <200512282308.jBSN8aar012872@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12851

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- clisp.spec	28 Dec 2005 22:34:06 -0000	1.8
+++ clisp.spec	28 Dec 2005 23:07:47 -0000	1.9
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	4%{?dist}
+Release: 	7%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -20,7 +20,7 @@
 BuildRequires:  libXrender-devel
 BuildRequires:  libXt-devel
 BuildRequires:	imake
-#ExcludeArch:	ppc ppc64
+ExcludeArch:	x86_64 ppc ppc64
 
 
 %description



From fedora-extras-commits at redhat.com  Wed Dec 28 23:15:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 28 Dec 2005 18:15:09 -0500
Subject: owners owners.list,1.486,1.487
Message-ID: <200512282315.jBSNFfPc012989@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12970

Modified Files:
	owners.list 
Log Message:
Transfer ownership of python-sqlobject


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -r1.486 -r1.487
--- owners.list	28 Dec 2005 10:27:09 -0000	1.486
+++ owners.list	28 Dec 2005 23:15:09 -0000	1.487
@@ -1019,7 +1019,7 @@
 Fedora Extras|python-simpletal|Alternative implementation of Zope Page Templates|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-simpy|Python simulation framework|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|python-sqlite|Python bindings for SQLite|thomas at apestaart.org|extras-qa at fedoraproject.org|
-Fedora Extras|python-sqlobject|SQLObject is an object-relational mapper for python|oliver.andrich 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-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  Wed Dec 28 23:29:12 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 18:29:12 -0500
Subject: rpms/clisp/FC-4 clisp.spec,1.12,1.13
Message-ID: <200512282329.jBSNTi95013043@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13006

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- clisp.spec	28 Dec 2005 23:04:04 -0000	1.12
+++ clisp.spec	28 Dec 2005 23:29:11 -0000	1.13
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -11,7 +11,7 @@
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 BuildRequires:  xorg-x11-devel
-ExcludeArch:	ppc ppc64
+ExcludeArch:	ppc ppc64 x86_64
 
 
 %description



From fedora-extras-commits at redhat.com  Wed Dec 28 23:29:25 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Wed, 28 Dec 2005 18:29:25 -0500
Subject: rpms/buoh/devel buoh.spec,1.2,1.3
Message-ID: <200512282329.jBSNTwDI013077@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13026

Modified Files:
	buoh.spec 
Log Message:
Thats Wed and not Web :-)



Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buoh.spec	28 Dec 2005 09:46:16 -0000	1.2
+++ buoh.spec	28 Dec 2005 23:29:25 -0000	1.3
@@ -76,7 +76,7 @@
 %{_datadir}/pixmaps/buoh*.png
 
 %changelog
-* Web Dec 28 2005 - Chris Chabot  - 0.8.1-4
+* Wed Dec 28 2005 - Chris Chabot  - 0.8.1-4
 - Changed desktop entry vendor to fedora
 
 * Mon Dec 27 2005 - Chris Chabot  - 0.8.1-3



From fedora-extras-commits at redhat.com  Wed Dec 28 23:47:23 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Wed, 28 Dec 2005 18:47:23 -0500
Subject: rpms/buoh/devel buoh.spec,1.3,1.4
Message-ID: <200512282347.jBSNltWO013453@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13426

Modified Files:
	buoh.spec 
Log Message:
Fixed typo in desktop file


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buoh.spec	28 Dec 2005 23:29:25 -0000	1.3
+++ buoh.spec	28 Dec 2005 23:47:23 -0000	1.4
@@ -69,7 +69,7 @@
 %dir %{_datadir}/buoh/ui
 %{_bindir}/buoh
 %{_sysconfdir}/gconf/schemas/buoh.schemas
-%{_datadir}/applications/gnome-buoh.desktop
+%{_datadir}/applications/fedora-buoh.desktop
 %{_datadir}/buoh/comics/comics.xml
 %{_datadir}/buoh/ui/buoh-ui.xml
 %{_datadir}/buoh/pixmaps/buoh*.png



From fedora-extras-commits at redhat.com  Wed Dec 28 23:48:12 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 18:48:12 -0500
Subject: rpms/perl-AppConfig/devel perl-AppConfig.spec,1.7,1.8
Message-ID: <200512282348.jBSNmjGh013478@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-AppConfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13461

Modified Files:
	perl-AppConfig.spec 
Log Message:
Dist tag.


Index: perl-AppConfig.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AppConfig/devel/perl-AppConfig.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-AppConfig.spec	6 Apr 2005 22:12:43 -0000	1.7
+++ perl-AppConfig.spec	28 Dec 2005 23:48:12 -0000	1.8
@@ -1,20 +1,16 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-AppConfig
 Version:        1.56
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Perl module for reading configuration files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/AppConfig/
-Source0:        http://www.cpan.org/authors/id/A/AB/ABW/AppConfig-1.56.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AB/ABW/AppConfig-%{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))
 
 %description
@@ -44,7 +40,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -60,7 +56,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Wed Dec 28 2005 Jose Pedro Oliveira  - 1.56-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.56-2
 - rebuilt
 
 * Sun May 23 2004 Jose Pedro Oliveira  - 0:1.56-0.fdr.1



From fedora-extras-commits at redhat.com  Wed Dec 28 23:49:22 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Wed, 28 Dec 2005 18:49:22 -0500
Subject: rpms/buoh/devel buoh.spec,1.4,1.5
Message-ID: <200512282349.jBSNnsMi013515@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13487

Modified Files:
	buoh.spec 
Log Message:
Bumbed release version


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buoh.spec	28 Dec 2005 23:47:23 -0000	1.4
+++ buoh.spec	28 Dec 2005 23:49:21 -0000	1.5
@@ -2,7 +2,7 @@
 License:          GPL
 Group:            Applications/Internet
 Version:          0.8.1
-Release:          4
+Release:          5
 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
+* Wed Dec 28 2005 - Chris Chabot  - 0.8.1-5
+- And changed %files entry too
+
 * Wed Dec 28 2005 - Chris Chabot  - 0.8.1-4
 - Changed desktop entry vendor to fedora
 



From fedora-extras-commits at redhat.com  Thu Dec 29 00:13:18 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 19:13:18 -0500
Subject: rpms/perl-Cache-Cache/devel perl-Cache-Cache.spec,1.7,1.8
Message-ID: <200512290014.jBT0EV1b015354@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cache-Cache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15316

Modified Files:
	perl-Cache-Cache.spec 
Log Message:
Dist tag.


Index: perl-Cache-Cache.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/perl-Cache-Cache.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Cache-Cache.spec	6 Apr 2005 22:12:43 -0000	1.7
+++ perl-Cache-Cache.spec	29 Dec 2005 00:12:59 -0000	1.8
@@ -1,19 +1,16 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Cache-Cache
 Version:        1.04
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Generic cache interface and implementations
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Cache-Cache/
-Source0:   http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-1.04.tar.gz
+Source0:        http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(Storable)
+BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Digest::SHA1), perl(Error), perl(IPC::ShareLite)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -45,7 +42,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -61,7 +58,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 1.04-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.04-2
 - rebuilt
 
 * Fri Mar 18 2005 Jose Pedro Oliveira  - 1.04-1



From fedora-extras-commits at redhat.com  Thu Dec 29 00:23:37 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 19:23:37 -0500
Subject: rpms/perl-ExtUtils-Depends/devel perl-ExtUtils-Depends.spec, 1.7,
	1.8
Message-ID: <200512290024.jBT0OAnf015481@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-serv15462

Modified Files:
	perl-ExtUtils-Depends.spec 
Log Message:
Dist tag.


Index: perl-ExtUtils-Depends.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-Depends/devel/perl-ExtUtils-Depends.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-ExtUtils-Depends.spec	6 Apr 2005 22:12:44 -0000	1.7
+++ perl-ExtUtils-Depends.spec	29 Dec 2005 00:23:37 -0000	1.8
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-ExtUtils-Depends
 Version:        0.205
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Easily build XS extensions that depend on XS extensions
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-Depends/
-Source0:        http://www.cpan.org/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-Depends-0.205.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-Depends-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -40,7 +37,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -56,7 +53,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.205-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.205-2
 - rebuilt
 
 * Tue Feb 15 2005 Jose Pedro Oliveira  - 0:0.205-1



From fedora-extras-commits at redhat.com  Thu Dec 29 00:30:15 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 19:30:15 -0500
Subject: rpms/perl-Error/devel perl-Error.spec,1.4,1.5
Message-ID: <200512290030.jBT0UlvA015555@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15536

Modified Files:
	perl-Error.spec 
Log Message:
Dist tag.


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Error.spec	6 Apr 2005 22:12:44 -0000	1.4
+++ perl-Error.spec	29 Dec 2005 00:30:15 -0000	1.5
@@ -1,15 +1,14 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Error
 Version:        0.15
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Error Perl module
+
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Error/
-Source0:        http://www.cpan.org/modules/by-module/Error/Error-0.15.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/Error/Error-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -19,6 +18,7 @@
 for errors/exceptions that can either be thrown, for subsequent catch, or
 can simply be recorded.
 
+
 %prep
 %setup -q -n Error-%{version}
 
@@ -36,20 +36,25 @@
 
 chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
 
-%check || :
+%check
 make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README example
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
+
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.15-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.15-2
 - rebuilt
 
 * Fri Jun 11 2004 Steven Pritchard  0:0.15-1



From fedora-extras-commits at redhat.com  Thu Dec 29 00:34:59 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 19:34:59 -0500
Subject: rpms/erlang/FC-4 otp-sslrpath.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 erlang.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200512290035.jBT0ZV1d015694@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15650

Modified Files:
	.cvsignore erlang.spec sources 
Added Files:
	otp-sslrpath.patch 
Log Message:
new version R10B-9

otp-sslrpath.patch:

--- NEW FILE otp-sslrpath.patch ---
--- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath	2005-12-29 00:49:17.000000000 +0100
+++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in	2005-12-29 00:50:15.000000000 +0100
@@ -95,7 +95,7 @@
 endif
 endif
 
-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@
+CC_R_FLAG=
 ifeq ($(findstring @,$(CC_R_FLAG)),@)
 # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;
 # we try our best here instead...


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Oct 2005 22:34:39 -0000	1.3
+++ .cvsignore	29 Dec 2005 00:34:58 -0000	1.4
@@ -1,3 +1,3 @@
-otp_doc_html_R10B-8.tar.gz
-otp_doc_man_R10B-8.tar.gz
-otp_src_R10B-8.tar.gz
+otp_doc_html_R10B-9.tar.gz
+otp_doc_man_R10B-9.tar.gz
+otp_src_R10B-9.tar.gz


Index: erlang.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-4/erlang.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- erlang.spec	29 Oct 2005 22:34:39 -0000	1.4
+++ erlang.spec	29 Dec 2005 00:34:58 -0000	1.5
@@ -1,17 +1,18 @@
 Name:           erlang
 Version:        R10B
-Release:        8.2%{?dist}
+Release:        9.1%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
 License:        Erlang Public License
 URL:            http://www.erlang.org
-Source:         http://www.erlang.org/download/otp_src_R10B-8.tar.gz
-Source1:	http://www.erlang.org/download/otp_doc_html_R10B-8.tar.gz
-Source2:	http://www.erlang.org/download/otp_doc_man_R10B-8.tar.gz
+Source:         http://www.erlang.org/download/otp_src_R10B-9.tar.gz
+Source1:	http://www.erlang.org/download/otp_doc_html_R10B-9.tar.gz
+Source2:	http://www.erlang.org/download/otp_doc_man_R10B-9.tar.gz
 Patch:		otp-links.patch
 Patch1:		otp-install.patch
 Patch2:		otp-rpath.patch
+Patch3:         otp-sslrpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, openssl-devel, flex, unixODBC-devel
 BuildRequires:	tcl-devel, tk-devel
@@ -35,10 +36,11 @@
 
 
 %prep
-%setup -q -n otp_src_R10B-8
+%setup -q -n otp_src_R10B-9
 %patch -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -88,10 +90,13 @@
 
 
 %post
-%{_libdir}/erlang/Install -minimal %{_libdir}/erlang > /dev/null
+%{_libdir}/erlang/Install -minimal %{_libdir}/erlang >/dev/null 2>/dev/null
 
 
 %changelog
+* Thu Dec 29 2005 Gerard Milmeister  - R10B-9.1
+- New Version R10B-9
+
 * Sat Oct 29 2005 Gerard Milmeister  - R10B-8.2
 - updated rpath patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2005 22:34:39 -0000	1.3
+++ sources	29 Dec 2005 00:34:58 -0000	1.4
@@ -1,3 +1,3 @@
-d4d3f448c311cd3fc3a44e06e4145bcb  otp_doc_html_R10B-8.tar.gz
-c0760f24ae789fda248e978430aefe38  otp_doc_man_R10B-8.tar.gz
-75cd5ad53b66baad9ebc802b8a1f6043  otp_src_R10B-8.tar.gz
+108bc01be67aaa2edde9a0331ef9bc71  otp_doc_html_R10B-9.tar.gz
+051cd9893b36313f20a420bc2491905c  otp_doc_man_R10B-9.tar.gz
+05791e9097f36202eb705df2a1db6500  otp_src_R10B-9.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 00:35:11 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 19:35:11 -0500
Subject: rpms/perl-ExtUtils-PkgConfig/devel perl-ExtUtils-PkgConfig.spec, 1.7,
	1.8
Message-ID: <200512290035.jBT0ZheQ015697@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-PkgConfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15675

Modified Files:
	perl-ExtUtils-PkgConfig.spec 
Log Message:
Dist tag.


Index: perl-ExtUtils-PkgConfig.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-PkgConfig/devel/perl-ExtUtils-PkgConfig.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-ExtUtils-PkgConfig.spec	6 Apr 2005 22:12:44 -0000	1.7
+++ perl-ExtUtils-PkgConfig.spec	29 Dec 2005 00:35:11 -0000	1.8
@@ -1,20 +1,17 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-ExtUtils-PkgConfig
 Version:        1.07
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Simplistic interface to pkg-config
 
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://search.cpan.org/dist/ExtUtils-PkgConfig/
-Source0:        http://www.cpan.org/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-PkgConfig-1.07.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-PkgConfig-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  pkgconfig, perl(Test::More)
+BuildRequires:  pkgconfig
 Requires:       pkgconfig
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -45,7 +42,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -61,7 +58,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 1.07-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.07-2
 - rebuilt
 
 * Tue Feb 15 2005 Jose Pedro Oliveira  - 0:1.07-1



From fedora-extras-commits at redhat.com  Thu Dec 29 00:43:04 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 19:43:04 -0500
Subject: rpms/perl-FreezeThaw/devel perl-FreezeThaw.spec,1.4,1.5
Message-ID: <200512290043.jBT0hakv015821@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-FreezeThaw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15804

Modified Files:
	perl-FreezeThaw.spec 
Log Message:
Dist tag.


Index: perl-FreezeThaw.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/devel/perl-FreezeThaw.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-FreezeThaw.spec	6 Apr 2005 22:12:45 -0000	1.4
+++ perl-FreezeThaw.spec	29 Dec 2005 00:43:04 -0000	1.5
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-FreezeThaw
 Version:        0.43
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Convert Perl structures to strings and back
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/FreezeThaw/
-Source0:        http://www.cpan.org/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.43.tar.gz
+Source0:        http://www.cpan.org/authors/id/I/IL/ILYAZ/modules/FreezeThaw-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -39,7 +36,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -55,7 +52,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.43-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.43-2
 - rebuilt
 
 * Sun Oct 31 2004 Jose Pedro Oliveira  - 0:0.43-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Dec 29 01:02:59 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 20:02:59 -0500
Subject: rpms/perl-HTML-Template/FC-4 .cvsignore, 1.2,
	1.3 perl-HTML-Template.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <200512290103.jBT13VdI017620@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTML-Template/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17582/FC-4

Modified Files:
	.cvsignore perl-HTML-Template.spec sources 
Log Message:
Update to 2.8.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:01:29 -0000	1.2
+++ .cvsignore	29 Dec 2005 01:02:59 -0000	1.3
@@ -1 +1 @@
-HTML-Template-2.7.tar.gz
+HTML-Template-2.8.tar.gz


Index: perl-HTML-Template.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template/FC-4/perl-HTML-Template.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-HTML-Template.spec	13 Aug 2005 11:37:31 -0000	1.7
+++ perl-HTML-Template.spec	29 Dec 2005 01:02:59 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Template
-Version:        2.7
-Release:        4%{?dist}
+Version:        2.8
+Release:        1%{?dist}
 Summary:        Perl module to use HTML Templates
 
 Group:          Development/Libraries
@@ -44,7 +44,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 TEST_SHARED_MEMORY=1 make test
 
 
@@ -55,11 +55,14 @@
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE ARTISTIC Changes FAQ GPL README
+%{perl_vendorlib}/HTML/
 %{_mandir}/man3/*.3*
-%{perl_vendorlib}/*
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 2.8-1
+- Update to 2.8.
+
 * Sat Aug 13 2005 Jose Pedro Oliveira  - 2.7-4
 - README file: corrected the end-of-line encoding (#165874).
 - Bring up to date with Fedora Extras template.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:01:29 -0000	1.2
+++ sources	29 Dec 2005 01:02:59 -0000	1.3
@@ -1 +1 @@
-376f572659b4c0c40a9dd68823a0dd6b  HTML-Template-2.7.tar.gz
+3f1d6f4b3ab3ef7f0fd8864d2ec56e59  HTML-Template-2.8.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 01:03:07 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 20:03:07 -0500
Subject: rpms/perl-HTML-Template/devel .cvsignore, 1.2,
	1.3 perl-HTML-Template.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <200512290104.jBT149LK017625@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTML-Template/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17582/devel

Modified Files:
	.cvsignore perl-HTML-Template.spec sources 
Log Message:
Update to 2.8.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:01:29 -0000	1.2
+++ .cvsignore	29 Dec 2005 01:03:06 -0000	1.3
@@ -1 +1 @@
-HTML-Template-2.7.tar.gz
+HTML-Template-2.8.tar.gz


Index: perl-HTML-Template.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template/devel/perl-HTML-Template.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-HTML-Template.spec	13 Aug 2005 11:37:31 -0000	1.7
+++ perl-HTML-Template.spec	29 Dec 2005 01:03:06 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Template
-Version:        2.7
-Release:        4%{?dist}
+Version:        2.8
+Release:        1%{?dist}
 Summary:        Perl module to use HTML Templates
 
 Group:          Development/Libraries
@@ -44,7 +44,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 TEST_SHARED_MEMORY=1 make test
 
 
@@ -55,11 +55,14 @@
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE ARTISTIC Changes FAQ GPL README
+%{perl_vendorlib}/HTML/
 %{_mandir}/man3/*.3*
-%{perl_vendorlib}/*
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 2.8-1
+- Update to 2.8.
+
 * Sat Aug 13 2005 Jose Pedro Oliveira  - 2.7-4
 - README file: corrected the end-of-line encoding (#165874).
 - Bring up to date with Fedora Extras template.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:01:29 -0000	1.2
+++ sources	29 Dec 2005 01:03:06 -0000	1.3
@@ -1 +1 @@
-376f572659b4c0c40a9dd68823a0dd6b  HTML-Template-2.7.tar.gz
+3f1d6f4b3ab3ef7f0fd8864d2ec56e59  HTML-Template-2.8.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 01:51:10 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 20:51:10 -0500
Subject: rpms/perl-SNMP_Session/FC-3 .cvsignore, 1.2,
	1.3 perl-SNMP_Session.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512290151.jBT1phhJ017925@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SNMP_Session/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17870/FC-3

Modified Files:
	.cvsignore perl-SNMP_Session.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 18:27:59 -0000	1.2
+++ .cvsignore	29 Dec 2005 01:51:10 -0000	1.3
@@ -1 +1 @@
-SNMP_Session-1.07.tar.gz
+SNMP_Session-1.08.tar.gz


Index: perl-SNMP_Session.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/FC-3/perl-SNMP_Session.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-SNMP_Session.spec	13 Sep 2005 18:32:06 -0000	1.2
+++ perl-SNMP_Session.spec	29 Dec 2005 01:51:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-SNMP_Session
-Version:        1.07
-Release:        2%{?dist}
+Version:        1.08
+Release:        1%{?dist}
 Summary:        SNMP support for Perl 5
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 1.08-1
+- Update to 1.08.
+
 * Tue Sep 13 2005 Jose Pedro Oliveira  - 1.07-2
 - Removed superfluous perl BR.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 18:27:59 -0000	1.2
+++ sources	29 Dec 2005 01:51:10 -0000	1.3
@@ -1 +1 @@
-496725e254c98cf1863703c4184f783e  SNMP_Session-1.07.tar.gz
+91ab58bd2c170145436f68578a2705ab  SNMP_Session-1.08.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 01:51:16 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 20:51:16 -0500
Subject: rpms/perl-SNMP_Session/FC-4 .cvsignore, 1.2,
	1.3 perl-SNMP_Session.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512290151.jBT1pmVR017930@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SNMP_Session/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17870/FC-4

Modified Files:
	.cvsignore perl-SNMP_Session.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 18:27:59 -0000	1.2
+++ .cvsignore	29 Dec 2005 01:51:16 -0000	1.3
@@ -1 +1 @@
-SNMP_Session-1.07.tar.gz
+SNMP_Session-1.08.tar.gz


Index: perl-SNMP_Session.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/FC-4/perl-SNMP_Session.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-SNMP_Session.spec	13 Sep 2005 18:32:06 -0000	1.2
+++ perl-SNMP_Session.spec	29 Dec 2005 01:51:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-SNMP_Session
-Version:        1.07
-Release:        2%{?dist}
+Version:        1.08
+Release:        1%{?dist}
 Summary:        SNMP support for Perl 5
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 1.08-1
+- Update to 1.08.
+
 * Tue Sep 13 2005 Jose Pedro Oliveira  - 1.07-2
 - Removed superfluous perl BR.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 18:27:59 -0000	1.2
+++ sources	29 Dec 2005 01:51:16 -0000	1.3
@@ -1 +1 @@
-496725e254c98cf1863703c4184f783e  SNMP_Session-1.07.tar.gz
+91ab58bd2c170145436f68578a2705ab  SNMP_Session-1.08.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 01:51:22 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 20:51:22 -0500
Subject: rpms/perl-SNMP_Session/devel .cvsignore, 1.2,
	1.3 perl-SNMP_Session.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512290151.jBT1psgT017935@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SNMP_Session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17870/devel

Modified Files:
	.cvsignore perl-SNMP_Session.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 18:27:59 -0000	1.2
+++ .cvsignore	29 Dec 2005 01:51:22 -0000	1.3
@@ -1 +1 @@
-SNMP_Session-1.07.tar.gz
+SNMP_Session-1.08.tar.gz


Index: perl-SNMP_Session.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/devel/perl-SNMP_Session.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-SNMP_Session.spec	13 Sep 2005 18:32:06 -0000	1.2
+++ perl-SNMP_Session.spec	29 Dec 2005 01:51:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-SNMP_Session
-Version:        1.07
-Release:        2%{?dist}
+Version:        1.08
+Release:        1%{?dist}
 Summary:        SNMP support for Perl 5
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 1.08-1
+- Update to 1.08.
+
 * Tue Sep 13 2005 Jose Pedro Oliveira  - 1.07-2
 - Removed superfluous perl BR.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 18:27:59 -0000	1.2
+++ sources	29 Dec 2005 01:51:22 -0000	1.3
@@ -1 +1 @@
-496725e254c98cf1863703c4184f783e  SNMP_Session-1.07.tar.gz
+91ab58bd2c170145436f68578a2705ab  SNMP_Session-1.08.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 02:02:38 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 28 Dec 2005 21:02:38 -0500
Subject: rpms/Inventor/devel Inventor-redhat-bugs.diff,1.1,NONE
Message-ID: <200512290202.jBT22eBZ019755@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19746

Removed Files:
	Inventor-redhat-bugs.diff 
Log Message:
Remove.


--- Inventor-redhat-bugs.diff DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec 29 02:08:34 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 21:08:34 -0500
Subject: rpms/perl-Text-WikiFormat/devel .cvsignore, 1.2,
	1.3 perl-Text-WikiFormat.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200512290209.jBT296OQ019898@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-WikiFormat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19823/devel

Modified Files:
	.cvsignore perl-Text-WikiFormat.spec sources 
Log Message:
Update to 0.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2005 12:09:42 -0000	1.2
+++ .cvsignore	29 Dec 2005 02:08:34 -0000	1.3
@@ -1 +1 @@
-Text-WikiFormat-0.76.tar.gz
+Text-WikiFormat-0.77.tar.gz


Index: perl-Text-WikiFormat.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/perl-Text-WikiFormat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Text-WikiFormat.spec	1 Sep 2005 12:09:42 -0000	1.1
+++ perl-Text-WikiFormat.spec	29 Dec 2005 02:08:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Text-WikiFormat
-Version:        0.76
-Release:        2%{?dist}
+Version:        0.77
+Release:        1%{?dist}
 Summary:        Translate Wiki formatted text into other formats
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.77-1
+- Update to 0.77.
+
 * Thu Sep  1 2005 Jose Pedro Oliveira  - 0.76-2
 - Disabled the signature test.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2005 12:09:42 -0000	1.2
+++ sources	29 Dec 2005 02:08:34 -0000	1.3
@@ -1 +1 @@
-70bc20c8d058bf64df24e384d36748d1  Text-WikiFormat-0.76.tar.gz
+1264c90c76320a51ba61089b6a201e03  Text-WikiFormat-0.77.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 02:08:10 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 21:08:10 -0500
Subject: rpms/perl-Text-WikiFormat/FC-4 .cvsignore, 1.2,
	1.3 perl-Text-WikiFormat.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200512290209.jBT293EY019888@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-WikiFormat/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19823/FC-4

Modified Files:
	.cvsignore perl-Text-WikiFormat.spec sources 
Log Message:
Update to 0.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2005 12:09:42 -0000	1.2
+++ .cvsignore	29 Dec 2005 02:08:10 -0000	1.3
@@ -1 +1 @@
-Text-WikiFormat-0.76.tar.gz
+Text-WikiFormat-0.77.tar.gz


Index: perl-Text-WikiFormat.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-4/perl-Text-WikiFormat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Text-WikiFormat.spec	1 Sep 2005 12:09:42 -0000	1.1
+++ perl-Text-WikiFormat.spec	29 Dec 2005 02:08:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Text-WikiFormat
-Version:        0.76
-Release:        2%{?dist}
+Version:        0.77
+Release:        1%{?dist}
 Summary:        Translate Wiki formatted text into other formats
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.77-1
+- Update to 0.77.
+
 * Thu Sep  1 2005 Jose Pedro Oliveira  - 0.76-2
 - Disabled the signature test.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2005 12:09:42 -0000	1.2
+++ sources	29 Dec 2005 02:08:10 -0000	1.3
@@ -1 +1 @@
-70bc20c8d058bf64df24e384d36748d1  Text-WikiFormat-0.76.tar.gz
+1264c90c76320a51ba61089b6a201e03  Text-WikiFormat-0.77.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 02:08:02 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 21:08:02 -0500
Subject: rpms/perl-Text-WikiFormat/FC-3 .cvsignore, 1.2,
	1.3 perl-Text-WikiFormat.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200512290209.jBT29444019893@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-WikiFormat/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19823/FC-3

Modified Files:
	.cvsignore perl-Text-WikiFormat.spec sources 
Log Message:
Update to 0.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2005 12:09:42 -0000	1.2
+++ .cvsignore	29 Dec 2005 02:08:02 -0000	1.3
@@ -1 +1 @@
-Text-WikiFormat-0.76.tar.gz
+Text-WikiFormat-0.77.tar.gz


Index: perl-Text-WikiFormat.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-3/perl-Text-WikiFormat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Text-WikiFormat.spec	1 Sep 2005 12:09:42 -0000	1.1
+++ perl-Text-WikiFormat.spec	29 Dec 2005 02:08:02 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Text-WikiFormat
-Version:        0.76
-Release:        2%{?dist}
+Version:        0.77
+Release:        1%{?dist}
 Summary:        Translate Wiki formatted text into other formats
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.77-1
+- Update to 0.77.
+
 * Thu Sep  1 2005 Jose Pedro Oliveira  - 0.76-2
 - Disabled the signature test.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2005 12:09:42 -0000	1.2
+++ sources	29 Dec 2005 02:08:02 -0000	1.3
@@ -1 +1 @@
-70bc20c8d058bf64df24e384d36748d1  Text-WikiFormat-0.76.tar.gz
+1264c90c76320a51ba61089b6a201e03  Text-WikiFormat-0.77.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 02:21:07 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 21:21:07 -0500
Subject: rpms/perl-Pod-Escapes/devel perl-Pod-Escapes.spec,1.6,1.7
Message-ID: <200512290221.jBT2Ldiv020147@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-serv20128

Modified Files:
	perl-Pod-Escapes.spec 
Log Message:
Dist tag.


Index: perl-Pod-Escapes.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Escapes/devel/perl-Pod-Escapes.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Pod-Escapes.spec	6 Apr 2005 22:13:07 -0000	1.6
+++ perl-Pod-Escapes.spec	29 Dec 2005 02:21:06 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Pod-Escapes
 Version:        1.04
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Perl module for resolving POD escape sequences
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Pod-Escapes/
-Source0:     http://www.cpan.org/authors/id/S/SB/SBURKE/Pod-Escapes-1.04.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SB/SBURKE/Pod-Escapes-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -39,7 +36,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -50,12 +47,15 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README
-%{perl_vendorlib}/Pod
+%{perl_vendorlib}/Pod/
 %{_mandir}/man3/*.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 1.04-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.04-2
 - rebuilt
 
 * Sun May  9 2004 Jose Pedro Oliveira  - 0:1.04-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Dec 29 02:31:27 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 21:31:27 -0500
Subject: rpms/perl-TeX-Hyphen/devel perl-TeX-Hyphen.spec,1.6,1.7
Message-ID: <200512290231.jBT2VxPp020311@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-TeX-Hyphen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20294

Modified Files:
	perl-TeX-Hyphen.spec 
Log Message:
Dist tag.


Index: perl-TeX-Hyphen.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-TeX-Hyphen/devel/perl-TeX-Hyphen.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-TeX-Hyphen.spec	6 Apr 2005 22:13:08 -0000	1.6
+++ perl-TeX-Hyphen.spec	29 Dec 2005 02:31:26 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-TeX-Hyphen
 Version:        0.140
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Hyphenate words using TeX's patterns
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/TeX-Hyphen/
-Source0:    http://www.cpan.org/authors/id/J/JA/JANPAZ/TeX-Hyphen-0.140.tar.gz
+Source0:        http://www.cpan.org/authors/id/J/JA/JANPAZ/TeX-Hyphen-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -37,7 +34,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -53,7 +50,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.140-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.140-2
 - rebuilt
 
 * Fri Jun 11 2004 Jose Pedro Oliveira  - 0:0.140-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Dec 29 02:36:20 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 21:36:20 -0500
Subject: rpms/perl-Tie-IxHash/devel perl-Tie-IxHash.spec,1.6,1.7
Message-ID: <200512290236.jBT2arp2020395@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Tie-IxHash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20374

Modified Files:
	perl-Tie-IxHash.spec 
Log Message:
Dist tag.


Index: perl-Tie-IxHash.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Tie-IxHash/devel/perl-Tie-IxHash.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Tie-IxHash.spec	6 Apr 2005 22:13:09 -0000	1.6
+++ perl-Tie-IxHash.spec	29 Dec 2005 02:36:20 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Tie-IxHash
 Version:        1.21
-Release:        3
-
+Release:        4%{?dist}
 Summary:        Ordered associative arrays for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Tie-IxHash/
-Source0:     http://www.cpan.org/authors/id/G/GS/GSAR/Tie-IxHash-1.21.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GS/GSAR/Tie-IxHash-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -42,7 +39,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -53,12 +50,15 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorlib}/Tie
+%{perl_vendorlib}/Tie/
 %{_mandir}/man3/*.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 1.21-4
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.21-3
 - rebuilt
 
 * Sun May  9 2004 Jose Pedro Oliveira  - 0:1.21-0.fdr.2



From fedora-extras-commits at redhat.com  Thu Dec 29 02:40:47 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 21:40:47 -0500
Subject: rpms/perl-Sub-Uplevel/devel perl-Sub-Uplevel.spec,1.4,1.5
Message-ID: <200512290241.jBT2fKpF020477@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20452

Modified Files:
	perl-Sub-Uplevel.spec 
Log Message:
Dist tag.


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/perl-Sub-Uplevel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Sub-Uplevel.spec	6 Apr 2005 22:13:08 -0000	1.4
+++ perl-Sub-Uplevel.spec	29 Dec 2005 02:40:47 -0000	1.5
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Sub-Uplevel
 Version:        0.09
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Run a perl function in an upper stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Sub-Uplevel/
-Source0:   http://www.cpan.org/authors/id/M/MS/MSCHWERN/Sub-Uplevel-0.09.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/MS/MSCHWERN/Sub-Uplevel-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -39,7 +36,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -55,7 +52,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.09-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.09-2
 - rebuilt
 
 * Thu Jul  8 2004 Jose Pedro Oliveira  - 0.09-1



From fedora-extras-commits at redhat.com  Thu Dec 29 04:24:11 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 28 Dec 2005 23:24:11 -0500
Subject: rpms/python-setuptools/FC-4 - New directory
Message-ID: <200512290424.jBT4ODt5024378@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24370/FC-4

Log Message:
Directory /cvs/extras/rpms/python-setuptools/FC-4 added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 29 04:24:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 28 Dec 2005 23:24:59 -0500
Subject: rpms/python-setuptools/FC-4 .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512290425.jBT4P1og024412@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24400/FC-4

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of branch FC-4 of python-setuptools


--- NEW 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 Dec 29 05:12:05 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 29 Dec 2005 00:12:05 -0500
Subject: rpms/python-setuptools import.log,1.2,1.3
Message-ID: <200512290513.jBT5D0gg026217@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26171

Modified Files:
	import.log 
Log Message:
auto-import python-setuptools-0.6a8-1.fc4 on branch FC-4 from python-setuptools-0.6a8-1.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	27 Dec 2005 11:38:50 -0000	1.2
+++ import.log	29 Dec 2005 05:12:04 -0000	1.3
@@ -1 +1,2 @@
 python-setuptools-0_6a8-1:HEAD:python-setuptools-0.6a8-1.src.rpm:1135683502
+python-setuptools-0_6a8-1_fc4:FC-4:python-setuptools-0.6a8-1.fc4.src.rpm:1135833054



From fedora-extras-commits at redhat.com  Thu Dec 29 05:12:32 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 29 Dec 2005 00:12:32 -0500
Subject: rpms/python-setuptools/FC-4 python-setuptools.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512290513.jBT5D7Qp026221@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26171/FC-4

Modified Files:
	.cvsignore sources 
Added Files:
	python-setuptools.spec 
Log Message:
auto-import python-setuptools-0.6a8-1.fc4 on branch FC-4 from python-setuptools-0.6a8-1.fc4.src.rpm


--- NEW FILE python-setuptools.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-setuptools
Version:        0.6a8
Release:        1%{?dist}
Summary:        Download, build, install, upgrade, and uninstall Python packages

Group:          Development/Languages
License:        PSFL/ZPL
URL:            http://peak.telecommunity.com/DevCenter/setuptools
Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       python-abi = %{pyver}

%description
setuptools is a collection of enhancements to the Python distutils that allow
you to more easily build and distribute Python packages, especially ones that
have dependencies on other packages.

%prep
%setup -q -n setuptools-%{version}
sed -i '1s@#!python@#!/usr/bin/python@' easy_install.py

%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
find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; -print | while read file ; do sed -i '1d' $file ; done
#find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; | while read file ; do grep -q '^#!' $file && sed -i '1d' $file ; done
echo "setuptools-%{version}-py%{pyver}.egg" > $RPM_BUILD_ROOT%{python_sitelib}/setuptools.pth

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc api_tests.txt EasyInstall.txt pkg_resources.txt setuptools.txt
%{_bindir}/*
%{python_sitelib}/setuptools.pth
%{python_sitelib}/setuptools-%{version}-py%{pyver}.egg

%changelog
* Sat Dec 24 2005 Ignacio Vazquez-Abrams  0.6a8-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Dec 2005 04:24:58 -0000	1.1
+++ .cvsignore	29 Dec 2005 05:12:31 -0000	1.2
@@ -0,0 +1 @@
+setuptools-0.6a8.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Dec 2005 04:24:58 -0000	1.1
+++ sources	29 Dec 2005 05:12:31 -0000	1.2
@@ -0,0 +1 @@
+3eecdf66c1a2cf8a6556bc00b69d572a  setuptools-0.6a8.zip



From fedora-extras-commits at redhat.com  Thu Dec 29 05:40:08 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 29 Dec 2005 00:40:08 -0500
Subject: rpms/python-setuptools/FC-4 branch,NONE,1.1
Message-ID: <200512290540.jBT5eAk3026388@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26378

Added Files:
	branch 
Log Message:
Whoops


--- NEW FILE branch ---
FC-4



From fedora-extras-commits at redhat.com  Thu Dec 29 07:00:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 29 Dec 2005 02:00:59 -0500
Subject: rpms/python-formencode/FC-4 .cvsignore, 1.2,
	1.3 python-formencode.spec, 1.3, 1.4 sources, 1.2,
	1.3 python-formencode-setup.patch, 1.1, NONE
Message-ID: <200512290701.jBT71Vu7030005@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-formencode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28375/FC-4

Modified Files:
	.cvsignore python-formencode.spec sources 
Removed Files:
	python-formencode-setup.patch 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Oct 2005 09:33:55 -0000	1.2
+++ .cvsignore	29 Dec 2005 07:00:59 -0000	1.3
@@ -1 +1 @@
-FormEncode-0.2.2.tar.gz
+FormEncode-0.4.tar.gz


Index: python-formencode.spec
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/FC-4/python-formencode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-formencode.spec	23 Oct 2005 20:18:43 -0000	1.3
+++ python-formencode.spec	29 Dec 2005 07:00:59 -0000	1.4
@@ -1,20 +1,21 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-formencode
-Version:        0.2.2
-Release:        3%{?dist}
+Version:        0.4
+Release:        1%{?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  
-Patch0:         python-formencode-setup.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+BuildRequires:  python-setuptools
+Requires:       python-abi = %{pyver}
 
 
 %description
@@ -24,8 +25,6 @@
 
 %prep
 %setup -q -n FormEncode-%{version}
-rm -rf ez_setup
-%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -34,6 +33,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
 
 
 %clean
@@ -43,21 +43,13 @@
 %files
 %defattr(-,root,root,-)
 %doc PKG-INFO docs
-
-%dir %{python_sitelib}/formencode
-%{python_sitelib}/formencode/*.py
-%{python_sitelib}/formencode/*.pyc
-%ghost %{python_sitelib}/formencode/*.pyo
-
-%dir %{python_sitelib}/formencode/util
-%{python_sitelib}/formencode/util/*.py
-%{python_sitelib}/formencode/util/*.pyc
-%ghost %{python_sitelib}/formencode/util/*.pyo
-
-%dir %{python_sitelib}/formencode/javascript
-%{python_sitelib}/formencode/javascript/*.js
+%{python_sitelib}/FormEncode.pth
+%{python_sitelib}/FormEncode-%{version}-py%{pyver}.egg
 
 %changelog
+* Thu Dec 29 2005 Ignacio Vazquez-Abrams  0.4-1
+- Upstream update
+
 * Sun Oct 23 2005 Oliver Andrich  0.2.2-3
 - fixed some minor packaging issues
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Oct 2005 09:33:55 -0000	1.2
+++ sources	29 Dec 2005 07:00:59 -0000	1.3
@@ -1 +1 @@
-56bb04a6ce9a3dcb187b3db6091ec5d9  FormEncode-0.2.2.tar.gz
+797852a19505f7d919db96dd994d0484  FormEncode-0.4.tar.gz


--- python-formencode-setup.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec 29 07:01:05 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 29 Dec 2005 02:01:05 -0500
Subject: rpms/python-formencode/devel .cvsignore, 1.2,
	1.3 python-formencode.spec, 1.3, 1.4 sources, 1.2,
	1.3 python-formencode-setup.patch, 1.1, NONE
Message-ID: <200512290701.jBT71sIo030022@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-formencode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28375/devel

Modified Files:
	.cvsignore python-formencode.spec sources 
Removed Files:
	python-formencode-setup.patch 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Oct 2005 09:33:55 -0000	1.2
+++ .cvsignore	29 Dec 2005 07:01:04 -0000	1.3
@@ -1 +1 @@
-FormEncode-0.2.2.tar.gz
+FormEncode-0.4.tar.gz


Index: python-formencode.spec
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/devel/python-formencode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-formencode.spec	23 Oct 2005 20:18:44 -0000	1.3
+++ python-formencode.spec	29 Dec 2005 07:01:04 -0000	1.4
@@ -1,20 +1,21 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-formencode
-Version:        0.2.2
-Release:        3%{?dist}
+Version:        0.4
+Release:        1%{?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  
-Patch0:         python-formencode-setup.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+BuildRequires:  python-setuptools
+Requires:       python-abi = %{pyver}
 
 
 %description
@@ -24,8 +25,6 @@
 
 %prep
 %setup -q -n FormEncode-%{version}
-rm -rf ez_setup
-%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -34,6 +33,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
 
 
 %clean
@@ -43,21 +43,13 @@
 %files
 %defattr(-,root,root,-)
 %doc PKG-INFO docs
-
-%dir %{python_sitelib}/formencode
-%{python_sitelib}/formencode/*.py
-%{python_sitelib}/formencode/*.pyc
-%ghost %{python_sitelib}/formencode/*.pyo
-
-%dir %{python_sitelib}/formencode/util
-%{python_sitelib}/formencode/util/*.py
-%{python_sitelib}/formencode/util/*.pyc
-%ghost %{python_sitelib}/formencode/util/*.pyo
-
-%dir %{python_sitelib}/formencode/javascript
-%{python_sitelib}/formencode/javascript/*.js
+%{python_sitelib}/FormEncode.pth
+%{python_sitelib}/FormEncode-%{version}-py%{pyver}.egg
 
 %changelog
+* Thu Dec 29 2005 Ignacio Vazquez-Abrams  0.4-1
+- Upstream update
+
 * Sun Oct 23 2005 Oliver Andrich  0.2.2-3
 - fixed some minor packaging issues
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Oct 2005 09:33:55 -0000	1.2
+++ sources	29 Dec 2005 07:01:04 -0000	1.3
@@ -1 +1 @@
-56bb04a6ce9a3dcb187b3db6091ec5d9  FormEncode-0.2.2.tar.gz
+797852a19505f7d919db96dd994d0484  FormEncode-0.4.tar.gz


--- python-formencode-setup.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec 29 12:53:36 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 29 Dec 2005 07:53:36 -0500
Subject: owners owners.list,1.487,1.488
Message-ID: <200512291254.jBTCs839007490@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5530

Modified Files:
	owners.list 
Log Message:
Added myself to CC for a few orphaned packages.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -r1.487 -r1.488
--- owners.list	28 Dec 2005 23:15:09 -0000	1.487
+++ owners.list	29 Dec 2005 12:53:35 -0000	1.488
@@ -45,7 +45,7 @@
 Fedora Extras|atlas|Automatically Tuned Linear Algebra Software|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|autossh|Utility to autorestart SSH tunnels|kaboom at oobleck.net|extras-qa at fedoraproject.org|
-Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|awstats|Advanced Web Statistics|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|banner|Prints a short string to the console in very large letters|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
@@ -352,7 +352,7 @@
 Fedora Extras|gtkwave|Waveform viewer|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|gtorrentviewer|A GTK2-based viewer and editor for BitTorrent meta files|paul at city-fan.org|extras-qa at fedoraproject.org|
-Fedora Extras|gtranslator|A gettext po file editor for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtranslator|A gettext po file editor for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gurlchecker|A GNOME link validity checker|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gv|A X front-end for the Ghostscript PostScript(TM) interpreter|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -1152,8 +1152,8 @@
 Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|system-config-control|Centralized tool for Fedora configuration utilities|ankit644 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|system-switch-im|A utility for switching default IIIMF to XIM servers|llch at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|t1lib|PostScript Type 1 font rasterizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|t1lib|PostScript Type 1 font rasterizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|taarich|Display Hebrew date|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
@@ -1199,7 +1199,7 @@
 Fedora Extras|tpctl|IBM ThinkPad configuration tools|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|treecc|Tree Compiler Compiler|compton at pcompton.com|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|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|tuxpaint|Drawing program designed for young children|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|tuxtype2|Tux Typing is an educational typing tutor for children|steve at silug.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 29 12:56:24 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 29 Dec 2005 07:56:24 -0500
Subject: rpms/pam_usb - New directory
Message-ID: <200512291256.jBTCuQ5X007567@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/pam_usb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7559/pam_usb

Log Message:
Directory /cvs/extras/rpms/pam_usb added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 29 12:56:30 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 29 Dec 2005 07:56:30 -0500
Subject: rpms/pam_usb/devel - New directory
Message-ID: <200512291256.jBTCuWQh007582@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/pam_usb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7559/pam_usb/devel

Log Message:
Directory /cvs/extras/rpms/pam_usb/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 29 12:56:49 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 29 Dec 2005 07:56:49 -0500
Subject: rpms/pam_usb Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512291256.jBTCupHU007620@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/pam_usb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7608

Added Files:
	Makefile import.log 
Log Message:
Setup of module pam_usb


--- NEW FILE Makefile ---
# Top level Makefile for module pam_usb
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 29 12:56:55 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 29 Dec 2005 07:56:55 -0500
Subject: rpms/pam_usb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512291256.jBTCuviL007640@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/pam_usb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7608/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pam_usb


--- NEW 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 Dec 29 12:57:58 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 29 Dec 2005 07:57:58 -0500
Subject: rpms/pam_usb import.log,1.1,1.2
Message-ID: <200512291258.jBTCwUci007750@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/pam_usb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7706

Modified Files:
	import.log 
Log Message:
auto-import pam_usb-0.3.3-2 on branch devel from pam_usb-0.3.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pam_usb/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Dec 2005 12:56:49 -0000	1.1
+++ import.log	29 Dec 2005 12:57:58 -0000	1.2
@@ -0,0 +1 @@
+pam_usb-0_3_3-2:HEAD:pam_usb-0.3.3-2.src.rpm:1135861068



From fedora-extras-commits at redhat.com  Thu Dec 29 12:58:04 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 29 Dec 2005 07:58:04 -0500
Subject: rpms/pam_usb/devel pam_usb-0.3.3-Makefile.patch, NONE,
	1.1 pam_usb-options.html, NONE, 1.1 pam_usb-pam.d-gdm.example,
	NONE, 1.1 pam_usb-pam.d-login.example, NONE,
	1.1 pam_usb-quickstart.html, NONE, 1.1 pam_usb.spec, NONE,
	1.1 pam_usb.udev, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512291258.jBTCwajw007754@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/pam_usb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7706/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pam_usb-0.3.3-Makefile.patch pam_usb-options.html 
	pam_usb-pam.d-gdm.example pam_usb-pam.d-login.example 
	pam_usb-quickstart.html pam_usb.spec pam_usb.udev 
Log Message:
auto-import pam_usb-0.3.3-2 on branch devel from pam_usb-0.3.3-2.src.rpm

pam_usb-0.3.3-Makefile.patch:

--- NEW FILE pam_usb-0.3.3-Makefile.patch ---
diff -Nrbu pam_usb-0.3.3/src/Makefile pam_usb-0.3.3-OK/src/Makefile
--- pam_usb-0.3.3/src/Makefile	2005-10-18 19:03:33.000000000 +0400
+++ pam_usb-0.3.3-OK/src/Makefile	2005-12-20 14:48:19.000000000 +0300
@@ -4,7 +4,8 @@
 SO		:= pam_usb.so
 SOURCES		:= $(wildcard *.c)
 OBJS		:= $(patsubst %.c,%.o,$(SOURCES))
-PAM_MODULES	:= $(DESTDIR)/lib/security
+LIB		:= lib
+PAM_MODULES	:= $(DESTDIR)/$(LIB)/security
 
 all: $(SO)
 
@@ -18,7 +19,8 @@
 	rm -f $(OBJS) $(SO)
 
 install: all
-	install -m644 $(SO) $(PAM_MODULES)
+	install -d $(PAM_MODULES)
+	install -m755 $(SO) $(PAM_MODULES)
 
 deinstall:
 	rm -f $(PAM_MODULES)/$(SO)
diff -Nrbu pam_usb-0.3.3/tools/usbadm/Makefile pam_usb-0.3.3-OK/tools/usbadm/Makefile
--- pam_usb-0.3.3/tools/usbadm/Makefile	2005-10-18 19:03:33.000000000 +0400
+++ pam_usb-0.3.3-OK/tools/usbadm/Makefile	2005-12-20 14:49:21.000000000 +0300
@@ -19,7 +19,9 @@
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 install: all
+	install -d $(DEST)
 	install -m755 $(BIN) $(DEST)
+	install -d $(MANDIR)/man1
 	install usbadm.1.gz $(MANDIR)/man1/
 
 deinstall:
diff -Nrbu pam_usb-0.3.3/tools/usbhotplug/Makefile pam_usb-0.3.3-OK/tools/usbhotplug/Makefile
--- pam_usb-0.3.3/tools/usbhotplug/Makefile	2005-10-18 19:03:33.000000000 +0400
+++ pam_usb-0.3.3-OK/tools/usbhotplug/Makefile	2005-12-20 14:50:34.000000000 +0300
@@ -21,12 +21,14 @@
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 install: all
+	install -d $(DEST)
 	install -m755 $(BIN) $(DEST)
 	install -d $(HOTPLUGDIR)/
 	install -m755 files/pamusb.hotplug $(HOTPLUGDIR)/
 	install -d $(PAMUSBCONF)/handlers/
 	install -m644 files/hotplug.conf $(PAMUSBCONF)/
 	install -m755 files/xlock.sh $(PAMUSBCONF)/handlers/
+	install -d $(PAMDIR)/usbhotplug
 	install -m644 files/usbhotplug.pam $(PAMDIR)/usbhotplug
 
 deinstall:


--- NEW FILE pam_usb-options.html ---


As third argument of a pam.d file, it's possible to specify some
arguments.
    
The following is a list of recognized options:
    

    

    

    
name
type
description
default value
    


    
mntpoint

string

Tells pam_usb the form of the temporary directory. XXXXXX (6 times) will be replaced by a temporary value.

 /tmp/pam_usbXXXXXX

    


    
proc_basename

string

the device's procfile. You usually don't have to change this, it's where pam_usb searches for devices.

/proc/scsi/usb-storage-%d/%d

    


    
pwfile

string

The path pam_usb will search for public and private keys (~user/ and mntpoint/)

 /.auth/

    


    
pubkey

string

The name of the public key located in the user's home

 id_pub

    


    
snfile

string

the serial number file contains the allowed SN. If it doesn't exists, the default behaviour is to grant everything.

 /etc/pam_usb/serials.conf

    


    
fs

string

comma-separated list of filesystems used to mount the device

 ext2,vfat

    


    
utmp

string

location of the utmp file

/var/run/utmp
 
    
 

    
mount_opts

string

comma-separated list of mount options (including: ro,bind,sync,remount,nosuid,noexec,nodev)


 
    


    
log_file

string

print debug messages to that file instead of stdout


 
    
 

    
local_consoles

string

comma-separated list of consoles which be able to login when allow_remote=-1

 /dev/vc/,/dev/tty,:
 
    


    
direct_open

boolean

Attempt to open the private key using O_DIRECT to avoid disk caching: will
work only on devices that support this feature.

    

 
    
 local_hosts
 
 string
 
 comma-separated list of hosts that will be able to login when allow_remote=-1
 
  :
  
    
  
 

    
force_device

string

Using this option, you can force pam_usb to use a specified device. If 
it fails mounting, it'll switch back to auto guess mode



    


    
allow_remote

boolean

When set to false (!allow_remote) it will allow only local_hosts and 
local_consoles to login.

 false
 
    
 

    
check_device

boolean

If unset (!check_device), pam_usb will not check neither if the device is 
attached, nor 
its serial number.

true

    


    
check_if_mounted

boolean

if the usb device is already mounted pam_usb will use its mountpoint (avoid using it)

 false

    


    
keep_mounted

boolean

When set to true, it'll keep mntpoint mounted. Useful if combined
with check_if_mounted.

 false
 
    
 


    
sign_times

integer

Number of times pam_usb will do the sign/check challenge.

 3

    


    
debug

boolean

enable debug mode

 false

    

    

    
Boolean variables can be set true by putting them as is (e.g. option), and to false by adding ! in front of them (e.g. !option).

    

    
The syntax is of the name=value form for string and integer options,
for example the following will
tell pam_usb to use either ext3 or reiserfs as filesystem, to enable
debug mode, to disable device checking and that the serial number file
is located at /etc/serials:
    

    auth    requisite       pam_usb.so      fs=ext3,reiserfs debug !check_device snfile=/etc/serials

    

    


    
        Copyright ? 2003,2004 Andrea Luzzardi <scox at gentoo.org>          

    
  


--- NEW FILE pam_usb-pam.d-gdm.example ---
#%PAM-1.0
auth       sufficient	pam_usb.so check_if_mounted mount_opts=ro allow_remote
auth       required	pam_env.so
auth       required	pam_stack.so service=system-auth
auth       required	pam_nologin.so
account    required	pam_stack.so service=system-auth
password   required	pam_stack.so service=system-auth
session    required	pam_stack.so service=system-auth
session    optional     pam_console.so


--- NEW FILE pam_usb-pam.d-login.example ---
#%PAM-1.0
auth       sufficient	pam_usb.so check_if_mounted mount_opts=ro quiet
auth       required	pam_securetty.so
auth       required	pam_stack.so service=system-auth
auth       required	pam_nologin.so
account    required	pam_stack.so service=system-auth
password   required	pam_stack.so service=system-auth
session    required	pam_stack.so service=system-auth
session    optional	pam_console.so


--- NEW FILE pam_usb-quickstart.html ---




    
Installing pam_usb
    

    % tar -zxvf pam_usb-VERSION.tar.gz
% cd pam_usb-VERSION
% make
# make install

    
Replace VERSION with the version number you downloaded.
    
This will unpack, compile and install the pam_usb module and its 
tools usbadm and usbhotplug.
    


    Setup
    

Now pam_usb can be enabled for your login applications.
    
A list of applications using PAM is avaible at /etc/pam.d/
(you may want to edit /etc/pam.d/login, and /etc/pam.d/xdm).
    
pam_usb can work in 3 different modes:

    Unique: You can login using your USB pen, if it's
not present, it isn't possible to login.

    
This mode can be enabled by commenting the line auth required 
pam_unix.so (by adding a # at the beginning of the line), and add
the following line:
    

    auth       required        pam_usb.so

    

    

    Alternative: Plugging in the USB device is enough to
login.
If it's not present, the system prompts for password.
    
To use such, add the following line before the auth required 
pam_unix.so line:
    

    auth       sufficient      pam_usb.so

    

    

    Additional: To login, you have to put the USB device and type
your password.
    
If you want to use this mode, add the following line before the auth 
required pam_unix.so line:
    

    auth       required        pam_usb.so

    

    

Please note that the /etc/pam.d/ directory name, and the pam_unix.so 
module name are mostly the same in every distro, but could be different 
(mandrake uses pam_stack.so instead of pam_unix.so).
    
For a first usage, you should use a alternative mode, and enable the
debug mode.
    
More info are avaible at the PAM 
documentation website.
    


    Workarounds
    

    2.6 kernel
    

    As the proc format has changed, a workaround is avaible to 
use it under a 2.6 kernel.
    
Add the !check_device option 
in order to make it work.
    

    Non USB-Storage devices
    

    
Since the 0.2_rc2 version, it is possible to use a floppy, a cdrom or 
another mountable device.
To use a floppy add the following options:
    
!check_device !check_if_mounted force_device=/dev/fd0
    
Replace /dev/fd0 by the device you're using, as /dev/cdrom if you want 
to store your private key on such support.
    
CD-ROMs mounting will require to be read-only. To do so, add the option mount_opts=ro.

    

    

    Key setup
    


    Now that we told PAM to use pam_usb for authentication, we have to create a 
couple of private and public keys that will be used for authentication.
We will use the fresh installed usbadm tool:

First you have to mount the USB device on your favourite mountpoint.
- If you didn't create a mountpoint for the usb pen then do so :

# mkdir /mnt/usb

Replace /mnt/usb with any other inexistent directory (or leave it alone).
- Mount the usb pen:

# mount /dev/sda1 /mnt/usb

Replace /dev/sda1 and /mnt/usb with the correct device name and mountpoint.
If you don't have any clue of what your device entry is, just plug the pen 
and type dmesg. Usually, if you don't have any SCSI device it should be 
/dev/sda1. Use an empty directory for mountpoint (the one you just created, 
for example).

Ok, now the device is mounted and we can access it's content via /mnt/usb
- Now we can create a couple of private/public keys by using the usbadm tool:
The syntax is the following: usbadm keygen <mntpoint> <user> <bits>

For example this will generate a private and public key for the user root using 
a pair of 2048 bits DSA keys.


# usbadm keygen /mnt/usb root 1024
[!] Directory /root/.auth/ not found, creating one...
[!] Directory /mnt/usb/.auth/ not found, creating one...
[!] Generating 1024 DSA key pair for root at host
[!] Extracting private key...
[+] Private key extracted.
[+] Private key successfully written.
[!] Writing public key...
[+] Public key successfully written.

That's it. This will check the directories needed by pam_usb, generate, extract 
and write private/public keys for the chosen user for the local host.

You can try with any configured application, like login or GDM.
For a first test, you may want to use su as you can test it without switching to 
a console.



    

    

    
        Copyright ? 2003,2004 Andrea Luzzardi <scox at gentoo.org>          
      
    
    
  


--- NEW FILE pam_usb.spec ---
Name:	pam_usb
Summary: PAM module for use with DSA key pairs and removable devices
Version: 0.3.3
Release: 2%{?dist}
License: GPL
Group: System Environment/Base
URL:  http://www.pamusb.org
Source0:  http://dl.sourceforge.net/pamusb/%{name}-%{version}.tar.gz
# lynx -source http://www.pamusb.org/quickstart.html >pam_usb-quickstart.html
Source1:  pam_usb-quickstart.html
# lynx -source http://www.pamusb.org/options.html >pam_usb-options.html
Source2:  pam_usb-options.html
Source3:  pam_usb.udev
Source4:  pam_usb-pam.d-login.example
Source5:  pam_usb-pam.d-gdm.example
Patch0:   pam_usb-0.3.3-Makefile.patch

BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pam-devel, openssl-devel, readline-devel, ncurses-devel


%description
This PAM module provides authentication through DSA private/public keys.
Public keys placed on the target computer, whereas private keys are stored
on some removable device, including USB storages/flash drives, cdroms,
floppies, etc.

Any kind of mountable devices (not removable only) can be used.

Due to using of DSA key pairs, the passwordless authentication can be organized
(if a private key is stored not crypted on the media).


%package hotplug
Summary: Hotplug agent to use with USB flash 
Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
Requires: hotplug

%description hotplug
Hotplug agent to use with USB flash.


%prep
%setup -q
%patch0 -p1

cp -p %{SOURCE1} quickstart.html
cp -p %{SOURCE2} options.html

mkdir pam.d-examples
cp -p %{SOURCE4} pam.d-examples/login
cp -p %{SOURCE5} pam.d-examples/gdm


%build
# Note: we may not overwrite CFLAGS, so use CC instead...
make CC="%__cc $RPM_OPT_FLAGS" LIB=%{_lib} %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install LIB=%{_lib} DESTDIR=$RPM_BUILD_ROOT

#  use new "udev" style instead of obsoleted "hotplug" ...
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d/default/*
install -D -m644 %{SOURCE3} \
	$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-%{name}.rules

pushd $RPM_BUILD_ROOT/etc/pam.d
rm -rf usbhotplug
cat >usbhotplug < - 0.3.3-2
- accepted for Fedora Extras (review by Wart )

* Thu Dec 22 2005 Dmitry Butskoy  - 0.3.3-2
- Use /etc/udev/rules.d instead of /etc/hotplug.d
- Add some pam.d examples (Wart at kobold.org)

* Tue Dec 20 2005 Dmitry Butskoy  - 0.3.3-1
- upgrade to 0.3.3
- always build hotplug package
- add Makefile patch (directory creation, permissions etc.)
- create usbhotplug pam file own way

* Wed Sep  7 2005 Dmitry Butskoy  - 0.3.2-1
- initial release
- copy quckstart.html and options.html from web-site to package
- separate hotplug stuff as an additional package, build it
  when "--with hotplug" is specified only


--- NEW FILE pam_usb.udev ---
ACTION!="add", ACTION!="remove", GOTO="pam_usb_end"
SUBSYSTEM=="usb", ENV{PRODUCT}=="?*",  \
	RUN+="/usr/bin/usbhotplug block"

LABEL="pam_usb_end"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pam_usb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Dec 2005 12:56:55 -0000	1.1
+++ .cvsignore	29 Dec 2005 12:58:04 -0000	1.2
@@ -0,0 +1 @@
+pam_usb-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pam_usb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Dec 2005 12:56:55 -0000	1.1
+++ sources	29 Dec 2005 12:58:04 -0000	1.2
@@ -0,0 +1 @@
+45e73035b706ff6dd20d002210bf0cb3  pam_usb-0.3.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 13:02:24 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 29 Dec 2005 08:02:24 -0500
Subject: owners owners.list,1.488,1.489
Message-ID: <200512291302.jBTD2v1q009475@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9454

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -r1.488 -r1.489
--- owners.list	29 Dec 2005 12:53:35 -0000	1.488
+++ owners.list	29 Dec 2005 13:02:08 -0000	1.489
@@ -684,6 +684,7 @@
 Fedora Extras|pam_mysql| PAM module for auth UNIX users using MySQL data base|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|pam_pkcs11|PKCS #11 PAM login module|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|pam_ssh|PAM module for use with SSH keys and ssh-agent|pertusus at free.fr|extras-qa at fedoraproject.org|dmitry at butskoy.name
+Fedora Extras|pam_usb|PAM module for use with DSA key pairs and removable devices|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|pan|A GNOME/GTK+ news reader for X|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 29 17:22:14 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 29 Dec 2005 12:22:14 -0500
Subject: rpms/tkcon - New directory
Message-ID: <200512291722.jBTHMGMb017545@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tkcon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17537/tkcon

Log Message:
Directory /cvs/extras/rpms/tkcon added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 29 17:22:19 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 29 Dec 2005 12:22:19 -0500
Subject: rpms/tkcon/devel - New directory
Message-ID: <200512291722.jBTHMLoG017564@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tkcon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17537/tkcon/devel

Log Message:
Directory /cvs/extras/rpms/tkcon/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 29 17:22:31 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 29 Dec 2005 12:22:31 -0500
Subject: rpms/tkcon Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512291722.jBTHMY8b017603@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tkcon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17591

Added Files:
	Makefile import.log 
Log Message:
Setup of module tkcon


--- NEW FILE Makefile ---
# Top level Makefile for module tkcon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 29 17:22:37 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 29 Dec 2005 12:22:37 -0500
Subject: rpms/tkcon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200512291722.jBTHMd6L017623@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tkcon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17591/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tkcon


--- NEW 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 Dec 29 17:22:59 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 29 Dec 2005 12:22:59 -0500
Subject: rpms/tkcon import.log,1.1,1.2
Message-ID: <200512291723.jBTHNVj0017702@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tkcon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17662

Modified Files:
	import.log 
Log Message:
auto-import tkcon-2.4-2 on branch devel from tkcon-2.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tkcon/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Dec 2005 17:22:31 -0000	1.1
+++ import.log	29 Dec 2005 17:22:59 -0000	1.2
@@ -0,0 +1 @@
+tkcon-2_4-2:HEAD:tkcon-2.4-2.src.rpm:1135876975



From fedora-extras-commits at redhat.com  Thu Dec 29 17:23:05 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 29 Dec 2005 12:23:05 -0500
Subject: rpms/tkcon/devel tkcon.desktop, NONE, 1.1 tkcon.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512291723.jBTHNdKA017706@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tkcon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17662/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tkcon.desktop tkcon.spec 
Log Message:
auto-import tkcon-2.4-2 on branch devel from tkcon-2.4-2.src.rpm


--- NEW FILE tkcon.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Tkcon
GenericName=Tkcon
Comment=Tcl console shell
Exec=tkcon
Icon=
Terminal=false
Type=Application
Categories=Application;Programming;Development;
Version=2.4


--- NEW FILE tkcon.spec ---
Name:           tkcon
Version:        2.4
Release:        2%{?dist}
Summary:        Tcl GUI console

Group:		Development/Tools
License:        BSD-like
URL:            http://tkcon.sourceforge.net/
Source0:        http://download.sourceforge.net/tkcon/tkcon-2.4.tar.gz
Source1:        tkcon.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch
BuildRequires: desktop-file-utils
Requires:  tk

%description
tkcon is a replacement for the standard Tk console with many more features.
It works on all platforms where Tcl/Tk is available.
It is meant primarily to aid one when working with the little details
inside tcl and tk, giving Unix users the GUI console provided by default
in the Mac and Windows Tk.

%prep
%setup -q
rm docs/*.txt
mv docs/license.terms .

sed -i 's,\r$,,' release.txt

%install
rm -rf $RPM_BUILD_ROOT
install -pD -m 0755 tkcon.tcl $RPM_BUILD_ROOT/%{_bindir}/tkcon

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/applications/*.desktop
%doc license.terms README.txt release.txt index.html docs

%changelog
* Wed Dec 28 2005 Wart  - 2.4-2
- Better description and installed documentation layout.
* Fri Dec 9 2005 Wart  - 2.4-1
- Initial Fedora spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Dec 2005 17:22:37 -0000	1.1
+++ .cvsignore	29 Dec 2005 17:23:04 -0000	1.2
@@ -0,0 +1 @@
+tkcon-2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Dec 2005 17:22:37 -0000	1.1
+++ sources	29 Dec 2005 17:23:04 -0000	1.2
@@ -0,0 +1 @@
+415905fe3d81aa957f9c4424c219784e  tkcon-2.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 17:29:48 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 29 Dec 2005 12:29:48 -0500
Subject: owners owners.list,1.489,1.490
Message-ID: <200512291730.jBTHULws017820@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17803

Modified Files:
	owners.list 
Log Message:
Added tkcon



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -r1.489 -r1.490
--- owners.list	29 Dec 2005 13:02:08 -0000	1.489
+++ owners.list	29 Dec 2005 17:29:48 -0000	1.490
@@ -1189,6 +1189,7 @@
 Fedora Extras|tin|A basic Internet news reader|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|tinyerp|Open Source ERP Client|dan at danny.cz|extras-qa at fedoraproject.org|tcallawa at redhat.com
 Fedora Extras|tiobench|Threaded I/O benchmark|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|tkcon|Tcl console|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Thu Dec 29 21:06:46 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 29 Dec 2005 16:06:46 -0500
Subject: rpms/emelfm2/devel emelfm2.spec,1.5,1.6
Message-ID: <200512292107.jBTL7pF1025034@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/emelfm2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25017

Modified Files:
	emelfm2.spec 
Log Message:
update to 0.1.4


Index: emelfm2.spec
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/devel/emelfm2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emelfm2.spec	21 Nov 2005 19:19:03 -0000	1.5
+++ emelfm2.spec	29 Dec 2005 21:06:19 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           emelfm2
-Version:        0.1.3
-Release:        2%{?dist}
+Version:        0.1.4
+Release:        1%{?dist}
 Summary:        A file manager that implements the popular two-pane design
 
 Group:          Applications/File
@@ -63,6 +63,9 @@
 
 	
 %changelog
+* Thu Dec 29 2005 Christoph Wickert  - 0.1.4-1
+- Update to 0.1.4.
+
 * Mon Nov 21 2005 Christoph Wickert  - 0.1.3-2
 - Removed nonexistant ROADMAP from %doc.
 



From fedora-extras-commits at redhat.com  Thu Dec 29 21:19:31 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 29 Dec 2005 16:19:31 -0500
Subject: rpms/emelfm2/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200512292120.jBTLK35H025147@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/emelfm2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25128

Modified Files:
	.cvsignore sources 
Log Message:
update sources and cvsignore for 0.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2005 18:16:55 -0000	1.3
+++ .cvsignore	29 Dec 2005 21:19:30 -0000	1.4
@@ -1 +1 @@
-emelfm2-0.1.3.tar.gz
+emelfm2-0.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2005 18:16:55 -0000	1.3
+++ sources	29 Dec 2005 21:19:30 -0000	1.4
@@ -1 +1 @@
-0f1412c28211aa4afa66cbd297eb9abd  emelfm2-0.1.3.tar.gz
+da39b1d017366fb41700c5d40365a1ae  emelfm2-0.1.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 30 12:23:25 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 30 Dec 2005 07:23:25 -0500
Subject: rpms/xfce4-xkb-plugin/devel xfce4-xkb-plugin.spec,1.1,1.2
Message-ID: <200512301223.jBUCNwU8021335@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21318

Modified Files:
	xfce4-xkb-plugin.spec 
Log Message:
Changes for modular X: Add libXext-devel and libXpm-devel to builddeps


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-xkb-plugin.spec	16 Dec 2005 22:28:33 -0000	1.1
+++ xfce4-xkb-plugin.spec	30 Dec 2005 12:23:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
 Version:	0.3.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
+BuildRequires:	libXext-devel, libXpm-devel
 
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
@@ -42,6 +43,9 @@
 %{_datadir}/xfce4/xkb/flags/*.png
 
 %changelog
+* Fri Dec 30 2005 Christoph Wickert  - 0.3.2-5
+- Changes for modular X: Add libXext-devel and libXpm-devel BuildReqs.
+
 * Thu Dec 01 2005 Christoph Wickert  - 0.3.2-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Fri Dec 30 13:06:51 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 30 Dec 2005 08:06:51 -0500
Subject: rpms/xfce4-battery-plugin/devel xfce4-battery-plugin.spec,1.1,1.2
Message-ID: <200512301307.jBUD7ixE023126@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23099

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
add libxfcegui4-devel buildreq and fix %defattr


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/xfce4-battery-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-battery-plugin.spec	15 Dec 2005 03:10:03 -0000	1.1
+++ xfce4-battery-plugin.spec	30 Dec 2005 13:06:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-battery-plugin
 Version:	0.3.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -8,9 +8,9 @@
 URL:		http://xfce-goodies.berlios.de/
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
 Source1:	GPL
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.2, libxml2-devel
+BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -34,11 +34,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Fri Dec 30 2005 Christoph Wickert  - 0.3.0-4
+- Add libxfcegui4-devel BuildReqs.
+- Fix %defattr.
+
 * Sat Nov 19 2005 Christoph Wickert  - 0.3.0-3
 - Use %{?_smp_mflags}.
 - Replace wrong BSD license with a copy of the GPL (#173105).



From fedora-extras-commits at redhat.com  Fri Dec 30 13:11:51 2005
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Fri, 30 Dec 2005 08:11:51 -0500
Subject: rpms/cfengine/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 cfengine.spec, 1.13, 1.14
Message-ID: <200512301312.jBUDCNW3023243@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23215

Modified Files:
	.cvsignore sources cfengine.spec 
Log Message:
update to upstream 2.1.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Oct 2005 12:54:09 -0000	1.8
+++ .cvsignore	30 Dec 2005 13:11:50 -0000	1.9
@@ -1,5 +1,4 @@
-cfengine-2.1.16.tar.gz
-cfengine-2.1.16-CAN-2005-2960.patch
+cfengine-2.1.18.tar.gz
 cfenvd
 cfexecd
 cfservd


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Oct 2005 12:54:09 -0000	1.8
+++ sources	30 Dec 2005 13:11:50 -0000	1.9
@@ -1,5 +1,4 @@
-1b009dcc2ab27c205e72b536c67ae173  cfengine-2.1.16.tar.gz
-2e8f500862bcf1b94f8108f258e39297  cfengine-2.1.16-CAN-2005-2960.patch
+7703780f987facc537cf239b04d2b2e8  cfengine-2.1.18.tar.gz
 37c565f98d2b252c9c6cf1c88d654e02  cfenvd
 19f07f0d576abf8bf8cb875ab6ad66c6  cfexecd
 fe6c086a41f428d47bde30646e0310c4  cfservd


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cfengine.spec	13 Nov 2005 10:47:36 -0000	1.13
+++ cfengine.spec	30 Dec 2005 13:11:50 -0000	1.14
@@ -1,14 +1,13 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 2.1.16
-Release: 3%{?dist}
+Version: 2.1.18
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.16.tar.gz
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.18.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
-Patch1: cfengine-2.1.16-CAN-2005-2960.patch
 URL: http://www.cfengine.org/
 BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel
 Requires(post): /sbin/chkconfig, /sbin/install-info
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 
 %build
@@ -120,6 +118,9 @@
 
 
 %changelog
+* Fri Dec 30 2005 Jeff Sheltren  - 2.1.18-1
+- Update to upstream 2.1.18
+
 * Mon Oct 17 2005 Jeff Sheltren  - 2.1.16-2
 - Patch insecure temp file, CAN-2005-2960 (#170896)
 



From fedora-extras-commits at redhat.com  Fri Dec 30 13:12:56 2005
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Fri, 30 Dec 2005 08:12:56 -0500
Subject: rpms/cfengine/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 cfengine.spec, 1.12, 1.13
Message-ID: <200512301313.jBUDDTP2023274@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23249

Modified Files:
	.cvsignore sources cfengine.spec 
Log Message:
update to upstream 2.1.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Oct 2005 12:57:36 -0000	1.8
+++ .cvsignore	30 Dec 2005 13:12:56 -0000	1.9
@@ -1,5 +1,4 @@
-cfengine-2.1.16.tar.gz
-cfengine-2.1.16-CAN-2005-2960.patch
+cfengine-2.1.18.tar.gz
 cfenvd
 cfexecd
 cfservd


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Oct 2005 12:57:36 -0000	1.8
+++ sources	30 Dec 2005 13:12:56 -0000	1.9
@@ -1,5 +1,4 @@
-1b009dcc2ab27c205e72b536c67ae173  cfengine-2.1.16.tar.gz
-2e8f500862bcf1b94f8108f258e39297  cfengine-2.1.16-CAN-2005-2960.patch
+7703780f987facc537cf239b04d2b2e8  cfengine-2.1.18.tar.gz
 37c565f98d2b252c9c6cf1c88d654e02  cfenvd
 19f07f0d576abf8bf8cb875ab6ad66c6  cfexecd
 fe6c086a41f428d47bde30646e0310c4  cfservd


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-4/cfengine.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cfengine.spec	18 Oct 2005 12:57:36 -0000	1.12
+++ cfengine.spec	30 Dec 2005 13:12:56 -0000	1.13
@@ -1,14 +1,13 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 2.1.16
-Release: 2%{?dist}
+Version: 2.1.18
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.16.tar.gz
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.18.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
-Patch1: cfengine-2.1.16-CAN-2005-2960.patch
 URL: http://www.cfengine.org/
 BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel
 Requires(post): /sbin/chkconfig, /sbin/install-info
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 
 %build
@@ -120,6 +118,9 @@
 
 
 %changelog
+* Fri Dec 30 2005 Jeff Sheltren  - 2.1.18-1
+- Update to upstream 2.1.18
+
 * Mon Oct 17 2005 Jeff Sheltren  - 2.1.16-2
 - Patch insecure temp file, CAN-2005-2960 (#170896)
 



From fedora-extras-commits at redhat.com  Fri Dec 30 13:13:38 2005
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Fri, 30 Dec 2005 08:13:38 -0500
Subject: rpms/cfengine/FC-3 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 cfengine.spec, 1.11, 1.12
Message-ID: <200512301314.jBUDEBmd023303@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23280

Modified Files:
	.cvsignore sources cfengine.spec 
Log Message:
update to upstream 2.1.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	18 Oct 2005 12:59:43 -0000	1.9
+++ .cvsignore	30 Dec 2005 13:13:38 -0000	1.10
@@ -1,5 +1,4 @@
-cfengine-2.1.16.tar.gz
-cfengine-2.1.16-CAN-2005-2960.patch
+cfengine-2.1.18.tar.gz
 cfenvd
 cfexecd
 cfservd


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	18 Oct 2005 12:59:43 -0000	1.9
+++ sources	30 Dec 2005 13:13:38 -0000	1.10
@@ -1,5 +1,4 @@
-1b009dcc2ab27c205e72b536c67ae173  cfengine-2.1.16.tar.gz
-2e8f500862bcf1b94f8108f258e39297  cfengine-2.1.16-CAN-2005-2960.patch
+7703780f987facc537cf239b04d2b2e8  cfengine-2.1.18.tar.gz
 37c565f98d2b252c9c6cf1c88d654e02  cfenvd
 19f07f0d576abf8bf8cb875ab6ad66c6  cfexecd
 fe6c086a41f428d47bde30646e0310c4  cfservd


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/cfengine.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cfengine.spec	18 Oct 2005 12:59:43 -0000	1.11
+++ cfengine.spec	30 Dec 2005 13:13:38 -0000	1.12
@@ -1,14 +1,13 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 2.1.16
-Release: 2%{?dist}
+Version: 2.1.18
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.16.tar.gz
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.18.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
-Patch1: cfengine-2.1.16-CAN-2005-2960.patch
 URL: http://www.cfengine.org/
 BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel
 Requires(post): /sbin/chkconfig, /sbin/install-info
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 
 %build
@@ -120,6 +118,9 @@
 
 
 %changelog
+* Fri Dec 30 2005 Jeff Sheltren  - 2.1.18-1
+- Update to upstream 2.1.18
+
 * Mon Oct 17 2005 Jeff Sheltren  - 2.1.16-2
 - Patch insecure temp file, CAN-2005-2960 (#170896)
 



From fedora-extras-commits at redhat.com  Fri Dec 30 13:45:26 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 30 Dec 2005 08:45:26 -0500
Subject: rpms/xfce4-modemlights-plugin/devel xfce4-modemlights-plugin.spec,
	1.1, 1.2
Message-ID: <200512301345.jBUDjwuh023558@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23541

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
change for modular X: add libX11-devel buildreq


Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/devel/xfce4-modemlights-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-modemlights-plugin.spec	15 Dec 2005 03:49:55 -0000	1.1
+++ xfce4-modemlights-plugin.spec	30 Dec 2005 13:45:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-modemlights-plugin
 Version: 	0.1.1
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Modemlights for the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
+BuildRequires:	libX11-devel
 
 %description
 A Xfce4 panel applet intended to simplify establishing a ppp connection via 
@@ -38,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Fri Dec 30 2005 Christoph Wickert  - 0.1.1-4
+- Add libX11-devel BuildReqs for modular X.
+
 * Thu Dec 01 2005 Christoph Wickert  - 0.1.1-3
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Fri Dec 30 16:25:25 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:25:25 -0500
Subject: rpms/perl-Config-Tiny/FC-3 .cvsignore, 1.4,
	1.5 perl-Config-Tiny.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200512301625.jBUGPwrY029206@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29141/FC-3

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.03.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Jun 2005 15:28:00 -0000	1.4
+++ .cvsignore	30 Dec 2005 16:25:25 -0000	1.5
@@ -1 +1 @@
-Config-Tiny-2.02.tar.gz
+Config-Tiny-2.03.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-3/perl-Config-Tiny.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Config-Tiny.spec	27 Jun 2005 15:28:00 -0000	1.6
+++ perl-Config-Tiny.spec	30 Dec 2005 16:25:25 -0000	1.7
@@ -1,19 +1,17 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Config-Tiny
-Version:        2.02
+Version:        2.03
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Config-Tiny/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.02.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(Test::More), perl(Test::Pod)
+BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -39,7 +37,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -50,14 +48,20 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
-%{perl_vendorlib}/Config
+%{perl_vendorlib}/Config/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 2.03-1
+- Updated to 2.03.
+
 * Mon Jun 27 2005 Jose Pedro Oliveira  - 2.02-1
 - Updated to 2.02.
 
+* Fri Apr  7 2005 Michael Schwendt  - 2.01-2
+- rebuilt
+
 * Thu Mar 24 2005 Jose Pedro Oliveira  - 2.01-1
 - Updated to 2.01.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Jun 2005 15:28:00 -0000	1.4
+++ sources	30 Dec 2005 16:25:25 -0000	1.5
@@ -1 +1 @@
-b5adfbf8561a4be3c898eb236ad3af01  Config-Tiny-2.02.tar.gz
+14b7c75fec38fd59fdf6390093946d7d  Config-Tiny-2.03.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 30 16:25:32 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:25:32 -0500
Subject: rpms/perl-Config-Tiny/FC-4 .cvsignore, 1.4,
	1.5 perl-Config-Tiny.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <200512301626.jBUGQ4Oh029211@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29141/FC-4

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.03.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Jun 2005 15:28:00 -0000	1.4
+++ .cvsignore	30 Dec 2005 16:25:31 -0000	1.5
@@ -1 +1 @@
-Config-Tiny-2.02.tar.gz
+Config-Tiny-2.03.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/perl-Config-Tiny.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Config-Tiny.spec	27 Jun 2005 15:28:00 -0000	1.8
+++ perl-Config-Tiny.spec	30 Dec 2005 16:25:31 -0000	1.9
@@ -1,17 +1,17 @@
 Name:           perl-Config-Tiny
-Version:        2.02
+Version:        2.03
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Config-Tiny/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.02.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(Test::More), perl(Test::Pod)
+BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -37,7 +37,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -48,11 +48,14 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
-%{perl_vendorlib}/Config
+%{perl_vendorlib}/Config/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 2.03-1
+- Updated to 2.03.
+
 * Mon Jun 27 2005 Jose Pedro Oliveira  - 2.02-1
 - Updated to 2.02.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Jun 2005 15:28:00 -0000	1.4
+++ sources	30 Dec 2005 16:25:31 -0000	1.5
@@ -1 +1 @@
-b5adfbf8561a4be3c898eb236ad3af01  Config-Tiny-2.02.tar.gz
+14b7c75fec38fd59fdf6390093946d7d  Config-Tiny-2.03.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 30 16:25:37 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:25:37 -0500
Subject: rpms/perl-Config-Tiny/devel .cvsignore, 1.4,
	1.5 perl-Config-Tiny.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <200512301626.jBUGQAvw029216@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29141/devel

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.03.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Jun 2005 15:28:06 -0000	1.4
+++ .cvsignore	30 Dec 2005 16:25:37 -0000	1.5
@@ -1 +1 @@
-Config-Tiny-2.02.tar.gz
+Config-Tiny-2.03.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Config-Tiny.spec	27 Jun 2005 15:28:06 -0000	1.8
+++ perl-Config-Tiny.spec	30 Dec 2005 16:25:37 -0000	1.9
@@ -1,17 +1,17 @@
 Name:           perl-Config-Tiny
-Version:        2.02
+Version:        2.03
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Config-Tiny/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.02.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(Test::More), perl(Test::Pod)
+BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -37,7 +37,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -48,11 +48,14 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
-%{perl_vendorlib}/Config
+%{perl_vendorlib}/Config/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 2.03-1
+- Updated to 2.03.
+
 * Mon Jun 27 2005 Jose Pedro Oliveira  - 2.02-1
 - Updated to 2.02.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Jun 2005 15:28:06 -0000	1.4
+++ sources	30 Dec 2005 16:25:37 -0000	1.5
@@ -1 +1 @@
-b5adfbf8561a4be3c898eb236ad3af01  Config-Tiny-2.02.tar.gz
+14b7c75fec38fd59fdf6390093946d7d  Config-Tiny-2.03.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 30 16:33:14 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:33:14 -0500
Subject: rpms/perl-Image-Size/devel perl-Image-Size.spec,1.6,1.7
Message-ID: <200512301633.jBUGXlEY029416@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Image-Size/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29399

Modified Files:
	perl-Image-Size.spec 
Log Message:
Dist tag.


Index: perl-Image-Size.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Size/devel/perl-Image-Size.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Image-Size.spec	6 Apr 2005 22:13:06 -0000	1.6
+++ perl-Image-Size.spec	30 Dec 2005 16:33:14 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Image-Size
 Version:        2.992
-Release:        3
-
+Release:        4%{?dist}
 Summary:        Determine the size of images in several common formats in Perl
 
 Group:          Development/Libraries
 License:        Artistic
 URL:            http://search.cpan.org/dist/Image-Size/
-Source0:      http://www.cpan.org/authors/id/R/RJ/RJRAY/Image-Size-2.992.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RJ/RJRAY/Image-Size-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -45,7 +42,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -63,7 +60,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 2.992-4
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 2.992-3
 - rebuilt
 
 * Thu Jun  3 2004 Jose Pedro Oliveira  - 0:2.992-0.fdr.2



From fedora-extras-commits at redhat.com  Fri Dec 30 16:34:35 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 30 Dec 2005 11:34:35 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.29,1.30
Message-ID: <200512301635.jBUGZ8Xg029477@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29460

Modified Files:
	Inventor.spec 
Log Message:
Don't BR: libXau-devel (#176313 reported to be fixed)


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Inventor.spec	28 Dec 2005 18:12:31 -0000	1.29
+++ Inventor.spec	30 Dec 2005 16:34:35 -0000	1.30
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        18%{?dist}
+Release:        19%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -37,8 +37,6 @@
 
 BuildRequires:  libGLU-devel
 BuildRequires:	libGLw-devel
-# Work around to xorg-x11-proto-devel missing to require X11/Xauth.h
-BuildRequires:	libXau-devel
 # FIXME: Why is libXi required?
 BuildRequires: 	libXi-devel
 
@@ -300,6 +298,9 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Fri Dec 30 2005 Ralf Cors??pius  - 2.1.5-19
+- Don't BR: libXau-devel (#176313 reported to be fixed).
+
 * Wed Dec 28 2005 Ralf Cors??pius  - 2.1.5-18
 - Remove patch10 (#173879, #175251 are reported to be fixed).
 



From fedora-extras-commits at redhat.com  Fri Dec 30 16:40:17 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:40:17 -0500
Subject: rpms/perl-Image-Base/devel perl-Image-Base.spec,1.6,1.7
Message-ID: <200512301640.jBUGenUh029551@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Image-Base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29531

Modified Files:
	perl-Image-Base.spec 
Log Message:
Dist tag.


Index: perl-Image-Base.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Base/devel/perl-Image-Base.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Image-Base.spec	6 Apr 2005 22:13:06 -0000	1.6
+++ perl-Image-Base.spec	30 Dec 2005 16:40:17 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Image-Base
 Version:        1.07
-Release:        4
-
+Release:        5%{?dist}
 Summary:        Base class for loading, manipulating and saving images in Perl
 
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://search.cpan.org/dist/Image-Base/
-Source0:      http://www.cpan.org/authors/id/S/SU/SUMMER/Image-Base-1.07.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SU/SUMMER/Image-Base-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -37,7 +34,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -53,7 +50,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 1.07-5
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.07-4
 - rebuilt
 
 * Thu Jun  3 2004 Jose Pedro Oliveira  - 0:1.07-0.fdr.3



From fedora-extras-commits at redhat.com  Fri Dec 30 16:48:00 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:48:00 -0500
Subject: rpms/perl-MLDBM/devel perl-MLDBM.spec,1.4,1.5
Message-ID: <200512301648.jBUGmWtK029651@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-MLDBM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29634

Modified Files:
	perl-MLDBM.spec 
Log Message:
Dist tag.


Index: perl-MLDBM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/devel/perl-MLDBM.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-MLDBM.spec	6 Apr 2005 22:13:06 -0000	1.4
+++ perl-MLDBM.spec	30 Dec 2005 16:48:00 -0000	1.5
@@ -1,20 +1,17 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-MLDBM
 Version:        2.01
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Store multi-level hash structure in single level tied hash
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/MLDBM/
-Source0:        http://www.cpan.org/authors/id/C/CH/CHAMAS/MLDBM-2.01.tar.gz
+Source0:        http://www.cpan.org/authors/id/C/CH/CHAMAS/MLDBM-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(FreezeThaw), perl(Storable)
+BuildRequires:  perl(FreezeThaw)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -41,7 +38,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -57,7 +54,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 2.01-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 2.01-2
 - rebuilt
 
 * Sun Oct 31 2004 Jose Pedro Oliveira  - 0:2.01-0.fdr.1



From fedora-extras-commits at redhat.com  Fri Dec 30 16:54:27 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:54:27 -0500
Subject: rpms/perl-Image-Xbm/devel perl-Image-Xbm.spec,1.6,1.7
Message-ID: <200512301654.jBUGsxFb029782@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Image-Xbm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29754

Modified Files:
	perl-Image-Xbm.spec 
Log Message:
Dist tag.


Index: perl-Image-Xbm.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Xbm/devel/perl-Image-Xbm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Image-Xbm.spec	6 Apr 2005 22:13:06 -0000	1.6
+++ perl-Image-Xbm.spec	30 Dec 2005 16:54:27 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Image-Xbm
 Version:        1.08
-Release:        3
-
+Release:        4%{?dist}
 Summary:        Load, create, manipulate and save xbm image files in Perl
 
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://search.cpan.org/dist/Image-Xbm/
-Source0:       http://www.cpan.org/authors/id/S/SU/SUMMER/Image-Xbm-1.08.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SU/SUMMER/Image-Xbm-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -40,7 +37,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -56,7 +53,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 1.08-4
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.08-3
 - rebuilt
 
 * Thu Jun  3 2004 Jose Pedro Oliveira  - 0:1.08-0.fdr.2



From fedora-extras-commits at redhat.com  Fri Dec 30 16:57:14 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:57:14 -0500
Subject: rpms/perl-Image-Xpm/devel perl-Image-Xpm.spec,1.6,1.7
Message-ID: <200512301657.jBUGvkDV029907@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Image-Xpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29890

Modified Files:
	perl-Image-Xpm.spec 
Log Message:
Dist tag.


Index: perl-Image-Xpm.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Xpm/devel/perl-Image-Xpm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Image-Xpm.spec	6 Apr 2005 22:13:06 -0000	1.6
+++ perl-Image-Xpm.spec	30 Dec 2005 16:57:13 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Image-Xpm
 Version:        1.09
-Release:        3
-
+Release:        4%{?dist}
 Summary:        Load, create, manipulate and save xpm image files in Perl
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://search.cpan.org/dist/Image-Xpm/
-Source0:       http://www.cpan.org/authors/id/S/SU/SUMMER/Image-Xpm-1.09.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SU/SUMMER/Image-Xpm-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -40,7 +37,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -56,7 +53,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 1.09-4
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.09-3
 - rebuilt
 
 * Thu Jun  3 2004 Jose Pedro Oliveira  - 0:1.09-0.fdr.2



From fedora-extras-commits at redhat.com  Fri Dec 30 17:24:07 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 30 Dec 2005 12:24:07 -0500
Subject: owners owners.list,1.490,1.491
Message-ID: <200512301724.jBUHOePv031728@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31711

Modified Files:
	owners.list 
Log Message:
bochs, freedroidrpg, and gpa are now more than potentially unmaintained.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -r1.490 -r1.491
--- owners.list	29 Dec 2005 17:29:48 -0000	1.490
+++ owners.list	30 Dec 2005 17:24:07 -0000	1.491
@@ -69,7 +69,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|ville.skytta at iki.fi|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|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|
@@ -218,7 +218,7 @@
 Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|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|
@@ -316,7 +316,7 @@
 Fedora Extras|gonvert|Units conversion utility|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gossip|Gnome Jabber Client|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gourmet|PyGTK Recipe Manager|mpeters at mac.com|extras-qa at fedoraproject.org|
-Fedora Extras|gpa|Graphical user interface for GnuPG|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gpa|Graphical user interface for GnuPG|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gparted|Gnome Partition Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gperiodic|Program for browsing the periodic table|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at ausil.us|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Dec 30 17:32:59 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 30 Dec 2005 12:32:59 -0500
Subject: fedora-rpmdevtools fedora-rpmdevtools.spec,1.84,1.85
Message-ID: <200512301733.jBUHXTxe031779@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31761

Modified Files:
	fedora-rpmdevtools.spec 
Log Message:
* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
- Update spectool to 1.0.6 (#176521).



Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- fedora-rpmdevtools.spec	28 Dec 2005 19:19:56 -0000	1.84
+++ fedora-rpmdevtools.spec	30 Dec 2005 17:32:57 -0000	1.85
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.5
+%define spectool_version   1.0.6
 
 Name:           fedora-rpmdevtools
-Version:        1.3
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Fedora RPM Development Tools
 
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
+- Update spectool to 1.0.6 (#176521).
+
 * Wed Dec 28 2005 Ville Skytt?? 
 - Update spectool to 1.0.5 (#162253), require wget for it.
 - Add disttags to spec templates.



From fedora-extras-commits at redhat.com  Fri Dec 30 17:47:21 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 30 Dec 2005 12:47:21 -0500
Subject: rpms/fedora-rpmdevtools/FC-4 .cvsignore, 1.10,
	1.11 fedora-rpmdevtools.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <200512301747.jBUHlrIT031894@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fedora-rpmdevtools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31856/FC-4

Modified Files:
	.cvsignore fedora-rpmdevtools.spec sources 
Log Message:
* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
- Update spectool to 1.0.6 (#176521).

* Wed Dec 28 2005 Ville Skytt?? 
- Update spectool to 1.0.5 (#162253), require wget for it.
- Add disttags to spec templates.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Oct 2005 21:24:23 -0000	1.10
+++ .cvsignore	30 Dec 2005 17:47:21 -0000	1.11
@@ -1,2 +1,2 @@
-spectool-1.0.4.tar.bz2
-fedora-rpmdevtools-1.3.tar.bz2
+spectool-1.0.6.tar.bz2
+fedora-rpmdevtools-1.4.tar.bz2


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/fedora-rpmdevtools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fedora-rpmdevtools.spec	26 Oct 2005 21:24:23 -0000	1.13
+++ fedora-rpmdevtools.spec	30 Dec 2005 17:47:21 -0000	1.14
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.4
+%define spectool_version   1.0.6
 
 Name:           fedora-rpmdevtools
-Version:        1.3
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Fedora RPM Development Tools
 
@@ -20,7 +20,7 @@
 Provides:       spectool = %{spectool_version}
 Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
-Requires:       rpm-python, python, cpio, sed, perl
+Requires:       rpm-python, python, cpio, sed, perl, wget
 # Minimal RPM build requirements
 Requires:       rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch
 Requires:       diffutils, gzip, bzip2, unzip
@@ -127,6 +127,13 @@
 
 
 %changelog
+* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
+- Update spectool to 1.0.6 (#176521).
+
+* Wed Dec 28 2005 Ville Skytt?? 
+- Update spectool to 1.0.5 (#162253), require wget for it.
+- Add disttags to spec templates.
+
 * Thu Oct 27 2005 Ville Skytt??  - 1.3-1
 - check-rpaths-worker: detect when RPATH references the parent directory
   of an absolute path (#169298, Enrico Scholz).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Oct 2005 21:24:23 -0000	1.10
+++ sources	30 Dec 2005 17:47:21 -0000	1.11
@@ -1,2 +1,2 @@
-f88484ff2a2d83f0cc1d37bc71300f7a  spectool-1.0.4.tar.bz2
-07a4788dc9abb36f273cfa3f7f21a97c  fedora-rpmdevtools-1.3.tar.bz2
+9a12bd585ba3911e34da861edc7557da  spectool-1.0.6.tar.bz2
+27d6ae54bc2db4d836fdd443842cd3fe  fedora-rpmdevtools-1.4.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec 30 17:47:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 30 Dec 2005 12:47:27 -0500
Subject: rpms/fedora-rpmdevtools/devel .cvsignore, 1.10,
	1.11 fedora-rpmdevtools.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <200512301747.jBUHlxG3031899@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fedora-rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31856/devel

Modified Files:
	.cvsignore fedora-rpmdevtools.spec sources 
Log Message:
* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
- Update spectool to 1.0.6 (#176521).

* Wed Dec 28 2005 Ville Skytt?? 
- Update spectool to 1.0.5 (#162253), require wget for it.
- Add disttags to spec templates.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Oct 2005 21:24:24 -0000	1.10
+++ .cvsignore	30 Dec 2005 17:47:27 -0000	1.11
@@ -1,2 +1,2 @@
-spectool-1.0.4.tar.bz2
-fedora-rpmdevtools-1.3.tar.bz2
+spectool-1.0.6.tar.bz2
+fedora-rpmdevtools-1.4.tar.bz2


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fedora-rpmdevtools.spec	26 Oct 2005 21:24:24 -0000	1.13
+++ fedora-rpmdevtools.spec	30 Dec 2005 17:47:27 -0000	1.14
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.4
+%define spectool_version   1.0.6
 
 Name:           fedora-rpmdevtools
-Version:        1.3
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Fedora RPM Development Tools
 
@@ -20,7 +20,7 @@
 Provides:       spectool = %{spectool_version}
 Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
-Requires:       rpm-python, python, cpio, sed, perl
+Requires:       rpm-python, python, cpio, sed, perl, wget
 # Minimal RPM build requirements
 Requires:       rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch
 Requires:       diffutils, gzip, bzip2, unzip
@@ -127,6 +127,13 @@
 
 
 %changelog
+* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
+- Update spectool to 1.0.6 (#176521).
+
+* Wed Dec 28 2005 Ville Skytt?? 
+- Update spectool to 1.0.5 (#162253), require wget for it.
+- Add disttags to spec templates.
+
 * Thu Oct 27 2005 Ville Skytt??  - 1.3-1
 - check-rpaths-worker: detect when RPATH references the parent directory
   of an absolute path (#169298, Enrico Scholz).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Oct 2005 21:24:24 -0000	1.10
+++ sources	30 Dec 2005 17:47:27 -0000	1.11
@@ -1,2 +1,2 @@
-f88484ff2a2d83f0cc1d37bc71300f7a  spectool-1.0.4.tar.bz2
-07a4788dc9abb36f273cfa3f7f21a97c  fedora-rpmdevtools-1.3.tar.bz2
+9a12bd585ba3911e34da861edc7557da  spectool-1.0.6.tar.bz2
+27d6ae54bc2db4d836fdd443842cd3fe  fedora-rpmdevtools-1.4.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec 30 17:53:20 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 30 Dec 2005 12:53:20 -0500
Subject: rpms/xchat-gnome/devel xchat-gnome-certificates.patch, NONE,
	1.1 xchat-gnome.spec, 1.10, 1.11
Message-ID: <200512301753.jBUHrqoh031959@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31925

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-gnome-certificates.patch 
Log Message:
* Fri Dec 30 2005 Brian Pepple  - 0.8-2
- add patch for self-signed certificate acceptance. (#174591)


xchat-gnome-certificates.patch:

--- NEW FILE xchat-gnome-certificates.patch ---
Index: src/fe-gnome/irc-network.c
===================================================================
--- src/fe-gnome/irc-network.c	(r??vision 9974)
+++ src/fe-gnome/irc-network.c	(copie de travail)
@@ -126,6 +126,7 @@
 	n->name        = g_strdup (net->name);
 	n->autoconnect = net->flags & FLAG_AUTO_CONNECT;
 	n->use_ssl     = net->flags & FLAG_USE_SSL;
+	n->allow_invalid = net->flags & FLAG_ALLOW_INVALID;
 	n->cycle       = net->flags & FLAG_CYCLE;
 
 	for (s1 = net->servlist; s1; s1 = g_slist_next (s1)) {
@@ -185,6 +186,7 @@
 
 	if (network->autoconnect) flags |= FLAG_AUTO_CONNECT;
 	if (network->use_ssl)     flags |= FLAG_USE_SSL;
+	if (network->allow_invalid) flags |= FLAG_ALLOW_INVALID;
 	if (network->cycle)       flags |= FLAG_CYCLE;
 	if (network->use_global)  flags |= FLAG_USE_GLOBAL;
 	net->flags = flags;
Index: src/fe-gnome/irc-network.h
===================================================================
--- src/fe-gnome/irc-network.h	(r??vision 9974)
+++ src/fe-gnome/irc-network.h	(copie de travail)
@@ -44,6 +44,7 @@
 	gchar *name;
 	gboolean autoconnect;
 	gboolean use_ssl;
+	gboolean allow_invalid;
 	gboolean cycle;
 	gboolean reconnect;
 	gboolean nogiveup_reconnect;
Index: src/fe-gnome/irc-network-editor.c
===================================================================
--- src/fe-gnome/irc-network-editor.c	(r??vision 9974)
+++ src/fe-gnome/irc-network-editor.c	(copie de travail)
@@ -233,6 +233,7 @@
 
 	GW(autoconnect);
 	GW(use_ssl);
+	GW(allow_invalid);
 	GW(cycle);
 
 	GW(nickserv_password);
@@ -399,6 +400,7 @@
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (e->autoconnect),      e->network->autoconnect);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (e->use_ssl),          e->network->use_ssl);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (e->allow_invalid),    e->network->allow_invalid);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (e->cycle),            e->network->cycle);
 
 	if (e->network->use_global) {
@@ -468,6 +470,7 @@
 
 	net->autoconnect        = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->autoconnect));
 	net->use_ssl            = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->use_ssl));
+	net->allow_invalid      = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->allow_invalid));
 	net->cycle              = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->cycle));
 	net->use_global         = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->use_globals));
 	net->encoding           = gtk_combo_box_get_active (GTK_COMBO_BOX (e->encoding));
Index: src/fe-gnome/irc-network-editor.h
===================================================================
--- src/fe-gnome/irc-network-editor.h	(r??vision 9974)
+++ src/fe-gnome/irc-network-editor.h	(copie de travail)
@@ -51,6 +51,7 @@
 
 	GtkWidget *autoconnect;
 	GtkWidget *use_ssl;
+	GtkWidget *allow_invalid;
 	GtkWidget *cycle;
 
 	GtkWidget *password;
Index: data/irc-network-editor.glade
===================================================================
--- data/irc-network-editor.glade	(r??vision 9974)
+++ data/irc-network-editor.glade	(copie de travail)
@@ -243,6 +243,25 @@
 		      
 
 		      
+			
+			  True
+			  True
+			  Accept _invalid SSL certificate
+			  True
+			  GTK_RELIEF_NORMAL
+			  True
+			  False
+			  False
+			  True
+			
+			
+			  0
+			  False
+			  False
+			
+		      
+
+		      
 			
 			  True
 			  True


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xchat-gnome.spec	20 Dec 2005 21:16:11 -0000	1.10
+++ xchat-gnome.spec	30 Dec 2005 17:53:20 -0000	1.11
@@ -6,7 +6,7 @@
 
 Name:           xchat-gnome
 Version:        0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -14,6 +14,7 @@
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-config.patch
+Patch1:		%{name}-certificates.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -51,6 +52,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
+%patch1 -p0 -b .certificates
 
 
 %build
@@ -132,10 +134,13 @@
 
 
 %changelog
+* Fri Dec 30 2005 Brian Pepple  - 0.8-2
+- add patch for self-signed certificate acceptance. (#174591)
+
 * Tue Dec 20 2005 Brian Pepple  - 0.8-1
 - Udate to 0.8.
 
-* Sun Dec 18 2005 Brian Pepple  - 0.8-01.rc1
+* Sun Dec 18 2005 Brian Pepple  - 0.8-01.rc2
 - Update to 0.8rc2.
 
 * Thu Dec 15 2005 Brian Pepple  - 0.8-01.rc1



From fedora-extras-commits at redhat.com  Fri Dec 30 17:54:39 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 30 Dec 2005 12:54:39 -0500
Subject: rpms/fedora-rpmdevtools/FC-3 .cvsignore, 1.9,
	1.10 fedora-rpmdevtools.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <200512301755.jBUHtBoJ032050@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fedora-rpmdevtools/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32016/FC-3

Modified Files:
	.cvsignore fedora-rpmdevtools.spec sources 
Log Message:
* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
- Update spectool to 1.0.6 (#176521).

* Wed Dec 28 2005 Ville Skytt?? 
- Update spectool to 1.0.5 (#162253), require wget for it.
- Add disttags to spec templates.

* Thu Oct 27 2005 Ville Skytt??  - 1.3-1
- check-rpaths-worker: detect when RPATH references the parent directory
  of an absolute path (#169298, Enrico Scholz).
- Add regression test for check-rpaths* (#169298, Enrico Scholz).
- Honor user's indent-tabs-mode setting in fedora-init.el (#170902).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Oct 2005 17:58:41 -0000	1.9
+++ .cvsignore	30 Dec 2005 17:54:39 -0000	1.10
@@ -1,2 +1,2 @@
-fedora-rpmdevtools-1.2.tar.bz2
-spectool-1.0.4.tar.bz2
+spectool-1.0.6.tar.bz2
+fedora-rpmdevtools-1.4.tar.bz2


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/fedora-rpmdevtools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-rpmdevtools.spec	7 Oct 2005 17:58:41 -0000	1.9
+++ fedora-rpmdevtools.spec	30 Dec 2005 17:54:39 -0000	1.10
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.4
+%define spectool_version   1.0.6
 
 Name:           fedora-rpmdevtools
-Version:        1.2
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Fedora RPM Development Tools
 
@@ -20,7 +20,7 @@
 Provides:       spectool = %{spectool_version}
 Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
-Requires:       rpm-python, python, cpio, sed, perl
+Requires:       rpm-python, python, cpio, sed, perl, wget
 # Minimal RPM build requirements
 Requires:       rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch
 Requires:       diffutils, gzip, bzip2, unzip
@@ -91,8 +91,9 @@
 install -pm 644 rmdevelrpms.conf $RPM_BUILD_ROOT%{_sysconfdir}/fedora
 
 
-%check || :
+%check
 env PATH="$RPM_BUILD_ROOT%{_bindir}:$PATH" sh test/fedora-kmodhelper-test.sh
+/bin/bash test/rpathtest.sh
 
 
 %clean
@@ -126,6 +127,19 @@
 
 
 %changelog
+* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
+- Update spectool to 1.0.6 (#176521).
+
+* Wed Dec 28 2005 Ville Skytt?? 
+- Update spectool to 1.0.5 (#162253), require wget for it.
+- Add disttags to spec templates.
+
+* Thu Oct 27 2005 Ville Skytt??  - 1.3-1
+- check-rpaths-worker: detect when RPATH references the parent directory
+  of an absolute path (#169298, Enrico Scholz).
+- Add regression test for check-rpaths* (#169298, Enrico Scholz).
+- Honor user's indent-tabs-mode setting in fedora-init.el (#170902).
+
 * Fri Oct  7 2005 Ville Skytt??  - 1.2-1
 - check-buildroot: grep for buildroot as a fixed string, not a regexp.
 - Update FSF's address in copyright notices.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Oct 2005 17:58:41 -0000	1.9
+++ sources	30 Dec 2005 17:54:39 -0000	1.10
@@ -1,2 +1,2 @@
-81129d10b7f5bbc86b44db5a8070dc6e  fedora-rpmdevtools-1.2.tar.bz2
-f88484ff2a2d83f0cc1d37bc71300f7a  spectool-1.0.4.tar.bz2
+9a12bd585ba3911e34da861edc7557da  spectool-1.0.6.tar.bz2
+27d6ae54bc2db4d836fdd443842cd3fe  fedora-rpmdevtools-1.4.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec 30 19:59:44 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Fri, 30 Dec 2005 14:59:44 -0500
Subject: rpms/abiword/FC-4 abiword.spec,1.17,1.18
Message-ID: <200512302000.jBUK0G9O003259@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3242

Modified Files:
	abiword.spec 
Log Message:
Expand BuildRequires for plugins




Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- abiword.spec	9 Nov 2005 11:06:49 -0000	1.17
+++ abiword.spec	30 Dec 2005 19:59:44 -0000	1.18
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -27,6 +27,8 @@
 BuildRequires: libgnomeprintui22-devel
 
 # some plugin build deps
+BuildRequires: bzip2-devel
+BuildRequires: poppler-devel >= 0.4.0
 BuildRequires: ots-devel >= 0.4.2
 BuildRequires: libwpd-devel >= 0.8.0
 BuildRequires: librsvg2-devel
@@ -138,6 +140,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Fri Dec 30 2005 Marc Maurer  - 1:2.4.1-4.fc4
+- Add BuildRequires bzip2-devel and poppler-devel for plugins
+
 * Wed Nov 09 2005 Marc Maurer  - 1:2.4.1-3.fc4
 - Fix bug 171928
 



From fedora-extras-commits at redhat.com  Fri Dec 30 20:33:45 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Fri, 30 Dec 2005 15:33:45 -0500
Subject: rpms/abiword/FC-3 abiword.spec,1.29,1.30
Message-ID: <200512302034.jBUKYHqZ005047@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5025

Modified Files:
	abiword.spec 
Log Message:
Expand BuildRequires for plugins




Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/abiword.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- abiword.spec	9 Nov 2005 11:08:51 -0000	1.29
+++ abiword.spec	30 Dec 2005 20:33:44 -0000	1.30
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -27,6 +27,7 @@
 BuildRequires: libgnomeprintui22-devel
 
 # some plugin build deps
+BuildRequires: bzip2-devel
 BuildRequires: ots-devel >= 0.4.2
 BuildRequires: libwpd-devel >= 0.8.0
 BuildRequires: librsvg2-devel
@@ -138,6 +139,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Fri Dec 30 2005 Marc Maurer  - 1:2.4.1-7.fc3
+- Add BuildRequires bzip2-devel for plugins
+
 * Wed Nov 09 2005 Marc Maurer  - 1:2.4.1-6.fc3
 - Fix bug 171928
 



From fedora-extras-commits at redhat.com  Fri Dec 30 21:31:51 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Fri, 30 Dec 2005 16:31:51 -0500
Subject: rpms/abiword/FC-3 abiword.spec,1.30,1.31
Message-ID: <200512302132.jBULWNsm007002@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6981

Modified Files:
	abiword.spec 
Log Message:
Add readline-devel requirement for the AbiCommand plugin




Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/abiword.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- abiword.spec	30 Dec 2005 20:33:44 -0000	1.30
+++ abiword.spec	30 Dec 2005 21:31:50 -0000	1.31
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -27,6 +27,7 @@
 BuildRequires: libgnomeprintui22-devel
 
 # some plugin build deps
+BuildRequires: readline-devel
 BuildRequires: bzip2-devel
 BuildRequires: ots-devel >= 0.4.2
 BuildRequires: libwpd-devel >= 0.8.0
@@ -139,6 +140,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Fri Dec 30 2005 Marc Maurer  - 1:2.4.1-8.fc3
+- Add BuildRequires readline-devel for the AbiCommand plugin
+
 * Fri Dec 30 2005 Marc Maurer  - 1:2.4.1-7.fc3
 - Add BuildRequires bzip2-devel for plugins
 



From fedora-extras-commits at redhat.com  Fri Dec 30 21:32:37 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Fri, 30 Dec 2005 16:32:37 -0500
Subject: rpms/abiword/FC-4 abiword.spec,1.18,1.19
Message-ID: <200512302133.jBULX9aR007054@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7001

Modified Files:
	abiword.spec 
Log Message:
Add readline-devel requirement for the AbiCommand plugin




Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- abiword.spec	30 Dec 2005 19:59:44 -0000	1.18
+++ abiword.spec	30 Dec 2005 21:32:37 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -27,6 +27,7 @@
 BuildRequires: libgnomeprintui22-devel
 
 # some plugin build deps
+BuildRequires: readline-devel
 BuildRequires: bzip2-devel
 BuildRequires: poppler-devel >= 0.4.0
 BuildRequires: ots-devel >= 0.4.2
@@ -140,6 +141,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Fri Dec 30 2005 Marc Maurer  - 1:2.4.1-5.fc4
+- Add BuildRequires readline-devel for the AbiCommand plugin
+
 * Fri Dec 30 2005 Marc Maurer  - 1:2.4.1-4.fc4
 - Add BuildRequires bzip2-devel and poppler-devel for plugins
 



From fedora-extras-commits at redhat.com  Fri Dec 30 22:59:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 17:59:03 -0500
Subject: rpms/alltray - New directory
Message-ID: <200512302259.jBUMx5En008906@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8898/alltray

Log Message:
Directory /cvs/extras/rpms/alltray added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 30 22:59:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 17:59:09 -0500
Subject: rpms/alltray/devel - New directory
Message-ID: <200512302259.jBUMxBIk008921@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8898/alltray/devel

Log Message:
Directory /cvs/extras/rpms/alltray/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 30 22:59:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 17:59:33 -0500
Subject: rpms/alltray Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512302259.jBUMxZNA008955@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8943

Added Files:
	Makefile import.log 
Log Message:
Setup of module alltray


--- NEW FILE Makefile ---
# Top level Makefile for module alltray
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 30 22:59:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 17:59:39 -0500
Subject: rpms/alltray/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512302259.jBUMxfX1008975@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8943/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module alltray


--- NEW 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 Dec 30 23:02:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 18:02:30 -0500
Subject: rpms/alltray import.log,1.1,1.2
Message-ID: <200512302303.jBUN32ZK010656@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10622

Modified Files:
	import.log 
Log Message:
auto-import alltray-0.65-1 on branch devel from alltray-0.65-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/alltray/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Dec 2005 22:59:33 -0000	1.1
+++ import.log	30 Dec 2005 23:02:30 -0000	1.2
@@ -0,0 +1 @@
+alltray-0_65-1:HEAD:alltray-0.65-1.src.rpm:1135983703



From fedora-extras-commits at redhat.com  Fri Dec 30 23:02:37 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 18:02:37 -0500
Subject: rpms/alltray/devel alltray.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512302303.jBUN3U4b010660@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10622/devel

Modified Files:
	.cvsignore sources 
Added Files:
	alltray.spec 
Log Message:
auto-import alltray-0.65-1 on branch devel from alltray-0.65-1.src.rpm


--- NEW FILE alltray.spec ---
Name:           alltray
Version:        0.65
Release:        1
Summary:        Dock any application in the tray

Group:          User Interface/Desktops
License:        GPL
URL:            http://alltray.sourceforge.net/
Source0:        http://dl.sourceforge.net/alltray/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel desktop-file-utils
#Requires:       

%description
With AllTray you can dock any application without a native tray icon into the
system tray. It works well with GNOME, KDE, XFCE 4, Fluxbox, and WindowMaker.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
rm $RPM_BUILD_ROOT%{_libdir}/*.so*
desktop-file-install --vendor=fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category Utility \
  --add-category GTK \
  --delete-original \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_mandir}/man1/%{name}.1*
%{_datadir}/pixmaps/%{name}.png

%changelog
* Thu Dec 23 2005 Ignacio Vazquez-Abrams  0.65-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Dec 2005 22:59:38 -0000	1.1
+++ .cvsignore	30 Dec 2005 23:02:37 -0000	1.2
@@ -0,0 +1 @@
+alltray-0.65.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Dec 2005 22:59:38 -0000	1.1
+++ sources	30 Dec 2005 23:02:37 -0000	1.2
@@ -0,0 +1 @@
+c3b86dab94dbea416174d6e4dd82a173  alltray-0.65.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 30 23:47:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 18:47:30 -0500
Subject: rpms/alltray/devel alltray.spec,1.1,1.2
Message-ID: <200512302348.jBUNm3b8010843@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10826

Modified Files:
	alltray.spec 
Log Message:
disttag


Index: alltray.spec
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/alltray.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alltray.spec	30 Dec 2005 23:02:37 -0000	1.1
+++ alltray.spec	30 Dec 2005 23:47:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           alltray
 Version:        0.65
-Release:        1
+Release:        1%{?dist}
 Summary:        Dock any application in the tray
 
 Group:          User Interface/Desktops



From fedora-extras-commits at redhat.com  Fri Dec 30 23:55:46 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 18:55:46 -0500
Subject: rpms/alltray/FC-4 - New directory
Message-ID: <200512302355.jBUNtncQ010934@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10926/FC-4

Log Message:
Directory /cvs/extras/rpms/alltray/FC-4 added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 30 23:56:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 18:56:09 -0500
Subject: rpms/alltray/FC-4 .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 branch, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512302356.jBUNuBj4010969@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10956/FC-4

Added Files:
	.cvsignore Makefile branch sources 
Log Message:
Setup of branch FC-4 of alltray


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE branch ---
FC-4


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec 30 23:57:05 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 18:57:05 -0500
Subject: rpms/alltray import.log,1.2,1.3
Message-ID: <200512302357.jBUNvdLd011038@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11004

Modified Files:
	import.log 
Log Message:
auto-import alltray-0.65-1.fc4 on branch FC-4 from alltray-0.65-1.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/alltray/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	30 Dec 2005 23:02:30 -0000	1.2
+++ import.log	30 Dec 2005 23:57:05 -0000	1.3
@@ -1 +1,2 @@
 alltray-0_65-1:HEAD:alltray-0.65-1.src.rpm:1135983703
+alltray-0_65-1_fc4:FC-4:alltray-0.65-1.fc4.src.rpm:1135987007



From fedora-extras-commits at redhat.com  Fri Dec 30 23:57:11 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 18:57:11 -0500
Subject: rpms/alltray/FC-4 alltray.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512302357.jBUNviqg011042@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11004/FC-4

Modified Files:
	.cvsignore sources 
Added Files:
	alltray.spec 
Log Message:
auto-import alltray-0.65-1.fc4 on branch FC-4 from alltray-0.65-1.fc4.src.rpm


--- NEW FILE alltray.spec ---
Name:           alltray
Version:        0.65
Release:        1%{?dist}
Summary:        Dock any application in the tray

Group:          User Interface/Desktops
License:        GPL
URL:            http://alltray.sourceforge.net/
Source0:        http://dl.sourceforge.net/alltray/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel desktop-file-utils
#Requires:       

%description
With AllTray you can dock any application without a native tray icon into the
system tray. It works well with GNOME, KDE, XFCE 4, Fluxbox, and WindowMaker.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
rm $RPM_BUILD_ROOT%{_libdir}/*.so*
desktop-file-install --vendor=fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category Utility \
  --add-category GTK \
  --delete-original \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_mandir}/man1/%{name}.1*
%{_datadir}/pixmaps/%{name}.png

%changelog
* Thu Dec 23 2005 Ignacio Vazquez-Abrams  0.65-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alltray/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Dec 2005 23:56:09 -0000	1.1
+++ .cvsignore	30 Dec 2005 23:57:11 -0000	1.2
@@ -0,0 +1 @@
+alltray-0.65.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alltray/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Dec 2005 23:56:09 -0000	1.1
+++ sources	30 Dec 2005 23:57:11 -0000	1.2
@@ -0,0 +1 @@
+c3b86dab94dbea416174d6e4dd82a173  alltray-0.65.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 04:24:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 23:24:33 -0500
Subject: owners owners.list,1.491,1.492
Message-ID: <200512310425.jBV4P51i020035@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20018

Modified Files:
	owners.list 
Log Message:
alltray


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -r1.491 -r1.492
--- owners.list	30 Dec 2005 17:24:07 -0000	1.491
+++ owners.list	31 Dec 2005 04:24:32 -0000	1.492
@@ -22,6 +22,7 @@
 Fedora Extras|airsnort|Wireless LAN (WLAN) tool which recovers encryption keys|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|alacarte|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net
 Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|alltray|Dock any application in the tray|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|amarok|Media player for KDE|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 31 11:23:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:23:39 -0500
Subject: rpms/php-json - New directory
Message-ID: <200512311123.jBVBNf1E001933@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1925/php-json

Log Message:
Directory /cvs/extras/rpms/php-json added to the repository




From fedora-extras-commits at redhat.com  Sat Dec 31 11:23:45 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:23:45 -0500
Subject: rpms/php-json/devel - New directory
Message-ID: <200512311123.jBVBNlph001948@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1925/php-json/devel

Log Message:
Directory /cvs/extras/rpms/php-json/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Dec 31 11:24:08 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:24:08 -0500
Subject: rpms/php-json Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512311124.jBVBOASq001982@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1970

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-json


--- NEW FILE Makefile ---
# Top level Makefile for module php-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 Dec 31 11:24:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:24:13 -0500
Subject: rpms/php-json/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512311124.jBVBOGoT002002@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1970/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-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 Dec 31 11:25:27 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:25:27 -0500
Subject: rpms/php-json import.log,1.1,1.2
Message-ID: <200512311125.jBVBPxe0002076@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2041

Modified Files:
	import.log 
Log Message:
auto-import php-json-1.1.0-1 on branch devel from php-json-1.1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-json/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Dec 2005 11:24:07 -0000	1.1
+++ import.log	31 Dec 2005 11:25:27 -0000	1.2
@@ -0,0 +1 @@
+php-json-1_1_0-1:HEAD:php-json-1.1.0-1.src.rpm:1136028317



From fedora-extras-commits at redhat.com  Sat Dec 31 11:25:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:25:33 -0500
Subject: rpms/php-json/devel php-json.html, NONE, 1.1 php-json.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512311126.jBVBQ5Y0002080@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2041/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-json.html php-json.spec 
Log Message:
auto-import php-json-1.1.0-1 on branch devel from php-json-1.1.0-1.src.rpm


--- NEW FILE php-json.html ---





omar kilani - projects - php-json







    


    

    

    
	           
	
	omar kilani

    
	home | projects
    
	
    libical | php-js | php-json | postfix_memcached
    
	
    
	    		
	           

    

    
	
	
	
    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.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.
    
        
    Version 1.0.6 - Released 2005-08-05 - Fixed issues with exporting private and protected class members (Thanks to Marek Lewczuk for the report.)
    
        
    Version 1.0.5 - Released 2005-06-16 - Changed spacing in json-c encoding, added optional assoc (boolean) parameter to json_decode to decode as associative array instead of object (Thanks to James Jones for the patch and Oscar F. Dur?n for the discussion), fixed issues with escaping /.
    
        
    Version 1.0.3 - Released 2005-06-15 - Fixed json-c string corruption issues under Mac OS X (thanks to Brett Stimmerman for the report) and FreeBSD (thanks to Robert S Wojciechowski for the report.)
    
        
    Version 1.0.2 - Released 2005-06-11 - Fixed issues with object reference counts under PHP4. Thanks to James Jones for the report.
    
        
    Version 1.0.1 - Released 2005-06-10 - Fixed non-linear and mixed type array index issues, fixed issues with escaping \\, forked json-c and added Unicode support.
    
        
    Version 1.0.0 - Released 2005-04-01 - Initial release.
    
        
    Mailing List 
    

    
  
     
    
     Google Groups
    
    Subscribe to php-json
  
    
  
    
  
     
    Email: 
    
      
    
      
    
        
         
        
      
    
      
    
        		
  
    
   
  
    
   Browse Archives at groups.google.com
  
    

    
        
    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.
    
        
    Then, just use json_encode to encode your PHP values into JSON, and json_decode to decode JSON into a PHP value.
    
        
    For example:
    
        
    $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 }
        
    
        
    While:
    
        
    $input = '{ "abc": 12, "foo": "bar", "bool0": false, "bool1": true, "arr": [ 1, 2, 3, null, 5 ], "float": 1.2345 }';
$val = json_decode($input);
echo $val->abc."\n";
        
    
        
    Would produce:
    
        
    12
        
    
        
    As of version 1.0.5, json_decode takes an optional parameter, assoc (boolean), that returns an associative array instead of an object.
    
        
    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"];
alert("result is " + result);
        
    
        
    This should display an alert box with the value of result, i.e., 14.814.
    
	
    Performance
    
        
    Following are some performance metrics for the php-json C extension in comparison to a native PHP implementation of JSON. The C extension is 86 times faster than the native PHP implementation in this test. More complex examples generally show the C extension in even better light, where a speed increase of 270 times is not uncommon.
    
        
    Test string is:
{ "abc": 12, "foo": "bar", "bool0": false, "bool1": true, "arr": [ 1, 2, 3, null, 5 ], "float": 1.2345 }

Initial C output is:
object(stdClass)#1 (6) refcount(1){
  ["abc"]=>
  long(12) refcount(1)
  ["foo"]=>
  string(3) "bar" refcount(1)
  ["bool0"]=>
  bool(false) refcount(1)
  ["bool1"]=>
  bool(true) refcount(1)
  ["arr"]=>
  array(5) refcount(1){
    [0]=>
    long(1) refcount(1)
    [1]=>
    long(2) refcount(1)
    [2]=>
    long(3) refcount(1)
    [3]=>
    NULL refcount(1)
    [4]=>
    long(5) refcount(1)
  }
  ["float"]=>
  double(1.2345) refcount(1)
}
Timing 1000 iterations with C
0.027885913848877 seconds elapsed


Initial PHP output is:
object(ObjectFromJSON)#3 (6) refcount(2){
  ["abc"]=>
  long(12) refcount(1)
  ["foo"]=>
  string(3) "bar" refcount(1)
  ["bool0"]=>
  bool(false) refcount(1)
  ["bool1"]=>
  bool(true) refcount(1)
  ["arr"]=>
  array(5) refcount(1){
    [0]=>
    long(1) refcount(1)
    [1]=>
    long(2) refcount(1)
    [2]=>
    long(3) refcount(1)
    [3]=>
    NULL refcount(1)
    [4]=>
    long(5) refcount(1)
  }
  ["float"]=>
  double(1.2345) refcount(1)
}
Timing 1000 iterations with PHP
2.3223311901093 seconds elapsed

    
	
	

    
	    		

    

    


    






--- NEW FILE php-json.spec ---
%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)}

Name:           php-json
Version:        1.1.0
Release:        1
Summary:        An extremely fast PHP extension for JSON

Group:          Development/Languages
License:        LGPL
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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  php-devel
Requires:       php = %{php_version}

%description
php-json is an extremely fast PHP C extension for JSON (JavaScript Object
Notation) serialisation.

%prep
%setup -q -n php-json-ext-%{version}
install -p -m 0644 %{SOURCE1} .
phpize --clean
phpize

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{php_extdir}
install -p -m 0755 modules/json.so $RPM_BUILD_ROOT%{php_extdir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/php.d
cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/json.ini << EOF
; Enable json extension module
extension=json.so
EOF

%check ||:
cat > test.ini << EOF
open_basedir=
safe_mode=0
output_buffering=0
extension_dir=${PWD}/modules
extension=json.so
EOF
php -m -c test.ini 2> /dev/null | grep -q json || {
  echo "JSON extension not loadable!"
  exit 1
}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc php-json.html
%config(noreplace) %{_sysconfdir}/php.d/json.ini
%{php_extdir}/json.so

%changelog
* Fri Dec 30 2005 Ignacio Vazquez-Abrams  1.1.0-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Dec 2005 11:24:13 -0000	1.1
+++ .cvsignore	31 Dec 2005 11:25:32 -0000	1.2
@@ -0,0 +1 @@
+php-json-ext-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Dec 2005 11:24:13 -0000	1.1
+++ sources	31 Dec 2005 11:25:32 -0000	1.2
@@ -0,0 +1 @@
+4a1a41fafabf866784868af59bf30510  php-json-ext-1.1.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Dec 31 11:28:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:28:39 -0500
Subject: rpms/php-json/devel php-json.spec,1.1,1.2
Message-ID: <200512311129.jBVBTC2M002139@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2122

Modified Files:
	php-json.spec 
Log Message:
disttag


Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/php-json.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-json.spec	31 Dec 2005 11:25:32 -0000	1.1
+++ php-json.spec	31 Dec 2005 11:28:39 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           php-json
 Version:        1.1.0
-Release:        1
+Release:        1%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Sat Dec 31 11:30:46 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:30:46 -0500
Subject: rpms/php-json/FC-4 - New directory
Message-ID: <200512311130.jBVBUmsE002201@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2193/FC-4

Log Message:
Directory /cvs/extras/rpms/php-json/FC-4 added to the repository




From fedora-extras-commits at redhat.com  Sat Dec 31 11:31:10 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:31:10 -0500
Subject: rpms/php-json/FC-4 .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 branch,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512311131.jBVBVCT0002238@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2225/FC-4

Added Files:
	.cvsignore Makefile branch sources 
Log Message:
Setup of branch FC-4 of php-json


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE branch ---
FC-4


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Dec 31 11:32:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:32:02 -0500
Subject: rpms/php-json import.log,1.2,1.3
Message-ID: <200512311132.jBVBWYCi002313@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2278

Modified Files:
	import.log 
Log Message:
auto-import php-json-1.1.0-1.fc4 on branch FC-4 from php-json-1.1.0-1.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-json/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	31 Dec 2005 11:25:27 -0000	1.2
+++ import.log	31 Dec 2005 11:32:02 -0000	1.3
@@ -1 +1,2 @@
 php-json-1_1_0-1:HEAD:php-json-1.1.0-1.src.rpm:1136028317
+php-json-1_1_0-1_fc4:FC-4:php-json-1.1.0-1.fc4.src.rpm:1136028706



From fedora-extras-commits at redhat.com  Sat Dec 31 11:32:08 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:32:08 -0500
Subject: rpms/php-json/FC-4 php-json.html, NONE, 1.1 php-json.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512311132.jBVBWeph002317@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2278/FC-4

Modified Files:
	.cvsignore sources 
Added Files:
	php-json.html php-json.spec 
Log Message:
auto-import php-json-1.1.0-1.fc4 on branch FC-4 from php-json-1.1.0-1.fc4.src.rpm


--- NEW FILE php-json.html ---





omar kilani - projects - php-json







    


    

    

    
	           
	
	omar kilani

    
	home | projects
    
	
    libical | php-js | php-json | postfix_memcached
    
	
    
	    		
	           

    

    
	
	
	
    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.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.
    
        
    Version 1.0.6 - Released 2005-08-05 - Fixed issues with exporting private and protected class members (Thanks to Marek Lewczuk for the report.)
    
        
    Version 1.0.5 - Released 2005-06-16 - Changed spacing in json-c encoding, added optional assoc (boolean) parameter to json_decode to decode as associative array instead of object (Thanks to James Jones for the patch and Oscar F. Dur?n for the discussion), fixed issues with escaping /.
    
        
    Version 1.0.3 - Released 2005-06-15 - Fixed json-c string corruption issues under Mac OS X (thanks to Brett Stimmerman for the report) and FreeBSD (thanks to Robert S Wojciechowski for the report.)
    
        
    Version 1.0.2 - Released 2005-06-11 - Fixed issues with object reference counts under PHP4. Thanks to James Jones for the report.
    
        
    Version 1.0.1 - Released 2005-06-10 - Fixed non-linear and mixed type array index issues, fixed issues with escaping \\, forked json-c and added Unicode support.
    
        
    Version 1.0.0 - Released 2005-04-01 - Initial release.
    
        
    Mailing List 
    

    
  
     
    
     Google Groups
    
    Subscribe to php-json
  
    
  
    
  
     
    Email: 
    
      
    
      
    
        
         
        
      
    
      
    
        		
  
    
   
  
    
   Browse Archives at groups.google.com
  
    

    
        
    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.
    
        
    Then, just use json_encode to encode your PHP values into JSON, and json_decode to decode JSON into a PHP value.
    
        
    For example:
    
        
    $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 }
        
    
        
    While:
    
        
    $input = '{ "abc": 12, "foo": "bar", "bool0": false, "bool1": true, "arr": [ 1, 2, 3, null, 5 ], "float": 1.2345 }';
$val = json_decode($input);
echo $val->abc."\n";
        
    
        
    Would produce:
    
        
    12
        
    
        
    As of version 1.0.5, json_decode takes an optional parameter, assoc (boolean), that returns an associative array instead of an object.
    
        
    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"];
alert("result is " + result);
        
    
        
    This should display an alert box with the value of result, i.e., 14.814.
    
	
    Performance
    
        
    Following are some performance metrics for the php-json C extension in comparison to a native PHP implementation of JSON. The C extension is 86 times faster than the native PHP implementation in this test. More complex examples generally show the C extension in even better light, where a speed increase of 270 times is not uncommon.
    
        
    Test string is:
{ "abc": 12, "foo": "bar", "bool0": false, "bool1": true, "arr": [ 1, 2, 3, null, 5 ], "float": 1.2345 }

Initial C output is:
object(stdClass)#1 (6) refcount(1){
  ["abc"]=>
  long(12) refcount(1)
  ["foo"]=>
  string(3) "bar" refcount(1)
  ["bool0"]=>
  bool(false) refcount(1)
  ["bool1"]=>
  bool(true) refcount(1)
  ["arr"]=>
  array(5) refcount(1){
    [0]=>
    long(1) refcount(1)
    [1]=>
    long(2) refcount(1)
    [2]=>
    long(3) refcount(1)
    [3]=>
    NULL refcount(1)
    [4]=>
    long(5) refcount(1)
  }
  ["float"]=>
  double(1.2345) refcount(1)
}
Timing 1000 iterations with C
0.027885913848877 seconds elapsed


Initial PHP output is:
object(ObjectFromJSON)#3 (6) refcount(2){
  ["abc"]=>
  long(12) refcount(1)
  ["foo"]=>
  string(3) "bar" refcount(1)
  ["bool0"]=>
  bool(false) refcount(1)
  ["bool1"]=>
  bool(true) refcount(1)
  ["arr"]=>
  array(5) refcount(1){
    [0]=>
    long(1) refcount(1)
    [1]=>
    long(2) refcount(1)
    [2]=>
    long(3) refcount(1)
    [3]=>
    NULL refcount(1)
    [4]=>
    long(5) refcount(1)
  }
  ["float"]=>
  double(1.2345) refcount(1)
}
Timing 1000 iterations with PHP
2.3223311901093 seconds elapsed

    
	
	

    
	    		

    

    


    






--- NEW FILE php-json.spec ---
%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)}

Name:           php-json
Version:        1.1.0
Release:        1%{?dist}
Summary:        An extremely fast PHP extension for JSON

Group:          Development/Languages
License:        LGPL
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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  php-devel
Requires:       php = %{php_version}

%description
php-json is an extremely fast PHP C extension for JSON (JavaScript Object
Notation) serialisation.

%prep
%setup -q -n php-json-ext-%{version}
install -p -m 0644 %{SOURCE1} .
phpize --clean
phpize

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{php_extdir}
install -p -m 0755 modules/json.so $RPM_BUILD_ROOT%{php_extdir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/php.d
cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/json.ini << EOF
; Enable json extension module
extension=json.so
EOF

%check ||:
cat > test.ini << EOF
open_basedir=
safe_mode=0
output_buffering=0
extension_dir=${PWD}/modules
extension=json.so
EOF
php -m -c test.ini 2> /dev/null | grep -q json || {
  echo "JSON extension not loadable!"
  exit 1
}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc php-json.html
%config(noreplace) %{_sysconfdir}/php.d/json.ini
%{php_extdir}/json.so

%changelog
* Fri Dec 30 2005 Ignacio Vazquez-Abrams  1.1.0-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-json/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Dec 2005 11:31:10 -0000	1.1
+++ .cvsignore	31 Dec 2005 11:32:07 -0000	1.2
@@ -0,0 +1 @@
+php-json-ext-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-json/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Dec 2005 11:31:10 -0000	1.1
+++ sources	31 Dec 2005 11:32:07 -0000	1.2
@@ -0,0 +1 @@
+4a1a41fafabf866784868af59bf30510  php-json-ext-1.1.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Dec 31 11:47:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:47:02 -0500
Subject: owners owners.list,1.492,1.493
Message-ID: <200512311147.jBVBlY6R002566@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2549

Modified Files:
	owners.list 
Log Message:
php-json


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -r1.492 -r1.493
--- owners.list	31 Dec 2005 04:24:32 -0000	1.492
+++ owners.list	31 Dec 2005 11:47:02 -0000	1.493
@@ -945,6 +945,7 @@
 Fedora Extras|pgp-tools|Collection of several utilities related to OpenPGP|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-adodb|Active Data Objects Data Base|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|php-eaccelerator|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|php-json|An extremely fast PHP extension for JSON|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|phpldapadmin|Web-based tool for managing LDAP servers|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|php-mmcache|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-mailparse|PECL package for parsing and working with email messages|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 31 14:49:21 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 31 Dec 2005 09:49:21 -0500
Subject: rpms/artwiz-aleczapka-fonts - New directory
Message-ID: <200512311449.jBVEnNW7007840@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/artwiz-aleczapka-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7832/artwiz-aleczapka-fonts

Log Message:
Directory /cvs/extras/rpms/artwiz-aleczapka-fonts added to the repository




From fedora-extras-commits at redhat.com  Sat Dec 31 14:49:27 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 31 Dec 2005 09:49:27 -0500
Subject: rpms/artwiz-aleczapka-fonts/devel - New directory
Message-ID: <200512311449.jBVEnTKo007855@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-serv7832/artwiz-aleczapka-fonts/devel

Log Message:
Directory /cvs/extras/rpms/artwiz-aleczapka-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Dec 31 14:50:18 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 31 Dec 2005 09:50:18 -0500
Subject: rpms/artwiz-aleczapka-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512311450.jBVEoKRD007891@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/artwiz-aleczapka-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7879

Added Files:
	Makefile import.log 
Log Message:
Setup of module artwiz-aleczapka-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module artwiz-aleczapka-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Dec 31 14:50:24 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 31 Dec 2005 09:50:24 -0500
Subject: rpms/artwiz-aleczapka-fonts/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512311450.jBVEoQQw007911@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-serv7879/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module artwiz-aleczapka-fonts


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Dec 31 14:51:38 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 31 Dec 2005 09:51:38 -0500
Subject: rpms/artwiz-aleczapka-fonts import.log,1.1,1.2
Message-ID: <200512311452.jBVEqBUH007989@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/artwiz-aleczapka-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7955

Modified Files:
	import.log 
Log Message:
auto-import artwiz-aleczapka-fonts-1.3-3 on branch devel from artwiz-aleczapka-fonts-1.3-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/artwiz-aleczapka-fonts/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Dec 2005 14:50:18 -0000	1.1
+++ import.log	31 Dec 2005 14:51:38 -0000	1.2
@@ -0,0 +1 @@
+artwiz-aleczapka-fonts-1_3-3:HEAD:artwiz-aleczapka-fonts-1.3-3.src.rpm:1136040662



From fedora-extras-commits at redhat.com  Sat Dec 31 14:51:44 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 31 Dec 2005 09:51:44 -0500
Subject: rpms/artwiz-aleczapka-fonts/devel artwiz-aleczapka-fonts.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512311452.jBVEqGUx007993@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-serv7955/devel

Modified Files:
	.cvsignore sources 
Added Files:
	artwiz-aleczapka-fonts.spec 
Log Message:
auto-import artwiz-aleczapka-fonts-1.3-3 on branch devel from artwiz-aleczapka-fonts-1.3-3.src.rpm


--- NEW FILE artwiz-aleczapka-fonts.spec ---
%define         fontdir %{_datadir}/fonts/artwiz-aleczapka

Name:           artwiz-aleczapka-fonts
Version:        1.3
Release:        3%{?dist}
Summary:        Set of (improved) artwiz fonts

Group:          User Interface/X
License:        GPL
URL:            http://artwizaleczapka.sourceforge.net/
Source0:        http://dl.sf.net/artwizaleczapka/artwiz-aleczapka-en-sources-1.3.tar.bz2
Source1:        http://dl.sf.net/artwizaleczapka/artwiz-aleczapka-de-sources-1.3.tar.bz2
Source2:        http://dl.sf.net/artwizaleczapka/artwiz-aleczapka-se-sources-1.3.tar.bz2

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  xorg-x11-font-utils

%description
This is set of (improved) artwiz fonts.
The ultimate solution to your all problems with artwiz fonts.
Screenshots: http://artwizaleczapka.sourceforge.net/images/shots/


%prep
%setup -q -c %{name}-%{version} -a1 -a2


%build
for lang in de en se; do
    pushd %{_builddir}/%{name}-%{version}/artwiz-aleczapka-$lang-sources-%{version}
    sh makepcf.sh
    popd
done


%install
%{__rm} -rf %{buildroot}
for lang in de en se; do
    %{__install} -d -m 0755 %{buildroot}%{fontdir}/artwiz-aleczapka-$lang-%{version}
    %{__install} -p -m 0644 %{_builddir}/%{name}-%{version}/artwiz-aleczapka-$lang-sources-%{version}/*.pcf \
	%{buildroot}%{fontdir}/artwiz-aleczapka-$lang-%{version}
done

# "touch" all files we've got flagged as %ghost but which are not
# present in the %{buildroot} when RPM looks for files
/bin/touch %{buildroot}%{fontdir}/fonts.cache-{1,2}
/bin/touch %{buildroot}%{fontdir}/artwiz-aleczapka-{de,en,se}-%{version}/fonts.cache-{1,2}


%clean
%{__rm} -rf %{buildroot}


%post
if [ -x %{_bindir}/fc-cache ]; then
  %{_bindir}/fc-cache %{_datadir}/fonts
fi

%postun
if [ "$1" = "0" ]; then
  if [ -x %{_bindir}/fc-cache ]; then
    %{_bindir}/fc-cache %{_datadir}/fonts
  fi
fi


%files
%defattr(-,root,root,-)
# generic docs are the same for every lang (AUHTORS has all info in german dir
# so use it from german font dir)
%doc artwiz-aleczapka-de-sources-1.3/{AUTHORS,COPYING,README,VERSION}
%doc artwiz-aleczapka-de-sources-1.3/README.DE
%doc artwiz-aleczapka-se-sources-1.3/README.SE
%dir %{fontdir}
%dir %{fontdir}/artwiz-aleczapka-de-%{version}
%dir %{fontdir}/artwiz-aleczapka-en-%{version}
%dir %{fontdir}/artwiz-aleczapka-se-%{version}
%{fontdir}/*/*.pcf
%ghost %{fontdir}/fonts.cache-1
%ghost %{fontdir}/fonts.cache-2
%ghost %{fontdir}/artwiz-aleczapka-de-%{version}/fonts.cache-1
%ghost %{fontdir}/artwiz-aleczapka-de-%{version}/fonts.cache-2
%ghost %{fontdir}/artwiz-aleczapka-en-%{version}/fonts.cache-1
%ghost %{fontdir}/artwiz-aleczapka-en-%{version}/fonts.cache-2
%ghost %{fontdir}/artwiz-aleczapka-se-%{version}/fonts.cache-1
%ghost %{fontdir}/artwiz-aleczapka-se-%{version}/fonts.cache-2


%changelog
* Sat Dec 31 2005 Andreas Bierfert 
1.3-3
- apply fixes from Dawid Gajownik
- add documentation

* Tue Nov 29 2005 Andreas Bierfert 
1.3-2
- package name with -fonts
- use fc-cache in post/postun

* Sat Nov 26 2005 Andreas Bierfert 
1.3-1
- split from fluxbox package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/artwiz-aleczapka-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Dec 2005 14:50:23 -0000	1.1
+++ .cvsignore	31 Dec 2005 14:51:44 -0000	1.2
@@ -0,0 +1,3 @@
+artwiz-aleczapka-de-sources-1.3.tar.bz2
+artwiz-aleczapka-en-sources-1.3.tar.bz2
+artwiz-aleczapka-se-sources-1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/artwiz-aleczapka-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Dec 2005 14:50:23 -0000	1.1
+++ sources	31 Dec 2005 14:51:44 -0000	1.2
@@ -0,0 +1,3 @@
+92e676c8ce70e20cb00026ffac49cca6  artwiz-aleczapka-de-sources-1.3.tar.bz2
+3de7de7aa635eb6160fac01d678f8b72  artwiz-aleczapka-en-sources-1.3.tar.bz2
+92923ff1066a0f95c955941cd089430f  artwiz-aleczapka-se-sources-1.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Dec 31 15:12:32 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 31 Dec 2005 10:12:32 -0500
Subject: owners owners.list,1.493,1.494
Message-ID: <200512311513.jBVFDKYB009968@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9921

Modified Files:
	owners.list 
Log Message:
- add artwiz-aleczapka-fonts



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -r1.493 -r1.494
--- owners.list	31 Dec 2005 11:47:02 -0000	1.493
+++ owners.list	31 Dec 2005 15:12:32 -0000	1.494
@@ -39,6 +39,7 @@
 Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at osdl.org|extras-qa at fedoraproject.org|
 Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 31 18:25:44 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 13:25:44 -0500
Subject: rpms/abcm2ps/FC-3 .cvsignore, 1.7, 1.8 abcm2ps.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200512311826.jBVIQGuI015422@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15384/FC-3

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Nov 2005 19:51:52 -0000	1.7
+++ .cvsignore	31 Dec 2005 18:25:43 -0000	1.8
@@ -1,2 +1,2 @@
-abcm2ps-4.12.2.tar.gz
+abcm2ps-4.12.3.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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- abcm2ps.spec	30 Nov 2005 19:51:52 -0000	1.7
+++ abcm2ps.spec	31 Dec 2005 18:25:43 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.2
+Version:        4.12.3
 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.2.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.3.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
+* Wed Dec 28 2005 Gerard Milmeister  - 4.12.3-1
+- New Version 4.12.3
+
 * Wed Nov 30 2005 Gerard Milmeister  - 4.12.2-1
 - New Version 4.12.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Nov 2005 19:51:52 -0000	1.7
+++ sources	31 Dec 2005 18:25:43 -0000	1.8
@@ -1,2 +1,2 @@
-906cfebc1255a4db39e93c8bf213f37c  abcm2ps-4.12.2.tar.gz
+dce1d84f6da39e7e95e2873d598f94b9  abcm2ps-4.12.3.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Sat Dec 31 18:25:50 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 13:25:50 -0500
Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.7, 1.8 abcm2ps.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200512311826.jBVIQN7n015427@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15384/FC-4

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Nov 2005 19:51:57 -0000	1.7
+++ .cvsignore	31 Dec 2005 18:25:50 -0000	1.8
@@ -1,2 +1,2 @@
-abcm2ps-4.12.2.tar.gz
+abcm2ps-4.12.3.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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- abcm2ps.spec	30 Nov 2005 19:51:57 -0000	1.7
+++ abcm2ps.spec	31 Dec 2005 18:25:50 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.2
+Version:        4.12.3
 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.2.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.3.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
+* Wed Dec 28 2005 Gerard Milmeister  - 4.12.3-1
+- New Version 4.12.3
+
 * Wed Nov 30 2005 Gerard Milmeister  - 4.12.2-1
 - New Version 4.12.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Nov 2005 19:51:57 -0000	1.7
+++ sources	31 Dec 2005 18:25:50 -0000	1.8
@@ -1,2 +1,2 @@
-906cfebc1255a4db39e93c8bf213f37c  abcm2ps-4.12.2.tar.gz
+dce1d84f6da39e7e95e2873d598f94b9  abcm2ps-4.12.3.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Sat Dec 31 18:49:35 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 13:49:35 -0500
Subject: rpms/TeXmacs/FC-4 .cvsignore, 1.16, 1.17 TeXmacs.spec, 1.25,
	1.26 sources, 1.18, 1.19
Message-ID: <200512311850.jBVIo782015566@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/TeXmacs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15545

Modified Files:
	.cvsignore TeXmacs.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	7 Nov 2005 16:17:21 -0000	1.16
+++ .cvsignore	31 Dec 2005 18:49:34 -0000	1.17
@@ -1 +1 @@
-TeXmacs-1.0.5.12-src.tar.gz
+TeXmacs-1.0.6-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TeXmacs.spec	7 Nov 2005 16:17:21 -0000	1.25
+++ TeXmacs.spec	31 Dec 2005 18:49:34 -0000	1.26
@@ -1,16 +1,17 @@
 Name:		TeXmacs
-Version:	1.0.5.12
-Release:	2%{?dist}
+Version:	1.0.6
+Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.texmacs.org
-Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.12-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6-src.tar.gz
 Patch0:		TeXmacs-maxima.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex, tetex-fonts, ghostscript
-Buildrequires:	guile-devel, desktop-file-utils, tetex, freetype-devel, xorg-x11-devel
+Buildrequires:	guile-devel, desktop-file-utils, tetex, freetype-devel
+Buildrequires:  xorg-x11-devel
 Requires:	fig2ps
 Requires(post): shared-mime-info, desktop-file-utils
 Requires(postun): shared-mime-info, desktop-file-utils
@@ -138,6 +139,9 @@
 
 
 %changelog
+* Sat Dec 31 2005 Gerard Milmeister  - 1.0.6-1
+- New Version 1.0.6
+
 * Mon Nov  7 2005 Gerard Milmeister  - 1.0.5.12-1
 - New Version 1.0.5.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	7 Nov 2005 16:17:21 -0000	1.18
+++ sources	31 Dec 2005 18:49:34 -0000	1.19
@@ -1 +1 @@
-9a4075df4d120d9c834ac78b6c964341  TeXmacs-1.0.5.12-src.tar.gz
+7b0a3896fd17cf2e993aa77d15bb6240  TeXmacs-1.0.6-src.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 18:52:17 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 13:52:17 -0500
Subject: rpms/TeXmacs/devel .cvsignore, 1.17, 1.18 TeXmacs.spec, 1.26,
	1.27 sources, 1.18, 1.19
Message-ID: <200512311852.jBVIqne9015631@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/TeXmacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15610

Modified Files:
	.cvsignore TeXmacs.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	7 Nov 2005 16:14:47 -0000	1.17
+++ .cvsignore	31 Dec 2005 18:52:17 -0000	1.18
@@ -1 +1 @@
-TeXmacs-1.0.5.12-src.tar.gz
+TeXmacs-1.0.6-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- TeXmacs.spec	7 Nov 2005 16:14:47 -0000	1.26
+++ TeXmacs.spec	31 Dec 2005 18:52:17 -0000	1.27
@@ -1,16 +1,26 @@
 Name:		TeXmacs
-Version:	1.0.5.12
-Release:	2%{?dist}
+Version:	1.0.6
+Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.texmacs.org
-Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.12-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6-src.tar.gz
 Patch0:		TeXmacs-maxima.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex, tetex-fonts, ghostscript
-Buildrequires:	guile-devel, desktop-file-utils, tetex, freetype-devel, xorg-x11-devel
+Buildrequires:	guile-devel, desktop-file-utils, tetex
+Buildrequires:  freetype-devel
+BuildRequires:  libICE-devel
+BuildRequires:  libSM-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXaw-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXft-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libXrender-devel
+BuildRequires:  libXt-devel
 Requires:	fig2ps
 Requires(post): shared-mime-info, desktop-file-utils
 Requires(postun): shared-mime-info, desktop-file-utils
@@ -138,6 +148,9 @@
 
 
 %changelog
+* Sat Dec 31 2005 Gerard Milmeister  - 1.0.6-1
+- New Version 1.0.6
+
 * Mon Nov  7 2005 Gerard Milmeister  - 1.0.5.12-1
 - New Version 1.0.5.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	7 Nov 2005 16:14:47 -0000	1.18
+++ sources	31 Dec 2005 18:52:17 -0000	1.19
@@ -1 +1 @@
-9a4075df4d120d9c834ac78b6c964341  TeXmacs-1.0.5.12-src.tar.gz
+7b0a3896fd17cf2e993aa77d15bb6240  TeXmacs-1.0.6-src.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 18:53:46 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 13:53:46 -0500
Subject: rpms/TeXmacs/FC-3 .cvsignore, 1.11, 1.12 TeXmacs.spec, 1.15,
	1.16 sources, 1.14, 1.15
Message-ID: <200512311854.jBVIsJ10015717@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/TeXmacs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15687

Modified Files:
	.cvsignore TeXmacs.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Nov 2005 16:17:16 -0000	1.11
+++ .cvsignore	31 Dec 2005 18:53:46 -0000	1.12
@@ -1 +1 @@
-TeXmacs-1.0.5.12-src.tar.gz
+TeXmacs-1.0.6-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-3/TeXmacs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TeXmacs.spec	7 Nov 2005 16:17:16 -0000	1.15
+++ TeXmacs.spec	31 Dec 2005 18:53:46 -0000	1.16
@@ -1,16 +1,17 @@
 Name:		TeXmacs
-Version:	1.0.5.12
-Release:	2%{?dist}
+Version:	1.0.6
+Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.texmacs.org
-Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.12-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6-src.tar.gz
 Patch0:		TeXmacs-maxima.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex, tetex-fonts, ghostscript
-Buildrequires:	guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel
+Buildrequires:	guile-devel, desktop-file-utils, tetex, freetype-devel
+Buildrequires:  xorg-x11-devel
 Requires:	fig2ps
 Requires(post): shared-mime-info, desktop-file-utils
 Requires(postun): shared-mime-info, desktop-file-utils
@@ -138,6 +139,9 @@
 
 
 %changelog
+* Sat Dec 31 2005 Gerard Milmeister  - 1.0.6-1
+- New Version 1.0.6
+
 * Mon Nov  7 2005 Gerard Milmeister  - 1.0.5.12-1
 - New Version 1.0.5.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-3/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	7 Nov 2005 16:17:16 -0000	1.14
+++ sources	31 Dec 2005 18:53:46 -0000	1.15
@@ -1 +1 @@
-9a4075df4d120d9c834ac78b6c964341  TeXmacs-1.0.5.12-src.tar.gz
+7b0a3896fd17cf2e993aa77d15bb6240  TeXmacs-1.0.6-src.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 19:13:06 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 14:13:06 -0500
Subject: rpms/TeXmacs/devel TeXmacs-inline.patch, NONE, 1.1 TeXmacs.spec,
	1.27, 1.28
Message-ID: <200512311913.jBVJDcE5017447@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/TeXmacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17427

Modified Files:
	TeXmacs.spec 
Added Files:
	TeXmacs-inline.patch 
Log Message:


TeXmacs-inline.patch:

--- NEW FILE TeXmacs-inline.patch ---
--- TeXmacs-1.0.6-src/src/System/Classes/url.hpp.inline	2005-12-31 20:11:32.000000000 +0100
+++ TeXmacs-1.0.6-src/src/System/Classes/url.hpp	2005-12-31 20:11:54.000000000 +0100
@@ -38,10 +38,13 @@
   inline bool operator == (url u) { return rep->t == u->t; }
   inline bool operator != (url u) { return rep->t != u->t; }
   inline url  operator [] (int i) { return url (rep->t[i]); }
-  inline friend url as_url (tree t) { return url (t); }
+  friend url as_url (tree t);
 };
 CONCRETE_CODE(url);
 
+inline url as_url (tree t) { return url (t); }
+
+
 ostream& operator << (ostream& out, url u);
 string as_string (url u, int type= URL_SYSTEM);
 


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- TeXmacs.spec	31 Dec 2005 18:52:17 -0000	1.27
+++ TeXmacs.spec	31 Dec 2005 19:13:05 -0000	1.28
@@ -1,6 +1,6 @@
 Name:		TeXmacs
 Version:	1.0.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
@@ -8,6 +8,7 @@
 URL:		http://www.texmacs.org
 Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6-src.tar.gz
 Patch0:		TeXmacs-maxima.patch
+Patch1:		TeXmacs-inline.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex, tetex-fonts, ghostscript
 Buildrequires:	guile-devel, desktop-file-utils, tetex
@@ -47,6 +48,7 @@
 %prep
 %setup -q -n TeXmacs-%{version}-src
 %patch0 -p1
+%patch1 -p1
 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
 
 



From fedora-extras-commits at redhat.com  Sat Dec 31 20:27:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 31 Dec 2005 15:27:36 -0500
Subject: rpms/R/FC-3 R.spec,1.10,1.11 sources,1.5,1.6
Message-ID: <200512312028.jBVKS8FN019284@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19232/FC-3

Modified Files:
	R.spec sources 
Log Message:

Bump to 2.2.1



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-3/R.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- R.spec	7 Oct 2005 05:46:54 -0000	1.10
+++ R.spec	31 Dec 2005 20:27:36 -0000	1.11
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.2.0
-Release: 2%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -218,6 +218,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Dec 20 2005 Tom "spot" Callaway  2.2.1-1
+- bump to 2.2.1
+
 * Thu Oct  6 2005 Tom "spot" Callaway  2.2.0-2
 - use fixed system lapack for FC-4 and devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Oct 2005 14:22:07 -0000	1.5
+++ sources	31 Dec 2005 20:27:36 -0000	1.6
@@ -1 +1 @@
-6bddf439ae417a48bd31892996ea111c  R-2.2.0.tar.gz
+42542290c6d1585af7ded330f811385c  R-2.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 20:27:49 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 31 Dec 2005 15:27:49 -0500
Subject: rpms/R/devel .cvsignore,1.5,1.6 R.spec,1.9,1.10 sources,1.6,1.7
Message-ID: <200512312028.jBVKSOew019289@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19232/devel

Modified Files:
	.cvsignore R.spec sources 
Log Message:

Bump to 2.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/R/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Oct 2005 14:22:12 -0000	1.5
+++ .cvsignore	31 Dec 2005 20:27:49 -0000	1.6
@@ -2,3 +2,4 @@
 R-2.1.0.tar.gz
 R-2.1.1.tar.gz
 R-2.2.0.tar.gz
+R-2.2.1.tar.gz


Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- R.spec	7 Oct 2005 05:47:00 -0000	1.9
+++ R.spec	31 Dec 2005 20:27:49 -0000	1.10
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.2.0
-Release: 2%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -10,10 +10,10 @@
 BuildRequires: gcc-gfortran
 BuildRequires: gcc-c++, tetex-latex, texinfo 
 BuildRequires: libpng-devel, libjpeg-devel, readline-devel, libtermcap-devel
-BuildRequires: XFree86-devel
 BuildRequires: tcl-devel, tk-devel
 BuildRequires: blas >= 3.0, pcre-devel, zlib-devel
 BuildRequires: java-1.4.2-gcj-compat, lapack-devel
+BuildRequires: libSM-devel, libX11-devel, libICE-devel
 Requires: evince, cups, firefox
 
 # These are the submodules that R provides. Sometimes R modules say they
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Dec 20 2005 Tom "spot" Callaway  2.2.1-1
+- bump to 2.2.1
+
 * Thu Oct  6 2005 Tom "spot" Callaway  2.2.0-2
 - use fixed system lapack for FC-4 and devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Oct 2005 14:22:12 -0000	1.6
+++ sources	31 Dec 2005 20:27:49 -0000	1.7
@@ -1 +1 @@
-6bddf439ae417a48bd31892996ea111c  R-2.2.0.tar.gz
+42542290c6d1585af7ded330f811385c  R-2.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 20:27:43 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 31 Dec 2005 15:27:43 -0500
Subject: rpms/R/FC-4 R.spec,1.9,1.10 sources,1.6,1.7
Message-ID: <200512312028.jBVKSQtQ019293@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19232/FC-4

Modified Files:
	R.spec sources 
Log Message:

Bump to 2.2.1



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- R.spec	7 Oct 2005 05:46:55 -0000	1.9
+++ R.spec	31 Dec 2005 20:27:43 -0000	1.10
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.2.0
-Release: 2%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Dec 20 2005 Tom "spot" Callaway  2.2.1-1
+- bump to 2.2.1
+
 * Thu Oct  6 2005 Tom "spot" Callaway  2.2.0-2
 - use fixed system lapack for FC-4 and devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Oct 2005 14:22:07 -0000	1.6
+++ sources	31 Dec 2005 20:27:43 -0000	1.7
@@ -1 +1 @@
-6bddf439ae417a48bd31892996ea111c  R-2.2.0.tar.gz
+42542290c6d1585af7ded330f811385c  R-2.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 21:03:01 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 31 Dec 2005 16:03:01 -0500
Subject: rpms/sbcl/devel .cvsignore, 1.7, 1.8 sbcl.spec, 1.31, 1.32 sources, 
	1.7, 1.8
Message-ID: <200512312103.jBVL3XFE021137@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21116

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Sat Dec 31 2005 Rex Dieter  0.9.8-1
- 0.9.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Dec 2005 14:59:39 -0000	1.7
+++ .cvsignore	31 Dec 2005 21:03:00 -0000	1.8
@@ -1,6 +1,4 @@
 sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-sbcl-0.9.4-x86-64-linux-binary.tar.bz2
-sbcl-0.9.5-source.tar.bz2
-sbcl-0.9.5-x86-linux-binary.tar.bz2
-sbcl-0.9.6-source.tar.bz2
-sbcl-0.9.7-source.tar.bz2
+sbcl-0.9.8-source.tar.bz2
+sbcl-0.9.8-x86-64-linux-binary.tar.bz2
+sbcl-0.9.8-x86-linux-binary.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sbcl.spec	5 Dec 2005 14:59:39 -0000	1.31
+++ sbcl.spec	31 Dec 2005 21:03:00 -0000	1.32
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.7
+Version: 0.9.8
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Sat Dec 31 2005 Rex Dieter  0.9.8-1
+- 0.9.8
+
 * Mon Nov 28 2005 Rex Dieter  0.9.7-1
 - 0.9.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Dec 2005 14:59:39 -0000	1.7
+++ sources	31 Dec 2005 21:03:00 -0000	1.8
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-67ec41e624a3f2ad7f6f3cde1bd001d3  sbcl-0.9.4-x86-64-linux-binary.tar.bz2
-cb01b462b517889723eeaf63b5474c70  sbcl-0.9.5-x86-linux-binary.tar.bz2
-d5e5e4ae500f12b7523989222cb4cc88  sbcl-0.9.7-source.tar.bz2
+4a8a3de71aff073b4e23e5bc2e432b27  sbcl-0.9.8-source.tar.bz2
+294b9133aa3d0195a0ad8d562bf9c7d5  sbcl-0.9.8-x86-64-linux-binary.tar.bz2
+900ae4d2353fd9371d6ebaef40180038  sbcl-0.9.8-x86-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Sat Dec 31 21:14:55 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 31 Dec 2005 16:14:55 -0500
Subject: rpms/kmymoney2/devel .cvsignore, 1.2, 1.3 kmymoney2.spec, 1.8,
	1.9 sources, 1.2, 1.3
Message-ID: <200512312115.jBVLFScG021590@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21567

Modified Files:
	.cvsignore kmymoney2.spec sources 
Log Message:
* Sat Dec 31 2005 Rex Dieter  0.8.2-1
- 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Nov 2005 20:23:11 -0000	1.2
+++ .cvsignore	31 Dec 2005 21:14:55 -0000	1.3
@@ -1 +1 @@
-kmymoney2-0.8.1.tar.bz2
+kmymoney2-0.8.2.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kmymoney2.spec	23 Dec 2005 21:28:14 -0000	1.8
+++ kmymoney2.spec	31 Dec 2005 21:14:55 -0000	1.9
@@ -16,19 +16,15 @@
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 0.8.1
-Release: 7%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
 Group:	 Applications/Productivity
-Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-0.8.1.tar.bz2
+Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-# inspired by http://article.gmane.org/gmane.comp.kde.kmymoney2.devel/3467
-Patch1: kmymoney2-0.8.1-qt335.patch
-Patch2: kmymoney2-0.8.1-gcc41.patch
-
 BuildRequires: desktop-file-utils
 BuildRequires: automake
 BuildRequires: libxml2-devel
@@ -56,9 +52,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .qt335
-%patch2 -p1 -b .gcc41
-
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -161,6 +154,9 @@
 
 
 %changelog
+* Sat Dec 31 2005 Rex Dieter  0.8.2-1
+- 0.8.2
+
 * Fri Dec 23 2005 Rex Dieter  0.8.1-7
 - gcc41 patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Nov 2005 20:23:11 -0000	1.2
+++ sources	31 Dec 2005 21:14:55 -0000	1.3
@@ -1 +1 @@
-266fd411098cdce53d7db202960f07d5  kmymoney2-0.8.1.tar.bz2
+ffb09eaba4f93cd47e9600a2cb6b02c5  kmymoney2-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Dec 31 21:29:41 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 31 Dec 2005 16:29:41 -0500
Subject: rpms/R/FC-3 R.spec,1.11,1.12
Message-ID: <200512312130.jBVLUDev021687@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21640/FC-3

Modified Files:
	R.spec 
Log Message:

* Sat Dec 31 2005 Tom "spot" Callaway  2.2.1-2
- missing BR: libXt-devel for FC-5



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-3/R.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- R.spec	31 Dec 2005 20:27:36 -0000	1.11
+++ R.spec	31 Dec 2005 21:29:40 -0000	1.12
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -218,6 +218,9 @@
 /sbin/ldconfig
 
 %changelog
+* Sat Dec 31 2005 Tom "spot" Callaway  2.2.1-2
+- missing BR: libXt-devel for FC-5
+
 * Tue Dec 20 2005 Tom "spot" Callaway  2.2.1-1
 - bump to 2.2.1
 



From fedora-extras-commits at redhat.com  Sat Dec 31 21:29:46 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 31 Dec 2005 16:29:46 -0500
Subject: rpms/R/FC-4 R.spec,1.10,1.11
Message-ID: <200512312130.jBVLUJ1l021690@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21640/FC-4

Modified Files:
	R.spec 
Log Message:

* Sat Dec 31 2005 Tom "spot" Callaway  2.2.1-2
- missing BR: libXt-devel for FC-5



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- R.spec	31 Dec 2005 20:27:43 -0000	1.10
+++ R.spec	31 Dec 2005 21:29:46 -0000	1.11
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Sat Dec 31 2005 Tom "spot" Callaway  2.2.1-2
+- missing BR: libXt-devel for FC-5
+
 * Tue Dec 20 2005 Tom "spot" Callaway  2.2.1-1
 - bump to 2.2.1
 



From fedora-extras-commits at redhat.com  Sat Dec 31 21:29:52 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 31 Dec 2005 16:29:52 -0500
Subject: rpms/R/devel R.spec,1.10,1.11
Message-ID: <200512312130.jBVLUOP6021693@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21640/devel

Modified Files:
	R.spec 
Log Message:

* Sat Dec 31 2005 Tom "spot" Callaway  2.2.1-2
- missing BR: libXt-devel for FC-5



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- R.spec	31 Dec 2005 20:27:49 -0000	1.10
+++ R.spec	31 Dec 2005 21:29:52 -0000	1.11
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -13,7 +13,7 @@
 BuildRequires: tcl-devel, tk-devel
 BuildRequires: blas >= 3.0, pcre-devel, zlib-devel
 BuildRequires: java-1.4.2-gcj-compat, lapack-devel
-BuildRequires: libSM-devel, libX11-devel, libICE-devel
+BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
 Requires: evince, cups, firefox
 
 # These are the submodules that R provides. Sometimes R modules say they
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Sat Dec 31 2005 Tom "spot" Callaway  2.2.1-2
+- missing BR: libXt-devel for FC-5
+
 * Tue Dec 20 2005 Tom "spot" Callaway  2.2.1-1
 - bump to 2.2.1
 



From fedora-extras-commits at redhat.com  Sat Dec 31 23:40:31 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 18:40:31 -0500
Subject: rpms/lablgtk/FC-4 .cvsignore, 1.3, 1.4 lablgtk.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200512312341.jBVNf3Vb026315@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/lablgtk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26294

Modified Files:
	.cvsignore lablgtk.spec sources 
Log Message:
new version 2.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:55:06 -0000	1.3
+++ .cvsignore	31 Dec 2005 23:40:30 -0000	1.4
@@ -1 +1 @@
-lablgtk-2.4.0.tar.gz
+lablgtk-2.6.0.tar.gz


Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-4/lablgtk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lablgtk.spec	10 Sep 2005 19:26:29 -0000	1.10
+++ lablgtk.spec	31 Dec 2005 23:40:30 -0000	1.11
@@ -1,26 +1,34 @@
 Name:           lablgtk
-Version:        2.4.0
-Release:	6%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
-Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
-Patch0:		lablgtk-gcc4.patch
+Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.6.0.tar.gz
+#Patch0:        lablgtk-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ocaml >= 3.08
-%{?_with_gl:Requires: lablgl >= 1.00}
+
 BuildRequires:  ocaml >= 3.08, camlp4 >= 3.08
 # lablgtk can generate quite extensive documentation.
 # Probably should enable this and create a subpackage for it.
-#BuildRequires:  ocaml-ocamldoc
-%{?_with_gl:BuildRequires: lablgl >= 1.00, gtkglarea2-devel}
+BuildRequires:  ocaml-ocamldoc
+BuildRequires:  lablgl >= 1.02
+BuildRequires:  gtkglarea2-devel
+BuildRequires:  zlib-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  librsvg2-devel
-BuildRequires:  libgnomeui-devel, libgnomecanvas-devel, gnome-panel-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  libgnomecanvas-devel
+BuildRequires:  gnome-panel-devel
+BuildRequires:  gtkspell-devel
+
+Requires:       ocaml >= 3.08
+Requires:       lablgl >= 1.02
+
 
 %description
 LablGTK is is an Objective Caml interface to gtk+.
@@ -30,16 +38,29 @@
 is not that easy if you know the dynamic typing approach taken by
 gtk+.
 
+
+%package doc
+Group:          System Environment/Libraries
+Summary:        Documentation for LablGTK
+Requires:	lablgtk = %{version}-%{release}
+
+%description doc
+Documentation for LablGTK.
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
+#%patch0 -p1 -b .gcc4
 # version information in META file is wrong
-perl -pi -e 's|version="1.3.1"|version="2.4.0"|' META
+perl -pi -e 's|version="1.3.1"|version="2.6.0"|' META
+
 
 %build
-%configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
+%configure --with-gl --enable-debug
 perl -pi -e "s|-O|$RPM_OPT_FLAGS|" src/Makefile
 make world
+make doc
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -54,22 +75,35 @@
      DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
 cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/*
 %{_libdir}/ocaml/lablgtk2
 %{_libdir}/ocaml/stublibs/*
 %doc README COPYING CHANGES
 %doc examples
 
+
+%files doc
+%defattr(-,root,root,-)
+%doc doc/html
+
+
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister  - 2.6.0-1
+- new version 2.6.0
+
 * Sat Sep 10 2005 Gerard Milmeister  - 2.4.0-6
 - include META file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:55:06 -0000	1.3
+++ sources	31 Dec 2005 23:40:30 -0000	1.4
@@ -1 +1 @@
-faa7b28c3ad97a1a76d983d24f26f567  lablgtk-2.4.0.tar.gz
+47319aacbbb761323bdfab67513829df  lablgtk-2.6.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 23:45:56 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 18:45:56 -0500
Subject: rpms/lablgtk/devel .cvsignore, 1.3, 1.4 lablgtk.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200512312346.jBVNkSQ3026388@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/lablgtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26367

Modified Files:
	.cvsignore lablgtk.spec sources 
Log Message:
new version 2.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:55:06 -0000	1.3
+++ .cvsignore	31 Dec 2005 23:45:56 -0000	1.4
@@ -1 +1 @@
-lablgtk-2.4.0.tar.gz
+lablgtk-2.6.0.tar.gz


Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/devel/lablgtk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lablgtk.spec	10 Sep 2005 19:27:23 -0000	1.10
+++ lablgtk.spec	31 Dec 2005 23:45:56 -0000	1.11
@@ -1,26 +1,33 @@
 Name:           lablgtk
-Version:        2.4.0
-Release:	6%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
-Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
-Patch0:		lablgtk-gcc4.patch
+Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.6.0.tar.gz
+#Patch0:        lablgtk-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ocaml >= 3.08
-%{?_with_gl:Requires: lablgl >= 1.00}
 BuildRequires:  ocaml >= 3.08, camlp4 >= 3.08
 # lablgtk can generate quite extensive documentation.
 # Probably should enable this and create a subpackage for it.
-#BuildRequires:  ocaml-ocamldoc
-%{?_with_gl:BuildRequires: lablgl >= 1.00, gtkglarea2-devel}
+BuildRequires:  ocaml-ocamldoc
+BuildRequires:  lablgl >= 1.02
+BuildRequires:  gtkglarea2-devel
+BuildRequires:  zlib-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  librsvg2-devel
-BuildRequires:  libgnomeui-devel, libgnomecanvas-devel, gnome-panel-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  libgnomecanvas-devel
+BuildRequires:  gnome-panel-devel
+BuildRequires:  gtkspell-devel
+
+Requires:       ocaml >= 3.08
+Requires:       lablgl >= 1.02
+
 
 %description
 LablGTK is is an Objective Caml interface to gtk+.
@@ -30,16 +37,28 @@
 is not that easy if you know the dynamic typing approach taken by
 gtk+.
 
+%package doc
+Group:          System Environment/Libraries
+Summary:        Documentation for LablGTK
+Requires:	lablgtk = %{version}-%{release}
+
+%description doc
+Documentation for LablGTK.
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
+#%patch0 -p1 -b .gcc4
 # version information in META file is wrong
-perl -pi -e 's|version="1.3.1"|version="2.4.0"|' META
+perl -pi -e 's|version="1.3.1"|version="2.6.0"|' META
+
 
 %build
-%configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
+%configure --with-gl --enable-debug
 perl -pi -e "s|-O|$RPM_OPT_FLAGS|" src/Makefile
 make world
+make doc
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,14 +81,22 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/*
 %{_libdir}/ocaml/lablgtk2
 %{_libdir}/ocaml/stublibs/*
 %doc README COPYING CHANGES
 %doc examples
 
+%files doc
+%defattr(-,root,root,-)
+%doc doc/html
+
+
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister  - 2.6.0-1
+- new version 2.6.0
+
 * Sat Sep 10 2005 Gerard Milmeister  - 2.4.0-6
 - include META file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:55:06 -0000	1.3
+++ sources	31 Dec 2005 23:45:56 -0000	1.4
@@ -1 +1 @@
-faa7b28c3ad97a1a76d983d24f26f567  lablgtk-2.4.0.tar.gz
+47319aacbbb761323bdfab67513829df  lablgtk-2.6.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 23:49:33 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 18:49:33 -0500
Subject: rpms/lablgtk/FC-3 .cvsignore, 1.3, 1.4 lablgtk.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200512312350.jBVNo5gU026455@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/lablgtk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26434

Modified Files:
	.cvsignore lablgtk.spec sources 
Log Message:
new version 2.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:55:06 -0000	1.3
+++ .cvsignore	31 Dec 2005 23:49:32 -0000	1.4
@@ -1 +1 @@
-lablgtk-2.4.0.tar.gz
+lablgtk-2.6.0.tar.gz


Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-3/lablgtk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lablgtk.spec	10 Sep 2005 19:28:04 -0000	1.6
+++ lablgtk.spec	31 Dec 2005 23:49:32 -0000	1.7
@@ -1,25 +1,32 @@
 Name:           lablgtk
-Version:        2.4.0
-Release:	6%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
-Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
+Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.6.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ocaml >= 3.08
-%{?_with_gl:Requires: lablgl >= 1.00}
 BuildRequires:  ocaml >= 3.08, camlp4 >= 3.08
 # lablgtk can generate quite extensive documentation.
 # Probably should enable this and create a subpackage for it.
-#BuildRequires:  ocaml-ocamldoc
-%{?_with_gl:BuildRequires: lablgl >= 1.00, gtkglarea2-devel}
+BuildRequires:  ocaml-ocamldoc
+BuildRequires:  lablgl >= 1.02
+BuildRequires:  gtkglarea2-devel
+BuildRequires:  zlib-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  librsvg2-devel
-BuildRequires:  libgnomeui-devel, libgnomecanvas-devel, gnome-panel-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  libgnomecanvas-devel
+BuildRequires:  gnome-panel-devel
+BuildRequires:  gtkspell-devel
+
+Requires:       ocaml >= 3.08
+Requires:       lablgl >= 1.02
+
 
 %description
 LablGTK is is an Objective Caml interface to gtk+.
@@ -29,15 +36,27 @@
 is not that easy if you know the dynamic typing approach taken by
 gtk+.
 
+%package doc
+Group:          System Environment/Libraries
+Summary:        Documentation for LablGTK
+Requires:	lablgtk = %{version}-%{release}
+
+%description doc
+Documentation for LablGTK.
+
+
 %prep
 %setup -q
 # version information in META file is wrong
-perl -pi -e 's|version="1.3.1"|version="2.4.0"|' META
+perl -pi -e 's|version="1.3.1"|version="2.6.0"|' META
+
 
 %build
-%configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
+%configure --with-gl --enable-debug
 perl -pi -e "s|-O|$RPM_OPT_FLAGS|" src/Makefile
 make world
+make doc
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,14 +79,22 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/*
 %{_libdir}/ocaml/lablgtk2
 %{_libdir}/ocaml/stublibs/*
 %doc README COPYING CHANGES
 %doc examples
 
+%files doc
+%defattr(-,root,root,-)
+%doc doc/html
+
+
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister  - 2.6.0-1
+- new version 2.6.0
+
 * Sat Sep 10 2005 Gerard Milmeister  - 2.4.0-6
 - include META file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:55:06 -0000	1.3
+++ sources	31 Dec 2005 23:49:32 -0000	1.4
@@ -1 +1 @@
-faa7b28c3ad97a1a76d983d24f26f567  lablgtk-2.4.0.tar.gz
+47319aacbbb761323bdfab67513829df  lablgtk-2.6.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 23:56:19 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 18:56:19 -0500
Subject: rpms/gtkglarea2/FC-3 gtkglarea2.spec,1.7,1.8
Message-ID: <200512312356.jBVNupk6026544@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gtkglarea2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26527

Modified Files:
	gtkglarea2.spec 
Log Message:



Index: gtkglarea2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglarea2/FC-3/gtkglarea2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkglarea2.spec	3 Mar 2005 23:13:54 -0000	1.7
+++ gtkglarea2.spec	31 Dec 2005 23:56:18 -0000	1.8
@@ -1,13 +1,14 @@
-Summary:	An OpenGL GTK widget
-Name: 		gtkglarea2
+Summary:	OpenGL GTK widget
+Name:		gtkglarea2
 Version:	1.99.0
-Release: 	1
+Release:	2
+
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea
 # ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/
-Source0: 	ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/1.99/gtkglarea-1.99.0.tar.bz2
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/1.99/gtkglarea-1.99.0.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	pkgconfig, xorg-x11-devel
 BuildRequires:	gtk2-devel
 
@@ -15,7 +16,7 @@
 Summary:	Development package for gtkglarea2
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	xorg-x11-devel
+Requires:	XFree86-devel
 Requires:	gtk2-devel
 
 %description



From fedora-extras-commits at redhat.com  Sat Dec 31 23:57:15 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 18:57:15 -0500
Subject: rpms/gtkglarea2/FC-3 gtkglarea2.spec,1.8,1.9
Message-ID: <200512312357.jBVNvlCu026597@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gtkglarea2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26580

Modified Files:
	gtkglarea2.spec 
Log Message:



Index: gtkglarea2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglarea2/FC-3/gtkglarea2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtkglarea2.spec	31 Dec 2005 23:56:18 -0000	1.8
+++ gtkglarea2.spec	31 Dec 2005 23:57:15 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	OpenGL GTK widget
 Name:		gtkglarea2
 Version:	1.99.0
-Release:	2
+Release:	2%{?dist}
 
 License:	LGPL
 Group:		System Environment/Libraries



From fedora-extras-commits at redhat.com  Sat Dec 31 23:58:15 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 18:58:15 -0500
Subject: rpms/gtkglarea2/devel gtkglarea2.spec,1.9,1.10
Message-ID: <200512312358.jBVNwlU1026658@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gtkglarea2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26641

Modified Files:
	gtkglarea2.spec 
Log Message:



Index: gtkglarea2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglarea2/devel/gtkglarea2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtkglarea2.spec	6 Apr 2005 22:11:39 -0000	1.9
+++ gtkglarea2.spec	31 Dec 2005 23:58:15 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	OpenGL GTK widget
 Name:		gtkglarea2
 Version:	1.99.0
-Release:	2
+Release:	3%{?dist}
 
 License:	LGPL
 Group:		System Environment/Libraries
@@ -9,8 +9,10 @@
 # ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/1.99/gtkglarea-1.99.0.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	pkgconfig, xorg-x11-devel
+BuildRequires:	pkgconfig
 BuildRequires:	gtk2-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libGLU-devel
 
 %package devel
 Summary:	Development package for gtkglarea2
@@ -18,6 +20,8 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	xorg-x11-devel
 Requires:	gtk2-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libGLU-devel
 
 %description
 GtkGLArea is a GTK widget that makes it easy to use OpenGL or Mesa
@@ -60,6 +64,9 @@
 %{_libdir}/pkgconfig/gtkgl-2.0.pc
 
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister  - 1.99.0-3
+- adapted for modular xorg
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Dec  1 01:18:31 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Wed, 30 Nov 2005 20:18:31 -0500
Subject: web/html/About/Projects docs.php,1.1,1.2
Message-ID: <200512010119.jB11J1QB017616@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/About/Projects
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17584/html/About/Projects

Modified Files:
	docs.php 
Log Message:
First round of edits to new revamp


Index: docs.php
===================================================================
RCS file: /cvs/fedora/web/html/About/Projects/docs.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docs.php	29 Nov 2005 17:30:30 -0000	1.1
+++ docs.php	1 Dec 2005 01:18:28 -0000	1.2
@@ -34,11 +34,11 @@
 		writers can contribute documentation about a specific topic
 		without having to worry about how it fits into a manual or how
 		it flows with other topics. Since the documents are for the
-		$PROJECT_NAME;, they only need to describe how to perform
+		$PROJECT_NAME, they only need to describe how to perform
 		tasks on $RELEASE_NAME.
    
 
         
     The project maintains some useful pages on the Fedora Project
+        href=\"http://fedoraproject.org/wiki/\">Fedora Project
         Wiki:
    
 
 	       
 		
    



From fedora-extras-commits at redhat.com  Thu Dec  1 01:18:37 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Wed, 30 Nov 2005 20:18:37 -0500
Subject: web/html/Contribute index.php,1.1,1.2
Message-ID: <200512010119.jB11J71t017620@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/Contribute
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17584/html/Contribute

Modified Files:
	index.php 
Log Message:
First round of edits to new revamp


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/Contribute/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	29 Nov 2005 17:32:30 -0000	1.1
+++ index.php	1 Dec 2005 01:18:35 -0000	1.2
@@ -15,7 +15,7 @@
 
    
 
 
    
-  Hundreds of individuals worldwide contribute directly to the success of Fedora projects.  Contributing to the community is the best way of learning about the community.  Fedora sponsors a number of community projects, which provide participation opportunities for people of all backgrounds.
+  Hundreds of individuals worldwide contribute directly to the success of the Fedora Project.  Contributing is the best way of learning about the community.  The Fedora Project is made up of a number of community projects, which provide participation opportunities for people of all backgrounds.
 
    
 
 
    Fedora Extras Project
    
@@ -36,7 +36,7 @@
 
 
    
   To read more about how to contribute to Fedora Documentation, visit the
-  Fedora Documentation Project page.
+  Fedora Documentation Project page.
 
    
 
 
    Fedora Translation Project
    
@@ -59,9 +59,15 @@
 
 
    
   To read more about how to become a Fedora Ambassador, please visit the
-  Fedora Ambassadors Project wiki.
+  Fedora Ambassadors Project wiki.
 
    
 
+
+
    Other Projects
    
+
+
    
+  For information on other Fedora projects, see the Projects wiki page.
+
    
 displayFooter('$Date$');



From fedora-extras-commits at redhat.com  Thu Dec  1 03:16:46 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 30 Nov 2005 22:16:46 -0500
Subject: extras-buildsys/common AuthedXMLRPCServer.py, 1.6.4.1,
	1.6.4.2 XMLRPCServerProxy.py, 1.5.4.1, 1.5.4.2
Message-ID: <200512010317.jB13HkjG021059@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20987/common

Modified Files:
      Tag: STABLE_0_4
	AuthedXMLRPCServer.py XMLRPCServerProxy.py 
Log Message:
Make the test a bit more informative


Index: AuthedXMLRPCServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -u -r1.6.4.1 -r1.6.4.2
--- AuthedXMLRPCServer.py	24 Nov 2005 22:32:02 -0000	1.6.4.1
+++ AuthedXMLRPCServer.py	1 Dec 2005 03:16:43 -0000	1.6.4.2
@@ -103,10 +103,10 @@
 ###########################################################
 
 class ReqHandler:
-    def ping(self):
+    def ping(self, callerid, trynum):
         authinfo = get_authinfo()
-        print "AUTHINFO: %s" % authinfo
-        return "pong"
+        print "AUTHINFO(%d / %d): %s" % (callerid, trynum, authinfo)
+        return "pong %d / %d" % (num, trynum)
 
 class TestServer(AuthedSSLXMLRPCServer):
     """
@@ -119,8 +119,7 @@
     def auth_cb(self, request, client_address):
         import random
         peer_cert = request.get_peer_certificate()
-        email = peer_cert.get_subject().countryName
-        return "AUTH: %s - %d" % (email, random.randint(1, 100))
+        return peer_cert.get_subject().emailAddress
 
 
 if __name__ == '__main__':


Index: XMLRPCServerProxy.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -r1.5.4.1 -r1.5.4.2
--- XMLRPCServerProxy.py	24 Nov 2005 22:32:02 -0000	1.5.4.1
+++ XMLRPCServerProxy.py	1 Dec 2005 03:16:43 -0000	1.5.4.2
@@ -64,8 +64,9 @@
 _lock = threading.Lock()
 
 class TestClient(threading.Thread):
-    def __init__(self, certs):
+    def __init__(self, certs, num):
         self.server = PlgXMLRPCServerProxy("https://127.0.0.1:8886", certs, timeout=20)
+        self.num = i
         threading.Thread.__init__(self)
 
     def run(self):
@@ -74,7 +75,8 @@
         i = 0
         while i < 5:
 #            _lock.acquire()
-            print self.server.ping()
+            reply = self.server.ping(self.num, i)
+            print "TRY(%d / %d): %s" % (self.num, i, reply)
             time.sleep(0.05)
 #            _lock.release()
             i = i + 1
@@ -92,7 +94,7 @@
 
     i = 100
     while i > 0:
-        t = TestClient(certs)
+        t = TestClient(certs, i)
         print "Created thread %d." % i
         t.start()
         i = i - 1



From fedora-extras-commits at redhat.com  Thu Dec  1 03:17:17 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 30 Nov 2005 22:17:17 -0500
Subject: extras-buildsys ChangeLog,1.155,1.156
Message-ID: <200512010317.jB13HloX021062@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21008

Modified Files:
	ChangeLog 
Log Message:
Make the test a bit more informative


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- ChangeLog	29 Nov 2005 06:41:40 -0000	1.155
+++ ChangeLog	1 Dec 2005 03:17:15 -0000	1.156
@@ -1,5 +1,10 @@
 2005-11-29  Dan Williams  
 
+    * Add an option in the server config file to disable
+        depsolving
+
+2005-11-29  Dan Williams  
+
     * Add a traceback server that listens on a Unix socket
         and writes backtraces for all threads to it.  Disabled
         by default.



From fedora-extras-commits at redhat.com  Thu Dec  1 03:17:22 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 30 Nov 2005 22:17:22 -0500
Subject: extras-buildsys/common AuthedXMLRPCServer.py, 1.7,
	1.8 XMLRPCServerProxy.py, 1.6, 1.7
Message-ID: <200512010317.jB13Hq96021066@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21008/common

Modified Files:
	AuthedXMLRPCServer.py XMLRPCServerProxy.py 
Log Message:
Make the test a bit more informative


Index: AuthedXMLRPCServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AuthedXMLRPCServer.py	25 Nov 2005 04:45:07 -0000	1.7
+++ AuthedXMLRPCServer.py	1 Dec 2005 03:17:20 -0000	1.8
@@ -103,10 +103,10 @@
 ###########################################################
 
 class ReqHandler:
-    def ping(self):
+    def ping(self, callerid, trynum):
         authinfo = get_authinfo()
-        print "AUTHINFO: %s" % authinfo
-        return "pong"
+        print "AUTHINFO(%d / %d): %s" % (callerid, trynum, authinfo)
+        return "pong %d / %d" % (num, trynum)
 
 class TestServer(AuthedSSLXMLRPCServer):
     """
@@ -119,8 +119,7 @@
     def auth_cb(self, request, client_address):
         import random
         peer_cert = request.get_peer_certificate()
-        email = peer_cert.get_subject().countryName
-        return "AUTH: %s - %d" % (email, random.randint(1, 100))
+        return peer_cert.get_subject().emailAddress
 
 
 if __name__ == '__main__':


Index: XMLRPCServerProxy.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLRPCServerProxy.py	25 Nov 2005 04:45:07 -0000	1.6
+++ XMLRPCServerProxy.py	1 Dec 2005 03:17:20 -0000	1.7
@@ -64,8 +64,9 @@
 _lock = threading.Lock()
 
 class TestClient(threading.Thread):
-    def __init__(self, certs):
+    def __init__(self, certs, num):
         self.server = PlgXMLRPCServerProxy("https://127.0.0.1:8886", certs, timeout=20)
+        self.num = i
         threading.Thread.__init__(self)
 
     def run(self):
@@ -74,7 +75,8 @@
         i = 0
         while i < 5:
 #            _lock.acquire()
-            print self.server.ping()
+            reply = self.server.ping(self.num, i)
+            print "TRY(%d / %d): %s" % (self.num, i, reply)
             time.sleep(0.05)
 #            _lock.release()
             i = i + 1
@@ -92,7 +94,7 @@
 
     i = 100
     while i > 0:
-        t = TestClient(certs)
+        t = TestClient(certs, i)
         print "Created thread %d." % i
         t.start()
         i = i - 1



From fedora-extras-commits at redhat.com  Thu Dec  1 03:17:28 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 30 Nov 2005 22:17:28 -0500
Subject: extras-buildsys/server Config.py, 1.11, 1.12 PackageJob.py, 1.39,
	1.40 Repo.py, 1.20, 1.21
Message-ID: <200512010317.jB13Hwk7021071@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21008/server

Modified Files:
	Config.py PackageJob.py Repo.py 
Log Message:
Make the test a bit more informative


Index: Config.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Config.py	26 Nov 2005 06:10:22 -0000	1.11
+++ Config.py	1 Dec 2005 03:17:25 -0000	1.12
@@ -95,6 +95,8 @@
     def save_default_config(self, filename=None):
         self.add_section("General")
         self.set_option("General", "hostname", "localhost")
+        self.set_option("General", "traceback_server", "no")
+        self.set_option("General", "depsolve_jobs", "yes")
 
         self.add_section("Directories")
         self.set_option("Directories", "server_work_dir", "/rpmbuild",)


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- PackageJob.py	29 Nov 2005 06:41:51 -0000	1.39
+++ PackageJob.py	1 Dec 2005 03:17:26 -0000	1.40
@@ -154,8 +154,11 @@
         self._result_dir = None
         self._srpm_path = None
         self._srpm_http_path = None
+
         self._depsolve_dir = None
         self._last_depsolve_error = None
+        self._depsolve_first_try = False
+
         self.repofiles = {}
         self.archjobs = {}
         self._archjobs_lock = threading.Lock()
@@ -404,10 +407,14 @@
 """ % (self._source, pkg_arches, allowed_arches)
             raise PrepError(msg)
 
-        self._set_cur_stage('depsolve_wait')
-        log("%s (%s): Requesting depsolve..." % (self.uid, self.package))
-        self._repo.request_depsolve(self, first_try=True)
-        return True  # sleep until the Repo wakes us up for depsolve
+        if self._server_cfg.get_bool("General", "depsolve_jobs"):
+            self._set_cur_stage('depsolve_wait')
+            log("%s (%s): Requesting depsolve..." % (self.uid, self.package))
+            self._repo.request_depsolve(self, first_try=True)
+            return True  # sleep until the Repo wakes us up for depsolve
+        else:
+            # Don't depsolve, just queue archjobs and wait
+            return self._prepare_and_wait()
 
     def _write_yum_conf(self, arch):
         # Figure out which mock config file it is, and write out it's yum.conf
@@ -492,7 +499,8 @@
         del base, srpm
         return success
 
-    def start_depsolve(self):
+    def start_depsolve(self, first_try=False):
+        self._depsolve_first_try = first_try
         self._set_cur_stage('depsolve')
         self.wake()
 
@@ -530,9 +538,11 @@
 
         log("%s (%s): Starting depsolve for arches: %s." % (self.uid, self.package, archlist))
 
+        failed_arch = None
         for arch in archlist:
             if self._arch_deps_solved(arch) == False:
                 unsolved_deps = True
+                failed_arch = arch
                 break
 
         self._archjobs_lock.release()
@@ -540,6 +550,15 @@
         self._repo.notify_depsolve_done(self)
 
         if unsolved_deps == True:
+            # Notify the queuer of the job that it's failed the first depsolve
+            if self._depsolve_first_try:
+                subject = 'Dependency Problem: %d - %s on %s' % (self.uid, self.name, self._target_str)
+                sender = self._server_cfg.get_str("Email", "email_from")
+                msg = """This job failed its initial dependency test.  The build server will
+periodically try to build the job for the next 8 hours.
+Error on %s: %s""" % (failed_arch, self._last_depsolve_error)
+                EmailUtils.email_result(sender, self.username, msg, subject)
+
             # Go to sleep until the repo changes
             self._set_cur_stage('depsolve_wait')
             self._repo.request_depsolve(self, first_try=False)
@@ -552,7 +571,10 @@
         shutil.rmtree(self._depsolve_dir, ignore_errors=True)
         self._depsolve_dir = None
 
-        # Queue up the archjobs
+        return self._prepare_and_wait()
+
+    def _prepare_and_wait(self):
+        # Make some directories we need
         work_dir = self._server_cfg.get_str("Directories", "server_work_dir")
         self._result_dir = self._make_stage_dir(work_dir)
         for arch in self.archjobs.keys():
@@ -570,6 +592,7 @@
         if self.use_cvs == True:
             shutil.rmtree(self.checkout_tmpdir, ignore_errors=True)
 
+        # Queue up archjobs
         self._set_cur_stage('waiting')
         self._request_arch_jobs()
         return False


Index: Repo.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Repo.py	29 Nov 2005 06:41:51 -0000	1.20
+++ Repo.py	1 Dec 2005 03:17:26 -0000	1.21
@@ -133,7 +133,7 @@
             archjob.repo_unlocked_callback()
         self._repo_unlock_lock.release()
 
-    def _start_depsolves_for_queue(self, queue, max_jobs):
+    def _start_depsolves_for_queue(self, queue, max_jobs, first_try=False):
         num = 0
         for job in queue:
             if queue[job]:
@@ -146,7 +146,7 @@
                     break
                 if not queue[job]:
                     queue[job] = True
-                    job.start_depsolve()
+                    job.start_depsolve(first_try)
                     available = available - 1
 
     def _start_waiting_depsolves(self, repo_changed=False):
@@ -161,11 +161,11 @@
             max_again_depsolves = self.MAX_DEPSOLVE_JOBS / 2
             max_immediate_depsolves = self.MAX_DEPSOLVE_JOBS / 2
 
-        self._start_depsolves_for_queue(self._depsolve_immediate_queue, max_immediate_depsolves)
+        self._start_depsolves_for_queue(self._depsolve_immediate_queue, max_immediate_depsolves, first_try=True)
 
         # Only fire off non-first-try depsolves if the repo has changed
         if repo_changed:
-            self._start_depsolves_for_queue(self._depsolve_again_queue, max_again_depsolves)
+            self._start_depsolves_for_queue(self._depsolve_again_queue, max_again_depsolves, first_try=False)
 
         self._depsolve_again_lock.release()
         self._depsolve_immediate_lock.release()



From fedora-extras-commits at redhat.com  Thu Dec  1 03:21:01 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 30 Nov 2005 22:21:01 -0500
Subject: extras-buildsys/common AuthedXMLRPCServer.py,1.8,1.9
Message-ID: <200512010321.jB13LWev021140@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21118/common

Modified Files:
	AuthedXMLRPCServer.py 
Log Message:
small fix


Index: AuthedXMLRPCServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AuthedXMLRPCServer.py	1 Dec 2005 03:17:20 -0000	1.8
+++ AuthedXMLRPCServer.py	1 Dec 2005 03:20:59 -0000	1.9
@@ -106,7 +106,7 @@
     def ping(self, callerid, trynum):
         authinfo = get_authinfo()
         print "AUTHINFO(%d / %d): %s" % (callerid, trynum, authinfo)
-        return "pong %d / %d" % (num, trynum)
+        return "pong %d / %d" % (callerid, trynum)
 
 class TestServer(AuthedSSLXMLRPCServer):
     """



From fedora-extras-commits at redhat.com  Thu Dec  1 03:20:34 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 30 Nov 2005 22:20:34 -0500
Subject: extras-buildsys/common AuthedXMLRPCServer.py,1.6.4.2,1.6.4.3
Message-ID: <200512010321.jB13LYUQ021143@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21093/common

Modified Files:
      Tag: STABLE_0_4
	AuthedXMLRPCServer.py 
Log Message:
Small fix


Index: AuthedXMLRPCServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.3
diff -u -r1.6.4.2 -r1.6.4.3
--- AuthedXMLRPCServer.py	1 Dec 2005 03:16:43 -0000	1.6.4.2
+++ AuthedXMLRPCServer.py	1 Dec 2005 03:20:32 -0000	1.6.4.3
@@ -106,7 +106,7 @@
     def ping(self, callerid, trynum):
         authinfo = get_authinfo()
         print "AUTHINFO(%d / %d): %s" % (callerid, trynum, authinfo)
-        return "pong %d / %d" % (num, trynum)
+        return "pong %d / %d" % (callerid, trynum)
 
 class TestServer(AuthedSSLXMLRPCServer):
     """



From fedora-extras-commits at redhat.com  Thu Dec  1 03:36:07 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Wed, 30 Nov 2005 22:36:07 -0500
Subject: rpms/krecipes/FC-3 .cvsignore, 1.2, 1.3 krecipes.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200512010336.jB13acB3021223@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21202

Modified Files:
	.cvsignore krecipes.spec sources 
Log Message:
Update to 0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jul 2005 17:23:12 -0000	1.2
+++ .cvsignore	1 Dec 2005 03:36:05 -0000	1.3
@@ -1 +1 @@
-krecipes-0.8.1.tar.gz
+krecipes-0.9.tar.gz


Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-3/krecipes.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- krecipes.spec	23 Oct 2005 05:05:28 -0000	1.4
+++ krecipes.spec	1 Dec 2005 03:36:05 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           krecipes
-Version:        0.8.1
-Release:        3%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
@@ -79,6 +79,8 @@
 
 
 %changelog
+* Wed Nov 11 2005 Dennis Gilmore  - 0.9-1
+- update to 0.9
 * Sat Oct 20 2005 Dennis Gilmore  - 0.8.1-3%{?dist}
 - add BuildRequires desktop-file-utils  http://fedoraproject.org/wiki/QAChecklist
 - add %post and %postun scriptlets  to notify of new icons per


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jul 2005 17:23:12 -0000	1.2
+++ sources	1 Dec 2005 03:36:05 -0000	1.3
@@ -1 +1 @@
-f9049384bad2139f049b9b4eadd7239a  krecipes-0.8.1.tar.gz
+ee1a1463946c63788ff8eeea302a7506  krecipes-0.9.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  1 03:37:55 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Wed, 30 Nov 2005 22:37:55 -0500
Subject: rpms/krecipes/FC-4 .cvsignore, 1.2, 1.3 krecipes.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200512010338.jB13cPZX021294@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21273

Modified Files:
	.cvsignore krecipes.spec sources 
Log Message:
Update to 0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jul 2005 17:23:12 -0000	1.2
+++ .cvsignore	1 Dec 2005 03:37:53 -0000	1.3
@@ -1 +1 @@
-krecipes-0.8.1.tar.gz
+krecipes-0.9.tar.gz


Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-4/krecipes.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- krecipes.spec	23 Oct 2005 05:06:01 -0000	1.4
+++ krecipes.spec	1 Dec 2005 03:37:53 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           krecipes
-Version:        0.8.1
-Release:        3%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
@@ -79,6 +79,8 @@
 
 
 %changelog
+* Wed Nov 11 2005 Dennis Gilmore  - 0.9-1
+- update to 0.9
 * Sat Oct 20 2005 Dennis Gilmore  - 0.8.1-3%{?dist}
 - add BuildRequires desktop-file-utils  http://fedoraproject.org/wiki/QAChecklist
 - add %post and %postun scriptlets  to notify of new icons per


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jul 2005 17:23:12 -0000	1.2
+++ sources	1 Dec 2005 03:37:53 -0000	1.3
@@ -1 +1 @@
-f9049384bad2139f049b9b4eadd7239a  krecipes-0.8.1.tar.gz
+ee1a1463946c63788ff8eeea302a7506  krecipes-0.9.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  1 03:39:06 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Wed, 30 Nov 2005 22:39:06 -0500
Subject: rpms/krecipes/devel .cvsignore, 1.2, 1.3 krecipes.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200512010339.jB13da2S021365@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21344

Modified Files:
	.cvsignore krecipes.spec sources 
Log Message:
Update to 0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jul 2005 17:23:12 -0000	1.2
+++ .cvsignore	1 Dec 2005 03:39:04 -0000	1.3
@@ -1 +1 @@
-krecipes-0.8.1.tar.gz
+krecipes-0.9.tar.gz


Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/krecipes.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- krecipes.spec	23 Oct 2005 05:06:07 -0000	1.4
+++ krecipes.spec	1 Dec 2005 03:39:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           krecipes
-Version:        0.8.1
-Release:        3%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
@@ -79,6 +79,8 @@
 
 
 %changelog
+* Wed Nov 11 2005 Dennis Gilmore  - 0.9-1
+- update to 0.9
 * Sat Oct 20 2005 Dennis Gilmore  - 0.8.1-3%{?dist}
 - add BuildRequires desktop-file-utils  http://fedoraproject.org/wiki/QAChecklist
 - add %post and %postun scriptlets  to notify of new icons per


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jul 2005 17:23:12 -0000	1.2
+++ sources	1 Dec 2005 03:39:04 -0000	1.3
@@ -1 +1 @@
-f9049384bad2139f049b9b4eadd7239a  krecipes-0.8.1.tar.gz
+ee1a1463946c63788ff8eeea302a7506  krecipes-0.9.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  1 03:59:17 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Wed, 30 Nov 2005 22:59:17 -0500
Subject: rpms/krecipes/FC-3 krecipes.spec,1.5,1.6
Message-ID: <200512010359.jB13xmEV021476@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21459

Modified Files:
	krecipes.spec 
Log Message:
Fixes




Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-3/krecipes.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- krecipes.spec	1 Dec 2005 03:36:05 -0000	1.5
+++ krecipes.spec	1 Dec 2005 03:59:15 -0000	1.6
@@ -46,7 +46,6 @@
 --add-category=Qt \
 --delete-original \
 $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/krecipes.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -64,9 +63,11 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
 
 
 %files -f %{name}.lang
@@ -76,9 +77,12 @@
 %{_datadir}/applications/fedora-krecipes.desktop
 %{_datadir}/apps/krecipes
 %{_datadir}/icons/hicolor/*/apps/*
-
+%{_datadir}/icons/crystalsvg/*/mimetypes/krecipes_file.png
+%{_datadir}/mimelnk/*/*.desktop
 
 %changelog
+* Wed Nov 11 2005 Dennis Gilmore  - 0.9-2
+- fix missing files
 * Wed Nov 11 2005 Dennis Gilmore  - 0.9-1
 - update to 0.9
 * Sat Oct 20 2005 Dennis Gilmore  - 0.8.1-3%{?dist}



From fedora-extras-commits at redhat.com  Thu Dec  1 04:03:35 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Wed, 30 Nov 2005 23:03:35 -0500
Subject: rpms/krecipes/FC-3 krecipes.spec,1.6,1.7
Message-ID: <200512010404.jB1445Ho023068@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23049

Modified Files:
	krecipes.spec 
Log Message:
Really fix



Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-3/krecipes.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- krecipes.spec	1 Dec 2005 03:59:15 -0000	1.6
+++ krecipes.spec	1 Dec 2005 04:03:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           krecipes
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity



From fedora-extras-commits at redhat.com  Thu Dec  1 04:05:25 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Wed, 30 Nov 2005 23:05:25 -0500
Subject: rpms/krecipes/FC-4 krecipes.spec,1.5,1.6
Message-ID: <200512010405.jB145uXb023129@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23110

Modified Files:
	krecipes.spec 
Log Message:
Fixes for missing files  :)



Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-4/krecipes.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- krecipes.spec	1 Dec 2005 03:37:53 -0000	1.5
+++ krecipes.spec	1 Dec 2005 04:05:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           krecipes
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
@@ -46,7 +46,6 @@
 --add-category=Qt \
 --delete-original \
 $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/krecipes.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -64,9 +63,11 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
 
 
 %files -f %{name}.lang
@@ -76,9 +77,12 @@
 %{_datadir}/applications/fedora-krecipes.desktop
 %{_datadir}/apps/krecipes
 %{_datadir}/icons/hicolor/*/apps/*
-
+%{_datadir}/icons/crystalsvg/*/mimetypes/krecipes_file.png
+%{_datadir}/mimelnk/*/*.desktop
 
 %changelog
+* Wed Nov 11 2005 Dennis Gilmore  - 0.9-2
+- fix missing files
 * Wed Nov 11 2005 Dennis Gilmore  - 0.9-1
 - update to 0.9
 * Sat Oct 20 2005 Dennis Gilmore  - 0.8.1-3%{?dist}



From fedora-extras-commits at redhat.com  Thu Dec  1 04:07:20 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Wed, 30 Nov 2005 23:07:20 -0500
Subject: rpms/krecipes/devel krecipes.spec,1.5,1.6
Message-ID: <200512010407.jB147oQm023190@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23172

Modified Files:
	krecipes.spec 
Log Message:
Fix missing files



Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/krecipes.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- krecipes.spec	1 Dec 2005 03:39:04 -0000	1.5
+++ krecipes.spec	1 Dec 2005 04:07:18 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           krecipes
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
@@ -46,7 +46,6 @@
 --add-category=Qt \
 --delete-original \
 $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/krecipes.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -64,9 +63,11 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
 
 
 %files -f %{name}.lang
@@ -76,9 +77,12 @@
 %{_datadir}/applications/fedora-krecipes.desktop
 %{_datadir}/apps/krecipes
 %{_datadir}/icons/hicolor/*/apps/*
-
+%{_datadir}/icons/crystalsvg/*/mimetypes/krecipes_file.png
+%{_datadir}/mimelnk/*/*.desktop
 
 %changelog
+* Wed Nov 11 2005 Dennis Gilmore  - 0.9-2
+- fix missing files
 * Wed Nov 11 2005 Dennis Gilmore  - 0.9-1
 - update to 0.9
 * Sat Oct 20 2005 Dennis Gilmore  - 0.8.1-3%{?dist}



From fedora-extras-commits at redhat.com  Thu Dec  1 04:18:26 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 30 Nov 2005 23:18:26 -0500
Subject: extras-buildsys/common XMLRPCServerProxy.py,1.7,1.8
Message-ID: <200512010419.jB14JREC023322@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23288/common

Modified Files:
	XMLRPCServerProxy.py 
Log Message:
More test fixups


Index: XMLRPCServerProxy.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLRPCServerProxy.py	1 Dec 2005 03:17:20 -0000	1.7
+++ XMLRPCServerProxy.py	1 Dec 2005 04:18:24 -0000	1.8
@@ -58,10 +58,14 @@
 import threading
 import time
 import random
+import OpenSSL
+import socket
 
 client_start = False
 
-_lock = threading.Lock()
+threadlist_lock = threading.Lock()
+threadlist = {}
+timed_out = 0
 
 class TestClient(threading.Thread):
     def __init__(self, certs, num):
@@ -74,12 +78,22 @@
             time.sleep(0.05)
         i = 0
         while i < 5:
-#            _lock.acquire()
-            reply = self.server.ping(self.num, i)
+            reply = None
+            try:
+                reply = self.server.ping(self.num, i)
+            except OpenSSL.SSL.Error, e:
+                reply = "OpenSSL Error (%s)" % e
+            except socket.timeout, e:
+                reply = "Socket timeout (%s)" % e
+                threadlist_lock.acquire()
+                timed_out = timed_out + 1
+                threadlist_lock.release()
             print "TRY(%d / %d): %s" % (self.num, i, reply)
             time.sleep(0.05)
-#            _lock.release()
             i = i + 1
+        threadlist_lock.acquire()
+        del threadlist[self]
+        threadlist_lock.release()
 
 
 if __name__ == '__main__':
@@ -95,6 +109,7 @@
     i = 100
     while i > 0:
         t = TestClient(certs, i)
+        threadlist[t] = None
         print "Created thread %d." % i
         t.start()
         i = i - 1
@@ -105,6 +120,11 @@
     while True:
         try:
             time.sleep(0.25)
+            threadlist_lock.acquire()
+            if len(threadlist) == 0:
+                break
+            threadlist_lock.release()
         except KeyboardInterrupt:
             os._exit(0)
+    print "All done. (%d timed out)" % timed_out
 



From fedora-extras-commits at redhat.com  Thu Dec  1 04:18:57 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 30 Nov 2005 23:18:57 -0500
Subject: extras-buildsys/common XMLRPCServerProxy.py,1.5.4.2,1.5.4.3
Message-ID: <200512010419.jB14JR7D023325@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23292/common

Modified Files:
      Tag: STABLE_0_4
	XMLRPCServerProxy.py 
Log Message:
More test fixups


Index: XMLRPCServerProxy.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -u -r1.5.4.2 -r1.5.4.3
--- XMLRPCServerProxy.py	1 Dec 2005 03:16:43 -0000	1.5.4.2
+++ XMLRPCServerProxy.py	1 Dec 2005 04:18:55 -0000	1.5.4.3
@@ -58,10 +58,14 @@
 import threading
 import time
 import random
+import OpenSSL
+import socket
 
 client_start = False
 
-_lock = threading.Lock()
+threadlist_lock = threading.Lock()
+threadlist = {}
+timed_out = 0
 
 class TestClient(threading.Thread):
     def __init__(self, certs, num):
@@ -74,12 +78,22 @@
             time.sleep(0.05)
         i = 0
         while i < 5:
-#            _lock.acquire()
-            reply = self.server.ping(self.num, i)
+            reply = None
+            try:
+                reply = self.server.ping(self.num, i)
+            except OpenSSL.SSL.Error, e:
+                reply = "OpenSSL Error (%s)" % e
+            except socket.timeout, e:
+                reply = "Socket timeout (%s)" % e
+                threadlist_lock.acquire()
+                timed_out = timed_out + 1
+                threadlist_lock.release()
             print "TRY(%d / %d): %s" % (self.num, i, reply)
             time.sleep(0.05)
-#            _lock.release()
             i = i + 1
+        threadlist_lock.acquire()
+        del threadlist[self]
+        threadlist_lock.release()
 
 
 if __name__ == '__main__':
@@ -95,6 +109,7 @@
     i = 100
     while i > 0:
         t = TestClient(certs, i)
+        threadlist[t] = None
         print "Created thread %d." % i
         t.start()
         i = i - 1
@@ -105,6 +120,11 @@
     while True:
         try:
             time.sleep(0.25)
+            threadlist_lock.acquire()
+            if len(threadlist) == 0:
+                break
+            threadlist_lock.release()
         except KeyboardInterrupt:
             os._exit(0)
+    print "All done. (%d timed out)" % timed_out
 



From fedora-extras-commits at redhat.com  Thu Dec  1 08:26:05 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu,  1 Dec 2005 03:26:05 -0500
Subject: rpms/cernlib/devel cernlib.spec,1.3,1.4
Message-ID: <200512010826.jB18QZmB030126@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30109

Modified Files:
	cernlib.spec 
Log Message:
Bump release to rebuild now that keywords are not expanded.



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cernlib.spec	30 Nov 2005 22:01:01 -0000	1.3
+++ cernlib.spec	1 Dec 2005 08:26:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -688,7 +688,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Nov 29 2005 Patrice Dumas  - 2005-5
+* Tue Nov 29 2005 Patrice Dumas  - 2005-6
 - update with newer debian patchset for cernlib, fix licence issues
 - don't use the include.tar.gz source, instead get include files from
   the source files



From fedora-extras-commits at redhat.com  Thu Dec  1 10:05:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  1 Dec 2005 05:05:50 -0500
Subject: rpms/xemacs/devel xemacs-21.4.17-utf8-fonts.patch, 1.1,
	1.2 xemacs.spec, 1.15, 1.16
Message-ID: <200512011006.jB1A6NKQ001552@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1519

Modified Files:
	xemacs-21.4.17-utf8-fonts.patch xemacs.spec 
Log Message:
* Wed Nov 30 2005 Ville Skytt??  - 21.4.17-7
- Require ISO-8859-1 fonts (Alexandre Oliva, #174617).
- Make popup dialog font the intended one even without ISO-8859 fonts.
- BuildRequire xmkmf to get X defines during build.
- Move editclient.sh to docs.


xemacs-21.4.17-utf8-fonts.patch:

Index: xemacs-21.4.17-utf8-fonts.patch
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs-21.4.17-utf8-fonts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xemacs-21.4.17-utf8-fonts.patch	27 Nov 2005 22:34:13 -0000	1.1
+++ xemacs-21.4.17-utf8-fonts.patch	1 Dec 2005 10:05:26 -0000	1.2
@@ -23,3 +23,12 @@
  
  ! Gui elements share this font
  !
+@@ -229,7 +229,7 @@
+ ! Some people use 12-point anyway because you get more text, but
+ ! there's no purpose at all in doing this for dialog boxes.
+ 
+-*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*
++*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-*
+ 
+ ! Dialog box translations.
+ ! =======================


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xemacs.spec	27 Nov 2005 22:34:13 -0000	1.15
+++ xemacs.spec	1 Dec 2005 10:05:26 -0000	1.16
@@ -8,7 +8,7 @@
 
 Name:           xemacs
 Version:        21.4.17
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -63,6 +63,7 @@
 BuildRequires:  neXtaw-devel
 %endif # xaw3d
 %endif # gtk
+BuildRequires:  xmkmf
 BuildRequires:  libXau-devel
 # TODO: verify these build deps wrt gtk/xaw3d builds
 BuildRequires:  xorg-x11-xbitmaps
@@ -70,6 +71,8 @@
 BuildRequires:  libXpm-devel
 Requires:       xemacs-sumo >= 20050118-2
 Requires:       xemacs-common = %{version}-%{release}
+Requires:       xorg-x11-fonts-ISO8859-1-75dpi
+Requires:       xorg-x11-fonts-ISO8859-1-100dpi
 
 %description
 XEmacs is a highly customizable open source text editor and
@@ -335,8 +338,8 @@
 
 # clean up "junk" (TODO: there's much more!)
 cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/etc
-rm -r aliases.ksh BETA check_cygwin_setup.sh CODING-STANDARDS InstallGuide \
-    sparcworks tests xemacs-fe.sh XKeysymDB *.sco *.1
+rm -r aliases.ksh BETA *.sh CODING-STANDARDS InstallGuide \
+    sparcworks tests XKeysymDB *.sco *.1 
 cd -
 
 # separate files
@@ -420,6 +423,7 @@
 %defattr(-,root,root,-)
 %doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release
 %doc etc/NEWS etc/MAILINGLISTS BUGS README.packages etc/TUTORIAL
+%doc etc/editclient.sh
 %{_bindir}/ellcc
 %{_bindir}/etags.xemacs
 %{_bindir}/gnuattach
@@ -446,6 +450,12 @@
 
 
 %changelog
+* Wed Nov 30 2005 Ville Skytt??  - 21.4.17-7
+- Require ISO-8859-1 fonts (Alexandre Oliva, #174617).
+- Make popup dialog font the intended one even without ISO-8859 fonts.
+- BuildRequire xmkmf to get X defines during build.
+- Move editclient.sh to docs.
+
 * Mon Nov 28 2005 Ville Skytt??  - 21.4.17-6
 - More modular X.Org fixes (Xauth for gnuclient, menubar font tweak).
 - Re-enable Canna and FreeWnn (bug introduced in 21.4.17-5).



From fedora-extras-commits at redhat.com  Thu Dec  1 10:36:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu,  1 Dec 2005 05:36:33 -0500
Subject: rpms/fyre/devel fyre-cluster.init,1.2,1.3 fyre.spec,1.10,1.11
Message-ID: <200512011037.jB1Ab3UV001715@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1686

Modified Files:
	fyre-cluster.init fyre.spec 
Log Message:
Fix NLS in initscript


Index: fyre-cluster.init
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/fyre-cluster.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fyre-cluster.init	8 Jul 2005 16:44:06 -0000	1.2
+++ fyre-cluster.init	1 Dec 2005 10:36:31 -0000	1.3
@@ -13,6 +13,8 @@
 # Source function library.
 . /etc/init.d/functions
 
+prog="fyre"
+
 . /etc/sysconfig/fyre
 
 ARGS=
@@ -26,7 +28,7 @@
 fi
 
 start() {
-	echo -n "Starting fyre: "
+	echo -n $"Starting $prog: "
 	daemon fyre -r $ARGS --pidfile /var/run/fyre.pid
 	echo
 	touch /var/lock/subsys/fyre-cluster
@@ -34,7 +36,7 @@
 }	
 
 stop() {
-	echo -n "Shutting down fyre: "
+	echo -n $"Stopping $prog: "
 	killproc fyre
 	echo
 	rm -f /var/lock/subsys/fyre-cluster


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/fyre.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fyre.spec	19 Aug 2005 02:51:09 -0000	1.10
+++ fyre.spec	1 Dec 2005 10:36:31 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           fyre
 Version:        1.0.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        A tool for creating artwork from chaotic functions
 Group:          Amusements/Graphics
@@ -75,6 +75,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/fyre
 
 %changelog
+* Thu Dec  1 2005 Ignacio Vazquez-Abrams  1.0.0-11
+- Fix NLS in initscript
+
 * Thu Aug 18 2005 Ignacio Vazquez-Abrams  1.0.0-10
 - Rebuild for new Cairo
 



From fedora-extras-commits at redhat.com  Thu Dec  1 10:54:38 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu,  1 Dec 2005 05:54:38 -0500
Subject: rpms/fyre/FC-3 fyre-cluster.init,1.2,1.3 fyre.spec,1.8,1.9
Message-ID: <200512011055.jB1At8fu001787@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1752/FC-3

Modified Files:
	fyre-cluster.init fyre.spec 
Log Message:
Add NLS to initscript


Index: fyre-cluster.init
===================================================================
RCS file: /cvs/extras/rpms/fyre/FC-3/fyre-cluster.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fyre-cluster.init	8 Jul 2005 16:44:01 -0000	1.2
+++ fyre-cluster.init	1 Dec 2005 10:54:36 -0000	1.3
@@ -13,6 +13,8 @@
 # Source function library.
 . /etc/init.d/functions
 
+prog="fyre"
+
 . /etc/sysconfig/fyre
 
 ARGS=
@@ -26,7 +28,7 @@
 fi
 
 start() {
-	echo -n "Starting fyre: "
+	echo -n $"Starting $prog: "
 	daemon fyre -r $ARGS --pidfile /var/run/fyre.pid
 	echo
 	touch /var/lock/subsys/fyre-cluster
@@ -34,7 +36,7 @@
 }	
 
 stop() {
-	echo -n "Shutting down fyre: "
+	echo -n $"Stopping $prog: "
 	killproc fyre
 	echo
 	rm -f /var/lock/subsys/fyre-cluster


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/FC-3/fyre.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fyre.spec	8 Jul 2005 16:44:01 -0000	1.8
+++ fyre.spec	1 Dec 2005 10:54:36 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           fyre
 Version:        1.0.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        A tool for creating artwork from chaotic functions
 Group:          Amusements/Graphics
@@ -75,6 +75,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/fyre
 
 %changelog
+* Thu Dec  1 2005 Ignacio Vazquez-Abrams  1.0.0-10
+- Fix NLS in initscript
+
 * Fri Jul  8 2005 Ignacio Vazquez-Abrams  1.0.0-9
 - Added restart definition to initscript (#161008)
 



From fedora-extras-commits at redhat.com  Thu Dec  1 10:54:44 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu,  1 Dec 2005 05:54:44 -0500
Subject: rpms/fyre/FC-4 fyre-cluster.init,1.2,1.3 fyre.spec,1.9,1.10
Message-ID: <200512011055.jB1AtE8X001791@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1752/FC-4

Modified Files:
	fyre-cluster.init fyre.spec 
Log Message:
Add NLS to initscript


Index: fyre-cluster.init
===================================================================
RCS file: /cvs/extras/rpms/fyre/FC-4/fyre-cluster.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fyre-cluster.init	8 Jul 2005 16:44:01 -0000	1.2
+++ fyre-cluster.init	1 Dec 2005 10:54:42 -0000	1.3
@@ -13,6 +13,8 @@
 # Source function library.
 . /etc/init.d/functions
 
+prog="fyre"
+
 . /etc/sysconfig/fyre
 
 ARGS=
@@ -26,7 +28,7 @@
 fi
 
 start() {
-	echo -n "Starting fyre: "
+	echo -n $"Starting $prog: "
 	daemon fyre -r $ARGS --pidfile /var/run/fyre.pid
 	echo
 	touch /var/lock/subsys/fyre-cluster
@@ -34,7 +36,7 @@
 }	
 
 stop() {
-	echo -n "Shutting down fyre: "
+	echo -n $"Stopping $prog: "
 	killproc fyre
 	echo
 	rm -f /var/lock/subsys/fyre-cluster


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/FC-4/fyre.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fyre.spec	8 Jul 2005 16:44:01 -0000	1.9
+++ fyre.spec	1 Dec 2005 10:54:42 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           fyre
 Version:        1.0.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        A tool for creating artwork from chaotic functions
 Group:          Amusements/Graphics
@@ -75,6 +75,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/fyre
 
 %changelog
+* Thu Dec  1 2005 Ignacio Vazquez-Abrams  1.0.0-10
+- Fix NLS in initscript
+
 * Fri Jul  8 2005 Ignacio Vazquez-Abrams  1.0.0-9
 - Added restart definition to initscript (#161008)
 



From fedora-extras-commits at redhat.com  Thu Dec  1 11:29:05 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu,  1 Dec 2005 06:29:05 -0500
Subject: rpms/mod_security/FC-4 .cvsignore, 1.3, 1.4 mod_security.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200512011129.jB1BTZuX003578@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3551

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Thu Dec 1 2005 Michael Fleming  1.9.1-1
- New release 1.9.1 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Nov 2005 08:41:38 -0000	1.3
+++ .cvsignore	1 Dec 2005 11:29:03 -0000	1.4
@@ -1 +1 @@
-modsecurity-apache-1.9.tar.gz
+modsecurity-apache-1.9.1.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/mod_security.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_security.spec	22 Nov 2005 08:41:38 -0000	1.4
+++ mod_security.spec	1 Dec 2005 11:29:03 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9
+Version: 1.9.1
 Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
@@ -40,6 +40,9 @@
 %config(noreplace) /etc/httpd/conf.d/mod_security.conf
 
 %changelog
+* Thu Dec 1 2005 Michael Fleming  1.9.1-1
+- New release 1.9.1 
+
 * Wed Nov 9 2005 Michael Fleming  1.9-1
 - New stable upstream release 1.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Nov 2005 08:41:38 -0000	1.3
+++ sources	1 Dec 2005 11:29:03 -0000	1.4
@@ -1 +1 @@
-4685b3d6127f2ab1aef71ed0c80ebcbc  modsecurity-apache-1.9.tar.gz
+d648ba26b1dba708a06344072bea984c  modsecurity-apache-1.9.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  1 11:31:54 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu,  1 Dec 2005 06:31:54 -0500
Subject: rpms/mod_security/FC-3 mod_security.spec,1.7,1.8 sources,1.3,1.4
Message-ID: <200512011132.jB1BWPgX003616@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3596

Modified Files:
	mod_security.spec sources 
Log Message:
* Thu Dec 1 2005 Michael Fleming  1.9.1-1
- New release 1.9.1 



Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/mod_security.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_security.spec	22 Nov 2005 11:46:13 -0000	1.7
+++ mod_security.spec	1 Dec 2005 11:31:52 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9
+Version: 1.9.1
 Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
@@ -40,6 +40,9 @@
 %config(noreplace) /etc/httpd/conf.d/mod_security.conf
 
 %changelog
+* Thu Dec 1 2005 Michael Fleming  1.9.1-1
+- New release 1.9.1 
+
 * Wed Nov 9 2005 Michael Fleming  1.9-1
 - New stable upstream release 1.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Nov 2005 11:46:13 -0000	1.3
+++ sources	1 Dec 2005 11:31:52 -0000	1.4
@@ -1 +1 @@
-4685b3d6127f2ab1aef71ed0c80ebcbc  modsecurity-apache-1.9.tar.gz
+d648ba26b1dba708a06344072bea984c  modsecurity-apache-1.9.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  1 11:33:00 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu,  1 Dec 2005 06:33:00 -0500
Subject: rpms/mod_security/devel mod_security.spec,1.7,1.8 sources,1.3,1.4
Message-ID: <200512011133.jB1BXUDo003650@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3628

Modified Files:
	mod_security.spec sources 
Log Message:
* Thu Dec 1 2005 Michael Fleming  1.9.1-1
- New release 1.9.1 



Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_security.spec	22 Nov 2005 08:39:23 -0000	1.7
+++ mod_security.spec	1 Dec 2005 11:32:58 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9
+Version: 1.9.1
 Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
@@ -40,6 +40,9 @@
 %config(noreplace) /etc/httpd/conf.d/mod_security.conf
 
 %changelog
+* Thu Dec 1 2005 Michael Fleming  1.9.1-1
+- New release 1.9.1 
+
 * Wed Nov 9 2005 Michael Fleming  1.9-1
 - New stable upstream release 1.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Nov 2005 08:39:23 -0000	1.3
+++ sources	1 Dec 2005 11:32:58 -0000	1.4
@@ -1 +1 @@
-4685b3d6127f2ab1aef71ed0c80ebcbc  modsecurity-apache-1.9.tar.gz
+d648ba26b1dba708a06344072bea984c  modsecurity-apache-1.9.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  1 11:39:49 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu,  1 Dec 2005 06:39:49 -0500
Subject: rpms/scim-anthy/FC-3 .cvsignore, 1.6, 1.7 scim-anthy.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <200512011140.jB1BeJVE003858@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/scim-anthy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3837

Modified Files:
	.cvsignore scim-anthy.spec sources 
Log Message:
* Thu Dec  1 2005 Akira TAGOH  - 0.8.0-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Oct 2005 09:54:10 -0000	1.6
+++ .cvsignore	1 Dec 2005 11:39:47 -0000	1.7
@@ -1,2 +1,3 @@
 scim-anthy-0.6.1.tar.gz
 scim-anthy-0.7.1.tar.gz
+scim-anthy-0.8.0.tar.gz


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scim-anthy.spec	17 Oct 2005 09:54:10 -0000	1.14
+++ scim-anthy.spec	1 Dec 2005 11:39:47 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           scim-anthy
-Version:        0.7.1
+Version:        0.8.0
 Release:        1%{?dist}
 
 License:        GPL
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Thu Dec  1 2005 Akira TAGOH  - 0.8.0-1
+- New upstream release.
+
 * Mon Oct 17 2005 Akira TAGOH  - 0.7.1-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Oct 2005 09:54:10 -0000	1.7
+++ sources	1 Dec 2005 11:39:47 -0000	1.8
@@ -1 +1 @@
-c0cc77402b8c9aa1fc0525398ef1cb90  scim-anthy-0.7.1.tar.gz
+869df30ecbbbfe43b0758f3b074ed0c9  scim-anthy-0.8.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  1 11:48:43 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu,  1 Dec 2005 06:48:43 -0500
Subject: rpms/scim-anthy/FC-4 .cvsignore, 1.7, 1.8 scim-anthy.spec, 1.21,
	1.22 sources, 1.9, 1.10
Message-ID: <200512011149.jB1BnDLV003953@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/scim-anthy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3932

Modified Files:
	.cvsignore scim-anthy.spec sources 
Log Message:
* Thu Dec  1 2005 Akira TAGOH  - 0.8.0-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Oct 2005 09:57:50 -0000	1.7
+++ .cvsignore	1 Dec 2005 11:48:41 -0000	1.8
@@ -1,2 +1,3 @@
 scim-anthy-0.6.1.tar.gz
 scim-anthy-0.7.1.tar.gz
+scim-anthy-0.8.0.tar.gz


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- scim-anthy.spec	17 Oct 2005 09:57:50 -0000	1.21
+++ scim-anthy.spec	1 Dec 2005 11:48:41 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           scim-anthy
-Version:        0.7.1
+Version:        0.8.0
 Release:        1%{?dist}
 
 License:        GPL
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Thu Dec  1 2005 Akira TAGOH  - 0.8.0-1
+- New upstream release.
+
 * Mon Oct 17 2005 Akira TAGOH  - 0.7.1-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	17 Oct 2005 09:57:50 -0000	1.9
+++ sources	1 Dec 2005 11:48:41 -0000	1.10
@@ -1 +1 @@
-c0cc77402b8c9aa1fc0525398ef1cb90  scim-anthy-0.7.1.tar.gz
+869df30ecbbbfe43b0758f3b074ed0c9  scim-anthy-0.8.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  1 13:17:23 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu,  1 Dec 2005 08:17:23 -0500
Subject: rpms/deskbar-applet/devel deskbar-applet.spec, 1.8, 1.9 fedorabz.py,
	1.2, 1.3
Message-ID: <200512011317.jB1DHrS6007493@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7474

Modified Files:
	deskbar-applet.spec fedorabz.py 
Log Message:
Fixed bugs in Fedora BZ handler


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- deskbar-applet.spec	27 Nov 2005 06:27:07 -0000	1.8
+++ deskbar-applet.spec	1 Dec 2005 13:17:21 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           deskbar-applet
 Version:        0.8.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -60,6 +60,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Dec  1 2005 Ignacio Vazquez-Abrams  0.8.5-2
+- Fixed bugs in Fedora BZ handler
+
 * Sun Nov 27 2005 Ignacio Vazquez-Abrams  0.8.5-1
 - Upstream update
 


Index: fedorabz.py
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/fedorabz.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedorabz.py	27 Nov 2005 06:27:07 -0000	1.2
+++ fedorabz.py	1 Dec 2005 13:17:21 -0000	1.3
@@ -2,6 +2,7 @@
 
 import deskbar, deskbar.indexer
 import deskbar.handler
+import gnomevfs
 
 HANDLERS = {
 	"FedoraBZHandler" : {
@@ -31,4 +32,4 @@
 		
 	def query(self, query, max=5):
 		if query.isdigit():
-			return [FedorabzMatch(self, query)]
+			return [FedoraBZMatch(self, query)]



From fedora-extras-commits at redhat.com  Thu Dec  1 13:28:36 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  1 Dec 2005 08:28:36 -0500
Subject: rpms/keychain/FC-4 .cvsignore, 1.2, 1.3 README.Fedora, 1.1,
	1.2 keychain-manpage.patch, 1.1, 1.2 keychain.csh, 1.2,
	1.3 keychain.sh, 1.2, 1.3 keychain.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200512011329.jB1DT7xc007592@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/keychain/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7542/FC-4

Modified Files:
	.cvsignore README.Fedora keychain-manpage.patch keychain.csh 
	keychain.sh keychain.spec sources 
Log Message:
* Sat Nov 26 2005 Ville Skytt??  - 2.6.1-1
- Update to 2.6.1.
- Invoke keychain with --noask in opt-in scripts in non-interactive shells
  to fix scp'ing to an opt-in enabled account for which keychain hasn't run.
- Make opt-in config work the same way with zsh as with other shells.
- Replace tweaks in manpage patch with more generic instructions.
- Make profile.d snippets non-executable (#35714).
- Preserve timestamps of installed files, other cosmetics.

(See #174262 for more info.)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2005 02:55:43 -0000	1.2
+++ .cvsignore	1 Dec 2005 13:28:34 -0000	1.3
@@ -1 +1 @@
-keychain-2.5.5.tar.bz2
+keychain-2.6.1.tar.bz2


Index: README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.Fedora	5 Aug 2005 02:55:43 -0000	1.1
+++ README.Fedora	1 Dec 2005 13:28:34 -0000	1.2
@@ -7,9 +7,8 @@
 different options are documented in keychain(1).
 
 Installed from Fedora Extras keychain can be easily activated by simply
-touching an empty ~/.keychainrc file when using either bash, sh, ksh, csh or
-tcsh. zsh shell users will have to add a `/etc/profile.d/keychain.sh' call to
-their ~/.zlogin file.
+touching an empty ~/.keychainrc file when using either bash, sh, ksh, zsh,
+csh or tcsh.
 This will let the user's shell invoke a default setup of keychain where it
 loads all user's ssh keys from ~/.ssh/ to an ssh-agent process. gpg keys are
 not loaded by default as the necessary gpg-agent is not part of the Fedora

keychain-manpage.patch:

Index: keychain-manpage.patch
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/keychain-manpage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keychain-manpage.patch	5 Aug 2005 02:55:43 -0000	1.1
+++ keychain-manpage.patch	1 Dec 2005 13:28:34 -0000	1.2
@@ -1,79 +1,36 @@
-diff -Naru keychain-2.5.0.orig/keychain.1 keychain-2.5.0/keychain.1
---- keychain-2.5.0.orig/keychain.1	2005-01-08 04:02:36.000000000 +0200
-+++ keychain-2.5.0/keychain.1	2005-01-08 13:49:25.542402807 +0200
-@@ -291,9 +291,11 @@
+--- keychain-2.6.1/keychain.1~	2005-10-10 22:40:23.000000000 +0300
++++ keychain-2.6.1/keychain.1	2005-11-26 16:56:14.000000000 +0200
+@@ -303,8 +303,13 @@
+ Show version information.
  .SH "EXAMPLES"
  .IX Header "EXAMPLES"
- This snippet would work in .bash_profile (for bash) or .zlogin (for
--zsh) to load two ssh keys and one gpg key:
-+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID
-+0123ABCD):
+-This snippet should work in any shell to load two ssh keys and one gpg
+-key:
++Note that the examples below assume that keychain is available on the
++machine they're run.  If you're using them in your login profile snippets
++that are shared between systems, it may be a good idea to protect their
++invocation by first checking if keychain is indeed available.
++.PP
++This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa)
++and one gpg key (key id 0123ABCD):
  .PP
- .Vb 5
-+\&    which keychain &>/dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \e
- \&                source $HOME/.keychain/$HOSTNAME-sh
-@@ -305,6 +307,7 @@
- \&.profile:
- .PP
- .Vb 6
-+\&    which keychain >/dev/null 2>/dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        host=`uname -n`
- \&        [ -f $HOME/.keychain/$host-sh ] && \e
-@@ -316,6 +319,7 @@
- This snippet would work in .login for tcsh:
- .PP
- .Vb 7
-+\&    which keychain >& /dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        if (-f $HOME/.keychain/$HOST-csh) then
- \&                source $HOME/.keychain/$HOST-csh
-@@ -328,6 +332,7 @@
- This snippet would work in .login for csh:
- .PP
- .Vb 8
-+\&    which keychain >& /dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        host=`uname -n`
- \&        if (-f $HOME/.keychain/$host-csh) then
-diff -Naru keychain-2.5.0.orig/keychain.pod keychain-2.5.0/keychain.pod
---- keychain-2.5.0.orig/keychain.pod	2005-01-08 04:02:36.000000000 +0200
-+++ keychain-2.5.0/keychain.pod	2005-01-08 13:49:44.002694389 +0200
-@@ -193,8 +193,10 @@
- =head1 EXAMPLES
+ .Vb 1
+ \&    eval `keychain --eval id_rsa id_dsa 0123ABCD`
+--- keychain-2.6.1/keychain.pod~	2005-10-10 22:40:23.000000000 +0300
++++ keychain-2.6.1/keychain.pod	2005-11-26 16:57:25.000000000 +0200
+@@ -207,8 +207,13 @@
  
- This snippet would work in .bash_profile (for bash) or .zlogin (for
--zsh) to load two ssh keys and one gpg key:
-+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID
-+0123ABCD):
- 
-+    which keychain &>/dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	[[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \
- 		source $HOME/.keychain/$HOSTNAME-sh
-@@ -204,6 +206,7 @@
- For other Bourne-compatible shells such as sh, you can use this in
- .profile:
- 
-+    which keychain >/dev/null 2>/dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	host=`uname -n`
- 	[ -f $HOME/.keychain/$host-sh ] && \
-@@ -213,6 +216,7 @@
- 
- This snippet would work in .login for tcsh:
+ =head1 EXAMPLES
  
-+    which keychain >& /dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	if (-f $HOME/.keychain/$HOST-csh) then
- 		source $HOME/.keychain/$HOST-csh
-@@ -223,6 +227,7 @@
+-This snippet should work in any shell to load two ssh keys and one gpg
+-key:
++Note that the examples below assume that keychain is available on the
++machine they're run.  If you're using them in your login profile snippets
++that are shared between systems, it may be a good idea to protect their
++invocation by first checking if keychain is indeed available.
++
++This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa)
++and one gpg key (key id 0123ABCD):
  
- This snippet would work in .login for csh:
+     eval `keychain --eval id_rsa id_dsa 0123ABCD`
  
-+    which keychain >& /dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	host=`uname -n`
- 	if (-f $HOME/.keychain/$host-csh) then


Index: keychain.csh
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/keychain.csh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.csh	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.csh	1 Dec 2005 13:28:34 -0000	1.3
@@ -10,10 +10,13 @@
     if (! $?KCHOPTS) then
 	set KCHOPTS = "--quiet"
     endif
+    if (! $?prompt) then
+	set KCHOPTS = ( $KCHOPTS --noask )
+    endif
     if (! $?SSHKEYS) then
 	set SSHKEYS = `grep -l -e '[DRS]S[AH] PRIVATE KEY' $HOME/.ssh/*`
     endif
-    if (! $?GPGKEYS ) then
+    if (! $?GPGKEYS) then
 	set GPGKEYS = ""
     endif
 


Index: keychain.sh
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/keychain.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.sh	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.sh	1 Dec 2005 13:28:34 -0000	1.3
@@ -7,11 +7,19 @@
     . $HOME/.keychainrc
 
     [ -n "$KCHOPTS" ] || KCHOPTS="--quiet"
+    case $- in
+	*i*) ;;
+	*) KCHOPTS="$KCHOPTS --noask" ;;
+    esac
     [ -n "$SSHKEYS" ] || SSHKEYS=`grep -l -e '[DRS]S[AH] PRIVATE KEY' \
 							   $HOME/.ssh/*`
     [ -n "$GPGKEYS" ] || GPGKEYS=""
 
-    keychain $KCHOPTS $SSHKEYS $GPGKEYS
+    if [ -n "$ZSH_VERSION" ] ; then
+	keychain ${=KCHOPTS} ${=SSHKEYS} ${=GPGKEYS}
+    else
+	keychain $KCHOPTS $SSHKEYS $GPGKEYS
+    fi
 
     HOST=`uname -n`
     [ -f $HOME/.keychain/$HOST-sh ] && \


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/keychain.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keychain.spec	10 Sep 2005 15:57:00 -0000	1.3
+++ keychain.spec	1 Dec 2005 13:28:34 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
-Version:	2.5.5
-Release:	2%{?dist}
+Version:	2.6.1
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.gentoo.org/proj/en/keychain/
@@ -31,11 +31,11 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 mkdir -p %{buildroot}%{_mandir}/man1
-install -m 755 keychain %{buildroot}%{_bindir}/keychain
-install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh
-install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh
-install -m 644 keychain.1 %{buildroot}%{_mandir}/man1
-install -m 644 %{SOURCE3} README.Fedora
+install -pm 755 keychain %{buildroot}%{_bindir}/keychain
+install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh
+install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh
+install -pm 644 keychain.1 %{buildroot}%{_mandir}/man1
+install -pm 644 %{SOURCE3} README.Fedora
 
 %clean
 rm -rf %{buildroot}
@@ -43,12 +43,21 @@
 %files
 %defattr(-,root,root)
 %doc COPYING ChangeLog README README.Fedora
-%doc %{_mandir}/man1/keychain.1.gz
-%{_bindir}/keychain
 %config(noreplace) %{_sysconfdir}/profile.d/keychain.sh
 %config(noreplace) %{_sysconfdir}/profile.d/keychain.csh
+%{_bindir}/keychain
+%{_mandir}/man1/keychain.1*
 
 %changelog
+* Sat Nov 26 2005 Ville Skytt??  - 2.6.1-1
+- Update to 2.6.1.
+- Invoke keychain with --noask in opt-in scripts in non-interactive shells
+  to fix scp'ing to an opt-in enabled account for which keychain hasn't run.
+- Make opt-in config work the same way with zsh as with other shells.
+- Replace tweaks in manpage patch with more generic instructions.
+- Make profile.d snippets non-executable (#35714).
+- Preserve timestamps of installed files, other cosmetics.
+
 * Tue Aug 16 2005  Alexander Dalloz  - 2.5.5-2
 - Added test for homedir mismatch in opt-in scripts, covering
   `sudo -s' (reported by Ville Skytt??).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2005 02:55:43 -0000	1.2
+++ sources	1 Dec 2005 13:28:34 -0000	1.3
@@ -1 +1 @@
-3afa5ce32a5c57e43caac82db3396aac  keychain-2.5.5.tar.bz2
+408caf4fe29cd88d5684410ef896c33d  keychain-2.6.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec  1 13:28:42 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  1 Dec 2005 08:28:42 -0500
Subject: rpms/keychain/devel .cvsignore, 1.2, 1.3 README.Fedora, 1.1,
	1.2 keychain-manpage.patch, 1.1, 1.2 keychain.csh, 1.2,
	1.3 keychain.sh, 1.2, 1.3 keychain.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200512011329.jB1DTCuY007604@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/keychain/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7542/devel

Modified Files:
	.cvsignore README.Fedora keychain-manpage.patch keychain.csh 
	keychain.sh keychain.spec sources 
Log Message:
* Sat Nov 26 2005 Ville Skytt??  - 2.6.1-1
- Update to 2.6.1.
- Invoke keychain with --noask in opt-in scripts in non-interactive shells
  to fix scp'ing to an opt-in enabled account for which keychain hasn't run.
- Make opt-in config work the same way with zsh as with other shells.
- Replace tweaks in manpage patch with more generic instructions.
- Make profile.d snippets non-executable (#35714).
- Preserve timestamps of installed files, other cosmetics.

(See #174262 for more info.)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2005 02:55:43 -0000	1.2
+++ .cvsignore	1 Dec 2005 13:28:40 -0000	1.3
@@ -1 +1 @@
-keychain-2.5.5.tar.bz2
+keychain-2.6.1.tar.bz2


Index: README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.Fedora	5 Aug 2005 02:55:43 -0000	1.1
+++ README.Fedora	1 Dec 2005 13:28:40 -0000	1.2
@@ -7,9 +7,8 @@
 different options are documented in keychain(1).
 
 Installed from Fedora Extras keychain can be easily activated by simply
-touching an empty ~/.keychainrc file when using either bash, sh, ksh, csh or
-tcsh. zsh shell users will have to add a `/etc/profile.d/keychain.sh' call to
-their ~/.zlogin file.
+touching an empty ~/.keychainrc file when using either bash, sh, ksh, zsh,
+csh or tcsh.
 This will let the user's shell invoke a default setup of keychain where it
 loads all user's ssh keys from ~/.ssh/ to an ssh-agent process. gpg keys are
 not loaded by default as the necessary gpg-agent is not part of the Fedora

keychain-manpage.patch:

Index: keychain-manpage.patch
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/keychain-manpage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keychain-manpage.patch	5 Aug 2005 02:55:43 -0000	1.1
+++ keychain-manpage.patch	1 Dec 2005 13:28:40 -0000	1.2
@@ -1,79 +1,36 @@
-diff -Naru keychain-2.5.0.orig/keychain.1 keychain-2.5.0/keychain.1
---- keychain-2.5.0.orig/keychain.1	2005-01-08 04:02:36.000000000 +0200
-+++ keychain-2.5.0/keychain.1	2005-01-08 13:49:25.542402807 +0200
-@@ -291,9 +291,11 @@
+--- keychain-2.6.1/keychain.1~	2005-10-10 22:40:23.000000000 +0300
++++ keychain-2.6.1/keychain.1	2005-11-26 16:56:14.000000000 +0200
+@@ -303,8 +303,13 @@
+ Show version information.
  .SH "EXAMPLES"
  .IX Header "EXAMPLES"
- This snippet would work in .bash_profile (for bash) or .zlogin (for
--zsh) to load two ssh keys and one gpg key:
-+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID
-+0123ABCD):
+-This snippet should work in any shell to load two ssh keys and one gpg
+-key:
++Note that the examples below assume that keychain is available on the
++machine they're run.  If you're using them in your login profile snippets
++that are shared between systems, it may be a good idea to protect their
++invocation by first checking if keychain is indeed available.
++.PP
++This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa)
++and one gpg key (key id 0123ABCD):
  .PP
- .Vb 5
-+\&    which keychain &>/dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \e
- \&                source $HOME/.keychain/$HOSTNAME-sh
-@@ -305,6 +307,7 @@
- \&.profile:
- .PP
- .Vb 6
-+\&    which keychain >/dev/null 2>/dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        host=`uname -n`
- \&        [ -f $HOME/.keychain/$host-sh ] && \e
-@@ -316,6 +319,7 @@
- This snippet would work in .login for tcsh:
- .PP
- .Vb 7
-+\&    which keychain >& /dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        if (-f $HOME/.keychain/$HOST-csh) then
- \&                source $HOME/.keychain/$HOST-csh
-@@ -328,6 +332,7 @@
- This snippet would work in .login for csh:
- .PP
- .Vb 8
-+\&    which keychain >& /dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        host=`uname -n`
- \&        if (-f $HOME/.keychain/$host-csh) then
-diff -Naru keychain-2.5.0.orig/keychain.pod keychain-2.5.0/keychain.pod
---- keychain-2.5.0.orig/keychain.pod	2005-01-08 04:02:36.000000000 +0200
-+++ keychain-2.5.0/keychain.pod	2005-01-08 13:49:44.002694389 +0200
-@@ -193,8 +193,10 @@
- =head1 EXAMPLES
+ .Vb 1
+ \&    eval `keychain --eval id_rsa id_dsa 0123ABCD`
+--- keychain-2.6.1/keychain.pod~	2005-10-10 22:40:23.000000000 +0300
++++ keychain-2.6.1/keychain.pod	2005-11-26 16:57:25.000000000 +0200
+@@ -207,8 +207,13 @@
  
- This snippet would work in .bash_profile (for bash) or .zlogin (for
--zsh) to load two ssh keys and one gpg key:
-+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID
-+0123ABCD):
- 
-+    which keychain &>/dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	[[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \
- 		source $HOME/.keychain/$HOSTNAME-sh
-@@ -204,6 +206,7 @@
- For other Bourne-compatible shells such as sh, you can use this in
- .profile:
- 
-+    which keychain >/dev/null 2>/dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	host=`uname -n`
- 	[ -f $HOME/.keychain/$host-sh ] && \
-@@ -213,6 +216,7 @@
- 
- This snippet would work in .login for tcsh:
+ =head1 EXAMPLES
  
-+    which keychain >& /dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	if (-f $HOME/.keychain/$HOST-csh) then
- 		source $HOME/.keychain/$HOST-csh
-@@ -223,6 +227,7 @@
+-This snippet should work in any shell to load two ssh keys and one gpg
+-key:
++Note that the examples below assume that keychain is available on the
++machine they're run.  If you're using them in your login profile snippets
++that are shared between systems, it may be a good idea to protect their
++invocation by first checking if keychain is indeed available.
++
++This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa)
++and one gpg key (key id 0123ABCD):
  
- This snippet would work in .login for csh:
+     eval `keychain --eval id_rsa id_dsa 0123ABCD`
  
-+    which keychain >& /dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	host=`uname -n`
- 	if (-f $HOME/.keychain/$host-csh) then


Index: keychain.csh
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/keychain.csh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.csh	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.csh	1 Dec 2005 13:28:40 -0000	1.3
@@ -10,10 +10,13 @@
     if (! $?KCHOPTS) then
 	set KCHOPTS = "--quiet"
     endif
+    if (! $?prompt) then
+	set KCHOPTS = ( $KCHOPTS --noask )
+    endif
     if (! $?SSHKEYS) then
 	set SSHKEYS = `grep -l -e '[DRS]S[AH] PRIVATE KEY' $HOME/.ssh/*`
     endif
-    if (! $?GPGKEYS ) then
+    if (! $?GPGKEYS) then
 	set GPGKEYS = ""
     endif
 


Index: keychain.sh
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/keychain.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.sh	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.sh	1 Dec 2005 13:28:40 -0000	1.3
@@ -7,11 +7,19 @@
     . $HOME/.keychainrc
 
     [ -n "$KCHOPTS" ] || KCHOPTS="--quiet"
+    case $- in
+	*i*) ;;
+	*) KCHOPTS="$KCHOPTS --noask" ;;
+    esac
     [ -n "$SSHKEYS" ] || SSHKEYS=`grep -l -e '[DRS]S[AH] PRIVATE KEY' \
 							   $HOME/.ssh/*`
     [ -n "$GPGKEYS" ] || GPGKEYS=""
 
-    keychain $KCHOPTS $SSHKEYS $GPGKEYS
+    if [ -n "$ZSH_VERSION" ] ; then
+	keychain ${=KCHOPTS} ${=SSHKEYS} ${=GPGKEYS}
+    else
+	keychain $KCHOPTS $SSHKEYS $GPGKEYS
+    fi
 
     HOST=`uname -n`
     [ -f $HOME/.keychain/$HOST-sh ] && \


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/keychain.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keychain.spec	10 Sep 2005 15:57:01 -0000	1.3
+++ keychain.spec	1 Dec 2005 13:28:40 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
-Version:	2.5.5
-Release:	2%{?dist}
+Version:	2.6.1
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.gentoo.org/proj/en/keychain/
@@ -31,11 +31,11 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 mkdir -p %{buildroot}%{_mandir}/man1
-install -m 755 keychain %{buildroot}%{_bindir}/keychain
-install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh
-install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh
-install -m 644 keychain.1 %{buildroot}%{_mandir}/man1
-install -m 644 %{SOURCE3} README.Fedora
+install -pm 755 keychain %{buildroot}%{_bindir}/keychain
+install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh
+install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh
+install -pm 644 keychain.1 %{buildroot}%{_mandir}/man1
+install -pm 644 %{SOURCE3} README.Fedora
 
 %clean
 rm -rf %{buildroot}
@@ -43,12 +43,21 @@
 %files
 %defattr(-,root,root)
 %doc COPYING ChangeLog README README.Fedora
-%doc %{_mandir}/man1/keychain.1.gz
-%{_bindir}/keychain
 %config(noreplace) %{_sysconfdir}/profile.d/keychain.sh
 %config(noreplace) %{_sysconfdir}/profile.d/keychain.csh
+%{_bindir}/keychain
+%{_mandir}/man1/keychain.1*
 
 %changelog
+* Sat Nov 26 2005 Ville Skytt??  - 2.6.1-1
+- Update to 2.6.1.
+- Invoke keychain with --noask in opt-in scripts in non-interactive shells
+  to fix scp'ing to an opt-in enabled account for which keychain hasn't run.
+- Make opt-in config work the same way with zsh as with other shells.
+- Replace tweaks in manpage patch with more generic instructions.
+- Make profile.d snippets non-executable (#35714).
+- Preserve timestamps of installed files, other cosmetics.
+
 * Tue Aug 16 2005  Alexander Dalloz  - 2.5.5-2
 - Added test for homedir mismatch in opt-in scripts, covering
   `sudo -s' (reported by Ville Skytt??).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2005 02:55:43 -0000	1.2
+++ sources	1 Dec 2005 13:28:40 -0000	1.3
@@ -1 +1 @@
-3afa5ce32a5c57e43caac82db3396aac  keychain-2.5.5.tar.bz2
+408caf4fe29cd88d5684410ef896c33d  keychain-2.6.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec  1 14:45:04 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu,  1 Dec 2005 09:45:04 -0500
Subject: rpms/octave/devel octave-2.9.4-x86_64.patch, NONE, 1.1 octave.spec,
	1.24, 1.25
Message-ID: <200512011445.jB1EjYNw009525@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9505

Modified Files:
	octave.spec 
Added Files:
	octave-2.9.4-x86_64.patch 
Log Message:
Add x86_64 patch.

octave-2.9.4-x86_64.patch:

--- NEW FILE octave-2.9.4-x86_64.patch ---
--- octave-2.9.4/src/DLD-FUNCTIONS/spchol.cc.orig	2005-11-11 10:44:05.000000000 -0700
+++ octave-2.9.4/src/DLD-FUNCTIONS/spchol.cc	2005-11-30 15:41:35.000000000 -0700
@@ -609,7 +609,11 @@
 	  for (octave_idx_type k = 0 ; k < n ; k++)
 	    {
 	      // get the kth row of L and store in the columns of L
+#ifdef IDX_TYPE_LONG
+	      cholmod_l_row_subtree (A1, A2, k, Parent, R, cm) ;
+#else
 	      cholmod_row_subtree (A1, A2, k, Parent, R, cm) ;
+#endif
 	      for (octave_idx_type p = 0 ; p < Rp [1] ; p++)
 		L.xridx (W [Ri [p]]++) = k ;
 


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- octave.spec	12 Nov 2005 06:02:28 -0000	1.24
+++ octave.spec	1 Dec 2005 14:45:02 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           octave
 Version:        2.9.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -8,6 +8,7 @@
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
 Patch0:         octave-2.9.4-header.patch
+Patch1:         octave-2.9.4-x86_64.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -51,6 +52,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 ./autogen.sh
 
 
@@ -63,7 +65,8 @@
 CPPFLAGS=-I%{_includedir}/glpk \
 CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" ./configure %enable64 \
 	--enable-shared=yes --enable-lite-kernel --enable-static=no \
-	--prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir}
+	--prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir} \
+	--mandir=%{_mandir}
 make %{?_smp_mflags}
 
 
@@ -72,7 +75,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f doc/interpreter/munge-texi doc/interpreter/*.o
 strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct
 
@@ -82,7 +85,6 @@
 
 perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/ls-R
 perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_datadir}/%{name}/ls-R
-perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/%{version}/oct/*/PKG_ADD
 
 
 # XXX Nuke unpackaged files
@@ -129,6 +131,9 @@
 
 
 %changelog
+* Thu Dec  1 2005 Quentin Spencer  2.9.4-2
+- Patch to enable compilation on x86_64.
+
 * Fri Nov 11 2005 Quentin Spencer  2.9.4-1
 - New upstream release.
 - Patch to make sure all headers are included in -devel.



From fedora-extras-commits at redhat.com  Thu Dec  1 14:46:40 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu,  1 Dec 2005 09:46:40 -0500
Subject: rpms/cernlib/devel 705-patch-paw_motif-paw-Imakefiles.dpatch, 1.1,
	1.2
Message-ID: <200512011447.jB1ElA5s009591@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9536

Modified Files:
	705-patch-paw_motif-paw-Imakefiles.dpatch 
Log Message:
build in mathlib before building pawlib to have a shared library for linking.



Index: 705-patch-paw_motif-paw-Imakefiles.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/705-patch-paw_motif-paw-Imakefiles.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 705-patch-paw_motif-paw-Imakefiles.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 705-patch-paw_motif-paw-Imakefiles.dpatch	1 Dec 2005 14:46:38 -0000	1.2
@@ -13,7 +13,7 @@
  
  
 -LIBDIRS= kernlib packlib code_motif pawlib graflib mathlib geant321 mclibs phtools
-+LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
++LIBDIRS= kernlib packlib code_motif graflib mathlib pawlib paw_motif geant321 mclibs phtools
  
  SUBDIRS= $(LIBDIRS) patchy cfortran
  



From fedora-extras-commits at redhat.com  Thu Dec  1 14:47:57 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu,  1 Dec 2005 09:47:57 -0500
Subject: rpms/cernlib/devel cernlib.spec,1.4,1.5
Message-ID: <200512011448.jB1EmRbP009614@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9597

Modified Files:
	cernlib.spec 
Log Message:
Bump version to recompile



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cernlib.spec	1 Dec 2005 08:26:03 -0000	1.4
+++ cernlib.spec	1 Dec 2005 14:47:54 -0000	1.5
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       6%{?dist}
+Release:       6%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -688,7 +688,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Nov 29 2005 Patrice Dumas  - 2005-6
+* Tue Nov 29 2005 Patrice Dumas  - 2005-6.1
 - update with newer debian patchset for cernlib, fix licence issues
 - don't use the include.tar.gz source, instead get include files from
   the source files



From fedora-extras-commits at redhat.com  Thu Dec  1 14:57:46 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu,  1 Dec 2005 09:57:46 -0500
Subject: rpms/octave/devel octave-2.9.4-x86_64.patch, 1.1, 1.2 octave.spec,
	1.25, 1.26
Message-ID: <200512011458.jB1EwGue009734@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9684

Modified Files:
	octave-2.9.4-x86_64.patch octave.spec 
Log Message:
Make sure patch applies before building.

octave-2.9.4-x86_64.patch:

Index: octave-2.9.4-x86_64.patch
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave-2.9.4-x86_64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- octave-2.9.4-x86_64.patch	1 Dec 2005 14:45:02 -0000	1.1
+++ octave-2.9.4-x86_64.patch	1 Dec 2005 14:57:44 -0000	1.2
@@ -1,5 +1,5 @@
---- octave-2.9.4/src/DLD-FUNCTIONS/spchol.cc.orig	2005-11-11 10:44:05.000000000 -0700
-+++ octave-2.9.4/src/DLD-FUNCTIONS/spchol.cc	2005-11-30 15:41:35.000000000 -0700
+--- src/DLD-FUNCTIONS/spchol.cc.orig	2005-11-11 10:44:05.000000000 -0700
++++ src/DLD-FUNCTIONS/spchol.cc	2005-11-30 15:41:35.000000000 -0700
 @@ -609,7 +609,11 @@
  	  for (octave_idx_type k = 0 ; k < n ; k++)
  	    {


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- octave.spec	1 Dec 2005 14:45:02 -0000	1.25
+++ octave.spec	1 Dec 2005 14:57:44 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           octave
 Version:        2.9.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Thu Dec  1 2005 Quentin Spencer  2.9.4-3
+- Make sure patch applies correctly before building!
+
 * Thu Dec  1 2005 Quentin Spencer  2.9.4-2
 - Patch to enable compilation on x86_64.
 



From fedora-extras-commits at redhat.com  Thu Dec  1 15:10:32 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  1 Dec 2005 10:10:32 -0500
Subject: rpms/gc/FC-4 gc.spec,1.12,1.13
Message-ID: <200512011510.jB1FAWme011405@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11371/FC-4

Modified Files:
	gc.spec 
Log Message:

Summary: C++ Garbage Collector	
Name:    gc	
Version: 6.6

Release: 4%{?dist}
Group:   System Environment/Libraries
License: BSD
Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# force no undefined symbols (#166344)
Patch1: gc-6.6-no-undefined.patch
BuildRequires: libtool
BuildRequires: automake 

Provides: libgc = %{version}-%{release}


%description
The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage 
collecting replacement for C malloc or C++ new.

%package devel
Summary: Libraries and header files for %{name} development 
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
Provides: libgc-devel = %{version}-%{release}
%description devel
Libraries and header files for %{name} development.


%prep
%setup -q -n %{name}%{version}

%patch1 -p1 -b .no-undefined

cp -f %{_datadir}/aclocal/libtool.m4 .
libtoolize --copy --force
aclocal
automake
autoconf
#autoheader


%build

%configure \
  --disable-static \
  --enable-cplusplus \
  --enable-threads=posix \
%ifarch %{ix86}
  --enable-parallel-mark
%endif

make %{?_smp_mflags}


%check || :
make check


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT 

install -p -D -m644 doc/gc.man	$RPM_BUILD_ROOT%{_mandir}/man3/gc.3

## Unpackaged files
rm -rf $RPM_BUILD_ROOT%{_datadir}/gc
rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la


%clean
rm -rf $RPM_BUILD_ROOT


%post   -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files 
%defattr(-,root,root)
%doc doc/README doc/README.changes doc/README.contributors 
%doc doc/README.environment doc/README.linux
%{_libdir}/lib*.so.*

%files devel
%defattr(-,root,root)
%doc doc/*.html
%{_includedir}/*
%{_libdir}/lib*.so
%{_mandir}/man?/*


%changelog
* Thu Dec 01 2005 Rex Dieter  6.6-4
- Provides: libgc(-devel)

* Wed Sep 14 2005 Rex Dieter  6.6-3
- no-undefined patch, libtool madness (#166344)

* Mon Sep 12 2005 Rex Dieter  6.6-2
- drop opendl patch (doesn't appear to be needed anymore)

* Fri Sep 09 2005 Rex Dieter  6.6-1
- 6.6

* Wed May 25 2005 Rex Dieter  6.5-1
- 6.5

* Fri Apr  7 2005 Michael Schwendt 
- rebuilt

* Wed Jan 26 2005 Rex Dieter  0:6.4-2
- --enable-threads unconditionally
- --enable-parallel-mark only on %%ix86 (#144681)

* Mon Jan 10 2005 Rex Dieter  0:6.4-1
- 6.4
- update opendl patch

* Fri Jul 09 2004 Rex Dieter  0:6.3-0.fdr.1
- 6.3(final)

* Tue Jun 01 2004 Rex Dieter  0:6.3-0.fdr.0.4.alpha6
- dlopen patch

* Wed May 26 2004 Rex Dieter  0:6.3-0.fdr.0.3.alpha6
- explictly --enable-threads ('n friends)

* Tue May 25 2004 Rex Dieter  0:6.3-0.fdr.0.2.alpha6
- 6.3alpha6
- --disable-static
- --enable-parallel-mark

* Wed Dec 17 2003 Rex Dieter  0:6.3-0.fdr.0.1.alpha2
- 6.3alpha2

* Thu Oct 02 2003 Rex Dieter  0:6.2-0.fdr.3
- OK, put manpage in man3.

* Thu Oct 02 2003 Rex Dieter  0:6.2-0.fdr.2
- drop manpage pending feedback from developer. 

* Tue Sep 30 2003 Rex Dieter  0:6.2-0.fdr.1
- fix manpage location 
- remove .la file (it appears unnecessary after all, thanks to opendl patch)
- remove cvs tag from description
- touchup -devel desc/summary.
- macro update to support Fedora Core

* Thu Sep 11 2003 Rex Dieter  0:6.2-0.fdr.0 
- 6.2 release.
- update license (BSD)
- Consider building with: --enable-parallel-mark
  (for now, no).




Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-4/gc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gc.spec	16 Sep 2005 17:49:26 -0000	1.12
+++ gc.spec	1 Dec 2005 15:10:29 -0000	1.13
@@ -1,19 +1,21 @@
-# $Id$
 
 Summary: C++ Garbage Collector	
 Name:    gc	
 Version: 6.6
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
-Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # force no undefined symbols (#166344)
 Patch1: gc-6.6-no-undefined.patch
-BuildRequires: libtool automake autoconf
+BuildRequires: libtool
+BuildRequires: automake 
+
+Provides: libgc = %{version}-%{release}
 
 
 %description
@@ -24,6 +26,7 @@
 Summary: Libraries and header files for %{name} development 
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Provides: libgc-devel = %{version}-%{release}
 %description devel
 Libraries and header files for %{name} development.
 
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Thu Dec 01 2005 Rex Dieter  6.6-4
+- Provides: libgc(-devel)
+
 * Wed Sep 14 2005 Rex Dieter  6.6-3
 - no-undefined patch, libtool madness (#166344)
 



From fedora-extras-commits at redhat.com  Thu Dec  1 15:10:05 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  1 Dec 2005 10:10:05 -0500
Subject: rpms/gc/FC-3 gc.spec,1.11,1.12
Message-ID: <200512011510.jB1FA5H8011385@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11371/FC-3

Modified Files:
	gc.spec 
Log Message:

Summary: C++ Garbage Collector	
Name:    gc	
Version: 6.6

Release: 4%{?dist}
Group:   System Environment/Libraries
License: BSD
Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# force no undefined symbols (#166344)
Patch1: gc-6.6-no-undefined.patch
BuildRequires: libtool
BuildRequires: automake 

Provides: libgc = %{version}-%{release}


%description
The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage 
collecting replacement for C malloc or C++ new.

%package devel
Summary: Libraries and header files for %{name} development 
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
Provides: libgc-devel = %{version}-%{release}
%description devel
Libraries and header files for %{name} development.


%prep
%setup -q -n %{name}%{version}

%patch1 -p1 -b .no-undefined

cp -f %{_datadir}/aclocal/libtool.m4 .
libtoolize --copy --force
aclocal
automake
autoconf
#autoheader


%build

%configure \
  --disable-static \
  --enable-cplusplus \
  --enable-threads=posix \
%ifarch %{ix86}
  --enable-parallel-mark
%endif

make %{?_smp_mflags}


%check || :
make check


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT 

install -p -D -m644 doc/gc.man	$RPM_BUILD_ROOT%{_mandir}/man3/gc.3

## Unpackaged files
rm -rf $RPM_BUILD_ROOT%{_datadir}/gc
rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la


%clean
rm -rf $RPM_BUILD_ROOT


%post   -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files 
%defattr(-,root,root)
%doc doc/README doc/README.changes doc/README.contributors 
%doc doc/README.environment doc/README.linux
%{_libdir}/lib*.so.*

%files devel
%defattr(-,root,root)
%doc doc/*.html
%{_includedir}/*
%{_libdir}/lib*.so
%{_mandir}/man?/*


%changelog
* Thu Dec 01 2005 Rex Dieter  6.6-4
- Provides: libgc(-devel)

* Wed Sep 14 2005 Rex Dieter  6.6-3
- no-undefined patch, libtool madness (#166344)

* Mon Sep 12 2005 Rex Dieter  6.6-2
- drop opendl patch (doesn't appear to be needed anymore)

* Fri Sep 09 2005 Rex Dieter  6.6-1
- 6.6

* Wed May 25 2005 Rex Dieter  6.5-1
- 6.5

* Fri Apr  7 2005 Michael Schwendt 
- rebuilt

* Wed Jan 26 2005 Rex Dieter  0:6.4-2
- --enable-threads unconditionally
- --enable-parallel-mark only on %%ix86 (#144681)

* Mon Jan 10 2005 Rex Dieter  0:6.4-1
- 6.4
- update opendl patch

* Fri Jul 09 2004 Rex Dieter  0:6.3-0.fdr.1
- 6.3(final)

* Tue Jun 01 2004 Rex Dieter  0:6.3-0.fdr.0.4.alpha6
- dlopen patch

* Wed May 26 2004 Rex Dieter  0:6.3-0.fdr.0.3.alpha6
- explictly --enable-threads ('n friends)

* Tue May 25 2004 Rex Dieter  0:6.3-0.fdr.0.2.alpha6
- 6.3alpha6
- --disable-static
- --enable-parallel-mark

* Wed Dec 17 2003 Rex Dieter  0:6.3-0.fdr.0.1.alpha2
- 6.3alpha2

* Thu Oct 02 2003 Rex Dieter  0:6.2-0.fdr.3
- OK, put manpage in man3.

* Thu Oct 02 2003 Rex Dieter  0:6.2-0.fdr.2
- drop manpage pending feedback from developer. 

* Tue Sep 30 2003 Rex Dieter  0:6.2-0.fdr.1
- fix manpage location 
- remove .la file (it appears unnecessary after all, thanks to opendl patch)
- remove cvs tag from description
- touchup -devel desc/summary.
- macro update to support Fedora Core

* Thu Sep 11 2003 Rex Dieter  0:6.2-0.fdr.0 
- 6.2 release.
- update license (BSD)
- Consider building with: --enable-parallel-mark
  (for now, no).




Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/FC-3/gc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gc.spec	1 Nov 2005 12:42:03 -0000	1.11
+++ gc.spec	1 Dec 2005 15:10:03 -0000	1.12
@@ -1,19 +1,21 @@
-# $Id$
 
 Summary: C++ Garbage Collector	
 Name:    gc	
 Version: 6.6
 
-Release: 3%{?dist}.1
+Release: 4%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
-Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # force no undefined symbols (#166344)
 Patch1: gc-6.6-no-undefined.patch
-BuildRequires: libtool automake autoconf
+BuildRequires: libtool
+BuildRequires: automake 
+
+Provides: libgc = %{version}-%{release}
 
 
 %description
@@ -24,6 +26,7 @@
 Summary: Libraries and header files for %{name} development 
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Provides: libgc-devel = %{version}-%{release}
 %description devel
 Libraries and header files for %{name} development.
 
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Thu Dec 01 2005 Rex Dieter  6.6-4
+- Provides: libgc(-devel)
+
 * Wed Sep 14 2005 Rex Dieter  6.6-3
 - no-undefined patch, libtool madness (#166344)
 



From fedora-extras-commits at redhat.com  Thu Dec  1 15:10:38 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  1 Dec 2005 10:10:38 -0500
Subject: rpms/gc/devel gc.spec,1.13,1.14
Message-ID: <200512011510.jB1FAcYO011423@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11371/devel

Modified Files:
	gc.spec 
Log Message:

Summary: C++ Garbage Collector	
Name:    gc	
Version: 6.6

Release: 4%{?dist}
Group:   System Environment/Libraries
License: BSD
Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# force no undefined symbols (#166344)
Patch1: gc-6.6-no-undefined.patch
BuildRequires: libtool
BuildRequires: automake 

Provides: libgc = %{version}-%{release}


%description
The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage 
collecting replacement for C malloc or C++ new.

%package devel
Summary: Libraries and header files for %{name} development 
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
Provides: libgc-devel = %{version}-%{release}
%description devel
Libraries and header files for %{name} development.


%prep
%setup -q -n %{name}%{version}

%patch1 -p1 -b .no-undefined

cp -f %{_datadir}/aclocal/libtool.m4 .
libtoolize --copy --force
aclocal
automake
autoconf
#autoheader


%build

%configure \
  --disable-static \
  --enable-cplusplus \
  --enable-threads=posix \
%ifarch %{ix86}
  --enable-parallel-mark
%endif

make %{?_smp_mflags}


%check || :
make check


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT 

install -p -D -m644 doc/gc.man	$RPM_BUILD_ROOT%{_mandir}/man3/gc.3

## Unpackaged files
rm -rf $RPM_BUILD_ROOT%{_datadir}/gc
rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la


%clean
rm -rf $RPM_BUILD_ROOT


%post   -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files 
%defattr(-,root,root)
%doc doc/README doc/README.changes doc/README.contributors 
%doc doc/README.environment doc/README.linux
%{_libdir}/lib*.so.*

%files devel
%defattr(-,root,root)
%doc doc/*.html
%{_includedir}/*
%{_libdir}/lib*.so
%{_mandir}/man?/*


%changelog
* Thu Dec 01 2005 Rex Dieter  6.6-4
- Provides: libgc(-devel)

* Wed Sep 14 2005 Rex Dieter  6.6-3
- no-undefined patch, libtool madness (#166344)

* Mon Sep 12 2005 Rex Dieter  6.6-2
- drop opendl patch (doesn't appear to be needed anymore)

* Fri Sep 09 2005 Rex Dieter  6.6-1
- 6.6

* Wed May 25 2005 Rex Dieter  6.5-1
- 6.5

* Fri Apr  7 2005 Michael Schwendt 
- rebuilt

* Wed Jan 26 2005 Rex Dieter  0:6.4-2
- --enable-threads unconditionally
- --enable-parallel-mark only on %%ix86 (#144681)

* Mon Jan 10 2005 Rex Dieter  0:6.4-1
- 6.4
- update opendl patch

* Fri Jul 09 2004 Rex Dieter  0:6.3-0.fdr.1
- 6.3(final)

* Tue Jun 01 2004 Rex Dieter  0:6.3-0.fdr.0.4.alpha6
- dlopen patch

* Wed May 26 2004 Rex Dieter  0:6.3-0.fdr.0.3.alpha6
- explictly --enable-threads ('n friends)

* Tue May 25 2004 Rex Dieter  0:6.3-0.fdr.0.2.alpha6
- 6.3alpha6
- --disable-static
- --enable-parallel-mark

* Wed Dec 17 2003 Rex Dieter  0:6.3-0.fdr.0.1.alpha2
- 6.3alpha2

* Thu Oct 02 2003 Rex Dieter  0:6.2-0.fdr.3
- OK, put manpage in man3.

* Thu Oct 02 2003 Rex Dieter  0:6.2-0.fdr.2
- drop manpage pending feedback from developer. 

* Tue Sep 30 2003 Rex Dieter  0:6.2-0.fdr.1
- fix manpage location 
- remove .la file (it appears unnecessary after all, thanks to opendl patch)
- remove cvs tag from description
- touchup -devel desc/summary.
- macro update to support Fedora Core

* Thu Sep 11 2003 Rex Dieter  0:6.2-0.fdr.0 
- 6.2 release.
- update license (BSD)
- Consider building with: --enable-parallel-mark
  (for now, no).




Index: gc.spec
===================================================================
RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gc.spec	16 Sep 2005 16:07:48 -0000	1.13
+++ gc.spec	1 Dec 2005 15:10:35 -0000	1.14
@@ -1,19 +1,21 @@
-# $Id$
 
 Summary: C++ Garbage Collector	
 Name:    gc	
 Version: 6.6
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group:   System Environment/Libraries
 License: BSD
 Url:     http://www.hpl.hp.com/personal/Hans_Boehm/gc/	
-Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.6.tar.gz
+Source:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # force no undefined symbols (#166344)
 Patch1: gc-6.6-no-undefined.patch
-BuildRequires: libtool automake autoconf
+BuildRequires: libtool
+BuildRequires: automake 
+
+Provides: libgc = %{version}-%{release}
 
 
 %description
@@ -24,6 +26,7 @@
 Summary: Libraries and header files for %{name} development 
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Provides: libgc-devel = %{version}-%{release}
 %description devel
 Libraries and header files for %{name} development.
 
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Thu Dec 01 2005 Rex Dieter  6.6-4
+- Provides: libgc(-devel)
+
 * Wed Sep 14 2005 Rex Dieter  6.6-3
 - no-undefined patch, libtool madness (#166344)
 



From fedora-extras-commits at redhat.com  Thu Dec  1 15:20:33 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu,  1 Dec 2005 10:20:33 -0500
Subject: rpms/digikam/devel .cvsignore, 1.2, 1.3 digikam.spec, 1.3,
	1.4 sources, 1.2, 1.3 digikam-0.7.4-64bit-typo.patch, 1.1, NONE
Message-ID: <200512011521.jB1FL3i6011555@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11534

Modified Files:
	.cvsignore digikam.spec sources 
Removed Files:
	digikam-0.7.4-64bit-typo.patch 
Log Message:
- Add description about digikamimageplugins and kipi-plugins
- Remove 64 bit patch, applied upstream
- Update to version 0.8.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Sep 2005 10:23:34 -0000	1.2
+++ .cvsignore	1 Dec 2005 15:20:30 -0000	1.3
@@ -1 +1,2 @@
 digikam-0.7.4.tar.bz2
+digikam-0.8.0.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- digikam.spec	22 Oct 2005 20:50:46 -0000	1.3
+++ digikam.spec	1 Dec 2005 15:20:30 -0000	1.4
@@ -1,17 +1,16 @@
 Name:		digikam
-Version:	0.7.4
-Release:	4%{?dist}
+Version:	0.8.0
+Release:	1%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		digikam-0.7.4-64bit-typo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0
-BuildRequires:	libkexif-devel >= 0.2 libkipi-devel >= 0.1 desktop-file-utils
+BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
+BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
 BuildRequires:	gettext
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -24,7 +23,8 @@
 digital camera, preview the images and download and/or delete them.
 
 digiKam buildin image editor makes the common photo correction a simple task.
-The image editor is extensible via plugins.
+The image editor is extensible via plugins, install the digikamimageplugins
+and/or kipi-plugins packages to use them.
 
 %package devel
 Summary:	Development files for %{name}
@@ -37,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b 64bit-typo.patch
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -95,7 +94,7 @@
 
 %files -f %name.lang
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING HACKING README
+%doc AUTHORS ChangeLog COPYING HACKING README TODO
 %{_bindir}/*
 %{_libdir}/libdigikam.so.*
 %{_libdir}/kde3/digikamimageplugin_core.la
@@ -116,6 +115,11 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Exclude libdigikam.la (bug #171503)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2005 10:23:34 -0000	1.2
+++ sources	1 Dec 2005 15:20:30 -0000	1.3
@@ -1 +1 @@
-3df53700ff78caca60cab4ea4116c7c5  digikam-0.7.4.tar.bz2
+9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2


--- digikam-0.7.4-64bit-typo.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec  1 15:58:17 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu,  1 Dec 2005 10:58:17 -0500
Subject: rpms/digikam/FC-3 .cvsignore, 1.2, 1.3 digikam.spec, 1.3,
	1.4 sources, 1.2, 1.3 digikam-0.7.4-64bit-typo.patch, 1.1, NONE
Message-ID: <200512011558.jB1Fwlxg011952@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11928

Modified Files:
	.cvsignore digikam.spec sources 
Removed Files:
	digikam-0.7.4-64bit-typo.patch 
Log Message:
- Add description about digikamimageplugins and kipi-plugins
- Remove 64 bit patch, applied upstream
- Update to version 0.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Sep 2005 10:23:34 -0000	1.2
+++ .cvsignore	1 Dec 2005 15:58:15 -0000	1.3
@@ -1 +1,2 @@
 digikam-0.7.4.tar.bz2
+digikam-0.8.0.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/digikam.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- digikam.spec	22 Oct 2005 20:22:12 -0000	1.3
+++ digikam.spec	1 Dec 2005 15:58:15 -0000	1.4
@@ -1,17 +1,16 @@
 Name:		digikam
-Version:	0.7.4
-Release:	4%{?dist}
+Version:	0.8.0
+Release:	1%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		digikam-0.7.4-64bit-typo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0
-BuildRequires:	libkexif-devel >= 0.2 libkipi-devel >= 0.1 desktop-file-utils
+BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
+BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
 BuildRequires:	gettext
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -24,7 +23,8 @@
 digital camera, preview the images and download and/or delete them.
 
 digiKam buildin image editor makes the common photo correction a simple task.
-The image editor is extensible via plugins.
+The image editor is extensible via plugins, install the digikamimageplugins
+and/or kipi-plugins packages to use them.
 
 %package devel
 Summary:	Development files for %{name}
@@ -37,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b 64bit-typo.patch
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -95,7 +94,7 @@
 
 %files -f %name.lang
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING HACKING README
+%doc AUTHORS ChangeLog COPYING HACKING README TODO
 %{_bindir}/*
 %{_libdir}/libdigikam.so.*
 %{_libdir}/kde3/digikamimageplugin_core.la
@@ -116,6 +115,11 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Exclude libdigikam.la (bug #171503)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2005 10:23:34 -0000	1.2
+++ sources	1 Dec 2005 15:58:15 -0000	1.3
@@ -1 +1 @@
-3df53700ff78caca60cab4ea4116c7c5  digikam-0.7.4.tar.bz2
+9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2


--- digikam-0.7.4-64bit-typo.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec  1 16:05:51 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu,  1 Dec 2005 11:05:51 -0500
Subject: rpms/digikam/FC-4 .cvsignore, 1.2, 1.3 digikam.spec, 1.3,
	1.4 sources, 1.2, 1.3 digikam-0.7.4-64bit-typo.patch, 1.1, NONE
Message-ID: <200512011606.jB1G6MjC013620@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13586

Modified Files:
	.cvsignore digikam.spec sources 
Removed Files:
	digikam-0.7.4-64bit-typo.patch 
Log Message:
- Add description about digikamimageplugins and kipi-plugins
- Remove 64 bit patch, applied upstream
- Update to version 0.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Sep 2005 10:23:34 -0000	1.2
+++ .cvsignore	1 Dec 2005 16:05:48 -0000	1.3
@@ -1 +1,2 @@
 digikam-0.7.4.tar.bz2
+digikam-0.8.0.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-4/digikam.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- digikam.spec	22 Oct 2005 20:36:08 -0000	1.3
+++ digikam.spec	1 Dec 2005 16:05:48 -0000	1.4
@@ -1,17 +1,16 @@
 Name:		digikam
-Version:	0.7.4
-Release:	4%{?dist}
+Version:	0.8.0
+Release:	1%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		digikam-0.7.4-64bit-typo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0
-BuildRequires:	libkexif-devel >= 0.2 libkipi-devel >= 0.1 desktop-file-utils
+BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
+BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
 BuildRequires:	gettext
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -24,7 +23,8 @@
 digital camera, preview the images and download and/or delete them.
 
 digiKam buildin image editor makes the common photo correction a simple task.
-The image editor is extensible via plugins.
+The image editor is extensible via plugins, install the digikamimageplugins
+and/or kipi-plugins packages to use them.
 
 %package devel
 Summary:	Development files for %{name}
@@ -37,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b 64bit-typo.patch
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -95,7 +94,7 @@
 
 %files -f %name.lang
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING HACKING README
+%doc AUTHORS ChangeLog COPYING HACKING README TODO
 %{_bindir}/*
 %{_libdir}/libdigikam.so.*
 %{_libdir}/kde3/digikamimageplugin_core.la
@@ -116,6 +115,11 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Exclude libdigikam.la (bug #171503)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2005 10:23:34 -0000	1.2
+++ sources	1 Dec 2005 16:05:49 -0000	1.3
@@ -1 +1 @@
-3df53700ff78caca60cab4ea4116c7c5  digikam-0.7.4.tar.bz2
+9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2


--- digikam-0.7.4-64bit-typo.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec  1 16:25:02 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Thu,  1 Dec 2005 11:25:02 -0500
Subject: rpms/digikam/FC-3 digikam-0.7.4-64bit-typo.patch, 1.2,
	1.3 .cvsignore, 1.3, 1.4 digikam.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200512011625.jB1GPWBZ013955@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13917

Modified Files:
	.cvsignore digikam.spec sources 
Added Files:
	digikam-0.7.4-64bit-typo.patch 
Log Message:
No future releases until SQLite >= 3.0.0 won't appear in FE.


digikam-0.7.4-64bit-typo.patch:

Index: digikam-0.7.4-64bit-typo.patch
===================================================================
RCS file: digikam-0.7.4-64bit-typo.patch
diff -N digikam-0.7.4-64bit-typo.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ digikam-0.7.4-64bit-typo.patch	1 Dec 2005 16:25:00 -0000	1.3
@@ -0,0 +1,11 @@
+--- digikam-0.7.4/digikam/sqlite/sqliteInt.h-orig	2005-08-21 05:20:42.000000000 +0200
++++ digikam-0.7.4/digikam/sqlite/sqliteInt.h	2005-09-17 15:44:54.000000000 +0200
+@@ -115,7 +115,7 @@
+ #   define INTPTR_TYPE int
+ # else
+ #   define INTPTR_TYPE long long
+-#warning "WARNING: Compiling sqlite for a Big Endian Platform."
++#warning "WARNING: Compiling sqlite for a 64 bit Platform."
+ #warning "WARNING: If you know this isn't true, please file a bugreport."
+ # endif
+ #endif


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2005 15:58:15 -0000	1.3
+++ .cvsignore	1 Dec 2005 16:25:00 -0000	1.4
@@ -1,2 +1 @@
 digikam-0.7.4.tar.bz2
-digikam-0.8.0.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/digikam.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- digikam.spec	1 Dec 2005 15:58:15 -0000	1.4
+++ digikam.spec	1 Dec 2005 16:25:00 -0000	1.5
@@ -1,16 +1,17 @@
 Name:		digikam
-Version:	0.8.0
-Release:	1%{?dist}
+Version:	0.7.4
+Release:	4%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		digikam-0.7.4-64bit-typo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
-BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
+BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0
+BuildRequires:	libkexif-devel >= 0.2 libkipi-devel >= 0.1 desktop-file-utils
 BuildRequires:	gettext
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -23,8 +24,7 @@
 digital camera, preview the images and download and/or delete them.
 
 digiKam buildin image editor makes the common photo correction a simple task.
-The image editor is extensible via plugins, install the digikamimageplugins
-and/or kipi-plugins packages to use them.
+The image editor is extensible via plugins.
 
 %package devel
 Summary:	Development files for %{name}
@@ -37,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b 64bit-typo.patch
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -94,7 +95,7 @@
 
 %files -f %name.lang
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING HACKING README TODO
+%doc AUTHORS ChangeLog COPYING HACKING README
 %{_bindir}/*
 %{_libdir}/libdigikam.so.*
 %{_libdir}/kde3/digikamimageplugin_core.la
@@ -115,11 +116,6 @@
 %{_libdir}/libdigikam.so
 
 %changelog
-* 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
 - Exclude libdigikam.la (bug #171503)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2005 15:58:15 -0000	1.3
+++ sources	1 Dec 2005 16:25:00 -0000	1.4
@@ -1 +1 @@
-9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2
+3df53700ff78caca60cab4ea4116c7c5  digikam-0.7.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec  1 18:12:17 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  1 Dec 2005 13:12:17 -0500
Subject: web/html index.php,1.17,1.18
Message-ID: <200512011812.jB1ICm57017691@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17669

Modified Files:
	index.php 
Log Message:
The latest version of this page is actually version 1.17, but I am putting up this page with latest news on FDS 1.0 being released and a note that the site is being updated.  To avoid confusion, we likely want to do a minor edit to 1.17 and commit it again before tagging it LIVE, to help avoid confusion as to what is truly the latest.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/index.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- index.php	29 Nov 2005 17:30:19 -0000	1.17
+++ index.php	1 Dec 2005 18:12:15 -0000	1.18
@@ -12,22 +12,132 @@
 
 
 
    
-Fedora Core is a free operating system that offers the best combination of stable and cutting-edge software that exists in the free software world.
+ is an open source project sponsored by
+Red Hat and supported by the Fedora community. It is also a proving ground
+for new technology that may eventually make its way into Red Hat products.
+It is not a supported product of Red Hat, Inc.
 
    
 
 
    
-Download Fedora Core 4 now.
+To learn more about the process, refer to About, 
+the Objectives,
+and the FAQs.
 
    
 
-Documentation for Fedora is available.
+
    
+
+
    Fedora Directory Server 1.0 Release [01 Dec 2005]
    
+
+
     
+  FDS 1.0 is past the hurdles and released into the wild.  Read more
+  about this amazing milestone in the history of open source directory
+  servers on the FDS
+  Wiki.  
 
    
 
+
    
+
+
    Latest Fedora News
    
+
 
    
-Fedora is always looking for contributors.
+  [01 Dec 2005] fedora.redhat.com update in progress
    
+  This site is in the process of undergoing a content refresh and
+  facelift.  Sorry for the cruft whilst we are editing.  Expect
+  changes here soon.
 
    
+
    
+  [06 Oct 2005] FUDCon London, 2005 (formerly FUDCon
+  III)
     
+  FUDCon is the conference/summit that focuses on the Fedora Project
+  and all things that go along with it.  For more information, visit
+  the FUDCon
+  webpages.
+
    
+
    
+  [13 Jun 2005] Fedora Core 4 (Stentz) now available
    
+  Fedora Core 4 is now available
+  from Red Hat and at distinguished mirror sites near you, and is also
+  available in the torrent.
+  Fedora Core is available for x86-64, i386, and ppc/ppc64. Please file bugs via
+  Bugzilla, Product Fedora Core, Version 4,
+  so that they are noticed and appropriately classified. Discuss this release on 
+  fedora-list.
+
    
+
    
+  [02 Jun 2005] Fedora participates in the Summer Of Code 
    
+  The Fedora Project is proud to participate in Google's
+  Summer Of Code. For
+  ideas on some of the projects Fedora is looking to sponsor, please see
+  the Fedora Project Wiki.
+
    
+  [01 Jun 2005] Fedora Directory Server announced 
    
+  The Fedora Directory Server is a robust, scalable open-source server 
+  designed to manage large directories of users and resources.  It is based
+  on an open-systems server protocol called the Lightweight Directory Access
+  Protocol (LDAP).  For more information, go to 
+  the project website.
+
    
+  [10 May 2005] Fedora Core 4 test 3 now available 
    
+  The third test release of Fedora Core 4
+  is now available.  New features in FC4 
+  test 3 include GNOME 2.10, KDE 3.4, and a preview of GCC 4.0.  PowerPC is 
+  also supported.  Download it from the torrent.  File bugs in 
+  bugzilla against Fedora 
+  Core, version fc4test3.  Discuss this release on 
+  fedora-test-list.
+
    
+
    
+  [03 May 2005] Endorsement of fedoraforum.org
      
+  The Fedora Project now endorses 
+  fedoraforum.org as its end-user
+  forum of choice.  Read more about the other available 
+  discussion forums.
+
    
+
    
+  [21 Apr 2005] FUDCon 2 Announced
    
+  FUDCon 2, the second gathering
+  of Fedora Users and Developers, will be held at LinuxTag in Karlsruhe,
+  Germany on the 24th and 25th of June.
+
    
+
    
+  [15 Apr 2005] Fedora Core 2 moves to Legacy Project
    
+  The Fedora Steering Committee announces the
+  transfer of Fedora Core 2 to the 
+  Fedora Legacy Project.
+  For more information on the Fedora Legacy Project, or if you wish to join
+  the team please see http://fedoralegacy.org/.
+
    
+
    
+  [01 Mar 2005] Announcing the Fedora Extras Project
    
+  The Fedora Extras Project has been 
+  established to create high-quality software to augment software available in 
+  Fedora Core. 
+
    
+
+
    
+
+
    Fedora Core Release Schedule
    
 
 
    
-Questions about Fedora?  Look for answers here.
+  The Fedora Project announces a new major release of Fedora Core every 
+  four to six months.  The current release schedule is available 
+  here.
+
    
+	
+
    Red Hat Enterprise Linux
    
+
+
    
+ is one of the sources
+for new technologies and enhancements that may be incorporated
+into Red Hat Enterprise Linux in the future.  Red Hat Enterprise
+Linux is the solution that provides a robust, stable operating system
+supported by Red Hat, Inc. and a wide variety of independent
+software vendors (ISVs).  For production use, support, service
+level agreements (SLAs), and ISV support, we proudly ask that
+you look at Red
+Hat Enterprise Linux.
+
 
    
 
 
    



From fedora-extras-commits at redhat.com  Thu Dec  1 18:43:38 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu,  1 Dec 2005 13:43:38 -0500
Subject: extras-buildsys ChangeLog,1.126.2.25,1.126.2.26
Message-ID: <200512011844.jB1Ii8gL017971@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17932

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2005-12-01  Dan Williams  

    Patch from Rudolf Kastl  #rh174573#:
    * etc/plague-server.init
      etc/plague-builder.init
        - Add nls support to initscripts
        - initscript cleanups




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.25
retrieving revision 1.126.2.26
diff -u -r1.126.2.25 -r1.126.2.26
--- ChangeLog	29 Nov 2005 06:36:31 -0000	1.126.2.25
+++ ChangeLog	1 Dec 2005 18:43:36 -0000	1.126.2.26
@@ -1,3 +1,11 @@
+2005-12-01  Dan Williams  
+
+    Patch from Rudolf Kastl  #rh174573#:
+    * etc/plague-server.init
+      etc/plague-builder.init
+        - Add nls support to initscripts
+        - initscript cleanups
+
 2005-11-29  Dan Williams  
 
     * Add a traceback server that listens on a Unix socket



From fedora-extras-commits at redhat.com  Thu Dec  1 18:43:44 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu,  1 Dec 2005 13:43:44 -0500
Subject: extras-buildsys/etc plague-builder.init, 1.7,
	1.7.2.1 plague-server.init, 1.2, 1.2.2.1
Message-ID: <200512011844.jB1IiE9A017975@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17932/etc

Modified Files:
      Tag: STABLE_0_4
	plague-builder.init plague-server.init 
Log Message:
2005-12-01  Dan Williams  

    Patch from Rudolf Kastl  #rh174573#:
    * etc/plague-server.init
      etc/plague-builder.init
        - Add nls support to initscripts
        - initscript cleanups




Index: plague-builder.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- plague-builder.init	31 Aug 2005 19:29:21 -0000	1.7
+++ plague-builder.init	1 Dec 2005 18:43:41 -0000	1.7.2.1
@@ -13,20 +13,28 @@
 # Source function library.
 . /etc/init.d/functions
 
+prog="plague-builder"
+
+if [ -f /etc/sysconfig/plague-builder ]; then
 . /etc/sysconfig/plague-builder
+fi
 
 start() {
-	echo -n "Starting plague-builder: "
+	if [ ! -f /var/lock/subsys/plague-builder ]; then
+	echo -n $"Starting $prog: "
 	daemon plague-builder -c $CONFIG -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log
 	echo
 	touch /var/lock/subsys/plague-builder
 	return 0
+	fi
 }	
 
 stop() {
-	echo -n "Shutting down plague-builder: "
+	if test "x`pidof plague-builder`" != x; then
+	echo -n $"Stopping $prog: "
 	killproc plague-builder
 	echo
+	fi
 	rm -f /var/lock/subsys/plague-builder
 	return 0
 }


Index: plague-server.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- plague-server.init	15 Aug 2005 03:18:19 -0000	1.2
+++ plague-server.init	1 Dec 2005 18:43:41 -0000	1.2.2.1
@@ -13,20 +13,28 @@
 # Source function library.
 . /etc/init.d/functions
 
+prog="plague-server"
+
+if [ -f /etc/sysconfig/plague-server ]; then
 . /etc/sysconfig/plague-server
+fi
 
 start() {
-	echo -n "Starting plague-server: "
+	if [ ! -f /var/lock/subsys/plague-server ]; then
+	echo -n $"Starting $prog: "
 	daemon plague-server -c $CONFIG -d -p /var/run/plague-server.pid -l /var/log/plague-server.log
 	echo
 	touch /var/lock/subsys/plague-server
 	return 0
+	fi
 }	
 
 stop() {
-	echo -n "Shutting down plague-server: "
+	if test "x`pidof plague-server`" != x; then
+	echo -n $"Stopping $prog: "
 	killproc plague-server
 	echo
+	fi
 	rm -f /var/lock/subsys/plague-server
 	return 0
 }



From fedora-extras-commits at redhat.com  Thu Dec  1 18:44:56 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu,  1 Dec 2005 13:44:56 -0500
Subject: extras-buildsys/etc plague-builder.init, 1.7, 1.8 plague-server.init,
	1.2, 1.3
Message-ID: <200512011844.jB1IiuG0018023@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17988/etc

Modified Files:
	plague-builder.init plague-server.init 
Log Message:
2005-12-01  Dan Williams  

    Patch from Rudolf Kastl  #rh174573#:
    * etc/plague-server.init
      etc/plague-builder.init
        - Add nls support to initscripts
        - initscript cleanups




Index: plague-builder.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plague-builder.init	31 Aug 2005 19:29:21 -0000	1.7
+++ plague-builder.init	1 Dec 2005 18:44:54 -0000	1.8
@@ -13,20 +13,28 @@
 # Source function library.
 . /etc/init.d/functions
 
+prog="plague-builder"
+
+if [ -f /etc/sysconfig/plague-builder ]; then
 . /etc/sysconfig/plague-builder
+fi
 
 start() {
-	echo -n "Starting plague-builder: "
+	if [ ! -f /var/lock/subsys/plague-builder ]; then
+	echo -n $"Starting $prog: "
 	daemon plague-builder -c $CONFIG -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log
 	echo
 	touch /var/lock/subsys/plague-builder
 	return 0
+	fi
 }	
 
 stop() {
-	echo -n "Shutting down plague-builder: "
+	if test "x`pidof plague-builder`" != x; then
+	echo -n $"Stopping $prog: "
 	killproc plague-builder
 	echo
+	fi
 	rm -f /var/lock/subsys/plague-builder
 	return 0
 }


Index: plague-server.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plague-server.init	15 Aug 2005 03:18:19 -0000	1.2
+++ plague-server.init	1 Dec 2005 18:44:54 -0000	1.3
@@ -13,20 +13,28 @@
 # Source function library.
 . /etc/init.d/functions
 
+prog="plague-server"
+
+if [ -f /etc/sysconfig/plague-server ]; then
 . /etc/sysconfig/plague-server
+fi
 
 start() {
-	echo -n "Starting plague-server: "
+	if [ ! -f /var/lock/subsys/plague-server ]; then
+	echo -n $"Starting $prog: "
 	daemon plague-server -c $CONFIG -d -p /var/run/plague-server.pid -l /var/log/plague-server.log
 	echo
 	touch /var/lock/subsys/plague-server
 	return 0
+	fi
 }	
 
 stop() {
-	echo -n "Shutting down plague-server: "
+	if test "x`pidof plague-server`" != x; then
+	echo -n $"Stopping $prog: "
 	killproc plague-server
 	echo
+	fi
 	rm -f /var/lock/subsys/plague-server
 	return 0
 }



From fedora-extras-commits at redhat.com  Thu Dec  1 18:44:51 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu,  1 Dec 2005 13:44:51 -0500
Subject: extras-buildsys ChangeLog,1.156,1.157
Message-ID: <200512011845.jB1IjM0o018033@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17988

Modified Files:
	ChangeLog 
Log Message:
2005-12-01  Dan Williams  

    Patch from Rudolf Kastl  #rh174573#:
    * etc/plague-server.init
      etc/plague-builder.init
        - Add nls support to initscripts
        - initscript cleanups




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- ChangeLog	1 Dec 2005 03:17:15 -0000	1.156
+++ ChangeLog	1 Dec 2005 18:44:48 -0000	1.157
@@ -1,3 +1,11 @@
+2005-12-01  Dan Williams  
+
+    Patch from Rudolf Kastl  #rh174573#:
+    * etc/plague-server.init
+      etc/plague-builder.init
+        - Add nls support to initscripts
+        - initscript cleanups
+
 2005-11-29  Dan Williams  
 
     * Add an option in the server config file to disable



From fedora-extras-commits at redhat.com  Thu Dec  1 19:16:57 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu,  1 Dec 2005 14:16:57 -0500
Subject: rpms/baobab/FC-4 .cvsignore, 1.4, 1.5 baobab.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200512011917.jB1JHSDK019849@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19811/FC-4

Modified Files:
	.cvsignore baobab.spec sources 
Log Message:
update to 2.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 20:18:38 -0000	1.4
+++ .cvsignore	1 Dec 2005 19:16:55 -0000	1.5
@@ -1 +1 @@
-baobab-1.3.1.tar.gz
+baobab-2.2.0.tar.gz


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- baobab.spec	12 Nov 2005 20:18:38 -0000	1.4
+++ baobab.spec	1 Dec 2005 19:16:55 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           baobab
-Version:        1.3.1
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.marzocca.net/linux/baobab.html
-Source0:        http://www.marzocca.net/linux/downloads/baobab-1.3.1.tar.gz
+Source0:        http://www.marzocca.net/linux/downloads/baobab-2.2.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -25,7 +25,7 @@
 
 %prep
 %setup -q
-
+sed -i 's/GNOME_CANVAS_REQUIRED=2.10.2/GNOME_CANVAS_REQUIRED=2.10.0/' configure
 
 %build
 %configure
@@ -53,10 +53,14 @@
 %{_bindir}/%{name}
 %{_datadir}/applications/*-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_datadir}/pixmaps/%{name}/
+%{_datadir}/%{name}/
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Dec 01 2005 Thorsten Leemhuis  - 2.2.0-1
+- Update to 2.2.0
+- Still works with older GNOME_CANVAS so drop requires in configure slightly
+
 * Sat Nov 12 2005 Thorsten Leemhuis  - 1.3.1-1
 - Update to 1.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 20:18:38 -0000	1.4
+++ sources	1 Dec 2005 19:16:55 -0000	1.5
@@ -1 +1 @@
-38faf53cc6de0cd50606935877685733  baobab-1.3.1.tar.gz
+8ea3c8c67a27e6f0be14744adc2c17c7  baobab-2.2.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  1 19:17:03 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu,  1 Dec 2005 14:17:03 -0500
Subject: rpms/baobab/devel .cvsignore, 1.4, 1.5 baobab.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200512011917.jB1JHXWA019854@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19811/devel

Modified Files:
	.cvsignore baobab.spec sources 
Log Message:
update to 2.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 20:12:03 -0000	1.4
+++ .cvsignore	1 Dec 2005 19:17:01 -0000	1.5
@@ -1 +1 @@
-baobab-1.3.1.tar.gz
+baobab-2.2.0.tar.gz


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- baobab.spec	12 Nov 2005 20:12:03 -0000	1.4
+++ baobab.spec	1 Dec 2005 19:17:01 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           baobab
-Version:        1.3.1
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.marzocca.net/linux/baobab.html
-Source0:        http://www.marzocca.net/linux/downloads/baobab-1.3.1.tar.gz
+Source0:        http://www.marzocca.net/linux/downloads/baobab-2.2.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -26,7 +26,6 @@
 %prep
 %setup -q
 
-
 %build
 %configure
 make %{?_smp_mflags}
@@ -53,10 +52,13 @@
 %{_bindir}/%{name}
 %{_datadir}/applications/*-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_datadir}/pixmaps/%{name}/
+%{_datadir}/%{name}/
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Dec 01 2005 Thorsten Leemhuis  - 2.2.0-1
+- Update to 2.2.0
+
 * Sat Nov 12 2005 Thorsten Leemhuis  - 1.3.1-1
 - Update to 1.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 20:12:03 -0000	1.4
+++ sources	1 Dec 2005 19:17:01 -0000	1.5
@@ -1 +1 @@
-38faf53cc6de0cd50606935877685733  baobab-1.3.1.tar.gz
+8ea3c8c67a27e6f0be14744adc2c17c7  baobab-2.2.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  1 19:40:28 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Thu,  1 Dec 2005 14:40:28 -0500
Subject: rpms/ghdl/devel ghdl.spec,1.1,1.2
Message-ID: <200512011940.jB1Jex1H020057@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20040

Modified Files:
	ghdl.spec 
Log Message:
ExcludeArchs



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghdl.spec	29 Nov 2005 11:19:29 -0000	1.1
+++ ghdl.spec	1 Dec 2005 19:40:26 -0000	1.2
@@ -4,7 +4,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.21
-Release: 0.24svn.1
+Release: 0.24svn.2%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -19,6 +19,11 @@
 BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+# gcc-gnat missing on ppc: Bug 174720
+# mock does not install glibc-devel.i386 on x86_64, therefore
+# gcc -m32 fails, therefore the package does not build under
+# mock/plague on x86_64: Bug 174731
+ExcludeArch: ppc x86_64
 
 # Make sure we don't use clashing namespaces
 %define _vendor fedora_ghdl
@@ -170,6 +175,10 @@
 %{_libexecdir}/gcc/
 
 %changelog
+* Thu Dec  1 2005 Thomas Sailer  - 0.21-0.24svn.2
+- Exclude ppc because gcc-gnat is missing
+- Exclude x86_64 because of mock build issues
+
 * Fri Nov 25 2005 Thomas Sailer  - 0.21-0.24svn.1
 - update to SVN rev 24
 - remove additional files to fix x86_64 build



From fedora-extras-commits at redhat.com  Thu Dec  1 19:53:41 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  1 Dec 2005 14:53:41 -0500
Subject: rpms/gnupg2/devel gpg-agent-shutdown.sh, NONE,
	1.1 gpg-agent-startup.sh, NONE, 1.1 gnupg2.spec, 1.22, 1.23
Message-ID: <200512011954.jB1JsB8r020280@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20261

Modified Files:
	gnupg2.spec 
Added Files:
	gpg-agent-shutdown.sh gpg-agent-startup.sh 
Log Message:
* Thu Dec 01 2005 Rex Dieter  1.9.19-4
- include gpg-agent-(startup|shutdown) scripts (#136533)
- BR: libksba-devel >= 1.9.12 



***** Error reading new file: [Errno 2] No such file or directory: 'gpg-agent-shutdown.sh'

***** Error reading new file: [Errno 2] No such file or directory: 'gpg-agent-startup.sh'

Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnupg2.spec	30 Nov 2005 17:19:56 -0000	1.22
+++ gnupg2.spec	1 Dec 2005 19:53:39 -0000	1.23
@@ -14,6 +14,12 @@
 Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# omit broken x86_64 build 
+# ExcludeArch: x86_64 
+
+# enable auto-startup/shutdown of gpg-agent
+Source10: gpg-agent-startup.sh
+Source11: gpg-agent-shutdown.sh
 
 Patch1: gnupg-1.9.18-lvalue.patch
 Patch2: gnupg-1.9.16-testverbose.patch
@@ -26,12 +32,12 @@
 BuildRequires: libassuan-devel >= 0.6.10
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.0
-#ifarch x86_64
+%ifarch x86_64
 # Hard-code libksba-0.9.11 for now (x86_64 'make check' fails)
-#BuildRequires: libksba-devel = 0.9.11
-#else
+BuildRequires: libksba-devel = 0.9.11
+%else
 BuildRequires: libksba-devel >= 0.9.12
-#endif
+%endif
 
 BuildRequires: gettext
 BuildRequires: openldap-devel
@@ -68,10 +74,9 @@
 %patch1 -p1 -b .lvalue
 #patch2 -p1 -b .testverbose
 
-#ifarch x86_64
-#sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac
-#sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure
-#endif
+%ifarch x86_64
+sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
+%endif
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
@@ -87,6 +92,8 @@
 
 
 %check ||:
+# Allows for better debugability
+echo "--debug-allow-core-dumps" >> tests/gpgsm.conf
 %ifarch x86_64
 # Expect one failure (reported upstream)
 make check ||:
@@ -100,6 +107,11 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# enable auto-startup/shutdown of gpg-agent 
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
+install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/env/
+install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{_prefix}/shutdown/
+
 %find_lang %{name}
 
 ## Unpackaged files
@@ -135,6 +147,9 @@
 %{_libdir}/gnupg/
 %{_libexecdir}/*
 %{_infodir}/*
+# Own dirs until someone else does (filesystem,kdebase?)
+%{_prefix}/env/
+%{_prefix}/shutdown/
 
 
 %clean
@@ -142,8 +157,9 @@
 
 
 %changelog
-* Wed Nov 30 2005 Rex Dieter  1.9.19-4
-- cleanup, remove hacks
+* Thu Dec 01 2005 Rex Dieter  1.9.19-4
+- include gpg-agent-(startup|shutdown) scripts (#136533)
+- BR: libksba-devel >= 1.9.12 
 
 * Wed Nov 30 2005 Rex Dieter  1.9.19-3
 - BR: libksba-devel >= 1.9.13



From fedora-extras-commits at redhat.com  Thu Dec  1 20:02:27 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  1 Dec 2005 15:02:27 -0500
Subject: rpms/gnupg2/devel gnupg2.spec,1.23,1.24
Message-ID: <200512012002.jB1K2vvE021981@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21962

Modified Files:
	gnupg2.spec 
Log Message:
drop usage of unavailable libksba-0.9.11



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnupg2.spec	1 Dec 2005 19:53:39 -0000	1.23
+++ gnupg2.spec	1 Dec 2005 20:02:24 -0000	1.24
@@ -32,12 +32,12 @@
 BuildRequires: libassuan-devel >= 0.6.10
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.0
-%ifarch x86_64
+#ifarch x86_64
 # Hard-code libksba-0.9.11 for now (x86_64 'make check' fails)
-BuildRequires: libksba-devel = 0.9.11
-%else
+#BuildRequires: libksba-devel = 0.9.11
+#else
 BuildRequires: libksba-devel >= 0.9.12
-%endif
+#endif
 
 BuildRequires: gettext
 BuildRequires: openldap-devel
@@ -72,7 +72,7 @@
 %setup -q -n gnupg-%{version}
 
 %patch1 -p1 -b .lvalue
-#patch2 -p1 -b .testverbose
+%patch2 -p1 -b .testverbose
 
 %ifarch x86_64
 sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
@@ -157,7 +157,7 @@
 
 
 %changelog
-* Thu Dec 01 2005 Rex Dieter  1.9.19-4
+* Thu Dec 01 2005 Rex Dieter  1.9.19-5
 - include gpg-agent-(startup|shutdown) scripts (#136533)
 - BR: libksba-devel >= 1.9.12 
 



From fedora-extras-commits at redhat.com  Thu Dec  1 20:10:31 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  1 Dec 2005 15:10:31 -0500
Subject: rpms/gnupg2/devel gnupg2.spec,1.24,1.25
Message-ID: <200512012011.jB1KB9DA022115@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22029

Modified Files:
	gnupg2.spec 
Log Message:
Release++



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnupg2.spec	1 Dec 2005 20:02:24 -0000	1.24
+++ gnupg2.spec	1 Dec 2005 20:10:26 -0000	1.25
@@ -7,7 +7,7 @@
 Summary: GNU utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.19
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec  1 20:25:18 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  1 Dec 2005 15:25:18 -0500
Subject: rpms/gnupg2/devel gnupg2.spec,1.25,1.26
Message-ID: <200512012025.jB1KPmp6022231@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22214

Modified Files:
	gnupg2.spec 
Log Message:
%%check: fix gpgsm.conf



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnupg2.spec	1 Dec 2005 20:10:26 -0000	1.25
+++ gnupg2.spec	1 Dec 2005 20:25:16 -0000	1.26
@@ -7,7 +7,7 @@
 Summary: GNU utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.19
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
@@ -93,7 +93,7 @@
 
 %check ||:
 # Allows for better debugability
-echo "--debug-allow-core-dumps" >> tests/gpgsm.conf
+echo "debug-allow-core-dumps" >> tests/gpgsm.conf
 %ifarch x86_64
 # Expect one failure (reported upstream)
 make check ||:
@@ -157,7 +157,7 @@
 
 
 %changelog
-* Thu Dec 01 2005 Rex Dieter  1.9.19-5
+* Thu Dec 01 2005 Rex Dieter  1.9.19-6
 - include gpg-agent-(startup|shutdown) scripts (#136533)
 - BR: libksba-devel >= 1.9.12 
 



From fedora-extras-commits at redhat.com  Thu Dec  1 20:37:39 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  1 Dec 2005 15:37:39 -0500
Subject: rpms/gnupg2/devel gnupg2.spec,1.26,1.27
Message-ID: <200512012038.jB1Kc9JJ022338@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22283

Modified Files:
	gnupg2.spec 
Log Message:
disable gpgsm.conf munging, doesn't work



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnupg2.spec	1 Dec 2005 20:25:16 -0000	1.26
+++ gnupg2.spec	1 Dec 2005 20:37:37 -0000	1.27
@@ -7,7 +7,7 @@
 Summary: GNU utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.19
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
@@ -92,8 +92,8 @@
 
 
 %check ||:
-# Allows for better debugability
-echo "debug-allow-core-dumps" >> tests/gpgsm.conf
+# Allows for better debugability (doesn't work, fixme)
+# echo "debug-allow-core-dumps" >> tests/gpgsm.conf
 %ifarch x86_64
 # Expect one failure (reported upstream)
 make check ||:
@@ -157,7 +157,7 @@
 
 
 %changelog
-* Thu Dec 01 2005 Rex Dieter  1.9.19-6
+* Thu Dec 01 2005 Rex Dieter  1.9.19-7
 - include gpg-agent-(startup|shutdown) scripts (#136533)
 - BR: libksba-devel >= 1.9.12 
 



From fedora-extras-commits at redhat.com  Thu Dec  1 20:59:15 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  1 Dec 2005 15:59:15 -0500
Subject: rpms/gnupg2/devel gnupg2.spec,1.27,1.28
Message-ID: <200512012059.jB1KxlYV022444@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22404

Modified Files:
	gnupg2.spec 
Log Message:
I guess we can expect 'make check' failures (for now)



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnupg2.spec	1 Dec 2005 20:37:37 -0000	1.27
+++ gnupg2.spec	1 Dec 2005 20:59:12 -0000	1.28
@@ -92,14 +92,10 @@
 
 
 %check ||:
-# Allows for better debugability (doesn't work, fixme)
+## Allows for better debugability (doesn't work, fixme)
 # echo "debug-allow-core-dumps" >> tests/gpgsm.conf
-%ifarch x86_64
-# Expect one failure (reported upstream)
-make check ||:
-%else
-make check
-%endif
+# (sometimes?) expect one failure (reported upstream)
+#make check ||:
 
 
 %install



From fedora-extras-commits at redhat.com  Thu Dec  1 21:01:51 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  1 Dec 2005 16:01:51 -0500
Subject: rpms/gnupg2/devel gnupg2.spec,1.28,1.29
Message-ID: <200512012102.jB1L2MoV024048@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24027

Modified Files:
	gnupg2.spec 
Log Message:
Release++



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnupg2.spec	1 Dec 2005 20:59:12 -0000	1.28
+++ gnupg2.spec	1 Dec 2005 21:01:48 -0000	1.29
@@ -7,7 +7,7 @@
 Summary: GNU utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.19
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
@@ -153,9 +153,10 @@
 
 
 %changelog
-* Thu Dec 01 2005 Rex Dieter  1.9.19-7
+* Thu Dec 01 2005 Rex Dieter  1.9.19-8
 - include gpg-agent-(startup|shutdown) scripts (#136533)
 - BR: libksba-devel >= 1.9.12 
+- %%check: be permissive about failures (for now)
 
 * Wed Nov 30 2005 Rex Dieter  1.9.19-3
 - BR: libksba-devel >= 1.9.13



From fedora-extras-commits at redhat.com  Thu Dec  1 21:10:12 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  1 Dec 2005 16:10:12 -0500
Subject: rpms/digikamimageplugins/FC-4 .cvsignore, 1.2,
	1.3 digikamimageplugins.spec, 1.8, 1.9 sources, 1.2, 1.3
Message-ID: <200512012110.jB1LAhNb024170@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24123/FC-4

Modified Files:
	.cvsignore digikamimageplugins.spec sources 
Log Message:
* Thu Dec 01 2005 Rex Dieter  0.8.0-1
- 0.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Oct 2005 20:21:44 -0000	1.2
+++ .cvsignore	1 Dec 2005 21:10:10 -0000	1.3
@@ -1 +1 @@
-digikamimageplugins-0.7.4.tar.bz2
+digikamimageplugins-0.8.0.tar.bz2


Index: digikamimageplugins.spec
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins/FC-4/digikamimageplugins.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- digikamimageplugins.spec	10 Nov 2005 18:51:16 -0000	1.8
+++ digikamimageplugins.spec	1 Dec 2005 21:10:10 -0000	1.9
@@ -1,13 +1,13 @@
 
 Name:    digikamimageplugins
 Summary: Plugins for Digikam
-Version: 0.7.4
-Release: 10%{?dist}
+Version: 0.8.0
+Release: 1%{?dist} 
 
 License: GPL
 Group:   Applications/Multimedia
 URL:     http://extragear.kde.org/apps/digikamimageplugins/ 
-Source:  http://dl.sourceforge.net/sourceforge/digikam/digikamimageplugins-0.7.4.tar.bz2	
+Source:  http://dl.sourceforge.net/sourceforge/digikam/digikamimageplugins-%{version}.tar.bz2	
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: digikamplugins < %{version}
@@ -17,7 +17,7 @@
 BuildRequires: kdelibs-devel >= 6:3.4
 BuildRequires: digikam-devel = %{version}
 
-Requires: digikam = %{version}
+Requires: digikam >= %{version}
 Requires: ImageMagick 
 
 
@@ -102,7 +102,6 @@
 done
 fi
 
-
 cat *.lang > %{name}.list
 
 
@@ -130,9 +129,17 @@
 
 
 %changelog
-* Thu Nov 10 2005 Rex Dieter  0.7.4-10
+* Thu Dec 01 2005 Rex Dieter  0.8.0-1
+- 0.8.0
+
+* Thu Nov 10 2005 Rex Dieter  0.8.0-0.1.rc
+- 0.8.0-rc
+
+* Thu Nov 10 2005 Rex Dieter  0.7.4-11 
 - abs->relative symlinks
 - simplify configure
+
+* Fri Nov 04 2005 Rex Dieter  0.7.4-10 
 - Req/BR: digikam = %%version
 
 * Fri Oct 28 2005 Rex Dieter  0.7.4-9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Oct 2005 20:21:44 -0000	1.2
+++ sources	1 Dec 2005 21:10:10 -0000	1.3
@@ -1 +1 @@
-5ea3c0dd6e6f1eb99211e75d0bf17d3d  digikamimageplugins-0.7.4.tar.bz2
+6670e0411dbf71ec9faeee087fc4f79a  digikamimageplugins-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec  1 21:10:18 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  1 Dec 2005 16:10:18 -0500
Subject: rpms/digikamimageplugins/devel .cvsignore, 1.2,
	1.3 digikamimageplugins.spec, 1.10, 1.11 sources, 1.2, 1.3
Message-ID: <200512012110.jB1LAmGD024188@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24123/devel

Modified Files:
	.cvsignore digikamimageplugins.spec sources 
Log Message:
* Thu Dec 01 2005 Rex Dieter  0.8.0-1
- 0.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Oct 2005 20:21:44 -0000	1.2
+++ .cvsignore	1 Dec 2005 21:10:16 -0000	1.3
@@ -1 +1 @@
-digikamimageplugins-0.7.4.tar.bz2
+digikamimageplugins-0.8.0.tar.bz2


Index: digikamimageplugins.spec
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins/devel/digikamimageplugins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- digikamimageplugins.spec	10 Nov 2005 18:51:21 -0000	1.10
+++ digikamimageplugins.spec	1 Dec 2005 21:10:16 -0000	1.11
@@ -1,13 +1,13 @@
 
 Name:    digikamimageplugins
 Summary: Plugins for Digikam
-Version: 0.7.4
-Release: 10%{?dist}
+Version: 0.8.0
+Release: 1%{?dist} 
 
 License: GPL
 Group:   Applications/Multimedia
 URL:     http://extragear.kde.org/apps/digikamimageplugins/ 
-Source:  http://dl.sourceforge.net/sourceforge/digikam/digikamimageplugins-0.7.4.tar.bz2	
+Source:  http://dl.sourceforge.net/sourceforge/digikam/digikamimageplugins-%{version}.tar.bz2	
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: digikamplugins < %{version}
@@ -17,7 +17,7 @@
 BuildRequires: kdelibs-devel >= 6:3.4
 BuildRequires: digikam-devel = %{version}
 
-Requires: digikam = %{version}
+Requires: digikam >= %{version}
 Requires: ImageMagick 
 
 
@@ -102,7 +102,6 @@
 done
 fi
 
-
 cat *.lang > %{name}.list
 
 
@@ -130,9 +129,17 @@
 
 
 %changelog
-* Thu Nov 10 2005 Rex Dieter  0.7.4-10
+* Thu Dec 01 2005 Rex Dieter  0.8.0-1
+- 0.8.0
+
+* Thu Nov 10 2005 Rex Dieter  0.8.0-0.1.rc
+- 0.8.0-rc
+
+* Thu Nov 10 2005 Rex Dieter  0.7.4-11 
 - abs->relative symlinks
 - simplify configure
+
+* Fri Nov 04 2005 Rex Dieter  0.7.4-10 
 - Req/BR: digikam = %%version
 
 * Fri Oct 28 2005 Rex Dieter  0.7.4-9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Oct 2005 20:21:44 -0000	1.2
+++ sources	1 Dec 2005 21:10:16 -0000	1.3
@@ -1 +1 @@
-5ea3c0dd6e6f1eb99211e75d0bf17d3d  digikamimageplugins-0.7.4.tar.bz2
+6670e0411dbf71ec9faeee087fc4f79a  digikamimageplugins-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec  1 22:02:42 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu,  1 Dec 2005 17:02:42 -0500
Subject: web/html/download vendors.list,1.7,1.8
Message-ID: <200512012203.jB1M3vcx026106@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/web/html/download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26089

Modified Files:
	vendors.list 
Log Message:
add computefree


Index: vendors.list
===================================================================
RCS file: /cvs/fedora/web/html/download/vendors.list,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vendors.list	18 Nov 2005 08:40:46 -0000	1.7
+++ vendors.list	1 Dec 2005 22:02:40 -0000	1.8
@@ -14,6 +14,8 @@
 
 CompraLinux (Spain only)::3 CDs or 6 CDs::13.92 euro or 24.36 euro
 
+ComputeFree::CDs::$10.99 - 12.99
+
 Copyleft Solutions::4 CDs or 1 DVD::Rs 400 or Rs 200
 
 cosaslibres.com::3 CDs or 6 CDs::25000 Pesos or 48000 Pesos
@@ -77,3 +79,4 @@
 Terrassol Tecnologia::3 CDs::45,00 reais
 
 TheLinuxStore.ca::CDs or DVD::7.97 - 9.97 CAD$
+



From fedora-extras-commits at redhat.com  Thu Dec  1 22:40:21 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Thu,  1 Dec 2005 17:40:21 -0500
Subject: fedora-security/audit fc4,1.98,1.99 fc5,1.10,1.11
Message-ID: <200512012240.jB1MeqSM026244@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26225

Modified Files:
	fc4 fc5 
Log Message:
Note CVE-2005-3962, a perl format string integer overflow issue



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- fc4	29 Nov 2005 15:48:06 -0000	1.98
+++ fc4	1 Dec 2005 22:40:19 -0000	1.99
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2005-3962 backport (perl) [since FEDORA-2005-1113]
 CVE-2005-3858 version (kernel, fixed 2.6.13) [since FEDORA-2005-949]
 CVE-2005-3857 VULNERABLE (kernel, fixed 2.6.15)
 CVE-2005-3848 version (kernel, fixed 2.6.13) [since FEDORA-2005-949]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fc5	29 Nov 2005 15:48:06 -0000	1.10
+++ fc5	1 Dec 2005 22:40:19 -0000	1.11
@@ -12,6 +12,7 @@
 
 ** are items that need attention
 
+CVE-2005-3962 VULNERABLE (perl)
 CVE-2005-3858 version (kernel, fixed 2.6.13)
 CVE-2005-3857 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1-git3
 CVE-2005-3848 version (kernel, fixed 2.6.13)



From fedora-extras-commits at redhat.com  Fri Dec  2 09:57:43 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  2 Dec 2005 04:57:43 -0500
Subject: rpms/cernlib/devel 705-patch-paw_motif-paw-Imakefiles.dpatch, 1.2,
	1.3 802-create-shared-libraries.dpatch, 1.1, 1.2 cernlib.spec,
	1.5, 1.6 cernlib_2005.05.09.dfsg-1.diff, 1.1, 1.2
Message-ID: <200512020958.jB29wDvt014695@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14663

Modified Files:
	705-patch-paw_motif-paw-Imakefiles.dpatch 
	802-create-shared-libraries.dpatch cernlib.spec 
	cernlib_2005.05.09.dfsg-1.diff 
Log Message:
- use updated beta debian patchset
- remove the BSD in the licence because there is no library nor binary
  under a BSD licence and someone could get the idea that there is 
  some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
  because of cfortran

The directory reordering in toplevel Imakefile is now done in patch 802
and not 705 



Index: 705-patch-paw_motif-paw-Imakefiles.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/705-patch-paw_motif-paw-Imakefiles.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 705-patch-paw_motif-paw-Imakefiles.dpatch	1 Dec 2005 14:46:38 -0000	1.2
+++ 705-patch-paw_motif-paw-Imakefiles.dpatch	2 Dec 2005 09:57:41 -0000	1.3
@@ -13,7 +13,7 @@
  
  
 -LIBDIRS= kernlib packlib code_motif pawlib graflib mathlib geant321 mclibs phtools
-+LIBDIRS= kernlib packlib code_motif graflib mathlib pawlib paw_motif geant321 mclibs phtools
++LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
  
  SUBDIRS= $(LIBDIRS) patchy cfortran
  


Index: 802-create-shared-libraries.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/802-create-shared-libraries.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 802-create-shared-libraries.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 802-create-shared-libraries.dpatch	2 Dec 2005 09:57:41 -0000	1.2
@@ -6,8 +6,17 @@
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile
---- cernlib-2005.05.09.dfsg~/src/Imakefile	2005-11-29 17:06:14.683891311 +0000
-+++ cernlib-2005.05.09.dfsg/src/Imakefile	2005-11-29 17:06:50.910248135 +0000
+--- cernlib-2005.05.09.dfsg~/src/Imakefile	2005-12-01 15:19:24.191267776 +0000
++++ cernlib-2005.05.09.dfsg/src/Imakefile	2005-12-01 15:20:10.310483251 +0000
+@@ -2,7 +2,7 @@
+ #define PassCDebugFlags
+ 
+ 
+-LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
++LIBDIRS= kernlib packlib mathlib graflib code_motif mclibs phtools pawlib paw_motif geant321
+ 
+ SUBDIRS= $(LIBDIRS) patchy cfortran
+ 
 @@ -15,6 +15,7 @@
  #endif
  
@@ -17,16 +26,16 @@
  INCLUDEDIRS= $(LIBDIRS) cfortran
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile cernlib-2005.05.09.dfsg/src/code_motif/Imakefile
---- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile	2005-11-29 17:06:14.555918310 +0000
-+++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile	2005-11-29 17:06:21.953357641 +0000
+--- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile	2005-12-01 15:19:24.062295137 +0000
++++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile	2005-12-01 15:19:31.186783665 +0000
 @@ -31,3 +31,4 @@
  SubdirLibraryTarget(packlib-lesstif,NullParameter) 
  
  InstallLibrary(packlib-lesstif,$(CERN_LIBDIR))
 +InstallSharedLibrary(packlib-lesstif,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
---- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-11-29 17:06:13.317179648 +0000
-+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-11-29 17:06:21.953357641 +0000
+--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-12-01 15:19:23.018516575 +0000
++++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-12-01 15:19:31.186783665 +0000
 @@ -26,6 +26,7 @@
  
  InstallLibrary(geant321,$(CERN_LIBDIR))
@@ -37,7 +46,7 @@
  /*
 diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile	1996-12-19 14:19:18.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile	2005-11-29 17:06:21.953357641 +0000
++++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile	2005-12-01 15:19:31.186783665 +0000
 @@ -10,6 +10,7 @@
  SubdirLibraryTarget(geant321_parallel,NullParameter)
  
@@ -48,7 +57,7 @@
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/Imakefile cernlib-2005.05.09.dfsg/src/graflib/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/graflib/Imakefile	2001-12-11 15:06:28.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile	2005-11-29 17:06:21.953357641 +0000
++++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile	2005-12-01 15:19:31.186783665 +0000
 @@ -11,9 +11,12 @@
  
  SubdirLibraryTarget(graflib,$(LIBDIRS))
@@ -66,7 +75,7 @@
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile	1997-09-02 13:34:47.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile	2005-11-29 17:06:21.967354688 +0000
++++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile	2005-12-01 15:19:31.186783665 +0000
 @@ -13,6 +13,7 @@
  SubdirLibraryTarget(grafX11,$(LIBDIRS))
  
@@ -77,7 +86,7 @@
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile	2002-04-26 14:37:20.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile	2005-11-29 17:06:21.967354688 +0000
++++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile	2005-12-01 15:19:31.187783453 +0000
 @@ -14,6 +14,7 @@
  
  InstallLibrary(kernlib,$(CERN_LIBDIR))
@@ -87,8 +96,8 @@
  test::	LibraryTargetName(kernlib)
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/Imakefile
---- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile	2005-11-29 17:06:14.498930333 +0000
-+++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile	2005-11-29 17:06:21.968354477 +0000
+--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile	2005-12-01 15:19:24.005307227 +0000
++++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile	2005-12-01 15:19:31.187783453 +0000
 @@ -19,6 +19,7 @@
  SubdirLibraryTarget(mathlib,$(LIBDIRS))
  
@@ -98,8 +107,8 @@
  InstallIncludeSubdirs($(LIBDIRS))
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/Imakefile
---- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile	2005-11-29 17:06:12.812286166 +0000
-+++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile	2005-11-29 17:06:21.968354477 +0000
+--- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile	2005-12-01 15:19:22.512623901 +0000
++++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile	2005-12-01 15:19:31.187783453 +0000
 @@ -13,6 +13,7 @@
  TestSubdirs($(LIBDIRS))
  
@@ -110,7 +119,7 @@
  INCLUDEDIRS= cojets eurodec herwig isajet pdf
 diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile	1996-05-06 20:06:50.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile	2005-11-29 17:06:21.968354477 +0000
++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile	2005-12-01 15:19:31.187783453 +0000
 @@ -12,6 +12,7 @@
  SubdirLibraryTarget(cojets,$(LIBDIRS))
  
@@ -121,7 +130,7 @@
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile	1996-05-06 20:06:55.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile	2005-11-29 17:06:21.968354477 +0000
++++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile	2005-12-01 15:19:31.187783453 +0000
 @@ -12,6 +12,7 @@
  SubdirLibraryTarget(eurodec,$(LIBDIRS))
  
@@ -132,7 +141,7 @@
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile	1997-01-06 17:06:41.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile	2005-11-29 17:06:21.968354477 +0000
++++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile	2005-12-01 15:19:31.187783453 +0000
 @@ -10,6 +10,7 @@
  
  InstallLibrary(herwig59,$(CERN_LIBDIR))
@@ -143,7 +152,7 @@
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile	2001-10-08 14:03:02.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile	2005-11-29 17:06:21.968354477 +0000
++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile	2005-12-01 15:19:31.187783453 +0000
 @@ -12,6 +12,7 @@
  SubdirLibraryTarget(isajet758,$(LIBDIRS))
  
@@ -154,7 +163,7 @@
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile	2000-05-29 14:49:59.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile	2005-11-29 17:06:21.969354266 +0000
++++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile	2005-12-01 15:19:31.188783241 +0000
 @@ -15,6 +15,7 @@
  SubdirLibraryTarget(pdflib804,spdf npdf)
  
@@ -165,7 +174,7 @@
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile	1999-03-26 10:52:23.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile	2005-11-29 17:06:21.969354266 +0000
++++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile	2005-12-01 15:19:31.188783241 +0000
 @@ -15,6 +15,7 @@
  SubdirLibraryTarget(photos202,code)
  
@@ -175,8 +184,8 @@
  TestSubdirs(test)
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/Imakefile cernlib-2005.05.09.dfsg/src/packlib/Imakefile
---- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile	2005-11-29 17:06:14.373956699 +0000
-+++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile	2005-11-29 17:06:21.969354266 +0000
+--- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile	2005-12-01 15:19:23.885332680 +0000
++++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile	2005-12-01 15:19:31.188783241 +0000
 @@ -14,6 +14,7 @@
  
  InstallLibrary(packlib,$(CERN_LIBDIR))
@@ -186,8 +195,8 @@
  TestSubdirs($(LIBDIRS))
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile
---- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile	2005-11-29 17:06:14.684891100 +0000
-+++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile	2005-11-29 17:06:21.969354266 +0000
+--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile	2005-12-01 15:19:24.192267563 +0000
++++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile	2005-12-01 15:19:31.188783241 +0000
 @@ -30,4 +30,5 @@
  SubdirLibraryTarget(pawlib-lesstif,$(LIBDIRS))
  
@@ -196,7 +205,7 @@
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile	1996-10-01 14:12:23.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile	2005-11-29 17:06:21.969354266 +0000
++++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile	2005-12-01 15:19:31.188783241 +0000
 @@ -11,6 +11,7 @@
  SubdirLibraryTarget(pawlib,$(LIBDIRS))
  
@@ -207,7 +216,7 @@
  
 diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/Imakefile cernlib-2005.05.09.dfsg/src/phtools/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/phtools/Imakefile	1996-11-14 16:44:33.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile	2005-11-29 17:06:21.970354056 +0000
++++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile	2005-12-01 15:19:31.189783029 +0000
 @@ -11,7 +11,7 @@
  SubdirLibraryTarget(phtools,$(LIBDIRS))
  


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cernlib.spec	1 Dec 2005 14:47:54 -0000	1.5
+++ cernlib.spec	2 Dec 2005 09:57:41 -0000	1.6
@@ -1,11 +1,11 @@
 Name:          cernlib
 Version:       2005
-Release:       6%{?dist}.1
+Release:       7%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
 # http://borex.princeton.edu/~kmccarty/faq.html#44
-License:       GPL/LGPL/BSD
+License:       GPL/LGPL
 URL:           http://cernlib.web.cern.ch/cernlib/
 # mandrake
 #BuildRequires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
@@ -688,6 +688,13 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Fri Dec  2 2005 Patrice Dumas  - 2005-7
+- use updated beta debian patchset
+- remove the BSD in the licence because there is no library nor binary
+  under a BSD licence and someone could get the idea that there is 
+  some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
+  because of cfortran
+
 * Tue Nov 29 2005 Patrice Dumas  - 2005-6.1
 - update with newer debian patchset for cernlib, fix licence issues
 - don't use the include.tar.gz source, instead get include files from

cernlib_2005.05.09.dfsg-1.diff:

Index: cernlib_2005.05.09.dfsg-1.diff
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib_2005.05.09.dfsg-1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib_2005.05.09.dfsg-1.diff	30 Nov 2005 22:01:01 -0000	1.1
+++ cernlib_2005.05.09.dfsg-1.diff	2 Dec 2005 09:57:41 -0000	1.2
@@ -2744,13 +2744,15 @@
 +-/* $Id$
 +- *
 +- * $Log$
-+- * Revision 1.1  2005/11/30 22:01:01  pertusus
-+- * - update with newer debian patchset for cernlib, fix licence issues
-+- * - don't use the include.tar.gz source, instead get include files from
-+- *   the source files
-+- * - build shared libraries
-+- * - simplify the scripts modifications
-+- * - add BuildRequires: libXau-devel to workaround #173530
++- * Revision 1.2  2005/12/02 09:57:41  pertusus
++- * - use updated beta debian patchset
++- * - remove the BSD in the licence because there is no library nor binary
++- *   under a BSD licence and someone could get the idea that there is
++- *   some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
++- *   because of cfortran
++- *
++- * The directory reordering in toplevel Imakefile is now done in patch 802
++- * and not 705
 +- *
 +- * Revision 1.5  2004/10/05 15:54:40  mclareni
 +- * Add configuration file linux-lp64 for Linux 64-bit pointer systems like AMD Opteron and Intel IA64.
@@ -6217,7 +6219,7 @@
 + #endif
 --- cernlib-2005.05.09.dfsg.orig/debian/patches/802-create-shared-libraries.dpatch
 +++ cernlib-2005.05.09.dfsg/debian/patches/802-create-shared-libraries.dpatch
-@@ -0,0 +1,219 @@
+@@ -0,0 +1,228 @@
 +#! /bin/sh /usr/share/dpatch/dpatch-run
 +## 802-create-shared-libraries.dpatch by  
 +##
@@ -6226,8 +6228,17 @@
 +
 + at DPATCH@
 +diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile
-+--- cernlib-2005.05.09.dfsg~/src/Imakefile	2005-11-29 17:06:14.683891311 +0000
-++++ cernlib-2005.05.09.dfsg/src/Imakefile	2005-11-29 17:06:50.910248135 +0000
++--- cernlib-2005.05.09.dfsg~/src/Imakefile	2005-12-01 15:19:24.191267776 +0000
+++++ cernlib-2005.05.09.dfsg/src/Imakefile	2005-12-01 15:20:10.310483251 +0000
++@@ -2,7 +2,7 @@
++ #define PassCDebugFlags
++ 
++ 
++-LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
+++LIBDIRS= kernlib packlib mathlib graflib code_motif mclibs phtools pawlib paw_motif geant321
++ 
++ SUBDIRS= $(LIBDIRS) patchy cfortran
++ 
 +@@ -15,6 +15,7 @@
 + #endif
 + 
@@ -6237,16 +6248,16 @@
 + INCLUDEDIRS= $(LIBDIRS) cfortran
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile cernlib-2005.05.09.dfsg/src/code_motif/Imakefile
-+--- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile	2005-11-29 17:06:14.555918310 +0000
-++++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile	2005-11-29 17:06:21.953357641 +0000
++--- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile	2005-12-01 15:19:24.062295137 +0000
+++++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile	2005-12-01 15:19:31.186783665 +0000
 +@@ -31,3 +31,4 @@
 + SubdirLibraryTarget(packlib-lesstif,NullParameter) 
 + 
 + InstallLibrary(packlib-lesstif,$(CERN_LIBDIR))
 ++InstallSharedLibrary(packlib-lesstif,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 +diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
-+--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-11-29 17:06:13.317179648 +0000
-++++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-11-29 17:06:21.953357641 +0000
++--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-12-01 15:19:23.018516575 +0000
+++++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-12-01 15:19:31.186783665 +0000
 +@@ -26,6 +26,7 @@
 + 
 + InstallLibrary(geant321,$(CERN_LIBDIR))
@@ -6257,7 +6268,7 @@
 + /*
 +diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile
 +--- cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile	1996-12-19 14:19:18.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile	2005-11-29 17:06:21.953357641 +0000
+++++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile	2005-12-01 15:19:31.186783665 +0000
 +@@ -10,6 +10,7 @@
 + SubdirLibraryTarget(geant321_parallel,NullParameter)
 + 
@@ -6268,7 +6279,7 @@
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/Imakefile cernlib-2005.05.09.dfsg/src/graflib/Imakefile
 +--- cernlib-2005.05.09.dfsg~/src/graflib/Imakefile	2001-12-11 15:06:28.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile	2005-11-29 17:06:21.953357641 +0000
+++++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile	2005-12-01 15:19:31.186783665 +0000
 +@@ -11,9 +11,12 @@
 + 
 + SubdirLibraryTarget(graflib,$(LIBDIRS))
@@ -6286,7 +6297,7 @@
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile
 +--- cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile	1997-09-02 13:34:47.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile	2005-11-29 17:06:21.967354688 +0000
+++++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile	2005-12-01 15:19:31.186783665 +0000
 +@@ -13,6 +13,7 @@
 + SubdirLibraryTarget(grafX11,$(LIBDIRS))
 + 
@@ -6297,7 +6308,7 @@
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/Imakefile
 +--- cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile	2002-04-26 14:37:20.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile	2005-11-29 17:06:21.967354688 +0000
+++++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile	2005-12-01 15:19:31.187783453 +0000
 +@@ -14,6 +14,7 @@
 + 
 + InstallLibrary(kernlib,$(CERN_LIBDIR))
@@ -6307,8 +6318,8 @@
 + test::	LibraryTargetName(kernlib)
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/Imakefile
-+--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile	2005-11-29 17:06:14.498930333 +0000
-++++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile	2005-11-29 17:06:21.968354477 +0000
++--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile	2005-12-01 15:19:24.005307227 +0000
+++++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile	2005-12-01 15:19:31.187783453 +0000
 +@@ -19,6 +19,7 @@
 + SubdirLibraryTarget(mathlib,$(LIBDIRS))
 + 
@@ -6318,8 +6329,8 @@
 + InstallIncludeSubdirs($(LIBDIRS))
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/Imakefile
-+--- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile	2005-11-29 17:06:12.812286166 +0000
-++++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile	2005-11-29 17:06:21.968354477 +0000
++--- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile	2005-12-01 15:19:22.512623901 +0000
+++++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile	2005-12-01 15:19:31.187783453 +0000
 +@@ -13,6 +13,7 @@
 + TestSubdirs($(LIBDIRS))
 + 
@@ -6330,7 +6341,7 @@
 + INCLUDEDIRS= cojets eurodec herwig isajet pdf
 +diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile
 +--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile	1996-05-06 20:06:50.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile	2005-11-29 17:06:21.968354477 +0000
+++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile	2005-12-01 15:19:31.187783453 +0000
 +@@ -12,6 +12,7 @@
 + SubdirLibraryTarget(cojets,$(LIBDIRS))
 + 
@@ -6341,7 +6352,7 @@
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile
 +--- cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile	1996-05-06 20:06:55.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile	2005-11-29 17:06:21.968354477 +0000
+++++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile	2005-12-01 15:19:31.187783453 +0000
 +@@ -12,6 +12,7 @@
 + SubdirLibraryTarget(eurodec,$(LIBDIRS))
 + 
@@ -6352,7 +6363,7 @@
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile
 +--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile	1997-01-06 17:06:41.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile	2005-11-29 17:06:21.968354477 +0000
+++++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile	2005-12-01 15:19:31.187783453 +0000
 +@@ -10,6 +10,7 @@
 + 
 + InstallLibrary(herwig59,$(CERN_LIBDIR))
@@ -6363,7 +6374,7 @@
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile
 +--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile	2001-10-08 14:03:02.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile	2005-11-29 17:06:21.968354477 +0000
+++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile	2005-12-01 15:19:31.187783453 +0000
 +@@ -12,6 +12,7 @@
 + SubdirLibraryTarget(isajet758,$(LIBDIRS))
 + 
@@ -6374,7 +6385,7 @@
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile
 +--- cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile	2000-05-29 14:49:59.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile	2005-11-29 17:06:21.969354266 +0000
+++++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile	2005-12-01 15:19:31.188783241 +0000
 +@@ -15,6 +15,7 @@
 + SubdirLibraryTarget(pdflib804,spdf npdf)
 + 
@@ -6385,7 +6396,7 @@
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile
 +--- cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile	1999-03-26 10:52:23.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile	2005-11-29 17:06:21.969354266 +0000
+++++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile	2005-12-01 15:19:31.188783241 +0000
 +@@ -15,6 +15,7 @@
 + SubdirLibraryTarget(photos202,code)
 + 
@@ -6395,8 +6406,8 @@
 + TestSubdirs(test)
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/Imakefile cernlib-2005.05.09.dfsg/src/packlib/Imakefile
-+--- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile	2005-11-29 17:06:14.373956699 +0000
-++++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile	2005-11-29 17:06:21.969354266 +0000
++--- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile	2005-12-01 15:19:23.885332680 +0000
+++++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile	2005-12-01 15:19:31.188783241 +0000
 +@@ -14,6 +14,7 @@
 + 
 + InstallLibrary(packlib,$(CERN_LIBDIR))
@@ -6406,8 +6417,8 @@
 + TestSubdirs($(LIBDIRS))
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile
-+--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile	2005-11-29 17:06:14.684891100 +0000
-++++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile	2005-11-29 17:06:21.969354266 +0000
++--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile	2005-12-01 15:19:24.192267563 +0000
+++++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile	2005-12-01 15:19:31.188783241 +0000
 +@@ -30,4 +30,5 @@
 + SubdirLibraryTarget(pawlib-lesstif,$(LIBDIRS))
 + 
@@ -6416,7 +6427,7 @@
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/Imakefile
 +--- cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile	1996-10-01 14:12:23.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile	2005-11-29 17:06:21.969354266 +0000
+++++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile	2005-12-01 15:19:31.188783241 +0000
 +@@ -11,6 +11,7 @@
 + SubdirLibraryTarget(pawlib,$(LIBDIRS))
 + 
@@ -6427,7 +6438,7 @@
 + 
 +diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/Imakefile cernlib-2005.05.09.dfsg/src/phtools/Imakefile
 +--- cernlib-2005.05.09.dfsg~/src/phtools/Imakefile	1996-11-14 16:44:33.000000000 +0000
-++++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile	2005-11-29 17:06:21.970354056 +0000
+++++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile	2005-12-01 15:19:31.189783029 +0000
 +@@ -11,7 +11,7 @@
 + SubdirLibraryTarget(phtools,$(LIBDIRS))
 + 
@@ -6762,13 +6773,15 @@
 + /* $Id$
 +  *
 +  * $Log$
-+  * Revision 1.1  2005/11/30 22:01:01  pertusus
-+  * - update with newer debian patchset for cernlib, fix licence issues
-+  * - don't use the include.tar.gz source, instead get include files from
-+  *   the source files
-+  * - build shared libraries
-+  * - simplify the scripts modifications
-+  * - add BuildRequires: libXau-devel to workaround #173530
++  * Revision 1.2  2005/12/02 09:57:41  pertusus
++  * - use updated beta debian patchset
++  * - remove the BSD in the licence because there is no library nor binary
++  *   under a BSD licence and someone could get the idea that there is
++  *   some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
++  *   because of cfortran
++  *
++  * The directory reordering in toplevel Imakefile is now done in patch 802
++  * and not 705
 +  *
 +diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.68wCAR/cernlib-2005.05.09/src/config/MacOSX.cf
 +--- cernlib-2005.05.09/src/config/MacOSX.cf	2005-06-10 14:34:58.142950664 -0400
@@ -7684,13 +7697,15 @@
 + /* $Id$
 +  *
 +  * $Log$
-+  * Revision 1.1  2005/11/30 22:01:01  pertusus
-+  * - update with newer debian patchset for cernlib, fix licence issues
-+  * - don't use the include.tar.gz source, instead get include files from
-+  *   the source files
-+  * - build shared libraries
-+  * - simplify the scripts modifications
-+  * - add BuildRequires: libXau-devel to workaround #173530
++  * Revision 1.2  2005/12/02 09:57:41  pertusus
++  * - use updated beta debian patchset
++  * - remove the BSD in the licence because there is no library nor binary
++  *   under a BSD licence and someone could get the idea that there is
++  *   some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
++  *   because of cfortran
++  *
++  * The directory reordering in toplevel Imakefile is now done in patch 802
++  * and not 705
 +  *
 +diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.68wCAR/cernlib-2005.05.09/src/config/MacOSX.cf
 +--- cernlib-2005.05.09/src/config/MacOSX.cf	2005-06-10 14:34:58.142950664 -0400
@@ -9890,7 +9905,7 @@
 +                SYSGMOTIF="-lXm -lXt /usr/lib/X11/libX11.r" ;;
 --- cernlib-2005.05.09.dfsg.orig/debian/add-ons/Makefile
 +++ cernlib-2005.05.09.dfsg/debian/add-ons/Makefile
-@@ -0,0 +1,520 @@
+@@ -0,0 +1,518 @@
 +# Variables for installation directories, conforming to GNU standards
 +prefix		= /usr/local
 +exec_prefix	= $(prefix)
@@ -10091,8 +10106,6 @@
 +# build programs
 +cernlib-programs:
 +	set -e ; \
-+	rm -f $(CVSCOSRC)/pawlib/paw/programs/comis && \
-+	ln -sf ../../comis/comis $(CVSCOSRC)/pawlib/paw/programs/comis ; \
 +	for package in $(BIN_PACKAGES) ; do \
 +		if [ -d $(CVSCOSRC)/$$package ] ; then \
 +			cd $(CERN_BUILDDIR)/$$package && $(MAKE) \
@@ -11162,12 +11175,14 @@
 +
 --- cernlib-2005.05.09.dfsg.orig/debian/add-ons/scripts/findsym
 +++ cernlib-2005.05.09.dfsg/debian/add-ons/scripts/findsym
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,54 @@
 +#!/bin/bash
 +
 +# find where a symbol is defined
-+# argument 1: "has" == provides a symbol,
-+#	      "needs" == requires a symbol
++# argument 1: "has" == what object provides a given symbol?
++#	      "needs" == what object requires a given symbol?
++#	      "requiredby" == what symbols are required by an object
++#                             providing a given symbol?
 +# argument 2: the symbol to search for
 +# argument 3: directory to search in ("." if omitted)
 +
@@ -11217,13 +11232,13 @@
 +
 --- cernlib-2005.05.09.dfsg.orig/debian/add-ons/scripts/README
 +++ cernlib-2005.05.09.dfsg/debian/add-ons/scripts/README
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,58 @@
 +Nothing in this directory is needed for compiling or building packages.
 +It's just a few simple scripts that make my life easier when trying to debug
 +library dependencies.
 +
-+makedeplist
-+-----------
++makedeplist (no arguments)
++--------------------------
 +
 +When run in the top-level cernlib source directory after a compilation (note
 +that DEB_BUILD_OPTIONS must have been set to "nostrip"), this script will
@@ -11248,18 +11263,32 @@
 +If you want to include non-Cernlib libraries in the output, symlink to them
 +from the shlib directory, e.g. shlib/libX11.so -> /usr/X11R6/lib/libX11.so
 +
-+findsym
-+-------
++findsym {has|needs|requiredby}  [  ]
++-------------------------------------------------------
 +
 +This script will find needed symbols recursively in any .o, .a, or .so files in
 +a directory.  "findsym has " searches for object files that provide a
 +given symbol.  "findsym needs " searches for object files that have the
-+symbol undefined.  An optional third argument specifies the starting directory
++symbol undefined.  "findsym requiredby " prints a list of symbols
++needed by object files that define the given symbol; this command works best
++with object files or shared libs.
++
++An optional third argument specifies the starting directory
 +("." by default).  Thus, seeing that the file
 +	libdeps/libpacklib-lesstif.not-in-cernlib.txt
 +contains (among others) the symbol XBell, we run (using an ingenious guess for
-+the starting directory) "findsym has XBell /usr/X11R6/lib" to determine that
-+this is found in libX11.so.
++the starting directory) "./findsym has XBell /usr/X11R6/lib" to determine that
++this symbol is found in libX11.so.
++
++libcomp  
++-------------------------
++
++This script compares the symbols exported by two dynamic libraries that are
++supposed to be different versions of the same library.  Any symbols in the
++first-specified library that are not present in the second-specified library,
++or have a different size, are noted.  The intent is to check for preservation
++of ABI compatibility.
++
 +
 +--Kevin McCarty
 --- cernlib-2005.05.09.dfsg.orig/debian/add-ons/scripts/makedeplist
@@ -11356,11 +11385,12 @@
 +exit 0
 --- cernlib-2005.05.09.dfsg.orig/debian/add-ons/scripts/libcomp
 +++ cernlib-2005.05.09.dfsg/debian/add-ons/scripts/libcomp
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,34 @@
 +#!/bin/bash
 +
 +# libcomp - Script to check whether the size of library symbols has
 +#           changed between versions.  For checking ABI compatibility.
++#           Requires the "bc" and "binutils" packages to be installed.
 +
 +# Arguments: $1 - old library; $2 - new library
 +
@@ -11663,13 +11693,15 @@
 +.\"* $Id$
 +.\"*
 +.\"* $Log$
-+.\"* Revision 1.1  2005/11/30 22:01:01  pertusus
-+.\"* - update with newer debian patchset for cernlib, fix licence issues
-+.\"* - don't use the include.tar.gz source, instead get include files from
-+.\"*   the source files
-+.\"* - build shared libraries
-+.\"* - simplify the scripts modifications
-+.\"* - add BuildRequires: libXau-devel to workaround #173530
++.\"* Revision 1.2  2005/12/02 09:57:41  pertusus
++.\"* - use updated beta debian patchset
++.\"* - remove the BSD in the licence because there is no library nor binary
++.\"*   under a BSD licence and someone could get the idea that there is
++.\"*   some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
++.\"*   because of cfortran
++.\"*
++.\"* The directory reordering in toplevel Imakefile is now done in patch 802
++.\"* and not 705
 +.\"*
 +.\"* Revision 1.3  2000/10/24 07:29:51  couet
 +.\"* - PAW web pages URL updated
@@ -13408,7 +13440,7 @@
 +pawlib/sigma/sigma
 --- cernlib-2005.05.09.dfsg.orig/debian/changelog
 +++ cernlib-2005.05.09.dfsg/debian/changelog
-@@ -0,0 +1,1334 @@
+@@ -0,0 +1,1336 @@
 +cernlib (2005.05.09.dfsg-1) unstable; urgency=low
 +
 +  * Removed the directories src/geant321/peanut and src/geant321/block,
@@ -13433,9 +13465,9 @@
 +      binary packages: geant321, libgeant321-2, libgeant321-2-dev.
 +
 +  * Some additional changes to existing patches suggested by Patrice Dumas
-+    :
++     in the process of creating Cernlib RPMs:
 +    - patch 102: Add src/mathlib/gen/d/old506.F to the list of files to
-+                 compile without optimization.
++                 compile without optimization; it breaks g77 3.2 otherwise.
 +    - patch 207: Have COMIS create temporary shared library files with g77,
 +                 not gcc.  (Resync patch 315.)
 +    - patch 210: Change  to .
@@ -13444,8 +13476,10 @@
 +                 in src/packlib/kernlib/kerngen/ccgen/lenocc.c ; it isn't
 +                 clear that the C version is 64-bit safe.
 +    - patch 800: Use "$(FCLINK)" to create shared libs, not "gcc".
-+    - patch 802: For consistency, add InstallSharedLibSubdirs to top-level
-+                 Imakefile, even though not used in the Debian package build.
++    - patch 802: Fixes to the top-level Imakefile, even though it isn't used
++                 in the Debian package build.  For consistency, add
++                 InstallSharedLibSubdirs(), and re-order the directory build
++                 order to match that in debian/add-ons/Makefile.
 +    - patch 804: #include "comis/mdpool.h" or .inc consistently, using a new
 +                 dpatch shell script 804-link-to-comis-includes.sh to link
 +                 src/pawlib/comis/comis into src/include/.
@@ -13474,7 +13508,7 @@
 +    - Spanish: C??sar G??mez Mart??n  (closes: #334390)
 +    - Swedish: Daniel Nylander  (closes: #332334)
 +
-+ -- Kevin B. McCarty   Tue, 29 Nov 2005 17:41:54 +0000
++ -- Kevin B. McCarty   Thu,  1 Dec 2005 15:14:27 +0000
 +
 +cernlib (2005.05.09-4) unstable; urgency=low
 +



From fedora-extras-commits at redhat.com  Fri Dec  2 14:07:54 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  2 Dec 2005 09:07:54 -0500
Subject: rpms/intuitively - New directory
Message-ID: <200512021407.jB2E7s8r023394@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/intuitively
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23385/intuitively

Log Message:
Directory /cvs/extras/rpms/intuitively added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  2 14:08:15 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  2 Dec 2005 09:08:15 -0500
Subject: rpms/intuitively/devel - New directory
Message-ID: <200512021408.jB2E8FdX023409@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/intuitively/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23385/intuitively/devel

Log Message:
Directory /cvs/extras/rpms/intuitively/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  2 14:08:55 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  2 Dec 2005 09:08:55 -0500
Subject: rpms/intuitively Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512021408.jB2E8t6i023446@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/intuitively
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23433

Added Files:
	Makefile import.log 
Log Message:
Setup of module intuitively


--- NEW FILE Makefile ---
# Top level Makefile for module intuitively
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec  2 14:09:17 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  2 Dec 2005 09:09:17 -0500
Subject: rpms/intuitively/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512021409.jB2E9HdU023464@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/intuitively/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23433/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module intuitively


--- NEW 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 Dec  2 14:10:35 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  2 Dec 2005 09:10:35 -0500
Subject: rpms/intuitively import.log,1.1,1.2
Message-ID: <200512021410.jB2EAZkq023534@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/intuitively
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23500

Modified Files:
	import.log 
Log Message:
auto-import intuitively-0.7-6 on branch devel from intuitively-0.7-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/intuitively/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Dec 2005 14:08:53 -0000	1.1
+++ import.log	2 Dec 2005 14:10:14 -0000	1.2
@@ -0,0 +1 @@
+intuitively-0_7-6:HEAD:intuitively-0.7-6.src.rpm:1133532561



From fedora-extras-commits at redhat.com  Fri Dec  2 14:10:32 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  2 Dec 2005 09:10:32 -0500
Subject: rpms/intuitively/devel intuitively.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512021411.jB2EBLPL023540@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/intuitively/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23500/devel

Modified Files:
	.cvsignore sources 
Added Files:
	intuitively.spec 
Log Message:
auto-import intuitively-0.7-6 on branch devel from intuitively-0.7-6.src.rpm


--- NEW FILE intuitively.spec ---
Summary:      Automatic IP detection utility
Name:         intuitively
Version:      0.7
Release:      6
URL:          http://home.samfundet.no/~tfheen/intuitively.html
Source0:      http://ftp.debian.org/debian/pool/main/i/intuitively/intuitively_%{version}.orig.tar.gz
License:      GPL
BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libnet-devel >= 1.1.1, libpcap, docbook-utils, flex
Group:         System Environment/Base


%description

"intuitively" is an utility to locate current network address via arp
requests and perform heavy reconfigurations based on its findings.

"intuitively" is intended for laptop users or people who use their
machines in different networks all the time. It is meant to be run
from the PCMCIA network initialization scripts or the command line.


%prep
%setup -q -n %{name}-%{version}

sed -i 's:/usr/share/intuitively:/some/path/to:' doc/intuitively.conf.dist


%build
%configure
make %{?_smp_mflags}

#  re-create man pages (it has a gabage due to wrong docbook2man invoking)
pushd doc
docbook2man intuitively.sgml
docbook2man intuitively.conf.sgml
popd


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/intuitively
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/intuitively.conf
%{_mandir}/*/*
%doc README COPYING AUTHORS NEWS doc/intuitively.conf.dist


%changelog
* Mon Nov 28 2005 Patrice Dumas  0.7-6
- all changes are from Dmitry Butskoy
- use a sed one-liner instead of Patch1
- use %{name} and some wildcards for %files
- properly recreate man pages
- pass sysconfdir to make instead of patching Makefile.in

* Mon Aug 15 2005 Patrice Dumas  0.7-4
- Buildrequires flex, libnet-devel
- (noreplace) for config
- replace /usr/share by /opt in example config file
- no make clean, use smp_mflags

* Mon Aug 15 2005 Patrice Dumas  0.7-3
- use the right url

* Fri Aug 12 2005 Patrice Dumas  0.7-1
- update

* Sat Mar 20 2004 Patrice Dumas  0.6-0.fdr.1
- Update using fedora spec file

* Fri Jun 14 2002 Dumas Patrice 
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/intuitively/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Dec 2005 14:09:15 -0000	1.1
+++ .cvsignore	2 Dec 2005 14:10:25 -0000	1.2
@@ -0,0 +1 @@
+intuitively_0.7.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/intuitively/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Dec 2005 14:09:15 -0000	1.1
+++ sources	2 Dec 2005 14:10:25 -0000	1.2
@@ -0,0 +1 @@
+047b7d9071422bb60b6e52425f7eb1aa  intuitively_0.7.orig.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  2 14:18:37 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  2 Dec 2005 09:18:37 -0500
Subject: rpms/intuitively/devel intuitively.spec,1.1,1.2
Message-ID: <200512021419.jB2EJ7ON023629@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/intuitively/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23612

Modified Files:
	intuitively.spec 
Log Message:
add dist tag



Index: intuitively.spec
===================================================================
RCS file: /cvs/extras/rpms/intuitively/devel/intuitively.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intuitively.spec	2 Dec 2005 14:10:25 -0000	1.1
+++ intuitively.spec	2 Dec 2005 14:18:35 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:      Automatic IP detection utility
 Name:         intuitively
 Version:      0.7
-Release:      6
+Release:      6%{?dist}
 URL:          http://home.samfundet.no/~tfheen/intuitively.html
 Source0:      http://ftp.debian.org/debian/pool/main/i/intuitively/intuitively_%{version}.orig.tar.gz
 License:      GPL



From fedora-extras-commits at redhat.com  Fri Dec  2 14:54:53 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  2 Dec 2005 09:54:53 -0500
Subject: rpms/scim-skk/FC-4 .cvsignore, 1.3, 1.4 scim-skk.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200512021455.jB2EtNXg023816@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23791

Modified Files:
	.cvsignore scim-skk.spec sources 
Log Message:
update to 0.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Nov 2005 13:17:04 -0000	1.3
+++ .cvsignore	2 Dec 2005 14:54:50 -0000	1.4
@@ -1 +1 @@
-scim-skk-0.4.0.tar.gz
+scim-skk-0.5.0.tar.gz


Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim-skk.spec	1 Nov 2005 13:17:04 -0000	1.6
+++ scim-skk.spec	2 Dec 2005 14:54:50 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		scim-skk
-Version:	0.4.0
+Version:	0.5.0
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -50,7 +50,10 @@
 
 
 %changelog
-* Tue Dec 1 2005 Ryo Diairki  - 0.4.0-1
+* Fri Dec 2 2005 Ryo Dairiki  - 0.4.0-1
+- update to 0.5.0
+
+* Tue Nov 1 2005 Ryo Diairki  - 0.4.0-1
 - update to 0.4.0
 
 * Fri Oct  7 2005 Ryo Dairiki  - 0.3.0-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Nov 2005 13:17:04 -0000	1.3
+++ sources	2 Dec 2005 14:54:50 -0000	1.4
@@ -1 +1 @@
-0d5ee7f39aef2b926e1a4907da00c0c9  scim-skk-0.4.0.tar.gz
+37467db3142c5ae980a1bf67c6f422e9  scim-skk-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  2 14:57:20 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  2 Dec 2005 09:57:20 -0500
Subject: rpms/scim-skk/FC-3 scim-skk.spec,1.6,1.7
Message-ID: <200512021457.jB2EvoqU023876@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23847

Modified Files:
	scim-skk.spec 
Log Message:
update to 0.5.0



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim-skk.spec	1 Nov 2005 13:11:23 -0000	1.6
+++ scim-skk.spec	2 Dec 2005 14:57:18 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		scim-skk
-Version:	0.4.0
+Version:	0.5.0
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -50,7 +50,10 @@
 
 
 %changelog
-* Tue Dec 1 2005 Ryo Diairki  - 0.4.0-1
+* Fri Dec 2 2005 Ryo Dairiki  - 0.4.0-1
+- update to 0.5.0
+
+* Tue Nov 1 2005 Ryo Diairki  - 0.4.0-1
 - update to 0.4.0
 
 * Fri Oct  7 2005 Ryo Dairiki  - 0.3.0-5



From fedora-extras-commits at redhat.com  Fri Dec  2 14:58:22 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  2 Dec 2005 09:58:22 -0500
Subject: rpms/scim-skk/devel scim-skk.spec,1.6,1.7
Message-ID: <200512021458.jB2EwqRW023929@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23895

Modified Files:
	scim-skk.spec 
Log Message:
update to 0.5.0



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim-skk.spec	1 Nov 2005 13:20:14 -0000	1.6
+++ scim-skk.spec	2 Dec 2005 14:58:20 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		scim-skk
-Version:	0.4.0
+Version:	0.5.0
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -50,7 +50,10 @@
 
 
 %changelog
-* Tue Dec 1 2005 Ryo Diairki  - 0.4.0-1
+* Fri Dec 2 2005 Ryo Dairiki  - 0.4.0-1
+- update to 0.5.0
+
+* Tue Nov 1 2005 Ryo Diairki  - 0.4.0-1
 - update to 0.4.0
 
 * Fri Oct  7 2005 Ryo Dairiki  - 0.3.0-5



From fedora-extras-commits at redhat.com  Fri Dec  2 15:00:16 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  2 Dec 2005 10:00:16 -0500
Subject: rpms/scim-skk/devel no-dictionary.diff,1.1,NONE
Message-ID: <200512021500.jB2F0GBj023972@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23945

Removed Files:
	no-dictionary.diff 
Log Message:
remove the patch already included into the upstream



--- no-dictionary.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  2 15:12:21 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  2 Dec 2005 10:12:21 -0500
Subject: rpms/scim-skk/devel sources,1.3,1.4
Message-ID: <200512021512.jB2FCp1o025715@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25698

Modified Files:
	sources 
Log Message:
update source



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Nov 2005 13:20:14 -0000	1.3
+++ sources	2 Dec 2005 15:12:19 -0000	1.4
@@ -1 +1 @@
-0d5ee7f39aef2b926e1a4907da00c0c9  scim-skk-0.4.0.tar.gz
+37467db3142c5ae980a1bf67c6f422e9  scim-skk-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  2 15:16:02 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  2 Dec 2005 10:16:02 -0500
Subject: rpms/scim-skk/FC-3 sources,1.3,1.4
Message-ID: <200512021516.jB2FGW8Y025775@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25758

Modified Files:
	sources 
Log Message:
update "source"



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Nov 2005 13:11:23 -0000	1.3
+++ sources	2 Dec 2005 15:15:59 -0000	1.4
@@ -1 +1 @@
-0d5ee7f39aef2b926e1a4907da00c0c9  scim-skk-0.4.0.tar.gz
+37467db3142c5ae980a1bf67c6f422e9  scim-skk-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  2 15:24:34 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  2 Dec 2005 10:24:34 -0500
Subject: owners owners.list,1.429,1.430
Message-ID: <200512021525.jB2FP4m5025849@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25832

Modified Files:
	owners.list 
Log Message:
add intuitively



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- owners.list	30 Nov 2005 03:15:34 -0000	1.429
+++ owners.list	2 Dec 2005 15:24:32 -0000	1.430
@@ -387,6 +387,7 @@
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|inkscape|A vector-based drawing program using SVG|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|iozone|A file system performance analysis tool|nhorman at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ip-sentinel|Tool to prevent unauthorized usage of IP addresses|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Dec  2 16:24:14 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri,  2 Dec 2005 11:24:14 -0500
Subject: rpms/tklib - New directory
Message-ID: <200512021624.jB2GOEV3027977@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tklib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27968/tklib

Log Message:
Directory /cvs/extras/rpms/tklib added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  2 16:24:20 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri,  2 Dec 2005 11:24:20 -0500
Subject: rpms/tklib/devel - New directory
Message-ID: <200512021624.jB2GOKhj027992@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tklib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27968/tklib/devel

Log Message:
Directory /cvs/extras/rpms/tklib/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  2 16:24:37 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri,  2 Dec 2005 11:24:37 -0500
Subject: rpms/tklib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512021624.jB2GObHD028046@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tklib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28013/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tklib


--- NEW 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 Dec  2 16:24:31 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri,  2 Dec 2005 11:24:31 -0500
Subject: rpms/tklib Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512021624.jB2GOVJa028026@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tklib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28013

Added Files:
	Makefile import.log 
Log Message:
Setup of module tklib


--- NEW FILE Makefile ---
# Top level Makefile for module tklib
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec  2 16:25:08 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri,  2 Dec 2005 11:25:08 -0500
Subject: rpms/tklib import.log,1.1,1.2
Message-ID: <200512021625.jB2GPcVv028121@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tklib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28084

Modified Files:
	import.log 
Log Message:
auto-import tklib-0.4.1-3 on branch devel from tklib-0.4.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tklib/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Dec 2005 16:24:29 -0000	1.1
+++ import.log	2 Dec 2005 16:25:06 -0000	1.2
@@ -0,0 +1 @@
+tklib-0_4_1-3:HEAD:tklib-0.4.1-3.src.rpm:1133540702



From fedora-extras-commits at redhat.com  Fri Dec  2 16:25:13 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri,  2 Dec 2005 11:25:13 -0500
Subject: rpms/tklib/devel tklib-0.4.1-makecheck.patch, NONE, 1.1 tklib.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512021625.jB2GPh9H028125@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tklib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28084/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tklib-0.4.1-makecheck.patch tklib.spec 
Log Message:
auto-import tklib-0.4.1-3 on branch devel from tklib-0.4.1-3.src.rpm

tklib-0.4.1-makecheck.patch:

--- NEW FILE tklib-0.4.1-makecheck.patch ---
diff -Naur tklib-0.4.1/sak.tcl tklib-0.4.1.new/sak.tcl
--- tklib-0.4.1/sak.tcl	2005-11-02 11:31:11.000000000 -0800
+++ tklib-0.4.1.new/sak.tcl	2005-12-01 10:37:37.000000000 -0800
@@ -884,7 +884,7 @@
     }
     foreach p [lsort [array names pp]] {
 	if {![info exists ip($p)]} {
-	    puts "  Provided, not indexed:          [format "%-*s | %s" $maxl $p $::pf($p)]"
+	    puts "  Provided, not indexed:          [format "%-*s | %s" $maxl $p $pp($p)]"
 	}
     }
     foreach p [lsort [array names ip]] {


--- NEW FILE tklib.spec ---
Summary: Collection of widgets and other packages for Tk
Name: tklib
Version: 0.4.1
Release: 3%{?dist}
License: BSD
Group: Development/Libraries
Source: http://download.sourceforge.net/tcllib/tklib-0.4.1.tar.gz
Patch0: tklib-0.4.1-makecheck.patch
URL: http://tcllib.sourceforge.net/
BuildArch: noarch
Requires: tk >= 0:8.3.1 tcllib
BuildRequires: tk >= 0:8.3.1 tcllib
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This package is intended to be a collection of Tcl packages that provide
Tk utility functions and widgets useful to a large collection of Tcl/Tk
programmers.

%prep
%setup -q
%patch0 -p1
# Remove some execute permission bits on files that aren't executable
# to suppress some rpmlint warnings.
chmod a-x modules/plotchart/*.tcl
chmod a-x modules/swaplist/*.tcl

%build
# Override the setting for 'libdir'.  If this isn't done then the
# platform-independent script files will get installed in a platform-specific
# directory (such as /usr/lib or /usr/lib64).
%configure --libdir=%{_datadir}
# Don't bother running 'make' because there's nothing to build.

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%check
make check

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc PACKAGES README README-0.4.txt ChangeLog license.terms
%{_datadir}/tklib*
%{_mandir}/*/*

%changelog
* Fri Dec 2 2005 Wart  0.4.1-3
- Minor specfile improvements.
* Thu Dec 1 2005 Wart  0.4.1-2
- Add check stage after the install, as well as a patch to the check script
  included in the package.
* Sun Nov 27 2005 Wart  0.4.1-1
- Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tklib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Dec 2005 16:24:35 -0000	1.1
+++ .cvsignore	2 Dec 2005 16:25:11 -0000	1.2
@@ -0,0 +1 @@
+tklib-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tklib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Dec 2005 16:24:35 -0000	1.1
+++ sources	2 Dec 2005 16:25:11 -0000	1.2
@@ -0,0 +1 @@
+4b6919112bc2b9bd816120a8210170b5  tklib-0.4.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  2 16:27:53 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri,  2 Dec 2005 11:27:53 -0500
Subject: owners owners.list,1.430,1.431
Message-ID: <200512021628.jB2GSNhE028184@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28164

Modified Files:
	owners.list 
Log Message:
Added entry for tklib




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- owners.list	2 Dec 2005 15:24:32 -0000	1.430
+++ owners.list	2 Dec 2005 16:27:51 -0000	1.431
@@ -1141,6 +1141,7 @@
 Fedora Extras|tinyerp|Open Source ERP Client|dan at danny.cz|extras-qa at fedoraproject.org|tcallawa at redhat.com
 Fedora Extras|tiobench|Threaded I/O benchmark|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+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|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Dec  2 16:40:13 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Fri,  2 Dec 2005 11:40:13 -0500
Subject: rpms/ghdl/devel ghdl.spec,1.2,1.3
Message-ID: <200512021640.jB2GehHc028361@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28344

Modified Files:
	ghdl.spec 
Log Message:
do not ExcludeArch x86_64, just disable multilibbing



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ghdl.spec	1 Dec 2005 19:40:26 -0000	1.2
+++ ghdl.spec	2 Dec 2005 16:40:11 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.21
-Release: 0.24svn.2%{?dist}
+Release: 0.24svn.3%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -21,9 +21,7 @@
 Requires(preun): /sbin/install-info
 # gcc-gnat missing on ppc: Bug 174720
 # mock does not install glibc-devel.i386 on x86_64, therefore
-# gcc -m32 fails, therefore the package does not build under
-# mock/plague on x86_64: Bug 174731
-ExcludeArch: ppc x86_64
+ExcludeArch: ppc
 
 # Make sure we don't use clashing namespaces
 %define _vendor fedora_ghdl
@@ -74,6 +72,9 @@
 	-e 's/-fstack-protector//g ' \
 	-e 's/--param=ssp-buffer-size=[0-9]*//g')
 
+# gcc -m32 fails, so we disable multilibbing.
+# so far multilib isn't very valuable, as the VHDL libraries aren't multilibbed
+# either; Bug 174731
 export CFLAGS="$OPT_FLAGS"
 export XCFLAGS="$OPT_FLAGS"
 export TCFLAGS="$OPT_FLAGS"
@@ -94,6 +95,7 @@
 	--mandir=%{_mandir} \
 	--infodir=%{_infodir} \
 	--enable-languages=vhdl \
+	--disable-multilib \
 %ifarch sparc
 	--host=%{gcc_target_platform} \
 	--build=%{gcc_target_platform} \



From fedora-extras-commits at redhat.com  Fri Dec  2 20:37:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  2 Dec 2005 15:37:35 -0500
Subject: rpms/syslog-ng/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 syslog-ng.spec, 1.6, 1.7
Message-ID: <200512022038.jB2Kc5fh003187@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/syslog-ng/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3149/FC-3

Modified Files:
	.cvsignore sources syslog-ng.spec 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 May 2005 17:34:30 -0000	1.3
+++ .cvsignore	2 Dec 2005 20:37:32 -0000	1.4
@@ -1 +1 @@
-syslog-ng-1.6.8.tar.gz
+syslog-ng-1.6.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 May 2005 17:34:30 -0000	1.3
+++ sources	2 Dec 2005 20:37:32 -0000	1.4
@@ -1 +1 @@
-ffbad7e8e6dcbe385820b8ffba23b622  syslog-ng-1.6.8.tar.gz
+5280a86b4f5c25b2ba157c8cea302cf0  syslog-ng-1.6.9.tar.gz


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/FC-3/syslog-ng.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- syslog-ng.spec	22 Jun 2005 00:30:17 -0000	1.6
+++ syslog-ng.spec	2 Dec 2005 20:37:32 -0000	1.7
@@ -2,20 +2,20 @@
 %define sbindir   /sbin
 
 Name:             syslog-ng
-Version:          1.6.8
-Release:          2%{?dist}
+Version:          1.6.9
+Release:          1%{?dist}
 Summary:          Syslog replacement daemon
 
 Group:            System Environment/Daemons
 License:          GPL
 Url:              http://www.balabit.com/products/syslog_ng/
-Source0:          http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.8.tar.gz
+Source0:          http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-%{version}.tar.gz
 Source1:          syslog.log
 Patch0:           syslog-ng-1.6.7-init.patch
 Patch1:           syslog-ng-1.6.7-logrotate.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    libol-devel >= 0.3.16
+BuildConflicts:   libol-devel < 0.3.17
 BuildRequires:    flex, tcp_wrappers, which
 # Requires sed v3.95 (command line option -i)
 Requires:         logrotate, sed >= 3.95
@@ -48,6 +48,7 @@
 %patch1 -p1
 %{__sed} -i  's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
 chmod a-x contrib/syslog2ng
+mv libol-0.3.17/ChangeLog ChangeLog.libol
 
 %build
 %configure \
@@ -106,6 +107,7 @@
 %doc doc/*.demo doc/*.sample
 %doc contrib/syslog-ng.conf.doc
 %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl
+%doc ChangeLog.libol
 %{sbindir}/syslog-ng
 %{_initrddir}/syslog-ng
 %dir %{_sysconfdir}/%{name}
@@ -117,6 +119,14 @@
 
 
 %changelog
+* Wed Nov 30 2005 Jose Pedro Oliveira  - 1.6.9-1
+- Build conflict statement
+  (see: https://lists.balabit.hu/pipermail/syslog-ng/2005-June/007630.html)
+
+* Wed Nov 23 2005 Jose Pedro Oliveira  - 1.6.9-0
+- Update to 1.6.9.
+- The libol support library is now included in the syslog-ng tarball.
+
 * Wed Jun 22 2005 Jose Pedro Oliveira  - 1.6.8-2
 - BuildRequire which, since it's not part of the default buildgroup
   (Konstantin Ryabitsev).



From fedora-extras-commits at redhat.com  Fri Dec  2 20:37:40 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  2 Dec 2005 15:37:40 -0500
Subject: rpms/syslog-ng/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 syslog-ng.spec, 1.6, 1.7
Message-ID: <200512022038.jB2KcBhr003192@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/syslog-ng/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3149/FC-4

Modified Files:
	.cvsignore sources syslog-ng.spec 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 May 2005 17:34:30 -0000	1.3
+++ .cvsignore	2 Dec 2005 20:37:38 -0000	1.4
@@ -1 +1 @@
-syslog-ng-1.6.8.tar.gz
+syslog-ng-1.6.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 May 2005 17:34:30 -0000	1.3
+++ sources	2 Dec 2005 20:37:38 -0000	1.4
@@ -1 +1 @@
-ffbad7e8e6dcbe385820b8ffba23b622  syslog-ng-1.6.8.tar.gz
+5280a86b4f5c25b2ba157c8cea302cf0  syslog-ng-1.6.9.tar.gz


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/FC-4/syslog-ng.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- syslog-ng.spec	22 Jun 2005 00:30:16 -0000	1.6
+++ syslog-ng.spec	2 Dec 2005 20:37:38 -0000	1.7
@@ -2,20 +2,20 @@
 %define sbindir   /sbin
 
 Name:             syslog-ng
-Version:          1.6.8
-Release:          2%{?dist}
+Version:          1.6.9
+Release:          1%{?dist}
 Summary:          Syslog replacement daemon
 
 Group:            System Environment/Daemons
 License:          GPL
 Url:              http://www.balabit.com/products/syslog_ng/
-Source0:          http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.8.tar.gz
+Source0:          http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-%{version}.tar.gz
 Source1:          syslog.log
 Patch0:           syslog-ng-1.6.7-init.patch
 Patch1:           syslog-ng-1.6.7-logrotate.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    libol-devel >= 0.3.16
+BuildConflicts:   libol-devel < 0.3.17
 BuildRequires:    flex, tcp_wrappers, which
 # Requires sed v3.95 (command line option -i)
 Requires:         logrotate, sed >= 3.95
@@ -48,6 +48,7 @@
 %patch1 -p1
 %{__sed} -i  's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
 chmod a-x contrib/syslog2ng
+mv libol-0.3.17/ChangeLog ChangeLog.libol
 
 %build
 %configure \
@@ -106,6 +107,7 @@
 %doc doc/*.demo doc/*.sample
 %doc contrib/syslog-ng.conf.doc
 %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl
+%doc ChangeLog.libol
 %{sbindir}/syslog-ng
 %{_initrddir}/syslog-ng
 %dir %{_sysconfdir}/%{name}
@@ -117,6 +119,14 @@
 
 
 %changelog
+* Wed Nov 30 2005 Jose Pedro Oliveira  - 1.6.9-1
+- Build conflict statement
+  (see: https://lists.balabit.hu/pipermail/syslog-ng/2005-June/007630.html)
+
+* Wed Nov 23 2005 Jose Pedro Oliveira  - 1.6.9-0
+- Update to 1.6.9.
+- The libol support library is now included in the syslog-ng tarball.
+
 * Wed Jun 22 2005 Jose Pedro Oliveira  - 1.6.8-2
 - BuildRequire which, since it's not part of the default buildgroup
   (Konstantin Ryabitsev).



From fedora-extras-commits at redhat.com  Fri Dec  2 20:59:15 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  2 Dec 2005 15:59:15 -0500
Subject: rpms/perl-DBD-SQLite/FC-3 .cvsignore, 1.3, 1.4 perl-DBD-SQLite.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200512022059.jB2Kxj2j003433@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-SQLite/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3370/FC-3

Modified Files:
	.cvsignore perl-DBD-SQLite.spec sources 
Log Message:
Update to 1.11.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Jul 2005 18:48:36 -0000	1.3
+++ .cvsignore	2 Dec 2005 20:59:13 -0000	1.4
@@ -1 +1 @@
-DBD-SQLite-1.09.tar.gz
+DBD-SQLite-1.11.tar.gz


Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-3/perl-DBD-SQLite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-DBD-SQLite.spec	29 Jul 2005 18:48:36 -0000	1.3
+++ perl-DBD-SQLite.spec	2 Dec 2005 20:59:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-DBD-SQLite
-Version:        1.09
-Release:        2%{?dist}
+Version:        1.11
+Release:        1%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver
 
 Group:          Development/Libraries
@@ -46,7 +46,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -63,6 +63,12 @@
 
 
 %changelog
+* Fri Dec  2 2005 Jose Pedro Oliveira  - 1.11-1
+- Update to 1.11.
+
+* Fri Dec  2 2005 Jose Pedro Oliveira  - 1.10-1
+- Update to 1.10.
+
 * Fri Jul 29 2005 Jose Pedro Oliveira  - 1.09-2
 - Build requirement added: sqlite-devel.
 - Doc file added: Changes.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jul 2005 18:48:36 -0000	1.3
+++ sources	2 Dec 2005 20:59:13 -0000	1.4
@@ -1 +1 @@
-02cde1aba9cc2d8474666d8258d8256d  DBD-SQLite-1.09.tar.gz
+7f22d8789245047343e114e655571022  DBD-SQLite-1.11.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  2 20:59:20 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  2 Dec 2005 15:59:20 -0500
Subject: rpms/perl-DBD-SQLite/FC-4 .cvsignore, 1.3, 1.4 perl-DBD-SQLite.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200512022059.jB2Kxohp003438@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-SQLite/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3370/FC-4

Modified Files:
	.cvsignore perl-DBD-SQLite.spec sources 
Log Message:
Update to 1.11.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Jul 2005 18:48:36 -0000	1.3
+++ .cvsignore	2 Dec 2005 20:59:18 -0000	1.4
@@ -1 +1 @@
-DBD-SQLite-1.09.tar.gz
+DBD-SQLite-1.11.tar.gz


Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-4/perl-DBD-SQLite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-DBD-SQLite.spec	29 Jul 2005 18:48:36 -0000	1.3
+++ perl-DBD-SQLite.spec	2 Dec 2005 20:59:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-DBD-SQLite
-Version:        1.09
-Release:        2%{?dist}
+Version:        1.11
+Release:        1%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver
 
 Group:          Development/Libraries
@@ -46,7 +46,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -63,6 +63,12 @@
 
 
 %changelog
+* Fri Dec  2 2005 Jose Pedro Oliveira  - 1.11-1
+- Update to 1.11.
+
+* Fri Dec  2 2005 Jose Pedro Oliveira  - 1.10-1
+- Update to 1.10.
+
 * Fri Jul 29 2005 Jose Pedro Oliveira  - 1.09-2
 - Build requirement added: sqlite-devel.
 - Doc file added: Changes.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jul 2005 18:48:36 -0000	1.3
+++ sources	2 Dec 2005 20:59:18 -0000	1.4
@@ -1 +1 @@
-02cde1aba9cc2d8474666d8258d8256d  DBD-SQLite-1.09.tar.gz
+7f22d8789245047343e114e655571022  DBD-SQLite-1.11.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  2 20:59:26 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  2 Dec 2005 15:59:26 -0500
Subject: rpms/perl-DBD-SQLite/devel .cvsignore, 1.3, 1.4 perl-DBD-SQLite.spec,
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200512022059.jB2KxuQh003443@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-SQLite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3370/devel

Modified Files:
	.cvsignore perl-DBD-SQLite.spec sources 
Log Message:
Update to 1.11.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Jul 2005 17:53:17 -0000	1.3
+++ .cvsignore	2 Dec 2005 20:59:23 -0000	1.4
@@ -1 +1 @@
-DBD-SQLite-1.09.tar.gz
+DBD-SQLite-1.11.tar.gz


Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-DBD-SQLite.spec	29 Jul 2005 18:22:34 -0000	1.5
+++ perl-DBD-SQLite.spec	2 Dec 2005 20:59:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-DBD-SQLite
-Version:        1.09
-Release:        2%{?dist}
+Version:        1.11
+Release:        1%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver
 
 Group:          Development/Libraries
@@ -46,7 +46,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -63,6 +63,12 @@
 
 
 %changelog
+* Fri Dec  2 2005 Jose Pedro Oliveira  - 1.11-1
+- Update to 1.11.
+
+* Fri Dec  2 2005 Jose Pedro Oliveira  - 1.10-1
+- Update to 1.10.
+
 * Fri Jul 29 2005 Jose Pedro Oliveira  - 1.09-2
 - Build requirement added: sqlite-devel.
 - Doc file added: Changes.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jul 2005 17:53:17 -0000	1.3
+++ sources	2 Dec 2005 20:59:23 -0000	1.4
@@ -1 +1 @@
-02cde1aba9cc2d8474666d8258d8256d  DBD-SQLite-1.09.tar.gz
+7f22d8789245047343e114e655571022  DBD-SQLite-1.11.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  2 22:48:28 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  2 Dec 2005 17:48:28 -0500
Subject: rpms/check/FC-3 check.spec,1.2,1.3
Message-ID: <200512022248.jB2Mmwho007317@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7255/FC-3

Modified Files:
	check.spec 
Log Message:

Fix bz 174313 with -fPIC



Index: check.spec
===================================================================
RCS file: /cvs/extras/rpms/check/FC-3/check.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- check.spec	17 Sep 2005 13:17:06 -0000	1.2
+++ check.spec	2 Dec 2005 22:48:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		check
 Version:	0.9.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A unit test framework for C
 Source0:	http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:		Development/Tools
@@ -8,6 +8,7 @@
 URL:		http://check.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	docbook-utils
+Patch0:		check-0.9.2-fPIC.patch
 
 %description
 Check is a unit test framework for C. It features a simple interface for 
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -50,6 +52,9 @@
 %{_datadir}/aclocal/check.m4
 
 %changelog
+* Fri Dec  2 2005 Tom "spot" Callaway  0.9.2-3
+- enabled -fPIC to resolve bz 174313
+
 * Sat Sep 17 2005 Tom "spot" Callaway  0.9.2-2
 - get rid of the so file (not needed)
 - only make devel package



From fedora-extras-commits at redhat.com  Fri Dec  2 22:48:34 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  2 Dec 2005 17:48:34 -0500
Subject: rpms/check/FC-4 check.spec,1.2,1.3
Message-ID: <200512022249.jB2Mn4pe007320@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7255/FC-4

Modified Files:
	check.spec 
Log Message:

Fix bz 174313 with -fPIC



Index: check.spec
===================================================================
RCS file: /cvs/extras/rpms/check/FC-4/check.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- check.spec	17 Sep 2005 13:17:07 -0000	1.2
+++ check.spec	2 Dec 2005 22:48:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		check
 Version:	0.9.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A unit test framework for C
 Source0:	http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:		Development/Tools
@@ -8,6 +8,7 @@
 URL:		http://check.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	docbook-utils
+Patch0:		check-0.9.2-fPIC.patch
 
 %description
 Check is a unit test framework for C. It features a simple interface for 
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -50,6 +52,9 @@
 %{_datadir}/aclocal/check.m4
 
 %changelog
+* Fri Dec  2 2005 Tom "spot" Callaway  0.9.2-3
+- enabled -fPIC to resolve bz 174313
+
 * Sat Sep 17 2005 Tom "spot" Callaway  0.9.2-2
 - get rid of the so file (not needed)
 - only make devel package



From fedora-extras-commits at redhat.com  Fri Dec  2 22:48:39 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  2 Dec 2005 17:48:39 -0500
Subject: rpms/check/devel check.spec,1.2,1.3
Message-ID: <200512022249.jB2Mn9CK007323@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/check/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7255/devel

Modified Files:
	check.spec 
Log Message:

Fix bz 174313 with -fPIC



Index: check.spec
===================================================================
RCS file: /cvs/extras/rpms/check/devel/check.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- check.spec	17 Sep 2005 13:17:13 -0000	1.2
+++ check.spec	2 Dec 2005 22:48:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		check
 Version:	0.9.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A unit test framework for C
 Source0:	http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:		Development/Tools
@@ -8,6 +8,7 @@
 URL:		http://check.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	docbook-utils
+Patch0:		check-0.9.2-fPIC.patch
 
 %description
 Check is a unit test framework for C. It features a simple interface for 
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -50,6 +52,9 @@
 %{_datadir}/aclocal/check.m4
 
 %changelog
+* Fri Dec  2 2005 Tom "spot" Callaway  0.9.2-3
+- enabled -fPIC to resolve bz 174313
+
 * Sat Sep 17 2005 Tom "spot" Callaway  0.9.2-2
 - get rid of the so file (not needed)
 - only make devel package



From fedora-extras-commits at redhat.com  Fri Dec  2 22:58:26 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  2 Dec 2005 17:58:26 -0500
Subject: rpms/gambas/FC-3 gambas.spec,1.10,1.11
Message-ID: <200512022258.jB2MwunL007528@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/gambas/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7471/FC-3

Modified Files:
	gambas.spec 
Log Message:

Fix description to resolve bz 173998



Index: gambas.spec
===================================================================
RCS file: /cvs/extras/rpms/gambas/FC-3/gambas.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gambas.spec	18 Nov 2005 16:37:20 -0000	1.10
+++ gambas.spec	2 Dec 2005 22:58:24 -0000	1.11
@@ -1,7 +1,7 @@
 Name:		gambas
 Summary: 	IDE based on a basic interpreter with object extensions
 Version: 	1.0.13
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL
 Group: 		Development/Tools
 URL: 		http://gambas.sourceforge.net/
@@ -36,14 +36,10 @@
 Provides:	%{name} = %{version}-%{release}
 Obsoletes:	%{name}
 
-
 %description runtime
 Gambas is a free development environment based on a Basic interpreter
-with object extensions, like Visual Basic (but it is NOT a clone !). 
-With Gambas, you can quickly design your program GUI, access MySQL or 
-PostgreSQL databases, pilot KDE applications with DCOP, translate your 
-program into many languages, create network applications easily, and so 
-on...
+with object extensions, like Visual Basic. This package contains the 
+runtime components necessary to run programs designed in gambas. 
 
 %package ide
 Summary:	Development environment for gambas
@@ -71,8 +67,10 @@
 Provides:	%{name}-examples = %{version}-%{release}
 
 %description ide
-The gambas-runtime package contains the complete Gambas Development 
-Environment, with the database manager, the help files, and all components.
+The gambas-ide package contains the complete Gambas Development 
+Environment, with the database manager, the help files, and all 
+components. This is what you want to install if you want to 
+create new programs with Gambas.
 
 %package gb-compress
 Summary:        Gambas component package for net
@@ -414,6 +412,9 @@
 %{_datadir}/gambas/info/gb.xml.libxml.xslt.*
 
 %changelog
+* Fri Dec  2 2005 Tom "spot" Callaway  1.0.13-3
+- fix description to resolve bugzilla 173998
+
 * Fri Nov 18 2005 Tom "spot" Callaway  1.0.13-2
 - BR: curl-devel, SDL_mixer-devel
 



From fedora-extras-commits at redhat.com  Fri Dec  2 22:58:31 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  2 Dec 2005 17:58:31 -0500
Subject: rpms/gambas/FC-4 gambas.spec,1.10,1.11
Message-ID: <200512022259.jB2Mx1BD007531@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/gambas/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7471/FC-4

Modified Files:
	gambas.spec 
Log Message:

Fix description to resolve bz 173998



Index: gambas.spec
===================================================================
RCS file: /cvs/extras/rpms/gambas/FC-4/gambas.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gambas.spec	18 Nov 2005 16:37:25 -0000	1.10
+++ gambas.spec	2 Dec 2005 22:58:29 -0000	1.11
@@ -1,7 +1,7 @@
 Name:		gambas
 Summary: 	IDE based on a basic interpreter with object extensions
 Version: 	1.0.13
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL
 Group: 		Development/Tools
 URL: 		http://gambas.sourceforge.net/
@@ -36,14 +36,10 @@
 Provides:	%{name} = %{version}-%{release}
 Obsoletes:	%{name}
 
-
 %description runtime
 Gambas is a free development environment based on a Basic interpreter
-with object extensions, like Visual Basic (but it is NOT a clone !). 
-With Gambas, you can quickly design your program GUI, access MySQL or 
-PostgreSQL databases, pilot KDE applications with DCOP, translate your 
-program into many languages, create network applications easily, and so 
-on...
+with object extensions, like Visual Basic. This package contains the 
+runtime components necessary to run programs designed in gambas. 
 
 %package ide
 Summary:	Development environment for gambas
@@ -71,8 +67,10 @@
 Provides:	%{name}-examples = %{version}-%{release}
 
 %description ide
-The gambas-runtime package contains the complete Gambas Development 
-Environment, with the database manager, the help files, and all components.
+The gambas-ide package contains the complete Gambas Development 
+Environment, with the database manager, the help files, and all 
+components. This is what you want to install if you want to 
+create new programs with Gambas.
 
 %package gb-compress
 Summary:        Gambas component package for net
@@ -414,6 +412,9 @@
 %{_datadir}/gambas/info/gb.xml.libxml.xslt.*
 
 %changelog
+* Fri Dec  2 2005 Tom "spot" Callaway  1.0.13-3
+- fix description to resolve bugzilla 173998
+
 * Fri Nov 18 2005 Tom "spot" Callaway  1.0.13-2
 - BR: curl-devel, SDL_mixer-devel
 



From fedora-extras-commits at redhat.com  Fri Dec  2 22:58:37 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  2 Dec 2005 17:58:37 -0500
Subject: rpms/gambas/devel gambas.spec,1.10,1.11
Message-ID: <200512022259.jB2Mx8s5007534@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/gambas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7471/devel

Modified Files:
	gambas.spec 
Log Message:

Fix description to resolve bz 173998



Index: gambas.spec
===================================================================
RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gambas.spec	18 Nov 2005 16:37:31 -0000	1.10
+++ gambas.spec	2 Dec 2005 22:58:34 -0000	1.11
@@ -1,7 +1,7 @@
 Name:		gambas
 Summary: 	IDE based on a basic interpreter with object extensions
 Version: 	1.0.13
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL
 Group: 		Development/Tools
 URL: 		http://gambas.sourceforge.net/
@@ -36,14 +36,10 @@
 Provides:	%{name} = %{version}-%{release}
 Obsoletes:	%{name}
 
-
 %description runtime
 Gambas is a free development environment based on a Basic interpreter
-with object extensions, like Visual Basic (but it is NOT a clone !). 
-With Gambas, you can quickly design your program GUI, access MySQL or 
-PostgreSQL databases, pilot KDE applications with DCOP, translate your 
-program into many languages, create network applications easily, and so 
-on...
+with object extensions, like Visual Basic. This package contains the 
+runtime components necessary to run programs designed in gambas. 
 
 %package ide
 Summary:	Development environment for gambas
@@ -71,8 +67,10 @@
 Provides:	%{name}-examples = %{version}-%{release}
 
 %description ide
-The gambas-runtime package contains the complete Gambas Development 
-Environment, with the database manager, the help files, and all components.
+The gambas-ide package contains the complete Gambas Development 
+Environment, with the database manager, the help files, and all 
+components. This is what you want to install if you want to 
+create new programs with Gambas.
 
 %package gb-compress
 Summary:        Gambas component package for net
@@ -414,6 +412,9 @@
 %{_datadir}/gambas/info/gb.xml.libxml.xslt.*
 
 %changelog
+* Fri Dec  2 2005 Tom "spot" Callaway  1.0.13-3
+- fix description to resolve bugzilla 173998
+
 * Fri Nov 18 2005 Tom "spot" Callaway  1.0.13-2
 - BR: curl-devel, SDL_mixer-devel
 



From fedora-extras-commits at redhat.com  Fri Dec  2 23:08:42 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  2 Dec 2005 18:08:42 -0500
Subject: common tobuild,1.2236,1.2237
Message-ID: <200512022309.jB2N9CIW009323@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9306

Modified Files:
	tobuild 
Log Message:
request build of rpms/gambas/FC-3 gambas-1_0_13-3_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2236
retrieving revision 1.2237
diff -u -r1.2236 -r1.2237
--- tobuild	16 Nov 2005 21:35:14 -0000	1.2236
+++ tobuild	2 Dec 2005 23:08:38 -0000	1.2237
@@ -47,3 +47,4 @@
 dwmw2	rpms/exim/devel	exim-4_54-4_fc4	devel
 shahms	rpms/bazaar/devel	bazaar-1_4_2-3_fc5	devel
 orion	rpms/hdf5/devel	hdf5-1_6_4-6_fc5	devel
+spot	rpms/gambas/FC-3	gambas-1_0_13-3_fc3	fc3



From fedora-extras-commits at redhat.com  Fri Dec  2 23:10:39 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  2 Dec 2005 18:10:39 -0500
Subject: common tobuild,1.2237,1.2238
Message-ID: <200512022311.jB2NB9C5009389@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9350

Modified Files:
	tobuild 
Log Message:
request build of rpms/gambas/FC-4 gambas-1_0_13-3_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2237
retrieving revision 1.2238
diff -u -r1.2237 -r1.2238
--- tobuild	2 Dec 2005 23:08:38 -0000	1.2237
+++ tobuild	2 Dec 2005 23:10:16 -0000	1.2238
@@ -48,3 +48,4 @@
 shahms	rpms/bazaar/devel	bazaar-1_4_2-3_fc5	devel
 orion	rpms/hdf5/devel	hdf5-1_6_4-6_fc5	devel
 spot	rpms/gambas/FC-3	gambas-1_0_13-3_fc3	fc3
+spot	rpms/gambas/FC-4	gambas-1_0_13-3_fc4	fc4



From fedora-extras-commits at redhat.com  Fri Dec  2 23:11:20 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  2 Dec 2005 18:11:20 -0500
Subject: common tobuild,1.2238,1.2239
Message-ID: <200512022311.jB2NBotR009424@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9405

Modified Files:
	tobuild 
Log Message:
request build of rpms/gambas/devel gambas-1_0_13-3_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2238
retrieving revision 1.2239
diff -u -r1.2238 -r1.2239
--- tobuild	2 Dec 2005 23:10:16 -0000	1.2238
+++ tobuild	2 Dec 2005 23:11:18 -0000	1.2239
@@ -49,3 +49,4 @@
 orion	rpms/hdf5/devel	hdf5-1_6_4-6_fc5	devel
 spot	rpms/gambas/FC-3	gambas-1_0_13-3_fc3	fc3
 spot	rpms/gambas/FC-4	gambas-1_0_13-3_fc4	fc4
+spot	rpms/gambas/devel	gambas-1_0_13-3_fc5	devel



From fedora-extras-commits at redhat.com  Sat Dec  3 00:03:50 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  2 Dec 2005 19:03:50 -0500
Subject: common tobuild,1.2239,1.2240
Message-ID: <200512030004.jB304Sdg011178@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11161

Modified Files:
	tobuild 
Log Message:
request build of rpms/gambas/FC-3 gambas-1_0_13-3_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2239
retrieving revision 1.2240
diff -u -r1.2239 -r1.2240
--- tobuild	2 Dec 2005 23:11:18 -0000	1.2239
+++ tobuild	3 Dec 2005 00:03:48 -0000	1.2240
@@ -50,3 +50,4 @@
 spot	rpms/gambas/FC-3	gambas-1_0_13-3_fc3	fc3
 spot	rpms/gambas/FC-4	gambas-1_0_13-3_fc4	fc4
 spot	rpms/gambas/devel	gambas-1_0_13-3_fc5	devel
+spot	rpms/gambas/FC-3	gambas-1_0_13-3_fc3	fc3



From fedora-extras-commits at redhat.com  Sat Dec  3 00:05:17 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  2 Dec 2005 19:05:17 -0500
Subject: common tobuild,1.2240,1.2241
Message-ID: <200512030006.jB3067KX011218@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11199

Modified Files:
	tobuild 
Log Message:
request build of rpms/gambas/FC-4 gambas-1_0_13-3_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2240
retrieving revision 1.2241
diff -u -r1.2240 -r1.2241
--- tobuild	3 Dec 2005 00:03:48 -0000	1.2240
+++ tobuild	3 Dec 2005 00:05:15 -0000	1.2241
@@ -51,3 +51,4 @@
 spot	rpms/gambas/FC-4	gambas-1_0_13-3_fc4	fc4
 spot	rpms/gambas/devel	gambas-1_0_13-3_fc5	devel
 spot	rpms/gambas/FC-3	gambas-1_0_13-3_fc3	fc3
+spot	rpms/gambas/FC-4	gambas-1_0_13-3_fc4	fc4



From fedora-extras-commits at redhat.com  Sat Dec  3 00:07:05 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  2 Dec 2005 19:07:05 -0500
Subject: common tobuild,1.2241,1.2242
Message-ID: <200512030007.jB307tT4011255@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11238

Modified Files:
	tobuild 
Log Message:
request build of rpms/gambas/devel gambas-1_0_13-3_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2241
retrieving revision 1.2242
diff -u -r1.2241 -r1.2242
--- tobuild	3 Dec 2005 00:05:15 -0000	1.2241
+++ tobuild	3 Dec 2005 00:07:03 -0000	1.2242
@@ -52,3 +52,4 @@
 spot	rpms/gambas/devel	gambas-1_0_13-3_fc5	devel
 spot	rpms/gambas/FC-3	gambas-1_0_13-3_fc3	fc3
 spot	rpms/gambas/FC-4	gambas-1_0_13-3_fc4	fc4
+spot	rpms/gambas/devel	gambas-1_0_13-3_fc5	devel



From fedora-extras-commits at redhat.com  Sat Dec  3 01:02:59 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri,  2 Dec 2005 20:02:59 -0500
Subject: rpms/scim-skk/FC-3 gtkComboBox.patch, NONE, 1.1 scim-skk.spec, 1.7,
	1.8
Message-ID: <200512030103.jB313UKi013097@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13074

Modified Files:
	scim-skk.spec 
Added Files:
	gtkComboBox.patch 
Log Message:
add a patch for gtk-2.4


gtkComboBox.patch:

--- NEW FILE gtkComboBox.patch ---
--- src/scim_skk_setup_dictionaries.cpp.orig	2005-11-11 20:07:42.000000000 +0900
+++ src/scim_skk_setup_dictionaries.cpp	2005-12-03 09:56:11.000000000 +0900
@@ -30,6 +30,8 @@
 
 #include "scim_skk_intl.h"
 
+#define gtk_combo_box_get_active_text n_gtk_combo_box_get_active_text
+
 using namespace scim;
 
 namespace scim_skk {
@@ -91,6 +93,18 @@
 
 static GtkWidget *__combo_box_dict_types = NULL;
 
+// There is no gtk_combo_box_get_active_text for gtk 2.4
+
+static const gchar *gtk_combo_box_get_active_text(GtkComboBox *combo) {
+	gint index = gtk_combo_box_get_active(combo);
+	if (index != -1) {
+		return __dict_type_names[index].data();
+	} else {
+		return NULL;
+	}
+}
+
+//
 
 static void
 file_selection_clicked_cb (GtkButton *button,
@@ -123,7 +137,7 @@
 dict_type_changed_cb (GtkComboBox *combo,
                       gpointer userdata)
 {
-    gchar *typetext = gtk_combo_box_get_active_text(combo);
+    const gchar *typetext = gtk_combo_box_get_active_text(combo);
     for (int i = 0; __dict_type_names[i] != ""; i++) {
         if (__dict_type_names[i] == typetext) {
             gtk_widget_show_all(__widgets_dicts[i].widget);


Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scim-skk.spec	2 Dec 2005 14:57:18 -0000	1.7
+++ scim-skk.spec	3 Dec 2005 01:02:57 -0000	1.8
@@ -7,6 +7,7 @@
 License:	GPL
 URL:		http://scim-imengine.sourceforge.jp/
 Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
+Patch0:	gtkComboBox.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:		scim skkdic
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -52,6 +54,7 @@
 %changelog
 * Fri Dec 2 2005 Ryo Dairiki  - 0.4.0-1
 - update to 0.5.0
+- patch for gtk-2.4; There is no gtk_combo_box_get_active_text for gtk-2.4
 
 * Tue Nov 1 2005 Ryo Diairki  - 0.4.0-1
 - update to 0.4.0



From fedora-extras-commits at redhat.com  Sat Dec  3 14:29:51 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat,  3 Dec 2005 09:29:51 -0500
Subject: rpms/athcool/FC-4 athcool.spec,1.2,1.3
Message-ID: <200512031430.jB3EULXq004685@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/athcool/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4648/FC-4

Modified Files:
	athcool.spec 
Log Message:
Fix broken debuginfo package (Ville Skytt??, #174881)



Index: athcool.spec
===================================================================
RCS file: /cvs/extras/rpms/athcool/FC-4/athcool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- athcool.spec	11 Aug 2005 08:49:20 -0000	1.2
+++ athcool.spec	3 Dec 2005 14:29:49 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           athcool
 Version:        0.3.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Enables/disables Powersaving mode for AMD processors
 
 Group:          System Environment/Daemons
@@ -43,8 +43,11 @@
 If you met those problems, you should not use athcool.
 Please use athcool AT YOUR OWN RISK.
 
+
 %prep
 %setup -q
+sed -i -e 's/install -s/install/' Makefile
+
 
 %build
 make \
@@ -85,7 +88,11 @@
 %{_mandir}/man8/%{name}.8*
 %{_sbindir}/%{name}
 
+
 %changelog
+* Sat Dec  3 2005 Dawid Gajownik  - 0.3.11-3
+- Fix broken debuginfo package (Ville Skytt??, #174881)
+
 * Wed Aug 10 2005 Dawid Gajownik  - 0.3.11-2
 - Correct Summary field.
 



From fedora-extras-commits at redhat.com  Sat Dec  3 14:29:57 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat,  3 Dec 2005 09:29:57 -0500
Subject: rpms/athcool/devel athcool.spec,1.2,1.3
Message-ID: <200512031430.jB3EURdL004693@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/athcool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4648/devel

Modified Files:
	athcool.spec 
Log Message:
Fix broken debuginfo package (Ville Skytt??, #174881)



Index: athcool.spec
===================================================================
RCS file: /cvs/extras/rpms/athcool/devel/athcool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- athcool.spec	11 Aug 2005 08:49:20 -0000	1.2
+++ athcool.spec	3 Dec 2005 14:29:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           athcool
 Version:        0.3.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Enables/disables Powersaving mode for AMD processors
 
 Group:          System Environment/Daemons
@@ -43,8 +43,11 @@
 If you met those problems, you should not use athcool.
 Please use athcool AT YOUR OWN RISK.
 
+
 %prep
 %setup -q
+sed -i -e 's/install -s/install/' Makefile
+
 
 %build
 make \
@@ -85,7 +88,11 @@
 %{_mandir}/man8/%{name}.8*
 %{_sbindir}/%{name}
 
+
 %changelog
+* Sat Dec  3 2005 Dawid Gajownik  - 0.3.11-3
+- Fix broken debuginfo package (Ville Skytt??, #174881)
+
 * Wed Aug 10 2005 Dawid Gajownik  - 0.3.11-2
 - Correct Summary field.
 



From fedora-extras-commits at redhat.com  Sun Dec  4 02:56:15 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  3 Dec 2005 21:56:15 -0500
Subject: rpms/python-kid/FC-4 .cvsignore, 1.6, 1.7 python-kid.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200512040256.jB42ujVf025926@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kid/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25885/FC-4

Modified Files:
	.cvsignore python-kid.spec sources 
Log Message:
Version 0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-kid/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Nov 2005 01:50:37 -0000	1.6
+++ .cvsignore	4 Dec 2005 02:56:13 -0000	1.7
@@ -1,2 +1,2 @@
-kid-0.7.1.tar.gz
-kid-0.7.1-setuptools.patch
+kid-0.8.tar.gz
+kid-0.8-setuptools.patch


Index: python-kid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-kid/FC-4/python-kid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-kid.spec	12 Nov 2005 01:50:37 -0000	1.5
+++ python-kid.spec	4 Dec 2005 02:56:13 -0000	1.6
@@ -1,15 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-kid
-Version:        0.7.1
-Release:        2%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        Kid - A simple and pythonic XML template language
 
 Group:          Applications/Publishing
 License:        MIT
 URL:            http://www.lesscode.org/projects/kid
 Source0:        http://lesscode.org/dist/kid/kid-%{version}.tar.gz
-Patch0:         kid-0.7.1-setuptools.patch
+Patch0:         kid-0.8-setuptools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Fri Dec 02 2005 Konstantin Ryabitsev  - 0.8-1
+- Version 0.8
+
 * Fri Nov 11 2005 Konstantin Ryabitsev  - 0.7.1-2
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-kid/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Nov 2005 01:50:37 -0000	1.6
+++ sources	4 Dec 2005 02:56:13 -0000	1.7
@@ -1,2 +1,2 @@
-9e8bdad66c964655a7ab0b84969444f3  kid-0.7.1.tar.gz
-3f5a5f0452c9862adb8739b16ab0349e  kid-0.7.1-setuptools.patch
+3ebc1df08ceb636fb5102fc3a1f6448e  kid-0.8.tar.gz
+ac863126ee6df21bd1f5e95210cef018  kid-0.8-setuptools.patch



From fedora-extras-commits at redhat.com  Sun Dec  4 02:56:20 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  3 Dec 2005 21:56:20 -0500
Subject: rpms/python-kid/devel .cvsignore, 1.6, 1.7 python-kid.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200512040256.jB42uqXC025931@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25885/devel

Modified Files:
	.cvsignore python-kid.spec sources 
Log Message:
Version 0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-kid/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Nov 2005 01:49:17 -0000	1.6
+++ .cvsignore	4 Dec 2005 02:56:18 -0000	1.7
@@ -1,2 +1,2 @@
-kid-0.7.1.tar.gz
-kid-0.7.1-setuptools.patch
+kid-0.8.tar.gz
+kid-0.8-setuptools.patch


Index: python-kid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-kid/devel/python-kid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-kid.spec	12 Nov 2005 01:49:17 -0000	1.5
+++ python-kid.spec	4 Dec 2005 02:56:18 -0000	1.6
@@ -1,15 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-kid
-Version:        0.7.1
-Release:        2%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        Kid - A simple and pythonic XML template language
 
 Group:          Applications/Publishing
 License:        MIT
 URL:            http://www.lesscode.org/projects/kid
 Source0:        http://lesscode.org/dist/kid/kid-%{version}.tar.gz
-Patch0:         kid-0.7.1-setuptools.patch
+Patch0:         kid-0.8-setuptools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Fri Dec 02 2005 Konstantin Ryabitsev  - 0.8-1
+- Version 0.8
+
 * Fri Nov 11 2005 Konstantin Ryabitsev  - 0.7.1-2
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-kid/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Nov 2005 01:49:17 -0000	1.6
+++ sources	4 Dec 2005 02:56:18 -0000	1.7
@@ -1,2 +1,2 @@
-9e8bdad66c964655a7ab0b84969444f3  kid-0.7.1.tar.gz
-3f5a5f0452c9862adb8739b16ab0349e  kid-0.7.1-setuptools.patch
+3ebc1df08ceb636fb5102fc3a1f6448e  kid-0.8.tar.gz
+ac863126ee6df21bd1f5e95210cef018  kid-0.8-setuptools.patch



From fedora-extras-commits at redhat.com  Sun Dec  4 04:29:36 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Sat,  3 Dec 2005 23:29:36 -0500
Subject: rpms/krecipes/devel krecipes.spec,1.6,1.7
Message-ID: <200512040430.jB44U6Rk029340@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29323

Modified Files:
	krecipes.spec 
Log Message:
Fixes for BR and new patch



Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/krecipes.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- krecipes.spec	1 Dec 2005 04:07:18 -0000	1.6
+++ krecipes.spec	4 Dec 2005 04:29:34 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           krecipes
 Version:        0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
@@ -9,10 +9,11 @@
 Source0:        http://download.sourceforge.net/krecipes/krecipes-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel > 3.1, sqlite-devel, desktop-file-utils
+BuildRequires:  kdelibs-devel > 3.1, sqlite-devel, desktop-file-utils, libacl-devel
 Requires:       kdebase >= 3.1
 
 patch0:		krecipes-gcc4.patch
+patch1:		krecipes-X11.patch
 
 %description
 Krecipes is a program that lets you to manage your recipes, create
@@ -23,6 +24,10 @@
 %prep
 %setup -q
 %patch0 -p1 -b .gcc4
+# autoconf tools check for X is a file in libXt-devel  and Xt lib
+# we dont use or link against libXt so rather than adding an extra
+# BuildRequires I patched configure to look for something thats there
+%patch1 -p1 -b .X11
 
 
 %build
@@ -81,9 +86,11 @@
 %{_datadir}/mimelnk/*/*.desktop
 
 %changelog
-* Wed Nov 11 2005 Dennis Gilmore  - 0.9-2
+* Sat Dec 03 2005 Dennis Gilmore  - 0.9-3
+- fix BuildRequies for libacl and add patch for X check.
+* Wed Nov 30 2005 Dennis Gilmore  - 0.9-2
 - fix missing files
-* Wed Nov 11 2005 Dennis Gilmore  - 0.9-1
+* Wed Nov 30 2005 Dennis Gilmore  - 0.9-1
 - update to 0.9
 * Sat Oct 20 2005 Dennis Gilmore  - 0.8.1-3%{?dist}
 - add BuildRequires desktop-file-utils  http://fedoraproject.org/wiki/QAChecklist



From fedora-extras-commits at redhat.com  Sun Dec  4 04:32:48 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Sat,  3 Dec 2005 23:32:48 -0500
Subject: rpms/krecipes/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200512040433.jB44XIT9029372@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29353

Modified Files:
	.cvsignore sources 
Log Message:
upload patch to change X check



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2005 03:39:04 -0000	1.3
+++ .cvsignore	4 Dec 2005 04:32:46 -0000	1.4
@@ -1 +1,2 @@
 krecipes-0.9.tar.gz
+krecipes-X11.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2005 03:39:04 -0000	1.3
+++ sources	4 Dec 2005 04:32:46 -0000	1.4
@@ -1 +1,2 @@
 ee1a1463946c63788ff8eeea302a7506  krecipes-0.9.tar.gz
+67e68fc70f7ff67235a7a36affa7af6d  krecipes-X11.patch



From fedora-extras-commits at redhat.com  Sun Dec  4 09:39:26 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  4 Dec 2005 04:39:26 -0500
Subject: rpms/liferea/devel liferea.spec,1.22,1.23
Message-ID: <200512040939.jB49dusN009278@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9257

Modified Files:
	liferea.spec 
Log Message:
* Sun Dec 04 2005 Luke Macken  - 1.0-0.3.rc4
- Rebuild against dbus 0.60




Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- liferea.spec	19 Nov 2005 01:04:12 -0000	1.22
+++ liferea.spec	4 Dec 2005 09:39:23 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.0
-Release:        0.2.rc4%{?dist}
+Release:        0.3.rc4%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Sun Dec 04 2005 Luke Macken  - 1.0-0.3.rc4
+- Rebuild against dbus 0.60
+
 * Fri Nov 18 2005 Brian Pepple  - 1.0-0.2.rc4
 - Update tp 1.0-RC4.
 



From fedora-extras-commits at redhat.com  Sun Dec  4 11:28:44 2005
From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm))
Date: Sun,  4 Dec 2005 06:28:44 -0500
Subject: rpms/initng - New directory
Message-ID: <200512041128.jB4BSifh012674@cvs-int.fedora.redhat.com>

Author: danielm

Update of /cvs/extras/rpms/initng
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12665/initng

Log Message:
Directory /cvs/extras/rpms/initng added to the repository




From fedora-extras-commits at redhat.com  Sun Dec  4 11:28:49 2005
From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm))
Date: Sun,  4 Dec 2005 06:28:49 -0500
Subject: rpms/initng/devel - New directory
Message-ID: <200512041128.jB4BSnPx012689@cvs-int.fedora.redhat.com>

Author: danielm

Update of /cvs/extras/rpms/initng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12665/initng/devel

Log Message:
Directory /cvs/extras/rpms/initng/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Dec  4 11:29:06 2005
From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm))
Date: Sun,  4 Dec 2005 06:29:06 -0500
Subject: rpms/initng Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512041129.jB4BT6oE012727@cvs-int.fedora.redhat.com>

Author: danielm

Update of /cvs/extras/rpms/initng
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12714

Added Files:
	Makefile import.log 
Log Message:
Setup of module initng


--- NEW FILE Makefile ---
# Top level Makefile for module initng
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec  4 11:29:12 2005
From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm))
Date: Sun,  4 Dec 2005 06:29:12 -0500
Subject: rpms/initng/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512041129.jB4BTChJ012747@cvs-int.fedora.redhat.com>

Author: danielm

Update of /cvs/extras/rpms/initng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12714/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module initng


--- NEW 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 Dec  4 11:30:15 2005
From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm))
Date: Sun,  4 Dec 2005 06:30:15 -0500
Subject: rpms/initng import.log,1.1,1.2
Message-ID: <200512041130.jB4BUjcC012835@cvs-int.fedora.redhat.com>

Author: danielm

Update of /cvs/extras/rpms/initng
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12797

Modified Files:
	import.log 
Log Message:
auto-import initng-0.4.7-1 on branch devel from initng-0.4.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/initng/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Dec 2005 11:29:04 -0000	1.1
+++ import.log	4 Dec 2005 11:30:13 -0000	1.2
@@ -0,0 +1 @@
+initng-0_4_7-1:HEAD:initng-0.4.7-1.src.rpm:1133695804



From fedora-extras-commits at redhat.com  Sun Dec  4 11:30:20 2005
From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm))
Date: Sun,  4 Dec 2005 06:30:20 -0500
Subject: rpms/initng/devel initng.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512041130.jB4BUK7k012828@cvs-int.fedora.redhat.com>

Author: danielm

Update of /cvs/extras/rpms/initng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12797/devel

Modified Files:
	.cvsignore sources 
Added Files:
	initng.spec 
Log Message:
auto-import initng-0.4.7-1 on branch devel from initng-0.4.7-1.src.rpm


--- NEW FILE initng.spec ---
Summary: Programs which control basic system processes
Name: initng
Version: 0.4.7
Release: 1%{?dist}
License: GPL
URL: http://initng.thinktux.net
Group: System Environment/Base
Source0: http://initng.thinktux.net/download/v0.4/initng-%{version}.tar.gz
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: filesystem >= 2.2.4-1

%description
Initng is a full replacement of the old and in many ways deprecated sysvinit
tool. It is designed with speed in mind, doing as much as possible
asynchronously. In other words: It will boot your unix-system much faster,
and give you more control and statistics over your system.

%package ifplugd
Summary:  Ifplugd support for initng
Group:    System Environment/Base
Requires: %{name} = %{version}
Requires: ifplugd

%description ifplugd
This package contains the files needed to add ifplugd support to initng.
When an interface is plugged or unplugged, the networking will be restarted
appropriately.

%prep
%setup -q

%build
%configure --libdir=/%{_lib} --sbindir=/sbin --disable-rpath
make

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
rm -rf %{buildroot}/%{_sysconfdir}/hotplug/net.agent
rm -rf %{buildroot}/sbin/killall5
rm -rf %{buildroot}/%{_sysconfdir}/pcmcia/network
rm -rf %{buildroot}/%{_sysconfdir}/initng/system.runlevel
rm -rf %{buildroot}/%{_sysconfdir}/initng/default.runlevel
mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}
mv %{buildroot}%{_datadir}/doc/initng/* %{buildroot}/%{_docdir}/%{name}-%{version}/
cp -a COPYING AUTHORS CODING_STANDARDS FAQ NEWS README TODO \
      %{buildroot}/%{_docdir}/%{name}-%{version}/
mv %{buildroot}%{_sbindir}/* %{buildroot}/sbin/

%post
if [ $1 = 1 -a -f /boot/grub/grub.conf -a -x /sbin/grubby ]; then
  grep initng /boot/grub/grub.conf >/dev/null
  if [ $? -ne 0 ]; then
    cp /boot/grub/grub.conf /boot/grub/grub.conf.bak
    defaultkpath=`grubby --default-kernel`
    defaultinitrd=`grubby --info=$defaultkpath | grep initrd`
    grubby --add-kernel=$defaultkpath --copy-default --args="init=/sbin/initng" --title="initng boot" --$defaultinitrd
  fi
fi
if [ ! -f /%{_sysconfdir}/initng/system.runlevel ] && [ ! -f /%{_sysconfdir}/initng/default.runlevel ]; then
  /sbin/gen_system_runlevel >/dev/null 2>&1 || :
fi
/sbin/ldconfig
exit 0

%clean
rm -rf %{buildroot}

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc %{_docdir}/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/initng
/sbin/system_off
/sbin/ng-update
/sbin/killalli5
/sbin/initng
/sbin/ngc
/sbin/ngdc
/sbin/install_service
/sbin/gen_system_runlevel
/sbin/shutdown_script
/sbin/ngcupdown
/sbin/wpa_cli.action
/sbin/initng-segfault
/%{_lib}/libinitng.*
/%{_lib}/initng
%{_mandir}/*/*

%files ifplugd
%defattr(-,root,root)
%{_sysconfdir}/ifplugd/action.d/ngcupdown
/sbin/ifplugd.action

%changelog
* Thu Dec 01 2005 Daniel Malmgren  0.4.7-1
- New upstream version

* Tue Nov 29 2005 Daniel Malmgren  0.4.6-2
- Some really small changes

* Tue Nov 29 2005 Daniel Malmgren  0.4.6-1
- New upstream version
- Fixes to gen_system_runlevel is now upstreams, skip our patch and my
  own ugly script
- Don't ship runlevel files, generate them in %post instead

* Mon Nov 28 2005 Daniel Malmgren  0.4.4-7
- Split out the default services script from spec file
- Remove glibc and bash dependencies
- Remove mkinitrd dependencies, check if grubby exists in %post instead

* Sun Nov 27 2005 Daniel Malmgren  0.4.4-6
- added crude functionaly for enabling the same services that are enabled
  in SysVinit

* Tue Nov 22 2005 Aurelien Bompard  0.4.4-5
- split ifplugd support in a separate package

* Tue Nov 22 2005 Daniel Malmgren  0.4.4-4
- Some really small fixes here and there

* Tue Nov 22 2005 Aurelien Bompard  0.4.4-3
- fix docs dir
- remove define _prefix / (commenting it is not enough)
- depend on ifplugd

* Tue Nov 22 2005 Daniel Malmgren  - 0.4.4-2
- Don't depend on SysVinit anymore. Only reason for that was that we needed
  killall5, but we have our own killalli5 now
- remove _prefix /, shouldn't be needed anymore, right?
- Hopefully fixed the location of the installed docfiles

* Sun Nov 20 2005 Daniel Malmgren  - 0.4.4-1
- New upstream version
- Fixed rpath problems
- Renamed default_runlevels.patch to initng-default-runlevel.patch
- Small fixes in the %files
- Added /sbin/killalli5

* Fri Nov 18 2005 Daniel Malmgren  - 0.4.0-7
- Ship more %doc files

* Fri Nov 18 2005 Daniel Malmgren  - 0.4.0-6
- Run ldconfig on updates as well
- Don't ship /etc/pcmcia/network which conflicts with pcmcia-cs package
- Remove fedora-release build requirement
- Changed all occurences of /lib into %{_lib}

* Thu Nov 17 2005 Chris Chabot  - 0.4.0-5
- Added ldconfig to post and postrun
- reconstructed patch from bug #173459 and enabled in spec file

* Thu Nov 17 2005 Daniel Malmgren  - 0.4.0-4
- Removed all echos from %post
- Changed "-disable-rpath" to "--disable-rpath" (which however doesn't seem to work anyway)

* Thu Nov 17 2005 Chris Chabot  - 0.4.0-3
- Cleaned up '-' in changelog
- New upstream version
- Modified Source to Source0, and changed to download URL
- Changed BuildRoot to fedora adviced/standard format
- Changed setup to setup -q
- Modified to use {_sysconfdir} and {_datadir}
- Temporary disabled %Patch0, not included in source & can't find in download dir
- added if [ $1 = 1 ] to %post

* Tue Nov 08 2005 Daniel Malmgren  - 0.4.0-2
- Ok, I'll stop playing with dependencies. Glibc requirements now just 2.3.

* Tue Nov 08 2005 Daniel Malmgren  - 0.4.0-1
- New upstream version

* Sat Nov 05 2005 Daniel Malmgren  - 0.3.5-2
- Added %post script using Grubby to add initng to grub.conf if it's not already there

* Sat Nov 05 2005 Daniel Malmgren  - 0.3.5-1
- New upstream version
- Changes to which services are in default runlevel

* Sun Oct 30 2005 Daniel Malmgren  - 0.3.4-1
- New upstream version
- Don't install the killall5 program which conflicts with SysVinit

* Sun Oct 16 2005 Daniel Malmgren  - 0.3.3-1
- New upstream version
- Refined the %files-section a bit

* Tue Oct 11 2005 Daniel Malmgren  - 0.3.2-2
- Changes to try to make package compatible with Fedora guidelines

* Sun Oct 09 2005 Daniel Malmgren  - 0.3.2-1
- New upstream version
- Added /sbin/initng-segfault

* Sat Oct 08 2005 Daniel Malmgren  - 0.3.1-1
- New upstream version

* Tue Sep 27 2005 Daniel Malmgren  - 0.3.0-1
- New upstream version

* Tue Sep 27 2005 Daniel Malmgren  - 0.2.5-1
- New upstream version
- Fix the coldplug issue properly

* Fri Sep 23 2005 Daniel Malmgren  - 0.2.3-1
- New upstream version

* Mon Sep 05 2005 Daniel Malmgren  - 0.2.0-1
- New upstream version
- Fix files that appeared/disappeared in this version
- Install doc files at the correct location

* Sat Aug 27 2005 Daniel Malmgren  - 0.1.9-1
- New upstream version
- Removed /etc/initng/conf and /etc/initng/plugin from installation
- Added new files /sbin/shutdown_script and /sbin/test_pidfile
- Remove xfs again, as I can't seem to get it working right anyway

* Sun Aug 14 2005 Daniel Malmgren  - 0.1.8-2
- Removed /etc/hotplug/net.agent which conflicts with hotplug package
- Add xfs to default runlevel

* Sun Aug 14 2005 Daniel Malmgren  - 0.1.8-1
- New upstream version
- Rename gen_system_runlevel.sh to gen_system_runlevel

* Sun Aug 07 2005 Daniel Malmgren > - 0.1.7-1
- First spec that really creates a rpm. Use at own risk!


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initng/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Dec 2005 11:29:10 -0000	1.1
+++ .cvsignore	4 Dec 2005 11:30:18 -0000	1.2
@@ -0,0 +1 @@
+initng-0.4.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initng/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Dec 2005 11:29:10 -0000	1.1
+++ sources	4 Dec 2005 11:30:18 -0000	1.2
@@ -0,0 +1 @@
+1801fe5e4643b7b9f12492475fc8ebb6  initng-0.4.7.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec  4 11:35:01 2005
From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm))
Date: Sun,  4 Dec 2005 06:35:01 -0500
Subject: owners owners.list,1.431,1.432
Message-ID: <200512041135.jB4BZVA8012894@cvs-int.fedora.redhat.com>

Author: danielm

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12875/owners

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- owners.list	2 Dec 2005 16:27:51 -0000	1.431
+++ owners.list	4 Dec 2005 11:34:58 -0000	1.432
@@ -385,6 +385,7 @@
 Fedora Extras|iiimf-le-simplehangul|Romanized Korean Hangul language engine for IIIMF|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
+Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org|
 Fedora Extras|inkscape|A vector-based drawing program using SVG|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Dec  4 11:41:03 2005
From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm))
Date: Sun,  4 Dec 2005 06:41:03 -0500
Subject: rpms/initng/devel initng.spec,1.1,1.2
Message-ID: <200512041141.jB4BfXv1012955@cvs-int.fedora.redhat.com>

Author: danielm

Update of /cvs/extras/rpms/initng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12938

Modified Files:
	initng.spec 
Log Message:



Index: initng.spec
===================================================================
RCS file: /cvs/extras/rpms/initng/devel/initng.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- initng.spec	4 Dec 2005 11:30:18 -0000	1.1
+++ initng.spec	4 Dec 2005 11:41:01 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes
 Name: initng
 Version: 0.4.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://initng.thinktux.net
 Group: System Environment/Base
@@ -53,6 +53,10 @@
   if [ $? -ne 0 ]; then
     cp /boot/grub/grub.conf /boot/grub/grub.conf.bak
     defaultkpath=`grubby --default-kernel`
+    if test -n $defaultkpath && test -f "/boot/vmlinuz-"`uname -r`
+    then
+    	defaultkpath="/boot/vmlinuz-"`uname -r`
+    fi
     defaultinitrd=`grubby --info=$defaultkpath | grep initrd`
     grubby --add-kernel=$defaultkpath --copy-default --args="init=/sbin/initng" --title="initng boot" --$defaultinitrd
   fi
@@ -94,6 +98,9 @@
 /sbin/ifplugd.action
 
 %changelog
+* Sun Dec 04 2005 Adel Gadllah  0.4.7-2
+- Fixed case where default entry in grub is not a linuxkernel
+
 * Thu Dec 01 2005 Daniel Malmgren  0.4.7-1
 - New upstream version
 



From fedora-extras-commits at redhat.com  Sun Dec  4 11:45:09 2005
From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm))
Date: Sun,  4 Dec 2005 06:45:09 -0500
Subject: rpms/initng/devel initng.spec,1.2,1.3
Message-ID: <200512041145.jB4Bjd4c013017@cvs-int.fedora.redhat.com>

Author: danielm

Update of /cvs/extras/rpms/initng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12998

Modified Files:
	initng.spec 
Log Message:



Index: initng.spec
===================================================================
RCS file: /cvs/extras/rpms/initng/devel/initng.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- initng.spec	4 Dec 2005 11:41:01 -0000	1.2
+++ initng.spec	4 Dec 2005 11:45:07 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes
 Name: initng
 Version: 0.4.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://initng.thinktux.net
 Group: System Environment/Base
@@ -98,6 +98,9 @@
 /sbin/ifplugd.action
 
 %changelog
+* Sun Dec 04 2005 Daniel Malmgren  0.4.7-3
+- First version released to Fedora extras
+
 * Sun Dec 04 2005 Adel Gadllah  0.4.7-2
 - Fixed case where default entry in grub is not a linuxkernel
 



From fedora-extras-commits at redhat.com  Sun Dec  4 11:55:30 2005
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Sun,  4 Dec 2005 06:55:30 -0500
Subject: rpms/balsa/devel .cvsignore, 1.7, 1.8 balsa.spec, 1.10, 1.11 sources,
	1.7, 1.8
Message-ID: <200512041156.jB4Bu0x9013097@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/balsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13076

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
upload 2.3.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Oct 2005 19:55:11 -0000	1.7
+++ .cvsignore	4 Dec 2005 11:55:28 -0000	1.8
@@ -1,2 +1,2 @@
-gmime-2.1.14.tar.bz2
-balsa-2.3.6.tar.bz2
+gmime-2.1.17.tar.bz2
+balsa-2.3.7.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- balsa.spec	23 Oct 2005 19:55:11 -0000	1.10
+++ balsa.spec	4 Dec 2005 11:55:28 -0000	1.11
@@ -1,8 +1,8 @@
-%define gmimever 2.1.14
+%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
 
 Name:           balsa
-Version:        2.3.6
+Version:        2.3.7
 Release:        1%{?dist}
 Summary:        Mail Client
 
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Sun Dec  4 2005 Pawel Salek  - 2.3.7-1
+- update to upstream version 2.3.7. Use gmime-2.1.17
+
 * Wed Oct 23 2005 Pawel Salek  - 2.3.6-1
 - update to upstream version 2.3.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Oct 2005 19:55:11 -0000	1.7
+++ sources	4 Dec 2005 11:55:28 -0000	1.8
@@ -1,2 +1,2 @@
-ee1c2d0c1f76ae113f0dd70893bbacf4  gmime-2.1.14.tar.bz2
-5a90dce6a7942e02dacb1e69872d6ea2  balsa-2.3.6.tar.bz2
+4be55ee55e4b3966bd51fadbf5fb323b  gmime-2.1.17.tar.bz2
+d50a439a8b8c2be99e3b0108d5d6073e  balsa-2.3.7.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec  4 12:02:35 2005
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Sun,  4 Dec 2005 07:02:35 -0500
Subject: common tobuild,1.2242,1.2243
Message-ID: <200512041203.jB4C35eq014723@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14706

Modified Files:
	tobuild 
Log Message:
request build of rpms/balsa/devel balsa-2_3_7-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2242
retrieving revision 1.2243
diff -u -r1.2242 -r1.2243
--- tobuild	3 Dec 2005 00:07:03 -0000	1.2242
+++ tobuild	4 Dec 2005 12:02:32 -0000	1.2243
@@ -53,3 +53,4 @@
 spot	rpms/gambas/FC-3	gambas-1_0_13-3_fc3	fc3
 spot	rpms/gambas/FC-4	gambas-1_0_13-3_fc4	fc4
 spot	rpms/gambas/devel	gambas-1_0_13-3_fc5	devel
+pawsa	rpms/balsa/devel	balsa-2_3_7-1_fc5	devel



From fedora-extras-commits at redhat.com  Sun Dec  4 12:12:09 2005
From: fedora-extras-commits at redhat.com (Daniel Malmgren (danielm))
Date: Sun,  4 Dec 2005 07:12:09 -0500
Subject: rpms/initng/devel initng.spec,1.3,1.4
Message-ID: <200512041212.jB4CCdqi014796@cvs-int.fedora.redhat.com>

Author: danielm

Update of /cvs/extras/rpms/initng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14779

Modified Files:
	initng.spec 
Log Message:



Index: initng.spec
===================================================================
RCS file: /cvs/extras/rpms/initng/devel/initng.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- initng.spec	4 Dec 2005 11:45:07 -0000	1.3
+++ initng.spec	4 Dec 2005 12:12:07 -0000	1.4
@@ -1,13 +1,14 @@
 Summary: Programs which control basic system processes
 Name: initng
 Version: 0.4.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 URL: http://initng.thinktux.net
 Group: System Environment/Base
 Source0: http://initng.thinktux.net/download/v0.4/initng-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: filesystem >= 2.2.4-1
+BuildRequires: device-mapper >= 1.01
 
 %description
 Initng is a full replacement of the old and in many ways deprecated sysvinit
@@ -98,6 +99,9 @@
 /sbin/ifplugd.action
 
 %changelog
+* Sun Dec 04 2005 Daniel Malmgren  0.4.7-4
+- Add build requirement on device-mapper, see if this helps building on x86_64...
+
 * Sun Dec 04 2005 Daniel Malmgren  0.4.7-3
 - First version released to Fedora extras
 



From fedora-extras-commits at redhat.com  Sun Dec  4 12:37:03 2005
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Sun,  4 Dec 2005 07:37:03 -0500
Subject: rpms/libesmtp/FC-4 .cvsignore, 1.2, 1.3 libesmtp.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200512041237.jB4CbXgw014921@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/libesmtp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14900

Modified Files:
	.cvsignore libesmtp.spec sources 
Log Message:
- fix #173332 following Patrice Dumas's patches.
- fix crashes on certificates with subjectAltName extension.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libesmtp/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jun 2005 21:08:03 -0000	1.2
+++ .cvsignore	4 Dec 2005 12:37:01 -0000	1.3
@@ -1 +1,3 @@
 libesmtp-1.0.3r1.tar.bz2
+libesmtp-ssl.patch
+COPYING.LGPL


Index: libesmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libesmtp/FC-4/libesmtp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libesmtp.spec	12 Jun 2005 21:08:03 -0000	1.1
+++ libesmtp.spec	4 Dec 2005 12:37:01 -0000	1.2
@@ -3,11 +3,13 @@
 Summary: SMTP client library
 Name:     	libesmtp
 Version:  	1.0.3r1
-Release:        3
+Release:        4
 License:	LGPL
 Group: System Environment/Libraries
 Source:  	http://www.stafford.uklinux.net/libesmtp/%{name}-%{version}.tar.bz2
+Source1: 	COPYING.LGPL
 Patch1:		libesmtp-build.patch
+Patch2:		libesmtp-ssl.patch
 URL:       	http://www.stafford.uklinux.net/libesmtp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openssl-devel pkgconfig automake libtool
@@ -22,7 +24,8 @@
 %package devel
 Summary: Headers and development libraries for libESMTP
 Group: Development/Libraries
-Requires: %{name} = %{version}
+License: LGPL/GPL
+Requires: %{name} = %{version}-%{release}, openssl-devel
 
 %description devel
 LibESMTP is a library to manage posting (or submission of) electronic
@@ -35,6 +38,8 @@
 %prep 
 %setup -q
 %patch1 -p1 -b .build
+%patch2 -p1 -b .ssl
+cp %{SOURCE1} .
 
 %build
 #we run auto* because the distributed configure script is inferior.
@@ -52,7 +57,7 @@
 %configure --with-auth-plugin-dir=%{plugindir} --enable-pthreads \
   --enable-require-all-recipients --enable-debug \
   --enable-etrn
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -68,19 +73,24 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS COPYING COPYING.GPL NEWS Notes README
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING.LGPL NEWS Notes README
 %{_libdir}/libesmtp.so.*
 %{plugindir}
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc examples COPYING.GPL
 %{_bindir}/libesmtp-config
 %{_prefix}/include/*
 %{_libdir}/libesmtp.so
 %{_libdir}/libesmtp.a
 
 %changelog
+* Sun Dec  4 2005 Pawel Salek  - 1.0.3r1-4
+- fix #173332 following Patrice Dumas's patches.
+- fix crashes on certificates with subjectAltName extension.
+
 * Sun Jun 12 2005 Pawel Salek  - 1.0.3r1-3
 - Add libesmtp-build.patch - fix building under FC4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libesmtp/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jun 2005 21:08:03 -0000	1.2
+++ sources	4 Dec 2005 12:37:01 -0000	1.3
@@ -1 +1,3 @@
 c07aa79293aa36298626fe5e68d6bfba  libesmtp-1.0.3r1.tar.bz2
+f018f16cbebc56490d2c3c18a23d3113  libesmtp-ssl.patch
+a6f89e2100d9b6cdffcea4f398e37343  COPYING.LGPL



From fedora-extras-commits at redhat.com  Sun Dec  4 12:45:58 2005
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Sun,  4 Dec 2005 07:45:58 -0500
Subject: rpms/libesmtp/devel .cvsignore, 1.3, 1.4 libesmtp.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200512041246.jB4CkSC9015000@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/libesmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14973

Modified Files:
	.cvsignore libesmtp.spec sources 
Log Message:
- Fix bug 173332 completely, including licence issues.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libesmtp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Oct 2005 19:07:25 -0000	1.3
+++ .cvsignore	4 Dec 2005 12:45:56 -0000	1.4
@@ -1,2 +1,3 @@
 libesmtp-1.0.3r1.tar.bz2
 libesmtp-ssl.patch
+COPYING.LGPL


Index: libesmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libesmtp/devel/libesmtp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libesmtp.spec	17 Nov 2005 21:03:45 -0000	1.4
+++ libesmtp.spec	4 Dec 2005 12:45:56 -0000	1.5
@@ -3,10 +3,11 @@
 Summary: SMTP client library
 Name:     	libesmtp
 Version:  	1.0.3r1
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:	LGPL
 Group: System Environment/Libraries
 Source:  	http://www.stafford.uklinux.net/libesmtp/%{name}-%{version}.tar.bz2
+Source1:       COPYING.LGPL
 Patch1:		libesmtp-build.patch
 Patch2:		libesmtp-ssl.patch
 URL:       	http://www.stafford.uklinux.net/libesmtp/
@@ -23,6 +24,7 @@
 %package devel
 Summary: Headers and development libraries for libESMTP
 Group: Development/Libraries
+License: LGPL/GPL
 Requires: %{name} = %{version}-%{release}, openssl-devel
 
 %description devel
@@ -37,6 +39,7 @@
 %setup -q
 %patch1 -p1 -b .build
 %patch2 -p1 -b .ssl
+cp %{SOURCE1} .
 
 %build
 #we run auto* because the distributed configure script is inferior.
@@ -54,7 +57,7 @@
 %configure --with-auth-plugin-dir=%{plugindir} --enable-pthreads \
   --enable-require-all-recipients --enable-debug \
   --enable-etrn
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,19 +73,23 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS COPYING COPYING.GPL NEWS Notes README
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING.LGPL NEWS Notes README
 %{_libdir}/libesmtp.so.*
 %{plugindir}
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc examples COPYING.GPL
 %{_bindir}/libesmtp-config
 %{_prefix}/include/*
 %{_libdir}/libesmtp.so
 %{_libdir}/libesmtp.a
 
 %changelog
+* Sun Dec  4 2005 Pawel Salek  - 1.0.3r1-7
+- Fix bug 173332 completely, including licence issues.
+
 * Thu Nov 17 2005 Pawel Salek  - 1.0.3r1-6
 - fix #173332.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libesmtp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Oct 2005 19:07:25 -0000	1.3
+++ sources	4 Dec 2005 12:45:56 -0000	1.4
@@ -1,2 +1,3 @@
 c07aa79293aa36298626fe5e68d6bfba  libesmtp-1.0.3r1.tar.bz2
 f018f16cbebc56490d2c3c18a23d3113  libesmtp-ssl.patch
+a6f89e2100d9b6cdffcea4f398e37343  COPYING.LGPL



From fedora-extras-commits at redhat.com  Sun Dec  4 12:56:30 2005
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Sun,  4 Dec 2005 07:56:30 -0500
Subject: rpms/balsa/FC-4 .cvsignore, 1.4, 1.5 balsa.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200512041257.jB4Cv0Ql015177@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/balsa/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15156

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
update to 2.3.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Jun 2005 08:12:03 -0000	1.4
+++ .cvsignore	4 Dec 2005 12:56:28 -0000	1.5
@@ -1,2 +1,2 @@
-balsa-2.3.3.tar.bz2
-gmime-2.1.14.tar.bz2
+gmime-2.1.17.tar.bz2
+balsa-2.3.7.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/FC-4/balsa.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- balsa.spec	19 Oct 2005 20:21:31 -0000	1.5
+++ balsa.spec	4 Dec 2005 12:56:28 -0000	1.6
@@ -1,9 +1,9 @@
-%define gmimever 2.1.14
+%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
 
 Name:           balsa
-Version:        2.3.3
-Release:        2%{?dist}
+Version:        2.3.7
+Release:        1%{?dist}
 Summary:        Balsa Mail Client
 
 Group:          Applications/Internet
@@ -14,7 +14,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: libesmtp >= 1.0.3
-Requires: scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 BuildRequires: scrollkeeper
 BuildRequires: libesmtp-devel >= 1.0.3
 BuildRequires: aspell-devel
@@ -63,12 +64,21 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %post
-which scrollkeeper-update>/dev/null 2>&1 && scrollkeeper-update
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+/bin/touch --no-create %{_datadir}/icons/hicolor
+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
-which scrollkeeper-update>/dev/null 2>&1 && scrollkeeper-update
+scrollkeeper-update -q || :
 
-# no need to update cache - it will be removed.
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -90,6 +100,12 @@
 
 
 %changelog
+* Sun Dec  4 2005 Pawel Salek  - 2.3.7-1
+- update to upstream version 2.3.7.
+
+* Mon Oct 24 2005 Pawel Salek  - 2.3.6-1
+- update to upstream version 2.3.6.
+
 * Wed Oct 19 2005 Pawel Salek  - 2.3.3-2
 - bump the release up to fix "make tag" problem.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Jun 2005 08:12:03 -0000	1.4
+++ sources	4 Dec 2005 12:56:28 -0000	1.5
@@ -1,2 +1,2 @@
-ac43ab8ca5ccc6782daac21e370b8605  balsa-2.3.3.tar.bz2
-ee1c2d0c1f76ae113f0dd70893bbacf4  gmime-2.1.14.tar.bz2
+4be55ee55e4b3966bd51fadbf5fb323b  gmime-2.1.17.tar.bz2
+d50a439a8b8c2be99e3b0108d5d6073e  balsa-2.3.7.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec  4 13:01:38 2005
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Sun,  4 Dec 2005 08:01:38 -0500
Subject: rpms/balsa/FC-4 balsa.spec,1.6,1.7
Message-ID: <200512041302.jB4D2R0O016818@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/balsa/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15274

Modified Files:
	balsa.spec 
Log Message:
bump the release number - 2.3.7-1 cannot be built.



Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/FC-4/balsa.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- balsa.spec	4 Dec 2005 12:56:28 -0000	1.6
+++ balsa.spec	4 Dec 2005 13:01:36 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           balsa
 Version:        2.3.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Balsa Mail Client
 
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Sun Dec  4 14:16:37 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  4 Dec 2005 09:16:37 -0500
Subject: rpms/gossip/devel gossip.spec,1.7,1.8
Message-ID: <200512041417.jB4EH7Tn018565@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gossip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18548

Modified Files:
	gossip.spec 
Log Message:
* Fri Dec  2 2005 Brian Pepple  - 0.9-6
- Rebuild for new dbus.



Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gossip.spec	31 Aug 2005 19:16:37 -0000	1.7
+++ gossip.spec	4 Dec 2005 14:16:34 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           gossip
 Version:        0.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Gnome Jabber Client
 
 Group:          Applications/Communications
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Fri Dec  2 2005 Brian Pepple  - 0.9-6
+- Rebuild for new dbus.
+
 * Wed Aug 31 2005 Brian Pepple  - 0.9-5
 - Add missing COPYING file to docs.
 



From fedora-extras-commits at redhat.com  Sun Dec  4 15:18:41 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun,  4 Dec 2005 10:18:41 -0500
Subject: rpms/freeciv/devel freeciv.spec,1.17,1.18
Message-ID: <200512041519.jB4FJCIx020333@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20304

Modified Files:
	freeciv.spec 
Log Message:
* Sun Dec  4 2005 Brian Pepple  - 2.0.7-4
- Rebuild for new bind.



Index: freeciv.spec
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- freeciv.spec	6 Nov 2005 15:23:59 -0000	1.17
+++ freeciv.spec	4 Dec 2005 15:18:39 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           freeciv
 Version:        2.0.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The Freeciv multi-player strategy game
 
 Group:          Amusements/Games
@@ -90,6 +90,9 @@
 %{_mandir}/man6/civclient.6.gz
 
 %changelog
+* Sun Dec  4 2005 Brian Pepple  - 2.0.7-4
+- Rebuild for new bind.
+
 * Sun Nov  6 2005 Brian Pepple  - 2.0.7-3
 - Update to 2.0.7.
 - Modify desktop patch for upstream fixes.



From fedora-extras-commits at redhat.com  Sun Dec  4 18:23:54 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  4 Dec 2005 13:23:54 -0500
Subject: rpms/lrmi/devel lrmi-0.9-asm.patch,NONE,1.1 lrmi.spec,1.6,1.7
Message-ID: <200512041824.jB4IOOcD025551@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lrmi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25529

Modified Files:
	lrmi.spec 
Added Files:
	lrmi-0.9-asm.patch 
Log Message:
* Sun Dec  4 2005 Ville Skytt??  - 0.9-2
- Fix build with new binutils.


lrmi-0.9-asm.patch:

--- NEW FILE lrmi-0.9-asm.patch ---
--- lrmi.c~	2005-09-01 09:43:52.000000000 +0300
+++ lrmi.c	2005-11-10 21:41:22.000000000 +0200
@@ -781,11 +781,11 @@
 		// FIXME: may apply this to BSD equivalents?
 		sigfillset(&all_sigs);
 		sigprocmask(SIG_SETMASK, &all_sigs, &old_sigs);
-		asm volatile ("movl %%gs, %0" : "=rm" (old_gs));
-		asm volatile ("movl %%fs, %0" : "=rm" (old_fs));
+		asm volatile ("mov %%gs, %0" : "=rm" (old_gs));
+		asm volatile ("mov %%fs, %0" : "=rm" (old_fs));
 		vret = lrmi_vm86(&context.vm);
-		asm volatile ("movl %0, %%gs" :: "rm" (old_gs));
-		asm volatile ("movl %0, %%fs" :: "rm" (old_fs));
+		asm volatile ("mov %0, %%gs" :: "rm" (old_gs));
+		asm volatile ("mov %0, %%fs" :: "rm" (old_fs));
 		sigprocmask(SIG_SETMASK, &old_sigs, NULL);
 
 		if (VM86_TYPE(vret) == VM86_INTx) {


Index: lrmi.spec
===================================================================
RCS file: /cvs/extras/rpms/lrmi/devel/lrmi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lrmi.spec	10 Nov 2005 17:57:01 -0000	1.6
+++ lrmi.spec	4 Dec 2005 18:23:51 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           lrmi
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for calling real mode BIOS routines
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@
 URL:            http://sourceforge.net/projects/lrmi/
 Source0:        http://download.sourceforge.net/lrmi/%{name}-%{version}.tar.gz
 Patch0:         %{name}-0.9-build.patch
+Patch1:         %{name}-0.9-asm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -36,6 +37,7 @@
 %prep
 %setup -q
 %patch0
+%patch1
 
 
 %build
@@ -75,6 +77,9 @@
 
 
 %changelog
+* Sun Dec  4 2005 Ville Skytt??  - 0.9-2
+- Fix build with new binutils.
+
 * Wed Nov  9 2005 Ville Skytt??  - 0.9-1
 - 0.9, patches mostly applied/obsoleted upstream.
 - Don't ship static libraries.



From fedora-extras-commits at redhat.com  Sun Dec  4 22:44:56 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Sun,  4 Dec 2005 17:44:56 -0500
Subject: rpms/krecipes/devel .cvsignore, 1.4, 1.5 krecipes.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200512042245.jB4MjQ0v032614@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32591

Modified Files:
	.cvsignore krecipes.spec sources 
Log Message:
update to 0.9.1  fixes bug with creation of new mysql databses



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Dec 2005 04:32:46 -0000	1.4
+++ .cvsignore	4 Dec 2005 22:44:54 -0000	1.5
@@ -1,2 +1 @@
-krecipes-0.9.tar.gz
-krecipes-X11.patch
+krecipes-0.9.1.tar.gz


Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/krecipes.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- krecipes.spec	4 Dec 2005 04:29:34 -0000	1.7
+++ krecipes.spec	4 Dec 2005 22:44:54 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           krecipes
-Version:        0.9
-Release:        3%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
@@ -86,6 +86,8 @@
 %{_datadir}/mimelnk/*/*.desktop
 
 %changelog
+* Sun Dec 04 2005 Dennis Gilmore  - 0.9.1-1
+- update to 0.9.1  this fixes a bug in mysql database creation
 * Sat Dec 03 2005 Dennis Gilmore  - 0.9-3
 - fix BuildRequies for libacl and add patch for X check.
 * Wed Nov 30 2005 Dennis Gilmore  - 0.9-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Dec 2005 04:32:46 -0000	1.4
+++ sources	4 Dec 2005 22:44:54 -0000	1.5
@@ -1,2 +1 @@
-ee1a1463946c63788ff8eeea302a7506  krecipes-0.9.tar.gz
-67e68fc70f7ff67235a7a36affa7af6d  krecipes-X11.patch
+7414fd5210561801ba04ee3dad6561d9  krecipes-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec  4 22:46:52 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Sun,  4 Dec 2005 17:46:52 -0500
Subject: rpms/krecipes/FC-4 .cvsignore, 1.3, 1.4 krecipes.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200512042247.jB4MlNVH032647@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32626

Modified Files:
	.cvsignore krecipes.spec sources 
Log Message:
Update to 0.9.1 this release fixes a bug in new mysql databse creation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2005 03:37:53 -0000	1.3
+++ .cvsignore	4 Dec 2005 22:46:50 -0000	1.4
@@ -1 +1 @@
-krecipes-0.9.tar.gz
+krecipes-0.9.1.tar.gz


Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-4/krecipes.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- krecipes.spec	1 Dec 2005 04:05:23 -0000	1.6
+++ krecipes.spec	4 Dec 2005 22:46:50 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           krecipes
-Version:        0.9
-Release:        2%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
@@ -9,7 +9,7 @@
 Source0:        http://download.sourceforge.net/krecipes/krecipes-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel > 3.1, sqlite-devel, desktop-file-utils
+BuildRequires:  kdelibs-devel > 3.1, sqlite-devel, desktop-file-utils, libacl-devel
 Requires:       kdebase >= 3.1
 
 patch0:		krecipes-gcc4.patch
@@ -81,9 +81,11 @@
 %{_datadir}/mimelnk/*/*.desktop
 
 %changelog
-* Wed Nov 11 2005 Dennis Gilmore  - 0.9-2
+* Sun Dec 04 2005 Dennis Gilmore  - 0.9.1-1
+- Update to 0.9.1 fixes bug in creation of new mysql databses
+* Wed Nov 30 2005 Dennis Gilmore  - 0.9-2
 - fix missing files
-* Wed Nov 11 2005 Dennis Gilmore  - 0.9-1
+* Wed Nov 30 2005 Dennis Gilmore  - 0.9-1
 - update to 0.9
 * Sat Oct 20 2005 Dennis Gilmore  - 0.8.1-3%{?dist}
 - add BuildRequires desktop-file-utils  http://fedoraproject.org/wiki/QAChecklist


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2005 03:37:53 -0000	1.3
+++ sources	4 Dec 2005 22:46:50 -0000	1.4
@@ -1 +1 @@
-ee1a1463946c63788ff8eeea302a7506  krecipes-0.9.tar.gz
+7414fd5210561801ba04ee3dad6561d9  krecipes-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec  4 23:04:46 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Sun,  4 Dec 2005 18:04:46 -0500
Subject: owners owners.list,1.432,1.433
Message-ID: <200512042305.jB4N5Hka001853@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1836

Modified Files:
	owners.list 
Log Message:
update email address to the one I actually use



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- owners.list	4 Dec 2005 11:34:58 -0000	1.432
+++ owners.list	4 Dec 2005 23:04:44 -0000	1.433
@@ -117,7 +117,7 @@
 Fedora Extras|cppunit|C++ unit testing framework|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
-Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at dgilmore.net|extras-qa at fedoraproject.org|
+Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ctrlproxy|IRC server with multiserver support|dwmw2 at infradead.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -309,7 +309,7 @@
 Fedora Extras|gpa|Graphical user interface for GnuPG|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gparted|Gnome Partition Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gperiodic|Program for browsing the periodic table|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
-Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at dgilmore.net|extras-qa at fedoraproject.org|
+Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|gpgme|GnuPG Made Easy|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gpredict|Real-time satellite tracking and orbit prediction program|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gpsim|A simulator for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
@@ -433,12 +433,12 @@
 Fedora Extras|kompose|Provides a full screen view of all open windows|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|konversation|An easy to use irc client for KDE|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|kover|WYSIWYG CD cover printer with CDDB support|adrian at lisas.de|extras-qa at fedoraproject.org|
-Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|dennis at dgilmore.net|extras-qa at fedoraproject.org|
+Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|krecipes|Application to manage recipes and shopping-lists|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|krusader|An advanced twin-panel (commander-style) file-manager for KDE|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|ksensors|An lm_sensors frontend for KDE|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|ktrack|Satellite prediction software for KDE|dennis at dgilmore.net|extras-qa at fedoraproject.org|
+Fedora Extras|ktrack|Satellite prediction software for KDE|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|kxdocker|A Mac OSX style docker|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kxdocker-resources|Plugins, Sounds, and Themes for kxdocker|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kyum|Graphical User Frontend (GUI) for yum|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Dec  4 23:23:58 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun,  4 Dec 2005 18:23:58 -0500
Subject: rpms/psi/devel .cvsignore, 1.5, 1.6 psi.spec, 1.12, 1.13 sources,
	1.6, 1.7
Message-ID: <200512042324.jB4NOSrG002072@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/psi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2051

Modified Files:
	.cvsignore psi.spec sources 
Log Message:
- update to 0.10-test3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Jan 2005 21:11:58 -0000	1.5
+++ .cvsignore	4 Dec 2005 23:23:56 -0000	1.6
@@ -1,19 +1,5 @@
-psi_ca.qm.bz2
-psi_cs.qm.bz2
-psi_el.qm.bz2
-psi_es.qm.bz2
-psi_it.qm.bz2
-psi_mk.qm.bz2
-psi_se.qm.bz2
-psi-0.9.3.tar.bz2
-psi_de.qm.bz2
-psi_ee.qm.bz2
-psi_et.qm.bz2
-psi_fi.qm.bz2
-psi_fr.qm.bz2
-psi_nl.qm.bz2
-psi_pl.qm.bz2
-psi_ru.qm.bz2
-psi_sk.qm.bz2
-psi_sw.qm.bz2
-psi_zh.qm.bz2
+emoticons-0.9.3.tar.gz
+psi-0.10-test3.tar.bz2
+psi-lang-packs-0.9.3.tar.gz
+rostericons-0.9.3.tar.gz
+systemicons-0.9.3.tar.gz


Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/psi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- psi.spec	2 Jun 2005 16:02:30 -0000	1.12
+++ psi.spec	4 Dec 2005 23:23:56 -0000	1.13
@@ -2,22 +2,21 @@
 %{!?_without_kde:%define with_kde 1}
 
 Name:       psi
-Version:    0.9.3
-Release:    4%{?dist}
-Summary:    Jabber client using Qt 3
+Version:    0.10
+Release:    0.2.test3%{?dist}
+Summary:    Jabber client based on Qt
 License:    GPL
 Group:      Applications/Internet
 URL:        http://psi.affinix.com/
-Source0:    http://dl.sf.net/psi/psi-0.9.3.tar.bz2
+#Source0:    http://people.ex.ac.uk/kismith/psi/psi-0.10-test2.tar.bz2
+Source0:    http://dl.sf.net/psi/psi-0.10-test3.tar.bz2
 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
+#Patch2:     psi-0.9.2-mach-build.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel >= 1:3.1.1
-BuildRequires:  XFree86-devel
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  qca-devel
@@ -29,49 +28,13 @@
 Requires:    gnupg
 
 # Language packs
-Source50:    psi_pl.qm.bz2
-#Source51:    psi_sr.qm.bz2
-Source52:    psi_fr.qm.bz2
-#Source53:    psi_eo.qm.bz2
-#Source54:    psi_sr at Latn.qm.bz2
-Source55:    psi_fi.qm.bz2
-Source56:    psi_cs.qm.bz2
-Source57:    psi_ru.qm.bz2
-Source58:    psi_de.qm.bz2
-Source59:    psi_es.qm.bz2
-Source60:    psi_mk.qm.bz2
-Source61:    psi_nl.qm.bz2
-Source62:    psi_sk.qm.bz2
-Source63:    psi_el.qm.bz2
-Source64:    psi_it.qm.bz2
-Source65:    psi_se.qm.bz2
-Source66:    psi_ca.qm.bz2
-Source67:    psi_zh.qm.bz2
-Source68:    psi_sw.qm.bz2
-Source69:    psi_ee.qm.bz2
-Source70:    psi_et.qm.bz2
-
-# Emoticonsets
-Source100:   Chibi.jisp
-Source101:   KMess-Cartoon-1.0.jisp
-Source102:   shinyicons.jisp
-Source103:   yahoo_messenger.jisp
-Source104:   kreativ_squareheads.jisp
-Source105:   tlen.pl-3.73.jisp
-Source106:   apple_ichat-1.0.jisp
-Source107:   trill-extra-symbols.jisp
-Source108:   trill-extra-smileys.jisp
-Source109:   Ninja.jisp
-Source110:   webmessenger.jisp
-
-# Rostericonsets
-Source130:   weather.jisp
-Source131:   icqG.jisp
-Source132:   gaduGaduG.jisp
-Source133:   http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_roster.jisp
+Source10:   psi-lang-packs-0.9.3.tar.gz
+
+# Iconsets
+Source11:   emoticons-0.9.3.tar.gz
+Source12:   rostericons-0.9.3.tar.gz
+Source13:   systemicons-0.9.3.tar.gz
 
-# System iconsets
-Source160:   http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_system.jisp
 
 
 %description
@@ -109,12 +72,11 @@
 
 
 %prep
-%setup -q
+%setup -q -n psi-%{version}-test3
 # (ugly) hack to enable debuginfo subrpm
 %patch1 -p1 -b .strip
 # needed to build with mach
-%patch2 -p1 -b .mach-build
-%patch3 -p1 -b .gcc4
+#%patch2 -p1 -b .mach-build
 
 
 %build
@@ -131,12 +93,11 @@
         --qtdir=$QTDIR
 
 # Fix build for FC1
-make qmake
-install -m 755 %{SOURCE2} src/uic-wrapper
-sed -i 's|\$(QTDIR)/bin/uic|./uic-wrapper|' src/Makefile
+#make qmake
+#install -m 755 %{SOURCE2} src/uic-wrapper
+#sed -i 's|\$(QTDIR)/bin/uic|./uic-wrapper|' src/Makefile
 
 make %{?_smp_mflags}
-#lrelease psi.pro
 
 
 %install
@@ -144,78 +105,52 @@
 
 export INSTALL_ROOT=$RPM_BUILD_ROOT
 make install
-#rm -f $RPM_BUILD_ROOT%{_datadir}/%name/{README,COPYING}
 cp -p libpsi/iconset/ICONSET-HOWTO $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/
 
 # Install language packs
-%__bzip2 -dck %{SOURCE50} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_pl.qm
-#%__bzip2 -dck %{SOURCE51} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sr.qm
-%__bzip2 -dck %{SOURCE52} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fr.qm
-#%__bzip2 -dck %{SOURCE53} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_eo.qm
-#%__bzip2 -dck %{SOURCE54} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sr at Latn.qm
-%__bzip2 -dck %{SOURCE55} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fi.qm
-%__bzip2 -dck %{SOURCE56} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_cs.qm
-%__bzip2 -dck %{SOURCE57} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ru.qm
-%__bzip2 -dck %{SOURCE58} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_de.qm
-%__bzip2 -dck %{SOURCE59} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_es.qm
-%__bzip2 -dck %{SOURCE60} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_mk.qm
-%__bzip2 -dck %{SOURCE61} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_nl.qm
-%__bzip2 -dck %{SOURCE62} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sk.qm
-%__bzip2 -dck %{SOURCE63} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_el.qm
-%__bzip2 -dck %{SOURCE64} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_it.qm
-%__bzip2 -dck %{SOURCE65} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_se.qm
-%__bzip2 -dck %{SOURCE66} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ca.qm
-%__bzip2 -dck %{SOURCE67} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_zh.qm
-%__bzip2 -dck %{SOURCE68} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sw.qm
-%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ee.qm
-%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_et.qm
+tar -xzpf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/%name/
 
 ## Install iconsets
-install -p %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE101} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE102} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE103} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE104} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE105} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE106} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE107} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE108} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE109} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE110} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-
-install -p %{SOURCE130} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
-install -p %{SOURCE131} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
-install -p %{SOURCE132} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
-install -p %{SOURCE133} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
+tar -xzpf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
+tar -xzpf %{SOURCE12} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
+tar -xzpf %{SOURCE13} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/
 
-install -p %{SOURCE160} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/
 
 # Menu
-perl -pi -e 's/Icon=psi/Icon=psi.png/' $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop
+#perl -pi -e 's/Icon=psi/Icon=psi.png/' $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop
 desktop-file-install --vendor fedora \
-                     --dir $RPM_BUILD_ROOT%{_datadir}/applications\
-                     --add-category Application\
-                     --add-category X-Fedora\
-                     --add-category Network\
-                     --delete-original\
-                     $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop
-
-# icon
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s ../icons/hicolor/48x48/apps/psi.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%name.png
+       --dir $RPM_BUILD_ROOT%{_datadir}/applications\
+       --add-category Application\
+       --add-category X-Fedora\
+       --delete-original\
+       $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files
 %defattr(0644,root,root,0755)
+# Needed by psi for the help dialog
 #%doc README COPYING libpsi/iconset/ICONSET-HOWTO
 %attr(0755,root,root) %{_bindir}/psi
 %{_datadir}/%{name}
 %_datadir/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/%name.png
-%{_datadir}/pixmaps/%name.png
 %exclude %{_datadir}/%{name}/*.qm
 %exclude %{_datadir}/%{name}/iconsets/*/*.jisp
 
@@ -230,6 +165,18 @@
 
 
 %changelog
+* Thu Nov 03 2005 Aurelien Bompard  0.10-0.2.test3
+- version 0.10 test3
+
+* Sat Oct 15 2005 Aurelien Bompard  0.10-0.2.test2
+- version 0.10 test2
+- drop patch 3 (applied upstream)
+- drop icon symlink (useless)
+
+* Thu Aug 25 2005 Aurelien Bompard  0.10-0.1.test1
+- version 0.10 test1
+- spec cleanups
+
 * Wed Jun  1 2005 Michael Schwendt  - 0.9.3-4
 - patch it for 64-bit/GCC 4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jan 2005 05:27:23 -0000	1.6
+++ sources	4 Dec 2005 23:23:56 -0000	1.7
@@ -1,35 +1,5 @@
-1689645b1e2bf181c6fc2d68f070cf0d  psi_ca.qm.bz2
-69f88fc4768d963bed4cd3ebfbb75a28  psi_cs.qm.bz2
-da61ff1ec70cf90357d78f6c81d0ad86  psi_el.qm.bz2
-c831c0924c363e8bac42aab577f6982d  psi_es.qm.bz2
-022996fd1f35f26a777f07d667071421  psi_it.qm.bz2
-3e1ac01eaf5451f1b1d0968b2f911983  psi_mk.qm.bz2
-8cc619e6752d6c4db5093eca5d458f0a  psi_se.qm.bz2
-d20f3bb530235a246bc2d92308089744  psi-0.9.3.tar.bz2
-52611e036dd0b7cb2ecadcf16eeb9632  psi_de.qm.bz2
-2e19193ebcfd59f80badf011714a2c82  psi_ee.qm.bz2
-2e19193ebcfd59f80badf011714a2c82  psi_et.qm.bz2
-74053f86b57bd74be4b2866dd02b730d  psi_fi.qm.bz2
-dd8f83f3c3fc1c20d094f6570acaad4b  psi_fr.qm.bz2
-a0cc2e82074a2be17c5ad0004747ac43  psi_nl.qm.bz2
-d3418d4383e47f37f7fedbbc9591db6c  psi_pl.qm.bz2
-5e701ee8f56b01c65f3097f5ba13f63c  psi_ru.qm.bz2
-784e291e51e4746b602e182ab9ec3ac2  psi_sk.qm.bz2
-a5570c823cfbe33ee602110b89cf4e16  psi_sw.qm.bz2
-38629928c813dc54fc04b38de5e6dcee  psi_zh.qm.bz2
-259f0351152852d8091b092440557bab  apple_ichat-1.0.jisp
-6d98db4a5fab3c5909a422d983ed336f  Chibi.jisp
-14f8bdbea1873b2972d56726c4c011cf  crystal_roster.jisp
-ee56b25a85ec3ddef64339e177f7028d  crystal_system.jisp
-a4aada51bbf57c17c2bfda5ba52717ec  gaduGaduG.jisp
-9d8b4be36909c235657d61698846aee1  icqG.jisp
-459d5feae7cf05210f10ffd8df9ac93f  KMess-Cartoon-1.0.jisp
-f1760382d3aea32199aeb7303493a9ea  kreativ_squareheads.jisp
-cbe6f581bf32a2cb56e8bf5871db639d  Ninja.jisp
-9ec2c600f390dc725e4793383ff50ec2  shinyicons.jisp
-099c70f9ca25623c89e3ba5b44af2e6d  tlen.pl-3.73.jisp
-6a3065d33b072e15decbfb3673028df6  trill-extra-smileys.jisp
-b743f3f65dfe526b6d730044031d5c78  trill-extra-symbols.jisp
-be98902383c572fd3cd6876a6940a73e  weather.jisp
-0a2ce25ab4506d563bf65da372c9f8f4  webmessenger.jisp
-747a785fdaae8dc5a5ee78a3253035ab  yahoo_messenger.jisp
+0310084bf278d59831e4cac863e9060e  emoticons-0.9.3.tar.gz
+6de947394d0e6a34dbf73694476ab129  psi-0.10-test3.tar.bz2
+57864bcb92feda6525cfade29f12c713  psi-lang-packs-0.9.3.tar.gz
+79ade28d67356a4bdd57c850cc2ed6c8  rostericons-0.9.3.tar.gz
+a359e33b1f2a8a80066771ebfbf4a916  systemicons-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec  5 04:53:23 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun,  4 Dec 2005 23:53:23 -0500
Subject: rpms/galeon/devel galeon.spec,1.13,1.14
Message-ID: <200512050453.jB54rr2u011898@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11878

Modified Files:
	galeon.spec 
Log Message:
- Fixed preun script, was removing schemas after update.
- Removed galeon-config-tool. Now using well-known Fedora scriptlets.
- Added scripts Requires



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- galeon.spec	30 Nov 2005 07:49:13 -0000	1.13
+++ galeon.spec	5 Dec 2005 04:53:20 -0000	1.14
@@ -1,13 +1,12 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-Requires:	scrollkeeper
 Requires:	mozilla = 37:1.7.12
 BuildRequires:	gettext mozilla-nspr-devel desktop-file-utils
 BuildRequires:	gtk2-devel >= 2.4.0
@@ -19,6 +18,13 @@
 %ifarch x86_64
 BuildRequires:  autoconf automake libtool intltool
 %endif
+Requires(post):   desktop-file-utils
+Requires(postun): desktop-file-utils
+Requires(pre):    GConf2
+Requires(post):   GConf2
+Requires(preun):  GConf2
+Requires(post):   scrollkeeper
+Requires(postun): scrollkeeper
 
 %description
 Galeon is a web browser built around Gecko (Mozilla's rendering
@@ -38,7 +44,8 @@
 %build
 %configure \
 	--disable-nautilus-view			\
-	--disable-werror
+	--disable-werror                        \
+	--disable-schemas-install
 make %{?_smp_mflags}
 
 
@@ -47,6 +54,7 @@
 
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/galeon.desktop
+rm -f $RPM_BUILD_ROOT%{_bindir}/galeon-config-tool
 # Overriding galeon *bluecurve* icon
 perl -pi -e 's|Icon=.+|Icon=%{_datadir}/pixmaps/galeon.png|g' galeon.desktop
 desktop-file-install --vendor fedora \
@@ -63,23 +71,26 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
-%{_bindir}/galeon-config-tool --fix-gconf-permissions
-%{_bindir}/galeon-config-tool --pkg-install-schemas
-scrollkeeper-update||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+update-desktop-database > /dev/null 2>&1 || :
+
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/galeon.schemas > /dev/null || :
+killall -HUP gconfd-2 || :
 
 %preun
-if [ "$1" = "1" ] ; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule \
-        %{_sysconfdir}/gconf/schemas/galeon.schemas >/dev/null
-fi||:
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/galeon.schemas > /dev/null || :
+    killall -HUP gconfd-2 || :
+fi
 
 %postun
-scrollkeeper-update||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+scrollkeeper-update -q || :
+update-desktop-database > /dev/null 2>&1 || :
 
 
 %files -f galeon-2.0.lang
@@ -88,7 +99,6 @@
 %config %{_sysconfdir}/gconf/schemas/galeon.schemas
 %config %{_sysconfdir}/sound/events/galeon.soundlist
 %{_bindir}/galeon
-%{_bindir}/galeon-config-tool
 %{_mandir}/man1/galeon.1*
 %{_datadir}/galeon
 %{_datadir}/gnome/help/galeon
@@ -103,6 +113,11 @@
 
 
 %changelog
+* Sun Dec  4 2005 Denis Leroy  - 2.0.0-2
+- Fixed preun script, was removing schemas after update.
+- Removed galeon-config-tool. Now using well-known Fedora scriptlets.
+- Added scripts Requires
+
 * Mon Nov 28 2005 Denis Leroy  - 2.0.0-1
 - Update to 2.0.0
 



From fedora-extras-commits at redhat.com  Mon Dec  5 11:28:48 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  5 Dec 2005 06:28:48 -0500
Subject: rpms/xemacs/devel xemacs-21.4.18-utf8-fonts.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xemacs.spec, 1.16,
	1.17 xemacs-21-cursor.patch, 1.1,
	NONE xemacs-21.4.17-innerbuf.patch, 1.1,
	NONE xemacs-21.4.17-utf8-fonts.patch, 1.2, NONE
Message-ID: <200512051129.jB5BTIba024340@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24307

Modified Files:
	.cvsignore sources xemacs.spec 
Added Files:
	xemacs-21.4.18-utf8-fonts.patch 
Removed Files:
	xemacs-21-cursor.patch xemacs-21.4.17-innerbuf.patch 
	xemacs-21.4.17-utf8-fonts.patch 
Log Message:
* Sun Dec  4 2005 Ville Skytt??  - 21.4.18-2
- 21.4.18, innerbuf and cursor patches applied upstream.


xemacs-21.4.18-utf8-fonts.patch:

--- NEW FILE xemacs-21.4.18-utf8-fonts.patch ---
--- xemacs-21.4.18/etc/Emacs.ad~	2002-12-12 08:21:12.000000000 +0200
+++ xemacs-21.4.18/etc/Emacs.ad	2005-12-04 18:07:07.000000000 +0200
@@ -198,20 +198,22 @@
 ! *menubar*FontSet:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
 !			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0
 !
-*menubar*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-*popup*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
+*menubar*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
+*popup*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
 *menubar*FontSet:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
 			-*-*-*-*-*-*-*-120-*-iso10646-1, \
 			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
-			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0
+			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \
+			-*-*-*-*-*-*-*-120-*-*-*
 *popup*FontSet:		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
 			-*-*-*-*-*-*-*-120-*-iso10646-1, \
 			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
-			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0
+			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \
+			-*-*-*-*-*-*-*-120-*-*-*
 
 ! Gui elements share this font
 !
-Emacs.gui-element.attributeFont:  -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+Emacs.gui-element.attributeFont:  -*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
 
 ! Font in the Motif dialog boxes.
 ! (Motif uses `fontList' while most other things use `font' - if you don't
@@ -227,7 +229,7 @@
 ! Some people use 12-point anyway because you get more text, but
 ! there's no purpose at all in doing this for dialog boxes.
 
-*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*
+*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-*
 
 ! Dialog box translations.
 ! =======================


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Mar 2005 22:11:36 -0000	1.2
+++ .cvsignore	5 Dec 2005 11:28:45 -0000	1.3
@@ -1 +1 @@
-xemacs-21.4.17.tar.bz2
+xemacs-21.4.18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Mar 2005 22:11:36 -0000	1.2
+++ sources	5 Dec 2005 11:28:45 -0000	1.3
@@ -1 +1 @@
-a207e106138c085711160855d78b72a2  xemacs-21.4.17.tar.bz2
+08c99ff915564a122a3a44df2264669c  xemacs-21.4.18.tar.bz2


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xemacs.spec	1 Dec 2005 10:05:26 -0000	1.16
+++ xemacs.spec	5 Dec 2005 11:28:45 -0000	1.17
@@ -7,8 +7,8 @@
 %define exectop %{_libdir}/xemacs-%{version}
 
 Name:           xemacs
-Version:        21.4.17
-Release:        7%{?dist}
+Version:        21.4.18
+Release:        2%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -22,16 +22,14 @@
 Source22:       delprevline.py
 Source23:       dotxemacs-init.el
 Source24:       default.el
-Patch0:         xemacs-21.4.17-innerbuf.patch
 Patch1:         xemacs-21.4.17-x-paths.patch
-Patch5:         xemacs-21-cursor.patch
 Patch10:        xemacs-21.4.10-find-paths-pkgdir.patch
 Patch11:        movemail-mktemp.patch
 Patch14:        menubar-games.patch
 Patch15:        xemacs-21.4.12-find-paths-libexec-lib64.patch
 Patch16:        xemacs-21.4.12-mk-nochk-features.patch
 Patch18:        xemacs-21.4.13-dump-paths-lispdir.patch
-Patch19:        xemacs-21.4.17-utf8-fonts.patch
+Patch19:        xemacs-21.4.18-utf8-fonts.patch
 Patch21:        xemacs-debian-docdir-dump.patch
 Patch23:        xemacs-no-expdyn-ia64-106744.patch
 Patch24:        xemacs-21.4.15-wnnfix-128362.patch
@@ -40,6 +38,7 @@
 BuildRequires:  autoconf213
 BuildRequires:  python
 BuildRequires:  sed >= 3.95
+BuildRequires:  texinfo
 BuildRequires:  ncurses-devel
 BuildRequires:  gpm-devel
 BuildRequires:  pam-devel
@@ -152,7 +151,6 @@
 
 %patch1 -p1
 # make find-paths.el look in datadir
-rm lisp/find-paths.elc
 %patch10 -p1
 # fix "libexec" on multilib
 %ifarch x86_64 s390x
@@ -162,13 +160,10 @@
 %patch14 -p1
 # make lisp dir and mule-lisp dir be the source lisp dirs (not in datadir)
 %patch18 -p1
-rm lisp/dump-paths.elc
 sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el
 
 ## non-lisp patches ##
 
-%patch0 -p1 -b .innerbuf
-%patch5 -p1 -b .cursor
 # movemail
 %patch11 -p1 -b .mkstemp
 # skip redundant check-features
@@ -450,6 +445,9 @@
 
 
 %changelog
+* Sun Dec  4 2005 Ville Skytt??  - 21.4.18-2
+- 21.4.18, innerbuf and cursor patches applied upstream.
+
 * Wed Nov 30 2005 Ville Skytt??  - 21.4.17-7
 - Require ISO-8859-1 fonts (Alexandre Oliva, #174617).
 - Make popup dialog font the intended one even without ISO-8859 fonts.


--- xemacs-21-cursor.patch DELETED ---


--- xemacs-21.4.17-innerbuf.patch DELETED ---


--- xemacs-21.4.17-utf8-fonts.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Dec  5 12:49:35 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon,  5 Dec 2005 07:49:35 -0500
Subject: rpms/krecipes/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200512051250.jB5Co5uY026200@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26181

Modified Files:
	.cvsignore sources 
Log Message:
Upload new patch



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Dec 2005 22:44:54 -0000	1.5
+++ .cvsignore	5 Dec 2005 12:49:33 -0000	1.6
@@ -1 +1,2 @@
 krecipes-0.9.1.tar.gz
+krecipes-X11.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Dec 2005 22:44:54 -0000	1.5
+++ sources	5 Dec 2005 12:49:33 -0000	1.6
@@ -1 +1,2 @@
 7414fd5210561801ba04ee3dad6561d9  krecipes-0.9.1.tar.gz
+67e68fc70f7ff67235a7a36affa7af6d  krecipes-X11.patch



From fedora-extras-commits at redhat.com  Mon Dec  5 12:53:56 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon,  5 Dec 2005 07:53:56 -0500
Subject: rpms/krecipes/devel krecipes.spec,1.8,1.9
Message-ID: <200512051254.jB5CsRS9026255@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26238

Modified Files:
	krecipes.spec 
Log Message:
Update build because i tagged and didnt have patch uploaded



Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/krecipes.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- krecipes.spec	4 Dec 2005 22:44:54 -0000	1.8
+++ krecipes.spec	5 Dec 2005 12:53:54 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           krecipes
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
@@ -86,6 +86,8 @@
 %{_datadir}/mimelnk/*/*.desktop
 
 %changelog
+* Mon Dec 05 2005 Dennis Gilmore  - 0.9.1-2
+- retag because patch wasnt uploaded
 * Sun Dec 04 2005 Dennis Gilmore  - 0.9.1-1
 - update to 0.9.1  this fixes a bug in mysql database creation
 * Sat Dec 03 2005 Dennis Gilmore  - 0.9-3



From fedora-extras-commits at redhat.com  Mon Dec  5 13:40:18 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  5 Dec 2005 08:40:18 -0500
Subject: rpms/perl-Locale-Maketext-Lexicon/devel .cvsignore, 1.3,
	1.4 perl-Locale-Maketext-Lexicon.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200512051340.jB5Dem6Z028005@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27981

Modified Files:
	.cvsignore perl-Locale-Maketext-Lexicon.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Nov 2005 08:44:51 -0000	1.3
+++ .cvsignore	5 Dec 2005 13:40:16 -0000	1.4
@@ -1 +1 @@
-Locale-Maketext-Lexicon-0.50.tar.gz
+Locale-Maketext-Lexicon-0.53.tar.gz


Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Locale-Maketext-Lexicon.spec	13 Nov 2005 08:44:51 -0000	1.3
+++ perl-Locale-Maketext-Lexicon.spec	5 Dec 2005 13:40:16 -0000	1.4
@@ -1,5 +1,5 @@
 Name: 		perl-Locale-Maketext-Lexicon
-Version: 	0.50
+Version: 	0.53
 Release: 	1%{?dist}
 Summary: 	Extract translatable strings from source
 License:	GPL or Artistic
@@ -55,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Dec 05 2005 Ralf Corsepius  - 0.53-1
+- Upstream update.
+
 * Sun Nov 13 2005 Ralf Corsepius  - 0.50-1
 - Upsteam update.
 - Add docs to %%doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Nov 2005 08:44:51 -0000	1.3
+++ sources	5 Dec 2005 13:40:16 -0000	1.4
@@ -1 +1 @@
-6e387db5b65bcd59b8335ff1e6910d55  Locale-Maketext-Lexicon-0.50.tar.gz
+c1bce07646a0d9bcd8a56a60235b63ec  Locale-Maketext-Lexicon-0.53.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec  5 13:43:55 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  5 Dec 2005 08:43:55 -0500
Subject: rpms/perl-Locale-Maketext-Lexicon/devel
	perl-Locale-Maketext-Lexicon.spec, 1.4, 1.5
Message-ID: <200512051344.jB5DiQDq028069@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28052

Modified Files:
	perl-Locale-Maketext-Lexicon.spec 
Log Message:
Fix typo.


Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Locale-Maketext-Lexicon.spec	5 Dec 2005 13:40:16 -0000	1.4
+++ perl-Locale-Maketext-Lexicon.spec	5 Dec 2005 13:43:53 -0000	1.5
@@ -55,7 +55,7 @@
 %{_mandir}/man3/*
 
 %changelog
-* Sun Dec 05 2005 Ralf Corsepius  - 0.53-1
+* Mon Dec 05 2005 Ralf Corsepius  - 0.53-1
 - Upstream update.
 
 * Sun Nov 13 2005 Ralf Corsepius  - 0.50-1



From fedora-extras-commits at redhat.com  Mon Dec  5 14:04:21 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  5 Dec 2005 09:04:21 -0500
Subject: rpms/perl-Locale-Maketext-Lexicon/FC-4 .cvsignore, 1.3,
	1.4 perl-Locale-Maketext-Lexicon.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200512051404.jB5E4pXJ029714@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29693

Modified Files:
	.cvsignore perl-Locale-Maketext-Lexicon.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Nov 2005 08:49:10 -0000	1.3
+++ .cvsignore	5 Dec 2005 14:03:58 -0000	1.4
@@ -1 +1 @@
-Locale-Maketext-Lexicon-0.50.tar.gz
+Locale-Maketext-Lexicon-0.53.tar.gz


Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Locale-Maketext-Lexicon.spec	13 Nov 2005 08:49:10 -0000	1.3
+++ perl-Locale-Maketext-Lexicon.spec	5 Dec 2005 14:03:58 -0000	1.4
@@ -1,5 +1,5 @@
 Name: 		perl-Locale-Maketext-Lexicon
-Version: 	0.50
+Version: 	0.53
 Release: 	1%{?dist}
 Summary: 	Extract translatable strings from source
 License:	GPL or Artistic
@@ -55,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec 05 2005 Ralf Corsepius  - 0.53-1
+- Upstream update.
+
 * Sun Nov 13 2005 Ralf Corsepius  - 0.50-1
 - Upsteam update.
 - Add docs to %%doc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Nov 2005 08:49:10 -0000	1.3
+++ sources	5 Dec 2005 14:03:58 -0000	1.4
@@ -1 +1 @@
-6e387db5b65bcd59b8335ff1e6910d55  Locale-Maketext-Lexicon-0.50.tar.gz
+c1bce07646a0d9bcd8a56a60235b63ec  Locale-Maketext-Lexicon-0.53.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec  5 14:16:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  5 Dec 2005 09:16:45 -0500
Subject: rpms/perl-DBIx-SearchBuilder/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4
Message-ID: <200512051417.jB5EHF5O029862@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29843

Modified Files:
	.cvsignore sources 
Log Message:
Remove 1.35


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2005 06:48:44 -0000	1.3
+++ .cvsignore	5 Dec 2005 14:16:43 -0000	1.4
@@ -1,3 +1,3 @@
 DBIx-SearchBuilder-1.27.tar.gz
 DBIx-SearchBuilder-1.33.tar.gz
-DBIx-SearchBuilder-1.35.tar.gz
+DBIx-SearchBuilder-1.36.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2005 06:48:44 -0000	1.3
+++ sources	5 Dec 2005 14:16:43 -0000	1.4
@@ -1,3 +1,3 @@
 b3bc442e5e447e8a02417c417cff7371  DBIx-SearchBuilder-1.27.tar.gz
 f9a11fe46b311d783a53d3c04a3d9246  DBIx-SearchBuilder-1.33.tar.gz
-16d8a5a722426f261b7384a0c5afc246  DBIx-SearchBuilder-1.35.tar.gz
+bef0e6a1affb4ad79bcf52205ca793a3  DBIx-SearchBuilder-1.36.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec  5 14:33:00 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  5 Dec 2005 09:33:00 -0500
Subject: rpms/perl-DBIx-DBSchema/devel .cvsignore, 1.2,
	1.3 perl-DBIx-DBSchema.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512051433.jB5EXVNk031012@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30945

Modified Files:
	.cvsignore perl-DBIx-DBSchema.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Nov 2005 07:24:42 -0000	1.2
+++ .cvsignore	5 Dec 2005 14:32:58 -0000	1.3
@@ -1 +1 @@
-DBIx-DBSchema-0.27.tar.gz
+DBIx-DBSchema-0.28.tar.gz


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/devel/perl-DBIx-DBSchema.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-DBIx-DBSchema.spec	6 Nov 2005 07:28:52 -0000	1.2
+++ perl-DBIx-DBSchema.spec	5 Dec 2005 14:32:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-DBSchema
-Version:        0.27
-Release:        2%{?dist}
+Version:        0.28
+Release:        1%{?dist}
 Summary:        Database-independent schema objects
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Mon Dec 05 2005  Ralf Cors??pius  - 0.28-1
+- Upstream update.
+
 * Sun Nov 06 2005  Ralf Cors??pius  - 0.27-2
 - Change URL (PR #170384, Paul Howard).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Nov 2005 07:24:42 -0000	1.2
+++ sources	5 Dec 2005 14:32:58 -0000	1.3
@@ -1 +1 @@
-9a609e0c227192373672d03dffb859f0  DBIx-DBSchema-0.27.tar.gz
+5f7486e3c6ffc2191f9b1bd3b1ea7053  DBIx-DBSchema-0.28.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec  5 14:37:51 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  5 Dec 2005 09:37:51 -0500
Subject: rpms/perl-DBIx-DBSchema/FC-4 .cvsignore, 1.2,
	1.3 perl-DBIx-DBSchema.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512051438.jB5EcLBu031491@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31424

Modified Files:
	.cvsignore perl-DBIx-DBSchema.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Nov 2005 07:24:42 -0000	1.2
+++ .cvsignore	5 Dec 2005 14:37:49 -0000	1.3
@@ -1 +1 @@
-DBIx-DBSchema-0.27.tar.gz
+DBIx-DBSchema-0.28.tar.gz


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4/perl-DBIx-DBSchema.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-DBIx-DBSchema.spec	6 Nov 2005 07:28:52 -0000	1.2
+++ perl-DBIx-DBSchema.spec	5 Dec 2005 14:37:49 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-DBSchema
-Version:        0.27
-Release:        2%{?dist}
+Version:        0.28
+Release:        1%{?dist}
 Summary:        Database-independent schema objects
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Mon Dec 05 2005  Ralf Cors??pius  - 0.28-1
+- Upstream update.
+
 * Sun Nov 06 2005  Ralf Cors??pius  - 0.27-2
 - Change URL (PR #170384, Paul Howard).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Nov 2005 07:24:42 -0000	1.2
+++ sources	5 Dec 2005 14:37:49 -0000	1.3
@@ -1 +1 @@
-9a609e0c227192373672d03dffb859f0  DBIx-DBSchema-0.27.tar.gz
+5f7486e3c6ffc2191f9b1bd3b1ea7053  DBIx-DBSchema-0.28.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec  5 14:44:42 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  5 Dec 2005 09:44:42 -0500
Subject: rpms/gnupg2/FC-4 gnupg2.spec,1.14,1.15
Message-ID: <200512051445.jB5EjC4w031713@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31694

Modified Files:
	gnupg2.spec 
Log Message:
* Thu Dec 01 2005 Rex Dieter  1.9.19-8
- include gpg-agent-(startup|shutdown) scripts (#136533)
- BR: libksba-devel >= 1.9.12 
- %check: be permissive about failures (for now)



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-4/gnupg2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnupg2.spec	31 Oct 2005 16:20:45 -0000	1.14
+++ gnupg2.spec	5 Dec 2005 14:44:40 -0000	1.15
@@ -7,13 +7,19 @@
 Summary: GNU utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.19
-Release: 2%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# omit broken x86_64 build 
+# ExcludeArch: x86_64 
+
+# enable auto-startup/shutdown of gpg-agent
+Source10: gpg-agent-startup.sh
+Source11: gpg-agent-shutdown.sh
 
 Patch1: gnupg-1.9.18-lvalue.patch
 Patch2: gnupg-1.9.16-testverbose.patch
@@ -26,12 +32,12 @@
 BuildRequires: libassuan-devel >= 0.6.10
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.0
-%ifarch x86_64
-# Hard-code libksba-0.9.11 for now (x86_64 issues)
-BuildRequires: libksba-devel = 0.9.11
-%else
-BuildRequires: libksba-devel >= 0.9.11
-%endif
+#ifarch x86_64
+# Hard-code libksba-0.9.11 for now (x86_64 'make check' fails)
+#BuildRequires: libksba-devel = 0.9.11
+#else
+BuildRequires: libksba-devel >= 0.9.12
+#endif
 
 BuildRequires: gettext
 BuildRequires: openldap-devel
@@ -44,7 +50,6 @@
 
 Requires: pinentry >= 0.7.1
 
-# Should these be versioned?  -- Rex
 Provides: gpg
 Provides: openpgp
 
@@ -69,20 +74,15 @@
 %patch1 -p1 -b .lvalue
 %patch2 -p1 -b .testverbose
 
-
-#ifarch x86_64
-sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac
-sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure
-#endif
+%ifarch x86_64
+sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
+%endif
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
 
 %build
 
-%{!?_without_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS}
-%{!?_without_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG}
-
 %configure \
   --disable-dependency-tracking \
   --disable-rpath \
@@ -91,8 +91,11 @@
 make %{?_smp_mflags}
 
 
-%check || :
-make check
+%check ||:
+## Allows for better debugability (doesn't work, fixme)
+# echo "debug-allow-core-dumps" >> tests/gpgsm.conf
+# (sometimes?) expect one failure (reported upstream)
+#make check ||:
 
 
 %install
@@ -100,6 +103,11 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# enable auto-startup/shutdown of gpg-agent 
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
+install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/env/
+install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{_prefix}/shutdown/
+
 %find_lang %{name}
 
 ## Unpackaged files
@@ -122,7 +130,6 @@
 #attr(4755,root,root) %{_bindir}/gpg2
 %{_bindir}/gpg2
 %{_bindir}/gpgv2
-%{_datadir}/gnupg
 %{_bindir}/gpg-connect-agent
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
@@ -132,9 +139,13 @@
 %{_bindir}/scdaemon
 %{_bindir}/watchgnupg
 %{_sbindir}/*
-%{_libdir}/gnupg
+%{_datadir}/gnupg/
+%{_libdir}/gnupg/
 %{_libexecdir}/*
 %{_infodir}/*
+# Own dirs until someone else does (filesystem,kdebase?)
+%{_prefix}/env/
+%{_prefix}/shutdown/
 
 
 %clean
@@ -142,22 +153,30 @@
 
 
 %changelog
-* Tue Oct 11 2005 Rex Dieter  - 1.9.19-2
+* Thu Dec 01 2005 Rex Dieter  1.9.19-8
+- include gpg-agent-(startup|shutdown) scripts (#136533)
+- BR: libksba-devel >= 1.9.12 
+- %%check: be permissive about failures (for now)
+
+* Wed Nov 30 2005 Rex Dieter  1.9.19-3
+- BR: libksba-devel >= 1.9.13
+
+* Tue Oct 11 2005 Rex Dieter  1.9.19-2
 - back to BR: libksba-devel = 1.9.11
 
-* Tue Oct 11 2005 Rex Dieter  - 1.9.19-1
+* Tue Oct 11 2005 Rex Dieter  1.9.19-1
 - 1.9.19
 
-* Fri Aug 26 2005 Rex Dieter  - 1.9.18-9
+* Fri Aug 26 2005 Rex Dieter  1.9.18-9
 - configure: NEED_KSBA_VERSION=0.9.12 -> 0.9.11
 
-* Fri Aug 26 2005 Rex Dieter  - 1.9.18-7
+* Fri Aug 26 2005 Rex Dieter  1.9.18-7
 - re-enable 'make check', rebuild against (older) libksba-0.9.11
 
-* Tue Aug  9 2005 Rex Dieter  - 1.9.18-6
+* Tue Aug  9 2005 Rex Dieter  1.9.18-6
 - don't 'make check' by default (regular builds pass, but FC4/5+plague fails)
 
-* Mon Aug  8 2005 Rex Dieter  - 1.9.18-5
+* Mon Aug  8 2005 Rex Dieter  1.9.18-5
 - 1.9.18
 - drop pth patch (--enable-gpg build fixed)
 - update description (from README)



From fedora-extras-commits at redhat.com  Mon Dec  5 14:46:54 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  5 Dec 2005 09:46:54 -0500
Subject: rpms/gnupg2/FC-4 gpg-agent-shutdown.sh, NONE,
	1.1 gpg-agent-startup.sh, NONE, 1.1
Message-ID: <200512051446.jB5Eks1s031742@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31730

Added Files:
	gpg-agent-shutdown.sh gpg-agent-startup.sh 
Log Message:
import gpg-agent scripts



***** Error reading new file: [Errno 2] No such file or directory: 'gpg-agent-shutdown.sh'

***** Error reading new file: [Errno 2] No such file or directory: 'gpg-agent-startup.sh'



From fedora-extras-commits at redhat.com  Mon Dec  5 14:48:14 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  5 Dec 2005 09:48:14 -0500
Subject: rpms/libksba/FC-4 .cvsignore, 1.6, 1.7 libksba.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <200512051448.jB5EmiwC031818@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libksba/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31763

Modified Files:
	.cvsignore libksba.spec sources 
Log Message:
* Wed Nov 30 2005 Rex Dieter  0.9.13-2
- remove hacks
- drop self Obsoletes
- 0.9.13



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libksba/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Aug 2005 20:52:51 -0000	1.6
+++ .cvsignore	5 Dec 2005 14:48:12 -0000	1.7
@@ -1,2 +1,2 @@
-libksba-0.9.12.tar.bz2
-libksba-0.9.12.tar.bz2.sig
+libksba-0.9.13.tar.bz2
+libksba-0.9.13.tar.bz2.sig


Index: libksba.spec
===================================================================
RCS file: /cvs/extras/rpms/libksba/FC-4/libksba.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libksba.spec	8 Aug 2005 20:12:05 -0000	1.11
+++ libksba.spec	5 Dec 2005 14:48:12 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: X.509 library
 Name:    libksba
-Version: 0.9.12
-Release: 1%{?dist}
+Version: 0.9.13
+Release: 2%{?dist}
 License: GPL
 Group:   System Environment/Libraries
 URL:     http://www.gnupg.org/
@@ -17,8 +17,8 @@
 CMS protocols.
 
 %package devel
-Summary:  Development headers and libraries for %{name}
-Group:    Development/Libraries
+Summary: Development headers and libraries for %{name}
+Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -38,7 +38,7 @@
 make %{?_smp_mflags}
 
 
-%check || :
+%check ||:
 make check
 
 
@@ -75,7 +75,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/*
+%{_bindir}/*-config
 %{_libdir}/lib*.so
 %{_includedir}/*
 %{_datadir}/aclocal/*
@@ -83,6 +83,20 @@
 
 
 %changelog
+* Wed Nov 30 2005 Rex Dieter  0.9.13-2
+- remove hacks
+- drop self Obsoletes
+
+* Wed Nov 30 2005 Rex Dieter  0.9.13-1
+- 0.9.13
+
+* Fri Aug 26 2005 Rex Dieter  0.9.11-3
+- botched Obsoletes good, let's try again.
+
+* Fri Aug 26 2005 Rex Dieter  0.9.11-2
+- revert to 0.9.11 (0.9.12 makes gnupg2 fail on x86_64) using Obsoletes
+  to avoid Epoch or other ugly means.
+
 * Mon Aug  8 2005 Rex Dieter  0.9.12-1
 - 0.9.12
 - --disable-static


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libksba/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Aug 2005 20:52:51 -0000	1.6
+++ sources	5 Dec 2005 14:48:12 -0000	1.7
@@ -1,2 +1,2 @@
-4d40a09134c5a0d2dcc6416f9abdcc98  libksba-0.9.12.tar.bz2
-9465c78bcdac0ea609cf37c2275a54af  libksba-0.9.12.tar.bz2.sig
+102154db88898d71e9f51b4e149e811c  libksba-0.9.13.tar.bz2
+3964fe9798ff1636de60c27ea042e340  libksba-0.9.13.tar.bz2.sig



From fedora-extras-commits at redhat.com  Mon Dec  5 14:49:35 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  5 Dec 2005 09:49:35 -0500
Subject: rpms/libksba/FC-3 .cvsignore, 1.5, 1.6 libksba.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200512051450.jB5Eo5bw031859@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libksba/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31838/FC-3

Modified Files:
	.cvsignore libksba.spec sources 
Log Message:
* Wed Nov 30 2005 Rex Dieter  0.9.13-2
- remove hacks
- drop self Obsoletes
- 0.9.13



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libksba/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Aug 2005 20:53:35 -0000	1.5
+++ .cvsignore	5 Dec 2005 14:49:33 -0000	1.6
@@ -1,2 +1,2 @@
-libksba-0.9.12.tar.bz2
-libksba-0.9.12.tar.bz2.sig
+libksba-0.9.13.tar.bz2
+libksba-0.9.13.tar.bz2.sig


Index: libksba.spec
===================================================================
RCS file: /cvs/extras/rpms/libksba/FC-3/libksba.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libksba.spec	8 Aug 2005 20:10:38 -0000	1.7
+++ libksba.spec	5 Dec 2005 14:49:33 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: X.509 library
 Name:    libksba
-Version: 0.9.12
-Release: 1%{?dist}
+Version: 0.9.13
+Release: 2%{?dist}
 License: GPL
 Group:   System Environment/Libraries
 URL:     http://www.gnupg.org/
@@ -17,8 +17,8 @@
 CMS protocols.
 
 %package devel
-Summary:  Development headers and libraries for %{name}
-Group:    Development/Libraries
+Summary: Development headers and libraries for %{name}
+Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -38,7 +38,7 @@
 make %{?_smp_mflags}
 
 
-%check || :
+%check ||:
 make check
 
 
@@ -75,7 +75,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/*
+%{_bindir}/*-config
 %{_libdir}/lib*.so
 %{_includedir}/*
 %{_datadir}/aclocal/*
@@ -83,6 +83,20 @@
 
 
 %changelog
+* Wed Nov 30 2005 Rex Dieter  0.9.13-2
+- remove hacks
+- drop self Obsoletes
+
+* Wed Nov 30 2005 Rex Dieter  0.9.13-1
+- 0.9.13
+
+* Fri Aug 26 2005 Rex Dieter  0.9.11-3
+- botched Obsoletes good, let's try again.
+
+* Fri Aug 26 2005 Rex Dieter  0.9.11-2
+- revert to 0.9.11 (0.9.12 makes gnupg2 fail on x86_64) using Obsoletes
+  to avoid Epoch or other ugly means.
+
 * Mon Aug  8 2005 Rex Dieter  0.9.12-1
 - 0.9.12
 - --disable-static


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libksba/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Aug 2005 20:53:35 -0000	1.5
+++ sources	5 Dec 2005 14:49:33 -0000	1.6
@@ -1,2 +1,2 @@
-4d40a09134c5a0d2dcc6416f9abdcc98  libksba-0.9.12.tar.bz2
-9465c78bcdac0ea609cf37c2275a54af  libksba-0.9.12.tar.bz2.sig
+102154db88898d71e9f51b4e149e811c  libksba-0.9.13.tar.bz2
+3964fe9798ff1636de60c27ea042e340  libksba-0.9.13.tar.bz2.sig



From fedora-extras-commits at redhat.com  Mon Dec  5 14:59:41 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  5 Dec 2005 09:59:41 -0500
Subject: rpms/sbcl/devel sbcl-0.9.6-permissive.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 sbcl.spec, 1.30, 1.31 sources, 1.6, 1.7
Message-ID: <200512051500.jB5F0CoQ032039@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32006

Modified Files:
	.cvsignore sbcl.spec sources 
Added Files:
	sbcl-0.9.6-permissive.patch 
Log Message:
* Mon Nov 28 2005 Rex Dieter  0.9.7-1
- 0.9.7


sbcl-0.9.6-permissive.patch:

--- NEW FILE sbcl-0.9.6-permissive.patch ---
--- sbcl-0.9.6/make-target-contrib.sh.permissive	2005-09-21 10:00:33.000000000 -0500
+++ sbcl-0.9.6/make-target-contrib.sh	2005-10-27 15:02:04.000000000 -0500
@@ -51,7 +51,7 @@
 for i in contrib/*; do
     test -d $i && test -f $i/Makefile || continue;
     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
-    test -f $i/test-passed && rm $i/test-passed 
+    # test -f $i/test-passed && rm $i/test-passed 
     $GNUMAKE -C $i test && touch $i/test-passed
 done
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Oct 2005 16:17:11 -0000	1.6
+++ .cvsignore	5 Dec 2005 14:59:39 -0000	1.7
@@ -3,3 +3,4 @@
 sbcl-0.9.5-source.tar.bz2
 sbcl-0.9.5-x86-linux-binary.tar.bz2
 sbcl-0.9.6-source.tar.bz2
+sbcl-0.9.7-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sbcl.spec	27 Oct 2005 18:46:20 -0000	1.30
+++ sbcl.spec	5 Dec 2005 14:59:39 -0000	1.31
@@ -5,12 +5,15 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define verbose 1 
+%define sbcl_verbose 1 
+
+# shell to use
+%define sbcl_shell /bin/bash -x
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.6
-Release: 4%{?dist}
+Version: 0.9.7
+Release: 1%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -62,6 +65,8 @@
 Patch4: sbcl-0.9.4-LIB_DIR.patch
 Patch5: sbcl-0.9.5-make-config-fix.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
+# Allow override of contrib test failure(s)
+Patch7: sbcl-0.9.6-permissive.patch
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -91,7 +96,8 @@
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
 %patch5 -p1 -b .make-config-fix
-%{?verbose:%patch6 -p1 -b .verbose-build}
+%{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
+%patch7 -p1 -b .permissive
 
 # Enable sb-thread
 %ifarch %{ix86} x86_64
@@ -107,7 +113,7 @@
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
 pushd sbcl-*-linux
-INSTALL_ROOT=`pwd`/../sbcl-bootstrap sh %{?verbose:-x} ./install.sh
+INSTALL_ROOT=`pwd`/../sbcl-bootstrap %{?sbcl_shell} ./install.sh
 popd
 %endif
 
@@ -129,11 +135,18 @@
 #%{__cc} -o my_setarch %{optflags} %{SOURCE100} 
 #define my_setarch ./my_setarch
 
+# WORKAROUND sb-posix STAT.2, STAT.4 test failures (fc3/fc4 only, fc5 passes?)
+# at least until a better solution is found
+# http://bugzilla.redhat.com/bugzilla/169506
+touch contrib/sb-posix/test-passed
+
 # trick contrib/ modules to use optflags too 
 export EXTRA_CFLAGS="$CFLAGS"
 export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
-%{?setarch} %{?my_setarch} sh %{?verbose:-x} ./make.sh %{?bootstrap}
+%{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap}
+
+
 
 # docs
 %if "%{?min_bootstrap}" == "%{nil}"
@@ -146,13 +159,13 @@
 # http://bugzilla.redhat.com/bugzilla/169506
 SB_POSIX=%{_libdir}/sbcl/sb-posix
 if [ ! -d $RPM_BUILD_ROOT${SB_POSIX} ]; then
-  echo "%SB_POSIX awol!"
+  echo "${SB_POSIX} awol!"
   exit 1
 fi
 pushd tests 
 # Only x86 builds are expected to pass all
 # Don't worry about thread.impure failure(s), threading is optional anyway.
-%{?setarch} sh ./run-tests.sh ||:
+%{?setarch} %{?sbcl_shell} ./run-tests.sh ||:
 popd
 
 
@@ -164,7 +177,7 @@
 unset SBCL_HOME 
 export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} 
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} 
-sh %{?verbose:-x} ./install.sh 
+%{?sbcl_shell} ./install.sh 
 
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
@@ -172,8 +185,8 @@
 # CVS crud 
 find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
 find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f
-# 'test-passed' files from %%check (leave these in, for now -- Rex)
-# find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
+# 'test-passed' files from %%check
+find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -vf
 
 
 %if "%{?min_bootstrap}" == "%{nil}"
@@ -213,6 +226,12 @@
 
 
 %changelog
+* Mon Nov 28 2005 Rex Dieter  0.9.7-1
+- 0.9.7
+
+* Thu Oct 27 2005 Rex Dieter  0.9.6-5
+- override (bogus/mock-induced) sb-posix test failure(s).
+
 * Thu Oct 27 2005 Rex Dieter  0.9.6-4
 - drop -D_FILE_OFFSET_BITS=64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Oct 2005 16:17:11 -0000	1.6
+++ sources	5 Dec 2005 14:59:39 -0000	1.7
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 67ec41e624a3f2ad7f6f3cde1bd001d3  sbcl-0.9.4-x86-64-linux-binary.tar.bz2
 cb01b462b517889723eeaf63b5474c70  sbcl-0.9.5-x86-linux-binary.tar.bz2
-5e94122e73bc59c1411ff93fee948bfb  sbcl-0.9.6-source.tar.bz2
+d5e5e4ae500f12b7523989222cb4cc88  sbcl-0.9.7-source.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec  5 15:16:55 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  5 Dec 2005 10:16:55 -0500
Subject: rpms/gnupg2/FC-3 gpg-agent-shutdown.sh, NONE,
	1.1 gpg-agent-startup.sh, NONE, 1.1 gnupg2.spec, 1.9, 1.10
Message-ID: <200512051517.jB5FHQYA001247@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1228

Modified Files:
	gnupg2.spec 
Added Files:
	gpg-agent-shutdown.sh gpg-agent-startup.sh 
Log Message:
* Thu Dec 01 2005 Rex Dieter  1.9.19-8
- include gpg-agent-(startup|shutdown) scripts (#136533)
- BR: libksba-devel >= 1.9.12 
- %check: be permissive about failures (for now)
- 1.9.19



***** Error reading new file: [Errno 2] No such file or directory: 'gpg-agent-shutdown.sh'

***** Error reading new file: [Errno 2] No such file or directory: 'gpg-agent-startup.sh'

Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/gnupg2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnupg2.spec	31 Oct 2005 16:22:47 -0000	1.9
+++ gnupg2.spec	5 Dec 2005 15:16:53 -0000	1.10
@@ -7,13 +7,19 @@
 Summary: GNU utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.19
-Release: 2%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# omit broken x86_64 build 
+# ExcludeArch: x86_64 
+
+# enable auto-startup/shutdown of gpg-agent
+Source10: gpg-agent-startup.sh
+Source11: gpg-agent-shutdown.sh
 
 Patch1: gnupg-1.9.18-lvalue.patch
 Patch2: gnupg-1.9.16-testverbose.patch
@@ -26,12 +32,12 @@
 BuildRequires: libassuan-devel >= 0.6.10
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.0
-%ifarch x86_64
-# Hard-code libksba-0.9.11 for now (x86_64 issues)
-BuildRequires: libksba-devel = 0.9.11
-%else
-BuildRequires: libksba-devel >= 0.9.11
-%endif
+#ifarch x86_64
+# Hard-code libksba-0.9.11 for now (x86_64 'make check' fails)
+#BuildRequires: libksba-devel = 0.9.11
+#else
+BuildRequires: libksba-devel >= 0.9.12
+#endif
 
 BuildRequires: gettext
 BuildRequires: openldap-devel
@@ -44,7 +50,6 @@
 
 Requires: pinentry >= 0.7.1
 
-# Should these be versioned?  -- Rex
 Provides: gpg
 Provides: openpgp
 
@@ -69,20 +74,15 @@
 %patch1 -p1 -b .lvalue
 %patch2 -p1 -b .testverbose
 
-
-#ifarch x86_64
-sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac
-sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure
-#endif
+%ifarch x86_64
+sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
+%endif
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
 
 %build
 
-%{!?_without_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS}
-%{!?_without_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG}
-
 %configure \
   --disable-dependency-tracking \
   --disable-rpath \
@@ -91,8 +91,11 @@
 make %{?_smp_mflags}
 
 
-%check || :
-make check
+%check ||:
+## Allows for better debugability (doesn't work, fixme)
+# echo "debug-allow-core-dumps" >> tests/gpgsm.conf
+# (sometimes?) expect one failure (reported upstream)
+#make check ||:
 
 
 %install
@@ -100,6 +103,11 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# enable auto-startup/shutdown of gpg-agent 
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
+install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/env/
+install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{_prefix}/shutdown/
+
 %find_lang %{name}
 
 ## Unpackaged files
@@ -122,7 +130,6 @@
 #attr(4755,root,root) %{_bindir}/gpg2
 %{_bindir}/gpg2
 %{_bindir}/gpgv2
-%{_datadir}/gnupg
 %{_bindir}/gpg-connect-agent
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
@@ -132,9 +139,13 @@
 %{_bindir}/scdaemon
 %{_bindir}/watchgnupg
 %{_sbindir}/*
-%{_libdir}/gnupg
+%{_datadir}/gnupg/
+%{_libdir}/gnupg/
 %{_libexecdir}/*
 %{_infodir}/*
+# Own dirs until someone else does (filesystem,kdebase?)
+%{_prefix}/env/
+%{_prefix}/shutdown/
 
 
 %clean
@@ -142,22 +153,30 @@
 
 
 %changelog
-* Tue Oct 11 2005 Rex Dieter  - 1.9.19-2
+* Thu Dec 01 2005 Rex Dieter  1.9.19-8
+- include gpg-agent-(startup|shutdown) scripts (#136533)
+- BR: libksba-devel >= 1.9.12 
+- %%check: be permissive about failures (for now)
+
+* Wed Nov 30 2005 Rex Dieter  1.9.19-3
+- BR: libksba-devel >= 1.9.13
+
+* Tue Oct 11 2005 Rex Dieter  1.9.19-2
 - back to BR: libksba-devel = 1.9.11
 
-* Tue Oct 11 2005 Rex Dieter  - 1.9.19-1
+* Tue Oct 11 2005 Rex Dieter  1.9.19-1
 - 1.9.19
 
-* Fri Aug 26 2005 Rex Dieter  - 1.9.18-9
+* Fri Aug 26 2005 Rex Dieter  1.9.18-9
 - configure: NEED_KSBA_VERSION=0.9.12 -> 0.9.11
 
-* Fri Aug 26 2005 Rex Dieter  - 1.9.18-7
+* Fri Aug 26 2005 Rex Dieter  1.9.18-7
 - re-enable 'make check', rebuild against (older) libksba-0.9.11
 
-* Tue Aug  9 2005 Rex Dieter  - 1.9.18-6
+* Tue Aug  9 2005 Rex Dieter  1.9.18-6
 - don't 'make check' by default (regular builds pass, but FC4/5+plague fails)
 
-* Mon Aug  8 2005 Rex Dieter  - 1.9.18-5
+* Mon Aug  8 2005 Rex Dieter  1.9.18-5
 - 1.9.18
 - drop pth patch (--enable-gpg build fixed)
 - update description (from README)



From fedora-extras-commits at redhat.com  Mon Dec  5 15:33:25 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  5 Dec 2005 10:33:25 -0500
Subject: rpms/sbcl/FC-4 .cvsignore, 1.5, 1.6 sbcl.spec, 1.29, 1.30 sources,
	1.5, 1.6
Message-ID: <200512051533.jB5FXt4V001333@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1312

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Mon Nov 28 2005 Rex Dieter  0.9.7-1
- 0.9.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Oct 2005 17:34:33 -0000	1.5
+++ .cvsignore	5 Dec 2005 15:33:23 -0000	1.6
@@ -3,3 +3,4 @@
 sbcl-0.9.5-source.tar.bz2
 sbcl-0.9.5-x86-linux-binary.tar.bz2
 sbcl-0.9.6-source.tar.bz2
+sbcl-0.9.7-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sbcl.spec	27 Oct 2005 20:14:29 -0000	1.29
+++ sbcl.spec	5 Dec 2005 15:33:23 -0000	1.30
@@ -5,12 +5,15 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define verbose 1 
+%define sbcl_verbose 1 
+
+# shell to use
+%define sbcl_shell /bin/bash -x
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.6
-Release: 5%{?dist}
+Version: 0.9.7
+Release: 1%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -93,7 +96,7 @@
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
 %patch5 -p1 -b .make-config-fix
-%{?verbose:%patch6 -p1 -b .verbose-build}
+%{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
 # Enable sb-thread
@@ -110,7 +113,7 @@
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
 pushd sbcl-*-linux
-INSTALL_ROOT=`pwd`/../sbcl-bootstrap sh %{?verbose:-x} ./install.sh
+INSTALL_ROOT=`pwd`/../sbcl-bootstrap %{?sbcl_shell} ./install.sh
 popd
 %endif
 
@@ -141,7 +144,7 @@
 export EXTRA_CFLAGS="$CFLAGS"
 export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
-%{?setarch} %{?my_setarch} sh %{?verbose:-x} ./make.sh %{?bootstrap}
+%{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap}
 
 
 
@@ -162,7 +165,7 @@
 pushd tests 
 # Only x86 builds are expected to pass all
 # Don't worry about thread.impure failure(s), threading is optional anyway.
-%{?setarch} sh ./run-tests.sh ||:
+%{?setarch} %{?sbcl_shell} ./run-tests.sh ||:
 popd
 
 
@@ -174,7 +177,7 @@
 unset SBCL_HOME 
 export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} 
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} 
-sh %{?verbose:-x} ./install.sh 
+%{?sbcl_shell} ./install.sh 
 
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
@@ -182,8 +185,8 @@
 # CVS crud 
 find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
 find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f
-# 'test-passed' files from %%check (leave these in, for now -- Rex)
-# find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
+# 'test-passed' files from %%check
+find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -vf
 
 
 %if "%{?min_bootstrap}" == "%{nil}"
@@ -223,8 +226,11 @@
 
 
 %changelog
+* Mon Nov 28 2005 Rex Dieter  0.9.7-1
+- 0.9.7
+
 * Thu Oct 27 2005 Rex Dieter  0.9.6-5
-- override friggen sb-posix test failure(s).
+- override (bogus/mock-induced) sb-posix test failure(s).
 
 * Thu Oct 27 2005 Rex Dieter  0.9.6-4
 - drop -D_FILE_OFFSET_BITS=64


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Oct 2005 17:34:33 -0000	1.5
+++ sources	5 Dec 2005 15:33:23 -0000	1.6
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 67ec41e624a3f2ad7f6f3cde1bd001d3  sbcl-0.9.4-x86-64-linux-binary.tar.bz2
 cb01b462b517889723eeaf63b5474c70  sbcl-0.9.5-x86-linux-binary.tar.bz2
-5e94122e73bc59c1411ff93fee948bfb  sbcl-0.9.6-source.tar.bz2
+d5e5e4ae500f12b7523989222cb4cc88  sbcl-0.9.7-source.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec  5 16:19:48 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  5 Dec 2005 11:19:48 -0500
Subject: common tobuild,1.2243,1.2244
Message-ID: <200512051620.jB5GKIBN003017@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3000

Modified Files:
	tobuild 
Log Message:
request build of rpms/gambas/FC-3 gambas-1_0_13-3_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2243
retrieving revision 1.2244
diff -u -r1.2243 -r1.2244
--- tobuild	4 Dec 2005 12:02:32 -0000	1.2243
+++ tobuild	5 Dec 2005 16:19:46 -0000	1.2244
@@ -54,3 +54,4 @@
 spot	rpms/gambas/FC-4	gambas-1_0_13-3_fc4	fc4
 spot	rpms/gambas/devel	gambas-1_0_13-3_fc5	devel
 pawsa	rpms/balsa/devel	balsa-2_3_7-1_fc5	devel
+spot	rpms/gambas/FC-3	gambas-1_0_13-3_fc3	fc3



From fedora-extras-commits at redhat.com  Mon Dec  5 17:17:34 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon,  5 Dec 2005 12:17:34 -0500
Subject: rpms/deskbar-applet/FC-3 deskbar-applet.spec,1.3,1.4
Message-ID: <200512051718.jB5HI5cH004838@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4821

Modified Files:
	deskbar-applet.spec 
Log Message:
Updated Source0 URL (#161670)


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/FC-3/deskbar-applet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- deskbar-applet.spec	19 Mar 2005 17:52:45 -0000	1.3
+++ deskbar-applet.spec	5 Dec 2005 17:17:32 -0000	1.4
@@ -1,11 +1,11 @@
 Name:           deskbar-applet
 Version:        0.2
-Release:        3
+Release:        4
 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://prdownloads.sourceforge.net/browserbookapp/deskbar-applet-0.2.tar.gz
+Source0:        http://dl.sourceforge.net/browserbookapp/deskbar-applet-0.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf
 BuildArch:      noarch
@@ -43,6 +43,9 @@
 %{_libdir}/bonobo/servers/DeskbarApplet.server
 
 %changelog
+* Mon Dec  5 2005 Ignacio Vazquez-Abrams  0.2-4
+- Updated Source0 URL (#161670)
+
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams  0.2-3
 - %%
 



From fedora-extras-commits at redhat.com  Mon Dec  5 17:27:07 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  5 Dec 2005 12:27:07 -0500
Subject: rpms/xemacs/devel xemacs.spec,1.17,1.18
Message-ID: <200512051727.jB5HRbiK004895@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4878

Modified Files:
	xemacs.spec 
Log Message:
* Mon Dec  5 2005 Ville Skytt?? 
- Fix typo in -info summary.
- Point to main man page for xemacs-nox.



Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xemacs.spec	5 Dec 2005 11:28:45 -0000	1.17
+++ xemacs.spec	5 Dec 2005 17:27:05 -0000	1.18
@@ -127,7 +127,7 @@
 interest when developing or debugging XEmacs itself.
 
 %package        info
-Summary:        XEmacs documemtation in GNU texinfo format
+Summary:        XEmacs documentation in GNU texinfo format
 Group:          Documentation
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -271,6 +271,8 @@
   mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \
   docdir=$RPM_BUILD_ROOT%{exectop}/doc/
 install -Dpm 644 etc/xemacs-ja.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/xemacs.1
+echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1
+echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/ja/man1/xemacs-nox.1
 
 # install nox files
 install -pm 755 src/xemacs-nox-%{version} $RPM_BUILD_ROOT%{_bindir}
@@ -432,8 +434,8 @@
 %{_mandir}/man1/etags.xemacs.1*
 %{_mandir}/man1/gnuattach.1*
 %{_mandir}/man1/gnudoit.1*
-%{_mandir}/man1/xemacs.1*
-%lang(ja) %{_mandir}/ja/man1/xemacs.1*
+%{_mandir}/man1/xemacs*.1*
+%lang(ja) %{_mandir}/ja/man1/xemacs*.1*
 %dir %{_localstatedir}/lock/xemacs/
 
 %files el -f el-files
@@ -445,6 +447,10 @@
 
 
 %changelog
+* Mon Dec  5 2005 Ville Skytt?? 
+- Fix typo in -info summary.
+- Point to main man page for xemacs-nox.
+
 * Sun Dec  4 2005 Ville Skytt??  - 21.4.18-2
 - 21.4.18, innerbuf and cursor patches applied upstream.
 



From fedora-extras-commits at redhat.com  Mon Dec  5 17:30:57 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  5 Dec 2005 12:30:57 -0500
Subject: rpms/xemacs/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xemacs.desktop, 1.1, 1.2 xemacs.spec, 1.3,
	1.4 xemacs-21-cursor.patch, 1.1,
	NONE xemacs-21.4.17-innerbuf.patch, 1.1, NONE
Message-ID: <200512051731.jB5HVRrK004937@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4913

Modified Files:
	.cvsignore sources xemacs.desktop xemacs.spec 
Removed Files:
	xemacs-21-cursor.patch xemacs-21.4.17-innerbuf.patch 
Log Message:
* Mon Dec  5 2005 Ville Skytt??  - 21.4.18-1
- 21.4.18, innerbuf and cursor patches applied upstream.
- Move icon to icons/hicolor and to the main package.
- Move man pages to subpackages where the things they document are.
- Point to main man page for xemacs-nox.
- Improve subpackage summaries.
- Use desktop-file-install for installing the desktop entry, fix up X-*
  categories, update desktop database at post (un)install time.
- Really mark default init files as %config.
- Mark config files as noreplace.
- Make sure scriptlet errors won't break upgrades.
- Don't own %{_bindir} in -common.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Mar 2005 22:11:36 -0000	1.2
+++ .cvsignore	5 Dec 2005 17:30:55 -0000	1.3
@@ -1 +1 @@
-xemacs-21.4.17.tar.bz2
+xemacs-21.4.18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Mar 2005 22:11:36 -0000	1.2
+++ sources	5 Dec 2005 17:30:55 -0000	1.3
@@ -1 +1 @@
-a207e106138c085711160855d78b72a2  xemacs-21.4.17.tar.bz2
+08c99ff915564a122a3a44df2264669c  xemacs-21.4.18.tar.bz2


Index: xemacs.desktop
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-4/xemacs.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xemacs.desktop	1 Mar 2005 22:11:36 -0000	1.1
+++ xemacs.desktop	5 Dec 2005 17:30:55 -0000	1.2
@@ -29,6 +29,6 @@
 Icon=xemacs
 Type=Application
 Terminal=false
-Categories=Application;Development;TextEditor;X-Red-Hat-Extra;
+Categories=Application;Development;TextEditor;
 Encoding=UTF-8
 StartupWMClass=Emacs


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-4/xemacs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xemacs.spec	5 May 2005 19:24:59 -0000	1.3
+++ xemacs.spec	5 Dec 2005 17:30:55 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Different version of Emacs
 Name: xemacs
-Version: 21.4.17
-Release: 3
+Version: 21.4.18
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Editors
 Source0: ftp://ftp.xemacs.org/xemacs-21.4/xemacs-%{version}.tar.bz2
@@ -12,8 +12,6 @@
 Source22: delprevline.py
 Source23: dotxemacs-init.el
 Source24: default.el
-Patch0: xemacs-21.4.17-innerbuf.patch
-Patch5: xemacs-21-cursor.patch
 Patch10: xemacs-21.4.10-find-paths-pkgdir.patch
 Patch11: movemail-mktemp.patch
 Patch14: menubar-games.patch
@@ -26,7 +24,7 @@
 Patch24: xemacs-21.4.15-wnnfix-128362.patch
 URL: http://www.xemacs.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: perl python autoconf213
+BuildRequires: perl python autoconf213 texinfo desktop-file-utils
 BuildRequires: XFree86-devel ncurses-devel gpm-devel
 BuildRequires: pam-devel zlib-devel libjpeg-devel glibc-devel compface
 BuildRequires: libpng-devel libtiff-devel Canna-devel
@@ -47,7 +45,7 @@
 This package contains xemacs built for X Windows with MULE support.
 
 %package common
-Summary: The byte-compiled lisp files and other common files for XEmacs.
+Summary: Byte-compiled lisp files and other common files for XEmacs
 Group: Applications/Editors
 PreReq: %{_sbindir}/alternatives
 
@@ -62,7 +60,7 @@
 This package contains byte-compiled lisp and other common files for XEmacs.
 
 %package nox
-Summary: A different version of Emacs built without X Windows Support.
+Summary: Different version of Emacs built without X Windows support
 Group: Applications/Editors
 # Note: no xemacs-sumo dependency here, we need -nox to build the sumo package.
 Requires: xemacs-common = %{version}-%{release}
@@ -78,8 +76,8 @@
 This package contains XEmacs built without X Windows support.
 
 %package el
-Summary: The .el source files for XEmacs.
-Group: Applications/Editors
+Summary: Emacs lisp source files for XEmacs
+Group: Development/Libraries
 
 %description el
 XEmacs is a highly customizable open source text editor and
@@ -89,11 +87,12 @@
 user interface support and an open software development
 model, similar to Linux.
 
-This package contains the lisp source files for XEmacs.
+This package contains the lisp source files for XEmacs mainly of
+interest when developing or debugging XEmacs itself.
 
 %package info
-Summary: Information files for XEmacs.
-Group: Applications/Editors
+Summary: XEmacs documentation in GNU texinfo format
+Group: Documentation
 PreReq: /sbin/install-info
 
 %description info
@@ -104,7 +103,7 @@
 user interface support and an open software development
 model, similar to Linux.
 
-This package contains the XEmacs manuals in info format.
+This package contains XEmacs documentation in GNU texinfo format.
 
 
 %define pkgdir %{_datadir}/xemacs
@@ -116,7 +115,6 @@
 
 ## Lisp patches ##
 # make find-paths.el look in datadir
-rm lisp/find-paths.elc
 %patch10 -p1
 # fix "libexec" on multilib
 %ifarch x86_64 s390x
@@ -126,12 +124,9 @@
 %patch14 -p1
 # make lisp dir and mule-lisp dir be the source lisp dirs (not in datadir)
 %patch18 -p1
-rm lisp/dump-paths.elc
 sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el
 
 ## non-Lisp patches ##
-%patch0 -p1 -b .innerbuf
-%patch5 -p1 -b .cursor
 # movemail
 %patch11 -p1 -b .mkstemp
 # skip redundant check-features
@@ -230,6 +225,7 @@
 # make docdir
 mkdir -p %buildroot%{exectop}/doc
 %makeinstall mandir=%buildroot%{_mandir}/man1 docdir=%buildroot%{exectop}/doc/
+echo ".so man1/xemacs.1" > %buildroot%{_mandir}/man1/xemacs-nox.1
 
 # install nox files
 mkdir -p %buildroot%{exectop}/doc-nox
@@ -253,8 +249,12 @@
 rm -f %buildroot%{_infodir}/standards*
 rm -f %buildroot%{_infodir}/termcap*
 
-install -m 755 -d %buildroot%{_datadir}/applications
-install -m 644 %SOURCE6 %buildroot%{_datadir}/applications/net-xemacs.desktop
+desktop-file-install \
+  --vendor=fedora \
+  --mode=644 \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE6}
 
 # Lockdir
 mkdir -p %buildroot%{_localstatedir}/lock/xemacs
@@ -271,7 +271,8 @@
 install -m 0644 %SOURCE23 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el
 
 # icon
-install -Dpm 644 %{SOURCE1} %buildroot%{_datadir}/pixmaps/xemacs.png
+install -Dpm 644 %{SOURCE1} \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png
 
 # Make sure nothing is 0400
 chmod -R a+rX  %buildroot%{_prefix}
@@ -291,7 +292,7 @@
 # remove buildroot prefix from files
 sed -i -e "s|%buildroot||" *.files
 # make site-packages lisp files config files
-perl -pe 's|^(.+/site-packages/lisp/.+)$|%%config $1|' base-el-not-bytecomped.files
+perl -pi -e 's|^(.+/site-packages/lisp/.+)$|%%config(noreplace) $1|' base-el-not-bytecomped.files
 # combine the file lists
 cat base-*.files dir.files >> base-files
 cat el-*.files dir.files >> el-files
@@ -302,8 +303,16 @@
 rm -rf %buildroot
 
 
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
+update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
+update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
+
 %post common
-alternatives --install %{_bindir}/etags etags %{_bindir}/etags.xemacs 40
+alternatives --install %{_bindir}/etags etags %{_bindir}/etags.xemacs 40 || :
 
 %preun common
 if [ "$1" = 0 ]; then
@@ -312,13 +321,13 @@
 
 %post info
 for file in xemacs cl internals lispref new-users-guide; do
-  /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir
+  /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir || :
 done
 
 %preun info
 if [ "$1" = "0" ]; then
   for file in xemacs cl internals lispref new-users-guide; do
-    /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir
+    /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir || :
   done
 fi
 
@@ -327,10 +336,14 @@
 %defattr(-, root, root)
 %{_bindir}/xemacs
 %{_bindir}/xemacs-%{version}
+# gnuclient, gnuserv need X libs, so not in -common
 %{_bindir}/gnuclient
 %{exectop}/*/gnuserv
 %{exectop}/doc
-%{_datadir}/applications/*
+%{_datadir}/applications/*-%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xemacs.png
+%{_mandir}/man1/gnuclient.1*
+%{_mandir}/man1/gnuserv.1*
 
 %files nox
 %defattr(-, root, root)
@@ -343,17 +356,19 @@
 %doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release
 %doc etc/NEWS etc/MAILINGLISTS BUGS README.packages
 %doc etc/TUTORIAL
-%exclude %{_bindir}/xemacs*
-# needs X libs
-%exclude %{_bindir}/gnuclient
-%{_bindir}
+%{_bindir}/ellcc
+%{_bindir}/etags.xemacs
+%{_bindir}/gnuattach
+%{_bindir}/gnudoit
+%{_bindir}/ootags
 %exclude %{exectop}/doc*
 # needs X libs
 %exclude %{exectop}/*/gnuserv
 %{exectop}
-%{_datadir}/pixmaps/xemacs.png
-%config %{_sysconfdir}/skel/.xemacs
-%{_mandir}/*/*
+%config(noreplace) %{_sysconfdir}/skel/.xemacs
+%{_mandir}/man1/gnuattach.1*
+%{_mandir}/man1/gnudoit.1*
+%{_mandir}/man1/xemacs*.1*
 %attr(1777, root, root) %{_localstatedir}/lock/xemacs
 
 %files el -f el-files
@@ -365,6 +380,19 @@
 
 
 %changelog
+* Mon Dec  5 2005 Ville Skytt??  - 21.4.18-1
+- 21.4.18, innerbuf and cursor patches applied upstream.
+- Move icon to icons/hicolor and to the main package.
+- Move man pages to subpackages where the things they document are.
+- Point to main man page for xemacs-nox.
+- Improve subpackage summaries.
+- Use desktop-file-install for installing the desktop entry, fix up X-*
+  categories, update desktop database at post (un)install time.
+- Really mark default init files as %%config.
+- Mark config files as noreplace.
+- Make sure scriptlet errors won't break upgrades.
+- Don't own %%{_bindir} in -common.
+
 * Thu May  5 2005 Ville Skytt??  - 21.4.17-3
 - Avoid stack corruption in open-network-stream when built with gcc4
   (Enrico Scholz, #154112).


--- xemacs-21-cursor.patch DELETED ---


--- xemacs-21.4.17-innerbuf.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Dec  5 17:54:25 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon,  5 Dec 2005 12:54:25 -0500
Subject: rpms/tclxml - New directory
Message-ID: <200512051754.jB5HsPQW005101@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5092/tclxml

Log Message:
Directory /cvs/extras/rpms/tclxml added to the repository




From fedora-extras-commits at redhat.com  Mon Dec  5 17:54:30 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon,  5 Dec 2005 12:54:30 -0500
Subject: rpms/tclxml/devel - New directory
Message-ID: <200512051754.jB5HsUiX005116@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5092/tclxml/devel

Log Message:
Directory /cvs/extras/rpms/tclxml/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Dec  5 17:54:53 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon,  5 Dec 2005 12:54:53 -0500
Subject: rpms/tclxml Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512051754.jB5HsrGZ005150@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5137

Added Files:
	Makefile import.log 
Log Message:
Setup of module tclxml


--- NEW FILE Makefile ---
# Top level Makefile for module tclxml
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec  5 17:54:58 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon,  5 Dec 2005 12:54:58 -0500
Subject: rpms/tclxml/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512051754.jB5HswtD005168@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5137/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tclxml


--- NEW 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 Dec  5 17:56:30 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon,  5 Dec 2005 12:56:30 -0500
Subject: rpms/tclxml import.log,1.1,1.2
Message-ID: <200512051757.jB5Hv1FY005246@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5208

Modified Files:
	import.log 
Log Message:
auto-import tclxml-3.1-1 on branch devel from tclxml-3.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tclxml/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Dec 2005 17:54:51 -0000	1.1
+++ import.log	5 Dec 2005 17:56:28 -0000	1.2
@@ -0,0 +1 @@
+tclxml-3_1-1:HEAD:tclxml-3.1-1.src.rpm:1133805358



From fedora-extras-commits at redhat.com  Mon Dec  5 17:56:37 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon,  5 Dec 2005 12:56:37 -0500
Subject: rpms/tclxml/devel tclxml.patch, NONE, 1.1 tclxml.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512051756.jB5HubBv005239@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5208/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tclxml.patch tclxml.spec 
Log Message:
auto-import tclxml-3.1-1 on branch devel from tclxml-3.1-1.src.rpm

tclxml.patch:

--- NEW FILE tclxml.patch ---
diff -Naur --exclude '*.swp' tclxml-3.1/configure tclxml-3.1.new/configure
--- tclxml-3.1/configure	2005-11-03 22:26:33.000000000 -0800
+++ tclxml-3.1.new/configure	2005-11-26 23:47:56.000000000 -0800
@@ -1530,7 +1530,8 @@
 
 	    # 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` \
diff -Naur --exclude '*.swp' tclxml-3.1/expat/configure tclxml-3.1.new/expat/configure
--- tclxml-3.1/expat/configure	2004-08-14 00:41:11.000000000 -0700
+++ tclxml-3.1.new/expat/configure	2005-11-26 23:50:36.000000000 -0800
@@ -1532,7 +1532,8 @@
 
 	    # 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` \
diff -Naur --exclude '*.swp' tclxml-3.1/expat/Makefile.in tclxml-3.1.new/expat/Makefile.in
--- tclxml-3.1/expat/Makefile.in	2002-10-09 14:17:21.000000000 -0700
+++ tclxml-3.1.new/expat/Makefile.in	2005-11-27 12:46:23.000000000 -0800
@@ -173,6 +173,7 @@
 SHARED_BUILD	= @SHARED_BUILD@
 
 INCLUDES	= @TCL_INCLUDES@ \
+        -I$(srcdir)/../include \
 	-I$(srcdir)/xmltok	\
 	-I$(srcdir)/xmlparse	\
 	-I$(srcdir)/xmlwf
diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/configure tclxml-3.1.new/libxml2/configure
--- tclxml-3.1/libxml2/configure	2005-11-03 22:26:52.000000000 -0800
+++ tclxml-3.1.new/libxml2/configure	2005-11-26 23:55:32.000000000 -0800
@@ -1540,7 +1540,8 @@
 
 	    # 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` \
@@ -5468,7 +5469,9 @@
 for d in                \
     $with_xml2lib       \
     $exec_prefix/lib    \
+    $libdir             \
     /usr/lib            \
+    /usr/lib64          \
     /usr/local/lib
 do
     if test -f "$d/libxml2.so" ; then
diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/configure.in tclxml-3.1.new/libxml2/configure.in
--- tclxml-3.1/libxml2/configure.in	2004-08-14 00:41:11.000000000 -0700
+++ tclxml-3.1.new/libxml2/configure.in	2005-11-26 23:54:28.000000000 -0800
@@ -247,7 +247,9 @@
 for d in                \
     $with_xml2lib       \
     $exec_prefix/lib    \
+    $libdir             \
     /usr/lib            \
+    /usr/lib64          \
     /usr/local/lib
 do
     if test -f "$d/libxml2.so" ; then
diff -Naur --exclude '*.swp' tclxml-3.1/tclconfig/tcl.m4 tclxml-3.1.new/tclconfig/tcl.m4
--- tclxml-3.1/tclconfig/tcl.m4	2003-12-03 12:06:35.000000000 -0800
+++ tclxml-3.1.new/tclconfig/tcl.m4	2005-11-27 11:58:42.000000000 -0800
@@ -73,10 +73,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


--- NEW FILE tclxml.spec ---
Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
Name: tclxml
Version: 3.1
Release: 1%{?dist}
License: BSD
Group: Development/Libraries
URL:	http://tclxml.sourceforge.net/
Source: http://dl.sf.net/tclxml/tclxml-3.1.tar.gz
Patch0: tclxml.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcl tcl-devel libxml2-devel expat-devel
Requires: tcl tcllib

%description
TclXML is a package that provides XML parsing for the Tcl scripting language.
It has three implementations of XML parsers: one written purely in Tcl
and wrappers for the expat and Gnome libxml2 C libraries.

%package expat
Summary: The Tcl xml parser built with the expat xml parser
Group: Development/Libraries
Requires: tclxml = %{version}
%description expat
TclXML is a package that provides optimized XML parsing for the Tcl
scripting language.  This implementation is built against the expat XML
parser.

%package libxml2
Summary: The Tcl xml parser built with the libxml2 xml parser
Group: Development/Libraries
Requires: tclxml = %{version}
%description libxml2
TclXML is a package that provides optimized XML parsing for the Tcl
scripting language.  This implementation is built against the libxml2
xml parser.

%package devel
Summary: Development files for the tclxml packages
Group: Development/Libraries
Requires: tclxml = %{version}
%description devel
Development header files for the tclxml packages.  This includes the
header files for the base, expat, and libxml2 subpackages.

%prep
%setup -q
%patch0 -p1

# Clean up rpmlint warning about line endings on
# one of the documentation files.
%{__sed} -i 's/\r//' doc/README.xml

# Remove execute permission bits on the source files to
# clean up rpmlint warnings. 
chmod a-x README ChangeLog
chmod a-x include/tclxml/tclxml.h
chmod a-x expat/xmltok/*.c
chmod a-x expat/xmltok/*.h
chmod a-x expat/xmlwf/*.h
chmod a-x expat/xmlwf/*.c
chmod a-x expat/xmlparse/*.h
chmod a-x expat/xmlparse/*.c
chmod a-x libxml2/*.c
chmod a-x tclexpat.c
chmod a-x tclxml.c

#autoreconf
#cd expat
#autoreconf
#cd ../libxml2
#autoreconf

%build
%configure
make %{?_smp_mflags}

cd expat
%configure --with-Tclxml=..
make %{?_smp_mflags}

cd ../libxml2
%configure --with-Tclxml=..
make %{?_smp_mflags}

%install
make install DESTDIR=$RPM_BUILD_ROOT
cd expat
make install DESTDIR=$RPM_BUILD_ROOT
cd ../libxml2
make install DESTDIR=$RPM_BUILD_ROOT

# Remove the following header files which really don't need
# to be installed.  They conflict with headers from
# libwww-devel
rm -f $RPM_BUILD_ROOT/usr/include/xmlparse.h
rm -f $RPM_BUILD_ROOT/usr/include/xmltok.h
rm -f $RPM_BUILD_ROOT/usr/include/xmlrole.h

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_libdir}/Tclxml%{version}/*.so
%{_libdir}/Tclxml%{version}/*.tcl
%doc LICENSE ANNOUNCE ChangeLog README RELNOTES
%doc doc/*

%files expat
%defattr(-,root,root)
%{_libdir}/Tclexpat%{version}

%files libxml2
%defattr(-,root,root)
%{_libdir}/TclXML_libxml2%{version}

%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/TclxmlConfig.sh
%{_libdir}/Tclxml%{version}/*.a

%changelog
* Sat Nov 26 2005 Wart  - 3.1-1
- Update to new upstream sources.
* Sat Nov 26 2005 Wart  - 3.0-3
- Remove dependency on dos2unix with clever sed command.
* Fri Nov 25 2005 Wart  - 3.0-2
- Fix file permissions to clean up rpmlint warnings.
- Add BR: dos2unix to remove DOS line endings on a documentation file.
- Other minor fixes to clean up rpmlint warnings.
* Fri Jun 17 2005 Wart  - 3.0-1
- Updated spec file to conform to Fedora Core 4 standards.
- Move autoreconf from the build to the prep stage.
* Tue Jan 18 2005 Wart  - 3.0-0.fdr.5
- Fix typo in version string for subpackage dependencies.
- Don't include the .a library in the base package.
* Fri Nov 5 2004 Wart  - 3.0-0.fdr.4
- Add epoch to version dependencies in spec file.
- Added additional doc files.
* Thu Nov 4 2004 Wart  - 3.0-0.fdr.3
- enable building on x86_64
* Thu Nov 4 2004 Wart  - 3.0-0.fdr.2
- Clean up rpmlint warnings.
* Thu Nov 4 2004 Wart  - 3.0-0.fdr.1
- Added Fedora-style spec file.
- Allow building generic RPMs from the Makefile.
- Fix VPATH problems with newer versions of autoconf tools.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Dec 2005 17:54:56 -0000	1.1
+++ .cvsignore	5 Dec 2005 17:56:35 -0000	1.2
@@ -0,0 +1 @@
+tclxml-3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Dec 2005 17:54:56 -0000	1.1
+++ sources	5 Dec 2005 17:56:35 -0000	1.2
@@ -0,0 +1 @@
+35de63a4ceba7a6fdb85dd1a62f2e881  tclxml-3.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec  5 18:15:10 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon,  5 Dec 2005 13:15:10 -0500
Subject: owners owners.list,1.433,1.434
Message-ID: <200512051815.jB5IFeQ4006974@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6955

Modified Files:
	owners.list 
Log Message:
Added tclxml




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- owners.list	4 Dec 2005 23:04:44 -0000	1.433
+++ owners.list	5 Dec 2005 18:15:07 -0000	1.434
@@ -1114,6 +1114,7 @@
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-arabtex|The ArabTeX package for TeX/LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec  5 21:11:15 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Mon,  5 Dec 2005 16:11:15 -0500
Subject: rpms/ghdl/FC-4 ghdl.spec,1.3,1.4
Message-ID: <200512052111.jB5LBiB2012671@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12617

Modified Files:
	ghdl.spec 
Log Message:
add forgotten changelog entry



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/FC-4/ghdl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghdl.spec	2 Dec 2005 16:40:11 -0000	1.3
+++ ghdl.spec	5 Dec 2005 21:11:11 -0000	1.4
@@ -177,6 +177,9 @@
 %{_libexecdir}/gcc/
 
 %changelog
+* Mon Dec  5 2005 Thomas Sailer  - 0.21-0.24svn.3
+- disable multilib and remove exclude of x86_64
+
 * Thu Dec  1 2005 Thomas Sailer  - 0.21-0.24svn.2
 - Exclude ppc because gcc-gnat is missing
 - Exclude x86_64 because of mock build issues



From fedora-extras-commits at redhat.com  Mon Dec  5 21:24:33 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon,  5 Dec 2005 16:24:33 -0500
Subject: rpms/gossip/devel gossip.spec,1.8,1.9
Message-ID: <200512052125.jB5LP3q9012774@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gossip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12757

Modified Files:
	gossip.spec 
Log Message:
* Mon Dec  5 2005 Brian Pepple  - 0.9-7
- Add BR for libXScrnSaver-devel, libXt-devel & xorg-x11-proto-devel.



Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gossip.spec	4 Dec 2005 14:16:34 -0000	1.8
+++ gossip.spec	5 Dec 2005 21:24:31 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           gossip
 Version:        0.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Gnome Jabber Client
 
 Group:          Applications/Communications
@@ -19,6 +19,9 @@
 BuildRequires:	libxslt-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libgcrypt-devel
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	libXt-devel
+BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	aspell-devel
 BuildRequires:	gettext
@@ -99,6 +102,9 @@
 
 
 %changelog
+* Mon Dec  5 2005 Brian Pepple  - 0.9-7
+- Add BR for libXScrnSaver-devel, libXt-devel & xorg-x11-proto-devel.
+
 * Fri Dec  2 2005 Brian Pepple  - 0.9-6
 - Rebuild for new dbus.
 



From fedora-extras-commits at redhat.com  Mon Dec  5 22:06:59 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon,  5 Dec 2005 17:06:59 -0500
Subject: rpms/nmh/FC-4 nmh.spec,1.8,1.9
Message-ID: <200512052207.jB5M7TS6014541@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/extras/rpms/nmh/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14494/FC-4

Modified Files:
	nmh.spec 
Log Message:
Add a buildrequires on /bin/vi to make the build process happy.



Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/FC-4/nmh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nmh.spec	10 Nov 2005 21:16:23 -0000	1.8
+++ nmh.spec	5 Dec 2005 22:06:57 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        11.fc4
+Release:        12.fc4
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
-BuildRequires:  sendmail
+BuildRequires:  /usr/sbin/sendmail
+BuildRequires:  /bin/vi
 
 %description
 Nmh is an email system based on the MH email system and is intended to
@@ -65,6 +66,10 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Mon Dec 05 2005 Josh Bressers  0:1.1-12.fc4
+- Add a buildrequires on /bin/vi
+- Modify the sendmail buildrequires to use /usr/sbin/sendmail
+
 * Thu Nov 10 2005 Josh Bressers  0:1.1-11.fc4
 - Add a sendmail buildrequires to make spost work properly
 



From fedora-extras-commits at redhat.com  Mon Dec  5 22:07:05 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon,  5 Dec 2005 17:07:05 -0500
Subject: rpms/nmh/devel nmh.spec,1.8,1.9
Message-ID: <200512052207.jB5M7Z89014544@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/extras/rpms/nmh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14494/devel

Modified Files:
	nmh.spec 
Log Message:
Add a buildrequires on /bin/vi to make the build process happy.



Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/devel/nmh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nmh.spec	10 Nov 2005 21:16:29 -0000	1.8
+++ nmh.spec	5 Dec 2005 22:07:03 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        11.fc5
+Release:        12.fc5
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
-BuildRequires:  sendmail
+BuildRequires:  /usr/sbin/sendmail
+BuildRequires:  /bin/vi
 
 %description
 Nmh is an email system based on the MH email system and is intended to
@@ -65,6 +66,10 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Mon Dec 05 2005 Josh Bressers  0:1.1-12.fc5
+- Add a buildrequires on /bin/vi
+- Modify the sendmail buildrequires to use /usr/sbin/sendmail
+
 * Thu Nov 10 2005 Josh Bressers  0:1.1-11.fc5
 - Add a sendmail buildrequires to make spost work properly
 



From fedora-extras-commits at redhat.com  Mon Dec  5 22:06:52 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon,  5 Dec 2005 17:06:52 -0500
Subject: rpms/nmh/FC-3 nmh.spec,1.8,1.9
Message-ID: <200512052208.jB5M82kl014547@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/extras/rpms/nmh/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14494/FC-3

Modified Files:
	nmh.spec 
Log Message:
Add a buildrequires on /bin/vi to make the build process happy.



Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/FC-3/nmh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nmh.spec	10 Nov 2005 21:16:18 -0000	1.8
+++ nmh.spec	5 Dec 2005 22:06:49 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        11.fc3
+Release:        12.fc3
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -13,7 +13,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
-BuildRequires:  sendmail
+BuildRequires:  /usr/sbin/sendmail
+BuildRequires:  /bin/vi
 
 %description
 Nmh is an email system based on the MH email system and is intended to
@@ -65,6 +66,10 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Mon Dec 05 2005 Josh Bressers  0:1.1-12.fc3
+- Add a buildrequires on /bin/vi
+- Modify the sendmail buildrequires to use /usr/sbin/sendmail
+
 * Thu Nov 10 2005 Josh Bressers  0:1.1-11.fc3
 - Add a sendmail buildrequires to make spost work properly
 



From fedora-extras-commits at redhat.com  Mon Dec  5 23:33:36 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Mon,  5 Dec 2005 18:33:36 -0500
Subject: web/html/Download vendors.list,1.1,1.2
Message-ID: <200512052334.jB5NY6wn016482@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/Download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16462/Download

Modified Files:
	vendors.list 
Log Message:
Latest vendors.list in new location


Index: vendors.list
===================================================================
RCS file: /cvs/fedora/web/html/Download/vendors.list,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vendors.list	29 Nov 2005 17:32:36 -0000	1.1
+++ vendors.list	5 Dec 2005 23:33:34 -0000	1.2
@@ -14,11 +14,15 @@
 
 CompraLinux (Spain only)::3 CDs or 6 CDs::13.92 euro or 24.36 euro
 
+ComputeFree::CDs::$10.99 - 12.99
+
+Copyleft Solutions::4 CDs or 1 DVD::Rs 400 or Rs 200
+
 cosaslibres.com::3 CDs or 6 CDs::25000 Pesos or 48000 Pesos
 
-Custom Web Pages::3 CDs or 6 CDs::$12 or $20
+Custom Web Pages::3 CDs or 6 CDs::$12 or $20
 
-delinuxspecialist.nl::4 CDs or 7 CDs or DVD Set::8.95 euro or 11.95 euro or 14.95 euro
+delinuxspecialist.nl::4 CDs or 7 CDs or DVD Set::8.95 euro or 11.95 euro or 14.95 euro
 
 Dr. Hinner EDV, Germany::3 CDs::18 euro
 
@@ -32,7 +36,7 @@
 
 Galuna, Romania::3 CDs::3 euro
 
-EEXI, Hellenic Association of Internet Users (Greece & Cyprus)::3 CDs or 1 DVD::10 euros or 15 euros
+EEXI, Hellenic Association of Internet Users (Greece & Cyprus)::3 CDs or 1 DVD::10 euros or 15 euros
 
 KoalaSoft Organization::3 CDs or 6 CDs::15 euro or 30 euro (Italy only)
 
@@ -75,3 +79,4 @@
 Terrassol Tecnologia::3 CDs::45,00 reais
 
 TheLinuxStore.ca::CDs or DVD::7.97 - 9.97 CAD$
+



From fedora-extras-commits at redhat.com  Mon Dec  5 23:59:16 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon,  5 Dec 2005 18:59:16 -0500
Subject: rpms/ortp/devel ortp-0.7.1-Werror.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 ortp.spec, 1.4, 1.5 sources, 1.2,
	1.3 ortp-0.7.0-Werror.patch, 1.1, NONE
Message-ID: <200512052359.jB5Nxk4A016614@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ortp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16588

Modified Files:
	.cvsignore ortp.spec sources 
Added Files:
	ortp-0.7.1-Werror.patch 
Removed Files:
	ortp-0.7.0-Werror.patch 
Log Message:
Upstream update

ortp-0.7.1-Werror.patch:

--- NEW FILE ortp-0.7.1-Werror.patch ---
--- ortp-0.7.1/configure.Werror	2005-12-04 07:17:34.000000000 -0500
+++ ortp-0.7.1/configure	2005-12-04 07:18:05.000000000 -0500
@@ -2071,10 +2071,6 @@
 
 echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-if test "$GCC" = "yes" ;
-then
-  CFLAGS="$CFLAGS -Werror "
-fi
 
 
 fi;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Nov 2005 20:10:53 -0000	1.2
+++ .cvsignore	5 Dec 2005 23:59:14 -0000	1.3
@@ -1 +1 @@
-ortp-0.7.0.tar.gz
+ortp-0.7.1.tar.gz


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/ortp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ortp.spec	30 Nov 2005 14:23:14 -0000	1.4
+++ ortp.spec	5 Dec 2005 23:59:14 -0000	1.5
@@ -1,13 +1,13 @@
 Name:           ortp
-Version:        0.7.0
-Release:        6%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.linphone.org/ortp/
 Source0:        http://www.linphone.org/ortp/sources/%{name}-%{version}.tar.gz
-Patch0:         ortp-0.7.0-Werror.patch
+Patch0:         ortp-0.7.1-Werror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.0.0
@@ -52,6 +52,9 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Sat Dec  3 2005 Ignacio Vazquez-Abrams  0.7.1-1
+- Upstream update
+
 * Wed Nov 30 2005 Ignacio Vazquez-Abrams  0.7.0-6
 - Fix a typo in Requires on -devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Nov 2005 20:10:53 -0000	1.2
+++ sources	5 Dec 2005 23:59:14 -0000	1.3
@@ -1 +1 @@
-4a8e1873e15b076698a82d5249e3992d  ortp-0.7.0.tar.gz
+e69ba3f5a2ac76e3b6117826d0c536b2  ortp-0.7.1.tar.gz


--- ortp-0.7.0-Werror.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec  6 00:17:41 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon,  5 Dec 2005 19:17:41 -0500
Subject: rpms/linphone/devel linphone-1.1.0-Werror.patch, NONE,
	1.1 linphone-1.1.0-ortp.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 linphone.spec, 1.13, 1.14 sources, 1.3,
	1.4 linphone-1.0.1-ortp.patch, 1.1, NONE
Message-ID: <200512060017.jB60HfMD018257@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18229

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.1.0-Werror.patch linphone-1.1.0-ortp.patch 
Removed Files:
	linphone-1.0.1-ortp.patch 
Log Message:
Upstream update

linphone-1.1.0-Werror.patch:

--- NEW FILE linphone-1.1.0-Werror.patch ---
--- linphone-1.1.0/configure.Werror	2005-12-05 17:54:55.000000000 -0500
+++ linphone-1.1.0/configure	2005-12-05 17:55:13.000000000 -0500
@@ -23816,10 +23816,6 @@
 		;;
 esac
 
-if test "$GCC" = "yes" ; then
-	STRICT_OPTIONS="-Wall -Werror"
-fi
-
 
 
 # Check whether --with-realprefix or --without-realprefix was given.

linphone-1.1.0-ortp.patch:

--- NEW FILE linphone-1.1.0-ortp.patch ---
--- linphone-1.1.0/gnome/Makefile.in.ortp	2005-08-24 18:45:55.000000000 -0400
+++ linphone-1.1.0/gnome/Makefile.in	2005-12-05 17:14:02.000000000 -0500
@@ -343,8 +343,7 @@
 @BUILD_GNOME_TRUE at INCLUDES = \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)\
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/intl \
- at BUILD_GNOME_TRUE@	-I$(top_srcdir)/oRTP/src \
- at BUILD_GNOME_TRUE@	-I$(top_srcdir)/oRTP/ \
+ at BUILD_GNOME_TRUE@	-I$(includedir)/ortp/ \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/mediastreamer \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/speex/libspeex \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/coreapi \
--- linphone-1.1.0/coreapi/Makefile.in.ortp	2005-08-24 18:45:54.000000000 -0400
+++ linphone-1.1.0/coreapi/Makefile.in	2005-12-05 17:14:02.000000000 -0500
@@ -292,8 +292,7 @@
 INCLUDES = \
 	-I$(top_srcdir)\
 	-I$(top_srcdir)/exosip\
-	-I$(top_srcdir)/oRTP/include \
-	-I$(top_srcdir)/oRTP/ \
+	-I$(includedir)/ortp/ \
 	-I$(top_srcdir)/mediastreamer \
 	$(SPEEX_CFLAGS) \
 	-I$(osip_prefix)/include/ 
--- linphone-1.1.0/Makefile.in.ortp	2005-08-24 18:45:54.000000000 -0400
+++ linphone-1.1.0/Makefile.in	2005-12-05 17:14:02.000000000 -0500
@@ -62,7 +62,7 @@
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
+DIST_SUBDIRS = m4 support pixmaps po ipkg gsmlib lpc10-1.5 \
 	win32acm mediastreamer mediastreamer2 media_api exosip coreapi \
 	console gnome share developer-docs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -277,7 +277,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 @BUILD_TRUESPEECH_TRUE at WIN32ACM_DIR = win32acm
-SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
+SUBDIRS = m4 support pixmaps po ipkg gsmlib lpc10-1.5 \
                 $(WIN32ACM_DIR) mediastreamer mediastreamer2\
 		media_api exosip coreapi console gnome share developer-docs
 
--- linphone-1.1.0/console/Makefile.in.ortp	2005-08-24 18:45:54.000000000 -0400
+++ linphone-1.1.0/console/Makefile.in	2005-12-05 17:14:02.000000000 -0500
@@ -284,8 +284,7 @@
 	-I$(top_srcdir)/coreapi\
 	-I$(top_srcdir)/osipua/\
 	-I$(top_srcdir)/osipua/src \
-	-I$(top_srcdir)/oRTP/include \
-	-I$(top_srcdir)/oRTP/ \
+	-I$(includedir)/ortp/ \
 	-I$(top_srcdir)/mediastreamer \
 	$(SPEEX_CFLAGS)\
 	-I$(osip_prefix)/include \
--- linphone-1.1.0/mediastreamer/Makefile.in.ortp	2005-08-24 18:45:56.000000000 -0400
+++ linphone-1.1.0/mediastreamer/Makefile.in	2005-12-05 17:14:02.000000000 -0500
@@ -68,7 +68,7 @@
 @BUILD_TRUESPEECH_TRUE at am__DEPENDENCIES_3 = ../win32acm/libwin32acm.a
 libmediastreamer_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
-	../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -356,6 +356,7 @@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
+ORTP_LIBS = -lortp
 OSIP_CFLAGS = @OSIP_CFLAGS@
 OSIP_LIBS = @OSIP_LIBS@
 PACKAGE = @PACKAGE@
@@ -494,7 +495,7 @@
 libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
 							../gsmlib/libgsm.la \
 							../lpc10-1.5/liblpc10.la \
-							../oRTP/src/libortp.la \
+							$(ORTP_LIBS) \
 							$(JACK_LIBS)\
 							$(SAMPLERATE_LIBS)\
 							$(SUPPORTLIB) \
@@ -559,8 +560,7 @@
 
 INCLUDES = -I$(top_srcdir) \
 						-I$(top_srcdir)/mediastreamer \
-						-I$(top_srcdir)/oRTP/include \
-						-I$(top_srcdir)/oRTP \
+						-I$(includedir)/ortp \
 						-I$(top_srcdir)/gsmlib   \
 						-I$(top_srcdir)/lpc10-1.5    \
 						$(SPEEX_CFLAGS) \
--- linphone-1.1.0/mediastreamer2/Makefile.in.ortp	2005-08-24 18:45:57.000000000 -0400
+++ linphone-1.1.0/mediastreamer2/Makefile.in	2005-12-05 17:14:02.000000000 -0500
@@ -55,7 +55,7 @@
 @BUILD_UGLIB_TRUE@	$(top_builddir)/support/libuglib.la
 libmediastreamer2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
-	../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_libmediastreamer2_la_OBJECTS = msfilter.lo msAlawdec.lo \
@@ -216,6 +216,7 @@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
+ORTP_LIBS = -lortp
 OSIP_CFLAGS = @OSIP_CFLAGS@
 OSIP_LIBS = @OSIP_LIBS@
 PACKAGE = @PACKAGE@
@@ -316,7 +317,7 @@
 libmediastreamer2_la_LIBADD = $(GLIB_LIBS) \
 							../gsmlib/libgsm.la \
 							../lpc10-1.5/liblpc10.la \
-							../oRTP/src/libortp.la \
+							$(ORTP_LIBS) \
 							$(JACK_LIBS)\
 							$(SUPPORTLIB) \
 							$(ALSA_LIBS) \
@@ -325,8 +326,7 @@
 AM_CFLAGS = $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(TRUESPEECH_CFLAGS) $(IPV6_CFLAGS)
 INCLUDES = -I$(top_srcdir) \
 						-I$(top_srcdir)/mediastreamer2 \
-						-I$(top_srcdir)/oRTP/include \
-						-I$(top_srcdir)/oRTP \
+						-I$(includedir)/ortp \
 						-I$(top_srcdir)/gsmlib   \
 						-I$(top_srcdir)/lpc10-1.5    \
 						$(SPEEX_CFLAGS)
--- linphone-1.1.0/media_api/Makefile.in.ortp	2005-08-24 18:45:56.000000000 -0400
+++ linphone-1.1.0/media_api/Makefile.in	2005-12-05 17:14:02.000000000 -0500
@@ -302,8 +302,7 @@
 INCLUDES = -I$(top_srcdir)/mediastreamer \
 		-I$(top_srcdir)/speex \
 		-I$(top_srcdir)/gsmlib \
-		-I$(top_srcdir)/oRTP \
-		-I$(top_srcdir)/oRTP/src \
+		-I$(includedir)/ortp \
 		-I$(top_srcdir)/lpc10-1.5 \
 		-I$(top_srcdir)/ffmpeg 
 
--- linphone-1.1.0/configure.ortp	2005-08-24 18:37:04.000000000 -0400
+++ linphone-1.1.0/configure	2005-12-05 17:17:37.000000000 -0500
@@ -462,8 +462,6 @@
 #if HAVE_UNISTD_H
 # include 
 #endif"
-
-ac_subdirs_all="$ac_subdirs_all oRTP"
 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBLINPHONE_SO_VERSION LINPHONE_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RU!
 LE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ac_pt_PKG_CONFIG LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS LIBGTK_CFLAGS LIBGTK_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS STRICT_OPTIONS IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE JACK_CFLAGS JACK_LI!
 BS SAMPLERATE_CFLAGS SAMPLERATE_LIBS osip_prefix OSIP_CFLAGS O!
 SIP_LI
EXOSIP_CFLAGS EXOSIP_LIBS SPEEX_CFLAGS SPEEX_LIBS ILBC_CFLAGS ILBC_LIBS ${NAME}_CFLAGS ${NAME}_LIBS VIDEO_CFLAGS VIDEO_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_UGLIB_TRUE BUILD_UGLIB_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE BUILD_SPEEX_TRUE BUILD_SPEEX_FALSE ARMBUILD_TRUE ARMBUILD_FALSE BUILD_VIDEO_TRUE BUILD_VIDEO_FALSE ALSA_LIBS subdirs HTML_DIR GTK_DOC_CFLAGS GTK_DOC_LIBS ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE have_db2html ENABLE_MANUAL_TRUE ENABLE_MANUAL_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -29745,9 +29743,6 @@
 
 
 
-subdirs="$subdirs oRTP"
-
-
 ##################################################
 # Check for gtk-doc.
 ##################################################


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Mar 2005 19:32:18 -0000	1.3
+++ .cvsignore	6 Dec 2005 00:17:38 -0000	1.4
@@ -1 +1 @@
-linphone-1.0.1.tar.gz
+linphone-1.1.0.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linphone.spec	30 Nov 2005 15:13:33 -0000	1.13
+++ linphone.spec	6 Dec 2005 00:17:38 -0000	1.14
@@ -1,15 +1,16 @@
 Name:           linphone
-Version:        1.0.1
-Release:        5%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
 License:        GPL
 URL:            http://www.linphone.org/?lang=us&rubrique=1
-Source0:        http://simon.morlat.free.fr/download/1.0.x/source/linphone-1.0.1.tar.gz
+Source0:        http://simon.morlat.free.fr/download/1.1.x/source/%{name}-%{version}.tar.gz
 Patch:          linphone-1.0.1-pkgconfig.patch
 Patch1:         linphone-1.0.1-desktop.patch
-Patch2:         linphone-1.0.1-ortp.patch
+Patch2:         linphone-1.1.0-ortp.patch
+Patch3:         linphone-1.1.0-Werror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
@@ -45,6 +46,7 @@
 %patch -p 1 -b .pkgconfig
 %patch1 -p 1 -b .old
 %patch2 -p 1 -b .ortp
+%patch3 -p 1 -b .Werror
 rm -r oRTP
 
 %build
@@ -97,6 +99,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec  5 2005 Ignacio Vazquez-Abrams  1.1.0-1
+- Upstream update
+
 * Wed Nov 30 2005 Ignacio Vazquez-Abrams  1.0.1-5
 - Remove ortp documentation for -devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Mar 2005 19:32:18 -0000	1.3
+++ sources	6 Dec 2005 00:17:38 -0000	1.4
@@ -1 +1 @@
-d65f977dd6512b7725fcb2e2c9713e65  linphone-1.0.1.tar.gz
+9f164b41c76ef1caca164909dea199a1  linphone-1.1.0.tar.gz


--- linphone-1.0.1-ortp.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec  6 00:36:11 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon,  5 Dec 2005 19:36:11 -0500
Subject: rpms/linphone/devel linphone.spec,1.14,1.15
Message-ID: <200512060036.jB60afVf018421@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18404

Modified Files:
	linphone.spec 
Log Message:
Added version on ortp-devel


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linphone.spec	6 Dec 2005 00:17:38 -0000	1.14
+++ linphone.spec	6 Dec 2005 00:36:09 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -15,7 +15,7 @@
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
 BuildRequires:  libosip2-devel speex-devel gettext desktop-file-utils
-BuildRequires:  ortp-devel
+BuildRequires:  ortp-devel >= 0.7.1
 
 %description
 Linphone is mostly sip compliant. It works successfully with these
@@ -99,6 +99,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec  5 2005 Ignacio Vazquez-Abrams  1.1.0-2
+- Added version on ortp-devel
+
 * Mon Dec  5 2005 Ignacio Vazquez-Abrams  1.1.0-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Tue Dec  6 02:56:31 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Mon,  5 Dec 2005 21:56:31 -0500
Subject: rpms/fortune-firefly/FC-3 firefly, 1.3, 1.4 fortune-firefly.spec,
	1.2, 1.3
Message-ID: <200512060257.jB62v16I022110@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22059/FC-3

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Latest version




Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-3/firefly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- firefly	12 Oct 2005 23:39:12 -0000	1.3
+++ firefly	6 Dec 2005 02:56:29 -0000	1.4
@@ -1892,7 +1892,7 @@
 Simon: "It was either that or the National Anthem.  Reports vary."
 
 %
-Jayne: "Saint Jane, it's got a ring to it!"
+Jayne: "Saint Jayne, it's got a ring to it!"
 
 Book: "I'm just trying to remember how many miracles you've performed."
 
@@ -2340,13 +2340,13 @@
 Wash: "Fine!"
 
 %
-Jayne: "Jayne'll be worth something if you run into trouble, but don't trust
+Mal: "Jayne'll be worth something if you run into trouble, but don't trust
 him, and don't let him take over. You're paid up through the end of the
 month, this is still your ship."
 
 Inara: "Mal..."
 
-Jayne: "As far as your security deposit goes, that I might have to owe you. "
+Mal: "As far as your security deposit goes, that I might have to owe you. "
 
 %
 Mal: "If it's Alliance trouble you got, you might want to consider another
@@ -2572,6 +2572,7 @@
 
 %
 Atherton: "Well, get ready to starve! I'll see to it you never work again.
+
 Inara: Actually, that's not how it works. You see, you've earned yourself a
 black mark in the client registry. No Companion is going to contact with you
 ever again."
@@ -2849,7 +2850,7 @@
 operation in the galaxy, and you put them in a room with a psychic."
 
 %
-Operative: "I certain older civilized cultures, when men failed as 
+Operative: "In certain older civilized cultures, when men failed as 
 completely as you have, they would throw themselves on their swords."
 
 Dr. Mathias: "Well, unfortunately, I forgot to bring a sword..."
@@ -2893,7 +2894,7 @@
 Jayne (whining): "Explode?  I don't wanna explode!"
 
 %
-Mal: "I thought you said it would hold for another week."
+Mal: "You told me the entry couplings would hold for another week!"
 
 Kaylee: "That was six months ago, cap'n."
 
@@ -2955,7 +2956,7 @@
 Mal: "Well, you don't want it to look like you just gave up."
 
 %
-Mal: "We mean to be theiving here, but what we are after is not yours.  So
+Mal: "We mean to be thieving here, but what we are after is not yours.  So
 let's have no undue fuss."
 
 %
@@ -3051,7 +3052,7 @@
 Jayne (interrupting the "safe words" that make River fall asleep): "Well don't
 say it!!!"
 
-Wash: "It only works on her, Jayne."
+Zoe: "It only works on her, Jayne."
 
 Jayne: "Oh.  Well, now I know that."
 
@@ -3240,7 +3241,7 @@
 %
 Simon: "We'll get off.  River and I will get off and..."
 
-Zoe: "Nobody's saying that."
+Kaylee: "Nobody's saying that."
 
 Wash: "Nobody besides Jayne is saying that."
 
@@ -3513,6 +3514,13 @@
 [Ed: There's mandatory candy?]
 
 %
+Mal: "Hello, little one.  You know your part in this?"
+
+River: (beat) "Do you?"
+
+Mal: "It's what I do, darlin'."  (sighing) "It's what I do."
+
+%
 --Package Maintainers note--: If your favorite Firefly quote is not in here,
 or you can help correct/expand a quote from "Serenity", please drop me a line
 at meme at daughtersoftiresias.org.


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-3/fortune-firefly.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fortune-firefly.spec	12 Oct 2005 23:39:12 -0000	1.2
+++ fortune-firefly.spec	6 Dec 2005 02:56:29 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		fortune-firefly
-Version:	2.0
-Release:        1
+Version:	2.0.1
+Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
 Group:		Amusements/Games
@@ -49,6 +49,13 @@
 
 %changelog
 
+* Mon Dec 05 2005 Karen Pease  - 2.0.1
+- Incorporated some typo corrections from Zack Elan (zackelan at gmail.com)
+- Changed the versioning style
+
+* Wed Oct 12 2005 Karen Pease  - 2.0.3
+- Fixed some quotes, added one more.
+
 * Wed Oct 12 2005 Karen Pease  - 2.0
 - Someone who wanted to remain anonymous graciously offered his time to
   correct Serenity quotes using a Visual Companion, which contains the



From fedora-extras-commits at redhat.com  Tue Dec  6 02:56:36 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Mon,  5 Dec 2005 21:56:36 -0500
Subject: rpms/fortune-firefly/FC-4 firefly, 1.3, 1.4 fortune-firefly.spec,
	1.3, 1.4
Message-ID: <200512060257.jB62v6h2022118@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22059/FC-4

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Latest version




Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-4/firefly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- firefly	12 Oct 2005 23:39:13 -0000	1.3
+++ firefly	6 Dec 2005 02:56:34 -0000	1.4
@@ -1892,7 +1892,7 @@
 Simon: "It was either that or the National Anthem.  Reports vary."
 
 %
-Jayne: "Saint Jane, it's got a ring to it!"
+Jayne: "Saint Jayne, it's got a ring to it!"
 
 Book: "I'm just trying to remember how many miracles you've performed."
 
@@ -2340,13 +2340,13 @@
 Wash: "Fine!"
 
 %
-Jayne: "Jayne'll be worth something if you run into trouble, but don't trust
+Mal: "Jayne'll be worth something if you run into trouble, but don't trust
 him, and don't let him take over. You're paid up through the end of the
 month, this is still your ship."
 
 Inara: "Mal..."
 
-Jayne: "As far as your security deposit goes, that I might have to owe you. "
+Mal: "As far as your security deposit goes, that I might have to owe you. "
 
 %
 Mal: "If it's Alliance trouble you got, you might want to consider another
@@ -2572,6 +2572,7 @@
 
 %
 Atherton: "Well, get ready to starve! I'll see to it you never work again.
+
 Inara: Actually, that's not how it works. You see, you've earned yourself a
 black mark in the client registry. No Companion is going to contact with you
 ever again."
@@ -2849,7 +2850,7 @@
 operation in the galaxy, and you put them in a room with a psychic."
 
 %
-Operative: "I certain older civilized cultures, when men failed as 
+Operative: "In certain older civilized cultures, when men failed as 
 completely as you have, they would throw themselves on their swords."
 
 Dr. Mathias: "Well, unfortunately, I forgot to bring a sword..."
@@ -2893,7 +2894,7 @@
 Jayne (whining): "Explode?  I don't wanna explode!"
 
 %
-Mal: "I thought you said it would hold for another week."
+Mal: "You told me the entry couplings would hold for another week!"
 
 Kaylee: "That was six months ago, cap'n."
 
@@ -2955,7 +2956,7 @@
 Mal: "Well, you don't want it to look like you just gave up."
 
 %
-Mal: "We mean to be theiving here, but what we are after is not yours.  So
+Mal: "We mean to be thieving here, but what we are after is not yours.  So
 let's have no undue fuss."
 
 %
@@ -3051,7 +3052,7 @@
 Jayne (interrupting the "safe words" that make River fall asleep): "Well don't
 say it!!!"
 
-Wash: "It only works on her, Jayne."
+Zoe: "It only works on her, Jayne."
 
 Jayne: "Oh.  Well, now I know that."
 
@@ -3240,7 +3241,7 @@
 %
 Simon: "We'll get off.  River and I will get off and..."
 
-Zoe: "Nobody's saying that."
+Kaylee: "Nobody's saying that."
 
 Wash: "Nobody besides Jayne is saying that."
 
@@ -3513,6 +3514,13 @@
 [Ed: There's mandatory candy?]
 
 %
+Mal: "Hello, little one.  You know your part in this?"
+
+River: (beat) "Do you?"
+
+Mal: "It's what I do, darlin'."  (sighing) "It's what I do."
+
+%
 --Package Maintainers note--: If your favorite Firefly quote is not in here,
 or you can help correct/expand a quote from "Serenity", please drop me a line
 at meme at daughtersoftiresias.org.


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-4/fortune-firefly.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fortune-firefly.spec	12 Oct 2005 23:39:13 -0000	1.3
+++ fortune-firefly.spec	6 Dec 2005 02:56:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		fortune-firefly
-Version:	2.0
-Release:        2
+Version:	2.0.1
+Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
 Group:		Amusements/Games
@@ -49,6 +49,13 @@
 
 %changelog
 
+* Mon Dec 05 2005 Karen Pease  - 2.0.1
+- Incorporated some typo corrections from Zack Elan (zackelan at gmail.com)
+- Changed the versioning style
+
+* Wed Oct 12 2005 Karen Pease  - 2.0.3
+- Fixed some quotes, added one more.
+
 * Wed Oct 12 2005 Karen Pease  - 2.0
 - Someone who wanted to remain anonymous graciously offered his time to
   correct Serenity quotes using a Visual Companion, which contains the



From fedora-extras-commits at redhat.com  Tue Dec  6 02:56:42 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Mon,  5 Dec 2005 21:56:42 -0500
Subject: rpms/fortune-firefly/devel firefly, 1.4, 1.5 fortune-firefly.spec,
	1.6, 1.7
Message-ID: <200512060257.jB62vC7N022122@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22059/devel

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Latest version




Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/devel/firefly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- firefly	13 Oct 2005 03:01:04 -0000	1.4
+++ firefly	6 Dec 2005 02:56:40 -0000	1.5
@@ -1892,7 +1892,7 @@
 Simon: "It was either that or the National Anthem.  Reports vary."
 
 %
-Jayne: "Saint Jane, it's got a ring to it!"
+Jayne: "Saint Jayne, it's got a ring to it!"
 
 Book: "I'm just trying to remember how many miracles you've performed."
 
@@ -2340,13 +2340,13 @@
 Wash: "Fine!"
 
 %
-Jayne: "Jayne'll be worth something if you run into trouble, but don't trust
+Mal: "Jayne'll be worth something if you run into trouble, but don't trust
 him, and don't let him take over. You're paid up through the end of the
 month, this is still your ship."
 
 Inara: "Mal..."
 
-Jayne: "As far as your security deposit goes, that I might have to owe you. "
+Mal: "As far as your security deposit goes, that I might have to owe you. "
 
 %
 Mal: "If it's Alliance trouble you got, you might want to consider another
@@ -2572,6 +2572,7 @@
 
 %
 Atherton: "Well, get ready to starve! I'll see to it you never work again.
+
 Inara: Actually, that's not how it works. You see, you've earned yourself a
 black mark in the client registry. No Companion is going to contact with you
 ever again."


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/devel/fortune-firefly.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fortune-firefly.spec	13 Oct 2005 03:01:05 -0000	1.6
+++ fortune-firefly.spec	6 Dec 2005 02:56:40 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		fortune-firefly
-Version:	2.0
-Release:        4
+Version:	2.0.1
+Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
 Group:		Amusements/Games
@@ -49,6 +49,10 @@
 
 %changelog
 
+* Mon Dec 05 2005 Karen Pease  - 2.0.1
+- Incorporated some typo corrections from Zack Elan (zackelan at gmail.com)
+- Changed the versioning style
+
 * Wed Oct 12 2005 Karen Pease  - 2.0.3
 - Fixed some quotes, added one more.
 



From fedora-extras-commits at redhat.com  Tue Dec  6 05:03:14 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 00:03:14 -0500
Subject: web/html/Download vendors.list,1.2,1.3
Message-ID: <200512060504.jB654FCT027241@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/Download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27208/html/Download

Modified Files:
	vendors.list 
Log Message:
Add LinPro to vendors list


Index: vendors.list
===================================================================
RCS file: /cvs/fedora/web/html/Download/vendors.list,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vendors.list	5 Dec 2005 23:33:34 -0000	1.2
+++ vendors.list	6 Dec 2005 05:03:06 -0000	1.3
@@ -46,6 +46,8 @@
 
 LinCD::4 CDs or 1 DVD::$7.96 or $2.99
 
+LinPro::4 CDs or 1 DVD::107.10 CZK or 95 CZK
+
 LinuxBazar (India only)::3 CDs::INR 100 + shipping
 
 LinuxElectrons::3 CDs 1 DVD::$7 or $9



From fedora-extras-commits at redhat.com  Tue Dec  6 05:03:45 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 00:03:45 -0500
Subject: web/html/download vendors.list,1.8,1.9
Message-ID: <200512060504.jB654F4l027242@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27208/html/download

Modified Files:
	vendors.list 
Log Message:
Add LinPro to vendors list


Index: vendors.list
===================================================================
RCS file: /cvs/fedora/web/html/download/vendors.list,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vendors.list	1 Dec 2005 22:02:40 -0000	1.8
+++ vendors.list	6 Dec 2005 05:03:43 -0000	1.9
@@ -46,6 +46,8 @@
 
 LinCD::4 CDs or 1 DVD::$7.96 or $2.99
 
+LinPro::4 CDs or 1 DVD::107.10 CZK or 95 CZK
+
 LinuxBazar (India only)::3 CDs::INR 100 + shipping
 
 LinuxElectrons::3 CDs 1 DVD::$7 or $9



From fedora-extras-commits at redhat.com  Tue Dec  6 05:11:14 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 00:11:14 -0500
Subject: web/include navigation.inc,1.14,1.15
Message-ID: <200512060511.jB65BiRb027308@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27291

Modified Files:
	navigation.inc 
Log Message:
Crufty links to docs found their way into the navigation.inc, replaced with useful links.


Index: navigation.inc
===================================================================
RCS file: /cvs/fedora/web/include/navigation.inc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- navigation.inc	29 Nov 2005 17:36:14 -0000	1.14
+++ navigation.inc	6 Dec 2005 05:11:11 -0000	1.15
@@ -16,9 +16,10 @@
 	"News"=>array("uri"=>"/News/"),
 	"Documentation"=>array("uri"=>"/docs/","sub"=>array(
 		"Release Notes"=>array("uri"=>"/docs/release-notes/"),
+		"Installation Guide"=>array("uri"=>"/docs/fedora-install-guide-en/"),
+		"Managing Software With Yum"=>array("uri"=>"/docs/yum/index.php"),
 		"Jargon Buster"=>array("uri"=>"/docs/jargon-buster/"),
                 "SELinux FAQ"=>array("uri"=>"/docs/selinux-faq/"),
-                "Keeping Up to Date"=>array("uri"=>"/docs/updates/"),
 		"Developer's Guide"=>array("uri"=>"/docs/developers-guide/"),
 		"Documentation Guide"=>array("uri"=>"/docs/documentation-guide/"),
 		)),



From fedora-extras-commits at redhat.com  Tue Dec  6 06:46:37 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:46:37 -0500
Subject: web/html/About FAQ.php,NONE,1.1
Message-ID: <200512060646.jB66kbg2029085@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/About
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29074

Added Files:
	FAQ.php 
Log Message:
I'm hoping gdk forgot to add this to the repo, otherwise this content needs a refresh and the links do, too.  I'm putting this in a placeholder to avoid 404 errors.


***** Error reading new file: [Errno 2] No such file or directory: 'FAQ.php'



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:21 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:21 -0500
Subject: web/html/About/legal index.php,NONE,1.1
Message-ID: <200512060653.jB66rL1a029195@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/About/legal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/About/legal

Added Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


***** Error reading new file: [Errno 2] No such file or directory: 'index.php'



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:09 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:09 -0500
Subject: web/html/About/Projects/translations translation-faq.php,1.1,1.2
Message-ID: <200512060654.jB66sAtc029330@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/About/Projects/translations
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/About/Projects/translations

Modified Files:
	translation-faq.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: translation-faq.php
===================================================================
RCS file: /cvs/fedora/web/html/About/Projects/translations/translation-faq.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- translation-faq.php	29 Nov 2005 17:31:07 -0000	1.1
+++ translation-faq.php	6 Dec 2005 06:53:07 -0000	1.2
@@ -18,24 +18,24 @@
 
 
    Q: Does the Fedora Project need translators?
    
 
    
-Yes. We welcome everyone's contribution. You can contribute as a translator, a proof reader or a locale maintainer.
+Yes. We welcome everyone's contribution. You can contribute as a translator, a proof reader, or a locale maintainer.
 
    
 
     Q: How can I become a translator? 
    
 
    
-To become a translator, you need to register for a cvs account at the sign up page.
+To become a translator, you need to register for a CVS account at the sign up page.
 If there is an existing fedora translator's mailing list for your locale, you need to join that mailing list too.
 
    
-
     Q: I use Windows operating system, can I still participate? 
    
+
     Q: I use a Microsoft Windows operating system, can I still participate? 
    
 
    
-Yes you can, however, you need to be able to manage ssh and cvs on your current operating system.
+Yes you can, however, you need to be able to manage ssh and CVS on your current operating system.
 
    
 
    Q: What sort of the files do we translate? 
    
 
    
-There are two types of translation: software interface and documentation. Both types of files are in PO format. Currently only software interface type of files are available for translation. Once the documentation files are available, it will be announced via fedora translation project mailing list.
+There are two types of translation: software interface and documentation. Both types of files are in PO format. Currently only software interface type of files are available for translation through the Web-based translation tools.  Documentation translation currently requires direct CVS access through the Fedora Documentation Project, refer to the wiki at DocsProject/Translation for more information.
 
    
 
    Q: Where do I get the files to translate? 
    
 
    
-The files are stored in CVS. You need to "check out" the files from CVS. Refer to the CVS FAQ for more information.
+The files are stored in CVS. You need to check out the files from CVS. Refer to the CVS FAQ for more information.
 
    
 
    Q: Is there any translation guide for the Fedora Project? 
    
 
    
@@ -43,11 +43,11 @@
 
    
 
     Q: How can I request to have a mailing list set up for my locale? 
    
 
    
-If there are 5 or more people are contributing to the translation of a locale, a mailing list dedicated to that locale can be set up. You may find your fellow contributors and request new mailing list from the fedora translation project mailing list.
+If there are 5 or more people who are contributing to the translation of a locale, a mailing list dedicated to that locale can be set up. You may find your fellow contributors and request a new mailing list from the fedora translation project mailing list.
 
    
 
     Q: There are no existing po files for my locale. How can I add the new locale? 
    
 
    
-Send your request to fedora translation project mailing list, you will be notified when the initial files are created and ready for translation.
+Send your request to the fedora translation project mailing list, you will be notified when the initial files are created and ready for translation.
 
    
 
     Q: How do I get my new locale enabled for installs? 
    
 
    
@@ -58,60 +58,59 @@
 
      
 
    1.  Close all instances of the programs that use the .po file 
      2. 
 
    2.  Go to the directory that contains the file and then run :
-
      	$ msgfmt your_locale.po -o package_name.mo 
+
      $ msgfmt your_locale.po -o package_name.mo 
 
       
      3. 
 
    3.  Make a backup copy of the file
 /usr/share/locale/your_locale/LC_MESSAGES/package_name.mo 
      4. 
 
    4.  Copy the new file in the catalog directory:
-
      -$	cp package_name.mo /usr/share/locale/your_locale/LC_MESSAGES/.
+
      $ cp package_name.mo /usr/share/locale/your_locale/LC_MESSAGES/
 
       
      5. 
-
    5.  Run the program and your translation will be there. 
      6. 
+
    6.  Run the program and your translation should be in use.
      7. 
 
    
-
     Q: Will the newest po file automatically be included in the next distribuited rpm package? 
    
+
     Q: Is the newest po file automatically be included in the next distribuited rpm package? 
    
 
    
-The answer is "yes" if the newest po file is commited to cvs before the final build of the rpm package. However, this is not an automated process at this stage. The best way to ensure your translation is included in the release is to adhere the translation freeze date, as outlined on Fedora schedule page.
+The answer is "yes" if the newest po file is commited to CVS before the final build of the software package (RPM). However, this is not an automated process at this stage. The best way to ensure your translation is included in the release is to adhere to the translation freeze date, as outlined on Fedora schedule page.
 
    
-
     Q: What should I do if my translations is not included in the distributed rpm package? 
    
+
     Q: What should I do if my translations is not included in the distributed package? 
    
 
    
-File a bug report against that package on bugzilla, providing detailed information such as your locale, the version of the po file etc.
+File a bug report against that package on bugzilla, providing detailed information such as your locale, the version of the po file, and so forth.
 
    
 
    
 
-
     CVS FAQ 
    
+
     CVS FAQ 
    
 
     Q: How can I get a CVS account?
    
 
    
 To get a CVS account, you need to register as a translator at the sign up page.
 
    
-
     Q: How do I generate the ssh keys required for cvs account? 
    
-
     Issue the command "ssh-keygen -t dsa" in a terminal, accepting the default location ~/.ssh/. Your public key will be ~/.ssh/id_dsa.pub. You need to copy and paste the content of that file into the registration page.
+
     Q: How do I generate the ssh keys required for CVS account? 
    
+
     Issue the command "ssh-keygen -t dsa" in a terminal, accepting the default location ~/.ssh/. Your newly created public key is at ~/.ssh/id_dsa.pub. You need to copy and paste the content of that file into the registration page.
 
    
 
     Q: I forgot the password to my ssh keys, what should I do? 
    
 
    
 You need to generate another set of ssh keys and email i18n at redhat.com with your login name and the new public key to get your account information updated.
 
    
-
     Q: I have a working account, How do I ceckout the files from cvs server? 
    
+
     Q: I have a working account, how do I checkout the files from the CVS server? 
    
 
    
-Open a terminal and issue following commands:
+Open a terminal and issue the following commands:
 
     $ export CVS_RSH=ssh
-$ export CVSROOT=:ext:@i18n.redhat.com:/usr/local/CVS
+$ export CVSROOT=:ext:USERNAME@i18n.redhat.com:/usr/local/CVS
 $ cvs -z9 co translate
 
    
 
    
 
     Q: What is the CVSROOT to check out the translation files? 
    
 
    
-CVSROOT=:ext:@i18n.redhat.com:/usr/local/CVS
+CVSROOT=:ext:USERNAME@i18n.redhat.com:/usr/local/CVS
 
    
-
     Q: I get timeout error when connecting to cvs, what should I check first? 
    
+
     Q: I get a timeout error when connecting to CVS, what should I check first? 
    
 
    
-You need to check if you have specified "export CVS_RSH=ssh" when trying to connect to cvs server.
+You need to check if you have specified "export CVS_RSH=ssh" when trying to connect to the CVS server.
 
    
-
     Q: I get "permission denied" error when connecting to cvs, what should I do? 
    
+
     Q: I get a "permission denied" error when connecting to CVS, what should I do? 
    
 
    
-You need to first make sure that your cvs account has been approved. If you have an active cvs account but still get "permission denied" error, email i18n at redhat.com with your current ssh key file (~/.ssh/id_dsa.pub) as attachment.
+First, make sure that your CVS account has been approved. If you have an active CVS account but still get the "permission denied" error, email i18n at redhat.com with your current ssh key file (~/.ssh/id_dsa.pub) as an attachment.
 
    
-
     Q: I have done the initial checkout from the cvs server. What should I do if I want the latest version? 
    
+
     Q: I have done the initial checkout from the CVS server. What should I do if I want the latest version? 
    
 
    
 Open a terminal, change to your "translate" directory, issue the following command:
 
    @@ -122,47 +121,47 @@
 
    
 Open a terminal, change to the directory containing the po file, issue the following command:
 
    -$ cvs -f commit -l -m ''some message you want to record in the log'
+$ cvs -f commit -l -m "some message you want to record in the log"
 
     
    
-
     Q: Can I add files to cvs? 
    
+
     Q: Can I add files to CVS? 
    
 
    
-No. If you need to add new po files to any package, send your completed translation to i18n.redhat.com for cvs addition.
+No. If you need to add new po files to any package, send your completed translation to i18n.redhat.com for CVS addition.
 
    
 
    
 
     Status Page FAQ 
    
 
     Q: How do I see the translation status of my locale? 
    
 
    
-Go to the status page, select your language from the drop down list, then press Show Status button.
+Go to the status page, select your language from the drop down list, then press the Show Status button.
 
    
-
     Q: What does the "availability" field of each package mean? 
    
+
     Q: What does the Availability field of each package mean? 
    
 
    
-Availability field indicates the different translation status of the file.
+The Availability field indicates the different translation status of the file.
 
    
 
      
-
    •  Finished: The translation is finished. Anyone with cvs access to that locale is able to review and make changes to the file. 
      • 
-
    •  QA: The file is translated and waiting to be QA'ed by the package maintainer. 
      • 
-
    •  Take: The translation is not complete and is available. Anyone with cvs access to that locale is able to take the translation task. 
      • 
-
    •  Assigned: The file is currently being translated by another person. Only the assigned translator is able to commit the changes to that file. 
      • 
+
    •  Finished: The translation is finished. Anyone with CVS access to that locale is able to review and make changes to the file. 
      • 
+
    •  QA: The file is translated and waiting to be QA'ed by the package maintainer. 
      • 
+
    •  Take: The translation is not complete and is available. Anyone with CVS access to that locale is able to take the translation task. 
      • 
+
    •  Assigned: The file is currently being translated by another person. Only the assigned translator is able to commit changes to that file. 
      • 
 
    
 
     Q: How do I "take" the files I want to translate? 
    
 
    
-If a file is available for translation, the availability field will show a Take button. Click that button, enter your username and password. Then the availability field will be changed to Assigned. The username is your cvs account login name, your password is the pin code issued when the account was approved.
+If a file is available for translation, the Availability field shows a Take button. Click that button, enter your username and password. Then the availability field will be changed to Assigned. The username is your CVS account login name, your password is the PIN code issued when the account was approved.
 
    
 
     Q: What should I do if I don't want to translate the file I've taken any more? 
    
 
    
-You should "release" the file if you no longer wish to work on it. Click the package name, then press Release button in Translation Status field. The file then is available for taken by other translators.
+You should "release" the file if you no longer wish to work on it. Click the package name, then press Release button in the Translation Status field. The file then is available to be taken by other translators.
 
    
-
     Q: I forgot my pin code. What should I do? 
    
+
     Q: I forgot my PIN code. What should I do? 
    
 
    
-Email i18n at redhat.com with your login name. Your pin code will be reissued and send to the email address you used to register the cvs account.
+Email i18n at redhat.com with your login name. Your PIN code is reissued and sent to the email address you used to register the CVS account.
 
    
 
     Q: How can I apply to be the maintainer of a package? 
    
 
    
-If you have translated most part of a particular package and wish to maintain any future translation to keep the consistency, you can apply to be the maintainer for that package in your locale. Click on the package name, then click Apply button next to Maintainer field.
+If you have translated most part of a particular package and wish to maintain any future translation to keep the consistency, you can apply to be the maintainer for that package in your locale. Click on the package name, then click Apply button next to Maintainer field.
 
    
 
     Q: I'm a maintainer. How can I approve the files in QA stage? 
    
 
    
-Click on the package name, then click Approve next to the Translation Status field.
+Click on the package name, then click Approve next to the Translation Status field.
 
    
 
     Q: I like to have new features implemented in the status page. Who should I contact? 
    
 
    



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:43 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:43 -0500
Subject: web/html/Download install.php,1.1,1.2
Message-ID: <200512060654.jB66sD0k029333@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/Download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/Download

Modified Files:
	install.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: install.php
===================================================================
RCS file: /cvs/fedora/web/html/Download/install.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- install.php	29 Nov 2005 17:32:36 -0000	1.1
+++ install.php	6 Dec 2005 06:53:40 -0000	1.2
@@ -10,7 +10,7 @@
 
 
    Download and Installation Instructions
    
 
    
-Read through the instructions before you begin to download Fedora Core.  These instructions are also available in a printable version.
+Read through the instructions before you begin to download Fedora Core.  These instructions are also available in a printable version.  For a more detailed treatment, refer to the Fedora Installation Guide.
 
    
 
 
    



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:15 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:15 -0500
Subject: web/html/About/Projects/translations/translation-windows
	generated-index.php, 1.1, 1.2 index.php, 1.1,
	1.2 ln-legalnotice.php, 1.1, 1.2 s1-cvs.php, 1.1,
	1.2 s1-cycle.php, 1.1, 1.2 s1-poedit.php, 1.1, 1.2 s1-reg.php,
	1.1, 1.2 s1-resource.php, 1.1, 1.2 s1-setup.php, 1.1,
	1.2 s1-ssh.php, 1.1, 1.2
Message-ID: <200512060654.jB66sFHO029337@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/About/Projects/translations/translation-windows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/About/Projects/translations/translation-windows

Modified Files:
	generated-index.php index.php ln-legalnotice.php s1-cvs.php 
	s1-cycle.php s1-poedit.php s1-reg.php s1-resource.php 
	s1-setup.php s1-ssh.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: generated-index.php
===================================================================
RCS file: /cvs/fedora/web/html/About/Projects/translations/translation-windows/generated-index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- generated-index.php	29 Nov 2005 17:31:12 -0000	1.1
+++ generated-index.php	6 Dec 2005 06:53:13 -0000	1.2
@@ -7,7 +7,7 @@
 
 ?>
 
-
    Index
    Prev???
    Index
    F
    Fedora Account
    register, Register Your Fedora Account
    I
    Introduction, Introduction
    L
    Lifecycle, Translation Lifecycle
    P
    poEdit
    download, Download and Install !
 poEdit
    install, Download and Install poEdit
    setup, Setup poEdit
    start, Setup poEdit
    R
    resource
    websites,  Related Websites 
    S
    SSH keys, Generate Your Digital ID
    Status page
    release,  Phase 5 
    take,  Phase 1 
    T
    TortoiseCVS
    connecting to cvs server,  Download Files from Fedora Server 
    cvs commit,  Phase 4 
    cvs up,  Phase 2 
    download, Download and Install TortoiseCVS
    install, Download and Install TortoiseCVS
    setup,  Set up TortoiseCVS 
    Prev?Up?
    8.?Other Resources?Home?
    
+
    Index
    Prev   
    Index
    F
    Fedora Account
    register, Register Your Fedora Account
    I
    Introduction, Introduction
    L
    Lifecycle, Translation Lifecycle
    P
    poEdit
    download, Downlo!
 ad and Install poEdit
    install, Download and Install poEdit
    setup, Setup poEdit
    start, Setup poEdit
    R
    resource
    websites,  Related Websites 
    S
    SSH keys, Generate Your Digital ID
    Status page
    release,  Phase 5 
    take,  Phase 1 
    T
    TortoiseCVS
    connecting to cvs server,  Download Files from Fedora Server 
    cvs commit,  Phase 4 
    cv!
 s up,  Phase 2 
    !
 downlo
 Download and Install TortoiseCVS
    install, Download and Install TortoiseCVS
    setup,  Set up TortoiseCVS 
    Prev Up 
    8. Other Resources Home 
    
 
 
 
-
    Translate Fedora in Microsoft Windows
    ???Next
    Translate Fedora in Microsoft? Windows?
    Chester Cheng
    Copyright ? 2004 Red Hat, Inc., Chester Cheng
    1. Introduction
    2. !
 Download and Install TortoiseCVS
    3. Generate Your Digital ID
    4. Register Your Fedora Account
    5. Using TortoiseCVS
    5.1.  Set up TortoiseCVS 
    5.2.  Download Files from Fedora Server 
    6.  poEdit 
    6.1. Download and Install poEdit
    6.2. Setup poEdit
    7. Translation Lifecycle
    7.1.  Phase 1 
    7.2.  Phase 2 
    7.3.  Phase 3 
    7.4.  Phase 4 
    7.5.  Phase 5 
    8. !
 Other 
ources
    8.1.  Related Websites 
    8.2.  Your Feedback 
    1.?Introduction
    
+
    Translate Fedora in Microsoft Windows
       Next
    Translate Fedora in Microsoft® Windows®
    Chester Cheng
    Copyright © 2004 Red Hat, Inc., Chester Cheng
    1.!
  Introduction
    2. Download and Install TortoiseCVS
    3. Generate Your Digital ID
    4. Register Your Fedora Account
    5. Using TortoiseCVS
    5.1.  Set up TortoiseCVS 
    5.2.  Download Files from Fedora Server 
    6.  poEdit 
    6.1. Download and Install poEdit
    6.2. Setup poEdit
    7. Tran!
 slation Lifecycle
    7.1.  Phase 1 
    7.2.  Phase 2 
    7.3.  Phase 3 
    7.4.  Phase 4 
    7.5.  Phase 5 
    8. Other Resources
    8.1.  Related Websites 
    8.2.  Your Feedback 
    1. Introduction
    
       To join the Fedora translation team and work with people around the world
-      is easy in Microsoft? Windows? as well. To achieve this, several
+      is easy in Microsoft® Windows® as well. To achieve this, several
       tools are needed:
 	
    • 
     A Web Browser that supports cookies
 	
    • 
-    A Concurrent Versions System (CVS) client —
-	This artical uses TortoiseCVS
+    A Concurrent Versions System (CVS) client —
+	This artical uses TortoiseCVS
 	
    • 
-    An editor for .po files — This article uses poEdit
+    An editor for .po files — This article uses poEdit
 	
    • 
-    A Secury Shell (ssh) client — This article uses puttygen
+    A Secury Shell (ssh) client — This article uses puttygen
 	which is a free utility that generates personalized digital ID, using public key infrastructure.
-	This utility is bundled within TortoiseCVS
+	This utility is bundled within TortoiseCVS
 	
    
 	This article will introduce you where to find and download these tools, how to install and setup,
 	and even a brief description of how to use them.
-	
    ???Next
    ???2.?Download and Install TortoiseCVS
    
+	
       Next
       2. Download and Install TortoiseCVS
    
 
 
    
     Garrett LeSage created the admonition graphics (note, tip, important,
-    caution, and warning). They may be freely redistributed with documentation
-    produced for the Red Hat Linux project.
+    caution, and warning).
+    Tommy Reynolds  created the callout graphics.
+    They all may be freely redistributed with documentation
+    produced for the Fedora Project.
     
    
     how-to-translate-fedora-in-windows-0.1 (2004-09-16)
   
    
-    Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux
-    Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts,
-    Rawhide and all Red Hat-based trademarks and logos are trademarks or registered
-    trademarks of Red Hat, Inc. in the United States and other countries.
-  
    
-    Linux is a registered trademark of Linus Torvalds.
-  
    
-    Motif and UNIX are registered trademarks of The Open Group.
-  
    
-    Intel and Pentium are registered trademarks of Intel Corporation. Itanium
-    and Celeron are trademarks of Intel Corporation.
-  
    
-    AMD, AMD Athlon, AMD Duron, and AMD K6 are trademarks of Advanced Micro
-    Devices, Inc.
-  
    
-    Windows is a registered trademark of Microsoft Corporation.
-  
    
-    SSH and Secure Shell are trademarks of SSH Communications Security, Inc.
-  
    
-    FireWire is a trademark of Apple Computer Corporation.
+    Red Hat and the Red Hat "Shadow Man" logo are registered trademarks of
+    Red Hat, Inc. in the United States and other countries.
   
    
     All other trademarks and copyrights referred to are the property of their
     respective owners.


Index: s1-cvs.php
===================================================================
RCS file: /cvs/fedora/web/html/About/Projects/translations/translation-windows/s1-cvs.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s1-cvs.php	29 Nov 2005 17:31:12 -0000	1.1
+++ s1-cvs.php	6 Dec 2005 06:53:13 -0000	1.2
@@ -7,41 +7,41 @@
 
 ?>
 
-
    2.?Download and Install TortoiseCVS
    Prev???Next
    2.?Download and Install TortoiseCVS
    
-      To download TortoiseCVS, go to:
+
    2. Download and Install TortoiseCVS
    Prev   Next
    2. Download and Install TortoiseCVS
    
+      To download TortoiseCVS, go to:
 
     http://www.tortoisecvs.org/download.shtml
 
    
 	  For demonstration purpose, this artical uses TortoiseCVS-1.6.14.
     
    
-	To install TortoiseCVS, double-click the file you just downloaded.
+	To install TortoiseCVS, double-click the file you just downloaded.
 	The following screenshots illustrate the installation process step by step:
 	
    
 			Welcome to TortoiseCVS setup.
-        
    Figure?1.?Welcome to TortoiseCVS setup
    
+        
    Figure 1. Welcome to TortoiseCVS setup
    
 			Select destination directory.
-        
    Figure?2.?Select Destination Directory
    
+        
    Figure 2. Select Destination Directory
    
 			Select components.
-        
    Figure?3.?Select Components
    
+        
    Figure 3. Select Components
    
 			Installing.
-        
    Figure?4.?Installing
    
+        
    Figure 4. Installing
    
 			Finish.
-        
    Figure?5.?Finish
    Prev?Up?Next
    Translate Fedora in Microsoft Windows?Home?3.?Generate Your Digital ID
    
+        ">
    Figure 5. Finish
    Prev Up Next
    Translate Fedora in Microsoft Windows Home 3. Generate Your Digital ID
    
 
 
 
-
    7.?Translation Lifecycle
    Prev???Next
    7.?Translation Lifecycle
    
+
    7. Translation Lifecycle
    Prev   Next
    7. Translation Lifecycle
    
 To keep the consistency of all documents among Fedora repository and translators, a translation lifecycle is
-being established. The life cycle involves 5 phases as shown in Table?1.
-
    PhaseActionSoftwareWhereLogin Requires
    Section?7.1, “ Phase 1 ”Take the file you want to translate
-(if no other translators took it)Any Web broswer with cookies enabledFedora Translation Status PageLogin name and PIN code
    Section?7.2, “ Phase 2 ”Download the latest file from Fedora repositoryTortoiseCVS or other CVS clientIn TortoiseCVS, right click the translate
-folder, choose CVS updatePassphrase of your private key
    Section?7.3, “ Phase 3 ”Edit the file you had taken.
-Save before you finishpoEdit or other editorsFor poEdit, click start =>
-All Programs => poEdit =>
-poEdit, then open the file you want to edit in the
+being established. The life cycle involves 5 phases as shown in Table 1, “Fedora PO file translation life cycle”.
+
    PhaseActionSoftwareWhereLogin Requires
    Section 7.1, “ Phase 1 ”Take the file you want to translate
+(if no other translators took it)Any Web broswer with cookies enabledFedora Translation Status PageLogin name and PIN code
    Section 7.2, “ Phase 2 ”Download the latest file from Fedora repositoryTortoiseCVS or other CVS clientIn TortoiseCVS, right click the translate
+folder, choose CVS updatePassphrase of your private key
    Section 7.3, “ Phase 3 ”Edit the file you had taken.
+Save before you finishpoEdit or other editorsFor poEdit, click start =>
+All Programs => poEdit =>
+poEdit, then open the file you want to edit in the
 translate folder. Or double-click the file directly in
-Windows ExplorerN/A
    Section?7.4, “ Phase 4 ”Upload your file back to Fedora repositoryTortoiseCVS or other CVS clientIn TortoiseCVS, right click translate
-folder, choose CVS update; Right click translate folder,
-choose CVS commmit if  there are no conflicts between files on your machine and the server.Passphrase of your private key
    Section?7.5, “ Phase 5 ”Release the file you have taken if you don't wish to translate any moreAny Web broswer with cookies enabledFedora Translation Status PageLogin name and PIN code
    Table?1.?Fedora PO file translation life cycle
    7.1.? Phase 1 
    
+Windows Explorer
    		N/A
    Section 7.4, “ Phase 4 ”Upload your file back to Fedora repositoryTortoiseCVS or other CVS clientIn TortoiseCVS, right click translate
+folder, choose CVS update; Right click translate folder,
+choose CVS commmit if  there are no conflicts between files on your machine and the server.Passphrase of your private key
    Section 7.5, “ Phase 5 ”Release the file you have taken if you don't wish to translate any moreAny Web broswer with cookies enabledFedora Translation Status PageLogin name and PIN code
    Table 1. Fedora PO file translation life cycle
    7.1.  Phase 1 
    
 Open your browser and go to:
 
     http://i18n.redhat.com/cgi-bin/i18n-status
 
    
-After select your language, you'll see a web page similar to Figure?32.
+After select your language, you'll see a web page similar to Figure 32, “Take a File for Translation”.
 In this example, po file in package dist has 839 entries untranslated and not taken
-by any translator. To claim this file, press the Take link at the right hand side.
+by any translator. To claim this file, press the Take link at the right hand side.
 
    
 			To take a file for translation.
-        
    Figure?32.?Take a File for Translation
    
+        ">
    Figure 32. Take a File for Translation
    
 If the file is not available for translation because someone else is working on it, you will see the
-status as Assigned, as shown in Figure?33.
+status as Assigned, as shown in Figure 33, “File Has Been Taken”.
 
    
 			File has been taken.
-        
    Figure?33.?File Has Been Taken
    
-After click the Take link, you'll be prompted for username and password
-(Figure?34). Please enter your Login name and PIN code as described in
-Figure?12.
+        ">
    Figure 33. File Has Been Taken
    
+After click the Take link, you'll be prompted for username and password
+(Figure 34, “Username and Password Prompt”). Please enter your Login name and PIN code as described in
+Figure 12, “Example Email”.
 
    
 			Username and password prompt.
-        
    Figure?34.?Username and Password Prompt
     The system will assign the file to you after you successfully login (Figure?35), or display the error page upon unsuccessful login (Figure?36). Please email i18n at redhat.com
+        ">
    Figure 34. Username and Password Prompt
     The system will assign the file to you after you successfully login (Figure 35, “File is Assigned to You”), or display the error page upon unsuccessful login (Figure 36, “Authentication Failed”). Please email i18n at redhat.com
 to request your PIN code to be reissued if you have lost it.
 
    
 			File is assigned to you.
-        
    Figure?35.?File is Assigned to You
    
+        
    Figure 35. File is Assigned to You
    
 			Authentication failed.
-        
    Figure?36.?Authentication Failed
    7.2.? Phase 2 
    
+        ">
    Figure 36. Authentication Failed
    7.2.  Phase 2 
    
 To download the latest files from server, please right-click on the translate
-folder in Windows Explorer and select CVS Update
-You'll be prompted to enter the passphrase of your private key before TortoiseCVS
-can continue. Figure?37 illustrates.
+folder in Windows Explorer and select CVS Update
+You'll be prompted to enter the passphrase of your private key before TortoiseCVS
+can continue. Figure 37, “Get Update Files from CVS” illustrates.
 
    
 			Get update files from cvs repository.
-        
    Figure?37.?Get Update Files from CVS
    
-You'll see a screen similar to Figure?38 after the update successfully finished.
+        ">
    Figure 37. Get Update Files from CVS
    
+You'll see a screen similar to Figure 38, “Update Successful” after the update successfully finished.
 The letter "P" in front of any file stands for "patched", which means minor changes from the server had been
 patched to your files; while "U" stands for "updated" that your file is overwritten by the latest version due
 to major changes. Don't be panic if you see "P" and "U" since we work in the community environment the files
@@ -62,23 +62,23 @@
 that's the beauty of cvs.
 
    
 			Update successful.
-        
    Figure?38.?Update Successful
    7.3.? Phase 3 
    
+        ">
    Figure 38. Update Successful
    7.3.  Phase 3 
    
 Open the file you had taken and downloaded from the server. You can either double click on the
-.po file or open the .po file within poEdit
+.po file or open the .po file within poEdit
 application. Don't forget to save your changes before you finish everything.
-
    7.4.? Phase 4 
    
+
    7.4.  Phase 4 
    
 To upload the file you've taken and subsequently translated back to cvs server is similar to
-download operation. Right-click on translate folder in Windows
-Explorer and select CVS Update. You'll be prompted to enter
-the passphrase of your private key before TortoiseCVS can continue.
-After you correctly input your passphrase, you may see a screen similar to Figure?39.
+download operation. Right-click on translate folder in Windows
+Explorer and select CVS Update. You'll be prompted to enter
+the passphrase of your private key before TortoiseCVS can continue.
+After you correctly input your passphrase, you may see a screen similar to Figure 39, “Update Before Commit”.
 
    
 			Update before commit.
-        
    Figure?39.?Update Before Commit
    
+        ">
    Figure 39. Update Before Commit
    
 "M" stands for "modified". It indicates that this file had been modified on YOUR
 local machine and needed to be uploaded to server.
 
    
-If you see a capital "C" instead of "M", then it's time to panic. :P (See Figure?40.)
+If you see a capital "C" instead of "M", then it's time to panic. :P (See Figure 40, “File Conflict”.)
 "C" stands for "conflict", which means while you were modifying your local file
 this file on the server has been changed at the same time.
 This may be caused by the package maintainer who merged your file with .pot
@@ -88,37 +88,37 @@
 and relavant mailing lists.
 
    
 			File conflict
-        
    Figure?40.?File Conflict
    
-If everything is fine, you can upload the file you had modified. Choose CVS Commit
-after you right-click on the translate folder, as shown in Figure?41.
+        ">
    Figure 40. File Conflict
    
+If everything is fine, you can upload the file you had modified. Choose CVS Commit
+after you right-click on the translate folder, as shown in Figure 41, “Commit Files to Server”.
 
    [Note] Note 
    
 cvs update will notify you the file modification on your local
 computer. It will NOT, however, upload the file back to server until you choose to
 cvs commit.
 
    
 			Commit files to server.
-        
    Figure?41.?Commit Files to Server
    
-You'll see a list of modified files, as shown in Figure?42. Check the file(s)
+        ">
    Figure 41. Commit Files to Server
    
+You'll see a list of modified files, as shown in Figure 42, “Commit Files to Server”. Check the file(s)
 you will upload to the server. It is also recommended to key in some comments, so other translators
-can easily track what has been changed in any file. Press OK to upload the file.
+can easily track what has been changed in any file. Press OK to upload the file.
 
    
 			Commit files to server.
-        
    Figure?42.?Commit Files to Server
    
+        ">
    Figure 42. Commit Files to Server
    
 Again, you'll be prompted the passphrase of your private key. After files are successfully uploaded
-to server, you will see a screen similar to Figure?43.
+to server, you will see a screen similar to Figure 43, “Commit Files to Server Successfully”.
 
    
 			Commit files to server successfully.
-        
    Figure?43.?Commit Files to Server Successfully
    7.5.? Phase 5 
    
+        ">
    Figure 43. Commit Files to Server Successfully
    7.5.  Phase 5 
    
 The phase is an optional one, only occurs when you decide to stop working on a file before it's fully translated. For example, you may go on a holiday and don't want to keep working on a file but would like others to be able
 to resume the work. To do so, you need to go to the Fedora status page, find the package you had taken,
 and click the package name to view the detail. On the bottom of that page, you would see the
-Release link, as shown in Figure?44.
+Release link, as shown in Figure 44, “Release File Screen”.
 
    
 			Release file screen.
-        
    Figure?44.?Release File Screen
    
+        ">
    Figure 44. Release File Screen
    
 This is the end of the life cycle of Fedora software translation. We do hope you enjoy being with part of the
 open source community and continue lending your support.
-
    Prev?Up?Next
    6.? poEdit ?Home?8.?Other Resources
    
+
    Prev Up Next
    6.  poEdit  Home 8. Other Resources
    
 
 
 
-
    6.? poEdit 
    Prev???Next
    6.? poEdit 
    6.1.?Download and Install poEdit
    
-	  To download poEdit, go to
+
    6.  poEdit 
    Prev   Next
    6.  poEdit 
    6.1. Download and Install poEdit
    
+	  To download poEdit, go to
 
     http://poedit.sourceforge.net/download.php#win32
 
 
    
 	For demonstration purpose, this article uses poEdit-1.3.1.
       
    
-	  Installing poEdit is as easy and straight-forward as installing
-	  TortoiseCVS. The main steps are:
+	  Installing poEdit is as easy and straight-forward as installing
+	  TortoiseCVS. The main steps are:
 	  
    
 			Welcome
-        
    Figure?21.?Welcome
    
+        
    Figure 21. Welcome
    
 			Licience agreement
-        
    Figure?22.?Licience Agreement
    
+        
    Figure 22. Licience Agreement
    
 			Select destination location
-        
    Figure?23.?Select Destination Location
    
+        
    Figure 23. Select Destination Location
    
 			Select components
-        
    Figure?24.?Select Components
    
+        
    Figure 24. Select Components
    
 			Select start menu folder
-        
    Figure?25.?Select Start Menu Folder
    
+        
    Figure 25. Select Start Menu Folder
    
 			Ready to install
-        
    Figure?26.?Ready To Install
    
+        
    Figure 26. Ready To Install
    
 			Installing
-        
    Figure?27.?Installing
    
+        
    Figure 27. Installing
    
 			Finish
-        
    Figure?28.?Finish
    6.2.?Setup poEdit
    
-	To start poEdit, click start =>
-	All Programs => poEdit =>
-	poEdit. You will a screen similar to Figure?29.
+        ">
    Figure 28. Finish
    6.2. Setup poEdit
    
+	To start poEdit, click start =>
+	All Programs => poEdit =>
+	poEdit. You will a screen similar to Figure 29, “Starting poEdit”.
 	
    
 			Starting poEdit.
-        
    Figure?29.?Starting poEdit
    
-	To configure poEdit, go to File =>
-	Preferences (Figure?30).
-	Enter your name and email address as shown in Figure?31, then press
-	OK.
+        ">
    Figure 29. Starting poEdit
    
+	To configure poEdit, go to File =>
+	Preferences (Figure 30, “Preference Submenu”).
+	Enter your name and email address as shown in Figure 31, “poEdit Preference Screen”, then press
+	OK.
 	
    
 			Preference submenu
-        
    Figure?30.?Preference Submenu
    
+        
    Figure 30. Preference Submenu
    
 			poEdit Preference screen
-        
    Figure?31.?poEdit Preference Screen
    
+        ">
    Figure 31. poEdit Preference Screen
    
 	Huh~, finally! All the preparation has come to the end. In next section we'll step into
 	the real translation work.
-	
    Prev?Up?Next
    5.?Using TortoiseCVS?Home?7.?Translation Lifecycle
    
+	
    Prev Up Next
    5. Using TortoiseCVS Home 7. Translation Lifecycle
    
 
 
 
-
    4.?Register Your Fedora Account
    Prev???Next
    4.?Register Your Fedora Account
    
+
    4. Register Your Fedora Account
    Prev   Next
    4. Register Your Fedora Account
    
 	It is essential to have an account and password to access Fedora translation CVS.
 	To become a translator please sign up at:
 
    @@ -16,30 +16,30 @@
     
    
 	You need to provide your basic information include Login name, Real Name, a valid email address,
 	the language or locale you are going to translate, as well as the SSH public key that generated
-	from the previous step (refer to Section?3, “Generate Your Digital ID” and Figure?9).
-	This step is illustrated in Figure?10.
+	from the previous step (refer to Section 3, “Generate Your Digital ID” and Figure 9, “Key Generation In Progress”).
+	This step is illustrated in Figure 10, “Account Sign up Screen”.
 	
    
 			Account Sign up screen.
-        
    Figure?10.?Account Sign up Screen
    
-	Press Continue once you are done. The next screen (Figure?11)
-	shows your account detail. Press Submit to confirm.
+        ">
    Figure 10. Account Sign up Screen
    
+	Press Continue once you are done. The next screen (Figure 11, “Confirm Account Details”)
+	shows your account detail. Press Submit to confirm.
 	
    
 			Confirm account details.
-        
    Figure?11.?Confirm Account Details
    
+        ">
    Figure 11. Confirm Account Details
    
 	An email will be sent to the email address you provided advising your application is being processed.
 	Once the account is approved another email will be sent to you advising your login name and
-	PIN code. The example email is shown in Figure?12.
+	PIN code. The example email is shown in Figure 12, “Example Email”.
 	
    
 			Example email.
-        
    Figure?12.?Example Email
    [Note] Note 
    
+        ">
    Figure 12. Example Email
    [Note] Note 
    
 	In the example, the Login name is snowlet, while the PIN code is
 	0000. They are the information you use to access Fedora
 	translation status page, to take or release a file, to apply to be a maintainer,
 	or to approve a QA'ed file.
 	
    
-	Once the account is activated, we can setup TortoiseCVS to
+	Once the account is activated, we can setup TortoiseCVS to
 	download Fedora files.
-	
    Prev?Up?Next
    3.?Generate Your Digital ID?Home?5.?Using TortoiseCVS
    
+	
    Prev Up Next
    3. Generate Your Digital ID Home 5. Using TortoiseCVS
    
 
 
 
-
    8.?Other Resources
    Prev???Next
    8.?Other Resources
    8.1.? Related Websites 
     Official website of TortoiseCVS
    
+
    8. Other Resources
    Prev   Next
    8. Other Resources
    8.1.  Related Websites 
     Official website of TortoiseCVS
    
 	
     	http://www.tortoisecvs.org/
 	
    
-    
     Official website of poEdit
    
+    
     Official website of poEdit
    
 	
     	http://poedit.sourceforge.net/
 	
    
-    
     Official website of PuTTY
    
+    
     Official website of PuTTY
    
 	
     	http://www.chiark.greenend.org.uk/~sgtatham/putty/
 	
    
-    
      WinCvs CVS Client 
    
-	WinCvs is an alternative CVS client you can use. The following article
+    
      WinCvs CVS Client 
    
+	WinCvs is an alternative CVS client you can use. The following article
 	describes its installation steps in detail.
 	
     	http://sourceforge.net/docman/display_doc.php?docid=766&group_id=1
@@ -29,14 +29,14 @@
 	
     	http://www.loria.fr/~molli/cvs/doc/cvs_toc.html
 	
    
-    
    8.2.? Your Feedback 
    
+    
    8.2.  Your Feedback 
    
 Your feedback is always welcome! If you have spotted any typo or errors, please contact
 Chester Cheng,
 or simply discuss it through 
 Fedora Translation List.
 
    
 Hope this article has helped you to set things up.  Looking forward to hearing from you!
-
    Prev?Up?Next
    7.?Translation Lifecycle?Home?Index
    
+
    Prev Up Next
    7. Translation Lifecycle Home Index
    
 
 
 
-
    5.?Using TortoiseCVS
    Prev???Next
    5.?Using TortoiseCVS
    5.1.? Set up TortoiseCVS 
    
-      To connect TortoiseCVS to Fedora Translation Project CVS repository, you
+
    5. Using TortoiseCVS
    Prev   Next
    5. Using TortoiseCVS
    5.1.  Set up TortoiseCVS 
    
+      To connect TortoiseCVS to Fedora Translation Project CVS repository, you
 	  need to first setup the environment. These steps only need be done once. Right-click in
-	  Windows Explorer, choose CVS =>
-	  Preferences… as shown in Figure?13.
+	  Windows Explorer, choose CVS =>
+	  Preferences… as shown in Figure 13, “Setup Preferences”.
     
    
 			Setup preferences.
-        
    Figure?13.?Setup Preferences
    In Preferences popup window, click the Tools tab.
+        ">
    Figure 13. Setup Preferences
    In Preferences popup window, click the Tools tab.
 	Add the parameter –i <Your Private Key> as shown in
-	Figure?14. <Your Private Key> is the private
+	Figure 14, “TortoiseCVS Preferences Window - Tools”. <Your Private Key> is the private
 	key you generated and saved on your computer. Its corresponding public key has been
-	used to apply the Fedora account in Figure?10.
+	used to apply the Fedora account in Figure 10, “Account Sign up Screen”.
 	
    
 			TortoiseCVS Preferences Window - Tools
-        
    Figure?14.?TortoiseCVS Preferences Window - Tools
    
-	The next thing needs to be setup is Network compression (as shown in
-	Figure?15), which will effectively speedup checkout process.
+        ">
    Figure 14. TortoiseCVS Preferences Window - Tools
    
+	The next thing needs to be setup is Network compression (as shown in
+	Figure 15, “TortoiseCVS Preferences Window - Advanced”), which will effectively speedup checkout process.
 	Set 9 - Best for best compression if you have a powerful CPU.
 	
    
-	Press OK when you're done. Now you are ready to download files from the Fedora server.
+	Press OK when you're done. Now you are ready to download files from the Fedora server.
 	
    
 			TortoiseCVS Preferences Window - Advanced
-        
    Figure?15.?TortoiseCVS Preferences Window - Advanced
    5.2.? Download Files from Fedora Server 
    
+        ">
    Figure 15. TortoiseCVS Preferences Window - Advanced
    5.2.  Download Files from Fedora Server 
    
 	To download files from the Fedora server for the first time, it is important to tell
-	TortoiseCVS where to find them. Again, these only need to be done once.
+	TortoiseCVS where to find them. Again, these only need to be done once.
 	The information are in the email sent to you when your account is activated. You may refer to the
 	following example, but don't forget to change 'snowlet' into your own username.
 	
    
-	To start this, right click in Windows Explorer, choose
-	CVS checkout (also referred as "cvs co"). See Figure?16.
+	To start this, right click in Windows Explorer, choose
+	CVS checkout (also referred as "cvs co"). See Figure 16, “CVS Checkout Menu”.
 	
    
 			CVS Checkout menu.
-        
    Figure?16.?CVS Checkout Menu
    
-
+    
    
+
    
+      Another source for updated information about the test release is http://fedoraproject.org/wiki/FC5Test1CommonProblems.
+    
    
+
    [Note] Note 
    
-	Sometimes CVS checkout menu just doesn't appear.
+        ">
    Figure 16. CVS Checkout Menu
    [Note] Note 
    
+	Sometimes CVS checkout menu just doesn't appear.
 	Try to perform this action in "C:\" root directory.
 	
    
 	You can find the CVSROOT in the email Fedora had sent you.
-	The information in Figure?17 is for your reference only. Don't forget to change the
-	User name: field to match your own account. The module for Fedora translation
+	The information in Figure 17, “CVS Root and Module” is for your reference only. Don't forget to change the
+	User name: field to match your own account. The module for Fedora translation
 	is translate.
 	
    
 			CVS root and module.
-        
    Figure?17.?CVS Root and Module
    
-	Press OK will lead you to Figure?18.
+        ">
    Figure 17. CVS Root and Module
    
+	Press OK will lead you to Figure 18, “TortoisePlink”.
 	
    
 			TortoisePlink.
-        
    Figure?18.?TortoisePlink
    
-	Here, TortoiseCVS is trying to connect Fedora CVS repository to get all
+        ">
    Figure 18. TortoisePlink
    
+	Here, TortoiseCVS is trying to connect Fedora CVS repository to get all
 	the files needed. Your passphrase of your private key is required before you go on. Press
-	OK after you input the passphrase.
+	OK after you input the passphrase.
 	
    
-	TortoiseCVS is downloading files from Fedora server
-	(Figure?19). It's time to take a
+	TortoiseCVS is downloading files from Fedora server
+	(Figure 19, “Checking out Files”). It's time to take a
 	break before we go on to the next screen.
 	
    
 			Checking out files.
-        
    Figure?19.?Checking out Files
    
+        ">
    Figure 19. Checking out Files
    
 	Done! You'll find a folder called translate that contains all the files for
-	different locales and packages (Figure?20).
+	different locales and packages (Figure 20, “"translate" Folder”).
 	
    
 			"translate" folder.
-        
    Figure?20.?"translate" Folder
    
+        '>
    Figure 20. "translate" Folder
    
 	To edit these files, you can use plain text editor, or specialised po file editors, such as
-	poEdit. The following section will discuss about this tool.
-	
    Prev?Up?Next
    4.?Register Your Fedora Account?Home?6.? poEdit 
    
+	poEdit. The following section will discuss about this tool.
+	
    Prev Up Next
    4. Register Your Fedora Account Home 6.  poEdit 
    
 
 
 
-
    3.?Generate Your Digital ID
    Prev???Next
    3.?Generate Your Digital ID
    
+
    3. Generate Your Digital ID
    Prev   Next
    3. Generate Your Digital ID
    
       For security purpose, a pair of keys — private key and public key — is required to identify yourself.
-	  To generate the key pair, open your Windows Explorer, and go to
+	  To generate the key pair, open your Windows Explorer, and go to
 	  C:\Program Files\TortoiseCVS (or other folder where you installed
-	  TortoiseCVS), then double-click puttygen.exe as shown
-	  in Figure?6.
+	  TortoiseCVS), then double-click puttygen.exe as shown
+	  in Figure 6, “Start puttygen Program”.
     
    
 			Start puttygen program.
-        
    Figure?6.?Start puttygen Program
    
-	Choose SSH2 DSA in Parameters (step 1), then press
-	Generate (step 2) as shown
-	in Figure?7.
+        ">
    Figure 6. Start puttygen Program
    
+	Choose SSH2 DSA in Parameters (step 1), then press
+	Generate (step 2) as shown
+	in Figure 7, “Generate DSA Keys”.
 	
    
 			Generate dsa keys.
-        
    Figure?7.?Generate DSA Keys
    
-	Move your mouse around the screen to generate the key pairs, as shown in Figure?8.
+        ">
    Figure 7. Generate DSA Keys
    
+	Move your mouse around the screen to generate the key pairs, as shown in Figure 8, “Key Generation In Progress”.
 	
    
 			Key generation in progress.
-        
    Figure?8.?Key Generation In Progress
    
+        ">
    Figure 8. Key Generation In Progress
    
 	After the key pair is generated, enter some comment for this key pair (or accept the default comment).
 	Don’t forget to input the key passphrase twice to protect your private key.
 	This “key passphrase” will be used every time you connect to the Fedora CVS repository to get the
-	latest documents. (As shown in Figure?9 step 1.)
+	latest documents. (As shown in Figure 9, “Key Generation In Progress” step 1.)
 	
    [Important]Important
    
 	It is very important to save your public and private keys in a safe place.
-	To save these keys, press Save public key and Save private key
-	as shown in Figure?9 step 2.
+	To save these keys, press Save public key and Save private key
+	as shown in Figure 9, “Key Generation In Progress” step 2.
 	
    
 			Key generation in progress.
-        
    Figure?9.?Key Generation In Progress
    [Tip] Tip 
    
-	The text circled in yellow (Figure?9) is your public key that needs
+        ">
    Figure 9. Key Generation In Progress
    [Tip] Tip 
    
+	The text circled in yellow (Figure 9, “Key Generation In Progress”) is your public key that needs
 	to be copied and pasted when registering an
-	account (refer to Section?4, “Register Your Fedora Account” for more information). You may want to leave this windows open
+	account (refer to Section 4, “Register Your Fedora Account” for more information). You may want to leave this windows open
 	for later use.
 	
    [Note] Note 
    
 	It doesn’t matter where you save your keys
 	or what filenames you save them as. In this example, the filename id_dsa.ppk is used.
 	It is also important to make a copy of your key pairs and store in a safe place.
-	
    Prev?Up?Next
    2.?Download and Install TortoiseCVS?Home?4.?Register Your Fedora Account
    
+	
    Prev Up Next
    2. Download and Install TortoiseCVS Home 4. Register Your Fedora Account
    
 
 

Author: kwade

Update of /cvs/fedora/web/html/docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/docs

Modified Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- index.php	29 Nov 2005 17:33:04 -0000	1.6
+++ index.php	6 Dec 2005 06:53:46 -0000	1.7
@@ -10,8 +10,8 @@
 				
    User Documentation
    
 				
    
 				This section is dedicated to user documentation for . All the
-				content is from the Documentation Project. Except for the 
-				Installation Guide, the documentation will be in tutorial format. All docs will be task-oriented.
+				content is from the Documentation Project. Except for guides such as the  
+				Installation Guide, the documentation is in tutorial format.  All docs are task-oriented.
 				
    
 
 				
    



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:53 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:53 -0500
Subject: web/html/docs/selinux-faq index.php,1.2,1.3
Message-ID: <200512060654.jB66sOWl029351@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/selinux-faq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/docs/selinux-faq

Modified Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/selinux-faq/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.php	5 Jun 2005 00:58:00 -0000	1.2
+++ index.php	6 Dec 2005 06:53:51 -0000	1.3
@@ -22,7 +22,7 @@
                                 
 
 				
    
-				To obtain the source XML for this document, for example when writing a patch to submit in a bug report, follow the directions on the Docs Project to download using anonymouse CVS.  The module you want is fedora-docs/selinux-faq/.  This will get you the latest XML source code.
+				To obtain the source XML for this document, for example when writing a patch to submit in a bug report, follow the directions on the Docs Project to download using anonymous CVS.  The module you want is fedora-docs/selinux-faq/.  This will get you the latest XML source code.
 				
    
 				
    
 				If you are interested in writing docs for  as part of the



From fedora-extras-commits at redhat.com  Tue Dec  6 06:52:59 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:52:59 -0500
Subject: web/html/About index.php,1.1,1.2
Message-ID: <200512060654.jB66sTG5029359@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/About
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/About

Modified Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/About/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	29 Nov 2005 17:30:24 -0000	1.1
+++ index.php	6 Dec 2005 06:52:56 -0000	1.2
@@ -15,15 +15,15 @@
 
 
    Fedora is a set of projects, sponsored by Red Hat and guided by the Fedora Foundation.  These projects are developed by a large community of people who strive to provide and maintain the very best in free, open source software and standards.
    
  
-
    Fedora Core, the central Fedora project, is an operating system and platform, based on Linux, that is always free for anyone to use, modify and distribute, now and forever. 
    
+
    Fedora Core, the central Fedora project, is an operating system and platform, based on Linux, that is always free for anyone to use, modify, and distribute, now and forever. 
    
 
 
    What is the Fedora Foundation?
    
 
-
    The Fedora Foundation is a 501(c)3 nonprofit organization.  It will serve the Fedora community in the following ways: 
    
+
    The Fedora Foundation is a 501(c)3 nonprofit organization.  Its goal is to serve the Fedora community in the following ways: 
    
 
      
 
    • By providing a non-profit entity to organize and manage volunteers. 
      
 
      • 
-
    • By ensuring that the work of these volunteers will remain forever free. 
      
+
    • By ensuring that the work of these volunteers remains forever free. 
      
 
      • 
 
    • By providing a fundraising arm for the development and protection of Fedora and related open source projects. 
      
 
      • 
@@ -35,7 +35,7 @@
 
    
 
 
    
-  The initial board of directors of the Fedora Foundation continues to develop its governance model in partnership with a community advisory board.  More announcements will be made in coming months as key milestones are reached.
+  The initial board of directors of the Fedora Foundation continues to develop its governance model in partnership with a community advisory board.  More announcements are coming in the months ahead as key milestones are reached.
 
    
 
 
    Why should I use Fedora?
    
@@ -73,11 +73,11 @@
 
 
    Excellence: Easy and safe software management with RPM and yum
    
 
    The yum utility requires no configuration, and you may add or remove software from Core or Extras as soon as the Fedora installation is complete. You may add a new package source by copying a simple text file into a directory, or by installing an RPM that does it for you.  
    
-
    Package operations safely abort if dependencies cannot be met. By default, yum requires all packages to pass a digital signature test before they may install to your system. 
    
+
    Package operations safely abort if dependencies cannot be met. By default, yum requires all packages to pass a digital signature test before they may install to your system. 
    
 
-
    The yum utility is developed by system administrators for use on large production networks. Advanced administrative tasks are made easy. For example, you may manage software on disk images with the installroot feature, and recent versions provide an interactive shell to enable you to quickly carry out batches of commands. 
    
+
    The yum utility is developed by system administrators for use on large production networks. Advanced administrative tasks are made easy. For example, you may manage software on disk images with the installroot feature, and recent versions provide an interactive shell to enable you to quickly carry out batches of commands. 
    
 
-
    You may create your own plug-ins for yum to add new features. Both plug-ins and the application itself are written in Python, making it simple to extend and integrate yum with other software. RPM supports Perl and Python scripting, as well as providing a library for C applications. 
    
+
    You may create your own plug-ins for yum to add new features. Both plug-ins and the application itself are written in Python, making it simple to extend and integrate yum with other software. RPM supports Perl and Python scripting, as well as providing a library for C applications. 
    
 
 
    References: 
    
 
      
@@ -87,11 +87,11 @@
 
 
      Excellence: Simple and flexible installation with Anaconda
      
 
-
      Anaconda provides a well-designed installer with both a graphical and text based interface with safe defaults, to enable users to install a new system with minimal difficulty. The interface provides advanced customization options to more precisely control package selection, configure complex storage arrangements with LVM and RAID, and attach the system to network management services such as LDAP and Kerberos. 
      
+
      Anaconda provides a well-designed installer with both a graphical and text based interface with safe defaults, to enable users to install a new system with minimal difficulty. The interface provides advanced customization options to more precisely control package selection, configure complex storage arrangements with LVM and RAID, and attach the system to network management services such as LDAP and Kerberos. 
      
 
-
      Anaconda supports installation from disc images, portable hard drives and network file shares. Any standard FTP, HTTP, or NFS server may act as an installation source. You may boot Anaconda from a pen drive or TFTP network boot service and perform an installation with no discs or CD drive at all, which is ideal for laptops and network terminals. 
      
+
      Anaconda supports installation from disc images, portable hard drives and network file shares. Any standard FTP, HTTP, or NFS server may act as an installation source. You may boot Anaconda from a pen drive or TFTP network boot service and perform an installation with no discs or CD drive at all, which is ideal for laptops and network terminals. 
      
 
-
      Fedora installation may be partially or fully automated with kickstart files. Fedora includes a utility for generating and editing kickstart files.  As plain-text files, kickstart files may also be created and modified by a simple text editor. The system-config-netboot utility enables administrators to configure a network boot service that combines with kickstart files and a file server to provide completely automated network installations. 
      
+
      Fedora installation may be partially or fully automated with kickstart files. Fedora includes a utility for generating and editing kickstart files.  As plain-text files, kickstart files may also be created and modified by a simple text editor. The system-config-netboot utility enables administrators to configure a network boot service that combines with kickstart files and a file server to provide completely automated network installations. 
      
 
 
      References: 
      
 
        
@@ -101,7 +101,7 @@
 
 
        Excellence: Deep Analysis with Systemtap and Frysk
        
 
-
        SystemTap and frysk, developed and sponsored by Red Hat in partnership with others like IBM and Intel, provide a comprehensive framework to benchmark, analyse and improve system performance.   With SystemTap, developers and sysadmins can take a deep look into a running kernel.  With frysk, developers and sysadmins can directly mainpulate executables as they run. 
        
+
        SystemTap and frysk, developed and sponsored by Red Hat in partnership with others such as IBM and Intel, provide a comprehensive framework to benchmark, analyse, and improve system performance.   With SystemTap, developers and sysadmins can take a deep look into a running kernel.  With frysk, developers and sysadmins can directly manipulate executables as they run. 
        
 
 
        References: 
        
 
          
@@ -113,7 +113,7 @@
 
 
          Excellence: The Free Java Platform
          
 
-
          Java is now possibly the most popular programming language in the world. Fedora provides a completely Open Source platform for developing and running Java applications. The combination of GCJ and the GNU Classpath libraries provide much of the functionality of Java 1.4.2 without a proprietary runtime. The Free Java platform is actively being developed to complete the missing functionality and finalize a Web browser plugin. 
          
+
          Java is now possibly the most popular programming language in the world. Fedora provides a completely open source platform for developing and running Java applications. The combination of GCJ and the GNU Classpath libraries provide much of the functionality of Java 1.4.2 without a proprietary runtime. The Free Java platform is actively being developed to complete the missing functionality and finalize a Web browser plugin. 
          
 
          Supplied Java software includes the Eclipse development environment, the Tomcat applications server, the Struts Web application framework, and the Jakarta Commons libraries. Fedora Core also includes the Java-GNOME bindings, which enable Java developers to write GNOME and GTK+ desktop applications in pure Java. Fedora Java packages follow the JPackage standards, which enable the supplied applications to work alongside the dozens of Java packages provided by jpackage.org. 
          
 
          References: 
          
 
            
@@ -128,7 +128,7 @@
 
 
            Excellence: Fedora Directory Server
            
 
-
            The Fedora Directory Server is a robust, scalable open-source server designed to manage large directories of users and resources. It is based on an open-systems server protocol called the Lightweight Directory Access Protocol (LDAP). It was acquired from Netscape and open sourced by Red Hat. It also forms the basis of the Red Hat Directory Server and is capable of serving the needs of any enterprise. 
            
+
            The Fedora Directory Server is a robust, scalable, open source server designed to manage large directories of users and resources. It is based on an open systems server protocol called the Lightweight Directory Access Protocol (LDAP).  The Fedora Directory Server was acquiredoriginally from Netscape and open sourced by Red Hat. It also forms the basis of the Red Hat Directory Server and is capable of serving the needs of any enterprise. 
            
 
            References: 
            
 
 
              



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:26 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:26 -0500
Subject: web/html/About/legal/licenses beta_eula.php, 1.1, 1.2 eula.php, 1.1,
	1.2
Message-ID: <200512060654.jB66sQb5029356@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/About/legal/licenses
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/About/legal/licenses

Modified Files:
	beta_eula.php eula.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: beta_eula.php
===================================================================
RCS file: /cvs/fedora/web/html/About/legal/licenses/beta_eula.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beta_eula.php	29 Nov 2005 17:31:56 -0000	1.1
+++ beta_eula.php	6 Dec 2005 06:53:24 -0000	1.2
@@ -9,7 +9,7 @@
 ?>
 
 
              LICENSE AGREEMENT
              
-FEDORA™ CORE 1 TEST 2 RELEASE
              
+FEDORA™ CORE TEST RELEASE
              
 
 
              This agreement governs the download, installation or use of the 
 Software (as defined below) and any updates to the Software, regardless


Index: eula.php
===================================================================
RCS file: /cvs/fedora/web/html/About/legal/licenses/eula.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eula.php	29 Nov 2005 17:31:56 -0000	1.1
+++ eula.php	6 Dec 2005 06:53:24 -0000	1.2
@@ -9,7 +9,7 @@
 ?>
 
 
              LICENSE AGREEMENT
              
-FEDORA™ CORE 1
              
+FEDORA™ CORE
              
 
 
              This agreement governs the download, installation or use of the
 Software (as defined below) and any updates to the Software, regardless



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:32 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:32 -0500
Subject: web/html/About/schedule index.php,1.1,1.2
Message-ID: <200512060654.jB66sWto029367@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/About/schedule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/About/schedule

Modified Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/About/schedule/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	29 Nov 2005 17:32:18 -0000	1.1
+++ index.php	6 Dec 2005 06:53:30 -0000	1.2
@@ -17,6 +17,8 @@
 each test release even after we have frozen for the next test release;
 all feedback is helpful.
              
 
+
              Documentation and translation of content depends on this schedule.  The documentation schedule is found on the  wiki page.
              
+
 
              You can subscribe to this calendar 
 or download it.
 



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:04 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:04 -0500
Subject: web/html/About/Projects docs.php,1.2,1.3 index.php,1.1,1.2
Message-ID: <200512060654.jB66sY4F029371@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/About/Projects
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/About/Projects

Modified Files:
	docs.php index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: docs.php
===================================================================
RCS file: /cvs/fedora/web/html/About/Projects/docs.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docs.php	1 Dec 2005 01:18:28 -0000	1.2
+++ docs.php	6 Dec 2005 06:53:02 -0000	1.3
@@ -65,11 +65,11 @@
 		
            • Emacs with PSGML mode (optional, but recommended)
              • 
 		
            
 
-        
            HOWEVER, the project will take submissions of new
-        documentation in any format, as there are volunteers who will
+        
            HOWEVER, the project takes submissions of new
+        documentation in any format, as there are volunteers who can
         convert into DocBook/XML.  Ongoing maintenance for the new
-        document should happen in DocBook/XML, which will be much
-        easier to learn from the converted document.
            
+        document should happen in DocBook/XML, which is easier to learn 
+        from the converted document.
            
 
         
            The Documentation Project is not interested in unmaintained
         documentation.  If you have a document to submit, either you or
@@ -122,15 +122,7 @@
 href=\"http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=129784\">129784
 is being used to track tutorial ideas with no writer assigned to
 them. If you are looking for a topic, refer to this bug to see if
-anything sparks your interest.
             
            Documents in progress
-include:
            
-
-
              
-
            • FC3 Installation Guide
              • 
-
            • Software Management with Yum
              • 
-
            • Release Notes
              • 
-
            
-
+anything sparks your interest.
             
 ");
 
 $project->addMisc("Fedora Documentation Steering Committee (FDSCo)","
@@ -166,9 +158,11 @@
 
            Fedora Editors:
            
 
 
              
-
            • Tammy Fox
              • 
-
            • Paul W. Frields
              • 
-
            • Karsten Wade
              • 
+
            • Tammy Fox (technical, wordsmith)
              • 
+
            • Paul W. Frields (technical, wordsmith)
              • 
+
            • Karsten Wade (technical, wordsmith)
              • 
+
            • Stuart Ellis (technical, wordsmith)
              • 
+
            • Rahul Sundaram (technical)
              • 
 
            
 
 ");


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/About/Projects/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	29 Nov 2005 17:30:30 -0000	1.1
+++ index.php	6 Dec 2005 06:53:02 -0000	1.2
@@ -11,8 +11,7 @@
 
 
            Projects
            
 
            
- is made up of many smaller projects. The pages
-in this section describe the purpose of these projects.
+ is made up of many smaller projects.  These Project pages describe the project's purpose.
 Each project has a project maintainer. Patches and suggestions should be sent to the maintainer
 via Bugzilla. Emailing the maintainer directly is not the proper way to submit a request.
 
            



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:59 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:59 -0500
Subject: web/html/participate/schedule index.php,1.5,1.6
Message-ID: <200512060654.jB66sT6N029364@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/schedule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/participate/schedule

Modified Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/schedule/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.php	1 Nov 2005 22:42:34 -0000	1.5
+++ index.php	6 Dec 2005 06:53:57 -0000	1.6
@@ -1,124 +1,3 @@
-initCommon();
-$template->displayHeader();
-?>
-
-
            Schedule
            
-
-
            PRELIMINARY Fedora Core 5 Schedule
            
-
-
            This schedule is preliminary; it may be modified at any time.
-
            
-
-
            Test users should continue to file bug reports against
-each test release even after we have frozen for the next test release;
-all feedback is helpful.
            
-
-
            You can subscribe to this calendar 
-or download it.
-
-
            
-
-- - - -
-
- 
- 
- 
-
-
-
-  
-  
-  
-
- 
- 
- 
-
-
- 
- 
- 
-
-
- 
- 
- 
-
-
- 
- 
- 
-
-
- 
- 
- 
-
-
- 
- 
- 
-
-
- 
- 
- 
-
-
- 
- 
- 
-
-
-
            




            DayMonthEvent
            14Novtest1 devel freeze
            21Novtest1 release
            19Decembertest2 devel freeze, String change deadline (data provided)
            
- 
            23Decembertest2 release, string build freeze (builds completed)
            16January 2006Translation deadline (data provided)
            
-     test3 devel freeze
- 
            23January 2006test3 release, translation build freeze (builds completed)
             ...Continual freeze, only critical bugs fixed until release
            13February 2006Absolute devel freeze
            27February 2006Release open, announced
            
-
            
-
-
            In addition to these releases, the nightly trees will usually be
-installable.
            
-
-
            Fedora Core 4
            
-
              
-
            • 15 March 2005 - Test 1 release
              • 
-
            • 11 April 2005 - Test 2 release
              • 
-
            • 10 May 2005 - Test 3 release
              • 
-
            • 13 June 2005 - General Availability
              • 
-
            
-
-
            Fedora Core 3
            
-
              
-
            • 13 July 2004 - Test 1 release
              • 
-
            • 20 September 2004 - Test 2 release
              • 
-
            • 11 October 2004 - Test 3 release
              • 
-
            • 8 November 2004 - General Availability
              • 
-
            
-	
-
            Fedora Core 2
            
-
              
-
            • 12 February 2004 - Test 1 release
              • 
-
            • 29 March 2004 - Test 2 release
              • 
-
            • 27 April 2004 - Test 3 release
              • 
-
            • 18 May 2004 - General Availability
              • 
-
            
-	
-
            Fedora Core 1 / Cambridge
            
-
              
-
            • 21 July 2003 - Test 1 (originally called Beta 1) release
              • 
-
            • 25 September 2003 - Test 2 release
              • 
-
            • 13 October 2003 - Test 3 release
              • 
-
            • 5 November 2003 - General Availability
              • 
-
            
-
-displayFooter('$Date$');
+



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:37 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:37 -0500
Subject: web/html/Contribute index.php,1.2,1.3
Message-ID: <200512060654.jB66sbkd029381@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/Contribute
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/Contribute

Modified Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/Contribute/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.php	1 Dec 2005 01:18:35 -0000	1.2
+++ index.php	6 Dec 2005 06:53:35 -0000	1.3
@@ -54,7 +54,7 @@
 
            Fedora Ambassadors Project
            
 
 
            
-  Fedora Ambassadors are enthusiasts who spread the word about Fedora, Linux, and Open Source to the wider public.  Ambassadors represent Fedora at events worldwide, and also act as Fedora experts in their own communities.  The Fedora Project will support Ambassadors with business cards, trade show kits, presentation materials and other resources.
+  Fedora Ambassadors are enthusiasts who spread the word about Fedora, Linux, and free/libre open source software (FLOSS) to the wider public.  Ambassadors represent Fedora at events worldwide, and also act as Fedora experts in their own communities.  The Fedora Project supports Ambassadors with business cards, trade show kits, presentation materials, collaboration with other Ambassadors, and other resources.
 
            
 
 
            



From fedora-extras-commits at redhat.com  Tue Dec  6 06:53:54 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 01:53:54 -0500
Subject: web/html/participate/documentation-faq index.php,1.1.1.1,1.2
Message-ID: <200512060654.jB66sOoi029354@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-faq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/html/participate/documentation-faq

Modified Files:
	index.php 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-faq/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- index.php	30 Mar 2005 17:47:24 -0000	1.1.1.1
+++ index.php	6 Dec 2005 06:53:52 -0000	1.2
@@ -23,7 +23,7 @@
 
            
 
 
            
-To volunteer for a topic, refer to the Documentation Quick Guide for instructions on how to 
+To volunteer for a topic, refer to the DocsProject wiki for instructions on how to 
 get started.
 
            
 
@@ -49,12 +49,8 @@
 
            How do I get write access to CVS?
            
 
 
            
-Eventually, we intend for full contributors to have write access to
-CVS, as well as access to other build environments.  This is actively being
-worked out across the entire Fedora Project as described on 
-How to Participate. In the meantime, you can
-email a patch or new file to the mailing list, and the Fedora Docs leader will
-commit them to CVS for you.
+Read the DocsProject/NewWriters 
+wiki page for detailed information.
 
            
 
 

Author: kwade

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29105/include

Modified Files:
	template.inc 
Log Message:
I did a fair job of going over each page and checking each link; tried to fix as many problems as I could, with an emphasis on no-errors and error-free content.  I fixed the side navigation to be have links to modern content; updated links; one redirect, more to come?; grammar and technical edits; misc and more.  Let's tag this live tomorrow, Tue. 6 December 2005 15:00 UTC or thereabouts, and I'll be around all day to fix any problems that come up.


Index: template.inc
===================================================================
RCS file: /cvs/fedora/web/include/template.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- template.inc	29 Nov 2005 17:36:14 -0000	1.6
+++ template.inc	6 Dec 2005 06:54:03 -0000	1.7
@@ -70,7 +70,7 @@
 			
 		



From fedora-extras-commits at redhat.com  Tue Dec  6 11:51:52 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  6 Dec 2005 06:51:52 -0500
Subject: rpms/bittorrent/devel bittorrent.spec, 1.31, 1.32 sources, 1.14,
	1.15 .cvsignore, 1.14, 1.15
Message-ID: <200512061152.jB6BqMm6005983@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5962

Modified Files:
	bittorrent.spec sources .cvsignore 
Log Message:
- Update to 4.2.1
- Source now at www.bittorrent.com rather than sourceforge



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- bittorrent.spec	23 Nov 2005 12:29:32 -0000	1.31
+++ bittorrent.spec	6 Dec 2005 11:51:49 -0000	1.32
@@ -3,14 +3,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        4.2.0
+Version:        4.2.1
 Release:        1%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
 License:        BitTorrent Open Source License
 URL:            http://www.bittorrent.com/
-Source0:        http://dl.sf.net/bittorrent/BitTorrent-%{version}.tar.gz
+Source0:        http://www.bittorrent.com/dl/BitTorrent-%{version}.tar.gz
 Source1:        bittorrent.desktop
 Source2:        bittorrent.png
 Source3:	btseed.init
@@ -217,6 +217,10 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Tue Dec  6 2005 Paul Howarth  4.2.1-1
+- Update to 4.2.1
+- Source now at www.bittorrent.com rather than sourceforge
+
 * Wed Nov 23 2005 Paul Howarth  4.2.0-1
 - update to 4.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Nov 2005 12:29:33 -0000	1.14
+++ sources	6 Dec 2005 11:51:49 -0000	1.15
@@ -1 +1 @@
-a6a6d07a20e75da44c7dbe44ff7d5346  BitTorrent-4.2.0.tar.gz
+0deb2e083e95206a9e601ff6ca35b826  BitTorrent-4.2.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Nov 2005 12:29:33 -0000	1.14
+++ .cvsignore	6 Dec 2005 11:51:49 -0000	1.15
@@ -1 +1 @@
-BitTorrent-4.2.0.tar.gz
+BitTorrent-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec  6 11:54:22 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  6 Dec 2005 06:54:22 -0500
Subject: rpms/bittorrent/FC-4 bittorrent.spec, 1.16, 1.17 sources, 1.8,
	1.9 .cvsignore, 1.8, 1.9
Message-ID: <200512061154.jB6BsrrS006060@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6039

Modified Files:
	bittorrent.spec sources .cvsignore 
Log Message:
resync with devel



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-4/bittorrent.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bittorrent.spec	23 Nov 2005 12:35:57 -0000	1.16
+++ bittorrent.spec	6 Dec 2005 11:54:20 -0000	1.17
@@ -3,14 +3,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        4.2.0
+Version:        4.2.1
 Release:        1%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
 License:        BitTorrent Open Source License
 URL:            http://www.bittorrent.com/
-Source0:        http://dl.sf.net/bittorrent/BitTorrent-%{version}.tar.gz
+Source0:        http://www.bittorrent.com/dl/BitTorrent-%{version}.tar.gz
 Source1:        bittorrent.desktop
 Source2:        bittorrent.png
 Source3:	btseed.init
@@ -217,6 +217,10 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Tue Dec  6 2005 Paul Howarth  4.2.1-1
+- Update to 4.2.1
+- Source now at www.bittorrent.com rather than sourceforge
+
 * Wed Nov 23 2005 Paul Howarth  4.2.0-1
 - update to 4.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Nov 2005 12:35:57 -0000	1.8
+++ sources	6 Dec 2005 11:54:20 -0000	1.9
@@ -1 +1 @@
-a6a6d07a20e75da44c7dbe44ff7d5346  BitTorrent-4.2.0.tar.gz
+0deb2e083e95206a9e601ff6ca35b826  BitTorrent-4.2.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Nov 2005 12:35:57 -0000	1.8
+++ .cvsignore	6 Dec 2005 11:54:20 -0000	1.9
@@ -1 +1 @@
-BitTorrent-4.2.0.tar.gz
+BitTorrent-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec  6 11:56:34 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  6 Dec 2005 06:56:34 -0500
Subject: rpms/bittorrent/FC-3 sources,1.8,1.9 .cvsignore,1.8,1.9
Message-ID: <200512061157.jB6Bv4k7006129@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6106

Modified Files:
	sources .cvsignore 
Log Message:
resync with devel



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Nov 2005 12:38:32 -0000	1.8
+++ sources	6 Dec 2005 11:56:32 -0000	1.9
@@ -1 +1 @@
-a6a6d07a20e75da44c7dbe44ff7d5346  BitTorrent-4.2.0.tar.gz
+0deb2e083e95206a9e601ff6ca35b826  BitTorrent-4.2.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Nov 2005 12:38:32 -0000	1.8
+++ .cvsignore	6 Dec 2005 11:56:32 -0000	1.9
@@ -1 +1 @@
-BitTorrent-4.2.0.tar.gz
+BitTorrent-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec  6 11:58:38 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  6 Dec 2005 06:58:38 -0500
Subject: rpms/bittorrent/FC-3 bittorrent.spec,1.11,1.12
Message-ID: <200512061159.jB6Bx8hY006235@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6210

Modified Files:
	bittorrent.spec 
Log Message:
resync with devel, after having actually changed the spec file this time...



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/bittorrent.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bittorrent.spec	23 Nov 2005 12:38:32 -0000	1.11
+++ bittorrent.spec	6 Dec 2005 11:58:36 -0000	1.12
@@ -3,14 +3,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        4.2.0
+Version:        4.2.1
 Release:        1%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
 License:        BitTorrent Open Source License
 URL:            http://www.bittorrent.com/
-Source0:        http://dl.sf.net/bittorrent/BitTorrent-%{version}.tar.gz
+Source0:        http://www.bittorrent.com/dl/BitTorrent-%{version}.tar.gz
 Source1:        bittorrent.desktop
 Source2:        bittorrent.png
 Source3:	btseed.init
@@ -217,6 +217,10 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Tue Dec  6 2005 Paul Howarth  4.2.1-1
+- Update to 4.2.1
+- Source now at www.bittorrent.com rather than sourceforge
+
 * Wed Nov 23 2005 Paul Howarth  4.2.0-1
 - update to 4.2.0
 



From fedora-extras-commits at redhat.com  Tue Dec  6 13:43:56 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Dec 2005 08:43:56 -0500
Subject: rpms/gpgme/FC-4 gpgme-1.1.0-tests.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 gpgme.spec, 1.9, 1.10 sources, 1.3, 1.4
Message-ID: <200512061344.jB6DiQ8b009793@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gpgme/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9769

Modified Files:
	.cvsignore gpgme.spec sources 
Added Files:
	gpgme-1.1.0-tests.patch 
Log Message:
* Mon Aug  8 2005 Rex Dieter  - 1.0.3-1
- 1.0.3
- --disable-static


gpgme-1.1.0-tests.patch:

--- NEW FILE gpgme-1.1.0-tests.patch ---
--- gpgme-1.1.0/tests/gpgsm/t-keylist.c.tests	2005-09-08 09:42:32.000000000 -0500
+++ gpgme-1.1.0/tests/gpgsm/t-keylist.c	2005-10-11 09:24:40.000000000 -0500
@@ -44,6 +44,7 @@
   char *issuer_name;
   char *chain_id;
   char *uid;
+  char *email;
   gpgme_validity_t validity;
   unsigned int key_length;
 }
@@ -53,7 +54,7 @@
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
       "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E",
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
-      GPGME_VALIDITY_ULTIMATE, 1024
+      NULL, GPGME_VALIDITY_ULTIMATE, 1024
     },
     { "DFA56FB5FC41E3A8921F77AD1622EEFD9152A5AD", 0, 909684190, 1009821790, "01",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -63,7 +64,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Top Level Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_NEVER, 2048
+      "", GPGME_VALIDITY_NEVER, 2048
     },
     { "2C8F3C356AB761CB3674835B792CDA52937F9285", 0, 973183644, 1009735200, "15",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -73,7 +74,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Server Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_UNKNOWN, 2048
+      "", GPGME_VALIDITY_UNKNOWN, 2048
     },
     { NULL }
   };
@@ -286,7 +287,8 @@
 	  exit (1);
 	}
 
-      if (!key->uids || key->uids->next)
+      /* Be tolerant against a missing email (ie, older gpgsm versions).  */
+      if (!key->uids || (key->uids->next && !keys[i].email))
 	{
 	  fprintf (stderr, "Key has unexpected number of user IDs\n");
 	  exit (1);
@@ -336,6 +338,13 @@
 		   key->uids->uid);
 	  exit (1);
 	}
+      if (key->uids->next && strcmp (key->uids->next->uid, keys[i].email))
+	{
+	  fprintf (stderr, "Unexpected email in user ID: %s\n",
+		   key->uids->next->uid);
+	  exit (1);
+	}
+
 
       gpgme_key_unref (key);
       i++;
--- gpgme-1.1.0/tests/gpg/t-sig-notation.c.tests	2005-09-30 21:06:08.000000000 -0500
+++ gpgme-1.1.0/tests/gpg/t-sig-notation.c	2005-10-11 09:24:40.000000000 -0500
@@ -42,8 +42,8 @@
   { "laughing at me",
     "Just Squeeze Me",
     GPGME_SIG_NOTATION_HUMAN_READABLE },
-  { "leave at home",
-    "Right Now",
+  { "preferred-email-encoding at pgp.com",
+    "pgpmime",
     GPGME_SIG_NOTATION_HUMAN_READABLE | GPGME_SIG_NOTATION_CRITICAL },
   { NULL, 
     "http://www.gnu.org/policy/",


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2005 19:47:28 -0000	1.3
+++ .cvsignore	6 Dec 2005 13:43:53 -0000	1.4
@@ -1 +1,2 @@
-gpgme-1.0.2.tar.bz2
+gpgme-1.0.3.tar.bz2
+gpgme-1.0.3.tar.bz2.sig


Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-4/gpgme.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gpgme.spec	12 May 2005 05:46:49 -0000	1.9
+++ gpgme.spec	6 Dec 2005 13:43:53 -0000	1.10
@@ -1,19 +1,22 @@
+
 Name:    gpgme
-Version: 1.0.2
-Release: 3%{?dist}
 Summary: GnuPG Made Easy - high level crypto API
+Version: 1.0.3
+Release: 1%{?dist}
+
 License: LGPL
 Group:   Applications/System
 URL:     http://www.gnupg.org/related_software/gpgme/
 Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig
-Patch0:  gpgme-1.0.2-macro.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: gpgme-1.0.2-macro.patch
+
 BuildRequires: gnupg >= 1.2.2
 BuildRequires: gnupg2 >= 1.9.6
-BuildRequires: pth-devel
 BuildRequires: libgpg-error-devel >= 0.5
+BuildRequires: pth-devel >= 2.0.4
 
 Requires: gnupg >= 1.2.2
 Requires: gnupg2 >= 1.9.6
@@ -27,38 +30,41 @@
 management.
 
 %package devel
-Summary:  Static 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
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
-%description    devel
-Static libraries and header files from GPGME, GnuPG Made Easy.
+%description devel
+%{summary}
 
 
 %prep
 %setup -q
-%patch0 -p0
+
+%patch0 -p0 -b .tests
 
 
 %build
 %configure \
-  --program-prefix="%{?_program_prefix}" \
-  --enable-static
+  --disable-static
 
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/*.la}
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %check || :
-make check
+# expect t-keylist failure, reported upstream
+make check ||:
 
 
 %clean
@@ -66,8 +72,8 @@
 
 
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %post devel
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
@@ -81,19 +87,22 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING* ChangeLog NEWS README* THANKS TODO VERSION
-%{_libdir}/libgpgme*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/gpgme-config
-%{_includedir}/gpgme.h
-%{_libdir}/libgpgme*.a
-%{_libdir}/libgpgme*.so
+%{_includedir}/*
+%{_libdir}/lib*.so
 %{_datadir}/aclocal/gpgme.m4
 %{_infodir}/gpgme.info*
 
 
 %changelog
+* Mon Aug  8 2005 Rex Dieter  - 1.0.3-1
+- 1.0.3
+- --disable-static
+
 * Thu May 12 2005 Michael Schwendt  - 1.0.2-3
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2005 19:47:28 -0000	1.3
+++ sources	6 Dec 2005 13:43:53 -0000	1.4
@@ -1 +1,2 @@
-25513fd35593bad08c1e486878296b40  gpgme-1.0.2.tar.bz2
+84f85671d63164fb1d338c23010f023d  gpgme-1.0.3.tar.bz2
+f91f3a341c0070aef7cec52e3cb4d770  gpgme-1.0.3.tar.bz2.sig



From fedora-extras-commits at redhat.com  Tue Dec  6 13:47:52 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Dec 2005 08:47:52 -0500
Subject: rpms/gpgme/FC-4 gpgme-1.0.2.tar.bz2.sig,1.1,NONE
Message-ID: <200512061347.jB6DlqCi009863@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gpgme/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9851

Removed Files:
	gpgme-1.0.2.tar.bz2.sig 
Log Message:
remove old .sig



--- gpgme-1.0.2.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec  6 13:48:46 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Dec 2005 08:48:46 -0500
Subject: rpms/gpgme/FC-3 gpgme-1.0.2-macro.patch, NONE,
	1.1 gpgme-1.1.0-tests.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 gpgme.spec, 1.6, 1.7 sources, 1.3,
	1.4 gpgme-1.0.2.tar.bz2.sig, 1.1, NONE
Message-ID: <200512061349.jB6DnGDt009912@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gpgme/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9884

Modified Files:
	.cvsignore gpgme.spec sources 
Added Files:
	gpgme-1.0.2-macro.patch gpgme-1.1.0-tests.patch 
Removed Files:
	gpgme-1.0.2.tar.bz2.sig 
Log Message:
* Mon Aug  8 2005 Rex Dieter  - 1.0.3-1
- 1.0.3
- --disable-static


gpgme-1.0.2-macro.patch:

--- NEW FILE gpgme-1.0.2-macro.patch ---
--- gpgme/ath-compat.c~	2004-12-07 23:11:52.000000000 +0200
+++ gpgme/ath-compat.c	2005-03-18 12:54:44.000000000 +0200
@@ -108,7 +108,7 @@
 ath_read (int fd, void *buf, size_t nbytes)
 {
   if (ath_ops && ath_ops->read)
-    return ath_ops->read (fd, buf, nbytes);
+    return (ath_ops->read) (fd, buf, nbytes);
   else
     return read (fd, buf, nbytes);
 }

gpgme-1.1.0-tests.patch:

--- NEW FILE gpgme-1.1.0-tests.patch ---
--- gpgme-1.1.0/tests/gpgsm/t-keylist.c.tests	2005-09-08 09:42:32.000000000 -0500
+++ gpgme-1.1.0/tests/gpgsm/t-keylist.c	2005-10-11 09:24:40.000000000 -0500
@@ -44,6 +44,7 @@
   char *issuer_name;
   char *chain_id;
   char *uid;
+  char *email;
   gpgme_validity_t validity;
   unsigned int key_length;
 }
@@ -53,7 +54,7 @@
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
       "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E",
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
-      GPGME_VALIDITY_ULTIMATE, 1024
+      NULL, GPGME_VALIDITY_ULTIMATE, 1024
     },
     { "DFA56FB5FC41E3A8921F77AD1622EEFD9152A5AD", 0, 909684190, 1009821790, "01",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -63,7 +64,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Top Level Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_NEVER, 2048
+      "", GPGME_VALIDITY_NEVER, 2048
     },
     { "2C8F3C356AB761CB3674835B792CDA52937F9285", 0, 973183644, 1009735200, "15",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -73,7 +74,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Server Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_UNKNOWN, 2048
+      "", GPGME_VALIDITY_UNKNOWN, 2048
     },
     { NULL }
   };
@@ -286,7 +287,8 @@
 	  exit (1);
 	}
 
-      if (!key->uids || key->uids->next)
+      /* Be tolerant against a missing email (ie, older gpgsm versions).  */
+      if (!key->uids || (key->uids->next && !keys[i].email))
 	{
 	  fprintf (stderr, "Key has unexpected number of user IDs\n");
 	  exit (1);
@@ -336,6 +338,13 @@
 		   key->uids->uid);
 	  exit (1);
 	}
+      if (key->uids->next && strcmp (key->uids->next->uid, keys[i].email))
+	{
+	  fprintf (stderr, "Unexpected email in user ID: %s\n",
+		   key->uids->next->uid);
+	  exit (1);
+	}
+
 
       gpgme_key_unref (key);
       i++;
--- gpgme-1.1.0/tests/gpg/t-sig-notation.c.tests	2005-09-30 21:06:08.000000000 -0500
+++ gpgme-1.1.0/tests/gpg/t-sig-notation.c	2005-10-11 09:24:40.000000000 -0500
@@ -42,8 +42,8 @@
   { "laughing at me",
     "Just Squeeze Me",
     GPGME_SIG_NOTATION_HUMAN_READABLE },
-  { "leave at home",
-    "Right Now",
+  { "preferred-email-encoding at pgp.com",
+    "pgpmime",
     GPGME_SIG_NOTATION_HUMAN_READABLE | GPGME_SIG_NOTATION_CRITICAL },
   { NULL, 
     "http://www.gnu.org/policy/",


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2005 19:47:28 -0000	1.3
+++ .cvsignore	6 Dec 2005 13:48:43 -0000	1.4
@@ -1 +1,2 @@
-gpgme-1.0.2.tar.bz2
+gpgme-1.0.3.tar.bz2
+gpgme-1.0.3.tar.bz2.sig


Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-3/gpgme.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gpgme.spec	1 Feb 2005 19:52:10 -0000	1.6
+++ gpgme.spec	6 Dec 2005 13:48:43 -0000	1.7
@@ -1,25 +1,27 @@
 
-Name:	 gpgme
-Epoch:	 0
-Version: 1.0.2
-Release: 1%{?dist_tag}
+Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
+Version: 1.0.3
+Release: 1%{?dist}
+
 License: LGPL
 Group:   Applications/System
 URL:     http://www.gnupg.org/related_software/gpgme/
-Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2.sig
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: gnupg >= 0:1.2.2
-BuildRequires: gnupg2 >= 0:1.9.6
-BuildRequires: pth-devel
-BuildRequires: libgpg-error-devel >= 0:0.5
+Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch0: gpgme-1.0.2-macro.patch
+
+BuildRequires: gnupg >= 1.2.2
+BuildRequires: gnupg2 >= 1.9.6
+BuildRequires: libgpg-error-devel >= 0.5
+BuildRequires: pth-devel >= 2.0.4
 
-Requires: gnupg >= 0:1.2.2
-Requires: gnupg2 >= 0:1.9.6
+Requires: gnupg >= 1.2.2
+Requires: gnupg2 >= 1.9.6
 
-Obsoletes: cryptplug <= 0:0.3.16-2
+Obsoletes: cryptplug <= 0.3.16-2
 
 %description
 GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
@@ -28,37 +30,41 @@
 management.
 
 %package devel
-Summary:  Static libraries and header files from GPGME, GnuPG Made Easy
+Summary:  Development headers and libraries for %{name}
 Group:    Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: libgpg-error-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
-%description    devel
-Static libraries and header files from GPGME, GnuPG Made Easy.
+%description devel
+%{summary}
 
 
 %prep
 %setup -q
 
+%patch0 -p0 -b .tests
+
 
 %build
 %configure \
-  --program-prefix="%{?_program_prefix}" \
-  --enable-static
+  --disable-static
 
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/*.la}
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %check || :
-make check 
+# expect t-keylist failure, reported upstream
+make check ||:
 
 
 %clean
@@ -66,8 +72,8 @@
 
 
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %post devel
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
@@ -81,19 +87,28 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING* ChangeLog NEWS README* THANKS TODO VERSION
-%{_libdir}/libgpgme*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/gpgme-config
-%{_includedir}/gpgme.h
-%{_libdir}/libgpgme*.a
-%{_libdir}/libgpgme*.so
+%{_includedir}/*
+%{_libdir}/lib*.so
 %{_datadir}/aclocal/gpgme.m4
 %{_infodir}/gpgme.info*
 
 
 %changelog
+* Mon Aug  8 2005 Rex Dieter  - 1.0.3-1
+- 1.0.3
+- --disable-static
+
+* Thu May 12 2005 Michael Schwendt  - 1.0.2-3
+- rebuilt
+
+* Fri Mar 18 2005 Ville Skytt??  - 1.0.2-2
+- Fix FC4 build.
+
 * Tue Feb  1 2005 Michael Schwendt  - 0:1.0.2-1
 - LGPL used here, and made summary more explicit.
 - Remove dirmngr dependency (gpgsm interfaces with it).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2005 19:47:28 -0000	1.3
+++ sources	6 Dec 2005 13:48:43 -0000	1.4
@@ -1 +1,2 @@
-25513fd35593bad08c1e486878296b40  gpgme-1.0.2.tar.bz2
+84f85671d63164fb1d338c23010f023d  gpgme-1.0.3.tar.bz2
+f91f3a341c0070aef7cec52e3cb4d770  gpgme-1.0.3.tar.bz2.sig


--- gpgme-1.0.2.tar.bz2.sig DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec  6 14:05:42 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Dec 2005 09:05:42 -0500
Subject: rpms/gpgme/FC-4 gpgme-1.0.3-tests.patch, NONE, 1.1 gpgme.spec, 1.10,
	1.11
Message-ID: <200512061406.jB6E6CP1011568@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gpgme/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11526/FC-4

Modified Files:
	gpgme.spec 
Added Files:
	gpgme-1.0.3-tests.patch 
Log Message:
* Tue Dec 06 2005 Rex Dieter  1.0.3-2
- tests.patch so 'make check' passes


gpgme-1.0.3-tests.patch:

--- NEW FILE gpgme-1.0.3-tests.patch ---
--- gpgme-1.1.0/tests/gpgsm/t-keylist.c.tests	2005-09-08 09:42:32.000000000 -0500
+++ gpgme-1.1.0/tests/gpgsm/t-keylist.c	2005-10-11 09:24:40.000000000 -0500
@@ -44,6 +44,7 @@
   char *issuer_name;
   char *chain_id;
   char *uid;
+  char *email;
   gpgme_validity_t validity;
   unsigned int key_length;
 }
@@ -53,7 +54,7 @@
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
       "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E",
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
-      GPGME_VALIDITY_ULTIMATE, 1024
+      NULL, GPGME_VALIDITY_ULTIMATE, 1024
     },
     { "DFA56FB5FC41E3A8921F77AD1622EEFD9152A5AD", 0, 909684190, 1009821790, "01",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -63,7 +64,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Top Level Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_NEVER, 2048
+      "", GPGME_VALIDITY_NEVER, 2048
     },
     { "2C8F3C356AB761CB3674835B792CDA52937F9285", 0, 973183644, 1009735200, "15",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -73,7 +74,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Server Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_UNKNOWN, 2048
+      "", GPGME_VALIDITY_UNKNOWN, 2048
     },
     { NULL }
   };
@@ -286,7 +287,8 @@
 	  exit (1);
 	}
 
-      if (!key->uids || key->uids->next)
+      /* Be tolerant against a missing email (ie, older gpgsm versions).  */
+      if (!key->uids || (key->uids->next && !keys[i].email))
 	{
 	  fprintf (stderr, "Key has unexpected number of user IDs\n");
 	  exit (1);
@@ -336,6 +338,13 @@
 		   key->uids->uid);
 	  exit (1);
 	}
+      if (key->uids->next && strcmp (key->uids->next->uid, keys[i].email))
+	{
+	  fprintf (stderr, "Unexpected email in user ID: %s\n",
+		   key->uids->next->uid);
+	  exit (1);
+	}
+
 
       gpgme_key_unref (key);
       i++;


Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-4/gpgme.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gpgme.spec	6 Dec 2005 13:43:53 -0000	1.10
+++ gpgme.spec	6 Dec 2005 14:05:39 -0000	1.11
@@ -2,7 +2,7 @@
 Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPL
 Group:   Applications/System
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: gpgme-1.0.2-macro.patch
+Patch1: gpgme-1.0.3-tests.patch
 
 BuildRequires: gnupg >= 1.2.2
 BuildRequires: gnupg2 >= 1.9.6
@@ -43,7 +44,8 @@
 %prep
 %setup -q
 
-%patch0 -p0 -b .tests
+%patch0 -p0 -b .macro
+%patch1 -p1 -b .tests
 
 
 %build
@@ -63,8 +65,7 @@
 
 
 %check || :
-# expect t-keylist failure, reported upstream
-make check ||:
+make check
 
 
 %clean
@@ -99,6 +100,9 @@
 
 
 %changelog
+* Tue Dec 06 2005 Rex Dieter  1.0.3-2
+- tests.patch so 'make check' passes
+
 * Mon Aug  8 2005 Rex Dieter  - 1.0.3-1
 - 1.0.3
 - --disable-static



From fedora-extras-commits at redhat.com  Tue Dec  6 14:05:24 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Dec 2005 09:05:24 -0500
Subject: rpms/gpgme/FC-3 gpgme-1.0.3-tests.patch, NONE, 1.1 gpgme.spec, 1.7,
	1.8
Message-ID: <200512061406.jB6E6dK7011569@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gpgme/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11526/FC-3

Modified Files:
	gpgme.spec 
Added Files:
	gpgme-1.0.3-tests.patch 
Log Message:
* Tue Dec 06 2005 Rex Dieter  1.0.3-2
- tests.patch so 'make check' passes


gpgme-1.0.3-tests.patch:

--- NEW FILE gpgme-1.0.3-tests.patch ---
--- gpgme-1.1.0/tests/gpgsm/t-keylist.c.tests	2005-09-08 09:42:32.000000000 -0500
+++ gpgme-1.1.0/tests/gpgsm/t-keylist.c	2005-10-11 09:24:40.000000000 -0500
@@ -44,6 +44,7 @@
   char *issuer_name;
   char *chain_id;
   char *uid;
+  char *email;
   gpgme_validity_t validity;
   unsigned int key_length;
 }
@@ -53,7 +54,7 @@
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
       "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E",
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
-      GPGME_VALIDITY_ULTIMATE, 1024
+      NULL, GPGME_VALIDITY_ULTIMATE, 1024
     },
     { "DFA56FB5FC41E3A8921F77AD1622EEFD9152A5AD", 0, 909684190, 1009821790, "01",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -63,7 +64,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Top Level Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_NEVER, 2048
+      "", GPGME_VALIDITY_NEVER, 2048
     },
     { "2C8F3C356AB761CB3674835B792CDA52937F9285", 0, 973183644, 1009735200, "15",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -73,7 +74,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Server Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_UNKNOWN, 2048
+      "", GPGME_VALIDITY_UNKNOWN, 2048
     },
     { NULL }
   };
@@ -286,7 +287,8 @@
 	  exit (1);
 	}
 
-      if (!key->uids || key->uids->next)
+      /* Be tolerant against a missing email (ie, older gpgsm versions).  */
+      if (!key->uids || (key->uids->next && !keys[i].email))
 	{
 	  fprintf (stderr, "Key has unexpected number of user IDs\n");
 	  exit (1);
@@ -336,6 +338,13 @@
 		   key->uids->uid);
 	  exit (1);
 	}
+      if (key->uids->next && strcmp (key->uids->next->uid, keys[i].email))
+	{
+	  fprintf (stderr, "Unexpected email in user ID: %s\n",
+		   key->uids->next->uid);
+	  exit (1);
+	}
+
 
       gpgme_key_unref (key);
       i++;


Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-3/gpgme.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gpgme.spec	6 Dec 2005 13:48:43 -0000	1.7
+++ gpgme.spec	6 Dec 2005 14:05:22 -0000	1.8
@@ -2,7 +2,7 @@
 Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPL
 Group:   Applications/System
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: gpgme-1.0.2-macro.patch
+Patch1: gpgme-1.0.3-tests.patch
 
 BuildRequires: gnupg >= 1.2.2
 BuildRequires: gnupg2 >= 1.9.6
@@ -43,7 +44,8 @@
 %prep
 %setup -q
 
-%patch0 -p0 -b .tests
+%patch0 -p0 -b .macro
+%patch1 -p1 -b .tests
 
 
 %build
@@ -63,8 +65,7 @@
 
 
 %check || :
-# expect t-keylist failure, reported upstream
-make check ||:
+make check
 
 
 %clean
@@ -99,6 +100,9 @@
 
 
 %changelog
+* Tue Dec 06 2005 Rex Dieter  1.0.3-2
+- tests.patch so 'make check' passes
+
 * Mon Aug  8 2005 Rex Dieter  - 1.0.3-1
 - 1.0.3
 - --disable-static



From fedora-extras-commits at redhat.com  Tue Dec  6 15:52:53 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue,  6 Dec 2005 10:52:53 -0500
Subject: rpms/openvpn/devel openvpn.spec,1.11,1.12
Message-ID: <200512061553.jB6FrOQP013469@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13451

Modified Files:
	openvpn.spec 
Log Message:
Rebuild.


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openvpn.spec	18 Nov 2005 23:33:28 -0000	1.11
+++ openvpn.spec	6 Dec 2005 15:52:51 -0000	1.12
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.3%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.4%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 #Source0:           http://openvpn.net/release/%{name}-%{version}.tar.gz
@@ -132,6 +132,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Tue Dec 06 2005 Steven Pritchard  2.1-0.4.beta7
+- Rebuild
+
 * Fri Nov 18 2005 Steven Pritchard  2.1-0.3.beta7
 - Update to 2.1_beta7
 



From fedora-extras-commits at redhat.com  Tue Dec  6 18:22:17 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 13:22:17 -0500
Subject: web/include navigation.inc,1.15,1.16
Message-ID: <200512061822.jB6IMlkd018682@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18665

Modified Files:
	navigation.inc 
Log Message:
Removing extra commas in navigation.inc


Index: navigation.inc
===================================================================
RCS file: /cvs/fedora/web/include/navigation.inc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- navigation.inc	6 Dec 2005 05:11:11 -0000	1.15
+++ navigation.inc	6 Dec 2005 18:22:15 -0000	1.16
@@ -11,7 +11,7 @@
 		"Mirrors"=>array("uri"=>"/Download/mirrors.php"),
 		"Vendors"=>array("uri"=>"/Download/vendors.php"),
 		"Updates"=>array("uri"=>"/Download/updates.php"),
-		"Download Server"=>array("uri"=>"http://download.fedora.redhat.com/pub/fedora/linux/"),
+		"Download Server"=>array("uri"=>"http://download.fedora.redhat.com/pub/fedora/linux/")
 		)),
 	"News"=>array("uri"=>"/News/"),
 	"Documentation"=>array("uri"=>"/docs/","sub"=>array(
@@ -21,7 +21,7 @@
 		"Jargon Buster"=>array("uri"=>"/docs/jargon-buster/"),
                 "SELinux FAQ"=>array("uri"=>"/docs/selinux-faq/"),
 		"Developer's Guide"=>array("uri"=>"/docs/developers-guide/"),
-		"Documentation Guide"=>array("uri"=>"/docs/documentation-guide/"),
+		"Documentation Guide"=>array("uri"=>"/docs/documentation-guide/")
 		)),
 	"Contribute"=>array("uri"=>"/Contribute/"),
 	"About"=>array("uri"=>"/About/","sub"=>array(
@@ -35,7 +35,7 @@
 		//"Product Relationship"=>array("uri"=>"/about/rhel.php"),
 		//"Fedora Name"=>array("uri"=>"/about/name.php"),
 		"Legal"=>array("uri"=>"/About/legal/"),
-		"GPG Keys"=>array("uri"=>"/About/security/"),
+		"GPG Keys"=>array("uri"=>"/About/security/")
 		))
 	);
 ?>



From fedora-extras-commits at redhat.com  Tue Dec  6 18:28:20 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 13:28:20 -0500
Subject: web/include template.inc,1.7,1.8
Message-ID: <200512061828.jB6ISoF1018758@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18726/include

Modified Files:
	template.inc 
Log Message:
Logo approved, moving on.


Index: template.inc
===================================================================
RCS file: /cvs/fedora/web/include/template.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- template.inc	6 Dec 2005 06:54:03 -0000	1.7
+++ template.inc	6 Dec 2005 18:28:18 -0000	1.8
@@ -64,7 +64,7 @@
 		
 		
            
 			
 
 			
            



From fedora-extras-commits at redhat.com  Tue Dec  6 18:55:04 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue,  6 Dec 2005 13:55:04 -0500
Subject: rpms/alsa-tools/devel .cvsignore, 1.5, 1.6 alsa-tools.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200512061855.jB6ItZDr019073@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/alsa-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19034

Modified Files:
	.cvsignore alsa-tools.spec sources 
Log Message:
Update to 1.0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Jun 2005 14:44:41 -0000	1.5
+++ .cvsignore	6 Dec 2005 18:55:02 -0000	1.6
@@ -1 +1 @@
-alsa-tools-1.0.9-pruned.tar.bz2
+alsa-tools-1.0.10-pruned.tar.bz2


Index: alsa-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/alsa-tools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- alsa-tools.spec	27 Jun 2005 14:44:41 -0000	1.8
+++ alsa-tools.spec	6 Dec 2005 18:55:02 -0000	1.9
@@ -4,7 +4,7 @@
 
 Summary: 	The ALSA Tools
 Name: 		alsa-tools
-Version: 	1.0.9
+Version: 	1.0.10
 Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
@@ -151,6 +151,9 @@
 %endif # ?_with_firmware
 
 %changelog
+* Tue Dec 06 2005 Thorsten Leemhuis  - 1.0.10-1
+- Update to 1.0.10
+
 * Fri May 06 2005 Thorsten Leemhuis  - 1.0.9-1
 - Update to 1.0.9
 - Use disttag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jun 2005 14:44:41 -0000	1.5
+++ sources	6 Dec 2005 18:55:02 -0000	1.6
@@ -1 +1 @@
-0151eb036e97d46bdee972cfdb433149  alsa-tools-1.0.9-pruned.tar.bz2
+dd280ae7294b3021438986ca54df9ca5  alsa-tools-1.0.10-pruned.tar.bz2



From fedora-extras-commits at redhat.com  Tue Dec  6 18:55:39 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 13:55:39 -0500
Subject: web/include widgets.inc,1.3,1.4
Message-ID: <200512061856.jB6Iu94T019168@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19081

Modified Files:
	widgets.inc 
Log Message:
Reverting this piece to what was in 1.2 that wasn't broken ... I'm figuring I did a phat phinger on this page while editing last night.


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- widgets.inc	15 Nov 2005 23:38:14 -0000	1.3
+++ widgets.inc	6 Dec 2005 18:55:37 -0000	1.4
@@ -55,7 +55,7 @@
 		$imgsize = getimagesize($_SERVER[DOCUMENT_ROOT]."/".$filename_deslash);
 	}
 	if ($extra != "") $extra = " ".$extra;
-	return "\"$alt\"$extra";
+	return "\"$alt\"$extra";
 }
 
 /* Escape and obfuscate the email to hide it from spambots,



From fedora-extras-commits at redhat.com  Tue Dec  6 18:59:37 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Dec 2005 13:59:37 -0500
Subject: rpms/sbcl/FC-3 .cvsignore, 1.5, 1.6 sbcl.spec, 1.24, 1.25 sources,
	1.5, 1.6
Message-ID: <200512061900.jB6J08AX019360@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19331

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Mon Nov 28 2005 Rex Dieter  0.9.7-1
- 0.9.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Oct 2005 17:34:32 -0000	1.5
+++ .cvsignore	6 Dec 2005 18:59:35 -0000	1.6
@@ -3,3 +3,4 @@
 sbcl-0.9.5-source.tar.bz2
 sbcl-0.9.5-x86-linux-binary.tar.bz2
 sbcl-0.9.6-source.tar.bz2
+sbcl-0.9.7-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sbcl.spec	27 Oct 2005 20:12:23 -0000	1.24
+++ sbcl.spec	6 Dec 2005 18:59:35 -0000	1.25
@@ -5,12 +5,15 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define verbose 1 
+%define sbcl_verbose 1 
+
+# shell to use
+%define sbcl_shell /bin/bash -x
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.6
-Release: 5%{?dist}
+Version: 0.9.7
+Release: 1%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -93,7 +96,7 @@
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
 %patch5 -p1 -b .make-config-fix
-%{?verbose:%patch6 -p1 -b .verbose-build}
+%{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
 # Enable sb-thread
@@ -110,7 +113,7 @@
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
 pushd sbcl-*-linux
-INSTALL_ROOT=`pwd`/../sbcl-bootstrap sh %{?verbose:-x} ./install.sh
+INSTALL_ROOT=`pwd`/../sbcl-bootstrap %{?sbcl_shell} ./install.sh
 popd
 %endif
 
@@ -141,7 +144,7 @@
 export EXTRA_CFLAGS="$CFLAGS"
 export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
-%{?setarch} %{?my_setarch} sh %{?verbose:-x} ./make.sh %{?bootstrap}
+%{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap}
 
 
 
@@ -162,7 +165,7 @@
 pushd tests 
 # Only x86 builds are expected to pass all
 # Don't worry about thread.impure failure(s), threading is optional anyway.
-%{?setarch} sh ./run-tests.sh ||:
+%{?setarch} %{?sbcl_shell} ./run-tests.sh ||:
 popd
 
 
@@ -174,7 +177,7 @@
 unset SBCL_HOME 
 export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} 
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} 
-sh %{?verbose:-x} ./install.sh 
+%{?sbcl_shell} ./install.sh 
 
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
@@ -182,8 +185,8 @@
 # CVS crud 
 find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
 find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f
-# 'test-passed' files from %%check (leave these in, for now -- Rex)
-# find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
+# 'test-passed' files from %%check
+find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -vf
 
 
 %if "%{?min_bootstrap}" == "%{nil}"
@@ -223,8 +226,11 @@
 
 
 %changelog
+* Mon Nov 28 2005 Rex Dieter  0.9.7-1
+- 0.9.7
+
 * Thu Oct 27 2005 Rex Dieter  0.9.6-5
-- override friggen sb-posix test failure(s).
+- override (bogus/mock-induced) sb-posix test failure(s).
 
 * Thu Oct 27 2005 Rex Dieter  0.9.6-4
 - drop -D_FILE_OFFSET_BITS=64


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Oct 2005 17:34:32 -0000	1.5
+++ sources	6 Dec 2005 18:59:35 -0000	1.6
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 67ec41e624a3f2ad7f6f3cde1bd001d3  sbcl-0.9.4-x86-64-linux-binary.tar.bz2
 cb01b462b517889723eeaf63b5474c70  sbcl-0.9.5-x86-linux-binary.tar.bz2
-5e94122e73bc59c1411ff93fee948bfb  sbcl-0.9.6-source.tar.bz2
+d5e5e4ae500f12b7523989222cb4cc88  sbcl-0.9.7-source.tar.bz2



From fedora-extras-commits at redhat.com  Tue Dec  6 19:03:53 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  6 Dec 2005 14:03:53 -0500
Subject: rpms/sbcl/FC-3 sbcl.spec,1.25,1.26
Message-ID: <200512061904.jB6J4NnI021032@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21012

Modified Files:
	sbcl.spec 
Log Message:
previous tagging attempt failed, micro increment Release



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sbcl.spec	6 Dec 2005 18:59:35 -0000	1.25
+++ sbcl.spec	6 Dec 2005 19:03:50 -0000	1.26
@@ -13,7 +13,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.7
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: BSD/MIT
 Group: 	 Development/Languages



From fedora-extras-commits at redhat.com  Tue Dec  6 19:33:40 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:33:40 -0500
Subject: web/html/docs/developers-guide - New directory
Message-ID: <200512061933.jB6JXeA9021183@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/developers-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21174/developers-guide

Log Message:
Directory /cvs/fedora/web/html/docs/developers-guide added to the repository




From fedora-extras-commits at redhat.com  Tue Dec  6 19:33:45 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:33:45 -0500
Subject: web/html/docs/documentation-guide - New directory
Message-ID: <200512061933.jB6JXje9021198@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21174/documentation-guide

Log Message:
Directory /cvs/fedora/web/html/docs/documentation-guide added to the repository




From fedora-extras-commits at redhat.com  Tue Dec  6 19:34:35 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:34:35 -0500
Subject: web/html/docs/developers-guide/stylesheet-images - New directory
Message-ID: <200512061934.jB6JYZpH021232@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/developers-guide/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21221/developers-guide/stylesheet-images

Log Message:
Directory /cvs/fedora/web/html/docs/developers-guide/stylesheet-images added to the repository




From fedora-extras-commits at redhat.com  Tue Dec  6 19:34:41 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:34:41 -0500
Subject: web/html/docs/documentation-guide/stylesheet-images - New directory
Message-ID: <200512061934.jB6JYfGK021250@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-guide/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21221/documentation-guide/stylesheet-images

Log Message:
Directory /cvs/fedora/web/html/docs/documentation-guide/stylesheet-images added to the repository




From fedora-extras-commits at redhat.com  Tue Dec  6 19:35:38 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:35:38 -0500
Subject: web/html/docs/documentation-faq - New directory
Message-ID: <200512061935.jB6JZch7021274@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-faq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21264/documentation-faq

Log Message:
Directory /cvs/fedora/web/html/docs/documentation-faq added to the repository




From fedora-extras-commits at redhat.com  Tue Dec  6 19:37:05 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:37:05 -0500
Subject: web/html/docs/developers-guide ch-console-access.php, NONE,
	1.1 ch-cvs.php, NONE, 1.1 ch-guidelines.php, NONE,
	1.1 ch-menus.php, NONE, 1.1 ch-package-versions.php, NONE,
	1.1 ch-rpm-building.php, NONE, 1.1 ch-ui-guidelines.php, NONE,
	1.1 index.php, NONE, 1.1 ln-legalnotice.php, NONE,
	1.1 s1-cvs-configure.php, NONE, 1.1 s1-cvs-cvscommands.php,
	NONE, 1.1 s1-rpm-guidelines.php, NONE,
	1.1 s1-rpm-more-guidelines.php, NONE,
	1.1 s1-ui-get-details.php, NONE, 1.1 s1-ui-get-religion.php,
	NONE, 1.1 s1-ui-gnome-guidelines.php, NONE,
	1.1 s1-ui-more-suggestions.php, NONE, 1.1 s1-ui-scaling.php,
	NONE, 1.1 sn-cvs-config.php, NONE, 1.1 sn-cvs-cvscommands.php,
	NONE, 1.1 sn-cvs-preparation.php, NONE, 1.1
Message-ID: <200512061937.jB6Jb5U2021331@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/developers-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21296/developers-guide

Added Files:
	ch-console-access.php ch-cvs.php ch-guidelines.php 
	ch-menus.php ch-package-versions.php ch-rpm-building.php 
	ch-ui-guidelines.php index.php ln-legalnotice.php 
	s1-cvs-configure.php s1-cvs-cvscommands.php 
	s1-rpm-guidelines.php s1-rpm-more-guidelines.php 
	s1-ui-get-details.php s1-ui-get-religion.php 
	s1-ui-gnome-guidelines.php s1-ui-more-suggestions.php 
	s1-ui-scaling.php sn-cvs-config.php sn-cvs-cvscommands.php 
	sn-cvs-preparation.php 
Log Message:
Moving documentation FAQ, guide, and developer guide to where they belong under /docs; this makes the documentation directory able to be moved more easily.  I'll setup redirects in the old locations.


***** Error reading new file: [Errno 2] No such file or directory: 'ch-console-access.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-cvs.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-guidelines.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-menus.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-package-versions.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-rpm-building.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-ui-guidelines.php'

***** Error reading new file: [Errno 2] No such file or directory: 'index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ln-legalnotice.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-cvs-configure.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-cvs-cvscommands.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-rpm-guidelines.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-rpm-more-guidelines.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-ui-get-details.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-ui-get-religion.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-ui-gnome-guidelines.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-ui-more-suggestions.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-ui-scaling.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-config.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-cvscommands.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-preparation.php'



From fedora-extras-commits at redhat.com  Tue Dec  6 19:37:11 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:37:11 -0500
Subject: web/html/docs/documentation-faq index.php,NONE,1.1
Message-ID: <200512061937.jB6JbBhM021347@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-faq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21296/documentation-faq

Added Files:
	index.php 
Log Message:
Moving documentation FAQ, guide, and developer guide to where they belong under /docs; this makes the documentation directory able to be moved more easily.  I'll setup redirects in the old locations.


***** Error reading new file: [Errno 2] No such file or directory: 'index.php'



From fedora-extras-commits at redhat.com  Tue Dec  6 19:37:16 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:37:16 -0500
Subject: web/html/docs/documentation-guide acknowledgments.php, NONE,
 1.1 ch-converting.php, NONE, 1.1 ch-cvs.php, NONE, 1.1 ch-emacs-nxml.php,
 NONE, 1.1 ch-emacs.php, NONE, 1.1 ch-getting-files.php, NONE,
 1.1 ch-intro.php, NONE, 1.1 ch-rh-guidelines.php, NONE, 1.1 ch-style.php,
 NONE, 1.1 ch-tutorial.php, NONE, 1.1 ch-vim.php, NONE, 1.1 ch-xml-tags.php,
 NONE, 1.1 generated-index.php, NONE, 1.1 index.php, NONE,
 1.1 ln-legalnotice.php, NONE, 1.1 s1-diagrams-images.php, NONE,
 1.1 s1-emacs-additional-resources.php, NONE, 1.1 s1-emacs-basic-commands.php,
 NONE, 1.1 s1-emacs-cedfile.php, NONE, 1.1 s1-emacs-colors.php, NONE,
 1.1 s1-emacs-examples.php, NONE, 1.1 s1-emacs-loadced.php, NONE,
 1.1 s1-emacs-nxml-additional-resources.php, NONE,
 1.1 s1-emacs-nxml-readme.php, NONE, 1.1 s1-nxml-examples.php, NONE,
 1.1 s1-screenshots.php, NONE, 1.1 s1-tutorial-license.php, NONE,
 1.1 s1-vim-additional-resources.php, NONE, 1.1 s1-vim-keymapping.php, NONE,
 1.1 s1-xml-admon.php, NONE, 1.1 s1-xml-guidelines-header.php, NONE,
 1.1 s1-xml-tag-sulink.php, NONE, 1.1!
 s1-xml-tags-application.php, NONE, 1.1 s1-xml-tags-chapter.php, NONE,
 1.1 s1-xml-tags-citetitle.php, NONE, 1.1 s1-xml-tags-command.php, NONE,
 1.1 s1-xml-tags-compoutput.php, NONE, 1.1 s1-xml-tags-emphasis.php, NONE,
 1.1 s1-xml-tags-example.php, NONE, 1.1 s1-xml-tags-figure.php, NONE,
 1.1 s1-xml-tags-filename.php, NONE, 1.1 s1-xml-tags-firstterm.php, NONE,
 1.1 s1-xml-tags-footnote.php, NONE, 1.1 s1-xml-tags-gui.php, NONE,
 1.1 s1-xml-tags-indexing.php, NONE, 1.1 s1-xml-tags-keycap.php, NONE,
 1.1 s1-xml-tags-lists.php, NONE, 1.1 s1-xml-tags-option.php, NONE,
 1.1 s1-xml-tags-para.php, NONE, 1.1 s1-xml-tags-part.php, NONE,
 1.1 s1-xml-tags-prompt.php, NONE, 1.1 s1-xml-tags-replaceable.php, NONE,
 1.1 s1-xml-tags-screen.php, NONE, 1.1 s1-xml-tags-sections.php, NONE,
 1.1 s1-xml-tags-table.php, NONE, 1.1 s1-xml-tags-trademark.php, NONE,
 1.1 s1-xml-tags-userinput.php, NONE, 1.1 s1-xml-tags-wordasword.php, NONE,
 1.1 s1-xml-tags-xref.php, NONE, 1.1 sn-composition-tips.php, NONE,
 1.1 sn-cvs-config.php, NONE, 1.1 sn-cvs-cvscommands.php, NONE, 1.1!
 sn-cvs-preparation.php,NONE,1.1 sn-grammar-and-usage.php,NONE!
 ,1.1 s
Message-ID: <200512061937.jB6JbGTD021427@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21296/documentation-guide

Added Files:
	acknowledgments.php ch-converting.php ch-cvs.php 
	ch-emacs-nxml.php ch-emacs.php ch-getting-files.php 
	ch-intro.php ch-rh-guidelines.php ch-style.php ch-tutorial.php 
	ch-vim.php ch-xml-tags.php generated-index.php index.php 
	ln-legalnotice.php s1-diagrams-images.php 
	s1-emacs-additional-resources.php s1-emacs-basic-commands.php 
	s1-emacs-cedfile.php s1-emacs-colors.php s1-emacs-examples.php 
	s1-emacs-loadced.php s1-emacs-nxml-additional-resources.php 
	s1-emacs-nxml-readme.php s1-nxml-examples.php 
	s1-screenshots.php s1-tutorial-license.php 
	s1-vim-additional-resources.php s1-vim-keymapping.php 
	s1-xml-admon.php s1-xml-guidelines-header.php 
	s1-xml-tag-sulink.php s1-xml-tags-application.php 
	s1-xml-tags-chapter.php s1-xml-tags-citetitle.php 
	s1-xml-tags-command.php s1-xml-tags-compoutput.php 
	s1-xml-tags-emphasis.php s1-xml-tags-example.php 
	s1-xml-tags-figure.php s1-xml-tags-filename.php 
	s1-xml-tags-firstterm.php s1-xml-tags-footnote.php 
	s1-xml-tags-gui.php s1-xml-tags-indexing.php 
	s1-xml-tags-keycap.php s1-xml-tags-lists.php 
	s1-xml-tags-option.php s1-xml-tags-para.php 
	s1-xml-tags-part.php s1-xml-tags-prompt.php 
	s1-xml-tags-replaceable.php s1-xml-tags-screen.php 
	s1-xml-tags-sections.php s1-xml-tags-table.php 
	s1-xml-tags-trademark.php s1-xml-tags-userinput.php 
	s1-xml-tags-wordasword.php s1-xml-tags-xref.php 
	sn-composition-tips.php sn-cvs-config.php 
	sn-cvs-cvscommands.php sn-cvs-preparation.php 
	sn-grammar-and-usage.php sn-tech-docs-fundamentals.php 
Log Message:
Moving documentation FAQ, guide, and developer guide to where they belong under /docs; this makes the documentation directory able to be moved more easily.  I'll setup redirects in the old locations.


***** Error reading new file: [Errno 2] No such file or directory: 'acknowledgments.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-converting.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-cvs.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-emacs-nxml.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-emacs.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-getting-files.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-intro.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-rh-guidelines.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-style.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-tutorial.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-vim.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ch-xml-tags.php'

***** Error reading new file: [Errno 2] No such file or directory: 'generated-index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ln-legalnotice.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-diagrams-images.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-additional-resources.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-basic-commands.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-cedfile.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-colors.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-examples.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-loadced.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-nxml-additional-resources.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-emacs-nxml-readme.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-nxml-examples.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-screenshots.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-tutorial-license.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-vim-additional-resources.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-vim-keymapping.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-admon.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-guidelines-header.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tag-sulink.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-application.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-chapter.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-citetitle.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-command.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-compoutput.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-emphasis.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-example.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-figure.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-filename.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-firstterm.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-footnote.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-gui.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-indexing.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-keycap.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-lists.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-option.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-para.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-part.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-prompt.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-replaceable.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-screen.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-sections.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-table.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-trademark.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-userinput.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-wordasword.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-xml-tags-xref.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-composition-tips.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-config.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-cvscommands.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-cvs-preparation.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-grammar-and-usage.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-tech-docs-fundamentals.php'



From fedora-extras-commits at redhat.com  Tue Dec  6 19:41:17 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:41:17 -0500
Subject: web/html/participate/developers-guide index.php,1.2,1.3
Message-ID: <200512061941.jB6JfmGd021502@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/developers-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21453/developers-guide

Modified Files:
	index.php 
Log Message:
Deprecating to zero the documentation that was stored in /participate for some reason ... these redirects just do the right thing, which we decided was much better than leaving an explanation behind.  This also supports the no-broken-URLs standard we should strive for.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/developers-guide/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.php	29 Sep 2005 17:08:19 -0000	1.2
+++ index.php	6 Dec 2005 19:41:15 -0000	1.3
@@ -1,17 +1,3 @@
-initCommon(); 
-$template->displayHeader();
-
+
-
-
            Fedora Core Developer's Guide
               Next
            Fedora Core Developer's Guide
            Tammy Fox
            Havoc Pennington
            Copyright © 2003 Red Hat, Inc., Tammy Fox, Havoc Pennington
            Table of Co!
 ntents
            1. General Guidelines
            2. Package Versions
            2.1. Beta Exceptions
            3. CVS
            3.1. How CVS Works
            3.2. Preparing For CVS Use
            3.2.1. Is CVS Installed On Your System
            3.2.2. Generating SSH Keys
            3.3. Configuring For CVS Access
            3.3.1. Avoiding Repetitive Typing
            3.3.2. Configuring for Read-Only CVS Access
            3.3.3. Configuring Read/Write CVS Access
            3.4. Basic CVS Commands
            3.4.1. Checking Out Modules
            3.4.1.1. Checking Out Branches of Modules
            3.4.2. Updating Files
            3.4.3. Committing Files
            3.4.4. Adding Files
            3.4.5. Managing Binary Files
            3.4.6. Removing Files
            3.4.7. Status of Files
            3.4.8. Resolving Conflicts
            3.4.9. Summary
            4. Building RPM Packages
            4.1. Spec File
            4.2!
 . Guidelines
            4.3. More RPM Building Hints
            5. User Interface Guidelines
            5.1. Read the CliffNotes®
            5.2. The GNOME Guidelines
            5.3. Get Religion
            5.4. Get Details
            5.5. More Suggestions
            5.6. Scaling It Down
            6. Enabling Console Access
            7. Adding Applications to the Men!
 us
            7.1. Red Hat Categories
               Next
               Chapter 1. General Guidelines
            
-
-displayFooter('$Date$');
-
-?>
-



From fedora-extras-commits at redhat.com  Tue Dec  6 19:41:23 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:41:23 -0500
Subject: web/html/participate/documentation-faq index.php,1.2,1.3
Message-ID: <200512061941.jB6Jfr14021505@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-faq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21453/documentation-faq

Modified Files:
	index.php 
Log Message:
Deprecating to zero the documentation that was stored in /participate for some reason ... these redirects just do the right thing, which we decided was much better than leaving an explanation behind.  This also supports the no-broken-URLs standard we should strive for.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-faq/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.php	6 Dec 2005 06:53:52 -0000	1.2
+++ index.php	6 Dec 2005 19:41:21 -0000	1.3
@@ -1,60 +1,3 @@
-initCommon();
-
-$template->displayHeader();
-
-?>
-
-
            Fedora Documentation Project FAQ
            
-
-
            
-This is a list of FAQs from common questions asked on the mailing list.
-Please refer to this page before posting a question to the mailing list.
-
            
-
-
            Does Fedora Project need writers/editors?
            
-
-
            
-Yes. Writers are needed right now more then editors. Without writers, there is
-nothing to edit.
-
            
-
-
            
-To volunteer for a topic, refer to the DocsProject wiki for instructions on how to 
-get started.
-
            
-
-
            What documents are needed?
            
-
-
            
-The Fedora Documenation Project documents are of the tutorial/HOWTO 
-variety because it works well with the distributed project by allowing one
-person or a some group of people to concentrate on a specific topic. Currently,
-the only "guide" planned is an Installation Guide. Since the docs are Web-based,
-having topics combined into "manuals" or "books" does not have many advantages.
-
            
-
-
            May I translate the legal notice?
            
-
-
            
-The legal notice page from the file legalnotice-en.xml may be translated, 
-but a statement that the translation is provided for convenience only 
-and that the English   language version takes precedence must be on the top of the 
-page.
-
            
-
-
            How do I get write access to CVS?
            
-
-
            
-Read the DocsProject/NewWriters 
-wiki page for detailed information.
-
            
-
-displayFooter('$Date$');
-
+



From fedora-extras-commits at redhat.com  Tue Dec  6 19:41:28 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:41:28 -0500
Subject: web/html/participate/documentation-guide index.php,1.4,1.5
Message-ID: <200512061941.jB6JfwO7021508@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21453/documentation-guide

Modified Files:
	index.php 
Log Message:
Deprecating to zero the documentation that was stored in /participate for some reason ... these redirects just do the right thing, which we decided was much better than leaving an explanation behind.  This also supports the no-broken-URLs standard we should strive for.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.php	19 Sep 2005 18:50:48 -0000	1.4
+++ index.php	6 Dec 2005 19:41:26 -0000	1.5
@@ -1,19 +1,3 @@
-initCommon(); 
-$template->displayHeader();
-
-?>
-
-
            Fedora Project Documentation Guide
               Next
            Fedora Project Documentation Guide
            Version 0.2.6.3
            Tammy Fox
            Johnray Fuller
            Sandra Moore
            !
 Copyright © 2003,2004,2005 Red Hat, Inc., Tammy Fox, Johnray Fuller, Sandra Moore
            Table of Contents
            Introduction
            1. Getting the Files
            2. Red Hat Documentation Guidelines
            2.1. ID Naming Conventions
            2.2. File Header
            2.3. Admonitions
            2.3.1. Creating Notes, Tips, Cautions, Importants, and Warnings
            2.4. Screenshots!
 
            2.5. Diagrams and Images
            3. Emacs and PSGML Mode
            3.1. Setting Up Your .emacs File
            3.2. Customizing Emacs
            3.3. Create Recompiled DTD Subset
            3.4. Load the Parsed DTD
            3.5. Basic Emacs Commands
            3.6. Examples
            3.6.1. Tag Completion
            3.6.2. Tag Closure
            3.6.3. Other Emacs Tasks
            3.7. Additional Resources
            4. Emacs and nXML Mode
            4.1. Getting the nXML RPM
            4.2. Examples
            4.2.1. Commands
            4.3. Additional Resources
            4.4. nXML README File
            5. VIM and DocBook
            5.1. Setting Up Your .vimrc File
            5.2. Keymapping with VIM
            5.3. Additional VIM Resources
            6. DocBook XML Tags
            6.1. Tags and Entities Caveats
            6.2. application
            6.3. chapter
            6.4. citetitle
            6.5. command
            6.6. computeroutput
            6.7. emphasis
            6.8. example
            6.9. filename
            6.10. firstterm
            6.11. footnote
            6.12. figure
            6.13. GUI Tags
            6.13.1. guilabel
            6.13.2. guibutton
            6.13.3. guiicon
            6.13.4. guimenu and
-	  guimenuitem
            6.14. keycap
            6.14.1. menuchoice
            6.14.2. keycombo
            6.15. Lists
            6.15.1. itemizedlist
            6.15.2. OrderedList
            6.15.3. Variablelist
            6.15.4. Creating a List Within a Table Using Simplelist
            6.15.5. glosslist
            6.16. option
            6.17. Index Entries
            6.18. para
            6.19. part
            6.20. prompt
            6.21. replaceable
            6.22. screen
            6.22.1. Using Inline Tags with screen
            6.23. Sections
            6.24. table
            6.24.1. Creating a List Within a Table
            6.25. trademark
            6.26. userinput
            6.27. ulink
            6.28. wordasword
            6.29. xref
            7. The Layout of a Tutorial
            7.1. The Parent File
            7.2. Including the License Information
            8. Style
            8.1. Why Style Is Important
            8.2. Fundamental Concepts of Technical Documentation
            8.2.1. General Style Requirements
            8.2.2. Golden Rules
            8.2.3. Tone
            8.2.4. Reaching the Right Audience
            8.2.5. User Motivation
            8.2.6. New Users
            
.7. Experienced Users
            8.2.8. Do Not Offend Your Audience
            8.3. Grammar and Usage Guidelines
            8.4. Composition Tips
            8.4.1. Active Voice
            8.4.2. Present Tense
            8.4.3. Narrative Voice
            8.4.4. Negative Words
            8.4.5. Uncertainty
            8.4.6. Redundant Coverage
            8.4.7. Self-referential Value Judgments
            8.4.8. Precision of Language
            8.4.9. DocBook Tips
            8.4.9.1. Admonitions
            8.4.9.2. The replaceable
-	  Tag
            8.4.9.3. XML Entities
            9. Converting to HTML and PDF
            10. CVS
            10.1. How CVS Works
            10.2. Preparing For CVS Use
            10.2.1. Is CVS Installed On Your System
            10.2.2. Generating SSH Keys
            10.3. Configuring For CVS Access
            10.3.1. Avoiding Repetitive Typing
            10.3.2. Configuring for Read-Only CVS Access
            10.3.3. Configuring Read/Write CVS Access
            10.4. Basic CVS Commands
            10.4.1. Checking Out Modules
            10.4.1.1. Checking Out Branches of Modules
            10.4.2. Updating Files
            10.4.3. Committing Files
            10.4.5. Managing Binary Files
            10.4.6. Removing Files
            10.4.7. Status of Files
            10.4.8. Resolving Conflicts
            10.4.9. Summary
            11. Acknowledgments
            Index
               Next
               Introduction
            
-
-displayFooter('$Date$');
-
-?>
-
+
\ No newline at end of file



From fedora-extras-commits at redhat.com  Tue Dec  6 19:48:09 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:48:09 -0500
Subject: web/html/participate/developers-guide ch-console-access.php, 1.2,
	NONE ch-cvs.php, 1.2, NONE ch-guidelines.php, 1.2,
	NONE ch-menus.php, 1.2, NONE ch-package-versions.php, 1.2,
	NONE ch-rpm-building.php, 1.2, NONE ch-ui-guidelines.php, 1.2,
	NONE ln-legalnotice.php, 1.2, NONE s1-cvs-configure.php,
	1.1.1.1, NONE s1-cvs-cvscommands.php, 1.1.1.1,
	NONE s1-rpm-guidelines.php, 1.2,
	NONE s1-rpm-more-guidelines.php, 1.2,
	NONE s1-ui-get-details.php, 1.2, NONE s1-ui-get-religion.php,
	1.2, NONE s1-ui-gnome-guidelines.php, 1.2,
	NONE s1-ui-more-suggestions.php, 1.2, NONE s1-ui-scaling.php,
	1.2, NONE sn-cvs-config.php, 1.1, NONE sn-cvs-cvscommands.php,
	1.1, NONE sn-cvs-preparation.php, 1.1, NONE
Message-ID: <200512061948.jB6Jm9xv021631@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/developers-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21621

Removed Files:
	ch-console-access.php ch-cvs.php ch-guidelines.php 
	ch-menus.php ch-package-versions.php ch-rpm-building.php 
	ch-ui-guidelines.php ln-legalnotice.php s1-cvs-configure.php 
	s1-cvs-cvscommands.php s1-rpm-guidelines.php 
	s1-rpm-more-guidelines.php s1-ui-get-details.php 
	s1-ui-get-religion.php s1-ui-gnome-guidelines.php 
	s1-ui-more-suggestions.php s1-ui-scaling.php sn-cvs-config.php 
	sn-cvs-cvscommands.php sn-cvs-preparation.php 
Log Message:
This location is deprecated, content has moved to /docs.


--- ch-console-access.php DELETED ---


--- ch-cvs.php DELETED ---


--- ch-guidelines.php DELETED ---


--- ch-menus.php DELETED ---


--- ch-package-versions.php DELETED ---


--- ch-rpm-building.php DELETED ---


--- ch-ui-guidelines.php DELETED ---


--- ln-legalnotice.php DELETED ---


--- s1-cvs-configure.php DELETED ---


--- s1-cvs-cvscommands.php DELETED ---


--- s1-rpm-guidelines.php DELETED ---


--- s1-rpm-more-guidelines.php DELETED ---


--- s1-ui-get-details.php DELETED ---


--- s1-ui-get-religion.php DELETED ---


--- s1-ui-gnome-guidelines.php DELETED ---


--- s1-ui-more-suggestions.php DELETED ---


--- s1-ui-scaling.php DELETED ---


--- sn-cvs-config.php DELETED ---


--- sn-cvs-cvscommands.php DELETED ---


--- sn-cvs-preparation.php DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec  6 19:55:19 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 14:55:19 -0500
Subject: web/html/participate/documentation-guide acknowledgments.php, 1.4,
 NONE ch-converting.php, 1.4, NONE ch-cvs.php, 1.4, NONE ch-emacs-nxml.php,
 1.4, NONE ch-emacs.php, 1.4, NONE ch-getting-files.php, 1.4,
 NONE ch-intro.php, 1.4, NONE ch-rh-guidelines.php, 1.4, NONE ch-style.php,
 1.3, NONE ch-tutorial.php, 1.4, NONE ch-vim.php, 1.4, NONE ch-xml-tags.php,
 1.4, NONE generated-index.php, 1.4, NONE ln-legalnotice.php, 1.4,
 NONE s1-diagrams-images.php, 1.4, NONE s1-emacs-additional-resources.php,
 1.4, NONE s1-emacs-basic-commands.php, 1.4, NONE s1-emacs-cedfile.php, 1.4,
 NONE s1-emacs-colors.php, 1.4, NONE s1-emacs-examples.php, 1.4,
 NONE s1-emacs-loadced.php, 1.4, NONE s1-emacs-nxml-additional-resources.php,
 1.4, NONE s1-emacs-nxml-readme.php, 1.4, NONE s1-nxml-examples.php, 1.4,
 NONE s1-screenshots.php, 1.4, NONE s1-tutorial-license.php, 1.4,
 NONE s1-vim-additional-resources.php, 1.4, NONE s1-vim-keymapping.php, 1.4,
 NONE s1-xml-admon.php, 1.4, NONE s1-xml-guidelines-header.php, 1.4,
 NONE s1-xml-tag-sulink.php, 1.4, NONE s1-xml-tags!
 -application.php, 1.4, NONE s1-xml-tags-chapter.php, 1.4,
 NONE s1-xml-tags-citetitle.php, 1.4, NONE s1-xml-tags-command.php, 1.4,
 NONE s1-xml-tags-compoutput.php, 1.4, NONE s1-xml-tags-emphasis.php, 1.4,
 NONE s1-xml-tags-example.php, 1.4, NONE s1-xml-tags-figure.php, 1.4,
 NONE s1-xml-tags-filename.php, 1.4, NONE s1-xml-tags-firstterm.php, 1.4,
 NONE s1-xml-tags-footnote.php, 1.4, NONE s1-xml-tags-gui.php, 1.4,
 NONE s1-xml-tags-indexing.php, 1.4, NONE s1-xml-tags-keycap.php, 1.4,
 NONE s1-xml-tags-lists.php, 1.4, NONE s1-xml-tags-option.php, 1.4,
 NONE s1-xml-tags-para.php, 1.4, NONE s1-xml-tags-part.php, 1.4,
 NONE s1-xml-tags-prompt.php, 1.4, NONE s1-xml-tags-replaceable.php, 1.4,
 NONE s1-xml-tags-screen.php, 1.4, NONE s1-xml-tags-sections.php, 1.4,
 NONE s1-xml-tags-table.php, 1.4, NONE s1-xml-tags-trademark.php, 1.4,
 NONE s1-xml-tags-userinput.php, 1.4, NONE s1-xml-tags-wordasword.php, 1.4,
 NONE s1-xml-tags-xref.php, 1.4, NONE sn-composition-tips.php, 1.3,
 NONE sn-cvs-config.php, 1.2, NONE sn-cvs-cvscommands.php, 1.2,
 NONE sn-cvs-prep!
 aration.php,1.2,NONE sn-grammar-and-usage.php,1.3,NONE sn-tech!
 -docs-
Message-ID: <200512061955.jB6JtJlB021985@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21975

Removed Files:
	acknowledgments.php ch-converting.php ch-cvs.php 
	ch-emacs-nxml.php ch-emacs.php ch-getting-files.php 
	ch-intro.php ch-rh-guidelines.php ch-style.php ch-tutorial.php 
	ch-vim.php ch-xml-tags.php generated-index.php 
	ln-legalnotice.php s1-diagrams-images.php 
	s1-emacs-additional-resources.php s1-emacs-basic-commands.php 
	s1-emacs-cedfile.php s1-emacs-colors.php s1-emacs-examples.php 
	s1-emacs-loadced.php s1-emacs-nxml-additional-resources.php 
	s1-emacs-nxml-readme.php s1-nxml-examples.php 
	s1-screenshots.php s1-tutorial-license.php 
	s1-vim-additional-resources.php s1-vim-keymapping.php 
	s1-xml-admon.php s1-xml-guidelines-header.php 
	s1-xml-tag-sulink.php s1-xml-tags-application.php 
	s1-xml-tags-chapter.php s1-xml-tags-citetitle.php 
	s1-xml-tags-command.php s1-xml-tags-compoutput.php 
	s1-xml-tags-emphasis.php s1-xml-tags-example.php 
	s1-xml-tags-figure.php s1-xml-tags-filename.php 
	s1-xml-tags-firstterm.php s1-xml-tags-footnote.php 
	s1-xml-tags-gui.php s1-xml-tags-indexing.php 
	s1-xml-tags-keycap.php s1-xml-tags-lists.php 
	s1-xml-tags-option.php s1-xml-tags-para.php 
	s1-xml-tags-part.php s1-xml-tags-prompt.php 
	s1-xml-tags-replaceable.php s1-xml-tags-screen.php 
	s1-xml-tags-sections.php s1-xml-tags-table.php 
	s1-xml-tags-trademark.php s1-xml-tags-userinput.php 
	s1-xml-tags-wordasword.php s1-xml-tags-xref.php 
	sn-composition-tips.php sn-cvs-config.php 
	sn-cvs-cvscommands.php sn-cvs-preparation.php 
	sn-grammar-and-usage.php sn-tech-docs-fundamentals.php 
Log Message:
This location is deprecated, content has moved to /docs.


--- acknowledgments.php DELETED ---


--- ch-converting.php DELETED ---


--- ch-cvs.php DELETED ---


--- ch-emacs-nxml.php DELETED ---


--- ch-emacs.php DELETED ---


--- ch-getting-files.php DELETED ---


--- ch-intro.php DELETED ---


--- ch-rh-guidelines.php DELETED ---


--- ch-style.php DELETED ---


--- ch-tutorial.php DELETED ---


--- ch-vim.php DELETED ---


--- ch-xml-tags.php DELETED ---


--- generated-index.php DELETED ---


--- ln-legalnotice.php DELETED ---


--- s1-diagrams-images.php DELETED ---


--- s1-emacs-additional-resources.php DELETED ---


--- s1-emacs-basic-commands.php DELETED ---


--- s1-emacs-cedfile.php DELETED ---


--- s1-emacs-colors.php DELETED ---


--- s1-emacs-examples.php DELETED ---


--- s1-emacs-loadced.php DELETED ---


--- s1-emacs-nxml-additional-resources.php DELETED ---


--- s1-emacs-nxml-readme.php DELETED ---


--- s1-nxml-examples.php DELETED ---


--- s1-screenshots.php DELETED ---


--- s1-tutorial-license.php DELETED ---


--- s1-vim-additional-resources.php DELETED ---


--- s1-vim-keymapping.php DELETED ---


--- s1-xml-admon.php DELETED ---


--- s1-xml-guidelines-header.php DELETED ---


--- s1-xml-tag-sulink.php DELETED ---


--- s1-xml-tags-application.php DELETED ---


--- s1-xml-tags-chapter.php DELETED ---


--- s1-xml-tags-citetitle.php DELETED ---


--- s1-xml-tags-command.php DELETED ---


--- s1-xml-tags-compoutput.php DELETED ---


--- s1-xml-tags-emphasis.php DELETED ---


--- s1-xml-tags-example.php DELETED ---


--- s1-xml-tags-figure.php DELETED ---


--- s1-xml-tags-filename.php DELETED ---


--- s1-xml-tags-firstterm.php DELETED ---


--- s1-xml-tags-footnote.php DELETED ---


--- s1-xml-tags-gui.php DELETED ---


--- s1-xml-tags-indexing.php DELETED ---


--- s1-xml-tags-keycap.php DELETED ---


--- s1-xml-tags-lists.php DELETED ---


--- s1-xml-tags-option.php DELETED ---


--- s1-xml-tags-para.php DELETED ---


--- s1-xml-tags-part.php DELETED ---


--- s1-xml-tags-prompt.php DELETED ---


--- s1-xml-tags-replaceable.php DELETED ---


--- s1-xml-tags-screen.php DELETED ---


--- s1-xml-tags-sections.php DELETED ---


--- s1-xml-tags-table.php DELETED ---


--- s1-xml-tags-trademark.php DELETED ---


--- s1-xml-tags-userinput.php DELETED ---


--- s1-xml-tags-wordasword.php DELETED ---


--- s1-xml-tags-xref.php DELETED ---


--- sn-composition-tips.php DELETED ---


--- sn-cvs-config.php DELETED ---


--- sn-cvs-cvscommands.php DELETED ---


--- sn-cvs-preparation.php DELETED ---


--- sn-grammar-and-usage.php DELETED ---


--- sn-tech-docs-fundamentals.php DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec  6 20:15:57 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Tue,  6 Dec 2005 15:15:57 -0500
Subject: devel/NetworkManager-vpnc NetworkManager-vpnc.spec,1.4,1.5
Message-ID: <200512062016.jB6KGRhc023664@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/devel/NetworkManager-vpnc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23647

Modified Files:
	NetworkManager-vpnc.spec 
Log Message:
* Tue Dec  6 2005 Jeremy Katz  - 0.3-3
- rebuild for new dbus



Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/devel/NetworkManager-vpnc/NetworkManager-vpnc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NetworkManager-vpnc.spec	17 Oct 2005 17:53:27 -0000	1.4
+++ NetworkManager-vpnc.spec	6 Dec 2005 20:15:54 -0000	1.5
@@ -7,7 +7,7 @@
 Summary: NetworkManager VPN integration for vpnc
 Name: NetworkManager-vpnc
 Version: 0.3
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -84,6 +84,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Tue Dec  6 2005 Jeremy Katz  - 0.3-3
+- rebuild for new dbus
+
 * Mon Oct 17 2005 Dan Williams  0.3-2
 - Rebuild to test new Extras buildsystem
 



From fedora-extras-commits at redhat.com  Tue Dec  6 20:22:21 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 15:22:21 -0500
Subject: CVSROOT avail,1.16,1.17
Message-ID: <200512062022.jB6KMpQk023746@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23727/CVSROOT

Modified Files:
	avail 
Log Message:
Web project leaders need some control of what they are fixing, so I give it to them.


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- avail	10 Nov 2005 17:42:51 -0000	1.16
+++ avail	6 Dec 2005 20:22:19 -0000	1.17
@@ -22,6 +22,7 @@
 unavail | | web
 avail | tfox,notting,sopwith,gdk,katzj,kwade | web
 avail | havill,hp,nman64 | web
+avail | ivazquez,nman64 | web
 avail | katzj | web/html/projects/anaconda-installer
 avail | bfox | web/html/projects/config-tools
 avail | blizzard,krh | web/html/projects/desktop



From fedora-extras-commits at redhat.com  Tue Dec  6 20:26:15 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue,  6 Dec 2005 15:26:15 -0500
Subject: fedora-security/audit fc4,1.99,1.100 fc5,1.11,1.12
Message-ID: <200512062026.jB6KQjge023810@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23787

Modified Files:
	fc4 fc5 
Log Message:
A few updates (not done the kernel update yet)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- fc4	1 Dec 2005 22:40:19 -0000	1.99
+++ fc4	6 Dec 2005 20:26:13 -0000	1.100
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2005-3962 backport (perl) [since FEDORA-2005-1113]
+CVE-2005-3912 backport (perl) [since FEDORA-2005-1113]
 CVE-2005-3858 version (kernel, fixed 2.6.13) [since FEDORA-2005-949]
 CVE-2005-3857 VULNERABLE (kernel, fixed 2.6.15)
 CVE-2005-3848 version (kernel, fixed 2.6.13) [since FEDORA-2005-949]
@@ -55,6 +56,9 @@
 CVE-2005-3243 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3242 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3241 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
+CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1122]
+CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1122]
+CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1122]
 CVE-2005-3186 backport (gdk-pixbuf) [since FEDORA-2005-1085]
 CVE-2005-3186 backport (gtk2) [since FEDORA-2005-1088]
 CVE-2005-3185 blocked (curl) by FORTIFY_SOURCE


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fc5	1 Dec 2005 22:40:19 -0000	1.11
+++ fc5	6 Dec 2005 20:26:13 -0000	1.12
@@ -13,6 +13,7 @@
 ** are items that need attention
 
 CVE-2005-3962 VULNERABLE (perl)
+CVE-2005-3912 ** (perl)
 CVE-2005-3858 version (kernel, fixed 2.6.13)
 CVE-2005-3857 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1-git3
 CVE-2005-3848 version (kernel, fixed 2.6.13)
@@ -63,6 +64,9 @@
 CVE-2005-3243 version (ethereal, fixed 0.10.13)
 CVE-2005-3242 version (ethereal, fixed 0.10.13)
 CVE-2005-3241 version (ethereal, fixed 0.10.13)
+CVE-2005-3193 VULNERABLE (xpdf, fixed 3.0.1pl1)
+CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1)
+CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1)
 CVE-2005-3186 backport (gdk-pixbuf)
 CVE-2005-3186 version (gtk2, fixed 2.8.7 at least)
 CVE-2005-3185 version (curl, fixed 7.15)



From fedora-extras-commits at redhat.com  Tue Dec  6 20:40:05 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue,  6 Dec 2005 15:40:05 -0500
Subject: web/include widgets.inc,1.4,1.5
Message-ID: <200512062040.jB6KeaBs023859@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23842

Modified Files:
	widgets.inc 
Log Message:
Patch from ivazquez for debugging.


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- widgets.inc	6 Dec 2005 18:55:37 -0000	1.4
+++ widgets.inc	6 Dec 2005 20:40:03 -0000	1.5
@@ -81,6 +81,10 @@
 	}
 
 	$output.="\t";
+	
+	if (!is_array($node)) {
+		die(var_export(debug_backtrace(), TRUE));
+	}
 
 	foreach($node as $item) {
 



From fedora-extras-commits at redhat.com  Tue Dec  6 21:15:01 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 16:15:01 -0500
Subject: web/include widgets.inc,1.5,1.6
Message-ID: <200512062115.jB6LFV04025647@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25623

Modified Files:
	widgets.inc 
Log Message:
Maybe a little more for the debugging.


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- widgets.inc	6 Dec 2005 20:40:03 -0000	1.5
+++ widgets.inc	6 Dec 2005 21:14:59 -0000	1.6
@@ -82,10 +82,12 @@
 
 	$output.="\t";
 	
-	if (!is_array($node)) {
+	if (!isset($node) || !is_array($node)) {
 		die(var_export(debug_backtrace(), TRUE));
 	}
 
+	unset $item;
+
 	foreach($node as $item) {
 
 		// Display item as selected if it is the correct or intended URI



From fedora-extras-commits at redhat.com  Tue Dec  6 21:38:14 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 16:38:14 -0500
Subject: web/include widgets.inc,1.6,1.7
Message-ID: <200512062138.jB6LciNj025764@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25743

Modified Files:
	widgets.inc 
Log Message:
Bad idea fixed.


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- widgets.inc	6 Dec 2005 21:14:59 -0000	1.6
+++ widgets.inc	6 Dec 2005 21:38:12 -0000	1.7
@@ -86,8 +86,6 @@
 		die(var_export(debug_backtrace(), TRUE));
 	}
 
-	unset $item;
-
 	foreach($node as $item) {
 
 		// Display item as selected if it is the correct or intended URI



From fedora-extras-commits at redhat.com  Tue Dec  6 22:00:29 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 17:00:29 -0500
Subject: web/include widgets.inc,1.7,1.8
Message-ID: <200512062200.jB6M0xOn025847@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25830

Modified Files:
	widgets.inc 
Log Message:
Debugging


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- widgets.inc	6 Dec 2005 21:38:12 -0000	1.7
+++ widgets.inc	6 Dec 2005 22:00:26 -0000	1.8
@@ -83,7 +83,7 @@
 	$output.="\t";
 	
 	if (!isset($node) || !is_array($node)) {
-		die(var_export(debug_backtrace(), TRUE));
+		var_export(debug_backtrace(), TRUE);
 	}
 
 	foreach($node as $item) {



From fedora-extras-commits at redhat.com  Tue Dec  6 22:04:00 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 17:04:00 -0500
Subject: web/include widgets.inc,1.8,1.9
Message-ID: <200512062204.jB6M4UOk027431@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27411

Modified Files:
	widgets.inc 
Log Message:
Debugging


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- widgets.inc	6 Dec 2005 22:00:26 -0000	1.8
+++ widgets.inc	6 Dec 2005 22:03:58 -0000	1.9
@@ -83,7 +83,7 @@
 	$output.="\t";
 	
 	if (!isset($node) || !is_array($node)) {
-		var_export(debug_backtrace(), TRUE);
+		var_dump(debug_backtrace());
 	}
 
 	foreach($node as $item) {



From fedora-extras-commits at redhat.com  Tue Dec  6 22:48:45 2005
From: fedora-extras-commits at redhat.com (Simon Bellwood (simonb))
Date: Tue,  6 Dec 2005 17:48:45 -0500
Subject: rpms/fdupes/devel fdupes.spec,1.1,1.2
Message-ID: <200512062249.jB6MnFBv027689@cvs-int.fedora.redhat.com>

Author: simonb

Update of /cvs/extras/rpms/fdupes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27670

Modified Files:
	fdupes.spec 
Log Message:
Sync with FC-4



Index: fdupes.spec
===================================================================
RCS file: /cvs/extras/rpms/fdupes/devel/fdupes.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fdupes.spec	28 Nov 2005 19:24:20 -0000	1.1
+++ fdupes.spec	6 Dec 2005 22:48:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           fdupes
 Version:        1.40
-Release:        3
+Release:        5%{?dist}
 Summary:        Identifies and optionally deletes duplicate files
 
 Group:          Applications/File
@@ -47,6 +47,12 @@
 
 
 %changelog
+* Wed Nov 30 2005 Simon Bellwood  - 1.40-5
+- Initial attempt to import into Extras.
+
+* Wed Nov 30 2005 Simon Bellwood  - 1.40-4
+- Updated spec file to include dist in Release: field.
+
 * Thu Nov 24 2005 Simon Bellwood  - 1.40-3
 - Spec file cleanup.
 



From fedora-extras-commits at redhat.com  Tue Dec  6 22:49:55 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 17:49:55 -0500
Subject: web/include widgets.inc,1.9,1.10
Message-ID: <200512062250.jB6MoPQo027758@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27738

Modified Files:
	widgets.inc 
Log Message:
Try a different form.


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- widgets.inc	6 Dec 2005 22:03:58 -0000	1.9
+++ widgets.inc	6 Dec 2005 22:49:53 -0000	1.10
@@ -86,7 +86,9 @@
 		var_dump(debug_backtrace());
 	}
 
-	foreach($node as $item) {
+	unset($item);
+
+	while (list(, $item) = each($node)) {
 
 		// Display item as selected if it is the correct or intended URI
 		if ($item['uri'] == $page_level['complete_path'] || $item['uri'] == $options['selected_uri']) {
@@ -107,8 +109,6 @@
 			$output.=side_nav_traverse($item['sub'],$page_level,$current_level+1,$nav_id,$options);
 		}
 		$output.='';
-
-		next($node);
 	}
 	$output.="\n".str_repeat("\t",$current_level+3).'
          ';
 



From fedora-extras-commits at redhat.com  Tue Dec  6 23:23:39 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 18:23:39 -0500
Subject: web/include widgets.inc,1.10,1.11
Message-ID: <200512062324.jB6NO9XD029522@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29496

Modified Files:
	widgets.inc 
Log Message:
Silence until we can get a better look.


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- widgets.inc	6 Dec 2005 22:49:53 -0000	1.10
+++ widgets.inc	6 Dec 2005 23:23:37 -0000	1.11
@@ -75,18 +75,19 @@
 /* iterate through the sitelist recursively */
 function side_nav_traverse($node,$page_level,$current_level="0",$nav_id="",$options="") {
 
+	if (!isset($node) || !is_array($node)) {
+		var_dump(debug_backtrace())
+		return;
+	}
+
+	unset($item);
+
 	if ($current_level==0 && $nav_id != "") {
 		// set CSS id for top level only
 		$id=' id="'.$nav_id.'"';
 	}
 
 	$output.="\t";
-	
-	if (!isset($node) || !is_array($node)) {
-		var_dump(debug_backtrace());
-	}
-
-	unset($item);
 
 	while (list(, $item) = each($node)) {
 



From fedora-extras-commits at redhat.com  Wed Dec  7 00:13:06 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 19:13:06 -0500
Subject: web/include widgets.inc,1.12,1.13
Message-ID: <200512070013.jB70Dj6r031359@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31340

Modified Files:
	widgets.inc 
Log Message:
Debugging


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- widgets.inc	7 Dec 2005 00:12:36 -0000	1.12
+++ widgets.inc	7 Dec 2005 00:13:04 -0000	1.13
@@ -76,7 +76,8 @@
 function side_nav_traverse($node,$page_level,$current_level="0",$nav_id="",$options="") {
 
 	if (!isset($node) || !is_array($node)) {
-		var_dump(debug_backtrace())
+		var_dump(debug_backtrace());
+		return;
 	}
 
 	unset($item);



From fedora-extras-commits at redhat.com  Wed Dec  7 00:12:42 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 19:12:42 -0500
Subject: web/include widgets.inc,1.11,1.12
Message-ID: <200512070014.jB70ED4x031364@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31319

Modified Files:
	widgets.inc 
Log Message:
Debugging


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- widgets.inc	6 Dec 2005 23:23:37 -0000	1.11
+++ widgets.inc	7 Dec 2005 00:12:36 -0000	1.12
@@ -77,7 +77,6 @@
 
 	if (!isset($node) || !is_array($node)) {
 		var_dump(debug_backtrace())
-		return;
 	}
 
 	unset($item);



From fedora-extras-commits at redhat.com  Wed Dec  7 01:11:45 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Tue,  6 Dec 2005 20:11:45 -0500
Subject: rpms/gquilt/devel .cvsignore, 1.5, 1.6 gquilt.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <200512070112.jB71CFUd000634@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gquilt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv613

Modified Files:
	.cvsignore gquilt.spec sources 
Log Message:
Update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2005 00:13:34 -0000	1.5
+++ .cvsignore	7 Dec 2005 01:11:42 -0000	1.6
@@ -1 +1 @@
-gquilt-0.14.tar.gz
+gquilt-0.15.tar.gz


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/gquilt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gquilt.spec	9 Sep 2005 00:13:34 -0000	1.4
+++ gquilt.spec	7 Dec 2005 01:11:42 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		gquilt
-Version:	0.14
+Version:	0.15
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
@@ -51,6 +51,9 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Mon Dec 5 2005 Josh Boyer  0.15-1
+- Update to latest release
+
 * Thu Sep 8 2005 Josh Boyer  0.14-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2005 00:13:34 -0000	1.5
+++ sources	7 Dec 2005 01:11:42 -0000	1.6
@@ -1 +1 @@
-3d4d853033f7b4b470ea8e3bc55737c8  gquilt-0.14.tar.gz
+b0a5eee0811471f50f9ee8fba5838a84  gquilt-0.15.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec  7 01:31:43 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Tue,  6 Dec 2005 20:31:43 -0500
Subject: rpms/gquilt/FC-4 .cvsignore, 1.5, 1.6 gquilt.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <200512070132.jB71WDD5000792@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gquilt/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv771

Modified Files:
	.cvsignore gquilt.spec sources 
Log Message:
Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2005 00:13:34 -0000	1.5
+++ .cvsignore	7 Dec 2005 01:31:41 -0000	1.6
@@ -1 +1 @@
-gquilt-0.14.tar.gz
+gquilt-0.15.tar.gz


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/gquilt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gquilt.spec	9 Sep 2005 00:13:34 -0000	1.4
+++ gquilt.spec	7 Dec 2005 01:31:41 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		gquilt
-Version:	0.14
+Version:	0.15
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
@@ -51,6 +51,9 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Mon Dec 5 2005 Josh Boyer  0.15-1
+- Update to latest release
+
 * Thu Sep 8 2005 Josh Boyer  0.14-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2005 00:13:34 -0000	1.5
+++ sources	7 Dec 2005 01:31:41 -0000	1.6
@@ -1 +1 @@
-3d4d853033f7b4b470ea8e3bc55737c8  gquilt-0.14.tar.gz
+b0a5eee0811471f50f9ee8fba5838a84  gquilt-0.15.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec  7 01:58:22 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Tue,  6 Dec 2005 20:58:22 -0500
Subject: web/include widgets.inc,1.13,1.14
Message-ID: <200512070158.jB71wqMq000904@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv885

Modified Files:
	widgets.inc 
Log Message:
Debugging


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- widgets.inc	7 Dec 2005 00:13:04 -0000	1.13
+++ widgets.inc	7 Dec 2005 01:58:20 -0000	1.14
@@ -75,7 +75,7 @@
 /* iterate through the sitelist recursively */
 function side_nav_traverse($node,$page_level,$current_level="0",$nav_id="",$options="") {
 
-	if (!isset($node) || !is_array($node)) {
+	if (!isset($node) || !is_array($node) || empty($node)) {
 		var_dump(debug_backtrace());
 		return;
 	}
@@ -89,7 +89,7 @@
 
 	$output.="\t";
 
-	while (list(, $item) = each($node)) {
+	foreach($node as $item) {
 
 		// Display item as selected if it is the correct or intended URI
 		if ($item['uri'] == $page_level['complete_path'] || $item['uri'] == $options['selected_uri']) {
@@ -110,6 +110,8 @@
 			$output.=side_nav_traverse($item['sub'],$page_level,$current_level+1,$nav_id,$options);
 		}
 		$output.='';
+
+		next($node);
 	}
 	$output.="\n".str_repeat("\t",$current_level+3).'
        ';
 



From fedora-extras-commits at redhat.com  Wed Dec  7 02:42:23 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  6 Dec 2005 21:42:23 -0500
Subject: rpms/OpenSceneGraph/FC-4 .cvsignore, 1.1, 1.2 OpenSceneGraph.spec,
	1.5, 1.6 sources, 1.1, 1.2
Message-ID: <200512070242.jB72grAQ002579@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2558

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Log Message:
- Merge diffs into one file.
- Fix up *.pcs from inside of *.spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Aug 2005 05:06:09 -0000	1.1
+++ .cvsignore	7 Dec 2005 02:42:21 -0000	1.2
@@ -1,2 +1,2 @@
-openscenegraph_0.9.9-5.diff.gz
 OSG_OP_OT-0.9.9.zip
+OpenSceneGraph-0.9.9.diff


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-4/OpenSceneGraph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OpenSceneGraph.spec	28 Aug 2005 07:27:18 -0000	1.5
+++ OpenSceneGraph.spec	7 Dec 2005 02:42:21 -0000	1.6
@@ -4,9 +4,11 @@
 # package are under the same license as the package itself.
 #
 
+%define apivers 0.9.9
+
 Name:           OpenSceneGraph
 Version:        0.9.9
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -14,14 +16,7 @@
 URL:            http://www.openscenegraph.org/
 Source0:        http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{version}.zip
 
-# Debian patch
-Patch0:		http://ftp.debian.org/debian/pool/main/o/openscenegraph/openscenegraph_0.9.9-5.diff.gz
-
-# Revert parts of the Debian patch
-Patch1:		OpenSceneGraph-0.9.9-revdeb.diff
-
-Patch2: 	OpenSceneGraph-0.9.9-osgTerrain.diff
-Patch3:		OpenSceneGraph-0.9.9-osgPlugins.diff
+Patch0:		OpenSceneGraph-0.9.9.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,9 +45,6 @@
 %prep
 %setup -q -n OSG_OP_OT-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # backup, we hack this file later
 cp OpenSceneGraph/Make/dependencies \
@@ -85,7 +77,12 @@
     $dir/Make/makerules
 
 # Fix libdir
-  sed -i -e 's,^libdir=.*$,libdir = %{_libdir},' \
+  sed -i \
+    -e 's,^prefix=.*$,prefix = %{_prefix},' \
+    -e 's,^includedir=.*$,includedir = %{_includedir},' \
+    -e 's,^libdir=.*$,libdir = %{_libdir},' \
+    -e 's,^Version:.*$,Version: %{apivers},' \
+    -e '/^Conflicts:$/d' \
     $dir/Make/$(echo $dir | tr [:upper:] [:lower:]).pc
 done
 
@@ -366,6 +363,10 @@
 %{_includedir}/Producer
 
 %changelog
+* Tue Dec 06 2005 Ralf Corsepius  - 0.9.9-4%{?dist}.1
+- Merge diffs into one file.
+- Fix up *.pcs from inside of *.spec.
+
 * Sun Aug 28 2005 Ralf Corsepius  - 0.9.9-4
 - Propagate %%_libdir to pkgconfig files.
 - Fix typo in %%ifarch magic to setup LD_LIBRARY_PATH


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Aug 2005 04:38:17 -0000	1.1
+++ sources	7 Dec 2005 02:42:21 -0000	1.2
@@ -1,2 +1,2 @@
-4aed300dd024609687e8f2e8348409e7  openscenegraph_0.9.9-5.diff.gz
 711773db3874320967091327473dbc31  OSG_OP_OT-0.9.9.zip
+b1d2366ab6db7c8102153bd262a4a145  OpenSceneGraph-0.9.9.diff



From fedora-extras-commits at redhat.com  Wed Dec  7 02:47:38 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  6 Dec 2005 21:47:38 -0500
Subject: rpms/OpenSceneGraph/FC-4 OpenSceneGraph-0.9.9-osgPlugins.diff, 1.1,
	NONE OpenSceneGraph-0.9.9-osgTerrain.diff, 1.1,
	NONE OpenSceneGraph-0.9.9-revdeb.diff, 1.3, NONE
Message-ID: <200512070247.jB72lcxe002603@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2593

Removed Files:
	OpenSceneGraph-0.9.9-osgPlugins.diff 
	OpenSceneGraph-0.9.9-osgTerrain.diff 
	OpenSceneGraph-0.9.9-revdeb.diff 
Log Message:
- Merge diffs into one file.
- Fix up *.pcs from inside of *.spec.



--- OpenSceneGraph-0.9.9-osgPlugins.diff DELETED ---


--- OpenSceneGraph-0.9.9-osgTerrain.diff DELETED ---


--- OpenSceneGraph-0.9.9-revdeb.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec  7 02:48:24 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  6 Dec 2005 21:48:24 -0500
Subject: rpms/OpenSceneGraph/FC-3 .cvsignore, 1.1, 1.2 OpenSceneGraph.spec,
	1.5, 1.6 sources, 1.1,
	1.2 OpenSceneGraph-0.9.9-osgPlugins.diff, 1.1,
	NONE OpenSceneGraph-0.9.9-osgTerrain.diff, 1.1,
	NONE OpenSceneGraph-0.9.9-revdeb.diff, 1.3, NONE
Message-ID: <200512070248.jB72mspE002640@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2619

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Removed Files:
	OpenSceneGraph-0.9.9-osgPlugins.diff 
	OpenSceneGraph-0.9.9-osgTerrain.diff 
	OpenSceneGraph-0.9.9-revdeb.diff 
Log Message:
- Merge diffs into one file.
- Fix up *.pcs from inside of *.spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-3/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Aug 2005 05:06:09 -0000	1.1
+++ .cvsignore	7 Dec 2005 02:48:22 -0000	1.2
@@ -1,2 +1,2 @@
-openscenegraph_0.9.9-5.diff.gz
 OSG_OP_OT-0.9.9.zip
+OpenSceneGraph-0.9.9.diff


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-3/OpenSceneGraph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OpenSceneGraph.spec	28 Aug 2005 07:27:18 -0000	1.5
+++ OpenSceneGraph.spec	7 Dec 2005 02:48:22 -0000	1.6
@@ -4,9 +4,11 @@
 # package are under the same license as the package itself.
 #
 
+%define apivers 0.9.9
+
 Name:           OpenSceneGraph
 Version:        0.9.9
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -14,14 +16,7 @@
 URL:            http://www.openscenegraph.org/
 Source0:        http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{version}.zip
 
-# Debian patch
-Patch0:		http://ftp.debian.org/debian/pool/main/o/openscenegraph/openscenegraph_0.9.9-5.diff.gz
-
-# Revert parts of the Debian patch
-Patch1:		OpenSceneGraph-0.9.9-revdeb.diff
-
-Patch2: 	OpenSceneGraph-0.9.9-osgTerrain.diff
-Patch3:		OpenSceneGraph-0.9.9-osgPlugins.diff
+Patch0:		OpenSceneGraph-0.9.9.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,9 +45,6 @@
 %prep
 %setup -q -n OSG_OP_OT-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # backup, we hack this file later
 cp OpenSceneGraph/Make/dependencies \
@@ -85,7 +77,12 @@
     $dir/Make/makerules
 
 # Fix libdir
-  sed -i -e 's,^libdir=.*$,libdir = %{_libdir},' \
+  sed -i \
+    -e 's,^prefix=.*$,prefix = %{_prefix},' \
+    -e 's,^includedir=.*$,includedir = %{_includedir},' \
+    -e 's,^libdir=.*$,libdir = %{_libdir},' \
+    -e 's,^Version:.*$,Version: %{apivers},' \
+    -e '/^Conflicts:$/d' \
     $dir/Make/$(echo $dir | tr [:upper:] [:lower:]).pc
 done
 
@@ -366,6 +363,10 @@
 %{_includedir}/Producer
 
 %changelog
+* Tue Dec 06 2005 Ralf Corsepius  - 0.9.9-4%{?dist}.1
+- Merge diffs into one file.
+- Fix up *.pcs from inside of *.spec.
+
 * Sun Aug 28 2005 Ralf Corsepius  - 0.9.9-4
 - Propagate %%_libdir to pkgconfig files.
 - Fix typo in %%ifarch magic to setup LD_LIBRARY_PATH


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-3/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Aug 2005 04:38:17 -0000	1.1
+++ sources	7 Dec 2005 02:48:22 -0000	1.2
@@ -1,2 +1,2 @@
-4aed300dd024609687e8f2e8348409e7  openscenegraph_0.9.9-5.diff.gz
 711773db3874320967091327473dbc31  OSG_OP_OT-0.9.9.zip
+b1d2366ab6db7c8102153bd262a4a145  OpenSceneGraph-0.9.9.diff


--- OpenSceneGraph-0.9.9-osgPlugins.diff DELETED ---


--- OpenSceneGraph-0.9.9-osgTerrain.diff DELETED ---


--- OpenSceneGraph-0.9.9-revdeb.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec  7 02:50:40 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  6 Dec 2005 21:50:40 -0500
Subject: rpms/OpenSceneGraph/devel .cvsignore, 1.1, 1.2 OpenSceneGraph.spec,
	1.5, 1.6 sources, 1.1,
	1.2 OpenSceneGraph-0.9.9-osgPlugins.diff, 1.1,
	NONE OpenSceneGraph-0.9.9-osgTerrain.diff, 1.1,
	NONE OpenSceneGraph-0.9.9-revdeb.diff, 1.3, NONE
Message-ID: <200512070251.jB72pAXs002677@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2656

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Removed Files:
	OpenSceneGraph-0.9.9-osgPlugins.diff 
	OpenSceneGraph-0.9.9-osgTerrain.diff 
	OpenSceneGraph-0.9.9-revdeb.diff 
Log Message:
- Merge diffs into one file.
- Fix up *.pcs from inside of *.spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Aug 2005 05:06:09 -0000	1.1
+++ .cvsignore	7 Dec 2005 02:50:38 -0000	1.2
@@ -1,2 +1,2 @@
-openscenegraph_0.9.9-5.diff.gz
 OSG_OP_OT-0.9.9.zip
+OpenSceneGraph-0.9.9.diff


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OpenSceneGraph.spec	28 Aug 2005 07:27:18 -0000	1.5
+++ OpenSceneGraph.spec	7 Dec 2005 02:50:38 -0000	1.6
@@ -4,9 +4,11 @@
 # package are under the same license as the package itself.
 #
 
+%define apivers 0.9.9
+
 Name:           OpenSceneGraph
 Version:        0.9.9
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -14,14 +16,7 @@
 URL:            http://www.openscenegraph.org/
 Source0:        http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{version}.zip
 
-# Debian patch
-Patch0:		http://ftp.debian.org/debian/pool/main/o/openscenegraph/openscenegraph_0.9.9-5.diff.gz
-
-# Revert parts of the Debian patch
-Patch1:		OpenSceneGraph-0.9.9-revdeb.diff
-
-Patch2: 	OpenSceneGraph-0.9.9-osgTerrain.diff
-Patch3:		OpenSceneGraph-0.9.9-osgPlugins.diff
+Patch0:		OpenSceneGraph-0.9.9.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,9 +45,6 @@
 %prep
 %setup -q -n OSG_OP_OT-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # backup, we hack this file later
 cp OpenSceneGraph/Make/dependencies \
@@ -85,7 +77,12 @@
     $dir/Make/makerules
 
 # Fix libdir
-  sed -i -e 's,^libdir=.*$,libdir = %{_libdir},' \
+  sed -i \
+    -e 's,^prefix=.*$,prefix = %{_prefix},' \
+    -e 's,^includedir=.*$,includedir = %{_includedir},' \
+    -e 's,^libdir=.*$,libdir = %{_libdir},' \
+    -e 's,^Version:.*$,Version: %{apivers},' \
+    -e '/^Conflicts:$/d' \
     $dir/Make/$(echo $dir | tr [:upper:] [:lower:]).pc
 done
 
@@ -366,6 +363,10 @@
 %{_includedir}/Producer
 
 %changelog
+* Tue Dec 06 2005 Ralf Corsepius  - 0.9.9-4%{?dist}.1
+- Merge diffs into one file.
+- Fix up *.pcs from inside of *.spec.
+
 * Sun Aug 28 2005 Ralf Corsepius  - 0.9.9-4
 - Propagate %%_libdir to pkgconfig files.
 - Fix typo in %%ifarch magic to setup LD_LIBRARY_PATH


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Aug 2005 04:38:17 -0000	1.1
+++ sources	7 Dec 2005 02:50:38 -0000	1.2
@@ -1,2 +1,2 @@
-4aed300dd024609687e8f2e8348409e7  openscenegraph_0.9.9-5.diff.gz
 711773db3874320967091327473dbc31  OSG_OP_OT-0.9.9.zip
+b1d2366ab6db7c8102153bd262a4a145  OpenSceneGraph-0.9.9.diff


--- OpenSceneGraph-0.9.9-osgPlugins.diff DELETED ---


--- OpenSceneGraph-0.9.9-osgTerrain.diff DELETED ---


--- OpenSceneGraph-0.9.9-revdeb.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec  7 08:22:02 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed,  7 Dec 2005 03:22:02 -0500
Subject: rpms/irssi/devel .cvsignore, 1.3, 1.4 irssi.spec, 1.10, 1.11 sources,
	1.3, 1.4
Message-ID: <200512070822.jB78MWPW012752@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/rpms/irssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12731

Modified Files:
	.cvsignore irssi.spec sources 
Log Message:
irssi: updated to 0.8.10rc8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Nov 2005 18:48:47 -0000	1.3
+++ .cvsignore	7 Dec 2005 08:22:00 -0000	1.4
@@ -1 +1 @@
-irssi-0.8.10-rc7.tar.gz
+irssi-0.8.10-rc8.tar.gz


Index: irssi.spec
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- irssi.spec	15 Nov 2005 18:48:47 -0000	1.10
+++ irssi.spec	7 Dec 2005 08:22:00 -0000	1.11
@@ -1,11 +1,11 @@
 %define		perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
-%define		release_candidate	rc7
+%define		release_candidate	rc8
 
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.10
-Release:	0.1.%{release_candidate}%{?dist}
+Release:	0.2.%{release_candidate}%{?dist}
 
 License:	GPL
 Group:		Applications/Communications
@@ -93,6 +93,9 @@
 %{_includedir}/irssi
 
 %changelog
+* Wed Dec  7 2005 Dams  - 0.8.10-0.2.rc8
+- Updated to rc8
+
 * Tue Nov 15 2005 Dams  - 0.8.10-0.1.rc7
 - Dropped patch 2 (seems applied upstream) and 3 (no longer needed)
 - Removed conditionnal build against glib1 parts


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Nov 2005 18:48:47 -0000	1.3
+++ sources	7 Dec 2005 08:22:00 -0000	1.4
@@ -1 +1 @@
-1931fc16009b593d98dc8c8f3503b701  irssi-0.8.10-rc7.tar.gz
+b51befaeca9ce3a763ee994096d4a387  irssi-0.8.10-rc8.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec  7 08:25:53 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed,  7 Dec 2005 03:25:53 -0500
Subject: rpms/irssi/FC-4 .cvsignore, 1.2, 1.3 irssi.spec, 1.8, 1.9 sources,
	1.2, 1.3 irssi-0.8.9-gcc4.patch, 1.1,
	NONE irssi-0.8.9-include-config.h.patch, 1.1, NONE
Message-ID: <200512070826.jB78QOSU012832@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/rpms/irssi/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811

Modified Files:
	.cvsignore irssi.spec sources 
Removed Files:
	irssi-0.8.9-gcc4.patch irssi-0.8.9-include-config.h.patch 
Log Message:
irssi/FC-4: backport from devel: 0.8.10rc8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/irssi/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:36:20 -0000	1.2
+++ .cvsignore	7 Dec 2005 08:25:51 -0000	1.3
@@ -1 +1 @@
-irssi-0.8.9.tar.bz2
+irssi-0.8.10-rc8.tar.gz


Index: irssi.spec
===================================================================
RCS file: /cvs/extras/rpms/irssi/FC-4/irssi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- irssi.spec	11 Apr 2005 21:26:34 -0000	1.8
+++ irssi.spec	7 Dec 2005 08:25:51 -0000	1.9
@@ -1,45 +1,51 @@
 %define		perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
+%define		release_candidate	rc8
+
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
-Version:	0.8.9
-Release:	7
+Version:	0.8.10
+Release:	0.2.%{release_candidate}%{?dist}
 
 License:	GPL
 Group:		Applications/Communications
 URL:		http://irssi.org/
-Source0:	http://irssi.org/files/%{name}-%{version}.tar.bz2
+Source0:	http://irssi.org/files/irssi-%{version}-%{release_candidate}.tar.gz
 Source1:	http://wouter.coekaerts.be/irssi/scripts/replace.pl
 Source2:	http://wouter.coekaerts.be/irssi/scripts/trigger.pl
 Source3:	http://wouter.coekaerts.be/irssi/scripts/convert-replace-trigger.pl
 Patch1:		convert-replace-trigger.pl-fixpath-patch
-Patch2:		irssi-0.8.9-include-config.h.patch
-Patch3:		irssi-0.8.9-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	ncurses-devel openssl-devel zlib-devel pkgconfig gc-devel
-%{?_with_glib1:BuildRequires:	glib-devel}
-%{!?_with_glib1:BuildRequires:	glib2-devel}
+BuildRequires:	ncurses-devel openssl-devel zlib-devel 
+BuildRequires:	pkgconfig gc-devel glib2-devel
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%package devel
+Summary:	Development package for irssi
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description
 Irssi is a modular IRC client with Perl scripting. Only text-mode
 frontend is currently supported. The GTK/GNOME frontend is no longer
 being maintained.
 
+%description devel
+This package contains headers needed to develop irssi plugins.
+
+Irssi is a modular IRC client with Perl scripting. Only text-mode
+frontend is currently supported. The GTK/GNOME frontend is no longer
+being maintained.
+
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{release_candidate}
 install -m 0644 %{SOURCE3} .
 %patch1 -p0
-%patch2 -p1 -b .include-config.h
-%patch3 -p1 -b .gcc4
-
 
 %build
 %configure --enable-ipv6 --with-textui	\
-%{?_with_glib1:	--with-glib1}		\
 	--with-proxy			\
 	--with-bot			\
 	--with-perl=module		\
@@ -82,7 +88,21 @@
 %{perl_vendorarch}/auto/Irssi
 
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/irssi
+
 %changelog
+* Wed Dec  7 2005 Dams  - 0.8.10-0.2.rc8
+- Updated to rc8
+
+* Tue Nov 15 2005 Dams  - 0.8.10-0.1.rc7
+- Dropped patch 2 (seems applied upstream) and 3 (no longer needed)
+- Removed conditionnal build against glib1 parts
+
+* Sun Nov 13 2005 Luke Macken  0.8.9-8
+- Rebuild against new openssl
+
 * Mon Apr 11 2005 Michael Schwendt  0.8.9-7
 - Two patches to fix build for GCC4 and new Perl with config.h.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/irssi/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:36:20 -0000	1.2
+++ sources	7 Dec 2005 08:25:51 -0000	1.3
@@ -1 +1 @@
-6610ee0e27922f447e40828cf7dee507  irssi-0.8.9.tar.bz2
+b51befaeca9ce3a763ee994096d4a387  irssi-0.8.10-rc8.tar.gz


--- irssi-0.8.9-gcc4.patch DELETED ---


--- irssi-0.8.9-include-config.h.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec  7 12:00:00 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  7 Dec 2005 07:00:00 -0500
Subject: rpms/xmms/FC-4 xmms.spec,1.10,1.11
Message-ID: <200512071200.jB7C0UVf018829@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18788/FC-4

Modified Files:
	xmms.spec 
Log Message:
Minor cleanups before requesting new builds.



Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/FC-4/xmms.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmms.spec	28 May 2005 12:29:55 -0000	1.10
+++ xmms.spec	7 Dec 2005 11:59:57 -0000	1.11
@@ -1,7 +1,7 @@
-Summary: The X MultiMedia System, a media player which resembles Winamp
+Summary: The X MultiMedia System, a media player
 Name: xmms
 Version: 1.2.10
-Release: 18
+Release: 18%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -74,7 +74,8 @@
 %patch11 -p1 -b .gcc4
 
 %build
-%configure --disable-dependency-tracking \
+%configure \
+  --disable-dependency-tracking \
   --enable-kanji \
   --enable-texthack \
   --enable-ipv6 \
@@ -112,20 +113,20 @@
 
 %find_lang %{name}
 
+%clean
+rm -rf %{buildroot}
+
 %post
-/sbin/ldconfig  
-update-desktop-database %{_datadir}/desktop-menu-patches || :
+/sbin/ldconfig
+update-desktop-database -q || :
 
 %postun
-/sbin/ldconfig 
-update-desktop-database %{_datadir}/desktop-menu-patches || :
-
-%clean
-rm -rf %{buildroot}
+/sbin/ldconfig
+update-desktop-database -q || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc AUTHORS COPYING ChangeLog FAQ NEWS TODO README 
+%doc AUTHORS COPYING ChangeLog FAQ NEWS TODO README
 %{_bindir}/xmms
 %{_bindir}/wmxmms
 %{_libdir}/libxmms.so.1*
@@ -139,11 +140,11 @@
 
 %files devel
 %defattr(-,root,root,0755)
-%{_includedir}/xmms/
 %{_bindir}/xmms-config
-%{_datadir}/aclocal/xmms.m4
+%{_includedir}/xmms/
 %{_libdir}/lib*.a
 %{_libdir}/lib*.so
+%{_datadir}/aclocal/xmms.m4
 
 %changelog
 * Sat May 28 2005 Matthias Saou  1:1.2.10-18



From fedora-extras-commits at redhat.com  Wed Dec  7 12:00:05 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed,  7 Dec 2005 07:00:05 -0500
Subject: rpms/xmms/devel xmms.spec,1.10,1.11
Message-ID: <200512071200.jB7C0aLn018832@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18788/devel

Modified Files:
	xmms.spec 
Log Message:
Minor cleanups before requesting new builds.



Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmms.spec	28 May 2005 12:29:55 -0000	1.10
+++ xmms.spec	7 Dec 2005 12:00:03 -0000	1.11
@@ -1,7 +1,7 @@
-Summary: The X MultiMedia System, a media player which resembles Winamp
+Summary: The X MultiMedia System, a media player
 Name: xmms
 Version: 1.2.10
-Release: 18
+Release: 18%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -74,7 +74,8 @@
 %patch11 -p1 -b .gcc4
 
 %build
-%configure --disable-dependency-tracking \
+%configure \
+  --disable-dependency-tracking \
   --enable-kanji \
   --enable-texthack \
   --enable-ipv6 \
@@ -112,20 +113,20 @@
 
 %find_lang %{name}
 
+%clean
+rm -rf %{buildroot}
+
 %post
-/sbin/ldconfig  
-update-desktop-database %{_datadir}/desktop-menu-patches || :
+/sbin/ldconfig
+update-desktop-database -q || :
 
 %postun
-/sbin/ldconfig 
-update-desktop-database %{_datadir}/desktop-menu-patches || :
-
-%clean
-rm -rf %{buildroot}
+/sbin/ldconfig
+update-desktop-database -q || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc AUTHORS COPYING ChangeLog FAQ NEWS TODO README 
+%doc AUTHORS COPYING ChangeLog FAQ NEWS TODO README
 %{_bindir}/xmms
 %{_bindir}/wmxmms
 %{_libdir}/libxmms.so.1*
@@ -139,11 +140,11 @@
 
 %files devel
 %defattr(-,root,root,0755)
-%{_includedir}/xmms/
 %{_bindir}/xmms-config
-%{_datadir}/aclocal/xmms.m4
+%{_includedir}/xmms/
 %{_libdir}/lib*.a
 %{_libdir}/lib*.so
+%{_datadir}/aclocal/xmms.m4
 
 %changelog
 * Sat May 28 2005 Matthias Saou  1:1.2.10-18



From fedora-extras-commits at redhat.com  Wed Dec  7 12:33:50 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 07:33:50 -0500
Subject: rpms/rt3/devel rt3.spec,1.4,1.5
Message-ID: <200512071234.jB7CYLtq020545@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/rt3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20528

Modified Files:
	rt3.spec 
Log Message:
 Require perl(HTML::Format), perl(HTML::TreeBuilder)


Index: rt3.spec
===================================================================
RCS file: /cvs/extras/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rt3.spec	4 Nov 2005 08:33:03 -0000	1.4
+++ rt3.spec	7 Dec 2005 12:33:48 -0000	1.5
@@ -13,7 +13,7 @@
 
 Name:		rt3
 Version:	3.4.4
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -41,19 +41,20 @@
 
 # rpm doesn't catch these:
 Requires: perl(Apache::Session)
-Requires: perl(URI::URL)
-Requires: perl(Tree::Simple)
-Requires: perl(Regexp::Common)
+Requires: perl(File::Temp)
+Requires: perl(HTML::Mason)
+Requires: perl(HTML::TextFormat)
+Requires: perl(HTML::TreeBuilder)
+Requires: perl(HTTP::Server::Simple::Mason)
 Requires: perl(I18N::LangTags::List)
-Requires: perl(MIME::Entity)
+Requires: perl(Locale::Maketext::Fuzzy)
 Requires: perl(LWP::MediaTypes)
-Requires: perl(File::Temp)
 Requires: perl(MIME::Entity)
-Requires: perl(Module::Versions::Report)
-Requires: perl(Locale::Maketext::Fuzzy)
-Requires: perl(HTTP::Server::Simple::Mason)
-Requires: perl(HTML::Mason)
 Requires: perl(mod_perl2)
+Requires: perl(Module::Versions::Report)
+Requires: perl(Regexp::Common)
+Requires: perl(Tree::Simple)
+Requires: perl(URI::URL)
 
 %description
 RT is an enterprise-grade ticketing system which enables a group of people
@@ -234,6 +235,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Wed Dec 07 2005 Ralf Cors??pius  - 3.4.4-11
+- Require perl(HTML::Format), perl(HTML::TreeBuilder) (#175176).
+
 * Fri Nov 04 2005 Ralf Cors??pius  - 3.4.4-10
 - Inline rt3-filter-provides.sh, rt3-filter-requires.sh into spec.
 



From fedora-extras-commits at redhat.com  Wed Dec  7 12:36:21 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 07:36:21 -0500
Subject: rpms/rt3/devel rt3.spec,1.5,1.6
Message-ID: <200512071236.jB7CapeY020573@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/rt3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20556

Modified Files:
	rt3.spec 
Log Message:
Fix typo in previous change


Index: rt3.spec
===================================================================
RCS file: /cvs/extras/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rt3.spec	7 Dec 2005 12:33:48 -0000	1.5
+++ rt3.spec	7 Dec 2005 12:36:19 -0000	1.6
@@ -43,7 +43,7 @@
 Requires: perl(Apache::Session)
 Requires: perl(File::Temp)
 Requires: perl(HTML::Mason)
-Requires: perl(HTML::TextFormat)
+Requires: perl(HTML::FormatText)
 Requires: perl(HTML::TreeBuilder)
 Requires: perl(HTTP::Server::Simple::Mason)
 Requires: perl(I18N::LangTags::List)
@@ -236,7 +236,7 @@
 
 %changelog
 * Wed Dec 07 2005 Ralf Cors??pius  - 3.4.4-11
-- Require perl(HTML::Format), perl(HTML::TreeBuilder) (#175176).
+- Require perl(HTML::FormatText), perl(HTML::TreeBuilder) (#175176).
 
 * Fri Nov 04 2005 Ralf Cors??pius  - 3.4.4-10
 - Inline rt3-filter-provides.sh, rt3-filter-requires.sh into spec.



From fedora-extras-commits at redhat.com  Wed Dec  7 12:57:44 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 07:57:44 -0500
Subject: rpms/rt3/FC-4 rt3.spec,1.3,1.4
Message-ID: <200512071258.jB7CwEbE020737@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/rt3/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20712

Modified Files:
	rt3.spec 
Log Message:
Require perl(HTML::FormatText), perl(HTML::TreeBuilder) (#175176).


Index: rt3.spec
===================================================================
RCS file: /cvs/extras/rpms/rt3/FC-4/rt3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rt3.spec	5 Nov 2005 09:18:17 -0000	1.3
+++ rt3.spec	7 Dec 2005 12:57:42 -0000	1.4
@@ -13,7 +13,7 @@
 
 Name:		rt3
 Version:	3.4.4
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -41,19 +41,20 @@
 
 # rpm doesn't catch these:
 Requires: perl(Apache::Session)
-Requires: perl(URI::URL)
-Requires: perl(Tree::Simple)
-Requires: perl(Regexp::Common)
+Requires: perl(File::Temp)
+Requires: perl(HTML::Mason)
+Requires: perl(HTML::FormatText)
+Requires: perl(HTML::TreeBuilder)
+Requires: perl(HTTP::Server::Simple::Mason)
 Requires: perl(I18N::LangTags::List)
-Requires: perl(MIME::Entity)
+Requires: perl(Locale::Maketext::Fuzzy)
 Requires: perl(LWP::MediaTypes)
-Requires: perl(File::Temp)
 Requires: perl(MIME::Entity)
-Requires: perl(Module::Versions::Report)
-Requires: perl(Locale::Maketext::Fuzzy)
-Requires: perl(HTTP::Server::Simple::Mason)
-Requires: perl(HTML::Mason)
 Requires: perl(mod_perl2)
+Requires: perl(Module::Versions::Report)
+Requires: perl(Regexp::Common)
+Requires: perl(Tree::Simple)
+Requires: perl(URI::URL)
 
 %description
 RT is an enterprise-grade ticketing system which enables a group of people
@@ -234,6 +235,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Wed Dec 07 2005 Ralf Cors??pius  - 3.4.4-11
+- Require perl(HTML::FormatText), perl(HTML::TreeBuilder) (#175176).
+
 * Fri Nov 04 2005 Ralf Cors??pius  - 3.4.4-10
 - Inline rt3-filter-provides.sh, rt3-filter-requires.sh into spec.
 



From fedora-extras-commits at redhat.com  Wed Dec  7 13:15:53 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 08:15:53 -0500
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.6,1.7
Message-ID: <200512071316.jB7DGOq2022471@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22424/devel

Modified Files:
	OpenSceneGraph.spec 
Log Message:
Use /sbin/ldconfig to create dyn. symlinks.


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OpenSceneGraph.spec	7 Dec 2005 02:50:38 -0000	1.6
+++ OpenSceneGraph.spec	7 Dec 2005 13:15:51 -0000	1.7
@@ -140,16 +140,7 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/OpenSceneGraph/src
 
 # fix up shared library symlinks
-pushd ${RPM_BUILD_ROOT}%{_libdir}
-  for i in lib*.so; do
-    if test -f $i; then
-      rm -f $i.*
-      soname=$(objdump -p $i | grep SONAME | sed 's,[ ]*SONAME[ ]*,,')
-      mv $i $soname
-      ln -s $soname $i
-    fi
-  done
-popd
+/sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir}
 
 install -m 644 -D OpenThreads/Make/openthreads.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
 install -m 644 -D OpenSceneGraph/Make/openscenegraph.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc



From fedora-extras-commits at redhat.com  Wed Dec  7 13:15:59 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 08:15:59 -0500
Subject: rpms/OpenSceneGraph/FC-3 OpenSceneGraph.spec,1.6,1.7
Message-ID: <200512071316.jB7DGTfE022474@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22424/FC-3

Modified Files:
	OpenSceneGraph.spec 
Log Message:
Use /sbin/ldconfig to create dyn. symlinks.


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-3/OpenSceneGraph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OpenSceneGraph.spec	7 Dec 2005 02:48:22 -0000	1.6
+++ OpenSceneGraph.spec	7 Dec 2005 13:15:57 -0000	1.7
@@ -140,16 +140,7 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/OpenSceneGraph/src
 
 # fix up shared library symlinks
-pushd ${RPM_BUILD_ROOT}%{_libdir}
-  for i in lib*.so; do
-    if test -f $i; then
-      rm -f $i.*
-      soname=$(objdump -p $i | grep SONAME | sed 's,[ ]*SONAME[ ]*,,')
-      mv $i $soname
-      ln -s $soname $i
-    fi
-  done
-popd
+/sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir}
 
 install -m 644 -D OpenThreads/Make/openthreads.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
 install -m 644 -D OpenSceneGraph/Make/openscenegraph.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc



From fedora-extras-commits at redhat.com  Wed Dec  7 13:16:04 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 08:16:04 -0500
Subject: rpms/OpenSceneGraph/FC-4 OpenSceneGraph.spec,1.6,1.7
Message-ID: <200512071316.jB7DGYZ8022477@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22424/FC-4

Modified Files:
	OpenSceneGraph.spec 
Log Message:
Use /sbin/ldconfig to create dyn. symlinks.


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-4/OpenSceneGraph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OpenSceneGraph.spec	7 Dec 2005 02:42:21 -0000	1.6
+++ OpenSceneGraph.spec	7 Dec 2005 13:16:02 -0000	1.7
@@ -140,16 +140,7 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/OpenSceneGraph/src
 
 # fix up shared library symlinks
-pushd ${RPM_BUILD_ROOT}%{_libdir}
-  for i in lib*.so; do
-    if test -f $i; then
-      rm -f $i.*
-      soname=$(objdump -p $i | grep SONAME | sed 's,[ ]*SONAME[ ]*,,')
-      mv $i $soname
-      ln -s $soname $i
-    fi
-  done
-popd
+/sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir}
 
 install -m 644 -D OpenThreads/Make/openthreads.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
 install -m 644 -D OpenSceneGraph/Make/openscenegraph.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc



From fedora-extras-commits at redhat.com  Wed Dec  7 14:33:45 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed,  7 Dec 2005 09:33:45 -0500
Subject: rpms/antiword/devel .cvsignore, 1.4, 1.5 antiword.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <200512071434.jB7EYFEK024498@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/antiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24477

Modified Files:
	.cvsignore antiword.spec sources 
Log Message:
* Wed Dec 07 2005 Adrian Reber  - 0.37-1
- updated to 0.37



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/antiword/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 May 2005 08:34:18 -0000	1.4
+++ .cvsignore	7 Dec 2005 14:33:42 -0000	1.5
@@ -1 +1 @@
-antiword-0.36.1.tar.gz
+antiword-0.37.tar.gz


Index: antiword.spec
===================================================================
RCS file: /cvs/extras/rpms/antiword/devel/antiword.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- antiword.spec	10 May 2005 12:45:18 -0000	1.10
+++ antiword.spec	7 Dec 2005 14:33:42 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:    MS Word to ASCII/Postscript converter
 Name:       antiword
-Version:    0.36.1
-Release:    2
+Version:    0.37
+Release:    1
 Source:     http://www.winfield.demon.nl/linux/%{name}-%{version}.tar.gz
 URL:        http://www.winfield.demon.nl/
 Patch0:     antiword-0.32-fix-flags.patch
@@ -30,6 +30,7 @@
 %{__cp} -a Resources/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/man1
 %{__cp} Docs/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%{__chmod} 644 kantiword
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -38,12 +39,15 @@
 %defattr(-,root,root)
 %doc Docs/COPYING Docs/FAQ Docs/ReadMe Docs/Netscape Docs/ChangeLog
 %doc Docs/Exmh Docs/Mozilla Docs/QandA Docs/Mutt Docs/antiword.php
-%doc Docs/Emacs Docs/History
+%doc Docs/Emacs Docs/History kantiword
 %{_bindir}/*
 %{_mandir}/*/*
 %{_datadir}/%{name}
 
 %changelog
+* Wed Dec 07 2005 Adrian Reber  - 0.37-1
+- updated to 0.37
+
 * Tue May 10 2005 Adrian Reber  - 0.36.1-2
 - updated to 0.36.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/antiword/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 May 2005 08:34:18 -0000	1.4
+++ sources	7 Dec 2005 14:33:42 -0000	1.5
@@ -1 +1 @@
-d46107219f4afaee658647a49dc45ed9  antiword-0.36.1.tar.gz
+f868e2a269edcbc06bf77e89a55898d1  antiword-0.37.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec  7 16:20:04 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 11:20:04 -0500
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.7,1.8
Message-ID: <200512071620.jB7GKYOC028058@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28040

Modified Files:
	OpenSceneGraph.spec 
Log Message:
Try at modular X11.


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- OpenSceneGraph.spec	7 Dec 2005 13:15:51 -0000	1.7
+++ OpenSceneGraph.spec	7 Dec 2005 16:20:02 -0000	1.8
@@ -8,7 +8,7 @@
 
 Name:           OpenSceneGraph
 Version:        0.9.9
-Release:        4%{?dist}.1
+Release:        5%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -21,7 +21,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	flex bison
-BuildRequires:  xorg-x11-Mesa-libGL
+BuildRequires:  libGL-devel
+BuildRequires: 	libGLU-devel
+BuildRequires:	libXmu-devel
+BuildRequires:	libX11-devel
 BuildRequires: 	Inventor-devel
 BuildRequires:	freeglut-devel
 BuildRequires:	libjpeg-devel
@@ -354,6 +357,9 @@
 %{_includedir}/Producer
 
 %changelog
+* Wed Dec 07 2005 Ralf Cors??pius  - 0.9.9-5
+- Try at getting this package buildable with modular X11.
+
 * Tue Dec 06 2005 Ralf Corsepius  - 0.9.9-4%{?dist}.1
 - Merge diffs into one file.
 - Fix up *.pcs from inside of *.spec.



From fedora-extras-commits at redhat.com  Wed Dec  7 17:11:06 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Wed,  7 Dec 2005 12:11:06 -0500
Subject: web/include widgets.inc,1.14,1.15
Message-ID: <200512071711.jB7HBaX1029939@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29922

Modified Files:
	widgets.inc 
Log Message:
Getting debug output mailed.


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- widgets.inc	7 Dec 2005 01:58:20 -0000	1.14
+++ widgets.inc	7 Dec 2005 17:11:04 -0000	1.15
@@ -76,7 +76,8 @@
 function side_nav_traverse($node,$page_level,$current_level="0",$nav_id="",$options="") {
 
 	if (!isset($node) || !is_array($node) || empty($node)) {
-		var_dump(debug_backtrace());
+		//var_dump(debug_backtrace());
+		@mail("webmaster at fedora.redhat.com", "Debug output from f.r.c", var_export(debug_backtrace(), TRUE));
 		return;
 	}
 



From fedora-extras-commits at redhat.com  Wed Dec  7 17:58:35 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Wed,  7 Dec 2005 12:58:35 -0500
Subject: web/html/participate common.inc,1.1.1.1,1.2
Message-ID: <200512071759.jB7Hx5hI030218@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/participate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30195

Modified Files:
	common.inc 
Log Message:
No longer using participate/common.inc


Index: common.inc
===================================================================
RCS file: /cvs/fedora/web/html/participate/common.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- common.inc	30 Mar 2005 17:47:23 -0000	1.1.1.1
+++ common.inc	7 Dec 2005 17:58:33 -0000	1.2
@@ -1,10 +1,10 @@
 addSideContent("Projects",$projects);
-
+*/
 ?>



From fedora-extras-commits at redhat.com  Wed Dec  7 18:03:04 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed,  7 Dec 2005 13:03:04 -0500
Subject: CVSROOT avail,1.17,1.18
Message-ID: <200512071803.jB7I3cWL031793@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31774

Modified Files:
	avail 
Log Message:
Trying to fix a lack of access for ivazquez; cleaning up repetitiveness may help?  Probably not, but worth an initial try.


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- avail	6 Dec 2005 20:22:19 -0000	1.17
+++ avail	7 Dec 2005 18:03:02 -0000	1.18
@@ -21,8 +21,7 @@
 # Fedora Web site
 unavail | | web
 avail | tfox,notting,sopwith,gdk,katzj,kwade | web
-avail | havill,hp,nman64 | web
-avail | ivazquez,nman64 | web
+avail | havill,hp,nman64,ivazquez | web
 avail | katzj | web/html/projects/anaconda-installer
 avail | bfox | web/html/projects/config-tools
 avail | blizzard,krh | web/html/projects/desktop



From fedora-extras-commits at redhat.com  Wed Dec  7 19:37:11 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed,  7 Dec 2005 14:37:11 -0500
Subject: web/html/docs/release-notes index.php,1.11,1.12
Message-ID: <200512071937.jB7Jbg8B001786@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1682

Modified Files:
	index.php 
Log Message:
Updating latest, also including ru and it trans as part of latest since they have updated their translations since the initial trans freeze.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/release-notes/index.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- index.php	26 Nov 2005 09:02:59 -0000	1.11
+++ index.php	7 Dec 2005 19:37:09 -0000	1.12
@@ -20,7 +20,9 @@
 These are the latest release notes, updated for FC5 test1:
 
        
 
        
-en
+en |
+it |
+ru
 
        
 
        
 These are the release notes as they shipped in the FC5 test1 ISO:



From fedora-extras-commits at redhat.com  Wed Dec  7 19:37:17 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed,  7 Dec 2005 14:37:17 -0500
Subject: web/html/docs/release-notes/fc5/test1-latest-en index.php,1.2,1.3
Message-ID: <200512071937.jB7Jbl9i001789@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-latest-en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1682/fc5/test1-latest-en

Modified Files:
	index.php 
Log Message:
Updating latest, also including ru and it trans as part of latest since they have updated their translations since the initial trans freeze.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/release-notes/fc5/test1-latest-en/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.php	25 Nov 2005 19:28:53 -0000	1.2
+++ index.php	7 Dec 2005 19:37:15 -0000	1.3
@@ -1,12 +1,12 @@
 initCommon();
-
+$template->initCommon(); 
 $template->displayHeader();
 
 ?>
+
 
        
 
        
 
        
@@ -23,10 +23,15 @@
 
    		[Tip]
 Latest Release Notes on the Web
 
    
+
    
+
    
       These release notes may be updated.  Visit http://fedora.redhat.com/docs/release-notes/
       to view the latest release notes for Fedora Core 5 test1.
-    
    
 
    
 
    
 
@@ -40,9 +45,9 @@
 
    3. Introduction and Technical Release Notes
    
 
    4. Hardware Requirements
    
 
    
-
    4.1. CPU Requirements
    
-
    4.2. Hard Disk Space Requirements
    
-
    4.3. Memory Requirements
    
+
    4.1. CPU Requirements
    
+
    4.2. Hard Disk Space Requirements
    
+
    4.3. Memory Requirements
    
 
    4.4. PPC Hardware Requirements
    
 
    
 
    5. Overview of This Release
    
@@ -57,11 +62,11 @@
 
    
 
    7.1. Basic Components
    
 
    
-
    7.1.1. Fedora Extras Repository
    
+
    7.1.1. Fedora Extras Repository
    
 
    7.1.2. Audit Daemon auditd and Log
 	Files
    
-
    7.1.3. Enabling the slocate Database
    
-
    7.1.4. Stricter Controls in openssh
    
+
    7.1.3. Enabling the slocate Database
    
+
    7.1.4. Stricter Controls in openssh
    
 
    7.1.5. Java Package Recommendations
    
 
    
 
    7.2. Core
    
@@ -74,26 +79,26 @@
   
 
    7.3.1. Java-like Environment
    
 
    7.4. Internationalization (i18n)
    
-
    7.4.1. Language Support
    
+
    7.4.1. Language Support
    
 
    7.5. Multimedia
    
 
    
 
    7.5.1. Excluded Multimedia Software
    
 
    7.5.2. CD and DVD Authoring and Burning
    
 
    
 
    7.6. Web Servers
    
-
    7.6.1. httpd
    
+
    7.6.1. httpd
    
 
    7.7. Samba (Windows File System Compatibility)
    
 
    7.8. X Window System (Graphics)
    
-
    7.8.1. X Window System (Graphics)
    
+
    7.8.1. X Window System (Graphics)
    
 
    7.9. Games and Entertainment
    
 
    
 
    8. Legacy Information
    
 
    9. Packages Movement
    
 
    
 
    9.1. Packages Added
    
-
    9.2. Packages Removed
    
+
    9.2. Packages Removed
    
 
    
-
    10. Notes
    
+
    10. Notes
    
 
    11. An Overview of the Fedora Project
    
 
 
    
@@ -320,7 +325,7 @@
 
    
 
    
 
    
-4.1.??CPU Requirements
    
+4.1.??CPU Requirements
    
 
    
 
    
 
    This section lists the CPU specifications required by Fedora Core
@@ -364,7 +369,7 @@
 
    
 
    
 
    
-4.2.??Hard Disk Space Requirements
    
+4.2.??Hard Disk Space Requirements
    
 
    
 
 
    This section lists the disk space required to install Fedora Core
@@ -427,7 +432,7 @@
 
    
 
    
 
    
-4.3.??Memory Requirements
    
+4.3.??Memory Requirements
    
 
    
 
 
    This section lists the memory required to install Fedora Core
@@ -720,7 +725,7 @@
 	  Certain hardware configurations (particularly those with
 	  LCD displays) may experience problems while starting the
 	  Fedora Core installation program.  In these instances, restart
-	  the installation, and add the "nofb" option
+	  the installation, and add the nofb option
 	  to the boot command line.
 	
    
 
    
@@ -730,7 +735,7 @@
 
- 
- 
+ 
+ 
- 
- 
+ 
+ 
- 
- 
+ 
+ 
- 
- 
+ 
+ 
@@ -73,13 +73,13 @@
  
- 
- 
+ 
+ 
- 
- 
+ 
+ 



From fedora-extras-commits at redhat.com  Tue Dec 20 22:50:50 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 17:50:50 -0500
Subject: rpms/cernlib/FC-3 cernlib-gxint-script.diff, 1.1, 1.2 cernlib.spec, 
	1.13, 1.14
Message-ID: <200512202251.jBKMpNwJ027749@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27727

Modified Files:
	cernlib-gxint-script.diff cernlib.spec 
Log Message:
* Tue Dec 20 2005 Patrice Dumas  - 2005-11
- add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
- fix gxint


cernlib-gxint-script.diff:

Index: cernlib-gxint-script.diff
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib-gxint-script.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-gxint-script.diff	9 Dec 2005 15:57:06 -0000	1.1
+++ cernlib-gxint-script.diff	20 Dec 2005 22:50:50 -0000	1.2
@@ -14,7 +14,7 @@
 -  CERN="/cern" ; export CERN
 -fi
 +# not used after the sed one liner in the spec file 
-+if [ -z "$CERN" ] ; then CERN="/usr"
++if [ -z "$CERN" ] ; then CERN="/usr"; fi
   
  if [ "$drv" = "/GKS" ] ; then
    if [ -z "$GKSR" ] ; then


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cernlib.spec	20 Dec 2005 21:54:45 -0000	1.13
+++ cernlib.spec	20 Dec 2005 22:50:50 -0000	1.14
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       10%{?dist}
+Release:       11%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -517,8 +517,8 @@
 	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
 # substitute version in gxint with the right version
-# substitute includedir in gxint to conform to FHS
-sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib:%{_includedir}/cernlib/\${ver}:' src/scripts/gxint 
+# substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
+sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
 sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \
@@ -613,6 +613,9 @@
 %{__ln_s} gxint321.f gxint.f
 popd
 
+# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
+%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+
 cd src
 # install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
@@ -670,6 +673,7 @@
 %{_bindir}/paw++
 %{_bindir}/paw
 %{_bindir}/pawX11
+%{_libdir}/cernlib/%{version}/bin/pawX11
 %doc paw.README 
 
 %files -n geant321
@@ -700,6 +704,10 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11
+- add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
+- fix gxint
+
 * Tue Dec 20 2005 Patrice Dumas  - 2005-10
 - add file in /etc/ld.so.conf.d required for dynamic linking
 



From fedora-extras-commits at redhat.com  Tue Dec 20 22:52:11 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 17:52:11 -0500
Subject: rpms/cernlib/FC-4 cernlib-gxint-script.diff, 1.2, 1.3 cernlib.spec, 
	1.18, 1.19
Message-ID: <200512202252.jBKMqiQB027817@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27795

Modified Files:
	cernlib-gxint-script.diff cernlib.spec 
Log Message:
* Tue Dec 20 2005 Patrice Dumas  - 2005-11
- add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
- fix gxint


cernlib-gxint-script.diff:

Index: cernlib-gxint-script.diff
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib-gxint-script.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-gxint-script.diff	9 Dec 2005 16:09:19 -0000	1.2
+++ cernlib-gxint-script.diff	20 Dec 2005 22:52:11 -0000	1.3
@@ -14,7 +14,7 @@
 -  CERN="/cern" ; export CERN
 -fi
 +# not used after the sed one liner in the spec file 
-+if [ -z "$CERN" ] ; then CERN="/usr"
++if [ -z "$CERN" ] ; then CERN="/usr"; fi
   
  if [ "$drv" = "/GKS" ] ; then
    if [ -z "$GKSR" ] ; then


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cernlib.spec	20 Dec 2005 21:54:01 -0000	1.18
+++ cernlib.spec	20 Dec 2005 22:52:11 -0000	1.19
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       10%{?dist}
+Release:       11%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -518,8 +518,8 @@
 	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
 # substitute version in gxint with the right version
-# substitute includedir in gxint to conform to FHS
-sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib:%{_includedir}/cernlib/\${ver}:' src/scripts/gxint 
+# substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
+sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
 sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \
@@ -614,6 +614,9 @@
 %{__ln_s} gxint321.f gxint.f
 popd
 
+# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
+%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+
 cd src
 # install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
@@ -671,6 +674,7 @@
 %{_bindir}/paw++
 %{_bindir}/paw
 %{_bindir}/pawX11
+%{_libdir}/cernlib/%{version}/bin/pawX11
 %doc paw.README 
 
 %files -n geant321
@@ -701,6 +705,10 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11
+- add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
+- fix gxint
+
 * Tue Dec 20 2005 Patrice Dumas  - 2005-10
 - add file in /etc/ld.so.conf.d required for dynamic linking
 



From fedora-extras-commits at redhat.com  Tue Dec 20 22:53:23 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 17:53:23 -0500
Subject: rpms/cernlib/devel cernlib-gxint-script.diff, 1.1, 1.2 cernlib.spec,
	1.11, 1.12
Message-ID: <200512202253.jBKMrtPw027885@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27863

Modified Files:
	cernlib-gxint-script.diff cernlib.spec 
Log Message:
* Tue Dec 20 2005 Patrice Dumas  - 2005-11
- add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
- fix gxint


cernlib-gxint-script.diff:

Index: cernlib-gxint-script.diff
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib-gxint-script.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-gxint-script.diff	30 Nov 2005 22:01:01 -0000	1.1
+++ cernlib-gxint-script.diff	20 Dec 2005 22:53:23 -0000	1.2
@@ -14,7 +14,7 @@
 -  CERN="/cern" ; export CERN
 -fi
 +# not used after the sed one liner in the spec file 
-+if [ -z "$CERN" ] ; then CERN="/usr"
++if [ -z "$CERN" ] ; then CERN="/usr"; fi
   
  if [ "$drv" = "/GKS" ] ; then
    if [ -z "$GKSR" ] ; then


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cernlib.spec	20 Dec 2005 21:50:55 -0000	1.11
+++ cernlib.spec	20 Dec 2005 22:53:23 -0000	1.12
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       10%{?dist}
+Release:       11%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -520,8 +520,8 @@
 	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
 # substitute version in gxint with the right version
-# substitute includedir in gxint to conform to FHS
-sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib:%{_includedir}/cernlib/\${ver}:' src/scripts/gxint 
+# substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
+sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
 sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \
@@ -616,6 +616,9 @@
 %{__ln_s} gxint321.f gxint.f
 popd
 
+# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
+%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+
 cd src
 # install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
@@ -673,6 +676,7 @@
 %{_bindir}/paw++
 %{_bindir}/paw
 %{_bindir}/pawX11
+%{_libdir}/cernlib/%{version}/bin/pawX11
 %doc paw.README 
 
 %files -n geant321
@@ -703,6 +707,10 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11
+- add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
+- fix gxint
+
 * Tue Dec 20 2005 Patrice Dumas  - 2005-10
 - add file in /etc/ld.so.conf.d required for dynamic linking
 



From fedora-extras-commits at redhat.com  Tue Dec 20 23:05:38 2005
From: fedora-extras-commits at redhat.com (Thomas Chung (tchung))
Date: Tue, 20 Dec 2005 18:05:38 -0500
Subject: web/html/News index.php,1.1,1.2
Message-ID: <200512202306.jBKN6ArW029607@cvs-int.fedora.redhat.com>

Author: tchung

Update of /cvs/fedora/web/html/News
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29585

Modified Files:
	index.php 
Log Message:



Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/News/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	29 Nov 2005 17:32:58 -0000	1.1
+++ index.php	20 Dec 2005 23:05:36 -0000	1.2
@@ -15,7 +15,7 @@
 
    
 
 
      
-  
    • Read Fedora News, a weekly summary of notable happenings in the Fedora community.
      • 
+  
    • Read Fedora News, a weekly summary of notable happenings in the Fedora community.
      • 
   
    • Meet Fedora contributors at an event near you.
      • 
   
    • Join Fedora mailing lists to participate in the discussions that shape Fedora.
      • 
 
    



From fedora-extras-commits at redhat.com  Tue Dec 20 23:19:06 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Tue, 20 Dec 2005 18:19:06 -0500
Subject: rpms/ghdl/FC-4 ghdl-svn38.patch, NONE, 1.1 ghdl.spec, 1.5,
	1.6 ghdl-0.21-infodirentry.patch, 1.1, NONE
Message-ID: <200512202319.jBKNJcvf029774@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29747

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-svn38.patch 
Removed Files:
	ghdl-0.21-infodirentry.patch 
Log Message:
update to svn38


ghdl-svn38.patch:

--- NEW FILE ghdl-svn38.patch ---
diff -urN ghdl-0.21/vhdl/ghdl.texi ghdl-0.22dev/vhdl/ghdl.texi
--- ghdl-0.21/vhdl/ghdl.texi	2005-12-12 03:21:55.000000000 +0100
+++ ghdl-0.22dev/vhdl/ghdl.texi	2005-12-20 16:18:45.000000000 +0100
@@ -4,10 +4,14 @@
 @settitle GHDL guide
 @c %**end of header
 
+ at direntry
+* ghdl: (ghdl).         VHDL compiler.
+ at end direntry
+
 @titlepage
 @title GHDL guide
 @subtitle GHDL, a VHDL compiler
- at subtitle For GHDL version 0.21 (Sokcho edition)
+ at subtitle For GHDL version 0.22 (Sokcho edition)
 @author Tristan Gingold
 @c The following two commands start the copyright page.
 @page
diff -urN ghdl-0.21/vhdl/grt/config/win32.c ghdl-0.22dev/vhdl/grt/config/win32.c
--- ghdl-0.21/vhdl/grt/config/win32.c	2005-12-12 03:39:16.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/config/win32.c	2005-12-20 16:18:50.000000000 +0100
@@ -1,5 +1,5 @@
-/*  GRT stack implementation for Win32
-    Copyright (C) 2004, 2005 Felix Bertram.
+/*  GRT stack implementation for Win32 using fibers.
+    Copyright (C) 2005 Tristan Gingold.
 
     GHDL 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
@@ -16,139 +16,74 @@
     Software Foundation, 59 Temple Place - Suite 330, Boston, MA
     02111-1307, USA.
 */
-//-----------------------------------------------------------------------------
-// Project:     GHDL - VHDL Simulator
-// Description: Win32 port of stacks package
-// Note:        Tristan's original i386/Linux used assembly-code 
-//              to manually switch stacks for performance reasons.
-// History:     2004feb09, FB, created.
-//-----------------------------------------------------------------------------
 
 #include 
-//#include 
-//#include 
-//#include 
-
-
-//#define INFO printf
-#define INFO (void)
-
-// GHDL names an endless loop calling FUNC with ARG a 'stack'
-// at a given time, only one stack may be 'executed'
-typedef struct 
-{	HANDLE              thread;         // stack's thread
-	HANDLE              mutex;          // mutex to suspend/resume thread
-	void                (*Func)(void*); // stack's FUNC
-	void*               Arg;            // ARG passed to FUNC
-} Stack_Type_t, *Stack_Type;
+#include 
 
-Stack_Type_t      main_stack_context;
-extern Stack_Type grt_stack_main_stack;
+struct stack_type
+{
+  LPVOID fiber; //  Win fiber.
+  void (*func)(void *);  // Function
+  void *arg; //  Function argument.
+};
+
+static struct stack_type  main_stack_context;
+extern void grt_set_main_stack (struct stack_type *stack);
 
-//------------------------------------------------------------------------------
 void grt_stack_init(void)
-// Initialize the stacks package.
-// This may adjust stack sizes.
-// Must be called after grt.options.decode.
-// => procedure Stack_Init;
-{	INFO("grt_stack_init\n");
-	INFO("  main_stack_context=0x%08x\n", &main_stack_context);
-
-	// create event. reset event, as we are currently running
-	main_stack_context.mutex = CreateEvent(NULL,  // lpsa
-	                                       FALSE, // fManualReset
-	                                       FALSE, // fInitialState
-	                                       NULL); // lpszEventName
-
-	grt_stack_main_stack= &main_stack_context;
-}
-
-//------------------------------------------------------------------------------
-static unsigned long __stdcall grt_stack_loop(void* pv_myStack)
-{
-	Stack_Type myStack= (Stack_Type)pv_myStack;
-
-	INFO("grt_stack_loop\n");
-	
-	INFO("  myStack=0x%08x\n", myStack);
-
-	// block until event becomes set again.
-	// this happens when this stack is enabled for the first time
-	WaitForSingleObject(myStack->mutex, INFINITE);
-	
-	// run stack's function in endless loop
-	while(1)
-	{	INFO("  call 0x%08x with 0x%08x\n", myStack->Func, myStack->Arg);
-		myStack->Func(myStack->Arg);
-	}
-	
-	// we never get here...
-	return 0;
-}
-
-//------------------------------------------------------------------------------
-Stack_Type grt_stack_create(void* Func, void* Arg) 
-// Create a new stack, which on first execution will call FUNC with
-// an argument ARG.
-// => function Stack_Create (Func : Address; Arg : Address) return Stack_Type;
-{  	Stack_Type newStack;
-	DWORD      m_IDThread; // Thread's ID (dummy)
-
-	INFO("grt_stack_create\n");
-	INFO("  call 0x%08x with 0x%08x\n", Func, Arg);
-			
-	newStack= malloc(sizeof(Stack_Type_t));
-	
-	// init function and argument
-	newStack->Func= Func;
-	newStack->Arg=  Arg;
-	
-	// create event. reset event, so that thread will blocked in grt_stack_loop
-	newStack->mutex= CreateEvent(NULL,  // lpsa
-	                             FALSE, // fManualReset
-	                             FALSE, // fInitialState
-	                             NULL); // lpszEventName
-	
-	INFO("  newStack=0x%08x\n", newStack);
-	
-	// create thread, which executes grt_stack_loop
-	newStack->thread= CreateThread(NULL,           // lpsa
-	                               0,              // cbStack
-	                               grt_stack_loop, // lpStartAddr
-	                               newStack,       // lpvThreadParm
-	                               0,              // fdwCreate
-	                               &m_IDThread);   // lpIDThread
-	
-	return newStack;
-}
-
-//------------------------------------------------------------------------------
-void grt_stack_switch(Stack_Type To, Stack_Type From)
-// Resume stack TO and save the current context to the stack pointed by
-// CUR.
-// => procedure Stack_Switch (To : Stack_Type; From : Stack_Type);
-{	INFO("grt_stack_switch\n");
-	INFO("  from 0x%08x to 0x%08x\n", From, To);
-	
-	// set 'To' event. this will make the other thread either
-	// - start for first time in grt_stack_loop
-	// - resume at WaitForSingleObject below
-	SetEvent(To->mutex);
-		
-	// block until 'From' event becomes set again
-	// as we are running, our event is reset and we block here
-	// when stacks are switched, with above SetEvent, we may proceed
-	WaitForSingleObject(From->mutex, INFINITE);
-}
-
-//------------------------------------------------------------------------------
-void grt_stack_delete(Stack_Type Stack)
-// Delete stack STACK, which must not be currently executed.
-// => procedure Stack_Delete (Stack : Stack_Type);
-{	INFO("grt_stack_delete\n");
+{
+  main_stack_context.fiber = ConvertThreadToFiber (NULL);
+  if (main_stack_context.fiber == NULL)
+    {
+      fprintf (stderr, "convertThreadToFiber failed (err=%lu)\n",
+	       GetLastError ());
+      abort ();
+    }
+  grt_set_main_stack (&main_stack_context);
+}
+
+static VOID __stdcall
+grt_stack_loop (void *v_stack)
+{
+  struct stack_type *stack = (struct stack_type *)v_stack;
+  while (1)
+    {
+      (*stack->func)(stack->arg);
+    }
+}
+
+struct stack_type *
+grt_stack_create (void (*func)(void *), void *arg) 
+{
+  struct stack_type *res;
+
+  res = malloc (sizeof (struct stack_type));
+  if (res == NULL)
+    return NULL;
+  res->func = func;
+  res->arg = arg;
+  res->fiber = CreateFiber (0, &grt_stack_loop, res);
+  if (res->fiber == NULL)
+    {
+      free (res);
+      return NULL;
+    }
+  return res;
+}
+
+void
+grt_stack_switch (struct stack_type *to, struct stack_type *from)
+{
+  SwitchToFiber (to->fiber);
+}
+
+void
+grt_stack_delete (struct stack_type *stack)
+{
+  DeleteFiber (stack->fiber);
+  stack->fiber = NULL;
 }
 
-//----------------------------------------------------------------------------
 #ifndef WITH_GNAT_RUN_TIME
 void __gnat_raise_storage_error(void)
 {
@@ -161,6 +96,3 @@
 }
 #endif
 
-//----------------------------------------------------------------------------
-// end of file
-
diff -urN ghdl-0.21/vhdl/grt/ghwlib.c ghdl-0.22dev/vhdl/grt/ghwlib.c
--- ghdl-0.21/vhdl/grt/ghwlib.c	2005-12-07 06:29:04.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/ghwlib.c	2005-12-20 16:18:50.000000000 +0100
@@ -1214,16 +1214,31 @@
   return 0;
 }
 
+static const char *
+ghw_get_lit (union ghw_type *type, int e)
+{
+  if (e >= type->en.nbr || e < 0)
+    return "??";
+  else
+    return type->en.lits[e];
+}
+
+static void
+ghw_disp_lit (union ghw_type *type, int e)
+{
+  printf ("%s (%d)", ghw_get_lit (type, e), e);
+}
+
 void
 ghw_disp_value (union ghw_val *val, union ghw_type *type)
 {
   switch (ghw_get_base_type (type)->kind)
     {
     case ghdl_rtik_type_b2:
-      printf ("%s (%d)", type->en.lits[val->b2], val->b2);
+      ghw_disp_lit (type, val->b2);
       break;
     case ghdl_rtik_type_e8:
-      printf ("%s (%d)", type->en.lits[val->e8], val->e8);
+      ghw_disp_lit (type, val->e8);
       break;
     case ghdl_rtik_type_i32:
       printf ("%d", val->i32);
@@ -1582,10 +1597,14 @@
 }
 
 void
-ghw_disp_range (union ghw_range *rng)
+ghw_disp_range (union ghw_type *type, union ghw_range *rng)
 {
   switch (rng->kind)
     {
+    case ghdl_rtik_type_e8:
+      printf ("%s %s %s", ghw_get_lit (type, rng->e8.left),
+	      ghw_get_dir (rng->e8.dir), ghw_get_lit (type, rng->e8.right));
+      break;
     case ghdl_rtik_type_i32:
     case ghdl_rtik_type_p32:
       printf ("%d %s %d",
@@ -1657,7 +1676,7 @@
 	printf ("subtype %s is ", s->name);
 	ghw_disp_typename (h, s->base);
 	printf (" range ");
-	ghw_disp_range (s->rng);
+	ghw_disp_range (s->base, s->rng);
 	printf (";\n");
       }
       break;
@@ -1692,7 +1711,7 @@
 	  {
 	    if (i != 0)
 	      printf (", ");
-	    ghw_disp_range (a->rngs[i]);
+	    ghw_disp_range ((union ghw_type *)a->base, a->rngs[i]);
 	  }
 	printf (");\n");
       }
diff -urN ghdl-0.21/vhdl/grt/ghwlib.h ghdl-0.22dev/vhdl/grt/ghwlib.h
--- ghdl-0.21/vhdl/grt/ghwlib.h	2005-12-07 06:27:09.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/ghwlib.h	2005-12-20 16:18:50.000000000 +0100
@@ -390,7 +390,8 @@
 
 const char *ghw_get_dir (int is_downto);
 
-void ghw_disp_range (union ghw_range *rng);
+/* Note: TYPE must be a base type (used only to display literals).  */
+void ghw_disp_range (union ghw_type *type, union ghw_range *rng);
 
 void ghw_disp_type (struct ghw_handler *h, union ghw_type *t);
 
diff -urN ghdl-0.21/vhdl/grt/grt-signals.adb ghdl-0.22dev/vhdl/grt/grt-signals.adb
--- ghdl-0.21/vhdl/grt/grt-signals.adb	2005-11-18 03:13:36.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/grt-signals.adb	2005-12-20 16:18:50.000000000 +0100
@@ -1095,15 +1095,6 @@
          when others =>
             Internal_Error ("ghdl_create_signal_attribute");
       end case;
---       Sig_Instance_Name := new Ghdl_Instance_Name_Type'
---         (Kind => Ghdl_Name_Signal,
---          Name => null,
---          Parent => null,
---          Brother => null,
---          Sig_Mode => Mode,
---          Sig_Kind => Kind_Signal_No,
---        Sig_Indexes => (First => Sig_Table.Last + 1, Last => Sig_Table.Last),
---          Sig_Type_Desc => Sig_Type);
       --  Note: bit and boolean are both mode_b2.
       Res := Create_Signal
         (Mode_B2, Value_Union'(Mode => Mode_B2, B2 => True),
diff -urN ghdl-0.21/vhdl/grt/grt-waves.adb ghdl-0.22dev/vhdl/grt/grt-waves.adb
--- ghdl-0.21/vhdl/grt/grt-waves.adb	2005-12-07 05:50:07.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/grt-waves.adb	2005-12-20 16:18:50.000000000 +0100
@@ -785,6 +785,15 @@
    Nbr_Scope_Signals : Natural := 0;
    Nbr_Dumped_Signals : Natural := 0;
 
+   --  This is only valid during write_hierarchy.
+   function Get_Signal_Number (Sig : Ghdl_Signal_Ptr) return Natural
+   is
+      function To_Integer_Address is new Ada.Unchecked_Conversion
+        (Ghdl_Signal_Ptr, Integer_Address);
+   begin
+      return Natural (To_Integer_Address (Sig.Alink));
+   end Get_Signal_Number;
+
    procedure Write_Signal_Number (Val_Addr : Address;
                                   Val_Name : Vstring;
                                   Val_Type : Ghdl_Rti_Access)
@@ -792,20 +801,28 @@
       pragma Unreferenced (Val_Name);
       pragma Unreferenced (Val_Type);
 
-      function To_Integer_Address is new Ada.Unchecked_Conversion
-        (Ghdl_Signal_Ptr, Integer_Address);
+      Num : Natural;
+
       function To_Ghdl_Signal_Ptr is new Ada.Unchecked_Conversion
         (Source => Integer_Address, Target => Ghdl_Signal_Ptr);
       Sig : Ghdl_Signal_Ptr;
    begin
+      --  Convert to signal.
       Sig := To_Ghdl_Signal_Ptr (To_Addr_Acc (Val_Addr).all);
-      if not Sig.Flags.Is_Dumped then
-         Sig.Flags.Is_Dumped := True;
+
+      --  Get signal number.
+      Num := Get_Signal_Number (Sig);
+
+      --  If the signal number is 0, then assign a valid signal number.
+      if Num = 0 then
          Nbr_Dumped_Signals := Nbr_Dumped_Signals + 1;
-         Sig.Flink := To_Ghdl_Signal_Ptr
+         Sig.Alink := To_Ghdl_Signal_Ptr
            (Integer_Address (Nbr_Dumped_Signals));
+         Num := Nbr_Dumped_Signals;
       end if;
-      Wave_Put_ULEB128 (Ghdl_E32 (To_Integer_Address (Sig.Flink)));
+
+      --  Do the real job: write the signal number.
+      Wave_Put_ULEB128 (Ghdl_E32 (Num));
    end Write_Signal_Number;
 
    procedure Foreach_Scalar_Signal_Number is new
@@ -1370,13 +1387,18 @@
       Table_Initial => 32,
       Table_Increment => 100);
 
+   function Get_Dump_Entry (N : Natural) return Ghdl_Signal_Ptr is
+   begin
+      return Dump_Table.Table (N);
+   end Get_Dump_Entry;
+
    procedure Write_Hierarchy (Root : VhpiHandleT)
    is
       N : Natural;
    begin
-      --  Check Flink is 0.
+      --  Check Alink is 0.
       for I in Sig_Table.First .. Sig_Table.Last loop
-         if Sig_Table.Table (I).Flink /= null then
+         if Sig_Table.Table (I).Alink /= null then
             Internal_Error ("wave.write_hierarchy");
          end if;
       end loop;
@@ -1393,15 +1415,20 @@
       Wave_Put_Byte (0);
 
       Dump_Table.Set_Last (Nbr_Dumped_Signals);
+      for I in Dump_Table.First .. Dump_Table.Last loop
+         Dump_Table.Table (I) := null;
+      end loop;
 
       --  Save and clear.
-      N := 0;
       for I in Sig_Table.First .. Sig_Table.Last loop
-         if Sig_Table.Table (I).Flags.Is_Dumped then
-            N := N + 1;
+         N := Get_Signal_Number (Sig_Table.Table (I));
+         if N /= 0 then
+            if Dump_Table.Table (N) /= null then
+               Internal_Error ("wave.write_hierarchy(2)");
+            end if;
             Dump_Table.Table (N) := Sig_Table.Table (I);
+            Sig_Table.Table (I).Alink := null;
          end if;
-         Sig_Table.Table (I).Flink := null;
       end loop;
    end Write_Hierarchy;
 
diff -urN ghdl-0.21/vhdl/version.ads ghdl-0.22dev/vhdl/version.ads
--- ghdl-0.21/vhdl/version.ads	2005-12-18 14:07:38.000000000 +0100
+++ ghdl-0.22dev/vhdl/version.ads	2005-12-20 16:18:55.000000000 +0100
@@ -1,4 +1,4 @@
 package Version is
    Ghdl_Version : constant String :=
-      "GHDL 0.21 (20051218) [Sokcho edition]";
+      "GHDL 0.22dev (20051220) [Sokcho edition]";
 end Version;


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/FC-4/ghdl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ghdl.spec	18 Dec 2005 23:06:54 -0000	1.5
+++ ghdl.spec	20 Dec 2005 23:19:06 -0000	1.6
@@ -3,8 +3,8 @@
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
-Version: 0.21
-Release: 1%{?dist}
+Version: 0.22
+Release: 0.38svn.0%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -14,7 +14,7 @@
 # ./dist.sh sources
 Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
-Patch0: ghdl-0.21-infodirentry.patch
+Patch0: ghdl-svn38.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo
 Requires(post): /sbin/install-info
@@ -52,9 +52,9 @@
 %prep
 %setup -q -n gcc-%{gccver} -T -b 1 -a 0
 pushd ghdl-%{ghdlver}
+%patch0 -p1
 %{__mv} vhdl ../gcc/
 popd
-%patch0 -p0
 
 %build
 %{__mkdir} obj-%{gcc_target_platform}
@@ -215,6 +215,9 @@
 %{_libexecdir}/gcc/
 
 %changelog
+* 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
 


--- ghdl-0.21-infodirentry.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 20 23:36:16 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 20 Dec 2005 18:36:16 -0500
Subject: rpms/plt-scheme/devel plt-scheme.spec, 1.19, 1.20 plt-xft.patch, 1.1,
	NONE
Message-ID: <200512202336.jBKNamON029872@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29855

Modified Files:
	plt-scheme.spec 
Removed Files:
	plt-xft.patch 
Log Message:



Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plt-scheme.spec	19 Dec 2005 21:28:40 -0000	1.19
+++ plt-scheme.spec	20 Dec 2005 23:36:16 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           plt-scheme
 Version:        300
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
@@ -9,7 +9,6 @@
 Source:		http://download.plt-scheme.org/bundles/300/plt/plt-300-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
-Patch1:		plt-xft.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
@@ -62,7 +61,6 @@
 %ifarch x86_64
 %patch0 -p1
 %endif
-%patch1 -p1
 
 
 %build
@@ -142,6 +140,9 @@
 
 
 %changelog
+* Wed Dec 21 2005 Gerard Milmeister  - 300-2
+- xft patch no longer necessary
+
 * Mon Dec 19 2005 Gerard Milmeister  - 300-1
 - New Version 300
 


--- plt-xft.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 06:30:53 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 01:30:53 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.11,1.12
Message-ID: <200512210631.jBL6VPCg009946@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9896/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Upgraded to 1.11.1.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nethack-vultures.spec	15 Dec 2005 23:49:02 -0000	1.11
+++ nethack-vultures.spec	21 Dec 2005 06:30:52 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.0
-Release:        8%{?dist}
+Version:        1.11.1
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 20 2005 Karen Pease  - 1.11.1-1
+- Upgraded source package; fixes some keyboard bugs and problems for 64bit/big endian machines concerning transparency.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-8
 - Forgot to relocate moved docs for postbuild.
 
@@ -180,15 +183,15 @@
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-3
 - Didn't quite get that patch right.
 
-* Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-2
 - Forgot to update the patches previously; done.
 
-* Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-1
 - Upgraded the tarball to the latest release
 - Upped the version
 - Removed a patch that's now part of the source
 
-* Mon Nov 21 2005 Karen Pease  - 1.10.1-1%{?dist}
+* Mon Nov 21 2005 Karen Pease  - 1.10.1-1
 - Made it so I don't have to manually tinker with revisions between dists
 - Using a 1.x release
 - Removed excess tarball



From fedora-extras-commits at redhat.com  Wed Dec 21 06:30:59 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 01:30:59 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.12,1.13
Message-ID: <200512210631.jBL6VWCn009949@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-serv9896/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Upgraded to 1.11.1.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nethack-vultures.spec	15 Dec 2005 23:49:07 -0000	1.12
+++ nethack-vultures.spec	21 Dec 2005 06:30:59 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.0
-Release:        8%{?dist}
+Version:        1.11.1
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 20 2005 Karen Pease  - 1.11.1-1
+- Upgraded source package; fixes some keyboard bugs and problems for 64bit/big endian machines concerning transparency.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-8
 - Forgot to relocate moved docs for postbuild.
 
@@ -183,15 +186,15 @@
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-3
 - Didn't quite get that patch right.
 
-* Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-2
 - Forgot to update the patches previously; done.
 
-* Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-1
 - Upgraded the tarball to the latest release
 - Upped the version
 - Removed a patch that's now part of the source
 
-* Mon Nov 21 2005 Karen Pease  - 1.10.1-1%{?dist}
+* Mon Nov 21 2005 Karen Pease  - 1.10.1-1
 - Made it so I don't have to manually tinker with revisions between dists
 - Using a 1.x release
 - Removed excess tarball



From fedora-extras-commits at redhat.com  Wed Dec 21 06:31:05 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 01:31:05 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.11,1.12
Message-ID: <200512210631.jBL6VcqQ009952@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9896/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Upgraded to 1.11.1.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nethack-vultures.spec	15 Dec 2005 23:49:13 -0000	1.11
+++ nethack-vultures.spec	21 Dec 2005 06:31:05 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.0
-Release:        8%{?dist}
+Version:        1.11.1
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 20 2005 Karen Pease  - 1.11.1-1
+- Upgraded source package; fixes some keyboard bugs and problems for 64bit/big endian machines concerning transparency.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-8
 - Forgot to relocate moved docs for postbuild.
 
@@ -183,15 +186,15 @@
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-3
 - Didn't quite get that patch right.
 
-* Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-2
 - Forgot to update the patches previously; done.
 
-* Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-1
 - Upgraded the tarball to the latest release
 - Upped the version
 - Removed a patch that's now part of the source
 
-* Mon Nov 21 2005 Karen Pease  - 1.10.1-1%{?dist}
+* Mon Nov 21 2005 Karen Pease  - 1.10.1-1
 - Made it so I don't have to manually tinker with revisions between dists
 - Using a 1.x release
 - Removed excess tarball



From fedora-extras-commits at redhat.com  Wed Dec 21 07:23:31 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 02:23:31 -0500
Subject: rpms/cernlib/devel cernlib.spec,1.12,1.13
Message-ID: <200512210724.jBL7O3Ef011718@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11686

Modified Files:
	cernlib.spec 
Log Message:
create dir before making link



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cernlib.spec	20 Dec 2005 22:53:23 -0000	1.12
+++ cernlib.spec	21 Dec 2005 07:23:31 -0000	1.13
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}
+Release:       11%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -601,6 +601,11 @@
 %{__install} -m644 src/cfortran/*.h $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/
 
 %{__install} -m755 bin/* $RPM_BUILD_ROOT%{_bindir}/
+
+# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
+%{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/
+%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
 (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
@@ -616,9 +621,6 @@
 %{__ln_s} gxint321.f gxint.f
 popd
 
-# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
-%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
-
 cd src
 # install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
@@ -647,6 +649,7 @@
 %dir %{_libdir}/cernlib/
 %dir %{_libdir}/cernlib/%{version}
 %dir %{_libdir}/cernlib/%{version}/lib
+%dir %{_libdir}/cernlib/%{version}/bin
 %{_libdir}/cernlib/%{version}/lib/*.so.*
 %{_datadir}/cernlib/
 %doc cernlib.README copyright
@@ -676,6 +679,7 @@
 %{_bindir}/paw++
 %{_bindir}/paw
 %{_bindir}/pawX11
+%dir %{_libdir}/cernlib/%{version}/bin
 %{_libdir}/cernlib/%{version}/bin/pawX11
 %doc paw.README 
 
@@ -707,7 +711,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.1
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Wed Dec 21 07:23:58 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 02:23:58 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.19,1.20
Message-ID: <200512210724.jBL7OVrG011756@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11702

Modified Files:
	cernlib.spec 
Log Message:
create dir before making link



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- cernlib.spec	20 Dec 2005 22:52:11 -0000	1.19
+++ cernlib.spec	21 Dec 2005 07:23:58 -0000	1.20
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}
+Release:       11%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -599,6 +599,11 @@
 %{__install} -m644 src/cfortran/*.h $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/
 
 %{__install} -m755 bin/* $RPM_BUILD_ROOT%{_bindir}/
+
+# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
+%{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/
+%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
 (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
@@ -614,9 +619,6 @@
 %{__ln_s} gxint321.f gxint.f
 popd
 
-# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
-%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
-
 cd src
 # install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
@@ -645,6 +647,7 @@
 %dir %{_libdir}/cernlib/
 %dir %{_libdir}/cernlib/%{version}
 %dir %{_libdir}/cernlib/%{version}/lib
+%dir %{_libdir}/cernlib/%{version}/bin
 %{_libdir}/cernlib/%{version}/lib/*.so.*
 %{_datadir}/cernlib/
 %doc cernlib.README copyright
@@ -674,6 +677,7 @@
 %{_bindir}/paw++
 %{_bindir}/paw
 %{_bindir}/pawX11
+%dir %{_libdir}/cernlib/%{version}/bin
 %{_libdir}/cernlib/%{version}/bin/pawX11
 %doc paw.README 
 
@@ -705,7 +709,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.1
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Wed Dec 21 07:26:01 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 02:26:01 -0500
Subject: rpms/cernlib/FC-3 cernlib.spec,1.14,1.15
Message-ID: <200512210726.jBL7QXSx011826@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11809

Modified Files:
	cernlib.spec 
Log Message:
create dir before making link



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cernlib.spec	20 Dec 2005 22:50:50 -0000	1.14
+++ cernlib.spec	21 Dec 2005 07:26:00 -0000	1.15
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}
+Release:       11%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -598,6 +598,11 @@
 %{__install} -m644 src/cfortran/*.h $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/
 
 %{__install} -m755 bin/* $RPM_BUILD_ROOT%{_bindir}/
+
+# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
+%{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/
+%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
 (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
@@ -613,9 +618,6 @@
 %{__ln_s} gxint321.f gxint.f
 popd
 
-# add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
-%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
-
 cd src
 # install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
@@ -644,6 +646,7 @@
 %dir %{_libdir}/cernlib/
 %dir %{_libdir}/cernlib/%{version}
 %dir %{_libdir}/cernlib/%{version}/lib
+%dir %{_libdir}/cernlib/%{version}/bin
 %{_libdir}/cernlib/%{version}/lib/*.so.*
 %{_datadir}/cernlib/
 %doc cernlib.README copyright
@@ -673,6 +676,7 @@
 %{_bindir}/paw++
 %{_bindir}/paw
 %{_bindir}/pawX11
+%dir %{_libdir}/cernlib/%{version}/bin
 %{_libdir}/cernlib/%{version}/bin/pawX11
 %doc paw.README 
 
@@ -704,7 +708,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.1
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Wed Dec 21 07:45:00 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 02:45:00 -0500
Subject: rpms/grads/devel grads.spec,1.2,1.3
Message-ID: <200512210745.jBL7jXKk011922@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11903

Modified Files:
	grads.spec 
Log Message:
* Wed Dec 21 2005 Patrice Dumas  1.9b4-5
- don't build the hdf interface on ppc, there is no hdf package



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grads.spec	20 Dec 2005 12:26:19 -0000	1.2
+++ grads.spec	21 Dec 2005 07:45:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -27,7 +27,11 @@
 Patch2:         grads-conditionnal_lats.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  hdf-devel udunits-devel netcdf-devel 
+# no hdf on ppc
+%ifnarch ppc
+BuildRequires:  hdf-devel 
+%endif
+BuildRequires:  udunits-devel netcdf-devel 
 #BuildRequires:  opendap-devel
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
@@ -100,6 +104,9 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Wed Dec 21 2005 Patrice Dumas  1.9b4-5
+- don't build the hdf interface on ppc, there is no hdf package
+
 * Tue Dec 13 2005 Patrice Dumas  1.9b4-4
 - simplify handling of data, as they are in the tarball
 



From fedora-extras-commits at redhat.com  Wed Dec 21 08:02:35 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 03:02:35 -0500
Subject: rpms/grads/devel grads.spec,1.3,1.4
Message-ID: <200512210803.jBL83AkK013647@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13625

Modified Files:
	grads.spec 
Log Message:
without hdf (on ppc) there is no gradshdf built



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grads.spec	21 Dec 2005 07:45:00 -0000	1.3
+++ grads.spec	21 Dec 2005 08:02:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        5%{?dist}
+Release:        5%{?dist}.1
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -69,6 +69,7 @@
 
 %build
 ./bootstrap
+# pass the -L and -I flags for hdf on ppc even though there is no hdf
 %configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
@@ -90,7 +91,9 @@
 %{_bindir}/bufrscan
 %{_bindir}/gradsc
 %{_bindir}/gradsdods
+%ifnarch ppc
 %{_bindir}/gradshdf
+%endif
 %{_bindir}/gradsnc
 %{_bindir}/gribmap
 %{_bindir}/gribscan
@@ -104,7 +107,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Wed Dec 21 2005 Patrice Dumas  1.9b4-5
+* Wed Dec 21 2005 Patrice Dumas  1.9b4-5.1
 - don't build the hdf interface on ppc, there is no hdf package
 
 * Tue Dec 13 2005 Patrice Dumas  1.9b4-4



From fedora-extras-commits at redhat.com  Wed Dec 21 08:08:32 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 03:08:32 -0500
Subject: rpms/cernlib/devel cernlib.spec,1.13,1.14
Message-ID: <200512210809.jBL896VL013735@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13700

Modified Files:
	cernlib.spec 
Log Message:
don't point link to buildroot


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cernlib.spec	21 Dec 2005 07:23:31 -0000	1.13
+++ cernlib.spec	21 Dec 2005 08:08:31 -0000	1.14
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.1
+Release:       11%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -604,7 +604,7 @@
 
 # add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/
-%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+%{__ln_s} %{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
 
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
@@ -711,7 +711,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11.1
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.2
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Wed Dec 21 08:08:59 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 03:08:59 -0500
Subject: rpms/cernlib/FC-3 cernlib.spec,1.15,1.16
Message-ID: <200512210809.jBL89Vj7013753@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13723

Modified Files:
	cernlib.spec 
Log Message:
don't point link to buildroot


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cernlib.spec	21 Dec 2005 07:26:00 -0000	1.15
+++ cernlib.spec	21 Dec 2005 08:08:59 -0000	1.16
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.1
+Release:       11%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -601,7 +601,7 @@
 
 # add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/
-%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+%{__ln_s} %{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
 
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
@@ -708,7 +708,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11.1
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.2
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Wed Dec 21 08:09:34 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed, 21 Dec 2005 03:09:34 -0500
Subject: rpms/irssi/devel .cvsignore, 1.4, 1.5 irssi.spec, 1.11, 1.12 sources,
	1.4, 1.5 convert-replace-trigger.pl, 1.1,
	NONE convert-replace-trigger.pl-fixpath-patch, 1.1,
	NONE replace.pl, 1.1, NONE trigger.pl, 1.1, NONE
Message-ID: <200512210810.jBL8AbFo013835@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/rpms/irssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13783

Modified Files:
	.cvsignore irssi.spec sources 
Removed Files:
	convert-replace-trigger.pl 
	convert-replace-trigger.pl-fixpath-patch replace.pl trigger.pl 
Log Message:
irssi: updated to 0.8.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Dec 2005 08:22:00 -0000	1.4
+++ .cvsignore	21 Dec 2005 08:09:33 -0000	1.5
@@ -1 +1,2 @@
 irssi-0.8.10-rc8.tar.gz
+irssi-0.8.10.tar.bz2


Index: irssi.spec
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- irssi.spec	7 Dec 2005 08:22:00 -0000	1.11
+++ irssi.spec	21 Dec 2005 08:09:33 -0000	1.12
@@ -1,20 +1,14 @@
 %define		perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
-%define		release_candidate	rc8
-
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.10
-Release:	0.2.%{release_candidate}%{?dist}
+Release:	1%{?dist}
 
 License:	GPL
 Group:		Applications/Communications
 URL:		http://irssi.org/
-Source0:	http://irssi.org/files/irssi-%{version}-%{release_candidate}.tar.gz
-Source1:	http://wouter.coekaerts.be/irssi/scripts/replace.pl
-Source2:	http://wouter.coekaerts.be/irssi/scripts/trigger.pl
-Source3:	http://wouter.coekaerts.be/irssi/scripts/convert-replace-trigger.pl
-Patch1:		convert-replace-trigger.pl-fixpath-patch
+Source0:	http://irssi.org/files/irssi-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel openssl-devel zlib-devel 
 BuildRequires:	pkgconfig gc-devel glib2-devel
@@ -40,9 +34,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{release_candidate}
-install -m 0644 %{SOURCE3} .
-%patch1 -p0
+%setup -q -n %{name}-%{version}
 
 %build
 %configure --enable-ipv6 --with-textui	\
@@ -57,10 +49,6 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
-# Extra script
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
-
 # Clean up
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a
 rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
@@ -77,7 +65,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README TODO convert-replace-trigger.pl
+%doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README TODO
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %{_bindir}/%{name}
 %{_bindir}/botti
@@ -93,6 +81,9 @@
 %{_includedir}/irssi
 
 %changelog
+* Sun Dec 11 2005 Dams  - 0.8.10-1
+- Updated to final 0.8.10
+
 * Wed Dec  7 2005 Dams  - 0.8.10-0.2.rc8
 - Updated to rc8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Dec 2005 08:22:00 -0000	1.4
+++ sources	21 Dec 2005 08:09:33 -0000	1.5
@@ -1 +1,2 @@
 b51befaeca9ce3a763ee994096d4a387  irssi-0.8.10-rc8.tar.gz
+4b83d4047670eb75bd14ae1bdd68dc38  irssi-0.8.10.tar.bz2


--- convert-replace-trigger.pl DELETED ---


--- convert-replace-trigger.pl-fixpath-patch DELETED ---


--- replace.pl DELETED ---


--- trigger.pl DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 08:11:26 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 03:11:26 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.20,1.21
Message-ID: <200512210811.jBL8BxQM013905@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13878

Modified Files:
	cernlib.spec 
Log Message:
don't point link to buildroot


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cernlib.spec	21 Dec 2005 07:23:58 -0000	1.20
+++ cernlib.spec	21 Dec 2005 08:11:26 -0000	1.21
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.1
+Release:       11%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -602,7 +602,7 @@
 
 # add a link to pawX11 from %{_libdir}/cernlib/%{version}/bin
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/
-%{__ln_s} $RPM_BUILD_ROOT%{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
+%{__ln_s} %{_bindir}/pawX11 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/bin/pawX11
 
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
@@ -709,7 +709,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11.1
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.2
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Wed Dec 21 08:13:45 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed, 21 Dec 2005 03:13:45 -0500
Subject: rpms/irssi/FC-4 .cvsignore, 1.3, 1.4 irssi.spec, 1.9, 1.10 sources, 
	1.3, 1.4 convert-replace-trigger.pl, 1.1,
	NONE convert-replace-trigger.pl-fixpath-patch, 1.1,
	NONE replace.pl, 1.1, NONE trigger.pl, 1.1, NONE
Message-ID: <200512210814.jBL8EIP4014021@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/rpms/irssi/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14000

Modified Files:
	.cvsignore irssi.spec sources 
Removed Files:
	convert-replace-trigger.pl 
	convert-replace-trigger.pl-fixpath-patch replace.pl trigger.pl 
Log Message:
irssi: updated to 0.8.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/irssi/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Dec 2005 08:25:51 -0000	1.3
+++ .cvsignore	21 Dec 2005 08:13:45 -0000	1.4
@@ -1 +1 @@
-irssi-0.8.10-rc8.tar.gz
+irssi-0.8.10.tar.bz2


Index: irssi.spec
===================================================================
RCS file: /cvs/extras/rpms/irssi/FC-4/irssi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- irssi.spec	7 Dec 2005 08:25:51 -0000	1.9
+++ irssi.spec	21 Dec 2005 08:13:45 -0000	1.10
@@ -1,20 +1,14 @@
 %define		perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
-%define		release_candidate	rc8
-
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.10
-Release:	0.2.%{release_candidate}%{?dist}
+Release:	1%{?dist}
 
 License:	GPL
 Group:		Applications/Communications
 URL:		http://irssi.org/
-Source0:	http://irssi.org/files/irssi-%{version}-%{release_candidate}.tar.gz
-Source1:	http://wouter.coekaerts.be/irssi/scripts/replace.pl
-Source2:	http://wouter.coekaerts.be/irssi/scripts/trigger.pl
-Source3:	http://wouter.coekaerts.be/irssi/scripts/convert-replace-trigger.pl
-Patch1:		convert-replace-trigger.pl-fixpath-patch
+Source0:	http://irssi.org/files/irssi-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel openssl-devel zlib-devel 
 BuildRequires:	pkgconfig gc-devel glib2-devel
@@ -40,9 +34,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{release_candidate}
-install -m 0644 %{SOURCE3} .
-%patch1 -p0
+%setup -q -n %{name}-%{version}
 
 %build
 %configure --enable-ipv6 --with-textui	\
@@ -57,10 +49,6 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
-# Extra script
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
-
 # Clean up
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a
 rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
@@ -77,7 +65,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README TODO convert-replace-trigger.pl
+%doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README TODO
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %{_bindir}/%{name}
 %{_bindir}/botti
@@ -93,6 +81,9 @@
 %{_includedir}/irssi
 
 %changelog
+* Sun Dec 11 2005 Dams  - 0.8.10-1
+- Updated to final 0.8.10
+
 * Wed Dec  7 2005 Dams  - 0.8.10-0.2.rc8
 - Updated to rc8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/irssi/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Dec 2005 08:25:51 -0000	1.3
+++ sources	21 Dec 2005 08:13:45 -0000	1.4
@@ -1 +1 @@
-b51befaeca9ce3a763ee994096d4a387  irssi-0.8.10-rc8.tar.gz
+4b83d4047670eb75bd14ae1bdd68dc38  irssi-0.8.10.tar.bz2


--- convert-replace-trigger.pl DELETED ---


--- convert-replace-trigger.pl-fixpath-patch DELETED ---


--- replace.pl DELETED ---


--- trigger.pl DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 08:15:03 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed, 21 Dec 2005 03:15:03 -0500
Subject: rpms/irssi/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200512210815.jBL8FZSX014058@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/rpms/irssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14039

Modified Files:
	.cvsignore sources 
Log Message:
irssi/devel: cleanup in sources/cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 08:09:33 -0000	1.5
+++ .cvsignore	21 Dec 2005 08:15:03 -0000	1.6
@@ -1,2 +1 @@
-irssi-0.8.10-rc8.tar.gz
 irssi-0.8.10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2005 08:09:33 -0000	1.5
+++ sources	21 Dec 2005 08:15:03 -0000	1.6
@@ -1,2 +1 @@
-b51befaeca9ce3a763ee994096d4a387  irssi-0.8.10-rc8.tar.gz
 4b83d4047670eb75bd14ae1bdd68dc38  irssi-0.8.10.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 21 08:18:01 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 03:18:01 -0500
Subject: rpms/cppunit/devel .cvsignore, 1.2, 1.3 cppunit.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200512210818.jBL8IXvb014183@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cppunit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14161

Modified Files:
	.cvsignore cppunit.spec sources 
Log Message:
* Wed Dec 21 2005 Patrice Dumas  1.11.4-1
- update



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Sep 2005 14:30:04 -0000	1.2
+++ .cvsignore	21 Dec 2005 08:18:00 -0000	1.3
@@ -1 +1 @@
-cppunit-1.11.0.tar.gz
+cppunit-1.11.4.tar.gz


Index: cppunit.spec
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/cppunit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cppunit.spec	11 Sep 2005 16:31:46 -0000	1.2
+++ cppunit.spec	21 Dec 2005 08:18:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name: cppunit
-Version: 1.11.0
-Release: 2%{?dist}
+Version: 1.11.4
+Release: 1%{?dist}
 
 Summary: C++ unit testing framework
 License: LGPL
@@ -74,6 +74,9 @@
 %doc doc/html/*
 
 %changelog
+* Wed Dec 21 2005 Patrice Dumas  1.11.4-1
+- update
+
 * Mon Aug 15 2005 Tom "spot" Callaway  1.11.0-2
 - various cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Sep 2005 14:30:04 -0000	1.2
+++ sources	21 Dec 2005 08:18:01 -0000	1.3
@@ -1 +1 @@
-7b256f622158d3c932b3c5025ef5e2ed  cppunit-1.11.0.tar.gz
+6f24440c2a580b4a98f34af09e385933  cppunit-1.11.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 21 08:20:30 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 21 Dec 2005 03:20:30 -0500
Subject: rpms/perl-DBIx-DBSchema/devel DBIx-DBSchema-0.28-version.diff, NONE,
	1.1
Message-ID: <200512210820.jBL8KWXd014253@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14240/devel

Added Files:
	DBIx-DBSchema-0.28-version.diff 
Log Message:
New.

DBIx-DBSchema-0.28-version.diff:

--- NEW FILE DBIx-DBSchema-0.28-version.diff ---
--- DBIx-DBSchema-0.28.orig/DBSchema/DBD/Pg.pm	2005-04-07 10:14:52.000000000 +0200
+++ DBIx-DBSchema-0.28/DBSchema/DBD/Pg.pm	2005-12-21 08:30:23.000000000 +0100
@@ -2,13 +2,14 @@
 
 use strict;
 use vars qw($VERSION @ISA %typemap);
+$VERSION = '0.10';
+
 use DBD::Pg 1.32;
 die "DBD::Pg version 1.32 or 1.41 (or later) required--".
     "this is only version $DBD::Pg::VERSION\n"
   if $DBD::Pg::VERSION != 1.32 && $DBD::Pg::VERSION < 1.41;
 use DBIx::DBSchema::DBD;
 
-$VERSION = '0.10';
 @ISA = qw(DBIx::DBSchema::DBD);
 
 %typemap = (



From fedora-extras-commits at redhat.com  Wed Dec 21 08:20:36 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 21 Dec 2005 03:20:36 -0500
Subject: rpms/perl-DBIx-DBSchema/FC-4 DBIx-DBSchema-0.28-version.diff, NONE, 
	1.1
Message-ID: <200512210820.jBL8KciY014271@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14240/FC-4

Added Files:
	DBIx-DBSchema-0.28-version.diff 
Log Message:
New.

DBIx-DBSchema-0.28-version.diff:

--- NEW FILE DBIx-DBSchema-0.28-version.diff ---
--- DBIx-DBSchema-0.28.orig/DBSchema/DBD/Pg.pm	2005-04-07 10:14:52.000000000 +0200
+++ DBIx-DBSchema-0.28/DBSchema/DBD/Pg.pm	2005-12-21 08:30:23.000000000 +0100
@@ -2,13 +2,14 @@
 
 use strict;
 use vars qw($VERSION @ISA %typemap);
+$VERSION = '0.10';
+
 use DBD::Pg 1.32;
 die "DBD::Pg version 1.32 or 1.41 (or later) required--".
     "this is only version $DBD::Pg::VERSION\n"
   if $DBD::Pg::VERSION != 1.32 && $DBD::Pg::VERSION < 1.41;
 use DBIx::DBSchema::DBD;
 
-$VERSION = '0.10';
 @ISA = qw(DBIx::DBSchema::DBD);
 
 %typemap = (



From fedora-extras-commits at redhat.com  Wed Dec 21 08:21:45 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 21 Dec 2005 03:21:45 -0500
Subject: rpms/perl-DBIx-DBSchema/devel perl-DBIx-DBSchema.spec,1.3,1.4
Message-ID: <200512210822.jBL8MH63014319@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14287/devel

Modified Files:
	perl-DBIx-DBSchema.spec 
Log Message:
Add workaround to #175468


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/devel/perl-DBIx-DBSchema.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-DBIx-DBSchema.spec	5 Dec 2005 14:32:58 -0000	1.3
+++ perl-DBIx-DBSchema.spec	21 Dec 2005 08:21:45 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           perl-DBIx-DBSchema
 Version:        0.28
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Database-independent schema objects
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/DBIx-DBSchema/
 Source0:        http://search.cpan.org/CPAN/authors/id/I/IV/IVAN/DBIx-DBSchema-%{version}.tar.gz
+Patch0:         DBIx-DBSchema-0.28-version.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q -n DBIx-DBSchema-%{version}
+%patch0 -p1
 chmod -x README Changes
 find -name '*.pm' -exec chmod -x {} \;
 
@@ -63,6 +65,9 @@
 
 
 %changelog
+* Wed Dec 21 2005  Ralf Cors??pius  - 0.28-2
+- Apply work around to CPAN incompatibility (PR #175468, J.V. Dias).
+
 * Mon Dec 05 2005  Ralf Cors??pius  - 0.28-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Wed Dec 21 08:21:51 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 21 Dec 2005 03:21:51 -0500
Subject: rpms/perl-DBIx-DBSchema/FC-4 perl-DBIx-DBSchema.spec,1.3,1.4
Message-ID: <200512210822.jBL8MQr3014322@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14287/FC-4

Modified Files:
	perl-DBIx-DBSchema.spec 
Log Message:
Add workaround to #175468


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4/perl-DBIx-DBSchema.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-DBIx-DBSchema.spec	5 Dec 2005 14:37:49 -0000	1.3
+++ perl-DBIx-DBSchema.spec	21 Dec 2005 08:21:51 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           perl-DBIx-DBSchema
 Version:        0.28
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Database-independent schema objects
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/DBIx-DBSchema/
 Source0:        http://search.cpan.org/CPAN/authors/id/I/IV/IVAN/DBIx-DBSchema-%{version}.tar.gz
+Patch0:         DBIx-DBSchema-0.28-version.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q -n DBIx-DBSchema-%{version}
+%patch0 -p1
 chmod -x README Changes
 find -name '*.pm' -exec chmod -x {} \;
 
@@ -63,6 +65,9 @@
 
 
 %changelog
+* Wed Dec 21 2005  Ralf Cors??pius  - 0.28-2
+- Apply work around to CPAN incompatibility (PR #175468, J.V. Dias).
+
 * Mon Dec 05 2005  Ralf Cors??pius  - 0.28-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Wed Dec 21 08:30:03 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 21 Dec 2005 03:30:03 -0500
Subject: rpms/perl-Params-Util/devel .cvsignore, 1.4,
	1.5 perl-Params-Util.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200512210830.jBL8UZAG014457@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14433

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Oct 2005 02:19:45 -0000	1.4
+++ .cvsignore	21 Dec 2005 08:30:03 -0000	1.5
@@ -1 +1 @@
-Params-Util-0.07.tar.gz
+Params-Util-0.08.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Params-Util.spec	12 Oct 2005 02:19:45 -0000	1.3
+++ perl-Params-Util.spec	21 Dec 2005 08:30:03 -0000	1.4
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.07
+Version: 	0.08
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,15 +49,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Oct 12 2005 Ralf Corsepius  - 0.07-1
+* Wed Dec 21 2005 Ralf Cors??pius  - 0.08-1
 - Upstream update.
 
-* Fri Oct 07 2005 Ralf Corsepius  - 0.06-1
+* Wed Oct 12 2005 Ralf Corsepius  - 0.07-1
 - Upstream update.
-- Remove BR perl(ExtUtils::AutoInstall), not required anymore.
-
-* Tue Sep 14 2005 Ralf Corsepius  - 0.05-2
-- Add BR: perl(ExtUtils::AutoInstall) and core deps.
-
-* Tue Sep 14 2005 Ralf Corsepius  - 0.05-1
-- Initial version.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Oct 2005 02:19:45 -0000	1.4
+++ sources	21 Dec 2005 08:30:03 -0000	1.5
@@ -1 +1 @@
-c79bec91e1818b0797935f95f5b2259b  Params-Util-0.07.tar.gz
+f67b9a6361526901e33a47a45719a61b  Params-Util-0.08.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 21 08:31:26 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 21 Dec 2005 03:31:26 -0500
Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.4,
	1.5 perl-Params-Util.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200512210831.jBL8VxUj014531@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14510

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Oct 2005 02:19:44 -0000	1.4
+++ .cvsignore	21 Dec 2005 08:31:26 -0000	1.5
@@ -1 +1 @@
-Params-Util-0.07.tar.gz
+Params-Util-0.08.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Params-Util.spec	12 Oct 2005 02:19:44 -0000	1.3
+++ perl-Params-Util.spec	21 Dec 2005 08:31:26 -0000	1.4
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.07
+Version: 	0.08
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,15 +49,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Oct 12 2005 Ralf Corsepius  - 0.07-1
+* Wed Dec 21 2005 Ralf Cors??pius  - 0.08-1
 - Upstream update.
 
-* Fri Oct 07 2005 Ralf Corsepius  - 0.06-1
+* Wed Oct 12 2005 Ralf Corsepius  - 0.07-1
 - Upstream update.
-- Remove BR perl(ExtUtils::AutoInstall), not required anymore.
-
-* Tue Sep 14 2005 Ralf Corsepius  - 0.05-2
-- Add BR: perl(ExtUtils::AutoInstall) and core deps.
-
-* Tue Sep 14 2005 Ralf Corsepius  - 0.05-1
-- Initial version.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Oct 2005 02:19:44 -0000	1.4
+++ sources	21 Dec 2005 08:31:26 -0000	1.5
@@ -1 +1 @@
-c79bec91e1818b0797935f95f5b2259b  Params-Util-0.07.tar.gz
+f67b9a6361526901e33a47a45719a61b  Params-Util-0.08.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 21 08:33:14 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 21 Dec 2005 03:33:14 -0500
Subject: rpms/perl-Params-Util/FC-3 .cvsignore, 1.4,
	1.5 perl-Params-Util.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200512210833.jBL8Xl0a014617@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14594

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Oct 2005 02:19:43 -0000	1.4
+++ .cvsignore	21 Dec 2005 08:33:14 -0000	1.5
@@ -1 +1 @@
-Params-Util-0.07.tar.gz
+Params-Util-0.08.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/perl-Params-Util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Params-Util.spec	12 Oct 2005 02:19:43 -0000	1.3
+++ perl-Params-Util.spec	21 Dec 2005 08:33:14 -0000	1.4
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.07
+Version: 	0.08
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,15 +49,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Oct 12 2005 Ralf Corsepius  - 0.07-1
+* Wed Dec 21 2005 Ralf Cors??pius  - 0.08-1
 - Upstream update.
 
-* Fri Oct 07 2005 Ralf Corsepius  - 0.06-1
+* Wed Oct 12 2005 Ralf Corsepius  - 0.07-1
 - Upstream update.
-- Remove BR perl(ExtUtils::AutoInstall), not required anymore.
-
-* Tue Sep 14 2005 Ralf Corsepius  - 0.05-2
-- Add BR: perl(ExtUtils::AutoInstall) and core deps.
-
-* Tue Sep 14 2005 Ralf Corsepius  - 0.05-1
-- Initial version.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Oct 2005 02:19:43 -0000	1.4
+++ sources	21 Dec 2005 08:33:14 -0000	1.5
@@ -1 +1 @@
-c79bec91e1818b0797935f95f5b2259b  Params-Util-0.07.tar.gz
+f67b9a6361526901e33a47a45719a61b  Params-Util-0.08.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 21 08:38:31 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 21 Dec 2005 03:38:31 -0500
Subject: fedora-security/audit fc5,1.22,1.23
Message-ID: <200512210839.jBL8d1hA014697@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14679

Modified Files:
	fc5 
Log Message:
This file is currently against FC5-test1 which is vulnerable to
fetchmail issue.  We'll rebase the file against FC5-test2 once released



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fc5	20 Dec 2005 22:27:22 -0000	1.22
+++ fc5	21 Dec 2005 08:38:29 -0000	1.23
@@ -12,7 +12,7 @@
 
 ** are items that need attention
 
-CVE-2005-4348 version (fetchmail, fixed 6.3.1)
+CVE-2005-4348 VULNERABLE (fetchmail, fixed 6.3.1)
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages



From fedora-extras-commits at redhat.com  Wed Dec 21 09:39:01 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 21 Dec 2005 04:39:01 -0500
Subject: rpms/paps/devel paps-0.6.2-fix-bufferoverflow.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 paps.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200512210939.jBL9dX0b017091@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/paps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17067

Modified Files:
	.cvsignore paps.spec sources 
Added Files:
	paps-0.6.2-fix-bufferoverflow.patch 
Log Message:
* Wed Dec 21 2005 Akira TAGOH  - 0.6.2-1
- New upstream release.
  - the bitmap font is now ignored. (#176206)
- paps-0.6.2-fix-bufferoverflow.patch: applied to fix the buffer overflow.

paps-0.6.2-fix-bufferoverflow.patch:

--- NEW FILE paps-0.6.2-fix-bufferoverflow.patch ---
diff -ruN paps-0.6.2.orig/src/libpaps.c paps-0.6.2/src/libpaps.c
--- paps-0.6.2.orig/src/libpaps.c	2005-12-21 05:31:17.000000000 +0900
+++ paps-0.6.2/src/libpaps.c	2005-12-21 18:23:40.000000000 +0900
@@ -147,11 +147,8 @@
                              void *user_data);
 static void get_next_char_id(// output
                              char *char_id);
-static void get_glyph_hash_string(FT_Face face,
-                                  PangoGlyphInfo *glyph_info,
-                                  // output
-                                  gchar *hash_string
-                                  );
+static gchar *get_glyph_hash_string(FT_Face face,
+                                    PangoGlyphInfo *glyph_info);
 
 // Fonts are three character symbols in an alphabet composing of
 // the following characters:
@@ -422,7 +419,7 @@
   double scale = 72.0 / PANGO_SCALE  / PAPS_DPI;
   double epsilon = 1e-2;
   double glyph_width = glyph_info->geometry.width * scale;
-  gchar glyph_hash_string[20];
+  gchar *glyph_hash_string;
   gchar *id;
 
   /* Output outline */
@@ -436,10 +433,8 @@
   FT_Outline_Funcs *outlinefunc;
   OutlineInfo outline_info;
 
-  get_glyph_hash_string(face,
-                        glyph_info,
-                        // output
-                        glyph_hash_string);
+  glyph_hash_string = get_glyph_hash_string(face,
+                                            glyph_info);
 
   // Look up the key in the hash table
   if (!(id = g_hash_table_lookup(paps->glyph_cache,
@@ -498,6 +493,7 @@
       FT_Done_Glyph (glyph);
 
     }
+  g_free(glyph_hash_string);
 
   if (id[0] != '*')
     {
@@ -626,13 +622,10 @@
   return char_id;
 }
 
-static void get_glyph_hash_string(FT_Face face,
-                                  PangoGlyphInfo *glyph_info,
-                                  // output
-                                  gchar *hash_string
-                                  )
+static gchar *get_glyph_hash_string(FT_Face face,
+                                    PangoGlyphInfo *glyph_info)
 {
-  sprintf(hash_string, "%08x-%d-%d",
+  return g_strdup_printf("%08x-%d-%d",
 	  (unsigned int)face,
 	  glyph_info->glyph,
 	  glyph_info->geometry.width


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Dec 2005 13:32:23 -0000	1.4
+++ .cvsignore	21 Dec 2005 09:39:00 -0000	1.5
@@ -4,3 +4,4 @@
 paps-0.3.tgz
 paps-0.5.tgz
 paps-0.6.1.tar.gz
+paps-0.6.2.tar.gz


Index: paps.spec
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- paps.spec	13 Dec 2005 13:32:24 -0000	1.3
+++ paps.spec	21 Dec 2005 09:39:00 -0000	1.4
@@ -1,13 +1,14 @@
 Name:		paps
-Version:	0.6.1
+Version:	0.6.2
 Release:	1%{?dist}
 
 License:	LGPL
 URL:		http://paps.sourceforge.net/
-Source0:	http://paps.sourceforge.net/paps-%{version}.tar.gz
+Source0:	http://prdownloads.sourceforge.net/paps/paps-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pango-devel
 Patch0:		paps-0.6.1-makefile.patch
+Patch1:		paps-0.6.2-fix-bufferoverflow.patch
 
 Summary:	Plain Text to PostScript converter
 Group:		Applications/Publishing
@@ -18,6 +19,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .makefile
+%patch1 -p1 -b .overflow
 aclocal
 automake
 autoconf
@@ -44,6 +46,11 @@
 
 
 %changelog
+* Wed Dec 21 2005 Akira TAGOH  - 0.6.2-1
+- New upstream release.
+  - the bitmap font is now ignored. (#176206)
+- paps-0.6.2-fix-bufferoverflow.patch: applied to fix the buffer overflow.
+
 * Tue Dec 13 2005 Akira TAGOH  - 0.6.1-1
 - New upstream release.
 - paps-0.6.1-makefile.patch: applied to install docs on the proper dir.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Dec 2005 13:32:24 -0000	1.4
+++ sources	21 Dec 2005 09:39:00 -0000	1.5
@@ -1 +1 @@
-9de11306b1db7c87e754b66e3328b212  paps-0.6.1.tar.gz
+06268e6796e3869275ddeec42d9cfd53  paps-0.6.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 21 10:33:41 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 21 Dec 2005 05:33:41 -0500
Subject: rpms/cernlib/devel cernlib.spec,1.14,1.15
Message-ID: <200512211034.jBLAYDwc018964@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18947

Modified Files:
	cernlib.spec 
Log Message:
exclude x86_64 as it leads to bus errors in f771



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cernlib.spec	21 Dec 2005 08:08:31 -0000	1.14
+++ cernlib.spec	21 Dec 2005 10:33:40 -0000	1.15
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.2
+Release:       11%{?dist}.3
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -24,6 +24,7 @@
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:   x86_64
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -711,7 +712,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11.2
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.3
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Wed Dec 21 10:51:24 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 21 Dec 2005 05:51:24 -0500
Subject: rpms/synergy/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 synergy.spec, 1.11, 1.12
Message-ID: <200512211051.jBLApvPb019105@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/synergy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19082

Modified Files:
	.cvsignore sources synergy.spec 
Log Message:
Update to 1.2.7, now use modular X build requirements for FC >= 5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synergy/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Nov 2005 13:37:16 -0000	1.7
+++ .cvsignore	21 Dec 2005 10:51:24 -0000	1.8
@@ -1 +1 @@
-synergy-1.2.5.tar.gz
+synergy-1.2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synergy/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Nov 2005 13:37:16 -0000	1.7
+++ sources	21 Dec 2005 10:51:24 -0000	1.8
@@ -1 +1 @@
-cf1b981acd317c003357f4ecba42448b  synergy-1.2.5.tar.gz
+da9effc847d13f9725b6db043d8283a5  synergy-1.2.7.tar.gz


Index: synergy.spec
===================================================================
RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- synergy.spec	7 Nov 2005 13:37:16 -0000	1.11
+++ synergy.spec	21 Dec 2005 10:51:24 -0000	1.12
@@ -1,14 +1,20 @@
 Summary: Mouse and keyboard sharing utility
 Name: synergy
-Version: 1.2.5
+Version: 1.2.7
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://synergy2.sourceforge.net/
-Source: http://dl.sf.net/synergy2/%{name}-%{version}.tar.gz
+Source: http://dl.sf.net/synergy2/synergy-%{version}.tar.gz
 Patch: synergy-1.2.2-werror.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, xorg-x11-devel, autoconf
+BuildRequires: gcc-c++, autoconf, automake
+%if "%{fedora}" >= "5"
+BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel
+BuildRequires: libXinerama-devel
+%else
+BuildRequires: xorg-x11-devel
+%endif
 
 %description
 Synergy lets you easily share a single mouse and keyboard between
@@ -48,6 +54,11 @@
 
 
 %changelog
+* Tue Dec 20 2005 Matthias Saou  1.2.7-1
+- Update to 1.2.7.
+- Add automake build requirement (to get aclocal).
+- For %%{fedora} >= 5, buildrequire modular X packages.
+
 * Mon Nov  7 2005 Matthias Saou  1.2.5-1
 - Update to 1.2.5, -Werror patch still required.
 



From fedora-extras-commits at redhat.com  Wed Dec 21 11:08:08 2005
From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost))
Date: Wed, 21 Dec 2005 06:08:08 -0500
Subject: rpms/fpc/devel .cvsignore, 1.4, 1.5 fpc.spec, 1.4, 1.5 sources, 1.5,
	1.6 fpc-2.0.0-G5.patch, 1.1, NONE
Message-ID: <200512211108.jBLB8eDN020819@cvs-int.fedora.redhat.com>

Author: joost

Update of /cvs/extras/rpms/fpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20798

Modified Files:
	.cvsignore fpc.spec sources 
Removed Files:
	fpc-2.0.0-G5.patch 
Log Message:
* Tue Dec 20 2005 Joost van der Sluis  2.0.2-1
- Updated to version 2.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fpc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Aug 2005 15:55:24 -0000	1.4
+++ .cvsignore	21 Dec 2005 11:07:45 -0000	1.5
@@ -1,2 +1 @@
-fpc-2.0.0.compiler.bin.tar.gz
-fpc-2.0.0.source.tar.gz
+fpcbuild-2.0.2.tar.bz2


Index: fpc.spec
===================================================================
RCS file: /cvs/extras/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fpc.spec	17 Aug 2005 16:33:51 -0000	1.4
+++ fpc.spec	21 Dec 2005 11:07:45 -0000	1.5
@@ -1,18 +1,17 @@
 Name:           fpc
-Version:        2.0.0
-Release:        4%{?dist}
+Version:        2.0.2
+Release:        1%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
 License:        GPL and modified LGPL
 URL:            http://www.freepascal.org/
-Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}-%{version}.source.tar.gz
-Source1:        http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
+Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}build-%{version}.tar.bz2
 Patch0:         %{name}-%{version}-G5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	gpm, glibc, ncurses, binutils
-BuildRequires:  tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
+BuildRequires:  fpc, tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
 
 %description
 
@@ -54,20 +53,12 @@
 %endif
 
 %prep
-%setup -q -a1 -n %{name}
+%setup -q -n %{name}-src-%{version}
 %patch0 
 
 %build
-# The source-files:
-mkdir -p fpcsrc
-cp -a rtl fpcsrc
-cp -a fcl fpcsrc
-cp -a packages fpcsrc
-rm -rf fpcsrc/packages/extra/amunits
-rm -rf fpcsrc/packages/extra/winunits
-find fpcsrc -name .cvsignore -exec rm '{}' ';'
-
-STARTPP=`pwd`/startcompiler/%{ppcname}
+cd fpcsrc
+STARTPP=%{ppcname}
 NEWPP=`pwd`/compiler/%{ppcname}
 NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
 DATA2INC=`pwd`/utils/data2inc
@@ -79,9 +70,10 @@
 make packages_extra_smart FPC=${NEWPP}
 make ide_all FPC=${NEWPP}
 make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC}
+cd ..
 export save_size=40000
 export pool_size=1250000
-make -C docs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
+make -C fpcdocs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
 
 # disable the debuginfo package
 %define debug_package %{nil}
@@ -89,6 +81,7 @@
 
 %install
 rm -rf %{buildroot}
+cd fpcsrc
 FPCMAKE=`pwd`/utils/fpcm/fpcmake
 NEWPP=`pwd`/compiler/%{ppcname}
 INSTALLOPTS="FPC=${NEWPP} FPCMAKE=${FPCMAKE} \
@@ -106,23 +99,28 @@
 make fv_distinstall ${INSTALLOPTS}
 make ide_distinstall ${INSTALLOPTS}
 make utils_distinstall ${INSTALLOPTS}
-
-make doc_install ${INSTALLOPTS}
-make -C docs pdfinstall ${INSTALLOPTS}
-make man_install ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir}
+cd ../install
+make -C doc ${INSTALLOPTS}
+make -C man ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir}
+cd ..
+make -C fpcdocs pdfinstall ${INSTALLOPTS}
 
 # create link
 ln -sf ../%{_lib}/%{name}/%{version}/%{ppcname} %{buildroot}%{_bindir}/%{ppcname}
 
-# Include the COPYING-information in the documentation
-cp -a compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
-cp -a rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
-cp -a fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl
-cp -a rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
+# Include the COPYING-information for the fcl/rtl in the documentation
+cp -a fpcsrc/compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
+cp -a fpcsrc/rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
+cp -a fpcsrc/fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl
+cp -a fpcsrc/rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
 
 # The source-files:
 mkdir -p %{buildroot}%{_datadir}/fpcsrc
-cp -a fpcsrc/* %{buildroot}%{_datadir}/fpcsrc/
+rm -rf fpcsrc/packages/extra/amunits
+rm -rf fpcsrc/packages/extra/winunits
+cp -a fpcsrc/rtl %{buildroot}%{_datadir}/fpcsrc
+cp -a fpcsrc/fcl %{buildroot}%{_datadir}/fpcsrc
+cp -a fpcsrc/packages %{buildroot}%{_datadir}/fpcsrc
 
 # Workaround:
 # newer rpm versions do not allow garbage
@@ -158,6 +156,9 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-1
+- Updated to version 2.0.2
+
 * Wed Aug 17 2005 Joost van der Sluis  2.0.0-4
 - Added %%{?dist} to release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fpc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Aug 2005 15:55:24 -0000	1.5
+++ sources	21 Dec 2005 11:07:45 -0000	1.6
@@ -1,2 +1 @@
-fd5730c59bb5a87e5828568b7d039cb5  fpc-2.0.0.compiler.bin.tar.gz
-3f9c64d0146a3631f6963fd7477776d1  fpc-2.0.0.source.tar.gz
+b88893bc005c4404197ae55ef3c0de30  fpcbuild-2.0.2.tar.bz2


--- fpc-2.0.0-G5.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 11:16:51 2005
From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost))
Date: Wed, 21 Dec 2005 06:16:51 -0500
Subject: rpms/fpc/devel fpc-2.0.2-G5.patch,NONE,1.1 fpc.spec,1.5,1.6
Message-ID: <200512211117.jBLBHNXL020935@cvs-int.fedora.redhat.com>

Author: joost

Update of /cvs/extras/rpms/fpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20915

Modified Files:
	fpc.spec 
Added Files:
	fpc-2.0.2-G5.patch 
Log Message:
* Tue Dec 20 2005 Joost van der Sluis  2.0.2-2
- Updated fpc-2.0.2-G5.patch


fpc-2.0.2-G5.patch:

--- NEW FILE fpc-2.0.2-G5.patch ---
Index: fpcsrc/rtl/powerpc/powerpc.inc
===================================================================
--- fpcsrc/rtl/powerpc/powerpc.inc	(revision 830)
+++ fpcsrc/rtl/powerpc/powerpc.inc	(working copy)
@@ -203,374 +203,7 @@
 end;
 {$endif MACOS}
 
-{****************************************************************************
-                                Move / Fill
-****************************************************************************}
 
-{$ifndef FPC_SYSTEM_HAS_MOVE}
-{$define FPC_SYSTEM_HAS_MOVE}
-procedure Move(const source;var dest;count:longint);[public, alias: 'FPC_MOVE'];assembler; nostackframe;
-asm
-          {  count <= 0 ?  }
-          cmpwi   cr0,r5,0
-          {  check if we have to do the move backwards because of overlap  }
-          sub     r10,r4,r3
-          {  carry := boolean(dest-source < count) = boolean(overlap) }
-          subc    r10,r10,r5
-
-          {  count < 15 ? (to decide whether we will move dwords or bytes  }
-          cmpwi   cr1,r5,15
-
-          {  if overlap, then r10 := -1 else r10 := 0  }
-          subfe   r10,r10,r10
-
-          {  count < 63 ? (32 + max. alignment (31) }
-          cmpwi   cr7,r5,63
-
-          {  if count <= 0, stop  }
-          ble     cr0,.LMoveDone
-
-          {  load the begin of the source in the data cache }
-          dcbt    0,r3
-          { and the dest as well }
-          dcbtst  0,r4
-
-          {  if overlap, then r0 := count else r0 := 0  }
-          and     r0,r5,r10
-          {  if overlap, then point source and dest to the end  }
-          add     r3,r3,r0
-          add     r4,r4,r0
-          {  if overlap, then r6 := 0, else r6 := -1  }
-          not     r6,r10
-          {  if overlap, then r10 := -2, else r10 := 0  }
-          slwi    r10,r10,1
-          {  if overlap, then r10 := -1, else r10 := 1  }
-          addi    r10,r10,1
-
-          {  if count < 15, copy everything byte by byte  }
-          blt     cr1,.LMoveBytes
-
-          {  if no overlap, then source/dest += -1, otherwise they stay }
-          {  After the next instruction, r3/r4 + r10 = next position to }
-          {  load/store from/to                                         }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-          {  otherwise, guarantee 4 byte alignment for dest for starters  }
-.LMove4ByteAlignLoop:
-          lbzux   r0,r3,r10
-          stbux   r0,r4,r10
-          {  is dest now 4 aligned?  }
-          andi.   r0,r4,3
-          subi    r5,r5,1
-          {  while not aligned, continue  }
-          bne     cr0,.LMove4ByteAlignLoop
-
-{$ifndef ppc603}
-          { check for 32 byte alignment }
-          andi.   r7,r4,31
-{$endif non ppc603}
-          { we are going to copy one byte again (the one at the newly }
-          { aligned address), so increase count byte 1                }
-          addi    r5,r5,1
-          { count div 4 for number of dwords to copy }
-          srwi    r0,r5,2
-          {  if 11 <= count < 63, copy using dwords }
-          blt     cr7,.LMoveDWords
-
-{$ifndef ppc603}
-          { # of dwords to copy to reach 32 byte alignment (*4) }
-          { (depends on forward/backward copy)                  }
-
-          { if forward copy, r6 = -1 -> r8 := 32 }
-          { if backward copy, r6 = 0 -> r8 := 0  }
-          rlwinm  r8,r6,0,31-6+1,31-6+1
-          { if forward copy, we have to copy 32 - unaligned count bytes }
-          { if backward copy unaligned count bytes                      }
-          sub     r7,r8,r7
-          { if backward copy, the calculated value is now negate -> }
-          { make it positive again                                 }
-          not     r8, r6
-          add     r7, r7, r8
-          xor     r7, r7, r8
-{$endif not ppc603}
-
-          { multiply the update count with 4 }
-          slwi    r10,r10,2
-          slwi    r6,r6,2
-          { and adapt the source and dest }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-{$ifndef ppc603}
-          beq     cr0,.LMove32BytesAligned
-.L32BytesAlignMoveLoop:
-          {  count >= 39 -> align to 8 byte boundary and then use the FPU  }
-          {  since we're already at 4 byte alignment, use dword store      }
-          subic.  r7,r7,4
-          lwzux   r0,r3,r10
-          subi    r5,r5,4
-          stwux   r0,r4,r10
-          bne     .L32BytesAlignMoveLoop
-
-.LMove32BytesAligned:
-          { count div 32 ( >= 1, since count was >=63 }
-          srwi    r0,r5,5
-          { remainder }
-          andi.   r5,r5,31
-          { to decide if we will do some dword stores (instead of only }
-          { byte stores) afterwards or not                             }
-{$else not ppc603}
-          srwi    r0,r5,4
-          andi.   r5,r5,15
-{$endif not ppc603}
-          cmpwi   cr1,r5,11
-          mtctr   r0
-
-          {  r0 := count div 4, will be moved to ctr when copying dwords  }
-          srwi    r0,r5,2
-
-{$ifndef ppc603}
-          {  adjust the update count: it will now be 8 or -8 depending on overlap  }
-          slwi    r10,r10,1
-
-          {  adjust source and dest pointers: because of the above loop, dest is now   }
-          {  aligned to 8 bytes. So if we add r6 we will still have an 8 bytes         }
-          { aligned address)                                                           }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-          slwi    r6,r6,1
-
-          { the dcbz offset must give a 32 byte aligned address when added   }
-          { to the current dest address and its address must point to the    }
-          { bytes that will be overwritten in the current iteration. In case }
-          { of a forward loop, the dest address has currently an offset of   }
-          { -8 compared to the bytes that will be overwritten (and r6 = -8). }
-          { In case of a backward of a loop, the dest address currently has  }
-          { an offset of +32 compared to the bytes that will be overwritten  }
-          { (and r6 = 0). So the forward dcbz offset must become +8 and the  }
-          { backward -32 -> (-r6 * 5) - 32 gives the correct offset          }
-          slwi    r7,r6,2
-          add     r7,r7,r6
-          neg     r7,r7
-          subi    r7,r7,32
-
-.LMove32ByteDcbz:
-          lfdux   f0,r3,r10
-          lfdux   f1,r3,r10
-          lfdux   f2,r3,r10
-          lfdux   f3,r3,r10
-          { must be done only now, in case source and dest are less than }
-          { 32 bytes apart!                                              }
-          dcbz    r4,r7
-          stfdux  f0,r4,r10
-          stfdux  f1,r4,r10
-          stfdux  f2,r4,r10
-          stfdux  f3,r4,r10
-          bdnz    .LMove32ByteDcbz
-.LMove32ByteLoopDone:
-{$else not ppc603}
-.LMove16ByteLoop:
-          lwzux   r11,r3,r10
-          lwzux   r7,r3,r10
-          lwzux   r8,r3,r10
-          lwzux   r9,r3,r10
-          stwux   r11,r4,r10
-          stwux   r7,r4,r10
-          stwux   r8,r4,r10
-          stwux   r9,r4,r10
-          bdnz    .LMove16ByteLoop
-{$endif not ppc603}
-
-          { cr0*4+eq is true if "count and 31" = 0 }
-          beq     cr0,.LMoveDone
-
-          {  make r10 again -1 or 1, but first adjust source/dest pointers }
-          sub     r3,r3,r6
-          sub     r4,r4,r6
-{$ifndef ppc603}
-          srawi   r10,r10,3
-          srawi   r6,r6,3
-{$else not ppc603}
-          srawi   r10,r10,2
-          srawi   r6,r6,2
-{$endif not ppc603}
-
-          { cr1 contains whether count <= 11 }
-          ble     cr1,.LMoveBytes
-
-.LMoveDWords:
-          mtctr   r0
-          andi.   r5,r5,3
-          {  r10 * 4  }
-          slwi    r10,r10,2
-          slwi    r6,r6,2
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-.LMoveDWordsLoop:
-          lwzux   r0,r3,r10
-          stwux   r0,r4,r10
-          bdnz    .LMoveDWordsLoop
-
-          beq     cr0,.LMoveDone
-          {  make r10 again -1 or 1  }
-          sub     r3,r3,r6
-          sub     r4,r4,r6
-          srawi   r10,r10,2
-          srawi   r6,r6,2
-.LMoveBytes:
-          add     r3,r3,r6
-          add     r4,r4,r6
-          mtctr   r5
-.LMoveBytesLoop:
-          lbzux   r0,r3,r10
-          stbux   r0,r4,r10
-          bdnz    .LMoveBytesLoop
-.LMoveDone:
-end;
-{$endif FPC_SYSTEM_HAS_MOVE}
-
-
-{$ifndef FPC_SYSTEM_HAS_FILLCHAR}
-{$define FPC_SYSTEM_HAS_FILLCHAR}
-
-Procedure FillChar(var x;count:longint;value:byte);assembler;
-{ input: x in r3, count in r4, value in r5 }
-
-{$ifndef FPC_ABI_AIX}
-{ in the AIX ABI, we can use te red zone for temp storage, otherwise we have }
-{ to explicitely allocate room                                               }
-var
-  temp : packed record
-    case byte of
-      0: (l1,l2: longint);
-      1: (d: double);
-    end;
-{$endif FPC_ABI_AIX}
-asm
-        { no bytes? }
-        cmpwi     cr6,r4,0
-        { less than 15 bytes? }
-        cmpwi     cr7,r4,15
-        { less than 64 bytes? }
-        cmpwi     cr1,r4,64
-        { fill r5 with ValueValueValueValue }
-        rlwimi    r5,r5,8,16,23
-        { setup for aligning x to multiple of 4}
-        rlwinm    r10,r3,0,31-2+1,31
-        rlwimi    r5,r5,16,0,15
-        ble       cr6,.LFillCharDone
-        { get the start of the data in the cache (and mark it as "will be }
-        { modified")                                                      }
-        dcbtst    0,r3
-        subfic    r10,r10,4
-        blt       cr7,.LFillCharVerySmall
-        { just store 4 bytes instead of using a loop to align (there are }
-        { plenty of other instructions now to keep the processor busy    }
-        { while it handles the (possibly unaligned) store)               }
-        stw       r5,0(r3)
-        { r3 := align(r3,4) }
-        add       r3,r3,r10
-        { decrease count with number of bytes already stored }
-        sub       r4,r4,r10
-        blt       cr1,.LFillCharSmall
-        { if we have to fill with 0 (which happens a lot), we can simply use }
-        { dcbz for the most part, which is very fast, so make a special case }
-        { for that                                                           }
-        cmplwi    cr1,r5,0
-        { align to a multiple of 32 (and immediately check whether we aren't }
-        { already 32 byte aligned)                                           }
-        rlwinm.   r10,r3,0,31-5+1,31
-        { setup r3 for using update forms of store instructions }
-        subi      r3,r3,4
-        { get number of bytes to store }
-        subfic    r10,r10,32
-        { if already 32byte aligned, skip align loop }
-        beq       .L32ByteAlignLoopDone
-        { substract from the total count }
-        sub       r4,r4,r10
-.L32ByteAlignLoop:
-        { we were already aligned to 4 byres, so this will count down to }
-        { exactly 0                                                      }
-        subic.    r10,r10,4
-        stwu      r5,4(r3)
-        bne       .L32ByteAlignLoop
-.L32ByteAlignLoopDone:
-        { get the amount of 32 byte blocks }
-        srwi      r10,r4,5
-        { and keep the rest in r4 (recording whether there is any rest) }
-        rlwinm.   r4,r4,0,31-5+1,31
-        { move to ctr }
-        mtctr     r10
-        { check how many rest there is (to decide whether we'll use }
-        { FillCharSmall or FillCharVerySmall)                       }
-        cmplwi    cr7,r4,11
-        { if filling with zero, only use dcbz }
-        bne       cr1, .LFillCharNoZero
-        { make r3 point again to the actual store position }
-        addi      r3,r3,4
-.LFillCharDCBZLoop:
-        dcbz      0,r3
-        addi      r3,r3,32
-        bdnz      .LFillCharDCBZLoop
-        { if there was no rest, we're finished }
-        beq       .LFillCharDone
-        b         .LFillCharVerySmall
-.LFillCharNoZero:
-{$ifdef FPC_ABI_AIX}
-        stw       r5,-4(r1)
-        stw       r5,-8(r1)
-        lfd       f0,-8(r1)
-{$else FPC_ABI_AIX}
-        stw       r5,temp
-        stw       r5,temp+4
-        lfd       f0,temp
-{$endif FPC_ABI_AIX}
-        { make r3 point to address-8, so we're able to use fp double stores }
-        { with update (it's already -4 now)                                 }
-        subi      r3,r3,4
-        { load r10 with 8, so that dcbz uses the correct address }
-        li        r10, 8
-.LFillChar32ByteLoop:
-        dcbz      r3,r10
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        bdnz      .LFillChar32ByteLoop
-        { if there was no rest, we're finished }
-        beq       .LFillCharDone
-        { make r3 point again to the actual next byte that must be written }
-        addi      r3,r3,8
-        b         .LFillCharVerySmall
-.LFillCharSmall:
-        { when we arrive here, we're already 4 byte aligned }
-        { get count div 4 to store dwords }
-        srwi      r10,r4,2
-        { get ready for use of update stores }
-        subi      r3,r3,4
-        mtctr     r10
-        rlwinm.   r4,r4,0,31-2+1,31
-.LFillCharSmallLoop:
-        stwu      r5,4(r3)
-        bdnz      .LFillCharSmallLoop
-        { if nothing left, stop }
-        beq       .LFillCharDone
-        { get ready to store bytes }
-        addi      r3,r3,4
-.LFillCharVerySmall:
-        mtctr     r4
-        subi      r3,r3,1
-.LFillCharVerySmallLoop:
-        stbu      r5,1(r3)
-        bdnz      .LFillCharVerySmallLoop
-.LFillCharDone:
-end;
-{$endif FPC_SYSTEM_HAS_FILLCHAR}
-
-
 {$ifndef FPC_SYSTEM_HAS_FILLDWORD}
 {$define FPC_SYSTEM_HAS_FILLDWORD}
 procedure filldword(var x;count : longint;value : dword);


Index: fpc.spec
===================================================================
RCS file: /cvs/extras/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fpc.spec	21 Dec 2005 11:07:45 -0000	1.5
+++ fpc.spec	21 Dec 2005 11:16:51 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           fpc
 Version:        2.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
@@ -156,6 +156,9 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-2
+- Updated fpc-2.0.2-G5.patch
+
 * Tue Dec 20 2005 Joost van der Sluis  2.0.2-1
 - Updated to version 2.0.2
 



From fedora-extras-commits at redhat.com  Wed Dec 21 11:23:20 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 21 Dec 2005 06:23:20 -0500
Subject: rpms/synergy/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 synergy.spec, 1.11, 1.12
Message-ID: <200512211123.jBLBNqKD021004@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/synergy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20979

Modified Files:
	.cvsignore sources synergy.spec 
Log Message:
Update to 1.2.7, now use modular X build requirements for FC >= 5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synergy/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Nov 2005 13:36:48 -0000	1.7
+++ .cvsignore	21 Dec 2005 11:23:20 -0000	1.8
@@ -1 +1 @@
-synergy-1.2.5.tar.gz
+synergy-1.2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synergy/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Nov 2005 13:36:48 -0000	1.7
+++ sources	21 Dec 2005 11:23:20 -0000	1.8
@@ -1 +1 @@
-cf1b981acd317c003357f4ecba42448b  synergy-1.2.5.tar.gz
+da9effc847d13f9725b6db043d8283a5  synergy-1.2.7.tar.gz


Index: synergy.spec
===================================================================
RCS file: /cvs/extras/rpms/synergy/FC-4/synergy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- synergy.spec	7 Nov 2005 13:36:48 -0000	1.11
+++ synergy.spec	21 Dec 2005 11:23:20 -0000	1.12
@@ -1,14 +1,20 @@
 Summary: Mouse and keyboard sharing utility
 Name: synergy
-Version: 1.2.5
+Version: 1.2.7
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://synergy2.sourceforge.net/
-Source: http://dl.sf.net/synergy2/%{name}-%{version}.tar.gz
+Source: http://dl.sf.net/synergy2/synergy-%{version}.tar.gz
 Patch: synergy-1.2.2-werror.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, xorg-x11-devel, autoconf
+BuildRequires: gcc-c++, autoconf, automake
+%if "%{fedora}" >= "5"
+BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel
+BuildRequires: libXinerama-devel
+%else
+BuildRequires: xorg-x11-devel
+%endif
 
 %description
 Synergy lets you easily share a single mouse and keyboard between
@@ -48,6 +54,11 @@
 
 
 %changelog
+* Tue Dec 20 2005 Matthias Saou  1.2.7-1
+- Update to 1.2.7.
+- Add automake build requirement (to get aclocal).
+- For %%{fedora} >= 5, buildrequire modular X packages.
+
 * Mon Nov  7 2005 Matthias Saou  1.2.5-1
 - Update to 1.2.5, -Werror patch still required.
 



From fedora-extras-commits at redhat.com  Wed Dec 21 12:00:57 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Wed, 21 Dec 2005 07:00:57 -0500
Subject: rpms/digikam/FC-3 .cvsignore, 1.4, 1.5 digikam.spec, 1.5,
	1.6 sources, 1.4, 1.5 digikam-0.7.4-64bit-typo.patch, 1.3, NONE
Message-ID: <200512211201.jBLC1T6K022754@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21150

Modified Files:
	.cvsignore digikam.spec sources 
Removed Files:
	digikam-0.7.4-64bit-typo.patch 
Log Message:
- Revert to digikam-0_8_0-1_fc3 (SQLite >= 3.0.0 appeared in FE3)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Dec 2005 16:25:00 -0000	1.4
+++ .cvsignore	21 Dec 2005 12:00:56 -0000	1.5
@@ -1 +1,2 @@
 digikam-0.7.4.tar.bz2
+digikam-0.8.0.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/digikam.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- digikam.spec	1 Dec 2005 16:25:00 -0000	1.5
+++ digikam.spec	21 Dec 2005 12:00:56 -0000	1.6
@@ -1,17 +1,16 @@
 Name:		digikam
-Version:	0.7.4
-Release:	4%{?dist}
+Version:	0.8.0
+Release:	1%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		digikam-0.7.4-64bit-typo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel gdbm-devel >= 1.8.0
-BuildRequires:	libkexif-devel >= 0.2 libkipi-devel >= 0.1 desktop-file-utils
+BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
+BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
 BuildRequires:	gettext
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -24,7 +23,8 @@
 digital camera, preview the images and download and/or delete them.
 
 digiKam buildin image editor makes the common photo correction a simple task.
-The image editor is extensible via plugins.
+The image editor is extensible via plugins, install the digikamimageplugins
+and/or kipi-plugins packages to use them.
 
 %package devel
 Summary:	Development files for %{name}
@@ -37,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b 64bit-typo.patch
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -95,7 +94,7 @@
 
 %files -f %name.lang
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING HACKING README
+%doc AUTHORS ChangeLog COPYING HACKING README TODO
 %{_bindir}/*
 %{_libdir}/libdigikam.so.*
 %{_libdir}/kde3/digikamimageplugin_core.la
@@ -116,6 +115,11 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Exclude libdigikam.la (bug #171503)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Dec 2005 16:25:00 -0000	1.4
+++ sources	21 Dec 2005 12:00:56 -0000	1.5
@@ -1 +1 @@
-3df53700ff78caca60cab4ea4116c7c5  digikam-0.7.4.tar.bz2
+9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2


--- digikam-0.7.4-64bit-typo.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 13:19:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 21 Dec 2005 08:19:55 -0500
Subject: rpms/wxPython/devel Makefile,1.3,1.4
Message-ID: <200512211320.jBLDKRe2024629@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/wxPython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24612

Added Files:
	Makefile 
Log Message:
re-enable wxPython component in CVS


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	21 Dec 2005 13:19:54 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: wxPython
+# $Id$
+NAME := wxPython
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)



From fedora-extras-commits at redhat.com  Wed Dec 21 14:14:21 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 09:14:21 -0500
Subject: rpms/nethack-vultures/devel .cvsignore,1.3,1.4
Message-ID: <200512211415.jBLEFDe6026591@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26563

Modified Files:
	.cvsignore 
Log Message:
Syncing so that make tag will work right.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Dec 2005 18:33:06 -0000	1.3
+++ .cvsignore	21 Dec 2005 14:14:21 -0000	1.4
@@ -1 +1,2 @@
 vultures-1.11.0-full.tar.bz2
+vultures-1.11.1-full.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 21 14:41:57 2005
From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost))
Date: Wed, 21 Dec 2005 09:41:57 -0500
Subject: rpms/fpc/devel fpc.spec,1.6,1.7
Message-ID: <200512211442.jBLEgTil026792@cvs-int.fedora.redhat.com>

Author: joost

Update of /cvs/extras/rpms/fpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26773

Modified Files:
	fpc.spec 
Log Message:
* Tue Dec 20 2005 Joost van der Sluis  2.0.2-3
- Disabled smart-linking for ppc



Index: fpc.spec
===================================================================
RCS file: /cvs/extras/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fpc.spec	21 Dec 2005 11:16:51 -0000	1.6
+++ fpc.spec	21 Dec 2005 14:41:57 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           fpc
 Version:        2.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
@@ -44,11 +44,14 @@
 
 %ifarch ppc
 %define ppcname ppcppc
+%define smart _all 
 %else
 %ifarch x86_64
 %define ppcname ppcx64
+%define smart _smart
 %else
 %define ppcname ppc386
+%define smart _smart
 %endif
 %endif
 
@@ -63,11 +66,11 @@
 NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
 DATA2INC=`pwd`/utils/data2inc
 make compiler_cycle FPC=${STARTPP}
-make rtl_clean rtl_smart FPC=${NEWPP}
-make packages_base_smart FPC=${NEWPP}
-make fcl_smart FPC=${NEWPP}
-make fv_smart FPC=${NEWPP}
-make packages_extra_smart FPC=${NEWPP}
+make rtl_clean rtl%{smart} FPC=${NEWPP}
+make packages_base%{smart} FPC=${NEWPP}
+make fcl%{smart} FPC=${NEWPP}
+make fv%{smart} FPC=${NEWPP}
+make packages_extra%{smart} FPC=${NEWPP}
 make ide_all FPC=${NEWPP}
 make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC}
 cd ..
@@ -156,6 +159,9 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-3
+- Disabled smart-linking for ppc
+
 * Tue Dec 20 2005 Joost van der Sluis  2.0.2-2
 - Updated fpc-2.0.2-G5.patch
 



From fedora-extras-commits at redhat.com  Wed Dec 21 15:09:39 2005
From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost))
Date: Wed, 21 Dec 2005 10:09:39 -0500
Subject: rpms/fpc/FC-3 fpc-2.0.2-G5.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 fpc.spec, 1.3, 1.4 sources, 1.3, 1.4 fpc-2.0.0-G5.patch, 1.1, NONE
Message-ID: <200512211510.jBLFAB7o028529@cvs-int.fedora.redhat.com>

Author: joost

Update of /cvs/extras/rpms/fpc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28505

Modified Files:
	.cvsignore fpc.spec sources 
Added Files:
	fpc-2.0.2-G5.patch 
Removed Files:
	fpc-2.0.0-G5.patch 
Log Message:
* Tue Dec 20 2005 Joost van der Sluis  2.0.2-3
- Disabled smart-linking for ppc

* Tue Dec 20 2005 Joost van der Sluis  2.0.2-1
- Updated to version 2.0.2


fpc-2.0.2-G5.patch:

--- NEW FILE fpc-2.0.2-G5.patch ---
Index: fpcsrc/rtl/powerpc/powerpc.inc
===================================================================
--- fpcsrc/rtl/powerpc/powerpc.inc	(revision 830)
+++ fpcsrc/rtl/powerpc/powerpc.inc	(working copy)
@@ -203,374 +203,7 @@
 end;
 {$endif MACOS}
 
-{****************************************************************************
-                                Move / Fill
-****************************************************************************}
 
-{$ifndef FPC_SYSTEM_HAS_MOVE}
-{$define FPC_SYSTEM_HAS_MOVE}
-procedure Move(const source;var dest;count:longint);[public, alias: 'FPC_MOVE'];assembler; nostackframe;
-asm
-          {  count <= 0 ?  }
-          cmpwi   cr0,r5,0
-          {  check if we have to do the move backwards because of overlap  }
-          sub     r10,r4,r3
-          {  carry := boolean(dest-source < count) = boolean(overlap) }
-          subc    r10,r10,r5
-
-          {  count < 15 ? (to decide whether we will move dwords or bytes  }
-          cmpwi   cr1,r5,15
-
-          {  if overlap, then r10 := -1 else r10 := 0  }
-          subfe   r10,r10,r10
-
-          {  count < 63 ? (32 + max. alignment (31) }
-          cmpwi   cr7,r5,63
-
-          {  if count <= 0, stop  }
-          ble     cr0,.LMoveDone
-
-          {  load the begin of the source in the data cache }
-          dcbt    0,r3
-          { and the dest as well }
-          dcbtst  0,r4
-
-          {  if overlap, then r0 := count else r0 := 0  }
-          and     r0,r5,r10
-          {  if overlap, then point source and dest to the end  }
-          add     r3,r3,r0
-          add     r4,r4,r0
-          {  if overlap, then r6 := 0, else r6 := -1  }
-          not     r6,r10
-          {  if overlap, then r10 := -2, else r10 := 0  }
-          slwi    r10,r10,1
-          {  if overlap, then r10 := -1, else r10 := 1  }
-          addi    r10,r10,1
-
-          {  if count < 15, copy everything byte by byte  }
-          blt     cr1,.LMoveBytes
-
-          {  if no overlap, then source/dest += -1, otherwise they stay }
-          {  After the next instruction, r3/r4 + r10 = next position to }
-          {  load/store from/to                                         }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-          {  otherwise, guarantee 4 byte alignment for dest for starters  }
-.LMove4ByteAlignLoop:
-          lbzux   r0,r3,r10
-          stbux   r0,r4,r10
-          {  is dest now 4 aligned?  }
-          andi.   r0,r4,3
-          subi    r5,r5,1
-          {  while not aligned, continue  }
-          bne     cr0,.LMove4ByteAlignLoop
-
-{$ifndef ppc603}
-          { check for 32 byte alignment }
-          andi.   r7,r4,31
-{$endif non ppc603}
-          { we are going to copy one byte again (the one at the newly }
-          { aligned address), so increase count byte 1                }
-          addi    r5,r5,1
-          { count div 4 for number of dwords to copy }
-          srwi    r0,r5,2
-          {  if 11 <= count < 63, copy using dwords }
-          blt     cr7,.LMoveDWords
-
-{$ifndef ppc603}
-          { # of dwords to copy to reach 32 byte alignment (*4) }
-          { (depends on forward/backward copy)                  }
-
-          { if forward copy, r6 = -1 -> r8 := 32 }
-          { if backward copy, r6 = 0 -> r8 := 0  }
-          rlwinm  r8,r6,0,31-6+1,31-6+1
-          { if forward copy, we have to copy 32 - unaligned count bytes }
-          { if backward copy unaligned count bytes                      }
-          sub     r7,r8,r7
-          { if backward copy, the calculated value is now negate -> }
-          { make it positive again                                 }
-          not     r8, r6
-          add     r7, r7, r8
-          xor     r7, r7, r8
-{$endif not ppc603}
-
-          { multiply the update count with 4 }
-          slwi    r10,r10,2
-          slwi    r6,r6,2
-          { and adapt the source and dest }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-{$ifndef ppc603}
-          beq     cr0,.LMove32BytesAligned
-.L32BytesAlignMoveLoop:
-          {  count >= 39 -> align to 8 byte boundary and then use the FPU  }
-          {  since we're already at 4 byte alignment, use dword store      }
-          subic.  r7,r7,4
-          lwzux   r0,r3,r10
-          subi    r5,r5,4
-          stwux   r0,r4,r10
-          bne     .L32BytesAlignMoveLoop
-
-.LMove32BytesAligned:
-          { count div 32 ( >= 1, since count was >=63 }
-          srwi    r0,r5,5
-          { remainder }
-          andi.   r5,r5,31
-          { to decide if we will do some dword stores (instead of only }
-          { byte stores) afterwards or not                             }
-{$else not ppc603}
-          srwi    r0,r5,4
-          andi.   r5,r5,15
-{$endif not ppc603}
-          cmpwi   cr1,r5,11
-          mtctr   r0
-
-          {  r0 := count div 4, will be moved to ctr when copying dwords  }
-          srwi    r0,r5,2
-
-{$ifndef ppc603}
-          {  adjust the update count: it will now be 8 or -8 depending on overlap  }
-          slwi    r10,r10,1
-
-          {  adjust source and dest pointers: because of the above loop, dest is now   }
-          {  aligned to 8 bytes. So if we add r6 we will still have an 8 bytes         }
-          { aligned address)                                                           }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-          slwi    r6,r6,1
-
-          { the dcbz offset must give a 32 byte aligned address when added   }
-          { to the current dest address and its address must point to the    }
-          { bytes that will be overwritten in the current iteration. In case }
-          { of a forward loop, the dest address has currently an offset of   }
-          { -8 compared to the bytes that will be overwritten (and r6 = -8). }
-          { In case of a backward of a loop, the dest address currently has  }
-          { an offset of +32 compared to the bytes that will be overwritten  }
-          { (and r6 = 0). So the forward dcbz offset must become +8 and the  }
-          { backward -32 -> (-r6 * 5) - 32 gives the correct offset          }
-          slwi    r7,r6,2
-          add     r7,r7,r6
-          neg     r7,r7
-          subi    r7,r7,32
-
-.LMove32ByteDcbz:
-          lfdux   f0,r3,r10
-          lfdux   f1,r3,r10
-          lfdux   f2,r3,r10
-          lfdux   f3,r3,r10
-          { must be done only now, in case source and dest are less than }
-          { 32 bytes apart!                                              }
-          dcbz    r4,r7
-          stfdux  f0,r4,r10
-          stfdux  f1,r4,r10
-          stfdux  f2,r4,r10
-          stfdux  f3,r4,r10
-          bdnz    .LMove32ByteDcbz
-.LMove32ByteLoopDone:
-{$else not ppc603}
-.LMove16ByteLoop:
-          lwzux   r11,r3,r10
-          lwzux   r7,r3,r10
-          lwzux   r8,r3,r10
-          lwzux   r9,r3,r10
-          stwux   r11,r4,r10
-          stwux   r7,r4,r10
-          stwux   r8,r4,r10
-          stwux   r9,r4,r10
-          bdnz    .LMove16ByteLoop
-{$endif not ppc603}
-
-          { cr0*4+eq is true if "count and 31" = 0 }
-          beq     cr0,.LMoveDone
-
-          {  make r10 again -1 or 1, but first adjust source/dest pointers }
-          sub     r3,r3,r6
-          sub     r4,r4,r6
-{$ifndef ppc603}
-          srawi   r10,r10,3
-          srawi   r6,r6,3
-{$else not ppc603}
-          srawi   r10,r10,2
-          srawi   r6,r6,2
-{$endif not ppc603}
-
-          { cr1 contains whether count <= 11 }
-          ble     cr1,.LMoveBytes
-
-.LMoveDWords:
-          mtctr   r0
-          andi.   r5,r5,3
-          {  r10 * 4  }
-          slwi    r10,r10,2
-          slwi    r6,r6,2
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-.LMoveDWordsLoop:
-          lwzux   r0,r3,r10
-          stwux   r0,r4,r10
-          bdnz    .LMoveDWordsLoop
-
-          beq     cr0,.LMoveDone
-          {  make r10 again -1 or 1  }
-          sub     r3,r3,r6
-          sub     r4,r4,r6
-          srawi   r10,r10,2
-          srawi   r6,r6,2
-.LMoveBytes:
-          add     r3,r3,r6
-          add     r4,r4,r6
-          mtctr   r5
-.LMoveBytesLoop:
-          lbzux   r0,r3,r10
-          stbux   r0,r4,r10
-          bdnz    .LMoveBytesLoop
-.LMoveDone:
-end;
-{$endif FPC_SYSTEM_HAS_MOVE}
-
-
-{$ifndef FPC_SYSTEM_HAS_FILLCHAR}
-{$define FPC_SYSTEM_HAS_FILLCHAR}
-
-Procedure FillChar(var x;count:longint;value:byte);assembler;
-{ input: x in r3, count in r4, value in r5 }
-
-{$ifndef FPC_ABI_AIX}
-{ in the AIX ABI, we can use te red zone for temp storage, otherwise we have }
-{ to explicitely allocate room                                               }
-var
-  temp : packed record
-    case byte of
-      0: (l1,l2: longint);
-      1: (d: double);
-    end;
-{$endif FPC_ABI_AIX}
-asm
-        { no bytes? }
-        cmpwi     cr6,r4,0
-        { less than 15 bytes? }
-        cmpwi     cr7,r4,15
-        { less than 64 bytes? }
-        cmpwi     cr1,r4,64
-        { fill r5 with ValueValueValueValue }
-        rlwimi    r5,r5,8,16,23
-        { setup for aligning x to multiple of 4}
-        rlwinm    r10,r3,0,31-2+1,31
-        rlwimi    r5,r5,16,0,15
-        ble       cr6,.LFillCharDone
-        { get the start of the data in the cache (and mark it as "will be }
-        { modified")                                                      }
-        dcbtst    0,r3
-        subfic    r10,r10,4
-        blt       cr7,.LFillCharVerySmall
-        { just store 4 bytes instead of using a loop to align (there are }
-        { plenty of other instructions now to keep the processor busy    }
-        { while it handles the (possibly unaligned) store)               }
-        stw       r5,0(r3)
-        { r3 := align(r3,4) }
-        add       r3,r3,r10
-        { decrease count with number of bytes already stored }
-        sub       r4,r4,r10
-        blt       cr1,.LFillCharSmall
-        { if we have to fill with 0 (which happens a lot), we can simply use }
-        { dcbz for the most part, which is very fast, so make a special case }
-        { for that                                                           }
-        cmplwi    cr1,r5,0
-        { align to a multiple of 32 (and immediately check whether we aren't }
-        { already 32 byte aligned)                                           }
-        rlwinm.   r10,r3,0,31-5+1,31
-        { setup r3 for using update forms of store instructions }
-        subi      r3,r3,4
-        { get number of bytes to store }
-        subfic    r10,r10,32
-        { if already 32byte aligned, skip align loop }
-        beq       .L32ByteAlignLoopDone
-        { substract from the total count }
-        sub       r4,r4,r10
-.L32ByteAlignLoop:
-        { we were already aligned to 4 byres, so this will count down to }
-        { exactly 0                                                      }
-        subic.    r10,r10,4
-        stwu      r5,4(r3)
-        bne       .L32ByteAlignLoop
-.L32ByteAlignLoopDone:
-        { get the amount of 32 byte blocks }
-        srwi      r10,r4,5
-        { and keep the rest in r4 (recording whether there is any rest) }
-        rlwinm.   r4,r4,0,31-5+1,31
-        { move to ctr }
-        mtctr     r10
-        { check how many rest there is (to decide whether we'll use }
-        { FillCharSmall or FillCharVerySmall)                       }
-        cmplwi    cr7,r4,11
-        { if filling with zero, only use dcbz }
-        bne       cr1, .LFillCharNoZero
-        { make r3 point again to the actual store position }
-        addi      r3,r3,4
-.LFillCharDCBZLoop:
-        dcbz      0,r3
-        addi      r3,r3,32
-        bdnz      .LFillCharDCBZLoop
-        { if there was no rest, we're finished }
-        beq       .LFillCharDone
-        b         .LFillCharVerySmall
-.LFillCharNoZero:
-{$ifdef FPC_ABI_AIX}
-        stw       r5,-4(r1)
-        stw       r5,-8(r1)
-        lfd       f0,-8(r1)
-{$else FPC_ABI_AIX}
-        stw       r5,temp
-        stw       r5,temp+4
-        lfd       f0,temp
-{$endif FPC_ABI_AIX}
-        { make r3 point to address-8, so we're able to use fp double stores }
-        { with update (it's already -4 now)                                 }
-        subi      r3,r3,4
-        { load r10 with 8, so that dcbz uses the correct address }
-        li        r10, 8
-.LFillChar32ByteLoop:
-        dcbz      r3,r10
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        bdnz      .LFillChar32ByteLoop
-        { if there was no rest, we're finished }
-        beq       .LFillCharDone
-        { make r3 point again to the actual next byte that must be written }
-        addi      r3,r3,8
-        b         .LFillCharVerySmall
-.LFillCharSmall:
-        { when we arrive here, we're already 4 byte aligned }
-        { get count div 4 to store dwords }
-        srwi      r10,r4,2
-        { get ready for use of update stores }
-        subi      r3,r3,4
-        mtctr     r10
-        rlwinm.   r4,r4,0,31-2+1,31
-.LFillCharSmallLoop:
-        stwu      r5,4(r3)
-        bdnz      .LFillCharSmallLoop
-        { if nothing left, stop }
-        beq       .LFillCharDone
-        { get ready to store bytes }
-        addi      r3,r3,4
-.LFillCharVerySmall:
-        mtctr     r4
-        subi      r3,r3,1
-.LFillCharVerySmallLoop:
-        stbu      r5,1(r3)
-        bdnz      .LFillCharVerySmallLoop
-.LFillCharDone:
-end;
-{$endif FPC_SYSTEM_HAS_FILLCHAR}
-
-
 {$ifndef FPC_SYSTEM_HAS_FILLDWORD}
 {$define FPC_SYSTEM_HAS_FILLDWORD}
 procedure filldword(var x;count : longint;value : dword);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fpc/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2005 15:15:37 -0000	1.2
+++ .cvsignore	21 Dec 2005 15:09:39 -0000	1.3
@@ -1,2 +1 @@
-fpc-2.0.0.compiler.bin.tar.gz
-fpc-2.0.0.source.tar.gz
+fpcbuild-2.0.2.tar.bz2


Index: fpc.spec
===================================================================
RCS file: /cvs/extras/rpms/fpc/FC-3/fpc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fpc.spec	17 Aug 2005 16:33:50 -0000	1.3
+++ fpc.spec	21 Dec 2005 15:09:39 -0000	1.4
@@ -1,18 +1,17 @@
 Name:           fpc
-Version:        2.0.0
-Release:        4%{?dist}
+Version:        2.0.2
+Release:        3%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
 License:        GPL and modified LGPL
 URL:            http://www.freepascal.org/
-Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}-%{version}.source.tar.gz
-Source1:        http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
+Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}build-%{version}.tar.bz2
 Patch0:         %{name}-%{version}-G5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	gpm, glibc, ncurses, binutils
-BuildRequires:  tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
+BuildRequires:  fpc, tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
 
 %description
 
@@ -45,43 +44,39 @@
 
 %ifarch ppc
 %define ppcname ppcppc
+%define smart _all 
 %else
 %ifarch x86_64
 %define ppcname ppcx64
+%define smart _smart
 %else
 %define ppcname ppc386
+%define smart _smart
 %endif
 %endif
 
 %prep
-%setup -q -a1 -n %{name}
+%setup -q -n %{name}-src-%{version}
 %patch0 
 
 %build
-# The source-files:
-mkdir -p fpcsrc
-cp -a rtl fpcsrc
-cp -a fcl fpcsrc
-cp -a packages fpcsrc
-rm -rf fpcsrc/packages/extra/amunits
-rm -rf fpcsrc/packages/extra/winunits
-find fpcsrc -name .cvsignore -exec rm '{}' ';'
-
-STARTPP=`pwd`/startcompiler/%{ppcname}
+cd fpcsrc
+STARTPP=%{ppcname}
 NEWPP=`pwd`/compiler/%{ppcname}
 NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
 DATA2INC=`pwd`/utils/data2inc
 make compiler_cycle FPC=${STARTPP}
-make rtl_clean rtl_smart FPC=${NEWPP}
-make packages_base_smart FPC=${NEWPP}
-make fcl_smart FPC=${NEWPP}
-make fv_smart FPC=${NEWPP}
-make packages_extra_smart FPC=${NEWPP}
+make rtl_clean rtl%{smart} FPC=${NEWPP}
+make packages_base%{smart} FPC=${NEWPP}
+make fcl%{smart} FPC=${NEWPP}
+make fv%{smart} FPC=${NEWPP}
+make packages_extra%{smart} FPC=${NEWPP}
 make ide_all FPC=${NEWPP}
 make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC}
+cd ..
 export save_size=40000
 export pool_size=1250000
-make -C docs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
+make -C fpcdocs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
 
 # disable the debuginfo package
 %define debug_package %{nil}
@@ -89,6 +84,7 @@
 
 %install
 rm -rf %{buildroot}
+cd fpcsrc
 FPCMAKE=`pwd`/utils/fpcm/fpcmake
 NEWPP=`pwd`/compiler/%{ppcname}
 INSTALLOPTS="FPC=${NEWPP} FPCMAKE=${FPCMAKE} \
@@ -106,23 +102,28 @@
 make fv_distinstall ${INSTALLOPTS}
 make ide_distinstall ${INSTALLOPTS}
 make utils_distinstall ${INSTALLOPTS}
-
-make doc_install ${INSTALLOPTS}
-make -C docs pdfinstall ${INSTALLOPTS}
-make man_install ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir}
+cd ../install
+make -C doc ${INSTALLOPTS}
+make -C man ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir}
+cd ..
+make -C fpcdocs pdfinstall ${INSTALLOPTS}
 
 # create link
 ln -sf ../%{_lib}/%{name}/%{version}/%{ppcname} %{buildroot}%{_bindir}/%{ppcname}
 
-# Include the COPYING-information in the documentation
-cp -a compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
-cp -a rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
-cp -a fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl
-cp -a rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
+# Include the COPYING-information for the fcl/rtl in the documentation
+cp -a fpcsrc/compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
+cp -a fpcsrc/rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
+cp -a fpcsrc/fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl
+cp -a fpcsrc/rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
 
 # The source-files:
 mkdir -p %{buildroot}%{_datadir}/fpcsrc
-cp -a fpcsrc/* %{buildroot}%{_datadir}/fpcsrc/
+rm -rf fpcsrc/packages/extra/amunits
+rm -rf fpcsrc/packages/extra/winunits
+cp -a fpcsrc/rtl %{buildroot}%{_datadir}/fpcsrc
+cp -a fpcsrc/fcl %{buildroot}%{_datadir}/fpcsrc
+cp -a fpcsrc/packages %{buildroot}%{_datadir}/fpcsrc
 
 # Workaround:
 # newer rpm versions do not allow garbage
@@ -158,6 +159,15 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-3
+- Disabled smart-linking for ppc
+
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-2
+- Updated fpc-2.0.2-G5.patch
+
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-1
+- Updated to version 2.0.2
+
 * Wed Aug 17 2005 Joost van der Sluis  2.0.0-4
 - Added %%{?dist} to release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fpc/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Aug 2005 15:55:19 -0000	1.3
+++ sources	21 Dec 2005 15:09:39 -0000	1.4
@@ -1,2 +1 @@
-fd5730c59bb5a87e5828568b7d039cb5  fpc-2.0.0.compiler.bin.tar.gz
-3f9c64d0146a3631f6963fd7477776d1  fpc-2.0.0.source.tar.gz
+b88893bc005c4404197ae55ef3c0de30  fpcbuild-2.0.2.tar.bz2


--- fpc-2.0.0-G5.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 16:01:40 2005
From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost))
Date: Wed, 21 Dec 2005 11:01:40 -0500
Subject: rpms/fpc/FC-4 fpc-2.0.2-G5.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 fpc.spec, 1.3, 1.4 sources, 1.3, 1.4 fpc-2.0.0-G5.patch, 1.1, NONE
Message-ID: <200512211602.jBLG2Yrm030368@cvs-int.fedora.redhat.com>

Author: joost

Update of /cvs/extras/rpms/fpc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30334

Modified Files:
	.cvsignore fpc.spec sources 
Added Files:
	fpc-2.0.2-G5.patch 
Removed Files:
	fpc-2.0.0-G5.patch 
Log Message:
* Tue Dec 20 2005 Joost van der Sluis  2.0.2-3
- Disabled smart-linking for ppc

* Tue Dec 20 2005 Joost van der Sluis  2.0.2-1
- Updated to version 2.0.2


fpc-2.0.2-G5.patch:

--- NEW FILE fpc-2.0.2-G5.patch ---
Index: fpcsrc/rtl/powerpc/powerpc.inc
===================================================================
--- fpcsrc/rtl/powerpc/powerpc.inc	(revision 830)
+++ fpcsrc/rtl/powerpc/powerpc.inc	(working copy)
@@ -203,374 +203,7 @@
 end;
 {$endif MACOS}
 
-{****************************************************************************
-                                Move / Fill
-****************************************************************************}
 
-{$ifndef FPC_SYSTEM_HAS_MOVE}
-{$define FPC_SYSTEM_HAS_MOVE}
-procedure Move(const source;var dest;count:longint);[public, alias: 'FPC_MOVE'];assembler; nostackframe;
-asm
-          {  count <= 0 ?  }
-          cmpwi   cr0,r5,0
-          {  check if we have to do the move backwards because of overlap  }
-          sub     r10,r4,r3
-          {  carry := boolean(dest-source < count) = boolean(overlap) }
-          subc    r10,r10,r5
-
-          {  count < 15 ? (to decide whether we will move dwords or bytes  }
-          cmpwi   cr1,r5,15
-
-          {  if overlap, then r10 := -1 else r10 := 0  }
-          subfe   r10,r10,r10
-
-          {  count < 63 ? (32 + max. alignment (31) }
-          cmpwi   cr7,r5,63
-
-          {  if count <= 0, stop  }
-          ble     cr0,.LMoveDone
-
-          {  load the begin of the source in the data cache }
-          dcbt    0,r3
-          { and the dest as well }
-          dcbtst  0,r4
-
-          {  if overlap, then r0 := count else r0 := 0  }
-          and     r0,r5,r10
-          {  if overlap, then point source and dest to the end  }
-          add     r3,r3,r0
-          add     r4,r4,r0
-          {  if overlap, then r6 := 0, else r6 := -1  }
-          not     r6,r10
-          {  if overlap, then r10 := -2, else r10 := 0  }
-          slwi    r10,r10,1
-          {  if overlap, then r10 := -1, else r10 := 1  }
-          addi    r10,r10,1
-
-          {  if count < 15, copy everything byte by byte  }
-          blt     cr1,.LMoveBytes
-
-          {  if no overlap, then source/dest += -1, otherwise they stay }
-          {  After the next instruction, r3/r4 + r10 = next position to }
-          {  load/store from/to                                         }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-          {  otherwise, guarantee 4 byte alignment for dest for starters  }
-.LMove4ByteAlignLoop:
-          lbzux   r0,r3,r10
-          stbux   r0,r4,r10
-          {  is dest now 4 aligned?  }
-          andi.   r0,r4,3
-          subi    r5,r5,1
-          {  while not aligned, continue  }
-          bne     cr0,.LMove4ByteAlignLoop
-
-{$ifndef ppc603}
-          { check for 32 byte alignment }
-          andi.   r7,r4,31
-{$endif non ppc603}
-          { we are going to copy one byte again (the one at the newly }
-          { aligned address), so increase count byte 1                }
-          addi    r5,r5,1
-          { count div 4 for number of dwords to copy }
-          srwi    r0,r5,2
-          {  if 11 <= count < 63, copy using dwords }
-          blt     cr7,.LMoveDWords
-
-{$ifndef ppc603}
-          { # of dwords to copy to reach 32 byte alignment (*4) }
-          { (depends on forward/backward copy)                  }
-
-          { if forward copy, r6 = -1 -> r8 := 32 }
-          { if backward copy, r6 = 0 -> r8 := 0  }
-          rlwinm  r8,r6,0,31-6+1,31-6+1
-          { if forward copy, we have to copy 32 - unaligned count bytes }
-          { if backward copy unaligned count bytes                      }
-          sub     r7,r8,r7
-          { if backward copy, the calculated value is now negate -> }
-          { make it positive again                                 }
-          not     r8, r6
-          add     r7, r7, r8
-          xor     r7, r7, r8
-{$endif not ppc603}
-
-          { multiply the update count with 4 }
-          slwi    r10,r10,2
-          slwi    r6,r6,2
-          { and adapt the source and dest }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-{$ifndef ppc603}
-          beq     cr0,.LMove32BytesAligned
-.L32BytesAlignMoveLoop:
-          {  count >= 39 -> align to 8 byte boundary and then use the FPU  }
-          {  since we're already at 4 byte alignment, use dword store      }
-          subic.  r7,r7,4
-          lwzux   r0,r3,r10
-          subi    r5,r5,4
-          stwux   r0,r4,r10
-          bne     .L32BytesAlignMoveLoop
-
-.LMove32BytesAligned:
-          { count div 32 ( >= 1, since count was >=63 }
-          srwi    r0,r5,5
-          { remainder }
-          andi.   r5,r5,31
-          { to decide if we will do some dword stores (instead of only }
-          { byte stores) afterwards or not                             }
-{$else not ppc603}
-          srwi    r0,r5,4
-          andi.   r5,r5,15
-{$endif not ppc603}
-          cmpwi   cr1,r5,11
-          mtctr   r0
-
-          {  r0 := count div 4, will be moved to ctr when copying dwords  }
-          srwi    r0,r5,2
-
-{$ifndef ppc603}
-          {  adjust the update count: it will now be 8 or -8 depending on overlap  }
-          slwi    r10,r10,1
-
-          {  adjust source and dest pointers: because of the above loop, dest is now   }
-          {  aligned to 8 bytes. So if we add r6 we will still have an 8 bytes         }
-          { aligned address)                                                           }
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-          slwi    r6,r6,1
-
-          { the dcbz offset must give a 32 byte aligned address when added   }
-          { to the current dest address and its address must point to the    }
-          { bytes that will be overwritten in the current iteration. In case }
-          { of a forward loop, the dest address has currently an offset of   }
-          { -8 compared to the bytes that will be overwritten (and r6 = -8). }
-          { In case of a backward of a loop, the dest address currently has  }
-          { an offset of +32 compared to the bytes that will be overwritten  }
-          { (and r6 = 0). So the forward dcbz offset must become +8 and the  }
-          { backward -32 -> (-r6 * 5) - 32 gives the correct offset          }
-          slwi    r7,r6,2
-          add     r7,r7,r6
-          neg     r7,r7
-          subi    r7,r7,32
-
-.LMove32ByteDcbz:
-          lfdux   f0,r3,r10
-          lfdux   f1,r3,r10
-          lfdux   f2,r3,r10
-          lfdux   f3,r3,r10
-          { must be done only now, in case source and dest are less than }
-          { 32 bytes apart!                                              }
-          dcbz    r4,r7
-          stfdux  f0,r4,r10
-          stfdux  f1,r4,r10
-          stfdux  f2,r4,r10
-          stfdux  f3,r4,r10
-          bdnz    .LMove32ByteDcbz
-.LMove32ByteLoopDone:
-{$else not ppc603}
-.LMove16ByteLoop:
-          lwzux   r11,r3,r10
-          lwzux   r7,r3,r10
-          lwzux   r8,r3,r10
-          lwzux   r9,r3,r10
-          stwux   r11,r4,r10
-          stwux   r7,r4,r10
-          stwux   r8,r4,r10
-          stwux   r9,r4,r10
-          bdnz    .LMove16ByteLoop
-{$endif not ppc603}
-
-          { cr0*4+eq is true if "count and 31" = 0 }
-          beq     cr0,.LMoveDone
-
-          {  make r10 again -1 or 1, but first adjust source/dest pointers }
-          sub     r3,r3,r6
-          sub     r4,r4,r6
-{$ifndef ppc603}
-          srawi   r10,r10,3
-          srawi   r6,r6,3
-{$else not ppc603}
-          srawi   r10,r10,2
-          srawi   r6,r6,2
-{$endif not ppc603}
-
-          { cr1 contains whether count <= 11 }
-          ble     cr1,.LMoveBytes
-
-.LMoveDWords:
-          mtctr   r0
-          andi.   r5,r5,3
-          {  r10 * 4  }
-          slwi    r10,r10,2
-          slwi    r6,r6,2
-          add     r3,r3,r6
-          add     r4,r4,r6
-
-.LMoveDWordsLoop:
-          lwzux   r0,r3,r10
-          stwux   r0,r4,r10
-          bdnz    .LMoveDWordsLoop
-
-          beq     cr0,.LMoveDone
-          {  make r10 again -1 or 1  }
-          sub     r3,r3,r6
-          sub     r4,r4,r6
-          srawi   r10,r10,2
-          srawi   r6,r6,2
-.LMoveBytes:
-          add     r3,r3,r6
-          add     r4,r4,r6
-          mtctr   r5
-.LMoveBytesLoop:
-          lbzux   r0,r3,r10
-          stbux   r0,r4,r10
-          bdnz    .LMoveBytesLoop
-.LMoveDone:
-end;
-{$endif FPC_SYSTEM_HAS_MOVE}
-
-
-{$ifndef FPC_SYSTEM_HAS_FILLCHAR}
-{$define FPC_SYSTEM_HAS_FILLCHAR}
-
-Procedure FillChar(var x;count:longint;value:byte);assembler;
-{ input: x in r3, count in r4, value in r5 }
-
-{$ifndef FPC_ABI_AIX}
-{ in the AIX ABI, we can use te red zone for temp storage, otherwise we have }
-{ to explicitely allocate room                                               }
-var
-  temp : packed record
-    case byte of
-      0: (l1,l2: longint);
-      1: (d: double);
-    end;
-{$endif FPC_ABI_AIX}
-asm
-        { no bytes? }
-        cmpwi     cr6,r4,0
-        { less than 15 bytes? }
-        cmpwi     cr7,r4,15
-        { less than 64 bytes? }
-        cmpwi     cr1,r4,64
-        { fill r5 with ValueValueValueValue }
-        rlwimi    r5,r5,8,16,23
-        { setup for aligning x to multiple of 4}
-        rlwinm    r10,r3,0,31-2+1,31
-        rlwimi    r5,r5,16,0,15
-        ble       cr6,.LFillCharDone
-        { get the start of the data in the cache (and mark it as "will be }
-        { modified")                                                      }
-        dcbtst    0,r3
-        subfic    r10,r10,4
-        blt       cr7,.LFillCharVerySmall
-        { just store 4 bytes instead of using a loop to align (there are }
-        { plenty of other instructions now to keep the processor busy    }
-        { while it handles the (possibly unaligned) store)               }
-        stw       r5,0(r3)
-        { r3 := align(r3,4) }
-        add       r3,r3,r10
-        { decrease count with number of bytes already stored }
-        sub       r4,r4,r10
-        blt       cr1,.LFillCharSmall
-        { if we have to fill with 0 (which happens a lot), we can simply use }
-        { dcbz for the most part, which is very fast, so make a special case }
-        { for that                                                           }
-        cmplwi    cr1,r5,0
-        { align to a multiple of 32 (and immediately check whether we aren't }
-        { already 32 byte aligned)                                           }
-        rlwinm.   r10,r3,0,31-5+1,31
-        { setup r3 for using update forms of store instructions }
-        subi      r3,r3,4
-        { get number of bytes to store }
-        subfic    r10,r10,32
-        { if already 32byte aligned, skip align loop }
-        beq       .L32ByteAlignLoopDone
-        { substract from the total count }
-        sub       r4,r4,r10
-.L32ByteAlignLoop:
-        { we were already aligned to 4 byres, so this will count down to }
-        { exactly 0                                                      }
-        subic.    r10,r10,4
-        stwu      r5,4(r3)
-        bne       .L32ByteAlignLoop
-.L32ByteAlignLoopDone:
-        { get the amount of 32 byte blocks }
-        srwi      r10,r4,5
-        { and keep the rest in r4 (recording whether there is any rest) }
-        rlwinm.   r4,r4,0,31-5+1,31
-        { move to ctr }
-        mtctr     r10
-        { check how many rest there is (to decide whether we'll use }
-        { FillCharSmall or FillCharVerySmall)                       }
-        cmplwi    cr7,r4,11
-        { if filling with zero, only use dcbz }
-        bne       cr1, .LFillCharNoZero
-        { make r3 point again to the actual store position }
-        addi      r3,r3,4
-.LFillCharDCBZLoop:
-        dcbz      0,r3
-        addi      r3,r3,32
-        bdnz      .LFillCharDCBZLoop
-        { if there was no rest, we're finished }
-        beq       .LFillCharDone
-        b         .LFillCharVerySmall
-.LFillCharNoZero:
-{$ifdef FPC_ABI_AIX}
-        stw       r5,-4(r1)
-        stw       r5,-8(r1)
-        lfd       f0,-8(r1)
-{$else FPC_ABI_AIX}
-        stw       r5,temp
-        stw       r5,temp+4
-        lfd       f0,temp
-{$endif FPC_ABI_AIX}
-        { make r3 point to address-8, so we're able to use fp double stores }
-        { with update (it's already -4 now)                                 }
-        subi      r3,r3,4
-        { load r10 with 8, so that dcbz uses the correct address }
-        li        r10, 8
-.LFillChar32ByteLoop:
-        dcbz      r3,r10
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        stfdu     f0,8(r3)
-        bdnz      .LFillChar32ByteLoop
-        { if there was no rest, we're finished }
-        beq       .LFillCharDone
-        { make r3 point again to the actual next byte that must be written }
-        addi      r3,r3,8
-        b         .LFillCharVerySmall
-.LFillCharSmall:
-        { when we arrive here, we're already 4 byte aligned }
-        { get count div 4 to store dwords }
-        srwi      r10,r4,2
-        { get ready for use of update stores }
-        subi      r3,r3,4
-        mtctr     r10
-        rlwinm.   r4,r4,0,31-2+1,31
-.LFillCharSmallLoop:
-        stwu      r5,4(r3)
-        bdnz      .LFillCharSmallLoop
-        { if nothing left, stop }
-        beq       .LFillCharDone
-        { get ready to store bytes }
-        addi      r3,r3,4
-.LFillCharVerySmall:
-        mtctr     r4
-        subi      r3,r3,1
-.LFillCharVerySmallLoop:
-        stbu      r5,1(r3)
-        bdnz      .LFillCharVerySmallLoop
-.LFillCharDone:
-end;
-{$endif FPC_SYSTEM_HAS_FILLCHAR}
-
-
 {$ifndef FPC_SYSTEM_HAS_FILLDWORD}
 {$define FPC_SYSTEM_HAS_FILLDWORD}
 procedure filldword(var x;count : longint;value : dword);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fpc/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2005 15:15:37 -0000	1.2
+++ .cvsignore	21 Dec 2005 16:01:40 -0000	1.3
@@ -1,2 +1 @@
-fpc-2.0.0.compiler.bin.tar.gz
-fpc-2.0.0.source.tar.gz
+fpcbuild-2.0.2.tar.bz2


Index: fpc.spec
===================================================================
RCS file: /cvs/extras/rpms/fpc/FC-4/fpc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fpc.spec	17 Aug 2005 16:33:51 -0000	1.3
+++ fpc.spec	21 Dec 2005 16:01:40 -0000	1.4
@@ -1,18 +1,17 @@
 Name:           fpc
-Version:        2.0.0
-Release:        4%{?dist}
+Version:        2.0.2
+Release:        3%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
 License:        GPL and modified LGPL
 URL:            http://www.freepascal.org/
-Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}-%{version}.source.tar.gz
-Source1:        http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
+Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}build-%{version}.tar.bz2
 Patch0:         %{name}-%{version}-G5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	gpm, glibc, ncurses, binutils
-BuildRequires:  tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
+BuildRequires:  fpc, tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
 
 %description
 
@@ -45,43 +44,39 @@
 
 %ifarch ppc
 %define ppcname ppcppc
+%define smart _all 
 %else
 %ifarch x86_64
 %define ppcname ppcx64
+%define smart _smart
 %else
 %define ppcname ppc386
+%define smart _smart
 %endif
 %endif
 
 %prep
-%setup -q -a1 -n %{name}
+%setup -q -n %{name}-src-%{version}
 %patch0 
 
 %build
-# The source-files:
-mkdir -p fpcsrc
-cp -a rtl fpcsrc
-cp -a fcl fpcsrc
-cp -a packages fpcsrc
-rm -rf fpcsrc/packages/extra/amunits
-rm -rf fpcsrc/packages/extra/winunits
-find fpcsrc -name .cvsignore -exec rm '{}' ';'
-
-STARTPP=`pwd`/startcompiler/%{ppcname}
+cd fpcsrc
+STARTPP=%{ppcname}
 NEWPP=`pwd`/compiler/%{ppcname}
 NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
 DATA2INC=`pwd`/utils/data2inc
 make compiler_cycle FPC=${STARTPP}
-make rtl_clean rtl_smart FPC=${NEWPP}
-make packages_base_smart FPC=${NEWPP}
-make fcl_smart FPC=${NEWPP}
-make fv_smart FPC=${NEWPP}
-make packages_extra_smart FPC=${NEWPP}
+make rtl_clean rtl%{smart} FPC=${NEWPP}
+make packages_base%{smart} FPC=${NEWPP}
+make fcl%{smart} FPC=${NEWPP}
+make fv%{smart} FPC=${NEWPP}
+make packages_extra%{smart} FPC=${NEWPP}
 make ide_all FPC=${NEWPP}
 make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC}
+cd ..
 export save_size=40000
 export pool_size=1250000
-make -C docs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
+make -C fpcdocs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
 
 # disable the debuginfo package
 %define debug_package %{nil}
@@ -89,6 +84,7 @@
 
 %install
 rm -rf %{buildroot}
+cd fpcsrc
 FPCMAKE=`pwd`/utils/fpcm/fpcmake
 NEWPP=`pwd`/compiler/%{ppcname}
 INSTALLOPTS="FPC=${NEWPP} FPCMAKE=${FPCMAKE} \
@@ -106,23 +102,28 @@
 make fv_distinstall ${INSTALLOPTS}
 make ide_distinstall ${INSTALLOPTS}
 make utils_distinstall ${INSTALLOPTS}
-
-make doc_install ${INSTALLOPTS}
-make -C docs pdfinstall ${INSTALLOPTS}
-make man_install ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir}
+cd ../install
+make -C doc ${INSTALLOPTS}
+make -C man ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir}
+cd ..
+make -C fpcdocs pdfinstall ${INSTALLOPTS}
 
 # create link
 ln -sf ../%{_lib}/%{name}/%{version}/%{ppcname} %{buildroot}%{_bindir}/%{ppcname}
 
-# Include the COPYING-information in the documentation
-cp -a compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
-cp -a rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
-cp -a fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl
-cp -a rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
+# Include the COPYING-information for the fcl/rtl in the documentation
+cp -a fpcsrc/compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
+cp -a fpcsrc/rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
+cp -a fpcsrc/fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl
+cp -a fpcsrc/rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
 
 # The source-files:
 mkdir -p %{buildroot}%{_datadir}/fpcsrc
-cp -a fpcsrc/* %{buildroot}%{_datadir}/fpcsrc/
+rm -rf fpcsrc/packages/extra/amunits
+rm -rf fpcsrc/packages/extra/winunits
+cp -a fpcsrc/rtl %{buildroot}%{_datadir}/fpcsrc
+cp -a fpcsrc/fcl %{buildroot}%{_datadir}/fpcsrc
+cp -a fpcsrc/packages %{buildroot}%{_datadir}/fpcsrc
 
 # Workaround:
 # newer rpm versions do not allow garbage
@@ -158,6 +159,15 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-3
+- Disabled smart-linking for ppc
+
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-2
+- Updated fpc-2.0.2-G5.patch
+
+* Tue Dec 20 2005 Joost van der Sluis  2.0.2-1
+- Updated to version 2.0.2
+
 * Wed Aug 17 2005 Joost van der Sluis  2.0.0-4
 - Added %%{?dist} to release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fpc/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Aug 2005 15:55:24 -0000	1.3
+++ sources	21 Dec 2005 16:01:40 -0000	1.4
@@ -1,2 +1 @@
-fd5730c59bb5a87e5828568b7d039cb5  fpc-2.0.0.compiler.bin.tar.gz
-3f9c64d0146a3631f6963fd7477776d1  fpc-2.0.0.source.tar.gz
+b88893bc005c4404197ae55ef3c0de30  fpcbuild-2.0.2.tar.bz2


--- fpc-2.0.0-G5.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 17:02:51 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 12:02:51 -0500
Subject: rpms/apcupsd/devel apcupsd.spec,1.3,1.4
Message-ID: <200512211703.jBLH3PjB032242@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32225

Modified Files:
	apcupsd.spec 
Log Message:
Rebuild



Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apcupsd.spec	16 Nov 2005 21:37:25 -0000	1.3
+++ apcupsd.spec	21 Dec 2005 17:02:50 -0000	1.4
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.10.18
-Release:      5%{?dist}
+Release:      6%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Wed Dec 21 2005 - Orion Poplawski  - 3.10.18-6
+- Rebuild
+
 * Wed Nov 16 2005 - Orion Poplawski  - 3.10.18-5
 - Bump for new openssl
 



From fedora-extras-commits at redhat.com  Wed Dec 21 17:12:25 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 12:12:25 -0500
Subject: rpms/gv/devel gv.spec,1.3,1.4
Message-ID: <200512211712.jBLHCwEa032322@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32294

Modified Files:
	gv.spec 
Log Message:
Rebuild



Index: gv.spec
===================================================================
RCS file: /cvs/extras/rpms/gv/devel/gv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gv.spec	31 Oct 2005 16:39:25 -0000	1.3
+++ gv.spec	21 Dec 2005 17:12:25 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A X front-end for the Ghostscript PostScript(TM) interpreter
 Name: gv
 Version: 3.6.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Publishing
 Requires: ghostscript
@@ -100,6 +100,9 @@
 %{_mandir}/man1/gv.*
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski  3.6.1-5
+- Rebuild
+
 * Thu Oct 27 2005 Orion Poplawski  3.6.1-4
 - Add patch find app defaults file (#171848)
 - Add BR: /usr/bin/makeinfo to properly build .info file (#171849)



From fedora-extras-commits at redhat.com  Wed Dec 21 17:22:42 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 12:22:42 -0500
Subject: rpms/hdf/devel hdf.spec,1.4,1.5
Message-ID: <200512211723.jBLHNEmX032475@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32443

Modified Files:
	hdf.spec 
Log Message:
Rebuild



Index: hdf.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf/devel/hdf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hdf.spec	5 Oct 2005 15:05:50 -0000	1.4
+++ hdf.spec	21 Dec 2005 17:22:42 -0000	1.5
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -73,6 +73,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski  4.2r1-6
+- Rebuild
+
 * Wed Oct 05 2005 Orion Poplawski  4.2r1-5
 - Add Requires: libjpeg-devel zlib-devel to -devel package
 



From fedora-extras-commits at redhat.com  Wed Dec 21 17:23:13 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 12:23:13 -0500
Subject: rpms/hdf5/devel hdf5.spec,1.4,1.5
Message-ID: <200512211723.jBLHNk9l032523@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32465

Modified Files:
	hdf5.spec 
Log Message:
Rebuild



Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hdf5.spec	30 Nov 2005 20:51:45 -0000	1.4
+++ hdf5.spec	21 Dec 2005 17:23:13 -0000	1.5
@@ -1,6 +1,6 @@
 Name: hdf5
 Version: 1.6.4
-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
@@ -94,6 +94,9 @@
 %{_libdir}/*.mod
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski  1.6.4-9
+- Rebuild
+
 * Wed Nov 30 2005 Orion Poplawski  1.6.4-8
 - Package fortran files properly
 - Move compiler wrappers to devel



From fedora-extras-commits at redhat.com  Wed Dec 21 17:29:25 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 12:29:25 -0500
Subject: rpms/nethack-vultures/FC-3 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200512211729.jBLHTwkk032658@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32607/FC-3

Modified Files:
	.cvsignore sources 
Log Message:
Committing new sources files




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Dec 2005 18:32:55 -0000	1.3
+++ .cvsignore	21 Dec 2005 17:29:25 -0000	1.4
@@ -1 +1 @@
-vultures-1.11.0-full.tar.bz2
+vultures-1.11.1-full.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Dec 2005 18:32:55 -0000	1.3
+++ sources	21 Dec 2005 17:29:25 -0000	1.4
@@ -1 +1 @@
-1c9957f9c46bd1bbb096a111f04a2f48  vultures-1.11.0-full.tar.bz2
+d1456849d0d854d29c5d510382f49287  vultures-1.11.1-full.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 21 17:29:37 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 12:29:37 -0500
Subject: rpms/nethack-vultures/devel .cvsignore,1.4,1.5 sources,1.3,1.4
Message-ID: <200512211730.jBLHU9rw032666@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32607/devel

Modified Files:
	.cvsignore sources 
Log Message:
Committing new sources files




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Dec 2005 14:14:21 -0000	1.4
+++ .cvsignore	21 Dec 2005 17:29:37 -0000	1.5
@@ -1,2 +1 @@
-vultures-1.11.0-full.tar.bz2
 vultures-1.11.1-full.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Dec 2005 18:33:06 -0000	1.3
+++ sources	21 Dec 2005 17:29:37 -0000	1.4
@@ -1 +1 @@
-1c9957f9c46bd1bbb096a111f04a2f48  vultures-1.11.0-full.tar.bz2
+d1456849d0d854d29c5d510382f49287  vultures-1.11.1-full.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 21 17:29:31 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 12:29:31 -0500
Subject: rpms/nethack-vultures/FC-4 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200512211730.jBLHU3hZ032662@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-serv32607/FC-4

Modified Files:
	.cvsignore sources 
Log Message:
Committing new sources files




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Dec 2005 18:33:01 -0000	1.3
+++ .cvsignore	21 Dec 2005 17:29:31 -0000	1.4
@@ -1 +1 @@
-vultures-1.11.0-full.tar.bz2
+vultures-1.11.1-full.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Dec 2005 18:33:01 -0000	1.3
+++ sources	21 Dec 2005 17:29:31 -0000	1.4
@@ -1 +1 @@
-1c9957f9c46bd1bbb096a111f04a2f48  vultures-1.11.0-full.tar.bz2
+d1456849d0d854d29c5d510382f49287  vultures-1.11.1-full.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 21 17:46:59 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 12:46:59 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.12,1.13
Message-ID: <200512211747.jBLHlVGE000358@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv341

Modified Files:
	nethack-vultures.spec 
Log Message:
Have to up the revision to get it to retag.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nethack-vultures.spec	21 Dec 2005 06:31:05 -0000	1.12
+++ nethack-vultures.spec	21 Dec 2005 17:46:58 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           nethack-vultures
-Version:        1.11.1
+Version:        1.11.2
 Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 



From fedora-extras-commits at redhat.com  Wed Dec 21 19:34:56 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 21 Dec 2005 14:34:56 -0500
Subject: rpms/wesnoth/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 wesnoth.spec, 1.24, 1.25
Message-ID: <200512211935.jBLJZT2O004233@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/wesnoth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4211

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
* Wed Dec 21 2005 Michael Schwendt  - 1.0.2-1
- update to 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Oct 2005 12:07:38 -0000	1.12
+++ .cvsignore	21 Dec 2005 19:34:55 -0000	1.13
@@ -1 +1 @@
-wesnoth-1.0.1.tar.gz
+wesnoth-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Oct 2005 12:07:38 -0000	1.12
+++ sources	21 Dec 2005 19:34:55 -0000	1.13
@@ -1 +1 @@
-20a2498938a168bf6a0989af857da500  wesnoth-1.0.1.tar.gz
+1d2a26062ce1c90cbf10845023f9435c  wesnoth-1.0.2.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wesnoth.spec	23 Oct 2005 12:07:38 -0000	1.24
+++ wesnoth.spec	21 Dec 2005 19:34:55 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           wesnoth
-Version:        1.0.1
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
@@ -158,6 +158,9 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Wed Dec 21 2005 Michael Schwendt  - 1.0.2-1
+- update to 1.0.2
+
 * Sat Oct 22 2005 Michael Schwendt  - 1.0.1-1
 - update to 1.0.1
 



From fedora-extras-commits at redhat.com  Wed Dec 21 19:47:38 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 14:47:38 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.12,1.13
Message-ID: <200512211948.jBLJmB9U004349@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4302/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the revision numbers in hopes of this prodding plague to use the
correct source package.  The problem is that for some reason, the server
keeps downloading the wrong source package, which causes a build failure. 
I'm not sure why it's doing that.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nethack-vultures.spec	21 Dec 2005 06:30:52 -0000	1.12
+++ nethack-vultures.spec	21 Dec 2005 19:47:38 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -162,7 +162,10 @@
 
 
 %changelog
-* Thu Dec 20 2005 Karen Pease  - 1.11.1-1
+* Wed Dec 21 2005 Karen Pease  - 1.11.1-2
+- Upped revision to try to get package to build on the server.
+
+* Tue Dec 20 2005 Karen Pease  - 1.11.1-1
 - Upgraded source package; fixes some keyboard bugs and problems for 64bit/big endian machines concerning transparency.
 
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-8



From fedora-extras-commits at redhat.com  Wed Dec 21 19:47:44 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 14:47:44 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.13,1.14
Message-ID: <200512211948.jBLJmGqd004352@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-serv4302/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the revision numbers in hopes of this prodding plague to use the
correct source package.  The problem is that for some reason, the server
keeps downloading the wrong source package, which causes a build failure. 
I'm not sure why it's doing that.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nethack-vultures.spec	21 Dec 2005 06:30:59 -0000	1.13
+++ nethack-vultures.spec	21 Dec 2005 19:47:44 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -162,7 +162,10 @@
 
 
 %changelog
-* Thu Dec 20 2005 Karen Pease  - 1.11.1-1
+* Wed Dec 21 2005 Karen Pease  - 1.11.1-2
+- Upped revision to try to get package to build on the server.
+
+* Tue Dec 20 2005 Karen Pease  - 1.11.1-1
 - Upgraded source package; fixes some keyboard bugs and problems for 64bit/big endian machines concerning transparency.
 
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-8



From fedora-extras-commits at redhat.com  Wed Dec 21 19:47:50 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Wed, 21 Dec 2005 14:47:50 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.13,1.14
Message-ID: <200512211948.jBLJmMDD004355@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4302/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the revision numbers in hopes of this prodding plague to use the
correct source package.  The problem is that for some reason, the server
keeps downloading the wrong source package, which causes a build failure. 
I'm not sure why it's doing that.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nethack-vultures.spec	21 Dec 2005 17:46:58 -0000	1.13
+++ nethack-vultures.spec	21 Dec 2005 19:47:50 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.2
-Release:        1%{?dist}
+Version:        1.11.1
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -162,7 +162,10 @@
 
 
 %changelog
-* Thu Dec 20 2005 Karen Pease  - 1.11.1-1
+* Wed Dec 21 2005 Karen Pease  - 1.11.1-2
+- Upped revision to try to get package to build on the server.
+
+* Tue Dec 20 2005 Karen Pease  - 1.11.1-1
 - Upgraded source package; fixes some keyboard bugs and problems for 64bit/big endian machines concerning transparency.
 
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-8



From fedora-extras-commits at redhat.com  Wed Dec 21 20:44:36 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 15:44:36 -0500
Subject: rpms/hdf5/FC-4 hdf5-1.6.5-h5diff_attr.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 hdf5.spec, 1.4, 1.5 sources, 1.2,
	1.3 hdf5-1.6.4-h5diff_attr.patch, 1.1, NONE
Message-ID: <200512212045.jBLKj8cD006262@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf5/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6234

Modified Files:
	.cvsignore hdf5.spec sources 
Added Files:
	hdf5-1.6.5-h5diff_attr.patch 
Removed Files:
	hdf5-1.6.4-h5diff_attr.patch 
Log Message:
Update to 1.6.5


hdf5-1.6.5-h5diff_attr.patch:

--- NEW FILE hdf5-1.6.5-h5diff_attr.patch ---
--- hdf5-1.6.5/tools/lib/h5diff_attr.c.orig	2005-12-21 12:08:45.000000000 -0700
+++ hdf5-1.6.5/tools/lib/h5diff_attr.c	2005-12-21 12:11:17.000000000 -0700
@@ -61,8 +61,8 @@
  int        rank2;        /* rank of dataset */
  hsize_t    dims1[H5S_MAX_RANK];/* dimensions of dataset */
  hsize_t    dims2[H5S_MAX_RANK];/* dimensions of dataset */
- char       name1[255];
- char       name2[255];
+ char       name1[255],np1[512];
+ char       name2[255],np2[512];
  int        n1, n2, i, j;
  int        ret=0;
  hsize_t    nfound;
@@ -196,21 +196,21 @@
  * array compare
  *-------------------------------------------------------------------------
  */
- sprintf(name1,"%s of <%s>",name1,path1);
- sprintf(name2,"%s of <%s>",name2,path2);
+ snprintf(np1,sizeof(np1),"%s of <%s>",name1,path1);
+ snprintf(np2,sizeof(np2),"%s of <%s>",name2,path2);
 
  /* always print name */
  if (options->m_verbose)
  {
-  printf( "Attribute:   <%s> and <%s>\n",name1,name2);
+  printf( "Attribute:   <%s> and <%s>\n",np1,np2);
   nfound = diff_array(buf1,
                      buf2,
                      nelmts1,
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -230,8 +230,8 @@
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -239,15 +239,15 @@
    options->m_quiet=0;
    if (nfound)
    {
-    printf( "Attribute:   <%s> and <%s>\n",name1,name2);
+    printf( "Attribute:   <%s> and <%s>\n",np1,np2);
     nfound = diff_array(buf1,
                      buf2,
                      nelmts1,
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -263,8 +263,8 @@
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hdf5/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Jul 2005 20:20:17 -0000	1.2
+++ .cvsignore	21 Dec 2005 20:44:35 -0000	1.3
@@ -1 +1 @@
-hdf5-1.6.4.tar.gz
+hdf5-1.6.5.tar.gz


Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/FC-4/hdf5.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hdf5.spec	30 Nov 2005 20:56:29 -0000	1.4
+++ hdf5.spec	21 Dec 2005 20:44:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name: hdf5
-Version: 1.6.4
-Release: 5%{?dist}
+Version: 1.6.5
+Release: 1%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -10,7 +10,7 @@
 Patch1: hdf5-1.6.4-destdir.patch
 Patch2: hdf5-1.6.4-norpath.patch
 Patch3: hdf5-1.6.4-testh5repack.patch
-Patch4: hdf5-1.6.4-h5diff_attr.patch
+Patch4: hdf5-1.6.5-h5diff_attr.patch
 Patch5: hdf5-1.6.4-ppc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gfortran >= 4.0.2, krb5-devel, openssl-devel, zlib-devel
@@ -75,6 +75,7 @@
 %{_bindir}/h5import
 %{_bindir}/h5jam
 %{_bindir}/h5ls
+%{_bindir}/h5perf
 %{_bindir}/h5repack
 %{_bindir}/h5repart
 %{_bindir}/h5unjam
@@ -93,6 +94,9 @@
 %{_libdir}/*.mod
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski  1.6.5-1
+- Update to 1.6.5
+
 * Wed Nov 30 2005 Orion Poplawski  1.6.4-5
 - Enable fortran, require fixed gfortran version
 - Add patch for fortran compilation on ppc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hdf5/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Jul 2005 20:20:17 -0000	1.2
+++ sources	21 Dec 2005 20:44:35 -0000	1.3
@@ -1 +1 @@
-a837391b633fc4c6681905d89047c032  hdf5-1.6.4.tar.gz
+67187b3253b89f1f41756b7fd4396ecf  hdf5-1.6.5.tar.gz


--- hdf5-1.6.4-h5diff_attr.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 20:57:24 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 15:57:24 -0500
Subject: rpms/hdf5/FC-4 hdf5.spec,1.5,1.6
Message-ID: <200512212057.jBLKvuWt006365@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf5/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6348

Modified Files:
	hdf5.spec 
Log Message:
We need time now



Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/FC-4/hdf5.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hdf5.spec	21 Dec 2005 20:44:35 -0000	1.5
+++ hdf5.spec	21 Dec 2005 20:57:24 -0000	1.6
@@ -13,7 +13,7 @@
 Patch4: hdf5-1.6.5-h5diff_attr.patch
 Patch5: hdf5-1.6.4-ppc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gcc-gfortran >= 4.0.2, krb5-devel, openssl-devel, zlib-devel
+BuildRequires: gcc-gfortran >= 4.0.2, krb5-devel, openssl-devel, zlib-devel, time
 
 %description
 HDF5 is a general purpose library and file format for storing scientific data.



From fedora-extras-commits at redhat.com  Wed Dec 21 21:07:35 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 16:07:35 -0500
Subject: rpms/hdf5/devel hdf5-1.6.5-h5diff_attr.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 hdf5.spec, 1.5, 1.6 sources, 1.2,
	1.3 hdf5-1.6.4-h5diff_attr.patch, 1.1, NONE
Message-ID: <200512212108.jBLL8C9t008069@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8042

Modified Files:
	.cvsignore hdf5.spec sources 
Added Files:
	hdf5-1.6.5-h5diff_attr.patch 
Removed Files:
	hdf5-1.6.4-h5diff_attr.patch 
Log Message:
Update to 1.6.5


hdf5-1.6.5-h5diff_attr.patch:

--- NEW FILE hdf5-1.6.5-h5diff_attr.patch ---
--- hdf5-1.6.5/tools/lib/h5diff_attr.c.orig	2005-12-21 12:08:45.000000000 -0700
+++ hdf5-1.6.5/tools/lib/h5diff_attr.c	2005-12-21 12:11:17.000000000 -0700
@@ -61,8 +61,8 @@
  int        rank2;        /* rank of dataset */
  hsize_t    dims1[H5S_MAX_RANK];/* dimensions of dataset */
  hsize_t    dims2[H5S_MAX_RANK];/* dimensions of dataset */
- char       name1[255];
- char       name2[255];
+ char       name1[255],np1[512];
+ char       name2[255],np2[512];
  int        n1, n2, i, j;
  int        ret=0;
  hsize_t    nfound;
@@ -196,21 +196,21 @@
  * array compare
  *-------------------------------------------------------------------------
  */
- sprintf(name1,"%s of <%s>",name1,path1);
- sprintf(name2,"%s of <%s>",name2,path2);
+ snprintf(np1,sizeof(np1),"%s of <%s>",name1,path1);
+ snprintf(np2,sizeof(np2),"%s of <%s>",name2,path2);
 
  /* always print name */
  if (options->m_verbose)
  {
-  printf( "Attribute:   <%s> and <%s>\n",name1,name2);
+  printf( "Attribute:   <%s> and <%s>\n",np1,np2);
   nfound = diff_array(buf1,
                      buf2,
                      nelmts1,
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -230,8 +230,8 @@
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -239,15 +239,15 @@
    options->m_quiet=0;
    if (nfound)
    {
-    printf( "Attribute:   <%s> and <%s>\n",name1,name2);
+    printf( "Attribute:   <%s> and <%s>\n",np1,np2);
     nfound = diff_array(buf1,
                      buf2,
                      nelmts1,
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -263,8 +263,8 @@
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Jul 2005 20:20:17 -0000	1.2
+++ .cvsignore	21 Dec 2005 21:07:16 -0000	1.3
@@ -1 +1 @@
-hdf5-1.6.4.tar.gz
+hdf5-1.6.5.tar.gz


Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hdf5.spec	21 Dec 2005 17:23:13 -0000	1.5
+++ hdf5.spec	21 Dec 2005 21:07:16 -0000	1.6
@@ -1,6 +1,6 @@
 Name: hdf5
-Version: 1.6.4
-Release: 9%{?dist}
+Version: 1.6.5
+Release: 1%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -10,10 +10,10 @@
 Patch1: hdf5-1.6.4-destdir.patch
 Patch2: hdf5-1.6.4-norpath.patch
 Patch3: hdf5-1.6.4-testh5repack.patch
-Patch4: hdf5-1.6.4-h5diff_attr.patch
+Patch4: hdf5-1.6.5-h5diff_attr.patch
 Patch5: hdf5-1.6.4-ppc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran
+BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
 
 %description
 HDF5 is a general purpose library and file format for storing scientific data.
@@ -76,6 +76,7 @@
 %{_bindir}/h5import
 %{_bindir}/h5jam
 %{_bindir}/h5ls
+%{_bindir}/h5perf
 %{_bindir}/h5repack
 %{_bindir}/h5repart
 %{_bindir}/h5unjam
@@ -94,6 +95,9 @@
 %{_libdir}/*.mod
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski  1.6.5-1
+- Update to 1.6.5
+
 * Wed Dec 21 2005 Orion Poplawski  1.6.4-9
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Jul 2005 20:20:17 -0000	1.2
+++ sources	21 Dec 2005 21:07:16 -0000	1.3
@@ -1 +1 @@
-a837391b633fc4c6681905d89047c032  hdf5-1.6.4.tar.gz
+67187b3253b89f1f41756b7fd4396ecf  hdf5-1.6.5.tar.gz


--- hdf5-1.6.4-h5diff_attr.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 21 21:55:39 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 16:55:39 -0500
Subject: rpms/hdf5/FC-4 hdf5.spec,1.6,1.7
Message-ID: <200512212156.jBLLuCa8008331@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf5/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8300

Modified Files:
	hdf5.spec 
Log Message:
Don't ship h5perf with missing library



Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/FC-4/hdf5.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hdf5.spec	21 Dec 2005 20:57:24 -0000	1.6
+++ hdf5.spec	21 Dec 2005 21:55:39 -0000	1.7
@@ -1,6 +1,6 @@
 Name: hdf5
 Version: 1.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -52,6 +52,8 @@
 find doc/html -name '*.sh*' | xargs chmod +x
 %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir}
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings
+# Don't instal h5perf until h5test.so.0 issues is sorted out
+rm $RPM_BUILD_ROOT/%{_bindir}/h5perf
 
 %check
 make check
@@ -75,7 +77,6 @@
 %{_bindir}/h5import
 %{_bindir}/h5jam
 %{_bindir}/h5ls
-%{_bindir}/h5perf
 %{_bindir}/h5repack
 %{_bindir}/h5repart
 %{_bindir}/h5unjam
@@ -94,6 +95,9 @@
 %{_libdir}/*.mod
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski  1.6.5-2
+- Don't ship h5perf with missing library
+
 * Wed Dec 21 2005 Orion Poplawski  1.6.5-1
 - Update to 1.6.5
 



From fedora-extras-commits at redhat.com  Wed Dec 21 21:57:14 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 21 Dec 2005 16:57:14 -0500
Subject: rpms/hdf5/devel hdf5.spec,1.6,1.7
Message-ID: <200512212157.jBLLvk5a008409@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8390

Modified Files:
	hdf5.spec 
Log Message:
Don't ship h5perf with missing library



Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hdf5.spec	21 Dec 2005 21:07:16 -0000	1.6
+++ hdf5.spec	21 Dec 2005 21:57:14 -0000	1.7
@@ -1,6 +1,6 @@
 Name: hdf5
 Version: 1.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -53,6 +53,8 @@
 find doc/html -name '*.sh*' | xargs chmod +x
 %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir}
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings
+# Don't instal h5perf until h5test.so.0 issues is sorted out
+rm $RPM_BUILD_ROOT/%{_bindir}/h5perf
 
 %check
 make check
@@ -76,7 +78,6 @@
 %{_bindir}/h5import
 %{_bindir}/h5jam
 %{_bindir}/h5ls
-%{_bindir}/h5perf
 %{_bindir}/h5repack
 %{_bindir}/h5repart
 %{_bindir}/h5unjam
@@ -95,6 +96,9 @@
 %{_libdir}/*.mod
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski  1.6.5-2
+- Don't ship h5perf with missing library
+
 * Wed Dec 21 2005 Orion Poplawski  1.6.5-1
 - Update to 1.6.5
 



From fedora-extras-commits at redhat.com  Thu Dec 22 05:14:25 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 22 Dec 2005 00:14:25 -0500
Subject: rpms/kphone/devel kphone.spec,1.19,1.20
Message-ID: <200512220514.jBM5Ev5x022422@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/kphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22405

Modified Files:
	kphone.spec 
Log Message:
rebuild for gcc 4.1



Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kphone.spec	13 Nov 2005 02:47:30 -0000	1.19
+++ kphone.spec	22 Dec 2005 05:14:24 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           kphone
 Version:        4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
 Group:          Applications/Communications
@@ -58,6 +58,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Thu Dec 22 05:35:28 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 22 Dec 2005 00:35:28 -0500
Subject: rpms/krecipes/devel krecipes.spec,1.9,1.10
Message-ID: <200512220536.jBM5a07s022516@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22499

Modified Files:
	krecipes.spec 
Log Message:
Rebuild for gcc 4.1



Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/devel/krecipes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- krecipes.spec	5 Dec 2005 12:53:54 -0000	1.9
+++ krecipes.spec	22 Dec 2005 05:35:28 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           krecipes
 Version:        0.9.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
@@ -86,6 +86,8 @@
 %{_datadir}/mimelnk/*/*.desktop
 
 %changelog
+* Wed Dec 21 2005 Dennis Gilmore  - 0.9.1-3
+-Rebuild for gcc 4.1
 * Mon Dec 05 2005 Dennis Gilmore  - 0.9.1-2
 - retag because patch wasnt uploaded
 * Sun Dec 04 2005 Dennis Gilmore  - 0.9.1-1



From fedora-extras-commits at redhat.com  Thu Dec 22 08:10:34 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 03:10:34 -0500
Subject: rpms/libdap/devel libdap.spec,1.2,1.3
Message-ID: <200512220811.jBM8BL5X027747@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libdap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27699

Modified Files:
	libdap.spec 
Log Message:
* Thu Dec 22 2005 Patrice Dumas  - 3.5.3-3
- rebuild



Index: libdap.spec
===================================================================
RCS file: /cvs/extras/rpms/libdap/devel/libdap.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libdap.spec	21 Nov 2005 22:01:19 -0000	1.2
+++ libdap.spec	22 Dec 2005 08:10:00 -0000	1.3
@@ -2,7 +2,7 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
 Version: 3.5.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 #Source0: http://www.opendap.org/pub/3.5/source/libdap-%{version}.tar.gz
 Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libdap-%{version}.tar.gz
@@ -74,6 +74,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Dec 22 2005 Patrice Dumas  - 3.5.3-3
+- rebuild
+
 * Mon Nov 21 2005 Patrice Dumas  - 3.5.3-2
 - fix Source0
 



From fedora-extras-commits at redhat.com  Thu Dec 22 08:17:04 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 03:17:04 -0500
Subject: rpms/libsx/devel libsx.spec,1.3,1.4
Message-ID: <200512220817.jBM8Hbi4027825@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27803

Modified Files:
	libsx.spec 
Log Message:
* Thu Dec 22 2005 Patrice Dumas  2.05-7
- rebuild



Index: libsx.spec
===================================================================
RCS file: /cvs/extras/rpms/libsx/devel/libsx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsx.spec	16 Nov 2005 22:40:22 -0000	1.3
+++ libsx.spec	22 Dec 2005 08:17:04 -0000	1.4
@@ -1,7 +1,7 @@
 Name:           libsx
 Summary:        Simple X library
 Version:        2.05
-Release:        6%{?dist}
+Release:        7%{?dist}
 Group:          System Environment/Libraries
 License:        LGPL
 Url:            ftp://ftp.ac-grenoble.fr/ge/Xlibraries/
@@ -52,9 +52,8 @@
 %patch -p0 -P 5
 
 %build
-mv libsx_defs libsx_defs-old
-sed -e s/'CFLAGS = -Wall -O2 -D_POSIX_SOURCE'/"CFLAGS = %{optflags} -fPIC"/g \
-	-e 's:-L/usr/X11R6/lib::' libsx_defs-old >libsx_defs
+sed -i -e s/'CFLAGS = -Wall -O2 -D_POSIX_SOURCE'/"CFLAGS = %{optflags} -fPIC"/g \
+	-e 's:-L/usr/X11R6/lib::' libsx_defs
 make src
 
 %install
@@ -96,6 +95,9 @@
 %{_includedir}/libsx.h
 
 %changelog
+* Thu Dec 22 2005 Patrice Dumas  2.05-7
+- rebuild
+
 * Wed Nov 16 2005 Patrice Dumas  2.05-6
 - adapt for modular X
 



From fedora-extras-commits at redhat.com  Thu Dec 22 08:35:34 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 22 Dec 2005 03:35:34 -0500
Subject: rpms/scribus/devel scribus.spec,1.11,1.12
Message-ID: <200512220836.jBM8a6ou027990@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/scribus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27973

Modified Files:
	scribus.spec 
Log Message:
* Thu Dec 22 2005 Luke Macken  - 1.2.1-6
- Rebuild against new openssl (Bug #174781)




Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scribus.spec	22 May 2005 23:16:50 -0000	1.11
+++ scribus.spec	22 Dec 2005 08:35:34 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.2.1
-Release: 5
+Release:        6
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Luke Macken  - 1.2.1-6
+- Rebuild against new openssl (Bug #174781)
+
 * Sun May 22 2005 Jeremy Katz  - 1.2.1-5
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Dec 22 08:53:10 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 22 Dec 2005 03:53:10 -0500
Subject: rpms/net6/devel .cvsignore, 1.4, 1.5 net6.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200512220853.jBM8rgI5028073@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/net6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28052

Modified Files:
	.cvsignore net6.spec sources 
Log Message:
* Thu Dec 22 2005 Luke Macken  - 1.2.2-1
- 1.2.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Nov 2005 05:48:40 -0000	1.4
+++ .cvsignore	22 Dec 2005 08:53:09 -0000	1.5
@@ -1 +1 @@
-net6-1.2.1.tar.gz
+net6-1.2.2.tar.gz


Index: net6.spec
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/net6.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- net6.spec	27 Nov 2005 05:51:00 -0000	1.5
+++ net6.spec	22 Dec 2005 08:53:09 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           net6
-Version:        1.2.1
-Release:        2%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        A TCP protocol abstraction for library C++
 
 Group:          Development/Libraries
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Luke Macken  - 1.2.2-1
+- 1.2.2
+
 * Sat Nov 26 2005 Luke Macken  - 1.2.1-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Nov 2005 05:48:40 -0000	1.4
+++ sources	22 Dec 2005 08:53:09 -0000	1.5
@@ -1 +1 @@
-e5e22450144b7a788955164729ef5034  net6-1.2.1.tar.gz
+8a551a2d9785b2b0ed431bb9eeb6cfd6  net6-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 08:56:58 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 22 Dec 2005 03:56:58 -0500
Subject: rpms/obby/devel .cvsignore, 1.3, 1.4 obby.spec, 1.11, 1.12 sources, 
	1.3, 1.4
Message-ID: <200512220857.jBM8vVQ0028188@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28162

Modified Files:
	.cvsignore obby.spec sources 
Log Message:
* Thu Dec 22 2005 Luke Macken  - 0.3.0-1
- 0.3.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2005 05:52:53 -0000	1.3
+++ .cvsignore	22 Dec 2005 08:56:58 -0000	1.4
@@ -1 +1 @@
-obby-0.3.0rc3.tar.gz
+obby-0.3.0.tar.gz


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/obby.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- obby.spec	27 Nov 2005 05:52:53 -0000	1.11
+++ obby.spec	22 Dec 2005 08:56:58 -0000	1.12
@@ -1,14 +1,12 @@
-%define _rc rc3
-
 Name:           obby
 Version:        0.3.0
-Release:        1.%{_rc}%{?dist}
+Release:        1%{?dist}
 Summary:        A library which provides synced document buffers
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://releases.0x539.de/obby
-Source0:        http://releases.0x539.de/obby/%{name}-%{version}%{_rc}.tar.gz
+Source0:        http://releases.0x539.de/obby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  net6-devel, gmp-devel, gettext-devel, libsigc++
@@ -31,7 +29,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{_rc}
+%setup -q
 
 
 %build
@@ -67,6 +65,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Luke Macken  - 0.3.0-1
+- 0.3.0
+
 * Sat Nov 26 2005 Luke Macken  - 0.3.0-1.rc3
 - Remove calls to aclocal and autoconf
 - Bump to 0.3.0rc3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2005 05:52:53 -0000	1.3
+++ sources	22 Dec 2005 08:56:58 -0000	1.4
@@ -1 +1 @@
-7f6eae742cd20ceb239604bd2415a09a  obby-0.3.0rc3.tar.gz
+b14135018a3093395296cf091f9f824f  obby-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 08:59:49 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 03:59:49 -0500
Subject: rpms/tetex-tex4ht/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tetex-tex4ht.spec, 1.1, 1.2
Message-ID: <200512220900.jBM90MeZ028237@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/tetex-tex4ht/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28207

Modified Files:
	.cvsignore sources tetex-tex4ht.spec 
Log Message:
* Thu Dec 22 2005 Patrice Dumas  - 1.0.2005_12_21_0412-1
- update



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Nov 2005 23:21:46 -0000	1.2
+++ .cvsignore	22 Dec 2005 08:59:49 -0000	1.3
@@ -1,2 +1,2 @@
-tex4ht-1.0.2005_11_06_1516.tar.gz
 tex4ht-all-20050228.zip
+tex4ht-1.0.2005_12_21_0412.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Nov 2005 23:21:46 -0000	1.2
+++ sources	22 Dec 2005 08:59:49 -0000	1.3
@@ -1,2 +1,2 @@
-9e32056c20f02f39986aef5f7cdbff09  tex4ht-1.0.2005_11_06_1516.tar.gz
 26eb8df2d6631794b3df0d6fb87a0219  tex4ht-all-20050228.zip
+4c7eaa6719f8d4a2acdce1e766dd49f2  tex4ht-1.0.2005_12_21_0412.tar.gz


Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tetex-tex4ht.spec	15 Nov 2005 23:21:46 -0000	1.1
+++ tetex-tex4ht.spec	22 Dec 2005 08:59:49 -0000	1.2
@@ -2,8 +2,8 @@
 
 Summary:       Translates TeX and LaTeX into HTML or XML+MathML
 Name:          tetex-tex4ht
-Version:       1.0.2005_11_06_1516
-Release:       3%{?dist}
+Version:       1.0.2005_12_21_0412
+Release:       1%{?dist}
 License:       LaTeX Project Public License
 Group:         Applications/Publishing
 URL:           http://www.cse.ohio-state.edu/~gurari/TeX4ht/
@@ -11,7 +11,7 @@
 # Source1 is only used for documentation
 # renamed to tex4ht-all-YYYYMMDD.zip - based on last timestamp in directory
 Source1: tex4ht-all-20050228.zip
-# unversioned upstream source
+# unversioned upstream source, downloaded with wget -N
 #Source1 http://www.cse.ohio-state.edu/~gurari/TeX4ht/tex4ht-all.zip
 Source2:       tex4ht-lppl.txt
 Patch0:        tex4ht-env.patch
@@ -103,6 +103,9 @@
 texhash > /dev/null 2>&1 || :
 
 %changelog
+* Thu Dec 22 2005 Patrice Dumas  - 1.0.2005_12_21_0412-1
+- update
+
 * Mon Nov 14 2005 Patrice Dumas  - 1.0.2005_11_06_1516-3
 - add Requires for ImageMagick
 



From fedora-extras-commits at redhat.com  Thu Dec 22 09:13:30 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 22 Dec 2005 04:13:30 -0500
Subject: rpms/gobby/devel .cvsignore, 1.3, 1.4 gobby.spec, 1.3, 1.4 sources, 
	1.3, 1.4
Message-ID: <200512220914.jBM9ERoU030363@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30291

Modified Files:
	.cvsignore gobby.spec sources 
Log Message:
* Thu Dec 22 2005 Luke Macken  - 0.3.0-1
- 0.3.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2005 05:54:42 -0000	1.3
+++ .cvsignore	22 Dec 2005 09:13:30 -0000	1.4
@@ -1 +1 @@
-gobby-0.3.0rc3.tar.gz
+gobby-0.3.0.tar.gz


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/gobby.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gobby.spec	27 Nov 2005 05:54:42 -0000	1.3
+++ gobby.spec	22 Dec 2005 09:13:30 -0000	1.4
@@ -1,14 +1,12 @@
-%define _rc rc3
-
 Name:           gobby
 Version:        0.3.0
-Release:        1.%{_rc}%{?dist}
+Release:        1%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gobby.0x539.de
-Source0:        http://releases.0x539.de/gobby/%{name}-%{version}%{_rc}.tar.gz
+Source0:        http://releases.0x539.de/gobby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
@@ -27,7 +25,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{_rc}
+%setup -q
 
 
 %build
@@ -68,6 +66,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Luke Macken  - 0.3.0-1
+- 0.3.0
+
 * Sat Nov 26 2005 Luke Macken  - 0.3.0-1.rc3
 - Bump to 0.3.0rc3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2005 05:54:42 -0000	1.3
+++ sources	22 Dec 2005 09:13:30 -0000	1.4
@@ -1 +1 @@
-59f6b9b7076cb6f23fad054554eedb6a  gobby-0.3.0rc3.tar.gz
+1b674f42654cc1960d37e0a6a2fcff1f  gobby-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 09:14:32 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 22 Dec 2005 04:14:32 -0500
Subject: rpms/sobby/devel .cvsignore, 1.2, 1.3 sobby.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <200512220915.jBM9FgAX030595@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/sobby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30364

Modified Files:
	.cvsignore sobby.spec sources 
Log Message:
* Thu Dec 22 2005 Luke Macken  - 0.3.0-1
- 0.3.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sobby/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2005 15:20:52 -0000	1.2
+++ .cvsignore	22 Dec 2005 09:14:32 -0000	1.3
@@ -1 +1 @@
-sobby-0.3.0rc3.tar.gz
+sobby-0.3.0.tar.gz


Index: sobby.spec
===================================================================
RCS file: /cvs/extras/rpms/sobby/devel/sobby.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sobby.spec	12 Dec 2005 15:20:52 -0000	1.1
+++ sobby.spec	22 Dec 2005 09:14:32 -0000	1.2
@@ -1,14 +1,12 @@
-%define _rc rc3
-
 Name:           sobby
 Version:        0.3.0
-Release:        1.%{_rc}%{?dist}
+Release:        1%{?dist}
 Summary:        Standalone obby server
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gobby.0x539.de
-Source0:        http://releases.0x539.de/sobby/%{name}-%{version}%{_rc}.tar.gz
+Source0:        http://releases.0x539.de/sobby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  obby-devel, glibmm24-devel
@@ -18,7 +16,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{_rc}
+%setup -q
 
 
 %build
@@ -42,5 +40,8 @@
 
 
 %changelog
+* Thu Dec 22 2005 Luke Macken  - 0.3.0-1
+- 0.3.0
+
 * Wed Dec 07 2005 Luke Macken  - 0.3.0-1.rc3
 - Packaged for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sobby/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2005 15:20:52 -0000	1.2
+++ sources	22 Dec 2005 09:14:32 -0000	1.3
@@ -1 +1 @@
-8c3538992f83527cfb9f0a42a9e2ed87  sobby-0.3.0rc3.tar.gz
+5408fc08d610be5aac4476c6ea6277f9  sobby-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 09:16:44 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 04:16:44 -0500
Subject: rpms/pam_ssh/devel pam_ssh.spec,1.7,1.8
Message-ID: <200512220917.jBM9HG2O030658@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/pam_ssh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30639

Modified Files:
	pam_ssh.spec 
Log Message:
* Thu Dec 22 2005 Patrice Dumas  - 1.91-12
- rebuild



Index: pam_ssh.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_ssh/devel/pam_ssh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pam_ssh.spec	13 Nov 2005 20:08:11 -0000	1.7
+++ pam_ssh.spec	22 Dec 2005 09:16:43 -0000	1.8
@@ -1,6 +1,6 @@
 Name: pam_ssh
 Version: 1.91
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: PAM module for use with SSH keys and ssh-agent
 Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2
 URL: http://sourceforge.net/projects/pam-ssh/
@@ -54,6 +54,9 @@
 %dir %{_localstatedir}/run/pam_ssh
 
 %changelog
+* Thu Dec 22 2005 Patrice Dumas  - 1.91-12
+- rebuild
+
 * Sun Nov 13 2005  1.91-11
 - add patch to include openssl/md5.h 
 



From fedora-extras-commits at redhat.com  Thu Dec 22 09:23:45 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 04:23:45 -0500
Subject: rpms/libnet/devel libnet.spec,1.5,1.6
Message-ID: <200512220924.jBM9OHAI030782@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30749

Modified Files:
	libnet.spec 
Log Message:
* Thu Dec 22 2005 Patrice Dumas  - 1.1.2.1-7
- rebuild



Index: libnet.spec
===================================================================
RCS file: /cvs/extras/rpms/libnet/devel/libnet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libnet.spec	12 Sep 2005 20:07:13 -0000	1.5
+++ libnet.spec	22 Dec 2005 09:23:45 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:        C library for portable packet creation and injection
 Name:           libnet
 Version:        1.1.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        BSD
 Group:          System Environment/Libraries
 URL:            http://www.packetfactory.net/libnet/
@@ -71,6 +71,9 @@
 %{_mandir}/man3/libnet*
 
 %changelog
+* Thu Dec 22 2005 Patrice Dumas  - 1.1.2.1-7
+- rebuild
+
 * Mon Sep 12 2005 Patrice Dumas  1.1.2.1-6
 - bump release and add dist tag
 



From fedora-extras-commits at redhat.com  Thu Dec 22 09:32:55 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 04:32:55 -0500
Subject: rpms/cernlib/devel cernlib.spec,1.15,1.16
Message-ID: <200512220933.jBM9XRNl030856@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30839

Modified Files:
	cernlib.spec 
Log Message:
adjust link in cfortran dir


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cernlib.spec	21 Dec 2005 10:33:40 -0000	1.15
+++ cernlib.spec	22 Dec 2005 09:32:55 -0000	1.16
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.3
+Release:       11%{?dist}.4
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -617,7 +617,7 @@
 # add links for cfortran header files in the top include directory
 pushd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
 for file in *.h; do
-	%{__ln_s} $file cfortran/$file
+	%{__ln_s} ../$file cfortran/$file
 done
 %{__ln_s} gxint321.f gxint.f
 popd
@@ -712,7 +712,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11.3
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.4
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Thu Dec 22 09:35:01 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 04:35:01 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.21,1.22
Message-ID: <200512220935.jBM9ZYdj030923@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30902

Modified Files:
	cernlib.spec 
Log Message:
adjust link in cfortran dir


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cernlib.spec	21 Dec 2005 08:11:26 -0000	1.21
+++ cernlib.spec	22 Dec 2005 09:35:01 -0000	1.22
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.2
+Release:       11%{?dist}.4
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -614,7 +614,7 @@
 # add links for cfortran header files in the top include directory
 pushd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
 for file in *.h; do
-	%{__ln_s} $file cfortran/$file
+	%{__ln_s} ../$file cfortran/$file
 done
 %{__ln_s} gxint321.f gxint.f
 popd
@@ -709,7 +709,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11.2
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.4
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Thu Dec 22 09:38:53 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 04:38:53 -0500
Subject: rpms/cernlib/FC-3 cernlib.spec,1.16,1.17
Message-ID: <200512220939.jBM9dPXu030988@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30971

Modified Files:
	cernlib.spec 
Log Message:
adjust link in cfortran dir


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cernlib.spec	21 Dec 2005 08:08:59 -0000	1.16
+++ cernlib.spec	22 Dec 2005 09:38:53 -0000	1.17
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.2
+Release:       11%{?dist}.4
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -613,7 +613,7 @@
 # add links for cfortran header files in the top include directory
 pushd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
 for file in *.h; do
-	%{__ln_s} $file cfortran/$file
+	%{__ln_s} ../$file cfortran/$file
 done
 %{__ln_s} gxint321.f gxint.f
 popd
@@ -708,7 +708,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Dec 20 2005 Patrice Dumas  - 2005-11.2
+* Tue Dec 20 2005 Patrice Dumas  - 2005-11.4
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 



From fedora-extras-commits at redhat.com  Thu Dec 22 09:44:22 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 04:44:22 -0500
Subject: rpms/pam_ssh/devel pam_ssh-1.91-include_syslog.diff, NONE,
	1.1 pam_ssh.spec, 1.8, 1.9
Message-ID: <200512220944.jBM9is12031057@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/pam_ssh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31037

Modified Files:
	pam_ssh.spec 
Added Files:
	pam_ssh-1.91-include_syslog.diff 
Log Message:
* Thu Dec 22 2005 Patrice Dumas  - 1.91-13
- add patch to include syslog.h


pam_ssh-1.91-include_syslog.diff:

--- NEW FILE pam_ssh-1.91-include_syslog.diff ---
--- pam_ssh-1.91/pam_ssh.c	2004-04-12 15:55:08.000000000 +0200
+++ pam_ssh-1.91-pat/pam_ssh.c	2005-12-22 10:37:21.000000000 +0100
@@ -63,6 +63,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define PAM_SM_AUTH
 #define PAM_SM_SESSION


Index: pam_ssh.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_ssh/devel/pam_ssh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pam_ssh.spec	22 Dec 2005 09:16:43 -0000	1.8
+++ pam_ssh.spec	22 Dec 2005 09:44:22 -0000	1.9
@@ -1,6 +1,6 @@
 Name: pam_ssh
 Version: 1.91
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: PAM module for use with SSH keys and ssh-agent
 Source: http://dl.sourceforge.net/sourceforge/pam-ssh/pam_ssh-%{version}.tar.bz2
 URL: http://sourceforge.net/projects/pam-ssh/
@@ -8,6 +8,7 @@
 Patch1: pam_ssh-1.91-var_run.patch
 Patch2: pam_ssh-1.91-man_agent_files.diff
 Patch3: pam_ssh-1.91-include_md5.diff
+Patch4: pam_ssh-1.91-include_syslog.diff
 
 License: BSD
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,6 +30,7 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure  --with-pam-dir=/%{_lib}/security/
@@ -54,8 +56,8 @@
 %dir %{_localstatedir}/run/pam_ssh
 
 %changelog
-* Thu Dec 22 2005 Patrice Dumas  - 1.91-12
-- rebuild
+* Thu Dec 22 2005 Patrice Dumas  - 1.91-13
+- add patch to include syslog.h
 
 * Sun Nov 13 2005  1.91-11
 - add patch to include openssl/md5.h 



From fedora-extras-commits at redhat.com  Thu Dec 22 10:30:14 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 22 Dec 2005 05:30:14 -0500
Subject: rpms/intuitively/devel intuitively.spec,1.2,1.3
Message-ID: <200512221030.jBMAUl9m000433@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/intuitively/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv409

Modified Files:
	intuitively.spec 
Log Message:
* Thu Dec 22 2005 Patrice Dumas  0.7-7
- rebuild



Index: intuitively.spec
===================================================================
RCS file: /cvs/extras/rpms/intuitively/devel/intuitively.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- intuitively.spec	2 Dec 2005 14:18:35 -0000	1.2
+++ intuitively.spec	22 Dec 2005 10:30:14 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:      Automatic IP detection utility
 Name:         intuitively
 Version:      0.7
-Release:      6%{?dist}
+Release:      7%{?dist}
 URL:          http://home.samfundet.no/~tfheen/intuitively.html
 Source0:      http://ftp.debian.org/debian/pool/main/i/intuitively/intuitively_%{version}.orig.tar.gz
 License:      GPL
@@ -31,7 +31,7 @@
 %configure
 make %{?_smp_mflags}
 
-#  re-create man pages (it has a gabage due to wrong docbook2man invoking)
+# re-create man pages (it has a garbage due to wrong docbook2man invoking)
 pushd doc
 docbook2man intuitively.sgml
 docbook2man intuitively.conf.sgml
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Patrice Dumas  0.7-7
+- rebuild
+
 * Mon Nov 28 2005 Patrice Dumas  0.7-6
 - all changes are from Dmitry Butskoy
 - use a sed one-liner instead of Patch1



From fedora-extras-commits at redhat.com  Thu Dec 22 11:25:36 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Thu, 22 Dec 2005 06:25:36 -0500
Subject: rpms/recode/devel recode.spec,1.5,1.6
Message-ID: <200512221126.jBMBQ9sg002224@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/recode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2207

Modified Files:
	recode.spec 
Log Message:
Rebuild.



Index: recode.spec
===================================================================
RCS file: /cvs/extras/rpms/recode/devel/recode.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- recode.spec	26 Aug 2005 21:55:10 -0000	1.5
+++ recode.spec	22 Dec 2005 11:25:36 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Conversion between character sets and surfaces
 Name: recode
 Version: 3.6
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPL
 Group: Applications/File
 Source: http://recode.progiciels-bpi.ca/archives/recode-%{version}.tar.gz
@@ -87,6 +87,9 @@
 %{_includedir}/*
 
 %changelog
+* Thu Dec 22 2005 Zoltan Kota  3.6-20
+- rebuild
+
 * Fri Aug 26 2005 Zoltan Kota  3.6-19
 - fix requires
 - disable static libs and remove libtool archives



From fedora-extras-commits at redhat.com  Thu Dec 22 11:36:34 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 22 Dec 2005 06:36:34 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.26,1.27
Message-ID: <200512221137.jBMBb6jC002355@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2333

Modified Files:
	Inventor.spec 
Log Message:
Reflect mesa packages bugs reported to be fixed.


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Inventor.spec	14 Dec 2005 09:45:41 -0000	1.26
+++ Inventor.spec	22 Dec 2005 11:36:34 -0000	1.27
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        16%{?dist}
+Release:        17%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -41,7 +41,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libGLU-devel
-BuildRequires:  libGL-devel
 BuildRequires:	libGLw-devel
 # Work around to xorg-x11-proto-devel missing to require X11/Xauth.h
 BuildRequires:	libXau-devel
@@ -72,10 +71,6 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	libGLU-devel
-# PR #175253: libGLU-devel should implicitly pull-in libGL-devel
-Requires:	libGL-devel
-# PR #173712: libGL-devel should implicitly pull-in libX11-devel
-Requires:	libX11-devel
 Requires:	freetype-devel libjpeg-devel
 
 %description    devel
@@ -312,6 +307,10 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Thu Dec 21 2005 Ralf Cors??pius  - 2.1.5-17
+- Remove BR: libX11-devel (#173712 reported to be fixed).
+- Remove BR: libGL-devel (#175253 reported to be fixed).
+
 * Wed Dec 14 2005 Ralf Corsepius  - 2.1.5-16
 - Remove BR: libXext-devel (Impl. R'd by openmotif-devel).
 - Remove BR: xorg-x11-proto-devel (PR #175256).



From fedora-extras-commits at redhat.com  Thu Dec 22 11:37:44 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 22 Dec 2005 06:37:44 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.27,1.28
Message-ID: <200512221138.jBMBcHfb002399@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2374

Modified Files:
	Inventor.spec 
Log Message:
I love changelogs ;)


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Inventor.spec	22 Dec 2005 11:36:34 -0000	1.27
+++ Inventor.spec	22 Dec 2005 11:37:44 -0000	1.28
@@ -307,7 +307,7 @@
 %{_libdir}/Inventor/examples
 
 %changelog
-* Thu Dec 21 2005 Ralf Cors??pius  - 2.1.5-17
+* Thu Dec 22 2005 Ralf Cors??pius  - 2.1.5-17
 - Remove BR: libX11-devel (#173712 reported to be fixed).
 - Remove BR: libGL-devel (#175253 reported to be fixed).
 



From fedora-extras-commits at redhat.com  Thu Dec 22 11:41:43 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 22 Dec 2005 06:41:43 -0500
Subject: rpms/Coin2/devel Coin2.spec,1.23,1.24
Message-ID: <200512221142.jBMBgFTr002499@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Coin2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2477

Modified Files:
	Coin2.spec 
Log Message:
- Remove hacks to mesa/X11 packaging bugs now reported to be fixed.



Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Coin2.spec	15 Dec 2005 13:46:07 -0000	1.23
+++ Coin2.spec	22 Dec 2005 11:41:43 -0000	1.24
@@ -13,7 +13,7 @@
 Summary: High-level 3D visualization library
 Name: Coin2
 Version: 2.4.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -29,12 +29,6 @@
 BuildRequires: libGLU-devel
 BuildRequires: libXext-devel
 
-# Workarounds to dependency bugs in modular X:
-# Missing in libGLU-devel
-BuildRequires: libGL-devel
-# Missing in libGL-devel, libXext-devel
-BuildRequires: libX11-devel
-
 BuildRequires: zlib-devel
 BuildRequires: bzip2-devel
 BuildRequires: fontconfig-devel
@@ -55,9 +49,6 @@
 Requires: %{name} = %{version}-%{release}
 Requires: zlib-devel bzip2-devel
 Requires: libGLU-devel
-Requires: libGL-devel
-# Missing in libGL-devel, libXext-devel
-BuildRequires: libX11-devel
 
 %description devel
 Development package for Coin
@@ -124,6 +115,9 @@
 %doc %{coin_htmldir}
 
 %changelog
+* Thu Dec 22 2005 Ralf Corsepius  - 2.4.4-6
+- Remove hacks to mesa/X11 packaging bugs now reported to be fixed.
+
 * Thu Dec 15 2005 Ralf Corsepius  - 2.4.4-5
 - More hacks for modular X11.
 - Add Coin-2.4.4-gcc-4.1.diff.



From fedora-extras-commits at redhat.com  Thu Dec 22 11:48:06 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Thu, 22 Dec 2005 06:48:06 -0500
Subject: rpms/python-bibtex/devel python-bibtex.spec,1.8,1.9
Message-ID: <200512221148.jBMBmceB002635@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/python-bibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2618

Modified Files:
	python-bibtex.spec 
Log Message:
Rebuild.



Index: python-bibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/python-bibtex/devel/python-bibtex.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-bibtex.spec	14 Oct 2005 21:37:25 -0000	1.8
+++ python-bibtex.spec	22 Dec 2005 11:48:06 -0000	1.9
@@ -5,7 +5,7 @@
 Summary: Python extension to parse BibTeX files
 Name: python-bibtex
 Version: 1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Libraries
 Source: http://dl.sf.net/pybliographer/python-bibtex-1.2.2.tar.gz
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Zoltan Kota  - 1.2.2-2
+- rebuild
+
 * Fri Oct 14 2005 Zoltan Kota  - 1.2.2-1
 - update to 1.2.2
 - add dist tag



From fedora-extras-commits at redhat.com  Thu Dec 22 12:02:03 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 22 Dec 2005 07:02:03 -0500
Subject: rpms/Coin2/FC-4 Coin-2.4.4-gcc-4.1.diff,NONE,1.1
Message-ID: <200512221202.jBMC2TRk004370@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Coin2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4357

Added Files:
	Coin-2.4.4-gcc-4.1.diff 
Log Message:
New.

Coin-2.4.4-gcc-4.1.diff:

--- NEW FILE Coin-2.4.4-gcc-4.1.diff ---
--- Coin-2.4.4.orig/src/nodes/SoExtSelection.cpp	2005-06-09 13:35:44.000000000 +0200
+++ Coin-2.4.4/src/nodes/SoExtSelection.cpp	2005-12-15 14:14:54.000000000 +0100
@@ -348,7 +348,7 @@
     SbList coords;
     SoTimerSensor * updatetimer;
 
-    SelectionState::SelectionState(SoExtSelection * t)
+    SelectionState(SoExtSelection * t)
     {
       this->updatetimer = new SoTimerSensor(&SoExtSelectionP::timercallback, t);
       this->updatetimer->setBaseTime(SbTime::zero());
@@ -356,7 +356,7 @@
       this->reset();
     }
 
-    SelectionState::~SelectionState()
+    ~SelectionState()
     {
       delete this->updatetimer;
     }



From fedora-extras-commits at redhat.com  Thu Dec 22 12:19:30 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 22 Dec 2005 07:19:30 -0500
Subject: rpms/Coin2/FC-4 Coin2.spec,1.14,1.15
Message-ID: <200512221220.jBMCK2xQ004574@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Coin2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4554

Modified Files:
	Coin2.spec 
Log Message:
- Add Coin-2.4.4-gcc-4.1.diff.
- Remove ancient changelog entries from spec file.




Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-4/Coin2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Coin2.spec	22 Sep 2005 07:31:34 -0000	1.14
+++ Coin2.spec	22 Dec 2005 12:19:30 -0000	1.15
@@ -13,7 +13,7 @@
 Summary: High-level 3D visualization library
 Name: Coin2
 Version: 2.4.4
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -23,6 +23,7 @@
 
 Patch0: coin-2.3.0-simage-soname.diff
 Patch1: coin-2.3.0-openal-soname.diff
+Patch2:	Coin-2.4.4-gcc-4.1.diff
 Patch5: coin-2.3.0-man3.diff
 
 BuildRequires: xorg-x11-Mesa-libGL
@@ -55,6 +56,7 @@
 %setup -q -n Coin-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch5 -p1
 
 sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \
@@ -112,6 +114,10 @@
 %doc %{coin_htmldir}
 
 %changelog
+* Thu Sep 22 2005 Ralf Cors??pius  - 2.4.4-3.1
+- Add Coin-2.4.4-gcc-4.1.diff.
+- Remove ancient changelog entries from spec file.
+
 * Thu Sep 22 2005 Ralf Corsepius  - 2.4.4-3
 - Remove simacros patch.
 - Remove libtool patch.
@@ -141,22 +147,3 @@
 - Include simacros.
 - Regenerate configure from simacros and FC3 libtool for x86_64.
 - Don't install bogusly generated manpages for dirs.
-
-* Sun Jul 4  2004 Ralf Corsepius  - 0:2.3.0-0.fdr.4
-- Let Coin-devel Require: bzip2-devel, zlib-devel.
-- Use @XX@ patterns in soname sed calls.
-- Remove Mesa from BuildRequires.
-
-* Sat Jul 3  2004 Ralf Corsepius  - 0:2.3.0-0.fdr.3
-- Disable run-time linkage for GLU, bzip2, zlib.
-- Add SONAME-hacks to simage, openal, freetype.
-- Enable static libs.
-
-* Fri Jun 25 2004 Ralf Corsepius  - 0:2.3.0-0.fdr.2
-- Fix package description.
-- Initial submission to Fedora Extra.
-
-* Thu Jun 24 2004 Ralf Corsepius  - 0:2.3.0-0.fdr.1
-- Update to 2.3.0
-- Install html docs to default installation dir (%%{_datadir}/html).
-- Remove dependency to simage.



From fedora-extras-commits at redhat.com  Thu Dec 22 13:05:14 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 22 Dec 2005 08:05:14 -0500
Subject: rpms/ktrack/devel ktrack.spec,1.12,1.13
Message-ID: <200512221305.jBMD5krk006427@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/ktrack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6410

Modified Files:
	ktrack.spec 
Log Message:
Rebuild for gcc really :)



Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/rpms/ktrack/devel/ktrack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ktrack.spec	22 May 2005 23:44:21 -0000	1.12
+++ ktrack.spec	22 Dec 2005 13:05:13 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 11.rc1.fc4
+Release: 12.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
+* Thu Dec 22 2005 Dennis Gilmore  - 0.3.0-12.rc1
+- rebuild for gcc 4.1
+
 * Sun May 22 2005 Jeremy Katz  - 0.3.0-11.rc1.fc4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Dec 22 15:03:20 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 22 Dec 2005 10:03:20 -0500
Subject: rpms/gpgme03/devel gpgme03.spec,1.12,1.13
Message-ID: <200512221504.jBMF43wi010060@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/gpgme03/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10043

Modified Files:
	gpgme03.spec 
Log Message:
Rebuild for gcc 4.1



Index: gpgme03.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme03/devel/gpgme03.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gpgme03.spec	18 Mar 2005 03:16:47 -0000	1.12
+++ gpgme03.spec	22 Dec 2005 15:03:19 -0000	1.13
@@ -4,7 +4,7 @@
 Summary:        GnuPG Made Easy interface library
 Name:           gpgme03
 Version:        0.3.16
-Release:        8
+Release:        9%{?dist}
 License:        GPL
 Group:          Applications/System
 Source:         ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-0.3.16.tar.gz
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Dennis Gilmore  - 0.3.16-9
+- rebuild with gcc 4.1
+
 * Fri Mar 18 2005 Michael Schwendt  - 0.3.16-8
 - Fix build for FC4.
 - Remove conflict with gpgme packages (relocate files in -devel



From fedora-extras-commits at redhat.com  Thu Dec 22 15:08:49 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 22 Dec 2005 10:08:49 -0500
Subject: rpms/konversation/devel konversation.spec,1.3,1.4
Message-ID: <200512221509.jBMF9L3a010122@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10105

Modified Files:
	konversation.spec 
Log Message:
Rebuild for gcc 4.1



Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- konversation.spec	23 Oct 2005 04:56:09 -0000	1.3
+++ konversation.spec	22 Dec 2005 15:08:48 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           konversation
 Version:        0.18
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
 Group:          Applications/Internet
@@ -83,18 +83,24 @@
 
 
 %changelog
+* 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
-touch --no-create %{_datadir}/icons/hicolor || :
 - http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#implementation_notes
+
 * Sun Jul 03 2005 Dennis Gilmore  - 0.18-4
 - Explicly export QT lib and include dirs  for x86_64 build issue
+
 * Tue Jun 28 2005  Dennis Gilmore  - 0.18-3
 - Destop-file-install,  change gcc4 patch  to configure  
   remove unneeded build deps.
+
 * Mon Jun 27 2005  Dennis Gilmore  - 0.18-2
 - Fix build requires,set QT, %%lang'ify LOCALE bits and HTML docs
   move automake to prep
+
 * Sat Jun 25 2005  Dennis Gilmore  - 0.18-1
 - Initial build



From fedora-extras-commits at redhat.com  Thu Dec 22 15:16:08 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 22 Dec 2005 10:16:08 -0500
Subject: rpms/gentium-fonts - New directory
Message-ID: <200512221516.jBMFGANc010262@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10254/gentium-fonts

Log Message:
Directory /cvs/extras/rpms/gentium-fonts added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 22 15:16:14 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 22 Dec 2005 10:16:14 -0500
Subject: rpms/gentium-fonts/devel - New directory
Message-ID: <200512221516.jBMFGGjU010277@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10254/gentium-fonts/devel

Log Message:
Directory /cvs/extras/rpms/gentium-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 22 15:17:14 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 22 Dec 2005 10:17:14 -0500
Subject: rpms/gentium-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512221517.jBMFHGf7010311@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10299

Added Files:
	Makefile import.log 
Log Message:
Setup of module gentium-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module gentium-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 22 15:17:19 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 22 Dec 2005 10:17:19 -0500
Subject: rpms/gentium-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512221517.jBMFHLTV010332@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10299/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gentium-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gentium-fonts
# $Id$
NAME := gentium-fonts
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 Dec 22 15:24:06 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 22 Dec 2005 10:24:06 -0500
Subject: rpms/perl-HTML-Template-Expr/FC-4 .cvsignore, 1.2,
	1.3 perl-HTML-Template-Expr.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512221524.jBMFOc5L010424@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10384/FC-4

Modified Files:
	.cvsignore perl-HTML-Template-Expr.spec sources 
Log Message:
* Thu Dec 22 2005 Ville Skytt??  - 0.05-1
- 0.05.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Aug 2005 20:45:12 -0000	1.2
+++ .cvsignore	22 Dec 2005 15:24:06 -0000	1.3
@@ -1 +1 @@
-HTML-Template-Expr-0.04.tar.gz
+HTML-Template-Expr-0.05.tar.gz


Index: perl-HTML-Template-Expr.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/perl-HTML-Template-Expr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-HTML-Template-Expr.spec	9 Aug 2005 20:47:57 -0000	1.2
+++ perl-HTML-Template-Expr.spec	22 Dec 2005 15:24:06 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Template-Expr
-Version:        0.04
+Version:        0.05
 Release:        1%{?dist}
 Summary:        Expression support extension for HTML::Template
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Ville Skytt??  - 0.05-1
+- 0.05.
+
 * Tue Aug  9 2005 Ville Skytt??  - 0.04-1
 - Bump for first FE build.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Aug 2005 20:45:12 -0000	1.2
+++ sources	22 Dec 2005 15:24:06 -0000	1.3
@@ -1 +1 @@
-7b34e122677342475cfde168a70d7cab  HTML-Template-Expr-0.04.tar.gz
+726e5bb49083cbf7d752767f7c3f29cf  HTML-Template-Expr-0.05.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 15:24:12 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 22 Dec 2005 10:24:12 -0500
Subject: rpms/perl-HTML-Template-Expr/devel .cvsignore, 1.2,
	1.3 perl-HTML-Template-Expr.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512221524.jBMFOiw2010429@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-HTML-Template-Expr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10384/devel

Modified Files:
	.cvsignore perl-HTML-Template-Expr.spec sources 
Log Message:
* Thu Dec 22 2005 Ville Skytt??  - 0.05-1
- 0.05.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Aug 2005 20:45:12 -0000	1.2
+++ .cvsignore	22 Dec 2005 15:24:12 -0000	1.3
@@ -1 +1 @@
-HTML-Template-Expr-0.04.tar.gz
+HTML-Template-Expr-0.05.tar.gz


Index: perl-HTML-Template-Expr.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/perl-HTML-Template-Expr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-HTML-Template-Expr.spec	9 Aug 2005 20:47:57 -0000	1.2
+++ perl-HTML-Template-Expr.spec	22 Dec 2005 15:24:12 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Template-Expr
-Version:        0.04
+Version:        0.05
 Release:        1%{?dist}
 Summary:        Expression support extension for HTML::Template
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Ville Skytt??  - 0.05-1
+- 0.05.
+
 * Tue Aug  9 2005 Ville Skytt??  - 0.04-1
 - Bump for first FE build.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Aug 2005 20:45:12 -0000	1.2
+++ sources	22 Dec 2005 15:24:12 -0000	1.3
@@ -1 +1 @@
-7b34e122677342475cfde168a70d7cab  HTML-Template-Expr-0.04.tar.gz
+726e5bb49083cbf7d752767f7c3f29cf  HTML-Template-Expr-0.05.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 15:27:18 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 22 Dec 2005 10:27:18 -0500
Subject: rpms/gentium-fonts import.log,1.1,1.2
Message-ID: <200512221527.jBMFRoTo010594@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10522

Modified Files:
	import.log 
Log Message:
auto-import gentium-fonts-1.02-2 on branch devel from gentium-fonts-1.02-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gentium-fonts/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Dec 2005 15:17:13 -0000	1.1
+++ import.log	22 Dec 2005 15:27:18 -0000	1.2
@@ -0,0 +1 @@
+gentium-fonts-1_02-2:HEAD:gentium-fonts-1.02-2.src.rpm:1135265206



From fedora-extras-commits at redhat.com  Thu Dec 22 15:27:24 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 22 Dec 2005 10:27:24 -0500
Subject: rpms/gentium-fonts/devel gentium-fonts.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512221527.jBMFRuKX010598@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10522/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gentium-fonts.spec 
Log Message:
auto-import gentium-fonts-1.02-2 on branch devel from gentium-fonts-1.02-2.src.rpm


--- NEW FILE gentium-fonts.spec ---
%define archivename	ttf-sil-gentium
%define fontdir         %{_datadir}/fonts/gentium

Name:           gentium-fonts
Version:        1.02
Release:        2
Summary:        SIL Gentium fonts

Group:          User Interface/X
License:        SIL Open Font License
URL:            http://scripts.sil.org/Gentium_linux
# Source0 can be downloaded from the above URL, search for "tar.gz"
Source0:        ttf-sil-gentium_1.0.2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

# Providing the name of an upstream RPM
Obsoletes:      fonts-sil-gentium
Provides:       fonts-sil-gentium

%description
SIL Gentium ("belonging to the nations" in Latin) is a Unicode typeface family
designed to enable the many diverse ethnic groups around the world who use
the Latin script to produce readable, high-quality publications. It supports
a wide range of Latin-based alphabets and includes glyphs that correspond to
all the Latin ranges of Unicode.

%prep
%setup -q -n %{archivename}-%{version}


%build


%install
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
rm -rf $RPM_BUILD_ROOT


%post
if [ -x %{_bindir}/fc-cache ]; then
  %{_bindir}/fc-cache %{_datadir}/fonts
fi


%postun
if [ "$1" = "0" ]; then
  if [ -x %{_bindir}/fc-cache ]; then
    %{_bindir}/fc-cache %{_datadir}/fonts
  fi
fi


%files
%defattr(0644,root,root,0755)
%doc FONTLOG GENTIUM-FAQ OFL OFL-FAQ QUOTES README

%dir %{fontdir}
%{fontdir}/*.ttf
%ghost %{fontdir}/fonts.cache-1
%ghost %{fontdir}/fonts.cache-2


%changelog

* Wed Dec 21 2005 Roozbeh Porunader  1.02-2
- Added comment to Source0 about where to get the file
- Added Provides and Obsoletes for upsteam RPM name

* Mon Dec 19 2005 Roozbeh Pournader  1.02-1
- Initial packaging, borrowing many things from dejavu-fonts


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gentium-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Dec 2005 15:17:19 -0000	1.1
+++ .cvsignore	22 Dec 2005 15:27:24 -0000	1.2
@@ -0,0 +1 @@
+ttf-sil-gentium_1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gentium-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Dec 2005 15:17:19 -0000	1.1
+++ sources	22 Dec 2005 15:27:24 -0000	1.2
@@ -0,0 +1 @@
+4c3e6ae586be277537ebb68f2a45b883  ttf-sil-gentium_1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 15:39:12 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 22 Dec 2005 10:39:12 -0500
Subject: owners owners.list,1.474,1.475
Message-ID: <200512221539.jBMFdjM0010712@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10695

Modified Files:
	owners.list 
Log Message:
Added gentium-fonts



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -r1.474 -r1.475
--- owners.list	20 Dec 2005 20:04:54 -0000	1.474
+++ owners.list	22 Dec 2005 15:39:12 -0000	1.475
@@ -252,6 +252,7 @@
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|general|For bugs not specific to any single component.|dkl at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|gentium-fonts|SIL Gentium fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|gentoo|Graphical file management program in GTK+ for Linux|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|geomview|An interactive 3D viewing program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gfontview|A font viewer for Type 1 and TrueType fonts|mpeters at mac.com|extras-qa at fedoraproject.org|ksfiles at gmail.com



From fedora-extras-commits at redhat.com  Thu Dec 22 16:02:32 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 22 Dec 2005 11:02:32 -0500
Subject: rpms/perl-GDGraph/devel .cvsignore, 1.2, 1.3 perl-GDGraph.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200512221603.jBMG34AV012471@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GDGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12447

Modified Files:
	.cvsignore perl-GDGraph.spec sources 
Log Message:
Update to 1.4305.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:00:44 -0000	1.2
+++ .cvsignore	22 Dec 2005 16:02:32 -0000	1.3
@@ -1 +1 @@
-GDGraph-1.43.tar.gz
+GDGraph-1.4305.tar.gz


Index: perl-GDGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph/devel/perl-GDGraph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-GDGraph.spec	6 Apr 2005 22:12:45 -0000	1.5
+++ perl-GDGraph.spec	22 Dec 2005 16:02:32 -0000	1.6
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-GDGraph
-Version:        1.43
-Release:        4
-
+Version:        1.4305
+Release:        1%{?dist}
 Summary:        Graph generation package for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/GDGraph/
-Source0:        http://www.cpan.org/authors/id/M/MV/MVERB/GDGraph-1.43.tar.gz
+Source0:        http://www.cpan.org/authors/id/B/BW/BWARFIELD/GDGraph-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,6 +20,9 @@
 
 %prep
 %setup -q -n GDGraph-%{version}
+%{__perl} -pi -e 's{^#!/usr/local/bin/perl\b}{#!%{__perl}}' samples/sample1A.pl
+%{__perl} -pi -e 's/\r\n/\n/' samples/sample64.pl
+chmod a-x CHANGES README
 
 
 %build
@@ -37,8 +37,9 @@
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
+find $RPM_BUILD_ROOT -type f -name "*\.pm\.orig" -exec rm -f {} ';'
 
-%check || :
+%check
 make test
 
 
@@ -54,13 +55,16 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 22 2005 Jose Pedro Oliveira  - 1.4305-1
+- Update to 1.4305.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.43-4
 - rebuilt
 
-* Sun Jul 11 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.3
+* Sun Jul 11 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.3
 - Unowned directory: %%{perl_vendorlib}/GD (see bug 1800 comment #1).
 
-* Wed Jun 30 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.2
+* Wed Jun 30 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.2
 - Bring up to date with current fedora.us perl spec template.
 - Added the samples directory to the documentation files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:00:44 -0000	1.2
+++ sources	22 Dec 2005 16:02:32 -0000	1.3
@@ -1 +1 @@
-cf546f2de827a56458afe288ab0807f2  GDGraph-1.43.tar.gz
+7cba9e4e9fc0c146ab1e34d00f61d932  GDGraph-1.4305.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 17:03:19 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 12:03:19 -0500
Subject: rpms/kompose/devel kompose-0.5.3-x.patch, NONE, 1.1 kompose.spec,
	1.1, 1.2
Message-ID: <200512221704.jBMH4eY9014505@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kompose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14475

Modified Files:
	kompose.spec 
Added Files:
	kompose-0.5.3-x.patch 
Log Message:
Add patch to remove X checks in configure for modular X


kompose-0.5.3-x.patch:

--- NEW FILE kompose-0.5.3-x.patch ---
--- kompose-0.5.4/configure.orig	2005-11-11 14:25:22.000000000 -0700
+++ kompose-0.5.4/configure	2005-11-21 13:16:23.000000000 -0700
@@ -26605,535 +26605,6 @@
 
 fi;
 
-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-
-echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
-
-if test "${kde_cv_have_x+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # One or both of the vars are not set, and there is no cached value.
-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-   kde_x_includes=NO
-else
-   kde_x_includes=$x_includes
-fi
-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-   kde_x_libraries=NO
-else
-   kde_x_libraries=$x_libraries
-fi
-
-# below we use the standard autoconf calls
-ac_x_libraries=$kde_x_libraries
-ac_x_includes=$kde_x_includes
-
-
-
-
-if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
-  # First, try using that file with no special directory specified.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$x_direct_test_include>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /usr/X11/include          \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done
-fi
-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = NO
-
-if test "$ac_x_libraries" = NO; then
-  # Check for the libraries.
-
-  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS="$LIBS"
-  LIBS="-l$x_direct_test_library $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-${x_direct_test_function}()
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-    /usr/X11/lib${kdelibsuff}           \
-    /usr/X11R6/lib${kdelibsuff}         \
-    /usr/X11R5/lib${kdelibsuff}         \
-    /usr/X11R4/lib${kdelibsuff}         \
-                                        \
-    /usr/lib${kdelibsuff}/X11           \
-    /usr/lib${kdelibsuff}/X11R6         \
-    /usr/lib${kdelibsuff}/X11R5         \
-    /usr/lib${kdelibsuff}/X11R4         \
-                                        \
-    /usr/local/X11/lib${kdelibsuff}     \
-    /usr/local/X11R6/lib${kdelibsuff}   \
-    /usr/local/X11R5/lib${kdelibsuff}   \
-    /usr/local/X11R4/lib${kdelibsuff}   \
-                                        \
-    /usr/local/lib${kdelibsuff}/X11     \
-    /usr/local/lib${kdelibsuff}/X11R6   \
-    /usr/local/lib${kdelibsuff}/X11R5   \
-    /usr/local/lib${kdelibsuff}/X11R4   \
-                                        \
-    /usr/X386/lib${kdelibsuff}          \
-    /usr/x386/lib${kdelibsuff}          \
-    /usr/XFree86/lib${kdelibsuff}/X11   \
-                                        \
-    /usr/lib${kdelibsuff}               \
-    /usr/local/lib${kdelibsuff}         \
-    /usr/unsupported/lib${kdelibsuff}   \
-    /usr/athena/lib${kdelibsuff}        \
-    /usr/local/x11r5/lib${kdelibsuff}   \
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
-    /lib/usr/lib${kdelibsuff}/X11       \
-                                        \
-    /usr/openwin/lib${kdelibsuff}       \
-    /usr/openwin/share/lib${kdelibsuff} \
-    ; \
-do
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi # $ac_x_libraries = NO
-
-case "$host" in
-mips-sgi-irix6*)
-  ;;
-*-*-solaris*)
-  ;;
-*)
-  rm -fr conftest.dir
-if mkdir conftest.dir; then
-  cd conftest.dir
-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-  cat >Imakefile <<'_ACEOF'
-acfindx:
-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-_ACEOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-	 test -f $ac_im_libdir/libX11.$ac_extension; then
-	ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case $ac_im_incroot in
-	/usr/include) ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-    esac
-    case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-    esac
-  fi
-  cd ..
-  rm -fr conftest.dir
-fi
-
-  if test -z "$ac_x_includes"; then
-    ac_x_includes="."
-  fi
-  if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib${kdelibsuff}"
-  fi
-esac
-#from now on we use our own again
-
-# when the user already gave --x-includes, we ignore
-# what the standard autoconf macros told us.
-if test "$kde_x_includes" = NO; then
-  kde_x_includes=$ac_x_includes
-fi
-
-# for --x-libraries too
-if test "$kde_x_libraries" = NO; then
-  kde_x_libraries=$ac_x_libraries
-fi
-
-if test "$kde_x_includes" = NO; then
-  { { echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5
-echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-if test "$kde_x_libraries" = NO; then
-  { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
-echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# Record where we found X for the cache.
-kde_cv_have_x="have_x=yes \
-         kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
-
-fi
-
-eval "$kde_cv_have_x"
-
-if test "$have_x" != yes; then
-  echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
-  no_x=yes
-else
-  echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
-echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
-fi
-
-if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-  X_INCLUDES=""
-  x_includes=".";  else
-  x_includes=$kde_x_includes
-  X_INCLUDES="-I$x_includes"
-fi
-
-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
-  X_LDFLAGS=""
-  x_libraries="/usr/lib";  else
-  x_libraries=$kde_x_libraries
-  X_LDFLAGS="-L$x_libraries"
-fi
-all_includes="$X_INCLUDES"
-all_libraries="$X_LDFLAGS"
-
-# Check for libraries that X11R6 Xt/Xaw programs need.
-ac_save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-# check for ICE first), but we must link in the order -lSM -lICE or
-# we get undefined symbols.  So assume we have SM if we have ICE.
-# These have to be linked with before -lX11, unlike the other
-# libraries we check for below, so use a different variable.
-#  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
-echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char IceConnectionNumber ();
-int
-main ()
-{
-IceConnectionNumber ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ICE_IceConnectionNumber=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ICE_IceConnectionNumber=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-  LIBSM="-lSM -lICE"
-fi
-
-LDFLAGS="$ac_save_LDFLAGS"
-
-LIB_X11='-lX11 $(LIBSOCKET)'
-
-echo "$as_me:$LINENO: checking for libXext" >&5
-echo $ECHO_N "checking for libXext... $ECHO_C" >&6
-if test "${kde_cv_have_libXext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-kde_ldflags_safe="$LDFLAGS"
-kde_libs_safe="$LIBS"
-
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-LIBS="-lXext -lX11 $LIBSOCKET"
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include 
-#ifdef STDC_HEADERS
-# include 
-#endif
-
-int
-main ()
-{
-
-printf("hello Xext\n");
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  kde_cv_have_libXext=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-kde_cv_have_libXext=no
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-
-LDFLAGS=$kde_ldflags_safe
-LIBS=$kde_libs_safe
-
-fi
-
-
-echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
-echo "${ECHO_T}$kde_cv_have_libXext" >&6
-
-if test "$kde_cv_have_libXext" = "no"; then
-  { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-can't find it itself, we stop here assuming that make wouldn't find
-them either." >&5
-echo "$as_me: error: We need a working libXext to proceed. Since configure
-can't find it itself, we stop here assuming that make wouldn't find
-them either." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-LIB_XEXT="-lXext"
-QTE_NORTTI=""
-
-elif test "$kde_use_qt_emb" = "yes"; then
-    CPPFLAGS=-DQWS
-  CXXFLAGS="$CXXFLAGS -fno-rtti"
-  QTE_NORTTI="-fno-rtti -DQWS"
-  X_PRE_LIBS=""
-  LIB_X11=""
-  LIB_XEXT=""
-  LIB_XRENDER=""
-  LIBSM=""
-  X_INCLUDES=""
-  X_LDFLAGS=""
-  x_includes=""
-  x_libraries=""
-elif test "$kde_use_qt_mac" = "yes"; then
-      CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
-  CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
-  X_PRE_LIBS=""
-  LIB_X11=""
-  LIB_XEXT=""
-  LIB_XRENDER=""
-  LIBSM=""
-  X_INCLUDES=""
-  X_LDFLAGS=""
-  x_includes=""
-  x_libraries=""
-fi
-
-
-
-
-
-
-
-
-
-
-
 
 
   LIBPTHREAD=""


Index: kompose.spec
===================================================================
RCS file: /cvs/extras/rpms/kompose/devel/kompose.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kompose.spec	4 Aug 2005 17:09:36 -0000	1.1
+++ kompose.spec	22 Dec 2005 17:03:17 -0000	1.2
@@ -1,11 +1,12 @@
 Name: kompose
 Summary: Provides a full screen view of all open windows
 Version: 0.5.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: User Interface/X
 Url: http://kompose.berlios.de
 Source: http://download.berlios.de/kompose/%{name}-%{version}.tar.bz2
+Patch0: kompose-0.5.3-x.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kdelibs-devel >= 3.2, imlib2-devel
 Requires: kdebase
@@ -19,6 +20,8 @@
 
 %prep
 %setup -q
+%patch -p1 -b .x
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -26,6 +29,7 @@
 %configure --disable-rpath
 make %{?_smp_mflags}
 
+
 %install
 %makeinstall
 desktop-file-install --vendor=fedora \
@@ -63,6 +67,9 @@
 %{_datadir}/pixmaps/kompose.png
 
 %changelog
+* Thu Dec 22 2005 - Orion Poplawski  0.5.3-4
+- Add patch to remove X checks in configure for modular X
+
 * Mon Jul 25 2005 - Orion Poplawski  0.5.3-3
 - Requires kdebase
 - Fix doc symlink.



From fedora-extras-commits at redhat.com  Thu Dec 22 18:18:06 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 22 Dec 2005 13:18:06 -0500
Subject: rpms/perl-GD/FC-4 .cvsignore, 1.6, 1.7 perl-GD.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200512221818.jBMIIcJd017054@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GD/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17023

Modified Files:
	.cvsignore perl-GD.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Aug 2005 18:24:27 -0000	1.6
+++ .cvsignore	22 Dec 2005 18:18:06 -0000	1.7
@@ -1 +1 @@
-GD-2.28.tar.gz
+GD-2.30.tar.gz


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/FC-4/perl-GD.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-GD.spec	8 Aug 2005 18:24:27 -0000	1.8
+++ perl-GD.spec	22 Dec 2005 18:18:06 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-GD
-Version:        2.28
+Version:        2.30
 Release:        1%{?dist}
 Summary:        Perl interface to the GD graphics library
 
@@ -25,7 +25,7 @@
 %prep
 %setup -q -n GD-%{version}
 %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \
-  qd.pl bdf_scripts/cvtbdf.pl demos/{*.{pl,cgi},truetype_test}
+  qd.pl bdf_scripts/bdf2gdfont.pl demos/{*.{pl,cgi},truetype_test}
 chmod 644 bdf_scripts/* demos/*
 chmod 755 qd.pl
 
@@ -44,7 +44,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Oct 21 2005 Jose Pedro Oliveira  - 2.30-1
+- Update to 2.30.
+
 * Mon Aug  8 2005 Jose Pedro Oliveira  - 2.28-1
 - Update to 2.28.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Aug 2005 18:24:27 -0000	1.6
+++ sources	22 Dec 2005 18:18:06 -0000	1.7
@@ -1 +1 @@
-de591245f779e2ed11851d1470d4e9df  GD-2.28.tar.gz
+cbc232526c0b348582f386abea802fbc  GD-2.30.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 18:31:38 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 22 Dec 2005 13:31:38 -0500
Subject: rpms/perl-GDGraph/FC-4 .cvsignore, 1.2, 1.3 perl-GDGraph.spec, 1.5, 
	1.6 sources, 1.2, 1.3
Message-ID: <200512221832.jBMIWAkd017166@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-serv17145

Modified Files:
	.cvsignore perl-GDGraph.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:00:44 -0000	1.2
+++ .cvsignore	22 Dec 2005 18:31:37 -0000	1.3
@@ -1 +1 @@
-GDGraph-1.43.tar.gz
+GDGraph-1.4305.tar.gz


Index: perl-GDGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/perl-GDGraph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-GDGraph.spec	6 Apr 2005 22:12:45 -0000	1.5
+++ perl-GDGraph.spec	22 Dec 2005 18:31:37 -0000	1.6
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-GDGraph
-Version:        1.43
-Release:        4
-
+Version:        1.4305
+Release:        1%{?dist}
 Summary:        Graph generation package for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/GDGraph/
-Source0:        http://www.cpan.org/authors/id/M/MV/MVERB/GDGraph-1.43.tar.gz
+Source0:        http://www.cpan.org/authors/id/B/BW/BWARFIELD/GDGraph-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,6 +20,9 @@
 
 %prep
 %setup -q -n GDGraph-%{version}
+%{__perl} -pi -e 's{^#!/usr/local/bin/perl\b}{#!%{__perl}}' samples/sample1A.pl
+%{__perl} -pi -e 's/\r\n/\n/' samples/sample64.pl
+chmod a-x CHANGES README
 
 
 %build
@@ -37,8 +37,9 @@
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
+find $RPM_BUILD_ROOT -type f -name "*\.pm\.orig" -exec rm -f {} ';'
 
-%check || :
+%check
 make test
 
 
@@ -54,13 +55,16 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 22 2005 Jose Pedro Oliveira  - 1.4305-1
+- Update to 1.4305.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.43-4
 - rebuilt
 
-* Sun Jul 11 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.3
+* Sun Jul 11 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.3
 - Unowned directory: %%{perl_vendorlib}/GD (see bug 1800 comment #1).
 
-* Wed Jun 30 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.2
+* Wed Jun 30 2004 Jose Pedro Oliveira  - 0:1.43-0.fdr.2
 - Bring up to date with current fedora.us perl spec template.
 - Added the samples directory to the documentation files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:00:44 -0000	1.2
+++ sources	22 Dec 2005 18:31:37 -0000	1.3
@@ -1 +1 @@
-cf546f2de827a56458afe288ab0807f2  GDGraph-1.43.tar.gz
+7cba9e4e9fc0c146ab1e34d00f61d932  GDGraph-1.4305.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 18:49:04 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 13:49:04 -0500
Subject: rpms/netcdf/devel netcdf.spec,1.11,1.12
Message-ID: <200512221849.jBMInaGA017259@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/netcdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17242

Modified Files:
	netcdf.spec 
Log Message:
rebuild for gcc41



Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- netcdf.spec	16 Oct 2005 06:11:56 -0000	1.11
+++ netcdf.spec	22 Dec 2005 18:49:04 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           netcdf
 Version:        3.6.0
-Release:        8.p1%{?dist}
+Release:        9.p1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 Orion Poplawski  - 3.6.0-9.p1
+- rebuild for gcc4.1
+
 * Sun Oct 16 2005 Ed Hill  - 3.6.0-8.p1
 - building the library twice (once each for g77 and gfortran) 
   fixes an annoying problem for people who need both compilers



From fedora-extras-commits at redhat.com  Thu Dec 22 19:29:52 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 22 Dec 2005 14:29:52 -0500
Subject: rpms/perl-pmtools/devel perl-pmtools.spec,1.3,1.4
Message-ID: <200512221930.jBMJUP08019580@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-pmtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19563

Modified Files:
	perl-pmtools.spec 
Log Message:
Dist tag


Index: perl-pmtools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-pmtools/devel/perl-pmtools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-pmtools.spec	6 Apr 2005 22:13:29 -0000	1.3
+++ perl-pmtools.spec	22 Dec 2005 19:29:52 -0000	1.4
@@ -1,9 +1,6 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-pmtools
 Version:        1.00
-Release:        2
-
+Release:        3%{?dist}
 Summary:        A suite of small programs to help manage Perl modules
 
 Group:          Development/Libraries
@@ -68,7 +65,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 22 2005 Jose Pedro Oliveira  - 1.00-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.00-2
 - rebuilt
 
 * Sun Feb 06 2005 Jose Pedro Oliveira  - 1.00-1
@@ -81,5 +81,5 @@
   script 'pman' into 'pmman' in order to avoid a filename clash with
   the pinfo package.
 
-* Sat Feb 28 2004 Jose Pedro Oliveira  0:1.00-0.fdr.0
+* Sat Feb 28 2004 Jose Pedro Oliveira  - 0:1.00-0.fdr.0
 - Initial build for fedora.us



From fedora-extras-commits at redhat.com  Thu Dec 22 19:44:09 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 22 Dec 2005 14:44:09 -0500
Subject: rpms/perl-GDTextUtil/devel perl-GDTextUtil.spec,1.5,1.6
Message-ID: <200512221944.jBMJiffW019711@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GDTextUtil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19694

Modified Files:
	perl-GDTextUtil.spec 
Log Message:
Dist tag


Index: perl-GDTextUtil.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GDTextUtil/devel/perl-GDTextUtil.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-GDTextUtil.spec	6 Apr 2005 22:12:45 -0000	1.5
+++ perl-GDTextUtil.spec	22 Dec 2005 19:44:09 -0000	1.6
@@ -1,22 +1,20 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 %define fontdir %{_datadir}/fonts/perl
 
 Name:           perl-GDTextUtil
 Version:        0.86
-Release:        5
-
+Release:        6%{?dist}
 Summary:        Text utilities for use with GD
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/GDTextUtil/
-Source0:       http://www.cpan.org/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/MV/MVERB/GDTextUtil-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(GD), perl(Test::More)
+BuildRequires:  perl(GD)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       fontconfig
 
@@ -50,7 +48,7 @@
 touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
 
 
-%check || :
+%check
 make test
 
 
@@ -72,10 +70,13 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 22 2005 Jose Pedro Oliveira  - 0.86-6
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.86-5
 - rebuilt
 
-* Sun Jul 11 2004 Jose Pedro Oliveira  - 0:0.86-0.fdr.4
+* Sun Jul 11 2004 Jose Pedro Oliveira  - 0:0.86-0.fdr.4
 - Unowned directory: %%{perl_vendorlib}/GD (see bug 1800 comment #1).
 
 * Tue Jul  6 2004 Jose Pedro Oliveira  - 0:0.86-0.fdr.3



From fedora-extras-commits at redhat.com  Thu Dec 22 19:45:55 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 22 Dec 2005 14:45:55 -0500
Subject: rpms/perl-GDGraph3d/devel perl-GDGraph3d.spec,1.6,1.7
Message-ID: <200512221946.jBMJkRBH019779@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GDGraph3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19762

Modified Files:
	perl-GDGraph3d.spec 
Log Message:
Dist tag


Index: perl-GDGraph3d.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GDGraph3d/devel/perl-GDGraph3d.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-GDGraph3d.spec	6 Apr 2005 22:12:45 -0000	1.6
+++ perl-GDGraph3d.spec	22 Dec 2005 19:45:55 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-GDGraph3d
 Version:        0.63
-Release:        3
-
+Release:        4%{?dist}
 Summary:        3D graph generation package for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/GDGraph3d/
-Source0:        http://www.cpan.org/authors/id/W/WA/WADG/GD-Graph3d-0.63.tar.gz
+Source0:        http://www.cpan.org/authors/id/W/WA/WADG/GD-Graph3d-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -41,7 +38,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -57,7 +54,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 22 2005 Jose Pedro Oliveira  - 0.63-4
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.63-3
 - rebuilt
 
 * Sat Jan 15 2005 Jose Pedro Oliveira  - 0:0.63-2



From fedora-extras-commits at redhat.com  Thu Dec 22 20:12:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 22 Dec 2005 15:12:02 -0500
Subject: owners owners.list,1.475,1.476
Message-ID: <200512222012.jBMKCZgg021554@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21537

Modified Files:
	owners.list 
Log Message:
ortp


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -r1.475 -r1.476
--- owners.list	22 Dec 2005 15:39:12 -0000	1.475
+++ owners.list	22 Dec 2005 20:12:01 -0000	1.476
@@ -667,6 +667,7 @@
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|ortp|A C library implementing the RTP protocol (RFC3550)|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|osiv|Open Source Image Velocimetry|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|p0f|Versatile passive OS fingerprinting tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 22 20:18:28 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 15:18:28 -0500
Subject: rpms/plplot/devel plplot-5.5.3-x.patch,NONE,1.1
Message-ID: <200512222018.jBMKIU0r021629@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21608

Added Files:
	plplot-5.5.3-x.patch 
Log Message:
patch to strip X check from configure for modular X


plplot-5.5.3-x.patch:

--- NEW FILE plplot-5.5.3-x.patch ---
--- plplot-5.5.3/configure.orig	2005-05-13 06:59:33.000000000 -0600
+++ plplot-5.5.3/configure	2005-12-22 11:16:35.000000000 -0700
@@ -30236,1404 +30236,10 @@
 
 
 
-
-
-
-if test "x$ac_path_x_has_been_run" != xyes; then
-  echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
-
-ac_path_x_has_been_run=yes
-
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
-  withval="$with_x"
-
-fi;
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
-  # The user explicitly disabled X.
-  have_x=disabled
-else
-  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-    # Both variables are already set.
-    have_x=yes
-  else
-    if test "${ac_cv_have_x+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
-rm -fr conftest.dir
-if mkdir conftest.dir; then
-  cd conftest.dir
-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-  cat >Imakefile <<'_ACEOF'
-acfindx:
-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-_ACEOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-	 test -f $ac_im_libdir/libX11.$ac_extension; then
-	ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case $ac_im_incroot in
-	/usr/include) ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-    esac
-    case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-    esac
-  fi
-  cd ..
-  rm -fr conftest.dir
-fi
-
-# Standard set of common directories for X headers.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
-/usr/X11/include
-/usr/X11R6/include
-/usr/X11R5/include
-/usr/X11R4/include
-
-/usr/include/X11
-/usr/include/X11R6
-/usr/include/X11R5
-/usr/include/X11R4
-
-/usr/local/X11/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
-
-/usr/local/include/X11
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
-
-/usr/X386/include
-/usr/x386/include
-/usr/XFree86/include/X11
-
-/usr/include
-/usr/local/include
-/usr/unsupported/include
-/usr/athena/include
-/usr/local/x11r5/include
-/usr/lpp/Xamples/include
-
-/usr/openwin/include
-/usr/openwin/share/include'
-
-if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for a specified header file.
-  # First, try using that file with no special directory specified.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include 
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Intrinsic.h"; then
-    ac_x_includes=$ac_dir
-    break
-  fi
-done
-fi
-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = no
-
-if test "$ac_x_libraries" = no; then
-  # Check for the libraries.
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS=$LIBS
-  LIBS="-lXt $LIBS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include 
-int
-main ()
-{
-XtMalloc (0)
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  LIBS=$ac_save_LIBS
-# We can link X programs with no special library path.
-ac_x_libraries=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-LIBS=$ac_save_LIBS
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-do
-  # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/libXt.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi # $ac_x_libraries = no
-
-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
-  # Didn't find X anywhere.  Cache the known absence of X.
-  ac_cv_have_x="have_x=no"
-else
-  # Record where we found X for the cache.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi
-fi
-
-  fi
-  eval "$ac_cv_have_x"
-fi # $with_x != no
-
-if test "$have_x" != yes; then
-  echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
-  no_x=yes
-else
-  # If each of the values was on the command line, it overrides each guess.
-  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-  # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  # It might be that x_includes is empty (headers are found in the
-  # standard search path. Then output the corresponding message
-  ac_out_x_includes=$x_includes
-  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
-fi
-
-fi
-if test "$no_x" = yes; then
-  # Not all programs may use this symbol, but it does not hurt to define it.
-
-cat >>confdefs.h <<\_ACEOF
-#define X_DISPLAY_MISSING 1
-_ACEOF
-
-  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
-  if test -n "$x_includes"; then
-    X_CFLAGS="$X_CFLAGS -I$x_includes"
-  fi
-
-  # It would also be nice to do this for all -L options, not just this one.
-  if test -n "$x_libraries"; then
-    X_LIBS="$X_LIBS -L$x_libraries"
-    # For Solaris; some versions of Sun CC require a space after -R and
-    # others require no space.  Words are not sufficient . . . .
-    case `(uname -sr) 2>/dev/null` in
-    "SunOS 5"*)
-      echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
-      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_R_nospace=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_R_nospace=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-      if test $ac_R_nospace = yes; then
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-	X_LIBS="$X_LIBS -R$x_libraries"
-      else
-	LIBS="$ac_xsave_LIBS -R $x_libraries"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_R_space=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_R_space=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-	if test $ac_R_space = yes; then
-	  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	  X_LIBS="$X_LIBS -R $x_libraries"
-	else
-	  echo "$as_me:$LINENO: result: neither works" >&5
-echo "${ECHO_T}neither works" >&6
-	fi
-      fi
-      LIBS=$ac_xsave_LIBS
-    esac
-  fi
-
-  # Check for system-dependent libraries X programs must link with.
-  # Do this before checking for the system-independent R6 libraries
-  # (-lICE), since we may need -lsocket or whatever for X linking.
-
-  if test "$ISC" = yes; then
-    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-  else
-    # Martyn Johnson says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And Karl Berry says
-    # the Alpha needs dnet_stub (dnet does not exist).
-    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char XOpenDisplay ();
-int
-main ()
-{
-XOpenDisplay ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dnet_ntoa ();
-int
-main ()
-{
-dnet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dnet_dnet_ntoa=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dnet_dnet_ntoa=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-fi
-
-    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet_stub  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dnet_ntoa ();
-int
-main ()
-{
-dnet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dnet_stub_dnet_ntoa=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dnet_stub_dnet_ntoa=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-fi
-
-    fi
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-    LIBS="$ac_xsave_LIBS"
-
-    # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-    # to get the SysV transport functions.
-    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
-    # needs -lnsl.
-    # The nsl library prevents programs from opening the X display
-    # on Irix 5.2, according to T.E. Dickey.
-    # The functions gethostbyname, getservbyname, and inet_addr are
-    # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:$LINENO: checking for gethostbyname" >&5
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
-if test "${ac_cv_func_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define gethostbyname to an innocuous variant, in case  declares gethostbyname.
-   For example, HP-UX 11i  declares gettimeofday.  */
-#define gethostbyname innocuous_gethostbyname
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname (); below.
-    Prefer  to  if __STDC__ is defined, since
-     exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include 
-#else
-# include 
-#endif
-
-#undef gethostbyname
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gethostbyname ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
-choke me
-#else
-char (*f) () = gethostbyname;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != gethostbyname;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_gethostbyname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
-
-    if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gethostbyname ();
-int
-main ()
-{
-gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl_gethostbyname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-fi
-
-      if test $ac_cv_lib_nsl_gethostbyname = no; then
-	echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gethostbyname ();
-int
-main ()
-{
-gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bsd_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bsd_gethostbyname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
-if test $ac_cv_lib_bsd_gethostbyname = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
-fi
-
-      fi
-    fi
-
-    # lieder at skyler.mavd.honeywell.com says without -lsocket,
-    # socket/setsockopt and other routines are undefined under SCO ODT
-    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-    # on later versions), says Simon Leinen: it contains gethostby*
-    # variants that don't use the name server (or something).  -lsocket
-    # must be given before -lnsl if both are needed.  We assume that
-    # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6
-if test "${ac_cv_func_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define connect to an innocuous variant, in case  declares connect.
-   For example, HP-UX 11i  declares gettimeofday.  */
-#define connect innocuous_connect
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect (); below.
-    Prefer  to  if __STDC__ is defined, since
-     exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include 
-#else
-# include 
-#endif
-
-#undef connect
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char connect ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_connect) || defined (__stub___connect)
-choke me
-#else
-char (*f) () = connect;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != connect;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_connect=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_connect=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6
-
-    if test $ac_cv_func_connect = no; then
-      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char connect ();
-int
-main ()
-{
-connect ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_connect=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_connect=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-if test $ac_cv_lib_socket_connect = yes; then
-  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-fi
-
-    fi
-
-    # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:$LINENO: checking for remove" >&5
-echo $ECHO_N "checking for remove... $ECHO_C" >&6
-if test "${ac_cv_func_remove+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define remove to an innocuous variant, in case  declares remove.
-   For example, HP-UX 11i  declares gettimeofday.  */
-#define remove innocuous_remove
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char remove (); below.
-    Prefer  to  if __STDC__ is defined, since
-     exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include 
-#else
-# include 
-#endif
-
-#undef remove
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char remove ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_remove) || defined (__stub___remove)
-choke me
-#else
-char (*f) () = remove;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != remove;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_remove=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_remove=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6
-
-    if test $ac_cv_func_remove = no; then
-      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
-if test "${ac_cv_lib_posix_remove+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lposix  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char remove ();
-int
-main ()
-{
-remove ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_posix_remove=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_posix_remove=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
-if test $ac_cv_lib_posix_remove = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-fi
-
-    fi
-
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:$LINENO: checking for shmat" >&5
-echo $ECHO_N "checking for shmat... $ECHO_C" >&6
-if test "${ac_cv_func_shmat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shmat to an innocuous variant, in case  declares shmat.
-   For example, HP-UX 11i  declares gettimeofday.  */
-#define shmat innocuous_shmat
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmat (); below.
-    Prefer  to  if __STDC__ is defined, since
-     exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include 
-#else
-# include 
-#endif
-
-#undef shmat
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shmat ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shmat) || defined (__stub___shmat)
-choke me
-#else
-char (*f) () = shmat;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shmat;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shmat=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shmat=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6
-
-    if test $ac_cv_func_shmat = no; then
-      echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lipc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shmat ();
-int
-main ()
-{
-shmat ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ipc_shmat=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ipc_shmat=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
-if test $ac_cv_lib_ipc_shmat = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-fi
-
-    fi
-  fi
-
-  # Check for libraries that X11R6 Xt/Xaw programs need.
-  ac_save_LDFLAGS=$LDFLAGS
-  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-  # check for ICE first), but we must link in the order -lSM -lICE or
-  # we get undefined symbols.  So assume we have SM if we have ICE.
-  # These have to be linked with before -lX11, unlike the other
-  # libraries we check for below, so use a different variable.
-  # John Interrante, Karl Berry
-  echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char IceConnectionNumber ();
-int
-main ()
-{
-IceConnectionNumber ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ICE_IceConnectionNumber=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ICE_IceConnectionNumber=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-fi
-
-  LDFLAGS=$ac_save_LDFLAGS
-
-fi
-
-
-if test "$have_x" != "yes"; then
-    enable_xwin="no"
-fi
-
-
-
-if test "$enable_xwin" = yes; then
-  enable_xwin_TRUE=
-  enable_xwin_FALSE='#'
-else
-  enable_xwin_TRUE='#'
-  enable_xwin_FALSE=
-fi
-
-
+enable_xwin=yes
+enable_xwin_TRUE=
+enable_xwin_FALSE='#'
+have_x=yes
 
 
 if test "$enable_tcl" = "no" -o "$have_x" != "yes"; then



From fedora-extras-commits at redhat.com  Thu Dec 22 20:18:20 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 22 Dec 2005 15:18:20 -0500
Subject: rpms/ortp/devel ortp.spec,1.5,1.6
Message-ID: <200512222018.jBMKIqgo021642@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ortp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21593

Modified Files:
	ortp.spec 
Log Message:
Added ortp.pc to -devel


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/ortp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ortp.spec	5 Dec 2005 23:59:14 -0000	1.5
+++ ortp.spec	22 Dec 2005 20:18:20 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ortp
 Version:        0.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
@@ -49,9 +49,13 @@
 %defattr(-,root,root,-)
 %{_includedir}/%{name}
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/ortp.pc
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Thu Dec 22 2005 Ignacio Vazquez-Abrams  0.7.1-2
+- Added ortp.pc to -devel
+
 * Sat Dec  3 2005 Ignacio Vazquez-Abrams  0.7.1-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Thu Dec 22 20:18:54 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 15:18:54 -0500
Subject: rpms/plplot/devel plplot-5.5.3-matwrap.patch, 1.1,
	1.2 plplot-5.5.3-tk.patch, 1.1, 1.2 plplot.spec, 1.6, 1.7
Message-ID: <200512222019.jBMKJQb6021715@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21641

Modified Files:
	plplot-5.5.3-matwrap.patch plplot-5.5.3-tk.patch plplot.spec 
Log Message:
- Add patch to strip X check from configure for modular X
- Rework patches to patch configure and avoid autoconf
- Teporarily add BR on libXau-devel and libXdmcp (bz #176313)


plplot-5.5.3-matwrap.patch:

Index: plplot-5.5.3-matwrap.patch
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot-5.5.3-matwrap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plplot-5.5.3-matwrap.patch	10 Aug 2005 17:15:10 -0000	1.1
+++ plplot-5.5.3-matwrap.patch	22 Dec 2005 20:18:54 -0000	1.2
@@ -18,20 +18,59 @@
  	$remember_defs_in_file = 0; # We're not really interested in this file.
        } else {
  	$remember_defs_in_file = 1; # This is a file we are actually
---- plplot-5.5.3/cf/octave.ac.orig	2005-08-09 09:34:00.000000000 -0600
-+++ plplot-5.5.3/cf/octave.ac	2005-08-09 09:34:52.000000000 -0600
-@@ -35,13 +35,7 @@
+--- plplot-5.5.3/configure.matwrap	2005-12-22 11:24:27.000000000 -0700
++++ plplot-5.5.3/configure	2005-12-22 11:25:04.000000000 -0700
+@@ -24312,52 +24312,7 @@
+         enable_octave=no;
+     fi
  
- # check for matwrap
-     if test "$enable_octave" = "yes"; then
--        AC_CHECK_PROG(has_matwrap, matwrap, yes, no)
+-# check for matwrap
+-    if test "$enable_octave" = "yes"; then
+-        # Extract the first word of "matwrap", so it can be a program name with args.
+-set dummy matwrap; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_has_matwrap+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$has_matwrap"; then
+-  ac_cv_prog_has_matwrap="$has_matwrap" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_has_matwrap="yes"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-  test -z "$ac_cv_prog_has_matwrap" && ac_cv_prog_has_matwrap="no"
+-fi
+-fi
+-has_matwrap=$ac_cv_prog_has_matwrap
+-if test -n "$has_matwrap"; then
+-  echo "$as_me:$LINENO: result: $has_matwrap" >&5
+-echo "${ECHO_T}$has_matwrap" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
 -        if test "$has_matwrap" = "yes"; then
 -	    MATWRAP=`which matwrap`
 -	else
 -            MATWRAP=`pwd`"/bindings/octave/matwrap/matwrap"
--            AC_MSG_WARN([Using builtin matwrap.]);
+-            { echo "$as_me:$LINENO: WARNING: Using builtin matwrap." >&5
+-echo "$as_me: WARNING: Using builtin matwrap." >&2;};
 -        fi
-+        MATWRAP=`pwd`"/bindings/octave/matwrap/matwrap"
-     fi
+-    fi
++MATWRAP=`pwd`"/bindings/octave/matwrap/matwrap"
  
  # check for user supplied mkoctfile
+     if test "$enable_octave" = "yes"; then

plplot-5.5.3-tk.patch:

Index: plplot-5.5.3-tk.patch
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot-5.5.3-tk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plplot-5.5.3-tk.patch	10 Aug 2005 17:15:10 -0000	1.1
+++ plplot-5.5.3-tk.patch	22 Dec 2005 20:18:54 -0000	1.2
@@ -1,6 +1,6 @@
---- plplot-5.5.3/cf/tcl.ac.orig	2005-08-04 13:42:51.000000000 -0600
-+++ plplot-5.5.3/cf/tcl.ac	2005-08-04 13:43:27.000000000 -0600
-@@ -55,13 +55,10 @@
+--- plplot-5.5.3/configure.tk	2005-12-22 11:17:02.000000000 -0700
++++ plplot-5.5.3/configure	2005-12-22 11:17:40.000000000 -0700
+@@ -24638,13 +24638,10 @@
  # "/usr" which would give bad result under Linux without this ordering.
  
  incdirs_default="\


Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plplot.spec	15 Dec 2005 16:24:44 -0000	1.6
+++ plplot.spec	22 Dec 2005 20:18:54 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           plplot
 Version:        5.5.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -15,15 +15,17 @@
 Patch3:         plplot-5.5.3-x86_64.patch
 Patch4:         plplot-5.5.3-octave.patch
 Patch5:         plplot-5.5.3-check.patch
+Patch6:         plplot-5.5.3-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  autoconf
 BuildRequires:  gcc-gfortran, freetype-devel, octave-devel, qhull-devel
 BuildRequires:  java-devel, libgcj-devel
 BuildRequires:  gd-devel, tcl-devel, tk-devel
 BuildRequires:  python-devel, pygtk2-devel, python-numeric
 BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2
 BuildRequires:  perl(XML::DOM)
+#Temporary until bz #176313 is fixed
+BuildRequires:  libXau-devel, libXdmcp-devel
 #BuildRequires: libunicode-devel
 
 %description
@@ -133,10 +135,10 @@
 %patch3 -p1 -b .orig
 %patch4 -p1 -b .orig
 %patch5 -p1 -b .orig
+%patch6 -p1 -b .orig
 
 
 %build
-autoconf
 %configure --disable-static --without-rpath --with-pthreads \
            --with-freetype-font-dir=/usr/share/fonts \
            --with-libunicode=no --disable-cgm --disable-linuxvga \
@@ -308,6 +310,11 @@
 %{_datadir}/plplot%{version}/examples/tk/
 
 %changelog
+* 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
+- Teporarily add BR on libXau-devel and libXdmcp (bz #176313)
+
 * Thu Dec 15 2005 - Orion Poplawski  - 5.5.3-9
 - Rebuild for gcc 4.1
 



From fedora-extras-commits at redhat.com  Thu Dec 22 20:25:48 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Thu, 22 Dec 2005 15:25:48 -0500
Subject: rpms/python-simpy - New directory
Message-ID: <200512222025.jBMKPouS021827@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21819/python-simpy

Log Message:
Directory /cvs/extras/rpms/python-simpy added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 22 20:25:54 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Thu, 22 Dec 2005 15:25:54 -0500
Subject: rpms/python-simpy/devel - New directory
Message-ID: <200512222025.jBMKPu6D021842@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21819/python-simpy/devel

Log Message:
Directory /cvs/extras/rpms/python-simpy/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 22 20:26:15 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Thu, 22 Dec 2005 15:26:15 -0500
Subject: rpms/python-simpy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512222026.jBMKQH8F021876@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21864

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-simpy


--- NEW FILE Makefile ---
# Top level Makefile for module python-simpy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 22 20:26:21 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Thu, 22 Dec 2005 15:26:21 -0500
Subject: rpms/python-simpy/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512222026.jBMKQNWH021896@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21864/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-simpy


--- NEW 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 Dec 22 20:27:14 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Thu, 22 Dec 2005 15:27:14 -0500
Subject: rpms/python-simpy import.log,1.1,1.2
Message-ID: <200512222027.jBMKRl1Q021980@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21938

Modified Files:
	import.log 
Log Message:
auto-import python-simpy-1.6.1-2 on branch devel from python-simpy-1.6.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Dec 2005 20:26:14 -0000	1.1
+++ import.log	22 Dec 2005 20:27:14 -0000	1.2
@@ -0,0 +1 @@
+python-simpy-1_6_1-2:HEAD:python-simpy-1.6.1-2.src.rpm:1135283225



From fedora-extras-commits at redhat.com  Thu Dec 22 20:27:20 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Thu, 22 Dec 2005 15:27:20 -0500
Subject: rpms/python-simpy/devel python-simpy-1.6.1-no-shebang.patch, NONE, 
	1.1 python-simpy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200512222027.jBMKRqrc021984@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21938/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-simpy-1.6.1-no-shebang.patch python-simpy.spec 
Log Message:
auto-import python-simpy-1.6.1-2 on branch devel from python-simpy-1.6.1-2.src.rpm

python-simpy-1.6.1-no-shebang.patch:

--- NEW FILE python-simpy-1.6.1-no-shebang.patch ---
diff -urN SimPy-orig/__init__.py SimPy/__init__.py
--- SimPy-orig/__init__.py	2005-11-16 12:55:29.000000000 +0200
+++ SimPy/__init__.py	2005-11-25 15:38:44.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """ SimPy a process-based simulation package in Python
 
 LICENSE:
diff -urN SimPy-orig/Lister.py SimPy/Lister.py
--- SimPy-orig/Lister.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/Lister.py	2005-11-25 15:39:07.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Lister 1.6.1
 Pretty-printer for SimPy class objects
 '$Revision: 1.1.1.6 $ $Date: 2005/11/12 04:39:47 $ kgm'
diff -urN SimPy-orig/Monitor.py SimPy/Monitor.py
--- SimPy-orig/Monitor.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/Monitor.py	2005-11-25 15:39:16.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Monitor 1.6.1
  '$Revision: 1.1.1.8 $ $Date: 2005/11/12 04:39:57 $ kgm'
 This dummy module is only provided for backward compatibility.
diff -urN SimPy-orig/MonitorTest.py SimPy/MonitorTest.py
--- SimPy-orig/MonitorTest.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/MonitorTest.py	2005-11-25 15:39:26.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 Testing Monitor, Tally. 
 This may be included in SimPyTest eventually.
diff -urN SimPy-orig/SimGUI.py SimPy/SimGUI.py
--- SimPy-orig/SimGUI.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/SimGUI.py	2005-11-25 15:39:43.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """SimGUI 1.6.1
 __version__ = '$Revision: 1.1.1.5 $ $Date: 2005/11/12 04:40:06 $ kgm'
 
diff -urN SimPy-orig/SimPlot.py SimPy/SimPlot.py
--- SimPy-orig/SimPlot.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/SimPlot.py	2005-11-25 15:39:49.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """ SimPlot 1.6.1
 
 $Revision: 1.1.1.10 $ $Date: 2005/11/16 09:39:29 $ kgm
diff -urN SimPy-orig/Simulation.py SimPy/Simulation.py
--- SimPy-orig/Simulation.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/Simulation.py	2005-11-25 15:39:56.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Simulation 1.6.1
 __version__ = '$Revision: 1.1.1.17 $ $Date: 2005/11/12 08:18:36 $ kgm'
 LICENSE:
diff -urN SimPy-orig/SimulationRT.py SimPy/SimulationRT.py
--- SimPy-orig/SimulationRT.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/SimulationRT.py	2005-11-25 15:40:03.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """SimulationRT 1.6.1
 __version__ = '$Revision: 1.1.1.9 $ $Date: 2005/11/12 05:43:35 $ kgm'
 LICENSE:
diff -urN SimPy-orig/SimulationStep.py SimPy/SimulationStep.py
--- SimPy-orig/SimulationStep.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/SimulationStep.py	2005-11-25 15:40:10.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """SimulationStep 1.6.1
 __version__ = '$Revision: 1.1.1.9 $ $Date: 2005/11/12 05:43:35 $ kgm'
 LICENSE:
diff -urN SimPy-orig/SimulationTrace.py SimPy/SimulationTrace.py
--- SimPy-orig/SimulationTrace.py	2005-11-16 12:55:28.000000000 +0200
+++ SimPy/SimulationTrace.py	2005-11-25 15:40:17.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """SimulationTrace 1.6.1
 __version__ = '$Revision: 1.1.1.11 $ $Date: 2005/11/12 05:43:35 $ kgm'
 LICENSE:
diff -urN SimPy-orig/testSimPy.py SimPy/testSimPy.py
--- SimPy-orig/testSimPy.py	2005-11-16 12:55:29.000000000 +0200
+++ SimPy/testSimPy.py	2005-11-25 15:40:33.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # testSimPy.py test routines
 #        $Author: kgmuller $              $Revision: 1.1.1.11 $
 #        $Date: 2005/11/16 09:35:50 $
diff -urN SimPy-orig/testSimPyRT.py SimPy/testSimPyRT.py
--- SimPy-orig/testSimPyRT.py	2005-11-16 12:55:29.000000000 +0200
+++ SimPy/testSimPyRT.py	2005-11-25 15:40:43.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # testSimPyRT.py test routines
 #Based on testSimpy.py to test full compatibility
 #between Simulation and SimulationRT
diff -urN SimPy-orig/testSimPyStep.py SimPy/testSimPyStep.py
--- SimPy-orig/testSimPyStep.py	2005-11-16 12:55:29.000000000 +0200
+++ SimPy/testSimPyStep.py	2005-11-25 15:40:53.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # testSimPyStep.py test routines
 #        $Author: kgmuller $              $Revision: 1.1.1.5 $
 #        $Date: 2005/11/12 04:40:49 $
diff -urN SimPy-orig/testSimPyTrace.py SimPy/testSimPyTrace.py
--- SimPy-orig/testSimPyTrace.py	2005-11-16 12:55:29.000000000 +0200
+++ SimPy/testSimPyTrace.py	2005-11-25 15:41:28.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # testSimPyTrace.py test routines
 #        $Author: kgmuller $              $Revision: 1.1.1.5 $
 #        $Date: 2005/11/12 04:41:03 $


--- NEW FILE python-simpy.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define pkgname SimPy

Name:		python-simpy
Version:	1.6.1
Release:	2
Summary:	Python simulation framework
Group:		Development/Languages
License:	LGPL
URL:		http://simpy.sourceforge.net
Source0:	http://download.sourceforge.net/simpy/SimPy-%{version}.tar.gz
Patch1:		python-simpy-1.6.1-no-shebang.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:	tkinter

%description
SimPy (= Simulation in Python) is an object-oriented, process-based
discrete-event simulation language based on standard Python. It
provides the modeler with components of a simulation model including
processes, for active components like customers, messages, and
vehicles, and resources, for passive components that form limited
capacity congestion points like servers, checkout counters, and
tunnels. It also provides monitor variables to aid in gathering
statistics. Random variates are provided by the standard Python random
module.

%package doc
Group: Documentation
Summary: Source code documentation for SimPy

%description doc
SimPy (= Simulation in Python) is an object-oriented, process-based
discrete-event simulation language based on standard Python.  This
package contains the source code documentation.


%prep
%setup -q -n %{pkgname}-%{version}
%patch1


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# choose html over txt files for documentation
%doc *.html PKG-INFO LGPLlicense_files SimPyDocs SimPyModels
%dir %{python_sitelib}/%{pkgname}/
%{python_sitelib}/%{pkgname}/*.py
%{python_sitelib}/%{pkgname}/*.pyc
%ghost %{python_sitelib}/%{pkgname}/*.pyo


%files doc
%defattr(-,root,root)
%doc SimPyDocs/SimPy_Sourcecode_Documentation/*


%changelog
* Wed Dec 21 2005 Sarantis Paskalis  - 1.6.1-2
- Add source code documentation as a -doc package (John Mahowald).
- Add Requires: tkinter for SimGUI to work (John Mahowald).
 
* Fri Nov 25 2005 Sarantis Paskalis  - 1.6.1-1
- First packaging version for FE.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Dec 2005 20:26:21 -0000	1.1
+++ .cvsignore	22 Dec 2005 20:27:20 -0000	1.2
@@ -0,0 +1 @@
+SimPy-1.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Dec 2005 20:26:21 -0000	1.1
+++ sources	22 Dec 2005 20:27:20 -0000	1.2
@@ -0,0 +1 @@
+6de42d6289bee6d767d07f8839f89d07  SimPy-1.6.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 20:33:48 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Thu, 22 Dec 2005 15:33:48 -0500
Subject: owners owners.list,1.476,1.477
Message-ID: <200512222034.jBMKYK1Y022055@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22038

Modified Files:
	owners.list 
Log Message:
Add python-simpy



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -r1.476 -r1.477
--- owners.list	22 Dec 2005 20:12:01 -0000	1.476
+++ owners.list	22 Dec 2005 20:33:47 -0000	1.477
@@ -1008,6 +1008,7 @@
 Fedora Extras|python-quixote|A highly Pythonic Web application framework|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-reportlab|Python PDF generation library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-simpletal|Alternative implementation of Zope Page Templates|shahms at shahms.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-simpy|Python simulation framework|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|python-sqlite|Python bindings for SQLite|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-sqlobject|SQLObject is an object-relational mapper for python|oliver.andrich at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-tpg|Toy Parser Generator|shahms at shahms.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 22 22:36:20 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu, 22 Dec 2005 17:36:20 -0500
Subject: web/html/Download vendors.list,1.3,1.4
Message-ID: <200512222236.jBMMapXN025821@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/web/html/Download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25801

Modified Files:
	vendors.list 
Log Message:
add linuxshopp


Index: vendors.list
===================================================================
RCS file: /cvs/fedora/web/html/Download/vendors.list,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vendors.list	6 Dec 2005 05:03:06 -0000	1.3
+++ vendors.list	22 Dec 2005 22:36:18 -0000	1.4
@@ -56,6 +56,8 @@
 
 LinuxInstall.org::3 CDs::$10
 
+LinuxShopp.com.br::CDs::R$20.00
+
 LinuxShop.co.nz::3 binary CDs or 3 source CDs::$12.95 NZ o4 $14.95 NZ
 
 MASH Consulting::3 CDs or 6 CDs::$10 or $15



From fedora-extras-commits at redhat.com  Thu Dec 22 23:37:42 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 18:37:42 -0500
Subject: rpms/plplot/devel plplot-5.5.3-check.patch, NONE,
	1.1 plplot-5.5.3-octave.patch, NONE,
	1.1 plplot-5.5.3-x86_64.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200512222338.jBMNcFcL027684@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27656

Modified Files:
	.cvsignore sources 
Added Files:
	plplot-5.5.3-check.patch plplot-5.5.3-octave.patch 
	plplot-5.5.3-x86_64.patch 
Log Message:
Move from "sources"


plplot-5.5.3-check.patch:

--- NEW FILE plplot-5.5.3-check.patch ---
--- plplot-5.5.3/examples/c/x23c.c.orig	2005-04-27 00:43:51.000000000 -0600
+++ plplot-5.5.3/examples/c/x23c.c	2005-08-11 15:21:10.719597600 -0600
@@ -228,6 +228,6 @@
     plcol0(1);
 
     plend();
-
+    exit(0);
 }
 

plplot-5.5.3-octave.patch:

--- NEW FILE plplot-5.5.3-octave.patch ---
--- plplot-5.5.3/bindings/octave/PLplot/figure.m.orig	2005-08-10 11:56:53.000000000 -0600
+++ plplot-5.5.3/bindings/octave/PLplot/figure.m	2005-08-10 12:00:39.000000000 -0600
@@ -49,9 +49,10 @@
 
   if (!exist("__pl") || !struct_contains (__pl,"inited"))
     v = split(version ,'.');
-    if (! (str2num(v(1,:)) >= 2 &&
-           str2num(v(2,:)) >= 1 &&
-           str2num(v(3,:)) >= 57))
+    if (! ((str2num(v(1,:)) > 2) ||
+           (str2num(v(1,:)) == 2 && str2num(v(2,:)) > 1) ||
+           (str2num(v(1,:)) == 2 && str2num(v(2,:)) == 1 &&
+            str2num(v(3,:)) >= 57)))
         error("The PLplot-Octave scripts need an Octave version \n\
         greater then or equal to 2.1.57.\n");
     endif

plplot-5.5.3-x86_64.patch:

--- NEW FILE plplot-5.5.3-x86_64.patch ---
--- plplot-5.5.3/configure.x86_64	2005-12-22 11:18:39.000000000 -0700
+++ plplot-5.5.3/configure	2005-12-22 11:19:07.000000000 -0700
@@ -24661,6 +24661,7 @@
 $HOME/local/lib \
 $HOME/lib \
 /usr/local/lib \
+/usr/lib64 \
 /usr/lib"
 
 incdirs=$incdirs_default


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Aug 2005 22:23:37 -0000	1.4
+++ .cvsignore	22 Dec 2005 23:37:42 -0000	1.5
@@ -1,4 +1 @@
 plplot-5.5.3.tar.gz
-plplot-5.5.3-x86_64.patch
-plplot-5.5.3-octave.patch
-plplot-5.5.3-check.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Aug 2005 22:23:37 -0000	1.4
+++ sources	22 Dec 2005 23:37:42 -0000	1.5
@@ -1,4 +1 @@
 6df3d63cffac28337ff7fa56712da5c7  plplot-5.5.3.tar.gz
-02cc9f8eb72211581aae2bd38670252f  plplot-5.5.3-x86_64.patch
-7970faa7d90fe1e98e19354fd607a309  plplot-5.5.3-octave.patch
-22f2761b863bf1f47fb37b7d7fb9ab85  plplot-5.5.3-check.patch



From fedora-extras-commits at redhat.com  Thu Dec 22 23:57:32 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 18:57:32 -0500
Subject: rpms/python-numarray/devel .cvsignore, 1.2, 1.3 python-numarray.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512222358.jBMNw6Yn027811@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-numarray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27789

Modified Files:
	.cvsignore python-numarray.spec sources 
Log Message:
Update to 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-numarray/devel/.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	22 Dec 2005 23:57:31 -0000	1.3
@@ -1 +1 @@
-numarray-1.3.3.tar.gz
+numarray-1.5.0.tar.gz


Index: python-numarray.spec
===================================================================
RCS file: /cvs/extras/rpms/python-numarray/devel/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	22 Dec 2005 23:57:31 -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.0
+Release:        1%{?dist}
 Summary:        Python array manipulation and computational library
 
 Group:          Development/Languages
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Thu Dec 22 2005 - Orion Poplawski  - 1.5.0-1
+- Update to 1.5.0
+
 * 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/devel/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	22 Dec 2005 23:57:31 -0000	1.3
@@ -1 +1 @@
-2286f5dbccebd4ba743915e9e1d30856  numarray-1.3.3.tar.gz
+6db331e321a74fa896cd5961fe33b7ef  numarray-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 23:59:40 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 22 Dec 2005 18:59:40 -0500
Subject: rpms/libosip2/FC-4 .cvsignore, 1.3, 1.4 libosip2.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200512230000.jBN00VL2027916@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libosip2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27868/FC-4

Modified Files:
	.cvsignore libosip2.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Oct 2005 06:11:57 -0000	1.3
+++ .cvsignore	22 Dec 2005 23:59:40 -0000	1.4
@@ -1 +1 @@
-libosip2-2.2.1.tar.gz
+libosip2-2.2.2.tar.gz


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-4/libosip2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libosip2.spec	15 Oct 2005 06:11:57 -0000	1.5
+++ libosip2.spec	22 Dec 2005 23:59:40 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           libosip2
-Version:        2.2.1
+Version:        2.2.2
 Release:        1%{?dist}
 
 Summary:        oSIP is an implementation of SIP
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Dec 22 2005 Ignacio Vazquez-Abrams  2.2.2-1
+- Upstream update
+
 * Sat Oct 15 2005 Ignacio Vazquez-Abrams  2.2.1-1
 - Upstream update
 - Disable static library


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Oct 2005 06:11:57 -0000	1.3
+++ sources	22 Dec 2005 23:59:40 -0000	1.4
@@ -1 +1 @@
-6daf22ab1d814f3d601147ee75e25170  libosip2-2.2.1.tar.gz
+40ee3ec89030f0d6dfdb2cf6100e6685  libosip2-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 22 23:59:46 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 22 Dec 2005 18:59:46 -0500
Subject: rpms/libosip2/devel .cvsignore, 1.3, 1.4 libosip2.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200512230000.jBN00V68027915@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27868/devel

Modified Files:
	.cvsignore libosip2.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Oct 2005 06:11:59 -0000	1.3
+++ .cvsignore	22 Dec 2005 23:59:46 -0000	1.4
@@ -1 +1 @@
-libosip2-2.2.1.tar.gz
+libosip2-2.2.2.tar.gz


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/libosip2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libosip2.spec	15 Oct 2005 06:11:59 -0000	1.5
+++ libosip2.spec	22 Dec 2005 23:59:46 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           libosip2
-Version:        2.2.1
+Version:        2.2.2
 Release:        1%{?dist}
 
 Summary:        oSIP is an implementation of SIP
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Dec 22 2005 Ignacio Vazquez-Abrams  2.2.2-1
+- Upstream update
+
 * Sat Oct 15 2005 Ignacio Vazquez-Abrams  2.2.1-1
 - Upstream update
 - Disable static library


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Oct 2005 06:11:59 -0000	1.3
+++ sources	22 Dec 2005 23:59:46 -0000	1.4
@@ -1 +1 @@
-6daf22ab1d814f3d601147ee75e25170  libosip2-2.2.1.tar.gz
+40ee3ec89030f0d6dfdb2cf6100e6685  libosip2-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 00:03:38 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 19:03:38 -0500
Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.11,1.12
Message-ID: <200512230004.jBN04QGT029588@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-matplotlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29538

Modified Files:
	python-matplotlib.spec 
Log Message:
Rebuild



Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-matplotlib.spec	20 Nov 2005 17:25:38 -0000	1.11
+++ python-matplotlib.spec	23 Dec 2005 00:03:38 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           python-matplotlib
 Version:        0.85
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python plotting library
 
 Group:          Development/Libraries
@@ -48,6 +48,9 @@
 %{_datadir}/matplotlib/
 
 %changelog
+* Thu Dec 22 2005 Orion Poplawski  0.85-2
+- Rebuild
+
 * Sun Nov 20 2005 Orion Poplawski  0.85-1
 - New upstream version 0.85
 



From fedora-extras-commits at redhat.com  Fri Dec 23 00:03:52 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 19:03:52 -0500
Subject: rpms/python-dateutil/devel .cvsignore, 1.2, 1.3 python-dateutil.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200512230004.jBN04Q0B029589@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-dateutil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29556

Modified Files:
	.cvsignore python-dateutil.spec sources 
Log Message:
Update to 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-dateutil/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Jul 2005 19:53:28 -0000	1.2
+++ .cvsignore	23 Dec 2005 00:03:51 -0000	1.3
@@ -1 +1 @@
-python-dateutil-1.0.tar.bz2
+python-dateutil-1.1.tar.bz2


Index: python-dateutil.spec
===================================================================
RCS file: /cvs/extras/rpms/python-dateutil/devel/python-dateutil.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-dateutil.spec	28 Jul 2005 19:53:28 -0000	1.1
+++ python-dateutil.spec	23 Dec 2005 00:03:51 -0000	1.2
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-dateutil
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Powerful extensions to the standard datetime module
 
 Group:          Development/Languages
 License:        Python Software Foundation License
-URL:            https://moin.conectiva.com.br/DateUtil
-#Source0:        https://moin.conectiva.com.br/DateUtil?action=AttachFile&do=get&target=python-dateutil-%{version}.tar.bz2
-Source0:        python-dateutil-%{version}.tar.bz2
+URL:            http://labix.org/python-dateutil
+Source0:        http://labix.org/download/python-dateutil/python-dateutil-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -42,6 +41,9 @@
 %{python_sitelib}/dateutil/
 
 %changelog
+* Thu Dec 22 2005 Orion Poplawski  1.1-1
+- Update to 1.1
+
 * Thu Jul 28 2005 Orion Poplawski  1.0-1
 - Update to 1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-dateutil/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jul 2005 19:53:28 -0000	1.2
+++ sources	23 Dec 2005 00:03:51 -0000	1.3
@@ -1 +1 @@
-764659b7b763fa551a5fbcec96d86d6d  python-dateutil-1.0.tar.bz2
+f259496f4059dda806837503ee4235f3  python-dateutil-1.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec 23 00:09:36 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 22 Dec 2005 19:09:36 -0500
Subject: rpms/pytz/devel .cvsignore, 1.2, 1.3 pytz.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200512230010.jBN0AE1b029735@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/pytz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29709

Modified Files:
	.cvsignore pytz.spec sources 
Log Message:
Update to 2005m



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jul 2005 20:58:39 -0000	1.2
+++ .cvsignore	23 Dec 2005 00:09:35 -0000	1.3
@@ -1 +1 @@
-pytz-2005i.tar.bz2
+pytz-2005m.tar.bz2


Index: pytz.spec
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/pytz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pytz.spec	28 Jul 2005 20:11:40 -0000	1.3
+++ pytz.spec	23 Dec 2005 00:09:35 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pytz
-Version:        2005i
-Release:        2%{?dist}
+Version:        2005m
+Release:        1%{?dist}
 Summary:        World Timezone Definitions for Python
 
 Group:          Development/Languages
@@ -47,6 +47,9 @@
 %{python_sitelib}/pytz/
 
 %changelog
+* Thu Dec 22 2005 Orion Poplawski  2005m-1
+- Update to 2005m
+
 * Fri Jul 22 2005 Orion Poplawski  2005i-2
 - Remove -O1 from install command
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jul 2005 20:58:39 -0000	1.2
+++ sources	23 Dec 2005 00:09:35 -0000	1.3
@@ -1 +1 @@
-45aeaba1bc49c62e65490c047ff7fbea  pytz-2005i.tar.bz2
+d0b8fd7e4a5be5fc763cb22044fba854  pytz-2005m.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec 23 01:45:52 2005
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Thu, 22 Dec 2005 20:45:52 -0500
Subject: rpms/bmp/FC-4 .cvsignore,1.2,1.3 bmp.spec,1.6,1.7 sources,1.2,1.3
Message-ID: <200512230146.jBN1kP39031782@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/bmp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31761

Modified Files:
	.cvsignore bmp.spec sources 
Log Message:
Update to upstream 0.9.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bmp/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Mar 2005 17:24:48 -0000	1.2
+++ .cvsignore	23 Dec 2005 01:45:51 -0000	1.3
@@ -1 +1 @@
-bmp-patched-0.9.7.tar.gz
+bmp-patched-0.9.7.1.tar.gz


Index: bmp.spec
===================================================================
RCS file: /cvs/extras/rpms/bmp/FC-4/bmp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bmp.spec	8 Jun 2005 17:42:03 -0000	1.6
+++ bmp.spec	23 Dec 2005 01:45:51 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           bmp
-Version:        0.9.7
-Release:        10%{?dist}
+Version:        0.9.7.1
+Release:        1%{?dist}
 Summary:        GTK2 based port of the XMMS media player
 
 Group:          Applications/Multimedia
@@ -15,7 +15,7 @@
 Patch0:         bmp-0.9.7-readmacro.patch
 Patch1:         bmp-0.9.7-default-skin.patch
 Patch2:         bmp-0.9.7-default-alsa.patch
-Patch3:         bmp-0.9.7-xmms-skins.patch
+Patch3:         bmp-0.9.7.1-xmms-skins.patch
 Patch4:         bmp-0.9.7-shaded-skin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -131,6 +131,10 @@
 
 
 %changelog
+* Fri Dec 23 2005 Ralf Ertzinger  0.9.7.1-1%{?dist}
+- Update to upstream 0.9.7.1
+- Update xmms-skins.patch
+
 * Thu Jun 02 2005 Ralf Ertzinger  0.9.7-10%{?dist} 
 - bmp-0.9.7-shaded-skin.patch (BZ #158402)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bmp/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Mar 2005 17:24:48 -0000	1.2
+++ sources	23 Dec 2005 01:45:52 -0000	1.3
@@ -1 +1 @@
-bcfd525c376ff9ece8f935d34bdcb56e  bmp-patched-0.9.7.tar.gz
+5df7869f4692b64bd2c5e8054569cd5e  bmp-patched-0.9.7.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 01:50:27 2005
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Thu, 22 Dec 2005 20:50:27 -0500
Subject: rpms/bmp/FC-4 bmp.spec,1.7,1.8 bmp-0.9.7-xmms-skins.patch,1.2,NONE
Message-ID: <200512230150.jBN1ox5Z031820@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/bmp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31803

Modified Files:
	bmp.spec 
Removed Files:
	bmp-0.9.7-xmms-skins.patch 
Log Message:
Remove old patch, disable dependency tracking in configure



Index: bmp.spec
===================================================================
RCS file: /cvs/extras/rpms/bmp/FC-4/bmp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bmp.spec	23 Dec 2005 01:45:51 -0000	1.7
+++ bmp.spec	23 Dec 2005 01:50:26 -0000	1.8
@@ -62,7 +62,8 @@
 %endif
 	--disable-mp3 \
 	--enable-gconf \
-	--enable-gnome-vfs
+	--enable-gnome-vfs \
+    --disable-dependency-tracking
 make %{?_smp_mflags}
 
 


--- bmp-0.9.7-xmms-skins.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec 23 01:58:23 2005
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Thu, 22 Dec 2005 20:58:23 -0500
Subject: rpms/bmp/FC-4 bmp-0.9.7.1-xmms-skins.patch,NONE,1.1
Message-ID: <200512230158.jBN1wPrb031919@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/bmp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31907

Added Files:
	bmp-0.9.7.1-xmms-skins.patch 
Log Message:
Add new patch file. Oops.


bmp-0.9.7.1-xmms-skins.patch:

--- NEW FILE bmp-0.9.7.1-xmms-skins.patch ---
diff -uNr bmp-0.9.7.1-orig/beep/skinwin.c bmp-0.9.7.1/beep/skinwin.c
--- bmp-0.9.7.1-orig/beep/skinwin.c	2005-11-27 17:35:25.000000000 +0100
+++ bmp-0.9.7.1/beep/skinwin.c	2005-11-27 17:36:58.000000000 +0100
@@ -232,11 +232,15 @@
 skinlist_update(void)
 {
     gchar *skinsdir;
+    gchar xmmsskinsdir[] = "/usr/share/xmms/Skins";
 
     skinlist_clear();
 
     scan_skindir(bmp_paths[BMP_PATH_USER_SKIN_DIR]);
     scan_skindir(DATA_DIR G_DIR_SEPARATOR_S BMP_SKIN_DIR_BASENAME);
+    if (g_file_test(xmmsskinsdir, G_FILE_TEST_IS_DIR)) {
+        scan_skindir( xmmsskinsdir );
+    }
 
     skinsdir = getenv("SKINSDIR");
     if (skinsdir) {



From fedora-extras-commits at redhat.com  Fri Dec 23 02:15:42 2005
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Thu, 22 Dec 2005 21:15:42 -0500
Subject: rpms/bmp/FC-4 bmp.spec,1.8,1.9
Message-ID: <200512230216.jBN2GFYf001168@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/bmp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1151

Modified Files:
	bmp.spec 
Log Message:
Remove TODO from filelist



Index: bmp.spec
===================================================================
RCS file: /cvs/extras/rpms/bmp/FC-4/bmp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bmp.spec	23 Dec 2005 01:50:26 -0000	1.8
+++ bmp.spec	23 Dec 2005 02:15:42 -0000	1.9
@@ -114,7 +114,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog FAQ NEWS README TODO
+%doc AUTHORS COPYING ChangeLog FAQ NEWS README
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_libdir}/bmp



From fedora-extras-commits at redhat.com  Fri Dec 23 06:05:40 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 23 Dec 2005 01:05:40 -0500
Subject: rpms/gnome-theme-clearlooks-bigpack/devel .cvsignore, 1.2,
	1.3 gnome-theme-clearlooks-bigpack.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512230606.jBN66UK1008347@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8324

Modified Files:
	.cvsignore gnome-theme-clearlooks-bigpack.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2005 12:02:36 -0000	1.2
+++ .cvsignore	23 Dec 2005 06:05:16 -0000	1.3
@@ -1 +1 @@
-Clearlooks-Big_Pack-0.5.tar.bz2
+Clearlooks-Big_Pack-0.6.x.tar.gz


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-theme-clearlooks-bigpack.spec	7 Apr 2005 12:20:40 -0000	1.2
+++ gnome-theme-clearlooks-bigpack.spec	23 Dec 2005 06:05:17 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           gnome-theme-clearlooks-bigpack
-Version:        0.5
-Release:        1.fc4
+Version:        0.6
+Release:        1%{?dist}
 Summary:        Additional Clearlooks color schemes
 
 Group:          User Interface/Desktops
 License:        GPL
-URL:            http://www.gnome-look.org/content/show.php?content=22259
-Source0:        http://oceanic.wsisiz.edu.pl/~slabosz/pliki/Clearlooks-Big_Pack-0.5.tar.bz2
+URL:            http://www.gnome-look.org/content/show.php?content=25557
+Source0:        http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -16,7 +16,7 @@
 Lots and lots of color schemes for the Clearlooks GTK+ 2.x engine.
 
 %prep
-%setup -q -n Clearlooks-Big_Pack-0.5
+%setup -q -c
 
 %build
 
@@ -33,6 +33,9 @@
 %{_datadir}/themes/*
 
 %changelog
+* Fri Dec 23 2005 Ignacio Vazquez-Abrams  0.6-1
+- Upstream update
+
 * Thu Apr  7 2005 Ignacio Vazquez-Abrams  0.5-1.fc4
 - Dist split
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Apr 2005 12:02:36 -0000	1.2
+++ sources	23 Dec 2005 06:05:17 -0000	1.3
@@ -1 +1 @@
-2fef62a30c3064bdb6b5381cc00d7d7c  Clearlooks-Big_Pack-0.5.tar.bz2
+9bf7ab320a7054c4ee1e8ee7ec97adca  Clearlooks-Big_Pack-0.6.x.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 06:44:47 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 23 Dec 2005 01:44:47 -0500
Subject: rpms/python-amara/devel python-amara.spec,1.9,1.10
Message-ID: <200512230645.jBN6jKog008553@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-amara/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8534

Modified Files:
	python-amara.spec 
Log Message:
disttag


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/rpms/python-amara/devel/python-amara.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-amara.spec	20 Apr 2005 04:58:52 -0000	1.9
+++ python-amara.spec	23 Dec 2005 06:44:47 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           python-amara
 Version:        1.0
-Release:        1.b1.fc4
+Release:        1.b1%{?dist}
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -49,15 +49,15 @@
 %doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
-* Wed Apr 20 2005 Ignacio Vazquez-Abrams  1.0-1.b1.fc4
+* Wed Apr 20 2005 Ignacio Vazquez-Abrams  1.0-1.b1
 - Upstream update
 - Fixed file ownership
 
-* Tue Apr  5 2005 Ignacio Vazquez-Abrams  0.9.4-7.fc4
+* Tue Apr  5 2005 Ignacio Vazquez-Abrams  0.9.4-7
 - Added python to BuildRequires
 - Removed versioning code for now
 
-* Wed Mar 30 2005 Ignacio Vazquez-Abrams  0.9.4-6.fc4
+* Wed Mar 30 2005 Ignacio Vazquez-Abrams  0.9.4-6
 - Added disttag
 
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams  0.9.4-6



From fedora-extras-commits at redhat.com  Fri Dec 23 06:45:56 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 23 Dec 2005 01:45:56 -0500
Subject: rpms/python-HTMLgen/devel python-HTMLgen.spec,1.9,1.10
Message-ID: <200512230646.jBN6kTuo008581@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-HTMLgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8564

Modified Files:
	python-HTMLgen.spec 
Log Message:
disttag


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/rpms/python-HTMLgen/devel/python-HTMLgen.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-HTMLgen.spec	5 Apr 2005 11:23:48 -0000	1.9
+++ python-HTMLgen.spec	23 Dec 2005 06:45:56 -0000	1.10
@@ -4,7 +4,7 @@
 
 Name:           python-HTMLgen
 Version:        2.2.2
-Release:        7.fc4
+Release:        7%{?dist}
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -45,11 +45,11 @@
 %{python_sitelib}/*.py[co]
 
 %changelog
-* Tue Apr  5 2005 Ignacio Vazquez-Abrams  2.2.2-7.fc4
+* Tue Apr  5 2005 Ignacio Vazquez-Abrams  2.2.2-7
 - Added python to BuildRequires
 - Removed versioning code for now
 
-* Wed Mar 30 2005 Ignacio Vazquez-Abrams  2.2.2-6.fc4
+* Wed Mar 30 2005 Ignacio Vazquez-Abrams  2.2.2-6
 - Added disttag
 
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams  2.2.2-6



From fedora-extras-commits at redhat.com  Fri Dec 23 07:07:29 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 23 Dec 2005 02:07:29 -0500
Subject: rpms/dbh/devel dbh.spec,1.4,1.5
Message-ID: <200512230708.jBN782uB010281@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10264

Modified Files:
	dbh.spec 
Log Message:
Remove hard coded dist tag (fixes bug 176471)
Remove zero length TODO and NEWS files
Remove static libs
Remove .la files



Index: dbh.spec
===================================================================
RCS file: /cvs/extras/rpms/dbh/devel/dbh.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dbh.spec	18 May 2005 22:34:43 -0000	1.4
+++ dbh.spec	23 Dec 2005 07:07:29 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Disk based hash library
 Name: dbh
 Version: 1.0.24
-Release: 1.fc4
+Release: 2%{?dist}
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.2/src/dbh-1.0.24.tar.gz
 Patch: dbh-1.0.22-rpath.patch
@@ -34,7 +34,7 @@
 %patch -p1 -b .rpath
 
 %build
-%configure --disable-rpath
+%configure --disable-rpath --disable-static
 
 make %{?_smp_mflags}
 
@@ -42,6 +42,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT 
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -51,18 +53,23 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING ChangeLog README
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-, root, root)
 %doc examples/*.c examples/Makefile* doc/*.html
 %{_libdir}/lib*.so
-%{_libdir}/*a
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 
 %changelog
+* Thu Dec 22 2005 Kevin Fenzi  - 1:1.0.24-2.fc5
+- Remove hard coded dist tag (fixes bug 176471)
+- Remove zero length TODO and NEWS files
+- Remove static libs
+- Remove .la files
+
 * Tue May 17 2005 Kevin Fenzi  - 1:1.0.24-1.fc4
 - Update to 1.0.24
 



From fedora-extras-commits at redhat.com  Fri Dec 23 07:12:32 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 23 Dec 2005 02:12:32 -0500
Subject: rpms/help2man/FC-4 help2man.spec,1.7,1.8
Message-ID: <200512230713.jBN7D7AA010451@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/help2man/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10378/FC-4

Modified Files:
	help2man.spec 
Log Message:
- Fix disttag (#176473).
- Cleanup spec.



Index: help2man.spec
===================================================================
RCS file: /cvs/extras/rpms/help2man/FC-4/help2man.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- help2man.spec	29 Apr 2005 17:23:36 -0000	1.7
+++ help2man.spec	23 Dec 2005 07:12:32 -0000	1.8
@@ -1,7 +1,7 @@
 Name:         	help2man
 Summary:      	Create simple man pages from --help output
 Version:      	1.35.1
-Release:      	1.fc4
+Release:      	2%{?dist}
 Group:       	Development/Tools
 License:     	GPL
 URL:		http://www.gnu.org/software/help2man
@@ -52,12 +52,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec 23 2005 Ralf Cors??pius  - 1.35.1-2
+- Fix disttag (#176473).
+- Cleanup spec.
+
 * Fri Apr 29 2005 Ralf Corsepius  - 1.35.1-1
 - Update to 1.35.1
 - Minor spec fixes.
-
-* Thu Jul 09 2004 Ralf Corsepius  - 1.33.1-0.fdr.2
-- Use %%configure.
-
-* Thu Jul 08 2004 Ralf Corsepius  - 1.33.1-0.fdr.1
-- Initial Fedora Extras submission.



From fedora-extras-commits at redhat.com  Fri Dec 23 07:12:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 23 Dec 2005 02:12:12 -0500
Subject: rpms/help2man/devel help2man.spec,1.7,1.8
Message-ID: <200512230713.jBN7DIk8010455@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/help2man/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10378/devel

Modified Files:
	help2man.spec 
Log Message:
- Fix disttag (#176473).
- Cleanup spec.



Index: help2man.spec
===================================================================
RCS file: /cvs/extras/rpms/help2man/devel/help2man.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- help2man.spec	29 Apr 2005 17:23:36 -0000	1.7
+++ help2man.spec	23 Dec 2005 07:12:12 -0000	1.8
@@ -1,7 +1,7 @@
 Name:         	help2man
 Summary:      	Create simple man pages from --help output
 Version:      	1.35.1
-Release:      	1.fc4
+Release:      	2%{?dist}
 Group:       	Development/Tools
 License:     	GPL
 URL:		http://www.gnu.org/software/help2man
@@ -52,12 +52,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec 23 2005 Ralf Cors??pius  - 1.35.1-2
+- Fix disttag (#176473).
+- Cleanup spec.
+
 * Fri Apr 29 2005 Ralf Corsepius  - 1.35.1-1
 - Update to 1.35.1
 - Minor spec fixes.
-
-* Thu Jul 09 2004 Ralf Corsepius  - 1.33.1-0.fdr.2
-- Use %%configure.
-
-* Thu Jul 08 2004 Ralf Corsepius  - 1.33.1-0.fdr.1
-- Initial Fedora Extras submission.



From fedora-extras-commits at redhat.com  Fri Dec 23 07:12:49 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 23 Dec 2005 02:12:49 -0500
Subject: rpms/help2man/FC-3 help2man.spec,1.6,1.7
Message-ID: <200512230713.jBN7DL0X010462@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/help2man/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10378/FC-3

Modified Files:
	help2man.spec 
Log Message:
- Fix disttag (#176473).
- Cleanup spec.



Index: help2man.spec
===================================================================
RCS file: /cvs/extras/rpms/help2man/FC-3/help2man.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- help2man.spec	29 Apr 2005 17:29:42 -0000	1.6
+++ help2man.spec	23 Dec 2005 07:12:48 -0000	1.7
@@ -1,7 +1,7 @@
 Name:         	help2man
 Summary:      	Create simple man pages from --help output
 Version:      	1.35.1
-Release:      	1.fc3
+Release:      	2%{?dist}
 Group:       	Development/Tools
 License:     	GPL
 URL:		http://www.gnu.org/software/help2man
@@ -52,12 +52,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec 23 2005 Ralf Cors??pius  - 1.35.1-2
+- Fix disttag (#176473).
+- Cleanup spec.
+
 * Fri Apr 29 2005 Ralf Corsepius  - 1.35.1-1
 - Update to 1.35.1
 - Minor spec fixes.
-
-* Thu Jul 09 2004 Ralf Corsepius  - 1.33.1-0.fdr.2
-- Use %%configure.
-
-* Thu Jul 08 2004 Ralf Corsepius  - 1.33.1-0.fdr.1
-- Initial Fedora Extras submission.



From fedora-extras-commits at redhat.com  Fri Dec 23 07:15:59 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 23 Dec 2005 02:15:59 -0500
Subject: rpms/dbh/FC-4 dbh.spec,1.4,1.5
Message-ID: <200512230716.jBN7GVET010557@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10540

Modified Files:
	dbh.spec 
Log Message:
Remove hard coded dist tag (fixes bug 176471)
Remove zero length TODO and NEWS files
Remove static libs
Remove .la files



Index: dbh.spec
===================================================================
RCS file: /cvs/extras/rpms/dbh/FC-4/dbh.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dbh.spec	18 May 2005 22:34:43 -0000	1.4
+++ dbh.spec	23 Dec 2005 07:15:59 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Disk based hash library
 Name: dbh
 Version: 1.0.24
-Release: 1.fc4
+Release: 2%{?dist}
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.2/src/dbh-1.0.24.tar.gz
 Patch: dbh-1.0.22-rpath.patch
@@ -34,7 +34,7 @@
 %patch -p1 -b .rpath
 
 %build
-%configure --disable-rpath
+%configure --disable-rpath --disable-static
 
 make %{?_smp_mflags}
 
@@ -42,6 +42,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT 
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -51,18 +53,23 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING ChangeLog README
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-, root, root)
 %doc examples/*.c examples/Makefile* doc/*.html
 %{_libdir}/lib*.so
-%{_libdir}/*a
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 
 %changelog
+* Thu Dec 22 2005 Kevin Fenzi  - 1:1.0.24-2.fc4
+- Remove hard coded dist tag (fixes bug 176471)
+- Remove zero length TODO and NEWS files
+- Remove static libs
+- Remove .la files
+
 * Tue May 17 2005 Kevin Fenzi  - 1:1.0.24-1.fc4
 - Update to 1.0.24
 



From fedora-extras-commits at redhat.com  Fri Dec 23 07:21:04 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 23 Dec 2005 02:21:04 -0500
Subject: rpms/dbh/devel dbh.spec,1.5,1.6
Message-ID: <200512230721.jBN7Larw010626@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10609

Modified Files:
	dbh.spec 
Log Message:
Bump release to fix tagging issue



Index: dbh.spec
===================================================================
RCS file: /cvs/extras/rpms/dbh/devel/dbh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dbh.spec	23 Dec 2005 07:07:29 -0000	1.5
+++ dbh.spec	23 Dec 2005 07:21:04 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Disk based hash library
 Name: dbh
 Version: 1.0.24
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.2/src/dbh-1.0.24.tar.gz
 Patch: dbh-1.0.22-rpath.patch
@@ -64,6 +64,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Dec 23 2005 Kevin Fenzi  - 1:1.0.24-3.fc5
+- Bump release to fix tagging issue
+
 * Thu Dec 22 2005 Kevin Fenzi  - 1:1.0.24-2.fc5
 - Remove hard coded dist tag (fixes bug 176471)
 - Remove zero length TODO and NEWS files



From fedora-extras-commits at redhat.com  Fri Dec 23 07:22:25 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 23 Dec 2005 02:22:25 -0500
Subject: rpms/dbh/FC-4 dbh.spec,1.5,1.6
Message-ID: <200512230722.jBN7MwLw010693@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dbh/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10675

Modified Files:
	dbh.spec 
Log Message:
Bump release to fix tagging issue



Index: dbh.spec
===================================================================
RCS file: /cvs/extras/rpms/dbh/FC-4/dbh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dbh.spec	23 Dec 2005 07:15:59 -0000	1.5
+++ dbh.spec	23 Dec 2005 07:22:25 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Disk based hash library
 Name: dbh
 Version: 1.0.24
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.2/src/dbh-1.0.24.tar.gz
 Patch: dbh-1.0.22-rpath.patch
@@ -64,6 +64,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Dec 22 2005 Kevin Fenzi  - 1:1.0.24-3.fc4
+- Bump release to fix tagging issue
+
 * Thu Dec 22 2005 Kevin Fenzi  - 1:1.0.24-2.fc4
 - Remove hard coded dist tag (fixes bug 176471)
 - Remove zero length TODO and NEWS files



From fedora-extras-commits at redhat.com  Fri Dec 23 08:34:18 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 23 Dec 2005 03:34:18 -0500
Subject: rpms/php-adodb/FC-4 .cvsignore, 1.4, 1.5 php-adodb.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512230834.jBN8Yo4Z012531@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/php-adodb/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12493/FC-4

Modified Files:
	.cvsignore php-adodb.spec sources 
Log Message:
- version 4.68


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Nov 2005 10:26:26 -0000	1.4
+++ .cvsignore	23 Dec 2005 08:34:17 -0000	1.5
@@ -1 +1 @@
-adodb467.tgz
+adodb468.tgz


Index: php-adodb.spec
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-4/php-adodb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-adodb.spec	18 Nov 2005 10:26:26 -0000	1.6
+++ php-adodb.spec	23 Dec 2005 08:34:17 -0000	1.7
@@ -1,9 +1,9 @@
 Name:           php-adodb
 Summary:        Active Data Objects Data Base
-Version:        4.67
+Version:        4.68
 Release:        1%{?dist}
 
-Source0:        http://dl.sf.net/adodb/adodb467.tgz
+Source0:        http://dl.sf.net/adodb/adodb468.tgz
 License:        BSD
 URL:            http://adodb.sf.net
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_var}/www/icons/*
 
 %changelog
+* Fri Dec 23 2005 Aurelien Bompard  4.68-1
+- version 4.68
+
 * Fri Nov 18 2005 Aurelien Bompard  4.67-1
 - version 4.67
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Nov 2005 10:26:26 -0000	1.4
+++ sources	23 Dec 2005 08:34:17 -0000	1.5
@@ -1 +1 @@
-679d4fac06126707f4bf636508e9ec8a  adodb467.tgz
+c4e8b0db2abc7181a1d3bb0621aa0c1d  adodb468.tgz



From fedora-extras-commits at redhat.com  Fri Dec 23 08:34:23 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 23 Dec 2005 03:34:23 -0500
Subject: rpms/php-adodb/devel .cvsignore, 1.4, 1.5 php-adodb.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512230834.jBN8YuD0012536@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/php-adodb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12493/devel

Modified Files:
	.cvsignore php-adodb.spec sources 
Log Message:
- version 4.68


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Nov 2005 10:26:32 -0000	1.4
+++ .cvsignore	23 Dec 2005 08:34:23 -0000	1.5
@@ -1 +1 @@
-adodb467.tgz
+adodb468.tgz


Index: php-adodb.spec
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/php-adodb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-adodb.spec	18 Nov 2005 10:26:32 -0000	1.6
+++ php-adodb.spec	23 Dec 2005 08:34:23 -0000	1.7
@@ -1,9 +1,9 @@
 Name:           php-adodb
 Summary:        Active Data Objects Data Base
-Version:        4.67
+Version:        4.68
 Release:        1%{?dist}
 
-Source0:        http://dl.sf.net/adodb/adodb467.tgz
+Source0:        http://dl.sf.net/adodb/adodb468.tgz
 License:        BSD
 URL:            http://adodb.sf.net
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_var}/www/icons/*
 
 %changelog
+* Fri Dec 23 2005 Aurelien Bompard  4.68-1
+- version 4.68
+
 * Fri Nov 18 2005 Aurelien Bompard  4.67-1
 - version 4.67
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Nov 2005 10:26:32 -0000	1.4
+++ sources	23 Dec 2005 08:34:23 -0000	1.5
@@ -1 +1 @@
-679d4fac06126707f4bf636508e9ec8a  adodb467.tgz
+c4e8b0db2abc7181a1d3bb0621aa0c1d  adodb468.tgz



From fedora-extras-commits at redhat.com  Fri Dec 23 08:37:08 2005
From: fedora-extras-commits at redhat.com (Leif O M Bergman (lmb))
Date: Fri, 23 Dec 2005 03:37:08 -0500
Subject: rpms/perl-IO-Multiplex - New directory
Message-ID: <200512230837.jBN8bAu1012593@cvs-int.fedora.redhat.com>

Author: lmb

Update of /cvs/extras/rpms/perl-IO-Multiplex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12585/perl-IO-Multiplex

Log Message:
Directory /cvs/extras/rpms/perl-IO-Multiplex added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 23 08:37:14 2005
From: fedora-extras-commits at redhat.com (Leif O M Bergman (lmb))
Date: Fri, 23 Dec 2005 03:37:14 -0500
Subject: rpms/perl-IO-Multiplex/devel - New directory
Message-ID: <200512230837.jBN8bGIV012608@cvs-int.fedora.redhat.com>

Author: lmb

Update of /cvs/extras/rpms/perl-IO-Multiplex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12585/perl-IO-Multiplex/devel

Log Message:
Directory /cvs/extras/rpms/perl-IO-Multiplex/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 23 08:37:23 2005
From: fedora-extras-commits at redhat.com (Leif O M Bergman (lmb))
Date: Fri, 23 Dec 2005 03:37:23 -0500
Subject: rpms/perl-IO-Multiplex Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512230837.jBN8bPfC012642@cvs-int.fedora.redhat.com>

Author: lmb

Update of /cvs/extras/rpms/perl-IO-Multiplex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12630

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-IO-Multiplex


--- NEW FILE Makefile ---
# Top level Makefile for module perl-IO-Multiplex
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 23 08:37:29 2005
From: fedora-extras-commits at redhat.com (Leif O M Bergman (lmb))
Date: Fri, 23 Dec 2005 03:37:29 -0500
Subject: rpms/perl-IO-Multiplex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200512230837.jBN8bVbE012662@cvs-int.fedora.redhat.com>

Author: lmb

Update of /cvs/extras/rpms/perl-IO-Multiplex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12630/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-IO-Multiplex


--- NEW 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 Dec 23 08:37:43 2005
From: fedora-extras-commits at redhat.com (Leif O M Bergman (lmb))
Date: Fri, 23 Dec 2005 03:37:43 -0500
Subject: rpms/perl-IO-Multiplex import.log,1.1,1.2
Message-ID: <200512230838.jBN8cGfC012801@cvs-int.fedora.redhat.com>

Author: lmb

Update of /cvs/extras/rpms/perl-IO-Multiplex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12696

Modified Files:
	import.log 
Log Message:
auto-import perl-IO-Multiplex-1.08-4 on branch devel from perl-IO-Multiplex-1.08-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Multiplex/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Dec 2005 08:37:23 -0000	1.1
+++ import.log	23 Dec 2005 08:37:43 -0000	1.2
@@ -0,0 +1 @@
+perl-IO-Multiplex-1_08-4:HEAD:perl-IO-Multiplex-1.08-4.src.rpm:1135327061



From fedora-extras-commits at redhat.com  Fri Dec 23 08:37:50 2005
From: fedora-extras-commits at redhat.com (Leif O M Bergman (lmb))
Date: Fri, 23 Dec 2005 03:37:50 -0500
Subject: rpms/perl-IO-Multiplex/devel perl-IO-Multiplex.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512230838.jBN8cN2q012810@cvs-int.fedora.redhat.com>

Author: lmb

Update of /cvs/extras/rpms/perl-IO-Multiplex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12696/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-IO-Multiplex.spec 
Log Message:
auto-import perl-IO-Multiplex-1.08-4 on branch devel from perl-IO-Multiplex-1.08-4.src.rpm


--- NEW FILE perl-IO-Multiplex.spec ---
Summary: IO-Multiplex module for perl
Name: perl-IO-Multiplex
Version: 1.08
Release: 4
License: Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/IO-Multiplex/

Source: http://www.cpan.org/authors/id/B/BB/BBB/IO-Multiplex-1.08.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch
BuildRequires: perl
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
IO::Multiplex is designed to take the effort out of managing
multiple file handles.  It is essentially a really fancy front end to
the select system call.  In addition to maintaining the select
loop, it buffers all input and output to/from the file handles.  It
can also accept incoming connections on one or more listen sockets.

%prep
%setup -n IO-Multiplex-%{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 ';'

%check
%{__make} test

%clean 
%{__rm} -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc Changes README
%doc %{_mandir}/man?/*
%{perl_vendorlib}/IO/

%changelog
* Tue Dec 13 2005 Leif O M Bergman  - 1.08-4
- Changes for fedora xtras compliance

* Mon Dec 12 2005 Leif O M Bergman  - 1.08-3
- Cosmetic changes for fedora xtras

* Sun Feb 20 2005 Dag Wieers  - 1.08-2
- Cosmetic changes.

* Thu Mar 18 2004 Dag Wieers  - 1.08-1
- Updated to release 1.08.

* Mon Jul 14 2003 Dag Wieers  - 1.04-0
- Initial package. (using DAR)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Multiplex/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Dec 2005 08:37:29 -0000	1.1
+++ .cvsignore	23 Dec 2005 08:37:49 -0000	1.2
@@ -0,0 +1 @@
+IO-Multiplex-1.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Multiplex/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Dec 2005 08:37:29 -0000	1.1
+++ sources	23 Dec 2005 08:37:49 -0000	1.2
@@ -0,0 +1 @@
+b27e0eb03f85cfd04b3e29953cfd4444  IO-Multiplex-1.08.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 08:42:18 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 23 Dec 2005 03:42:18 -0500
Subject: rpms/python-dialog/FC-4 python-dialog.spec,1.5,1.6
Message-ID: <200512230842.jBN8goJ6012897@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/python-dialog/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12865/FC-4

Modified Files:
	python-dialog.spec 
Log Message:
- remove hardcoded disttag (#176478)


Index: python-dialog.spec
===================================================================
RCS file: /cvs/extras/rpms/python-dialog/FC-4/python-dialog.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-dialog.spec	30 Mar 2005 10:45:13 -0000	1.5
+++ python-dialog.spec	23 Dec 2005 08:42:18 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           python-dialog
 Version:        2.7
-Release:        1.fc4
+Release:        2%{?dist}
 Summary:        Python interface to the Unix dialog utility
 
 Group:          Development/Languages
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Aurelien Bompard  2.7-1
+- remove hardcoded disttag
+
 * Wed Mar 30 2005 Aurelien Bompard  2.7-1.fc4
 - change release tag for FC4
 - drop Epoch



From fedora-extras-commits at redhat.com  Fri Dec 23 08:42:24 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 23 Dec 2005 03:42:24 -0500
Subject: rpms/python-dialog/devel python-dialog.spec,1.5,1.6
Message-ID: <200512230842.jBN8guIR012900@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/python-dialog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12865/devel

Modified Files:
	python-dialog.spec 
Log Message:
- remove hardcoded disttag (#176478)


Index: python-dialog.spec
===================================================================
RCS file: /cvs/extras/rpms/python-dialog/devel/python-dialog.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-dialog.spec	30 Mar 2005 10:45:13 -0000	1.5
+++ python-dialog.spec	23 Dec 2005 08:42:24 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           python-dialog
 Version:        2.7
-Release:        1.fc4
+Release:        2%{?dist}
 Summary:        Python interface to the Unix dialog utility
 
 Group:          Development/Languages
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Aurelien Bompard  2.7-1
+- remove hardcoded disttag
+
 * Wed Mar 30 2005 Aurelien Bompard  2.7-1.fc4
 - change release tag for FC4
 - drop Epoch



From fedora-extras-commits at redhat.com  Fri Dec 23 08:49:22 2005
From: fedora-extras-commits at redhat.com (Leif O M Bergman (lmb))
Date: Fri, 23 Dec 2005 03:49:22 -0500
Subject: owners owners.list,1.477,1.478
Message-ID: <200512230849.jBN8ns8s012972@cvs-int.fedora.redhat.com>

Author: lmb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12937

Modified Files:
	owners.list 
Log Message:
Adding perl-IO-Multiplex



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -r1.477 -r1.478
--- owners.list	22 Dec 2005 20:33:47 -0000	1.477
+++ owners.list	23 Dec 2005 08:49:22 -0000	1.478
@@ -805,6 +805,7 @@
 Fedora Extras|perl-Image-Xbm|Load, create, manipulate and save xbm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-Xpm|Load, create, manipulate and save xpm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-CaptureOutput|Capture STDOUT/STDERR from subprocesses and XS/C modules|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Dec 23 09:00:53 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 23 Dec 2005 04:00:53 -0500
Subject: rpms/grads/FC-3 grads.spec,1.4,1.5
Message-ID: <200512230901.jBN91PLb014708@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13105

Modified Files:
	grads.spec 
Log Message:
No hdf-devel on FC-3



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-3/grads.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grads.spec	21 Dec 2005 08:02:35 -0000	1.4
+++ grads.spec	23 Dec 2005 09:00:53 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        5%{?dist}.1
+Release:        5%{?dist}.2
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -28,9 +28,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # no hdf on ppc
-%ifnarch ppc
-BuildRequires:  hdf-devel 
-%endif
 BuildRequires:  udunits-devel netcdf-devel 
 #BuildRequires:  opendap-devel
 BuildRequires:  libdap-devel libnc-dap-devel
@@ -69,7 +66,7 @@
 
 %build
 ./bootstrap
-# pass the -L and -I flags for hdf on ppc even though there is no hdf
+# pass the -L and -I flags for hdf even though there is no hdf
 %configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
@@ -91,9 +88,6 @@
 %{_bindir}/bufrscan
 %{_bindir}/gradsc
 %{_bindir}/gradsdods
-%ifnarch ppc
-%{_bindir}/gradshdf
-%endif
 %{_bindir}/gradsnc
 %{_bindir}/gribmap
 %{_bindir}/gribscan
@@ -107,7 +101,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Wed Dec 21 2005 Patrice Dumas  1.9b4-5.1
+* Wed Dec 21 2005 Patrice Dumas  1.9b4-5.2
 - don't build the hdf interface on ppc, there is no hdf package
 
 * Tue Dec 13 2005 Patrice Dumas  1.9b4-4



From fedora-extras-commits at redhat.com  Fri Dec 23 09:10:40 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 23 Dec 2005 04:10:40 -0500
Subject: rpms/grads/FC-4 grads.spec,1.4,1.5
Message-ID: <200512230911.jBN9BDTP015070@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15053

Modified Files:
	grads.spec 
Log Message:
./configure fails on x86_64


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-4/grads.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grads.spec	21 Dec 2005 08:02:35 -0000	1.4
+++ grads.spec	23 Dec 2005 09:10:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        5%{?dist}.1
+Release:        5%{?dist}.2
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -26,6 +26,8 @@
 Patch1:         grads_dap-no_lats.patch
 Patch2:         grads-conditionnal_lats.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# configure fails on x86_64
+ExcludeArch:    x86_64
 
 # no hdf on ppc
 %ifnarch ppc
@@ -107,7 +109,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Wed Dec 21 2005 Patrice Dumas  1.9b4-5.1
+* Wed Dec 21 2005 Patrice Dumas  1.9b4-5.2
 - don't build the hdf interface on ppc, there is no hdf package
 
 * Tue Dec 13 2005 Patrice Dumas  1.9b4-4



From fedora-extras-commits at redhat.com  Fri Dec 23 09:22:01 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 23 Dec 2005 04:22:01 -0500
Subject: rpms/help2man/devel .cvsignore, 1.3, 1.4 help2man.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200512230923.jBN9N3UX015431@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/help2man/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15408

Modified Files:
	.cvsignore help2man.spec sources 
Log Message:
* Fri Dec 23 2005 Ralf Cors??pius  - 1.36.3-1
- Upstream update.
- Add build option --with nls.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/help2man/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Apr 2005 17:23:36 -0000	1.3
+++ .cvsignore	23 Dec 2005 09:22:01 -0000	1.4
@@ -1 +1 @@
-help2man-1.35.1.tar.gz
+help2man-1.36.3.tar.gz


Index: help2man.spec
===================================================================
RCS file: /cvs/extras/rpms/help2man/devel/help2man.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- help2man.spec	23 Dec 2005 07:12:12 -0000	1.8
+++ help2man.spec	23 Dec 2005 09:22:01 -0000	1.9
@@ -1,13 +1,20 @@
+# Supported build option:
+#
+# --with nls ... build this package with --enable-nls 
+
 Name:         	help2man
 Summary:      	Create simple man pages from --help output
-Version:      	1.35.1
-Release:      	2%{?dist}
+Version:      	1.36.3
+Release:      	1%{?dist}
 Group:       	Development/Tools
 License:     	GPL
 URL:		http://www.gnu.org/software/help2man
 Source:       	ftp://ftp.gnu.org/gnu/help2man/help2man-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:    	noarch
+
+%{!?_with_nls:BuildArch: noarch}
+%{?_with_nls:BuildRequires: perl(Locale::gettext)}
+%{?_with_nls:Requires: perl(Locale::gettext)}
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -24,9 +31,9 @@
 %setup -n help2man-%{version}
 
 %build
-# --enable-nls would require perl(Locale::gettext)
-  %configure --disable-nls
-make
+
+%configure %{!?_with_nls:--disable-nls}
+make %{?_smp_mflags}
 
 %install
 rm -fr $RPM_BUILD_ROOT
@@ -45,13 +52,27 @@
 fi
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %doc README NEWS THANKS
 %{_bindir}/help2man
 %{_infodir}/*
 %{_mandir}/man1/*
 
+%if "%{?_with_nls}"
+%{_libdir}/*.so
+%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/help2man.mo
+%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/help2man.mo
+%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/help2man.mo
+%lang(pl) %{_mandir}/pl/man1/*
+%lang(fi) %{_mandir}/fi/man1/*
+%lang(fr) %{_mandir}/fr/man1/*
+%endif
+
 %changelog
+* Fri Dec 23 2005 Ralf Cors??pius  - 1.36.3-1
+- Upstream update.
+- Add build option --with nls.
+
 * Fri Dec 23 2005 Ralf Cors??pius  - 1.35.1-2
 - Fix disttag (#176473).
 - Cleanup spec.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/help2man/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Apr 2005 17:23:36 -0000	1.3
+++ sources	23 Dec 2005 09:22:01 -0000	1.4
@@ -1 +1 @@
-e3c9e846dd163eb7f1d1661e2d0baa07  help2man-1.35.1.tar.gz
+4b5f1609d22a6a0aacbeb5eaf08ad2b1  help2man-1.36.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 09:37:04 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 23 Dec 2005 04:37:04 -0500
Subject: rpms/grads/FC-3 grads.spec,1.5,1.6
Message-ID: <200512230937.jBN9bb5Z015591@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15572

Modified Files:
	grads.spec 
Log Message:
./configure fails on x86_64


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-3/grads.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grads.spec	23 Dec 2005 09:00:53 -0000	1.5
+++ grads.spec	23 Dec 2005 09:37:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        5%{?dist}.2
+Release:        5%{?dist}.3
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -26,6 +26,8 @@
 Patch1:         grads_dap-no_lats.patch
 Patch2:         grads-conditionnal_lats.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# configure fails on x86_64
+ExcludeArch:    x86_64
 
 # no hdf on ppc
 BuildRequires:  udunits-devel netcdf-devel 
@@ -101,7 +103,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Wed Dec 21 2005 Patrice Dumas  1.9b4-5.2
+* Wed Dec 21 2005 Patrice Dumas  1.9b4-5.3
 - don't build the hdf interface on ppc, there is no hdf package
 
 * Tue Dec 13 2005 Patrice Dumas  1.9b4-4



From fedora-extras-commits at redhat.com  Fri Dec 23 10:17:50 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 23 Dec 2005 05:17:50 -0500
Subject: rpms/scim-input-pad/FC-3 .cvsignore, 1.2, 1.3 scim-input-pad.spec,
	1.2, 
	1.3 sources, 1.2, 1.3 scim-input-pad-0.1.0-casts.patch, 1.1, NONE
Message-ID: <200512231018.jBNAIMHT017498@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-serv17477

Modified Files:
	.cvsignore scim-input-pad.spec sources 
Removed Files:
	scim-input-pad-0.1.0-casts.patch 
Log Message:
update to 1.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2005 23:28:12 -0000	1.2
+++ .cvsignore	23 Dec 2005 10:17:50 -0000	1.3
@@ -1 +1 @@
-scim-input-pad-0.1.0.tar.gz
+scim-input-pad-0.1.1.tar.gz


Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-3/scim-input-pad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-input-pad.spec	21 Oct 2005 23:40:39 -0000	1.2
+++ scim-input-pad.spec	23 Dec 2005 10:17:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scim-input-pad
-Version:        0.1.0
-Release:        3%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -11,14 +11,12 @@
 
 BuildRequires:  scim-devel
 Requires:       scim
-Patch0:	        scim-input-pad-0.1.0-casts.patch
 
 %description
 Scim-input-pad is an on-screen input pad used to input symbols easily.
 
 %prep
 %setup -q
-%patch0 -p0 -b .orig
 
 
 %build
@@ -58,6 +56,10 @@
 
 
 %changelog
+* Fri Dec 23 2005 Ryo Dairiki 
+- update to 0.1.1
+- get rid of the patch for irregal casting
+
 * Sat Oct 22 2005 Ryo Dairiki 
 - reimport sourcefiles.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 23:28:12 -0000	1.2
+++ sources	23 Dec 2005 10:17:50 -0000	1.3
@@ -1 +1 @@
-119ce442a774d9fd25da550669675501  scim-input-pad-0.1.0.tar.gz
+45fc98fadcfdb8351478a2bc8e37b24f  scim-input-pad-0.1.1.tar.gz


--- scim-input-pad-0.1.0-casts.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec 23 10:18:50 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 23 Dec 2005 05:18:50 -0500
Subject: rpms/scim-input-pad/FC-4 scim-input-pad.spec, 1.2, 1.3 sources, 1.2,
	1.3 scim-input-pad-0.1.0-casts.patch, 1.1, NONE
Message-ID: <200512231019.jBNAJMhr017569@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-serv17509

Modified Files:
	scim-input-pad.spec sources 
Removed Files:
	scim-input-pad-0.1.0-casts.patch 
Log Message:
update to 0.1.1



Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-4/scim-input-pad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-input-pad.spec	21 Oct 2005 23:41:20 -0000	1.2
+++ scim-input-pad.spec	23 Dec 2005 10:18:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scim-input-pad
-Version:        0.1.0
-Release:        3%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -11,14 +11,12 @@
 
 BuildRequires:  scim-devel
 Requires:       scim
-Patch0:	        scim-input-pad-0.1.0-casts.patch
 
 %description
 Scim-input-pad is an on-screen input pad used to input symbols easily.
 
 %prep
 %setup -q
-%patch0 -p0 -b .orig
 
 
 %build
@@ -58,6 +56,10 @@
 
 
 %changelog
+* Fri Dec 23 2005 Ryo Dairiki 
+- update to 0.1.1
+- get rid of the patch for irregal casting
+
 * Sat Oct 22 2005 Ryo Dairiki 
 - reimport sourcefiles.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 23:25:51 -0000	1.2
+++ sources	23 Dec 2005 10:18:50 -0000	1.3
@@ -1 +1 @@
-119ce442a774d9fd25da550669675501  scim-input-pad-0.1.0.tar.gz
+45fc98fadcfdb8351478a2bc8e37b24f  scim-input-pad-0.1.1.tar.gz


--- scim-input-pad-0.1.0-casts.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec 23 10:19:53 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 23 Dec 2005 05:19:53 -0500
Subject: rpms/scim-input-pad/devel scim-input-pad.spec, 1.2, 1.3 sources, 1.2,
	1.3 scim-input-pad-0.1.0-casts.patch, 1.1, NONE
Message-ID: <200512231020.jBNAKP4F017639@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-serv17616

Modified Files:
	scim-input-pad.spec sources 
Removed Files:
	scim-input-pad-0.1.0-casts.patch 
Log Message:
update to 0.1.1



Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/devel/scim-input-pad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-input-pad.spec	21 Oct 2005 23:31:35 -0000	1.2
+++ scim-input-pad.spec	23 Dec 2005 10:19:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scim-input-pad
-Version:        0.1.0
-Release:        3%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -11,14 +11,12 @@
 
 BuildRequires:  scim-devel
 Requires:       scim
-Patch0:	        scim-input-pad-0.1.0-casts.patch
 
 %description
 Scim-input-pad is an on-screen input pad used to input symbols easily.
 
 %prep
 %setup -q
-%patch0 -p0 -b .orig
 
 
 %build
@@ -58,6 +56,10 @@
 
 
 %changelog
+* Fri Dec 23 2005 Ryo Dairiki 
+- update to 0.1.1
+- get rid of the patch for irregal casting
+
 * Sat Oct 22 2005 Ryo Dairiki 
 - reimport sourcefiles.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 23:25:24 -0000	1.2
+++ sources	23 Dec 2005 10:19:52 -0000	1.3
@@ -1 +1 @@
-119ce442a774d9fd25da550669675501  scim-input-pad-0.1.0.tar.gz
+45fc98fadcfdb8351478a2bc8e37b24f  scim-input-pad-0.1.1.tar.gz


--- scim-input-pad-0.1.0-casts.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec 23 11:09:13 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 23 Dec 2005 06:09:13 -0500
Subject: rpms/wesnoth/FC-4 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 wesnoth.spec, 1.16, 1.17
Message-ID: <200512231109.jBNB9p8V019524@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/wesnoth/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19455/FC-4

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Oct 2005 10:33:13 -0000	1.11
+++ .cvsignore	23 Dec 2005 11:09:12 -0000	1.12
@@ -1 +1 @@
-wesnoth-1.0.1.tar.gz
+wesnoth-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Oct 2005 10:33:13 -0000	1.11
+++ sources	23 Dec 2005 11:09:12 -0000	1.12
@@ -1 +1 @@
-20a2498938a168bf6a0989af857da500  wesnoth-1.0.1.tar.gz
+1d2a26062ce1c90cbf10845023f9435c  wesnoth-1.0.2.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/wesnoth.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wesnoth.spec	24 Oct 2005 10:33:13 -0000	1.16
+++ wesnoth.spec	23 Dec 2005 11:09:12 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           wesnoth
-Version:        1.0.1
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
@@ -158,6 +158,9 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Wed Dec 21 2005 Michael Schwendt  - 1.0.2-1
+- update to 1.0.2
+
 * Sat Oct 22 2005 Michael Schwendt  - 1.0.1-1
 - update to 1.0.1
 



From fedora-extras-commits at redhat.com  Fri Dec 23 11:09:19 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 23 Dec 2005 06:09:19 -0500
Subject: rpms/wesnoth/FC-3 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 wesnoth.spec, 1.12, 1.13
Message-ID: <200512231110.jBNBA776019531@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/wesnoth/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19455/FC-3

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Oct 2005 10:33:12 -0000	1.11
+++ .cvsignore	23 Dec 2005 11:09:18 -0000	1.12
@@ -1 +1 @@
-wesnoth-1.0.1.tar.gz
+wesnoth-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Oct 2005 10:33:12 -0000	1.11
+++ sources	23 Dec 2005 11:09:18 -0000	1.12
@@ -1 +1 @@
-20a2498938a168bf6a0989af857da500  wesnoth-1.0.1.tar.gz
+1d2a26062ce1c90cbf10845023f9435c  wesnoth-1.0.2.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/wesnoth.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wesnoth.spec	24 Oct 2005 10:33:12 -0000	1.12
+++ wesnoth.spec	23 Dec 2005 11:09:18 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           wesnoth
-Version:        1.0.1
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
@@ -158,6 +158,9 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Wed Dec 21 2005 Michael Schwendt  - 1.0.2-1
+- update to 1.0.2
+
 * Sat Oct 22 2005 Michael Schwendt  - 1.0.1-1
 - update to 1.0.1
 



From fedora-extras-commits at redhat.com  Fri Dec 23 13:08:34 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri, 23 Dec 2005 08:08:34 -0500
Subject: rpms/ktrack/FC-3 ktrack.spec,1.11,1.12
Message-ID: <200512231309.jBND97ea023236@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/ktrack/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23214

Modified Files:
	ktrack.spec 
Log Message:
Fix hard coded dist tag



Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/rpms/ktrack/FC-3/ktrack.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ktrack.spec	6 Apr 2005 10:11:58 -0000	1.11
+++ ktrack.spec	23 Dec 2005 13:08:08 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 10.rc1.fc3
+Release: 12.rc1.%{?dist}
 License: GPL
 Group: Applications/Communications
 Source: http://prdownloads.sourceforge.net/ktrack/ktrack-0.3.0-rc1.tar.bz2
@@ -59,10 +59,16 @@
 %doc AUTHORS ChangeLog COPYING README TODO doc/en/index.docbook doc/en/index.cache.bz2
 
 %changelog
+* Thu Dec 22 2005 Dennis Gilmore  - 0.3.0-12.rc1
+- rebuild for gcc 4.1
+
+* Sun May 22 2005 Jeremy Katz  - 0.3.0-11.rc1.fc4
+- rebuild on all arches
+
 * Wed Apr  6 2005 Ignacio Vazquez-Abrams  0.3.0-10.rc1.fc3
 - Rebuild against hamlib 1.2.4
 
-* Sat Mar 26 2005 Michael Schwendt  0.3.0-9.rc1.fc3
+* Sat Mar 26 2005 Michael Schwendt  0.3.0-9.rc1.fc4
 - Pass Qt library/header location to configure script to work around
   broken Qt detection on x86_64.
 



From fedora-extras-commits at redhat.com  Fri Dec 23 13:11:57 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri, 23 Dec 2005 08:11:57 -0500
Subject: rpms/ktrack/FC-4 ktrack.spec,1.12,1.13
Message-ID: <200512231312.jBNDCU7P023337@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/ktrack/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23310

Modified Files:
	ktrack.spec 
Log Message:
Build to fix hard coded dist tags




Index: ktrack.spec
===================================================================
RCS file: /cvs/extras/rpms/ktrack/FC-4/ktrack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ktrack.spec	22 May 2005 23:44:21 -0000	1.12
+++ ktrack.spec	23 Dec 2005 13:11:57 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Satellite prediction software for KDE
 Name: ktrack
 Version: 0.3.0
-Release: 11.rc1.fc4
+Release: 12.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
+* Thu Dec 22 2005 Dennis Gilmore  - 0.3.0-12.rc1
+- rebuild for gcc 4.1
+
 * Sun May 22 2005 Jeremy Katz  - 0.3.0-11.rc1.fc4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Fri Dec 23 15:39:03 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 23 Dec 2005 10:39:03 -0500
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.4,1.5
Message-ID: <200512231539.jBNFdZao026919@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26902

Modified Files:
	kmymoney2.spec 
Log Message:
* Fri Dec 23 2005 Rex Dieter  0.8.1-5
- cleanup %post
- fc5 respin for new(er) libofx



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kmymoney2.spec	15 Dec 2005 15:08:12 -0000	1.4
+++ kmymoney2.spec	23 Dec 2005 15:39:02 -0000	1.5
@@ -10,7 +10,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -109,18 +109,18 @@
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor ||:
-touch --no-create %{_datadir}/icons/locolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+for icon_theme in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig 
-touch --no-create %{_datadir}/icons/hicolor ||:
-touch --no-create %{_datadir}/icons/locolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+for icon_theme in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
@@ -152,6 +152,10 @@
 
 
 %changelog
+* Fri Dec 23 2005 Rex Dieter  0.8.1-5
+- cleanup %%post
+- fc5 respin for new(er) libofx
+
 * Mon Nov 14 2005 Rex Dieter  0.8.1-4
 - relax BR: kdelibs-devel to 3.3 (for aurora/sparc, #173133)
 



From fedora-extras-commits at redhat.com  Fri Dec 23 15:46:01 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Fri, 23 Dec 2005 10:46:01 -0500
Subject: rpms/mantis/devel mantis-1.0.0rc2-noadmin.patch, NONE, 1.1 sources, 
	1.4, 1.5 mantis.spec, 1.7, 1.8 mantis-1.0.0a3-nonmysql.patch,
	1.1, NONE mantis-0.19.2-noadmin.patch, 1.1, NONE
Message-ID: <200512231546.jBNFkYrF027089@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mantis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27067/devel

Modified Files:
	sources mantis.spec 
Added Files:
	mantis-1.0.0rc2-noadmin.patch 
Removed Files:
	mantis-1.0.0a3-nonmysql.patch mantis-0.19.2-noadmin.patch 
Log Message:
- SECURITY: release 1.0.0rc4
- removed x-permission from most files
- rediffed


mantis-1.0.0rc2-noadmin.patch:

--- NEW FILE mantis-1.0.0rc2-noadmin.patch ---
--- mantis-1.0.0rc2/login_page.php.noadmin	2005-08-16 00:13:50.000000000 +0200
+++ mantis-1.0.0rc2/login_page.php	2005-10-27 19:56:19.000000000 +0200
@@ -141,7 +141,7 @@
 
 	# Check if the admin directory is available and is readable.
 	$t_admin_dir = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR;
-	if ( is_dir( $t_admin_dir ) && is_readable( $t_admin_dir ) ) {
+	if ( 0 && is_dir( $t_admin_dir ) && is_readable( $t_admin_dir ) ) {
 		echo '
    ', "\n";
 		echo '
    WARNING: Admin directory should be removed.
    ', "\n";
 		echo '
    ', "\n";


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Jun 2005 14:48:48 -0000	1.4
+++ sources	23 Dec 2005 15:46:01 -0000	1.5
@@ -1 +1 @@
-b12ab13376e91313402f666f22948ded  mantis-1.0.0a3.tar.gz
+96724be25c508d2f4008dfa5535efd82  mantis-1.0.0rc4.tar.gz


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mantis.spec	25 Jun 2005 14:45:53 -0000	1.7
+++ mantis.spec	23 Dec 2005 15:46:01 -0000	1.8
@@ -1,6 +1,6 @@
 # $Id$
 
-%global alpha		a3
+%global alpha		rc4
 
 %global pkgdir		%_datadir/%name
 %global cfgdir		%_sysconfdir/%name
@@ -19,8 +19,7 @@
 Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%name-%version%{?alpha}.tar.gz
 Patch0:		mantis-1.0.0a3-iis.patch
 Patch1:		mantis-0.19.2-noexamplecom.patch
-Patch2:		mantis-0.19.2-noadmin.patch
-Patch3:		mantis-1.0.0a3-nonmysql.patch
+Patch2:		mantis-1.0.0rc2-noadmin.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	diffutils
 Requires:	php
@@ -60,7 +59,6 @@
 %patch0 -p1 -b .iis
 %patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
-%patch3 -p1 -b .nonmysql
 
 chmod -x *.php
 rm -rf packages
@@ -85,6 +83,22 @@
 mv $RPM_BUILD_ROOT%pkgdir/mantis_offline.php.sample $RPM_BUILD_ROOT%cfgdir/
 mv $RPM_BUILD_ROOT%pkgdir/config_inc.php.sample     $RPM_BUILD_ROOT%cfgdir/config_inc.php
 
+for i in $(find $RPM_BUILD_ROOT -type f -regex '.*\.\(php\|txt\|gif\|png\|css\|htm\|dtd\|xsl\|sql\|js\|bak\|xml\|zip\)$' -perm +0111); do
+	case $i in
+		(*.php)
+			if ! sed '1p;d' "$i" | grep -q '^#!'; then
+			   chmod a-x "$i"
+			elif sed '1p;d' "$i" | grep -q '/usr/local/bin/php'; then
+			   sed -i -e '1s!/usr/local/bin/php!/usr/bin/php!' "$i"
+			fi
+			;;
+		(*.bak)		rm -f "$i";;
+		(*)		chmod a-x "$i";;
+	esac
+done
+
+chmod -x $RPM_BUILD_ROOT%pkgdir/{doc/*,core/phpmailer/{README,LICENSE}}
+
 ln -s %cfgdir/config_inc.php	 $RPM_BUILD_ROOT%pkgdir/config_inc.php
 ln -s %cfgdir/mantis_offline.php $RPM_BUILD_ROOT%pkgdir/mantis_offline.php
 
@@ -115,9 +129,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc sql
 %pkgdir
-%exclude %pkgdir/sql
 %attr(-,root,apache) %dir %cfgdir
 %attr(0640,root,apache) %config(noreplace) %cfgdir/*
 
@@ -128,6 +140,11 @@
 
 
 %changelog
+* Fri Dec 23 2005 Enrico Scholz  - 1.0.0-0.1.rc4
+- SECURITY: release 1.0.0rc4
+- removed x-permission from most files
+- rediffed
+
 * Sat Jun 25 2005 Enrico Scholz  - 1.0.0
 - updated to 1.0.0a3
 - removed the part which created the psql-script; upstream has now a


--- mantis-1.0.0a3-nonmysql.patch DELETED ---


--- mantis-0.19.2-noadmin.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec 23 15:46:59 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Fri, 23 Dec 2005 10:46:59 -0500
Subject: rpms/mantis/FC-4 sources,1.4,1.5 mantis.spec,1.7,1.8
Message-ID: <200512231547.jBNFlVF6027119@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mantis/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27100/FC-4

Modified Files:
	sources mantis.spec 
Log Message:
- SECURITY: release 0.19.4
  * File Upload Vulnerability (TKADV2005-11-002) (thraxisp)
  * Injection Vulnerabilities in Filters (TKADV2005-11-002)
  * SQL Injection in manage user page (TKADV2005-11-002)
  * HTTP Header CRLF Injection (TKADV2005-11-002) (vboctor)
  * Port XSS Vulnerability in filters (TKADV2005-11-002) (thraxisp)
- removed x-permission from most files



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Oct 2005 17:26:44 -0000	1.4
+++ sources	23 Dec 2005 15:46:58 -0000	1.5
@@ -1 +1 @@
-b3c1d9f6f66bc5e7e236cc9449aa3ced  mantis-0.19.3.tar.gz
+6dd7282469f7be4fb2eeaff92942f448  mantis-0.19.4.tar.gz


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-4/mantis.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mantis.spec	27 Oct 2005 17:26:44 -0000	1.7
+++ mantis.spec	23 Dec 2005 15:46:58 -0000	1.8
@@ -8,7 +8,7 @@
 
 Summary:	Web-based bugtracking system
 Name:		mantis
-Version:	0.19.3
+Version:	0.19.4
 Release:	%release_func 1
 License:	GPL
 Group:		Applications/Internet
@@ -59,7 +59,7 @@
 %patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
 
-chmod -x *.php
+chmod -x *.php sql/*
 rm -rf packages
 
 sed -e '$s!CONCAT.*!md5(random()*random())||md5(now()));!;
@@ -95,6 +95,22 @@
 mv $RPM_BUILD_ROOT%pkgdir/mantis_offline.php.sample $RPM_BUILD_ROOT%cfgdir/
 mv $RPM_BUILD_ROOT%pkgdir/config_inc.php.sample     $RPM_BUILD_ROOT%cfgdir/config_inc.php
 
+for i in $(find $RPM_BUILD_ROOT -type f -regex '.*\.\(php\|txt\|gif\|png\|css\|htm\|dtd\|xsl\|sql\|js\|bak\|xml\)$' -perm +0111); do
+	case $i in
+		(*.php)
+			if ! sed '1p;d' "$i" | grep -q '^#!'; then
+			   chmod a-x "$i"
+			elif sed '1p;d' "$i" | grep -q '/usr/local/bin/php'; then
+			   sed -i -e '1s!/usr/local/bin/php!/usr/bin/php!' "$i"
+			fi
+			;;
+		(*.bak)		rm -f "$i";;
+		(*)		chmod a-x "$i";;
+	esac
+done
+
+chmod -x $RPM_BUILD_ROOT%pkgdir/{doc/*,core/phpmailer/{README,LICENSE}}
+
 ln -s %cfgdir/config_inc.php	   $RPM_BUILD_ROOT%pkgdir/config_inc.php
 ln -s %cfgdir/mantis_offline.php $RPM_BUILD_ROOT%pkgdir/mantis_offline.php
 
@@ -138,6 +154,15 @@
 
 
 %changelog
+* Fri Dec 23 2005 Enrico Scholz  - 0.19.4-1
+- SECURITY: release 0.19.4
+  * File Upload Vulnerability (TKADV2005-11-002) (thraxisp)
+  * Injection Vulnerabilities in Filters (TKADV2005-11-002)
+  * SQL Injection in manage user page (TKADV2005-11-002)
+  * HTTP Header CRLF Injection (TKADV2005-11-002) (vboctor)
+  * Port XSS Vulnerability in filters (TKADV2005-11-002) (thraxisp)
+- removed x-permission from most files
+
 * Thu Oct 27 2005 Enrico Scholz  - 0.19.3-1
 - updated to 0.19.3 (SECURITY)
 - minor spec file cleanups



From fedora-extras-commits at redhat.com  Fri Dec 23 16:12:41 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 23 Dec 2005 11:12:41 -0500
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.5,1.6
Message-ID: <200512231613.jBNGDDSW028940@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28923

Modified Files:
	kmymoney2.spec 
Log Message:
* Fri Dec 23 2005 Rex Dieter  0.8.1-6
- cleanup ofx deps



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kmymoney2.spec	23 Dec 2005 15:39:02 -0000	1.5
+++ kmymoney2.spec	23 Dec 2005 16:12:41 -0000	1.6
@@ -1,16 +1,23 @@
 
 %if "%{?fedora}" > "2"
 %define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel, openjade-devel >= 1.3.2
+%endif
+
+%if "%{?fedora}" > "4"
+%define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel opensp-devel
 %endif
 
 %if "%{?rhel}" > "3"
 %define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel, openjade-devel >= 1.3.2
 %endif
 
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -26,10 +33,9 @@
 BuildRequires: libxml2-devel
 BuildRequires: ghostscript
 BuildRequires: kdelibs-devel >= 6:3.3
+%{?_with_ofxbanking:BuildRequires: %{ofx_deps}}
 %{?_with_check:BuildRequires: cppunit-devel >= 1.8.0}
-%{?_with_ofxbanking:BuildRequires: openjade-devel >= 1.3.2, libofx-devel}
-## TODO
-#define _with_kbanking --with-kbanking
+## FIXME/TODO
 %{?_with_kbanking:BuildRequires: aqbanking-devel >= 1.6.0}
 
 
@@ -58,7 +64,8 @@
 
 %configure \
   --disable-rpath \
-  --disable-debug --disable-warnings --disable-dependency-tracking --enable-final \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final \
   %{?_with_kbanking: --enable-kbanking } %{!?_with_kbanking: --disable-kbanking } \
   %{?_with_ofxbanking: --enable-ofxbanking --enable-ofxplugin } \
   %{!?_with_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
@@ -152,6 +159,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Rex Dieter  0.8.1-6
+- cleanup ofx deps
+
 * Fri Dec 23 2005 Rex Dieter  0.8.1-5
 - cleanup %%post
 - fc5 respin for new(er) libofx



From fedora-extras-commits at redhat.com  Fri Dec 23 16:30:51 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 23 Dec 2005 11:30:51 -0500
Subject: rpms/phpldapadmin/FC-4 phpldapadmin-0.9.7.2-config.patch, NONE,
	1.1 phpldapadmin.spec, 1.7, 1.8 sources, 1.3,
	1.4 phpldapadmin-0.9.7.1-config.patch, 1.1, NONE
Message-ID: <200512231631.jBNGVOKe029039@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/phpldapadmin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29017

Modified Files:
	phpldapadmin.spec sources 
Added Files:
	phpldapadmin-0.9.7.2-config.patch 
Removed Files:
	phpldapadmin-0.9.7.1-config.patch 
Log Message:


phpldapadmin-0.9.7.2-config.patch:

--- NEW FILE phpldapadmin-0.9.7.2-config.patch ---
diff -Nrbu phpldapadmin-0.9.7.2/config/config.php phpldapadmin-0.9.7.2-OK/config/config.php
--- phpldapadmin-0.9.7.2/config/config.php	2005-11-15 19:29:18.000000000 +0300
+++ phpldapadmin-0.9.7.2-OK/config/config.php	2005-11-15 19:29:06.000000000 +0300
@@ -34,6 +34,9 @@
 /* Useful important configuration overrides  */
 /*********************************************/
 
+#  $config->custom->appearance['language'] = 'en';
+#  $config->custom->appearance['show_clear_password'] = true;
+
 /* If you are asked to put pla in debug mode, this is how you do it: */
 #  $config->custom->debug['level'] = 2;
 #  $config->custom->debug['syslog'] = true;
@@ -64,7 +67,7 @@
 
 /* A convenient name that will appear in the tree viewer and throughout
    phpLDAPadmin to identify this LDAP server to users. */
-$ldapservers->SetValue($i,'server','name','My LDAP Server');
+$ldapservers->SetValue($i,'server','name','Local LDAP Server');
 
 /* Examples:
    'ldap.example.com',
@@ -93,6 +96,7 @@
    encrypted using blowfish and the secret your specify above as
    session['blowfish']. */
 // $ldapservers->SetValue($i,'server','auth_type','cookie');
+$ldapservers->SetValue($i,'server','auth_type','session');
 
 /* The DN of the user for phpLDAPadmin to bind with. For anonymous binds or
    'cookie' or 'session' auth_types, LEAVE THE LOGIN_DN AND LOGIN_PASS BLANK. If
@@ -118,6 +122,7 @@
 /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
    blowfish, crypt or leave blank for now default algorithm. */
 // $ldapservers->SetValue($i,'appearance','password_hash','md5');
+$ldapservers->SetValue($i,'appearance','password_hash','');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, you can
    optionally specify here an attribute to use when logging in. If you enter
@@ -129,6 +134,7 @@
    specify 'string', in which case you can provide a string to use for logging
    users in. See 'login_string' directly below. */
 // $ldapservers->SetValue($i,'login','attr','dn');
+$ldapservers->SetValue($i,'login','attr','uid');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, and you
    specified 'string' for 'login_attr' above, you must provide a string here for


Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/phpldapadmin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- phpldapadmin.spec	3 Nov 2005 13:12:50 -0000	1.7
+++ phpldapadmin.spec	23 Dec 2005 16:30:51 -0000	1.8
@@ -1,13 +1,13 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
-Version: 0.9.7.1
-Release: 1%{?dist}
+Version: 0.9.7.2
+Release: 2
 Group: Applications/Internet
 License: GPL
 URL: http://phpldapadmin.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tar.gz
 Patch1: phpldapadmin-0.9.7.1-namingcontexts.patch
-Patch2: phpldapadmin-0.9.7.1-config.patch
+Patch2: phpldapadmin-0.9.7.2-config.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -55,7 +55,7 @@
 cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
-rm -rf doc/ INSTALL LICENSE VERSION
+rm -rf doc/ INSTALL LICENSE
 popd
 
 
@@ -114,6 +114,13 @@
 
 
 %changelog
+* 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)
+
+* Tue Nov 15 2005 Dmitry Butskoy  - 0.9.7.2-1
+- update to 0.9.7.2
+
 * Tue Nov  1 2005 Dmitry Butskoy  - 0.9.7.1-1
 - upgrade to 0.9.7.1
 - adapt patches and spec to new upstream layout.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Nov 2005 16:36:11 -0000	1.3
+++ sources	23 Dec 2005 16:30:51 -0000	1.4
@@ -1 +1 @@
-7491767e6a6c1166217472daa9b4c45c  phpldapadmin-0.9.7.1.tar.gz
+ac9923e37bbc232b9ca537cfd9282691  phpldapadmin-0.9.7.2.tar.gz


--- phpldapadmin-0.9.7.1-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec 23 16:32:04 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 23 Dec 2005 11:32:04 -0500
Subject: rpms/phpldapadmin/FC-4 phpldapadmin.spec,1.8,1.9
Message-ID: <200512231632.jBNGWalO029092@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/phpldapadmin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29075

Modified Files:
	phpldapadmin.spec 
Log Message:



Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/phpldapadmin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- phpldapadmin.spec	23 Dec 2005 16:30:51 -0000	1.8
+++ phpldapadmin.spec	23 Dec 2005 16:32:04 -0000	1.9
@@ -1,7 +1,7 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
 Version: 0.9.7.2
-Release: 2
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://phpldapadmin.sourceforge.net



From fedora-extras-commits at redhat.com  Fri Dec 23 16:34:03 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Fri, 23 Dec 2005 11:34:03 -0500
Subject: rpms/phpldapadmin/FC-3 phpldapadmin-0.9.7.2-config.patch, NONE,
	1.1 phpldapadmin.spec, 1.7, 1.8 sources, 1.3,
	1.4 phpldapadmin-0.9.7.1-config.patch, 1.1, NONE
Message-ID: <200512231634.jBNGYZpa029168@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/phpldapadmin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29146

Modified Files:
	phpldapadmin.spec sources 
Added Files:
	phpldapadmin-0.9.7.2-config.patch 
Removed Files:
	phpldapadmin-0.9.7.1-config.patch 
Log Message:


phpldapadmin-0.9.7.2-config.patch:

--- NEW FILE phpldapadmin-0.9.7.2-config.patch ---
diff -Nrbu phpldapadmin-0.9.7.2/config/config.php phpldapadmin-0.9.7.2-OK/config/config.php
--- phpldapadmin-0.9.7.2/config/config.php	2005-11-15 19:29:18.000000000 +0300
+++ phpldapadmin-0.9.7.2-OK/config/config.php	2005-11-15 19:29:06.000000000 +0300
@@ -34,6 +34,9 @@
 /* Useful important configuration overrides  */
 /*********************************************/
 
+#  $config->custom->appearance['language'] = 'en';
+#  $config->custom->appearance['show_clear_password'] = true;
+
 /* If you are asked to put pla in debug mode, this is how you do it: */
 #  $config->custom->debug['level'] = 2;
 #  $config->custom->debug['syslog'] = true;
@@ -64,7 +67,7 @@
 
 /* A convenient name that will appear in the tree viewer and throughout
    phpLDAPadmin to identify this LDAP server to users. */
-$ldapservers->SetValue($i,'server','name','My LDAP Server');
+$ldapservers->SetValue($i,'server','name','Local LDAP Server');
 
 /* Examples:
    'ldap.example.com',
@@ -93,6 +96,7 @@
    encrypted using blowfish and the secret your specify above as
    session['blowfish']. */
 // $ldapservers->SetValue($i,'server','auth_type','cookie');
+$ldapservers->SetValue($i,'server','auth_type','session');
 
 /* The DN of the user for phpLDAPadmin to bind with. For anonymous binds or
    'cookie' or 'session' auth_types, LEAVE THE LOGIN_DN AND LOGIN_PASS BLANK. If
@@ -118,6 +122,7 @@
 /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
    blowfish, crypt or leave blank for now default algorithm. */
 // $ldapservers->SetValue($i,'appearance','password_hash','md5');
+$ldapservers->SetValue($i,'appearance','password_hash','');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, you can
    optionally specify here an attribute to use when logging in. If you enter
@@ -129,6 +134,7 @@
    specify 'string', in which case you can provide a string to use for logging
    users in. See 'login_string' directly below. */
 // $ldapservers->SetValue($i,'login','attr','dn');
+$ldapservers->SetValue($i,'login','attr','uid');
 
 /* If you specified 'cookie' or 'session' as the auth_type above, and you
    specified 'string' for 'login_attr' above, you must provide a string here for


Index: phpldapadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/phpldapadmin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- phpldapadmin.spec	3 Nov 2005 13:14:08 -0000	1.7
+++ phpldapadmin.spec	23 Dec 2005 16:34:03 -0000	1.8
@@ -1,13 +1,13 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
-Version: 0.9.7.1
-Release: 1%{?dist}
+Version: 0.9.7.2
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://phpldapadmin.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/phpldapadmin/phpldapadmin-%{version}.tar.gz
 Patch1: phpldapadmin-0.9.7.1-namingcontexts.patch
-Patch2: phpldapadmin-0.9.7.1-config.patch
+Patch2: phpldapadmin-0.9.7.2-config.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -55,7 +55,7 @@
 cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
-rm -rf doc/ INSTALL LICENSE VERSION
+rm -rf doc/ INSTALL LICENSE
 popd
 
 
@@ -114,6 +114,13 @@
 
 
 %changelog
+* 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)
+
+* Tue Nov 15 2005 Dmitry Butskoy  - 0.9.7.2-1
+- update to 0.9.7.2
+
 * Tue Nov  1 2005 Dmitry Butskoy  - 0.9.7.1-1
 - upgrade to 0.9.7.1
 - adapt patches and spec to new upstream layout.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Nov 2005 16:36:11 -0000	1.3
+++ sources	23 Dec 2005 16:34:03 -0000	1.4
@@ -1 +1 @@
-7491767e6a6c1166217472daa9b4c45c  phpldapadmin-0.9.7.1.tar.gz
+ac9923e37bbc232b9ca537cfd9282691  phpldapadmin-0.9.7.2.tar.gz


--- phpldapadmin-0.9.7.1-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec 23 16:46:29 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 23 Dec 2005 11:46:29 -0500
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.6,1.7
Message-ID: <200512231647.jBNGl1jx029240@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29223

Modified Files:
	kmymoney2.spec 
Log Message:
fix icon inclusion



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kmymoney2.spec	23 Dec 2005 16:12:41 -0000	1.6
+++ kmymoney2.spec	23 Dec 2005 16:46:29 -0000	1.7
@@ -137,8 +137,8 @@
 %{_bindir}/kmymoney*
 %{_datadir}/apps/kmymoney2
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*
-%{_datadir}/icons/locolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
 %{_libdir}/lib*.so.*



From fedora-extras-commits at redhat.com  Fri Dec 23 17:20:08 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri, 23 Dec 2005 12:20:08 -0500
Subject: rpms/crack/devel crack.spec,1.1,1.2
Message-ID: <200512231720.jBNHKfnH031077@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/crack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31060

Modified Files:
	crack.spec 
Log Message:
Rebuild with gcc-4.1.


Index: crack.spec
===================================================================
RCS file: /cvs/extras/rpms/crack/devel/crack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crack.spec	7 Sep 2005 08:52:56 -0000	1.1
+++ crack.spec	23 Dec 2005 17:20:08 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:   Password cracker
 Name:      crack
 Version:   5.0a
-Release:   1%{?dist}
+Release:   2%{?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
+* Fri Dec 23 2005 Christian Iseli  5.0a-2
+- rebuild with gcc-4.1
+
 * Tue Sep 06 2005 Tom "spot" Callaway  5.0a-1
 - use words to make a richer dict 1
 



From fedora-extras-commits at redhat.com  Fri Dec 23 17:22:59 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri, 23 Dec 2005 12:22:59 -0500
Subject: rpms/hmmer/devel hmmer.spec,1.2,1.3
Message-ID: <200512231723.jBNHNVEC031200@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/hmmer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31179

Modified Files:
	hmmer.spec 
Log Message:
Rebuild with gcc-4.1.


Index: hmmer.spec
===================================================================
RCS file: /cvs/extras/rpms/hmmer/devel/hmmer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hmmer.spec	8 Aug 2005 09:24:48 -0000	1.2
+++ hmmer.spec	23 Dec 2005 17:22:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           hmmer
 Version:        2.3.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Profile HMM software for protein sequence analysis
 
 Group:          Applications/Engineering
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Christian Iseli  2.3.2-4
+ - Rebuild with gcc-4.1.
+
 * Mon Aug 08 2005 Christian Iseli  2.3.2-3
  - Removed altivec switch for ppc: apparently, it only works using Apple's
    GCC compiler.



From fedora-extras-commits at redhat.com  Fri Dec 23 17:26:01 2005
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri, 23 Dec 2005 12:26:01 -0500
Subject: rpms/nfswatch/devel nfswatch.spec,1.5,1.6
Message-ID: <200512231726.jBNHQXgb031325@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/nfswatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31264

Modified Files:
	nfswatch.spec 
Log Message:
Rebuild with gcc-4.1.


Index: nfswatch.spec
===================================================================
RCS file: /cvs/extras/rpms/nfswatch/devel/nfswatch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nfswatch.spec	29 Nov 2005 16:54:32 -0000	1.5
+++ nfswatch.spec	23 Dec 2005 17:26:01 -0000	1.6
@@ -2,7 +2,7 @@
 Summary: An NFS traffic monitoring tool
 Name: nfswatch
 Version: 4.99.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: BSD
 URL: http://nfswatch.sourceforge.net
@@ -47,6 +47,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Dec 23 2005 Christian Iseli  4.99.5-2
+ - rebuild with gcc-4.1
+
 * Tue Nov 29 2005 Christian Iseli  4.99.5-1
  - new upstream version
 



From fedora-extras-commits at redhat.com  Fri Dec 23 17:41:34 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 23 Dec 2005 12:41:34 -0500
Subject: rpms/xemacs-sumo/devel
	xemacs-sumo-20051208-latin-unity-kludge.patch, 
	NONE, 1.1 xemacs-sumo.spec, 1.13, 1.14
Message-ID: <200512231742.jBNHg6X4031468@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31448

Modified Files:
	xemacs-sumo.spec 
Added Files:
	xemacs-sumo-20051208-latin-unity-kludge.patch 
Log Message:
* Sat Dec 17 2005 Ville Skytt??  - 20051208-1
- Patch to support write-region's kludge in latin-unity.


xemacs-sumo-20051208-latin-unity-kludge.patch:

--- NEW FILE xemacs-sumo-20051208-latin-unity-kludge.patch ---
--- mule-packages/lisp/latin-unity/ChangeLog	10 Apr 2005 13:50:28 -0000	1.41
+++ mule-packages/lisp/latin-unity/ChangeLog	17 Dec 2005 11:16:50 -0000
@@ -1,0 +1,5 @@
+2005-12-17  Ville Skytt?  
+
+	* latin-unity.el (latin-unity-sanity-check): Mimic `write-region's
+	kludgy feature where the region's start offset is a string.
+
--- mule-packages/lisp/latin-unity/latin-unity.el	15 Feb 2005 22:22:48 -0000	1.12
+++ mule-packages/lisp/latin-unity/latin-unity.el	17 Dec 2005 11:16:51 -0000
@@ -551,11 +551,14 @@
 setting `buffer-file-coding-system' to nil or 'no-conversion or 'binary.
 
 This function is intended for use as a `write-region-pre-hook'.  It does
-nothing except return nil if `write-region' handlers are inhibited."
+nothing except return nil if `write-region' handlers are inhibited, or if
+BEGIN is a string (to support the corresponding \"kludgy feature\" of
+`write-region')."
 
   ;; don't do anything if we're in a `write-region' handler
   ;; #### is nil the right return value if we are?
-  (if (eq inhibit-file-name-operation 'write-region)
+  ;; Bypass also on `write-region's "klugdy feature" where BEGIN is a string
+  (if (or (eq inhibit-file-name-operation 'write-region) (stringp begin))
       nil
     (prog1
     (let ((buffer-default


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xemacs-sumo.spec	10 Dec 2005 21:06:20 -0000	1.13
+++ xemacs-sumo.spec	23 Dec 2005 17:41:33 -0000	1.14
@@ -21,6 +21,7 @@
 Source17:       Emacs.ad.zh_TW.UTF-8
 Patch0:         %{name}-20051208-hypb-posix.patch
 Patch1:         %{name}-20051208-pydoc-path.patch
+Patch2:         %{name}-20051208-latin-unity-kludge.patch
 Patch6:         auctex-texsite-jlatex-detect-69129.patch
 Patch7:         auctex-texjp-platex.patch
 Patch8:         egg-wnn-host-unix-79826.patch
@@ -87,6 +88,8 @@
 %patch1 -p0
 install -dm 755 xemacs-packages/etc/python-modes
 mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes}
+# support write-region's kludge in latin-unity
+%patch2 -p0
 # fix jlatex autodetection
 %patch6 -p0
 # use ptex rather jtex by default for Japanese
@@ -208,7 +211,10 @@
 
 
 %changelog
-* Fri Dec  9 2005 Ville Skytt??  - 20051208-1
+* Sat Dec 17 2005 Ville Skytt??  - 20051208-1
+- Patch to support write-region's kludge in latin-unity.
+
+* Fri Dec  9 2005 Ville Skytt?? 
 - 2005-12-08.
 - Patch hyperbole to not require csh.
 - Patch pydoc.el to find pydoc_lisp.py out of the box.



From fedora-extras-commits at redhat.com  Fri Dec 23 21:22:19 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 23 Dec 2005 16:22:19 -0500
Subject: rpms/xemacs-sumo/FC-4 xemacs-sumo-20051208-hypb-posix.patch, NONE, 
	1.1 xemacs-sumo-20051208-latin-unity-kludge.patch, NONE,
	1.1 xemacs-sumo-20051208-pydoc-path.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 sources, 1.6, 1.7 xemacs-sumo.spec, 1.10, 1.11
Message-ID: <200512232122.jBNLMpjF006409@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6379/FC-4

Modified Files:
	.cvsignore sources xemacs-sumo.spec 
Added Files:
	xemacs-sumo-20051208-hypb-posix.patch 
	xemacs-sumo-20051208-latin-unity-kludge.patch 
	xemacs-sumo-20051208-pydoc-path.patch 
Log Message:
Sync with devel (package repocopied from devel too).

xemacs-sumo-20051208-hypb-posix.patch:

--- NEW FILE xemacs-sumo-20051208-hypb-posix.patch ---
--- xemacs-packages/lisp/hyperbole/smart-clib-sym	27 Jun 2003 05:11:53 -0000	1.1.1.1
+++ xemacs-packages/lisp/hyperbole/smart-clib-sym	8 Dec 2005 19:08:52 -0000
@@ -1,4 +1,4 @@
-#!/bin/csh -f
+#!/bin/sh
 #
 # SUMMARY:      Test whether symbol appears within a set of C libraries.
 # USAGE:         
@@ -26,37 +26,26 @@
 #
 # DESCRIP-END.
 
-# Perl script used to tell whether one file is newer than another.
-#
-set fn = "file-newer"
-
 # Create this file and place in the file the full path for each C, C++ or
 # Objective-C library that you want scanned for symbol names.  One filename
 # per line.  Do not quote the filenames.
 #
-set clib_list = "~/.CLIBS-LIST"
-
+clib_list="$HOME/.CLIBS-LIST"
 
 # This file will automatically be created to cache the symbol names.
 # Remove it if you ever want to rebuild the symbol table.
 #
-set clib_symbols = "~/.clibs-symbols"
-
-# Try to locate 'perl' and 'file-newer' script for use.
-
-which perl >& /dev/null
-if ($status) unset fn
+clib_symbols="$HOME/.clibs-symbols"
 
-set st = 0 rebuild = 0
-if (-e $clib_list) then
-   if (! -e $clib_symbols || -z $clib_symbols) set rebuild = 1
-   if (! $rebuild  && $?fn) @ rebuild = `perl $fn $clib_list $clib_symbols`
-   if ($rebuild) then
-      nm -g `cat $clib_list` | grep '^[0-9 ].* _[A-Za-z]' | sed -e 's/^[^_][^_]*_//g' | sort | uniq > $clib_symbols
-   endif
-   fgrep -sx $1 $clib_symbols >& /dev/null
-   @ st = ! $status
-endif
+st=0
+if [ -s $clib_list ] ; then
+    if [ ! -s $clib_symbols ] || \
+       [ -n "`find $clib_list -prune -newer $clib_symbols`" ] ; then
+        nm -gP `cat $clib_list` 2>/dev/null | grep '^_[A-Za-z]' \
+        | sed -e 's/^_//' -e 's/ .*//' | sort -u > $clib_symbols
+    fi
+    grep -Fx "$1" $clib_symbols >/dev/null 2>&1 && st=1
+fi
 
 echo $st
 exit $st

xemacs-sumo-20051208-latin-unity-kludge.patch:

--- NEW FILE xemacs-sumo-20051208-latin-unity-kludge.patch ---
--- mule-packages/lisp/latin-unity/ChangeLog	10 Apr 2005 13:50:28 -0000	1.41
+++ mule-packages/lisp/latin-unity/ChangeLog	17 Dec 2005 11:16:50 -0000
@@ -1,0 +1,5 @@
+2005-12-17  Ville Skytt?  
+
+	* latin-unity.el (latin-unity-sanity-check): Mimic `write-region's
+	kludgy feature where the region's start offset is a string.
+
--- mule-packages/lisp/latin-unity/latin-unity.el	15 Feb 2005 22:22:48 -0000	1.12
+++ mule-packages/lisp/latin-unity/latin-unity.el	17 Dec 2005 11:16:51 -0000
@@ -551,11 +551,14 @@
 setting `buffer-file-coding-system' to nil or 'no-conversion or 'binary.
 
 This function is intended for use as a `write-region-pre-hook'.  It does
-nothing except return nil if `write-region' handlers are inhibited."
+nothing except return nil if `write-region' handlers are inhibited, or if
+BEGIN is a string (to support the corresponding \"kludgy feature\" of
+`write-region')."
 
   ;; don't do anything if we're in a `write-region' handler
   ;; #### is nil the right return value if we are?
-  (if (eq inhibit-file-name-operation 'write-region)
+  ;; Bypass also on `write-region's "klugdy feature" where BEGIN is a string
+  (if (or (eq inhibit-file-name-operation 'write-region) (stringp begin))
       nil
     (prog1
     (let ((buffer-default

xemacs-sumo-20051208-pydoc-path.patch:

--- NEW FILE xemacs-sumo-20051208-pydoc-path.patch ---
--- xemacs-packages/lisp/python-modes/pydoc.el	18 Sep 2002 06:04:19 -0000	1.1
+++ xemacs-packages/lisp/python-modes/pydoc.el	9 Dec 2005 22:16:38 -0000
@@ -383,18 +383,23 @@
 
 (defun pydoc-initialize()
   (message "Please wait a moment while the Python help system is initialized...")
-  (let (output-buf)
+  (let ((output-buf)
+	(pydir (locate-data-directory "python-modes")))
     (save-window-excursion
       ;; Start a Python interpreter if not already running.
       (py-shell)
       (pydoc-wait-for-output (current-buffer) 3.0)
       (setq output-buf
 	    (py-execute-string
-	     "if not vars().has_key('pydoc_lisp'):
+	     (format
+	      "if not vars().has_key('pydoc_lisp'):
+    import sys
+    if not '%s' in sys.path:
+        sys.path.append('%s')
     import pydoc_lisp
 
 pydoc_lisp.pydoc_output_lisp()
-"))
+" pydir pydir)))
       ;; current vintages of python-mode.el (4.6 at least)
       ;; no longer return a buffer [name].  We get t from the
       ;; final kill-buffer instead.  If we see t we use the


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Jul 2005 12:29:57 -0000	1.6
+++ .cvsignore	23 Dec 2005 21:22:18 -0000	1.7
@@ -1,2 +1,2 @@
-xemacs-mule-sumo-2005-07-15.tar.bz2
-xemacs-sumo-2005-07-15.tar.bz2
+xemacs-mule-sumo-2005-12-08.tar.bz2
+xemacs-sumo-2005-12-08.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jul 2005 12:29:57 -0000	1.6
+++ sources	23 Dec 2005 21:22:18 -0000	1.7
@@ -1,2 +1,2 @@
-016362256e4de4b150d6c2f8d686dd3f  xemacs-mule-sumo-2005-07-15.tar.bz2
-28b92fa2e0bcd0c8e81fd6286d37af30  xemacs-sumo-2005-07-15.tar.bz2
+553da38bc36b4365ab98e0565a0530b8  xemacs-mule-sumo-2005-12-08.tar.bz2
+1927c40affd04ff7c10b979ef24548d0  xemacs-sumo-2005-12-08.tar.bz2


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/xemacs-sumo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xemacs-sumo.spec	23 Jul 2005 12:29:57 -0000	1.10
+++ xemacs-sumo.spec	23 Dec 2005 21:22:18 -0000	1.11
@@ -1,4 +1,4 @@
-%define sumo    2005-07-15
+%define sumo    2005-12-08
 %define pkgdir  %{_datadir}/xemacs
 
 Name:           xemacs-sumo
@@ -19,6 +19,9 @@
 Source15:       Emacs.ad.ko_KR.UTF-8
 Source16:       Emacs.ad.zh_CN.UTF-8
 Source17:       Emacs.ad.zh_TW.UTF-8
+Patch0:         %{name}-20051208-hypb-posix.patch
+Patch1:         %{name}-20051208-pydoc-path.patch
+Patch2:         %{name}-20051208-latin-unity-kludge.patch
 Patch6:         auctex-texsite-jlatex-detect-69129.patch
 Patch7:         auctex-texjp-platex.patch
 Patch8:         egg-wnn-host-unix-79826.patch
@@ -33,8 +36,10 @@
 BuildRequires:  xemacs-nox
 BuildRequires:  sed >= 3.95
 BuildRequires:  /sbin/install-info
+BuildRequires:  %{__python}
 Requires:       xemacs-common
-Provides:       apel-xemacs = 10.2
+# Fake release in this provision in order to avoid self-obsoletion (for now).
+Provides:       apel-xemacs = 10.6-6
 Provides:       ruby-mode-xemacs
 Obsoletes:      apel-xemacs < 10.6-6
 Obsoletes:      ruby-mode-xemacs
@@ -76,6 +81,15 @@
 
 %prep
 %setup -q -c -a1
+# get rid of csh dependency
+%patch0 -p0
+rm xemacs-packages/lisp/hyperbole/file-newer
+# find pydoc_lisp.py out-of-the-box
+%patch1 -p0
+install -dm 755 xemacs-packages/etc/python-modes
+mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes}
+# support write-region's kludge in latin-unity
+%patch2 -p0
 # fix jlatex autodetection
 %patch6 -p0
 # use ptex rather jtex by default for Japanese
@@ -94,7 +108,9 @@
 %patch15 -p0
 
 sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \
-  xemacs-packages/{lisp/hyperbole/file-newer,etc/bbdb/*.pl}
+  xemacs-packages/etc/bbdb/*.pl
+
+chmod -c -x xemacs-packages/lisp/edit-utils/crm.el
 
 # remove game we shouldn't ship
 rm xemacs-packages/lisp/games/tetris.el*
@@ -155,7 +171,7 @@
 find $RPM_BUILD_ROOT%{pkgdir} -type f -name '*.info*' | xargs gzip -9
 
 # separate files
-rm -f *.files base-files el-files info-files
+rm -f *.files
 echo "%%defattr(-,root,root,-)" > base-files
 echo "%%defattr(-,root,root,-)" > el-files
 echo "%%defattr(-,root,root,-)" > info-files
@@ -163,15 +179,21 @@
 find $RPM_BUILD_ROOT%{pkgdir}/* \
   \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \
   \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \
-  \( -type d -name info -fprint info.files -prune \) -o \
-  \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \
+  \( -type d -not -name info -fprintf dir.files "%%%%dir %%p\n" \) -o \
   \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \
      -fprint base-el-not-bytecomped.files \) \)
 
 sed -i -e "s|$RPM_BUILD_ROOT||" *.files
-cat base-*.files dir.files >> base-files
-cat el-*.files   dir.files >> el-files
-cat info.files             >> info-files
+cat base-*.files dir.files | grep -v /info/ >> base-files
+cat el-*.files dir.files                    >> el-files
+cat base-non-el.files | grep /info/         >> info-files
+
+sed -i -e 's/^\(.*\(\.ja\|-ja\.texi\)\)$/%lang(ja) \1/' base-files
+sed -i -e 's/^\(.*[_-]ja\.info.*\)$/%lang(ja) \1/' info-files
+
+# in case redhat-rpm-config is not installed or doesn't do this for us:
+%{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/python-modes', ddir='/', force=1)"
+%{__python} -O -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/python-modes', ddir='/', force=1)"
 
 
 %clean
@@ -179,13 +201,27 @@
 
 
 %files -f base-files
+%{pkgdir}/xemacs-packages/etc/python-modes/*.pyc
+%ghost %{pkgdir}/xemacs-packages/etc/python-modes/*.pyo
 
 %files el -f el-files
 
 %files info -f info-files
+%dir %{pkgdir}/*-packages/info/
 
 
 %changelog
+* Sat Dec 17 2005 Ville Skytt??  - 20051208-1
+- Patch to support write-region's kludge in latin-unity.
+
+* Fri Dec  9 2005 Ville Skytt?? 
+- 2005-12-08.
+- Patch hyperbole to not require csh.
+- Patch pydoc.el to find pydoc_lisp.py out of the box.
+- Include bytecompiled python files.
+- Set %%lang for various docs and info files.
+- Prune changelog entries from pre-xemacs-sumo times.
+
 * Sat Jul 16 2005 Ville Skytt??  - 20050715-1
 - 2005-07-15; jde font-lock, sql-mode abbrev, w3 stylesheet and file
   permissions fixed upstream.
@@ -195,12 +231,12 @@
 - Remove mew and skk, they're in separate packages again (#162952).
 - Reformat specfile.
 
-* Thu Jun  2 2005 Ville Skytt??  - 20050505-4.1
+* Thu Jun  2 2005 Ville Skytt??  - 20050505-6
 - Make sure we're using files included in this package
   when byte-recompiling patched *.el; also allows the byte-compilation
   to actually happen even if no previous xemacs-sumo is installed.
 
-* Wed Jun  1 2005 Ville Skytt??  - 20050505-4
+* Wed Jun  1 2005 Ville Skytt??  - 20050505-5
 - Bundle upstream cc-mode package version 1.45 (contains cc-mode 5.30.10).
 - Fix JDEE font-lock warnings with import statements.
 
@@ -308,243 +344,3 @@
 * Mon May 12 2003 Jens Petersen  - 20030414-1
 - new package to separate xemacs-sumo and xemacs-mule-sumo from
   main xemacs package
-
-
-* Sat May 10 2003 Jens Petersen  - 21.4.12-11
-- build with system malloc on ppc64
-
-* Tue Apr 22 2003 Jens Petersen  - 21.4.12-10
-- obsoletes ruby-mode-xemacs (#84673)
-- move obsoletes xemacs-sumo-el to -el subpackage
-- fix links in jde html documentation (#89499)
-
-* Tue Apr 15 2003 Jens Petersen  - 21.4.12-8
-- comment out ja and ko menubar translations in X resource files for now,
-  to avoid startup hanging in utf-8 locale (#88860)
-- use default menubar font in ja and ko locale
-- in a UTF-8 locale set default coding systems to utf-8 (partly #77130
-  and #74227)
-- set Info-directory-list in site-start.el again
-- move psgml setup into site-start.el
-- move previous contents of "dotxemacs-init.el" to new "default.el"
-
-* Mon Mar 31 2003 Akira TAGOH  21.4.12-7
-- Rebuild against the latest Canna.
-
-* Thu Feb 20 2003 Jens Petersen  - 21.4.12-6
-- default browse-url to use htmlview and update psgml-html browser
-  defaults (#84262)
-
-* Tue Feb 11 2003 Jens Petersen  - 21.4.12-5
-- build with system-malloc on alpha and ia64
-- skip redundant check-features target
-
-* Thu Feb  6 2003 Jens Petersen  - 21.4.12-4
-- fix "libexec dir" to be under lib64 on multilib archs
-- set default ftp to be non-kerberos in site-start.el
-- update sumos to 2003-02-05
-- mspec patch and rpm-spec-mode update no longer needed
-- buildrequire autoconf213
-- add ".xemacs/init.el" to /etc/skel
-- skip redundant check-features target on s390 and s390x
-
-* Wed Jan 22 2003 Tim Powers 
-- rebuilt
-
-* Tue Jan 21 2003 Jens Petersen  - 21.4.12-2
-- fix `paths-emacs-root-p' (find-paths.el) to look in share not lib
-- don't generate backup files when updating autoloads
-- try startup notification in desktop file
-- cleanup desktop file to use name XEmacs and add encoding key
-
-* Fri Jan 17 2003 Jens Petersen  21.4.12-1
-- update to 21.4.12 bugfix release (21.4 series now declared stable branch)
-- renumbered sumo package patches to be greater than 100
-- install sumo packages by copying rather than moving
-- patch sh-script.el to append m?spec entry to auto-mode-alist
-- avoid ppc.ldscript and build on ppc
-- remove games that we shouldn't ship
-- update to latest rcs2log
-- update to latest rpm-spec-mode.el
-- use _smp_mflags for lib-src and src
-- run batch-update-directory and batch-byte-recompile-directory on sumo lisp
-  dirs
-- improve datadir/xemacs-version/ ownership
-
-* Sat Jan  4 2003 Jens Petersen  21.4.11-1
-- update to 21.4.11
-- don't configure with union-type, since it causes runtime problems apparently
-- only do postun info dir deletions when uninstalling
-
-* Wed Jan  1 2003 Jens Petersen  21.4.10-6
-- move apel to separate package and require it
-- renamed psgml-init.el-xemacs to xemacs-psgml-init.el
-- use datadir in site-start.el
-- really include the movemail mkstemp patch
-- use mapc to load site-start.d files
-
-* Tue Dec 31 2002 Ville Skytt?? 
-- New Sumos (2002-12-30).
-- Use `construct-emacs-version-name' in `paths-emacs-root-p' (find-paths.el),
-  fixing "Couldn't find obvious default for XEmacs hierarchy" warnings
-  (as in XEmacs 21.5).
-- Move site-start stuff to site-packages.
-- Don't set Info-directory-list in site-start.el.
-- Don't use --pkgdir, it's ignored.  Don't pass pkgdir to makeinstall.
-- Fix source tarball URLs.
-- Don't override the defcustom in psgml-init.el, set its default value instead.
-- Add rpmbuild option: "--with debug" for building a debug-enabled XEmacs.
-
-* Sun Dec 29 2002 Jens Petersen 
-- updates package sumos to 2002-12-26 release
-
-* Mon Dec 23 2002 Jens Petersen  21.4.10-5
-- patch find-paths.el to search in datadir
-- setup lisp packages under datadir not libdir
-- use buildroot macro instead of RPM_BUILD_ROOT
-- drop local configure macro
-- fix buildrequires and requires
-- list configure options one-per-line
-- improve psgml-init.el catalog setup
-- remove and add lisp packages with package-admin
-- rebyte-compile lisp packages
-- keep etags as etags.xemacs (#78106)
-- don't bother removing non-existent udp2tcp nor .cvsignore files
-- simply filelist generation to a single find search pass
-- put core .el files in -el package
-- put package info files into -info package
-- don't create backup files when patching in lisp packages tree
-- don't explicitly gzip lisp package info files
-- don't mark the applications files noreplace
-- exclude ppc, since __init_array_start undefined
-
-* Wed Dec 18 2002 Jens Petersen 
-- patch egg-wnn to default to unix domain socket (#79826)
-  [patch from ynakai at redhat.com]
-- add ia64 patch from SuSE
-- use mkstemp in movemail
-
-* Tue Nov 19 2002 Jens Petersen 
-- apply jlatex autodetect patch correctly and drop append to tex-site.el
-- default to pTeX and pLaTeX for Japanese TeX and LaTeX
-
-* Mon Nov 18 2002 Jens Petersen  21.4.10-3
-- backout uncommenting of deactivate-mark (#77696)
-- update psgml dtd catalog path in psgml-init.el (#78022)
-  [reported by ville.skytta at iki.fi]
-- build with --use-union-type (#78024)
-  [suggested by ville.skytta at iki.fi]
-
-* Fri Nov 15 2002 Jens Petersen 
-- fix autodetection of jlatex (#69129)
-
-* Tue Nov 12 2002 Elliot Lee  21.4.10-2
-- build on x86_64
-
-* Mon Nov 11 2002 Jens Petersen  21.4.10-1
-- update to 21.4.10
-- update sumos to 2002-09-19
-- no longer backout mule-ucs package
-- encode this file in utf-8
-- xemacs-21.1.14-xfs.patch no longer needed
-- use _libdir, _datadir, _bindir, _prefix
-- exclude x86_64 (requires Canna)
-- own /usr/lib/xemacs/{,mule-packages} and /usr/X11R6/lib/X11/ (#73982)
-  [reported by enrico.scholz at informatik.tu-chemnitz.de]
-- fix default italic font size (#75275)
-  [reported with fix by ville.skytta at iki.fi]
-- update ja menubar translations in ja locale X resource file (#76068)
-  [from ynakai at redhat.com]
-- update ko locale X resource file (#76072) [from ynakai at redhat.com]
-- add pkgdir rpm macro for packages dir
-- uncomment deactivate-mark in simple.el (#77696)
-
-* Mon Aug 26 2002 Trond Eivind Glomsr??d  21.4.8-16
-- some cleanups - and remove the info tarball, it's now part
-  of the base tarball. Wow, the package gets smaller. (#72480)
-
-* Mon Aug 19 2002 Trond Eivind Glomsr??d  21.4.8-15
-- Bug in specfile from -14 gave bug on startup (#71743)
-
-* Thu Aug 15 2002 Trond Eivind Glomsr??d  21.4.8-14
-- Use utf-8 by default for input/output (#71584 )
-- Make it not segfault when handling utf-8 (#71589)
-
-* Wed Aug  7 2002 Trond Eivind Glomsr??d  21.4.8-13
-- Add openmotif-devel to buildrequires, as it will use it for widgets
-  if it finds it
-
-* Fri Aug  2 2002 Trond Eivind Glomsr??d  21.4.8-12
-- Don't package po-mode separately, it's now in sumo
-- Compile with drag'n'drop support
-- Use the bundled rpm-spec-mode, it has some adaptions for XEmacs
-
-* Wed Jul 31 2002 Trond Eivind Glomsr??d  21.4.8-11
-- Don't use a separate ispell.el file anymore - the included one is newer
-- Fix html-mode (#64826)
-
-* Tue Jul 23 2002 Trond Eivind Glomsr??d  21.4.8-10
-- Update lisp tarballs
-- desktop file fixes (#69542)
-- Add bdb support (#65640)
-
-* Mon Jul  8 2002 Trond Eivind Glomsr??d  21.4.8-9
-- Make it provide ruby-mode-xemacs (request from tagoh)
-
-* Fri Jun 21 2002 Tim Powers 
-- automated rebuild
-
-* Mon Jun 17 2002 Trond Eivind Glomsr??d  21.4.8-7
-- #66835
-
-* Wed May 29 2002 Trond Eivind Glomsr??d  21.4.8-6
-- Make it build... Evil.
-- Exclude IA64
-- Upgrade sumo tarballs to 2002-05-22
-
-* Fri May 24 2002 Jens Petersen  21.4.8-5
-- Build using portable dumper, so that build with glibc-2.3 malloc is ok
-
-* Mon May 13 2002 Trond Eivind Glomsr??d  21.4.8-2
-- Remove the s390 patches so it builds on s390 :)
-
-* Fri May 10 2002 Trond Eivind Glomsr??d  21.4.8-1
-- 21.4.8
-
-* Tue May  7 2002 Trond Eivind Glomsr??d  21.4.6-9
-- Rebuild... chmod -x pstogif to work around an rpm bug until
-  it's fixed (#64320)
-
-* Tue Apr 23 2002 Trond Eivind Glomsr??d  21.4.6-8
-- New sumo packages
-
-* Thu Feb 21 2002 Trond Eivind Glomsr??d  21.4.6-7
-- Rebuild
-
-* Tue Jan 29 2002 Jens Petersen  21.4.6-6
-- Remove skk package, since it conflicts with ddskk-xemacs (newer)
-
-* Thu Jan 24 2002 Trond Eivind Glomsr??d  21.4.6-5
-- New sumos
-
-* Wed Jan 09 2002 Tim Powers 
-- automated rebuild
-
-* Wed Dec 19 2001 Jens Petersen  21.4.6-3
-- Fix fontlist pattern in Emacs.ad.Japanese.
-- CHANGES-beta is now CHANGES-release.
-- Obsolete xemacs-sumo xemacs-sumo-el
-
-* Wed Dec 19 2001 Jens Petersen  21.4.6-2
-- Don't obsolete flim.
-
-* Mon Dec 17 2001 Trond Eivind Glomsr??d  21.4.6-1
-- 21.4.6
-- New sumo packages
-- disable alpha
-
-* Wed Nov 14 2001 Jens Petersen  21.4.5-2
-- Add -znocombreloc configure option to override new ld default.
-
-* Tue Nov  6 2001 Trond Eivind Glomsr??d  21.4.5-1
-- 21.4.5. It builds on IA64 and fixes #55578



From fedora-extras-commits at redhat.com  Fri Dec 23 21:28:14 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 23 Dec 2005 16:28:14 -0500
Subject: rpms/kmymoney2/devel kmymoney2-0.8.1-gcc41.patch, NONE,
	1.1 kmymoney2.spec, 1.7, 1.8
Message-ID: <200512232128.jBNLSkpl006474@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6445

Modified Files:
	kmymoney2.spec 
Added Files:
	kmymoney2-0.8.1-gcc41.patch 
Log Message:
* Fri Dec 23 2005 Rex Dieter  0.8.1-7
- gcc41 patch


kmymoney2-0.8.1-gcc41.patch:

--- NEW FILE kmymoney2-0.8.1-gcc41.patch ---
--- kmymoney2-0.8.1/kmymoney2/converter/mymoneyqifreader.h.gcc41	2005-07-16 14:17:29.000000000 -0500
+++ kmymoney2-0.8.1/kmymoney2/converter/mymoneyqifreader.h	2005-12-23 15:26:42.000000000 -0600
@@ -270,7 +270,7 @@
     * @param searchname The name of the account to find or create
     * @return QCString id of the found or created account
     */
-  static const QCString MyMoneyQifReader::findOrCreateIncomeAccount(const QString& searchname);
+  static const QCString findOrCreateIncomeAccount(const QString& searchname);
   
   /**
     * This method looks up the @p searchname account by name and returns its id
@@ -280,7 +280,7 @@
     * @param searchname The name of the account to find or create
     * @return QCString id of the found or created account
     */
-  static const QCString MyMoneyQifReader::findOrCreateExpenseAccount(const QString& searchname);
+  static const QCString findOrCreateExpenseAccount(const QString& searchname);
   
   void processQifLine(void);
   


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kmymoney2.spec	23 Dec 2005 16:46:29 -0000	1.7
+++ kmymoney2.spec	23 Dec 2005 21:28:14 -0000	1.8
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -27,6 +27,7 @@
 
 # inspired by http://article.gmane.org/gmane.comp.kde.kmymoney2.devel/3467
 Patch1: kmymoney2-0.8.1-qt335.patch
+Patch2: kmymoney2-0.8.1-gcc41.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: automake
@@ -56,6 +57,7 @@
 %setup -q
 
 %patch1 -p1 -b .qt335
+%patch2 -p1 -b .gcc41
 
 
 %build
@@ -159,6 +161,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Rex Dieter  0.8.1-7
+- gcc41 patch
+
 * Fri Dec 23 2005 Rex Dieter  0.8.1-6
 - cleanup ofx deps
 



From fedora-extras-commits at redhat.com  Fri Dec 23 21:37:44 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 23 Dec 2005 16:37:44 -0500
Subject: rpms/liferea/devel .cvsignore, 1.16, 1.17 liferea.spec, 1.23,
	1.24 sources, 1.17, 1.18
Message-ID: <200512232138.jBNLcGdC006583@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6557

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Fri Dec 23 2005 Brian Pepple  - 1.0-2
- Update to 1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	19 Nov 2005 01:04:12 -0000	1.16
+++ .cvsignore	23 Dec 2005 21:37:43 -0000	1.17
@@ -1 +1 @@
-liferea-1.0-RC4.tar.gz
+liferea-1.0.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- liferea.spec	4 Dec 2005 09:39:23 -0000	1.23
+++ liferea.spec	23 Dec 2005 21:37:44 -0000	1.24
@@ -2,13 +2,13 @@
 
 Name:           liferea
 Version:        1.0
-Release:        0.3.rc4%{?dist}
+Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
-Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-RC4.tar.gz
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel
@@ -35,7 +35,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-RC4
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Brian Pepple  - 1.0-2
+- Update to 1.0.
+
 * Sun Dec 04 2005 Luke Macken  - 1.0-0.3.rc4
 - Rebuild against dbus 0.60
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	19 Nov 2005 01:04:12 -0000	1.17
+++ sources	23 Dec 2005 21:37:44 -0000	1.18
@@ -1 +1 @@
-593df5a7743b3ec8925a68605bef22da  liferea-1.0-RC4.tar.gz
+ba3a520361e5b02a27f93ee5ecda4448  liferea-1.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 21:39:21 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 23 Dec 2005 16:39:21 -0500
Subject: rpms/liferea/FC-4 .cvsignore, 1.16, 1.17 liferea.spec, 1.21,
	1.22 sources, 1.17, 1.18
Message-ID: <200512232139.jBNLdrGe006661@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6638

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Fri Dec 23 2005 Brian Pepple  - 1.0-1
- Update to 1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	19 Nov 2005 01:06:49 -0000	1.16
+++ .cvsignore	23 Dec 2005 21:39:20 -0000	1.17
@@ -1 +1 @@
-liferea-1.0-RC4.tar.gz
+liferea-1.0.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- liferea.spec	19 Nov 2005 01:06:49 -0000	1.21
+++ liferea.spec	23 Dec 2005 21:39:20 -0000	1.22
@@ -2,13 +2,13 @@
 
 Name:           liferea
 Version:        1.0
-Release:        0.1.rc4%{?dist}
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
-Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-RC4.tar.gz
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel
@@ -35,7 +35,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-RC4
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Brian Pepple  - 1.0-1
+- Update to 1.0.
+
 * Fri Nov 18 2005 Brian Pepple  - 1.0-0.1.rc4
 - Update to 1.0-RC4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	19 Nov 2005 01:06:49 -0000	1.17
+++ sources	23 Dec 2005 21:39:20 -0000	1.18
@@ -1 +1 @@
-593df5a7743b3ec8925a68605bef22da  liferea-1.0-RC4.tar.gz
+ba3a520361e5b02a27f93ee5ecda4448  liferea-1.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 22:58:33 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Fri, 23 Dec 2005 17:58:33 -0500
Subject: rpms/cfitsio/devel .cvsignore, 1.2, 1.3 cfitsio.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200512232259.jBNMx6bn008699@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/cfitsio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8674

Modified Files:
	.cvsignore cfitsio.spec sources 
Log Message:
Bring cfitsio up to 3.005beta



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Nov 2005 00:15:39 -0000	1.2
+++ .cvsignore	23 Dec 2005 22:58:33 -0000	1.3
@@ -1 +1 @@
-cfitsio3004bbeta.tar.gz
+cfitsio3005beta.tar.gz


Index: cfitsio.spec
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cfitsio.spec	14 Nov 2005 19:00:22 -0000	1.6
+++ cfitsio.spec	23 Dec 2005 22:58:33 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           cfitsio
-Version:        3.004
-Release:        0.12.b%{?dist}
+Version:        3.005
+Release:        0.1.beta%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
-Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3004bbeta.tar.gz
+Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3005beta.tar.gz
 Patch:          cfitsio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +69,9 @@
 %{_libdir}/libcfitsio.so
 
 %changelog
+* Fri Dec 23 2005 Matthew Truch  - 3.005-0.1.beta
+- Update to 3.005beta release.
+
 * Mon Nov 14 2005 Matthew Truch  - 3.004-0.12.b
 - Put in proper URL and Source addresses.
 - Sync up spec files.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Nov 2005 00:15:39 -0000	1.2
+++ sources	23 Dec 2005 22:58:33 -0000	1.3
@@ -1 +1 @@
-28d128ad001aadb848cb13f4c4fc3d14  cfitsio3004bbeta.tar.gz
+c15fe2e87037e630255ca5a3bb97cbb5  cfitsio3005beta.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 23:09:21 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Fri, 23 Dec 2005 18:09:21 -0500
Subject: rpms/cfitsio/FC-4 .cvsignore, 1.2, 1.3 cfitsio.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200512232309.jBNN9aq1010398@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/cfitsio/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10377

Modified Files:
	.cvsignore cfitsio.spec sources 
Log Message:
Updating FC-4 cfitsio to 3.005beta



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Nov 2005 00:15:39 -0000	1.2
+++ .cvsignore	23 Dec 2005 23:09:21 -0000	1.3
@@ -1 +1 @@
-cfitsio3004bbeta.tar.gz
+cfitsio3005beta.tar.gz


Index: cfitsio.spec
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/FC-4/cfitsio.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cfitsio.spec	14 Nov 2005 19:02:56 -0000	1.5
+++ cfitsio.spec	23 Dec 2005 23:09:21 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           cfitsio
-Version:        3.004
-Release:        0.12.b%{?dist}
+Version:        3.005
+Release:        0.1.beta%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
-Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3004bbeta.tar.gz
+Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3005beta.tar.gz
 Patch:          cfitsio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +69,9 @@
 %{_libdir}/libcfitsio.so
 
 %changelog
+* Fri Dec 23 2005 Matthew Truch  - 3.005-0.1.beta
+- Update to 3.005beta release.
+
 * Mon Nov 14 2005 Matthew Truch  - 3.004-0.12.b
 - Put in proper URL and Source addresses.
 - Sync up spec files.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Nov 2005 00:15:39 -0000	1.2
+++ sources	23 Dec 2005 23:09:21 -0000	1.3
@@ -1 +1 @@
-28d128ad001aadb848cb13f4c4fc3d14  cfitsio3004bbeta.tar.gz
+c15fe2e87037e630255ca5a3bb97cbb5  cfitsio3005beta.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 23:11:39 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Fri, 23 Dec 2005 18:11:39 -0500
Subject: rpms/cfitsio/FC-3 .cvsignore, 1.2, 1.3 cfitsio.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200512232312.jBNNCCKU010500@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/cfitsio/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10457

Modified Files:
	.cvsignore cfitsio.spec sources 
Log Message:
Updating FC-3 cfitsio to 3.005beta



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Nov 2005 00:15:39 -0000	1.2
+++ .cvsignore	23 Dec 2005 23:11:39 -0000	1.3
@@ -1 +1 @@
-cfitsio3004bbeta.tar.gz
+cfitsio3005beta.tar.gz


Index: cfitsio.spec
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/FC-3/cfitsio.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cfitsio.spec	14 Nov 2005 19:07:01 -0000	1.5
+++ cfitsio.spec	23 Dec 2005 23:11:39 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           cfitsio
-Version:        3.004
-Release:        0.11.b%{?dist}
+Version:        3.005
+Release:        0.1.beta%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
-Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3004bbeta.tar.gz
+Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3005beta.tar.gz
 Patch:          cfitsio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -66,6 +66,9 @@
 %{_libdir}/libcfitsio.so
 
 %changelog
+* Fri Dec 23 2005 Matthew Truch  - 3.005-0.1.beta
+- Update to 3.005beta release.
+
 * Mon Nov 14 2005 Matthew Truch  - 3.004-0.11.b
 - Use proper URL: and Source: addresses.
 - Correct typo in revision number in changelog.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Nov 2005 00:15:39 -0000	1.2
+++ sources	23 Dec 2005 23:11:39 -0000	1.3
@@ -1 +1 @@
-28d128ad001aadb848cb13f4c4fc3d14  cfitsio3004bbeta.tar.gz
+c15fe2e87037e630255ca5a3bb97cbb5  cfitsio3005beta.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 23 23:24:33 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Fri, 23 Dec 2005 18:24:33 -0500
Subject: rpms/hpic/FC-3 hpic.spec,1.2,1.3
Message-ID: <200512232325.jBNNP5ao010596@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/hpic/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10563/FC-3

Modified Files:
	hpic.spec 
Log Message:
Sync up spec files.  No real changes, no new builds required.



Index: hpic.spec
===================================================================
RCS file: /cvs/extras/rpms/hpic/FC-3/hpic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hpic.spec	14 Nov 2005 16:04:46 -0000	1.2
+++ hpic.spec	23 Dec 2005 23:24:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           hpic
 Version:        0.52
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Healpix manipulation binaries and library
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@
 %{_libdir}/libhpic.a
 
 %changelog
+* Mon Nov 14 2005 Matthew Truch  - 0.52-4
+- Bump revision to make build system build.
+
 * Mon Nov 14 2005 Matthew Truch  - 0.52-3
 - hpic-devel requires cfitsio-devel (for headers).
 - Clean up URL and Source0.



From fedora-extras-commits at redhat.com  Fri Dec 23 23:24:39 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Fri, 23 Dec 2005 18:24:39 -0500
Subject: rpms/hpic/devel hpic.spec,1.2,1.3
Message-ID: <200512232325.jBNNPB6C010599@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/hpic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10563/devel

Modified Files:
	hpic.spec 
Log Message:
Sync up spec files.  No real changes, no new builds required.



Index: hpic.spec
===================================================================
RCS file: /cvs/extras/rpms/hpic/devel/hpic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hpic.spec	14 Nov 2005 15:55:45 -0000	1.2
+++ hpic.spec	23 Dec 2005 23:24:38 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           hpic
 Version:        0.52
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Healpix manipulation binaries and library
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@
 %{_libdir}/libhpic.a
 
 %changelog
+* Mon Nov 14 2005 Matthew Truch  - 0.52-4
+- Bump revision to make build system build.
+
 * Mon Nov 14 2005 Matthew Truch  - 0.52-3
 - hpic-devel requires cfitsio-devel (for headers).
 - Clean up URL and Source0.



From fedora-extras-commits at redhat.com  Sat Dec 24 03:44:38 2005
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Fri, 23 Dec 2005 22:44:38 -0500
Subject: rpms/grisbi/devel grisbi.spec,1.8,1.9
Message-ID: <200512240345.jBO3jAWb018001@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/grisbi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17977

Modified Files:
	grisbi.spec 
Log Message:
bump for rebuild against new libofx



Index: grisbi.spec
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/grisbi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grisbi.spec	11 Jun 2005 19:58:59 -0000	1.8
+++ grisbi.spec	24 Dec 2005 03:44:37 -0000	1.9
@@ -1,7 +1,7 @@
 %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help
 Name:		grisbi
 Version:	0.5.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Personal finances manager
 
 Group:		Applications/Productivity
@@ -112,6 +112,9 @@
 %ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html
 
 %changelog
+* Fri Dec 23 2005 Bill Nottingham  0.5.7-2
+- rebuild against new libofx
+
 * Sat Jun 11 2005 Aurelien Bompard  0.5.7-1
 - version 0.5.7
 



From fedora-extras-commits at redhat.com  Sat Dec 24 06:48:07 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sat, 24 Dec 2005 01:48:07 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.13,1.14
Message-ID: <200512240648.jBO6mdcX023387@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23340/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Fixed a slash-em crash that was package-related




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nethack-vultures.spec	21 Dec 2005 19:47:38 -0000	1.13
+++ nethack-vultures.spec	24 Dec 2005 06:48:06 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -98,6 +98,7 @@
 
 # Save some space
 for f in graphics music sound ; do
+    cp $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f/* $RPM_BUILD_ROOT%{_prefix}/games/vultureseye/$f/
     rm -r $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
     ln -s ../vultureseye/$f \
         $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
@@ -162,6 +163,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Karen Pease  - 1.11.1-3
+- Modified the specfile to duplicate the slash'em contents into the vultures dirs before rm'ing, to fix a missing-file crash
+
 * Wed Dec 21 2005 Karen Pease  - 1.11.1-2
 - Upped revision to try to get package to build on the server.
 



From fedora-extras-commits at redhat.com  Sat Dec 24 06:48:13 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sat, 24 Dec 2005 01:48:13 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.14,1.15
Message-ID: <200512240648.jBO6mjd9023390@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-serv23340/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Fixed a slash-em crash that was package-related




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nethack-vultures.spec	21 Dec 2005 19:47:44 -0000	1.14
+++ nethack-vultures.spec	24 Dec 2005 06:48:13 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -98,6 +98,7 @@
 
 # Save some space
 for f in graphics music sound ; do
+    cp $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f/* $RPM_BUILD_ROOT%{_prefix}/games/vultureseye/$f/
     rm -r $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
     ln -s ../vultureseye/$f \
         $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
@@ -162,6 +163,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Karen Pease  - 1.11.1-3
+- Modified the specfile to duplicate the slash'em contents into the vultures dirs before rm'ing, to fix a missing-file crash
+
 * Wed Dec 21 2005 Karen Pease  - 1.11.1-2
 - Upped revision to try to get package to build on the server.
 



From fedora-extras-commits at redhat.com  Sat Dec 24 06:48:19 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sat, 24 Dec 2005 01:48:19 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.14,1.15
Message-ID: <200512240648.jBO6mpm7023394@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23340/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Fixed a slash-em crash that was package-related




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nethack-vultures.spec	21 Dec 2005 19:47:50 -0000	1.14
+++ nethack-vultures.spec	24 Dec 2005 06:48:19 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -98,6 +98,7 @@
 
 # Save some space
 for f in graphics music sound ; do
+    cp $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f/* $RPM_BUILD_ROOT%{_prefix}/games/vultureseye/$f/
     rm -r $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
     ln -s ../vultureseye/$f \
         $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
@@ -162,6 +163,9 @@
 
 
 %changelog
+* Fri Dec 23 2005 Karen Pease  - 1.11.1-3
+- Modified the specfile to duplicate the slash'em contents into the vultures dirs before rm'ing, to fix a missing-file crash
+
 * Wed Dec 21 2005 Karen Pease  - 1.11.1-2
 - Upped revision to try to get package to build on the server.
 



From fedora-extras-commits at redhat.com  Sat Dec 24 12:25:07 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 24 Dec 2005 07:25:07 -0500
Subject: rpms/milter-greylist/FC-4 milter-greylist-1.6-sysconf.patch, NONE, 
	1.1 milter-greylist.spec, 1.5, 1.6
Message-ID: <200512241225.jBOCPeN9002464@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2444

Modified Files:
	milter-greylist.spec 
Added Files:
	milter-greylist-1.6-sysconf.patch 
Log Message:
- allowed to configure the parameter given to the daemon in an
  /etc/sysconfig/milter-greylist file (bz #162334)
- set user and socketfile in the configfile
- minor specfile cleanups


milter-greylist-1.6-sysconf.patch:

--- NEW FILE milter-greylist-1.6-sysconf.patch ---
2005-12-24 Enrico Scholz 

	* rc-redhat.sh.in: allow to override the used options by
	  loading /etc/sysconfig/milter-greylist

--- milter-greylist-1.6/rc-redhat.sh.in.sysconf	2005-12-24 13:14:25.000000000 +0100
+++ milter-greylist-1.6/rc-redhat.sh.in	2005-12-24 13:15:09.000000000 +0100
@@ -16,6 +16,10 @@
 socket="/var/milter-greylist/milter-greylist.sock"
 user="@USER@"
 OPTIONS="-P $pidfile -u $user -p $socket"
+
+f=/etc/sysconfig/milter-greylist
+test ! -e "$f" || . "$f"
+
 RETVAL=0
 prog="Milter-Greylist"
 


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/FC-4/milter-greylist.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- milter-greylist.spec	19 May 2005 17:37:44 -0000	1.5
+++ milter-greylist.spec	24 Dec 2005 12:25:06 -0000	1.6
@@ -21,7 +21,7 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	1.6
-Release:	%release_func 3
+Release:	%release_func 4
 License:	BSD w/ advertising
 Group:		System Environment/Daemon
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -29,6 +29,7 @@
 Patch0:		milter-greylist-1.6-rh.patch
 Patch1:		milter-greylist-1.6-group.patch
 Patch2:		milter-greylist-1.4-spfbool.patch
+Patch3:		milter-greylist-1.6-sysconf.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:		init(%name)
 Requires(pre):		fedora-usermgmt
@@ -91,9 +92,12 @@
 %patch0 -p1 -b .rh
 %patch1 -p1 -b .group
 %patch2 -p1 -b .spfbool
+%patch3 -p1 -b .sysconf
 
 perl -pi -e 's!(\$\{INSTALL\}.*\s)(\S+\s*)$!$1\${DESTDIR}$2!' Makefile.in
 perl -pi -e 's!--rpath!--XXXX!g' configure
+sed  -i  -e 's!^\#user .*!user "%username"!;
+             s!^\#socket !socket !' greylist.conf
 
 for i in `find -type f`; do
     sed -e 's!/var/milter-greylist/milter-greylist.sock!%rundir/milter-greylist.sock!g;
@@ -117,7 +121,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %__install -d -m755 \
-	$RPM_BUILD_ROOT{/etc/mail,%rundir,%dbdir,%_initrddir,%minitsvcdir,%_var/run}
+	$RPM_BUILD_ROOT{%_sysconfdir/mail,%rundir,%dbdir,%_initrddir,%minitsvcdir,%_var/run}
 
 %__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)"
 %__install -p -m755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name
@@ -171,7 +175,7 @@
 %defattr(-,root,root,-)
 %doc ChangeLog README
 %_mandir/man*/*
-%attr(0640,root,%username) %config(noreplace) /etc/mail/greylist.conf
+%attr(0640,root,%username) %verify(not mtime) %config(noreplace) %_sysconfdir/mail/greylist.conf
 %dir %attr(0751,%username,%username) %vardir
 %dir %attr(0770,root,%username) %dbdir
 %dir %attr(0700,%username,root) %rundir
@@ -194,6 +198,12 @@
 %endif
 
 %changelog
+* Sat Dec 24 2005 Enrico Scholz  - 1.6-4
+- allowed to configure the parameter given to the daemon in an
+  /etc/sysconfig/milter-greylist file (bz #162334)
+- set user and socketfile in the configfile
+- minor specfile cleanups
+
 * Thu May 19 2005 Enrico Scholz  - 1.6-3
 - set %%dist
 - use %%global instead of %%define



From fedora-extras-commits at redhat.com  Sat Dec 24 12:56:33 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 24 Dec 2005 07:56:33 -0500
Subject: rpms/milter-greylist/devel milter-greylist.params, NONE,
	1.1 milter-greylist.i, NONE,
	1.1 milter-greylist-2.0.2-sysv.patch, NONE,
	1.1 milter-greylist.spec, 1.9,
	1.10 milter-greylist-2.0rc5-user.patch, 1.1, NONE
Message-ID: <200512241257.jBOCv5nc002634@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2606

Modified Files:
	milter-greylist.spec 
Added Files:
	milter-greylist.params milter-greylist.i 
	milter-greylist-2.0.2-sysv.patch 
Removed Files:
	milter-greylist-2.0rc5-user.patch 
Log Message:
- use /var/run/milter-greylist as directory for the socket (bz #162334#6)
- do not set user and socket in the sysv-initscript anymore; instead
  of uncomment the configfile entries
- ship minit params file as SOURCE instead of generating it on-the-fly
- added -initng subpackage
- minor specfile cleanups



--- NEW FILE milter-greylist.params ---
-D


--- NEW FILE milter-greylist.i ---
daemon daemon/milter-greylist {
	need = system/initial system/mountfs;
	use  = system/netmount;
	require_network;

	respawn;
	exec	  daemon = /usr/sbin/milter-greylist;
	exec_args daemon = -D;
}

milter-greylist-2.0.2-sysv.patch:

--- NEW FILE milter-greylist-2.0.2-sysv.patch ---
--- milter-greylist-2.0.2/rc-redhat.sh.in.sysv	2005-03-13 17:43:52.000000000 +0100
+++ milter-greylist-2.0.2/rc-redhat.sh.in	2005-12-24 13:08:37.000000000 +0100
@@ -13,9 +13,7 @@
 . /etc/init.d/functions
 
 pidfile="/var/milter-greylist/milter-greylist.pid"
-socket="/var/milter-greylist/milter-greylist.sock"
-user="@USER@"
-OPTIONS="-P $pidfile -p $socket"
+OPTIONS="-P $pidfile"
 if [ -f /etc/sysconfig/milter-greylist ]
 then
     . /etc/sysconfig/milter-greylist
@@ -29,7 +27,7 @@
                 RETVAL=1
                 failure
         else
-                daemon --user=$user @BINDIR@/milter-greylist $OPTIONS
+                daemon @BINDIR@/milter-greylist $OPTIONS
                 RETVAL=$?
                 [ $RETVAL -eq 0 ] && touch /var/lock/subsys/milter-greylist
         fi;


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- milter-greylist.spec	22 Oct 2005 00:56:35 -0000	1.9
+++ milter-greylist.spec	24 Dec 2005 12:56:33 -0000	1.10
@@ -1,10 +1,13 @@
 ## $Id$
 
 ## This package accepts the following switches:
-##   --with spf    ...  enable SPF support
-##   --with minit  ...  enable minit support
+##   --with spf        ...  enable SPF support
+##   --without minit   ...  disable creation of 'minit' subpackage
+##   --without initng  ...  disable creation of 'initng' subpackage
 
 ## Fedora Extras specific customization below...
+%{!?_with_minit:%global		_without_minit		--without minit}
+%{!?_with_initng:%global	_without_initng		--without initng}
 ##
 
 %global username	grmilter
@@ -12,7 +15,7 @@
 %global minitsvcdir	%minitdir/services/grmilter
 %global vardir		%_var/lib/%name
 %global dbdir		%vardir/db
-%global rundir		%vardir/run
+%global rundir		%_var/run/%name
 %global __chkconfig	/sbin/chkconfig
 
 %{!?release_func:%global release_func() %1%{?dist}}
@@ -20,12 +23,12 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	2.0.2
-Release:	%release_func 1
+Release:	%release_func 2
 License:	BSD w/ advertising
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
 Source0:	ftp://ftp.espci.fr/pub/milter-greylist/%name-%version.tgz
-Patch0:		milter-greylist-2.0rc5-user.patch
+Patch0:		milter-greylist-2.0.2-sysv.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:		init(%name)
 Requires(pre):		fedora-usermgmt
@@ -35,7 +38,7 @@
 
 %package sysv
 Summary:	Sysv initscripts for %name
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 Provides:	init(%name) = sysv
 Requires(preun):	%name = %version-%release
 Requires(postun):	%name = %version-%release
@@ -46,12 +49,23 @@
 
 %package minit
 Summary:	Minit initscripts for %name
-Group:		System Environment/Daemon
-Provides:	init(%name) = minit
+Group:		System Environment/Daemons
+Source20:	milter-greylist.params
+Provides:		init(%name) = minit
 Requires:		%name = %version-%release
 Requires(pre):		minit-setup
 Requires(postun):	minit-setup
 
+%package initng
+Summary:	initng initscripts for %name
+Group:		System Environment/Daemons
+Source30:	milter-greylist.i
+Provides:		init(%name) = initng
+Requires:		%name = %version-%release
+Requires(pre):		%_sysconfdir/initng %name
+Requires(preun):	initng %name
+Requires(postun):	initng %name
+
 
 %description
 Greylisting is a new method of blocking significant amounts of spam at
@@ -83,11 +97,23 @@
 This package provides the minit initscripts for the %name package.
 
 
+%description initng
+Greylisting is a new method of blocking significant amounts of spam at
+the mailserver level, but without resorting to heavyweight statistical
+analysis or other heuristical (and error-prone) approaches. Consequently,
+implementations are fairly lightweight, and may even decrease network
+traffic and processor load on your mailserver.
+
+This package provides the initng initscripts for the %name package.
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .user
+%patch0 -p1 -b .sysv
 
 perl -pi -e 's!--rpath!--XXXX!g' configure
+sed  -i  -e 's!^\#user .*!user "%username"!;
+             s!^\#socket !socket !' greylist.conf
 
 for i in `find -type f`; do
     sed -e 's!/var/milter-greylist/milter-greylist.sock!%rundir/milter-greylist.sock!g;
@@ -112,27 +138,28 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%__install -d -m755 $RPM_BUILD_ROOT{%_initrddir,%minitsvcdir,%rundir,%dbdir,%_var/run}
+%__install -d -m755 $RPM_BUILD_ROOT{%_initrddir,%minitsvcdir,%rundir,%dbdir,%_var/run} \
+		    $RPM_BUILD_ROOT%_sysconfdir/initng/daemon
 %__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)"
 %__install -p -m755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name
 
 # the minit stuff
 ln -s %_sbindir/milter-greylist $RPM_BUILD_ROOT%minitsvcdir/run
-touch $RPM_BUILD_ROOT%minitsvcdir/respawn
+%__install -p -m644 %SOURCE20   $RPM_BUILD_ROOT%minitsvcdir/params
+touch                           $RPM_BUILD_ROOT%minitsvcdir/respawn
 
-cat <$RPM_BUILD_ROOT%minitsvcdir/params
--D
--u%username
--p%rundir/milter-greylist.sock
-EOF
-
-# Short hack...
-%{!?_with_minit:rm -rf $RPM_BUILD_ROOT%minitdir}
+# the initng stuff
+%__install -p -m644 %SOURCE30	$RPM_BUILD_ROOT%_sysconfdir/initng/daemon/milter-greylist.i
 
 # create temporary files
 touch $RPM_BUILD_ROOT%rundir/milter-greylist.sock
 touch $RPM_BUILD_ROOT%_var/run/milter-greylist.pid
 
+## Remove the unwanted init-methods
+%{?_without_sysv:  rm -rf $RPM_BUILD_ROOT%_initrddir}
+%{?_without_minit: rm -rf $RPM_BUILD_ROOT%_sysconfdir/minit}
+%{?_without_initng:rm -rf $RPM_BUILD_ROOT%_sysconfdir/initng}
+
 
 %pre
 /usr/sbin/fedora-groupadd 7 -r %username &>/dev/null || :
@@ -157,6 +184,15 @@
 test "$1"  = 0 || %_initrddir/%name condrestart >/dev/null || :
 
 
+%preun initng
+test "$1" != 0 || {
+	/sbin/ngc --stop    daemon/milter-greylist &>/dev/null || :
+	/sbin/ng-update del daemon/milter-greylist &>/dev/null || :
+}
+
+%postun initng
+test "$1"  = 0 || /sbin/ngc --restart daemon/milter-greylist &>/dev/null || :
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -165,7 +201,7 @@
 %defattr(-,root,root,-)
 %doc ChangeLog README
 %_mandir/man*/*
-%attr(0640,root,%username) %config(noreplace) /etc/mail/greylist.conf
+%attr(0640,root,%username) %verify(not mtime) %config(noreplace) %_sysconfdir/mail/greylist.conf
 %dir %attr(0751,%username,%username) %vardir
 %dir %attr(0770,root,%username) %dbdir
 %dir %attr(0700,%username,root) %rundir
@@ -174,20 +210,36 @@
 %ghost %rundir/milter-greylist.sock
 %ghost %_var/run/milter-greylist.pid
 
+%if 0%{!?_without_sysv:1}
 %files sysv
-%defattr(-,root,root,-)
-%config %_initrddir/*
+  %defattr(-,root,root,-)
+  %config %_initrddir/*
+%endif
+
+%if 0%{!?_without_initng:1}
+%files initng
+  %defattr(-,root,root,-)
+  %config %_sysconfdir/initng/daemon/*
+%endif
 
-%if 0%{?_with_minit:1}
+%if 0%{!?_without_minit:1}
 %files minit
-%defattr(-,root,root,-)
-%dir %minitsvcdir
-%minitsvcdir/run
-%minitsvcdir/respawn
-%config(noreplace) %minitsvcdir/params
+  %defattr(-,root,root,-)
+  %dir %minitsvcdir
+  %minitsvcdir/run
+  %minitsvcdir/respawn
+  %config(noreplace) %minitsvcdir/params
 %endif
 
 %changelog
+* Sat Dec 24 2005 Enrico Scholz  - 2.0.2-2
+- use /var/run/milter-greylist as directory for the socket (bz #162334#6)
+- do not set user and socket in the sysv-initscript anymore; instead
+  of uncomment the configfile entries
+- ship minit params file as SOURCE instead of generating it on-the-fly
+- added -initng subpackage
+- minor specfile cleanups
+
 * Sat Oct 22 2005 Enrico Scholz  - 2.0.2-1
 - updated to 2.0.2
 


--- milter-greylist-2.0rc5-user.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Dec 24 13:07:06 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 24 Dec 2005 08:07:06 -0500
Subject: rpms/milter-greylist/FC-4 milter-greylist.spec,1.6,1.7
Message-ID: <200512241307.jBOD7vkk004330@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4310

Modified Files:
	milter-greylist.spec 
Log Message:
fixed groupname



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/FC-4/milter-greylist.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- milter-greylist.spec	24 Dec 2005 12:25:06 -0000	1.6
+++ milter-greylist.spec	24 Dec 2005 13:07:06 -0000	1.7
@@ -23,7 +23,7 @@
 Version:	1.6
 Release:	%release_func 4
 License:	BSD w/ advertising
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
 Source0:	ftp://ftp.espci.fr/pub/milter-greylist/%name-%version.tgz
 Patch0:		milter-greylist-1.6-rh.patch
@@ -39,7 +39,7 @@
 
 %package sysv
 Summary:	Sysv initscripts for %name
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 Provides:	init(%name) = sysv
 Requires(preun):	%name = %version-%release
 Requires(postun):	%name = %version-%release
@@ -50,7 +50,7 @@
 
 %package minit
 Summary:	Minit initscripts for %name
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 Provides:	init(%name) = minit
 Requires:		%name = %version-%release
 Requires(pre):		minit-setup
@@ -203,6 +203,7 @@
   /etc/sysconfig/milter-greylist file (bz #162334)
 - set user and socketfile in the configfile
 - minor specfile cleanups
+- fixed groupname
 
 * Thu May 19 2005 Enrico Scholz  - 1.6-3
 - set %%dist



From fedora-extras-commits at redhat.com  Sat Dec 24 13:15:45 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 24 Dec 2005 08:15:45 -0500
Subject: rpms/milter-greylist/FC-3 milter-greylist-1.6-sysconf.patch, NONE, 
	1.1 milter-greylist.spec, 1.2, 1.3
Message-ID: <200512241316.jBODGH0Y004511@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4491

Modified Files:
	milter-greylist.spec 
Added Files:
	milter-greylist-1.6-sysconf.patch 
Log Message:
- allowed to configure the parameter given to the daemon in an
  /etc/sysconfig/milter-greylist file (bz #162334)
- set user and socketfile in the configfile
- minor specfile cleanups
- fixed groupname


milter-greylist-1.6-sysconf.patch:

--- NEW FILE milter-greylist-1.6-sysconf.patch ---
2005-12-24 Enrico Scholz 

	* rc-redhat.sh.in: allow to override the used options by
	  loading /etc/sysconfig/milter-greylist

--- milter-greylist-1.6/rc-redhat.sh.in.sysconf	2005-12-24 13:14:25.000000000 +0100
+++ milter-greylist-1.6/rc-redhat.sh.in	2005-12-24 13:15:09.000000000 +0100
@@ -16,6 +16,10 @@
 socket="/var/milter-greylist/milter-greylist.sock"
 user="@USER@"
 OPTIONS="-P $pidfile -u $user -p $socket"
+
+f=/etc/sysconfig/milter-greylist
+test ! -e "$f" || . "$f"
+
 RETVAL=0
 prog="Milter-Greylist"
 


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/FC-3/milter-greylist.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- milter-greylist.spec	19 May 2005 17:39:07 -0000	1.2
+++ milter-greylist.spec	24 Dec 2005 13:15:45 -0000	1.3
@@ -21,14 +21,15 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	1.6
-Release:	%release_func 3
+Release:	%release_func 4
 License:	BSD w/ advertising
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
 Source0:	ftp://ftp.espci.fr/pub/milter-greylist/%name-%version.tgz
 Patch0:		milter-greylist-1.6-rh.patch
 Patch1:		milter-greylist-1.6-group.patch
 Patch2:		milter-greylist-1.4-spfbool.patch
+Patch3:		milter-greylist-1.6-sysconf.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:		init(%name)
 Requires(pre):		fedora-usermgmt
@@ -38,7 +39,7 @@
 
 %package sysv
 Summary:	Sysv initscripts for %name
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 Provides:	init(%name) = sysv
 Requires(preun):	%name = %version-%release
 Requires(postun):	%name = %version-%release
@@ -49,7 +50,7 @@
 
 %package minit
 Summary:	Minit initscripts for %name
-Group:		System Environment/Daemon
+Group:		System Environment/Daemons
 Provides:	init(%name) = minit
 Requires:		%name = %version-%release
 Requires(pre):		minit-setup
@@ -91,9 +92,12 @@
 %patch0 -p1 -b .rh
 %patch1 -p1 -b .group
 %patch2 -p1 -b .spfbool
+%patch3 -p1 -b .sysconf
 
 perl -pi -e 's!(\$\{INSTALL\}.*\s)(\S+\s*)$!$1\${DESTDIR}$2!' Makefile.in
 perl -pi -e 's!--rpath!--XXXX!g' configure
+sed  -i  -e 's!^\#user .*!user "%username"!;
+             s!^\#socket !socket !' greylist.conf
 
 for i in `find -type f`; do
     sed -e 's!/var/milter-greylist/milter-greylist.sock!%rundir/milter-greylist.sock!g;
@@ -117,7 +121,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %__install -d -m755 \
-	$RPM_BUILD_ROOT{/etc/mail,%rundir,%dbdir,%_initrddir,%minitsvcdir,%_var/run}
+	$RPM_BUILD_ROOT{%_sysconfdir/mail,%rundir,%dbdir,%_initrddir,%minitsvcdir,%_var/run}
 
 %__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)"
 %__install -p -m755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name
@@ -171,7 +175,7 @@
 %defattr(-,root,root,-)
 %doc ChangeLog README
 %_mandir/man*/*
-%attr(0640,root,%username) %config(noreplace) /etc/mail/greylist.conf
+%attr(0640,root,%username) %verify(not mtime) %config(noreplace) %_sysconfdir/mail/greylist.conf
 %dir %attr(0751,%username,%username) %vardir
 %dir %attr(0770,root,%username) %dbdir
 %dir %attr(0700,%username,root) %rundir
@@ -194,6 +198,13 @@
 %endif
 
 %changelog
+* Sat Dec 24 2005 Enrico Scholz  - 1.6-4
+- allowed to configure the parameter given to the daemon in an
+  /etc/sysconfig/milter-greylist file (bz #162334)
+- set user and socketfile in the configfile
+- minor specfile cleanups
+- fixed groupname
+
 * Thu May 19 2005 Enrico Scholz  - 1.6-3
 - set %%dist
 - use %%global instead of %%define



From fedora-extras-commits at redhat.com  Sat Dec 24 16:12:52 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 24 Dec 2005 11:12:52 -0500
Subject: rpms/munin/devel munin.spec,1.3,1.4
Message-ID: <200512241613.jBOGDPWp009869@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9852

Modified Files:
	munin.spec 
Log Message:
Fixed ownership for /var/log/munin in node subpackage (fixes 176529)



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- munin.spec	15 Dec 2005 05:16:08 -0000	1.3
+++ munin.spec	24 Dec 2005 16:12:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -207,7 +207,7 @@
 %{_sbindir}/munin-run
 %{_sbindir}/munin-node
 %{_sbindir}/munin-node-configure
-%dir /var/log/munin
+%attr(-, munin, munin) %dir /var/log/munin
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
 %dir /etc/munin
@@ -222,7 +222,10 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
-* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
+* Sat Dec 24 2005 Kevin Fenzi  - 1.2.4-5
+- Fixed ownership for /var/log/munin in node subpackage (fixes 176529)
+
+* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-4
 - Fixed ownership for /var/lib/munin in node subpackage
 
 * Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3



From fedora-extras-commits at redhat.com  Sat Dec 24 16:15:42 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 24 Dec 2005 11:15:42 -0500
Subject: rpms/munin/FC-4 munin.spec,1.3,1.4
Message-ID: <200512241616.jBOGGEBO009938@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9921

Modified Files:
	munin.spec 
Log Message:
Fixed ownership for /var/log/munin in node subpackage (fixes 176529)



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-4/munin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- munin.spec	15 Dec 2005 05:19:44 -0000	1.3
+++ munin.spec	24 Dec 2005 16:15:41 -0000	1.4
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -207,7 +207,7 @@
 %{_sbindir}/munin-run
 %{_sbindir}/munin-node
 %{_sbindir}/munin-node-configure
-%dir /var/log/munin
+%attr(-, munin, munin) %dir /var/log/munin
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
 %dir /etc/munin
@@ -222,6 +222,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Dec 24 2005 Kevin Fenzi  - 1.2.4-5
+- Fixed ownership for /var/log/munin in node subpackage (fixes 176529)
+
 * Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-4
 - Fixed ownership for /var/lib/munin in node subpackage
 



From fedora-extras-commits at redhat.com  Sat Dec 24 16:18:02 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 24 Dec 2005 11:18:02 -0500
Subject: rpms/munin/FC-3 munin.spec,1.3,1.4
Message-ID: <200512241618.jBOGIYTO010007@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9990

Modified Files:
	munin.spec 
Log Message:
Fixed ownership for /var/log/munin in node subpackage (fixes 176529)



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-3/munin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- munin.spec	15 Dec 2005 05:22:06 -0000	1.3
+++ munin.spec	24 Dec 2005 16:18:02 -0000	1.4
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -207,7 +207,7 @@
 %{_sbindir}/munin-run
 %{_sbindir}/munin-node
 %{_sbindir}/munin-node-configure
-%dir /var/log/munin
+%attr(-, munin, munin) %dir /var/log/munin
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
 %dir /etc/munin
@@ -222,6 +222,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Dec 24 2005 Kevin Fenzi  - 1.2.4-5
+- Fixed ownership for /var/log/munin in node subpackage (fixes 176529)
+
 * Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-4
 - Fixed ownership for /var/lib/munin in node subpackage
 



From fedora-extras-commits at redhat.com  Sat Dec 24 18:53:15 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Sat, 24 Dec 2005 13:53:15 -0500
Subject: rpms/hpic/devel hpic.spec,1.3,1.4
Message-ID: <200512241853.jBOIrme4013704@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/hpic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13681

Modified Files:
	hpic.spec 
Log Message:
Forgot defattr for devel package.



Index: hpic.spec
===================================================================
RCS file: /cvs/extras/rpms/hpic/devel/hpic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hpic.spec	23 Dec 2005 23:24:38 -0000	1.3
+++ hpic.spec	24 Dec 2005 18:53:15 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           hpic
 Version:        0.52
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Healpix manipulation binaries and library
 
 Group:          Development/Libraries
@@ -60,11 +60,15 @@
 %{_bindir}/hpic*
 
 %files devel
+%defattr(-,root,root)
 %{_libdir}/libhpic.so
 %{_includedir}/hpic.h
 %{_libdir}/libhpic.a
 
 %changelog
+* Sat Dec 24 2005 Matthew Truch  - 0.52-5
+- Include missing %defattr for devel package (bug 173090).
+
 * Mon Nov 14 2005 Matthew Truch  - 0.52-4
 - Bump revision to make build system build.
 



From fedora-extras-commits at redhat.com  Sat Dec 24 19:02:40 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Sat, 24 Dec 2005 14:02:40 -0500
Subject: rpms/hpic/FC-4 hpic.spec,1.3,1.4
Message-ID: <200512241903.jBOJ3Cl0015486@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/hpic/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15439/FC-4

Modified Files:
	hpic.spec 
Log Message:
Fix missing %defattr from devel package.



Index: hpic.spec
===================================================================
RCS file: /cvs/extras/rpms/hpic/FC-4/hpic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hpic.spec	14 Nov 2005 18:48:24 -0000	1.3
+++ hpic.spec	24 Dec 2005 19:02:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           hpic
 Version:        0.52
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Healpix manipulation binaries and library
 
 Group:          Development/Libraries
@@ -60,11 +60,15 @@
 %{_bindir}/hpic*
 
 %files devel
+%defattr(-,root,root)
 %{_libdir}/libhpic.so
 %{_includedir}/hpic.h
 %{_libdir}/libhpic.a
 
 %changelog
+* Sat Dec 24 2005 Matthew Truch  - 0.52-5
+- Include missing %defattr for devel package (bug 173090).
+
 * Mon Nov 14 2005 Matthew Truch  - 0.52-4
 - Bump revision to make build system build.
 



From fedora-extras-commits at redhat.com  Sat Dec 24 19:02:13 2005
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Sat, 24 Dec 2005 14:02:13 -0500
Subject: rpms/hpic/FC-3 hpic.spec,1.3,1.4
Message-ID: <200512241903.jBOJ3Fsc015489@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/hpic/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15439/FC-3

Modified Files:
	hpic.spec 
Log Message:
Fix missing %defattr from devel package.



Index: hpic.spec
===================================================================
RCS file: /cvs/extras/rpms/hpic/FC-3/hpic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hpic.spec	23 Dec 2005 23:24:32 -0000	1.3
+++ hpic.spec	24 Dec 2005 19:02:12 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           hpic
 Version:        0.52
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Healpix manipulation binaries and library
 
 Group:          Development/Libraries
@@ -60,11 +60,15 @@
 %{_bindir}/hpic*
 
 %files devel
+%defattr(-,root,root)
 %{_libdir}/libhpic.so
 %{_includedir}/hpic.h
 %{_libdir}/libhpic.a
 
 %changelog
+* Sat Dec 24 2005 Matthew Truch  - 0.52-5
+- Include missing %defattr for devel package (bug 173090).
+
 * Mon Nov 14 2005 Matthew Truch  - 0.52-4
 - Bump revision to make build system build.
 



From fedora-extras-commits at redhat.com  Sat Dec 24 20:12:19 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 24 Dec 2005 15:12:19 -0500
Subject: rpms/new import.log,1.2,1.3
Message-ID: <200512242012.jBOKCpGJ017410@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/new
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17378

Modified Files:
	import.log 
Log Message:
auto-import new-1.3.5-3 on branch devel from new-1.3.5-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/new/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	19 Dec 2005 22:30:12 -0000	1.2
+++ import.log	24 Dec 2005 20:12:18 -0000	1.3
@@ -1 +1,2 @@
 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



From fedora-extras-commits at redhat.com  Sat Dec 24 20:12:25 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sat, 24 Dec 2005 15:12:25 -0500
Subject: rpms/new/devel new.spec,1.1,1.2
Message-ID: <200512242012.jBOKCwXL017413@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17378/devel

Modified Files:
	new.spec 
Log Message:
auto-import new-1.3.5-3 on branch devel from new-1.3.5-3.src.rpm


Index: new.spec
===================================================================
RCS file: /cvs/extras/rpms/new/devel/new.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- new.spec	19 Dec 2005 22:30:18 -0000	1.1
+++ new.spec	24 Dec 2005 20:12:25 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A simple template system
 Name: new
 Version: 1.3.5
-Release: 2
+Release: 3
 License: GPL
 Group: Development/Tools
 Source: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz
@@ -91,12 +91,16 @@
 %doc	AUTHORS COPYING ChangeLog INSTALL README
 
 %files devel
+%defattr(-, root, root)
 %{_libdir}/pkgconfig/new.pc
 %{_includedir}/new
 %{_libdir}/lib*.so
 
 
 %changelog
+* Sat Dec 24 2005 W. Michael Petullo  - 1.3.5-3
+   - Add %defattr for %files devel.
+
 * Tue Dec 13 2005 W. Michael Petullo  - 1.3.5-2
    - Broke out -devel package.
    - Simplifies %files block.



From fedora-extras-commits at redhat.com  Sun Dec 25 01:08:47 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 24 Dec 2005 20:08:47 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.5, 1.6 rxvt-unicode.spec, 1.7, 
	1.8 sources, 1.5, 1.6
Message-ID: <200512250109.jBP19vN9026119@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-serv26061/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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Dec 2005 21:53:46 -0000	1.5
+++ .cvsignore	25 Dec 2005 01:08:37 -0000	1.6
@@ -1 +1 @@
-rxvt-unicode-5.9.tar.bz2
+rxvt-unicode-6.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rxvt-unicode.spec	18 Dec 2005 21:53:46 -0000	1.7
+++ rxvt-unicode.spec	25 Dec 2005 01:08:37 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        5.9
+Version:        6.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+6.0-1
+- version upgrade
+
 * Sun Dec 18 2005 Andreas Bierfert 
 5.9-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Dec 2005 21:53:46 -0000	1.5
+++ sources	25 Dec 2005 01:08:37 -0000	1.6
@@ -1 +1 @@
-c160e8199d71324d789657c6d1092a4e  rxvt-unicode-5.9.tar.bz2
+7d00ac0675290a0b726d32d912e2cfcd  rxvt-unicode-6.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 25 01:08:56 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 24 Dec 2005 20:08:56 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.5, 1.6 rxvt-unicode.spec, 1.7, 
	1.8 sources, 1.5, 1.6
Message-ID: <200512250109.jBP19wvE026127@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-serv26061/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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Dec 2005 21:53:52 -0000	1.5
+++ .cvsignore	25 Dec 2005 01:08:55 -0000	1.6
@@ -1 +1 @@
-rxvt-unicode-5.9.tar.bz2
+rxvt-unicode-6.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rxvt-unicode.spec	18 Dec 2005 21:53:52 -0000	1.7
+++ rxvt-unicode.spec	25 Dec 2005 01:08:55 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        5.9
+Version:        6.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+6.0-1
+- version upgrade
+
 * Sun Dec 18 2005 Andreas Bierfert 
 5.9-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Dec 2005 21:53:52 -0000	1.5
+++ sources	25 Dec 2005 01:08:55 -0000	1.6
@@ -1 +1 @@
-c160e8199d71324d789657c6d1092a4e  rxvt-unicode-5.9.tar.bz2
+7d00ac0675290a0b726d32d912e2cfcd  rxvt-unicode-6.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 25 01:09:23 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 24 Dec 2005 20:09:23 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.5, 1.6 rxvt-unicode.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <200512250110.jBP19vUa026122@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26061/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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Dec 2005 21:53:58 -0000	1.5
+++ .cvsignore	25 Dec 2005 01:09:23 -0000	1.6
@@ -1 +1 @@
-rxvt-unicode-5.9.tar.bz2
+rxvt-unicode-6.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rxvt-unicode.spec	18 Dec 2005 21:53:58 -0000	1.10
+++ rxvt-unicode.spec	25 Dec 2005 01:09:23 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        5.9
+Version:        6.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -70,6 +70,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+6.0-1
+- version upgrade
+
 * Sun Dec 18 2005 Andreas Bierfert 
 5.9-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Dec 2005 21:53:58 -0000	1.5
+++ sources	25 Dec 2005 01:09:23 -0000	1.6
@@ -1 +1 @@
-c160e8199d71324d789657c6d1092a4e  rxvt-unicode-5.9.tar.bz2
+7d00ac0675290a0b726d32d912e2cfcd  rxvt-unicode-6.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 25 04:00:48 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 24 Dec 2005 23:00:48 -0500
Subject: rpms/gobby/devel gobby.spec,1.4,1.5
Message-ID: <200512250401.jBP41OSE031370@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29765

Modified Files:
	gobby.spec 
Log Message:
Add libXau-devel to BR



Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/gobby.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gobby.spec	22 Dec 2005 09:13:30 -0000	1.4
+++ gobby.spec	25 Dec 2005 04:00:47 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gobby
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:  desktop-file-utils, libXau-devel
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Sat Dec 24 2005 Luke Macken  - 0.3.0-2
+- Add libXau-devel to BuildRequires
+
 * Thu Dec 22 2005 Luke Macken  - 0.3.0-1
 - 0.3.0
 



From fedora-extras-commits at redhat.com  Sun Dec 25 04:15:30 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 24 Dec 2005 23:15:30 -0500
Subject: rpms/gobby/devel gobby.spec,1.5,1.6
Message-ID: <200512250416.jBP4G3Fr031479@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31462

Modified Files:
	gobby.spec 
Log Message:
update BR again..



Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/gobby.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gobby.spec	25 Dec 2005 04:00:47 -0000	1.5
+++ gobby.spec	25 Dec 2005 04:15:30 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gobby
 Version:        0.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
-BuildRequires:  desktop-file-utils, libXau-devel
+BuildRequires:  desktop-file-utils, libXau-devel, libXdmcp-devel
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Sat Dec 24 2005 Luke Macken  - 0.3.0-3
+- Add libXdmcp-devel to BuildRequires
+
 * Sat Dec 24 2005 Luke Macken  - 0.3.0-2
 - Add libXau-devel to BuildRequires
 



From fedora-extras-commits at redhat.com  Sun Dec 25 09:21:18 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 25 Dec 2005 04:21:18 -0500
Subject: rpms/libetpan/FC-3 .cvsignore, 1.5, 1.6 libetpan.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200512250921.jBP9LsiQ008365@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8306/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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2005 08:26:17 -0000	1.5
+++ .cvsignore	25 Dec 2005 09:21:16 -0000	1.6
@@ -1 +1 @@
-libetpan-0.40.tar.gz
+libetpan-0.41.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-3/libetpan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libetpan.spec	17 Nov 2005 08:21:46 -0000	1.4
+++ libetpan.spec	25 Dec 2005 09:21:16 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.40
+Version:        0.41
 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.40
+%setup -q -n %{name}-0.41
 
 %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.3.2.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.0.6.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+0.41-1
+- version upgrade
+
 * Thu Nov 17 2005 Andreas Bierfert 
 0.40-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2005 08:26:17 -0000	1.5
+++ sources	25 Dec 2005 09:21:16 -0000	1.6
@@ -1 +1 @@
-d204c1c222408d24b073dbaaf8ab3920  libetpan-0.40.tar.gz
+62fd85dc7d38f7586073b469278ee58e  libetpan-0.41.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 25 09:21:24 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 25 Dec 2005 04:21:24 -0500
Subject: rpms/libetpan/FC-4 .cvsignore, 1.5, 1.6 libetpan.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200512250921.jBP9Lu0X008370@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8306/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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2005 08:26:23 -0000	1.5
+++ .cvsignore	25 Dec 2005 09:21:24 -0000	1.6
@@ -1 +1 @@
-libetpan-0.40.tar.gz
+libetpan-0.41.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-4/libetpan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libetpan.spec	17 Nov 2005 08:21:51 -0000	1.4
+++ libetpan.spec	25 Dec 2005 09:21:24 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.40
+Version:        0.41
 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.40
+%setup -q -n %{name}-0.41
 
 %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.3.2.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.0.6.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+0.41-1
+- version upgrade
+
 * Thu Nov 17 2005 Andreas Bierfert 
 0.40-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2005 08:26:23 -0000	1.5
+++ sources	25 Dec 2005 09:21:24 -0000	1.6
@@ -1 +1 @@
-d204c1c222408d24b073dbaaf8ab3920  libetpan-0.40.tar.gz
+62fd85dc7d38f7586073b469278ee58e  libetpan-0.41.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 25 09:21:41 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 25 Dec 2005 04:21:41 -0500
Subject: rpms/libetpan/devel .cvsignore, 1.5, 1.6 libetpan.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200512250922.jBP9MDwg009249@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8306/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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2005 08:26:28 -0000	1.5
+++ .cvsignore	25 Dec 2005 09:21:40 -0000	1.6
@@ -1 +1 @@
-libetpan-0.40.tar.gz
+libetpan-0.41.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libetpan.spec	17 Nov 2005 08:21:57 -0000	1.5
+++ libetpan.spec	25 Dec 2005 09:21:40 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.40
+Version:        0.41
 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.40
+%setup -q -n %{name}-0.41
 
 %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.3.2.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.0.6.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+0.41-1
+- version upgrade
+
 * Thu Nov 17 2005 Andreas Bierfert 
 0.40-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2005 08:26:28 -0000	1.5
+++ sources	25 Dec 2005 09:21:40 -0000	1.6
@@ -1 +1 @@
-d204c1c222408d24b073dbaaf8ab3920  libetpan-0.40.tar.gz
+62fd85dc7d38f7586073b469278ee58e  libetpan-0.41.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 25 09:26:51 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 25 Dec 2005 04:26:51 -0500
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.11, 1.12 sources, 1.12,
	1.13 sylpheed-claws.spec, 1.27, 1.28
Message-ID: <200512250927.jBP9RNap011941@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11920

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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Nov 2005 09:57:01 -0000	1.11
+++ .cvsignore	25 Dec 2005 09:26:51 -0000	1.12
@@ -1 +1 @@
-sylpheed-claws-1.9.100.tar.bz2
+sylpheed-claws-2.0.0-rc2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Nov 2005 09:57:01 -0000	1.12
+++ sources	25 Dec 2005 09:26:51 -0000	1.13
@@ -1 +1 @@
-863c314557f90f17c2f6d6a0ab57e6c2  sylpheed-claws-1.9.100.tar.bz2
+1becc85e57825d4e654c34bf14e2877b  sylpheed-claws-2.0.0-rc2.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sylpheed-claws.spec	21 Nov 2005 08:12:34 -0000	1.27
+++ sylpheed-claws.spec	25 Dec 2005 09:26:51 -0000	1.28
@@ -1,13 +1,13 @@
-%define         openssl_pc  %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
+#%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}
+Version:        2.0.0
+Release:        0.rc2%{?dist}
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.100.tar.bz2
+Source0:        http://claws.sylpheed.org/snapshots/sylpheed-claws-2.0.0-rc2.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
 
@@ -47,13 +47,13 @@
 for development with %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
 
 %build
-%if %openssl_pc
-MY_OPENSSL_CFLAGS=`pkg-config openssl --cflags`
-%endif
-CFLAGS="${MY_OPENSSL_CFLAGS} ${RPM_OPT_FLAGS}" \
+#%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 +113,14 @@
 %{_libdir}/sylpheed-claws/plugins/*deps
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+2.0.0-0.rc2
+- version upgrade
+
+* Sun Dec 04 2005 Andreas Bierfert 
+2.0.0-0.rc1
+- version upgrade
+
 * 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  Sun Dec 25 09:29:10 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 25 Dec 2005 04:29:10 -0500
Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins.spec, 1.4,
	1.5
Message-ID: <200512250929.jBP9ThLG011982@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-serv11950/FC-4

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sylpheed-claws-plugins.spec	20 Nov 2005 22:11:17 -0000	1.4
+++ sylpheed-claws-plugins.spec	25 Dec 2005 09:29:10 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        1.9.100
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -285,6 +285,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+1.9.100-2
+- rebuild
+
 * Thu Nov 17 2005 Andreas Bierfert 
 1.9.100-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Dec 25 09:29:16 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 25 Dec 2005 04:29:16 -0500
Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.4, 
	1.5
Message-ID: <200512250929.jBP9TmUb011985@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-serv11950/devel

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sylpheed-claws-plugins.spec	20 Nov 2005 22:11:22 -0000	1.4
+++ sylpheed-claws-plugins.spec	25 Dec 2005 09:29:16 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        1.9.100
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -285,6 +285,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sun Dec 25 2005 Andreas Bierfert 
+1.9.100-2
+- rebuild
+
 * Thu Nov 17 2005 Andreas Bierfert 
 1.9.100-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Dec 25 15:24:52 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 25 Dec 2005 10:24:52 -0500
Subject: owners owners.list,1.478,1.479
Message-ID: <200512251525.jBPFPOl5022533@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22516

Modified Files:
	owners.list 
Log Message:
repair remaining damage done in r1.459


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -r1.478 -r1.479
--- owners.list	23 Dec 2005 08:49:22 -0000	1.478
+++ owners.list	25 Dec 2005 15:24:51 -0000	1.479
@@ -237,16 +237,16 @@
 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|compton at pcompton.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|galeon|GNOME2 Web browser based on Mozilla|denisleroy at yahoo.com|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|
 Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gcfilms|Movies collections management|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gcl|GNU Common Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdesklets|Advanced architecture for desktop applets|luya256 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -278,7 +278,7 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 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|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|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|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|
@@ -304,7 +304,7 @@
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-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|gnome-vfsmm26|C++ wrapper for gnome-vfs|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnugo|Text based go program|compton at pcompton.com|extras-qa at fedoraproject.org|
@@ -342,8 +342,8 @@
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -396,7 +396,7 @@
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org|
-Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|inkscape|A vector-based drawing program using SVG|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
@@ -486,15 +486,15 @@
 Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm20|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm24|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm20|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm24|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|libgnomedb|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|libgsf113|GNOME Structured File library 1.13|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libibverbs|A library for direct userspace use of InfiniBand|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libid3tag|ID3 tag manipulation library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -532,7 +532,7 @@
 Fedora Extras|libsexy|Funky fresh graphical widgets for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
-Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++|Typesafe Signal Framework for C++|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Dec 25 15:28:47 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 25 Dec 2005 10:28:47 -0500
Subject: owners owners.list,1.479,1.480
Message-ID: <200512251529.jBPFTJPZ022561@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22544

Modified Files:
	owners.list 
Log Message:
sort entries by package name


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -r1.479 -r1.480
--- owners.list	25 Dec 2005 15:24:51 -0000	1.479
+++ owners.list	25 Dec 2005 15:28:47 -0000	1.480
@@ -66,8 +66,8 @@
 Fedora Extras|blogtk|Gnome application for editing/maintaining blogs|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|blt|BLT widget extension to Tcl/Tk scripting language development|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bluefish|A GTK2 web development application for experienced users|compton at pcompton.com|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|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|ville.skytta at iki.fi|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|
@@ -154,8 +154,8 @@
 Fedora Extras|dkms|Dynamic Kernel Module Support (DKMS) method for installing module RPMS|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|tcallawa at redhat.com,gary_lerhaupt at dell.com
 Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
+Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|drivel|A journal or "blog" client|katzj at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -188,6 +188,7 @@
 Fedora Extras|factory|A C++ class library for multivariate polynomial data|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|fbdesk|Icon Manager for Fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|fbida|FrameBuffer Imageviewer|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-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|
@@ -223,8 +224,8 @@
 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|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
+Fedora Extras|fuse|File System in Userspace|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -434,8 +435,8 @@
 Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kid3|Efficient ID3 tagger|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|kile|LaTeX source editor and TeX shell|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|kinput2|Japanese kanji input server for X11|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kimdaba|KDE Image Database|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|kinput2|Japanese kanji input server for X11|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kiosktool|KIOSK administration tool for KDE|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kipi-plugins|Plugins to use with Kipi|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kmymoney2|Personal finance|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -453,12 +454,14 @@
 Fedora Extras|kxdocker|A Mac OSX style docker|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kxdocker-resources|Plugins, Sounds, and Themes for kxdocker|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kyum|Graphical User Frontend (GUI) for yum|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
+Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|lablgl|LablGL is an OpenGL interface for Objective Caml|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|lablgtk|An Objective Caml interface to gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|lcms|Color Management System|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|leafnode|A leafsite NNTP server|davidhart at tqmcube.com|extras-qa at fedoraproject.org|
 Fedora Extras|leafpad|GTK+ based simple text editor|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|lft|Alternate traceroute tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -555,8 +558,8 @@
 Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lincvs|Graphical CVS Client|compton at pcompton.com|extras-qa at fedoraproject.org|
-Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|linkchecker|Script that checks HTML documents for broken links|redhat at flyn.org|extras-qa at fedoraproject.org|
+Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -593,8 +596,8 @@
 Fedora Extras|mhash|Thread-safe hash algorithms library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|mhonarc|A Perl mail-to-HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|milter-greylist|Milter for greylisting, the next step in the spam control war|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|mknbi|Utility for creating network bootable images|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|mimetex|Easily embed LaTeX math in web pages|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|mknbi|Utility for creating network bootable images|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mmv|Move/copy/append/link multiple files|shishz at hotpop.com|extras-qa at fedoraproject.org|
 Fedora Extras|mock|Builds packages inside chroots|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
@@ -602,16 +605,16 @@
 Fedora Extras|mod_auth_pam|PAM authentication module for Apache|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|mod_security|Security module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|extras-qa at fedoraproject.org|
-Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|moin-latex|LaTeX plugin for the MoinMoin wiki|ed at eh3.com|extras-qa at fedoraproject.org|
+Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|monotone|A free, distributed version control system|roland at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|moodle|A Course Management System|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|moodss|Powerful modular monitoring graphical application|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org|
-Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org|
@@ -648,7 +651,9 @@
 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|
 Fedora Extras|numlockx|NumLockX turns on NumLock after starting X|jpmahowald at gmail.com|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|
 Fedora Extras|ocaml|The Objective Caml compiler and programming environment|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -697,11 +702,12 @@
 Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-BerkeleyDB|Perl interface to Berkeley DB|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Boulder|An API for hierarchical tag/value structures|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Business-Hours|Calculate business hours in a time period|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cache-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cache-Simple-TimedExpiry|Cache::Simple::TimedExpiry Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-capitalization|No capitalization on method names|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Carp-Assert|Executable comments|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Carp-Assert-More|Convenience wrappers around Carp::Assert|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cflow|Find flows in flow files|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -744,7 +750,6 @@
 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-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-capitalization|No capitalization on method names|rc040203 at freenet.de|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
 Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -770,19 +775,19 @@
 Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Flat|Implements a flat filesystem|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-FileHandle-Unget|A FileHandle that supports ungetting of multiple bytes|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-NCopy|Copy files to directories, or a single file to another file|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-FileHandle-Unget|A FileHandle that supports ungetting of multiple bytes|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-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-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-gettext|Interface to gettext family of functions|rc040203 at freenet.de|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
 Fedora Extras|perl-GD|Perl interface to the GD graphics library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GD-SVG|GD SVG enables SVG output from scripts written using GD|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GDTextUtil|Text utilities for use with GD|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Graph|A Perl module for dealing with graphs, the abstract data structures|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -795,8 +800,8 @@
 Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Ima-DBI|Database connection caching and organization|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-Base|Base class for loading, manipulating and saving images in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-ExifTool|Utility for reading and writing image meta info|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -839,8 +844,8 @@
 Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-IP-CMatch|Efficiently match IP addresses against IP ranges with C|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Netmask|Perl module for manipulation and lookup of IP network blocks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-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
@@ -849,9 +854,9 @@
 Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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-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-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
@@ -1070,7 +1075,6 @@
 Fedora Extras|sbcl|Steel Bank Common Lisp|rdieter at math.unl.edu|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|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-chewing|SCIM IMEngine for Traditional Chinese|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-fcitx|fcitx SCIM IMEngine for Simplified Chinese|petersen at redhat.com|extras-qa at fedoraproject.org|
@@ -1080,6 +1084,7 @@
 Fedora Extras|scim-pinyin|Chinese input method for SCIM|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-qtimm|SCIM Qt Input Method module|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-skk|Scim-skk is a SCIM IMEngine module for skk to support Japanese input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|scim|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|petersen at redhat.com|extras-qa at fedoraproject.org|
 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|
@@ -1162,8 +1167,8 @@
 Fedora Extras|tetex-eurofont|Provides a command that prints a euro symbol|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-cm-lgc|The CM-LGC Type1 fonts for LaTeX|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-kerkis|The Kerkis type 1 fonts for LaTeX|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
-Fedora Extras|tetex-font-tipa|The TIPA fonts for LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-fontools|Tools for handling fonts with LaTeX and fontinst|mpeters at mac.com|extras-qa at fedoraproject.org|
+Fedora Extras|tetex-font-tipa|The TIPA fonts for LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-lgrind|Source-code pretty-printer for LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-perltex|Define LaTeX macros in terms of Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-pgf|Create PostScript and PDF graphics in TeX|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
@@ -1244,8 +1249,8 @@
 Fedora Extras|xboard|An X Window System graphical chessboard|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|xbsql|A SQL wrapper for xbase|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xca|Graphical X.509 certificate management tool|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|xcin|A XIM server input method for Traditional Chinese|llch at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xchat-gnome|Gnome IRC Client|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|xcin|A XIM server input method for Traditional Chinese|llch at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xdaliclock|A clock for the X Window System|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|xdesktopwaves|Simulation of water waves on the X Window System desktop|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xemacs|A different version of Emacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -1259,8 +1264,8 @@
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-minicmd-plugin|Mini command-line plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1288,6 +1293,7 @@
 Fedora Extras|xlhtml|Excel 95/97 and PowerPoint to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|xlockmore|Screen lock and screen saver|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlindent|A XML stream reformatter|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlstarlet|Command line XML toolkit|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-acme|XMMS plugin to use special multimedia keys in GNOME or through acme|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -1308,6 +1314,7 @@
 Fedora Extras|xsupplicant|Open Source Implementation of IEEE 802.1x|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|yakuake|A Quake-like terminal application|dreadyman at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|yap|High-performance Prolog Compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|yasm|Complete rewrite of the NASM assembler|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org|
@@ -1316,10 +1323,3 @@
 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|yakuake|A Quake-like terminal application|dreadyman at gmail.com|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|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|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|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
-Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|
-Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Dec 25 19:21:17 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Sun, 25 Dec 2005 14:21:17 -0500
Subject: web/html index.php,1.18,1.19
Message-ID: <200512251921.jBPJLlFP029547@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29529

Modified Files:
	index.php 
Log Message:
Adding note about transition


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/index.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- index.php	1 Dec 2005 18:12:15 -0000	1.18
+++ index.php	25 Dec 2005 19:21:15 -0000	1.19
@@ -9,137 +9,31 @@
 ?>
 
 
    
-
+
+ 
 
 
    
- is an open source project sponsored by
-Red Hat and supported by the Fedora community. It is also a proving ground
-for new technology that may eventually make its way into Red Hat products.
-It is not a supported product of Red Hat, Inc.
+Fedora Core is a free operating system that offers the best combination of stable and cutting-edge software that exists in the free software world.
 
    
 
 
    
-To learn more about the process, refer to About, 
-the Objectives,
-and the FAQs.
+Download Fedora Core 4 now.
 
    
 
-
    
-
-
    Fedora Directory Server 1.0 Release [01 Dec 2005]
    
-
-
     
-  FDS 1.0 is past the hurdles and released into the wild.  Read more
-  about this amazing milestone in the history of open source directory
-  servers on the FDS
-  Wiki.  
+Documentation for Fedora is available.
 
    
 
-
    
-
-
    Latest Fedora News
    
-
-
    
-  [01 Dec 2005] fedora.redhat.com update in progress
    
-  This site is in the process of undergoing a content refresh and
-  facelift.  Sorry for the cruft whilst we are editing.  Expect
-  changes here soon.
-
    
-
    
-  [06 Oct 2005] FUDCon London, 2005 (formerly FUDCon
-  III)
     
-  FUDCon is the conference/summit that focuses on the Fedora Project
-  and all things that go along with it.  For more information, visit
-  the FUDCon
-  webpages.
-
    
-
    
-  [13 Jun 2005] Fedora Core 4 (Stentz) now available
    
-  Fedora Core 4 is now available
-  from Red Hat and at distinguished mirror sites near you, and is also
-  available in the torrent.
-  Fedora Core is available for x86-64, i386, and ppc/ppc64. Please file bugs via
-  Bugzilla, Product Fedora Core, Version 4,
-  so that they are noticed and appropriately classified. Discuss this release on 
-  fedora-list.
-
    
-
    
-  [02 Jun 2005] Fedora participates in the Summer Of Code 
    
-  The Fedora Project is proud to participate in Google's
-  Summer Of Code. For
-  ideas on some of the projects Fedora is looking to sponsor, please see
-  the Fedora Project Wiki.
-
    
-  [01 Jun 2005] Fedora Directory Server announced 
    
-  The Fedora Directory Server is a robust, scalable open-source server 
-  designed to manage large directories of users and resources.  It is based
-  on an open-systems server protocol called the Lightweight Directory Access
-  Protocol (LDAP).  For more information, go to 
-  the project website.
 
    
-  [10 May 2005] Fedora Core 4 test 3 now available 
    
-  The third test release of Fedora Core 4
-  is now available.  New features in FC4 
-  test 3 include GNOME 2.10, KDE 3.4, and a preview of GCC 4.0.  PowerPC is 
-  also supported.  Download it from the torrent.  File bugs in 
-  bugzilla against Fedora 
-  Core, version fc4test3.  Discuss this release on 
-  fedora-test-list.
+Fedora is always looking for contributors.
 
    
-
    
-  [03 May 2005] Endorsement of fedoraforum.org
      
-  The Fedora Project now endorses 
-  fedoraforum.org as its end-user
-  forum of choice.  Read more about the other available 
-  discussion forums.
-
    
-
    
-  [21 Apr 2005] FUDCon 2 Announced
    
-  FUDCon 2, the second gathering
-  of Fedora Users and Developers, will be held at LinuxTag in Karlsruhe,
-  Germany on the 24th and 25th of June.
-
    
-
    
-  [15 Apr 2005] Fedora Core 2 moves to Legacy Project
    
-  The Fedora Steering Committee announces the
-  transfer of Fedora Core 2 to the 
-  Fedora Legacy Project.
-  For more information on the Fedora Legacy Project, or if you wish to join
-  the team please see http://fedoralegacy.org/.
-
    
-
    
-  [01 Mar 2005] Announcing the Fedora Extras Project
    
-  The Fedora Extras Project has been 
-  established to create high-quality software to augment software available in 
-  Fedora Core. 
-
    
-
-
    
-
-
    Fedora Core Release Schedule
    
 
 
    
-  The Fedora Project announces a new major release of Fedora Core every 
-  four to six months.  The current release schedule is available 
-  here.
-
    
-	
-
    Red Hat Enterprise Linux
    
+Questions about Fedora?  Look for answers here.
+
    
 
 
    
- is one of the sources
-for new technologies and enhancements that may be incorporated
-into Red Hat Enterprise Linux in the future.  Red Hat Enterprise
-Linux is the solution that provides a robust, stable operating system
-supported by Red Hat, Inc. and a wide variety of independent
-software vendors (ISVs).  For production use, support, service
-level agreements (SLAs), and ISV support, we proudly ask that
-you look at Red
-Hat Enterprise Linux.
-
+We are currently in the process of evaluating a transition of this website to fedoraproject.org. fedoraproject.org is a community website that is being revamped and has more content being actively added to it on a regular basis. Users and developers are encouraged to visit this website for information and regular updates. The Fedora Websites Team is discussing the transition and a new content management system to host our updated infrastructure. Anyone is welcome to join those discussions. Thank you for your interest in the Fedora Project.
 
    
-
 
    
 
 

Author: nman64

Update of /cvs/fedora/web/html/Download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29624/Download

Modified Files:
	vendors.list 
Log Message:
Removing dead vendors


Index: vendors.list
===================================================================
RCS file: /cvs/fedora/web/html/Download/vendors.list,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vendors.list	22 Dec 2005 22:36:18 -0000	1.4
+++ vendors.list	25 Dec 2005 19:39:59 -0000	1.5
@@ -4,8 +4,6 @@
 
 B2B Poland::6 CDs or 1 DVD::17.99 Euros
 
-bitbone (Germany)::3 CDs::15 Euros
-
 Call A CD::3 CDs or 1 DVD::10 Euros
 
 CheapBytes::3 CDs or 6 CDs::$6.99 or $12.99
@@ -30,8 +28,6 @@
 
 Edmunds Enterprises::3 binary CDs or 3 source CDs or 6 CDs::$4.50 or $7.50
 
-eFusian::3 CDs::£4
-
 Fedora-France.org::3 CDs or 1 DVD::9.9 euro
 
 Galuna, Romania::3 CDs::3 euro
@@ -64,12 +60,8 @@
 
 Mathias Kettner ::3 CDs::15 Euro
 
-Moelands Digital (Netherlands only)::3 CDS or     6 CDS::15 euro or 30 euro
-
 Mynasoft::3 CDs or 6 CDs::$15 or $25
 
-N-iX ::3 CDs::18 euro
-
 OSdepot.com::3 CDs or 6 CDs::$3.95 or $14.95
 
 OSDisc.com::3 CDs or 6 CDs::$7.95 or $13.95



From fedora-extras-commits at redhat.com  Sun Dec 25 19:40:06 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Sun, 25 Dec 2005 14:40:06 -0500
Subject: web/html/download vendors.list,1.9,1.10
Message-ID: <200512251940.jBPJebF4029661@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29624/download

Modified Files:
	vendors.list 
Log Message:
Removing dead vendors


Index: vendors.list
===================================================================
RCS file: /cvs/fedora/web/html/download/vendors.list,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vendors.list	6 Dec 2005 05:03:43 -0000	1.9
+++ vendors.list	25 Dec 2005 19:40:04 -0000	1.10
@@ -4,8 +4,6 @@
 
 B2B Poland::6 CDs or 1 DVD::17.99 Euros
 
-bitbone (Germany)::3 CDs::15 Euros
-
 Call A CD::3 CDs or 1 DVD::10 Euros
 
 CheapBytes::3 CDs or 6 CDs::$6.99 or $12.99
@@ -30,8 +28,6 @@
 
 Edmunds Enterprises::3 binary CDs or 3 source CDs or 6 CDs::$4.50 or $7.50
 
-eFusian::3 CDs::£4
-
 Fedora-France.org::3 CDs or 1 DVD::9.9 euro
 
 Galuna, Romania::3 CDs::3 euro
@@ -56,18 +52,16 @@
 
 LinuxInstall.org::3 CDs::$10
 
+LinuxShopp.com.br::CDs::R$20.00
+
 LinuxShop.co.nz::3 binary CDs or 3 source CDs::$12.95 NZ o4 $14.95 NZ
 
 MASH Consulting::3 CDs or 6 CDs::$10 or $15
 
 Mathias Kettner ::3 CDs::15 Euro
 
-Moelands Digital (Netherlands only)::3 CDS or     6 CDS::15 euro or 30 euro
-
 Mynasoft::3 CDs or 6 CDs::$15 or $25
 
-N-iX ::3 CDs::18 euro
-
 OSdepot.com::3 CDs or 6 CDs::$3.95 or $14.95
 
 OSDisc.com::3 CDs or 6 CDs::$7.95 or $13.95



From fedora-extras-commits at redhat.com  Sun Dec 25 21:11:53 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 25 Dec 2005 16:11:53 -0500
Subject: rpms/wv/devel .cvsignore,1.3,1.4 sources,1.3,1.4 wv.spec,1.11,1.12
Message-ID: <200512252112.jBPLCP6H000935@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/wv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv914/devel

Modified Files:
	.cvsignore sources wv.spec 
Log Message:
- version 1.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 May 2005 15:30:18 -0000	1.3
+++ .cvsignore	25 Dec 2005 21:11:53 -0000	1.4
@@ -1 +1 @@
-wv-1.0.3.tar.gz
+wv-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 May 2005 15:30:18 -0000	1.3
+++ sources	25 Dec 2005 21:11:53 -0000	1.4
@@ -1 +1 @@
-71e42aa9af1e03cc8c608bbbdcb43af8  wv-1.0.3.tar.gz
+b6319d5e75611fe2210453b5feb82c0c  wv-1.2.0.tar.gz


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/wv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wv.spec	28 Oct 2005 14:21:03 -0000	1.11
+++ wv.spec	25 Dec 2005 21:11:53 -0000	1.12
@@ -1,23 +1,23 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.0.3
-Release:    2%{?dist}
+Version:    1.2.0
+Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-1.0.3.tar.gz
-Patch0:     wv-wvtext-tmp.patch
-Patch1:     wv-1.0.3-oledecod.patch
-Patch2:     wv-1.0.3-gcc4.patch
+Source:     http://dl.sf.net/wvware/wv-1.2.0.tar.gz
+#Patch0:     wv-wvtext-tmp.patch
+#Patch1:     wv-1.0.3-oledecod.patch
+#Patch2:     wv-1.0.3-gcc4.patch
 Patch5:     wv-1.0.0-rhbug150461.patch
 
-#BuildRequires: XFree86-devel
 BuildRequires: glib2-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libxml2-devel
 BuildRequires: ImageMagick-devel
 BuildRequires: pkgconfig
+BuildRequires: libgsf-devel >= 1.11.2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:   wvware = %{version}-%{release}
 
@@ -42,8 +42,8 @@
 %prep
 %setup -q
 #%patch0
-%patch1 -p1 -b .oledecod
-%patch2 -p1 -b .gcc4
+#%patch1 -p1 -b .oledecod
+#%patch2 -p1 -b .gcc4
 %patch5 -p1 -b .printf-rhbug150461
 
 
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Nov 11 2005 Aurelien Bompard  1.2.0-1
+- version 1.2.0
+
 * Fri Oct 28 2005 Aurelien Bompard  1.0.3-2
 - split out a -devel package (#171962)
 



From fedora-extras-commits at redhat.com  Sun Dec 25 21:27:39 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 16:27:39 -0500
Subject: rpms/xca/FC-4 xca-0.5.1-gcc41.patch, NONE,
	1.1 xca-0.5.1-openssl098.patch, NONE, 1.1 xca-0.5.1-sha1.patch,
	NONE, 1.1 xca.spec, 1.10, 1.11
Message-ID: <200512252128.jBPLSBiI001064@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1014/FC-4

Modified Files:
	xca.spec 
Added Files:
	xca-0.5.1-gcc41.patch xca-0.5.1-openssl098.patch 
	xca-0.5.1-sha1.patch 
Log Message:
- fixed compilation with gcc41 and openssl098
- use SHA1 instead of MD5 as the default hashalgo


xca-0.5.1-gcc41.patch:

--- NEW FILE xca-0.5.1-gcc41.patch ---
--- xca-0.5.1/lib/pki_key.h.gcc41	2003-12-10 07:43:05.000000000 +0100
+++ xca-0.5.1/lib/pki_key.h	2005-12-25 17:27:48.000000000 +0100
@@ -83,7 +83,7 @@
 	pki_key(const QString name = "", int type = EVP_PKEY_RSA);
 	pki_key(EVP_PKEY *pkey);
 	// copy constructor
-	pki_key::pki_key(const pki_key *pk);
+	pki_key(const pki_key *pk);
 	/* destructor */
 	~pki_key();
 	
--- xca-0.5.1/lib/db_crl.h.gcc41	2004-04-16 00:31:31.000000000 +0200
+++ xca-0.5.1/lib/db_crl.h	2005-12-25 16:01:56.000000000 +0100
@@ -69,7 +69,7 @@
 	void preprocess();
 	void inToCont(pki_base *pki);
 	pki_base *insert(pki_base *item);
-	void db_crl::deletePKI(pki_base *pki);
+	void deletePKI(pki_base *pki);
     signals:
 	void updateCertView();
 };
--- xca-0.5.1/lib/db_x509.h.gcc41	2004-02-18 01:03:05.000000000 +0100
+++ xca-0.5.1/lib/db_x509.h	2005-12-25 16:01:56.000000000 +0100
@@ -84,7 +84,7 @@
 	void writeAllCerts(const QString fname, bool onlyTrusted);
 	pki_x509 *getByIssSerial(const pki_x509 *issuer, const a1int &a);
 	pki_x509 *getBySubject(const x509name &xname, pki_x509 *last = NULL);
-	pki_base *db_x509::insert(pki_base *item);
+	pki_base *insert(pki_base *item);
     public slots:
 	void revokeCert(const x509rev &revok, const pki_x509 *issuer);
     
--- xca-0.5.1/lib/asn1time.h.gcc41	2003-08-06 10:15:37.000000000 +0200
+++ xca-0.5.1/lib/asn1time.h	2005-12-25 16:55:02.000000000 +0100
@@ -75,7 +75,7 @@
 	QString toPlain() const;
 	QString toSortable() const;
 	int ymdg(int *y, int *m, int *d, int *g) const;
-	int a1time::ymdg(int *y, int *m, int *d, int *h, int *M, int *s, int *g) const;
+	int ymdg(int *y, int *m, int *d, int *h, int *M, int *s, int *g) const;
 	ASN1_TIME *get() const;
 	ASN1_TIME *get_utc() const;
 	a1time &now(int delta = 0);

xca-0.5.1-openssl098.patch:

--- NEW FILE xca-0.5.1-openssl098.patch ---
--- xca-0.5.1/lib/x509rev.cpp.openssl098	2003-11-24 14:42:44.000000000 +0100
+++ xca-0.5.1/lib/x509rev.cpp	2005-12-25 21:38:32.000000000 +0100
@@ -50,8 +50,13 @@
 
 #include "x509rev.h"
 
-#define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+#  define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((i2d_of_void *)i2d_X509_REVOKED, \
+		(d2i_of_void *)d2i_X509_REVOKED,(char *)x5r)
+#else
+#  define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
 		(char *(*)())d2i_X509_REVOKED,(char *)x5r)
+#endif
 	
 x509rev::x509rev()
 {
--- xca-0.5.1/lib/openssl-compat.h.openssl098	2005-12-25 21:38:44.000000000 +0100
+++ xca-0.5.1/lib/openssl-compat.h	2005-12-25 21:51:29.000000000 +0100
@@ -0,0 +1,17 @@
+#ifndef H_XCA_LIB_OPENSSL_COMPAT_H
+#define H_XCA_LIB_OPENSSL_COMPAT_H
+
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+#  define XCA_D2I_F(F,X) \
+inline static X*					\
+d2i_##F(X** a, unsigned char**b, long int c)		\
+{							\
+  return d2i_##F(a, (unsigned char const **) b, c);	\
+}
+#  define XCA_D2I(X)		XCA_D2I_F(X,X)
+#else
+#  define XCA_D2I(X)
+#  define XCA_D2I_F(F,X)
+#endif
+
+#endif
--- xca-0.5.1/lib/asn1time.h.openssl098	2005-12-25 21:33:32.000000000 +0100
+++ xca-0.5.1/lib/asn1time.h	2005-12-25 21:42:47.000000000 +0100
@@ -89,4 +89,7 @@
 	bool const operator != (const a1time &a);
 };
 
+#include "openssl-compat.h"
+XCA_D2I(ASN1_TIME)
+
 #endif
--- xca-0.5.1/lib/pki_x509.h.openssl098	2004-02-18 01:03:06.000000000 +0100
+++ xca-0.5.1/lib/pki_x509.h	2005-12-25 21:43:37.000000000 +0100
@@ -141,4 +141,7 @@
 	   const EVP_MD *getDigest();
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509)
+
 #endif
--- xca-0.5.1/lib/pki_crl.h.openssl098	2004-02-18 01:03:05.000000000 +0100
+++ xca-0.5.1/lib/pki_crl.h	2005-12-25 21:44:28.000000000 +0100
@@ -97,4 +97,7 @@
 	void updateView();
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_CRL)
+
 #endif
--- xca-0.5.1/lib/pki_x509req.h.openssl098	2004-02-05 21:17:55.000000000 +0100
+++ xca-0.5.1/lib/pki_x509req.h	2005-12-25 21:45:20.000000000 +0100
@@ -95,4 +95,8 @@
 	   void set_spki(NETSCAPE_SPKI *_spki);
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_REQ)
+XCA_D2I(NETSCAPE_SPKI)
+
 #endif
--- xca-0.5.1/lib/pki_key.cpp.openssl098	2004-02-18 01:03:06.000000000 +0100
+++ xca-0.5.1/lib/pki_key.cpp	2005-12-25 21:53:16.000000000 +0100
@@ -58,6 +58,9 @@
 #include 
 #include 
 
+#include "openssl-compat.h"
+XCA_D2I_F(RSA_PUBKEY,RSA)
+
 char pki_key::passwd[40]="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
 
 QPixmap *pki_key::icon[2]= { NULL, NULL };
@@ -107,7 +110,13 @@
 	if (pk == NULL) return;
 	key->type = pk->key->type;
 	if (key->type == EVP_PKEY_RSA) {
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+		key->pkey.rsa=((RSA *)ASN1_dup( (i2d_of_void *)i2d_RSAPrivateKey,
+										(d2i_of_void *)d2i_RSAPrivateKey,
+										(char *)pk->key->pkey.rsa));
+#else
 		key->pkey.rsa=((RSA *)ASN1_dup( (int (*)())i2d_RSAPrivateKey, (char *(*)())d2i_RSAPrivateKey,(char *)pk->key->pkey.rsa));
+#endif
 	}
 	// TODO add DSA support.....	
 	openssl_error();
--- xca-0.5.1/lib/x509name.h.openssl098	2003-11-25 16:56:46.000000000 +0100
+++ xca-0.5.1/lib/x509name.h	2005-12-25 21:54:02.000000000 +0100
@@ -87,4 +87,7 @@
 		
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_NAME)
+
 #endif

xca-0.5.1-sha1.patch:

--- NEW FILE xca-0.5.1-sha1.patch ---
--- xca-0.5.1/widgets/NewX509.cpp.sha1	2004-05-21 21:07:44.000000000 +0200
+++ xca-0.5.1/widgets/NewX509.cpp	2005-12-25 22:14:07.000000000 +0100
@@ -117,7 +117,7 @@
 	// are there any useable private keys  ?
 	strings = MainWindow::keys->get0PrivateDesc();
 	keyList->insertStringList(strings);
-	hashAlgo->setCurrentItem(1);
+	hashAlgo->setCurrentItem(2);
 	
 	// any PKCS#10 requests to be used ?
 	strings = MainWindow::reqs->getDesc();


Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/FC-4/xca.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xca.spec	21 May 2005 13:46:10 -0000	1.10
+++ xca.spec	25 Dec 2005 21:27:38 -0000	1.11
@@ -5,7 +5,7 @@
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
 Version:	0.5.1
-Release:	%release_func 3
+Release:	%release_func 4
 
 License:	BSD
 Group:		Applications/Productivity
@@ -15,6 +15,9 @@
 # http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/clicklabel.cpp?r1=1.3&r2=1.4&diff_format=u
 Patch1:		%name-0.5.1-gcc4.patch
 Patch2:		%name-0.5.1-db43.patch
+Patch3:		%name-0.5.1-gcc41.patch
+Patch4:		%name-0.5.1-openssl098.patch
+Patch5:		%name-0.5.1-sha1.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt-devel openssl-devel
 BuildRequires:	/usr/include/db.h
@@ -35,6 +38,9 @@
 %patch0 -p0 -b .langinst
 %patch1 -p2 -b .gcc4
 %patch2 -p1 -b .db43
+%patch3 -p1 -b .gcc41
+%patch4 -p1 -b .openssl098
+%patch5 -p1 -b .sha1
 
 dblibs=$(echo /usr/%_lib/libdb_cxx*.so | tac | sed -e 's!.*lib\(db[^ ]*\)\.so!\1!g')
 sed -i "s! db_cxx-4 ! ${dblibs} !g" configure
@@ -86,6 +92,10 @@
 
 
 %changelog
+* Sun Dec 25 2005 Enrico Scholz  - 0.5.1-4
+- fixed compilation with gcc41 and openssl098
+- use SHA1 instead of MD5 as the default hashalgo
+
 * Sat May 21 2005 Enrico Scholz  - 0.5.1-3
 - generalized db4 detection
 - fixed x86_64 builds



From fedora-extras-commits at redhat.com  Sun Dec 25 21:27:44 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 16:27:44 -0500
Subject: rpms/xca/devel xca-0.5.1-gcc41.patch, NONE,
	1.1 xca-0.5.1-openssl098.patch, NONE, 1.1 xca-0.5.1-sha1.patch,
	NONE, 1.1 xca.spec, 1.10, 1.11
Message-ID: <200512252128.jBPLSH9q001067@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1014/devel

Modified Files:
	xca.spec 
Added Files:
	xca-0.5.1-gcc41.patch xca-0.5.1-openssl098.patch 
	xca-0.5.1-sha1.patch 
Log Message:
- fixed compilation with gcc41 and openssl098
- use SHA1 instead of MD5 as the default hashalgo


xca-0.5.1-gcc41.patch:

--- NEW FILE xca-0.5.1-gcc41.patch ---
--- xca-0.5.1/lib/pki_key.h.gcc41	2003-12-10 07:43:05.000000000 +0100
+++ xca-0.5.1/lib/pki_key.h	2005-12-25 17:27:48.000000000 +0100
@@ -83,7 +83,7 @@
 	pki_key(const QString name = "", int type = EVP_PKEY_RSA);
 	pki_key(EVP_PKEY *pkey);
 	// copy constructor
-	pki_key::pki_key(const pki_key *pk);
+	pki_key(const pki_key *pk);
 	/* destructor */
 	~pki_key();
 	
--- xca-0.5.1/lib/db_crl.h.gcc41	2004-04-16 00:31:31.000000000 +0200
+++ xca-0.5.1/lib/db_crl.h	2005-12-25 16:01:56.000000000 +0100
@@ -69,7 +69,7 @@
 	void preprocess();
 	void inToCont(pki_base *pki);
 	pki_base *insert(pki_base *item);
-	void db_crl::deletePKI(pki_base *pki);
+	void deletePKI(pki_base *pki);
     signals:
 	void updateCertView();
 };
--- xca-0.5.1/lib/db_x509.h.gcc41	2004-02-18 01:03:05.000000000 +0100
+++ xca-0.5.1/lib/db_x509.h	2005-12-25 16:01:56.000000000 +0100
@@ -84,7 +84,7 @@
 	void writeAllCerts(const QString fname, bool onlyTrusted);
 	pki_x509 *getByIssSerial(const pki_x509 *issuer, const a1int &a);
 	pki_x509 *getBySubject(const x509name &xname, pki_x509 *last = NULL);
-	pki_base *db_x509::insert(pki_base *item);
+	pki_base *insert(pki_base *item);
     public slots:
 	void revokeCert(const x509rev &revok, const pki_x509 *issuer);
     
--- xca-0.5.1/lib/asn1time.h.gcc41	2003-08-06 10:15:37.000000000 +0200
+++ xca-0.5.1/lib/asn1time.h	2005-12-25 16:55:02.000000000 +0100
@@ -75,7 +75,7 @@
 	QString toPlain() const;
 	QString toSortable() const;
 	int ymdg(int *y, int *m, int *d, int *g) const;
-	int a1time::ymdg(int *y, int *m, int *d, int *h, int *M, int *s, int *g) const;
+	int ymdg(int *y, int *m, int *d, int *h, int *M, int *s, int *g) const;
 	ASN1_TIME *get() const;
 	ASN1_TIME *get_utc() const;
 	a1time &now(int delta = 0);

xca-0.5.1-openssl098.patch:

--- NEW FILE xca-0.5.1-openssl098.patch ---
--- xca-0.5.1/lib/x509rev.cpp.openssl098	2003-11-24 14:42:44.000000000 +0100
+++ xca-0.5.1/lib/x509rev.cpp	2005-12-25 21:38:32.000000000 +0100
@@ -50,8 +50,13 @@
 
 #include "x509rev.h"
 
-#define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+#  define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((i2d_of_void *)i2d_X509_REVOKED, \
+		(d2i_of_void *)d2i_X509_REVOKED,(char *)x5r)
+#else
+#  define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
 		(char *(*)())d2i_X509_REVOKED,(char *)x5r)
+#endif
 	
 x509rev::x509rev()
 {
--- xca-0.5.1/lib/openssl-compat.h.openssl098	2005-12-25 21:38:44.000000000 +0100
+++ xca-0.5.1/lib/openssl-compat.h	2005-12-25 21:51:29.000000000 +0100
@@ -0,0 +1,17 @@
+#ifndef H_XCA_LIB_OPENSSL_COMPAT_H
+#define H_XCA_LIB_OPENSSL_COMPAT_H
+
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+#  define XCA_D2I_F(F,X) \
+inline static X*					\
+d2i_##F(X** a, unsigned char**b, long int c)		\
+{							\
+  return d2i_##F(a, (unsigned char const **) b, c);	\
+}
+#  define XCA_D2I(X)		XCA_D2I_F(X,X)
+#else
+#  define XCA_D2I(X)
+#  define XCA_D2I_F(F,X)
+#endif
+
+#endif
--- xca-0.5.1/lib/asn1time.h.openssl098	2005-12-25 21:33:32.000000000 +0100
+++ xca-0.5.1/lib/asn1time.h	2005-12-25 21:42:47.000000000 +0100
@@ -89,4 +89,7 @@
 	bool const operator != (const a1time &a);
 };
 
+#include "openssl-compat.h"
+XCA_D2I(ASN1_TIME)
+
 #endif
--- xca-0.5.1/lib/pki_x509.h.openssl098	2004-02-18 01:03:06.000000000 +0100
+++ xca-0.5.1/lib/pki_x509.h	2005-12-25 21:43:37.000000000 +0100
@@ -141,4 +141,7 @@
 	   const EVP_MD *getDigest();
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509)
+
 #endif
--- xca-0.5.1/lib/pki_crl.h.openssl098	2004-02-18 01:03:05.000000000 +0100
+++ xca-0.5.1/lib/pki_crl.h	2005-12-25 21:44:28.000000000 +0100
@@ -97,4 +97,7 @@
 	void updateView();
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_CRL)
+
 #endif
--- xca-0.5.1/lib/pki_x509req.h.openssl098	2004-02-05 21:17:55.000000000 +0100
+++ xca-0.5.1/lib/pki_x509req.h	2005-12-25 21:45:20.000000000 +0100
@@ -95,4 +95,8 @@
 	   void set_spki(NETSCAPE_SPKI *_spki);
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_REQ)
+XCA_D2I(NETSCAPE_SPKI)
+
 #endif
--- xca-0.5.1/lib/pki_key.cpp.openssl098	2004-02-18 01:03:06.000000000 +0100
+++ xca-0.5.1/lib/pki_key.cpp	2005-12-25 21:53:16.000000000 +0100
@@ -58,6 +58,9 @@
 #include 
 #include 
 
+#include "openssl-compat.h"
+XCA_D2I_F(RSA_PUBKEY,RSA)
+
 char pki_key::passwd[40]="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
 
 QPixmap *pki_key::icon[2]= { NULL, NULL };
@@ -107,7 +110,13 @@
 	if (pk == NULL) return;
 	key->type = pk->key->type;
 	if (key->type == EVP_PKEY_RSA) {
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+		key->pkey.rsa=((RSA *)ASN1_dup( (i2d_of_void *)i2d_RSAPrivateKey,
+										(d2i_of_void *)d2i_RSAPrivateKey,
+										(char *)pk->key->pkey.rsa));
+#else
 		key->pkey.rsa=((RSA *)ASN1_dup( (int (*)())i2d_RSAPrivateKey, (char *(*)())d2i_RSAPrivateKey,(char *)pk->key->pkey.rsa));
+#endif
 	}
 	// TODO add DSA support.....	
 	openssl_error();
--- xca-0.5.1/lib/x509name.h.openssl098	2003-11-25 16:56:46.000000000 +0100
+++ xca-0.5.1/lib/x509name.h	2005-12-25 21:54:02.000000000 +0100
@@ -87,4 +87,7 @@
 		
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_NAME)
+
 #endif

xca-0.5.1-sha1.patch:

--- NEW FILE xca-0.5.1-sha1.patch ---
--- xca-0.5.1/widgets/NewX509.cpp.sha1	2004-05-21 21:07:44.000000000 +0200
+++ xca-0.5.1/widgets/NewX509.cpp	2005-12-25 22:14:07.000000000 +0100
@@ -117,7 +117,7 @@
 	// are there any useable private keys  ?
 	strings = MainWindow::keys->get0PrivateDesc();
 	keyList->insertStringList(strings);
-	hashAlgo->setCurrentItem(1);
+	hashAlgo->setCurrentItem(2);
 	
 	// any PKCS#10 requests to be used ?
 	strings = MainWindow::reqs->getDesc();


Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xca.spec	21 May 2005 13:46:10 -0000	1.10
+++ xca.spec	25 Dec 2005 21:27:44 -0000	1.11
@@ -5,7 +5,7 @@
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
 Version:	0.5.1
-Release:	%release_func 3
+Release:	%release_func 4
 
 License:	BSD
 Group:		Applications/Productivity
@@ -15,6 +15,9 @@
 # http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/clicklabel.cpp?r1=1.3&r2=1.4&diff_format=u
 Patch1:		%name-0.5.1-gcc4.patch
 Patch2:		%name-0.5.1-db43.patch
+Patch3:		%name-0.5.1-gcc41.patch
+Patch4:		%name-0.5.1-openssl098.patch
+Patch5:		%name-0.5.1-sha1.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt-devel openssl-devel
 BuildRequires:	/usr/include/db.h
@@ -35,6 +38,9 @@
 %patch0 -p0 -b .langinst
 %patch1 -p2 -b .gcc4
 %patch2 -p1 -b .db43
+%patch3 -p1 -b .gcc41
+%patch4 -p1 -b .openssl098
+%patch5 -p1 -b .sha1
 
 dblibs=$(echo /usr/%_lib/libdb_cxx*.so | tac | sed -e 's!.*lib\(db[^ ]*\)\.so!\1!g')
 sed -i "s! db_cxx-4 ! ${dblibs} !g" configure
@@ -86,6 +92,10 @@
 
 
 %changelog
+* Sun Dec 25 2005 Enrico Scholz  - 0.5.1-4
+- fixed compilation with gcc41 and openssl098
+- use SHA1 instead of MD5 as the default hashalgo
+
 * Sat May 21 2005 Enrico Scholz  - 0.5.1-3
 - generalized db4 detection
 - fixed x86_64 builds



From fedora-extras-commits at redhat.com  Sun Dec 25 22:04:09 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 17:04:09 -0500
Subject: rpms/mimetic - New directory
Message-ID: <200512252204.jBPM4AOW002863@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mimetic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2855/mimetic

Log Message:
Directory /cvs/extras/rpms/mimetic added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 25 22:04:38 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 17:04:38 -0500
Subject: rpms/mimetic/devel - New directory
Message-ID: <200512252204.jBPM4ehZ002877@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mimetic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2855/mimetic/devel

Log Message:
Directory /cvs/extras/rpms/mimetic/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 25 22:05:58 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 17:05:58 -0500
Subject: rpms/mimetic Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512252206.jBPM60eH002917@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mimetic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2905

Added Files:
	Makefile import.log 
Log Message:
Setup of module mimetic


--- NEW FILE Makefile ---
# Top level Makefile for module mimetic
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 25 22:06:04 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 17:06:04 -0500
Subject: rpms/mimetic/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512252206.jBPM66f4002935@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mimetic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2905/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mimetic


--- NEW 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 Dec 25 22:09:51 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 17:09:51 -0500
Subject: rpms/mimetic/devel mimetic-0.8.9-gcc41.patch, NONE,
	1.1 mimetic-0.8.9-noconfigh.patch, NONE, 1.1 mimetic.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512252210.jBPMAObg003023@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mimetic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2979/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mimetic-0.8.9-gcc41.patch mimetic-0.8.9-noconfigh.patch 
	mimetic.spec 
Log Message:
auto-import mimetic-0.8.9-3 on branch devel from mimetic-0.8.9-3.src.rpm

mimetic-0.8.9-gcc41.patch:

--- NEW FILE mimetic-0.8.9-gcc41.patch ---
--- mimetic-0.8.9/mimetic/utils.h.gcc41	2005-03-07 16:35:08.000000000 +0100
+++ mimetic-0.8.9/mimetic/utils.h	2005-12-25 22:56:59.000000000 +0100
@@ -56,13 +56,6 @@
  * returns an Iterator pointing at the first character of the found pattern
  * or \p eit if the search fails
  */
-template
-Iterator find_bm(Iterator bit, Iterator eit, const std::string& word)
-{
-    return find_bm(bit, eit, word, 
-        typename std::iterator_traits::iterator_category());
-}
-
 // find_bm specialization for random access iterators
 template
 Iterator find_bm(Iterator bit, Iterator eit, const std::string& word, const std::random_access_iterator_tag&)
@@ -94,6 +87,13 @@
     return bit + i + 1;
 }
 
+template
+Iterator find_bm(Iterator bit, Iterator eit, const std::string& word)
+{
+    return find_bm(bit, eit, word, 
+        typename std::iterator_traits::iterator_category());
+}
+
 
 
 } // ns utils

mimetic-0.8.9-noconfigh.patch:

--- NEW FILE mimetic-0.8.9-noconfigh.patch ---
Oct 24 2005 Enrico Scholz 
	* os/file.h, message.h: assume that HAVE_MMAP and HAVE_UNISTD_H are
	  '1'; this avoids problems when we are clearing 
	  (which conflicts with autoconf/automake) later. Because this
	  patch is for a Fedora package, it is safe to assume that these
	  macros are set

--- mimetic-0.8.9/mimetic/os/file.h.noconfigh	2005-02-23 11:26:15.000000000 +0100
+++ mimetic-0.8.9/mimetic/os/file.h	2005-10-24 17:43:59.000000000 +0200
@@ -23,14 +23,14 @@
 #include 
 #include 
 #include 
-#ifdef HAVE_MMAP
+#if 1
 #include 
 #endif
 
 namespace mimetic
 {
 
-#if HAVE_MMAP == 1
+#if 1 == 1
 typedef MMFile File;
 #else
 typedef StdFile File;
--- mimetic-0.8.9/mimetic/message.h.noconfigh	2005-03-07 16:35:08.000000000 +0100
+++ mimetic-0.8.9/mimetic/message.h	2005-10-24 17:43:48.000000000 +0200
@@ -21,7 +21,7 @@
 #include 
 #include 
 #include 
-#ifdef HAVE_UNISTD_H
+#if 1
 #include 
 #endif
 


--- NEW FILE mimetic.spec ---
## $Id: mimetic.spec 1791 2005-10-24 15:54:46Z ensc at BIGO.ENSC.DE $

%{!?release_func:%global release_func() %1%{?dist}}

Name:		mimetic
Version:	0.8.9
Release:	%release_func 3
Summary:	A full featured MIME library written in C++

Group:		System Environment/Libraries
License:	GPL
URL:		http://codesink.org/mimetic_mime_library.html
Source0:	http://codesink.org/download/%name-%version.tar.gz
Patch0:		mimetic-0.8.9-noconfigh.patch
Patch1:		mimetic-0.8.9-gcc41.patch
BuildRoot:	%_tmppath/%name-%version-%release-root-%(%__id_u -n)

BuildRequires:	doxygen


%package devel
Summary:	Files for development of applications which will use %name
Group:		Development/Libraries
Requires:	%name = %version-%release


%description
mimetic is a GPL MIME library written in C++ designed to be easy to use
and integrate but yet fast and efficient. mimetic doesn't use exceptions
but it heavily uses templates so a mostly standard compliant C++ compiler
is required.


%description devel
mimetic is a GPL MIME library written in C++ designed to be easy to use
and integrate but yet fast and efficient. mimetic doesn't use exceptions
but it heavily uses templates so a mostly standard compliant C++ compiler
is required.

This package contains files for the development of applications which
will use %name.


%prep
%setup -q
%patch0 -p1 -b .noconfigh
%patch1 -p1 -b .gcc41


%build
%configure --disable-static
%__make %{?_smp_mflags}
%__make docs -C doc


%install
rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%_libdir/*.la

echo "\
// cleared by the Fedora Extras package; content causes conflicts
// with autoconf/automake 'config.h' files else" > $RPM_BUILD_ROOT%_includedir/%name/config.h


%check
%__make check


%clean
rm -rf $RPM_BUILD_ROOT


%post   -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%_libdir/*.so.*


%files devel
%defattr(-,root,root,-)
%doc doc/html
%_libdir/*.so
%_includedir/%name


%changelog
* Sun Dec 25 2005 Enrico Scholz  - 0.8.9-3
- fixed compilation with gcc41
- first Fedora Extras release (review #171624)

* Mon Oct 24 2005 Enrico Scholz  - 0.8.9-2
- workaround problems with  which conflicts with
  local files from autoconf/automake

* Mon Oct 24 2005 Enrico Scholz  - 0.8.9-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimetic/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Dec 2005 22:06:04 -0000	1.1
+++ .cvsignore	25 Dec 2005 22:09:50 -0000	1.2
@@ -0,0 +1 @@
+mimetic-0.8.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimetic/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Dec 2005 22:06:04 -0000	1.1
+++ sources	25 Dec 2005 22:09:50 -0000	1.2
@@ -0,0 +1 @@
+fa3cb93e37684c71ac5afad02870302b  mimetic-0.8.9.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 25 22:09:23 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 17:09:23 -0500
Subject: rpms/mimetic import.log,1.1,1.2
Message-ID: <200512252210.jBPMATJo003024@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/mimetic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2979

Modified Files:
	import.log 
Log Message:
auto-import mimetic-0.8.9-3 on branch devel from mimetic-0.8.9-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mimetic/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Dec 2005 22:05:58 -0000	1.1
+++ import.log	25 Dec 2005 22:09:23 -0000	1.2
@@ -0,0 +1 @@
+mimetic-0_8_9-3:HEAD:mimetic-0.8.9-3.src.rpm:1135548517



From fedora-extras-commits at redhat.com  Sun Dec 25 22:13:37 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 25 Dec 2005 17:13:37 -0500
Subject: owners owners.list,1.480,1.481
Message-ID: <200512252214.jBPME9iJ003134@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3112

Modified Files:
	owners.list 
Log Message:
added mimetic


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -r1.480 -r1.481
--- owners.list	25 Dec 2005 15:28:47 -0000	1.480
+++ owners.list	25 Dec 2005 22:13:37 -0000	1.481
@@ -597,6 +597,7 @@
 Fedora Extras|mhonarc|A Perl mail-to-HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|milter-greylist|Milter for greylisting, the next step in the spam control war|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mimetex|Easily embed LaTeX math in web pages|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|mimetic|A full featured MIME library written in C++|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mknbi|Utility for creating network bootable images|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mmv|Move/copy/append/link multiple files|shishz at hotpop.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 26 02:52:47 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 25 Dec 2005 21:52:47 -0500
Subject: rpms/liferea/devel liferea.spec,1.24,1.25
Message-ID: <200512260253.jBQ2rJiC010236@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10219

Modified Files:
	liferea.spec 
Log Message:
* Sun Dec 25 2005 Brian Pepple  - 1.0-3
- Add BR for libXdmcp-devel,libXau-devel, & libSM-devel.



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- liferea.spec	23 Dec 2005 21:37:44 -0000	1.24
+++ liferea.spec	26 Dec 2005 02:52:46 -0000	1.25
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -14,6 +14,9 @@
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel mozilla-devel
 BuildRequires:  GConf2-devel
+BuildRequires:	libXdmcp-devel
+BuildRequires:	libXau-devel
+BuildRequires:	libSM-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  zlib-devel
@@ -92,6 +95,9 @@
 
 
 %changelog
+* Sun Dec 25 2005 Brian Pepple  - 1.0-3
+- Add BR for libXdmcp-devel,libXau-devel, & libSM-devel.
+
 * Fri Dec 23 2005 Brian Pepple  - 1.0-2
 - Update to 1.0.
 



From fedora-extras-commits at redhat.com  Mon Dec 26 11:07:09 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Mon, 26 Dec 2005 06:07:09 -0500
Subject: rpms/python-simpy/devel python-simpy.spec,1.1,1.2
Message-ID: <200512261107.jBQB7wNP026257@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26240

Modified Files:
	python-simpy.spec 
Log Message:
Bump release



Index: python-simpy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/devel/python-simpy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-simpy.spec	22 Dec 2005 20:27:20 -0000	1.1
+++ python-simpy.spec	26 Dec 2005 11:06:49 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		python-simpy
 Version:	1.6.1
-Release:	2
+Release:	3
 Summary:	Python simulation framework
 Group:		Development/Languages
 License:	LGPL
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon Dec 26 2005 Sarantis Paskalis  - 1.6.1-3
+- Bump release.
+
 * Wed Dec 21 2005 Sarantis Paskalis  - 1.6.1-2
 - Add source code documentation as a -doc package (John Mahowald).
 - Add Requires: tkinter for SimGUI to work (John Mahowald).



From fedora-extras-commits at redhat.com  Mon Dec 26 11:14:14 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Mon, 26 Dec 2005 06:14:14 -0500
Subject: rpms/python-simpy/devel python-simpy.spec,1.2,1.3
Message-ID: <200512261114.jBQBEkvj026332@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26315

Modified Files:
	python-simpy.spec 
Log Message:
Add dist to release. Bump release.



Index: python-simpy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/devel/python-simpy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-simpy.spec	26 Dec 2005 11:06:49 -0000	1.2
+++ python-simpy.spec	26 Dec 2005 11:14:14 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:		python-simpy
 Version:	1.6.1
-Release:	3
+Release:	3%{?dist}
 Summary:	Python simulation framework
 Group:		Development/Languages
 License:	LGPL
@@ -72,7 +72,7 @@
 
 %changelog
 * Mon Dec 26 2005 Sarantis Paskalis  - 1.6.1-3
-- Bump release.
+- Add dist in release. Bump release.
 
 * Wed Dec 21 2005 Sarantis Paskalis  - 1.6.1-2
 - Add source code documentation as a -doc package (John Mahowald).



From fedora-extras-commits at redhat.com  Mon Dec 26 11:15:23 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Mon, 26 Dec 2005 06:15:23 -0500
Subject: rpms/python-simpy/FC-4 python-simpy.spec,1.1,1.2
Message-ID: <200512261115.jBQBFtDG026388@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26369

Modified Files:
	python-simpy.spec 
Log Message:
Add dist to release.  Bump release.



Index: python-simpy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/FC-4/python-simpy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-simpy.spec	22 Dec 2005 20:27:20 -0000	1.1
+++ python-simpy.spec	26 Dec 2005 11:15:22 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		python-simpy
 Version:	1.6.1
-Release:	2
+Release:	3%{?dist}
 Summary:	Python simulation framework
 Group:		Development/Languages
 License:	LGPL
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon Dec 26 2005 Sarantis Paskalis  - 1.6.1-3
+- Add dist in release. Bump release.
+
 * Wed Dec 21 2005 Sarantis Paskalis  - 1.6.1-2
 - Add source code documentation as a -doc package (John Mahowald).
 - Add Requires: tkinter for SimGUI to work (John Mahowald).



From fedora-extras-commits at redhat.com  Mon Dec 26 11:16:34 2005
From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis))
Date: Mon, 26 Dec 2005 06:16:34 -0500
Subject: rpms/python-simpy/FC-3 python-simpy.spec,1.1,1.2
Message-ID: <200512261117.jBQBH7AV026441@cvs-int.fedora.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/python-simpy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26423

Modified Files:
	python-simpy.spec 
Log Message:
Insert dist in release.  Bump release.



Index: python-simpy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpy/FC-3/python-simpy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-simpy.spec	22 Dec 2005 20:27:20 -0000	1.1
+++ python-simpy.spec	26 Dec 2005 11:16:34 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		python-simpy
 Version:	1.6.1
-Release:	2
+Release:	3%{?dist}
 Summary:	Python simulation framework
 Group:		Development/Languages
 License:	LGPL
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon Dec 26 2005 Sarantis Paskalis  - 1.6.1-3
+- Add dist in release. Bump release.
+
 * Wed Dec 21 2005 Sarantis Paskalis  - 1.6.1-2
 - Add source code documentation as a -doc package (John Mahowald).
 - Add Requires: tkinter for SimGUI to work (John Mahowald).



From fedora-extras-commits at redhat.com  Mon Dec 26 11:54:26 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 26 Dec 2005 06:54:26 -0500
Subject: rpms/makebootfat - New directory
Message-ID: <200512261154.jBQBsSUV026700@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/makebootfat
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26692/makebootfat

Log Message:
Directory /cvs/extras/rpms/makebootfat added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 26 11:54:32 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 26 Dec 2005 06:54:32 -0500
Subject: rpms/makebootfat/devel - New directory
Message-ID: <200512261154.jBQBsYEo026717@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/makebootfat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26692/makebootfat/devel

Log Message:
Directory /cvs/extras/rpms/makebootfat/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 26 11:54:52 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 26 Dec 2005 06:54:52 -0500
Subject: rpms/makebootfat Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512261154.jBQBstis026753@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/makebootfat
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26739

Added Files:
	Makefile import.log 
Log Message:
Setup of module makebootfat


--- NEW FILE Makefile ---
# Top level Makefile for module makebootfat
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 26 11:54:58 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 26 Dec 2005 06:54:58 -0500
Subject: rpms/makebootfat/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512261155.jBQBt0xG026773@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/makebootfat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26739/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module makebootfat


--- NEW 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 Dec 26 11:55:39 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 26 Dec 2005 06:55:39 -0500
Subject: rpms/makebootfat import.log,1.1,1.2
Message-ID: <200512261156.jBQBuDGG026857@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/makebootfat
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26820

Modified Files:
	import.log 
Log Message:
auto-import makebootfat-1.4-2 on branch devel from makebootfat-1.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/makebootfat/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Dec 2005 11:54:52 -0000	1.1
+++ import.log	26 Dec 2005 11:55:39 -0000	1.2
@@ -0,0 +1 @@
+makebootfat-1_4-2:HEAD:makebootfat-1.4-2.src.rpm:1135598130



From fedora-extras-commits at redhat.com  Mon Dec 26 11:55:56 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 26 Dec 2005 06:55:56 -0500
Subject: rpms/makebootfat/devel makebootfat-README.usbboot, NONE,
	1.1 makebootfat.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512261156.jBQBuSur026867@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/makebootfat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26820/devel

Modified Files:
	.cvsignore sources 
Added Files:
	makebootfat-README.usbboot makebootfat.spec 
Log Message:
auto-import makebootfat-1.4-2 on branch devel from makebootfat-1.4-2.src.rpm


--- NEW FILE makebootfat-README.usbboot ---
1. Extract contents of the image */images/diskboot.img (from an appropriate
distribution) to a directory, for example /tmp/imagedir

2. Copy file ldlinux.bss (from /usr/share/makebootfat directory or,
originally, from syslinux-*.src.rpm sources) to the same directory 

4. Put file mbrfat.bin (from /usr/share/makebootfat, or makebootfat sources)
to the same directory

   Note: generally, it is not required to put both the files into the same dir,
but for simpler usage it is better.

5. Generate an image of appropriate size, at least the size of diskboot.img
(see above), but better some more (8 or 16 Mb may be useful)
   dd bs=1M count=16 /tmp/image.img

6. Make the boot image in this temporary file image:
   losetup /dev/loop0 /tmp/image.img
   cd /tmp/imagedir
   /usr/bin/makebootfat -o /dev/loop0 -X -b ldlinux.bss \
	-m mbrfat.bin -F /tmp/imagedir
   losetup -d /dev/loop0

   Note: for syslinux >= 3, option `-Y' may be used instead of `-X'
   Note: if you specify real disk (i.e., /dev/sda instead of /dev/loop0),
   the whole disk area will be filled by a single fat filesystem...

7. Copy the created image to a target media:
   dd bs=512 /dev/sda

8. Add another partitions (if needed) onto free space left on the media
   fdisk /dev/sda

Thats all.



--- NEW FILE makebootfat.spec ---
Summary: Utility for creation bootable FAT disk
Name: makebootfat
Version: 1.4
Release: 2%{?dist}
Group: 	Applications/System
License: GPL
URL: http://advancemame.sourceforge.net/doc-makebootfat.html
Source0: http://dl.sourceforge.net/sourceforge/advancemame/%{name}-%{version}.tar.gz
Source1: makebootfat-README.usbboot

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
This utility creates a bootable FAT filesystem and populates it
with files and boot tools.

It was mainly designed to create bootable USB and Fixed disk
for the AdvanceCD project (http://advancemame.sourceforge.net), but
can be successfully used separately for any purposes.


%prep
%setup -q

cp -a %{SOURCE1} README.usbboot


%build

%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/x86
install -p -m644 mbrfat.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/x86
install -p -m644 test/ldlinux.bss $RPM_BUILD_ROOT%{_datadir}/%{name}/x86


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc AUTHORS COPYING HISTORY README README.usbboot
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/*/*


%changelog
* Mon Dec 26 2005 Dmitry Butskoy  - 1.4-2
- place mbrfat.bin and ldlinux.bss under %{_datadir}/%{name}/x86

* Mon Dec 24 2005 Dmitry Butskoy  - 1.4-1
- accepted for Fedora Extra (review by John Mahowald )

* Mon Oct  3 2005 Dmitry Butskoy  - 1.4-1
- initial release
- install mbrfat.bin and ldlinux.bss binary files, they are
  actually needed to create something useful here.
- add README.usbboot -- instruction how to make diskboot.img more helpful
  (written by me).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/makebootfat/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Dec 2005 11:54:58 -0000	1.1
+++ .cvsignore	26 Dec 2005 11:55:55 -0000	1.2
@@ -0,0 +1 @@
+makebootfat-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/makebootfat/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Dec 2005 11:54:58 -0000	1.1
+++ sources	26 Dec 2005 11:55:55 -0000	1.2
@@ -0,0 +1 @@
+8ae9144e2bec8b8498361a25fdf76741  makebootfat-1.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 26 14:13:49 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Mon, 26 Dec 2005 09:13:49 -0500
Subject: rpms/up-imapproxy/FC-3 up-imapproxy.spec,1.5,1.6
Message-ID: <200512261414.jBQEELB9032180@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32086/FC-3

Modified Files:
	up-imapproxy.spec 
Log Message:
Release bump to build against new OpenSSL in devel branch -- fc5 only.
I copied the spec to fc3 and fc4 branches in order to keep the release 
tag consistent.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-3/up-imapproxy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- up-imapproxy.spec	11 Oct 2005 19:37:27 -0000	1.5
+++ up-imapproxy.spec	26 Dec 2005 14:13:48 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -74,6 +74,9 @@
 %{_sbindir}/*
 
 %changelog
+* Mon Dec 26 2005 Jeff Carlson  - 1.2.4-5
+- Rebuild against new OpenSSL in devel (fc5 only).
+
 * Tue Oct 11 2005 Ville Skytt??  - 1.2.4-4
 - Fix for CAN-2005-2661 (#170220, from Debian).
 



From fedora-extras-commits at redhat.com  Mon Dec 26 14:13:55 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Mon, 26 Dec 2005 09:13:55 -0500
Subject: rpms/up-imapproxy/FC-4 up-imapproxy.spec,1.5,1.6
Message-ID: <200512261414.jBQEERfU032183@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32086/FC-4

Modified Files:
	up-imapproxy.spec 
Log Message:
Release bump to build against new OpenSSL in devel branch -- fc5 only.
I copied the spec to fc3 and fc4 branches in order to keep the release 
tag consistent.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-4/up-imapproxy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- up-imapproxy.spec	11 Oct 2005 19:37:28 -0000	1.5
+++ up-imapproxy.spec	26 Dec 2005 14:13:55 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -74,6 +74,9 @@
 %{_sbindir}/*
 
 %changelog
+* Mon Dec 26 2005 Jeff Carlson  - 1.2.4-5
+- Rebuild against new OpenSSL in devel (fc5 only).
+
 * Tue Oct 11 2005 Ville Skytt??  - 1.2.4-4
 - Fix for CAN-2005-2661 (#170220, from Debian).
 



From fedora-extras-commits at redhat.com  Mon Dec 26 14:14:01 2005
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Mon, 26 Dec 2005 09:14:01 -0500
Subject: rpms/up-imapproxy/devel up-imapproxy.spec,1.5,1.6
Message-ID: <200512261414.jBQEEXD8032186@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32086/devel

Modified Files:
	up-imapproxy.spec 
Log Message:
Release bump to build against new OpenSSL in devel branch -- fc5 only.
I copied the spec to fc3 and fc4 branches in order to keep the release 
tag consistent.



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/up-imapproxy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- up-imapproxy.spec	11 Oct 2005 19:37:28 -0000	1.5
+++ up-imapproxy.spec	26 Dec 2005 14:14:01 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -74,6 +74,9 @@
 %{_sbindir}/*
 
 %changelog
+* Mon Dec 26 2005 Jeff Carlson  - 1.2.4-5
+- Rebuild against new OpenSSL in devel (fc5 only).
+
 * Tue Oct 11 2005 Ville Skytt??  - 1.2.4-4
 - Fix for CAN-2005-2661 (#170220, from Debian).
 



From fedora-extras-commits at redhat.com  Mon Dec 26 15:48:26 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 26 Dec 2005 10:48:26 -0500
Subject: owners owners.list,1.481,1.482
Message-ID: <200512261548.jBQFmwbv001545@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1525

Modified Files:
	owners.list 
Log Message:
drivel package changing hands from Jeremy to Paul


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -r1.481 -r1.482
--- owners.list	25 Dec 2005 22:13:37 -0000	1.481
+++ owners.list	26 Dec 2005 15:48:26 -0000	1.482
@@ -156,7 +156,7 @@
 Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
-Fedora Extras|drivel|A journal or "blog" client|katzj at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|drivel|A journal or "blog" client|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 26 15:53:05 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 26 Dec 2005 10:53:05 -0500
Subject: rpms/liferea/devel liferea.spec,1.25,1.26
Message-ID: <200512261553.jBQFrbsK001587@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1569

Modified Files:
	liferea.spec 
Log Message:
* Mon Dec 26 2005 Brian Pepple  - 1.0-4
- Dropp BR for libXdmcp-devel & libXau-devel, replace w/ libX11-devel (#176313).



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- liferea.spec	26 Dec 2005 02:52:46 -0000	1.25
+++ liferea.spec	26 Dec 2005 15:53:05 -0000	1.26
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -14,8 +14,7 @@
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel mozilla-devel
 BuildRequires:  GConf2-devel
-BuildRequires:	libXdmcp-devel
-BuildRequires:	libXau-devel
+BuildRequires:	libX11-devel
 BuildRequires:	libSM-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -95,6 +94,9 @@
 
 
 %changelog
+* Mon Dec 26 2005 Brian Pepple  - 1.0-4
+- Dropp BR for libXdmcp-devel & libXau-devel, replace w/ libX11-devel (#176313).
+
 * Sun Dec 25 2005 Brian Pepple  - 1.0-3
 - Add BR for libXdmcp-devel,libXau-devel, & libSM-devel.
 



From fedora-extras-commits at redhat.com  Mon Dec 26 16:32:59 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 26 Dec 2005 11:32:59 -0500
Subject: owners owners.list,1.482,1.483
Message-ID: <200512261633.jBQGXV9A003364@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3346

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -r1.482 -r1.483
--- owners.list	26 Dec 2005 15:48:26 -0000	1.482
+++ owners.list	26 Dec 2005 16:32:58 -0000	1.483
@@ -581,6 +581,7 @@
 Fedora Extras|Maelstrom|A space combat game.|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|MagicPoint|X based presentation software|colin at fedoraproject.org|extras-qa at fedoraproject.org|rms at 1407.org
 Fedora Extras|mail-notification|Mail Notification is a status icon that informs you if you have new mail|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|makebootfat|Utility for creation bootable FAT disk|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|manedit|GUI editor for creating man pages.|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|mantis|A web-based bugtracking system|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mathml-fonts|Mathematical symbol fonts|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 26 17:04:34 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 26 Dec 2005 12:04:34 -0500
Subject: rpms/drivel/FC-3 drivel-2.0.2-desktop.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 drivel.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512261706.jBQH60pT005138@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/drivel/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5068/FC-3

Modified Files:
	.cvsignore drivel.spec sources 
Added Files:
	drivel-2.0.2-desktop.patch 
Log Message:
Update to 2.0.2, add trivial patch for .desktop file

drivel-2.0.2-desktop.patch:

--- NEW FILE drivel-2.0.2-desktop.patch ---
diff -uNr drivel-2.0.2-orig/data/gnome-drivel.desktop.in drivel-2.0.2/data/gnome-drivel.desktop.in
--- drivel-2.0.2-orig/data/gnome-drivel.desktop.in	2005-06-13 20:34:38.000000000 -0400
+++ drivel-2.0.2/data/gnome-drivel.desktop.in	2005-12-26 11:11:34.000000000 -0500
@@ -4,7 +4,7 @@
 _GenericName=Journal Editor
 _Comment=Update and manage your online journal
 Exec=drivel %U
-Terminal=False
+Terminal=false
 Type=Application
 Icon=drivel-48.png
 MimeType=application/x-drivel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jun 2005 21:07:57 -0000	1.2
+++ .cvsignore	26 Dec 2005 17:04:33 -0000	1.3
@@ -1 +1 @@
-drivel-2.0.0.tar.bz2
+drivel-2.0.2.tar.bz2


Index: drivel.spec
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-3/drivel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drivel.spec	13 Jun 2005 00:09:29 -0000	1.2
+++ drivel.spec	26 Dec 2005 17:04:34 -0000	1.3
@@ -1,11 +1,12 @@
 Summary: A journal or "blog" client
 Name: drivel
-Version: 2.0.0
-Release: 3%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 Url: http://www.dropline.net/drivel
 Source: %{name}-%{version}.tar.bz2
+Patch0:	drivel-2.0.2-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: scrollkeeper
 BuildRequires: gtkspell-devel 
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-schemas-install --disable-mime-update --disable-desktop-update --with-curl-libraries=%{_libdir}
@@ -110,6 +112,9 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Dec 26 2005 Paul W. Frields  - 2.0.2-1
+- Update to 2.0.2
+
 * Sun Jun 12 2005 Jeremy Katz  2.0.0-3
 - gconf schema removal, BR gettext, add Fedora category to the desktop file 
   (noticed by mschwendt)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jun 2005 21:07:57 -0000	1.2
+++ sources	26 Dec 2005 17:04:34 -0000	1.3
@@ -1 +1 @@
-38c866e10909d123bb20c6fb4a852ba7  drivel-2.0.0.tar.bz2
+b77d376946ab32f0f8992c5e0baf1f51  drivel-2.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 26 17:05:27 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 26 Dec 2005 12:05:27 -0500
Subject: rpms/drivel/devel drivel-2.0.2-desktop.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 drivel.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512261705.jBQH5xtI005136@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/drivel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5068/devel

Modified Files:
	.cvsignore drivel.spec sources 
Added Files:
	drivel-2.0.2-desktop.patch 
Log Message:
Update to 2.0.2, add trivial patch for .desktop file

drivel-2.0.2-desktop.patch:

--- NEW FILE drivel-2.0.2-desktop.patch ---
diff -uNr drivel-2.0.2-orig/data/gnome-drivel.desktop.in drivel-2.0.2/data/gnome-drivel.desktop.in
--- drivel-2.0.2-orig/data/gnome-drivel.desktop.in	2005-06-13 20:34:38.000000000 -0400
+++ drivel-2.0.2/data/gnome-drivel.desktop.in	2005-12-26 11:11:34.000000000 -0500
@@ -4,7 +4,7 @@
 _GenericName=Journal Editor
 _Comment=Update and manage your online journal
 Exec=drivel %U
-Terminal=False
+Terminal=false
 Type=Application
 Icon=drivel-48.png
 MimeType=application/x-drivel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/drivel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jun 2005 21:07:57 -0000	1.2
+++ .cvsignore	26 Dec 2005 17:05:27 -0000	1.3
@@ -1 +1 @@
-drivel-2.0.0.tar.bz2
+drivel-2.0.2.tar.bz2


Index: drivel.spec
===================================================================
RCS file: /cvs/extras/rpms/drivel/devel/drivel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drivel.spec	13 Jun 2005 00:09:29 -0000	1.2
+++ drivel.spec	26 Dec 2005 17:05:27 -0000	1.3
@@ -1,11 +1,12 @@
 Summary: A journal or "blog" client
 Name: drivel
-Version: 2.0.0
-Release: 3%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 Url: http://www.dropline.net/drivel
 Source: %{name}-%{version}.tar.bz2
+Patch0:	drivel-2.0.2-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: scrollkeeper
 BuildRequires: gtkspell-devel 
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-schemas-install --disable-mime-update --disable-desktop-update --with-curl-libraries=%{_libdir}
@@ -110,6 +112,9 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Dec 26 2005 Paul W. Frields  - 2.0.2-1
+- Update to 2.0.2
+
 * Sun Jun 12 2005 Jeremy Katz  2.0.0-3
 - gconf schema removal, BR gettext, add Fedora category to the desktop file 
   (noticed by mschwendt)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/drivel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jun 2005 21:07:57 -0000	1.2
+++ sources	26 Dec 2005 17:05:27 -0000	1.3
@@ -1 +1 @@
-38c866e10909d123bb20c6fb4a852ba7  drivel-2.0.0.tar.bz2
+b77d376946ab32f0f8992c5e0baf1f51  drivel-2.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 26 17:05:01 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 26 Dec 2005 12:05:01 -0500
Subject: rpms/drivel/FC-4 drivel-2.0.2-desktop.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 drivel.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512261706.jBQH66DU005141@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/drivel/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5068/FC-4

Modified Files:
	.cvsignore drivel.spec sources 
Added Files:
	drivel-2.0.2-desktop.patch 
Log Message:
Update to 2.0.2, add trivial patch for .desktop file

drivel-2.0.2-desktop.patch:

--- NEW FILE drivel-2.0.2-desktop.patch ---
diff -uNr drivel-2.0.2-orig/data/gnome-drivel.desktop.in drivel-2.0.2/data/gnome-drivel.desktop.in
--- drivel-2.0.2-orig/data/gnome-drivel.desktop.in	2005-06-13 20:34:38.000000000 -0400
+++ drivel-2.0.2/data/gnome-drivel.desktop.in	2005-12-26 11:11:34.000000000 -0500
@@ -4,7 +4,7 @@
 _GenericName=Journal Editor
 _Comment=Update and manage your online journal
 Exec=drivel %U
-Terminal=False
+Terminal=false
 Type=Application
 Icon=drivel-48.png
 MimeType=application/x-drivel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jun 2005 21:07:57 -0000	1.2
+++ .cvsignore	26 Dec 2005 17:05:00 -0000	1.3
@@ -1 +1 @@
-drivel-2.0.0.tar.bz2
+drivel-2.0.2.tar.bz2


Index: drivel.spec
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-4/drivel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drivel.spec	13 Jun 2005 00:09:29 -0000	1.2
+++ drivel.spec	26 Dec 2005 17:05:01 -0000	1.3
@@ -1,11 +1,12 @@
 Summary: A journal or "blog" client
 Name: drivel
-Version: 2.0.0
-Release: 3%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 Url: http://www.dropline.net/drivel
 Source: %{name}-%{version}.tar.bz2
+Patch0:	drivel-2.0.2-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: scrollkeeper
 BuildRequires: gtkspell-devel 
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-schemas-install --disable-mime-update --disable-desktop-update --with-curl-libraries=%{_libdir}
@@ -110,6 +112,9 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Dec 26 2005 Paul W. Frields  - 2.0.2-1
+- Update to 2.0.2
+
 * Sun Jun 12 2005 Jeremy Katz  2.0.0-3
 - gconf schema removal, BR gettext, add Fedora category to the desktop file 
   (noticed by mschwendt)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jun 2005 21:07:57 -0000	1.2
+++ sources	26 Dec 2005 17:05:01 -0000	1.3
@@ -1 +1 @@
-38c866e10909d123bb20c6fb4a852ba7  drivel-2.0.0.tar.bz2
+b77d376946ab32f0f8992c5e0baf1f51  drivel-2.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 26 21:14:33 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 26 Dec 2005 16:14:33 -0500
Subject: rpms/celestia/devel celestia.spec,1.8,1.9
Message-ID: <200512262115.jBQLF5TB012820@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12800

Modified Files:
	celestia.spec 
Log Message:
Update to 1.4.0.
BR libGL-devel instead of xorg-x11-Mesa-libGL.



Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- celestia.spec	22 May 2005 23:42:44 -0000	1.8
+++ celestia.spec	26 Dec 2005 21:14:32 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           celestia
-Version:        1.3.2
-Release: 4
+Version:        1.4.0
+Release:        1%{?dist}
 
 Summary:        OpenGL real-time visual space simulation
 
 Group:          Amusements/Graphics
 License:        GPL
-Source0:        http://dl.sf.net/celestia/celestia-1.3.2.tar.gz
+Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
 Source3:        celestia.desktop
 Patch0:         %{name}-1.3.2-compile.patch
 URL:            http://www.shatters.net/celestia/
@@ -18,7 +18,7 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  xorg-x11-Mesa-libGL
+BuildRequires:  libGL-devel
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -93,6 +93,12 @@
 
 
 %changelog
+* Mon Dec 26 2005 Steven Pritchard  1.4.0-1
+- Update to 1.4.0
+
+* Sat Dec 03 2005 Steven Pritchard  1.3.2-5
+- BR libGL-devel instead of xorg-x11-Mesa-libGL
+
 * Sun May 22 2005 Jeremy Katz  - 1.3.2-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Mon Dec 26 22:42:18 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 26 Dec 2005 17:42:18 -0500
Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.28,1.29
Message-ID: <200512262242.jBQMgoq2014599@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14582

Modified Files:
	sylpheed-claws.spec 
Log Message:
- fix s/rc1/rc2/



Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sylpheed-claws.spec	25 Dec 2005 09:26:51 -0000	1.28
+++ sylpheed-claws.spec	26 Dec 2005 22:42:18 -0000	1.29
@@ -47,7 +47,7 @@
 for development with %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc2
 
 %build
 #%if %openssl_pc



From fedora-extras-commits at redhat.com  Mon Dec 26 22:50:49 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 26 Dec 2005 17:50:49 -0500
Subject: rpms/celestia/devel .cvsignore, 1.3, 1.4 celestia.spec, 1.9,
	1.10 sources, 1.3, 1.4 celestia-1.3.2-compile.patch, 1.1, NONE
Message-ID: <200512262251.jBQMpLXW014702@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14677

Modified Files:
	.cvsignore celestia.spec sources 
Removed Files:
	celestia-1.3.2-compile.patch 
Log Message:
Update to 1.4.0.
Remove celestia-1.3.2-compile.patch (seems to be applied upstream).
Use find_lang magic.
Remove duplicate desktop file.
Fix Help -> Controls.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:09:26 -0000	1.3
+++ .cvsignore	26 Dec 2005 22:50:48 -0000	1.4
@@ -1 +1 @@
-celestia-1.3.2.tar.gz
+celestia-1.4.0.tar.gz


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- celestia.spec	26 Dec 2005 21:14:32 -0000	1.9
+++ celestia.spec	26 Dec 2005 22:50:48 -0000	1.10
@@ -8,7 +8,6 @@
 License:        GPL
 Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
 Source3:        celestia.desktop
-Patch0:         %{name}-1.3.2-compile.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p6 -b .orig
 
 
 %build
@@ -56,8 +54,11 @@
 install -p -m 644 -D src/celestia/kde/data/hi48-app-celestia.png \
   $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 $RPM_BUILD_ROOT%{_datadir}/applications/celestia.desktop
+
 desktop-file-install \
   --vendor fedora                                          \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
@@ -66,6 +67,8 @@
   --add-category Graphics                                  \
   %{SOURCE3}
 
+%find_lang %{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,7 +85,7 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO controls.txt manual/*.html manual/*.css
 %{_bindir}/*
@@ -95,6 +98,10 @@
 %changelog
 * Mon Dec 26 2005 Steven Pritchard  1.4.0-1
 - Update to 1.4.0
+- Remove celestia-1.3.2-compile.patch (seems to be applied upstream)
+- Use find_lang magic
+- Remove duplicate desktop file
+- Fix Help -> Controls
 
 * Sat Dec 03 2005 Steven Pritchard  1.3.2-5
 - BR libGL-devel instead of xorg-x11-Mesa-libGL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:09:26 -0000	1.3
+++ sources	26 Dec 2005 22:50:48 -0000	1.4
@@ -1 +1 @@
-0aaf86592a8989a0576e34c1f4cb3c2a  celestia-1.3.2.tar.gz
+d4bd0029af87fdd9cb4a0828cf62a025  celestia-1.4.0.tar.gz


--- celestia-1.3.2-compile.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Dec 26 23:49:11 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 26 Dec 2005 18:49:11 -0500
Subject: rpms/tetex-xcolor/FC-3 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tetex-xcolor.spec, 1.7, 1.8
Message-ID: <200512262349.jBQNniiv016552@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/tetex-xcolor/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16511

Modified Files:
	.cvsignore sources tetex-xcolor.spec 
Log Message:
Update to 2.09.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Nov 2005 16:47:29 -0000	1.8
+++ .cvsignore	26 Dec 2005 23:49:10 -0000	1.9
@@ -1 +1 @@
-xcolor-2.08.zip
+xcolor-2.09.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Nov 2005 16:47:29 -0000	1.8
+++ sources	26 Dec 2005 23:49:10 -0000	1.9
@@ -1 +1 @@
-a3ad5e01a15ad79fe742b1adfbad91df  xcolor-2.08.zip
+57ef23fa778f2ae6e22f773bcb21ea5d  xcolor-2.09.zip


Index: tetex-xcolor.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-xcolor/FC-3/tetex-xcolor.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tetex-xcolor.spec	30 Nov 2005 16:47:29 -0000	1.7
+++ tetex-xcolor.spec	26 Dec 2005 23:49:10 -0000	1.8
@@ -5,7 +5,7 @@
 %define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        2.08
+Version:        2.09
 Release:        1%{?dist}
 Summary:        Driver-independent color extensions for LaTeX and pdfLaTeX
 
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Mon Dec 26 2005 Jose Pedro Oliveira  - 2.09-1
+- Update to 2.09.
+
 * Wed Nov 30 2005 Jose Pedro Oliveira  - 2.08-1
 - Update to 2.08.
 



From fedora-extras-commits at redhat.com  Mon Dec 26 23:49:29 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 26 Dec 2005 18:49:29 -0500
Subject: rpms/python-reportlab/devel python-reportlab.spec,1.7,1.8
Message-ID: <200512262350.jBQNo1gD016558@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-reportlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16536

Modified Files:
	python-reportlab.spec 
Log Message:
* Mon Dec 26 2005 Brian Pepple  - 1.20-4
- Add dist tag. (#176479)



Index: python-reportlab.spec
===================================================================
RCS file: /cvs/extras/rpms/python-reportlab/devel/python-reportlab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-reportlab.spec	9 May 2005 16:49:18 -0000	1.7
+++ python-reportlab.spec	26 Dec 2005 23:49:29 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:		python-reportlab
 Version:	1.20
-Release:	3.fc4
+Release:	4%{?dist}
 Summary:	Python PDF generation library
 
 Group:		Development/Libraries
@@ -46,10 +46,14 @@
 %files
 %defattr(-,root,root,-)
 %doc reportlab/README reportlab/changes reportlab/license.txt
-%{python_sitelib}/*
+%dir %{python_sitelib}/reportlab
+%{python_sitelib}/reportlab/
 
 
 %changelog
+* Mon Dec 26 2005 Brian Pepple  - 1.20-4
+- Add dist tag. (#176479)
+
 * Mon May  9 2005 Brian Pepple  - 1.20-3.fc4
 - Switchback to sitelib patch.
 - Make package noarch.



From fedora-extras-commits at redhat.com  Mon Dec 26 23:51:51 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 26 Dec 2005 18:51:51 -0500
Subject: rpms/celestia/FC-4 .cvsignore, 1.3, 1.4 celestia.spec, 1.8,
	1.9 sources, 1.3, 1.4 celestia-1.3.2-compile.patch, 1.1, NONE
Message-ID: <200512262352.jBQNqOLD016681@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16655

Modified Files:
	.cvsignore celestia.spec sources 
Removed Files:
	celestia-1.3.2-compile.patch 
Log Message:
Update to 1.4.0.
Remove celestia-1.3.2-compile.patch (seems to be applied upstream).
Use find_lang magic.
Remove duplicate desktop file.
Fix Help -> Controls.
BR libGL-devel instead of xorg-x11-Mesa-libGL.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:09:26 -0000	1.3
+++ .cvsignore	26 Dec 2005 23:51:51 -0000	1.4
@@ -1 +1 @@
-celestia-1.3.2.tar.gz
+celestia-1.4.0.tar.gz


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-4/celestia.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- celestia.spec	22 May 2005 23:42:44 -0000	1.8
+++ celestia.spec	26 Dec 2005 23:51:51 -0000	1.9
@@ -1,14 +1,13 @@
 Name:           celestia
-Version:        1.3.2
-Release: 4
+Version:        1.4.0
+Release:        1%{?dist}
 
 Summary:        OpenGL real-time visual space simulation
 
 Group:          Amusements/Graphics
 License:        GPL
-Source0:        http://dl.sf.net/celestia/celestia-1.3.2.tar.gz
+Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
 Source3:        celestia.desktop
-Patch0:         %{name}-1.3.2-compile.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,7 +17,7 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  xorg-x11-Mesa-libGL
+BuildRequires:  libGL-devel
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -38,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p6 -b .orig
 
 
 %build
@@ -56,8 +54,11 @@
 install -p -m 644 -D src/celestia/kde/data/hi48-app-celestia.png \
   $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 $RPM_BUILD_ROOT%{_datadir}/applications/celestia.desktop
+
 desktop-file-install \
   --vendor fedora                                          \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
@@ -66,6 +67,8 @@
   --add-category Graphics                                  \
   %{SOURCE3}
 
+%find_lang %{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,7 +85,7 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO controls.txt manual/*.html manual/*.css
 %{_bindir}/*
@@ -93,6 +96,16 @@
 
 
 %changelog
+* Mon Dec 26 2005 Steven Pritchard  1.4.0-1
+- Update to 1.4.0
+- Remove celestia-1.3.2-compile.patch (seems to be applied upstream)
+- Use find_lang magic
+- Remove duplicate desktop file
+- Fix Help -> Controls
+
+* Sat Dec 03 2005 Steven Pritchard  1.3.2-5
+- BR libGL-devel instead of xorg-x11-Mesa-libGL
+
 * Sun May 22 2005 Jeremy Katz  - 1.3.2-4
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:09:26 -0000	1.3
+++ sources	26 Dec 2005 23:51:51 -0000	1.4
@@ -1 +1 @@
-0aaf86592a8989a0576e34c1f4cb3c2a  celestia-1.3.2.tar.gz
+d4bd0029af87fdd9cb4a0828cf62a025  celestia-1.4.0.tar.gz


--- celestia-1.3.2-compile.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 27 01:17:47 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 26 Dec 2005 20:17:47 -0500
Subject: rpms/loudmouth/devel loudmouth.spec,1.8,1.9
Message-ID: <200512270118.jBR1IJwS020175@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/loudmouth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20158

Modified Files:
	loudmouth.spec 
Log Message:
* Mon Dec 26 2005 Brian Pepple  - 1.0.1-4
- Rebuild.



Index: loudmouth.spec
===================================================================
RCS file: /cvs/extras/rpms/loudmouth/devel/loudmouth.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- loudmouth.spec	31 Aug 2005 19:30:38 -0000	1.8
+++ loudmouth.spec	27 Dec 2005 01:17:46 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           loudmouth
 Version:        1.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Loudmouth is a Jabber programming library written in C
 
 Group:          System Environment/Libraries
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Mon Dec 26 2005 Brian Pepple  - 1.0.1-4
+- Rebuild.
+
 * Wed Aug 31 2005 Brian Pepple  - 1.0.1-3
 - Update to 1.0.1.
 



From fedora-extras-commits at redhat.com  Tue Dec 27 01:31:09 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 26 Dec 2005 20:31:09 -0500
Subject: rpms/gossip/devel gossip.spec,1.9,1.10
Message-ID: <200512270131.jBR1Vf08020447@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gossip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20430

Modified Files:
	gossip.spec 
Log Message:
* Mon Dec 26 2005 Brian Pepple  - 0.9-8
- Rebuild for new loudmouth.



Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gossip.spec	5 Dec 2005 21:24:31 -0000	1.9
+++ gossip.spec	27 Dec 2005 01:31:08 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           gossip
 Version:        0.9
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Gnome Jabber Client
 
 Group:          Applications/Communications
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Mon Dec 26 2005 Brian Pepple  - 0.9-8
+- Rebuild for new loudmouth.
+
 * Mon Dec  5 2005 Brian Pepple  - 0.9-7
 - Add BR for libXScrnSaver-devel, libXt-devel & xorg-x11-proto-devel.
 



From fedora-extras-commits at redhat.com  Tue Dec 27 03:11:12 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 26 Dec 2005 22:11:12 -0500
Subject: rpms/ddskk/devel ddskk.spec,1.2,1.3
Message-ID: <200512270311.jBR3BjI1024048@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ddskk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24027

Modified Files:
	ddskk.spec 
Log Message:
add missing % for defattr of xemacs filelist



Index: ddskk.spec
===================================================================
RCS file: /cvs/extras/rpms/ddskk/devel/ddskk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ddskk.spec	16 Nov 2005 02:52:16 -0000	1.2
+++ ddskk.spec	27 Dec 2005 03:11:10 -0000	1.3
@@ -90,7 +90,7 @@
 %{_infodir}/*
 
 %files xemacs
-defattr(-,root,root)
+%defattr(-,root,root)
 %doc ChangeLog READMEs
 %{pkgdir}
 



From fedora-extras-commits at redhat.com  Tue Dec 27 03:16:11 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 26 Dec 2005 22:16:11 -0500
Subject: rpms/scim-fcitx/devel scim-fcitx.spec,1.1,1.2
Message-ID: <200512270316.jBR3GiQe024146@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24127

Modified Files:
	scim-fcitx.spec 
Log Message:
try to build without _smp_mflags to see if that fixes:
"make[2]: *** No rule to make target `pyphrase.mb', needed by `all-am'.  Stop."



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/devel/scim-fcitx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-fcitx.spec	20 Dec 2005 03:16:48 -0000	1.1
+++ scim-fcitx.spec	27 Dec 2005 03:16:11 -0000	1.2
@@ -31,7 +31,8 @@
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+# doesn't build with %{?_smp_mflags}
+make
 
 
 %install



From fedora-extras-commits at redhat.com  Tue Dec 27 03:25:33 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 26 Dec 2005 22:25:33 -0500
Subject: rpms/ddskk/FC-4 ddskk.spec,1.1,1.2
Message-ID: <200512270326.jBR3Q5kS024211@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ddskk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24189

Modified Files:
	ddskk.spec 
Log Message:
sync with devel branch
- require and buildrequire apel version 10.6
- fix xemacs filelist defattr



Index: ddskk.spec
===================================================================
RCS file: /cvs/extras/rpms/ddskk/FC-4/ddskk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ddskk.spec	13 Jul 2005 09:30:45 -0000	1.1
+++ ddskk.spec	27 Dec 2005 03:25:33 -0000	1.2
@@ -1,12 +1,12 @@
 # [for Emacs] -*- coding: utf-8 -*-
 
-%define	apelminver	10.2
+%define	apelminver	10.6
 %define	pkgdir %{_datadir}/xemacs/mule-packages
 
 Summary: Daredevil SKK - Simple Kana to Kanji conversion program for Emacs
 Name: ddskk
 Version: 12.2.0
-Release: 6
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://openlab.ring.gr.jp/skk/main.html
@@ -90,11 +90,14 @@
 %{_infodir}/*
 
 %files xemacs
-defattr(-,root,root)
+%defattr(-,root,root)
 %doc ChangeLog READMEs
 %{pkgdir}
 
 %changelog
+* Wed Nov 16 2005 Jens Petersen  - 12.2.0-7
+- require and buildrequire apel version 10.6
+
 * Wed Jul 13 2005 Jens Petersen  - 12.2.0-6
 - initial import to Fedora Extras
 - bring back the xemacs subpackages



From fedora-extras-commits at redhat.com  Tue Dec 27 03:39:18 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 26 Dec 2005 22:39:18 -0500
Subject: rpms/scim-fcitx/FC-4 scim-fcitx.spec,1.1,1.2
Message-ID: <200512270339.jBR3doxg024283@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24266

Modified Files:
	scim-fcitx.spec 
Log Message:
don't build with _smp_mflags to fix multi-cpu build problem



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/FC-4/scim-fcitx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-fcitx.spec	20 Dec 2005 03:16:48 -0000	1.1
+++ scim-fcitx.spec	27 Dec 2005 03:39:17 -0000	1.2
@@ -31,7 +31,8 @@
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+# doesn't build with %{?_smp_mflags}
+make
 
 
 %install



From fedora-extras-commits at redhat.com  Tue Dec 27 04:35:14 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 26 Dec 2005 23:35:14 -0500
Subject: rpms/scim-fcitx/FC-3 scim-fcitx.spec,1.1,1.2
Message-ID: <200512270435.jBR4Zkid026100@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26080

Modified Files:
	scim-fcitx.spec 
Log Message:
sync with fc-4
- don't build with smp flags



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/FC-3/scim-fcitx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-fcitx.spec	20 Dec 2005 03:16:48 -0000	1.1
+++ scim-fcitx.spec	27 Dec 2005 04:35:13 -0000	1.2
@@ -31,7 +31,8 @@
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+# doesn't build with %{?_smp_mflags}
+make
 
 
 %install



From fedora-extras-commits at redhat.com  Tue Dec 27 04:50:33 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 26 Dec 2005 23:50:33 -0500
Subject: rpms/uim/devel .cvsignore, 1.12, 1.13 sources, 1.11, 1.12 uim.spec, 
	1.24, 1.25
Message-ID: <200512270451.jBR4p57c026201@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26180

Modified Files:
	.cvsignore sources uim.spec 
Log Message:
* Tue Dec 27 2005 Akira TAGOH  - 1.0.1-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	16 Dec 2005 11:03:20 -0000	1.12
+++ .cvsignore	27 Dec 2005 04:50:32 -0000	1.13
@@ -11,3 +11,4 @@
 uim-0.4.9.1.tar.gz
 uim-1.0.0-alpha.tar.gz
 uim-1.0.0-beta.tar.gz
+uim-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	16 Dec 2005 11:03:20 -0000	1.11
+++ sources	27 Dec 2005 04:50:32 -0000	1.12
@@ -1 +1 @@
-c68b7a8544551bd5b65df03dcb46d9e3  uim-1.0.0-beta.tar.gz
+1de96cb9ca0c570c0d04678a95f9c75a  uim-1.0.1.tar.gz


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- uim.spec	16 Dec 2005 11:03:20 -0000	1.24
+++ uim.spec	27 Dec 2005 04:50:32 -0000	1.25
@@ -3,8 +3,8 @@
 %define uninst_xinput for llcc in %{uim_locale}; do alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim ; done
 
 Name:		uim
-Version:	1.0.0
-Release:	0.2.beta%{?dist}
+Version:	1.0.1
+Release:	1%{?dist}
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,7 +12,7 @@
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
 BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
 BuildRequires:	emacs
-Source0:	http://uim.freedesktop.org/release/%{name}-%{version}-beta.tar.gz
+Source0:	http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz
 Source1:	xinput.d-uim
 Source2:	uim-init.el
 
@@ -153,7 +153,7 @@
 %define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules )
 
 %prep
-%setup -q -n %{name}-%{version}-beta
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -343,6 +343,9 @@
 %{_datadir}/uim/m17nlib.scm
 
 %changelog
+* Tue Dec 27 2005 Akira TAGOH  - 1.0.1-1
+- New upstream release.
+
 * Fri Dec 16 2005 Akira TAGOH  - 1.0.0-0.2.beta
 - updates to 1.0.0-beta.
 



From fedora-extras-commits at redhat.com  Tue Dec 27 04:55:18 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 26 Dec 2005 23:55:18 -0500
Subject: rpms/darcs/FC-4 darcs.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200512270455.jBR4tpuO026252@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/darcs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26225

Modified Files:
	darcs.spec sources 
Log Message:
update to 1.0.5



Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/FC-4/darcs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- darcs.spec	17 Nov 2005 07:27:02 -0000	1.6
+++ darcs.spec	27 Dec 2005 04:55:18 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           darcs
-Version:        1.0.4
+Version:        1.0.5
 Release:        1%{?dist}
 Summary:        David's advanced revision control system
 
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Thu Dec  8 2005 Jens Petersen  - 1.0.5-1
+- 1.0.5 bugfix release
+
 * Mon Nov 14 2005 Jens Petersen  - 1.0.4-1
 - 1.0.4 release
   - skip tests/send.sh for now since it is failing in buildsystem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/darcs/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Nov 2005 07:03:41 -0000	1.3
+++ sources	27 Dec 2005 04:55:18 -0000	1.4
@@ -1 +1 @@
-0be693b00e4b1bd24906d4f479e78923  darcs-1.0.4.tar.gz
+9a9a4f84ed5b6258f7ab321713adf20b  darcs-1.0.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 05:44:01 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 27 Dec 2005 00:44:01 -0500
Subject: rpms/darcs/FC-3 darcs.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200512270544.jBR5iXNx028630@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/darcs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28611

Modified Files:
	darcs.spec sources 
Log Message:
1.0.5 bugfix release



Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/FC-3/darcs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- darcs.spec	17 Nov 2005 07:29:56 -0000	1.4
+++ darcs.spec	27 Dec 2005 05:44:01 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           darcs
-Version:        1.0.4
+Version:        1.0.5
 Release:        1%{?dist}
 Summary:        David's advanced revision control system
 
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Thu Dec  8 2005 Jens Petersen  - 1.0.5-1
+- 1.0.5 bugfix release
+
 * Mon Nov 14 2005 Jens Petersen  - 1.0.4-1
 - 1.0.4 release
   - skip tests/send.sh for now since it is failing in buildsystem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/darcs/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Nov 2005 07:29:56 -0000	1.3
+++ sources	27 Dec 2005 05:44:01 -0000	1.4
@@ -1 +1 @@
-0be693b00e4b1bd24906d4f479e78923  darcs-1.0.4.tar.gz
+9a9a4f84ed5b6258f7ab321713adf20b  darcs-1.0.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 06:39:00 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 27 Dec 2005 01:39:00 -0500
Subject: rpms/scim-tables/FC-4 .cvsignore, 1.4, 1.5 scim-tables.spec, 1.13, 
	1.14 sources, 1.4, 1.5
Message-ID: <200512270639.jBR6dWWi030421@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-tables/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30400

Modified Files:
	.cvsignore scim-tables.spec sources 
Log Message:
sync with FC package:
- update to 0.5.5
  - update filelists
- remove the Japanese and Korean tables and subpackages with
  tables-skip-ja-ko.patch and %%{jk_tables}



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Nov 2005 13:53:44 -0000	1.4
+++ .cvsignore	27 Dec 2005 06:38:59 -0000	1.5
@@ -1 +1 @@
-scim-tables-0.5.4.tar.gz
+scim-tables-0.5.5.tar.gz


Index: scim-tables.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- scim-tables.spec	2 Nov 2005 14:43:22 -0000	1.13
+++ scim-tables.spec	27 Dec 2005 06:38:59 -0000	1.14
@@ -1,6 +1,9 @@
+# set to include Japanese and Korean tables
+%define jk_tables 0
+
 Name:		scim-tables
-Version:	0.5.4
-Release:	2%{?dist}
+Version:	0.5.5
+Release:	1%{?dist}
 Summary:	SCIM Generic Table IMEngine
 
 License:	GPL
@@ -12,6 +15,7 @@
 BuildRequires:	scim-devel, gtk2-devel
 BuildRequires:	gettext-devel
 Requires:	scim
+Patch1:		tables-skip-ja-ko.patch
 
 %description
 This package contains the Generic Table IMEngine for SCIM.
@@ -65,6 +69,7 @@
 %description hindi
 This package contains scim-tables files for Hindi input.
 
+%if %{jk_tables}
 %package japanese
 Summary:	SCIM tables for Japanese
 Group:		System Environment/Libraries
@@ -73,6 +78,7 @@
 
 %description japanese
 This package contains scim-tables files for Japanese.
+%endif
 
 %package kannada
 Summary:	SCIM tables for Kannada
@@ -82,6 +88,7 @@
 %description kannada
 This package contains scim-tables files for Kannada input.
 
+%if %{jk_tables}
 %package korean
 Summary:	SCIM tables for Korean
 Group:		System Environment/Libraries
@@ -90,6 +97,7 @@
 
 %description korean
 This package contains scim-tables files for Korean.
+%endif
 
 %package malayalam
 Summary:	SCIM tables for Malayalam scripts
@@ -167,6 +175,13 @@
 %prep
 %setup -q
 
+%if !%{jk_tables}
+%patch1 -p1 -b -1.JK
+# patch1 touches a Makefile.am file
+autoreconf
+%endif
+
+
 %build
 %configure --disable-static
 make  %{?_smp_mflags}
@@ -179,7 +194,6 @@
 # kill *.a and *.la files
 rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.la
 
-
 %find_lang %{name}
 
 
@@ -199,6 +213,7 @@
 %{_libdir}/scim-1.0/IMEngine/table.so
 %{_libdir}/scim-1.0/SetupUI/table-imengine-setup.so
 %{_datadir}/scim/icons/table.png
+%{_mandir}/man1/scim-make-table.1*
 
 
 %files amharic
@@ -226,17 +241,16 @@
 
 %files chinese
 %defattr(-, root, root, -)
-%doc tables/zh/README-Erbi.txt tables/zh/README-CangJie.txt
+%doc tables/zh/README-*.txt
 %dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Array30.bin
-%{_datadir}/scim/tables/CangJie.bin
-%{_datadir}/scim/tables/CangJie3.bin
+%{_datadir}/scim/tables/CangJie*.bin
 %{_datadir}/scim/tables/Cantonese.bin
 %{_datadir}/scim/tables/CantonHK.bin
 %{_datadir}/scim/tables/Dayi3.bin
+%{_datadir}/scim/tables/EZ*.bin
 %{_datadir}/scim/tables/Erbi.bin
 %{_datadir}/scim/tables/Erbi-QS.bin
-%{_datadir}/scim/tables/EZ.bin
 %{_datadir}/scim/tables/Jyutping.bin
 %{_datadir}/scim/tables/Quick.bin
 %{_datadir}/scim/tables/Simplex.bin
@@ -246,14 +260,13 @@
 %{_datadir}/scim/tables/Ziranma.bin
 %{_datadir}/scim/tables/ZhuYin.bin
 %{_datadir}/scim/icons/Array30.png
-%{_datadir}/scim/icons/CangJie.png
-%{_datadir}/scim/icons/CangJie3.png
+%{_datadir}/scim/icons/CangJie*.png
 %{_datadir}/scim/icons/Cantonese.png
 %{_datadir}/scim/icons/CantonHK.png
 %{_datadir}/scim/icons/Dayi.png
+%{_datadir}/scim/icons/EZ*.png
 %{_datadir}/scim/icons/Erbi.png
 %{_datadir}/scim/icons/Erbi-QS.png
-%{_datadir}/scim/icons/EZ.png
 %{_datadir}/scim/icons/Jyutping.png
 %{_datadir}/scim/icons/Quick.png
 %{_datadir}/scim/icons/Simplex.png
@@ -282,9 +295,10 @@
 %{_datadir}/scim/icons/Hindi-phonetic.png
 
 
+%if %{jk_tables}
 %files japanese
 %defattr(-, root, root, -)
-%doc tables/ja/kanjidic_licence.html tables/ja/kanjidic_doc.html
+%doc tables/ja/kanjidic*
 %dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/HIRAGANA.bin
 %{_datadir}/scim/tables/KATAKANA.bin
@@ -292,6 +306,7 @@
 %{_datadir}/scim/icons/HIRAGANA.png
 %{_datadir}/scim/icons/KATAKANA.png
 %{_datadir}/scim/icons/Nippon.png
+%endif
 
 
 %files kannada
@@ -303,6 +318,7 @@
 %{_datadir}/scim/icons/Kannada-kgp.png
 
 
+%if %{jk_tables}
 %files korean
 %defattr(-, root, root, -)
 %dir %{_datadir}/scim/tables
@@ -311,6 +327,7 @@
 %{_datadir}/scim/tables/Hanja.bin
 %{_datadir}/scim/icons/Hangul.png
 %{_datadir}/scim/icons/Hanja.png
+%endif
 
 
 %files malayalam
@@ -385,6 +402,12 @@
 
 
 %changelog
+* Mon Dec 26 2005 Jens Petersen  - 0.5.5-1%{?dist}
+- update to 0.5.5
+  - update filelists
+- remove the Japanese and Korean tables and subpackages with
+  tables-skip-ja-ko.patch and %%{jk_tables}
+
 * Wed Dec 1 2005 Ryo Dairiki  - 0.6.0-1%{?dist}
 - update to 0.5.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Nov 2005 13:53:44 -0000	1.4
+++ sources	27 Dec 2005 06:38:59 -0000	1.5
@@ -1 +1 @@
-69ce8f1945ba2ab4bf820386e76c2cd9  scim-tables-0.5.4.tar.gz
+15da0323195dea92690d4b391665b95a  scim-tables-0.5.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 06:42:08 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 27 Dec 2005 01:42:08 -0500
Subject: rpms/scim-tables/FC-4 tables-skip-ja-ko.patch,NONE,1.1
Message-ID: <200512270642.jBR6gAZS030482@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-tables/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30470

Added Files:
	tables-skip-ja-ko.patch 
Log Message:
add tables-skip-ja-ko.patch



tables-skip-ja-ko.patch:

--- NEW FILE tables-skip-ja-ko.patch ---
--- scim-tables-0.5.5/configure.ac~	2005-12-05 15:37:12.000000000 +0900
+++ scim-tables-0.5.5/configure.ac	2005-12-26 17:02:55.000000000 +0900
@@ -126,14 +126,6 @@
 		 tables/zh/Wubi.txt
 		 tables/zh/Ziranma.txt
 		 tables/zh/ZhuYin.txt
-		 tables/ja/Makefile
-		 tables/ja/HIRAGANA.txt
-		 tables/ja/KATAKANA.txt
-		 tables/ja/Nippon.txt
-		 tables/ko/Makefile
-		 tables/ko/Hangul.txt
-		 tables/ko/HangulRomaja.txt
-		 tables/ko/Hanja.txt
 		 tables/bn/Makefile
 		 tables/bn/Bengali-inscript.txt
 		 tables/bn/Bengali-probhat.txt
--- scim-tables-0.5.5/icons/Makefile.am~	2005-10-12 19:56:43.000000000 +0900
+++ scim-tables-0.5.5/icons/Makefile.am	2005-12-26 17:05:09.000000000 +0900
@@ -35,19 +35,14 @@
 			  EZ.png        \
 			  Gujarati-inscript.png	\
 			  Gujarati-phonetic.png	\
-			  Hangul.png    \
-			  Hanja.png     \
 			  Hindi-inscript.png	\
 			  Hindi-phonetic.png	\
-			  HIRAGANA.png  \
 			  Jyutping.png  \
-			  KATAKANA.png  \
 			  Kannada-inscript.png	\
 			  Kannada-kgp.png	\
 			  LaTeX.png     \
 			  Malayalam-inscript.png	\
 			  Nepali.png    \
-			  Nippon.png    \
 			  Punjabi-inscript.png	\
 			  Punjabi-jhelum.png	\
 			  Punjabi-phonetic.png	\
--- scim-tables-0.5.5/tables/Makefile.am~	2005-10-30 02:00:15.000000000 +0900
+++ scim-tables-0.5.5/tables/Makefile.am	2005-12-26 16:52:09.000000000 +0900
@@ -18,5 +18,5 @@
 MAINTAINERCLEANFILES 	= Makefile.in
 CLEANFILES		= *.bak 
 
-SUBDIRS 		= additional am ar bn gu hi ja kn ko ml ne pa ru ta te th vi zh
+SUBDIRS 		= additional am ar bn gu hi kn ml ne pa ru ta te th vi zh
 



From fedora-extras-commits at redhat.com  Tue Dec 27 06:44:57 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 27 Dec 2005 01:44:57 -0500
Subject: rpms/scim-tables/FC-3 tables-skip-ja-ko.patch, NONE,
	1.1 scim-tables.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <200512270645.jBR6jTal030557@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-tables/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30533

Modified Files:
	scim-tables.spec sources 
Added Files:
	tables-skip-ja-ko.patch 
Log Message:
sync with Core:
- update to 0.5.5
  - update filelists
- remove the Japanese and Korean tables and subpackages with
  tables-skip-ja-ko.patch and %%{jk_tables}


tables-skip-ja-ko.patch:

--- NEW FILE tables-skip-ja-ko.patch ---
--- scim-tables-0.5.5/configure.ac~	2005-12-05 15:37:12.000000000 +0900
+++ scim-tables-0.5.5/configure.ac	2005-12-26 17:02:55.000000000 +0900
@@ -126,14 +126,6 @@
 		 tables/zh/Wubi.txt
 		 tables/zh/Ziranma.txt
 		 tables/zh/ZhuYin.txt
-		 tables/ja/Makefile
-		 tables/ja/HIRAGANA.txt
-		 tables/ja/KATAKANA.txt
-		 tables/ja/Nippon.txt
-		 tables/ko/Makefile
-		 tables/ko/Hangul.txt
-		 tables/ko/HangulRomaja.txt
-		 tables/ko/Hanja.txt
 		 tables/bn/Makefile
 		 tables/bn/Bengali-inscript.txt
 		 tables/bn/Bengali-probhat.txt
--- scim-tables-0.5.5/icons/Makefile.am~	2005-10-12 19:56:43.000000000 +0900
+++ scim-tables-0.5.5/icons/Makefile.am	2005-12-26 17:05:09.000000000 +0900
@@ -35,19 +35,14 @@
 			  EZ.png        \
 			  Gujarati-inscript.png	\
 			  Gujarati-phonetic.png	\
-			  Hangul.png    \
-			  Hanja.png     \
 			  Hindi-inscript.png	\
 			  Hindi-phonetic.png	\
-			  HIRAGANA.png  \
 			  Jyutping.png  \
-			  KATAKANA.png  \
 			  Kannada-inscript.png	\
 			  Kannada-kgp.png	\
 			  LaTeX.png     \
 			  Malayalam-inscript.png	\
 			  Nepali.png    \
-			  Nippon.png    \
 			  Punjabi-inscript.png	\
 			  Punjabi-jhelum.png	\
 			  Punjabi-phonetic.png	\
--- scim-tables-0.5.5/tables/Makefile.am~	2005-10-30 02:00:15.000000000 +0900
+++ scim-tables-0.5.5/tables/Makefile.am	2005-12-26 16:52:09.000000000 +0900
@@ -18,5 +18,5 @@
 MAINTAINERCLEANFILES 	= Makefile.in
 CLEANFILES		= *.bak 
 
-SUBDIRS 		= additional am ar bn gu hi ja kn ko ml ne pa ru ta te th vi zh
+SUBDIRS 		= additional am ar bn gu hi kn ml ne pa ru ta te th vi zh
 


Index: scim-tables.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-3/scim-tables.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scim-tables.spec	2 Nov 2005 14:37:28 -0000	1.9
+++ scim-tables.spec	27 Dec 2005 06:44:56 -0000	1.10
@@ -1,6 +1,9 @@
+# set to include Japanese and Korean tables
+%define jk_tables 0
+
 Name:		scim-tables
-Version:	0.5.4
-Release:	2%{?dist}
+Version:	0.5.5
+Release:	1%{?dist}
 Summary:	SCIM Generic Table IMEngine
 
 License:	GPL
@@ -12,6 +15,7 @@
 BuildRequires:	scim-devel, gtk2-devel
 BuildRequires:	gettext-devel
 Requires:	scim
+Patch1:		tables-skip-ja-ko.patch
 
 %description
 This package contains the Generic Table IMEngine for SCIM.
@@ -65,6 +69,7 @@
 %description hindi
 This package contains scim-tables files for Hindi input.
 
+%if %{jk_tables}
 %package japanese
 Summary:	SCIM tables for Japanese
 Group:		System Environment/Libraries
@@ -73,6 +78,7 @@
 
 %description japanese
 This package contains scim-tables files for Japanese.
+%endif
 
 %package kannada
 Summary:	SCIM tables for Kannada
@@ -82,6 +88,7 @@
 %description kannada
 This package contains scim-tables files for Kannada input.
 
+%if %{jk_tables}
 %package korean
 Summary:	SCIM tables for Korean
 Group:		System Environment/Libraries
@@ -90,6 +97,7 @@
 
 %description korean
 This package contains scim-tables files for Korean.
+%endif
 
 %package malayalam
 Summary:	SCIM tables for Malayalam scripts
@@ -167,6 +175,13 @@
 %prep
 %setup -q
 
+%if !%{jk_tables}
+%patch1 -p1 -b -1.JK
+# patch1 touches a Makefile.am file
+autoreconf
+%endif
+
+
 %build
 %configure --disable-static
 make  %{?_smp_mflags}
@@ -179,7 +194,6 @@
 # kill *.a and *.la files
 rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.la
 
-
 %find_lang %{name}
 
 
@@ -199,6 +213,7 @@
 %{_libdir}/scim-1.0/IMEngine/table.so
 %{_libdir}/scim-1.0/SetupUI/table-imengine-setup.so
 %{_datadir}/scim/icons/table.png
+%{_mandir}/man1/scim-make-table.1*
 
 
 %files amharic
@@ -226,17 +241,16 @@
 
 %files chinese
 %defattr(-, root, root, -)
-%doc tables/zh/README-Erbi.txt tables/zh/README-CangJie.txt
+%doc tables/zh/README-*.txt
 %dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Array30.bin
-%{_datadir}/scim/tables/CangJie.bin
-%{_datadir}/scim/tables/CangJie3.bin
+%{_datadir}/scim/tables/CangJie*.bin
 %{_datadir}/scim/tables/Cantonese.bin
 %{_datadir}/scim/tables/CantonHK.bin
 %{_datadir}/scim/tables/Dayi3.bin
+%{_datadir}/scim/tables/EZ*.bin
 %{_datadir}/scim/tables/Erbi.bin
 %{_datadir}/scim/tables/Erbi-QS.bin
-%{_datadir}/scim/tables/EZ.bin
 %{_datadir}/scim/tables/Jyutping.bin
 %{_datadir}/scim/tables/Quick.bin
 %{_datadir}/scim/tables/Simplex.bin
@@ -246,14 +260,13 @@
 %{_datadir}/scim/tables/Ziranma.bin
 %{_datadir}/scim/tables/ZhuYin.bin
 %{_datadir}/scim/icons/Array30.png
-%{_datadir}/scim/icons/CangJie.png
-%{_datadir}/scim/icons/CangJie3.png
+%{_datadir}/scim/icons/CangJie*.png
 %{_datadir}/scim/icons/Cantonese.png
 %{_datadir}/scim/icons/CantonHK.png
 %{_datadir}/scim/icons/Dayi.png
+%{_datadir}/scim/icons/EZ*.png
 %{_datadir}/scim/icons/Erbi.png
 %{_datadir}/scim/icons/Erbi-QS.png
-%{_datadir}/scim/icons/EZ.png
 %{_datadir}/scim/icons/Jyutping.png
 %{_datadir}/scim/icons/Quick.png
 %{_datadir}/scim/icons/Simplex.png
@@ -282,9 +295,10 @@
 %{_datadir}/scim/icons/Hindi-phonetic.png
 
 
+%if %{jk_tables}
 %files japanese
 %defattr(-, root, root, -)
-%doc tables/ja/kanjidic_licence.html tables/ja/kanjidic_doc.html
+%doc tables/ja/kanjidic*
 %dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/HIRAGANA.bin
 %{_datadir}/scim/tables/KATAKANA.bin
@@ -292,6 +306,7 @@
 %{_datadir}/scim/icons/HIRAGANA.png
 %{_datadir}/scim/icons/KATAKANA.png
 %{_datadir}/scim/icons/Nippon.png
+%endif
 
 
 %files kannada
@@ -303,6 +318,7 @@
 %{_datadir}/scim/icons/Kannada-kgp.png
 
 
+%if %{jk_tables}
 %files korean
 %defattr(-, root, root, -)
 %dir %{_datadir}/scim/tables
@@ -311,6 +327,7 @@
 %{_datadir}/scim/tables/Hanja.bin
 %{_datadir}/scim/icons/Hangul.png
 %{_datadir}/scim/icons/Hanja.png
+%endif
 
 
 %files malayalam
@@ -385,6 +402,12 @@
 
 
 %changelog
+* Mon Dec 26 2005 Jens Petersen  - 0.5.5-1%{?dist}
+- update to 0.5.5
+  - update filelists
+- remove the Japanese and Korean tables and subpackages with
+  tables-skip-ja-ko.patch and %%{jk_tables}
+
 * Wed Dec 1 2005 Ryo Dairiki  - 0.6.0-1%{?dist}
 - update to 0.5.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Nov 2005 14:36:52 -0000	1.4
+++ sources	27 Dec 2005 06:44:56 -0000	1.5
@@ -1 +1 @@
-69ce8f1945ba2ab4bf820386e76c2cd9  scim-tables-0.5.4.tar.gz
+15da0323195dea92690d4b391665b95a  scim-tables-0.5.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 08:54:09 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 27 Dec 2005 03:54:09 -0500
Subject: rpms/uim/FC-3 uim-init.el, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 
	1.8, 1.9 uim.spec, 1.9,
	1.10 uim-0.4.6-dont-require-devel-pkgs.patch, 1.1,
	NONE uim-0.4.6-multilib.patch, 1.1, NONE
Message-ID: <200512270854.jBR8sfDm001636@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/uim/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1608

Modified Files:
	.cvsignore sources uim.spec 
Added Files:
	uim-init.el 
Removed Files:
	uim-0.4.6-dont-require-devel-pkgs.patch 
	uim-0.4.6-multilib.patch 
Log Message:
* Tue Dec 27 2005 Akira TAGOH  - 1.0.1-1
- New upstream release.


--- NEW FILE uim-init.el ---
(require 'uim-leim)

(add-to-list 'load-path "/usr/share/emacs/site-lisp/uim-el")
(setq uim-el-agent "/usr/bin/uim-el-agent")
;(setq uim-candidate-display-inline t)
;(setq default-input-method "japanese-anthy-uim")


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2005 10:11:29 -0000	1.9
+++ .cvsignore	27 Dec 2005 08:54:08 -0000	1.10
@@ -8,3 +8,4 @@
 uim-0.4.7.1.tar.gz
 uim-0.4.8.tar.gz
 uim-0.4.9.1.tar.gz
+uim-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Sep 2005 10:11:29 -0000	1.8
+++ sources	27 Dec 2005 08:54:08 -0000	1.9
@@ -1 +1 @@
-0e2625cc926917d7864c4d0c341c535a  uim-0.4.9.1.tar.gz
+1de96cb9ca0c570c0d04678a95f9c75a  uim-1.0.1.tar.gz


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-3/uim.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- uim.spec	30 Sep 2005 10:11:29 -0000	1.9
+++ uim.spec	27 Dec 2005 08:54:08 -0000	1.10
@@ -2,23 +2,26 @@
 %define inst_xinput for llcc in %{uim_locale}; do alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim 50 ; done
 %define uninst_xinput for llcc in %{uim_locale}; do alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim ; done
 
-Summary:	A multilingual input method library
 Name:		uim
-Version:	0.4.9.1
+Version:	1.0.1
 Release:	1%{?dist}
 License:	GPL/BSD
-Group:		System Environment/Libraries
 URL:		http://uim.freedesktop.org/
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
+BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
+BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
+BuildRequires:	emacs
 Source0:	http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz
 Source1:	xinput.d-uim
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
-BuildRequires:	anthy-devel Canna-devel
+Source2:	uim-init.el
+
+
+Summary:	A multilingual input method library
+Group:		System Environment/Libraries
 Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
 Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
 
-Patch2:		uim-0.4.6-dont-require-devel-pkgs.patch
-
 %package	devel
 Summary:	Development files for the Uim library
 Group:		Development/Libraries
@@ -43,6 +46,17 @@
 Group:		User Interface/Desktops
 Requires:	uim = %{version}-%{release}
 
+%package	el
+Summary:	Emacs support for Uim
+Group:		System Environment/Libraries
+Requires:	%{name}-el-common = %{version}
+Requires:	emacs-common
+
+%package	el-common
+Summary:	Common package for Emacsen support for Uim
+Group:		System Environment/Libraries
+Requires:	uim = %{version}-%{release}
+
 %package	anthy
 Summary:	Anthy support for Uim
 Group:		System Environment/Libraries
@@ -67,6 +81,13 @@
 Requires(post):	gtk2
 Requires(postun): gtk2
 
+%package	m17n
+Summary:	m17n-lib support for Uim
+Group:		System Environment/Libraries
+Requires:	uim = %{version}-%{release}
+Requires(post):	gtk2
+Requires(postun): gtk2
+
 %description
 Uim is a multilingual input method library. Uim aims to
 provide secure and useful input methods for all
@@ -110,6 +131,12 @@
 
 This package provides the Qt IM module and helper programs.
 
+%description	el
+This package provides Emacs support.
+
+%description	el-common
+This package provides an utility to use Emacsen support for Uim.
+
 %description	anthy
 This package provides support for Anthy, a Japanese input method.
 
@@ -119,19 +146,18 @@
 %description	skk
 This package provides support for SKK, a Japanese input method.
 
+%description	m17n
+This package provides support for m17n-lib, which allows input of
+many languages using the input table map from m17n-db.
+
 %define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules )
 
 %prep
-%setup -q
-%patch2 -p1 -b .dlopen
+%setup -q -n %{name}-%{version}
 
-# patch creation:
-libtoolize --force && aclocal-1.9 -I m4 && autoheader && automake-1.9 --foreign && autoconf
-# touch uim/config.h.in, otherwise autoheader will run again
-touch uim/config.h.in
 
 %build
-%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule --without-scim
+%configure --with-x --with-xft --with-canna --with-anthy --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
 make
 
 %install
@@ -141,10 +167,13 @@
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim
+install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/
 
 %find_lang %{name}
+%find_lang uim-chardict-qt
 
-find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk)" > scm.list
+find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|m17n)" > scm.list
 cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
 
 # compress large doc
@@ -210,21 +239,29 @@
 	%{gtk_im_update}
 fi
 
+%post	m17n
+umask 022
+%{gtk_im_update}
+
+%postun m17n
+umask 022
+if [ $1 = 0 ]; then
+	%{gtk_im_update}
+fi
+
 %files -f %{name}.lang
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog* NEWS README
-%lang(ja) %doc README.ja
 %{_bindir}/uim-fep*
-%{_bindir}/uim-helper-server
 %{_bindir}/uim-module-manager
 %{_bindir}/uim-sh
 %{_bindir}/uim-xim
 %{_libdir}/lib*.so.*
 %dir %{_datadir}/uim
-%{_datadir}/uim/tables
 %{_sysconfdir}/X11/xinit/xinput.d
 %dir %{_libdir}/uim
 %{_libdir}/uim/plugin/libuim-custom-enabler.so
+%{_libexecdir}/uim-helper-server
 %{_datadir}/uim/pixmaps
 %{_datadir}/uim/helperdata
 %{_mandir}/man1/uim-xim.1*
@@ -241,8 +278,6 @@
 
 %files	gtk2
 %defattr (-, root, root)
-%{_bindir}/uim-candwin-gtk
-%{_bindir}/uim-helper-candwin-gtk
 %{_bindir}/uim-helper-toolbar-gtk
 %{_bindir}/uim-helper-toolbar-gtk-systray
 %{_bindir}/uim-pref-gtk
@@ -251,6 +286,7 @@
 %{_bindir}/uim-im-switcher-gtk
 %{_bindir}/uim-input-pad-ja
 %{_libdir}/gtk-2.0/2.*/immodules
+%{_libexecdir}/uim-candwin-gtk
 %exclude %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a
 %dir %{_datadir}/uim
 %{_datadir}/applications/uim.desktop
@@ -261,16 +297,27 @@
 %{_libexecdir}/uim-toolbar-applet
 %{_libdir}/bonobo/servers/GNOME_UimApplet.server
 
-%files	qt
+%files	-f uim-chardict-qt.lang qt
 %defattr (-, root, root)
-%{_bindir}/uim-candwin-qt
 %{_bindir}/uim-chardict-qt
 %{_bindir}/uim-im-switcher-qt
 %{_bindir}/uim-pref-qt
 %{_bindir}/uim-toolbar-qt
 %{_libdir}/qt-3.*/plugins/inputmethods
+%{_libexecdir}/uim-candwin-qt
 %exclude %{_libdir}/qt-3.*/plugins/inputmethods/lib*.*a
 
+%files	el
+%defattr (-, root, root)
+%doc emacs/COPYING emacs/README
+%lang(ja) %doc emacs/README.ja
+%{_datadir}/emacs/site-lisp/uim-el
+%{_datadir}/emacs/site-lisp/site-start.d/uim-init.el
+
+%files el-common
+%defattr (-, root, root)
+%{_bindir}/uim-el-agent
+
 %files	anthy
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-anthy.so
@@ -289,7 +336,25 @@
 %dir %{_datadir}/uim
 %{_datadir}/uim/skk*.scm
 
+%files m17n
+%defattr (-, root, root)
+%{_libdir}/uim/plugin/libuim-m17nlib.so
+%dir %{_datadir}/uim
+%{_datadir}/uim/m17nlib.scm
+
 %changelog
+* Tue Dec 27 2005 Akira TAGOH  - 1.0.1-1
+- New upstream release.
+
+* Fri Dec 16 2005 Akira TAGOH  - 1.0.0-0.2.beta
+- updates to 1.0.0-beta.
+
+* Thu Dec 15 2005 Akira TAGOH  - 1.0.0-0.1.alpha
+- New upstream release.
+- added uim-m17n package. (#175600)
+- added uim-el package.
+- uim-0.4.6-dont-require-devel-pkgs.patch: removed.
+
 * Fri Sep 30 2005 Akira TAGOH  - 0.4.9.1-1
 - New upstream release.
 


--- uim-0.4.6-dont-require-devel-pkgs.patch DELETED ---


--- uim-0.4.6-multilib.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 27 08:58:45 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 27 Dec 2005 03:58:45 -0500
Subject: rpms/uim/FC-4 uim-init.el, NONE, 1.1 .cvsignore, 1.10, 1.11 sources,
	1.9, 1.10 uim.spec, 1.16,
	1.17 uim-0.4.6-dont-require-devel-pkgs.patch, 1.1,
	NONE uim-0.4.6-multilib.patch, 1.1, NONE
Message-ID: <200512270859.jBR8xIKF001752@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/uim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1729

Modified Files:
	.cvsignore sources uim.spec 
Added Files:
	uim-init.el 
Removed Files:
	uim-0.4.6-dont-require-devel-pkgs.patch 
	uim-0.4.6-multilib.patch 
Log Message:
* Tue Dec 27 2005 Akira TAGOH  - 1.0.1-1
- New upstream release.


--- NEW FILE uim-init.el ---
(require 'uim-leim)

(add-to-list 'load-path "/usr/share/emacs/site-lisp/uim-el")
(setq uim-el-agent "/usr/bin/uim-el-agent")
;(setq uim-candidate-display-inline t)
;(setq default-input-method "japanese-anthy-uim")


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Sep 2005 09:48:23 -0000	1.10
+++ .cvsignore	27 Dec 2005 08:58:45 -0000	1.11
@@ -9,3 +9,4 @@
 uim-0.4.7.1.tar.gz
 uim-0.4.8.tar.gz
 uim-0.4.9.1.tar.gz
+uim-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2005 09:48:23 -0000	1.9
+++ sources	27 Dec 2005 08:58:45 -0000	1.10
@@ -1 +1 @@
-0e2625cc926917d7864c4d0c341c535a  uim-0.4.9.1.tar.gz
+1de96cb9ca0c570c0d04678a95f9c75a  uim-1.0.1.tar.gz


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-4/uim.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- uim.spec	30 Sep 2005 09:48:23 -0000	1.16
+++ uim.spec	27 Dec 2005 08:58:45 -0000	1.17
@@ -2,23 +2,26 @@
 %define inst_xinput for llcc in %{uim_locale}; do alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim 50 ; done
 %define uninst_xinput for llcc in %{uim_locale}; do alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim ; done
 
-Summary:	A multilingual input method library
 Name:		uim
-Version:	0.4.9.1
+Version:	1.0.1
 Release:	1%{?dist}
 License:	GPL/BSD
-Group:		System Environment/Libraries
 URL:		http://uim.freedesktop.org/
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
+BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
+BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
+BuildRequires:	emacs
 Source0:	http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz
 Source1:	xinput.d-uim
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
-BuildRequires:	anthy-devel Canna-devel
+Source2:	uim-init.el
+
+
+Summary:	A multilingual input method library
+Group:		System Environment/Libraries
 Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
 Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
 
-Patch2:		uim-0.4.6-dont-require-devel-pkgs.patch
-
 %package	devel
 Summary:	Development files for the Uim library
 Group:		Development/Libraries
@@ -43,6 +46,17 @@
 Group:		User Interface/Desktops
 Requires:	uim = %{version}-%{release}
 
+%package	el
+Summary:	Emacs support for Uim
+Group:		System Environment/Libraries
+Requires:	%{name}-el-common = %{version}
+Requires:	emacs-common
+
+%package	el-common
+Summary:	Common package for Emacsen support for Uim
+Group:		System Environment/Libraries
+Requires:	uim = %{version}-%{release}
+
 %package	anthy
 Summary:	Anthy support for Uim
 Group:		System Environment/Libraries
@@ -67,6 +81,13 @@
 Requires(post):	gtk2
 Requires(postun): gtk2
 
+%package	m17n
+Summary:	m17n-lib support for Uim
+Group:		System Environment/Libraries
+Requires:	uim = %{version}-%{release}
+Requires(post):	gtk2
+Requires(postun): gtk2
+
 %description
 Uim is a multilingual input method library. Uim aims to
 provide secure and useful input methods for all
@@ -110,6 +131,12 @@
 
 This package provides the Qt IM module and helper programs.
 
+%description	el
+This package provides Emacs support.
+
+%description	el-common
+This package provides an utility to use Emacsen support for Uim.
+
 %description	anthy
 This package provides support for Anthy, a Japanese input method.
 
@@ -119,19 +146,18 @@
 %description	skk
 This package provides support for SKK, a Japanese input method.
 
+%description	m17n
+This package provides support for m17n-lib, which allows input of
+many languages using the input table map from m17n-db.
+
 %define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules )
 
 %prep
-%setup -q
-%patch2 -p1 -b .dlopen
+%setup -q -n %{name}-%{version}
 
-# patch creation:
-libtoolize --force && aclocal-1.9 -I m4 && autoheader && automake-1.9 --foreign && autoconf
-# touch uim/config.h.in, otherwise autoheader will run again
-touch uim/config.h.in
 
 %build
-%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule --without-scim
+%configure --with-x --with-xft --with-canna --with-anthy --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
 make
 
 %install
@@ -141,10 +167,13 @@
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim
+install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/
 
 %find_lang %{name}
+%find_lang uim-chardict-qt
 
-find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk)" > scm.list
+find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|m17n)" > scm.list
 cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
 
 # compress large doc
@@ -210,21 +239,29 @@
 	%{gtk_im_update}
 fi
 
+%post	m17n
+umask 022
+%{gtk_im_update}
+
+%postun m17n
+umask 022
+if [ $1 = 0 ]; then
+	%{gtk_im_update}
+fi
+
 %files -f %{name}.lang
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog* NEWS README
-%lang(ja) %doc README.ja
 %{_bindir}/uim-fep*
-%{_bindir}/uim-helper-server
 %{_bindir}/uim-module-manager
 %{_bindir}/uim-sh
 %{_bindir}/uim-xim
 %{_libdir}/lib*.so.*
 %dir %{_datadir}/uim
-%{_datadir}/uim/tables
 %{_sysconfdir}/X11/xinit/xinput.d
 %dir %{_libdir}/uim
 %{_libdir}/uim/plugin/libuim-custom-enabler.so
+%{_libexecdir}/uim-helper-server
 %{_datadir}/uim/pixmaps
 %{_datadir}/uim/helperdata
 %{_mandir}/man1/uim-xim.1*
@@ -241,8 +278,6 @@
 
 %files	gtk2
 %defattr (-, root, root)
-%{_bindir}/uim-candwin-gtk
-%{_bindir}/uim-helper-candwin-gtk
 %{_bindir}/uim-helper-toolbar-gtk
 %{_bindir}/uim-helper-toolbar-gtk-systray
 %{_bindir}/uim-pref-gtk
@@ -251,6 +286,7 @@
 %{_bindir}/uim-im-switcher-gtk
 %{_bindir}/uim-input-pad-ja
 %{_libdir}/gtk-2.0/2.*/immodules
+%{_libexecdir}/uim-candwin-gtk
 %exclude %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a
 %dir %{_datadir}/uim
 %{_datadir}/applications/uim.desktop
@@ -261,16 +297,27 @@
 %{_libexecdir}/uim-toolbar-applet
 %{_libdir}/bonobo/servers/GNOME_UimApplet.server
 
-%files	qt
+%files	-f uim-chardict-qt.lang qt
 %defattr (-, root, root)
-%{_bindir}/uim-candwin-qt
 %{_bindir}/uim-chardict-qt
 %{_bindir}/uim-im-switcher-qt
 %{_bindir}/uim-pref-qt
 %{_bindir}/uim-toolbar-qt
 %{_libdir}/qt-3.*/plugins/inputmethods
+%{_libexecdir}/uim-candwin-qt
 %exclude %{_libdir}/qt-3.*/plugins/inputmethods/lib*.*a
 
+%files	el
+%defattr (-, root, root)
+%doc emacs/COPYING emacs/README
+%lang(ja) %doc emacs/README.ja
+%{_datadir}/emacs/site-lisp/uim-el
+%{_datadir}/emacs/site-lisp/site-start.d/uim-init.el
+
+%files el-common
+%defattr (-, root, root)
+%{_bindir}/uim-el-agent
+
 %files	anthy
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-anthy.so
@@ -289,7 +336,25 @@
 %dir %{_datadir}/uim
 %{_datadir}/uim/skk*.scm
 
+%files m17n
+%defattr (-, root, root)
+%{_libdir}/uim/plugin/libuim-m17nlib.so
+%dir %{_datadir}/uim
+%{_datadir}/uim/m17nlib.scm
+
 %changelog
+* Tue Dec 27 2005 Akira TAGOH  - 1.0.1-1
+- New upstream release.
+
+* Fri Dec 16 2005 Akira TAGOH  - 1.0.0-0.2.beta
+- updates to 1.0.0-beta.
+
+* Thu Dec 15 2005 Akira TAGOH  - 1.0.0-0.1.alpha
+- New upstream release.
+- added uim-m17n package. (#175600)
+- added uim-el package.
+- uim-0.4.6-dont-require-devel-pkgs.patch: removed.
+
 * Fri Sep 30 2005 Akira TAGOH  - 0.4.9.1-1
 - New upstream release.
 


--- uim-0.4.6-dont-require-devel-pkgs.patch DELETED ---


--- uim-0.4.6-multilib.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 27 09:10:27 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 27 Dec 2005 04:10:27 -0500
Subject: rpms/uim/FC-3 uim.spec,1.10,1.11
Message-ID: <200512270910.jBR9AjcJ003702@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/uim/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3685

Modified Files:
	uim.spec 
Log Message:



Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-3/uim.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- uim.spec	27 Dec 2005 08:54:08 -0000	1.10
+++ uim.spec	27 Dec 2005 09:10:26 -0000	1.11
@@ -8,7 +8,7 @@
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
+BuildRequires:	xorg-x11-devel
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
 BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
 BuildRequires:	emacs



From fedora-extras-commits at redhat.com  Tue Dec 27 09:29:10 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 27 Dec 2005 04:29:10 -0500
Subject: rpms/uim/FC-4 uim.spec,1.17,1.18
Message-ID: <200512270929.jBR9Tgwe004088@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/uim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4071

Modified Files:
	uim.spec 
Log Message:



Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/FC-4/uim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- uim.spec	27 Dec 2005 08:58:45 -0000	1.17
+++ uim.spec	27 Dec 2005 09:29:10 -0000	1.18
@@ -8,7 +8,7 @@
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
+BuildRequires:	xorg-x11-devel
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
 BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
 BuildRequires:	emacs



From fedora-extras-commits at redhat.com  Tue Dec 27 11:34:19 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 06:34:19 -0500
Subject: rpms/python-setuptools - New directory
Message-ID: <200512271134.jBRBYLwj007693@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7685/python-setuptools

Log Message:
Directory /cvs/extras/rpms/python-setuptools added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 27 11:34:25 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 06:34:25 -0500
Subject: rpms/python-setuptools/devel - New directory
Message-ID: <200512271134.jBRBYR8a007708@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7685/python-setuptools/devel

Log Message:
Directory /cvs/extras/rpms/python-setuptools/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 27 11:35:56 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 06:35:56 -0500
Subject: rpms/python-setuptools Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512271135.jBRBZwfK007742@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7730

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-setuptools


--- NEW FILE Makefile ---
# Top level Makefile for module python-setuptools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 27 11:36:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 06:36:01 -0500
Subject: rpms/python-setuptools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200512271136.jBRBa3xN007762@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7730/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-setuptools


--- NEW 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 Dec 27 11:38:51 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 06:38:51 -0500
Subject: rpms/python-setuptools import.log,1.1,1.2
Message-ID: <200512271139.jBRBdNZp007832@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7797

Modified Files:
	import.log 
Log Message:
auto-import python-setuptools-0.6a8-1 on branch devel from python-setuptools-0.6a8-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Dec 2005 11:35:55 -0000	1.1
+++ import.log	27 Dec 2005 11:38:50 -0000	1.2
@@ -0,0 +1 @@
+python-setuptools-0_6a8-1:HEAD:python-setuptools-0.6a8-1.src.rpm:1135683502



From fedora-extras-commits at redhat.com  Tue Dec 27 11:38:56 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 06:38:56 -0500
Subject: rpms/python-setuptools/devel python-setuptools.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512271139.jBRBdSdh007836@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7797/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-setuptools.spec 
Log Message:
auto-import python-setuptools-0.6a8-1 on branch devel from python-setuptools-0.6a8-1.src.rpm


--- NEW FILE python-setuptools.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-setuptools
Version:        0.6a8
Release:        1
Summary:        Download, build, install, upgrade, and uninstall Python packages

Group:          Development/Languages
License:        PSFL/ZPL
URL:            http://peak.telecommunity.com/DevCenter/setuptools
Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       python-abi = %{pyver}

%description
setuptools is a collection of enhancements to the Python distutils that allow
you to more easily build and distribute Python packages, especially ones that
have dependencies on other packages.

%prep
%setup -q -n setuptools-%{version}
sed -i '1s@#!python@#!/usr/bin/python@' easy_install.py

%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
find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; -print | while read file ; do sed -i '1d' $file ; done
#find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; | while read file ; do grep -q '^#!' $file && sed -i '1d' $file ; done
echo "setuptools-%{version}-py%{pyver}.egg" > $RPM_BUILD_ROOT%{python_sitelib}/setuptools.pth

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc api_tests.txt EasyInstall.txt pkg_resources.txt setuptools.txt
%{_bindir}/*
%{python_sitelib}/setuptools.pth
%{python_sitelib}/setuptools-%{version}-py%{pyver}.egg

%changelog
* Sat Dec 24 2005 Ignacio Vazquez-Abrams  0.6a8-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Dec 2005 11:36:01 -0000	1.1
+++ .cvsignore	27 Dec 2005 11:38:56 -0000	1.2
@@ -0,0 +1 @@
+setuptools-0.6a8.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Dec 2005 11:36:01 -0000	1.1
+++ sources	27 Dec 2005 11:38:56 -0000	1.2
@@ -0,0 +1 @@
+3eecdf66c1a2cf8a6556bc00b69d572a  setuptools-0.6a8.zip



From fedora-extras-commits at redhat.com  Tue Dec 27 12:02:49 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 07:02:49 -0500
Subject: rpms/python-setuptools/devel python-setuptools.spec,1.1,1.2
Message-ID: <200512271203.jBRC3MIK009555@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9538

Modified Files:
	python-setuptools.spec 
Log Message:
disttag


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/python-setuptools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-setuptools.spec	27 Dec 2005 11:38:56 -0000	1.1
+++ python-setuptools.spec	27 Dec 2005 12:02:49 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           python-setuptools
 Version:        0.6a8
-Release:        1
+Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Tue Dec 27 17:25:44 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 27 Dec 2005 12:25:44 -0500
Subject: rpms/dclib/devel dclib.spec,1.5,1.6
Message-ID: <200512271726.jBRHQHpL018379@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/dclib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18362

Modified Files:
	dclib.spec 
Log Message:
rebuild



Index: dclib.spec
===================================================================
RCS file: /cvs/extras/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dclib.spec	10 Nov 2005 17:45:01 -0000	1.5
+++ dclib.spec	27 Dec 2005 17:25:44 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           dclib
 Version:        0.3.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Direct Connect file sharing library
 
 Group:          Applications/Internet
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Tue Dec 27 2005 Luke Macken  0.3.7-5
+- Rebuild
+
 * Thu Nov 10 2005 Luke Macken  0.3.7-4
 - Rebuild for new openssl
 



From fedora-extras-commits at redhat.com  Tue Dec 27 17:28:23 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 27 Dec 2005 12:28:23 -0500
Subject: rpms/naim/devel naim.spec,1.5,1.6
Message-ID: <200512271728.jBRHStrg018443@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/naim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18426

Modified Files:
	naim.spec 
Log Message:
rebuild



Index: naim.spec
===================================================================
RCS file: /cvs/extras/rpms/naim/devel/naim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- naim.spec	15 Dec 2005 19:25:55 -0000	1.5
+++ naim.spec	27 Dec 2005 17:28:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name: naim
 Version: 0.11.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: An ncurses-based console AIM, ICQ, IRC, and Lily client
 
 Group: Applications/Internet
@@ -38,6 +38,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Dec 27 2005 Luke Macken  0.11.8.1-2
+- Rebuild
+
 * Thu Dec 15 2005 Luke Macken  0.11.8.1-1
 - Bump to 0.11.8.1
 



From fedora-extras-commits at redhat.com  Tue Dec 27 17:40:57 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 27 Dec 2005 12:40:57 -0500
Subject: rpms/nethack/devel nethack.spec,1.9,1.10
Message-ID: <200512271741.jBRHfTcJ018504@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/nethack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18487

Modified Files:
	nethack.spec 
Log Message:
rebuild



Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nethack.spec	24 Nov 2005 05:37:18 -0000	1.9
+++ nethack.spec	27 Dec 2005 17:40:56 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           nethack
 Version:        3.4.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Tue Dec 27 2005 Luke Macken  3.4.3-6
+- Rebuild
+
 * Wed Nov 23 2005 Luke Macken  3.4.3-5
 - Keep the license in the game directory (Bug #173385)
 - Don't obsolete falconseye anymore (Bug #173385)



From fedora-extras-commits at redhat.com  Tue Dec 27 17:43:05 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 27 Dec 2005 12:43:05 -0500
Subject: rpms/pork/devel pork.spec,1.2,1.3
Message-ID: <200512271743.jBRHhbkt018566@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/pork/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18549

Modified Files:
	pork.spec 
Log Message:
rebuild



Index: pork.spec
===================================================================
RCS file: /cvs/extras/rpms/pork/devel/pork.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pork.spec	15 Nov 2005 00:29:50 -0000	1.2
+++ pork.spec	27 Dec 2005 17:43:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pork
 Version:        0.99.8.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Console based AIM client that looks like ircII
 
 Group:          Applications/Internet
@@ -52,7 +52,10 @@
 
 
 %changelog
-* Mon Nov 14 2005 Luke Macken  - 0.99.8.1-4
+- Rebuild
+
+* Mon Nov 14 2005 Luke Macken  - 0.99.8.1-3
 - Documentation update
 
 * Sun Nov 13 2005 Luke Macken  - 0.99.8.1-2



From fedora-extras-commits at redhat.com  Tue Dec 27 17:45:21 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 27 Dec 2005 12:45:21 -0500
Subject: rpms/xprobe2/devel xprobe2.spec,1.3,1.4
Message-ID: <200512271745.jBRHjrE8018629@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/xprobe2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18612

Modified Files:
	xprobe2.spec 
Log Message:
rebuild



Index: xprobe2.spec
===================================================================
RCS file: /cvs/extras/rpms/xprobe2/devel/xprobe2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xprobe2.spec	12 Nov 2005 19:33:26 -0000	1.3
+++ xprobe2.spec	27 Dec 2005 17:45:21 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           xprobe2
 Version:        0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Xprobe2 is an active operating system fingerprinting tool
 
 Group:          Applications/Internet
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Dec 27 2005 Luke Macken  0.3-4
+- Rebuild
+
 * Sat Nov 12 2005 Luke Macken  0.3-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Dec 27 18:30:28 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 27 Dec 2005 13:30:28 -0500
Subject: mock mock.py,1.31,1.32 mock.spec,1.13,1.14
Message-ID: <200512271830.jBRIUw3n020447@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20411

Modified Files:
	mock.py mock.spec 
Log Message:

apply all of Andreas Thienemann's patches.

fixes rm -rf call to rm -rfv and fixes the mock man page in the package
makefile and specfile.



Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mock.py	12 Nov 2005 19:00:46 -0000	1.31
+++ mock.py	27 Dec 2005 18:30:26 -0000	1.32
@@ -179,7 +179,7 @@
             self._umount('dev/pts')
             
         if os.path.exists(self.basedir):
-            cmd = '%s -rf %s' % (self.config['rm'], self.basedir)
+            cmd = '%s -rfv %s' % (self.config['rm'], self.basedir)
             (retval, output) = self.do(cmd)
 
             if retval != 0:
@@ -589,7 +589,7 @@
         # purge the builddir, if it exists
         bd_out = '%s%s' % (self.rootdir, self.builddir)
         if os.path.exists(bd_out):
-            cmd = 'rm -rf %s' % self.builddir
+            cmd = 'rm -rfv %s' % self.builddir
             self.do_chroot(cmd, fatal=True)
     
         # create dir structure


Index: mock.spec
===================================================================
RCS file: /cvs/fedora/mock/mock.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mock.spec	4 Aug 2005 07:23:01 -0000	1.13
+++ mock.spec	27 Dec 2005 18:30:26 -0000	1.14
@@ -47,12 +47,16 @@
 %config(noreplace) %{_sysconfdir}/%{name}/*.cfg
 %{_bindir}/%{name}
 %{_libexecdir}/mock-yum
+%{_mandir}/man1/mock.1*
 %attr(04750, root, mock) %{_sbindir}/mock-helper
 %attr(02775, root, mock) %dir /var/lib/mock
 %{_libdir}/libselinux-mock.so
 
 
 %changelog
+* Tue Dec 27 2005 Seth Vidal 
+- add patch from Andreas Thienemann - adds man page
+
 * Sat Jun 11 2005 Seth Vidal 
 - security fix in mock-helper
 



From fedora-extras-commits at redhat.com  Tue Dec 27 18:30:34 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 27 Dec 2005 13:30:34 -0500
Subject: mock/docs Makefile,1.1,1.2
Message-ID: <200512271831.jBRIV4vH020450@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/mock/docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20411/docs

Modified Files:
	Makefile 
Log Message:

apply all of Andreas Thienemann's patches.

fixes rm -rf call to rm -rfv and fixes the mock man page in the package
makefile and specfile.



Index: Makefile
===================================================================
RCS file: /cvs/fedora/mock/docs/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	5 Aug 2005 08:12:44 -0000	1.1
+++ Makefile	27 Dec 2005 18:30:31 -0000	1.2
@@ -5,6 +5,6 @@
 	rm -f *.pyc *.pyo *~
 
 install:
-	mkdir -p $(DESTDIR)/usr/share/man/man{1}
+	mkdir -p $(DESTDIR)/usr/share/man/man1
 	install -m 644 mock.1 $(DESTDIR)/usr/share/man/man1/mock.1
 



From fedora-extras-commits at redhat.com  Tue Dec 27 20:13:14 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 27 Dec 2005 15:13:14 -0500
Subject: rpms/lirc/devel lirc.spec,1.10,1.11
Message-ID: <200512272013.jBRKDkdG024136@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24119

Modified Files:
	lirc.spec 
Log Message:
* Tue Dec 27 2005 Ville Skytt?? 
- Split kernel modules into separate package.
- Disable debugging features.



Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lirc.spec	14 Dec 2005 21:07:23 -0000	1.10
+++ lirc.spec	27 Dec 2005 20:13:13 -0000	1.11
@@ -1,18 +1,12 @@
-# Driver TODO, sometime maybe:
-# - caraca (req: caraca, http://caraca.sf.net/)
-# - irman: (req: libirman, http://lirc.sf.net/software/snapshots/)
-# Other TODO:
+# TODO:
+# - caraca driver (req: caraca, http://caraca.sf.net/)
+# - irman driver (req: libirman, http://lirc.sf.net/software/snapshots/)
 # - move to -devel (?): irw, *mode2, others?
 #   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
 #   - does someone actually need xmode2/smode2 for something?
+# - bcond_without for alsa, portaudio, x?
 # - don't run as root and/or create dedicated group, reduce fifo permissions?
 # - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc.
-# - Verify that the kernel modules work and correct /dev entries get created
-#   automagically with proper permissions etc.
-
-%{!?kver: %{expand: %%define kver %(uname -r)}}
-%define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu}
-%define mdir /lib/modules/%{kver}/extra
 
 Name:           lirc
 Version:        0.8.0
@@ -29,14 +23,12 @@
 Patch0:         %{name}-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{!?_with_modules:1}
 BuildRequires:  %{__perl}
 BuildRequires:  alsa-lib-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libusb-devel
 BuildRequires:  portaudio-devel >= 18
 Build%{?_with_svgalib:Requires}%{!?_with_svgalib:Conflicts}: svgalib-devel
-%endif
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
@@ -57,43 +49,12 @@
 %description    devel
 %{summary}.
 
-%package     -n kernel-module-%{name}-%{kver}
-Summary:        Kernel modules for LIRC
-Group:          System Environment/Kernel
-Provides:       kernel-module
-Provides:       kernel-module-%{name} = %{version}
-%if 0%{?_with_modules:1}
-BuildRequires:  kernel-devel-%{_target_cpu} = %{kver}
-%endif
-Requires:       %{name} = %{version}
-Requires:       module-init-tools
-Requires:       kernel-%{_target_cpu} = %{kver}
-Requires:       udev
-
-%description -n kernel-module-%{name}-%{kver}
-LIRC kernel modules built for kernel
-%{kver} (%{_target_cpu}).
-
 
 %prep
 %setup -q -n %{name}-%{version}pre2
 %patch0 -p1
-
-# *cough*
-echo %{kver} | grep -q _FC5 && \
-   sed -i -e 's/KERNEL_VERSION(2,\s*6,\s*15)/KERNEL_VERSION(2,6,14)/' \
-   drivers/kcompat.h drivers/lirc_{imon,sasem}/lirc_*.c
-
 chmod 644 contrib/*
-
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
-
-# cmdir: unknown symbols (cmdir_{read,write}, set_tx_channels)
-# gpio: missing drivers/media/video/{bttv,bttvp}.h in kernel-devel
-for drv in cmdir gpio ; do
-  sed -i -e "/^\\s*(lirc_dev lirc_$drv)/d" -e "/^\\s*lirc_$drv/d" configure*
-done
-
 touch -r aclocal.m4 configure.in # avoid autofoo re-run
 
 
@@ -101,31 +62,18 @@
 %configure \
   --disable-static \
   --disable-dependency-tracking \
-  --enable-debug \
   --enable-sandboxed \
   --with-syslog=LOG_DAEMON \
-%if 0%{?_with_modules:1}
-  --with-kerneldir=%{ksrc} \
-  --with-moduledir=%{mdir}/%{name} \
-  --with-driver=all
-make %{?_smp_mflags} -C drivers
-%else
   --with-driver=userspace
 make %{?_smp_mflags}
-%endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 
-%if 0%{?_with_modules:1}
-make install DESTDIR=$RPM_BUILD_ROOT -C drivers
-# executable here to allow stripping, fixed later in %%files
-chmod +x $RPM_BUILD_ROOT%{mdir}/%{name}/*.ko
-
-%else
 make install DESTDIR=$RPM_BUILD_ROOT
 %{!?_with_svgalib:rm $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1*}
+
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc
 %{__perl} -pi -e \
   's|/etc/|%{_sysconfdir}/|g ;
@@ -133,16 +81,19 @@
    s|/usr/sbin/|%{_sbindir}/|g' \
   $RPM_BUILD_ROOT%{_initrddir}/lirc
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lirc
+
 mkdir __docs
 cp -pR doc contrib __docs
 cd __docs
 rm -rf doc/Makefile* doc/.libs doc/man* contrib/lirc.* contrib/sendxevent.c
 cd ..
+
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf
+
 install -dm 755 $RPM_BUILD_ROOT/dev
 touch $RPM_BUILD_ROOT/dev/lirc{d,m}
+
 rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
-%endif
 
 
 %clean
@@ -153,9 +104,6 @@
 /sbin/ldconfig
 /sbin/chkconfig --add lirc
 
-%post -n kernel-module-%{name}-%{kver}
-depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
-
 %preun
 if [ $1 -eq 0 ] ; then
   %{_initrddir}/lirc stop >/dev/null || :
@@ -168,11 +116,7 @@
   %{_initrddir}/lirc try-restart >/dev/null || :
 fi
 
-%postun -n kernel-module-%{name}-%{kver}
-depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
-
 
-%if 0%{!?_with_modules:1}
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO remotes __docs/*
@@ -192,16 +136,13 @@
 %defattr(-,root,root,-)
 %{_includedir}/lirc/
 %{_libdir}/liblirc_client.so
-%endif
-
-%if 0%{?_with_modules:1}
-%files -n kernel-module-%{name}-%{kver}
-%defattr(644,root,root,755)
-%{mdir}/
-%endif
 
 
 %changelog
+* Tue Dec 27 2005 Ville Skytt?? 
+- Split kernel modules into separate package.
+- Disable debugging features.
+
 * Wed Dec 14 2005 Ville Skytt??  - 0.8.0-0.2.pre2
 - 0.8.0pre2, kernel >= 2.6.15 USB patch applied upstream.
 - lirc_clientd renamed to lircrcd.



From fedora-extras-commits at redhat.com  Tue Dec 27 21:55:18 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 27 Dec 2005 16:55:18 -0500
Subject: owners owners.list,1.483,1.484
Message-ID: <200512272155.jBRLtp2G025922@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25899

Modified Files:
	owners.list 
Log Message:
Added chabotc at xs4all.nl for buoh



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -r1.483 -r1.484
--- owners.list	26 Dec 2005 16:32:58 -0000	1.483
+++ owners.list	27 Dec 2005 21:55:18 -0000	1.484
@@ -1325,3 +1325,4 @@
 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|buoh|Online comics reader|chabotc at xs4all.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 27 22:10:48 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 27 Dec 2005 17:10:48 -0500
Subject: rpms/buoh - New directory
Message-ID: <200512272210.jBRMAoLm027615@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27606/buoh

Log Message:
Directory /cvs/extras/rpms/buoh added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 27 22:10:54 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 27 Dec 2005 17:10:54 -0500
Subject: rpms/buoh/devel - New directory
Message-ID: <200512272210.jBRMAu01027630@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27606/buoh/devel

Log Message:
Directory /cvs/extras/rpms/buoh/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 27 22:12:27 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 27 Dec 2005 17:12:27 -0500
Subject: rpms/buoh Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512272212.jBRMCUVU027665@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27653

Added Files:
	Makefile import.log 
Log Message:
Setup of module buoh


--- NEW FILE Makefile ---
# Top level Makefile for module buoh
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 27 22:12:36 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 27 Dec 2005 17:12:36 -0500
Subject: rpms/buoh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200512272212.jBRMCcHQ027685@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27653/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module buoh


--- NEW 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 Dec 27 22:14:23 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 27 Dec 2005 17:14:23 -0500
Subject: rpms/buoh import.log,1.1,1.2
Message-ID: <200512272214.jBRMEuef027789@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27750

Modified Files:
	import.log 
Log Message:
auto-import buoh-0.8.1-3 on branch devel from buoh-0.8.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/buoh/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Dec 2005 22:12:23 -0000	1.1
+++ import.log	27 Dec 2005 22:14:23 -0000	1.2
@@ -0,0 +1 @@
+buoh-0_8_1-3:HEAD:buoh-0.8.1-3.src.rpm:1135721668



From fedora-extras-commits at redhat.com  Tue Dec 27 22:14:29 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 27 Dec 2005 17:14:29 -0500
Subject: rpms/buoh/devel buoh.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200512272215.jBRMF1XY027795@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27750/devel

Modified Files:
	.cvsignore sources 
Added Files:
	buoh.spec 
Log Message:
auto-import buoh-0.8.1-3 on branch devel from buoh-0.8.1-3.src.rpm


--- NEW FILE buoh.spec ---
Name:             buoh
License:          GPL
Group:            Applications/Internet
Version:          0.8.1
Release:          3
Summary:          Online comics reader
URL:              http://buoh.steve-o.org/
Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    desktop-file-utils,perl, perl-XML-Parser, gettext, gtk2-devel, libsoup-devel, libgnomeui-devel, GConf2-devel
Requires(post):   GConf2
Requires(postun): GConf2

%description
Buoh is a reader for online strips comics. It has a number of features,
including: Selecting your favorites comic through a list of more than 130
comics, easy & simple an eye-candy view of an online comic, browsing over
the comic strip archives.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
/usr/bin/install -m 644 $RPM_BUILD_ROOT%{_datadir}/buoh/pixmaps/buoh*.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/

perl -pi -e "s,Terminal=0,Terminal=false,g" $RPM_BUILD_ROOT%{_datadir}/applications/buoh.desktop
desktop-file-install --delete-original			\
  --vendor=gnome								\
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora						\
  $RPM_BUILD_ROOT%{_datadir}/applications/buoh.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/buoh.schemas > /dev/null  || :
killall -HUP gconfd-2 &>/dev/null || :

%postun
if [ "$1" -gt 1 ]; then
  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/buoh.schemas >/dev/null || :
  killall -HUP gconfd-2 &>/dev/null || :
fi

%preun
if [ "$1" -eq 0 ]; then
  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/buoh.schemas > /dev/null || :
  killall -HUP gconfd-2 &>/dev/null || :
fi
		  
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING INSTALL README NEWS TODO
%dir %{_datadir}/buoh
%dir %{_datadir}/buoh/comics
%dir %{_datadir}/buoh/ui
%{_bindir}/buoh
%{_sysconfdir}/gconf/schemas/buoh.schemas
%{_datadir}/applications/gnome-buoh.desktop
%{_datadir}/buoh/comics/comics.xml
%{_datadir}/buoh/ui/buoh-ui.xml
%{_datadir}/buoh/pixmaps/buoh*.png
%{_datadir}/pixmaps/buoh*.png

%changelog
* Mon Dec 27 2005 - Chris Chabot  - 0.8.1-3
- Added desktop file utils to PreReq, and used to install .desktop file
  with Fedora category
- Copy icon files to _datadir/pixmaps so desktop envirioment can find them
- Quick fix up to .desktop file to Terminal=false instead of Terminal=0
  following freedesktop standard
- Removed ldconfig from post,prerun and postrun, this package has
  no .so's

* Mon Dec 26 2005 - Chris Chabot  - 0.8.1-2
- Added gconf uninstall rules on upgrade and uninstall
- Commented out hard requirements, leaving them to rpm's autodep

* Fri Dec 23 2005 - Chris Chabot  - 0.8.1-1
- Updated to upstream 0.8.1
- Upstream changed required gtk+ version to 2.6

* Fri Dec 23 2005 - Chris Chabot  - 0.8-3
- Moved "rm -rf $RPM_BUILD_ROOT" from prep to install
- Removed "unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL" since
  this shouldn't be required (it has its own shell env)

* Tue Nov 15 2005 - Chris Chabot  - 0.8-2
- Changed %makeinstall into make install DESTDIR=$RPM_BUILD_ROOT,
  was a bug in the makefiles that caused make install to install
  buoh's icons and xml files in /usr/share, not in the build root.

* Mon Nov 14 2005 - Chris Chabot  - 0.8-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Dec 2005 22:12:36 -0000	1.1
+++ .cvsignore	27 Dec 2005 22:14:29 -0000	1.2
@@ -0,0 +1 @@
+buoh-0.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Dec 2005 22:12:36 -0000	1.1
+++ sources	27 Dec 2005 22:14:29 -0000	1.2
@@ -0,0 +1 @@
+5d05a51d7c6616d93e93df3465b49fe7  buoh-0.8.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 22:15:52 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 27 Dec 2005 17:15:52 -0500
Subject: owners owners.list,1.484,1.485
Message-ID: <200512272216.jBRMGObN027844@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27827

Modified Files:
	owners.list 
Log Message:
python-setuptools


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -r1.484 -r1.485
--- owners.list	27 Dec 2005 21:55:18 -0000	1.484
+++ owners.list	27 Dec 2005 22:15:51 -0000	1.485
@@ -1015,6 +1015,7 @@
 Fedora Extras|python-psyco|Python specializing compiler|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-quixote|A highly Pythonic Web application framework|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-reportlab|Python PDF generation library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|python-setuptools|Download, build, install, upgrade, and uninstall Python packages|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-simpletal|Alternative implementation of Zope Page Templates|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-simpy|Python simulation framework|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|python-sqlite|Python bindings for SQLite|thomas at apestaart.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 27 22:54:20 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 17:54:20 -0500
Subject: rpms/libqalculate/devel .cvsignore, 1.4, 1.5 libqalculate.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200512272254.jBRMsqVX027936@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/libqalculate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27907

Modified Files:
	.cvsignore libqalculate.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Nov 2005 01:26:49 -0000	1.4
+++ .cvsignore	27 Dec 2005 22:54:20 -0000	1.5
@@ -1 +1 @@
-libqalculate-0.9.0.tar.gz
+libqalculate-0.9.2.tar.gz


Index: libqalculate.spec
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/devel/libqalculate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libqalculate.spec	6 Nov 2005 01:26:49 -0000	1.5
+++ libqalculate.spec	27 Dec 2005 22:54:20 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Multi-purpose calculator library
 Name: libqalculate
-Version: 0.9.0
+Version: 0.9.2
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -73,6 +73,9 @@
 %{_bindir}/qalc
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sat Nov 05 2005 Deji Akingunola  - 0.9.0-1
 - Upgrade to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Nov 2005 01:26:49 -0000	1.4
+++ sources	27 Dec 2005 22:54:20 -0000	1.5
@@ -1 +1 @@
-1c730ef9865fc5ef850ae7c7dbe4eb93  libqalculate-0.9.0.tar.gz
+f7a67bb97e943641868fd1ddf395742d  libqalculate-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 22:57:07 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 17:57:07 -0500
Subject: rpms/libqalculate/FC-4 .cvsignore, 1.4, 1.5 libqalculate.spec, 1.6, 
	1.7 sources, 1.4, 1.5
Message-ID: <200512272257.jBRMve0n028027@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/libqalculate/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28006

Modified Files:
	.cvsignore libqalculate.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Nov 2005 01:38:02 -0000	1.4
+++ .cvsignore	27 Dec 2005 22:57:06 -0000	1.5
@@ -1 +1 @@
-libqalculate-0.9.0.tar.gz
+libqalculate-0.9.2.tar.gz


Index: libqalculate.spec
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-4/libqalculate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libqalculate.spec	6 Nov 2005 01:38:02 -0000	1.6
+++ libqalculate.spec	27 Dec 2005 22:57:06 -0000	1.7
@@ -1,6 +1,6 @@
 Summary: Multi-purpose calculator library
 Name: libqalculate
-Version: 0.9.0
+Version: 0.9.2
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -73,6 +73,9 @@
 %{_bindir}/qalc
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sat Nov 05 2005 Deji Akingunola  - 0.9.0-1
 - Upgrade to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Nov 2005 01:38:02 -0000	1.4
+++ sources	27 Dec 2005 22:57:06 -0000	1.5
@@ -1 +1 @@
-1c730ef9865fc5ef850ae7c7dbe4eb93  libqalculate-0.9.0.tar.gz
+f7a67bb97e943641868fd1ddf395742d  libqalculate-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 22:59:07 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 17:59:07 -0500
Subject: rpms/libqalculate/FC-3 .cvsignore, 1.5, 1.6 libqalculate.spec, 1.6, 
	1.7 sources, 1.5, 1.6
Message-ID: <200512272259.jBRMxe46028101@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/libqalculate/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28077

Modified Files:
	.cvsignore libqalculate.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Nov 2005 01:24:29 -0000	1.5
+++ .cvsignore	27 Dec 2005 22:59:07 -0000	1.6
@@ -1,2 +1 @@
-libqalculate-0.9.0.tar.gz
-libqalculate-gnomevfs.patch
+libqalculate-0.9.2.tar.gz


Index: libqalculate.spec
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-3/libqalculate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libqalculate.spec	7 Nov 2005 01:24:29 -0000	1.6
+++ libqalculate.spec	27 Dec 2005 22:59:07 -0000	1.7
@@ -1,6 +1,6 @@
 Summary: Multi-purpose calculator library
 Name: libqalculate
-Version: 0.9.0
+Version: 0.9.2
 Release: 2%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -75,6 +75,9 @@
 %{_bindir}/qalc
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sun Nov 06 2005 Deji Akingunola  - 0.9.0-2
 - Fix for gnome-vfs2 < 2.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Nov 2005 01:24:29 -0000	1.5
+++ sources	27 Dec 2005 22:59:07 -0000	1.6
@@ -1,2 +1 @@
-1c730ef9865fc5ef850ae7c7dbe4eb93  libqalculate-0.9.0.tar.gz
-54ba093ce9723e517ee76cc883749a4b  libqalculate-gnomevfs.patch
+f7a67bb97e943641868fd1ddf395742d  libqalculate-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 23:04:41 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:04:41 -0500
Subject: rpms/libqalculate/FC-3 libqalculate.spec,1.7,1.8
Message-ID: <200512272306.jBRN66Bk029763@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/libqalculate/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29734

Modified Files:
	libqalculate.spec 
Log Message:
Release number should be '1' not '2'



Index: libqalculate.spec
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-3/libqalculate.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libqalculate.spec	27 Dec 2005 22:59:07 -0000	1.7
+++ libqalculate.spec	27 Dec 2005 23:04:41 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Multi-purpose calculator library
 Name: libqalculate
 Version: 0.9.2
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://qalculate.sourceforge.net/



From fedora-extras-commits at redhat.com  Tue Dec 27 23:12:13 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:12:13 -0500
Subject: rpms/qalculate-gtk/devel .cvsignore, 1.4, 1.5 qalculate-gtk.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200512272312.jBRNCkvd029846@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/qalculate-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29822

Modified Files:
	.cvsignore qalculate-gtk.spec sources 
Log Message:
gnome-vfs2 patch no longer needed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Nov 2005 01:47:33 -0000	1.4
+++ .cvsignore	27 Dec 2005 23:12:13 -0000	1.5
@@ -1 +1 @@
-qalculate-gtk-0.9.0.tar.gz
+qalculate-gtk-0.9.2.tar.gz


Index: qalculate-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/devel/qalculate-gtk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qalculate-gtk.spec	6 Nov 2005 01:47:33 -0000	1.5
+++ qalculate-gtk.spec	27 Dec 2005 23:12:13 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: A multi-purpose desktop calculator for GNU/Linux
 Name: qalculate-gtk
-Version: 0.9.0
+Version: 0.9.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
@@ -62,6 +62,9 @@
 %{_datadir}/qalculate-gtk/
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sat Nov 05 2005 Deji Akingunola  - 0.9.0.1
 - Upgrade to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Nov 2005 01:47:33 -0000	1.4
+++ sources	27 Dec 2005 23:12:13 -0000	1.5
@@ -1 +1 @@
-964d42e83d00929593439f73e604a185  qalculate-gtk-0.9.0.tar.gz
+287cb244e13f7c12074f89ca8f008528  qalculate-gtk-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 23:14:41 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:14:41 -0500
Subject: rpms/libqalculate/FC-3 libqalculate.spec,1.8,1.9
Message-ID: <200512272315.jBRNFTTA029941@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/libqalculate/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29891

Modified Files:
	libqalculate.spec 
Log Message:
Remove gnome2-vfs patch



Index: libqalculate.spec
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-3/libqalculate.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libqalculate.spec	27 Dec 2005 23:04:41 -0000	1.8
+++ libqalculate.spec	27 Dec 2005 23:14:41 -0000	1.9
@@ -6,7 +6,6 @@
 Group: System Environment/Libraries
 URL: http://qalculate.sourceforge.net/
 Source0: http://dl.sf.net/sourceforge/qalculate/libqalculate-%{version}.tar.gz
-Patch0: libqalculate-gnomevfs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel, cln-devel
 BuildRequires: libxml2-devel >= 2.3.8
@@ -39,7 +38,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .gnomevfs
 
 %build
 %configure --disable-static
@@ -77,6 +75,7 @@
 %changelog
 * Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
 - Upgrade to new version
+- gnome-vfs patch not needed any more
 
 * Sun Nov 06 2005 Deji Akingunola  - 0.9.0-2
 - Fix for gnome-vfs2 < 2.10



From fedora-extras-commits at redhat.com  Tue Dec 27 23:17:33 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:17:33 -0500
Subject: rpms/libqalculate/FC-3 libqalculate.spec,1.9,1.10
Message-ID: <200512272318.jBRNI6ka029994@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/libqalculate/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29977

Modified Files:
	libqalculate.spec 
Log Message:
Bump relaese number



Index: libqalculate.spec
===================================================================
RCS file: /cvs/extras/rpms/libqalculate/FC-3/libqalculate.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libqalculate.spec	27 Dec 2005 23:14:41 -0000	1.9
+++ libqalculate.spec	27 Dec 2005 23:17:33 -0000	1.10
@@ -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/



From fedora-extras-commits at redhat.com  Tue Dec 27 23:22:03 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:22:03 -0500
Subject: rpms/qalculate-gtk/FC-4 .cvsignore, 1.3, 1.4 qalculate-gtk.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200512272322.jBRNMa4b030097@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/qalculate-gtk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30071

Modified Files:
	.cvsignore qalculate-gtk.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Nov 2005 01:49:58 -0000	1.3
+++ .cvsignore	27 Dec 2005 23:22:03 -0000	1.4
@@ -1 +1 @@
-qalculate-gtk-0.9.0.tar.gz
+qalculate-gtk-0.9.2.tar.gz


Index: qalculate-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/FC-4/qalculate-gtk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qalculate-gtk.spec	6 Nov 2005 01:49:58 -0000	1.4
+++ qalculate-gtk.spec	27 Dec 2005 23:22:03 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: A multi-purpose desktop calculator for GNU/Linux
 Name: qalculate-gtk
-Version: 0.9.0
+Version: 0.9.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
@@ -62,6 +62,9 @@
 %{_datadir}/qalculate-gtk/
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sat Nov 05 2005 Deji Akingunola  - 0.9.0.1
 - Upgrade to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Nov 2005 01:49:58 -0000	1.3
+++ sources	27 Dec 2005 23:22:03 -0000	1.4
@@ -1 +1 @@
-964d42e83d00929593439f73e604a185  qalculate-gtk-0.9.0.tar.gz
+287cb244e13f7c12074f89ca8f008528  qalculate-gtk-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 23:25:07 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:25:07 -0500
Subject: rpms/qalculate-gtk/FC-3 .cvsignore, 1.4, 1.5 qalculate-gtk.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200512272325.jBRNPdjJ030171@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/qalculate-gtk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30150

Modified Files:
	.cvsignore qalculate-gtk.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Nov 2005 01:28:56 -0000	1.4
+++ .cvsignore	27 Dec 2005 23:25:06 -0000	1.5
@@ -1,2 +1 @@
-qalculate-gtk-0.9.0.tar.gz
-qalculate-gtk.patch
+qalculate-gtk-0.9.2.tar.gz


Index: qalculate-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/FC-3/qalculate-gtk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qalculate-gtk.spec	7 Nov 2005 01:28:56 -0000	1.5
+++ qalculate-gtk.spec	27 Dec 2005 23:25:06 -0000	1.6
@@ -1,12 +1,11 @@
 Summary: A multi-purpose desktop calculator for GNU/Linux
 Name: qalculate-gtk
-Version: 0.9.0
-Release: 2%{?dist}
+Version: 0.9.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://qalculate.sourceforge.net/
 Source: http://dl.sf.net/qalculate/qalculate-gtk-%{version}.tar.gz
-Patch0: qalculate-gtk.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgnome-devel, libglade2-devel, libqalculate-devel
 BuildRequires: gettext, desktop-file-utils, scrollkeeper
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .
 
 %build
 %configure 
@@ -64,6 +62,10 @@
 %{_datadir}/qalculate-gtk/
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+- Remove gnome-vfs patch, fixed in this version
+
 * Sun Nov 06 2005 Deji Akingunola  - 0.9.0-2
 - Fix build issue on FC-3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qalculate-gtk/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Nov 2005 01:28:56 -0000	1.4
+++ sources	27 Dec 2005 23:25:06 -0000	1.5
@@ -1,2 +1 @@
-964d42e83d00929593439f73e604a185  qalculate-gtk-0.9.0.tar.gz
-59893873c247eca78fdabf7ebf49a1d4  qalculate-gtk.patch
+287cb244e13f7c12074f89ca8f008528  qalculate-gtk-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 23:27:45 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:27:45 -0500
Subject: rpms/qalculate-kde/devel .cvsignore, 1.3, 1.4 qalculate-kde.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200512272328.jBRNSHaF030254@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/qalculate-kde/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30231

Modified Files:
	.cvsignore qalculate-kde.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Nov 2005 02:31:25 -0000	1.3
+++ .cvsignore	27 Dec 2005 23:27:45 -0000	1.4
@@ -1 +1 @@
-qalculate-kde-0.9.0.tar.gz
+qalculate-kde-0.9.2.tar.gz


Index: qalculate-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/devel/qalculate-kde.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qalculate-kde.spec	6 Nov 2005 02:31:25 -0000	1.3
+++ qalculate-kde.spec	27 Dec 2005 23:27:45 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: A multi-purpose desktop calculator for GNU/Linux
 Name: qalculate-kde
-Version: 0.9.0
+Version: 0.9.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
@@ -61,6 +61,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sat Nov 05 2005 Deji Akingunola  - 0.9.0-1
 - Upgrade to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Nov 2005 02:31:25 -0000	1.3
+++ sources	27 Dec 2005 23:27:45 -0000	1.4
@@ -1 +1 @@
-00bec7f342212ac53d348c836e8cf040  qalculate-kde-0.9.0.tar.gz
+f77569e3396e3af769526ded6393c0e1  qalculate-kde-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 23:36:09 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:36:09 -0500
Subject: rpms/qalculate-kde/FC-4 .cvsignore, 1.3, 1.4 qalculate-kde.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200512272336.jBRNafHA030348@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/qalculate-kde/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30327

Modified Files:
	.cvsignore qalculate-kde.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Nov 2005 02:33:49 -0000	1.3
+++ .cvsignore	27 Dec 2005 23:36:09 -0000	1.4
@@ -1 +1 @@
-qalculate-kde-0.9.0.tar.gz
+qalculate-kde-0.9.2.tar.gz


Index: qalculate-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/FC-4/qalculate-kde.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qalculate-kde.spec	6 Nov 2005 02:33:49 -0000	1.3
+++ qalculate-kde.spec	27 Dec 2005 23:36:09 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: A multi-purpose desktop calculator for GNU/Linux
 Name: qalculate-kde
-Version: 0.9.0
+Version: 0.9.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
@@ -61,6 +61,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sat Nov 05 2005 Deji Akingunola  - 0.9.0-1
 - Upgrade to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Nov 2005 02:33:49 -0000	1.3
+++ sources	27 Dec 2005 23:36:09 -0000	1.4
@@ -1 +1 @@
-00bec7f342212ac53d348c836e8cf040  qalculate-kde-0.9.0.tar.gz
+f77569e3396e3af769526ded6393c0e1  qalculate-kde-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 27 23:39:44 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 27 Dec 2005 18:39:44 -0500
Subject: rpms/qalculate-kde/FC-3 .cvsignore, 1.3, 1.4 qalculate-kde.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200512272340.jBRNeGqE030426@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/qalculate-kde/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30405

Modified Files:
	.cvsignore qalculate-kde.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Nov 2005 02:32:42 -0000	1.3
+++ .cvsignore	27 Dec 2005 23:39:43 -0000	1.4
@@ -1 +1 @@
-qalculate-kde-0.9.0.tar.gz
+qalculate-kde-0.9.2.tar.gz


Index: qalculate-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/FC-3/qalculate-kde.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qalculate-kde.spec	6 Nov 2005 02:32:42 -0000	1.3
+++ qalculate-kde.spec	27 Dec 2005 23:39:43 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: A multi-purpose desktop calculator for GNU/Linux
 Name: qalculate-kde
-Version: 0.9.0
+Version: 0.9.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Engineering
@@ -61,6 +61,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Dec 27 2005 Deji Akingunola  - 0.9.2-1
+- Upgrade to new version
+
 * Sat Nov 05 2005 Deji Akingunola  - 0.9.0-1
 - Upgrade to new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qalculate-kde/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Nov 2005 02:32:42 -0000	1.3
+++ sources	27 Dec 2005 23:39:43 -0000	1.4
@@ -1 +1 @@
-00bec7f342212ac53d348c836e8cf040  qalculate-kde-0.9.0.tar.gz
+f77569e3396e3af769526ded6393c0e1  qalculate-kde-0.9.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 08:09:46 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 28 Dec 2005 03:09:46 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.6, 1.7 rxvt-unicode.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <200512280810.jBS8ALBv013973@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13915/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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Dec 2005 01:09:23 -0000	1.6
+++ .cvsignore	28 Dec 2005 08:09:46 -0000	1.7
@@ -1 +1 @@
-rxvt-unicode-6.0.tar.bz2
+rxvt-unicode-6.1.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rxvt-unicode.spec	25 Dec 2005 01:09:23 -0000	1.11
+++ rxvt-unicode.spec	28 Dec 2005 08:09:46 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.0
+Version:        6.1
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -70,6 +70,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Dec 28 2005 Andreas Bierfert 
+6.1-1
+- version upgrade
+
 * Sun Dec 25 2005 Andreas Bierfert 
 6.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Dec 2005 01:09:23 -0000	1.6
+++ sources	28 Dec 2005 08:09:46 -0000	1.7
@@ -1 +1 @@
-7d00ac0675290a0b726d32d912e2cfcd  rxvt-unicode-6.0.tar.bz2
+9aae8858e0c123e5c618ab0f41da1bdc  rxvt-unicode-6.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 28 08:09:40 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 28 Dec 2005 03:09:40 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.6, 1.7 rxvt-unicode.spec, 1.8, 
	1.9 sources, 1.6, 1.7
Message-ID: <200512280810.jBS8AGMr013970@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-serv13915/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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Dec 2005 01:08:55 -0000	1.6
+++ .cvsignore	28 Dec 2005 08:09:40 -0000	1.7
@@ -1 +1 @@
-rxvt-unicode-6.0.tar.bz2
+rxvt-unicode-6.1.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rxvt-unicode.spec	25 Dec 2005 01:08:55 -0000	1.8
+++ rxvt-unicode.spec	28 Dec 2005 08:09:40 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.0
+Version:        6.1
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Dec 28 2005 Andreas Bierfert 
+6.1-1
+- version upgrade
+
 * Sun Dec 25 2005 Andreas Bierfert 
 6.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Dec 2005 01:08:55 -0000	1.6
+++ sources	28 Dec 2005 08:09:40 -0000	1.7
@@ -1 +1 @@
-7d00ac0675290a0b726d32d912e2cfcd  rxvt-unicode-6.0.tar.bz2
+9aae8858e0c123e5c618ab0f41da1bdc  rxvt-unicode-6.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 28 08:09:19 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 28 Dec 2005 03:09:19 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.6, 1.7 rxvt-unicode.spec, 1.8, 
	1.9 sources, 1.6, 1.7
Message-ID: <200512280810.jBS8ANiv013980@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-serv13915/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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Dec 2005 01:08:37 -0000	1.6
+++ .cvsignore	28 Dec 2005 08:09:18 -0000	1.7
@@ -1 +1 @@
-rxvt-unicode-6.0.tar.bz2
+rxvt-unicode-6.1.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rxvt-unicode.spec	25 Dec 2005 01:08:37 -0000	1.8
+++ rxvt-unicode.spec	28 Dec 2005 08:09:18 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.0
+Version:        6.1
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Dec 28 2005 Andreas Bierfert 
+6.1-1
+- version upgrade
+
 * Sun Dec 25 2005 Andreas Bierfert 
 6.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Dec 2005 01:08:37 -0000	1.6
+++ sources	28 Dec 2005 08:09:18 -0000	1.7
@@ -1 +1 @@
-7d00ac0675290a0b726d32d912e2cfcd  rxvt-unicode-6.0.tar.bz2
+9aae8858e0c123e5c618ab0f41da1bdc  rxvt-unicode-6.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 28 08:32:08 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 28 Dec 2005 03:32:08 -0500
Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.29,1.30
Message-ID: <200512280832.jBS8WeUK014174@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14157

Modified Files:
	sylpheed-claws.spec 
Log Message:
- fix path



Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sylpheed-claws.spec	26 Dec 2005 22:42:18 -0000	1.29
+++ sylpheed-claws.spec	28 Dec 2005 08:32:08 -0000	1.30
@@ -82,7 +82,7 @@
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
-%{__install} %{_builddir}/%{name}-%{version}/sylpheed-claws.png \
+%{__install} %{_builddir}/%{name}-%{version}-rc2/sylpheed-claws.png \
 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 
 %clean



From fedora-extras-commits at redhat.com  Wed Dec 28 08:46:36 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 28 Dec 2005 03:46:36 -0500
Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.30,1.31
Message-ID: <200512280847.jBS8l8Vo014258@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14241

Modified Files:
	sylpheed-claws.spec 
Log Message:
- no manual for now



Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sylpheed-claws.spec	28 Dec 2005 08:32:08 -0000	1.30
+++ sylpheed-claws.spec	28 Dec 2005 08:46:36 -0000	1.31
@@ -99,8 +99,8 @@
 %{_libdir}/sylpheed-claws/plugins/*.so
 %exclude %{_libdir}/sylpheed-claws/plugins/*.a
 %{_datadir}/pixmaps/*
-%dir %{_datadir}/sylpheed-claws/
-%{_datadir}/sylpheed-claws/*
+#%dir %{_datadir}/sylpheed-claws/
+#%{_datadir}/sylpheed-claws/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*
 #%{_datadir}/icons/*



From fedora-extras-commits at redhat.com  Wed Dec 28 09:46:17 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Wed, 28 Dec 2005 04:46:17 -0500
Subject: rpms/buoh/devel buoh.spec,1.1,1.2
Message-ID: <200512280946.jBS9knBn016616@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16599

Modified Files:
	buoh.spec 
Log Message:
Changed vendor string to fedora



Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buoh.spec	27 Dec 2005 22:14:29 -0000	1.1
+++ buoh.spec	28 Dec 2005 09:46:16 -0000	1.2
@@ -2,7 +2,7 @@
 License:          GPL
 Group:            Applications/Internet
 Version:          0.8.1
-Release:          3
+Release:          4
 Summary:          Online comics reader
 URL:              http://buoh.steve-o.org/
 Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.gz
@@ -34,7 +34,7 @@
 
 perl -pi -e "s,Terminal=0,Terminal=false,g" $RPM_BUILD_ROOT%{_datadir}/applications/buoh.desktop
 desktop-file-install --delete-original			\
-  --vendor=gnome								\
+  --vendor=fedora								\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora						\
   $RPM_BUILD_ROOT%{_datadir}/applications/buoh.desktop
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/buoh*.png
 
 %changelog
+* Web Dec 28 2005 - Chris Chabot  - 0.8.1-4
+- Changed desktop entry vendor to fedora
+
 * Mon Dec 27 2005 - Chris Chabot  - 0.8.1-3
 - Added desktop file utils to PreReq, and used to install .desktop file
   with Fedora category



From fedora-extras-commits at redhat.com  Wed Dec 28 10:27:10 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 28 Dec 2005 05:27:10 -0500
Subject: owners owners.list,1.485,1.486
Message-ID: <200512281027.jBSARgRq018376@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18359

Modified Files:
	owners.list 
Log Message:
Transfer ownership of python-formencode


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -r1.485 -r1.486
--- owners.list	27 Dec 2005 22:15:51 -0000	1.485
+++ owners.list	28 Dec 2005 10:27:09 -0000	1.486
@@ -998,7 +998,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-formencode|FormEncode is a validation and form generation package.|oliver.andrich at gmail.com|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|
 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|



From fedora-extras-commits at redhat.com  Wed Dec 28 12:07:20 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 28 Dec 2005 07:07:20 -0500
Subject: rpms/bzflag/devel bzflag-2.0.4-stringdos.patch, NONE,
	1.1 bzflag.spec, 1.19, 1.20 bzflag-2.0.2-isoc++.patch, 1.1, NONE
Message-ID: <200512281207.jBSC7rRQ022083@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22052

Modified Files:
	bzflag.spec 
Added Files:
	bzflag-2.0.4-stringdos.patch 
Removed Files:
	bzflag-2.0.2-isoc++.patch 
Log Message:
don't crash on maliciously formed callsign, etc. strings (#176626, patch backported from upstream CVS)


bzflag-2.0.4-stringdos.patch:

--- NEW FILE bzflag-2.0.4-stringdos.patch ---
--- bzflag-2.0.4.20050930/src/game/PlayerInfo.cxx.stringdos	2005-09-28 02:24:42.000000000 +0200
+++ bzflag-2.0.4.20050930/src/game/PlayerInfo.cxx	2005-12-28 12:39:57.000000000 +0100
@@ -108,6 +108,12 @@
   buf = nboUnpackString(buf, email, EmailLen);
   buf = nboUnpackString(buf, token, TokenLen);
   buf = nboUnpackString(buf, clientVersion, VersionLen);
+
+  // terminate the strings
+  callSign[CallSignLen - 1] = '\0';
+  email[EmailLen - 1] = '\0';
+  token[TokenLen - 1] = '\0';
+  clientVersion[VersionLen - 1] = '\0';
   cleanEMail();
 
   DEBUG2("Player %s [%d] sent version string: %s\n",


Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bzflag.spec	25 Nov 2005 12:15:09 -0000	1.19
+++ bzflag.spec	28 Dec 2005 12:07:01 -0000	1.20
@@ -7,14 +7,14 @@
 Summary: 3D multi-player tank battle game
 Name: bzflag
 Version: 2.0.4
-Release: 1
+Release: 2
 License: GPL
 Group: Amusements/Games
 URL: http://bzflag.org
 Source0: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
 Source1: bzflag.desktop
 Patch0: bzflag-2.0.4-lookup.patch
-Patch1: bzflag-2.0.2-isoc++.patch
+Patch1: bzflag-2.0.4-stringdos.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 %if %_modular_X
 BuildRequires: libXi-devel
@@ -48,7 +48,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?date:.%{date}}
-%patch0 -p1 -b .isoc++
+%patch0 -p1 -b .lookup
+%patch1 -p1 -b .stringdos
 
 %build
 # Use PIE because bzflag/bzfs are networked server applications
@@ -93,6 +94,10 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Dec 28 2005 Nils Philippsen  2.0.4-2
+- don't crash on maliciously formed callsign, etc. strings (#176626, patch
+  backported from upstream CVS)
+
 * Mon Nov 21 2005 Nils Philippsen  2.0.4-1
 - version 2.0.4
 - update lookup patch


--- bzflag-2.0.2-isoc++.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 28 12:25:51 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 28 Dec 2005 07:25:51 -0500
Subject: rpms/bzflag/FC-4 bzflag-2.0.4-stringdos.patch, NONE, 1.1 bzflag.spec,
	1.16, 1.17 bzflag-2.0.2-isoc++.patch, 1.1, NONE
Message-ID: <200512281226.jBSCQNg3022345@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22325

Modified Files:
	bzflag.spec 
Added Files:
	bzflag-2.0.4-stringdos.patch 
Removed Files:
	bzflag-2.0.2-isoc++.patch 
Log Message:
don't crash on maliciously formed callsign, etc. strings (#176626, patch backported from upstream CVS)


bzflag-2.0.4-stringdos.patch:

--- NEW FILE bzflag-2.0.4-stringdos.patch ---
--- bzflag-2.0.4.20050930/src/game/PlayerInfo.cxx.stringdos	2005-09-28 02:24:42.000000000 +0200
+++ bzflag-2.0.4.20050930/src/game/PlayerInfo.cxx	2005-12-28 12:39:57.000000000 +0100
@@ -108,6 +108,12 @@
   buf = nboUnpackString(buf, email, EmailLen);
   buf = nboUnpackString(buf, token, TokenLen);
   buf = nboUnpackString(buf, clientVersion, VersionLen);
+
+  // terminate the strings
+  callSign[CallSignLen - 1] = '\0';
+  email[EmailLen - 1] = '\0';
+  token[TokenLen - 1] = '\0';
+  clientVersion[VersionLen - 1] = '\0';
   cleanEMail();
 
   DEBUG2("Player %s [%d] sent version string: %s\n",


Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/FC-4/bzflag.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bzflag.spec	29 Nov 2005 12:33:38 -0000	1.16
+++ bzflag.spec	28 Dec 2005 12:25:50 -0000	1.17
@@ -7,14 +7,14 @@
 Summary: 3D multi-player tank battle game
 Name: bzflag
 Version: 2.0.4
-Release: 0.fc4.2
+Release: 0.fc4.3
 License: GPL
 Group: Amusements/Games
 URL: http://bzflag.org
 Source0: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
 Source1: bzflag.desktop
 Patch0: bzflag-2.0.4-lookup.patch
-Patch1: bzflag-2.0.2-isoc++.patch
+Patch1: bzflag-2.0.2-stringdos.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 %if %_modular_X
 BuildRequires: libXi-devel
@@ -48,7 +48,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?date:.%{date}}
-%patch0 -p1 -b .isoc++
+%patch0 -p1 -b .stringdos
 
 %build
 # Use PIE because bzflag/bzfs are networked server applications
@@ -93,6 +93,10 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Dec 28 2005 Nils Philippsen  2.0.4-0.fc4.3
+- don't crash on maliciously formed callsign, etc. strings (#176626, patch
+  backported from upstream CVS)
+
 * Tue Nov 29 2005 Nils Philippsen  2.0.4-0.fc4.2
 - bump release to make build system build
 


--- bzflag-2.0.2-isoc++.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 28 12:28:39 2005
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Wed, 28 Dec 2005 07:28:39 -0500
Subject: rpms/bzflag/FC-4 bzflag.spec,1.17,1.18
Message-ID: <200512281229.jBSCTCT8022406@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22389

Modified Files:
	bzflag.spec 
Log Message:
fix stringdos patch filename



Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/FC-4/bzflag.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bzflag.spec	28 Dec 2005 12:25:50 -0000	1.17
+++ bzflag.spec	28 Dec 2005 12:28:39 -0000	1.18
@@ -14,7 +14,7 @@
 Source0: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
 Source1: bzflag.desktop
 Patch0: bzflag-2.0.4-lookup.patch
-Patch1: bzflag-2.0.2-stringdos.patch
+Patch1: bzflag-2.0.4-stringdos.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 %if %_modular_X
 BuildRequires: libXi-devel



From fedora-extras-commits at redhat.com  Wed Dec 28 14:25:42 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 28 Dec 2005 09:25:42 -0500
Subject: rpms/xmms/devel xmms.spec,1.12,1.13
Message-ID: <200512281426.jBSEQE6g026276@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26257

Modified Files:
	xmms.spec 
Log Message:
* 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)
- Add missing modular Xorg BuildReqs, this (re)enables session managment
  support and the openGL plugins.



Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xmms.spec	20 Dec 2005 14:47:55 -0000	1.12
+++ xmms.spec	28 Dec 2005 14:25:41 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: The X MultiMedia System, a media player
 Name: xmms
 Version: 1.2.10
-Release: 18.1%{?dist}
+Release: 19%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -28,6 +28,10 @@
 
 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: zlib-devel
 Requires(pre): 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
@@ -80,7 +84,10 @@
   --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
 
 gcc -fPIC $RPM_OPT_FLAGS -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \
@@ -147,6 +154,12 @@
 %{_datadir}/aclocal/xmms.m4
 
 %changelog
+* 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)
+- Add missing modular Xorg BuildReqs, this (re)enables session managment
+  support and the openGL plugins.
+
 * Tue Dec 20 2005 Matthias Saou  1:1.2.10-18.1
 - Update gcc4 patch to include fix for xmms.org bug #1730, fixes FC5 build.
 



From fedora-extras-commits at redhat.com  Wed Dec 28 14:27:52 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 28 Dec 2005 09:27:52 -0500
Subject: rpms/xmms/FC-4 xmms.spec,1.11,1.12
Message-ID: <200512281428.jBSESOTa026359@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xmms/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26331

Modified Files:
	xmms.spec 
Log Message:
* 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)



Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/FC-4/xmms.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xmms.spec	7 Dec 2005 11:59:57 -0000	1.11
+++ xmms.spec	28 Dec 2005 14:27:52 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: The X MultiMedia System, a media player
 Name: xmms
 Version: 1.2.10
-Release: 18%{?dist}
+Release: 19%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -80,7 +80,10 @@
   --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
 
 gcc -fPIC $RPM_OPT_FLAGS -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \
@@ -147,6 +150,10 @@
 %{_datadir}/aclocal/xmms.m4
 
 %changelog
+* 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)
+
 * Sat May 28 2005 Matthias Saou  1:1.2.10-18
 - Build with explicit --with-pic to fix compilation of flac plugin on
   x86_64.



From fedora-extras-commits at redhat.com  Wed Dec 28 16:08:31 2005
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Wed, 28 Dec 2005 11:08:31 -0500
Subject: rpms/balsa/devel .cvsignore, 1.8, 1.9 balsa.spec, 1.11, 1.12 sources,
	1.8, 1.9
Message-ID: <200512281609.jBSG940T030285@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/balsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30264

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
- update to 2.3.8; enable gtkhtml and gtkspell.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Dec 2005 11:55:28 -0000	1.8
+++ .cvsignore	28 Dec 2005 16:08:31 -0000	1.9
@@ -1,2 +1,2 @@
+balsa-2.3.8.tar.bz2
 gmime-2.1.17.tar.bz2
-balsa-2.3.7.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- balsa.spec	4 Dec 2005 11:55:28 -0000	1.11
+++ balsa.spec	28 Dec 2005 16:08:31 -0000	1.12
@@ -1,8 +1,8 @@
 %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
+Version:        2.3.8
 Release:        1%{?dist}
 Summary:        Mail Client
 
@@ -15,18 +15,19 @@
 
 Requires: libesmtp >= 1.0.3
 Requires: scrollkeeper
-BuildRequires: scrollkeeper
-BuildRequires: libesmtp-devel >= 1.0.3
 BuildRequires: aspell-devel
+BuildRequires: desktop-file-utils
+BuildRequires: gnome-vfs2-devel
+BuildRequires: gtk2-devel
+BuildRequires: gtkhtml2-devel
+BuildRequires: gtkspell-devel
+BuildRequires: libesmtp-devel >= 1.0.3
+BuildRequires: libgnome-devel
+BuildRequires: libgnomeprint22-devel
+BuildRequires: libgnomeprintui22-devel
+BuildRequires: libgnomeui-devel
 BuildRequires: openssl-devel
-
-BuildRequires:  gtk2-devel
-BuildRequires:  libgnome-devel
-BuildRequires:  libgnomeui-devel
-BuildRequires:  gnome-vfs2-devel
-BuildRequires:  libgnomeprint22-devel
-BuildRequires:  libgnomeprintui22-devel
-BuildRequires:  desktop-file-utils
+BuildRequires: scrollkeeper
 
 %description
 Balsa is a GNOME email client which supports mbox, maildir, and mh
@@ -102,6 +103,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Pawel Salek  - 2.3.8-1
+- update to 2.3.8; enable gtkhtml and gtkspell.
+
 * Sun Dec  4 2005 Pawel Salek  - 2.3.7-1
 - update to upstream version 2.3.7. Use gmime-2.1.17
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Dec 2005 11:55:28 -0000	1.8
+++ sources	28 Dec 2005 16:08:31 -0000	1.9
@@ -1,2 +1,2 @@
+517c0a1cbd4dc85ec06a6c7b0f522ffa  balsa-2.3.8.tar.bz2
 4be55ee55e4b3966bd51fadbf5fb323b  gmime-2.1.17.tar.bz2
-d50a439a8b8c2be99e3b0108d5d6073e  balsa-2.3.7.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 28 17:12:19 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 28 Dec 2005 12:12:19 -0500
Subject: rpms/baobab/devel baobab.spec,1.6,1.7
Message-ID: <200512281712.jBSHCqYO032211@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32194

Modified Files:
	baobab.spec 
Log Message:
Rebuild with new libgtop


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- baobab.spec	8 Dec 2005 16:43:15 -0000	1.6
+++ baobab.spec	28 Dec 2005 17:12:19 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           baobab
 Version:        2.2.2
-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
+* Wed Dec 28 2005 Thorsten Leemhuis  - 2.2.2-2
+- Rebuild
+
 * Thu Dec 08 2005 Thorsten Leemhuis  - 2.2.2-1
 - Update to 2.2.2
 



From fedora-extras-commits at redhat.com  Wed Dec 28 18:12:31 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 28 Dec 2005 13:12:31 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.28,1.29
Message-ID: <200512281813.jBSID3Ef001779@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1753

Modified Files:
	Inventor.spec 
Log Message:
Remove patch10 (#173879, #175251 are reported to be fixed).


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Inventor.spec	22 Dec 2005 11:37:44 -0000	1.28
+++ Inventor.spec	28 Dec 2005 18:12:31 -0000	1.29
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        17%{?dist}
+Release:        18%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -33,11 +33,6 @@
 # Declare SoTempPath forward
 Patch8:		Inventor-SoPath.diff
 
-# Work around to RH shipping a broken libGLw
-# - PR #173879: libGLw headers missing
-# - PR #175251: libGLw missing motif
-Patch10:	Inventor-redhat-bugs.diff
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libGLU-devel
@@ -134,8 +129,6 @@
 %patch7 -p0
 %patch8 -p1
 
-%patch10 -p1
-
 grep -Rl __ia64 lib* | while read a; do \
   sed -i -e 's,__ia64,__ia64__,g' \
   -e 's,__ia64____,__ia64__,g' \
@@ -307,6 +300,9 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Wed Dec 28 2005 Ralf Cors??pius  - 2.1.5-18
+- Remove patch10 (#173879, #175251 are reported to be fixed).
+
 * Thu Dec 22 2005 Ralf Cors??pius  - 2.1.5-17
 - Remove BR: libX11-devel (#173712 reported to be fixed).
 - Remove BR: libGL-devel (#175253 reported to be fixed).



From fedora-extras-commits at redhat.com  Wed Dec 28 18:54:18 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 28 Dec 2005 13:54:18 -0500
Subject: web/html/docs/mirror generated-index.php, 1.1, 1.2 index.php, 1.1,
	1.2 ln-legalnotice.php, 1.1, 1.2 rv-revhistory.php, 1.1,
	1.2 sn-client-config.php, 1.1, 1.2 sn-planning-and-setup.php,
	1.1, 1.2 sn-server-config.php, 1.1, 1.2
Message-ID: <200512281854.jBSIsmQN002009@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/fedora/web/html/docs/mirror
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1977

Modified Files:
	generated-index.php index.php ln-legalnotice.php 
	rv-revhistory.php sn-client-config.php 
	sn-planning-and-setup.php sn-server-config.php 
Log Message:
Update to 0.37.2




Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/mirror/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	27 Nov 2005 17:18:38 -0000	1.1
+++ index.php	28 Dec 2005 18:54:16 -0000	1.2
@@ -20,7 +20,7 @@
     at http://bugzilla.redhat.com/.  When you file your bug, select "Fedora Documentation" as the
     Product, and select the title of this document as
     the Component.  The version of this document is
-    mirror-tutorial-0.37.1 (2005-11-27).
+    mirror-tutorial-0.37.2 (2005-12-28).
   
    
     The maintainers of this document will automatically receive your bug report.
     On behalf of the entire Fedora community, thank you for helping us make
@@ -37,7 +37,7 @@
 	    Using a command line interface
 	  
    1.3. About Mirrors
    
 	A mirror
-	 is a server
+	 is a server
 	that provides a copy of one or more collections of files.
 	Mirroring a site reduces traffic to the original source site,
 	thus spreading the stress and bandwidth costs of many users
@@ -47,7 +47,7 @@
 	managing Internet services.
       
    
 	The site from which you retrieve files to build your mirror is
-	called an upstream mirror. If possible, choose an upstream mirror that is
+	called an upstream mirror. If possible, choose an upstream mirror that is
 	located close to you geographically. This reduces unnecessary
 	traffic across transcontinental sections of the Internet, where
 	bandwidth is limited and expensive. Use only upstream mirrors


Index: ln-legalnotice.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/mirror/ln-legalnotice.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ln-legalnotice.php	27 Nov 2005 17:18:38 -0000	1.1
+++ ln-legalnotice.php	28 Dec 2005 18:54:16 -0000	1.2
@@ -26,7 +26,7 @@
     They all may be freely redistributed with documentation
     produced for the Fedora Project.
     
    
-    mirror-tutorial-0.37.1 (2005-11-27)
+    mirror-tutorial-0.37.2 (2005-12-28)
   
    
     Red Hat and the Red Hat "Shadow Man" logo are registered trademarks of
     Red Hat, Inc. in the United States and other countries.


Index: rv-revhistory.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/mirror/rv-revhistory.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rv-revhistory.php	27 Nov 2005 17:18:38 -0000	1.1
+++ rv-revhistory.php	28 Dec 2005 18:54:16 -0000	1.2
@@ -85,6 +85,11 @@
 	  
    
 	    Minor revision fixing service reload command.
 	  
    
+	
    
 
    
 	    Chinese, Japanese, and Korean graphical installations
-	    started using the "nofb" option will
+	    started using the nofb option will
 	    start in English, and then switch to the appropriate
 	    language once the graphical phase of the installation
 	    process begins.
@@ -833,7 +838,7 @@
 
    
 
    
 
    
-7.1.1.??Fedora Extras Repository
    
+7.1.1.??Fedora Extras Repository
    
 
    
 
 
    
@@ -904,7 +909,7 @@
 
    
 
    
 
    
-7.1.3.??Enabling the slocate Database
    
+7.1.3.??Enabling the slocate Database
    
 
    
 
 
    
@@ -918,7 +923,7 @@
 
    
 
    
 
    
-7.1.4.??Stricter Controls in openssh
    
+7.1.4.??Stricter Controls in openssh
    
 
    
 
 
    
@@ -1063,7 +1068,7 @@
 
    
 
    
 
    
-7.2.1.3.??Following Generic Textbooks
    
+7.2.1.3.??Following Generic Textbooks
    
 
    
 
 
    
@@ -1411,7 +1416,7 @@
 
    
 
    
 
    
-7.4.1.??Language Support
    
+7.4.1.??Language Support
    
 
    
 
 
    
@@ -1537,7 +1542,7 @@
 
    
 
    
 
    
-7.6.1.??httpd
    
+7.6.1.??httpd
    
 
    
 
 
    
@@ -1611,7 +1616,7 @@
 
    
 
    
 
    
-7.8.1.??X Window System (Graphics)
    
+7.8.1.??X Window System (Graphics)
    
 
    
 
 
    This section contains information related to the X Window
@@ -1666,7 +1671,7 @@
 
    
 
    
 
    
-7.8.1.2.1.??The /usr/X11R6 directory hierarchy
    
+7.8.1.2.1.??The /usr/X11R6 directory hierarchy
    
 
    
 
 
    
@@ -1683,7 +1688,7 @@
 
    
 
    
 
    
-7.8.1.2.2.??Imake
    
+7.8.1.2.2.??Imake
    
 
    
 
 
    Imake is no longer used to build the X
@@ -1702,7 +1707,7 @@
 
    
 
    
 
    
-7.8.1.2.3.??The systemwide app-defaults directory
    
+7.8.1.2.3.??The systemwide app-defaults directory
    
 
    
 
 
    The system app-defaults directory for X resources, is now
@@ -1957,7 +1962,7 @@
 
    
 
    
 
    
-9.2.??Packages Removed
    
+9.2.??Packages Removed
    
 
    
 
 
    
@@ -1980,7 +1985,7 @@
 
    
 
    
 
    
-10.??Notes
    
+10.??Notes
    
 
    
 
 
    



From fedora-extras-commits at redhat.com  Wed Dec  7 19:37:25 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed,  7 Dec 2005 14:37:25 -0500
Subject: web/html/docs/release-notes/fc5/test1-latest-it index.php,1.1,1.2
Message-ID: <200512071937.jB7Jbtvg001792@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-latest-it
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1682/fc5/test1-latest-it

Modified Files:
	index.php 
Log Message:
Updating latest, also including ru and it trans as part of latest since they have updated their translations since the initial trans freeze.


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 index.php
Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/release-notes/fc5/test1-latest-it/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	24 Nov 2005 21:40:58 -0000	1.1
+++ index.php	7 Dec 2005 19:37:22 -0000	1.2
@@ -7,30 +7,2093 @@
 
 ?>
 
-
    Note di rilascio per Fedora Core 5 test1
       Avanti
    Note di rilascio per Fedora Core 5 test1
    Copyright © 2005 Red Hat, Inc.
    1. Benvenuti in Fedora Core 5 test1
    2. Note legali
    3. Introduzione e Release Notes Tecniche
    4. Requisiti Hardware
    4.1. Requisiti CPU
    4.2. Requisiti di spazio su sisco rigido
    4.3. Requisiti di memoria
    4.4. Requisiti Hardware PPC
    5. Descrizione di questa release
    6. Note Relative all'installazione
    6.1. Note di installazione PPC
    6.1.1. Requisiti hardware PPC!
 
    6.2. Note su anaconda
    6.3. Problemi relativi all'intallazione
    7. Note specifiche sui pacchetti
    7.1. Componenti di base
    7.1.1. Repositorio Fedora Extras
    7.1.2. Il demone di audit auditd ed i files di log
    7.1.3. LinuxThreads contro NPTL
    7.1.4. Abilitare il database slocate
    7.1.5. Controlli più stretti in openssh
    7.1.6. I symlinks Perl Binary Compat
    7.1.7. Strumenti di configurazione del server e del sistema
    7.1.8. Raccomandazioni sul pacchetto Java
    7.2. Core
    7.2.1. yum
    7.2.2. 
-    Linux Kernel
-  
    7.2.3. Sicurezza
    7.3. Internationalizazione (i18n)
    7.3.1. Supporto Linguaggi
    7.4. Multimedia
    7.4.1. Software multimediale escluso
    7.4.2. CD e DVD Authoring e Burning
    7.5. Giochi ed intrattenimento
    7.6. Web Servers
    7.6.1. httpd
    7.7. Samba (Compatibilità con il File System di Windows)
    7.8. Sistema X Window (Grafico)
    7.8.1. xorg-x11
    7.9. Giochi ed intrattenimento
    8. Movimenti dei pacchetti
    8.1. Pacchetti modificati
    8.1!
 .1. Pacchetti aggiunti
    8.1.2. Pacchetti Rimossi
    8.2. Note
    9. Una descrizione del Fedora Project
    1. Benvenuti in Fedora Core 5 test1
    [Attenzione]Informazioni non aggiornate
    
-      Il contenuto in questa sezione deve essere aggiornato per Fedora Core
-      5 test1
-    
    
-    Fedora Core è una piattaforma basata su Linux completamente gratutita, amichevole, sicura e
-    general purpose.  Fedora Project è un progetto open source che
+
    
+
    
+
    
+
    
+(Ultime) Note di rilascio per Fedora Core 5 test1
    
+
    Copyright ?? 2005 Red Hat, Inc.
    
+
    
+
    
+    Questo documento ?? rilasciato sotto i termini della GNU Free Documentation
+    License.  Per maggiori dettagli, leggi le note legali complete su Sezione??2, ???Note legali???.
+  
    
+
    
+
+
+
+
+
+
    [Tip]Le ultime note di rilascio sul Web
    
+      Queste note di rilascio possono essere aggiornate.  Visita http://fedora.redhat.com/docs/release-notes/
+      per vedere le ultime note di rilascio per Fedora Core 5 test1.
+    
    
+
    
+
    
+
    
+
    
+
    
+
    
+
    1. Benvenuti in Fedora Core 5 test1
    
+
    1.1. Che c'?? di nuovo in Fedora Core 5 test1
    
+
    2. Note legali
    
+
    3. Introduzione e Release Notes Tecniche
    
+
    4. Requisiti Hardware
    
+
    
+
    4.1. Requisiti CPU
    
+
    4.2. Requisiti di spazio su sisco rigido
    
+
    4.3. Requisiti di memoria
    
+
    4.4. Requisiti Hardware PPC
    
+
    
+
    5. Descrizione di questa release
    
+
    6. Note relative all'installazione
    
+
    
+
    6.1. Note di installazione PPC
    
+
    6.2. Note su anaconda
    
+
    6.3. Cambiamenti nel programma d'installazione
    
+
    6.4. Problemi relativi all'intallazione
    
+
    
+
    7. Note specifiche sui pacchetti
    
+
    
+
    7.1. Componenti di base
    
+
    
+
    7.1.1. Repositorio Fedora Extras
    
+
    7.1.2. Il demone di audit auditd ed i files
+        di log
    
+
    7.1.3. Abilitare il database slocate
    
+
    7.1.4. Controlli pi?? stretti in openssh
    
+
    7.1.5. Raccomandazioni sul pacchetto Java
    
+
    
+
    7.2. Core
    
+
    
+
    7.2.1. Linux Kernel
    
+
    7.2.2. Sicurezza
    
+
    
+
    7.3. 
+    Strumenti di sviluppo
+  
    
+
    7.3.1. Ambiente Java-like
    
+
    7.4. Internazionalizzazione (i18n)
    
+
    7.4.1. Supporto Linguaggi
    
+
    7.5. Multimedia
    
+
    
+
    7.5.1. Software multimediale escluso
    
+
    7.5.2. CD e DVD Authoring e masterizzazione
    
+
    
+
    7.6. Web Servers
    
+
    7.6.1. httpd
    
+
    7.7. Samba (Compatibilit?? con il File System di Windows)
    
+
    7.8. Il sistema X Window (Grafico)
    
+
    7.8.1. Il sistema X Window (Grafico)
    
+
    7.9. Giochi ed intrattenimento
    
+
    
+
    8. Informazioni legacy
    
+
    9. Movimenti dei pacchetti
    
+
    
+
    9.1. Pacchetti aggiunti
    
+
    9.2. Pacchetti Rimossi
    
+
    
+
    10. Note
    
+
    11. Una descrizione del Fedora Project
    
+
    
+
    
+
    
+
    
+1.??Benvenuti in Fedora Core 5 test1
    
+
    
+
    
+
    
+    Fedora Core ?? una piattaforma basata su Linux completamente gratutita, amichevole, sicura e
+    general purpose.  Fedora Project ?? un progetto open source che ?? utilizzabile, modificabile e distribuibile
+    liberamente da chiunque, ora e per sempre.  Il Fedora Project ?? un progetto open source che 
     esplora le ultime tecnologie e concetti sponsorizzato da Red Hat e
-    supportato dalla comunità Fedora.
-  
    
+
    [Suggerimento]Ultime Release Notes sul Web
    
+    supportato dalla comunit?? Fedora.
+  
    
+
    
+
+
+
+
+
+
    [Caution]Questa ?? una test release, non intesa per gli utenti finali
    
+
    
+      Questa ?? una test release ed ?? distribuita per gli sviluppatori e testers
+      per partecipare e fornire giudizzi. Non ?? intesa per gli
+      utenti finali.
+    
    
+
    
+      Sottoscrivi le mailing lists fedora-test e fedora-devel per tenere traccia
+      dei cambiamenti pi?? importanti nella versione di sviluppo attuale
+      e dare il tuo giudizio agli sviluppatori. Fedora Project ha bisogno che tu
+      invii i rapporti d'errore e le migliorie per dare all'utente finale una migliore
+      versione definitva. Per maggiori informazioni su questo, fa riferimento al
+      seguente documento:
+    
    
+
    
+      http://fedoraproject.org/wiki/BugsAndFeatureRequests. 
+      
+    
    
+
    
+
    
+
+
+
+
+
    [Tip]Ultime Release Notes sul Web
    
       Queste release notes devono essere aggiornate.  Visita http://fedora.redhat.com/docs/release-notes/
       per vedere le ultimerelease notes per Fedora Core 5 test1.
-    
    
+    
    
+
    
     Fa riferimento a queste pagine web per cercare maggiori informazioni su Fedora:
-  
       Avanti
       2. Note legali
    
+      
    
+
    
+
    
+
    
+
    
+1.1.??Che c'?? di nuovo in Fedora Core 5 test1
    
+
    
+
    
+
      
+
    • Il software di virtualizzazione Xen ed lo strumento di amministrazione dei
+	  pacchetti yum sono ora ben integrati all'interno del proramma di installazione Fedora.
+	  L'interfaccia del programma d'installazione ?? molto sequenziale.  Il login remoto ed
+	  il supporto per i tracebacks ?? incluso.
[...1719 lines suppressed...]
+
      jrefactory-2.8.9-3jpp_1fc 
      
+
      mockobjects-0.09-12jpp_2fc 
      
+
      monolog-1.8.6-1jpp_5fc 
      
+
      oldkilim-1.1.3-2jpp_3fc 
      
+
      p6spy-1.3-2jpp_3fc 
      
+
      fractal-2.2-2jpp_1fc 
      
+
      velocity-1.4-3jpp_1fc 
      
+
      werken.xpath-0.9.4-0.beta.9jpp_1fc 
      
+
      gnu.regexp-1.1.4-7jpp_1fc 
      
+
      nanoxml-2.2.3-3jpp_3fc 
      
+
      asm-1.5.3-1jpp_1fc 
      
+
      cairo-1.0.0-1 
      
+
      objectweb-anttask-1.2-1jpp_1fc 
      
+
      objectweb-deploysched-0.2-1jpp_1fc 
      
+
      carol-1.8.9.3-1jpp_5fc 
      
+
      jacorb-2.2-3jpp_3fc 
      
+
      jakarta-commons-cli-1.0-6jpp_1fc 
      
+
      tanukiwrapper-3.1.1-4jpp_3fc 
      
+
      tog-pegasus-2.4.1-4.FC5 
      
+
      joram-4.1.5-1jpp_5fc 
      
+
      jotm-2.0.5-1jpp_3fc 
      
+
      lucene-1.4.3-1jpp_1fc 
      
+
      geronimo-specs-1.0-0.M2.2jpp_4fc 
      
+
      jakarta-commons-codec-1.3-2jpp_1fc 
      
+
      howl-logger-0.1.8-1jpp_3fc 
      
+
      dhcdbd-1.8-1 
      
+
      aspell-ru-0.99f7-2 
      
+
      hplip-0.9.5-3 
      
+
      gpart-0.1h-1 
      
+
      iso-codes-0.47-1 
      
+
      gif89encoder-0.90-0.b.1jpp_1fc 
      
+
      jonathan-rmi-3.1-5 
      
+
      pup-0.0.2-1 
      
+
      jorm-2.4.3-1jpp_2fc 
      
+
      jorm-rdb-adapter-2.6-1jpp_1fc 
      
+
      medor-1.4.4-1jpp_1fc 
      
+
      medor-expression-1.4.2-1jpp_1fc 
      
+
      perseus-cache-1.3.4-1jpp_1fc 
      
+
      perseus-concurrency-1.4-1jpp_1fc 
      
+
      perseus-dependency-1.4-1jpp_1fc 
      
+
      perseus-distribution-1.3.2-1jpp_1fc 
      
+
      perseus-fos-1.3.1-1jpp_1fc 
      
+
      perseus-persistence-1.3.4-1jpp_1fc 
      
+
      perseus-pool-1.3.3-1jpp_1fc 
      
+
      systemtap-0.4.1-2 
      
+
      pcmciautils-007-1 
      
+
      scim-tables-0.5.3-4 
      
+
      libsemanage-1.3.2-1 
      
+
      scim-hangul-0.2.0-5.fc5 
      
+
      scim-pinyin-0.5.91-1 
      
+
      scim-chewing-0.2.1-1 
      
+
      scim-qtimm-0.9.4-1 
      
+
      libchewing-0.2.7-1 
      
+
      kasumi-0.9-3.fc5 
      
+
      kexec-tools-1.101-2 
      
+
      libsetrans-0.1.7-1 
      
+
      icu-3.4-4 
      
+
      libiec61883-1.0.0-8.fc5 
      
+
    
+
    
+
    
+
    
+9.2.??Pacchetti Rimossi
    
+
    
+
    
+
    
+	Questi pacchetti sono stati rimossi:
+      
    
+
    ccs-0.25-0.17 
    
+
    cman-1.0-0.pre33.15 
    
+
    cman-kernel-2.6.11.5-20050601.152643.FC4.2 
    
+
    dlm-1.0-0.pre21.10 
    
+
    dlm-kernel-2.6.11.5-20050601.152643.FC4.2 
    
+
    fence-1.27-16 
    
+
    GFS-kernel-2.6.11.8-20050601.152643.FC4.2 
    
+
    gnbd-1.0-0.pre14.6 
    
+
    gulm-1.0-0.pre30.1 
    
+
    iddev-1.9-21 
    
+
    magma-1.0-0.pre21.7 
    
+
    magma-plugins-1.0-0.pre18.3 
    
+
    
+
    
+
    
+
    
+
    
+10.??Note
    
+
    
+
    
+
    
+      L'utilit?? di configurazione system-config-mouse
+      ?? stata scartata in questa release poich?? synaptic e la configurazione
+      dei mouse a 3 bottoni viene fatta automaticamente ed i mouse
+      seriali non sono supportati.
+    
    
+
    
+      Gli screensavers, per impostazione predefinita non sono pi?? installati?  Spieghiamo
+      il perch?? e forniamo i comandi per installarli.
+    
    
+
    
+
    
+
    
+
    
+11.??Una descrizione del Fedora Project
    
+
    
+
    
+
    
+      L'obiettivo del Fedora Project ?? di lavorare con la comunit?? Linux per
+      creare un sistema operativo completo, general-purpose esclusivamente
+      da software open source.  Lo sviluppo ?? compiuto in un forum pubbllico.
+      Il progetto produce delle releases su base temporale di Fedora Core approssimativamente
+      2-3 volte l'anno, con uno scadenziario pubblico delle release.  Le squadre
+      di ingegneri Red Hat continuano a participare alla costruzione della Fedora Core
+      ed invitano ed incoraggiano pi?? partecipanti esterni di quanto era
+      possibile in passato.  Utilizzando questo processo pi?? aperto, speriamo di
+      fornire un sistema operativo molto pi?? in linea con gli ideali di software
+      libero e molto pi?? appetibile alla comunit?? open source.
+    
    
+
    
+      Per maggiori informazioni, fate riferimento al sito web di Fedora Project:
+    
    
+
    
+      http://fedora.redhat.com/
+    
    
+
    
+      In aggiunta al sito, sono disponibili le seguenti
+      mailing lists:
+    
    
+
      
+
    • 
+	  fedora-list at redhat.com ??? Per gli utenti delle releases di Fedora Core
+	
      • 
+
    • 
+	  fedora-test-list at redhat.com ??? Per i testers delle test
+	  releases di Fedora Core
+	
      • 
+
    • 
+	  fedora-devel-list at redhat.com ??? Per gli sviluppatori,
+	  sviluppatori, sviluppatori
+	
      • 
+
    • 
+	  fedora-docs-list at redhat.com ??? Per i partecipanti al
+	  Documentation Project
+	
      • 
+
    • 
+	fedora-ambassadors-list at redhat.com ??? Per i componenti
+	della comunit?? che rappresentano il Fedora Project in pubblico.
+      
      • 
+
    
+
    
+    Per sottoscrivere ad una di queste liste, spedisci un email con la parola
+    "subscribe" nel soggetto a
+    <listname>-request
+    (dove
+    <listname>
+    ?? una delle sopraelencate liste.)
+  
    
+
    
+    Alternativamente, puoi sottoscriverti mediante l'interfaccia Web:
+  
    
+
    
+    http://www.redhat.com/mailman/listinfo/
+  
    
+
    
+      Il Fedora Project include anche un canale IRC (Internet Relay Chat).  IRC ?? una
+      forma di comunicazione real-time, basata su testo.  Con essa, puoi avere
+      conversazioni con pi?? persone contemporaneamente in un canale aperto o
+      chattare privatamente con qualcuno uno-a-uno.
+    
    
+
    
+      Per parlare con gli altri partecipanti al Fedora Project via IRC, accedi alla freenode IRC
+      network.  Inizialmente, potresti usare irc.freenode.net come
+      IRC server, anche se potresti decidere di selezionare un server che ti sia
+      geograficamente pi?? vicino.  Fai riferimento al sito web di freenode (http://www.freenode.net/) per ulteriori
+      informazioni.  I partecipanti a Fedora Project frequentano il canale
+      #fedora, mentre gli sviluppatori Fedora Project possono spesso essere
+      trovati sul canale #fedora-devel.  Alcuni dei progetti
+      pi?? grandi possono anche avere i propri canali; queste informazioni si possono
+      trovare sulle pagine del progetto.
+    
    
+
    
+      Per poter parlare sul canale #fedora, dovrai
+      registrare il tuo nickname (nick).
+      Ti verranno date istruzioni quando farai il /join al
+      cannale.
+    
    
+
    
+
+
+
+
+
+
    [Note]Nota
    
+	Red Hat non ha controllo sui canali IRC di Fedora Project o i loro
+	contenuti.
+      
    
+
    
+
    
 
 

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-latest-en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5518

Modified Files:
	index.php 
Log Message:
Externalizing this link; same info from a source accessible by the public.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/release-notes/fc5/test1-latest-en/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.php	7 Dec 2005 19:37:15 -0000	1.3
+++ index.php	7 Dec 2005 21:35:48 -0000	1.4
@@ -1,8 +1,9 @@
 initCommon(); 
+$template->initCommon();
+
 $template->displayHeader();
 
 ?>
@@ -45,9 +46,9 @@
 
    3. Introduction and Technical Release Notes
    
 
    4. Hardware Requirements
    
 
    
-
    4.1. CPU Requirements
    
-
    4.2. Hard Disk Space Requirements
    
-
    4.3. Memory Requirements
    
+
    4.1. CPU Requirements
    
+
    4.2. Hard Disk Space Requirements
    
+
    4.3. Memory Requirements
    
 
    4.4. PPC Hardware Requirements
    
 
    
 
    5. Overview of This Release
    
@@ -62,11 +63,11 @@
 
    
 
    7.1. Basic Components
    
 
    
-
    7.1.1. Fedora Extras Repository
    
+
    7.1.1. Fedora Extras Repository
    
 
    7.1.2. Audit Daemon auditd and Log
 	Files
    
-
    7.1.3. Enabling the slocate Database
    
-
    7.1.4. Stricter Controls in openssh
    
+
    7.1.3. Enabling the slocate Database
    
+
    7.1.4. Stricter Controls in openssh
    
 
    7.1.5. Java Package Recommendations
    
 
    
 
    7.2. Core
    
@@ -79,26 +80,26 @@
   
 
    7.3.1. Java-like Environment
    
 
    7.4. Internationalization (i18n)
    
-
    7.4.1. Language Support
    
+
    7.4.1. Language Support
    
 
    7.5. Multimedia
    
 
    
 
    7.5.1. Excluded Multimedia Software
    
 
    7.5.2. CD and DVD Authoring and Burning
    
 
    
 
    7.6. Web Servers
    
-
    7.6.1. httpd
    
+
    7.6.1. httpd
    
 
    7.7. Samba (Windows File System Compatibility)
    
 
    7.8. X Window System (Graphics)
    
-
    7.8.1. X Window System (Graphics)
    
+
    7.8.1. X Window System (Graphics)
    
 
    7.9. Games and Entertainment
    
 
    
 
    8. Legacy Information
    
 
    9. Packages Movement
    
 
    
 
    9.1. Packages Added
    
-
    9.2. Packages Removed
    
+
    9.2. Packages Removed
    
 
    
-
    10. Notes
    
+
    10. Notes
    
 
    11. An Overview of the Fedora Project
    
 
    
 
    
@@ -325,7 +326,7 @@
 
    
 
    
 
    
-4.1.??CPU Requirements
    
+4.1.??CPU Requirements
    
 
    
 
    
 
    This section lists the CPU specifications required by Fedora Core
@@ -369,7 +370,7 @@
 
    
 
    
 
    
-4.2.??Hard Disk Space Requirements
    
+4.2.??Hard Disk Space Requirements
    
 
    
 
 
    This section lists the disk space required to install Fedora Core
@@ -432,7 +433,7 @@
 
    
 
    
 
    
-4.3.??Memory Requirements
    
+4.3.??Memory Requirements
    
 
    
 
 
    This section lists the memory required to install Fedora Core
@@ -838,7 +839,7 @@
 
    
 
    
 
    
-7.1.1.??Fedora Extras Repository
    
+7.1.1.??Fedora Extras Repository
    
 
    
 
 
    
@@ -909,7 +910,7 @@
 
    
 
    
 
    
-7.1.3.??Enabling the slocate Database
    
+7.1.3.??Enabling the slocate Database
    
 
    
 
 
    
@@ -923,7 +924,7 @@
 
    
 
    
 
    
-7.1.4.??Stricter Controls in openssh
    
+7.1.4.??Stricter Controls in openssh
    
 
    
 
 
    
@@ -1068,7 +1069,7 @@
 
    
 
    
 
    
-7.2.1.3.??Following Generic Textbooks
    
+7.2.1.3.??Following Generic Textbooks
    
 
    
 
 
    
@@ -1360,7 +1361,7 @@
       5 test1. For more information, read this informative article:
     
    
 
    
-      http://post-office.corp.redhat.com/archives/rhselinux-project/2005-June/msg00001.html
+      http://www.livejournal.com/users/james_morris/5583.html
     
    
 
 
@@ -1416,7 +1417,7 @@
 
    
 
    
 
    
-7.4.1.??Language Support
    
+7.4.1.??Language Support
    
 
    
 
 
    
@@ -1542,7 +1543,7 @@
 
    
 
    
 
    
-7.6.1.??httpd
    
+7.6.1.??httpd
    
 
    
 
 
    
@@ -1616,7 +1617,7 @@
 
    
 
    
 
    
-7.8.1.??X Window System (Graphics)
    
+7.8.1.??X Window System (Graphics)
    
 
    
 
 
    This section contains information related to the X Window
@@ -1671,7 +1672,7 @@
 
    
 
    
 
    
-7.8.1.2.1.??The /usr/X11R6 directory hierarchy
    
+7.8.1.2.1.??The /usr/X11R6 directory hierarchy
    
 
    
 
 
    
@@ -1688,7 +1689,7 @@
 
    
 
    
 
    
-7.8.1.2.2.??Imake
    
+7.8.1.2.2.??Imake
    
 
    
 
 
    Imake is no longer used to build the X
@@ -1707,7 +1708,7 @@
 
    
 
    
 
    
-7.8.1.2.3.??The systemwide app-defaults directory
    
+7.8.1.2.3.??The systemwide app-defaults directory
    
 
    
 
 
    The system app-defaults directory for X resources, is now
@@ -1962,7 +1963,7 @@
 
    
 
    
 
    
-9.2.??Packages Removed
    
+9.2.??Packages Removed
    
 
    
 
 
    
@@ -1985,7 +1986,7 @@
 
    
 
    
 
    
-10.??Notes
    
+10.??Notes
    
 
    
 
 
    



From fedora-extras-commits at redhat.com  Wed Dec  7 22:13:52 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed,  7 Dec 2005 17:13:52 -0500
Subject: rpms/gdesklets - New directory
Message-ID: <200512072213.jB7MDqTw007504@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7495/gdesklets

Log Message:
Directory /cvs/extras/rpms/gdesklets added to the repository




From fedora-extras-commits at redhat.com  Wed Dec  7 22:13:58 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed,  7 Dec 2005 17:13:58 -0500
Subject: rpms/gdesklets/devel - New directory
Message-ID: <200512072213.jB7MDwGB007519@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7495/gdesklets/devel

Log Message:
Directory /cvs/extras/rpms/gdesklets/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Dec  7 22:14:08 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed,  7 Dec 2005 17:14:08 -0500
Subject: rpms/gdesklets Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512072214.jB7ME8uS007553@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7540

Added Files:
	Makefile import.log 
Log Message:
Setup of module gdesklets


--- NEW FILE Makefile ---
# Top level Makefile for module gdesklets
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec  7 22:14:15 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed,  7 Dec 2005 17:14:15 -0500
Subject: rpms/gdesklets/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512072214.jB7MEFNQ007571@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7540/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gdesklets


--- NEW 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 Dec  7 22:14:46 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed,  7 Dec 2005 17:14:46 -0500
Subject: rpms/gdesklets import.log,1.1,1.2
Message-ID: <200512072215.jB7MFGd6007649@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7609

Modified Files:
	import.log 
Log Message:
auto-import gdesklets-0.35.2-20 on branch devel from gdesklets-0.35.2-20.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Dec 2005 22:14:06 -0000	1.1
+++ import.log	7 Dec 2005 22:14:44 -0000	1.2
@@ -0,0 +1 @@
+gdesklets-0_35_2-20:HEAD:gdesklets-0.35.2-20.src.rpm:1133993681



From fedora-extras-commits at redhat.com  Wed Dec  7 22:14:51 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed,  7 Dec 2005 17:14:51 -0500
Subject: rpms/gdesklets/devel NullObject-1.0-fix.patch, NONE,
	1.1 gdesklets.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512072214.jB7MEpWE007641@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7609/devel

Modified Files:
	.cvsignore sources 
Added Files:
	NullObject-1.0-fix.patch gdesklets.spec 
Log Message:
auto-import gdesklets-0.35.2-20 on branch devel from gdesklets-0.35.2-20.src.rpm

NullObject-1.0-fix.patch:

--- NEW FILE NullObject-1.0-fix.patch ---
 NullObject.py |    2 ++
 1 files changed, 2 insertions(+)

Index: gDesklets-0.35.2/NullObject.py
===================================================================
--- gDesklets-0.35.2.orig/NullObject.py	2005-11-29 16:35:03.000000000 -0600
+++ gDesklets-0.35.2/NullObject.py	2005-11-29 16:36:30.000000000 -0600
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
 class __Null:
 
     """Null object that does __nothing__"""


--- NEW FILE gdesklets.spec ---
Name:           gdesklets
Version:        0.35.2
Release:        20%{?dist}
Summary:        Advanced architecture for desktop applets

Group:          User Interface/Desktops
License:        GPL

URL:            http://gdesklets.gnomedesktop.org/
Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
Patch0:		NullObject-1.0-fix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


############################################################################
#
# Starting from 0.35.x, gDesklets no longer requires GConf. Future maintainers
# must avoid using it.
#
##########################################################################

BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1
BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0
# Requires:	gnome-python2-gconf >= 2.6.0
Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
Requires(post): desktop-file-utils
Requires(post): shared-mime-info
Requires(postun): desktop-file-utils
Requires(postun): shared-mime-info


%description
'gDesklets' provides an advanced architecture for desktop applets -
tiny displays that sit on your desktop such as status meters, icon
bars, weather sensors, news tickers.

%prep
%setup -q -n gDesklets-%{version}
%patch0 -p1 

%build

%configure \
  --disable-schemas-install
make %{?_smp_mflags}


#%_install
#rm -rf ${RPM_BUILD_ROOT}
#make -e install DESTDIR=${RPM_BUILD_ROOT}

%install
[ -n $RPM_BUILD_ROOT -a $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
env DESTDIR=$RPM_BUILD_ROOT make -e install
%find_lang %{name}


desktop-file-install --vendor=fedora  \
  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
  --add-category X-Fedora \
  --add-category Accessories \
  --add-category Application \
  --add-category Utility \
        data/%{name}.desktop


mkdir -p  ${RPM_BUILD_ROOT}{%{_bindir},%{_datadir}/%{name}/data/}
ln -sf ../../../../%{_datadir}/pixmaps/%{name}.png ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/data/%{name}.png
ln -sf ../../%{_libdir}/%{name}/%{name} ${RPM_BUILD_ROOT}%{_bindir}/%{name}

rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/application
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{globs,magic,XMLnamespaces,aliases,subclasses,mime.cache}
rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/{%{name}.desktop,mimeinfo.cache}


%post
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :


%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :


%clean
rm -rf ${RPM_BUILD_ROOT}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_sysconfdir}/gconf/schemas/%{name}-display-thumbnail.schemas
%{_bindir}/%{name}
%{_bindir}/%{name}-display-thumbnailer
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/gnome/48x48/mimetypes/*.png
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/fedora-%{name}.desktop
%{_libdir}/%{name}/
%{_mandir}/man1/*




%changelog
* Tue Dec 6 2005 Luya Tshimbalanga  - 0.35.2-20
- Clean up 
- Fixed the right path for symbolic link

* Sat Dec 3 2005 Luya Tshimbalanga  - 0.35.2-19
- Added disable-schemas-install on %_configure
- Trying to symlink using nrpms method based on FC3 version

* Tue Nov 29 2005 Luya Tshimbalanga  - 0.35.2-18
- Added patch against NullObject.py (thanks jwb)

* Tue Nov 29 2005 Luya Tshimbalanga  - 0.35.2-17
- Reorganized names and fixed %_install


* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-16
- Rebuild

* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-15
- Fixed %_install

* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-14
- Bump

* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-13
- Bump

* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-12
- Removed pygtk2

* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-11
- Added distribution version
- Clarified the note about GConf instead of gconf

* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-10
- Added libgnomeui-devel to test some sensors

* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-9
- Cleaned up and removed unnecesary buildrequires

* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-8
- Fixed error on mime.cache

* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-7
- Rebuilt

* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-6
- Rebuilt

* Wed Nov 16 2005 Luya Tshimbalanga  - 0.35.2-5
- Added desktop-file-utils command for post and postun

* Wed Nov 16 2005 Luya Tshimbalanga  - 0.35.2-4
- Fixed mistakes (thanks Alex Lancaster (alexl at users.sourceforge.net))

* Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-3
- Enhanced codes to be FedoraGuide compliant (thanks to Brian Pepple (bdpepple at ameritech.net))

* Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-2
- bump

* Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Dec 2005 22:14:12 -0000	1.1
+++ .cvsignore	7 Dec 2005 22:14:49 -0000	1.2
@@ -0,0 +1 @@
+gDesklets-0.35.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Dec 2005 22:14:12 -0000	1.1
+++ sources	7 Dec 2005 22:14:49 -0000	1.2
@@ -0,0 +1 @@
+8d77add2c07cb374a79a30d1d2055f54  gDesklets-0.35.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec  8 00:27:39 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed,  7 Dec 2005 19:27:39 -0500
Subject: web/html/participate/schedule index.php,1.6,1.7
Message-ID: <200512080028.jB80SNPh012719@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/schedule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12682

Modified Files:
	index.php 
Log Message:
Clean-up of syntax, might it yield a redirect on the live site?  We shall see.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/schedule/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- index.php	6 Dec 2005 06:53:57 -0000	1.6
+++ index.php	8 Dec 2005 00:27:37 -0000	1.7
@@ -1,3 +1,3 @@
 



From fedora-extras-commits at redhat.com  Thu Dec  8 02:17:20 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed,  7 Dec 2005 21:17:20 -0500
Subject: rpms/darcs/devel .cvsignore, 1.3, 1.4 darcs.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <200512080217.jB82HosD016341@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/darcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16315

Modified Files:
	.cvsignore darcs.spec sources 
Log Message:
- 1.0.5 bugfix release
  - tests/send.sh ok again



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2005 00:33:29 -0000	1.3
+++ .cvsignore	8 Dec 2005 02:17:18 -0000	1.4
@@ -1 +1 @@
-darcs-1.0.4.tar.gz
+darcs-1.0.5.tar.gz


Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- darcs.spec	17 Nov 2005 06:38:32 -0000	1.5
+++ darcs.spec	8 Dec 2005 02:17:18 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           darcs
-Version:        1.0.4
+Version:        1.0.5
 Release:        1%{?dist}
 Summary:        David's advanced revision control system
 
@@ -47,8 +47,6 @@
 
 %prep
 %setup -q
-# skip test currently failing in buildsystem
-mv tests/send.sh{,-disabled}
 
 
 %build
@@ -85,9 +83,13 @@
 
 
 %changelog
+* Thu Dec  8 2005 Jens Petersen  - 1.0.5-1
+- 1.0.5 bugfix release
+  - tests/send.sh ok again
+
 * Mon Nov 14 2005 Jens Petersen  - 1.0.4-1
 - 1.0.4 release
-  - skip send.sh test for now since it is failing in buildsystem
+  - skip tests/send.sh for now since it is failing in buildsystem
 
 * Tue Jul  5 2005 Jens Petersen 
 - drop superfluous doc buildrequires (Karanbir Singh, #162436)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2005 00:33:29 -0000	1.3
+++ sources	8 Dec 2005 02:17:18 -0000	1.4
@@ -1 +1 @@
-0be693b00e4b1bd24906d4f479e78923  darcs-1.0.4.tar.gz
+9a9a4f84ed5b6258f7ab321713adf20b  darcs-1.0.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 02:38:55 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Wed,  7 Dec 2005 21:38:55 -0500
Subject: web/html/participate/schedule index.php,1.7,1.8
Message-ID: <200512080239.jB82dPZ3016621@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/participate/schedule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16599

Modified Files:
	index.php 
Log Message:
More complex, working redirect


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/schedule/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- index.php	8 Dec 2005 00:27:37 -0000	1.7
+++ index.php	8 Dec 2005 02:38:53 -0000	1.8
@@ -1,3 +1,3 @@
 



From fedora-extras-commits at redhat.com  Thu Dec  8 03:05:04 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Wed,  7 Dec 2005 22:05:04 -0500
Subject: web/html/participate/schedule index.php,1.8,1.9
Message-ID: <200512080306.jB83626r018271@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/participate/schedule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18254/schedule

Modified Files:
	index.php 
Log Message:
Without header() working...


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/schedule/index.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- index.php	8 Dec 2005 02:38:53 -0000	1.8
+++ index.php	8 Dec 2005 03:05:01 -0000	1.9
@@ -1,3 +1,41 @@
 initCommon();
+$template->displayHeader();
+
+?>
+
    This Page Has Moved
    
+
+
    
+The new location is:
+
    
+
+
      
+ 
      • 
+
    
+
+
    
+Please update your links or bookmarks accordingly.
+
    
+
+displayFooter('$Date$moddate) .' UTC $');
+
 ?>



From fedora-extras-commits at redhat.com  Thu Dec  8 03:26:50 2005
From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64))
Date: Wed,  7 Dec 2005 22:26:50 -0500
Subject: web/html/participate/schedule index.php,1.9,1.10
Message-ID: <200512080327.jB83RKMp018390@cvs-int.fedora.redhat.com>

Author: nman64

Update of /cvs/fedora/web/html/participate/schedule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18373

Modified Files:
	index.php 
Log Message:
Foolish me.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/schedule/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- index.php	8 Dec 2005 03:05:01 -0000	1.9
+++ index.php	8 Dec 2005 03:26:48 -0000	1.10
@@ -28,14 +28,6 @@
 
 displayFooter('$Date$moddate) .' UTC $');
+$template->displayFooter('$Date$');
 
 ?>



From fedora-extras-commits at redhat.com  Thu Dec  8 04:07:47 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 23:07:47 -0500
Subject: rpms/Inventor/devel Inventor-redhat-bugs.diff,NONE,1.1
Message-ID: <200512080407.jB847lx6020147@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20134

Added Files:
	Inventor-redhat-bugs.diff 
Log Message:
New.

Inventor-redhat-bugs.diff:

--- NEW FILE Inventor-redhat-bugs.diff ---
--- /dev/null	2005-11-21 11:13:32.160873500 +0100
+++ inventor/libSoXt/include/GL/GLwMDrawA.h	2005-12-08 04:29:09.000000000 +0100
@@ -0,0 +1,13 @@
+#include 
+
+#define glwMDrawingAreaWidgetClass SoglwMDrawingAreaWidgetClass
+
+#define GLwNredSize SoGLwNredSize
+#define GLwNgreenSize SoGLwNgreenSize
+#define GLwNblueSize SoGLwNblueSize
+
+#define GLwNrgba SoGLwNrgba
+#define GLwNvisualInfo SoGLwNvisualInfo
+
+#define GLwNexposeCallback SoGLwNexposeCallback
+#define GLwNginitCallback SoGLwNginitCallback
--- inventor/apps/samples/widgets/GNUmakefile.componentTest.orig	2005-12-08 04:47:39.000000000 +0100
+++ inventor/apps/samples/widgets/GNUmakefile.componentTest	2005-12-08 04:52:04.000000000 +0100
@@ -5,7 +5,7 @@
 
 CXXFILES = componentTest.c++
 
-LLDLIBS = libInventorWidget.a -lInventor -lInventorXt -lGLw
+LLDLIBS = libInventorWidget.a -lInventor -lInventorXt
 
 all install: all_ivbin
 



From fedora-extras-commits at redhat.com  Thu Dec  8 04:11:16 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 23:11:16 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.21,1.22
Message-ID: <200512080412.jB84C7G6020231@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20186

Modified Files:
	Inventor.spec 
Log Message:
Next attempt.


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Inventor.spec	22 Nov 2005 02:38:32 -0000	1.21
+++ Inventor.spec	8 Dec 2005 04:11:12 -0000	1.22
@@ -33,11 +33,16 @@
 # Declare SoTempPath forward
 Patch8:		Inventor-SoPath.diff
 
+# Work around to RH shipping a broken libGLw
+# - PR #173879: libGLw headers missing
+# - PR #175251: libGLw missing motif
+Patch10:	Inventor-redhat-bugs.diff
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  mesa-libGLU-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:	mesa-libGLw-devel
+BuildRequires:  libGLU-devel
+BuildRequires:  libGL-devel
+BuildRequires:	libGLw-devel
 BuildRequires:	libX11-devel
 BuildRequires:	libXext-devel
 # Work around to RH shipping libXext without headers
@@ -135,6 +140,8 @@
 %patch7 -p0
 %patch8 -p1
 
+%patch10 -p1
+
 grep -Rl __ia64 lib* | while read a; do \
   sed -i -e 's,__ia64,__ia64__,g' \
   -e 's,__ia64____,__ia64__,g' \
@@ -228,6 +235,9 @@
 install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor
 mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples
 
+# testing
+exit 1
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -306,8 +316,9 @@
 %{_libdir}/Inventor/examples
 
 %changelog
-* Mon Nov 21 2005 Ralf Corsepius  - 2.1.5-14
+* Tue Dec 8 2005 Ralf Corsepius  - 2.1.5-14
 - Attempt to build against modular X.
+- Add Inventor-redhat-bugs patch.
 
 * Tue Aug 03 2005 Ralf Corsepius  - 2.1.5-13
 - Let PPC use standard RPM_OPT_FLAGS.



From fedora-extras-commits at redhat.com  Thu Dec  8 04:33:43 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed,  7 Dec 2005 23:33:43 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.22,1.23
Message-ID: <200512080434.jB84YDXx020387@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20365

Modified Files:
	Inventor.spec 
Log Message:
Next attempt.


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Inventor.spec	8 Dec 2005 04:11:12 -0000	1.22
+++ Inventor.spec	8 Dec 2005 04:33:40 -0000	1.23
@@ -316,7 +316,7 @@
 %{_libdir}/Inventor/examples
 
 %changelog
-* Tue Dec 8 2005 Ralf Corsepius  - 2.1.5-14
+* Thu Dec 8 2005 Ralf Corsepius  - 2.1.5-14
 - Attempt to build against modular X.
 - Add Inventor-redhat-bugs patch.
 



From fedora-extras-commits at redhat.com  Thu Dec  8 05:34:23 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu,  8 Dec 2005 00:34:23 -0500
Subject: rpms/darcs/devel darcs.spec,1.6,1.7
Message-ID: <200512080534.jB85Yrv3022108@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/darcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22086

Modified Files:
	darcs.spec 
Log Message:
on second thoughs still skip send.sh since it still fails in the buildsys



Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- darcs.spec	8 Dec 2005 02:17:18 -0000	1.6
+++ darcs.spec	8 Dec 2005 05:34:21 -0000	1.7
@@ -47,6 +47,8 @@
 
 %prep
 %setup -q
+# skip test currently failing in buildsystem
+mv tests/send.sh{,-disabled}
 
 
 %build
@@ -85,7 +87,6 @@
 %changelog
 * Thu Dec  8 2005 Jens Petersen  - 1.0.5-1
 - 1.0.5 bugfix release
-  - tests/send.sh ok again
 
 * Mon Nov 14 2005 Jens Petersen  - 1.0.4-1
 - 1.0.4 release



From fedora-extras-commits at redhat.com  Thu Dec  8 05:51:49 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  8 Dec 2005 00:51:49 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.23,1.24
Message-ID: <200512080552.jB85qKXQ022201@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22184

Modified Files:
	Inventor.spec 
Log Message:
Next attempt.


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Inventor.spec	8 Dec 2005 04:33:40 -0000	1.23
+++ Inventor.spec	8 Dec 2005 05:51:47 -0000	1.24
@@ -76,7 +76,11 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:	pkgconfig
-Requires:	xorg-x11-devel
+Requires:	libGLU-devel
+# PR #175253: libGLU-devel should implicitly pull-in libGL-devel
+Requires:	libGL-devel
+# PR #173712: libGL-devel should implicitly pull-in libX11-devel
+Requires:	libX11-devel
 Requires:	freetype-devel libjpeg-devel
 
 %description    devel
@@ -235,9 +239,6 @@
 install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor
 mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples
 
-# testing
-exit 1
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 



From fedora-extras-commits at redhat.com  Thu Dec  8 08:45:39 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  8 Dec 2005 03:45:39 -0500
Subject: rpms/Inventor/devel Inventor-pkgconfig.diff, 1.1, 1.2 Inventor.spec,
	1.24, 1.25
Message-ID: <200512080846.jB88kAg4027431@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27409

Modified Files:
	Inventor-pkgconfig.diff Inventor.spec 
Log Message:
- Further modular X fixes.
- Reflect modular X pkgconfigs.


Inventor-pkgconfig.diff:

Index: Inventor-pkgconfig.diff
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor-pkgconfig.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Inventor-pkgconfig.diff	8 Nov 2004 03:59:15 -0000	1.1
+++ Inventor-pkgconfig.diff	8 Dec 2005 08:45:37 -0000	1.2
@@ -9,9 +9,9 @@
 +Name: libInventor
 +Description: SGI Open Inventor
 +Version: 2.1.5
-+Requires: freetype2
-+Libs: -L${libdir} -L/usr/X11R6/lib -lInventor -ljpeg -lGL -lX11 -lm -ldl
-+Cflags: -I${includedir} -I/usr/X11R6/include
++Requires: freetype2 x11
++Libs: -L${libdir} -lInventor -ljpeg -lGL -lX11 -lm -ldl
++Cflags: -I${includedir}
 --- /dev/null	2003-09-15 15:40:47.000000000 +0200
 +++ libInventorXt.pc.in	2004-07-07 08:37:59.000000000 +0200
 @@ -0,0 +1,11 @@
@@ -23,6 +23,6 @@
 +Name: libInventorXt
 +Description: SGI Open InventorXt
 +Version: 2.1.5
-+Requires: libInventor
-+Libs: -L${libdir} -L/usr/X11R6/lib -lInventorXt -lXm -lXt
-+Cflags: -I${includedir} -I/usr/X11R6/include
++Requires: libInventor xt
++Libs: -L${libdir} -lInventorXt -lXm
++Cflags: -I${includedir}


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Inventor.spec	8 Dec 2005 05:51:47 -0000	1.24
+++ Inventor.spec	8 Dec 2005 08:45:37 -0000	1.25
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        14%{?dist}
+Release:        15%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -43,7 +43,6 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  libGL-devel
 BuildRequires:	libGLw-devel
-BuildRequires:	libX11-devel
 BuildRequires:	libXext-devel
 # Work around to RH shipping libXext without headers
 BuildRequires:  xorg-x11-proto-devel
@@ -52,7 +51,6 @@
 # FIXME: Why is libXi required?
 BuildRequires: 	libXi-devel
 
-BuildRequires: 	libXt-devel
 BuildRequires:	openmotif-devel
 BuildRequires:	freetype-devel
 BuildRequires:	libjpeg-devel
@@ -102,6 +100,8 @@
 Requires:	InventorXt = %{version}-%{release}
 Requires:	Inventor-devel = %{version}-%{release}
 Requires:	pkgconfig
+# PR 175256: Missing openmotif-devel dep
+Requires:	xorg-x11-proto-devel
 Requires:	openmotif-devel
 
 %description    -n InventorXt-devel
@@ -317,6 +317,10 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Thu Dec 8 2005 Ralf Corsepius  - 2.1.5-15
+- Further modular X fixes.
+- Reflect modular X pkgconfigs.
+
 * Thu Dec 8 2005 Ralf Corsepius  - 2.1.5-14
 - Attempt to build against modular X.
 - Add Inventor-redhat-bugs patch.



From fedora-extras-commits at redhat.com  Thu Dec  8 10:51:10 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 05:51:10 -0500
Subject: web/html/docs/translation-windows - New directory
Message-ID: <200512081051.jB8ApABB031980@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31971/translation-windows

Log Message:
Directory /cvs/fedora/web/html/docs/translation-windows added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 10:51:16 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 05:51:16 -0500
Subject: web/html/docs/translation-guide - New directory
Message-ID: <200512081051.jB8ApGY2031995@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31971/translation-guide

Log Message:
Directory /cvs/fedora/web/html/docs/translation-guide added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:00:55 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:00:55 -0500
Subject: web/html/docs/release-notes fedora.css,NONE,1.1
Message-ID: <200512081100.jB8B0tqI032103@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32088/docs/release-notes

Added Files:
	fedora.css 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #D0D0B0;
	background-color: #FAF9E0;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #22437f;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
      
h2 {
        font-size: 1.25em;
}

h3 {
        font-size: 1.1em;
}

a:link {
        color: #900;
}
a:visited {
        color: #48468f;
}
a:hover {
        color: #f20;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}

.procedure ol li {
        margin-bottom: 0.5em;
}
.procedure ol li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

.itemizedlist ul li {
	margin-bottom: 0.5em;
}
.itemizedlist ul li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

p.title	{
	text-align: center;
}



From fedora-extras-commits at redhat.com  Thu Dec  8 11:01:00 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:01:00 -0500
Subject: web/html/docs/translation-guide index.php,NONE,1.1
Message-ID: <200512081101.jB8B10pi032120@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32088/docs/translation-guide

Added Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


***** Error reading new file: [Errno 2] No such file or directory: 'index.php'



From fedora-extras-commits at redhat.com  Thu Dec  8 11:01:05 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:01:05 -0500
Subject: web/html/docs/translation-windows fedora.css, NONE,
	1.1 generated-index.php, NONE, 1.1 index.php, NONE,
	1.1 ln-legalnotice.php, NONE, 1.1 s1-cvs.php, NONE,
	1.1 s1-cycle.php, NONE, 1.1 s1-poedit.php, NONE,
	1.1 s1-reg.php, NONE, 1.1 s1-resource.php, NONE,
	1.1 s1-setup.php, NONE, 1.1 s1-ssh.php, NONE, 1.1
Message-ID: <200512081101.jB8B15rg001200@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32088/docs/translation-windows

Added Files:
	fedora.css generated-index.php index.php ln-legalnotice.php 
	s1-cvs.php s1-cycle.php s1-poedit.php s1-reg.php 
	s1-resource.php s1-setup.php s1-ssh.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #B0C4DE;
	background-color: #F0F8FF;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #990000;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
                                                                                                                
h2 {
        font-size: 1.25em;
}
                                                                                                                
h3 {
        font-size: 1.1em;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}


***** Error reading new file: [Errno 2] No such file or directory: 'generated-index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ln-legalnotice.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-cvs.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-cycle.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-poedit.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-reg.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-resource.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-setup.php'

***** Error reading new file: [Errno 2] No such file or directory: 's1-ssh.php'



From fedora-extras-commits at redhat.com  Thu Dec  8 11:03:55 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:03:55 -0500
Subject: web/html/participate/qa-guide index.php,1.1.1.1,1.2
Message-ID: <200512081105.jB8B5DRK001327@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/qa-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227/qa-guide

Modified Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/qa-guide/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- index.php	30 Mar 2005 17:47:24 -0000	1.1.1.1
+++ index.php	8 Dec 2005 11:03:53 -0000	1.2
@@ -1,17 +1,33 @@
-initCommon(); 
+$template->initCommon();
 $template->displayHeader();
 
 ?>
+
    This Page Has Moved
    
+
+
    
+The new location is:
+
    
 
-
    Red Hat Linux Project Quality Assurance Guide
    ???Next
    Red Hat Linux Project Quality Assurance Guide
    Brock Organ
    Copyright ? 2003 Red Hat, Inc., Brock Organ
    Table of Contents
    Introduction
    1. Infrastructure
    2. Individual Packages
    3. Installation
    4. Release Engineering
    5. Kernel Testing
    6. Toolchain
    7. General Applications
    ???Next
    ???Introduction
    
+
      
+ 
      • 
+
    
 
-
+Please update your links or bookmarks accordingly.
+
    
+
+displayFooter('$Date$');
 
 ?>
-



From fedora-extras-commits at redhat.com  Thu Dec  8 11:04:36 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:04:36 -0500
Subject: web/html/participate/translation-windows index.php,1.1.1.1,1.2
Message-ID: <200512081105.jB8B5CdF001322@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/translation-windows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227/translation-windows

Modified Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/translation-windows/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- index.php	30 Mar 2005 17:47:24 -0000	1.1.1.1
+++ index.php	8 Dec 2005 11:04:30 -0000	1.2
@@ -1,35 +1,33 @@
-initCommon(); 
+$template->initCommon();
 $template->displayHeader();
 
 ?>
+
    This Page Has Moved
    
+
+
    
+The new location is:
+
    
 
-
    Translate Fedora in Microsoft Windows
    ???Next
    Translate Fedora in Microsoft? Windows?
    Chester Cheng
    Copyright ? 2004 Red Hat, Inc., Chester Cheng
    1. Introduction
    2. !
 Download and Install TortoiseCVS
    3. Generate Your Digital ID
    4. Register Your Fedora Account
    5. Using TortoiseCVS
    5.1.  Set up TortoiseCVS 
    5.2.  Download Files from Fedora Server 
    6.  poEdit 
    6.1. Download and Install poEdit
    6.2. Setup poEdit
    7. Translation Lifecycle
    7.1.  Phase 1 
    7.2.  Phase 2 
    7.3.  Phase 3 
    7.4.  Phase 4 
    7.5.  Phase 5 
    8. !
 Other 
ources
    8.1.  Related Websites 
    8.2.  Your Feedback 
    1.?Introduction
    
-      To join the Fedora translation team and work with people around the world
-      is easy in Microsoft? Windows? as well. To achieve this, several
-      tools are needed:
-	
    • 
-    A Web Browser that supports cookies
-	
    • 
-    A Concurrent Versions System (CVS) client —
-	This artical uses TortoiseCVS
-	
    • 
-    An editor for .po files — This article uses poEdit
-	
    • 
-    A Secury Shell (ssh) client — This article uses puttygen
-	which is a free utility that generates personalized digital ID, using public key infrastructure.
-	This utility is bundled within TortoiseCVS
-	
    
-	This article will introduce you where to find and download these tools, how to install and setup,
-	and even a brief description of how to use them.
-	
    ???Next
    ???2.?Download and Install TortoiseCVS
    
+
      
+ 
      • 
+
    
 
-
+Please update your links or bookmarks accordingly.
+
    
+
+displayFooter('$Date$');
 
 ?>
-



From fedora-extras-commits at redhat.com  Thu Dec  8 11:03:43 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:03:43 -0500
Subject: web/html/participate/documentation-guide index.php,1.5,1.6
Message-ID: <200512081105.jB8B5D0H001325@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227/documentation-guide

Modified Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-guide/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.php	6 Dec 2005 19:41:26 -0000	1.5
+++ index.php	8 Dec 2005 11:03:40 -0000	1.6
@@ -1,3 +1,33 @@
 
\ No newline at end of file
+//
+// Easily-changeable template for redirection.
+//
+
+$NEWURL="http://fedora.redhat.com/docs/documentation-guide/";
+
+include("site.inc");
+
+$template = new Page;
+$template->initCommon();
+$template->displayHeader();
+
+?>
+
    This Page Has Moved
    
+
+
    
+The new location is:
+
    
+
+
      
+ 
      • 
+
    
+
+
    
+Please update your links or bookmarks accordingly.
+
    
+
+displayFooter('$Date$');
+
+?>



From fedora-extras-commits at redhat.com  Thu Dec  8 11:03:48 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:03:48 -0500
Subject: web/html/participate/documentation-quick-start index.php, 1.1.1.1,
	1.2
Message-ID: <200512081105.jB8B5DY4001329@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-quick-start
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227/documentation-quick-start

Modified Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-quick-start/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- index.php	30 Mar 2005 17:47:24 -0000	1.1.1.1
+++ index.php	8 Dec 2005 11:03:46 -0000	1.2
@@ -1,175 +1,32 @@
-initCommon();
-
 $template->displayHeader();
 
 ?>
-
-
    Fedora Documentation Project Quick Start Guide
    
-
-
    Note: this document is still in progress. If you have any thoughts, please
-share them on the fedora-docs-list mailing list.
    
-
-
    
-Since reading the Documentation Guide 
-can be a bit overwhelming at first, read
-this page first to understand how to start participating and the
-process used to add a tutorial to the project.
-
    
-
-
    
-The first step is to choose whether you want to be a writer or an editor.
-Refer to the project page for each role's definition.
-Editors must first be approved by the project leader and must have experience
-with DocBook XML and the proper use of tags since all editors must follow the
-same guidelines when reviewing tutorials.
-
    
-
-
    
-If you are chosen as an editor, your name is added to the project page,
-and your job is to wait until writers are finished writing the tutorials and
-need editing.
-
    
+
    This Page Has Moved
    
 
 
    
-If you choose to be a writer, the follow process must be used:
+The new location is:
 
    
 
 
      
-
-
    • Refer to bug fedora-docs-writing 
-to see the list of tutorials already in progress to make sure you do not select a duplicate.
      • 
-
-
    • If you have an idea that is not in the list of docs in progress, open a Bugzilla report
-with your idea and be sure to make bug fedora-docs-writing
-depend on it. Also, email the mailing list to let everyone know you are working on it.
-If you can't think of an idea, refer to fedora-docs-ideas
-for a list of ideas without owners.
      
-
      In your Bugzilla report for the new topic, include the following information:
-
        
-
      • What problem it solves
        • 
-
      • Summary of topic
        • 
-
      • Outline for tutorial
        • 
-
      • Intended target audience
        • 
-
      • Whether you are the sole author or whether it is a group effort
        • 
-
      • Whether it helps to create a set of documents with related themes
        • 
-
      • Time estimate on when it will be finished
        • 
-
      • Other resources (other than an editor) you will need to finish -- testers with similar hardware, etc.
        • 
+ 
        • 
 
      
-
      
-
      • 
-
-
    • If you are not familiar with DocBook XML, read the Documentation Guide 
-to learn how to use this format. Tutorials must be submitted in this format. Even if
-you are familiar with it, read the guide to learn how tags are used for the project
-and to learn how to setup your file to make it compatible with the CVS structure and
-the common entities file.
      • 
-
-
    • Start following the conventions in the guide from the beginning such as 
-preparing your directories according to the example-tutorial.
-
-
    • Once your file is ready, attach a tarball of the files it to the bug report you 
-created so that an editor can be assigned to it. The editor should be able to untar the file
-under the fedora-docs CVS module and type make html to build it. If you need help with creating
-this structure, ask the mailing list for help or ask for an editor so he/she can help you.
      • 
-
-
    • The editor will review your tutorial according to the editing guidelines (which are in progress)
-and work with you to get them corrected.
      • 
-
-
    • Once the writer and editor feel it is ready to be published to the website,
-make bug fedora-docs-ready 
-depend on this bug so the project maintainer can review it and post it to the website.
-Be sure to include the CVS file versions and branch name to make sure the correction
-document is posted.
      • 
-
    • Once it is posted to the website, you are still responsible for maintaining your tutorial.
-Until write access is available for CVS, submit updates to your tutorial in the form of
-patches via Bugzilla so that they can be applied.
      • 
-
    
-
-
    *Before* the writer hands a document over to the editor, he/she must
-verify the following:
    
 
-
      
-
    1. Spell check all files.
      2. 
-
    2. Verify that all URLs are still valid.
      3. 
-
    3. Verify that the technical content is correct -- which means follow
-your own documentation step by step to confirm.
      4. 
-
    4. Verify that the names of the files include the language such as
-example-tutorial-en.xml.
      5. 
-
    5. Verify that all sections have an id so all HTML files generated have
-static filenames.
      6. 
-
    6. Verify that all ids following the naming convention in the Docs Guide
      7. 
-
    7. Checkout the fedora-docs CVS module if you haven't already, and   
-   verify that if you drop in your directory that it builds within the 
-   CVS environment, including using a Makefile based on the existing    
-   ones.
      8. 
-
    8. Verify the HTML Output:
-
        
-
      • Click all links to make sure they are valid
        • 
-
      • View each page to make sure there aren't any missing images.
        • 
-
      • Make sure all the images match their description in the text.
        • 
-
      • Click the Legal Notice link on the title page to make sure it   
-      works and contains the FDL, that the version number has been 
-      bumped if a previous version existed, and that the last modified 
-      date has been updated.
        • 
-
      
-
      9. 
-
    
-
-
    Then, the editor is responsible for:
    
-
-
      
-
    1. Making sure the writer followed the docs conventions including using
-standard id names, verifying that the parent file follows the example
-tutorial so that it builds in CVS, and proper use of XML tags.
      2. 
-
    2. Checking the grammar and word usage.
      3. 
-
    3. Verifying that it is written for the intended target audience.
      4. 
-
    4. Looking for any possible missing steps (While reading, if it feels
-like a step was omitted, ask the writer to make sure. Many times writers
-who are familiar with a procedure will leave out a step that is obvious
-to them but not to the reader.
      5. 
-
    5. Verifying that it builds in the CVS structure
      6. 
-
    6. Determine if the topic needs a second technical review. If it does,
-work with the writer to email the mailing lists to find someone to
-follow the document step by step to make sure it works on their system
-as well.
    7. 
-
    
-
-
    Summary of Tutorial Tracking
    
-
-
    Bug fedora-docs-ideas: 
-Docs ideas without owners - a general bucket for ideas for new documents or conversions that come
-*first* through the list
    
-
    Bug fedora-docs-writing: Docs in progress - for tracking
-documents actively being written/developed/edited
    
-
-
    Bug fedora-docs-ready Docs ready for going to
-fedora.redhat.com - when it is done with fedora-docs-writing, it comes here while it
-undergoes final editing to go to the website.
    
-
-
    This means the process of idea -> publication is: 
    
-
-
      
-
    1. File a bug report for your document, or carry the on the one with the
-idea in it.
      2. 
-
-
    2. Move the bug through the tracker in this order
-
      -idea 	             -> 	develop 	        <-> 	publish
-fedora-docs-ideas		fedora-docs-writing		fedora-docs-ready
-
      
-
      3. 
-
    
-
-
    Note: there is a double-arrow between develop <-> publish because a
-document should stay alive after it is published.  Once you have
-published a version and have moved to writing for the next version of
-Fedora Core, your document's bug moves back to fedora-docs-writing.
    
+
    
+Please update your links or bookmarks accordingly.
+
    
 
-displayFooter('$Date$');
 



From fedora-extras-commits at redhat.com  Thu Dec  8 11:04:25 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:04:25 -0500
Subject: web/html/participate/translation-guide index.php,1.1.1.1,1.2
Message-ID: <200512081105.jB8B5DsM001328@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/translation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227/translation-guide

Modified Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/translation-guide/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- index.php	30 Mar 2005 17:47:24 -0000	1.1.1.1
+++ index.php	8 Dec 2005 11:04:22 -0000	1.2
@@ -1,4 +1,10 @@
-displayHeader();
 
 ?>
-
    Translation Guide
    
+
    This Page Has Moved
    
+
+
    
+The new location is:
+
    
+
+
      
+ 
      • 
+
    
 
 
    
-to be written by Paul Gampe and Sarah Smith
+Please update your links or bookmarks accordingly.
 
    
 
-displayFooter('$Date$');
 



From fedora-extras-commits at redhat.com  Thu Dec  8 11:03:24 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:03:24 -0500
Subject: web/html/participate/developers-guide index.php,1.3,1.4
Message-ID: <200512081105.jB8B5DMr001326@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/developers-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1227/developers-guide

Modified Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/developers-guide/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.php	6 Dec 2005 19:41:15 -0000	1.3
+++ index.php	8 Dec 2005 11:03:21 -0000	1.4
@@ -1,3 +1,33 @@
 initCommon();
+$template->displayHeader();
+
+?>
+
    This Page Has Moved
    
+
+
    
+The new location is:
+
    
+
+
      
+ 
      • 
+
    
+
+
    
+Please update your links or bookmarks accordingly.
+
    
+
+displayFooter('$Date$');
+
 ?>



From fedora-extras-commits at redhat.com  Thu Dec  8 11:09:52 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:09:52 -0500
Subject: web/html/participate/documentation-faq index.php,1.3,1.4
Message-ID: <200512081110.jB8BANrx001387@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/participate/documentation-faq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1366/documentation-faq

Modified Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/participate/documentation-faq/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.php	6 Dec 2005 19:41:21 -0000	1.3
+++ index.php	8 Dec 2005 11:09:49 -0000	1.4
@@ -1,3 +1,33 @@
 initCommon();
+$template->displayHeader();
+
+?>
+
    This Page Has Moved
    
+
+
    
+The new location is:
+
    
+
+
      
+ 
      • 
+
    
+
+
    
+Please update your links or bookmarks accordingly.
+
    
+
+displayFooter('$Date$');
+
 ?>



From fedora-extras-commits at redhat.com  Thu Dec  8 11:11:48 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  8 Dec 2005 06:11:48 -0500
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.8,1.9
Message-ID: <200512081112.jB8BCIW9001443@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1403

Modified Files:
	OpenSceneGraph.spec 
Log Message:
Remove -lXi from makedefs.


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- OpenSceneGraph.spec	7 Dec 2005 16:20:02 -0000	1.8
+++ OpenSceneGraph.spec	8 Dec 2005 11:11:30 -0000	1.9
@@ -69,6 +69,7 @@
     -e 's,^\(INST_LIBS[ ]*=\).*$,\1 $(DESTDIR)%{_libdir},g' \
     -e 's,^\(INST_EXAMPLES[ ]*=\).*$,\1 $(DESTDIR)%{_bindir},g' \
     -e 's,\(^[ \t]*LIBS[ ]*=.*\) -lstdc++,\1,g' \
+    -e 's, -lXi,,g' \
     $dir/Make/makedefs
 
 # Propagate RPM_OPT_FLAGS



From fedora-extras-commits at redhat.com  Thu Dec  8 11:20:02 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:20:02 -0500
Subject: web/html/docs/translation-windows/figs - New directory
Message-ID: <200512081120.jB8BK2hU001521@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1512/figs

Log Message:
Directory /cvs/fedora/web/html/docs/translation-windows/figs added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:21:17 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:21:17 -0500
Subject: web/html/docs/translation-windows/figs/account - New directory
Message-ID: <200512081121.jB8BLHwE001548@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/account
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1539/account

Log Message:
Directory /cvs/fedora/web/html/docs/translation-windows/figs/account added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:21:22 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:21:22 -0500
Subject: web/html/docs/translation-windows/figs/cycle - New directory
Message-ID: <200512081121.jB8BLMFs001564@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/cycle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1539/cycle

Log Message:
Directory /cvs/fedora/web/html/docs/translation-windows/figs/cycle added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:21:28 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:21:28 -0500
Subject: web/html/docs/translation-windows/figs/key - New directory
Message-ID: <200512081121.jB8BLSWj001580@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/key
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1539/key

Log Message:
Directory /cvs/fedora/web/html/docs/translation-windows/figs/key added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:21:33 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:21:33 -0500
Subject: web/html/docs/translation-windows/figs/poedit - New directory
Message-ID: <200512081121.jB8BLXlY001595@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/poedit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1539/poedit

Log Message:
Directory /cvs/fedora/web/html/docs/translation-windows/figs/poedit added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:21:39 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:21:39 -0500
Subject: web/html/docs/translation-windows/figs/setup - New directory
Message-ID: <200512081121.jB8BLdq8001610@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/setup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1539/setup

Log Message:
Directory /cvs/fedora/web/html/docs/translation-windows/figs/setup added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:25:38 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:25:38 -0500
Subject: web/html/docs/translation-windows/figs/account image001.jpg, NONE,
	1.1 image002.jpg, NONE, 1.1 image003.jpg, NONE, 1.1
Message-ID: <200512081125.jB8BPcVO001663@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/account
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1643/translation-windows/figs/account

Added Files:
	image001.jpg image002.jpg image003.jpg 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:25:44 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:25:44 -0500
Subject: web/html/docs/translation-windows/figs/cycle conflict.jpg, NONE,
	1.1 cvs_up.jpg, NONE, 1.1 cvs_up_commit.jpg, NONE,
	1.1 cvs_up_finish.jpg, NONE, 1.1 cvs_up_menu_commit.jpg, NONE,
	1.1 cvs_up_modified.jpg, NONE, 1.1 fedora_assign_to_you.jpg,
	NONE, 1.1 fedora_assigned.jpg, NONE,
	1.1 fedora_auth_denied.jpg, NONE, 1.1 fedora_login.jpg, NONE,
	1.1 fedora_released.jpg, NONE, 1.1 fedora_take.jpg, NONE, 1.1
Message-ID: <200512081125.jB8BPiia001690@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/cycle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1643/translation-windows/figs/cycle

Added Files:
	conflict.jpg cvs_up.jpg cvs_up_commit.jpg cvs_up_finish.jpg 
	cvs_up_menu_commit.jpg cvs_up_modified.jpg 
	fedora_assign_to_you.jpg fedora_assigned.jpg 
	fedora_auth_denied.jpg fedora_login.jpg fedora_released.jpg 
	fedora_take.jpg 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:25:49 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:25:49 -0500
Subject: web/html/docs/translation-windows/figs/key image001.jpg, NONE,
	1.1 image002.jpg, NONE, 1.1 image003.jpg, NONE,
	1.1 image004.jpg, NONE, 1.1
Message-ID: <200512081125.jB8BPnIa001709@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/key
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1643/translation-windows/figs/key

Added Files:
	image001.jpg image002.jpg image003.jpg image004.jpg 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:25:55 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:25:55 -0500
Subject: web/html/docs/translation-windows/figs/poedit image001.jpg, NONE,
	1.1 image002.jpg, NONE, 1.1 image003.jpg, NONE,
	1.1 image004.jpg, NONE, 1.1 image005.jpg, NONE,
	1.1 image006.jpg, NONE, 1.1 image007.jpg, NONE,
	1.1 image008.jpg, NONE, 1.1 menu_preferences.jpg, NONE,
	1.1 poEdit_start.jpg, NONE, 1.1 preferences.jpg, NONE, 1.1
Message-ID: <200512081125.jB8BPtpH001735@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/poedit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1643/translation-windows/figs/poedit

Added Files:
	image001.jpg image002.jpg image003.jpg image004.jpg 
	image005.jpg image006.jpg image007.jpg image008.jpg 
	menu_preferences.jpg poEdit_start.jpg preferences.jpg 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:26:00 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:26:00 -0500
Subject: web/html/docs/translation-windows/figs/setup image001.jpg, NONE,
	1.1 image002.jpg, NONE, 1.1 image003.jpg, NONE, 1.1
Message-ID: <200512081126.jB8BQ0ho001754@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/setup
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1643/translation-windows/figs/setup

Added Files:
	image001.jpg image002.jpg image003.jpg 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:26:06 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:26:06 -0500
Subject: web/html/docs/translation-windows/figs/tortoise cvs20.jpg, NONE,
	1.1 cvs_co.jpg, NONE, 1.1 cvs_commit.jpg, NONE,
	1.1 cvs_cvsroot_module.jpg, NONE, 1.1 cvs_right_click_menu.jpg,
	NONE, 1.1 cvs_tortoisePlink.jpg, NONE, 1.1 image001.jpg, NONE,
	1.1 image002.jpg, NONE, 1.1 image003.jpg, NONE,
	1.1 image004.jpg, NONE, 1.1 image005.jpg, NONE, 1.1
Message-ID: <200512081126.jB8BQ6hB001780@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-windows/figs/tortoise
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1643/translation-windows/figs/tortoise

Added Files:
	cvs20.jpg cvs_co.jpg cvs_commit.jpg cvs_cvsroot_module.jpg 
	cvs_right_click_menu.jpg cvs_tortoisePlink.jpg image001.jpg 
	image002.jpg image003.jpg image004.jpg image005.jpg 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:30:59 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:30:59 -0500
Subject: web/html/docs/qa-guide - New directory
Message-ID: <200512081130.jB8BUxHm001831@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/qa-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1822/qa-guide

Log Message:
Directory /cvs/fedora/web/html/docs/qa-guide added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:31:45 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:31:45 -0500
Subject: web/html/docs/qa-guide ch-intro.php, NONE,
	1.1 general-applications.php, NONE, 1.1 index.php, NONE,
	1.1 individual-packages.php, NONE, 1.1 infrastructure.php,
	NONE, 1.1 installation.php, NONE, 1.1 kernel.php, NONE,
	1.1 ln-legalnotice.php, NONE, 1.1 release-engineering.php,
	NONE, 1.1 toolchain.php, NONE, 1.1
Message-ID: <200512081131.jB8BVjPd001867@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/qa-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1847/qa-guide

Added Files:
	ch-intro.php general-applications.php index.php 
	individual-packages.php infrastructure.php installation.php 
	kernel.php ln-legalnotice.php release-engineering.php 
	toolchain.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


***** Error reading new file: [Errno 2] No such file or directory: 'ch-intro.php'

***** Error reading new file: [Errno 2] No such file or directory: 'general-applications.php'

***** Error reading new file: [Errno 2] No such file or directory: 'index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'individual-packages.php'

***** Error reading new file: [Errno 2] No such file or directory: 'infrastructure.php'

***** Error reading new file: [Errno 2] No such file or directory: 'installation.php'

***** Error reading new file: [Errno 2] No such file or directory: 'kernel.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ln-legalnotice.php'

***** Error reading new file: [Errno 2] No such file or directory: 'release-engineering.php'

***** Error reading new file: [Errno 2] No such file or directory: 'toolchain.php'



From fedora-extras-commits at redhat.com  Thu Dec  8 11:39:08 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:39:08 -0500
Subject: web/html/docs/developers-guide common.inc,NONE,1.1
Message-ID: <200512081139.jB8Bd8wr001921@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/developers-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1906/developers-guide

Added Files:
	common.inc 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE common.inc ---
options["selected_uri"]="/participate/developers-guide/";

?>



From fedora-extras-commits at redhat.com  Thu Dec  8 11:39:13 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:39:13 -0500
Subject: web/html/docs/documentation-guide common.inc,NONE,1.1
Message-ID: <200512081139.jB8BdD7M001937@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1906/documentation-guide

Added Files:
	common.inc 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE common.inc ---
options["selected_uri"]="/participate/documentation-guide/";

?>



From fedora-extras-commits at redhat.com  Thu Dec  8 11:39:18 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:39:18 -0500
Subject: web/html/docs/qa-guide common.inc,NONE,1.1
Message-ID: <200512081139.jB8BdIYQ001953@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/qa-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1906/qa-guide

Added Files:
	common.inc 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE common.inc ---
options["selected_uri"]="/participate/qa-guide/";

?>



From fedora-extras-commits at redhat.com  Thu Dec  8 11:39:24 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:39:24 -0500
Subject: web/html/docs/translation-guide common.inc,NONE,1.1
Message-ID: <200512081139.jB8BdOAG001969@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1906/translation-guide

Added Files:
	common.inc 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE common.inc ---
options["selected_uri"]="/participate/translation-guide/";

?>



From fedora-extras-commits at redhat.com  Thu Dec  8 11:41:12 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:41:12 -0500
Subject: web/html/docs/release-notes/figs - New directory
Message-ID: <200512081141.jB8BfC63002002@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/figs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1993/release-notes/figs

Log Message:
Directory /cvs/fedora/web/html/docs/release-notes/figs added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 11:41:40 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:41:40 -0500
Subject: web/html/docs/developers-guide/stylesheet-images caution.png, NONE,
	1.1 important.png, NONE, 1.1 note.png, NONE, 1.1 tip.png, NONE,
	1.1 warning.png, NONE, 1.1
Message-ID: <200512081141.jB8Bfetm002037@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/developers-guide/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/developers-guide/stylesheet-images

Added Files:
	caution.png important.png note.png tip.png warning.png 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:41:45 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:41:45 -0500
Subject: web/html/docs/documentation-guide/stylesheet-images caution.png,
	NONE, 1.1 important.png, NONE, 1.1 note.png, NONE, 1.1 tip.png,
	NONE, 1.1 warning.png, NONE, 1.1
Message-ID: <200512081141.jB8BfjHh002057@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-guide/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/documentation-guide/stylesheet-images

Added Files:
	caution.png important.png note.png tip.png warning.png 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:41:50 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:41:50 -0500
Subject: web/html/docs/qa-guide qa-guide.pdf,NONE,1.1
Message-ID: <200512081141.jB8BfonN002073@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/qa-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/qa-guide

Added Files:
	qa-guide.pdf 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE qa-guide.pdf ---
%PDF-1.3
5 0 obj
<< /S /GoTo /D (documentation-guide.1) >>
endobj
8 0 obj
(Red Hat Linux Project Quality Assurance Guide)
endobj
9 0 obj
<< /S /GoTo /D (ch-intro.2) >>
endobj
12 0 obj
(Introduction)
endobj
13 0 obj
<< /S /GoTo /D (infrastructure.2) >>
endobj
16 0 obj
(Infrastructure)
endobj
17 0 obj
<< /S /GoTo /D (individual-packages.2) >>
endobj
20 0 obj
(Individual Packages)
endobj
21 0 obj
<< /S /GoTo /D (installation.2) >>
endobj
24 0 obj
(Installation)
endobj
25 0 obj
<< /S /GoTo /D (release-engineering.2) >>
endobj
28 0 obj
(Release Engineering)
endobj
29 0 obj
<< /S /GoTo /D (kernel.2) >>
endobj
32 0 obj
(Kernel Testing)
endobj
33 0 obj
<< /S /GoTo /D (toolchain.2) >>
endobj
36 0 obj
(Toolchain)
endobj
37 0 obj
<< /S /GoTo /D (general-applications.2) >>
endobj
40 0 obj
(General Applications)
endobj
41 0 obj
<< /S /GoTo /D [42 0 R  /Fit ] >>
endobj
44 0 obj <<
/Length 263       
/Filter /FlateDecode
>>
stream
x??RMK?0??W?1=4??i>?????7?P?Z?j?????4?.
??J ?????{	?A??LA?!?.?G8U?B??#??R?M<6Ig???Se?n
9?kJ????????.?
endobj
42 0 obj <<
/Type /Page
/Contents 44 0 R
/Resources 43 0 R
/MediaBox [0 0 612 792]
/Parent 50 0 R
>> endobj
45 0 obj <<
/D [42 0 R /XYZ 72 756 null]
>> endobj
46 0 obj <<
/D [42 0 R /XYZ 72 720 null]
>> endobj
47 0 obj <<
/D [42 0 R /XYZ 72 720 null]
>> endobj
6 0 obj <<
/D [42 0 R /XYZ 72 720 null]
>> endobj
43 0 obj <<
/Font << /F22 49 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
53 0 obj <<
/Length 1758      
/Filter /FlateDecode
>>
stream
x???R?8?=_??'g??ww_B?t??vw???c?D?m???)?G:???$???}?0????s?H1?[?G???\bz??O??????g?]1?????G4>?????????~??????N???S?1???P`;?V???_h????cFn?[$???L7RX_z?[??????'M???yO??y???}?A???F???{(qA?eB|?@??*[???c????@??o?8?h\?t0???xW89c??XF??b`[??&z?Cg????AY?".?????t?y???z?*?mF~????B;4?pE??3gU?????C??[????g??Fy?yNcfx6?)???tf
??'uN?
?u?R???j\??)??????F???t?	?U??KhQ62?1 ?T,U%??TQ?m???w???*#eq??|???R???d??ae?1?`DYa?E?????~?h?$1?+?`V?p??8???6D?`????U
??R??i??/???K?ZZ??????C???:??8?}??9
?u?~hH?]?0?2xP;???Lo?
?????????;sZ?&?L??????43gU?????e??z???)t?]?4?'?j??*??y?kL(?hL???	??L???S??i??\:p)D??????T$,??;????#/?6u???@C;??B?s&:?a??s??~?:;"?'?????,`?XM*> endobj
57 0 obj <<
/Type /Annot
/Border[1 0 0]/H/I/C[0 1 1]
/Rect [152.322 646.24 271.657 655.362]
/Subtype/Link/A<>
>> endobj
54 0 obj <<
/D [52 0 R /XYZ 72 741.554 null]
>> endobj
51 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
60 0 obj <<
/Length 572       
/Filter /FlateDecode
>>
stream
x??UM??0??W??Hc;??A??i!??B??fS?8	+?=N???jKA]????of??=??Q1?8g ?x?V{??a???	o=2???!??C?^NC??ecO?Bq*??NC??NG??2????????)a`????{x????;?)?{KDY6^???????????x?<]o?????qi?K?~?U?}??$$F8??I?W?(??(?j???|?[?S???[Uk?1??????
?????R[	JD??[@?/)???????U??G???n#u?V???F?lr?>K?j???5u.?F???.????:??????8????A?6???[????y??c????D???C?????4???FfMPc?	?CbJ?UWX?!PYwze??5?d;#o??q*T???*????n??)+G?VL8?????*???o}O??,H]*-?Y??|??4ZV?\?u]??)}???r?K9?????D?E??V*????:rs?@XD?-??)p?x]c~?B?5_!<>???9:?4?.&?iJPl??1??r??d?+??I B$?$_dC9=>
endobj
59 0 obj <<
/Type /Page
/Contents 60 0 R
/Resources 58 0 R
/MediaBox [0 0 612 792]
/Parent 50 0 R
>> endobj
61 0 obj <<
/D [59 0 R /XYZ 72 741.554 null]
>> endobj
62 0 obj <<
/D [59 0 R /XYZ 72 720 null]
>> endobj
10 0 obj <<
/D [59 0 R /XYZ 72 720 null]
>> endobj
58 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
65 0 obj <<
/Length 977       
/Filter /FlateDecode
>>
stream
x??WK??6??W?(5KR/??&M??!??h?????+?????3?H??????M,??p??h????s??`i???.???/?v?M???^????aI?y?s????c??q}?????Ac~]????uOc???I`t$E?E??D???%???3x???+?~x?
Z2??.?#=]o??w??djyho?????x?????q??=Y?>?2?	??p?v:?????V?{???2W?`~}??;m??P?????-^???S&b??????G??,???)??Bo6????gsQ????kO-?_?a?o???H???????m]?3???LD??K?][k???n?|g??n*???A?U-g?G????W?
endobj
64 0 obj <<
/Type /Page
/Contents 65 0 R
/Resources 63 0 R
/MediaBox [0 0 612 792]
/Parent 50 0 R
>> endobj
66 0 obj <<
/D [64 0 R /XYZ 72 741.554 null]
>> endobj
67 0 obj <<
/D [64 0 R /XYZ 72 720 null]
>> endobj
14 0 obj <<
/D [64 0 R /XYZ 72 720 null]
>> endobj
63 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
70 0 obj <<
/Length 506       
/Filter /FlateDecode
>>
stream
x??UMo?0??W?hK???
??VM????-?????e??M?~?.d?M?(?R??????{???#p*q??Z?b?8?`??A?V8?.???*?T???????/?m?]?89i???C???G?'?2/I`H?G"fFeOS?8?L??]]s\??????Ie?
?.??D???'|?$?Q??w?????8????????C???K??b???????+???n?ki$??H????????]??sb*9YX*8?h_????}??15???[?p???a&?[)K??(??l?@????+??a1bE?zS]/krCY?A??ba+7?\???
??)?????Q?c?
endobj
69 0 obj <<
/Type /Page
/Contents 70 0 R
/Resources 68 0 R
/MediaBox [0 0 612 792]
/Parent 50 0 R
>> endobj
71 0 obj <<
/D [69 0 R /XYZ 72 741.554 null]
>> endobj
72 0 obj <<
/D [69 0 R /XYZ 72 720 null]
>> endobj
18 0 obj <<
/D [69 0 R /XYZ 72 720 null]
>> endobj
68 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
75 0 obj <<
/Length 1537      
/Filter /FlateDecode
>>
stream
x??X?o?6?_?G	?5R??[?4]
t?Zw????h??,y?????w??d???vh?
???????oF|???&?4	?E?4?L?t?gf?z5???gn????aL??R?G?{??qu??????^bv^??`?yM?_??0(?y?i??'D????f????u9y3???;?8?!??M?> endobj
76 0 obj <<
/D [74 0 R /XYZ 72 741.554 null]
>> endobj
77 0 obj <<
/D [74 0 R /XYZ 72 720 null]
>> endobj
22 0 obj <<
/D [74 0 R /XYZ 72 720 null]
>> endobj
73 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
80 0 obj <<
/Length 444       
/Filter /FlateDecode
>>
stream
x??UKO?0??W?????A=jVo*7???$> endobj
81 0 obj <<
/D [79 0 R /XYZ 72 741.554 null]
>> endobj
82 0 obj <<
/D [79 0 R /XYZ 72 720 null]
>> endobj
26 0 obj <<
/D [79 0 R /XYZ 72 720 null]
>> endobj
78 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
86 0 obj <<
/Length 500       
/Filter /FlateDecode
>>
stream
x??UKo?0??W?(?&?zX=vXt???u=??M??V??_=?
?t?a? 0E~"???D!q?
??S,??
X;? ???0
??x???s????i???7?6R&?E?"????!????~???$0bT??fX??0%S?????????C_??|?;1???w?%?W|r?o)o?w???> endobj
87 0 obj <<
/D [85 0 R /XYZ 72 741.554 null]
>> endobj
88 0 obj <<
/D [85 0 R /XYZ 72 720 null]
>> endobj
30 0 obj <<
/D [85 0 R /XYZ 72 720 null]
>> endobj
84 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
91 0 obj <<
/Length 402       
/Filter /FlateDecode
>>
stream
x??T]o?0}???#D]?B:????O???? ?~?o??S?W?|'??%z?G????0?0b?F????????????2
?????3??N???j(7?m??^?0?6?vnL?D!?jww?R
)CR?`Vc?x??/?U??]?J?d??U?)?,r	va???`?????t??jxh??6?)?wB(h??	1??q?L?2??;e?J?????uc?U??XK?)?|n??> endobj
92 0 obj <<
/D [90 0 R /XYZ 72 741.554 null]
>> endobj
93 0 obj <<
/D [90 0 R /XYZ 72 720 null]
>> endobj
34 0 obj <<
/D [90 0 R /XYZ 72 720 null]
>> endobj
89 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
96 0 obj <<
/Length 413       
/Filter /FlateDecode
>>
stream
x??U?k?0????QfILL??6????<J??	V??????VEjKG;6"yy~???O	??C??P0?8g?_?J;??ZDP/3 at v??e?1G????iH?_??????Y?#?q?op`?R??9d??@k?Z?F????0?0b?A}????B??V~?'e
?A}???
???????/o???jD??k?k??r?H?ec??7SJ!eH(???,??w//??????@z??iXx????y?^g??\?s0q?68"6??VF????r???w??v	??^@??4??aZ6?sl?Y?-??b?7?I?8??>[?5j#Wm?~?M???6oM?&??>?=M??"?E???P??????~P???kE?7?x???????"?F????<?J4??????0Qu?????????????q?;endstream
endobj
95 0 obj <<
/Type /Page
/Contents 96 0 R
/Resources 94 0 R
/MediaBox [0 0 612 792]
/Parent 83 0 R
>> endobj
97 0 obj <<
/D [95 0 R /XYZ 72 741.554 null]
>> endobj
98 0 obj <<
/D [95 0 R /XYZ 72 720 null]
>> endobj
38 0 obj <<
/D [95 0 R /XYZ 72 720 null]
>> endobj
94 0 obj <<
/Font << /F22 49 0 R /F28 56 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
99 0 obj <<
/Type /Encoding
/Differences [ 0 /.notdef 1/dotaccent/fi/fl/fraction/hungarumlaut/Lslash/lslash/ogonek/ring 10/.notdef 11/breve/minus 13/.notdef 14/Zcaron/zcaron/caron/dotlessi/dotlessj/ff/ffi/ffl 22/.notdef 30/grave/quotesingle/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quoteright/parenleft/parenright/asterisk/plus/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore/quoteleft/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 127/.notdef 130/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE 141/.notdef 147/quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron/guilsinglright/oe 157/.notdef 159/Ydieresis 160/.notdef 161/exclamdown/cent/sterling/currency/yen/brokenbar/section/dieresis/copyr!
 ight/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]
>> endobj
56 0 obj <<
/Type /Font
/Subtype /Type1
/Encoding 99 0 R
/BaseFont /Times-Roman
>> endobj
49 0 obj <<
/Type /Font
/Subtype /Type1
/Encoding 99 0 R
/BaseFont /Helvetica-Bold
>> endobj
50 0 obj <<
/Type /Pages
/Count 6
/Parent 100 0 R
/Kids [42 0 R 52 0 R 59 0 R 64 0 R 69 0 R 74 0 R]
>> endobj
83 0 obj <<
/Type /Pages
/Count 4
/Parent 100 0 R
/Kids [79 0 R 85 0 R 90 0 R 95 0 R]
>> endobj
100 0 obj <<
/Type /Pages
/Count 10
/Kids [50 0 R 83 0 R]
>> endobj
101 0 obj <<
/Type /Outlines
/First 7 0 R
/Last 7 0 R
/Count 1
>> endobj
39 0 obj <<
/Title 40 0 R
/A 37 0 R
/Parent 7 0 R
/Prev 35 0 R
>> endobj
35 0 obj <<
/Title 36 0 R
/A 33 0 R
/Parent 7 0 R
/Prev 31 0 R
/Next 39 0 R
>> endobj
31 0 obj <<
/Title 32 0 R
/A 29 0 R
/Parent 7 0 R
/Prev 27 0 R
/Next 35 0 R
>> endobj
27 0 obj <<
/Title 28 0 R
/A 25 0 R
/Parent 7 0 R
/Prev 23 0 R
/Next 31 0 R
>> endobj
23 0 obj <<
/Title 24 0 R
/A 21 0 R
/Parent 7 0 R
/Prev 19 0 R
/Next 27 0 R
>> endobj
19 0 obj <<
/Title 20 0 R
/A 17 0 R
/Parent 7 0 R
/Prev 15 0 R
/Next 23 0 R
>> endobj
15 0 obj <<
/Title 16 0 R
/A 13 0 R
/Parent 7 0 R
/Prev 11 0 R
/Next 19 0 R
>> endobj
11 0 obj <<
/Title 12 0 R
/A 9 0 R
/Parent 7 0 R
/Next 15 0 R
>> endobj
7 0 obj <<
/Title 8 0 R
/A 5 0 R
/Parent 101 0 R
/First 11 0 R
/Last 39 0 R
/Count -8
>> endobj
102 0 obj <<
/Names [(Doc-Start) 46 0 R (ch-intro) 62 0 R (ch-intro.2) 10 0 R (documentation-guide) 47 0 R (documentation-guide.1) 6 0 R (general-applications) 98 0 R (general-applications.2) 38 0 R (individual-packages) 72 0 R (individual-packages.2) 18 0 R (infrastructure) 67 0 R (infrastructure.2) 14 0 R (installation) 77 0 R (installation.2) 22 0 R (kernel) 88 0 R (kernel.2) 30 0 R (page.1) 45 0 R (page.10) 97 0 R (page.2) 54 0 R (page.3) 61 0 R (page.4) 66 0 R (page.5) 71 0 R (page.6) 76 0 R (page.7) 81 0 R (page.8) 87 0 R (page.9) 92 0 R (release-engineering) 82 0 R (release-engineering.2) 26 0 R (toolchain) 93 0 R (toolchain.2) 34 0 R]
/Limits [(Doc-Start) (toolchain.2)]
>> endobj
103 0 obj <<
/Kids [102 0 R]
>> endobj
104 0 obj <<
/Dests 103 0 R
>> endobj
105 0 obj <<
/Type /Catalog
/Pages 100 0 R
/Outlines 101 0 R
/Names 104 0 R
/PageMode /UseOutlines /URI<>  /ViewerPreferences<<>> 
/OpenAction 41 0 R
>> endobj
106 0 obj <<
/Producer (pdfTeX-0.14h)
/Author()/Title()/Subject()/Creator(LaTeX with hyperref package)/Producer(pdfTeX14.h)/Keywords()
/Creator (TeX)
/CreationDate (D:20030717002700)
>> endobj
xref
0 107
0000000001 65535 f 
0000000002 00000 f 
0000000003 00000 f 
0000000004 00000 f 
0000000048 00000 f 
0000000009 00000 n 
0000001471 00000 n 
0000015613 00000 n 
0000000066 00000 n 
0000000129 00000 n 
0000004739 00000 n 
0000015541 00000 n 
0000000175 00000 n 
0000000206 00000 n 
0000006142 00000 n 
0000015455 00000 n 
0000000259 00000 n 
0000000292 00000 n 
0000007074 00000 n 
0000015369 00000 n 
0000000350 00000 n 
0000000388 00000 n 
0000009037 00000 n 
0000015283 00000 n 
0000000439 00000 n 
0000000470 00000 n 
0000009907 00000 n 
0000015197 00000 n 
0000000528 00000 n 
0000000566 00000 n 
0000010833 00000 n 
0000015111 00000 n 
0000000611 00000 n 
0000000644 00000 n 
0000011661 00000 n 
0000015025 00000 n 
0000000692 00000 n 
0000000720 00000 n 
0000012500 00000 n 
0000014952 00000 n 
0000000779 00000 n 
0000000818 00000 n 
0000001210 00000 n 
0000001521 00000 n 
0000000868 00000 n 
0000001318 00000 n 
0000001369 00000 n 
0000001420 00000 n 
0000000055 00000 f 
0000014512 00000 n 
0000014605 00000 n 
0000003792 00000 n 
0000003428 00000 n 
0000001591 00000 n 
0000003737 00000 n 
0000000000 00000 f 
0000014422 00000 n 
0000003555 00000 n 
0000004790 00000 n 
0000004525 00000 n 
0000003874 00000 n 
0000004633 00000 n 
0000004688 00000 n 
0000006193 00000 n 
0000005928 00000 n 
0000004872 00000 n 
0000006036 00000 n 
0000006091 00000 n 
0000007125 00000 n 
0000006860 00000 n 
0000006275 00000 n 
0000006968 00000 n 
0000007023 00000 n 
0000009088 00000 n 
0000008823 00000 n 
0000007207 00000 n 
0000008931 00000 n 
0000008986 00000 n 
0000009958 00000 n 
0000009693 00000 n 
0000009170 00000 n 
0000009801 00000 n 
0000009856 00000 n 
0000014715 00000 n 
0000010884 00000 n 
0000010619 00000 n 
0000010040 00000 n 
0000010727 00000 n 
0000010782 00000 n 
0000011712 00000 n 
0000011447 00000 n 
0000010966 00000 n 
0000011555 00000 n 
0000011610 00000 n 
0000012551 00000 n 
0000012286 00000 n 
0000011794 00000 n 
0000012394 00000 n 
0000012449 00000 n 
0000012633 00000 n 
0000014811 00000 n 
0000014879 00000 n 
0000015709 00000 n 
0000016406 00000 n 
0000016445 00000 n 
0000016483 00000 n 
0000016652 00000 n 
trailer
<<
/Size 107
/Root 105 0 R
/Info 106 0 R
>>
startxref
16845
%%EOF



From fedora-extras-commits at redhat.com  Thu Dec  8 11:41:56 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:41:56 -0500
Subject: web/html/docs/release-notes/fc5/test1-en fedora.css,NONE,1.1
Message-ID: <200512081141.jB8BfuOV002089@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/release-notes/fc5/test1-en

Added Files:
	fedora.css 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #D0D0B0;
	background-color: #FAF9E0;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #22437f;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
      
h2 {
        font-size: 1.25em;
}

h3 {
        font-size: 1.1em;
}

a:link {
        color: #900;
}
a:visited {
        color: #48468f;
}
a:hover {
        color: #f20;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}

.procedure ol li {
        margin-bottom: 0.5em;
}
.procedure ol li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

.itemizedlist ul li {
	margin-bottom: 0.5em;
}
.itemizedlist ul li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

p.title	{
	text-align: center;
}



From fedora-extras-commits at redhat.com  Thu Dec  8 11:42:01 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:42:01 -0500
Subject: web/html/docs/release-notes/fc5/test1-it fedora.css,NONE,1.1
Message-ID: <200512081142.jB8Bg1Ux002105@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-it
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/release-notes/fc5/test1-it

Added Files:
	fedora.css 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

/* 
This "body" section is included for reference.  Diff with fedora-draft.css
body	{
	background-attachment	scroll;
	background-color:	#FEFEFF;
	background-image:	url('watermark.png');
	background-position:	top center;
	background-repeat:	repeat;
}
*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #D0D0B0;
	background-color: #FAF9E0;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #22437f;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
      
h2 {
        font-size: 1.25em;
}

h3 {
        font-size: 1.1em;
}

a:link {
        color: #900;
}
a:visited {
        color: #48468f;
}
a:hover {
        color: #f20;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}

.procedure ol li {
        margin-bottom: 0.5em;
}
.procedure ol li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

.itemizedlist ul li {
	margin-bottom: 0.5em;
}
.itemizedlist ul li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

p.title	{
	text-align: center;
}



From fedora-extras-commits at redhat.com  Thu Dec  8 11:42:06 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:42:06 -0500
Subject: web/html/docs/release-notes/fc5/test1-ja_JP fedora.css,NONE,1.1
Message-ID: <200512081142.jB8Bg6Ae002121@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-ja_JP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/release-notes/fc5/test1-ja_JP

Added Files:
	fedora.css 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

/* 
This "body" section is included for reference.  Diff with fedora-draft.css
body	{
	background-attachment	scroll;
	background-color:	#FEFEFF;
	background-image:	url('watermark.png');
	background-position:	top center;
	background-repeat:	repeat;
}
*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #D0D0B0;
	background-color: #FAF9E0;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #22437f;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
      
h2 {
        font-size: 1.25em;
}

h3 {
        font-size: 1.1em;
}

a:link {
        color: #900;
}
a:visited {
        color: #48468f;
}
a:hover {
        color: #f20;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}

.procedure ol li {
        margin-bottom: 0.5em;
}
.procedure ol li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

.itemizedlist ul li {
	margin-bottom: 0.5em;
}
.itemizedlist ul li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

p.title	{
	text-align: center;
}



From fedora-extras-commits at redhat.com  Thu Dec  8 11:42:12 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:42:12 -0500
Subject: web/html/docs/release-notes/fc5/test1-ru fedora.css,NONE,1.1
Message-ID: <200512081142.jB8BgC8J002137@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-ru
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/release-notes/fc5/test1-ru

Added Files:
	fedora.css 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

/* 
This "body" section is included for reference.  Diff with fedora-draft.css
body	{
	background-attachment	scroll;
	background-color:	#FEFEFF;
	background-image:	url('watermark.png');
	background-position:	top center;
	background-repeat:	repeat;
}
*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #D0D0B0;
	background-color: #FAF9E0;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #22437f;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
      
h2 {
        font-size: 1.25em;
}

h3 {
        font-size: 1.1em;
}

a:link {
        color: #900;
}
a:visited {
        color: #48468f;
}
a:hover {
        color: #f20;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}

.procedure ol li {
        margin-bottom: 0.5em;
}
.procedure ol li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

.itemizedlist ul li {
	margin-bottom: 0.5em;
}
.itemizedlist ul li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

p.title	{
	text-align: center;
}



From fedora-extras-commits at redhat.com  Thu Dec  8 11:42:17 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:42:17 -0500
Subject: web/html/docs/release-notes/fc5/test1-zh_CN fedora.css,NONE,1.1
Message-ID: <200512081142.jB8BgHS3002153@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc5/test1-zh_CN
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/release-notes/fc5/test1-zh_CN

Added Files:
	fedora.css 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


--- NEW FILE fedora.css ---
/*

CSS for Red Hat Linux Project docs from the Documentation Project

Written by Tammy Fox and Garrett LeSage

Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.

License: GPL

*/

/* 
This "body" section is included for reference.  Diff with fedora-draft.css
body	{
	background-attachment	scroll;
	background-color:	#FEFEFF;
	background-image:	url('watermark.png');
	background-position:	top center;
	background-repeat:	repeat;
}
*/

li p {
	display: inline;
}

div.table table {
	width: 95%;
	background-color: #DCDCDC; 
	color: #000000;
	border-spacing: 0;
}

div.table table th {
	border: 1px solid #A9A9A9;	
	background-color: #A9A9A9;
	color: #000000;
}

div.table table td {
	border: 1px solid #A9A9A9; 
	background-color: #DCDCDC;
	color: #000000;
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 2px; 

}

div.note table, div.tip table, div.important table, div.caution table, div.warning table {
	width: 95%;
	border: 2px solid #D0D0B0;
	background-color: #FAF9E0;
	color: #000000;
	/* padding inside table area */
	padding: 0.5em;
	margin-bottom: 0.5em;
	margin-top: 0.5em;
}

.qandaset table {
	border-collapse: collapse;
}
.qandaset {
}
.qandaset tr.question {
}
.qandaset tr.question td {
	font-weight: bold;
	padding: 1em 1em 0;
}
.qandaset tr.answer td {
	padding: 0.25em 1em 1.5em;
}
.qandaset tr.question td, .qandaset tr.answer td {
}

hr {
        border: 0;
        border-bottom: 1px solid #ccc;
}

h1, h2, h3, h4 {
        font-family: luxi sans,sans-serif;
	color: #22437f;
	font-weight: bold;
}
h1 {
        font-size: 1.75em;
}
      
h2 {
        font-size: 1.25em;
}

h3 {
        font-size: 1.1em;
}

a:link {
        color: #900;
}
a:visited {
        color: #48468f;
}
a:hover {
        color: #f20;
}

code.screen, pre.screen {
	font-family: monospace;
	font-size: 1em;
	display: block;
	padding: 10px;
	border: 1px solid #bbb;
	background-color: #eee;
	color: #000;
	overflow: auto;
	border-radius: 2.5px;
	-moz-border-radius: 2.5px;
	margin: 0.5em 2em;
}

div.example {
	padding: 10px;
        border: 1px solid #bbb;
	margin: 0.5em 2em;
}

.procedure ol li {
        margin-bottom: 0.5em;
}
.procedure ol li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

.itemizedlist ul li {
	margin-bottom: 0.5em;
}
.itemizedlist ul li li {
	/* prevent inheritance */
	margin-bottom: 0em;
}

p.title	{
	text-align: center;
}



From fedora-extras-commits at redhat.com  Thu Dec  8 11:42:22 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:42:22 -0500
Subject: web/html/docs/release-notes/stylesheet-images 1.png, NONE,
	1.1 10.png, NONE, 1.1 11.png, NONE, 1.1 12.png, NONE,
	1.1 13.png, NONE, 1.1 14.png, NONE, 1.1 15.png, NONE,
	1.1 2.png, NONE, 1.1 3.png, NONE, 1.1 4.png, NONE, 1.1 5.png,
	NONE, 1.1 6.png, NONE, 1.1 7.png, NONE, 1.1 8.png, NONE,
	1.1 9.png, NONE, 1.1 caution.png, NONE, 1.1 important.png,
	NONE, 1.1 note.png, NONE, 1.1 tip.png, NONE, 1.1 warning.png,
	NONE, 1.1
Message-ID: <200512081142.jB8BgMu1002189@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2013/release-notes/stylesheet-images

Added Files:
	1.png 10.png 11.png 12.png 13.png 14.png 15.png 2.png 3.png 
	4.png 5.png 6.png 7.png 8.png 9.png caution.png important.png 
	note.png tip.png warning.png 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:45:24 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:45:24 -0500
Subject: web/html/docs/release-notes/figs Fedora_Desktop.png,NONE,1.1
Message-ID: <200512081145.jB8BjOCR002226@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/figs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2213/release-notes/figs

Added Files:
	Fedora_Desktop.png 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.



From fedora-extras-commits at redhat.com  Thu Dec  8 11:57:56 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 06:57:56 -0500
Subject: web/html/docs/documentation-quick-start - New directory
Message-ID: <200512081157.jB8BvuGr002341@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-quick-start
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2331/documentation-quick-start

Log Message:
Directory /cvs/fedora/web/html/docs/documentation-quick-start added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 12:00:08 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu,  8 Dec 2005 07:00:08 -0500
Subject: web/html/docs/documentation-quick-start index.php,NONE,1.1
Message-ID: <200512081200.jB8C08H8002393@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/documentation-quick-start
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2382/documentation-quick-start

Added Files:
	index.php 
Log Message:
Trying to get content moved to new locations with proper redirect pages left behind.


***** Error reading new file: [Errno 2] No such file or directory: 'index.php'



From fedora-extras-commits at redhat.com  Thu Dec  8 12:20:08 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  8 Dec 2005 07:20:08 -0500
Subject: rpms/koffice/FC-4 koffice-CAN-2005-3193.diff, NONE, 1.1 koffice.spec,
	1.9, 1.10
Message-ID: <200512081220.jB8CKd6l004044@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4022

Modified Files:
	koffice.spec 
Added Files:
	koffice-CAN-2005-3193.diff 
Log Message:
- fix CAN-2005-3193


koffice-CAN-2005-3193.diff:

--- NEW FILE koffice-CAN-2005-3193.diff ---
Index: filters/kword/pdf/xpdf/xpdf/Stream.cc
===================================================================
--- filters/kword/pdf/xpdf/xpdf/Stream.cc	(revision 485850)
+++ filters/kword/pdf/xpdf/xpdf/Stream.cc	(revision 486431)
@@ -404,18 +404,33 @@ void ImageStream::skipLine() {
 
 StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
 				 int widthA, int nCompsA, int nBitsA) {
+  int totalBits;
+
   str = strA;
   predictor = predictorA;
   width = widthA;
   nComps = nCompsA;
   nBits = nBitsA;
+  predLine = NULL;
+  ok = gFalse;
 
   nVals = width * nComps;
+  totalBits = nVals * nBits;
+  if ( totalBits == 0 ||
+     (totalBits / nBits) / nComps != width ||
+     totalBits + 7 < 0) {
+    return;
+  }
   pixBytes = (nComps * nBits + 7) >> 3;
-  rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
+  rowBytes = ((totalBits + 7) >> 3) + pixBytes;
+  if (rowBytes < 0)
+    return;
+
   predLine = (Guchar *)gmalloc(rowBytes);
   memset(predLine, 0, rowBytes);
   predIdx = rowBytes;
+
+  ok = gTrue;
 }
 
 StreamPredictor::~StreamPredictor() {
@@ -982,6 +997,10 @@ LZWStream::LZWStream(Stream *strA, int p
     FilterStream(strA) {
   if (predictor != 1) {
     pred = new StreamPredictor(this, predictor, columns, colors, bits);
+    if ( !pred->isOk()) {
+       delete pred;
+       pred = NULL;
+    }
   } else {
     pred = NULL;
   }
@@ -2861,6 +2880,10 @@ GBool DCTStream::readBaselineSOF() {
   height = read16();
   width = read16();
   numComps = str->getChar();
+  if (numComps <= 0 || numComps > 4) {
+     error(getPos(), "Bad number of components in DCT stream");
+     return gFalse;
+  }
   if (prec != 8) {
     error(getPos(), "Bad DCT precision %d", prec);
     return gFalse;
@@ -3179,6 +3202,10 @@ FlateStream::FlateStream(Stream *strA, i
     FilterStream(strA) {
   if (predictor != 1) {
     pred = new StreamPredictor(this, predictor, columns, colors, bits);
+    if ( !pred->isOk()) {
+        delete pred;
+        pred = NULL;
+    }
   } else {
     pred = NULL;
   }
Index: filters/kword/pdf/xpdf/xpdf/Stream.h
===================================================================
--- filters/kword/pdf/xpdf/xpdf/Stream.h	(revision 485850)
+++ filters/kword/pdf/xpdf/xpdf/Stream.h	(revision 486431)
@@ -227,6 +227,7 @@ public:
 
   int lookChar();
   int getChar();
+  GBool isOk() { return ok; }
 
 private:
 
@@ -242,6 +243,7 @@ private:
   int rowBytes;			// bytes per line
   Guchar *predLine;		// line buffer
   int predIdx;			// current index in predLine
+  GBool ok;
 };
 
 //------------------------------------------------------------------------


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- koffice.spec	16 Oct 2005 21:25:35 -0000	1.9
+++ koffice.spec	8 Dec 2005 12:20:06 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -11,7 +11,8 @@
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-
+# CAN-2005-3193 see #175260
+Patch1:         koffice-CAN-2005-3193.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -191,8 +192,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1
 
-# this will make sure that patch0 and patch1 are considered
+# this will make sure that patch0 is considered
 make -f admin/Makefile.common
 
 %build
@@ -744,6 +746,10 @@
 %{_datadir}/servicetypes/kofilter*.desktop
 
 %changelog
+* Thu Dec 08 2005 Andreas Bierfert 
+1.4.2-2
+- fix CAN-2005-3193
+
 * Fri Oct 14 2005 Andreas Bierfert 
 1.4.2-1
 - version upgrade



From fedora-extras-commits at redhat.com  Thu Dec  8 12:24:12 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  8 Dec 2005 07:24:12 -0500
Subject: rpms/koffice/devel koffice-CAN-2005-3193.diff, NONE,
	1.1 koffice.spec, 1.15, 1.16
Message-ID: <200512081224.jB8COhVI004117@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4097

Modified Files:
	koffice.spec 
Added Files:
	koffice-CAN-2005-3193.diff 
Log Message:
- fix CAN-2005-3193


koffice-CAN-2005-3193.diff:

--- NEW FILE koffice-CAN-2005-3193.diff ---
Index: filters/kword/pdf/xpdf/xpdf/Stream.cc
===================================================================
--- filters/kword/pdf/xpdf/xpdf/Stream.cc	(revision 485850)
+++ filters/kword/pdf/xpdf/xpdf/Stream.cc	(revision 486431)
@@ -404,18 +404,33 @@ void ImageStream::skipLine() {
 
 StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
 				 int widthA, int nCompsA, int nBitsA) {
+  int totalBits;
+
   str = strA;
   predictor = predictorA;
   width = widthA;
   nComps = nCompsA;
   nBits = nBitsA;
+  predLine = NULL;
+  ok = gFalse;
 
   nVals = width * nComps;
+  totalBits = nVals * nBits;
+  if ( totalBits == 0 ||
+     (totalBits / nBits) / nComps != width ||
+     totalBits + 7 < 0) {
+    return;
+  }
   pixBytes = (nComps * nBits + 7) >> 3;
-  rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
+  rowBytes = ((totalBits + 7) >> 3) + pixBytes;
+  if (rowBytes < 0)
+    return;
+
   predLine = (Guchar *)gmalloc(rowBytes);
   memset(predLine, 0, rowBytes);
   predIdx = rowBytes;
+
+  ok = gTrue;
 }
 
 StreamPredictor::~StreamPredictor() {
@@ -982,6 +997,10 @@ LZWStream::LZWStream(Stream *strA, int p
     FilterStream(strA) {
   if (predictor != 1) {
     pred = new StreamPredictor(this, predictor, columns, colors, bits);
+    if ( !pred->isOk()) {
+       delete pred;
+       pred = NULL;
+    }
   } else {
     pred = NULL;
   }
@@ -2861,6 +2880,10 @@ GBool DCTStream::readBaselineSOF() {
   height = read16();
   width = read16();
   numComps = str->getChar();
+  if (numComps <= 0 || numComps > 4) {
+     error(getPos(), "Bad number of components in DCT stream");
+     return gFalse;
+  }
   if (prec != 8) {
     error(getPos(), "Bad DCT precision %d", prec);
     return gFalse;
@@ -3179,6 +3202,10 @@ FlateStream::FlateStream(Stream *strA, i
     FilterStream(strA) {
   if (predictor != 1) {
     pred = new StreamPredictor(this, predictor, columns, colors, bits);
+    if ( !pred->isOk()) {
+        delete pred;
+        pred = NULL;
+    }
   } else {
     pred = NULL;
   }
Index: filters/kword/pdf/xpdf/xpdf/Stream.h
===================================================================
--- filters/kword/pdf/xpdf/xpdf/Stream.h	(revision 485850)
+++ filters/kword/pdf/xpdf/xpdf/Stream.h	(revision 486431)
@@ -227,6 +227,7 @@ public:
 
   int lookChar();
   int getChar();
+  GBool isOk() { return ok; }
 
 private:
 
@@ -242,6 +243,7 @@ private:
   int rowBytes;			// bytes per line
   Guchar *predLine;		// line buffer
   int predIdx;			// current index in predLine
+  GBool ok;
 };
 
 //------------------------------------------------------------------------


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- koffice.spec	21 Nov 2005 22:42:28 -0000	1.15
+++ koffice.spec	8 Dec 2005 12:24:10 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -11,7 +11,9 @@
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-Patch1:         koffice-qt3.3.5.patch
+
+# fix CAN-2005-3193 see #175260
+Patch1:         koffice-CAN-2005-3193.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -192,9 +194,9 @@
 %prep
 %setup -q
 %patch0 -p1
-#%patch1
+%patch1
 
-# this will make sure that patch0 and patch1 are considered
+# this will make sure that patch0 is considered
 make -f admin/Makefile.common
 
 %build
@@ -746,6 +748,10 @@
 %{_datadir}/servicetypes/kofilter*.desktop
 
 %changelog
+* Thu Dec 08 2005 Andreas Bierfert 
+1.4.2-3
+- fix CAN-2005-3193
+
 * Thu Nov 10 2005 Andreas Bierfert 
 1.4.2-2
 - remove xorg-x11-devel BR



From fedora-extras-commits at redhat.com  Thu Dec  8 13:17:27 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu,  8 Dec 2005 08:17:27 -0500
Subject: rpms/goffice/devel goffice.spec,1.4,1.5
Message-ID: <200512081317.jB8DHvm9005930@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/goffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5913

Modified Files:
	goffice.spec 
Log Message:
switch to Core libgsf


Index: goffice.spec
===================================================================
RCS file: /cvs/extras/rpms/goffice/devel/goffice.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- goffice.spec	28 Nov 2005 18:41:25 -0000	1.4
+++ goffice.spec	8 Dec 2005 13:17:25 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		goffice         
 Version: 	0.1.2
-Release:        2
+Release:        3
 Summary:        Goffice support libraries
 
 Group:          System Environment/Libraries
@@ -9,7 +9,7 @@
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/${name}/0.1/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgsf113-devel	>= 1.13.3
+BuildRequires:  libgsf-devel	>= 1.13.3
 BuildRequires:	libgnomeprint22-devel	>= 2.8.2
 BuildRequires:	libgnomeui-devel >= 2.0.0
 # this is probably needed because of a bug in one of the above three, try
@@ -36,7 +36,6 @@
 
 
 %build
-export PKG_CONFIG_PATH=%{_libdir}/libgsf-1.13/lib/pkgconfig
 %configure
 make %{?_smp_mflags}
 
@@ -70,6 +69,10 @@
 
 
 %changelog
+* Mon Nov 28 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.
+
 * Mon Nov 28 2005 Hans de Goede  0.1.2-2
 -Make Source0 a full URL
 -Better URL tag



From fedora-extras-commits at redhat.com  Thu Dec  8 13:22:11 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu,  8 Dec 2005 08:22:11 -0500
Subject: rpms/goffice/devel goffice.spec,1.5,1.6
Message-ID: <200512081322.jB8DMgwn006012@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/goffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5974

Modified Files:
	goffice.spec 
Log Message:
try building without BR libSM-devel


Index: goffice.spec
===================================================================
RCS file: /cvs/extras/rpms/goffice/devel/goffice.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- goffice.spec	8 Dec 2005 13:17:25 -0000	1.5
+++ goffice.spec	8 Dec 2005 13:22:06 -0000	1.6
@@ -9,12 +9,12 @@
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/${name}/0.1/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libgsf-devel	>= 1.13.3
+BuildRequires:	libgsf-devel		>= 1.13.3
 BuildRequires:	libgnomeprint22-devel	>= 2.8.2
-BuildRequires:	libgnomeui-devel >= 2.0.0
+BuildRequires:	libgnomeui-devel	>= 2.0.0
 # this is probably needed because of a bug in one of the above three, try
 # removing this some time in the future.
-BuildRequires:  libSM-devel
+# BuildRequires:  libSM-devel
 
 
 %description
@@ -24,9 +24,9 @@
 Summary:	Libraries and include files for goffice
 Group:		Development/Libraries
 Requires:	%{name} = %{version}
-Requires:	libgsf113-devel >= 1.13.3
-Requires:	libgnomeprint22-devel >= 2.8.2
-Requires:	libgnomeui-devel >= 2.0.0
+Requires:	libgsf-devel		>= 1.13.3
+Requires:	libgnomeprint22-devel	>= 2.8.2
+Requires:	libgnomeui-devel	>= 2.0.0
 
 %description devel
 Development libraries for goffice
@@ -69,7 +69,7 @@
 
 
 %changelog
-* Mon Nov 28 2005 Hans de Goede  0.1.2-3
+* 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  Thu Dec  8 15:59:34 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu,  8 Dec 2005 10:59:34 -0500
Subject: rpms/tinyerp/FC-3 tinyerp.spec,1.4,1.5
Message-ID: <200512081600.jB8G0579010494@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10465

Modified Files:
	tinyerp.spec 
Log Message:
 - set owner for dirs in %post not %pre



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tinyerp.spec	28 Nov 2005 14:40:32 -0000	1.4
+++ tinyerp.spec	8 Dec 2005 15:59:32 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -109,11 +109,11 @@
 /usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
-chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
-
 exit 0
 
 %post server
+chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
+
 /sbin/chkconfig --add tinyerp-server
 
 %preun server



From fedora-extras-commits at redhat.com  Thu Dec  8 16:00:57 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu,  8 Dec 2005 11:00:57 -0500
Subject: rpms/tinyerp/FC-4 tinyerp.spec,1.6,1.7
Message-ID: <200512081601.jB8G1RL4012071@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10502

Modified Files:
	tinyerp.spec 
Log Message:
 - set owner for dirs in %post instead of %pre



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tinyerp.spec	28 Nov 2005 14:43:00 -0000	1.6
+++ tinyerp.spec	8 Dec 2005 16:00:55 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -109,11 +109,11 @@
 /usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
-chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
-
 exit 0
 
 %post server
+chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
+
 /sbin/chkconfig --add tinyerp-server
 
 %preun server



From fedora-extras-commits at redhat.com  Thu Dec  8 16:43:17 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu,  8 Dec 2005 11:43:17 -0500
Subject: rpms/baobab/devel .cvsignore, 1.5, 1.6 baobab.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <200512081643.jB8GhlH6012263@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12242

Modified Files:
	.cvsignore baobab.spec sources 
Log Message:
update to 2.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Dec 2005 19:17:01 -0000	1.5
+++ .cvsignore	8 Dec 2005 16:43:15 -0000	1.6
@@ -1 +1 @@
-baobab-2.2.0.tar.gz
+baobab-2.2.2.tar.gz


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- baobab.spec	1 Dec 2005 19:17:01 -0000	1.5
+++ baobab.spec	8 Dec 2005 16:43:15 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           baobab
-Version:        2.2.0
+Version:        2.2.2
 Release:        1%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.marzocca.net/linux/baobab.html
-Source0:        http://www.marzocca.net/linux/downloads/baobab-2.2.0.tar.gz
+Source0:        http://www.marzocca.net/linux/downloads/baobab-2.2.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -56,6 +56,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Dec 08 2005 Thorsten Leemhuis  - 2.2.2-1
+- Update to 2.2.2
+
 * Thu Dec 01 2005 Thorsten Leemhuis  - 2.2.0-1
 - Update to 2.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Dec 2005 19:17:01 -0000	1.5
+++ sources	8 Dec 2005 16:43:15 -0000	1.6
@@ -1 +1 @@
-8ea3c8c67a27e6f0be14744adc2c17c7  baobab-2.2.0.tar.gz
+2a4911a28c27752e1c92f6505b39cc60  baobab-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 16:56:07 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu,  8 Dec 2005 11:56:07 -0500
Subject: rpms/baobab/FC-4 .cvsignore, 1.5, 1.6 baobab.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <200512081656.jB8GubTX012352@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329

Modified Files:
	.cvsignore baobab.spec sources 
Log Message:
update to 2.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Dec 2005 19:16:55 -0000	1.5
+++ .cvsignore	8 Dec 2005 16:56:05 -0000	1.6
@@ -1 +1 @@
-baobab-2.2.0.tar.gz
+baobab-2.2.2.tar.gz


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- baobab.spec	1 Dec 2005 19:16:55 -0000	1.5
+++ baobab.spec	8 Dec 2005 16:56:05 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           baobab
-Version:        2.2.0
+Version:        2.2.2
 Release:        1%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.marzocca.net/linux/baobab.html
-Source0:        http://www.marzocca.net/linux/downloads/baobab-2.2.0.tar.gz
+Source0:        http://www.marzocca.net/linux/downloads/baobab-2.2.2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -57,6 +57,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Dec 08 2005 Thorsten Leemhuis  - 2.2.2-1
+- Update to 2.2.2
+
 * Thu Dec 01 2005 Thorsten Leemhuis  - 2.2.0-1
 - Update to 2.2.0
 - Still works with older GNOME_CANVAS so drop requires in configure slightly


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Dec 2005 19:16:55 -0000	1.5
+++ sources	8 Dec 2005 16:56:05 -0000	1.6
@@ -1 +1 @@
-8ea3c8c67a27e6f0be14744adc2c17c7  baobab-2.2.0.tar.gz
+2a4911a28c27752e1c92f6505b39cc60  baobab-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 17:09:35 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu,  8 Dec 2005 12:09:35 -0500
Subject: rpms/perl-Data-Buffer - New directory
Message-ID: <200512081709.jB8H9Zdd014040@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Data-Buffer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14029/perl-Data-Buffer

Log Message:
Directory /cvs/extras/rpms/perl-Data-Buffer added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 17:09:50 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu,  8 Dec 2005 12:09:50 -0500
Subject: rpms/perl-Data-Buffer/devel - New directory
Message-ID: <200512081709.jB8H9oSD014053@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-serv14029/perl-Data-Buffer/devel

Log Message:
Directory /cvs/extras/rpms/perl-Data-Buffer/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 17:11:20 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu,  8 Dec 2005 12:11:20 -0500
Subject: rpms/perl-Data-Buffer Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512081711.jB8HBKaI014131@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Data-Buffer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14118

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Data-Buffer


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Data-Buffer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec  8 17:11:25 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu,  8 Dec 2005 12:11:25 -0500
Subject: rpms/perl-Data-Buffer/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512081711.jB8HBPaG014151@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-serv14118/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Data-Buffer


--- NEW 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 Dec  8 17:11:45 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu,  8 Dec 2005 12:11:45 -0500
Subject: rpms/tinyerp/FC-3 tinyerp.spec,1.5,1.6
Message-ID: <200512081712.jB8HCG0k014194@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14092

Modified Files:
	tinyerp.spec 
Log Message:
 - chown for log and spool is not required



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tinyerp.spec	8 Dec 2005 15:59:32 -0000	1.5
+++ tinyerp.spec	8 Dec 2005 17:11:43 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -112,8 +112,6 @@
 exit 0
 
 %post server
-chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
-
 /sbin/chkconfig --add tinyerp-server
 
 %preun server
@@ -132,6 +130,9 @@
 
 
 %changelog
+* Thu Dec  7 2005 Dan Horak  3.1.1-3
+- chown for log and spool is not required
+
 * Mon Nov 28 2005 Dan Horak  3.1.1-1
 - upgrade to tinyerp 3.1.1
 



From fedora-extras-commits at redhat.com  Thu Dec  8 17:12:51 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu,  8 Dec 2005 12:12:51 -0500
Subject: rpms/tinyerp/FC-4 tinyerp.spec,1.7,1.8
Message-ID: <200512081713.jB8HDLgD014299@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14200

Modified Files:
	tinyerp.spec 
Log Message:
 - chown for log and spool is not required



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tinyerp.spec	8 Dec 2005 16:00:55 -0000	1.7
+++ tinyerp.spec	8 Dec 2005 17:12:49 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -112,8 +112,6 @@
 exit 0
 
 %post server
-chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
-
 /sbin/chkconfig --add tinyerp-server
 
 %preun server
@@ -132,6 +130,9 @@
 
 
 %changelog
+* Thu Dec  7 2005 Dan Horak  3.1.1-3
+- chown for log and spool is not required
+
 * Mon Nov 28 2005 Dan Horak  3.1.1-1
 - upgrade to tinyerp 3.1.1
 



From fedora-extras-commits at redhat.com  Thu Dec  8 17:12:50 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu,  8 Dec 2005 12:12:50 -0500
Subject: rpms/perl-Data-Buffer import.log,1.1,1.2
Message-ID: <200512081713.jB8HDKaD014296@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Data-Buffer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14214

Modified Files:
	import.log 
Log Message:
auto-import perl-Data-Buffer-0.04-1 on branch devel from perl-Data-Buffer-0.04-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Buffer/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Dec 2005 17:11:18 -0000	1.1
+++ import.log	8 Dec 2005 17:12:48 -0000	1.2
@@ -0,0 +1 @@
+perl-Data-Buffer-0_04-1:HEAD:perl-Data-Buffer-0.04-1.src.rpm:1134061954



From fedora-extras-commits at redhat.com  Thu Dec  8 17:12:55 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu,  8 Dec 2005 12:12:55 -0500
Subject: rpms/perl-Data-Buffer/devel perl-Data-Buffer.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512081713.jB8HDP5r014303@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-serv14214/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Data-Buffer.spec 
Log Message:
auto-import perl-Data-Buffer-0.04-1 on branch devel from perl-Data-Buffer-0.04-1.src.rpm


--- NEW FILE perl-Data-Buffer.spec ---
Summary:	Read/write buffer class for perl
Name:		perl-Data-Buffer
Version:	0.04
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Data-Buffer/
Source0:	http://search.cpan.org/CPAN/authors/id/B/BT/BTROTT/Data-Buffer-%{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
Data::Buffer implements a low-level binary buffer in which you can get and put
integers, strings, and other data. Internally the implementation is based on
pack and unpack, such that Data::Buffer is really a layer on top of those
built-in functions.

%prep
%setup -q -n Data-Buffer-%{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
%{perl_vendorlib}/Data/
%{_mandir}/man3/Data::Buffer.3pm*

%changelog
* Mon Nov 28 2005 Paul Howarth  0.04-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Buffer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Dec 2005 17:11:23 -0000	1.1
+++ .cvsignore	8 Dec 2005 17:12:53 -0000	1.2
@@ -0,0 +1 @@
+Data-Buffer-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Buffer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Dec 2005 17:11:23 -0000	1.1
+++ sources	8 Dec 2005 17:12:53 -0000	1.2
@@ -0,0 +1 @@
+d971f7b92684cc4f4cba7a9c774b8480  Data-Buffer-0.04.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 17:16:44 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu,  8 Dec 2005 12:16:44 -0500
Subject: owners owners.list,1.434,1.435
Message-ID: <200512081717.jB8HHE26014454@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14432

Modified Files:
	owners.list 
Log Message:
Add perl-Data-Buffer



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -r1.434 -r1.435
--- owners.list	5 Dec 2005 18:15:07 -0000	1.434
+++ owners.list	8 Dec 2005 17:16:42 -0000	1.435
@@ -722,6 +722,7 @@
 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-capitalization|No capitalization on method names|rc040203 at freenet.de|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
 Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Dec  8 18:46:06 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 13:46:06 -0500
Subject: rpms/perl-Readonly - New directory
Message-ID: <200512081846.jB8Ik6x1016316@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16307/perl-Readonly

Log Message:
Directory /cvs/extras/rpms/perl-Readonly added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 18:46:11 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 13:46:11 -0500
Subject: rpms/perl-Readonly/devel - New directory
Message-ID: <200512081846.jB8IkBu5016331@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16307/perl-Readonly/devel

Log Message:
Directory /cvs/extras/rpms/perl-Readonly/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 18:46:51 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 13:46:51 -0500
Subject: rpms/perl-Readonly Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512081846.jB8Ikpxt016365@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16352

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Readonly


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Readonly
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec  8 18:46:56 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 13:46:56 -0500
Subject: rpms/perl-Readonly/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512081846.jB8Iku6m016383@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16352/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Readonly


--- NEW 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 Dec  8 18:48:02 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 13:48:02 -0500
Subject: rpms/perl-Readonly import.log,1.1,1.2
Message-ID: <200512081848.jB8ImWNv016450@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16416

Modified Files:
	import.log 
Log Message:
auto-import perl-Readonly-1.03-4 on branch devel from perl-Readonly-1.03-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Dec 2005 18:46:49 -0000	1.1
+++ import.log	8 Dec 2005 18:48:00 -0000	1.2
@@ -0,0 +1 @@
+perl-Readonly-1_03-4:HEAD:perl-Readonly-1.03-4.src.rpm:1134067601



From fedora-extras-commits at redhat.com  Thu Dec  8 18:48:08 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 13:48:08 -0500
Subject: rpms/perl-Readonly/devel perl-Readonly.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512081848.jB8ImcNZ016454@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16416/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Readonly.spec 
Log Message:
auto-import perl-Readonly-1.03-4 on branch devel from perl-Readonly-1.03-4.src.rpm


--- NEW FILE perl-Readonly.spec ---
Name:           perl-Readonly
Version:        1.03
Release:        4%{?dist}
Summary:        Facility for creating read-only scalars, arrays, hashes

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Readonly/
Source0:        http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Readonly.pm provides a facility for creating non-modifiable scalars,
arrays, and hashes.

Readonly.pm
* Creates scalars, arrays (not lists), and hashes.
* Creates variables that look and work like native perl variables.
* Creates global or lexical variables.
* Works at runtime or compile time.
* Works with deep or shallow data structures.
* Prevents reassignment of Readonly variables.

%prep
%setup -q -n Readonly-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%{perl_vendorlib}/benchmark.pl .

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README benchmark.pl
%{perl_vendorlib}/Readonly.pm
%{_mandir}/man3/*


%changelog
* Thu Dec 08 2005 Michael A. Peters  - 1.03-3
- Remove requires on perl-Readonly-XS

* Thu Dec 08 2005 Michael A. Peters  - 1.03-3
- Fix license and BuildRequires, use %%{?_smp_mflags} with make,

* Sat Nov 12 2005 Michael A. Peters  - 1.03-2
- separate out perl-Readonly-XS into its own package
- package benchmark.pl as a doc

* Mon Nov 7 2005 Michael A. Peters  - 1.03-1
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Dec 2005 18:46:54 -0000	1.1
+++ .cvsignore	8 Dec 2005 18:48:05 -0000	1.2
@@ -0,0 +1 @@
+Readonly-1.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Dec 2005 18:46:54 -0000	1.1
+++ sources	8 Dec 2005 18:48:05 -0000	1.2
@@ -0,0 +1 @@
+0acef3a995ac9ecf575f66a726d638f4  Readonly-1.03.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 18:53:09 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 13:53:09 -0500
Subject: owners owners.list,1.435,1.436
Message-ID: <200512081853.jB8IreqK016518@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16501

Modified Files:
	owners.list 
Log Message:
added  perl-Readonly



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -r1.435 -r1.436
--- owners.list	8 Dec 2005 17:16:42 -0000	1.435
+++ owners.list	8 Dec 2005 18:53:07 -0000	1.436
@@ -835,6 +835,7 @@
 Fedora Extras|perl-Pod-Tests|Extract embedded tests and code examples from POD|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Razor-Agent|Use a Razor catalogue server to filter spam messages|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Readonly|Facility for creating read-only scalars, arrays, hashes|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Regexp-Common|Regexp::Common Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SNMP_Session|SNMP support for Perl 5|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Dec  8 19:11:47 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:11:47 -0500
Subject: rpms/perl-Readonly-XS - New directory
Message-ID: <200512081911.jB8JBlQE018250@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly-XS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18241/perl-Readonly-XS

Log Message:
Directory /cvs/extras/rpms/perl-Readonly-XS added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 19:11:53 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:11:53 -0500
Subject: rpms/perl-Readonly-XS/devel - New directory
Message-ID: <200512081911.jB8JBrKo018265@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18241/perl-Readonly-XS/devel

Log Message:
Directory /cvs/extras/rpms/perl-Readonly-XS/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec  8 19:12:30 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:12:30 -0500
Subject: rpms/perl-Readonly-XS Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512081912.jB8JCUXb018302@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly-XS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18289

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Readonly-XS


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Readonly-XS
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec  8 19:12:36 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:12:36 -0500
Subject: rpms/perl-Readonly-XS/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512081912.jB8JCaLh018322@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18289/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Readonly-XS


--- NEW 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 Dec  8 19:13:36 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:13:36 -0500
Subject: rpms/perl-Readonly-XS import.log,1.1,1.2
Message-ID: <200512081914.jB8JE6ec018395@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly-XS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18361

Modified Files:
	import.log 
Log Message:
auto-import perl-Readonly-XS-1.04-2 on branch devel from perl-Readonly-XS-1.04-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Dec 2005 19:12:28 -0000	1.1
+++ import.log	8 Dec 2005 19:13:34 -0000	1.2
@@ -0,0 +1 @@
+perl-Readonly-XS-1_04-2:HEAD:perl-Readonly-XS-1.04-2.src.rpm:1134069137



From fedora-extras-commits at redhat.com  Thu Dec  8 19:13:42 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:13:42 -0500
Subject: rpms/perl-Readonly-XS/devel perl-Readonly-XS.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512081914.jB8JECnH018399@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18361/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Readonly-XS.spec 
Log Message:
auto-import perl-Readonly-XS-1.04-2 on branch devel from perl-Readonly-XS-1.04-2.src.rpm


--- NEW FILE perl-Readonly-XS.spec ---
Name:           perl-Readonly-XS
Version:        1.04
Release:        2%{?dist}
Summary:        Companion module for Readonly.pm

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Readonly-XS/
Source0:        http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Readonly-XS-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: perl(Readonly) >= 1.02
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:  perl(Readonly)

%description
Readonly-XS is a companion module for Readonly.pm, to speed up read-only
scalar variables

%prep
%setup -q -n Readonly-XS-%{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' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README Changes
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Readonly/
%{_mandir}/man3/*.3*


%changelog
* Thu Dec 08 2005 Michael A. Peters  - 1.04-2
- proper version on perl(Readonly) BuildRequires

* Thu Dec 08 2005 Michael A. Peters  - 1.04-1
- New Version
- BuildRequires perl(Readonly), remove explicit requires on
- perl-Readonly version

* Thu Dec 08 2005 Michael A. Peters  - 1.03-2
- Fix license and BuildRequires

* Sat Nov 12 2005 Michael A. Peters  - 1.03-1
- created spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Dec 2005 19:12:34 -0000	1.1
+++ .cvsignore	8 Dec 2005 19:13:39 -0000	1.2
@@ -0,0 +1 @@
+Readonly-XS-1.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Dec 2005 19:12:34 -0000	1.1
+++ sources	8 Dec 2005 19:13:39 -0000	1.2
@@ -0,0 +1 @@
+6d1e61f5c90ff1bf7ffcbfb01148b316  Readonly-XS-1.04.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 19:16:28 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:16:28 -0500
Subject: owners owners.list,1.436,1.437
Message-ID: <200512081916.jB8JGw5F018450@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18433

Modified Files:
	owners.list 
Log Message:
ownership of perl-Readonly-XS



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- owners.list	8 Dec 2005 18:53:07 -0000	1.436
+++ owners.list	8 Dec 2005 19:16:26 -0000	1.437
@@ -836,6 +836,7 @@
 Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Razor-Agent|Use a Razor catalogue server to filter spam messages|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Readonly|Facility for creating read-only scalars, arrays, hashes|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Readonly-XS|Companion module for Readonly.pm|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Regexp-Common|Regexp::Common Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SNMP_Session|SNMP support for Perl 5|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Dec  8 19:28:14 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu,  8 Dec 2005 14:28:14 -0500
Subject: rpms/perl-File-BOM/devel .cvsignore, 1.2, 1.3 perl-File-BOM.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200512081928.jB8JSiF5018605@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-File-BOM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18583

Modified Files:
	.cvsignore perl-File-BOM.spec sources 
Log Message:
New upstream version - updating in devel branch only



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BOM/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jun 2005 07:13:18 -0000	1.2
+++ .cvsignore	8 Dec 2005 19:28:12 -0000	1.3
@@ -1 +1,2 @@
 File-BOM-0.09.tar.gz
+File-BOM-0.11.tar.gz


Index: perl-File-BOM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BOM/devel/perl-File-BOM.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-BOM.spec	18 Jun 2005 07:13:18 -0000	1.1
+++ perl-File-BOM.spec	8 Dec 2005 19:28:12 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-File-BOM
-Version:        0.09
+Version:        0.11
 Release:        1%{?dist}
 Summary:        Utilities for reading Byte Order Marks
 
@@ -10,8 +10,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Readonly)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -49,5 +51,8 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Nov 05 2005 Michael A. Peters  0.11-1
+- update from upstream, BuildRequires perl(Readonly)
+
 * Sat Jun 18 2005 Michael A. Peters  0.09-1
 - initial Fedora Extras CVS Checkin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-BOM/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jun 2005 07:13:18 -0000	1.2
+++ sources	8 Dec 2005 19:28:12 -0000	1.3
@@ -1 +1,2 @@
 907feafba72c9762b24c756ca1c0cb3d  File-BOM-0.09.tar.gz
+ba42fb0d185582c8dfa02dcab28efa9f  File-BOM-0.11.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 19:35:31 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Thu,  8 Dec 2005 14:35:31 -0500
Subject: fedora-security/audit fc4,1.100,1.101 fc5,1.12,1.13
Message-ID: <200512081936.jB8Ja2e3018677@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18658

Modified Files:
	fc4 fc5 
Log Message:
Add all the outstanding CVE ids.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- fc4	6 Dec 2005 20:26:13 -0000	1.100
+++ fc4	8 Dec 2005 19:35:27 -0000	1.101
@@ -1,10 +1,25 @@
-Up to date CVE as of CVE email 20051127
+Up to date CVE as of CVE email 20051207
 Up to date FC4 as of 200501127
 
 ** are items that need attention
 
+CVE-2005-4077 VULNERABLE (curl)
+CVE-2005-3193 VULNERABLE (xpdf)
+CVE-2005-3193 VULNERABLE (kdegraphics)
+CVE-2005-3193 VULNERABLE (tetex)
+CVE-2005-3193 VULNERABLE (poppler)
+CVE-2005-3192 VULNERABLE (xpdf)
+CVE-2005-3192 VULNERABLE (kdegraphics)
+CVE-2005-3192 VULNERABLE (tetex)
+CVE-2005-3192 VULNERABLE (poppler)
+CVE-2005-3191 VULNERABLE (xpdf)
+CVE-2005-3191 VULNERABLE (kdegraphics)
+CVE-2005-3191 VULNERABLE (tetex)
+CVE-2005-3191 VULNERABLE (poppler)
+CVE-2005-3964 VULNERABLE (openmotif)
 CVE-2005-3962 backport (perl) [since FEDORA-2005-1113]
 CVE-2005-3912 backport (perl) [since FEDORA-2005-1113]
+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-3848 version (kernel, fixed 2.6.13) [since FEDORA-2005-949]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fc5	6 Dec 2005 20:26:13 -0000	1.12
+++ fc5	8 Dec 2005 19:35:28 -0000	1.13
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20051127
+Up to date CVE as of CVE email 20051207
 Up to date FC5 as of FC5-Test1-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -12,8 +12,23 @@
 
 ** are items that need attention
 
+CVE-2005-4077 VULNERABLE (curl)
+CVE-2005-3193 VULNERABLE (xpdf)
+CVE-2005-3193 VULNERABLE (kdegraphics)
+CVE-2005-3193 VULNERABLE (tetex)
+CVE-2005-3193 VULNERABLE (poppler)
+CVE-2005-3192 VULNERABLE (xpdf)
+CVE-2005-3192 VULNERABLE (kdegraphics)
+CVE-2005-3192 VULNERABLE (tetex)
+CVE-2005-3192 VULNERABLE (poppler)
+CVE-2005-3191 VULNERABLE (xpdf)
+CVE-2005-3191 VULNERABLE (kdegraphics)
+CVE-2005-3191 VULNERABLE (tetex)
+CVE-2005-3191 VULNERABLE (poppler)
+CVE-2005-3964 VULNERABLE (openmotif)
 CVE-2005-3962 VULNERABLE (perl)
 CVE-2005-3912 ** (perl)
+CVE-2005-3883 VULNERABLE (php)
 CVE-2005-3858 version (kernel, fixed 2.6.13)
 CVE-2005-3857 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1-git3
 CVE-2005-3848 version (kernel, fixed 2.6.13)



From fedora-extras-commits at redhat.com  Thu Dec  8 20:11:46 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu,  8 Dec 2005 15:11:46 -0500
Subject: CVSROOT loginfo,1.10,1.11 syncmail,1.1,1.2
Message-ID: <200512082012.jB8KCH02020415@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20385

Modified Files:
	loginfo syncmail 
Log Message:
do *docs*


Index: loginfo
===================================================================
RCS file: /cvs/fedora/CVSROOT/loginfo,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- loginfo	3 Jun 2005 21:21:59 -0000	1.10
+++ loginfo	8 Dec 2005 20:11:44 -0000	1.11
@@ -29,3 +29,4 @@
 ^extras-buildsys-temp $CVSROOT/CVSROOT/syncmail %{sVv} katzj skvidal
 ALL	$CVSROOT/CVSROOT/syncmail %{sVv} cvsextras at fedora.redhat.com
 ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/fedora localdelivery at cvs-int.fedora.redhat.com
+ALL $CVSROOT/CVSROOT/syncmail --require-keyword='*docs*' %{sVv} relnotes at fedoraproject.org


Index: syncmail
===================================================================
RCS file: /cvs/fedora/CVSROOT/syncmail,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syncmail	22 Apr 2005 22:42:19 -0000	1.1
+++ syncmail	8 Dec 2005 20:11:44 -0000	1.2
@@ -5,6 +5,7 @@
 #     check out the CVSROOT directory on your local machine,
 #     make the changes there and commit. Otherwise your changes
 #     will be lost. --gafton
+# - updated by sopwith to add a --require-keyword option that only sends mail if 'keyword' is found in the comment message
 #
 # - updated by gafton to allow for --nodiff option. The nodiff option
 #   still sends out messages when something changes in a directory, but
@@ -62,6 +63,9 @@
     	Use  as the environment variable CVSROOT.  Otherwise this
     	variable must exist in the environment.
 
+    --require-keyword=STRING
+        Only send mail if STRING is found in the commit message.
+
     --nodiff
     	Don't bother generating the full diff, just report if the files changed
         or not.
@@ -183,7 +187,7 @@
     return string.join(lines, '')
 
 # send mail using sendmail
-def blast_mail(subject, people):    
+def blast_mail(subject, people):
     global optDiffStat
 
     # the redirection sequence in this command is actually intentional
@@ -198,7 +202,11 @@
         del diff_files[-3:]
     if diff_files[-3:] == ['-', 'Imported', 'sources']:
         del diff_files[-3:]
-        
+    commit_message = sys.stdin.read()
+    for I in optRequireKeyword:
+        if I not in commit_message:
+            return
+
     # cannot wait for child process or that will cause parent to retain cvs
     # lock for too long.  Urg!
     if not os.fork(): # in the child
@@ -220,7 +228,7 @@
         fp.write("\n")
         fp.write("Author: %s\n\n" % (username,))
         # now insert the CVS blurb
-        fp.write(sys.stdin.read())
+        fp.write(commit_message)
         fp.write('\n')
         # append the diffs if available and sensible
 	graphics = re.compile(r".*\.(jp(e)?g|gif|png|tif(f)?),", re.IGNORECASE)
@@ -246,14 +254,16 @@
     global DIFF_HEAD_LINES
     global DIFF_TAIL_LINES
     global DIFF_TRUNCATE_IF_LARGER
+    global optRequireKeyword
     
     try:
         opts, args = getopt.getopt(sys.argv[1:], 'h', [
 	    'cvsroot=', 'quiet', 'nodiff', 'nodiffstat', 'help',
-	    'headlines=', 'taillines=', 'truncate='])
+	    'headlines=', 'taillines=', 'truncate=', 'require-keyword='])
     except getopt.error, msg:
         usage(1, msg)
 
+    optRequireKeyword = []
     # parse the options
     for opt, arg in opts:
         if opt in ('-h', '--help'):
@@ -269,12 +279,14 @@
             optDiffStat = 0
         elif opt == '--nodiffstat':
             optDiffStat = 0
-	elif opt == 'headlines=':
+	elif opt == '--headlines':
 	    DIFF_HEAD_LINES = arg
-	elif opt == 'taillines=':
+	elif opt == '--taillines':
 	    DIFF_TAIL_LINES = arg
-	elif opt == 'truncate=':
+	elif opt == '--truncate':
 	    DIFF_TRUNCATE_IF_LARGER = arg
+        elif opt == '--require-keyword':
+            optRequireKeyword.append(arg)
 
     # What follows is the specification containing the files that were
     # modified.  The argument actually must be split, with the first component



From fedora-extras-commits at redhat.com  Thu Dec  8 20:32:14 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  8 Dec 2005 15:32:14 -0500
Subject: rpms/libapreq2/devel libapreq2-2.07-rc3-ldflags.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 libapreq2.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200512082032.jB8KWifF020644@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libapreq2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20619

Modified Files:
	.cvsignore libapreq2.spec sources 
Added Files:
	libapreq2-2.07-rc3-ldflags.patch 
Log Message:
* 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.


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/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2005 09:10:07 -0000	1.4
+++ .cvsignore	8 Dec 2005 20:32:12 -0000	1.5
@@ -1 +1 @@
-libapreq2-2.07-rc2.tar.gz
+libapreq2-2.07-rc3.tar.gz


Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libapreq2.spec	15 Oct 2005 09:10:07 -0000	1.4
+++ libapreq2.spec	8 Dec 2005 20:32:12 -0000	1.5
@@ -2,16 +2,17 @@
 
 Name:           libapreq2
 Version:        2.07
-Release:        0.rc2%{?dist}
+Release:        0.1.rc3%{?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-rc2.tar.gz
+Source0:        http://people.apache.org/~joes/libapreq2-2.07-rc3.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
@@ -55,8 +56,9 @@
 
 %prep
 %setup -q
-aprver=$(apr-config --version)
-apuver=$(apu-config --version)
+# 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
@@ -67,7 +69,8 @@
   "s|.*?|%{_docdir}/apr-util-devel-$apuver/html/|" \
   docs/apu.tag
 %patch0
-rm glue/perl/pm_to_blib
+%patch1
+%{__perl} -pi -e 's|/usr/lib|%{_libdir}|' apreq2-config.in # patch1 ~ multilib
 ./buildconf
 
 
@@ -136,6 +139,13 @@
 
 
 %changelog
+* 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.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2005 09:10:07 -0000	1.4
+++ sources	8 Dec 2005 20:32:12 -0000	1.5
@@ -1 +1 @@
-58126a3682617e65a5ce18ca542fd797  libapreq2-2.07-rc2.tar.gz
+3dcccf0afb7a5315e3d8115041893ee4  libapreq2-2.07-rc3.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 21:34:54 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu,  8 Dec 2005 16:34:54 -0500
Subject: CVSROOT syncmail,1.2,1.3
Message-ID: <200512082135.jB8LZPZf022486@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22466/CVSROOT-ext-fedora

Modified Files:
	syncmail 
Log Message:
fix syncmail


Index: syncmail
===================================================================
RCS file: /cvs/fedora/CVSROOT/syncmail,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- syncmail	8 Dec 2005 20:11:44 -0000	1.2
+++ syncmail	8 Dec 2005 21:34:52 -0000	1.3
@@ -204,7 +204,7 @@
         del diff_files[-3:]
     commit_message = sys.stdin.read()
     for I in optRequireKeyword:
-        if I not in commit_message:
+        if commit_message.find(I) < 0:
             return
 
     # cannot wait for child process or that will cause parent to retain cvs



From fedora-extras-commits at redhat.com  Thu Dec  8 21:35:28 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu,  8 Dec 2005 16:35:28 -0500
Subject: CVSROOT syncmail,1.1,1.2
Message-ID: <200512082135.jB8LZxql022511@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/devel/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22492/CVSROOT-ext-devel

Modified Files:
	syncmail 
Log Message:
fix syncmail


Index: syncmail
===================================================================
RCS file: /cvs/devel/CVSROOT/syncmail,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syncmail	22 Apr 2005 22:42:19 -0000	1.1
+++ syncmail	8 Dec 2005 21:35:26 -0000	1.2
@@ -5,6 +5,7 @@
 #     check out the CVSROOT directory on your local machine,
 #     make the changes there and commit. Otherwise your changes
 #     will be lost. --gafton
+# - updated by sopwith to add a --require-keyword option that only sends mail if 'keyword' is found in the comment message
 #
 # - updated by gafton to allow for --nodiff option. The nodiff option
 #   still sends out messages when something changes in a directory, but
@@ -62,6 +63,9 @@
     	Use  as the environment variable CVSROOT.  Otherwise this
     	variable must exist in the environment.
 
+    --require-keyword=STRING
+        Only send mail if STRING is found in the commit message.
+
     --nodiff
     	Don't bother generating the full diff, just report if the files changed
         or not.
@@ -183,7 +187,7 @@
     return string.join(lines, '')
 
 # send mail using sendmail
-def blast_mail(subject, people):    
+def blast_mail(subject, people):
     global optDiffStat
 
     # the redirection sequence in this command is actually intentional
@@ -198,7 +202,11 @@
         del diff_files[-3:]
     if diff_files[-3:] == ['-', 'Imported', 'sources']:
         del diff_files[-3:]
-        
+    commit_message = sys.stdin.read()
+    for I in optRequireKeyword:
+        if commit_message.find(I) < 0:
+            return
+
     # cannot wait for child process or that will cause parent to retain cvs
     # lock for too long.  Urg!
     if not os.fork(): # in the child
@@ -220,7 +228,7 @@
         fp.write("\n")
         fp.write("Author: %s\n\n" % (username,))
         # now insert the CVS blurb
-        fp.write(sys.stdin.read())
+        fp.write(commit_message)
         fp.write('\n')
         # append the diffs if available and sensible
 	graphics = re.compile(r".*\.(jp(e)?g|gif|png|tif(f)?),", re.IGNORECASE)
@@ -246,14 +254,16 @@
     global DIFF_HEAD_LINES
     global DIFF_TAIL_LINES
     global DIFF_TRUNCATE_IF_LARGER
+    global optRequireKeyword
     
     try:
         opts, args = getopt.getopt(sys.argv[1:], 'h', [
 	    'cvsroot=', 'quiet', 'nodiff', 'nodiffstat', 'help',
-	    'headlines=', 'taillines=', 'truncate='])
+	    'headlines=', 'taillines=', 'truncate=', 'require-keyword='])
     except getopt.error, msg:
         usage(1, msg)
 
+    optRequireKeyword = []
     # parse the options
     for opt, arg in opts:
         if opt in ('-h', '--help'):
@@ -269,12 +279,14 @@
             optDiffStat = 0
         elif opt == '--nodiffstat':
             optDiffStat = 0
-	elif opt == 'headlines=':
+	elif opt == '--headlines':
 	    DIFF_HEAD_LINES = arg
-	elif opt == 'taillines=':
+	elif opt == '--taillines':
 	    DIFF_TAIL_LINES = arg
-	elif opt == 'truncate=':
+	elif opt == '--truncate':
 	    DIFF_TRUNCATE_IF_LARGER = arg
+        elif opt == '--require-keyword':
+            optRequireKeyword.append(arg)
 
     # What follows is the specification containing the files that were
     # modified.  The argument actually must be split, with the first component



From fedora-extras-commits at redhat.com  Thu Dec  8 21:56:21 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu,  8 Dec 2005 16:56:21 -0500
Subject: owners owners.list,1.2,1.3
Message-ID: <200512082156.jB8Lupap022587@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22561

Modified Files:
	owners.list 
Log Message:
fix owner of cvs


Index: owners.list
===================================================================
RCS file: /cvs/fedora/owners/owners.list,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- owners.list	11 Jul 2005 19:35:50 -0000	1.2
+++ owners.list	8 Dec 2005 21:56:19 -0000	1.3
@@ -9,7 +9,7 @@
 # All e-mail addresses used here MUST correspond to existing bugzilla accounts!
 
 Fedora Infrastructure|Account System|accounts.fedora.redhat.com|sopwith at redhat.com||wtogami at redhat.com
-Fedora Infrastructure|cvs|For issues related to the Fedora CVS system.|gafton at redhat.com|katzj at redhat.com|notting at redhat.com,wtogami at redhat.com,sopwith at redhat.com
+Fedora Infrastructure|cvs|For issues related to the Fedora CVS system.|sopwith at redhat.com|katzj at redhat.com|notting at redhat.com,wtogami at redhat.com,sopwith at redhat.com
 Fedora Infrastructure|extras buildsys|For issues related to the Fedora Extras build system.|skvidal at phy.duke.edu|katzj at redhat.com|wtogami at redhat.com
 Fedora Infrastructure|other|Anything else|wtogami at redhat.com||sopwith at redhat.com
 Fedora Infrastructure|update system|The Fedora Core update system|lmacken at redhat.com|notting at redhat.com|



From fedora-extras-commits at redhat.com  Thu Dec  8 22:19:35 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Thu,  8 Dec 2005 17:19:35 -0500
Subject: rpms/pgadmin3/FC-4 pgadmin3.spec,1.5,1.6
Message-ID: <200512082220.jB8MK5Jo024312@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/pgadmin3/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24269/FC-4

Modified Files:
	pgadmin3.spec 
Log Message:
Updated Devel and FC-4 specfiles for version 1.4.0.


Index: pgadmin3.spec
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/FC-4/pgadmin3.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pgadmin3.spec	22 May 2005 23:18:49 -0000	1.5
+++ pgadmin3.spec	8 Dec 2005 22:19:33 -0000	1.6
@@ -1,14 +1,14 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
-Version:	1.0.2
-Release: 5
+Version:	1.4.0
+Release:    2%{?dist}
 
 License:	Artistic
 Group:		Applications/Databases
-Source: 	ftp://ftp.postgresql.org/pub/pgadmin3/release/src/pgadmin3-1.0.2.tar.gz
+Source: 	ftp://ftp.postgresql.org/pub/pgadmin3/release/src/pgadmin3-1.4.0.tar.gz
 URL:		http://www.pgadmin.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	wxGTK2-devel wxGTK2-stc wxGTK2-xrc postgresql-devel desktop-file-utils openssl-devel
+BuildRequires:	wxGTK-devel wxGTK-stc wxGTK-xrc postgresql-devel desktop-file-utils openssl-devel
 
 %description
 pgAdmin III is a comprehensive PostgreSQL database design
@@ -19,8 +19,8 @@
 
 %build
 %configure
-#Somehow doesn't link in these..
-make %{?_smp_mflags} LDFLAGS="-lwx_gtk2-2.4 -lwx_gtk2_stc-2.4 -lwx_gtk2_xrc-2.4" all
+
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +48,12 @@
 %{_datadir}/applications/*
 
 %changelog
+* Thu Dec 8 2005 Gavin Henry  - 1.4.0-2
+- Removed specific lib includes, not needed anymore 
+
+* Wed Dec 7 2005 Gavin Henry  - 1.4.0-1
+- Updated to latest release
+
 * Sun May 22 2005 Jeremy Katz  - 1.0.2-5
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Dec  8 22:19:40 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Thu,  8 Dec 2005 17:19:40 -0500
Subject: rpms/pgadmin3/devel pgadmin3.spec,1.5,1.6
Message-ID: <200512082220.jB8MKBeL024315@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/pgadmin3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24269/devel

Modified Files:
	pgadmin3.spec 
Log Message:
Updated Devel and FC-4 specfiles for version 1.4.0.


Index: pgadmin3.spec
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/pgadmin3.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pgadmin3.spec	22 May 2005 23:18:49 -0000	1.5
+++ pgadmin3.spec	8 Dec 2005 22:19:38 -0000	1.6
@@ -1,14 +1,14 @@
 Summary:	Graphical client for PostgreSQL
 Name:		pgadmin3
-Version:	1.0.2
-Release: 5
+Version:	1.4.0
+Release:    2%{?dist}
 
 License:	Artistic
 Group:		Applications/Databases
-Source: 	ftp://ftp.postgresql.org/pub/pgadmin3/release/src/pgadmin3-1.0.2.tar.gz
+Source: 	ftp://ftp.postgresql.org/pub/pgadmin3/release/src/pgadmin3-1.4.0.tar.gz
 URL:		http://www.pgadmin.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	wxGTK2-devel wxGTK2-stc wxGTK2-xrc postgresql-devel desktop-file-utils openssl-devel
+BuildRequires:	wxGTK-devel wxGTK-stc wxGTK-xrc postgresql-devel desktop-file-utils openssl-devel
 
 %description
 pgAdmin III is a comprehensive PostgreSQL database design
@@ -19,8 +19,8 @@
 
 %build
 %configure
-#Somehow doesn't link in these..
-make %{?_smp_mflags} LDFLAGS="-lwx_gtk2-2.4 -lwx_gtk2_stc-2.4 -lwx_gtk2_xrc-2.4" all
+
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +48,12 @@
 %{_datadir}/applications/*
 
 %changelog
+* Thu Dec 8 2005 Gavin Henry  - 1.4.0-2
+- Removed specific lib includes, not needed anymore 
+
+* Wed Dec 7 2005 Gavin Henry  - 1.4.0-1
+- Updated to latest release
+
 * Sun May 22 2005 Jeremy Katz  - 1.0.2-5
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Dec  8 22:26:10 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Thu,  8 Dec 2005 17:26:10 -0500
Subject: rpms/pgadmin3/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200512082226.jB8MQe7m024377@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/pgadmin3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24357

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:12:23 -0000	1.2
+++ .cvsignore	8 Dec 2005 22:26:08 -0000	1.3
@@ -1 +1 @@
-pgadmin3-1.0.2.tar.gz
+pgadmin3-1.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:12:23 -0000	1.2
+++ sources	8 Dec 2005 22:26:08 -0000	1.3
@@ -1 +1 @@
-6f0c61d2d0736d057b80a319b8148fd2  pgadmin3-1.0.2.tar.gz
+a0779079bf579b0cd5e132ac5372f7f3  pgadmin3-1.4.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec  8 22:27:20 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Thu,  8 Dec 2005 17:27:20 -0500
Subject: rpms/pgadmin3/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200512082227.jB8MRpSZ024409@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/pgadmin3/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24389

Modified Files:
	.cvsignore sources 
Log Message:
added new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:12:23 -0000	1.2
+++ .cvsignore	8 Dec 2005 22:27:18 -0000	1.3
@@ -1 +1 @@
-pgadmin3-1.0.2.tar.gz
+pgadmin3-1.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgadmin3/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:12:23 -0000	1.2
+++ sources	8 Dec 2005 22:27:18 -0000	1.3
@@ -1 +1 @@
-6f0c61d2d0736d057b80a319b8148fd2  pgadmin3-1.0.2.tar.gz
+a0779079bf579b0cd5e132ac5372f7f3  pgadmin3-1.4.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 04:44:28 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu,  8 Dec 2005 23:44:28 -0500
Subject: rpms/deskbar-applet/devel deskbar-applet.spec,1.9,1.10
Message-ID: <200512090444.jB94iwh4002416@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2396

Modified Files:
	deskbar-applet.spec 
Log Message:
Upstream update


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- deskbar-applet.spec	1 Dec 2005 13:17:21 -0000	1.9
+++ deskbar-applet.spec	9 Dec 2005 04:44:25 -0000	1.10
@@ -2,17 +2,17 @@
 %{!?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.5
-Release:        2%{?dist}
+Version:        0.8.6
+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://dl.sourceforge.net/browserbookapp/%{name}-%{version}.tar.gz
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/0.8/%{name}-%{version}.tar.bz2
 Source1:        fedorabz.py
 Source2:        fedorabz.png
-Patch0:         deskbar-applet-0.8.2-fedorabz.patch
+Patch0:         deskbar-applet-0.8.6-fedorabz.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
@@ -57,9 +57,11 @@
 %{_libdir}/bonobo/servers/Deskbar_Applet.server
 %{python_sitelib}/deskbar
 %{_datadir}/%{name}
-%{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Dec  8 2005 Ignacio Vazquez-Abrams  0.8.6-1
+- Upstream update
+
 * Thu Dec  1 2005 Ignacio Vazquez-Abrams  0.8.5-2
 - Fixed bugs in Fedora BZ handler
 



From fedora-extras-commits at redhat.com  Fri Dec  9 05:15:12 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri,  9 Dec 2005 00:15:12 -0500
Subject: rpms/deskbar-applet/devel deskbar-applet-0.8.6-fedorabz.patch, NONE,
	1.1 deskbar-applet-0.8.2-fedorabz.patch, 1.1, NONE
Message-ID: <200512090515.jB95FCEe004134@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4121

Added Files:
	deskbar-applet-0.8.6-fedorabz.patch 
Removed Files:
	deskbar-applet-0.8.2-fedorabz.patch 
Log Message:
Add the patch

deskbar-applet-0.8.6-fedorabz.patch:

--- NEW FILE deskbar-applet-0.8.6-fedorabz.patch ---
--- deskbar-applet-0.8.6/deskbar/handlers/Makefile.in.fedorabz	2005-12-06 15:37:07.000000000 -0500
+++ deskbar-applet-0.8.6/deskbar/handlers/Makefile.in	2005-12-08 22:52:46.000000000 -0500
@@ -238,6 +238,7 @@
 deskbar_handlers_PYTHON = beagle.py beagle-live.py email_address.py \
 	epiphany.py files.py galago.py galeon.py gtkbookmarks.py \
 	google-live.py mozilla.py programs.py pathprograms.py \
+	fedorabz.py \
 	volumes.py web_address.py $(am__append_1)
 EXTRA_DIST = \
 	debug-async_handler.py \
--- deskbar-applet-0.8.6/data/art/Makefile.in.fedorabz	2005-12-06 15:37:07.000000000 -0500
+++ deskbar-applet-0.8.6/data/art/Makefile.in	2005-12-08 22:44:02.000000000 -0500
@@ -240,6 +240,7 @@
 art_DATA = \
 	deskbar-applet.svg \
 	deskbar-applet-small.png \
+	fedorabz.png \
 	folder-bookmark.png \
 	generic.png \
 	google.png \


--- deskbar-applet-0.8.2-fedorabz.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 05:19:17 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri,  9 Dec 2005 00:19:17 -0500
Subject: rpms/deskbar-applet/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200512090519.jB95Jlpn004231@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4211

Modified Files:
	.cvsignore sources 
Log Message:
And the tarball...


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Nov 2005 06:27:07 -0000	1.4
+++ .cvsignore	9 Dec 2005 05:19:15 -0000	1.5
@@ -1 +1 @@
-deskbar-applet-0.8.5.tar.gz
+deskbar-applet-0.8.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Nov 2005 06:27:07 -0000	1.4
+++ sources	9 Dec 2005 05:19:15 -0000	1.5
@@ -1 +1 @@
-7f4963686dd92255d423014c5e404e68  deskbar-applet-0.8.5.tar.gz
+67507881804181b749d5e317a76b91ee  deskbar-applet-0.8.6.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec  9 05:53:16 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri,  9 Dec 2005 00:53:16 -0500
Subject: rpms/perl-Readonly-XS/devel perl-Readonly-XS.spec,1.1,1.2
Message-ID: <200512090553.jB95rkLS004326@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/perl-Readonly-XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4300

Modified Files:
	perl-Readonly-XS.spec 
Log Message:
Added proper version requires to perl(Readonly)



Index: perl-Readonly-XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Readonly-XS/devel/perl-Readonly-XS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Readonly-XS.spec	8 Dec 2005 19:13:39 -0000	1.1
+++ perl-Readonly-XS.spec	9 Dec 2005 05:53:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Readonly-XS
 Version:        1.04
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Companion module for Readonly.pm
 
 Group:          Development/Libraries
@@ -11,7 +11,7 @@
 
 BuildRequires: perl(Readonly) >= 1.02
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:  perl(Readonly)
+Requires:  perl(Readonly) >= 1.02
 
 %description
 Readonly-XS is a companion module for Readonly.pm, to speed up read-only
@@ -52,8 +52,8 @@
 
 
 %changelog
-* Thu Dec 08 2005 Michael A. Peters  - 1.04-2
-- proper version on perl(Readonly) BuildRequires
+* Thu Dec 08 2005 Michael A. Peters  - 1.04-3
+- proper version on perl(Readonly) BuildRequires & Requires
 
 * Thu Dec 08 2005 Michael A. Peters  - 1.04-1
 - New Version



From fedora-extras-commits at redhat.com  Fri Dec  9 08:17:52 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 03:17:52 -0500
Subject: rpms/perl-Crypt-DH - New directory
Message-ID: <200512090817.jB98HquH009723@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9714/perl-Crypt-DH

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-DH added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 08:17:58 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 03:17:58 -0500
Subject: rpms/perl-Crypt-DH/devel - New directory
Message-ID: <200512090817.jB98HwIG009739@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9714/perl-Crypt-DH/devel

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-DH/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 08:18:27 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 03:18:27 -0500
Subject: rpms/perl-Crypt-DH Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512090818.jB98IRrD009774@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9761

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Crypt-DH


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Crypt-DH
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec  9 08:18:32 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 03:18:32 -0500
Subject: rpms/perl-Crypt-DH/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512090818.jB98IW7M009793@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9761/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Crypt-DH


--- NEW 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 Dec  9 08:19:39 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 03:19:39 -0500
Subject: rpms/perl-Crypt-DH import.log,1.1,1.2
Message-ID: <200512090820.jB98K9Cr009887@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9845

Modified Files:
	import.log 
Log Message:
auto-import perl-Crypt-DH-0.06-1 on branch devel from perl-Crypt-DH-0.06-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DH/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Dec 2005 08:18:25 -0000	1.1
+++ import.log	9 Dec 2005 08:19:37 -0000	1.2
@@ -0,0 +1 @@
+perl-Crypt-DH-0_06-1:HEAD:perl-Crypt-DH-0.06-1.src.rpm:1134116345



From fedora-extras-commits at redhat.com  Fri Dec  9 08:19:45 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 03:19:45 -0500
Subject: rpms/perl-Crypt-DH/devel perl-Crypt-DH.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512090820.jB98KFu9009894@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9845/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Crypt-DH.spec 
Log Message:
auto-import perl-Crypt-DH-0.06-1 on branch devel from perl-Crypt-DH-0.06-1.src.rpm


--- NEW FILE perl-Crypt-DH.spec ---
Summary:	Perl module implementing the Diffie-Hellman key exchange system
Name:		perl-Crypt-DH
Version:	0.06
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Crypt-DH/
Source0:	http://search.cpan.org/CPAN/authors/id/B/BT/BTROTT/Crypt-DH-%{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
Crypt::DH is a Perl implementation of the Diffie-Hellman key exchange system.
Diffie-Hellman is an algorithm by which two parties can agree on a shared
secret key, known only to them. The secret is negotiated over an insecure
network without the two parties ever passing the actual shared secret, or their
private keys, between them.

%prep
%setup -q -n Crypt-DH-%{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::DH.3pm*

%changelog
* Tue Nov 29 2005 Paul Howarth  0.06-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DH/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Dec 2005 08:18:30 -0000	1.1
+++ .cvsignore	9 Dec 2005 08:19:42 -0000	1.2
@@ -0,0 +1 @@
+Crypt-DH-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DH/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Dec 2005 08:18:30 -0000	1.1
+++ sources	9 Dec 2005 08:19:42 -0000	1.2
@@ -0,0 +1 @@
+eabecac024d427c670a6e0edbadcec5d  Crypt-DH-0.06.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 08:32:28 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 03:32:28 -0500
Subject: rpms/perl-Crypt-DH/devel perl-Crypt-DH.spec,1.1,1.2
Message-ID: <200512090832.jB98WwAn009983@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9965

Modified Files:
	perl-Crypt-DH.spec 
Log Message:
Add facility to skip test suite at build time if desired



Index: perl-Crypt-DH.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DH/devel/perl-Crypt-DH.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Crypt-DH.spec	9 Dec 2005 08:19:42 -0000	1.1
+++ perl-Crypt-DH.spec	9 Dec 2005 08:32:25 -0000	1.2
@@ -1,7 +1,11 @@
+# To skip the lengthy test suite, use:
+# rpmbuild --without checks
+%bcond_without checks
+
 Summary:	Perl module implementing the Diffie-Hellman key exchange system
 Name:		perl-Crypt-DH
 Version:	0.06
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-DH/
@@ -25,7 +29,7 @@
 %{__make} %{?_smp_mflags}
 
 %check
-%{__make} test
+%{?with_checks:%{__make} test}
 
 %install
 %{__rm} -rf %{buildroot}
@@ -44,5 +48,8 @@
 %{_mandir}/man3/Crypt::DH.3pm*
 
 %changelog
+* Fri Dec  9 2005 Paul Howarth  0.06-2
+- Add facility to skip test suite at build time if desired
+
 * Tue Nov 29 2005 Paul Howarth  0.06-1
 - Initial build



From fedora-extras-commits at redhat.com  Fri Dec  9 08:33:42 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri,  9 Dec 2005 03:33:42 -0500
Subject: rpms/rdiff-backup/devel rdiff-backup.spec,1.9,1.10
Message-ID: <200512090834.jB98YCQ4010045@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10027

Modified Files:
	rdiff-backup.spec 
Log Message:
Upgraded to version 1.0.3.


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rdiff-backup.spec	14 Sep 2005 07:40:55 -0000	1.9
+++ rdiff-backup.spec	9 Dec 2005 08:33:39 -0000	1.10
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Version: 1.0.1
+Version: 1.0.3
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -53,6 +53,8 @@
 %ghost %{python_sitearch}/rdiff_backup/*.pyo
 
 %changelog
+* Fri Dec 9  2005 Gavin Henry  - 0:1.0.3-1 
+
 * Wed Sep 14 2005 Gavin Henry  - 0:1.0.1-1
 - New version
 



From fedora-extras-commits at redhat.com  Fri Dec  9 08:36:53 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri,  9 Dec 2005 03:36:53 -0500
Subject: rpms/rdiff-backup/devel .cvsignore,1.3,1.4 sources,1.4,1.5
Message-ID: <200512090837.jB98bNjI010101@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10081

Modified Files:
	.cvsignore sources 
Log Message:
New sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Sep 2005 07:40:55 -0000	1.3
+++ .cvsignore	9 Dec 2005 08:36:51 -0000	1.4
@@ -1 +1 @@
-rdiff-backup-1.0.1.tar.gz
+rdiff-backup-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Sep 2005 07:40:55 -0000	1.4
+++ sources	9 Dec 2005 08:36:51 -0000	1.5
@@ -1 +1 @@
-765e8c97c696eeb7b19006d9ed0967be  rdiff-backup-1.0.1.tar.gz
+dedae55157ec11d046ffd79bd48db25c  rdiff-backup-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 08:38:56 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri,  9 Dec 2005 03:38:56 -0500
Subject: rpms/rdiff-backup/FC-4 rdiff-backup.spec,1.10,1.11
Message-ID: <200512090839.jB98dRjV010125@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rdiff-backup/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10107

Modified Files:
	rdiff-backup.spec 
Log Message:
New version.


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/rdiff-backup.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rdiff-backup.spec	14 Sep 2005 07:39:49 -0000	1.10
+++ rdiff-backup.spec	9 Dec 2005 08:38:54 -0000	1.11
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Version: 1.0.1
+Version: 1.0.3
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -53,6 +53,9 @@
 %ghost %{python_sitearch}/rdiff_backup/*.pyo
 
 %changelog
+* Fri Dec 9  2005 Gavin Henry  - 0:1.0.3-1
+- New version
+
 * Wed Sep 14 2005 Gavin Henry  - 0:1.0.1-1
 - New version
 



From fedora-extras-commits at redhat.com  Fri Dec  9 08:42:44 2005
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri,  9 Dec 2005 03:42:44 -0500
Subject: rpms/rdiff-backup/FC-4 .cvsignore,1.4,1.5 sources,1.5,1.6
Message-ID: <200512090843.jB98hEfm010235@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/rdiff-backup/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10215

Modified Files:
	.cvsignore sources 
Log Message:
Added new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Sep 2005 07:39:49 -0000	1.4
+++ .cvsignore	9 Dec 2005 08:42:42 -0000	1.5
@@ -1 +1 @@
-rdiff-backup-1.0.1.tar.gz
+rdiff-backup-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Sep 2005 07:39:49 -0000	1.5
+++ sources	9 Dec 2005 08:42:42 -0000	1.6
@@ -1 +1 @@
-765e8c97c696eeb7b19006d9ed0967be  rdiff-backup-1.0.1.tar.gz
+dedae55157ec11d046ffd79bd48db25c  rdiff-backup-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 10:14:06 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  9 Dec 2005 05:14:06 -0500
Subject: owners owners.list,1.437,1.438
Message-ID: <200512091014.jB9AEaJt014315@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14290

Modified Files:
	owners.list 
Log Message:
perl-Crypt-DH



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- owners.list	8 Dec 2005 19:16:26 -0000	1.437
+++ owners.list	9 Dec 2005 10:14:04 -0000	1.438
@@ -721,6 +721,7 @@
 Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-Blowfish|XS Blowfish implementation for Perl|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-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-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-capitalization|No capitalization on method names|rc040203 at freenet.de|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  Fri Dec  9 10:24:50 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri,  9 Dec 2005 05:24:50 -0500
Subject: rpms/amarok/FC-4 amarok-1.3.6-libtunepimp040.patch, NONE,
	1.1 .cvsignore, 1.16, 1.17 amarok.spec, 1.32, 1.33 sources,
	1.16, 1.17
Message-ID: <200512091025.jB9APKdl014392@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14346/FC-4

Modified Files:
	.cvsignore amarok.spec sources 
Added Files:
	amarok-1.3.6-libtunepimp040.patch 
Log Message:
- version 1.3.7

amarok-1.3.6-libtunepimp040.patch:

--- NEW FILE amarok-1.3.6-libtunepimp040.patch ---
--- amarok-1.3.6/amarok/src/ktrm.cpp.tp 2005-11-07 16:19:18.000000000 -0600
+++ amarok-1.3.6/amarok/src/ktrm.cpp    2005-11-17 13:09:35.000000000 -0600
@@ -42,7 +42,7 @@
 
 extern "C"
 {
-    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId);
+    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status);
 }
 
 /**
@@ -66,7 +66,8 @@
         int id;
 
         if(!m_fileMap.contains(lookup->file())) {
-            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()));
+            // Not sure if 3rd field should be 0 or 1, guessing 1 -- Rex
+            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()),1);
             m_fileMap.insert(lookup->file(), id);
         }
         else {
@@ -121,7 +122,6 @@
         tp_SetAutoSaveThreshold(m_pimp, -1);
         tp_SetMoveFiles(m_pimp, false);
         tp_SetRenameFiles(m_pimp, false);
-        tp_SetUseUTF8(m_pimp, true);
         tp_SetNotifyCallback(m_pimp, TRMNotifyCallback, 0);
 
         if(KProtocolManager::useProxy()) {
@@ -245,13 +245,13 @@
  * Callback fuction for TunePimp lookup events.
  */
 
-static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId)
+static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId, TPFileStatus status)
 {
     if(type != tpFileChanged)
         return;
 
     track_t track = tp_GetTrack(pimp, fileId);
-    TPFileStatus status = tr_GetStatus(track);
+    status = tr_GetStatus(track);
 
     switch(status) {
     case eRecognized:
@@ -556,10 +556,10 @@
                 KTRMResult result;
 
                 result.d->title = QString::fromUtf8(tracks[i]->name);
-                result.d->artist = QString::fromUtf8(tracks[i]->artist->name);
-                result.d->album = QString::fromUtf8(tracks[i]->album->name);
+                result.d->artist = QString::fromUtf8(tracks[i]->artist.name);
+                result.d->album = QString::fromUtf8(tracks[i]->album.name);
                 result.d->track = tracks[i]->trackNum;
-                result.d->year = tracks[i]->album->releaseYear;
+                result.d->year = tracks[i]->album.releaseYear;
                 result.d->relevance =
                     4 * stringSimilarity(strList,result.d->title) +
                     2 * stringSimilarity(strList,result.d->artist) +



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	11 Nov 2005 13:41:11 -0000	1.16
+++ .cvsignore	9 Dec 2005 10:24:48 -0000	1.17
@@ -1 +1 @@
-amarok-1.3.6.tar.bz2
+amarok-1.3.7.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- amarok.spec	11 Nov 2005 13:41:11 -0000	1.32
+++ amarok.spec	9 Dec 2005 10:24:48 -0000	1.33
@@ -6,14 +6,15 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.6
+Version:    1.3.7
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.6.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.7.tar.bz2
 Patch0:     amarok-1.3.4-helix-libs.patch
+Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,6 +27,7 @@
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
+BuildRequires:  libtunepimp-devel >= 0.4.0
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
@@ -83,6 +85,8 @@
 %setup -q
 # Discover the helix libs
 %patch0 -p1 -b .helix-libs
+# Use libtunepimp 0.4.0 (api changed)
+%patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
@@ -197,8 +201,6 @@
 %{_datadir}/services/amarok_helixengine_plugin.desktop
 %endif
 
-%exclude %{_datadir}/apps/zeroconf/_shoutcast._tcp
-
 
 %files visualisation
 %defattr(-,root,root)
@@ -216,6 +218,13 @@
 
 
 %changelog
+* Wed Dec 07 2005 Aurelien Bompard  1.3.7-1
+- version 1.3.7
+
+* Sun Nov 20 2005 Aurelien Bompard  1.3.6-2
+- build with libtunepimp
+- add patch to use libtunepimp 0.4.0 (api changed)
+
 * Tue Nov 08 2005 Aurelien Bompard  1.3.6-1
 - version 1.3.6
 - BR libGL instead of xorg-x11-Mesa-libGL to prepare for X11R7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	11 Nov 2005 13:41:11 -0000	1.16
+++ sources	9 Dec 2005 10:24:48 -0000	1.17
@@ -1 +1 @@
-f97ac51a8c2f150ffc4cc0ef49c59a2f  amarok-1.3.6.tar.bz2
+e2297042070643c105f8bb0e524c73ad  amarok-1.3.7.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec  9 10:24:56 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri,  9 Dec 2005 05:24:56 -0500
Subject: rpms/amarok/devel amarok-1.3.6-libtunepimp040.patch, NONE,
	1.1 .cvsignore, 1.16, 1.17 amarok.spec, 1.30, 1.31 sources,
	1.16, 1.17
Message-ID: <200512091025.jB9APQfJ014397@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14346/devel

Modified Files:
	.cvsignore amarok.spec sources 
Added Files:
	amarok-1.3.6-libtunepimp040.patch 
Log Message:
- version 1.3.7

amarok-1.3.6-libtunepimp040.patch:

--- NEW FILE amarok-1.3.6-libtunepimp040.patch ---
--- amarok-1.3.6/amarok/src/ktrm.cpp.tp 2005-11-07 16:19:18.000000000 -0600
+++ amarok-1.3.6/amarok/src/ktrm.cpp    2005-11-17 13:09:35.000000000 -0600
@@ -42,7 +42,7 @@
 
 extern "C"
 {
-    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId);
+    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status);
 }
 
 /**
@@ -66,7 +66,8 @@
         int id;
 
         if(!m_fileMap.contains(lookup->file())) {
-            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()));
+            // Not sure if 3rd field should be 0 or 1, guessing 1 -- Rex
+            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()),1);
             m_fileMap.insert(lookup->file(), id);
         }
         else {
@@ -121,7 +122,6 @@
         tp_SetAutoSaveThreshold(m_pimp, -1);
         tp_SetMoveFiles(m_pimp, false);
         tp_SetRenameFiles(m_pimp, false);
-        tp_SetUseUTF8(m_pimp, true);
         tp_SetNotifyCallback(m_pimp, TRMNotifyCallback, 0);
 
         if(KProtocolManager::useProxy()) {
@@ -245,13 +245,13 @@
  * Callback fuction for TunePimp lookup events.
  */
 
-static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId)
+static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId, TPFileStatus status)
 {
     if(type != tpFileChanged)
         return;
 
     track_t track = tp_GetTrack(pimp, fileId);
-    TPFileStatus status = tr_GetStatus(track);
+    status = tr_GetStatus(track);
 
     switch(status) {
     case eRecognized:
@@ -556,10 +556,10 @@
                 KTRMResult result;
 
                 result.d->title = QString::fromUtf8(tracks[i]->name);
-                result.d->artist = QString::fromUtf8(tracks[i]->artist->name);
-                result.d->album = QString::fromUtf8(tracks[i]->album->name);
+                result.d->artist = QString::fromUtf8(tracks[i]->artist.name);
+                result.d->album = QString::fromUtf8(tracks[i]->album.name);
                 result.d->track = tracks[i]->trackNum;
-                result.d->year = tracks[i]->album->releaseYear;
+                result.d->year = tracks[i]->album.releaseYear;
                 result.d->relevance =
                     4 * stringSimilarity(strList,result.d->title) +
                     2 * stringSimilarity(strList,result.d->artist) +



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	11 Nov 2005 13:41:17 -0000	1.16
+++ .cvsignore	9 Dec 2005 10:24:54 -0000	1.17
@@ -1 +1 @@
-amarok-1.3.6.tar.bz2
+amarok-1.3.7.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- amarok.spec	11 Nov 2005 13:41:17 -0000	1.30
+++ amarok.spec	9 Dec 2005 10:24:54 -0000	1.31
@@ -6,14 +6,15 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.6
+Version:    1.3.7
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.6.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.7.tar.bz2
 Patch0:     amarok-1.3.4-helix-libs.patch
+Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,6 +27,7 @@
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
+BuildRequires:  libtunepimp-devel >= 0.4.0
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
@@ -83,6 +85,8 @@
 %setup -q
 # Discover the helix libs
 %patch0 -p1 -b .helix-libs
+# Use libtunepimp 0.4.0 (api changed)
+%patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
@@ -197,8 +201,6 @@
 %{_datadir}/services/amarok_helixengine_plugin.desktop
 %endif
 
-%exclude %{_datadir}/apps/zeroconf/_shoutcast._tcp
-
 
 %files visualisation
 %defattr(-,root,root)
@@ -216,6 +218,13 @@
 
 
 %changelog
+* Wed Dec 07 2005 Aurelien Bompard  1.3.7-1
+- version 1.3.7
+
+* Sun Nov 20 2005 Aurelien Bompard  1.3.6-2
+- build with libtunepimp
+- add patch to use libtunepimp 0.4.0 (api changed)
+
 * Tue Nov 08 2005 Aurelien Bompard  1.3.6-1
 - version 1.3.6
 - BR libGL instead of xorg-x11-Mesa-libGL to prepare for X11R7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	11 Nov 2005 13:41:17 -0000	1.16
+++ sources	9 Dec 2005 10:24:54 -0000	1.17
@@ -1 +1 @@
-f97ac51a8c2f150ffc4cc0ef49c59a2f  amarok-1.3.6.tar.bz2
+e2297042070643c105f8bb0e524c73ad  amarok-1.3.7.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec  9 12:40:06 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri,  9 Dec 2005 07:40:06 -0500
Subject: rpms/torcs/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 torcs.spec,
	1.9, 1.10 TORCS-1.2.3-64bit.patch, 1.1, NONE
Message-ID: <200512091240.jB9CeaZF018843@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/torcs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818

Modified Files:
	.cvsignore sources torcs.spec 
Removed Files:
	TORCS-1.2.3-64bit.patch 
Log Message:
Backport TORCS 1.2.4 from devel to FC-4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Feb 2005 15:39:54 -0000	1.4
+++ .cvsignore	9 Dec 2005 12:40:04 -0000	1.5
@@ -1,5 +1,5 @@
-TORCS-1.2.3-src.tgz
-TORCS-1.2.3-src-robots-base.tgz
-TORCS-1.2.3-src-robots-berniw.tgz
-TORCS-1.2.3-src-robots-bt.tgz
-TORCS-1.2.3-src-robots-olethros.tgz
+TORCS-1.2.4-src-robots-base.tgz
+TORCS-1.2.4-src-robots-berniw.tgz
+TORCS-1.2.4-src-robots-bt.tgz
+TORCS-1.2.4-src-robots-olethros.tgz
+TORCS-1.2.4-src.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Feb 2005 15:39:54 -0000	1.4
+++ sources	9 Dec 2005 12:40:04 -0000	1.5
@@ -1,5 +1,5 @@
-0f1dc6a3f08e1ae9f80e118c350bb4b4  TORCS-1.2.3-src.tgz
-43d670da19adb2e4c632390611d2dc31  TORCS-1.2.3-src-robots-base.tgz
-ba4f75b0707a592cb18ea971da8c1382  TORCS-1.2.3-src-robots-berniw.tgz
-605d82faeb3d547ccb9acbbac9281ff9  TORCS-1.2.3-src-robots-bt.tgz
-2cd15c851a6f07410a4363114a5b2880  TORCS-1.2.3-src-robots-olethros.tgz
+3afe0d23f1e637fe56efccd2b6e8a8f1  TORCS-1.2.4-src-robots-base.tgz
+40aed9595f91051e8468e8a19b65f809  TORCS-1.2.4-src-robots-berniw.tgz
+337eecc6e545aceda094d945e12c3023  TORCS-1.2.4-src-robots-bt.tgz
+13b1eeba1148ca57dc1d989fcb27d308  TORCS-1.2.4-src-robots-olethros.tgz
+f5b41bf29cb7b6160e5ead6e187380b6  TORCS-1.2.4-src.tgz


Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-4/torcs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- torcs.spec	4 Aug 2005 15:35:46 -0000	1.9
+++ torcs.spec	9 Dec 2005 12:40:04 -0000	1.10
@@ -2,8 +2,8 @@
 
 Summary: The Open Racing Car Simulator
 Name: torcs
-Version: 1.2.3
-Release: 5%{?dist}
+Version: 1.2.4
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://torcs.org/
@@ -12,11 +12,10 @@
 Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz
 Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
 Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz
-Patch0: TORCS-1.2.3-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: torcs-data, torcs-data-cars-extra
+Requires: torcs-data, torcs-data-tracks-road, torcs-data-cars-extra
 BuildRequires: xorg-x11-devel, freeglut-devel, plib-devel >= 1.8.3
-BuildRequires: libpng-devel, libjpeg-devel, zlib-devel
+BuildRequires: libpng-devel, libjpeg-devel, zlib-devel, openal-devel
 BuildRequires: desktop-file-utils
 
 %description
@@ -40,7 +39,6 @@
 
 %prep
 %setup -a 1 -a 2 -a 3 -a 4
-%patch0 -p1 -b .64bit
 # Put the drivers back where they belong
 %{__mv} %{name}-%{version}/src/drivers/* src/drivers/
 
@@ -55,7 +53,7 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
-%{__install} -m 644 -D Ticon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
+%{__install} -D -p -m 0644 Ticon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
 %{__cat} > %{name}.desktop << EOF
 [Desktop Entry]
@@ -120,7 +118,6 @@
 %{_datadir}/games/%{name}/telemetry/
 %{_datadir}/pixmaps/%{name}.png
 
-
 %files robots
 %defattr(-, root, root, 0755)
 %dir %{_libdir}/%{name}/
@@ -148,6 +145,12 @@
 
 
 %changelog
+* Wed Oct 12 2005 Matthias Saou  1.2.4-1
+- Update to 1.2.4.
+- Add torcs-data-tracks-road requirement directly to main torcs.
+- Drop no longer needed TORCS-1.2.3-64bit.patch.
+- Add openal-devel build dependency.
+
 * Wed Aug  3 2005 Matthias Saou  1.2.3-5
 - Move base robots from the sub-package to the main one to have the default
   quick race work. Hopefully this will change in later versions if the game


--- TORCS-1.2.3-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 13:18:47 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 08:18:47 -0500
Subject: rpms/cernlib/devel 114-install-scripts-properly.dpatch, NONE,
	1.1 211-fix-comis-on-64-bit-arches.dpatch, NONE,
	1.1 cernlib_2005.05.09.dfsg-2.diff, NONE,
	1.1 003-geant-dummy-functions.dpatch, 1.1, 1.2 cernlib.spec,
	1.6, 1.7 cernlib-install_scripts.patch, 1.1,
	NONE cernlib_2005.05.09.dfsg-1.diff, 1.2, NONE
Message-ID: <200512091318.jB9DIlWc020609@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20590

Modified Files:
	003-geant-dummy-functions.dpatch cernlib.spec 
Added Files:
	114-install-scripts-properly.dpatch 
	211-fix-comis-on-64-bit-arches.dpatch 
	cernlib_2005.05.09.dfsg-2.diff 
Removed Files:
	cernlib-install_scripts.patch cernlib_2005.05.09.dfsg-1.diff 
Log Message:
- use new debian patchset
- enable 64 bit fixes patch




--- NEW FILE 114-install-scripts-properly.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 114-install-scripts-properly.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Install scripts properly (i.e. don't try to strip them).

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/scripts/Imakefile cernlib-2005.05.09.dfsg/src/scripts/Imakefile
--- cernlib-2005.05.09.dfsg~/src/scripts/Imakefile	2004-07-29 10:17:08.000000000 -0400
+++ cernlib-2005.05.09.dfsg/src/scripts/Imakefile	2005-12-02 10:45:23.091782817 -0500
@@ -1,10 +1,10 @@
 
-InstallProgram(paw,$(CERN_BINDIR))
+InstallNamedProg(paw,paw,$(CERN_BINDIR))
 
 #if defined(CERNLIB_SHIFT)
 InstallNamedProg(cernlib_shift,cernlib,$(CERN_BINDIR))
 #else
-InstallProgram(cernlib,$(CERN_BINDIR))
+InstallNamedProg(cernlib,cernlib,$(CERN_BINDIR))
 #endif
 
-InstallProgram(gxint,$(CERN_BINDIR))
+InstallNamedProg(gxint,gxint,$(CERN_BINDIR))


--- NEW FILE 211-fix-comis-on-64-bit-arches.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-64-bit-arches.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09~/src/geant321/gphys/gphot.F cernlib-2005.05.09/src/geant321/gphys/gphot.F
--- cernlib-2005.05.09~/src/geant321/gphys/gphot.F	1995-10-24 10:21:29.000000000 +0000
+++ cernlib-2005.05.09/src/geant321/gphys/gphot.F	2005-09-20 19:27:10.734527890 +0000
@@ -240,7 +240,7 @@
                   ELSE
 C Radiative shell decay
                      JS = JFN+1+2*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 40 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
@@ -296,7 +296,7 @@
                   ELSE
 c Nonradiative decay
                      JS = JFN+1+3*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 60 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
diff -urNad cernlib-2005.05.09~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.05.09/src/packlib/kernlib/kerngen/ccgen/locb.c
--- cernlib-2005.05.09~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/kernlib/kerngen/ccgen/locb.c	2005-09-20 19:27:10.734527890 +0000
@@ -44,7 +44,25 @@
    DummyDef
 #endif
 {
+#if defined(CERNLIB_QMLXIA64)
+   const unsigned long long int mask=0x00000000ffffffff;
+   static unsigned long long int base=1;
+   unsigned long long int jadr=(unsigned long long int) iadr;
+   unsigned long long int jadrl = (mask & jadr);
+
+   if (base == 1) {
+     base = (~mask & jadr);
+   } else if(base != (~mask & jadr)) {
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+     printf("locb_() Warning: changing base from %lx to %lx!!!\n",
+     	   base, (~mask & jadr));
+     printf("This may result in program crash or incorrect results\n");
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+   }
+   return ((int) jadrl);
+#else
    return( (int) iadr );
+#endif
 }
 /*> END <----------------------------------------------------------*/
 #ifdef CERNLIB_TCGEN_LOCB
diff -urNad cernlib-2005.05.09~/src/packlib/zbook/code/zjump.c cernlib-2005.05.09/src/packlib/zbook/code/zjump.c
--- cernlib-2005.05.09~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/zbook/code/zjump.c	2005-09-20 19:27:10.734527890 +0000
@@ -7,6 +7,9 @@
  *
  */
 #include "zbook/pilot_c.h"
+#if defined(CERNLIB_QMLXIA64)
+static void (*target)();
+#endif
 #if defined(CERNLIB_UNIX)
 #if defined(CERNLIB_QX_SC)
 zjump_(name,p1,p2,p3,p4)
@@ -18,8 +21,23 @@
 ZJUMP(name,p1,p2,p3,p4)
 #endif
 char *p1, *p2, *p3, *p4;
+
+/*  LP64 compatibility:
+    name is taken from a Fortran array and therefore its address is 32 bit
+    which has to be converted to a 64 bit address to satisfy void (*) (H. Vogt) */
+
+#if defined(CERNLIB_QMLXIA64)
+int *name;
+{
+  long jadr;
+  jadr   = *name;  /* convert int to long */
+  target = (void (*)())jadr;
+  (*target)(p1, p2, p3, p4);
+}
+#else
 void (**name)();
 {
    (**name)(p1, p2, p3, p4);
 }
 #endif
+#endif
diff -urNad cernlib-2005.05.09~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.05.09/src/packlib/zebra/test/brztest/btest2.F
--- cernlib-2005.05.09~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/zebra/test/brztest/btest2.F	2005-09-20 19:27:10.734527890 +0000
@@ -29,6 +29,15 @@
 ********************************************************************************
 *
       COMMON/CRZT/IXSTOR,IXDIV,IFENCE(2),LEV,LEVIN,BLVECT(30000)
+
+*     LP64 compatibility:
+*     For 64-bit pointer systems put local variables referenced by LOCF
+*     in a dummy named common block to keep addresses in the program region.
+*     see also: packlib/ffread/test/main.F (H. Vogt)
+
+#if defined(CERNLIB_QMLXIA64)
+      COMMON /TEST64/LBANK
+#endif
       DIMENSION LQ(999),IQ(999),Q(999)
       EQUIVALENCE (IQ(1),Q(1),LQ(9)),(LQ(1),LEV)
 C
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09~/src/pawlib/comis/code/Imakefile	2005-09-20 19:26:47.894420356 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-09-20 19:27:10.734527890 +0000
@@ -50,6 +50,10 @@
 SRCS_F := $(SRCS_F) cscrexec.F
 #endif
 
+#if defined(CERNLIB_QMLXIA64)
+SRCS_F := $(SRCS_F) csrtgpl.F csitgpl.F
+#endif
+
 #if defined(CERNLIB_OLD)
 SRCS_F := $(SRCS_F) cspdir.F csrmbk.F
 #endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csaddr.F	1996-02-26 17:16:25.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-09-20 19:27:10.735527676 +0000
@@ -17,8 +17,14 @@
       INTEGER CSLTGP,CSITGP
       CHARACTER*32 NAME
 #include "comis/cstab.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       INTEGER CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      INTEGER*8 CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)
       NAME=CHNAME
       NC=LENOCC(NAME)
       CALL CSCHID(NAME(:NC))
@@ -26,21 +32,39 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
+#endif
+#endif
+#if defined(CERNLIB_SHL)
           ELSE
             I=0
           ENDIF
         ENDIF
       ELSE
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+        IF(IADGPL.NE.0)THEN
+          IFCS=-2
+          ITYPGP=-2
+          I=CSITGPL(IPVS)
+        ENDIF
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
           I=CSITGP(IPVS)
         ENDIF
+#endif
       END IF
       CSADDR=I
 #endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csinit.F cernlib-2005.05.09/src/pawlib/comis/code/csinit.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csinit.F	2005-04-18 15:41:04.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csinit.F	2005-09-20 19:27:10.735527676 +0000
@@ -64,6 +64,9 @@
 #if defined(CERNLIB_SHL)
 #include "comis/cshlnm.inc"
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+#endif
 #if defined(CERNLIB_PAW)
 #include "paw/pcmode.inc"
 #include "comis/cshfill.inc"
@@ -159,6 +162,9 @@
       ICHMINU=ICHAR('-')
       ICHPLUS=ICHAR('+')
       ICHCOMM=ICHAR(',')
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+      IPIADGV=0
+#endif
 #if defined(CERNLIB_PAW)
       CALL CSPAWI
       MODHFI=0
@@ -209,11 +215,16 @@
       CHF77 ='f77 -c -pic'
       CHCC  ='cc -c -pic'
 #endif
-#if (defined(CERNLIB_LINUX))
+#if (defined(CERNLIB_LINUX))&&(!defined(CERNLIB_QMLXIA64))
       ITMPLEN=CSTMPD(CHPATH, 256)
       CHF77 ='g77 -c'
       CHCC  ='cc -c'
 #endif
+#if (defined(CERNLIB_LINUX))&&(defined(CERNLIB_QMLXIA64))
+      ITMPLEN=CSTMPD(CHPATH, 256)
+      CHF77 ='g77 -c -fPIC -fno-f2c'
+      CHCC  ='cc -c -fPIC -fno-f2c'
+#endif
 #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
       ITMPLEN=CSTMPD(CHPATH, 256)
       CHF77 ='f77 -c'
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csintx.F cernlib-2005.05.09/src/pawlib/comis/code/csintx.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csintx.F	1996-12-05 09:50:37.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csintx.F	2005-09-20 19:27:10.762521893 +0000
@@ -38,6 +38,9 @@
 #if defined(CERNLIB_PAW)
 #include "comis/cskucs.inc"
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_ALPHA_OSF))
       INTEGER CSTRCMP
 #endif
@@ -1105,6 +1108,32 @@
       ENDIF
 #endif
 #if (!defined(CERNLIB_VAX))&&(!defined(CERNLIB_APOLLO))
+#if defined(CERNLIB_QMLXIA64)
+      IF(IQ(IP+KSIFCS).EQ.-2)THEN
+*Dynamic linker may give long addresses
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ENDIF
+#else
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NPAR,IDA(IOFSPL))
       ELSEIF(ITP.EQ.2)THEN
@@ -1115,6 +1144,7 @@
         DCSRES=CSCALD(IADGP,NPAR,IDA(IOFSPL))
       ENDIF
 #endif
+#endif
       IPC=IPC+4
       GO TO 999
 *NUM I
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csitgpl.F cernlib-2005.05.09/src/pawlib/comis/code/csitgpl.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csitgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csitgpl.F	2005-09-20 19:27:10.763521679 +0000
@@ -0,0 +1,32 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZU:  1.16/16 04/10/93  12.14.52  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+      INTEGER FUNCTION CSITGPL(IP)
+***------------------------------
+*   it is last routine from the tables-set.
+***-----------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cspnts.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab64.inc"
+      I=MHLOC(KSIDP+NWIDEN)
+      IQ(I)=0
+      IQ(I+1)=NCIDEN
+      DO 1 K=1,NWIDEN
+        IQ(I+KSIDP-1+K)=IDEN(K)
+   1  CONTINUE
+      CALL CSRTGPL(I)
+      IF(IP.EQ.0)THEN
+        IPGP=I
+      ELSE
+        IQ(IP)=I
+      ENDIF
+      CSITGP=I
+      END
+#endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/cskcal.F cernlib-2005.05.09/src/pawlib/comis/code/cskcal.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/cskcal.F	1996-12-05 09:50:39.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/cskcal.F	2005-09-20 19:27:10.763521679 +0000
@@ -31,6 +31,9 @@
 #include "comis/cstab.inc"
 #include "comis/csfres.inc"
 #include "comis/cssysd.inc"
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
       CHARACTER PRONAME*32
       INTEGER CSCALI
       DOUBLE PRECISION CSCALD
@@ -232,6 +235,34 @@
         I2=I2+KS
         I=I+1
  9203 CONTINUE
+#if defined(CERNLIB_QMLXIA64)
+*  Dynamic linker may give long addresses
+      IF (IFCS.EQ.-2)THEN
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ENDIF
+#else
 *      IT=IABS(ITYPGP)
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NOPAR,IF77PL(1))
@@ -245,6 +276,7 @@
       ENDIF
 *+SELF,IF=UNIX,IF=-SGI,IF=-IBMRT,IF=-DECS,IF=-HPUX,IF=-SUN,IF=-MSDOS.
 #endif
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_STDUNIX))
       I=1
       DO 9203 K=ITA-NPAR+1,ITA
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/cslink.F cernlib-2005.05.09/src/pawlib/comis/code/cslink.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/cslink.F	1996-02-26 17:16:17.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/cslink.F	2005-09-20 19:27:10.763521679 +0000
@@ -21,10 +21,15 @@
 #include "comis/cstab.inc"
 #include "comis/cspnts.inc"
 #include "comis/cslun.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       CHARACTER*(KLENID) FNNAME
       INTEGER CS_GET_FUNC
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      CHARACTER*(KLENID) FNNAME
+      INTEGER*8 CS_GET_FUNC
+#endif
          COMMON/CSGSCM/IGS,JGS,NGS,CSJUNK(3)
       IF(ISTLIB.EQ.0 .AND. ITBS.EQ.0)RETURN
    2  I=IPGP
@@ -60,12 +65,20 @@
 #if defined(CERNLIB_SHL)
           CALL CSGTIDP(I,FNNAME,NC)
           CALL CUTOL(FNNAME(1:NC))
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(FNNAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+          ENDIF
+#else
           IADGP=CS_GET_FUNC(FNNAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
           ENDIF
 #endif
+#endif
           IP=0
         ENDIF
       ENDIF
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csrtgpl.F cernlib-2005.05.09/src/pawlib/comis/code/csrtgpl.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csrtgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csrtgpl.F	2005-09-20 19:27:10.764521465 +0000
@@ -0,0 +1,31 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZ :  1.18/14 10/01/95  15.41.06  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+
+      SUBROUTINE CSRTGPL(I)
+***--------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab.inc"
+#include "comis/cstab64.inc"
+
+      IPIADGV = IPIADGV + 1
+      IF (IPIADGV .GT. MAXIAD64)  THEN
+        WRITE (*,'(2a,I4)') 'to much addresses for dynamik linking, ',
+     &                      'limit is ', MAXIAD64
+        WRITE (*,'(2a)') 'increase MAXIAD64 in cstab64.inc and ',
+     &                    'recompile COMIS'
+
+        STOP
+      END IF
+      IADGPLV(IPIADGV) = IADGPL
+      IADGP            = IPIADGV
+      CALL CCOPYA(IADGP,IQ(I+2),KSIDP-2)
+      END
+#endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/comis/cstab64.inc cernlib-2005.05.09/src/pawlib/comis/comis/cstab64.inc
--- cernlib-2005.05.09~/src/pawlib/comis/comis/cstab64.inc	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/comis/cstab64.inc	2005-09-20 19:27:10.775519109 +0000
@@ -0,0 +1,10 @@
+*
+*
+* cstab64.inc
+*
+      PARAMETER (MAXIAD64=100) !maximum number of shared objects
+      INTEGER*8 IADGPL,IADGPLV(MAXIAD64)
+      INTEGER   IADGPL1, IADGPL2
+      COMMON /CSTB64/ IADGPL,IADGPLV
+      COMMON /CSTB64I/ IPIADGV
+      EQUIVALENCE (IADGPL, IADGPL1)
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/ccopys.c	1997-09-02 15:50:38.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/ccopys.c	2005-09-20 19:27:10.776518895 +0000
@@ -33,11 +33,25 @@
 #else
 void ccopys_(ja,jb,nn)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *nn;
+{
+  int i,n; char *a,*b;
+  n=*nn; (long)a=*ja; (long)b=*jb;
+#else
      char **ja, **jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+#endif
   if ( a >= b )
      for ( i=0; i
 #endif
@@ -274,6 +285,7 @@
 #endif
          p->next = f->first_proc;
          f->first_proc = p;
+         if (debug_level > 0) printf("function pointer is: %p\n", p->funcptr);
          return (void *)(p->funcptr);
       }
      f = f->next;
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscald.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscald.c	2004-10-27 09:01:54.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscald.c	2005-09-20 19:27:10.776518895 +0000
@@ -32,8 +32,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 double cscald_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -46,10 +45,41 @@
     int CSCALD (name,n,p)
 #  endif
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscald_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+double cscald_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[15];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = *fptr + (unsigned long)jumpad_;
+   if ( *fptr > 0 ) ptr = 0;
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  double (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    double d;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscali.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscali.c	2004-10-22 12:42:40.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscali.c	2005-09-20 19:27:10.777518681 +0000
@@ -29,8 +29,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 int cscali_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -39,10 +38,41 @@
 #if defined(CERNLIB_QXCAPT)
 int type_of_call CSCALI (name,n,p)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscali_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+int cscali_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[15];
+{
+   int jumpad_();
+   int (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   if ( *fptr > 0 ) ptr = 0;
+   ptr += *fptr;
+   name = (int (*)())ptr;
+/*    printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  int (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    int i;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscalr.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscalr.c	2004-10-22 12:03:16.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscalr.c	2005-09-20 19:27:10.788516325 +0000
@@ -33,16 +33,12 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 float cscalr_ (name,n,p)
 #endif
-
 #if defined(CERNLIB_QXNO_SC)
 float cscalr (name,n,p)
 #endif
-
 #if defined(CERNLIB_QXCAPT)
 # if defined(CERNLIB_MSSTDCALL)
    float type_of_call CSCALR(name,n,p)
@@ -51,10 +47,39 @@
 # endif
 #endif
 
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscalr_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+float cscalr_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ int pin[15];
+{
+   int jumpad_();
+   float (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   ptr += *fptr;
+   name = (float (*)())ptr;
+/*    printf ("cscalr - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  float (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    float r;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cstrcmp.c	1997-09-02 15:50:44.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cstrcmp.c	2005-09-20 19:27:10.788516325 +0000
@@ -36,6 +36,27 @@
 #else
 int cstrcmp_(ja,na,jb,nb)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *na, *nb;
+{
+
+  int i,la,lb,k; char *a,*b;
+  if ( *na >= *nb )
+     {
+      (long)a=*ja; (long)b=*jb; la=*na; lb=*nb; k=1;
+      }
+  else
+    {
+      (long)a=*jb; (long)b=*ja; la=*nb; lb=*na; k=-1;
+     }
+#else
      char **ja, **jb;
      int *na, *nb;
 {
@@ -48,6 +69,7 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+#endif
   for ( i=0; i b[i]) ? k : -k ); }
diff -urNad cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_execute.c cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_execute.c
--- cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_execute.c	2001-09-18 13:41:35.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_execute.c	2005-09-20 19:27:10.789516111 +0000
@@ -245,7 +245,15 @@
 	char		ntname[MAX_NAME_LEN+6];
 	int		i, ierr, indx, itype, isize, ielem;
 	Int32 *		addr;
-	int		ibase[1], ioff, nuse;
+
+	/* LP64 compatibility:
+	   use static for ibase (at least) because its address is stored
+	   as Int32 in structure CWNBlock                                 
+	   static takes ibase from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int	ibase[1], ioff, nuse;
 	int		id = qe->id;
 	char *		path = qe->path;
 	char *		title;
@@ -871,8 +879,21 @@
 			if ( cmd->u.scan.pawpp ) {
 				char	buf[33];
 
+				/* for LP64 ABI matlab and matrow are 64 bit pointer, type is void*  
+				   but PCADDR.jmlab and PCADDR.jmrow are of type int
+				   see: c_pcaddr.h and qp_command.h
+				   it is related to CWNBlock -> see above (H. Vogt)*/
+
+#if defined(CERNLIB_QMLXIA64)
+				unsigned long long int	 myjmlab, myjmrow;
+				myjmlab = PCADDR.jmlab;
+				myjmrow = PCADDR.jmrow;
+				c->matlab = (TableCallBack) myjmlab;
+				c->matrow = (TableCallBack) myjmrow;
+#else
 				c->matlab = (TableCallBack) PCADDR.jmlab;
 				c->matrow = (TableCallBack) PCADDR.jmrow;
+#endif
 
 				qp_assert( qe->nexpr <= MAX_OUTSTR );
 
diff -urNad cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_hbook_if.c cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_hbook_if.c
--- cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_hbook_if.c	1999-07-05 15:43:35.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_hbook_if.c	2005-09-20 19:27:10.801513541 +0000
@@ -149,7 +149,15 @@
 	int	idn, idtmp;
 	int	icycle;
 	int	ierr;
-	int     izero = 0;
+
+	/* LP64 compatibility:
+	   use static for izero because its address is fetched by hbname_
+	   using locb and locb expects 32 bit addresses only.
+	   static takes izero from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int     izero = 0;
 
 	/* split string into  path, id and cycle */
 
diff -urNad cernlib-2005.05.09~/src/scripts/cernlib cernlib-2005.05.09/src/scripts/cernlib
--- cernlib-2005.05.09~/src/scripts/cernlib	2003-01-23 14:00:37.000000000 +0000
+++ cernlib-2005.05.09/src/scripts/cernlib	2005-09-20 19:27:10.801513541 +0000
@@ -115,6 +115,12 @@
 	       [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
 	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
 	       [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
+#                      add path to lib64 for x86_64 architecture
+	       if [ `uname -m` = x86_64 ] && [ -d /usr/X11R6/lib64 ] ; then
+		  SYSGDIRS="-L/usr/X11R6/lib -L/usr/X11R6/lib64"
+		  SYSGX11="$SYSGDIRS -lX11"
+		  SYSGMOTIF="$SYSGDIRS -lXm -lXt -lXp -lXext -lX11"
+	       fi
 	       ;;
       NeXT)    SYSGX11="/usr/lib/X11/libX11.r" ;
                SYSGMOTIF="-lXm -lXt /usr/lib/X11/libX11.r" ;;

cernlib_2005.05.09.dfsg-2.diff:

***** Error reading new file: [Errno 2] No such file or directory: 'cernlib_2005.05.09.dfsg-2.diff'

Index: 003-geant-dummy-functions.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/003-geant-dummy-functions.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 003-geant-dummy-functions.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 003-geant-dummy-functions.dpatch	9 Dec 2005 13:18:44 -0000	1.2
@@ -21,7 +21,7 @@
 diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gkine/dummy.c cernlib-2005.05.09.dfsg/src/geant321/gkine/dummy.c
 --- cernlib-2005.05.09.dfsg~/src/geant321/gkine/dummy.c	1970-01-01 00:00:00.000000000 +0000
 +++ cernlib-2005.05.09.dfsg/src/geant321/gkine/dummy.c	2005-11-29 16:55:14.274440352 +0000
-@@ -0,0 +1,204 @@
+@@ -0,0 +1,205 @@
 +/* Dummy file to avoid undefined symbols in the library */
 +/* Kevin McCarty, 14 Jan 2003 */
 +/* Last revised 22 November 2005 */
@@ -179,7 +179,8 @@
 + * shared libraries in the 12 official Debian architectures and determining
 + * the maximum size of each common block there. */
 +
-+#define COMMON(fortranname_, size) struct { char c[size]; } fortranname_
++#define COMMON(fortranname_, size) \
++        struct { char c[size]; } fortranname_ = { { 0, } }
 +
 +COMMON(fkadhn_, 1376);
 +COMMON(fkadhp_, 3712);


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cernlib.spec	2 Dec 2005 09:57:41 -0000	1.6
+++ cernlib.spec	9 Dec 2005 13:18:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       7%{?dist}
+Release:       8%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -62,7 +62,7 @@
 Source201: cernlib-deadpool.txt
 
 # debian patchset
-Patch0: cernlib_2005.05.09.dfsg-1.diff
+Patch0: cernlib_2005.05.09.dfsg-2.diff
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: 001-fix-missing-fluka.dpatch
@@ -84,6 +84,7 @@
 Patch112: 112-remove-nonexistent-prototypes-from-gen.h.dpatch
 # a workaround for cups. Applied in doubt.
 Patch113: 113-cups-postscript-fix.dpatch
+Patch114: 114-install-scripts-properly.dpatch
 Patch200: 200-comis-allow-special-chars-in-path.dpatch
 Patch201: 201-update-kuip-helper-apps.dpatch
 Patch202: 202-fix-includes-in-minuit-example.dpatch
@@ -97,8 +98,8 @@
 Patch208: 208-fix-redundant-packlib-dependencies.dpatch
 Patch209: 209-ignore-unneeded-headers-in-kmutil.c.dpatch
 Patch210: 210-improve-cfortran-header-files.dpatch
-# disabled in the debian patchset
-# 211-fix-comis-on-64-bit-arches.disabled
+# disabled in the debian patchset, enabled here
+Patch211: 211-fix-comis-on-64-bit-arches.dpatch
 Patch300: 300-skip-duplicate-lenocc.dpatch
 # Use another approach, see cernlib-enforce-FHS
 # Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -168,13 +169,13 @@
 
 # change the cernlib script such that -llapack -lblas is used instead of 
 # cernlib lapack
-# and also depend explicitely on libkernlib now that it is out of packlib
+# depend explicitely on libkernlib now that it is out of packlib
+# use lesstif-pawlib and lesstif-packlib
 # the modified script is renamed cernlib-static later and the debian cernlib
 # script is used instead.
 Patch1200: cernlib-cernlib_kernlib.patch
 # don't stop if the CERN variable isn't defined
 Patch1201: cernlib-gxint-script.diff
-Patch1202: cernlib-install_scripts.patch
 Patch1203: cernlib-hwuli2_use_dimag.diff 
 Patch1204: cernlib-hwhiga_use_dimag.diff
 Patch1205: cernlib-gfortran.diff 
@@ -307,6 +308,7 @@
 %patch -P 111 -p1
 %patch -P 112 -p1
 %patch -P 113 -p1
+%patch -P 114 -p1
 %patch -P 200 -p1
 %patch -P 201 -p1
 %patch -P 202 -p1
@@ -318,7 +320,7 @@
 %patch -P 208 -p1
 %patch -P 209 -p1
 %patch -P 210 -p1
-#%patch -P 211 -p1
+%patch -P 211 -p1
 %patch -P 300 -p1
 #%patch -P 301 -p1
 #%patch -P 302 -p1
@@ -447,7 +449,6 @@
 
 %patch -P 1200
 %patch -P 1201
-%patch -P 1202
 %patch -P 1203
 %patch -P 1204
 # use gfortran
@@ -688,6 +689,10 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8
+- use new debian patchset
+- enable 64 bit fixes patch
+
 * Fri Dec  2 2005 Patrice Dumas  - 2005-7
 - use updated beta debian patchset
 - remove the BSD in the licence because there is no library nor binary


--- cernlib-install_scripts.patch DELETED ---


--- cernlib_2005.05.09.dfsg-1.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 15:53:18 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Fri,  9 Dec 2005 10:53:18 -0500
Subject: rpms/digikam/devel digikam.spec,1.4,1.5
Message-ID: <200512091553.jB9Frm50024284@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24265

Modified Files:
	digikam.spec 
Log Message:
- Work around for modular X.Org paths



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- digikam.spec	1 Dec 2005 15:20:30 -0000	1.4
+++ digikam.spec	9 Dec 2005 15:53:16 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -43,6 +43,8 @@
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
+	--with-extra-includes=/usr/share/X11/ \
+	--with-extra-libs=/usr/share/X11/ \
 	--disable-rpath \
 	--disable-debug
 make %{?_smp_mflags}
@@ -115,6 +117,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Add description about digikamimageplugins and kipi-plugins
 - Remove 64 bit patch, applied upstream



From fedora-extras-commits at redhat.com  Fri Dec  9 15:57:08 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 10:57:08 -0500
Subject: rpms/cernlib/FC-3 001-fix-missing-fluka.dpatch, NONE,
 1.1 002-fix-missing-mclibs.dpatch, NONE,
 1.1 003-geant-dummy-functions.dpatch, NONE,
 1.1 100-fix-isajet-manual-corruption.dpatch, NONE,
 1.1 101-undefine-PPC.dpatch, NONE, 1.1 102-dont-optimize-some-code.dpatch,
 NONE, 1.1 103-ignore-overly-long-macro-in-gen.h.dpatch, NONE,
 1.1 104-fix-undefined-insertchar-warning.dpatch, NONE,
 1.1 105-fix-obsolete-xmfontlistcreate-warning.dpatch, NONE,
 1.1 106-fix-paw++-menus-in-lesstif.dpatch, NONE,
 1.1 107-define-strdup-macro-safely.dpatch, NONE,
 1.1 108-quote-protect-comis-script.dpatch, NONE,
 1.1 110-ignore-included-lapack-rule.dpatch, NONE,
 1.1 111-fix-kuesvr-install-location.dpatch, NONE,
 1.1 112-remove-nonexistent-prototypes-from-gen.h.dpatch, NONE,
 1.1 113-cups-postscript-fix.dpatch, NONE,
 1.1 114-install-scripts-properly.dpatch, NONE,
 1.1 200-comis-allow-special-chars-in-path.dpatch, NONE,
 1.1 201-update-kuip-helper-apps.dpatch, NONE,
 1.1 202-fix-includes-in-minuit-example.dpatch, NONE,
 1.1 203-compile-geant-wi!
 th-ertrak.dpatch, NONE, 1.1 204-compile-isajet-with-isasrt.dpatch, NONE,
 1.1 205-max-path-length-to-256.dpatch, NONE,
 1.1 206-herwig-uses-DBLE-not-REAL.dpatch, NONE,
 1.1 207-compile-temp-libs-with-fPIC.dpatch, NONE,
 1.1 208-fix-redundant-packlib-dependencies.dpatch, NONE,
 1.1 209-ignore-unneeded-headers-in-kmutil.c.dpatch, NONE,
 1.1 210-improve-cfortran-header-files.dpatch, NONE,
 1.1 211-fix-comis-on-64-bit-arches.dpatch, NONE,
 1.1 300-skip-duplicate-lenocc.dpatch, NONE,
 1.1 303-shadow-passwords-supported.dpatch, NONE,
 1.1 304-update-Imake-config-files.dpatch, NONE,
 1.1 305-use-POWERPC-not-PPC-as-test.dpatch, NONE,
 1.1 306-patch-assert.h-for-makedepend.dpatch, NONE,
 1.1 307-use-canonical-cfortran.dpatch, NONE,
 1.1 308-use-canonical-cfortran-location.dpatch, NONE,
 1.1 309-define-dummy-herwig-routines.dpatch, NONE,
 1.1 310-define-dummy-fowl-routines.dpatch, NONE,
 1.1 311-skip-duplicate-qnext.dpatch, NONE,
 1.1 312-skip-duplicate-gamma.dpatch, NONE,
 1.1 313-comis-preserves-filename-case.dpatch, NONE, 1.1 314-permit-usi!
 ng-regcomp-for-re_comp.dpatch,NONE,1.1 315-fixes-for-MacOSX.dp!
 atch,N
Message-ID: <200512091557.jB9Fv888024440@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24352

Modified Files:
	.cvsignore cernlib-deadpool.txt cernlib.README cernlib.spec 
	paw.README sources 
Added Files:
	001-fix-missing-fluka.dpatch 002-fix-missing-mclibs.dpatch 
	003-geant-dummy-functions.dpatch 
	100-fix-isajet-manual-corruption.dpatch 
	101-undefine-PPC.dpatch 102-dont-optimize-some-code.dpatch 
	103-ignore-overly-long-macro-in-gen.h.dpatch 
	104-fix-undefined-insertchar-warning.dpatch 
	105-fix-obsolete-xmfontlistcreate-warning.dpatch 
	106-fix-paw++-menus-in-lesstif.dpatch 
	107-define-strdup-macro-safely.dpatch 
	108-quote-protect-comis-script.dpatch 
	110-ignore-included-lapack-rule.dpatch 
	111-fix-kuesvr-install-location.dpatch 
	112-remove-nonexistent-prototypes-from-gen.h.dpatch 
	113-cups-postscript-fix.dpatch 
	114-install-scripts-properly.dpatch 
	200-comis-allow-special-chars-in-path.dpatch 
	201-update-kuip-helper-apps.dpatch 
	202-fix-includes-in-minuit-example.dpatch 
	203-compile-geant-with-ertrak.dpatch 
	204-compile-isajet-with-isasrt.dpatch 
	205-max-path-length-to-256.dpatch 
	206-herwig-uses-DBLE-not-REAL.dpatch 
	207-compile-temp-libs-with-fPIC.dpatch 
	208-fix-redundant-packlib-dependencies.dpatch 
	209-ignore-unneeded-headers-in-kmutil.c.dpatch 
	210-improve-cfortran-header-files.dpatch 
	211-fix-comis-on-64-bit-arches.dpatch 
	300-skip-duplicate-lenocc.dpatch 
	303-shadow-passwords-supported.dpatch 
	304-update-Imake-config-files.dpatch 
	305-use-POWERPC-not-PPC-as-test.dpatch 
	306-patch-assert.h-for-makedepend.dpatch 
	307-use-canonical-cfortran.dpatch 
	308-use-canonical-cfortran-location.dpatch 
	309-define-dummy-herwig-routines.dpatch 
	310-define-dummy-fowl-routines.dpatch 
	311-skip-duplicate-qnext.dpatch 
	312-skip-duplicate-gamma.dpatch 
	313-comis-preserves-filename-case.dpatch 
	314-permit-using-regcomp-for-re_comp.dpatch 
	315-fixes-for-MacOSX.dpatch 
	318-additional-gcc-3.4-fixes.dpatch 
	700-remove-kernlib-from-packlib-Imakefile.dpatch 
	701-patch-hbook-comis-Imakefiles.dpatch 
	702-patch-Imakefiles-for-packlib-mathlib.dpatch 
	703-patch-code_motif-packlib-Imakefiles.dpatch 
	704-patch-code_kuip-higzcc-Imakefiles.dpatch 
	705-patch-paw_motif-paw-Imakefiles.dpatch 
	800-implement-shared-library-rules-in-Imake.dpatch 
	801-non-optimized-rule-uses-fPIC-g.dpatch 
	802-create-shared-libraries.dpatch 
	803-link-binaries-dynamically.dpatch 
	804-workaround-for-comis-mdpool-struct-location.dpatch 
	805-expunge-missing-mathlib-kernlib-symbols.dpatch 
	806-bump-mathlib-and-dependents-sonames.dpatch 
	cernlib-enforce-FHS.diff cernlib-gxint-script.diff 
	cernlib-hwhiga_use_dimag.diff cernlib-hwuli2_use_dimag.diff 
	cernlib_2005.05.09.dfsg-2.diff 
Removed Files:
	001-delete-pythia-refs 003-enforce-FHS 
	005-enable-shadow-passwd 007-delete-fluka-refs 008-undef-PPC 
	010-comis-allow-special-chars-in-path 
	012-add-no-optimization-macro 
	013-fix-paw-imakefile-special-rules 
	014-fix-herwig-imakefile-special-rules 015-fix-optimization 
	018-move-kernlib-to-toplevel 028-fix-isajet-docs 
	030-filename-length-to-256 033-fix-undefined-insertchar 
	035-do-not-use-XmFontListCreate 038-fix-strndup-macro-problem 
	039-use-DBLE-not-REAL 044-fix-strdup-redefinition 
	045-compile-with-isasrt 047-fix-paw++-menus 
	cernlib-XmDrawShadow-no-prototype.patch 
	cernlib-bimsel-nodouble-save.diff cernlib-cernlib.patch 
	cernlib-hwhiga_use_aimag.diff cernlib-hwuli2_use_aimag.diff 
	cernlib-install_scripts.patch cernlib-static-tcpaw.diff 
	cernlib_2004.11.04-3.diff gxint-script.diff 
Log Message:
- update with newer debian patchset for cernlib, fix licence issues
- remove the BSD in the licence because there is no library nor binary
  under a BSD licence and someone could get the idea that there is 
  some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
  because of cfortran
- don't use the include.tar.gz source, instead get include files from
  the source files
- build shared libraries
- simplify the scripts modifications

sync with devel, except 64 bit fixes



--- NEW FILE 001-fix-missing-fluka.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 001-fix-missing-fluka.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Deal with FLUKA code having been purged from Debian's Cernlib source.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	1998-03-05 11:20:07.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-11-23 17:41:29.886310858 +0000
@@ -4,10 +4,11 @@
 
 AllTarget(geant321)
 
-LIBDIRS= block cdf cgpack fiface fluka gbase gcons gdraw \ @@\
+/* Fluka removed from Debian source package for copyright reasons. */
+LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
          geocad ggeom gheisha ghits ghrout ghutils giface \ @@\
 	 giopa gkine gphys gscan gstrag gtrak guser gxint \ @@\
-	 miface miguti neutron peanut
+	 miface miguti neutron
 
 
 SUBDIRS= $(LIBDIRS) data examples gxuser geant321
@@ -25,9 +26,12 @@
 InstallLibrary(geant321,$(CERN_LIBDIR))
 InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
 
+/* Fluka removed from Debian source package for copyright reasons. */
+/*
 SubdirDataFile($(LIBRARY),flukaaf.dat,data)
 
 InstallNonExecFileTarget(install.lib,flukaaf.dat,$(CERN_LIBDIR))
+*/
 
 /* This will install the correct link for xsneut95.dat at CERN;
  * If you want a local copy of the file, just copy it there
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/miface/Imakefile cernlib-2005.05.09.dfsg/src/geant321/miface/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/miface/Imakefile	1995-10-24 10:21:53.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/miface/Imakefile	2005-11-23 17:41:52.230563421 +0000
@@ -1,5 +1,5 @@
 SRCS_F= \ @@\
-	 gfmdis.F gfmfin.F gmicap.F gmiset.F gmorin.F gmplxs.F gmxsec.F
+	                   gmicap.F gmiset.F gmorin.F gmplxs.F gmxsec.F
 
 #ifdef CERNLIB_QMVAOS
  FORTRANSAVEOPTION=FortranSaveFlags


--- NEW FILE 002-fix-missing-mclibs.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 002-fix-missing-mclibs.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Deal with several of the MC libs having to be purged from source.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/Imakefile /tmp/dpep.pmIy0R/cernlib-2005.05.09/src/mclibs/Imakefile
--- cernlib-2005.05.09/src/mclibs/Imakefile	1999-05-20 09:30:20.000000000 -0400
+++ /tmp/dpep.pmIy0R/cernlib-2005.05.09/src/mclibs/Imakefile	2005-06-08 15:39:37.783591646 -0400
@@ -2,9 +2,11 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-
-LIBDIRS= ariadne cojets eurodec herwig fritiof \ @@\
-	 isajet jetset lepto63 pdf photos pythia
+/* Pythia and Jetset are not under GPL, so we must remove references
+   to them and their dependents.  They have already been purged from
+   Debianized source code.  Also, re-order libs so that dependent ones
+   come after dependees. */
+LIBDIRS= cojets eurodec pdf photos herwig isajet
 
 SUBDIRS = $(LIBDIRS)
 
@@ -12,8 +14,8 @@
 
 InstallLibSubdirs($(LIBDIRS))
 
-INCLUDEDIRS= ariadne cojets eurodec herwig fritiof \ @@\
-	 isajet jetset lepto63 pdf pythia
+/* Again, purge Pythia, Jetset and dependents. */
+INCLUDEDIRS= cojets eurodec herwig isajet pdf
 
 InstallIncludeSubdirs($(INCLUDEDIRS))
 


--- NEW FILE 003-geant-dummy-functions.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 003-geant-dummy-functions.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add stub Geant functions to avoid missing symbols due to Fluka removal.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gkine/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gkine/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/gkine/Imakefile	1996-03-28 16:21:20.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/gkine/Imakefile	2005-11-29 15:59:27.035065621 +0000
@@ -1,6 +1,9 @@
 SRCS_F= gfkine.F gfvert.F gludky.F glund.F glundi.F gpkine.F \ @@\
 	gpkinx.F gpvert.F gskine.F gskinu.F gsvert.F gsveru.F gtau.F
 
+/* Dummy file containing stubs for deleted Fluka and mclibs functions: */
+SRCS_C= dummy.c
+
 #ifdef CERNLIB_QMVAOS
  FORTRANSAVEOPTION=FortranSaveFlags
  FORTRANOPTIONS = -math_library accurate $(FORTRANSAVEOPTION)
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gkine/dummy.c cernlib-2005.05.09.dfsg/src/geant321/gkine/dummy.c
--- cernlib-2005.05.09.dfsg~/src/geant321/gkine/dummy.c	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/gkine/dummy.c	2005-11-29 16:55:14.274440352 +0000
@@ -0,0 +1,205 @@
+/* Dummy file to avoid undefined symbols in the library */
+/* Kevin McCarty, 14 Jan 2003 */
+/* Last revised 22 November 2005 */
+
+#include 
+#include 
+#include 
+
+/* Want the dummy functions to be weakly defined so they may be overridden
+ * without error. */
+
+#define kludge(x)    #x
+#define stringify(x) kludge(x)
+#define underline(x) __ ## x
+
+#define DUMMY(domain, UPPERNAME, fortranname_, returntype) \
+returntype fortranname_() {print_dummy(#domain,#UPPERNAME);}
+
+#define WEAKDUMMY(domain, UPPERNAME, fortranname_, returntype) \
+static returntype underline(fortranname_)() {print_dummy(#domain,#UPPERNAME);} \
+void fortranname_() \
+	__attribute__ ((weak, alias (stringify(underline(fortranname_))) ))
+
+static void print_dummy(const char *domain, const char *function)
+{
+  fprintf(stderr, "Geant321: Now in dummy %s routine.\n", function);
+  fprintf(stderr,
+"If you see this message, you are presumably trying to call (possibly\n"
+"indirectly) the %s routine");
+
+  if (strcmp(domain, "Jetset") == 0)
+    fprintf(stderr,
+" in the Jetset library.\n"
+#if defined (CERNLIB_DEBIAN)
+"To obtain the Jetset library, please see the file\n"
+"/usr/share/doc/geant321/README.Debian\n"
+#endif
+    );
+
+  else if (strcmp(domain, "Fluka") == 0)
+    fprintf(stderr,
+" in the FLUKA library.\n"
+"FLUKA is unfortunately not available in this distribution of Cernlib for\n"
+"licensing reasons"
+#if defined (CERNLIB_DEBIAN)
+"; please see the file /usr/share/doc/geant321/README.Debian\n"
+"for details.\n"
+#else
+".\n"
+#endif
+    );
+  
+  else if (strcmp(domain, "User") == 0)
+    fprintf(stderr, ".  This routine is not built into Geant;\n"
+"you must write code for it yourself.  Please see the documentation"
+#if defined (CERNLIB_DEBIAN)
+"\n(for instance in the geant321-doc package)"
+#endif
+".\n");
+  
+  exit(EXIT_FAILURE);
+}
+
+/* Functions that the user is supposed to set up */
+WEAKDUMMY(User, UGINIT, uginit_, void);
+WEAKDUMMY(User, UGLAST, uglast_, void);
+
+/* Functions in the non-free Jetset library, which can be used
+ * if it's installed */
+WEAKDUMMY(Jetset, LU1ENT, lu1ent_, void);
+WEAKDUMMY(Jetset, LUCOMP, lucomp_, int);
+WEAKDUMMY(Jetset, LUEEVT, lueevt_, void);
+WEAKDUMMY(Jetset, LUEXEC, luexec_, void);
+
+/* N.B.  When the libgeant321 dynamic soversion is bumped, at the same time
+ * everything below this point except the dummy FLDIST and FLINIT subroutines
+ * may be deleted; those should be turned into weak aliases in case anyone
+ * wants to create a separate GEANT-FLUKA library. */
+
+/* From src/geant321/fluka (not the complete set of functions, just
+ * those referenced from external files) */
+WEAKDUMMY(Fluka, DOST,   dost_,   double);
+WEAKDUMMY(Fluka, EEXLVL, eexlvl_, void);
+WEAKDUMMY(Fluka, EVENTV, eventv_, void);
+WEAKDUMMY(Fluka, EVEVAP, evevap_, void);
+WEAKDUMMY(Fluka, EVVINI, evvini_, void);
+WEAKDUMMY(Fluka, FKENER, fkener_, double);
+WEAKDUMMY(Fluka, FKZERO, fkzero_, void);
+WEAKDUMMY(Fluka, NIZLNW, nizlnw_, void);
+WEAKDUMMY(Fluka, NUCREL, nucrel_, void);
+WEAKDUMMY(Fluka, RACO,   raco_,   void);
+WEAKDUMMY(Fluka, SAMCST, samcst_, void);
+WEAKDUMMY(Fluka, SIGEL,  sigel_,  void);
+WEAKDUMMY(Fluka, SITSAO, sitsao_, double);
+
+/* The following dummy functions are added due to the removal
+ * of the corresponding code from Geant (it is also part of FLUKA).
+ * We are constrained to keep the ABI for the dynamic library, so
+ * these dummy functions must be kept until next time the libgeant321
+ * soversion is changed. */
+
+/* From src/geant321/fiface */
+DUMMY(Fluka, FLDIST, fldist_, void);
+DUMMY(Fluka, FLINIT, flinit_, void);
+DUMMY(Fluka, FLUFIN, flufin_, void);
+
+/* From src/geant321/miface */
+DUMMY(Fluka, GFMFIN, gfmfin_, void);
+DUMMY(Fluka, GFMDIS, gfmdis_, void);
+
+/* From src/geant321/block */
+DUMMY(Fluka, FDEVAP, fdevap_, void);
+DUMMY(Fluka, FDNOPT, fdnopt_, void);
+DUMMY(Fluka, FDPREE, fdpree_, void);
+DUMMY(Fluka, FLKDT1, flkdt1_, void);
+DUMMY(Fluka, FLKDT2, flkdt2_, void);
+DUMMY(Fluka, FLKDT3, flkdt3_, void);
+DUMMY(Fluka, FLKDT4, flkdt4_, void);
+DUMMY(Fluka, FLKDT5, flkdt5_, void);
+DUMMY(Fluka, FLKDT6, flkdt6_, void);
+DUMMY(Fluka, FLKDT7, flkdt7_, void);
+
+/* From src/geant321/peanut */
+DUMMY(Fluka, BIMNXT, bimnxt_, void);   /* alternate entry to BIMSEL */
+DUMMY(Fluka, BIMSEL, bimsel_, void);
+DUMMY(Fluka, COSLEG, cosleg_, double);
+DUMMY(Fluka, FEKFNC, fekfnc_, double);
+DUMMY(Fluka, FPFRNC, fpfrnc_, double);
+DUMMY(Fluka, FRADNC, fradnc_, double);
+DUMMY(Fluka, FRHINC, frhinc_, double);
+DUMMY(Fluka, FRHONC, frhonc_, double);
+DUMMY(Fluka, NCLVFX, nclvfx_, double); /* alternate entry to PFNCLV */
+DUMMY(Fluka, NCLVIN, nclvin_, void);
+DUMMY(Fluka, NCLVST, nclvst_, void);
+DUMMY(Fluka, NUCNUC, nucnuc_, void);
+DUMMY(Fluka, NWINXT, nwinxt_, void);   /* alternate entry to NWISEL */
+DUMMY(Fluka, NWISEL, nwisel_, void);
+DUMMY(Fluka, PEANUT, peanut_, void);
+DUMMY(Fluka, PFNCLV, pfnclv_, double);
+DUMMY(Fluka, PHDSET, phdset_, void);
+DUMMY(Fluka, PHDWLL, phdwll_, void);
+DUMMY(Fluka, PIOABS, pioabs_, void);
+DUMMY(Fluka, PREPRE, prepre_, void);
+DUMMY(Fluka, RSCOMP, rscomp_, void);   /* alternate entry to SBCOMP */
+DUMMY(Fluka, RSTNXT, rstnxt_, void);   /* alternate entry to RSTSEL */
+DUMMY(Fluka, RSTSEL, rstsel_, void);
+DUMMY(Fluka, SBCOMP, sbcomp_, void);
+DUMMY(Fluka, SIGFER, sigfer_, void);
+DUMMY(Fluka, UMOFIN, umofin_, void);
+DUMMY(Fluka, XINNEU, xinneu_, double);
+DUMMY(Fluka, XINPRO, xinpro_, double);
+
+/* The following dummy common blocks are added for the same reason.
+ * The number of bytes required was determined by inspecting the existing
+ * shared libraries in the 12 official Debian architectures and determining
+ * the maximum size of each common block there. */
+
+#define COMMON(fortranname_, size) \
+        struct { char c[size]; } fortranname_ = { { 0, } }
+
+COMMON(fkadhn_, 1376);
+COMMON(fkadhp_, 3712);
+COMMON(fkbala_,  288);
+COMMON(fkcd97_, 1152);
+COMMON(fkchpa_, 1472);
+COMMON(fkchpr_,  576);
+COMMON(fkcmcy_,  176);
+COMMON(fkcomc_, 7424);
+COMMON(fkcosp_,   64);
+COMMON(fkdecc_,10816);
+COMMON(fkdech_, 4328);
+COMMON(fkenco_,   16);
+COMMON(fkeva0_,60960);
+COMMON(fkfinu_,52000);
+COMMON(fkhadf_,  352);
+COMMON(fkheac_,   96);
+COMMON(fkheav_, 5408);
+COMMON(fkhet7_,   64);
+COMMON(fkhetp_,   32);
+COMMON(fkhigf_, 1632);
+COMMON(fkidgb_,   16);
+COMMON(fkinpf_,   32);
+COMMON(fkisot_,10208);
+COMMON(fkmapa_, 5824);
+COMMON(fknegx_,  128);
+COMMON(fknuct_,   16);
+COMMON(fknuda_, 1248);
+COMMON(fknuge_, 1120);
+COMMON(fknugi_,26944);
+COMMON(fknuii_, 1888);
+COMMON(fknule_,18048);
+COMMON(fknupw_,   32);
+COMMON(fkpapr_, 2400);
+COMMON(fkpare_,  256);
+COMMON(fkparn_, 7296);
+COMMON(fkpart_, 9696);
+COMMON(fkploc_, 2864);
+COMMON(fkquar_,  832);
+COMMON(fkreac_,50976);
+COMMON(fkredv_, 2368);
+COMMON(fkresn_,  256);
+COMMON(fkrun_,    32);
+COMMON(fkslop_,  608);
+COMMON(fkxsep_,13600);
+


--- NEW FILE 100-fix-isajet-manual-corruption.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 100-fix-isajet-manual-corruption.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix corruption in LaTeX source to the Isajet manual.
## DP: (Replacement text obtained from a PS version of the manual on the web.)

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc /tmp/dpep.tlmeFD/cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc
--- cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc	2001-10-08 10:03:08.000000000 -0400
+++ /tmp/dpep.tlmeFD/cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc	2005-06-08 16:12:37.814042242 -0400
@@ -122,7 +122,7 @@
 $W/Z$ decay. These were calculated using FORM 1.1 by J.~Vermaseren. The
 process $g + t \to W + b$ is {\it not} included. Both $g + b \to W^- +
 t$ and $g + \bar t \to W^- + \bar b$ of course give the same $W^- + t
-+\BARB_FINALSTATEAFTERQCDEVOLUTION
++\bar b$ final state after QCD evolution.  While the latter process is
 needed to describe the $m_t = 0$(!) mass singularity for $q_t \gg
 m_t$, it has a pole in the physical region at low $q_t$ from on-shell
 $t \to W + b$ decays. There is no obvious way to avoid this without


--- NEW FILE 101-undefine-PPC.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 101-undefine-PPC.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: If "PPC" is defined by compiler, undefine where it clashes with a
## DP: local variable.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F /tmp/dpep.aeMGeJ/cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F
--- cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F	1996-01-11 09:14:33.000000000 -0500
+++ /tmp/dpep.aeMGeJ/cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F	2005-06-08 17:00:48.403200778 -0400
@@ -37,6 +37,15 @@
 #include "cojets/zpar2.inc"
 #include "cojets/zwpar.inc"
 #include "cojets/weakon.inc"
+
+C     The following is necessary since PPC is defined in g77 on
+C     the powerpc architecture, but it's also a variable in this
+C     file.
+C       -- Kevin McCarty
+#ifdef PPC
+#undef PPC
+#endif
+
       DIMENSION QP(4),QM(4),QK(4),QE(4),QN(4)
       DIMENSION COEF(2,2),QQV(2)
 C


--- NEW FILE 102-dont-optimize-some-code.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 102-dont-optimize-some-code.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't allow the compiler to optimize several files that cause trouble
## DP: (either compiler crash or broken code generation).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	1996-06-12 11:25:38.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-09 11:14:52.470486750 -0400
@@ -19,6 +19,11 @@
 SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
 	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F rgmlt.F rkstp64.F \ @@\
 	simps64.F triint64.F 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(rderiv,rderiv,-O0,NullParameter)
+SpecialFortranLibObjectRule(rfrdh1,rfrdh1,-O0,NullParameter)
+#endif
 #else
 SRCS_F:= $(SRCS_F) cgauss128.F cauchy.F cauchy128.F deqbs128.F deqmr128.F \ @@\
 	deriv128.F minfc128.F rfrdh128.F rgmlt128.F rkstp128.F simps128.F \ @@\
@@ -37,6 +42,16 @@
 IMAKE_DEFINES=-DFortranDoesCpp=NO
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(rknysd,rknysd,-O0,NullParameter)
+SpecialFortranLibObjectRule(old506,old506,-O0,NullParameter)
+
+/* -O1 -fno-automatic optimization creates wrong code in g77 2.95, 3.3, 3.4
+   due to x86 chip extended precision, cf. http://bugs.debian.org/290438 */
+SpecialFortranLibObjectRule(radmul,radmul,-O0,NullParameter)
+#endif
+
 FORTRANSAVEOPTION = FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/mathlib/gen/e/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/e/Imakefile	1996-05-01 09:21:54.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile	2005-06-09 11:16:07.058731880 -0400
@@ -12,6 +12,11 @@
 
 #if defined(CERNLIB_DOUBLE)
 SRCS_F:= $(SRCS_F) chsum.F dchebn.F rchecf.F rcspln.F
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(rchecf,rchecf,-O0,NullParameter)
+SpecialFortranLibObjectRule(rcspln,rcspln,-O0,NullParameter)
+#endif
 #else
 SRCS_F:= $(SRCS_F) chsum128.F rchebn.F rcspln128.F
 #endif
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile	1996-05-06 11:19:44.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile	2005-06-09 11:16:58.039286811 -0400
@@ -4,4 +4,8 @@
 
 FORTRANSAVEOPTION = FortranSaveFlags
 
+#if defined(CERNLIB_LINUX)
+SpecialFortranLibObjectRule(isawev,isawev,-O0,NullParameter)
+#endif
+
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile
--- cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile	2000-04-19 09:51:56.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile	2005-06-09 11:22:02.812494322 -0400
@@ -97,4 +97,10 @@
 #ifdef CERNLIB_HPUX
 FORTRANOPTIONS += '-WF,-P'
 #endif
+
+#if defined(CERNLIB_LINUX)
+/* -O2 optimization on ARM breaks in g77 3.3.3 */
+SpecialFortranLibObjectRule(structm,structm,-O0,NullParameter)
+#endif
+
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile	1996-06-10 06:20:57.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile	2005-06-09 11:09:34.621022534 -0400
@@ -14,6 +14,11 @@
 FDEBUGFLAGS=+O1
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(muller,muller,-O0,NullParameter)
+#endif
+
 FORTRANSAVEOPTION = FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile	1996-06-12 06:04:36.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile	2005-06-09 11:10:40.068274255 -0400
@@ -4,6 +4,11 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(ranget,ranget,-O0,NullParameter)
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2001-09-14 09:08:51.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-09 11:19:57.756983183 -0400
@@ -101,4 +101,10 @@
 SpecialFortranLibObjectRule(cskide,cskide,-O0,NullParameter)
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* optimizing this file, even at -O1, causes runtime breakage with g77 3.3
+   cf. http://bugs.debian.org/233689 */
+SpecialFortranLibObjectRule(csrfun,csrfun,-O0,NullParameter)
+#endif
+
 SubdirLibraryTarget(NullParameter,NullParameter)


--- NEW FILE 103-ignore-overly-long-macro-in-gen.h.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 103-ignore-overly-long-macro-in-gen.h.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Comment out macro in cfortran/gen.h with too many arguments for cfortran
## DP: to accept.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/gen.h /tmp/dpep.weQ8Dc/cernlib-2005.05.09/src/cfortran/gen.h
--- cernlib-2005.05.09/src/cfortran/gen.h	2000-06-23 06:13:58.000000000 -0400
+++ /tmp/dpep.weQ8Dc/cernlib-2005.05.09/src/cfortran/gen.h	2005-06-09 11:43:16.729842789 -0400
@@ -1123,10 +1123,10 @@
 
 PROTOCCALLSFSUB3(NAMEZB,namezb,FLOAT,INT,INT)
 #define NAMEZB(A1,A2,A3)  CCALLSFSUB3(NAMEZB,namezb,FLOAT,INT,INT,A1,A2,A3)
-
+/*
 PROTOCCALLSFSUB29(NEWPTQ,newptq,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,PDOUBLE,DOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PINT,PINT)
 #define NEWPTQ(A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11,A12,A13,A14,A15,A16,A17,A18,A19,A20,A21,A22,A23,A24,A25,A26,A27,A28,A29)  CCALLSFSUB29(NEWPTQ,newptq,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,PDOUBLE,DOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PINT,PINT,A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11,A12,A13,A14,A15,A16,A17,A18,A19,A20,A21,A22,A23,A24,A25,A26,A27,A28,A29)
-
+*/
 PROTOCCALLSFSUB9(NEWRO,newro,INT,INT,INT,FLOAT,PFLOAT,FLOATV,FLOATV,FLOATV,FLOATV)
 #define NEWRO(A1,A2,A3,A4,A5,A6,A7,A8,A9)  CCALLSFSUB9(NEWRO,newro,INT,INT,INT,FLOAT,PFLOAT,FLOATV,FLOATV,FLOATV,FLOATV,A1,A2,A3,A4,A5,A6,A7,A8,A9)
 


--- NEW FILE 104-fix-undefined-insertchar-warning.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 104-fix-undefined-insertchar-warning.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Correct Lesstif warning about undefined InsertChar.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c /tmp/dpep.XJ5w0K/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c
--- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c	1996-03-08 10:33:04.000000000 -0500
+++ /tmp/dpep.XJ5w0K/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c	2005-06-09 14:36:52.509109480 -0400
@@ -573,7 +573,7 @@
                         EditMenu,
                         RES_CONVERT( XmNlabelString, "Copy" ),
                         RES_CONVERT( XmNmnemonic, "C" ),
-                        XmNaccelerator, "CtrlInsertChar",
+                        XmNaccelerator, "CtrlInsert",
                         RES_CONVERT( XmNacceleratorText, "Ctrl+Ins" ),
                         NULL );
         UxPutContext( copyButton, (char *) UxKuipIoContext );
@@ -585,7 +585,7 @@
                         EditMenu,
                         RES_CONVERT( XmNlabelString, "Paste" ),
                         RES_CONVERT( XmNmnemonic, "P" ),
-                        XmNaccelerator, "ShiftInsertChar",
+                        XmNaccelerator, "ShiftInsert",
                         RES_CONVERT( XmNacceleratorText, "Shift+Ins" ),
                         NULL );
         UxPutContext( pasteButton, (char *) UxKuipIoContext );


--- NEW FILE 105-fix-obsolete-xmfontlistcreate-warning.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 105-fix-obsolete-xmfontlistcreate-warning.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix Lesstif warning about use of obsolete XmFontListCreate() function

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	1996-10-24 08:13:41.000000000 -0400
+++ /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	2005-06-09 14:39:00.831812710 -0400
@@ -776,6 +776,7 @@
  ***********************************************************************/
 static void init_data ()
 {
+  /* This function edited not to use obsolete function XmFontListCreate() */
     int k;
 
     km_charset = XmSTRING_DEFAULT_CHARSET;
@@ -792,8 +793,11 @@
        if (help_font_struct == NULL)
            printf ("%s Warning: Font loaded for HELP (%s) is NULL \n",
                    main_prompt, srec.Help_font);
-       else
-           help_font = XmFontListCreate (help_font_struct,km_charset);
+       else {
+	   XmFontListEntry entry = XmFontListEntryCreate(
+	       km_charset, XmFONT_IS_FONT, (XtPointer)help_font_struct );
+           help_font = XmFontListAppendEntry( NULL, entry );
+       }
    }
 
    /*
diff -urNad cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c
--- cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c	2000-10-03 10:11:22.000000000 -0400
+++ /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c	2005-06-09 14:39:00.803818666 -0400
@@ -215,18 +215,22 @@
  *****************************************************************************/
 static void MajButton(Widget w, Widget font,Widget pre,int postab)
 {
+   /* this function edited not to use obsolete function XmFontListCreate() */
    XmFontList police;
+   XmFontListEntry entry;
    XFontStruct *info_police;
    char strlabel[20];
    int prenum,policenum;
-
+   
    XtVaGetValues(pre,XmNuserData,&prenum,NULL);
    prenum--;
    XtVaGetValues(font,XmNuserData,&policenum,NULL);
    policenum--;
    if (( info_police=XLoadQueryFont(UxDisplay,StrFontTab[policenum]))== NULL)
       fprintf(stderr,"Unable to load font %s \n ",StrFontTab[policenum]);
-   police=XmFontListCreate(info_police,XmSTRING_DEFAULT_CHARSET);
+   entry = XmFontListEntryCreate(XmSTRING_DEFAULT_CHARSET,XmFONT_IS_FONT,
+				 (XtPointer)info_police);
+   police=XmFontListAppendEntry(NULL,entry);
    XtVaSetValues(w,XmNfontList,police,NULL);
    /* XFreeFont(UxDisplay,info_police);*/
 


--- NEW FILE 106-fix-paw++-menus-in-lesstif.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 106-fix-paw++-menus-in-lesstif.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix odd behavior of Paw++ menus when compiled against Lesstif.  The
## DP: problem is that Paw++ Motif code does some awfully weird things that
## DP: Lesstif doesn't support; cf. http://bugs.debian.org/270862 .

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c /tmp/dpep.KorIaA/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	2005-06-09 14:41:14.451377612 -0400
+++ /tmp/dpep.KorIaA/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	2005-06-09 14:41:22.929573007 -0400
@@ -1066,7 +1066,7 @@
 {
     int narg;
     Arg arglist[2];
-    Widget id_pdm;
+    Widget id_pdm, id_pdm_shell;
     Widget PdMenu[15];
 
     /*
@@ -1076,8 +1076,19 @@
     UxKuipBrowserContext = (_UxCkuipBrowser *)UxGetContext(parent);
 
     /*  create pulldown_menu */
-    id_pdm = XmCreatePulldownMenu (browserMenu,"OptionsPdMenu",arglist,0);
-
+    id_pdm_shell = XtVaCreatePopupShell ("OptionsPdMenu_shell",
+	xmMenuShellWidgetClass, browserMenu,
+	XmNwidth, 1,
+	XmNheight, 1,
+	XmNallowShellResize, TRUE,
+	XmNoverrideRedirect, TRUE,
+	NULL );
+    id_pdm = XtVaCreateWidget( "OptionsPdMenu",
+	xmRowColumnWidgetClass,
+	id_pdm_shell,
+	XmNrowColumnType, XmMENU_PULLDOWN,
+	NULL );
+/*  id_pdm = XmCreatePulldownMenu (browserMenu,"OptionsPdMenu",arglist,0); */
 
     /* create pulldown_menu_entry "Options" */
     XtVaCreateManagedWidget( "optionsMenu",
@@ -1091,7 +1102,7 @@
 /*  create list of push_buttons and separators for menu "Option"             */
 /*  create pulldown_menu for "Raise Window" (with list of appl. shells)       */
     narg = 0;
-#if XmREVISION == 99 /* problem with REVISION 2 ! */
+#if XmVERSION > 1 || XmREVISION >= 2
     XtSetArg(arglist[narg], XmNtearOffModel, XmTEAR_OFF_ENABLED); narg++;
 #endif
     kuipControlShellM = XmCreatePulldownMenu
@@ -1312,9 +1323,7 @@
 static void create_command_menu(parent)
    Widget parent;
 {
-    Widget id_pdme, id_pdm;
-    Arg    arglist[2];
-    int    narg;
+    Widget id_pdme, id_pdm, id_pdm_shell;
 
     /*
      *   find and restore the context for Browser
@@ -1323,12 +1332,26 @@
     UxKuipBrowserContext = (_UxCkuipBrowser *)UxGetContext(parent);
 
     /* create pulldown_menu_entry "Commands" for all commands */
-    narg = 0;
+
+    id_pdm_shell = XtVaCreatePopupShell ("CommandsPdMenu_shell",
+	xmMenuShellWidgetClass, browserMenu,
+	XmNwidth, 1,
+	XmNheight, 1,
+	XmNallowShellResize, TRUE,
+	XmNoverrideRedirect, TRUE,
+	NULL );
+    
+    id_pdm = XtVaCreateWidget( "CommandsPdMenu",
+	xmRowColumnWidgetClass,
+	id_pdm_shell,
+	XmNrowColumnType, XmMENU_PULLDOWN,
 #if XmVERSION > 1 || XmREVISION >= 2
-    XtSetArg(arglist[narg], XmNtearOffModel, XmTEAR_OFF_ENABLED); narg++;
+	XmNtearOffModel, XmTEAR_OFF_ENABLED,
 #endif
-    id_pdm = XmCreatePulldownMenu
-                     (browserMenu, "CommandsPdMenu", arglist, narg);
+	NULL );
+      
+/*      XmCreatePulldownMenu
+                     (browserMenu, "CommandsPdMenu", arglist, narg); */
 
     id_pdme = XtVaCreateManagedWidget( "id_pdme",
                         xmCascadeButtonGadgetClass, browserMenu,
@@ -1927,7 +1950,7 @@
    if (kuipControlShellM != NULL) XtDestroyWidget (kuipControlShellM);
 
    narg = 0;
-#if XmREVISION == 99 /* problem with REVISION 2 ! */
+#if XmVERSION > 1 || XmREVISION >= 2
    XtSetArg(arglist[narg], XmNtearOffModel, XmTEAR_OFF_ENABLED); narg++;
 #endif
    kuipControlShellM = XmCreatePulldownMenu


--- NEW FILE 107-define-strdup-macro-safely.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 107-define-strdup-macro-safely.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: In some cases strdup() and strndup() are macros, causing a build
## DP: failure.  Ensure any such macros are undefined before redeclaring them.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h /tmp/dpep.ieQnkg/cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h
--- cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h	1997-03-14 12:16:39.000000000 -0500
+++ /tmp/dpep.ieQnkg/cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h	2005-06-09 14:58:22.446739916 -0400
@@ -32,6 +32,9 @@
 
 extern char* strrstr( const char* str1, const char* str2 );
 
+#ifdef strdup
+# undef strdup /* otherwise the next function declaration may bomb */
+#endif
 #define strdup Strdup           /* prototype without const */
 extern char* strdup( const char* str );
 
@@ -46,6 +49,10 @@
                      const char* str4 );
 extern char* str5dup( const char* str1, const char* str2, const char* str3,
                      const char* str4, const char* str5 );
+
+#ifdef strndup
+# undef strndup /* otherwise the next function declaration may bomb */
+#endif
 extern char* strndup( const char* buf, size_t n );
 extern char* stridup( int i );
 


--- NEW FILE 108-quote-protect-comis-script.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 108-quote-protect-comis-script.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.tIRzzG/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
--- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2000-09-25 10:16:36.000000000 -0400
+++ /tmp/dpep.tIRzzG/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:41:16.757077306 -0400
@@ -70,7 +70,7 @@
       LEXEC=LENOCC(FEXEC)
       OPEN(LUNOUT,FILE=FEXEC(:LEXEC), STATUS='UNKNOWN',ERR=99)
       WRITE(LUNOUT,'(A)')         '#!/bin/sh'
-      WRITE(LUNOUT,'(A)')         'olddir=`pwd`'
+      WRITE(LUNOUT,'(A)')         'olddir="`pwd`"'
 *      WRITE(LUNOUT,'(A)')         'cd '//CHPATH(:LPATH)
       CHLINE=                     'cd '//CHPATH(:LPATH)
       L=LENOCC(CHLINE)
@@ -206,7 +206,7 @@
       CHLINE=                     '/bin/rm -f '//NAME(:LN)//'.o'
       L=LENOCC(CHLINE)
       WRITE(LUNOUT,'(A)')CHLINE(:L)
-      WRITE(LUNOUT,'(A)')         'cd $olddir'
+      WRITE(LUNOUT,'(A)')         'cd "$olddir"'
       WRITE(LUNOUT,'(A)')         'exit 0'
       CALL CSCLOS(LUNOUT)
       CLOSE(LUNOUT)


--- NEW FILE 110-ignore-included-lapack-rule.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 110-ignore-included-lapack-rule.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Comment out rule requiring liblapack in a subdirectory of mathlib code.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mathlib/Imakefile /tmp/dpep.Ib8j9x/cernlib-2005.05.09/src/mathlib/Imakefile
--- cernlib-2005.05.09/src/mathlib/Imakefile	1999-11-09 12:07:49.000000000 -0500
+++ /tmp/dpep.Ib8j9x/cernlib-2005.05.09/src/mathlib/Imakefile	2005-06-10 11:24:47.771309475 -0400
@@ -5,9 +5,12 @@
 
 LIBDIRS= gen bvsl
 
+/* Lapack is independent of Cernlib and should be installed as one of
+   the build dependencies.
 #ifndef WIN32
  LIBDIRS := $(LIBDIRS) lapack
 #endif
+*/
 
 SUBDIRS= $(LIBDIRS)
 


--- NEW FILE 111-fix-kuesvr-install-location.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 111-fix-kuesvr-install-location.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix install location of kuesvr binary.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile /tmp/dpep.ZmakmH/cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile	1996-03-11 10:43:22.000000000 -0500
+++ /tmp/dpep.ZmakmH/cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile	2005-06-10 12:03:32.706178628 -0400
@@ -1,4 +1,4 @@
 
 NormalProgramTarget(kuesvr,kuesvr.o,NullParameter,NullParameter,NullParameter)
 
-InstallProgram(kuesvr,$(CERN)/$(CERN_LEVEL)/bin)
+InstallProgram(kuesvr,$(CERN_BINDIR))


--- NEW FILE 112-remove-nonexistent-prototypes-from-gen.h.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 112-remove-nonexistent-prototypes-from-gen.h.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove prototypes from gen.h of functions that don't exist in mathlib.
## DP: Because of the way cfortran works, their existence otherwise causes
## DP: linking failures in third-party code.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/gen.h /tmp/dpep.3jFEkx/cernlib-2005.05.09/src/cfortran/gen.h
--- cernlib-2005.05.09/src/cfortran/gen.h	2005-06-27 10:02:17.225463958 -0400
+++ /tmp/dpep.3jFEkx/cernlib-2005.05.09/src/cfortran/gen.h	2005-06-27 10:05:41.503584328 -0400
@@ -84,10 +84,10 @@
 
 PROTOCCALLSFFUN1(FLOAT,ALGAMA,algama,FLOAT)
 #define ALGAMA(A2)  CCALLSFFUN1(ALGAMA,algama,FLOAT,A2)
-
+/*
 PROTOCCALLSFFUN1(FLOAT,QLGAMA,qlgama,FLOAT)
 #define QLGAMA(A2)  CCALLSFFUN1(QLGAMA,qlgama,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(DOUBLE,DLGAMA,dlgama,DOUBLE)
 #define DLGAMA(A2)  CCALLSFFUN1(DLGAMA,dlgama,DOUBLE,A2)
 
@@ -141,10 +141,10 @@
 
 PROTOCCALLSFFUN5(DOUBLE,DCAUCH,dcauch,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE)
 #define DCAUCH(A2,A3,A4,A5,A6)  CCALLSFFUN5(DCAUCH,dcauch,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,A2,A3,A4,A5,A6)
-
+/*
 PROTOCCALLSFFUN6(DOUBLE,CHEBQU,chebqu,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,INT,DOUBLE)
 #define CHEBQU(A2,A3,A4,A5,A6,A7)  CCALLSFFUN6(CHEBQU,chebqu,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,INT,DOUBLE,A2,A3,A4,A5,A6,A7)
-
+*/
 PROTOCCALLSFFUN2(FLOAT,CHISIN,chisin,FLOAT,INT)
 #define CHISIN(A2,A3)  CCALLSFFUN2(CHISIN,chisin,FLOAT,INT,A2,A3)
 
@@ -204,13 +204,13 @@
 
 PROTOCCALLSFFUN3(DOUBLE,DVDOT,dvdot,INT,DOUBLEV,DOUBLEV)
 #define DVDOT(A2,A3,A4)  CCALLSFFUN3(DVDOT,dvdot,INT,DOUBLEV,DOUBLEV,A2,A3,A4)
-
+/*
 PROTOCCALLSFFUN2(DOUBLE,E401BD,e401bd,DOUBLE,DOUBLE)
 #define E401BD(A2,A3)  CCALLSFFUN2(E401BD,e401bd,DOUBLE,DOUBLE,A2,A3)
 
 PROTOCCALLSFFUN2(FLOAT,ELIN1,elin1,FLOAT,FLOAT)
 #define ELIN1(A2,A3)  CCALLSFFUN2(ELIN1,elin1,FLOAT,FLOAT,A2,A3)
-
+*/
 PROTOCCALLSFFUN1(FLOAT,ERF,erf,FLOAT)
 #define ERF(A2)  CCALLSFFUN1(ERF,erf,FLOAT,A2)
 
@@ -237,13 +237,13 @@
 
 PROTOCCALLSFFUN2(FLOAT,FREARG,frearg,FLOAT,FLOAT)
 #define FREARG(A2,A3)  CCALLSFFUN2(FREARG,frearg,FLOAT,FLOAT,A2,A3)
-
+/*
 PROTOCCALLSFFUN3(FLOAT,FRED2,fred2,FLOAT,FLOAT,FLOAT)
 #define FRED2(A2,A3,A4)  CCALLSFFUN3(FRED2,fred2,FLOAT,FLOAT,FLOAT,A2,A3,A4)
 
 PROTOCCALLSFFUN1(FLOAT,FRED3,fred3,FLOAT)
 #define FRED3(A2)  CCALLSFFUN1(FRED3,fred3,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(FLOAT,FREQ,freq,FLOAT)
 #define FREQ(A2)  CCALLSFFUN1(FREQ,freq,FLOAT,A2)
 
@@ -255,10 +255,10 @@
 
 PROTOCCALLSFFUN1(DOUBLE,DFRSIN,dfrsin,DOUBLE)
 #define DFRSIN(A2)  CCALLSFFUN1(DFRSIN,dfrsin,DOUBLE,A2)
-
+/*
 PROTOCCALLSFFUN2(FLOAT,FUN,fun,INT,FLOATV)
 #define FUN(A2,A3)  CCALLSFFUN2(FUN,fun,INT,FLOATV,A2,A3)
-
+*/
 PROTOCCALLSFFUN1(FLOAT,G116F1,g116f1,FLOAT)
 #define G116F1(A2)  CCALLSFFUN1(G116F1,g116f1,FLOAT,A2)
 
@@ -270,10 +270,10 @@
 
 PROTOCCALLSFFUN1(FLOAT,GAMMA,gamma,FLOAT)
 #define GAMMA(A2)  CCALLSFFUN1(GAMMA,gamma,FLOAT,A2)
-
+/*
 PROTOCCALLSFFUN1(FLOAT,QGAMMA,qgamma,FLOAT)
 #define QGAMMA(A2)  CCALLSFFUN1(QGAMMA,qgamma,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(DOUBLE,DGAMMA,dgamma,DOUBLE)
 #define DGAMMA(A2)  CCALLSFFUN1(DGAMMA,dgamma,DOUBLE,A2)
 
@@ -297,16 +297,16 @@
 
 PROTOCCALLSFFUN4(FLOAT,GAUSS,gauss,ROUTINE,FLOAT,FLOAT,FLOAT)
 #define GAUSS(A2,A3,A4,A5)  CCALLSFFUN4(GAUSS,gauss,ROUTINE,FLOAT,FLOAT,FLOAT,A2,A3,A4,A5)
-
+/*
 PROTOCCALLSFFUN4(FLOAT,QGAUSS,qgauss,ROUTINE,FLOAT,FLOAT,FLOAT)
 #define QGAUSS(A2,A3,A4,A5)  CCALLSFFUN4(QGAUSS,qgauss,ROUTINE,FLOAT,FLOAT,FLOAT,A2,A3,A4,A5)
-
+*/
 PROTOCCALLSFFUN4(DOUBLE,DGAUSS,dgauss,ROUTINE,DOUBLE,DOUBLE,DOUBLE)
 #define DGAUSS(A2,A3,A4,A5)  CCALLSFFUN4(DGAUSS,dgauss,ROUTINE,DOUBLE,DOUBLE,DOUBLE,A2,A3,A4,A5)
-
+/*
 PROTOCCALLSFFUN6(DOUBLE,GPINDP,gpindp,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,DOUBLE,INT)
 #define GPINDP(A2,A3,A4,A5,A6,A7)  CCALLSFFUN6(GPINDP,gpindp,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,DOUBLE,INT,A2,A3,A4,A5,A6,A7)
-
+*/
 PROTOCCALLSFFUN2(INT,IGET,iget,INTV,INT)
 #define IGET(A2,A3)  CCALLSFFUN2(IGET,iget,INTV,INT,A2,A3)
 
@@ -315,16 +315,16 @@
 
 PROTOCCALLSFFUN3(INT,ILSUM,ilsum,INT,LOGICALV,INT)
 #define ILSUM(A2,A3,A4)  CCALLSFFUN3(ILSUM,ilsum,INT,LOGICALV,INT,A2,A3,A4)
-
+/*
 PROTOCCALLSFFUN10(FLOAT,QLINSQ,qlinsq,INT,INT,INT,FLOATV,PFLOAT,FLOATV,FLOATV,FLOATV,PDOUBLE,INT)
 #define QLINSQ(A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)  CCALLSFFUN10(QLINSQ,qlinsq,INT,INT,INT,FLOATV,PFLOAT,FLOATV,FLOATV,FLOATV,PDOUBLE,INT,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)
-
+*/
 PROTOCCALLSFFUN3(INT,LKKSPL,lkkspl,DOUBLE,DOUBLEV,INT)
 #define LKKSPL(A2,A3,A4)  CCALLSFFUN3(LKKSPL,lkkspl,DOUBLE,DOUBLEV,INT,A2,A3,A4)
-
+/*
 PROTOCCALLSFFUN4(INT,LOCHAR,lochar,INTV,INT,INTV,INT)
 #define LOCHAR(A2,A3,A4,A5)  CCALLSFFUN4(LOCHAR,lochar,INTV,INT,INTV,INT,A2,A3,A4,A5)
-
+*/
 PROTOCCALLSFFUN2(INT,MAXFZE,maxfze,FLOATV,INT)
 #define MAXFZE(A2,A3)  CCALLSFFUN2(MAXFZE,maxfze,FLOATV,INT,A2,A3)
 
@@ -339,10 +339,10 @@
 
 PROTOCCALLSFFUN2(INT,NDIGIT,ndigit,DOUBLE,DOUBLE)
 #define NDIGIT(A2,A3)  CCALLSFFUN2(NDIGIT,ndigit,DOUBLE,DOUBLE,A2,A3)
-
+/*
 PROTOCCALLSFFUN1(INT,NEAR1,near1,FLOAT)
 #define NEAR1(A2)  CCALLSFFUN1(NEAR1,near1,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(INT,NIC311,nic311,FLOAT)
 #define NIC311(A2)  CCALLSFFUN1(NIC311,nic311,FLOAT,A2)
 


--- NEW FILE 113-cups-postscript-fix.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 113-cups-postscript-fix.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Re-order PostScript output to work around CUPS printing issue.

@DPATCH@
diff -urNad cernlib-2005.05.09~/src/graflib/higz/ipost/ipdef.F cernlib-2005.05.09/src/graflib/higz/ipost/ipdef.F
--- cernlib-2005.05.09~/src/graflib/higz/ipost/ipdef.F	2003-03-20 09:14:10.000000000 +0000
+++ cernlib-2005.05.09/src/graflib/higz/ipost/ipdef.F	2005-09-20 18:59:21.992348547 +0000
@@ -316,6 +316,7 @@
       CALL IPPSTR('%%EndProlog@')
 *
       CALL IPPSTR('%%BeginSetup@')
+      CALL IPPSTR('%%EndSetup@')
       CALL IPPSTF(8,'newpath ')
       CALL IPSVRT(1)
       IF (MODE.EQ.1.OR.MODE.EQ.4) THEN
@@ -333,7 +334,6 @@
       ENDIF
       CALL IPPSTF(15,' .25 .25 scale ')
       IF (MODE.NE.3) CALL IPSVRT(1)
-      CALL IPPSTR('%%EndSetup@')
 *
       NBSAV0 = NBSAVE
       IF (MODE.NE.3) CALL IPPSTR('%%Page: number 1@')


--- NEW FILE 114-install-scripts-properly.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 114-install-scripts-properly.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Install scripts properly (i.e. don't try to strip them).

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/scripts/Imakefile cernlib-2005.05.09.dfsg/src/scripts/Imakefile
--- cernlib-2005.05.09.dfsg~/src/scripts/Imakefile	2004-07-29 10:17:08.000000000 -0400
+++ cernlib-2005.05.09.dfsg/src/scripts/Imakefile	2005-12-02 10:45:23.091782817 -0500
@@ -1,10 +1,10 @@
 
-InstallProgram(paw,$(CERN_BINDIR))
+InstallNamedProg(paw,paw,$(CERN_BINDIR))
 
 #if defined(CERNLIB_SHIFT)
 InstallNamedProg(cernlib_shift,cernlib,$(CERN_BINDIR))
 #else
-InstallProgram(cernlib,$(CERN_BINDIR))
+InstallNamedProg(cernlib,cernlib,$(CERN_BINDIR))
 #endif
 
-InstallProgram(gxint,$(CERN_BINDIR))
+InstallNamedProg(gxint,gxint,$(CERN_BINDIR))


--- NEW FILE 200-comis-allow-special-chars-in-path.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 200-comis-allow-special-chars-in-path.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F /tmp/dpep.gkT1Y2/cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F
--- cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F	1997-05-20 05:37:58.000000000 -0400
+++ /tmp/dpep.gkT1Y2/cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F	2005-06-08 19:34:43.101436210 -0400
@@ -29,6 +29,7 @@
 C.    *        CHFUNC may be the name of a COMIS function              *
 C.    *        or a file name. A file cannot contain one of            *
 C.    *        the following characters: +*=-()<>                      *
+C.    *        [n.b. patched to work around this. --Kevin McCarty]     *
 C.    *                                                                *
 C.    ******************************************************************
 #include "paw/pawcfu.inc"
@@ -60,7 +61,11 @@
       IF(NCH.LE.0)GO TO 99
       IFILE=0
       TFILE=' '
-      IF(INDEX(CHFUNC,']').EQ.0.AND.INDEX(CHFUNC,':').EQ.0)THEN
+* Added '/' as a character symbolizing a filename; otherwise Unix paths
+* containing +, *, =, -, etc. return a bogus "Unknown routine" error
+* (Fix by Kevin McCarty)
+      IF(INDEX(CHFUNC,']').EQ.0.AND.INDEX(CHFUNC,':').EQ.0.AND.
+     +   INDEX(CHFUNC,'/').EQ.0)THEN
          IF(INDEX(CHFUNC,'+').NE.0.OR.
      +      INDEX(CHFUNC,'*').NE.0.OR.
      +      INDEX(CHFUNC,'=').NE.0.OR.


--- NEW FILE 201-update-kuip-helper-apps.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 201-update-kuip-helper-apps.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Instead of "ghostview" and "lp", call the more modern helper apps
## DP: "gv" and "lpr" from KUIP.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2003-02-13 09:25:23.000000000 -0500
+++ /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2005-06-09 12:34:49.057760462 -0400
@@ -249,7 +249,7 @@
     host_psviewer = getenv( "PSVIEWER" );
   if( host_psviewer == NULL ) {
 #ifdef UNIX
-    host_psviewer = "ghostview";
+    host_psviewer = "gv";
 #endif
 #ifdef vms
     host_psviewer = "VIEW/FORM=PS/INTERFACE=DECWINDOWS";
@@ -277,7 +277,7 @@
 # if defined(MSDOS) || defined(CERNLIB_WINNT)
   ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'print $*'" );
 # else
-  ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'lp $*'" );
+  ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'lpr $*'" );
 # endif
 #else
   ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'XPRINT $*'" );
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	1997-09-25 10:02:25.000000000 -0400
+++ /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	2005-06-09 12:35:59.499480148 -0400
@@ -925,7 +925,7 @@
 The startup value can be defined by the environment variables
 'KUIPPSVIEWER' or 'PSVIEWER'.
 .
-On Unix workstations it is by default set to 'ghostview'.
+On Unix workstations it is by default set to 'gv'.
 On VAX/VMS the default commands is 'VIEW/FORM=PS/INTERFACE=DECWINDOWS'.
 
 >Action kxhostpsviewer%C


--- NEW FILE 202-fix-includes-in-minuit-example.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 202-fix-includes-in-minuit-example.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: minuit-main example should have <> instead of "" around include files.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c /tmp/dpep.SuauEf/cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c
--- cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c	2001-04-18 04:56:22.000000000 -0400
+++ /tmp/dpep.SuauEf/cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c	2005-06-09 13:22:59.567224997 -0400
@@ -15,8 +15,8 @@
 #define FCN fcn
 #endif
 
-#include "cfortran.h"
-#include "minuit.h"
+#include 
+#include 
 #define Ncont 20
 int main()
 {


--- NEW FILE 203-compile-geant-with-ertrak.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 203-compile-geant-with-ertrak.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Ertrak code added to library in Debian since I saw no reason to exclude.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-11-23 15:41:44.798536817 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-11-23 15:43:39.618959247 +0000
@@ -5,11 +5,12 @@
 AllTarget(geant321)
 
 /* Fluka removed from Debian source package for copyright reasons. */
+/* Ertrak added to Debian since I saw no reason to leave it out. */
 LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
          geocad ggeom gheisha ghits ghrout ghutils giface \ @@\
 	 giopa gkine gphys gscan gstrag gtrak guser gxint \ @@\
-	 miface miguti neutron
-
+	 miface miguti neutron        \ @@\
+	 erdecks erpremc matx55
 
 SUBDIRS= $(LIBDIRS) data examples gxuser geant321
 


--- NEW FILE 204-compile-isajet-with-isasrt.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 204-compile-isajet-with-isasrt.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Include isasrt in the Isajet library, by request (cf.
## DP: http://bugs.debian.org/260469 )

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile /tmp/dpep.PM12lm/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2001-10-08 09:06:49.000000000 -0400
+++ /tmp/dpep.PM12lm/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2005-06-09 14:25:29.621215677 -0400
@@ -9,7 +9,7 @@
 	 fortop.F frgjet.F frgmnt.F gamma.F getpt.F gettot.F heavyx.F \ @@\
 	 hevolv.F higgs.F idanti.F idgen.F iframs.F inisap.F ipartns.F \ @@\
 	 ipjset.F iprtns.F irmov0.F isabeg.F isaend.F isaevt.F isaini.F \ @@\
-	 isajet.F ispjet.F istrad.F iswdky.F jetgen.F \ @@\
+	 isajet.F isasrt.F ispjet.F istrad.F iswdky.F jetgen.F \ @@\
 	 label.F lboost.F logerr.F \ @@\
 	 logic.F logp.F logphi.F logphw.F logpt.F logqm.F logqt.F logthw.F \ @@\
 	 logx.F logxw.F logyth.F logyw.F lstsq.F mbias.F mbset.F nogood.F \ @@\


--- NEW FILE 205-max-path-length-to-256.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 205-max-path-length-to-256.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Set max path length to 256 in Hbook.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc /tmp/dpep.ceXWNa/cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc
--- cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc	2003-02-07 07:13:37.000000000 -0500
+++ /tmp/dpep.ceXWNa/cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc	2005-06-09 15:20:49.541661646 -0400
@@ -20,7 +20,7 @@
 *
 *CMZ :  4.20/03 28/07/93  09.33.32  by  Rene Brun
 *-- Author :
-      PARAMETER (NLPATM=100, MXFILES=50, LENHFN=128)
+      PARAMETER (NLPATM=100, MXFILES=50, LENHFN=256)
       COMMON /HCDIRN/NLCDIR,NLNDIR,NLPAT,ICDIR,NCHTOP,ICHTOP(MXFILES)
      +              ,ICHTYP(MXFILES),ICHLUN(MXFILES)
       CHARACTER*16   CHNDIR,    CHCDIR,    CHPAT    ,CHTOP


--- NEW FILE 206-herwig-uses-DBLE-not-REAL.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 206-herwig-uses-DBLE-not-REAL.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Have libherwig use double precision consistently

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F
--- cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F	1996-12-03 09:16:56.000000000 -0500
+++ /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F	2005-06-09 15:22:00.263743792 -0400
@@ -72,7 +72,7 @@
       TAMP(6)=HWHIG5(T,S,U,EMH2,EMQ2,2,0,5,0,0,0)
       TAMP(7)=HWHIG5(U,T,S,EMH2,EMQ2,3,0,6,0,0,0)
       DO 20 I=1,7
-      TAMPI(I)= REAL(TAMP(I))
+      TAMPI(I)= DBLE(TAMP(I))
   20  TAMPR(I)=-IMAG(TAMP(I))
 C Square and add prefactors
       WTGG=0.03125*FLOAT(NCOLO*(NCOLO**2-1))
diff -urNad cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F
--- cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F	1996-12-03 09:17:04.000000000 -0500
+++ /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F	2005-06-09 15:22:00.263743792 -0400
@@ -18,7 +18,7 @@
      &  1.644934066848226D0/
       PROD(Y,Y2)=Y*(ONE+A1*Y*(ONE+A2*Y*(ONE+A3*Y2*(ONE+A4*Y2*(ONE+A5*Y2*
      & (ONE+A6*Y2*(ONE+A7*Y2*(ONE+A8*Y2*(ONE+A9*Y2*(ONE+A10*Y2))))))))))
-      XR=REAL(X)
+      XR=DBLE(X)
       XI=IMAG(X)
       R2=XR*XR+XI*XI
       IF (R2.GT.ONE.AND.(XR/R2).GT.HALF) THEN


--- NEW FILE 207-compile-temp-libs-with-fPIC.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 207-compile-temp-libs-with-fPIC.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Compile temporary COMIS libraries with -fPIC for non-x86 arches.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.srSRmd/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
--- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2000-09-25 10:16:36.000000000 -0400
+++ /tmp/dpep.srSRmd/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:47:44.859676286 -0400
@@ -81,12 +81,12 @@
       WRITE(LUNOUT,'(A)')CHLINE(:L)
       IF(FEXT.EQ.'.c')THEN
         L=LENOCC(CHCC)
-*                                 'cc -c .... name.c'
-        CHLINE=CHCC(:L)//' '//NAME(:LN)// '.c'
+*                                 'cc -c .... -fPIC name.c'
+        CHLINE=CHCC(:L)//' -fPIC '//NAME(:LN)// '.c'
       ELSE
         L=LENOCC(CHF77)
-*                                 'f77 -c .... name.f'
-        CHLINE=CHF77(:L)//' '//NAME(:LN)// '.f'
+*                                 'f77 -c .... -fPIC name.f'
+        CHLINE=CHF77(:L)//' -fPIC '//NAME(:LN)// '.f'
       ENDIF
       L=LENOCC(CHLINE)
       WRITE(LUNOUT,'(A)')CHLINE(:L)
@@ -176,7 +176,7 @@
       ENDIF
 #endif
 #if defined(CERNLIB_LINUX)
-      CHLINE=                   'ld -shared -o '
+      CHLINE=                   'g77 -shared -o '
      +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
 #endif
 #if defined(CERNLIB_ALPHA_OSF)


--- NEW FILE 208-fix-redundant-packlib-dependencies.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 208-fix-redundant-packlib-dependencies.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove some redundancy in the libraries listed to be linked against.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile
--- cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile	1996-05-09 10:32:43.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile	2005-06-10 11:54:49.270360036 -0400
@@ -20,7 +20,7 @@
 NeedTcpipLib
 #endif
 
-CernlibFortranProgramTarget(dzeX11,dzedit.o,$(PACKAGE_LIB),$(PACKAGE_LIB),graflib/X11 packlib)
+CernlibFortranProgramTarget(dzeX11,dzedit.o,libdzdoc.a,libdzdoc.a,graflib/X11 packlib)
 
 InstallProgram(dzeX11,$(CERN_BINDIR))
 InstallScript(dzedit,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile
--- cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile	1996-04-16 04:09:49.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile	2005-06-10 11:55:33.872780414 -0400
@@ -14,6 +14,6 @@
 
 NeedTcpipLib
 
-CernlibFortranProgramTarget(zftp,zftp.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(zftp,zftp.o,libzftplib.a,libzftplib.a,packlib)
 
 InstallProgram(zftp,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile
--- cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile	1996-05-05 05:40:20.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile	2005-06-10 11:56:23.109221943 -0400
@@ -31,10 +31,10 @@
 
 DefinePackageLibrary(zservlib)
 
-CernlibFortranProgramTarget(zserv,zs.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(zserv,zs.o,libzservlib.a,libzservlib.a,packlib)
 
 InstallProgram(zserv,$(CERN_BINDIR))
 
-CernlibFortranProgramTarget(pawserv,zs.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(pawserv,zs.o,libzservlib.a,libzservlib.a,packlib)
 
 InstallProgram(pawserv,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile
--- cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile	1996-11-05 04:32:29.000000000 -0500
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile	2005-06-10 11:56:54.779438847 -0400
@@ -28,6 +28,6 @@
 NeedSysexe
 #endif
 
-CernlibFortranProgramTarget(fatmen,fatmen.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(fatmen,fatmen.o,libfmkuip.a,libfmkuip.a,packlib)
 
 InstallProgram(fatmen,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile
--- cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile	1996-04-02 05:03:43.000000000 -0500
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile	2005-06-10 11:57:39.794807919 -0400
@@ -17,6 +17,6 @@
 SpecialFortranObjectRule(hepdb,hepdb,'-WF,-P',NullParameter)
 #endif
 
-CernlibFortranProgramTarget(hepdb,hepdb.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(hepdb,hepdb.o,libdbmodule.a,libdbmodule.a,packlib)
 
 InstallProgram(hepdb,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	1996-04-18 12:33:08.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-10 12:00:35.355791756 -0400
@@ -21,6 +21,6 @@
 #endif
 
 
-CernlibCcProgramTarget(kxterm,kxterm.o,$(PACKAGE_LIB),$(PACKAGE_LIB),$(CLIBS))
+CernlibCcProgramTarget(kxterm,kxterm.o,libkxtlib.a,libkxtlib.a,$(CLIBS))
 
 InstallProgram(kxterm,$(CERN_BINDIR))


--- NEW FILE 209-ignore-unneeded-headers-in-kmutil.c.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 209-ignore-unneeded-headers-in-kmutil.c.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Comment out header files not actually needed in kmutil.c.
## DP: (This will be helpful when we move this file elsewhere to be part of
## DP: the Lesstif-dependent library split out from packlib.)

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c /tmp/dpep.BncUU7/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c	1996-03-08 10:33:09.000000000 -0500
+++ /tmp/dpep.BncUU7/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c	2005-06-10 12:06:07.198547576 -0400
@@ -20,12 +20,13 @@
 /******************************************************************************/
 
 #include "kuip/kuip.h"
+/* commented out, since this file doesn't need these includes. --Kevin McCarty
 #include "kuip/kfor.h"
 #include "kuip/kmenu.h"
 
 #include "mkutda.h"
 #include "kuip/mkutfu.h"
-
+*/
 
 /***********************************************************************
  *                                                                     *


--- NEW FILE 210-improve-cfortran-header-files.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 210-improve-cfortran-header-files.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Protect against multiple inclusion and add explicit dependency on
## DP: cfortran.h to the Cernlib C headers.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/comis.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/comis.h
--- cernlib-2005.05.09/src/cfortran/comis.h	1999-10-29 07:41:26.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/comis.h	2005-06-10 12:51:30.985999665 -0400
@@ -1,3 +1,11 @@
+#ifndef _COMIS_H
+#define _COMIS_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN1(INT,CSADDR,csaddr,STRING)
 #define	CSADDR(CHFILE) CCALLSFFUN1(CSADDR,csaddr,STRING,CHFILE)
 
@@ -30,3 +38,9 @@
 
 PROTOCCALLSFSUB2(CSTYPE,cstype,INT,PSTRING)
 #define CSTYPE(CADR,CHTYPE) CCALLSFSUB2(CSTYPE,cstype,INT,PSTRING,CADR,CHTYPE)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _COMIS_H */
diff -urNad cernlib-2005.05.09/src/cfortran/cspack.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/cspack.h
--- cernlib-2005.05.09/src/cfortran/cspack.h	1999-10-29 07:42:56.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/cspack.h	2005-06-10 12:51:31.013993690 -0400
@@ -1,5 +1,19 @@
+#ifndef _CSPACK_H
+#define _CSPACK_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB2(CZPUTA,czputa,STRING,PINT)
 #define CZPUTA(CHMAIL,ISTAT) CCALLSFSUB2(CZPUTA,czputa,STRING,PINT,CHMAIL,ISTAT)
 
 PROTOCCALLSFSUB2(CZGETA,czgeta,PSTRING,PINT)
 #define CZGETA(CHMAIL,ISTAT) CCALLSFSUB2(CZGETA,czgeta,PSTRING,PINT,CHMAIL,ISTAT)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _CSPACK_H */
diff -urNad cernlib-2005.05.09/src/cfortran/geant315.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant315.h
--- cernlib-2005.05.09/src/cfortran/geant315.h	1996-05-15 05:24:06.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant315.h	2005-06-10 12:51:31.080979393 -0400
@@ -1,3 +1,11 @@
+#ifndef _GEANT315_H
+#define _GEANT315_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*------------------------------------------------------------------
 fortran filename   : /cern/new/src/cfs/geant315/abbrch.f
 ------------------------------------------------------------------*/
@@ -4797,3 +4805,9 @@
 
 #define ZEREGS() CCALLSFSUB0(ZEREGS,zeregs)
 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GEANT315_H */
diff -urNad cernlib-2005.05.09/src/cfortran/geant321.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant321.h
--- cernlib-2005.05.09/src/cfortran/geant321.h	1996-05-15 05:24:07.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant321.h	2005-06-10 12:51:31.148964883 -0400
@@ -1,3 +1,11 @@
+#ifndef _GEANT321_H
+#define _GEANT321_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*------------------------------------------------------------------
 fortran filename   : abbrch.f
 ------------------------------------------------------------------*/
@@ -6099,3 +6107,9 @@
  PROTOCCALLSFFUN3(DOUBLE,XSEPRO,xsepro,DOUBLE,DOUBLE,DOUBLE)
 #define XSEPRO(A2,A3,A4)  CCALLSFFUN3(XSEPRO,xsepro,DOUBLE,DOUBLE,DOUBLE,A2,A3,A4)
 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GEANT321_H */
diff -urNad cernlib-2005.05.09/src/cfortran/gen.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/gen.h
--- cernlib-2005.05.09/src/cfortran/gen.h	2005-06-10 12:51:00.965407158 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/gen.h	2005-06-10 12:51:31.190955921 -0400
@@ -1,3 +1,11 @@
+#ifndef _GEN_H
+#define _GEN_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Subroutines/Functions with COMPLEX not supported ***
 
 #define CBSJA(A1,A2,A3,A4,A5)  CCALLSFSUB5(CBSJA,cbsja,COMPLEX,FLOAT,INT,INT,PCOMPLEX,A1,A2,A3,A4,A5)
@@ -1489,3 +1497,9 @@
 
 PROTOCCALLSFSUB6(ZEROX,zerox,FLOAT,FLOAT,FLOAT,INT,FLOAT,INT)
 #define ZEROX(A1,A2,A3,A4,A5,A6)  CCALLSFSUB6(ZEROX,zerox,FLOAT,FLOAT,FLOAT,INT,FLOAT,INT,A1,A2,A3,A4,A5,A6)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GEN_H */
diff -urNad cernlib-2005.05.09/src/cfortran/graflib.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/graflib.h
--- cernlib-2005.05.09/src/cfortran/graflib.h	1998-01-29 05:49:27.000000000 -0500
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/graflib.h	2005-06-10 12:51:31.220949519 -0400
@@ -1,2 +1,16 @@
-#include "higz.h"
-#include "hplot.h"
+#ifndef _GRAFLIB_H
+#define _GRAFLIB_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include 
+#include 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GRAFLIB_H */
diff -urNad cernlib-2005.05.09/src/cfortran/jetset74.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/jetset74.h
--- cernlib-2005.05.09/src/cfortran/jetset74.h	1999-10-29 12:55:45.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/jetset74.h	2005-06-10 12:51:31.250943117 -0400
@@ -1,3 +1,11 @@
+#ifndef _JETSET74_H
+#define _JETSET74_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN2(INT,KLU,klu,INT,INT)
 #define KLU(A2,A3)  CCALLSFFUN2(KLU,klu,INT,INT,A2,A3)
 
@@ -327,3 +335,9 @@
 
 PROTOCCALLSFSUB11(STRUCTM,structm,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE)
 #define STRUCTM(A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)  CCALLSFSUB11(STRUCTM,structm,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _JETSET74_H */
diff -urNad cernlib-2005.05.09/src/cfortran/kernlib.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kernlib.h
--- cernlib-2005.05.09/src/cfortran/kernlib.h	2000-03-16 11:58:18.000000000 -0500
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kernlib.h	2005-06-10 12:51:31.291934368 -0400
@@ -1,3 +1,11 @@
+#ifndef _KERNLIB_H
+#define _KERNLIB_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN1(FLOAT,ALOGAM,alogam,FLOAT)
 #define ALOGAM(A2)  CCALLSFFUN1(ALOGAM,alogam,FLOAT,A2)
 
@@ -1512,3 +1520,9 @@
 
 PROTOCCALLSFSUB1(WORDSEP,wordsep,STRING)
 #define WORDSEP(A1)  CCALLSFSUB1(WORDSEP,wordsep,STRING,A1)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _KERNLIB_H */
diff -urNad cernlib-2005.05.09/src/cfortran/kuip.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kuip.h
--- cernlib-2005.05.09/src/cfortran/kuip.h	2000-10-05 10:27:54.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kuip.h	2005-06-10 12:51:31.319928394 -0400
@@ -1,3 +1,11 @@
+#ifndef _KUIP_H
+#define _KUIP_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB3(KUCLOS,kuclos,INT,STRING,INT)
 #define KUCLOS(A1,A2,A3)    CCALLSFSUB3(KUCLOS,kuclos,INT,STRING,INT,A1,A2,A3)
 
@@ -6,3 +14,9 @@
 
 PROTOCCALLSFSUB0(KUWHAG,kuwhag)
 #define KUWHAG() CCALLSFSUB0(KUWHAG,kuwhag)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _KUIP_H */
diff -urNad cernlib-2005.05.09/src/cfortran/lapack.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lapack.h
--- cernlib-2005.05.09/src/cfortran/lapack.h	2000-06-23 06:13:58.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lapack.h	2005-06-10 12:51:31.348922205 -0400
@@ -1,2 +1,16 @@
+#ifndef _LAPACK_H
+#define _LAPACK_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB11(DGELS,dgels,STRING,INT,INT,INT,DOUBLEV,INT,DOUBLEV,INT,DOUBLEV,INT,PINT)
 #define DGELS(TRANS,M,N,NRHS,A,LDA,B,LDB,WORK,LWORK,INFO) CCALLSFSUB11(DGELS,dgels,STRING,INT,INT,INT,DOUBLEV,INT,DOUBLEV,INT,DOUBLEV,INT,PINT,TRANS,M,N,NRHS,A,LDA,B,LDB,WORK,LWORK,INFO)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _LAPACK_H */
diff -urNad cernlib-2005.05.09/src/cfortran/lepto62.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lepto62.h
--- cernlib-2005.05.09/src/cfortran/lepto62.h	1999-10-29 12:55:45.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lepto62.h	2005-06-10 12:51:31.378915804 -0400
@@ -1,3 +1,11 @@
+#ifndef _LEPTO62_H
+#define _LEPTO62_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN2(FLOAT,DCROSS,dcross,FLOAT,FLOAT)
 #define DCROSS(A2,A3)  CCALLSFFUN2(DCROSS,dcross,FLOAT,FLOAT,A2,A3)
 
@@ -174,3 +182,9 @@
 
 PROTOCCALLSFSUB0(RIWIBD,riwibd)
 #define RIWIBD() CCALLSFSUB0(RIWIBD,riwibd)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _LEPTO62_H */
diff -urNad cernlib-2005.05.09/src/cfortran/minuit.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/minuit.h
--- cernlib-2005.05.09/src/cfortran/minuit.h	1999-10-27 11:30:23.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/minuit.h	2005-06-10 12:51:31.407909615 -0400
@@ -1,3 +1,11 @@
+#ifndef _MINUIT_H
+#define _MINUIT_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  *  Interface to minuit using cfortran.h
  *
@@ -190,3 +198,9 @@
 
 PROTOCCALLSFSUB0(STAND,stand)
 #define STAND() CCALLSFSUB0(STAND,stand)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _MINUIT_H */
diff -urNad cernlib-2005.05.09/src/cfortran/packlib.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/packlib.h
--- cernlib-2005.05.09/src/cfortran/packlib.h	1998-01-29 11:17:45.000000000 -0500
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/packlib.h	2005-06-10 12:51:31.436903427 -0400
@@ -1,4 +1,18 @@
-#include "hbook.h"
-#include "minuit.h"
-#include "kuip.h"
-#include "zebra.h"
+#ifndef _PACKLIB_H
+#define _PACKLIB_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include 
+#include 
+#include 
+#include 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _PACKLIB_H */
diff -urNad cernlib-2005.05.09/src/cfortran/paw.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/paw.h
--- cernlib-2005.05.09/src/cfortran/paw.h	2000-10-05 10:27:55.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/paw.h	2005-06-10 12:51:31.464897452 -0400
@@ -1,6 +1,20 @@
+#ifndef _PAW_H
+#define _PAW_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB2(PAW,paw,INT,INT)
 #define PAW(A1,A2)  CCALLSFSUB2(PAW,paw,INT,INT,A1,A2)
 
 PROTOCCALLSFSUB0(PAEXIT,paexit)
 #define PAEXIT() CCALLSFSUB0(PAEXIT,paexit)
 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _PAW_H */
diff -urNad cernlib-2005.05.09/src/cfortran/zebra.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/zebra.h
--- cernlib-2005.05.09/src/cfortran/zebra.h	1999-10-29 07:35:47.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/zebra.h	2005-06-10 12:51:31.496890624 -0400
@@ -1,5 +1,19 @@
+#ifndef _ZEBRA_H
+#define _ZEBRA_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB1(MZEBRA,mzebra,INT)
 #define MZEBRA(A1)    CCALLSFSUB1(MZEBRA,mzebra,INT,A1)
 
 PROTOCCALLSFSUB2(MZPAW,mzpaw,INT,STRING)
 #define MZPAW(A1,A2)  CCALLSFSUB2(MZPAW,mzpaw,INT,STRING,A1,A2)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _ZEBRA_H */


--- NEW FILE 211-fix-comis-on-64-bit-arches.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-64-bit-arches.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09~/src/geant321/gphys/gphot.F cernlib-2005.05.09/src/geant321/gphys/gphot.F
--- cernlib-2005.05.09~/src/geant321/gphys/gphot.F	1995-10-24 10:21:29.000000000 +0000
+++ cernlib-2005.05.09/src/geant321/gphys/gphot.F	2005-09-20 19:27:10.734527890 +0000
@@ -240,7 +240,7 @@
                   ELSE
 C Radiative shell decay
                      JS = JFN+1+2*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 40 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
@@ -296,7 +296,7 @@
                   ELSE
 c Nonradiative decay
                      JS = JFN+1+3*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 60 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
diff -urNad cernlib-2005.05.09~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.05.09/src/packlib/kernlib/kerngen/ccgen/locb.c
--- cernlib-2005.05.09~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/kernlib/kerngen/ccgen/locb.c	2005-09-20 19:27:10.734527890 +0000
@@ -44,7 +44,25 @@
    DummyDef
 #endif
 {
+#if defined(CERNLIB_QMLXIA64)
+   const unsigned long long int mask=0x00000000ffffffff;
+   static unsigned long long int base=1;
+   unsigned long long int jadr=(unsigned long long int) iadr;
+   unsigned long long int jadrl = (mask & jadr);
+
+   if (base == 1) {
+     base = (~mask & jadr);
+   } else if(base != (~mask & jadr)) {
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+     printf("locb_() Warning: changing base from %lx to %lx!!!\n",
+     	   base, (~mask & jadr));
+     printf("This may result in program crash or incorrect results\n");
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+   }
+   return ((int) jadrl);
+#else
    return( (int) iadr );
+#endif
 }
 /*> END <----------------------------------------------------------*/
 #ifdef CERNLIB_TCGEN_LOCB
diff -urNad cernlib-2005.05.09~/src/packlib/zbook/code/zjump.c cernlib-2005.05.09/src/packlib/zbook/code/zjump.c
--- cernlib-2005.05.09~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/zbook/code/zjump.c	2005-09-20 19:27:10.734527890 +0000
@@ -7,6 +7,9 @@
  *
  */
 #include "zbook/pilot_c.h"
+#if defined(CERNLIB_QMLXIA64)
+static void (*target)();
+#endif
 #if defined(CERNLIB_UNIX)
 #if defined(CERNLIB_QX_SC)
 zjump_(name,p1,p2,p3,p4)
@@ -18,8 +21,23 @@
 ZJUMP(name,p1,p2,p3,p4)
 #endif
 char *p1, *p2, *p3, *p4;
+
+/*  LP64 compatibility:
+    name is taken from a Fortran array and therefore its address is 32 bit
+    which has to be converted to a 64 bit address to satisfy void (*) (H. Vogt) */
+
+#if defined(CERNLIB_QMLXIA64)
+int *name;
+{
+  long jadr;
+  jadr   = *name;  /* convert int to long */
+  target = (void (*)())jadr;
+  (*target)(p1, p2, p3, p4);
+}
+#else
 void (**name)();
 {
    (**name)(p1, p2, p3, p4);
 }
 #endif
+#endif
diff -urNad cernlib-2005.05.09~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.05.09/src/packlib/zebra/test/brztest/btest2.F
--- cernlib-2005.05.09~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/zebra/test/brztest/btest2.F	2005-09-20 19:27:10.734527890 +0000
@@ -29,6 +29,15 @@
 ********************************************************************************
 *
       COMMON/CRZT/IXSTOR,IXDIV,IFENCE(2),LEV,LEVIN,BLVECT(30000)
+
+*     LP64 compatibility:
+*     For 64-bit pointer systems put local variables referenced by LOCF
+*     in a dummy named common block to keep addresses in the program region.
+*     see also: packlib/ffread/test/main.F (H. Vogt)
+
+#if defined(CERNLIB_QMLXIA64)
+      COMMON /TEST64/LBANK
+#endif
       DIMENSION LQ(999),IQ(999),Q(999)
       EQUIVALENCE (IQ(1),Q(1),LQ(9)),(LQ(1),LEV)
 C
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09~/src/pawlib/comis/code/Imakefile	2005-09-20 19:26:47.894420356 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-09-20 19:27:10.734527890 +0000
@@ -50,6 +50,10 @@
 SRCS_F := $(SRCS_F) cscrexec.F
 #endif
 
+#if defined(CERNLIB_QMLXIA64)
+SRCS_F := $(SRCS_F) csrtgpl.F csitgpl.F
+#endif
+
 #if defined(CERNLIB_OLD)
 SRCS_F := $(SRCS_F) cspdir.F csrmbk.F
 #endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csaddr.F	1996-02-26 17:16:25.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-09-20 19:27:10.735527676 +0000
@@ -17,8 +17,14 @@
       INTEGER CSLTGP,CSITGP
       CHARACTER*32 NAME
 #include "comis/cstab.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       INTEGER CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      INTEGER*8 CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)
       NAME=CHNAME
       NC=LENOCC(NAME)
       CALL CSCHID(NAME(:NC))
@@ -26,21 +32,39 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
+#endif
+#endif
+#if defined(CERNLIB_SHL)
           ELSE
             I=0
           ENDIF
         ENDIF
       ELSE
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+        IF(IADGPL.NE.0)THEN
+          IFCS=-2
+          ITYPGP=-2
+          I=CSITGPL(IPVS)
+        ENDIF
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
           I=CSITGP(IPVS)
         ENDIF
+#endif
       END IF
       CSADDR=I
 #endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csinit.F cernlib-2005.05.09/src/pawlib/comis/code/csinit.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csinit.F	2005-04-18 15:41:04.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csinit.F	2005-09-20 19:27:10.735527676 +0000
@@ -64,6 +64,9 @@
 #if defined(CERNLIB_SHL)
 #include "comis/cshlnm.inc"
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+#endif
 #if defined(CERNLIB_PAW)
 #include "paw/pcmode.inc"
 #include "comis/cshfill.inc"
@@ -159,6 +162,9 @@
       ICHMINU=ICHAR('-')
       ICHPLUS=ICHAR('+')
       ICHCOMM=ICHAR(',')
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+      IPIADGV=0
+#endif
 #if defined(CERNLIB_PAW)
       CALL CSPAWI
       MODHFI=0
@@ -209,11 +215,16 @@
       CHF77 ='f77 -c -pic'
       CHCC  ='cc -c -pic'
 #endif
-#if (defined(CERNLIB_LINUX))
+#if (defined(CERNLIB_LINUX))&&(!defined(CERNLIB_QMLXIA64))
       ITMPLEN=CSTMPD(CHPATH, 256)
       CHF77 ='g77 -c'
       CHCC  ='cc -c'
 #endif
+#if (defined(CERNLIB_LINUX))&&(defined(CERNLIB_QMLXIA64))
+      ITMPLEN=CSTMPD(CHPATH, 256)
+      CHF77 ='g77 -c -fPIC -fno-f2c'
+      CHCC  ='cc -c -fPIC -fno-f2c'
+#endif
 #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
       ITMPLEN=CSTMPD(CHPATH, 256)
       CHF77 ='f77 -c'
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csintx.F cernlib-2005.05.09/src/pawlib/comis/code/csintx.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csintx.F	1996-12-05 09:50:37.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csintx.F	2005-09-20 19:27:10.762521893 +0000
@@ -38,6 +38,9 @@
 #if defined(CERNLIB_PAW)
 #include "comis/cskucs.inc"
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_ALPHA_OSF))
       INTEGER CSTRCMP
 #endif
@@ -1105,6 +1108,32 @@
       ENDIF
 #endif
 #if (!defined(CERNLIB_VAX))&&(!defined(CERNLIB_APOLLO))
+#if defined(CERNLIB_QMLXIA64)
+      IF(IQ(IP+KSIFCS).EQ.-2)THEN
+*Dynamic linker may give long addresses
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ENDIF
+#else
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NPAR,IDA(IOFSPL))
       ELSEIF(ITP.EQ.2)THEN
@@ -1115,6 +1144,7 @@
         DCSRES=CSCALD(IADGP,NPAR,IDA(IOFSPL))
       ENDIF
 #endif
+#endif
       IPC=IPC+4
       GO TO 999
 *NUM I
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csitgpl.F cernlib-2005.05.09/src/pawlib/comis/code/csitgpl.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csitgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csitgpl.F	2005-09-20 19:27:10.763521679 +0000
@@ -0,0 +1,32 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZU:  1.16/16 04/10/93  12.14.52  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+      INTEGER FUNCTION CSITGPL(IP)
+***------------------------------
+*   it is last routine from the tables-set.
+***-----------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cspnts.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab64.inc"
+      I=MHLOC(KSIDP+NWIDEN)
+      IQ(I)=0
+      IQ(I+1)=NCIDEN
+      DO 1 K=1,NWIDEN
+        IQ(I+KSIDP-1+K)=IDEN(K)
+   1  CONTINUE
+      CALL CSRTGPL(I)
+      IF(IP.EQ.0)THEN
+        IPGP=I
+      ELSE
+        IQ(IP)=I
+      ENDIF
+      CSITGP=I
+      END
+#endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/cskcal.F cernlib-2005.05.09/src/pawlib/comis/code/cskcal.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/cskcal.F	1996-12-05 09:50:39.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/cskcal.F	2005-09-20 19:27:10.763521679 +0000
@@ -31,6 +31,9 @@
 #include "comis/cstab.inc"
 #include "comis/csfres.inc"
 #include "comis/cssysd.inc"
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
       CHARACTER PRONAME*32
       INTEGER CSCALI
       DOUBLE PRECISION CSCALD
@@ -232,6 +235,34 @@
         I2=I2+KS
         I=I+1
  9203 CONTINUE
+#if defined(CERNLIB_QMLXIA64)
+*  Dynamic linker may give long addresses
+      IF (IFCS.EQ.-2)THEN
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ENDIF
+#else
 *      IT=IABS(ITYPGP)
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NOPAR,IF77PL(1))
@@ -245,6 +276,7 @@
       ENDIF
 *+SELF,IF=UNIX,IF=-SGI,IF=-IBMRT,IF=-DECS,IF=-HPUX,IF=-SUN,IF=-MSDOS.
 #endif
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_STDUNIX))
       I=1
       DO 9203 K=ITA-NPAR+1,ITA
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/cslink.F cernlib-2005.05.09/src/pawlib/comis/code/cslink.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/cslink.F	1996-02-26 17:16:17.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/cslink.F	2005-09-20 19:27:10.763521679 +0000
@@ -21,10 +21,15 @@
 #include "comis/cstab.inc"
 #include "comis/cspnts.inc"
 #include "comis/cslun.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       CHARACTER*(KLENID) FNNAME
       INTEGER CS_GET_FUNC
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      CHARACTER*(KLENID) FNNAME
+      INTEGER*8 CS_GET_FUNC
+#endif
          COMMON/CSGSCM/IGS,JGS,NGS,CSJUNK(3)
       IF(ISTLIB.EQ.0 .AND. ITBS.EQ.0)RETURN
    2  I=IPGP
@@ -60,12 +65,20 @@
 #if defined(CERNLIB_SHL)
           CALL CSGTIDP(I,FNNAME,NC)
           CALL CUTOL(FNNAME(1:NC))
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(FNNAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+          ENDIF
+#else
           IADGP=CS_GET_FUNC(FNNAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
           ENDIF
 #endif
+#endif
           IP=0
         ENDIF
       ENDIF
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csrtgpl.F cernlib-2005.05.09/src/pawlib/comis/code/csrtgpl.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csrtgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csrtgpl.F	2005-09-20 19:27:10.764521465 +0000
@@ -0,0 +1,31 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZ :  1.18/14 10/01/95  15.41.06  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+
+      SUBROUTINE CSRTGPL(I)
+***--------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab.inc"
+#include "comis/cstab64.inc"
+
+      IPIADGV = IPIADGV + 1
+      IF (IPIADGV .GT. MAXIAD64)  THEN
+        WRITE (*,'(2a,I4)') 'to much addresses for dynamik linking, ',
+     &                      'limit is ', MAXIAD64
+        WRITE (*,'(2a)') 'increase MAXIAD64 in cstab64.inc and ',
+     &                    'recompile COMIS'
+
+        STOP
+      END IF
+      IADGPLV(IPIADGV) = IADGPL
+      IADGP            = IPIADGV
+      CALL CCOPYA(IADGP,IQ(I+2),KSIDP-2)
+      END
+#endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/comis/cstab64.inc cernlib-2005.05.09/src/pawlib/comis/comis/cstab64.inc
--- cernlib-2005.05.09~/src/pawlib/comis/comis/cstab64.inc	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/comis/cstab64.inc	2005-09-20 19:27:10.775519109 +0000
@@ -0,0 +1,10 @@
+*
+*
+* cstab64.inc
+*
+      PARAMETER (MAXIAD64=100) !maximum number of shared objects
+      INTEGER*8 IADGPL,IADGPLV(MAXIAD64)
+      INTEGER   IADGPL1, IADGPL2
+      COMMON /CSTB64/ IADGPL,IADGPLV
+      COMMON /CSTB64I/ IPIADGV
+      EQUIVALENCE (IADGPL, IADGPL1)
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/ccopys.c	1997-09-02 15:50:38.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/ccopys.c	2005-09-20 19:27:10.776518895 +0000
@@ -33,11 +33,25 @@
 #else
 void ccopys_(ja,jb,nn)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *nn;
+{
+  int i,n; char *a,*b;
+  n=*nn; (long)a=*ja; (long)b=*jb;
+#else
      char **ja, **jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+#endif
   if ( a >= b )
      for ( i=0; i
 #endif
@@ -274,6 +285,7 @@
 #endif
          p->next = f->first_proc;
          f->first_proc = p;
+         if (debug_level > 0) printf("function pointer is: %p\n", p->funcptr);
          return (void *)(p->funcptr);
       }
      f = f->next;
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscald.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscald.c	2004-10-27 09:01:54.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscald.c	2005-09-20 19:27:10.776518895 +0000
@@ -32,8 +32,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 double cscald_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -46,10 +45,41 @@
     int CSCALD (name,n,p)
 #  endif
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscald_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+double cscald_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[15];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = *fptr + (unsigned long)jumpad_;
+   if ( *fptr > 0 ) ptr = 0;
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  double (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    double d;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscali.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscali.c	2004-10-22 12:42:40.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscali.c	2005-09-20 19:27:10.777518681 +0000
@@ -29,8 +29,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 int cscali_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -39,10 +38,41 @@
 #if defined(CERNLIB_QXCAPT)
 int type_of_call CSCALI (name,n,p)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscali_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+int cscali_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[15];
+{
+   int jumpad_();
+   int (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   if ( *fptr > 0 ) ptr = 0;
+   ptr += *fptr;
+   name = (int (*)())ptr;
+/*    printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  int (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    int i;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscalr.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscalr.c	2004-10-22 12:03:16.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscalr.c	2005-09-20 19:27:10.788516325 +0000
@@ -33,16 +33,12 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 float cscalr_ (name,n,p)
 #endif
-
 #if defined(CERNLIB_QXNO_SC)
 float cscalr (name,n,p)
 #endif
-
 #if defined(CERNLIB_QXCAPT)
 # if defined(CERNLIB_MSSTDCALL)
    float type_of_call CSCALR(name,n,p)
@@ -51,10 +47,39 @@
 # endif
 #endif
 
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscalr_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+float cscalr_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ int pin[15];
+{
+   int jumpad_();
+   float (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   ptr += *fptr;
+   name = (float (*)())ptr;
+/*    printf ("cscalr - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  float (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    float r;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cstrcmp.c	1997-09-02 15:50:44.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cstrcmp.c	2005-09-20 19:27:10.788516325 +0000
@@ -36,6 +36,27 @@
 #else
 int cstrcmp_(ja,na,jb,nb)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *na, *nb;
+{
+
+  int i,la,lb,k; char *a,*b;
+  if ( *na >= *nb )
+     {
+      (long)a=*ja; (long)b=*jb; la=*na; lb=*nb; k=1;
+      }
+  else
+    {
+      (long)a=*jb; (long)b=*ja; la=*nb; lb=*na; k=-1;
+     }
+#else
      char **ja, **jb;
      int *na, *nb;
 {
@@ -48,6 +69,7 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+#endif
   for ( i=0; i b[i]) ? k : -k ); }
diff -urNad cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_execute.c cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_execute.c
--- cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_execute.c	2001-09-18 13:41:35.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_execute.c	2005-09-20 19:27:10.789516111 +0000
@@ -245,7 +245,15 @@
 	char		ntname[MAX_NAME_LEN+6];
 	int		i, ierr, indx, itype, isize, ielem;
 	Int32 *		addr;
-	int		ibase[1], ioff, nuse;
+
+	/* LP64 compatibility:
+	   use static for ibase (at least) because its address is stored
+	   as Int32 in structure CWNBlock                                 
+	   static takes ibase from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int	ibase[1], ioff, nuse;
 	int		id = qe->id;
 	char *		path = qe->path;
 	char *		title;
@@ -871,8 +879,21 @@
 			if ( cmd->u.scan.pawpp ) {
 				char	buf[33];
 
+				/* for LP64 ABI matlab and matrow are 64 bit pointer, type is void*  
+				   but PCADDR.jmlab and PCADDR.jmrow are of type int
+				   see: c_pcaddr.h and qp_command.h
+				   it is related to CWNBlock -> see above (H. Vogt)*/
+
+#if defined(CERNLIB_QMLXIA64)
+				unsigned long long int	 myjmlab, myjmrow;
+				myjmlab = PCADDR.jmlab;
+				myjmrow = PCADDR.jmrow;
+				c->matlab = (TableCallBack) myjmlab;
+				c->matrow = (TableCallBack) myjmrow;
+#else
 				c->matlab = (TableCallBack) PCADDR.jmlab;
 				c->matrow = (TableCallBack) PCADDR.jmrow;
+#endif
 
 				qp_assert( qe->nexpr <= MAX_OUTSTR );
 
diff -urNad cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_hbook_if.c cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_hbook_if.c
--- cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_hbook_if.c	1999-07-05 15:43:35.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_hbook_if.c	2005-09-20 19:27:10.801513541 +0000
@@ -149,7 +149,15 @@
 	int	idn, idtmp;
 	int	icycle;
 	int	ierr;
-	int     izero = 0;
+
+	/* LP64 compatibility:
+	   use static for izero because its address is fetched by hbname_
+	   using locb and locb expects 32 bit addresses only.
+	   static takes izero from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int     izero = 0;
 
 	/* split string into  path, id and cycle */
 
diff -urNad cernlib-2005.05.09~/src/scripts/cernlib cernlib-2005.05.09/src/scripts/cernlib
--- cernlib-2005.05.09~/src/scripts/cernlib	2003-01-23 14:00:37.000000000 +0000
+++ cernlib-2005.05.09/src/scripts/cernlib	2005-09-20 19:27:10.801513541 +0000
@@ -115,6 +115,12 @@
 	       [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
 	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
 	       [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
+#                      add path to lib64 for x86_64 architecture
+	       if [ `uname -m` = x86_64 ] && [ -d /usr/X11R6/lib64 ] ; then
+		  SYSGDIRS="-L/usr/X11R6/lib -L/usr/X11R6/lib64"
+		  SYSGX11="$SYSGDIRS -lX11"
+		  SYSGMOTIF="$SYSGDIRS -lXm -lXt -lXp -lXext -lX11"
+	       fi
 	       ;;
       NeXT)    SYSGX11="/usr/lib/X11/libX11.r" ;
                SYSGMOTIF="-lXm -lXt /usr/lib/X11/libX11.r" ;;


--- NEW FILE 300-skip-duplicate-lenocc.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 300-skip-duplicate-lenocc.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Only compile one of the two "lenocc()" functions.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile
--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile	2002-09-19 16:44:52.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile	2005-11-28 19:59:28.690293288 +0000
@@ -19,7 +19,9 @@
 SRCS_C += apofsz.c
 #endif
 
-#if defined(CERNLIB_WINNT)
+#if defined(CERNLIB_WINNT) || defined(CERNLIB_LINUX)
+/* Do not use lenocc.c in Linux; favor packlib/kernlib/kerngen/tcgen/lenocc.F
+ * instead.  --Kevin McCarty, for Debian */
 SRCS_C += lnblnk.c
 #endif
 
@@ -29,7 +31,7 @@
 
 #if defined(CERNLIB_DECS) || defined(CERNLIB_QMVAOS) \
  || defined(CERNLIB_HPUX) || defined(CERNLIB_IBMRT) || defined(CERNLIB_IBMRTD) \
- || defined(CERNLIB_OS9)  || defined(CERNLIB_LINUX)
+ || defined(CERNLIB_OS9)
 SRCS_C += lenocc.c lnblnk.c
 #endif
 


--- NEW FILE 303-shadow-passwords-supported.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 303-shadow-passwords-supported.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Allow Cern's server code to read from /etc/shadow.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.KyLyTI/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
--- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-04-18 11:39:28.000000000 -0400
+++ /tmp/dpep.KyLyTI/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-08 16:55:00.088372396 -0400
@@ -28,6 +28,9 @@
  *
  */
 #include "cspack/pilot.h"
+#if defined(CERNLIB_LINUX) && ! defined(CERNLIB_MACOSX)
+#define SHADOW_SUPPORT /* for Debian */
+#endif
 #if !defined(CERNLIB_IBM)||defined(CERNLIB_TCPSOCK)
 /*N.B. Must define sequence TCPLOG if a log file is required, e.g.*/
 /*#define LOGFILE "disk$dd:-ben.socks-serv.log"*/ /* VMS    */
@@ -231,7 +234,7 @@
 #endif /* OSK */
 #endif /* AUTHENT */
  
-#ifdef linux_softland
+#if defined(linux_softland) || defined(SHADOW_SUPPORT)
 #include 
 #endif /* linux_softland */
  
@@ -1780,10 +1783,10 @@
         union wait ret;
 #endif /* APOPWD1 */
  
-        char   *xpasswd, *crypt();
+        char   *xpasswd, *encrypted, *crypt();
         struct passwd *pw;
  
-#ifdef linux_softland
+#if defined(linux_softland) || defined(SHADOW_SUPPORT)
         struct spwd *spwd;
 #endif /* linux_softland */
  
@@ -1798,6 +1801,7 @@
                 reply("Unknown user %s.\n", user);
                 return(-2);
         }
+	encrypted = pw->pw_passwd;
  
 #ifdef linux_softland
         spwd = getspnam(user);
@@ -1805,6 +1809,29 @@
                 reply("User %s has illegal shadow password\n",user);
                 return(-2);
         }
+	encrypted = spwd->sp_pwdp;
+
+#elif defined(SHADOW_SUPPORT)
+	/* shadow passwords may not be enabled in Debian, so must check */
+	{
+		FILE *test = fopen("/etc/shadow", "r");
+		if (test) {
+			fclose(test);
+			spwd = getspnam(user);
+			if (spwd == NULL) {
+				reply("User %s has illegal shadow password\n",
+				      user);
+				return(-2);
+			}
+			encrypted = spwd->sp_pwdp;
+		}
+		else if (errno == EACCES) {
+			reply("Server has insufficient permissions to "
+			      "read /etc/shadow file\n");
+			return(-2);
+		}
+	}
+
 #endif /* linux_softland */
  
 #ifdef APOPWD1
@@ -1850,15 +1877,16 @@
 #else
  
 #ifdef linux_softland
-            xpasswd = pw_encrypt(pass,spwd->sp_pwdp);
+            xpasswd = pw_encrypt(pass, encrypted);
 #else
-            xpasswd = crypt(pass, pw->pw_passwd);
+            xpasswd = crypt(pass, encrypted);
 #endif /* linux_softland */
+
             /* The strcmp does not catch null passwords! */
-#ifdef linux_softland
-            if (spwd->sp_pwdp == '\0' || strcmp(xpasswd,spwd->sp_pwdp)) {
+#if defined(linux_softland) || defined(SHADOW_SUPPORT)
+            if (*encrypted == '\0' || strcmp(xpasswd,spwd->sp_pwdp)) {
 #else
-            if (*pw->pw_passwd == '\0' || strcmp(xpasswd,pw->pw_passwd)) {
+            if (*encrypted == '\0' || strcmp(xpasswd,pw->pw_passwd)) {
 #endif /* linux_softland */
  
 #endif /* AFS */


***** Error reading new file: [Errno 2] No such file or directory: '304-update-Imake-config-files.dpatch'

--- NEW FILE 305-use-POWERPC-not-PPC-as-test.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 305-use-POWERPC-not-PPC-as-test.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Since patch 304 changed the meaning of CERNLIB_PPC to a mere endianness
## DP: test, we now use CERNLIB_POWERPC to mean actually checking for a PowerPC
## DP: processor; fix the three occurences of this in Imakefiles.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile
--- cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile	1998-09-25 11:34:28.000000000 -0400
+++ /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile	2005-06-09 10:51:45.913019086 -0400
@@ -43,7 +43,7 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_PPC)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
 SpecialFortranLibObjectRule(hwuci2,hwuci2,-O0,NullParameter)
 #endif
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/Imakefile /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	1998-09-25 05:33:51.000000000 -0400
+++ /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	2005-06-09 10:50:47.068482917 -0400
@@ -56,7 +56,7 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_PPC)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
 SpecialFortranLibObjectRule(pawins,pawins,-O0,NullParameter)
 #endif
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	1999-09-14 05:20:08.000000000 -0400
+++ /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	2005-06-09 10:51:15.807396176 -0400
@@ -46,7 +46,7 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_PPC)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
 SpecialObjectRule(archive/qp_execute.o,qp_execute.c archive/qp_execute.d,-O0 -o $@)
 SpecialObjectRule(debug/qp_execute.o,qp_execute.c debug/qp_execute.d,-O0 -o $@)
 SpecialObjectRule(shared/qp_execute.o,qp_execute.c shared/qp_execute.d,-O0 -o $@)


--- NEW FILE 306-patch-assert.h-for-makedepend.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 306-patch-assert.h-for-makedepend.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Include local copy of assert.h with a workaround for a bug of
## DP: makedepend (cf. Debian bug # 171908).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/include/assert.h /tmp/dpep.9sKNsJ/cernlib-2005.05.09/src/include/assert.h
--- cernlib-2005.05.09/src/include/assert.h	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.9sKNsJ/cernlib-2005.05.09/src/include/assert.h	2005-06-09 12:50:41.751880968 -0400
@@ -0,0 +1,153 @@
+#ifndef CERNLIB_LINUX
+# include "/usr/include/assert.h"
+#else
+
+/* Copyright (C) 1991,1992,1994-2001,2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/*
+ *	ISO C99 Standard: 7.2 Diagnostics	
+ */
+
+#ifdef	_ASSERT_H
+
+# undef	_ASSERT_H
+# undef	assert
+# undef __ASSERT_VOID_CAST
+
+# ifdef	__USE_GNU
+#  undef assert_perror
+# endif
+
+#endif /* assert.h	*/
+
+#define	_ASSERT_H	1
+#include 
+
+#if defined __cplusplus && __GNUC_PREREQ (2,95)
+# define __ASSERT_VOID_CAST static_cast
+#else
+# define __ASSERT_VOID_CAST (void)
+#endif
+
+/* void assert (int expression);
+
+   If NDEBUG is defined, do nothing.
+   If not, and EXPRESSION is zero, print an error message and abort.  */
+
+#ifdef	NDEBUG
+
+# define assert(expr)		(__ASSERT_VOID_CAST (0))
+
+/* void assert_perror (int errnum);
+
+   If NDEBUG is defined, do nothing.  If not, and ERRNUM is not zero, print an
+   error message with the error text for ERRNUM and abort.
+   (This is a GNU extension.) */
+
+# ifdef	__USE_GNU
+#  define assert_perror(errnum)	(__ASSERT_VOID_CAST (0))
+# endif
+
+#else /* Not NDEBUG.  */
+
+#ifndef _ASSERT_H_DECLS
+#define _ASSERT_H_DECLS
+__BEGIN_DECLS
+
+/* This prints an "Assertion failed" message and aborts.  */
+extern void __assert_fail (__const char *__assertion, __const char *__file,
+			   unsigned int __line, __const char *__function)
+     __THROW __attribute__ ((__noreturn__));
+
+/* Likewise, but prints the error text for ERRNUM.  */
+extern void __assert_perror_fail (int __errnum, __const char *__file,
+				  unsigned int __line,
+				  __const char *__function)
+     __THROW __attribute__ ((__noreturn__));
+
+
+/* The following is not at all used here but needed for standard
+   compliance.  */
+extern void __assert (const char *__assertion, const char *__file, int __line)
+     __THROW __attribute__ ((__noreturn__));
+
+
+__END_DECLS
+#endif /* Not _ASSERT_H_DECLS */
+
+/* For the macro definition we use gcc's __builtin_expect if possible
+   to generate good code for the non-error case.  gcc 3.0 is a good
+   enough estimate for when the feature became available.  */
+# if __GNUC_PREREQ (3, 0)
+#  define assert(expr) \
+  (__ASSERT_VOID_CAST (__builtin_expect (!!(expr), 1) ? 0 :		      \
+		       (__assert_fail (__STRING(expr), __FILE__, __LINE__,    \
+				       __ASSERT_FUNCTION), 0)))
+# else
+#  define assert(expr) \
+  (__ASSERT_VOID_CAST ((expr) ? 0 :					      \
+		       (__assert_fail (__STRING(expr), __FILE__, __LINE__,    \
+				       __ASSERT_FUNCTION), 0)))
+# endif
+
+# ifdef	__USE_GNU
+#  if __GNUC_PREREQ (3, 0)
+#   define assert_perror(errnum) \
+  (__ASSERT_VOID_CAST (__builtin_expect (!(errnum), 1) ? 0 :		      \
+		       (__assert_perror_fail ((errnum), __FILE__, __LINE__,   \
+					      __ASSERT_FUNCTION), 0)))
+#  else
+#   define assert_perror(errnum) \
+  (__ASSERT_VOID_CAST (!(errnum) ? 0 :					      \
+		       (__assert_perror_fail ((errnum), __FILE__, __LINE__,   \
+					      __ASSERT_FUNCTION), 0)))
+#  endif
+# endif
+
+/* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
+   which contains the name of the function currently being defined.
+   This is broken in G++ before version 2.6.
+   C9x has a similar variable called __func__, but prefer the GCC one since
+   it demangles C++ function names.  */
+
+/* The following commented-out line breaks makedepend (bug # 171908); a local
+ * patched version of assert.h is therefore included.
+ *   --Kevin McCarty, for Debian */
+/* # if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4) */
+
+/* begin fix to work around Debian Bug # 171908 */
+# if defined __cplusplus
+#  if __GNUC_PREREQ (2, 6)
+#   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
+#  endif
+# elif __GNUC_PREREQ (2, 4)
+/* end fix */
+
+#   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
+# else
+#  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#   define __ASSERT_FUNCTION	__func__
+#  else
+#   define __ASSERT_FUNCTION	((__const char *) 0)
+#  endif
+# endif
+
+#endif /* NDEBUG.  */
+
+#endif /* CERNLIB_LINUX */


--- NEW FILE 307-use-canonical-cfortran.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 307-use-canonical-cfortran.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Use the most recent version of cfortran.h and cfortran.doc from
## DP: Debian package of cfortran, version 4.4-6.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.doc /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc
--- cernlib-2005.05.09/src/cfortran/cfortran.doc	1998-12-11 12:17:09.000000000 -0500
+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc	2004-12-10 10:47:33.000000000 -0500
@@ -195,7 +195,7 @@
 HP9000> f77 -c cfortex.f
 HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest
 
-HP0000> # If old-style f77 +800 compiled objects are required:
+HP9000> # If old-style f77 +800 compiled objects are required:
 HP9000> # #define hpuxFortran800
 HP9000> cc -c -Aa -DhpuxFortran800 cfortest.c
 HP9000> f77 +800 -o cfortest cfortest.o cfortex.f
@@ -643,7 +643,7 @@
    [For an ancient math.h on a 386 or sparc, get similar from a new math.h.]
    #ifdef mc68000     /* 5 lines Copyright (c) 1988 by Sun Microsystems, Inc. */
    #define FLOATFUNCTIONTYPE	int
-   #define RETURNFLOAT(x) 		return (*(int *)(&(x)))
+   #define RETURNFLOAT(x) 	return (*(int *)(&(x)))
    #define ASSIGNFLOAT(x,y)	*(int *)(&x) = y
    #endif
 
@@ -874,7 +874,7 @@
 works everywhere and would seem to be an obvious choice.
 
 
-3. 
+3. 
 
 cfortran.h encourages the exact specification of the type and dimension of
 array parameters because it allows the C compiler to detect errors in the
@@ -1835,7 +1835,7 @@
 
 Unlike all other C compilers supported by cfortran.h,
 'gcc -traditional' promotes to double all functions returning float
-as demonstrated bu the following example.
+as demonstrated by the following example.
 
 /* m.c */
 #include 
@@ -2017,8 +2017,9 @@
 
 THIS PACKAGE, I.E. CFORTRAN.H, THIS DOCUMENT, AND THE CFORTRAN.H EXAMPLE
 PROGRAMS ARE PROPERTY OF THE AUTHOR WHO RESERVES ALL RIGHTS. THIS PACKAGE AND
-THE CODE IT PRODUCES MAY BE FREELY DISTRIBUTED WITHOUT FEES, SUBJECT TO THE
-FOLLOWING RESTRICTIONS:
+THE CODE IT PRODUCES MAY BE FREELY DISTRIBUTED WITHOUT FEES, SUBJECT
+(AT YOUR CHOICE) EITHER TO THE GNU LIBRARY GENERAL PUBLIC LICENSE
+AT http://www.gnu.org/licenses/lgpl.html OR TO THE FOLLOWING RESTRICTIONS:
 - YOU MUST ACCOMPANY ANY COPIES OR DISTRIBUTION WITH THIS (UNALTERED) NOTICE.
 - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA 
   (E.G. TAPE, DISK, COMPUTER, PAPER.)
diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.h /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h
--- cernlib-2005.05.09/src/cfortran/cfortran.h	2002-09-11 13:05:51.000000000 -0400
+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h	2004-12-10 10:47:34.000000000 -0500
@@ -1,4 +1,4 @@
-/* cfortran.h  4.4_cernlib2002 */
+/* cfortran.h  4.4 */
 /* http://www-zeus.desy.de/~burow/cfortran/                   */
 /* Burkhard Burow  burow at desy.de                 1990 - 2002. */
 
@@ -11,6 +11,32 @@
    MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE.
 */
 
+/* The following modifications were made by the authors of CFITSIO or by me. 
+ * I've flagged them below with "(CFITSIO)" or "(KMCCARTY)".
+ * PDW = Peter Wilson
+ * DM  = Doug Mink
+ * LEB = ??
+ * -- Kevin McCarty, for Debian (11/29/2003) */
+
+/*******
+   Modifications:
+      Oct 1997: Changed symbol name extname to appendus (PDW/HSTX)
+                (Conflicted with a common variable name in FTOOLS)
+      Nov 1997: If g77Fortran defined, also define f2cFortran (PDW/HSTX)
+      Feb 1998: Let VMS see the NUM_ELEMS code. Lets programs treat
+                single strings as vectors with single elements
+      Nov 1999: If macintoxh defined, also define f2cfortran (for Mac OS-X)
+      Apr 2000: If WIN32 defined, also define PowerStationFortran and
+                VISUAL_CPLUSPLUS (Visual C++)
+      Jun 2000: If __GNUC__ and linux defined, also define f2cFortran
+                (linux/gcc environment detection)
+      Apr 2002: If __CYGWIN__ is defined, also define f2cFortran
+      Nov 2002: If __APPLE__ defined, also define f2cfortran (for Mac OS-X)
+
+      Nov 2003: If __INTEL_COMPILER or INTEL_COMPILER defined, also define
+                f2cFortran (KMCCARTY)
+ *******/
+
 /* 
   Avoid symbols already used by compilers and system *.h:
   __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c
@@ -75,7 +101,8 @@
 
 /* Remainder of cfortran.h depends on the Fortran compiler. */
 
-#if defined(CLIPPERFortran) || defined(pgiFortran)
+/* 11/29/2003 (KMCCARTY): add *INTEL_COMPILER symbols here */
+#if defined(CLIPPERFortran) || defined(pgiFortran) || defined(__INTEL_COMPILER) || defined(INTEL_COMPILER)
 #define f2cFortran
 #endif
 
@@ -90,6 +117,27 @@
                            Support f2c or f77 with gcc, vcc with f2c. 
                            f77 with vcc works, missing link magic for f77 I/O.*/
 #endif
+/* 04/13/00 DM (CFITSIO): Add these lines for NT */
+/*   with PowerStationFortran and and Visual C++ */
+#if defined(WIN32) && !defined(__CYGWIN__)
+#define PowerStationFortran   
+#define VISUAL_CPLUSPLUS
+#endif
+#if defined(g77Fortran)                        /* 11/03/97 PDW (CFITSIO) */
+#define f2cFortran
+#endif
+#if        defined(__CYGWIN__)                 /* 04/11/02 LEB (CFITSIO) */
+#define       f2cFortran 
+#endif
+#if        defined(__GNUC__) && defined(linux) /* 06/21/00 PDW (CFITSIO) */
+#define       f2cFortran 
+#endif
+#if defined(macintosh)                         /* 11/1999 (CFITSIO) */
+#define f2cFortran
+#endif
+#if defined(__APPLE__)                         /* 11/2002 (CFITSIO) */
+#define f2cFortran
+#endif
 #if defined(__hpux)             /* 921107: Use __hpux instead of __hp9000s300 */
 #define       hpuxFortran       /*         Should also allow hp9000s7/800 use.*/
 #endif
@@ -131,6 +179,7 @@
 #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
 /* If your compiler barfs on ' #error', replace # with the trigraph for #     */
  #error "cfortran.h:  Can't find your environment among:\
+    - GNU gcc (g77) on Linux.                                            \
     - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...)     \
     - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000     \
     - VAX   VMS CC 3.1 and FORTRAN 5.4.                                  \
@@ -151,7 +200,8 @@
     - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran          \
     - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \
     - Absoft Pro Fortran: Use #define AbsoftProFortran \
-    - Portland Group Fortran: Use #define pgiFortran"
+    - Portland Group Fortran: Use #define pgiFortran \
+    - Intel Fortran: Use #define INTEL_COMPILER"
 /* Compiler must throw us out at this point! */
 #endif
 #endif
@@ -164,7 +214,8 @@
 
 /* Throughout cfortran.h we use: UN = Uppercase Name.  LN = Lowercase Name.   */
 
-#if defined(f2cFortran) || defined(NAGf90Fortran) || defined(DECFortran) || defined(mipsFortran) || defined(apolloFortran) || defined(sunFortran) || defined(CONVEXFortran) || defined(SXFortran) || defined(extname)
+/* "extname" changed to "appendus" below (CFITSIO) */
+#if defined(f2cFortran) || defined(NAGf90Fortran) || defined(DECFortran) || defined(mipsFortran) || defined(apolloFortran) || defined(sunFortran) || defined(CONVEXFortran) || defined(SXFortran) || defined(appendus)
 #define CFC_(UN,LN)            _(LN,_)      /* Lowercase FORTRAN symbols.     */
 #define orig_fcallsc(UN,LN)    CFC_(UN,LN)
 #else 
@@ -268,7 +319,8 @@
 #endif
 
 #ifndef apolloFortran
-#define COMMON_BLOCK_DEF(DEFINITION, NAME) DEFINITION NAME
+/* "extern" removed (CFITSIO) */
+#define COMMON_BLOCK_DEF(DEFINITION, NAME) /* extern */ DEFINITION NAME
 #define CF_NULL_PROTO
 #else                                         /* HP doesn't understand #elif. */
 /* Without ANSI prototyping, Apollo promotes float functions to double.    */
@@ -512,7 +564,7 @@
                     *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO)  ),   \
   (F).dsc$a_a0    =  ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length          ,(F))
 
-#else
+#endif      /* PDW: 2/10/98 (CFITSIO) -- Let VMS see NUM_ELEMS definitions */
 #define _NUM_ELEMS      -1
 #define _NUM_ELEM_ARG   -2
 #define NUM_ELEMS(A)    A,_NUM_ELEMS
@@ -540,7 +592,8 @@
 }
 return (int)num;
 }
-#endif
+/* #endif removed 2/10/98 (CFITSIO) */
+
 /*-------------------------------------------------------------------------*/
 
 /*           UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS       */


--- NEW FILE 308-use-canonical-cfortran-location.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 308-use-canonical-cfortran-location.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: All code compiled at Cernlib build-time should look for cfortran.h
## DP: at .

@DPATCH@
diff -urNad cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c /tmp/dpep.d3syqe/cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c
--- cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c	1996-02-14 08:10:26.000000000 -0500
+++ /tmp/dpep.d3syqe/cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c	2005-06-09 13:13:22.079711057 -0400
@@ -39,7 +39,7 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  */
 
-#include "higz/cfortran.h"
+#include 
 #if !defined(VMS) && !defined(_WINDOWS)
 #include "higz/tkConfig.h"
 #endif
diff -urNad cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c /tmp/dpep.d3syqe/cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c
--- cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c	1996-04-17 10:46:29.000000000 -0400
+++ /tmp/dpep.d3syqe/cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c	2005-06-09 13:14:58.654908060 -0400
@@ -16,7 +16,7 @@
 #include	
 
 
-#include	"cfortran.h"
+#include	
 
 /* #include	"packlib.h" */
 #include	"hbook_interface.h"


--- NEW FILE 309-define-dummy-herwig-routines.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 309-define-dummy-herwig-routines.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Define stub functions for herwig routines that are supposed to be
## DP: provided by the user.  Also, comment out the dummy functions pdfset
## DP: and structm; real versions are provided in pdflib.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/Imakefile	2005-11-28 19:46:53.619963660 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/Imakefile	2005-11-28 19:46:58.890844233 +0000
@@ -24,8 +24,13 @@
 	hwulob.F hwulof.F hwulor.F hwumas.F hwupcm.F hwurap.F hwures.F \ @@\
 	hwurob.F hwurof.F hwurot.F hwusor.F hwusqr.F hwusta.F hwutab.F \ @@\
 	hwutim.F hwvdif.F hwvdot.F hwvequ.F hwvsca.F hwvsum.F hwvzro.F \ @@\
-	hwwarn.F ieupdg.F ipdgeu.F pdfset.F qqinit.F qqlmat.F sasano.F \ @@\
-	sasbeh.F sasdir.F sasgam.F sasvmd.F structm.F
+	hwwarn.F ieupdg.F ipdgeu.F /*pdfset.F*/ qqinit.F qqlmat.F sasano.F \ @@\
+	sasbeh.F sasdir.F sasgam.F sasvmd.F /*structm.F*/
+	/* comment out pdfset.F, structm.F; real versions are in pdflib */
+
+/* add the following file to define dummy routines as weak symbols */
+/* --Kevin McCarty, for Debian */
+SRCS_C= dummy.c
 
 FORTRANSAVEOPTION = FortranSaveFlags
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/dummy.c cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/dummy.c
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/dummy.c	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/dummy.c	2005-11-28 19:49:17.897320746 +0000
@@ -0,0 +1,34 @@
+/* Dummy file to avoid undefined symbols in the library */
+/* Kevin McCarty, 14 Jan 2003 */
+
+#include 
+#include 
+
+/* Want the dummy functions to be weakly defined so they may be overridden
+ * without error. */
+
+#define kludge(x)    #x
+#define stringify(x) kludge(x)
+#define underline(x) dummy_ ## x
+
+#define DUMMY(UPPERNAME, fortranname_, returntype) \
+static returntype underline(fortranname_)() { print_dummy(#UPPERNAME); } \
+void fortranname_() \
+	__attribute__ ((weak, alias (stringify(underline(fortranname_))) ))
+
+static void print_dummy(const char *function)
+{
+  fprintf(stderr, "herwig59: Now in dummy %s routine.\n", function);
+  fprintf(stderr,
+          "If you see this message, you should define your own such routine.\n"
+#if defined (CERNLIB_DEBIAN)
+	  "For details, see the file /usr/share/doc/libherwig59-2-dev/herwig59.txt.gz\n"
+#endif
+  );
+  exit(EXIT_FAILURE);
+}
+
+DUMMY(HWABEG, hwabeg_, void);
+DUMMY(HWANAL, hwanal_, void);
+DUMMY(HWAEND, hwaend_, void);
+


--- NEW FILE 310-define-dummy-fowl-routines.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 310-define-dummy-fowl-routines.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Define stub functions for routines in fowl that are supposed to be
## DP: user-defined.  Also, rename START to FSTART to avoid name clash
## DP: with mathlib.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/Imakefile cernlib-2005.05.09.dfsg/src/phtools/fowl/Imakefile
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/Imakefile	1996-04-26 07:13:52.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/Imakefile	2005-11-28 19:49:52.412989577 +0000
@@ -1,10 +1,12 @@
-SRCS_F=	 beamin.F breitw.F chmove.F delsq.F dumpme.F finish.F \ @@\
+SRCS_F=	 beamin.F breitw.F chmove.F delsq.F dumpme.F /* finish.F */ \ @@\
 	fmass.F fmassq.F fowl.F fowlmp.F fowlpr.F genev.F histey.F \ @@\
 	labsys.F pdk.F qqstrt.F rangnr.F redat2.F redata.F rotes2.F \ @@\
 	scout.F teedia.F tranch.F xplsdx.F
 
+SRCS_C= dummy.c /*"fake" defn of start, user, finish to avoid undefined syms*/
+
 #if !defined(CERNLIB_UNIX)
-SRCS_F := $(SRCS_F) start.F
+SRCS_F := $(SRCS_F) /* start.F */
 #endif
 
 SubdirLibraryTarget(fowl,NullParameter)
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/dummy.c cernlib-2005.05.09.dfsg/src/phtools/fowl/dummy.c
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/dummy.c	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/dummy.c	2005-11-28 19:53:31.287496776 +0000
@@ -0,0 +1,39 @@
+/* Dummy file to avoid undefined symbols in the library */
+/* Kevin McCarty, 26 Apr 2004 */
+/* Last revised 13 Aug 2004 */
+
+#include 
+#include 
+
+/* Want the dummy functions to be weakly defined so they may be overridden
+ * without error. */
+
+#define kludge(x)    #x
+#define stringify(x) kludge(x)
+#define underline(x) dummy_ ## x
+
+#define DUMMY(UPPERNAME, fortranname_, returntype) \
+static returntype underline(fortranname_)() { print_dummy(#UPPERNAME); } \
+void fortranname_() \
+	__attribute__ ((weak, alias (stringify(underline(fortranname_))) ))
+
+static void print_dummy(const char *function)
+{
+  fprintf(stderr, "phtools: Now in dummy %s routine.\n", function);
+  fprintf(stderr,
+          "If you see this message, you should define your own such routine.\n"
+	  "For details, see "
+#if defined (CERNLIB_DEBIAN)
+	                   "/usr/share/doc/libphtools2-dev/README.Debian\n"
+	  "and "
+#endif
+	      "the CERN writeup for FOWL (available at the URL\n"
+	  "http://wwwasdoc.web.cern.ch/wwwasdoc/Welcome.html ; scroll down\n"
+	  "to the link for W505 - FOWL.)\n");
+  exit(EXIT_FAILURE);
+}
+
+DUMMY(FSTART, fstart_, void);
+DUMMY(USER,   user_,   void);
+DUMMY(FINISH, finish_, void);
+
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/fowlmp.F cernlib-2005.05.09.dfsg/src/phtools/fowl/fowlmp.F
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/fowlmp.F	1996-03-22 16:42:46.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/fowlmp.F	2005-11-28 19:49:52.412989577 +0000
@@ -30,7 +30,7 @@
       CALL REDATA
       IF(NEVTOT.LT.NGRP) NGRP = NEVTOT
       N2 = MIN (NEVTOT/NGRP, 30000)
-      CALL START
+      CALL FSTART
       DO  500 I2= 1, N2
       DO  400  I= 1, NGRP
       IEVENT = IEVENT + 1
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/qqstrt.F cernlib-2005.05.09.dfsg/src/phtools/fowl/qqstrt.F
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/qqstrt.F	1996-03-22 16:42:47.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/qqstrt.F	2005-11-28 19:49:52.412989577 +0000
@@ -38,6 +38,9 @@
       COMMON
      +/TAPES / NTPIN     ,NTPOUT   ,NTPNCH   ,NTPBIN   ,KONSOL
       IF(JEVT.LE.0) RETURN
+#if 0
+C     Comment this section out; "which" is obsolete
+C     -- Kevin McCarty, for Debian, 26 April 2004
       CALL WHICH(ISIT,VAL)
       WRITE(6,700)JEVT,VAL
   700 FORMAT('0RANDOM NUMBER GENERATOR INITIATED TO',I12,
@@ -46,6 +49,7 @@
 C--     CDC   60-BIT WORD
 CDC                             )B10000000000000007171 .RO.  TVEJ( = POL
       GOTO 200
+#endif
   100 CONTINUE
 C         FOR -CDC JUST MAKE SURE IT IS ODD
       IGLOP = JEVT


--- NEW FILE 311-skip-duplicate-qnext.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 311-skip-duplicate-qnext.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't compile in redundant versions of qnext.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile	1998-03-05 08:17:18.000000000 -0500
+++ /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile	2005-06-09 14:28:05.755053006 -0400
@@ -1,5 +1,6 @@
+/* don't compile qnexte.F --Kevin*/
 SRCS_F= abend.F accessf.F exitf.F \ @@\
-	intrac.F jumpxn.F lnblnk.F locb.F locf.F qnexte.F unlinkf.F
+	intrac.F jumpxn.F lnblnk.F locb.F locf.F unlinkf.F
 
 #ifndef CERNLIB_OS9
 SRCS_F := $(SRCS_F) timed.F timel.F timex.F 
diff -urNad cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile
--- cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile	1996-03-06 05:47:15.000000000 -0500
+++ /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile	2005-06-09 14:28:05.755053006 -0400
@@ -1,6 +1,7 @@
+/* don't compile qnext.F --Kevin*/
 SRCS_F=	 izbcd.F izbcdt.F izbcdv.F izchav.F izhnum.F lzbyt.F \ @@\
 	lzfind.F lzfval.F lzlast.F lzlong.F nzbank.F nzfind.F nzlong.F \ @@\
-	qnext.F zhtoi.F zitoh.F zkrak.F zkrakn.F znumid.F zpress.F \ @@\
+	zhtoi.F zitoh.F zkrak.F zkrakn.F znumid.F zpress.F \ @@\
 	zshunt.F zsort.F zsorth.F zsorti.F zsorv.F zsorvh.F zsorvi.F \ @@\
 	ztopsy.F
 


--- NEW FILE 312-skip-duplicate-gamma.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 312-skip-duplicate-gamma.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't compile in redundant gamma function in isajet; use the mathlib one

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile /tmp/dpep.IX54UM/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2005-06-09 14:29:18.976494518 -0400
+++ /tmp/dpep.IX54UM/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2005-06-09 14:30:21.913126207 -0400
@@ -1,12 +1,13 @@
 DoIncludePackage(isajet)
 #include "pilot.h"
 
+/* gamma.F removed; use the one defined in mathlib/gen/c/gamma.F */
 SRCS_F= \ @@\
 	 amass.F charge.F cteq5l.F ctxc2i.F ctxi2c.F ctxin.F ctxout.F \ @@\
 	 dblpcm.F dblvec.F dboost.F decay.F decjet.F \ @@\
 	 domssm.F drllyn.F eebeg.F eemax.F elctrn.F epf.F evol01.F evol02.F \ @@\
 	 evol03.F evol05.F evol06.F evol07.F evolms.F evolve.F flavor.F \ @@\
-	 fortop.F frgjet.F frgmnt.F gamma.F getpt.F gettot.F heavyx.F \ @@\
+	 fortop.F frgjet.F frgmnt.F         getpt.F gettot.F heavyx.F \ @@\
 	 hevolv.F higgs.F idanti.F idgen.F iframs.F inisap.F ipartns.F \ @@\
 	 ipjset.F iprtns.F irmov0.F isabeg.F isaend.F isaevt.F isaini.F \ @@\
 	 isajet.F isasrt.F ispjet.F istrad.F iswdky.F jetgen.F \ @@\


--- NEW FILE 313-comis-preserves-filename-case.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 313-comis-preserves-filename-case.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Have COMIS preserve filename case when interpreting FORTRAN code.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2003-02-13 09:25:23.000000000 -0500
+++ /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2005-06-09 15:24:32.751560586 -0400
@@ -200,6 +200,14 @@
   ku_exel( "/KUIP/SET_SHOW/COLUMNS -1" );
   ku_exel( "/KUIP/SET_SHOW/DOLLAR 'ON'" );
 
+#if defined(UNIX) && (defined(WINNT) || !defined(MSDOS))
+/* Correct the default behavior of converting filenames to lower-case
+ * on a case-sensitive operating system... Not that I'm bitter or anything.
+ * --Kevin McCarty, for Debian
+ */
+  ku_exel( "/KUIP/SET_SHOW/FILECASE 'KEEP'" );
+#endif
+
   host_editor = getenv( "KUIPEDITOR" );
   if( host_editor == NULL )
     host_editor = getenv( "EDITOR" );
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	1997-09-25 10:02:25.000000000 -0400
+++ /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	2005-06-09 15:23:49.276738602 -0400
@@ -1064,11 +1064,12 @@
 .
 This command has only an effect on Unix systems to select whether filenames
 are kept as entered on the command line.
-The startup value is 'CONVERT', i.e. filenames are converted to lowercase.
+The startup value is 'KEEP', i.e. filename cases are preserved.  With
+the 'CONVERT' setting, filenames are converted to lowercase.
 .
 On other systems filenames are always converted to uppercase.
 .
-The 'RESTORE' option set the conversion mode to the value effective
+The 'RESTORE' option sets the conversion mode to the value effective
 before the last FILECASE KEEP/CONVERT command.
 E.g. the sequence
      FILECASE KEEP; EDIT Read.Me; FILECASE RESTORE
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F /tmp/dpep.GROFhd/cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F
--- cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F	1999-05-20 03:37:18.000000000 -0400
+++ /tmp/dpep.GROFhd/cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F	2005-06-09 15:23:49.276738602 -0400
@@ -140,7 +140,7 @@
       CHUTIT = ' '
 *
       IF (IPIAF.EQ.0) THEN
-         CALL KUOPEN(10,'PAW.METAFILE','UNKNOWN',ISTAT)
+         CALL KUOPEN(10,'paw.metafile','UNKNOWN',ISTAT)
 #if (defined(CERNLIB_IBM))&&(!defined(CERNLIB_IBMMVS))
          CALL HERMES(19)
          CALL VMCMS('FILEDEF 19 DISK GKSERROR OUTPUT A',IRET)


--- NEW FILE 314-permit-using-regcomp-for-re_comp.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 314-permit-using-regcomp-for-re_comp.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add a possibility to use regcomp() instead of re_comp() (selected at
## DP: compile time)

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c /tmp/dpep.OUDE1M/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c	1996-03-08 10:33:08.000000000 -0500
+++ /tmp/dpep.OUDE1M/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c	2005-06-09 15:49:30.689188356 -0400
@@ -18,6 +18,11 @@
 #include "kuip/mkutfu.h"
 #include "mkutda.h"
 
+#ifdef MATCH_REGCOMP
+#include 
+#include      /* for regex_t */
+#endif
+
 static char **ftype_list = NULL;
 static char **class_list = NULL;
 static char **stext_list = NULL;
@@ -92,8 +97,12 @@
     DIR            *dirp;
     struct dirent  *dp;
     char           *pattern;
+#ifdef MATCH_REGCOMP
+    regex_t        *re = (regex_t *)malloc( sizeof(regex_t) );
+#else
     char           *re;
 #endif
+#endif
     struct stat     filestatus;
 
     ndlist     = 0;
@@ -221,11 +230,15 @@
       }
     }
     pattern = mstrcat( pattern, "$" );
+#ifdef MATCH_REGCOMP
+    regcomp( re, pattern, REG_NEWLINE );
+#else
 #ifdef MATCH_RE_COMP
     re = re_comp( pattern );
 #else
     re = regcmp( pattern, NULL );
 #endif
+#endif
     free( pattern );
 
     /*
@@ -260,12 +273,16 @@
         }
         else if( (filestatus.st_mode & S_IFMT) == S_IFREG ) {
           /* regular file: match name against regexp */
+#ifdef MATCH_REGCOMP
+          int match = (regexec( re, dp->d_name, 0, NULL, 0 ) == 0);
+#else
 #ifdef MATCH_RE_COMP
           int match = re_exec( dp->d_name );
 #else
           int match = (regex( re, dp->d_name ) != NULL);
 #endif
-          if( match == 1 ) {
+#endif
+          if( match ) {
             filelist = (char**)realloc( (char*)filelist,
                                        (nflist+1) * sizeof(char*) );
             filelist[nflist] = strdup( dp->d_name );
@@ -276,6 +293,9 @@
       closedir( dirp );
     }
 
+#ifdef MATCH_REGCOMP
+    regfree( re );
+#endif
 #ifndef MATCH_RE_COMP
     free( re );
 #endif


--- NEW FILE 315-fixes-for-MacOSX.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 315-fixes-for-MacOSX.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch set (mostly due to Keisuke Fujii) to allow Cernlib to compile
## DP: and run on OS X.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/config/Imake.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules
--- cernlib-2005.05.09/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules	2005-06-09 15:52:06.472072084 -0400
@@ -2171,7 +2171,7 @@
 #define CppScriptTarget(dst,src,defs,deplist)				@@\
 dst::  src deplist							@@\
 	RemoveFile($@)							@@\
-	$(CPP) defs $@				@@\
+	$(CPP) defs src | CppSedMagic >$@				@@\
 	chmod a+x $@							@@\
 									@@\
 clean::									@@\
@@ -2203,7 +2203,7 @@
 #define CppFileTarget(dst,src,defs,deplist)				@@\
 dst::  src deplist							@@\
 	RemoveFile($@)							@@\
-	$(CPP) defs $@				@@\
+	$(CPP) defs src | CppSedMagic >$@				@@\
 									@@\
 clean::									@@\
 	RemoveFiles(dst)
diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf
--- cernlib-2005.05.09/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,170 @@
+XCOMM platform:  $SFO: MOSXS.cf,v 1.0 95/11/19 23:21:00 sl Exp $
+
+#define OSVendor          Apple Computer, Inc.
+#ifdef MacOSXArchitecture
+#define OSName            MacOSX
+#define OSMajorVersion    DefaultOSMajorVersion
+#define OSMinorVersion    DefaultOSMinorVersion
+#define OSTeenyVersion    0
+#endif
+
+#define ProjectRulesFile  
+#define ProjectTmplFile   
+
+#define InstKmemFlags -m 2755 -g kmem
+/* #define ConstructMFLAGS		NO */
+
+#define HasNdbm     YES
+#define SetTtyGroup YES
+#define HasBsearch  YES
+#ifdef MacOSXArchitecture
+#define HasPutenv               YES
+#define MathLibrary             /**/
+#define DBMLibrary              /**/
+#define TermcapLibrary          /**/
+#define HasBSD44Sockets         YES
+#define HAS_SNPRINTF            YES
+#endif
+
+#define NeedConstPrototypes     YES
+#define NeedVarargsPrototypes   YES
+#define NeedFunctionPrototypes  YES
+#define NeedWidePrototypes      NO
+
+#define GzipFontCompression     YES
+#define CompressAllFonts        YES
+
+#ifndef HasShm
+# define HasShm			YES
+#endif
+#ifndef BuildGlxExt
+# define BuildGlxExt 	  	YES
+# define GlxUseNSGL             YES
+#endif
+#define BuildServer             YES
+#define BuildXprint             NO
+#define BuildFonts              YES
+#define BuildDPMS               NO
+
+#define TenonServer             YES
+#define XprtServer              NO
+#define XVendorString "Tenon Intersystems Xtools"
+#define XVendorRelease 1000
+#ifndef UseRgbTxt
+#define UseRgbTxt               YES
+#endif
+
+#define BuildPexExt             NO
+
+#ifndef BuildGLXLibrary
+# define BuildGLXLibrary	YES
+#endif
+
+/* no direct graphics extension */
+#define	BuildXF86DGA	NO
+
+/* no extra tablets and weird input devices */
+#define BuildXInputExt	NO
+
+/* Build Xinerama (aka panoramiX) extension */
+#define BuildXinerama		YES
+
+/* no Display Power Management extension */
+#define	BuildDPMSExt	NO
+
+# define BuildXvExt     NO
+
+#ifndef OptimizationLevel
+# define OptimizationLevel -O
+#endif
+#define OptimizedCDebugFlags OptimizationLevel -fPIC -pipe
+#define ExtraLoadFlags -L/usr/X11R6/lib -L/sw/lib -L/usr/lib -lc
+
+#define BuildExamples YES
+
+#define StandardDefines -DCERNLIB_LINUX -DCERNLIB_PPC -DCERNLIB_MACOSX \
+			-Dunix=unix -D__powerpc__ -D__DARWIN__
+/* -DX_NOT_POSIX -DX_LOCALE */
+
+#define HasVoidSignalReturn YES
+
+#ifndef DependFlags
+#define DependFlags -I/usr/include/ansi -I/usr/include/bsd -I/sw/include
+#endif
+
+#define StandardIncludes -I/sw/include
+
+#define InstallCmd	install	/* unlink old */
+
+/* #define ArCmd libtool -a -o */
+#define ArCmd ar -r
+
+#ifndef RanlibCmd
+#define RanlibCmd	ranlib -c -s
+#endif
+
+/* see below for ServerDefines */
+
+#define PrimaryScreenResolution 95	/* for 17 inch screen */
+
+#define ServerCDebugFlags OptimizationLevel -fPIC -g -pipe
+
+#ifndef HasGcc
+#define HasGcc YES
+#endif
+
+#undef CcCmd
+#undef CplusplusCmd
+#ifdef MacOSXArchitecture
+#define CcCmd		cc -g -arch "ppc" -no-cpp-precomp
+#define CplusplusCmd    c++ -g -no-cpp-precomp
+#endif
+#ifndef CcCmd
+#define CcCmd cc -g
+#endif
+
+#define CppCmd        /usr/bin/cpp
+
+#include 
+#include 
+#undef XFree86Server
+/* #define GLX_DIRECT_RENDERING */
+
+#define f2cFortran              YES
+#define FortranCmd              g77 -g
+#define XargsCmd                xargs
+#define FortranSaveFlags        /* */ /* Everything static !? */
+#define OptimisedFortranFlags	OptimizationLevel -fPIC -funroll-loops \
+				-fomit-frame-pointer
+#define DefaultCCOptions	OptimizationLevel
+#define DefaultFCOptions        -fno-automatic \
+				-fno-second-underscore \
+				-fno-f90 -fugly-complex -fno-globals \
+				-fugly-init -Wno-globals OptimizationLevel
+
+#ifndef CernlibLocalDefines
+# define CernlibLocalDefines
+#endif
+#define CernlibSystem           -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX \
+				-DCERNLIB_PPC -DCERNLIB_QMGLIBC \
+				-DCERNLIB_MACOSX CernlibLocalDefines
+
+#undef CERNLIB_SHIFT
+
+#define CERNLIB_LINUX
+#define CERNLIB_UNIX
+#define CERNLIB_LNX
+#define CERNLIB_PPC
+#define CERNLIB_QMGLIBC
+#define CERNLIB_MACOSX
+
+#define X11Includes             -I/usr/X11R6/include
+
+/*
+ *  Create a Make Variable to allow building with/out Motif
+ */
+#undef MotifDependantMakeVar
+#define MotifDependantMakeVar(variable,value) variable=value
+/* End  CERNLIB changes */
+
+
diff -urNad cernlib-2005.05.09/src/config/MacOSX.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules
--- cernlib-2005.05.09/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,123 @@
+XCOMM $XConsortium: MOSXS.rules,v 1.1 97/12/12 15:34:45 sl Exp $
+
+/*
+ * MacOSX shared library rules
+ */
+
+#define HasSharedLibraries YES
+
+#define ForceNormalLib NO
+
+#ifndef SharedDataSeparation
+#define SharedDataSeparation YES
+#endif
+#ifndef SharedCodeDef
+#define SharedCodeDef
+#endif
+#ifndef SharedLibraryDef
+#define SharedLibraryDef -fno-common
+#endif
+
+#define ShLibIncludeFile 
+
+#ifndef SharedLibraryLoadFlags
+#define SharedLibraryLoadFlags
+#endif
+#ifndef PositionIndependentCFlags
+#define PositionIndependentCFlags
+#endif
+
+
+/*
+ * InstallSharedLibrary - generate rules to install the shared library.
+ * Edited 2003-05-09 by Kevin McCarty to add an install.shlib target.
+ */
+#ifndef InstallSharedLibrary
+#define InstallSharedLibrary(libname,rev,dest)				@@\
+.PHONY: install.shlib shlib/libname					@@\
+shlib/libname:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+install.shlib:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+$(DESTDIR)dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\
+	MakeDir($(DESTDIR)dest)						@@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.rev.dylib) $(DESTDIR)dest @@\
+	(T=`echo Concat($(DESTDIR)dest/lib,libname.rev.dylib) | sed 's/\.[^\.d]*\.dylib/\.dylib/'`;\ @@\
+		$(RM) $$T && $(LN) Concat(lib,libname.rev.dylib) $$T)	@@\
+	$(RM) Concat($(DESTDIR)dest/lib,libname.dylib)			@@\
+	$(LN) Concat(lib,libname.rev.dylib) Concat($(DESTDIR)dest/lib,libname.dylib)
+#endif /* InstallSharedLibrary */
+
+/*
+ * NormalSharedLibraryTarget - generate rules to create a shared library;
+ * build it into a different name so that the we do not hose people by having
+ * the library gone for long periods.
+ */
+#ifndef SharedLibraryTarget
+#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
+AllTarget(Concat(lib,libname.dylib))					@@\
+									@@\
+Concat(lib,libname.dylib):  solist $(EXTRALIBRARYDEPS)			@@\
+	$(RM) $@~							@@\
+	(cd down; $(CC) -I/usr/X11R6/lib -dynamiclib -undefined suppress -install_name /usr/X11R6/lib/$@ -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.dylib)
+
+#endif /* SharedLibraryTarget */
+
+/*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepLibraryTarget
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.dylib))					@@\
+									@@\
+Concat(lib,libname.dylib):  deplist $(EXTRALIBRARYDEPS)		@@\
+	$(RM) $@~							@@\
+	(cd down; $(CC) -I/usr/X11R6/lib -dynamiclib -undefined suppress -install_name /usr/X11R6/lib/$@ -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
+	$(RM) $@							@@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.dylib)
+
+#endif /* SharedDepLibraryTarget */
+
+/*
+ * SharedLibraryDataTarget - generate rules to create shlib data file;
+ */
+#ifndef SharedLibraryDataTarget
+#define SharedLibraryDataTarget(libname,rev,salist)
+#endif /* SharedLibraryDataTarget */
+
+#ifndef InstallSharedLibraryData
+#define InstallSharedLibraryData(libname,rev,dest)
+#endif /* InstallSharedLibraryData */
+
+/*
+ * SharedLibReferences - variables for shared libraries
+ */
+#ifndef SharedLibReferences
+#define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
+revname = rev								@@\
+Concat3(DEP,varname,LIB) = SharedLibDependencies(libname,libsource,revname) @@\
+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
+LintLibReferences(varname,libname,libsource)
+#endif
+
+/*
+ * SharedDSLibReferences - variables for shared libraries
+ */
+#ifndef SharedDSLibReferences
+#define SharedDSLibReferences(varname,libname,libsource,revname,rev)	@@\
+revname = rev								@@\
+Concat3(DEP,varname,LIB) = SharedDSLibDependencies(libname,libsource,revname) @@\
+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) Concat3(Shared,libname,Reqs)		@@\
+LintLibReferences(varname,libname,libsource)
+#endif
+
+
diff -urNad cernlib-2005.05.09/src/config/MacOSX.tmpl /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl
--- cernlib-2005.05.09/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,67 @@
+XCOMM $XConsortium: MOSXS.tmpl,v 1.2 97/12/12 19:07:12 sl Exp $
+
+/*
+ * Xnext shared library template
+ */
+
+
+
+#ifndef SharedXtReqs
+#define SharedXtReqs /**/
+#endif
+#ifndef SharedXawReqs
+#define SharedXawReqs /**/
+#endif
+#ifndef SharedXmuReqs
+#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB)
+#endif
+
+#define SharedLibX11 YES
+#define SharedX11Rev F
+SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev)
+
+#define SharedLibXau NO		/* don't need shared form */
+#define SharedLibXdmcp NO	/* don't need shared form */
+
+#define SharedLibXmu YES
+#define SharedXmuRev F
+
+#define SharedOldXRev F
+
+#define SharedLibXext YES
+#define SharedXextRev F
+
+#define SharedLibXt YES
+#define SharedXtRev F
+SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev)
+
+#define SharedXawRev F
+
+#define SharedXtfRev A
+
+#define SharedLibXi YES
+#define SharedXiRev F
+SharedLibReferences(XI,Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev)
+
+#define SharedLibXtst YES
+#define SharedXtstRev F
+SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev)
+
+
+#define SharedPexRev F
+SharedLibReferences(PEX,PEX5,$(PEXLIBSRC),SOPEXREV,SharedPexRev)
+
+#define SharedLibXie YES
+#define SharedXieRev F
+
+#define SharedLibICE YES
+#define SharedICERev F
+SharedLibReferences(ICE,ICE,$(ICESRC),SOICEREV,SharedICERev)
+
+#define SharedLibSM YES
+#define SharedSMRev F
+SharedLibReferences(SM,SM,$(SMSRC),SOSMREV,SharedSMRev)
+
+#define SharedFSRev F
+SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
+
diff -urNad cernlib-2005.05.09/src/config/site.def /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def
--- cernlib-2005.05.09/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def	2005-06-09 15:52:06.472072084 -0400
@@ -99,9 +99,7 @@
 /*   if it is already defined and false, undef it! */
 /* do not use shift by default
 #if defined(CERNLIB_UNIX) && !defined(CERNLIB_WINNT)
-#if ! defined(CERNLIB_SHIFT)
-#define CERNLIB_SHIFT
-#elif  ! CERNLIB_SHIFT
+#if defined(CERNLIB_SHIFT) && !CERNLIB_SHIFT
 #undef CERNLIB_SHIFT
 #endif
 #endif
diff -urNad cernlib-2005.05.09/src/geant321/gxint/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile
--- cernlib-2005.05.09/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile	2005-06-09 15:52:06.472072084 -0400
@@ -30,7 +30,7 @@
 
 gxint321.f:  gxint.F
 	RemoveFile($@)
-	$(CPP) $(FORTRANALLDEFMDEPEND) < $^ | sed -e '/^$$/d' | CppSedMagic >$@
+	FortranCmd -E $(FORTRANALLDEFMDEPEND) $^ | sed -e '/^$$/d' | CppSedMagic >$@
 
 install.lib:: $(CERN_LIBDIR)/gxint.f
 
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile	2005-06-09 15:52:06.471072296 -0400
@@ -7,8 +7,12 @@
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
 #ifdef CERNLIB_UNIX
+#ifdef CERNLIB_MACOSX
+SUBDIRS:= $(SUBDIRS) scripts
+#else
 SUBDIRS:= $(SUBDIRS) scripts mgr
 #endif
+#endif
 
 InstallLibSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F
--- cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	2005-06-09 15:52:06.483069745 -0400
@@ -92,7 +92,11 @@
 #endif
       ENDIF
       WRITE(Z,'(2D26.16)') H,T
+#if defined(CERNLIB_MACOSX)
+      READ(Z,'(2(4X,D22.16))') H1,T1
+#else
       READ(Z,'(2(D22.16,4X))') H1,T1
+#endif
        IF(IDS .EQ. 1) THEN
       ERRMAX=MAX(ERRMAX,ABS(H1-T1))
       LTEST= LTEST .AND. ERRMAX .LE.  TSTERR
diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F
--- cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	2005-06-09 15:52:06.483069745 -0400
@@ -70,7 +70,11 @@
 #endif
       END IF
       WRITE(Z,'(2D26.16)') R,T
+#if defined(CERNLIB_MACOSX)
+      READ(Z,'(2(4X,D22.16))') R1,T1
+#else
       READ(Z,'(2(D22.16,4X))') R1,T1
+#endif
       ERMAX= MAX(ERMAX,ABS(R1-T1))
       IF(IDS .EQ. 3 .OR. IDS .EQ. 4) THEN
        WRITE(LOUT,'(1X,F10.3,2F25.16,1P,D10.1)') SX,R,T,ABS(R1-T1)
diff -urNad cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile
--- cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
@@ -1,11 +1,11 @@
 
 .SUFFIXES:
 
-CopyFile(cojets.cpp,cojets.cin)
+CopyFile(cojets.cpp,cojets.s)
 CopyFile(decay.cpp,decay.cin)
 CopyFile(table.cpp,table.cin)
 
-CppFileTarget(cojets.dat,cojets.cin,NullParameter,table.cin decay.cin)
+CppFileTarget(cojets.dat,cojets.s,-E -traditional,table.cin decay.cin)
 
 PackageDirFileTarget(cojets.dat)
 
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
@@ -1,9 +1,9 @@
 
 .SUFFIXES:
 
-CopyFile(decay.cpp,decay.cin)
+CopyFile(decay.cpp,decay.s)
 
-CppFileTarget(isajet.dat,decay.cin,NullParameter,NullParameter)
+CppFileTarget(isajet.dat,decay.s,-E -traditional ,NullParameter)
 
 PackageDirFileTarget(isajet.dat)
 
diff -urNad cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c
--- cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2005-06-09 15:52:06.483069745 -0400
@@ -80,7 +80,7 @@
 static int pid;                 /* process identifier                   */
 static int logfd ;              /* logging file descriptor              */
 #if !defined(SOLARIS) && !defined(linux) && !defined(_AIX) \
-  && !defined(IRIX5) && !defined(apollo)
+  && !defined(IRIX5) && !defined(apollo) && !defined(__DARWIN__)
 extern int syslog();
 #endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX */
 extern char *getenv();
diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
--- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:51:53.621804393 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:52:06.485069320 -0400
@@ -2569,7 +2569,7 @@
 #if !defined(IBM) && !defined(_WIN32)
 /* I provide "getpass" myself as standard version truncates to 8 characters */
 #include 
-#ifdef CBREAK
+#if defined(CBREAK) || defined(CERNLIB_MACOSX)
 #define BSDTTY         /* First find out if BSD or SYSV terminal handling.. */
 #endif
  
@@ -2577,6 +2577,10 @@
 #include 
 #else
 #include 
+# if defined(CERNLIB_MACOSX)
+# define gtty(x,y) ioctl(x,TIOCGETP,y)
+# define stty(x,y) ioctl(x,TIOCSETP,y)
+# endif
 #endif
  
 /* Fails with gcc 3.4.3
@@ -3540,3 +3544,20 @@
  
 }
 #endif
+
+#if defined(CERNLIB_MACOSX)
+  /* need to define cuserid() for OS X */
+
+char * getlogin();
+
+char *
+cuserid(char *string)
+{
+  static char cuserid_str[L_cuserid];
+  char *result = (string ? string : cuserid_str);
+  
+  strncpy(result, getlogin(), L_cuserid - 1);
+  result[L_cuserid - 1] = '\0';
+  return result;
+}
+#endif /* CERNLIB_MACOSX */
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c
--- cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	2005-06-09 15:52:06.485069320 -0400
@@ -200,7 +200,7 @@
 || defined(_IBMR2) \
 || defined(__convexc__) \
 || defined(_OSK) \
-|| defined(__linux) || defined(__FreeBSD__)
+|| defined(__linux) || defined(__FreeBSD__) || defined(__DARWIN__)
 
   void systems_( command, buf, buflen, l, chars, rc, ovflw )
 
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
@@ -4,6 +4,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
@@ -10,6 +10,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -11,6 +11,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -6,6 +6,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -7,6 +7,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 	 
 
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -7,6 +7,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h
--- cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	2005-06-09 15:52:06.487068895 -0400
@@ -188,6 +188,17 @@
 #endif
 
 
+#ifdef CERNLIB_MACOSX
+#  define MACOSX
+#  define MACHINE_NAME "MACOSX"
+#  define UNIX
+#  define HAVE_MEMMOVE
+#  define HAVE_STRCASECMP
+#  define HAVE_SELECT
+#  define MATCH_REGCOMP         /* use regcomp/regexec */
+#endif
+
+
 #ifdef MSDOS
 #  define MACHINE_NAME "IBMPC"
 #  define OS_NAME "MSDOS"
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
@@ -26,7 +26,12 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+c     thanks to Keisuke Fujii for this patch for OS X
+#if defined(CERNLIB_MACOSX)
+          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
+#endif
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
@@ -35,7 +40,11 @@
           ENDIF
         ENDIF
       ELSE
+#if defined(CERNLIB_MACOSX)
+        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
+#endif
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
--- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:51:53.524825013 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:57:50.699841388 -0400
@@ -82,11 +82,19 @@
       IF(FEXT.EQ.'.c')THEN
         L=LENOCC(CHCC)
 *                                 'cc -c .... -fPIC name.c'
+#if defined(CERNLIB_MACOSX)
+        CHLINE=CHCC(:L)//' -fPIC -fno-common '//NAME(:LN)// '.c'
+#else
         CHLINE=CHCC(:L)//' -fPIC '//NAME(:LN)// '.c'
+#endif
       ELSE
         L=LENOCC(CHF77)
 *                                 'f77 -c .... -fPIC name.f'
+#if defined(CERNLIB_MACOSX)
+        CHLINE=CHF77(:L)//' -fPIC -fno-common '//NAME(:LN)// '.f'
+#else
         CHLINE=CHF77(:L)//' -fPIC '//NAME(:LN)// '.f'
+#endif
       ENDIF
       L=LENOCC(CHLINE)
       WRITE(LUNOUT,'(A)')CHLINE(:L)
@@ -176,8 +184,15 @@
       ENDIF
 #endif
 #if defined(CERNLIB_LINUX)
+# if defined(CERNLIB_MACOSX)
+      CHLINE= 'g77 -bundle -bind_at_load -bundle_loader '
+     +        '`/usr/bin/which pawX11` -o '
+     +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
+C     thanks to Keisuke Fujii for the above compiler command      
+# else
       CHLINE=                   'g77 -shared -o '
      +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
+# endif
 #endif
 #if defined(CERNLIB_ALPHA_OSF)
         CHLINE=                   'ld -shared -o '
diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -9,7 +9,7 @@
 EXTRA_LDOPTIONS=-Wl,-E
 #endif
 
-#if defined(CERNLIB_LINUX)
+#if defined(CERNLIB_LINUX) && !defined(CERNLIB_MACOSX)
 EXTRA_LDOPTIONS=-Wl,-E
 #endif
 


--- NEW FILE 318-additional-gcc-3.4-fixes.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 318-additional-gcc-3.4-fixes.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Additional fixes for gcc 3.4, courtesy of Andreas Jochens.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
--- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-14 12:31:12.078969103 -0400
+++ /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-14 12:33:16.618251997 -0400
@@ -2405,6 +2405,7 @@
  */
 
 static  FILE *cfile;
+static  rnetrc(), token();
  
 ruserpass(host, aname, apass)
         char *host, **aname, **apass;
@@ -2592,6 +2593,8 @@
 /*** NOTE MAXPASSWD IS DEFINED AS 8 IN ALL STANDARD UNIX SYSTEMS, BUT THIS
  *** GIVES US PROBLEMS INTERWORKING WITH VMS AND CRAY-SECURID SYSTEMS. ***/
 #define MAXPASSWD     20       /* max significant characters in password */
+
+static void (*sig)(), catch();
  
 char *
 getpass(prompt)
@@ -2608,7 +2611,6 @@
         register int c;
         FILE    *fi;
         static char pbuf[ MAXPASSWD + 1 ];
-        void    (*sig)(), catch();
  
         if((fi = fopen("/dev/tty", "r")) == NULL)
                 return((char*)NULL);
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c	1996-03-08 10:33:10.000000000 -0500
+++ /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c	2005-06-14 12:33:43.511482468 -0400
@@ -31,7 +31,7 @@
 /* _Xm routine definitions  */
 void    _XmHighlightBorder ();
 void   _XmUnhighlightBorder ();
-void   _XmDrawShadow ();
+/* void   _XmDrawShadow (); */
 
 /* Motif1.1 ( except apollo, hpux has _XmPrimitive... with two args only
  * Gunter 30-jan-95


--- NEW FILE 700-remove-kernlib-from-packlib-Imakefile.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 700-remove-kernlib-from-packlib-Imakefile.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	2005-06-10 16:46:36.495568752 -0400
+++ /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/Imakefile	2005-06-10 16:50:33.508709032 -0400
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= packlib pawlib graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib pawlib graflib mathlib geant321 mclibs phtools
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
@@ -23,5 +23,5 @@
 DelegateTarget(bin/kuipc,packlib)
 
 DelegateTarget(lib/packlib,packlib)
-DelegateTarget(lib/kernlib,packlib)
+DelegateTarget(lib/kernlib,kernlib)
 
diff -urNad cernlib-2005.05.09/src/packlib/Imakefile /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/packlib/Imakefile
--- cernlib-2005.05.09/src/packlib/Imakefile	1997-10-02 10:09:19.000000000 -0400
+++ /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/packlib/Imakefile	2005-06-10 16:48:25.928085636 -0400
@@ -4,7 +4,7 @@
 
 
 LIBDIRS= cspack epio fatmen ffread hbook hepdb kapack kuip \ @@\
-	 minuit zbook zebra kernlib
+	 minuit zbook zebra
 
 SUBDIRS= $(LIBDIRS)
 
@@ -17,14 +17,10 @@
 
 TestSubdirs($(LIBDIRS))
 
-#ifndef CERNLIB_VAXVMS
-
-InstallLibSubdirs(kernlib)
-
-#else
+#ifdef CERNLIB_VAXVMS
 
 SUBDIRS := $(SUBDIRS) vmslibfiles
-InstallLibSubdirs(kernlib vmslibfiles)
+InstallLibSubdirs(vmslibfiles)
 
 #endif
 


--- NEW FILE 701-patch-hbook-comis-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 701-patch-hbook-comis-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix up makefiles after moving hkfill.F and hkf1q.F in the other
## DP: 701 dpatch (a shell script).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/hbook/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile
--- cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	2005-06-10 17:04:08.866020136 -0400
@@ -19,8 +19,8 @@
 	hgn.F hgnf.F hgnpar.F hgstat.F hhipar.F hhxye.F hi.F \ @@\
 	hictoi.F hid1.F hid2.F hidall.F hidopt.F hidpos.F hie.F  \ @@\
 	hif.F hij.F hije.F hijxy.F hindex.F hinprx.F hinteg.F  \ @@\
-	hipak1.F histdo.F histgo.F hix.F hkf1.F hkf1q.F hkf2.F  \ @@\
-	hkff1.F hkff2.F hkffi1.F hkfi1.F hkfil2.F hkfill.F hkfilpf.F \ @@\
+	hipak1.F histdo.F histgo.F hix.F hkf1.F         hkf2.F  \ @@\
+	hkff1.F hkff2.F hkffi1.F hkfi1.F hkfil2.F          hkfilpf.F \ @@\
 	hkind.F hknul1.F hknuli.F hlabel.F hlabeq.F hlabnb.F \ @@\
 	hlattr.F hlccmp.F hldir.F hldir1.F hldir2.F hldirt.F \ @@\
 	hlgnxt.F hlhcmp.F hlimit.F hllsq.F hlnext.F hlocat.F \ @@\
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:02:24.843306185 -0400
+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:05:09.955931988 -0400
@@ -37,7 +37,8 @@
 	csspar.F cssubr.F cssvpt.F cstadv.F cstarr.F csterr.F cstext.F \ @@\
 	cstfrf.F cstinf.F cstlgb.F cstlog.F cstpar.F cstran.F cstrer.F \ @@\
 	cstypar.F cstype.F csubad.F csunam.F csundf.F csxpar.F \ @@\
-	mcline.F mcsident.F
+	mcline.F mcsident.F \ @@\
+	hkfill.F hkf1q.F /* moved here from src/packlib/hbook/code */
 
 #if defined(CERNLIB_PAW)
 SRCS_F := $(SRCS_F) cspawi.F cskuix.F cktoiv.F cspawv.F csmkvd.F \ @@\


--- NEW FILE 702-patch-Imakefiles-for-packlib-mathlib.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 702-patch-Imakefiles-for-packlib-mathlib.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Hacks to Imakefiles to go along with the 702 shellscript for moving
## DP: files around.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-10 22:19:15.720962444 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-10 22:24:26.783925145 -0400
@@ -1,6 +1,8 @@
 DoIncludePackage(gen)
 #include "pilot.h"
 
+/* rgmlt*.F have been moved into packlib/hbook to remove circular dependencies.
+   --Kevin McCarty, for Debian. */
 SRCS_F=	arithm.F c128.F c256.F c512.F c64.F cauchy64.F cft.F cfstft.F \ @@\
 	rfstft.F cgauss.F d107d1.F d107r1.F d501l1.F d501l2.F d501n1.F \ @@\
         d501n2.F d501p1.F d501p2.F d501sf.F d700su.F d701bd.F \ @@\
@@ -10,14 +12,14 @@
         epditr.F epdje.F epdloc.F epdsrt.F epdtab.F errorf.F esolve.F \ @@\
 	fcn1.F fftrc.F fumili.F gauss.F i128.F i32.F i64.F linsq.F \ @@\
 	mconv.F mft.F minfc.F minsq.F monito.F newro.F old506.F radapt.F \ @@\
-	radmul.F rca.F rfrdh164.F rfrdh264.F rft.F rgmlt64.F rgquad.F \ @@\
+	radmul.F rca.F rfrdh164.F rfrdh264.F rft.F           rgquad.F \ @@\
 	rgs56p.F rgset.F riwiad.F riwibd.F rknys64.F rknysd.F rkstp.F \ @@\
 	rpa.F rps.F rrkstp.F rsa.F rtriint.F s128.F s256.F s512.F \ @@\
 	s64.F scal.F sgz.F simps.F synt.F traper.F triint.F vd01a.F
 
 #if defined(CERNLIB_DOUBLE)
 SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
-	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F rgmlt.F rkstp64.F \ @@\
+	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F         rkstp64.F \ @@\
 	simps64.F triint64.F 
 #if defined(CERNLIB_LINUX)
 /* -O3 optimization breaks in g77 3.2 */
@@ -26,7 +28,7 @@
 #endif
 #else
 SRCS_F:= $(SRCS_F) cgauss128.F cauchy.F cauchy128.F deqbs128.F deqmr128.F \ @@\
-	deriv128.F minfc128.F rfrdh128.F rgmlt128.F rkstp128.F simps128.F \ @@\
+	deriv128.F minfc128.F rfrdh128.F            rkstp128.F simps128.F \ @@\
 	triint128.F 
 #endif
 
diff -urNad cernlib-2005.05.09/src/mathlib/gen/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/Imakefile	1996-10-02 12:09:45.000000000 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/Imakefile	2005-06-10 22:20:55.683416711 -0400
@@ -8,7 +8,8 @@
 IMAKE_DEFINES=-DFortranDoesCpp=NO
 #endif
 
-LIBDIRS= a b c d divon e f g h j m n s u v x
+/* "n" subdir moved to packlib/hbook/  --Kevin McCarty, for Debian */
+LIBDIRS= a b c d divon e f g h j m   s u v x
 
 SUBDIRS= $(LIBDIRS) gen tests
 
diff -urNad cernlib-2005.05.09/src/mathlib/hbook/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/hbook/Imakefile
--- cernlib-2005.05.09/src/mathlib/hbook/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/hbook/Imakefile	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,12 @@
+/* this Imakefile used to get hdiff to compile within the mathlib tree */
+
+#define IHaveSubdirs
+#define PassCDebugFlags
+
+LIBDIRS= hdiff
+SUBDIRS= $(LIBDIRS) hbook
+
+TopOfPackage(hbook)
+SubdirLibraryTarget(hbook,$(LIBDIRS))
+DoIncludePackage(hbook)
+InstallIncludeSubdirs(hbook)
diff -urNad cernlib-2005.05.09/src/mathlib/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/Imakefile
--- cernlib-2005.05.09/src/mathlib/Imakefile	2005-06-10 22:19:15.834937877 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/Imakefile	2005-06-10 22:20:05.279280394 -0400
@@ -3,7 +3,7 @@
 #define PassCDebugFlags 
 
 
-LIBDIRS= gen bvsl
+LIBDIRS= gen bvsl hbook /* hdiff stuff moved from packlib */
 
 /* Lapack is independent of Cernlib and should be installed as one of
    the build dependencies.
diff -urNad cernlib-2005.05.09/src/packlib/hbook/d/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/d/Imakefile
--- cernlib-2005.05.09/src/packlib/hbook/d/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/d/Imakefile	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,25 @@
+/* this Imakefile is used to get some things from mathlib/gen/d to compile
+   within the packlib/hbook tree */
+
+DoIncludePackage(gen)
+#include "pilot.h"
+
+SRCS_F=	rgmlt64.F
+
+#if defined(CERNLIB_DOUBLE)
+SRCS_F:= $(SRCS_F) rgmlt.F
+#else
+SRCS_F:= $(SRCS_F) rgmlt128.F
+#endif
+
+#ifdef CERNLIB_HPUX
+FORTRANOPTIONS += -WF,-P
+#endif
+
+#if defined(CERNLIB_SGI)
+IMAKE_DEFINES=-DFortranDoesCpp=NO
+#endif
+
+FORTRANSAVEOPTION = FortranSaveFlags
+
+SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/hbook/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/Imakefile
--- cernlib-2005.05.09/src/packlib/hbook/Imakefile	1997-04-28 04:21:23.000000000 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/Imakefile	2005-06-10 22:26:27.063010420 -0400
@@ -2,7 +2,9 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-LIBDIRS= hdiff hmerge hquad chbook fpclassc \ @@\
+/* hdiff moved to mathlib to avoid circular DLL dependencies; "d" and "n"
+   moved here from mathlib for the same reasons */
+LIBDIRS= d n   hmerge hquad chbook fpclassc \ @@\
 	 hrz code hmcstat hntup
 
 #ifdef CERNLIB_VAX


--- NEW FILE 703-patch-code_motif-packlib-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 703-patch-code_motif-packlib-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix up Imakefiles, etc. so that code_motif becomes a separate library
## DP: after moving it around in the patch 703 shell script.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/code_motif/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/code_motif/Imakefile
--- cernlib-2005.05.09/src/code_motif/Imakefile	1996-12-10 10:20:59.000000000 -0500
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/code_motif/Imakefile	2005-06-12 10:31:56.480928814 -0400
@@ -10,8 +10,10 @@
 	kuxxt.c mkdcmp.c mkdgra.c mkdpan.c mkmpan.c mkuip.c
 
 MotifDependantMakeVar(SRCS_C,$(MOTIF_SRCS_C))
-	
+
+/* Commented out since kmutil.c has been moved to packlib/kuip/code_kuip
 SRCS_C:= $(SRCS_C) kmutil.c
+*/
 
 #if defined(CERNLIB_VAXVMS)
 
@@ -22,4 +24,10 @@
  
 PACKAGE_INCLUDES := $(PACKAGE_INCLUDES) MotifIncludes X11Includes
 
-SubdirLibraryTarget(NullParameter,NullParameter)
+/* Top of package boilerplate to split this out as a separate library */
+
+TopOfPackage(packlib-lesstif)
+
+SubdirLibraryTarget(packlib-lesstif,NullParameter) 
+
+InstallLibrary(packlib-lesstif,$(CERN_LIBDIR))
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	2005-06-12 10:31:54.221414133 -0400
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/Imakefile	2005-06-12 10:32:20.947673659 -0400
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= kernlib packlib pawlib graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib code_motif pawlib graflib mathlib geant321 mclibs phtools
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	1999-11-24 04:52:07.000000000 -0500
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	2005-06-12 10:31:56.480928814 -0400
@@ -3,7 +3,9 @@
 SRCS_C=	getline.c kalias.c kbrow.c kedit.c kexec.c khash.c kicon.c \ @@\
 	kienbr.c kipiaf.c kkern.c kmacro.c kmath.c kmenu.c kmisc.c \ @@\
 	kmodel.c kmterm.c kuinit.c kutrue.c kuvers.c kuwhag.c	   \ @@\
-	kuwhat.c kvect.c
+	kuwhat.c kvect.c \ @@\
+	kmutil.c
+	/* ^^ moved here from code_motif.  --Kevin McCarty */
 
 #ifdef CERNLIB_WINNT
 SRCS_C :=$(SRCS_C) kmutil0.c
diff -urNad cernlib-2005.05.09/src/packlib/kuip/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/Imakefile	1997-11-28 12:26:56.000000000 -0500
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/Imakefile	2005-06-12 10:31:56.480928814 -0400
@@ -4,11 +4,14 @@
 
 LIBDIRS= code_kuip 
 
+/* Commented out so that code_motif gives a separate shared library
+ * --Kevin McCarty
 #ifndef CERNLIB_WINNT
 LIBDIRS := $(LIBDIRS) code_motif
 #else
 LIBDIRS := $(LIBDIRS) code_windows
 #endif
+*/
 
 SUBDIRS= $(LIBDIRS) programs examples kuip
 


--- NEW FILE 704-patch-code_kuip-higzcc-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 704-patch-code_kuip-higzcc-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch Imakefiles after moving kuwhag.c from packlib to grafX11.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile /tmp/dpep.IDWarm/cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile
--- cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile	1998-11-16 04:36:53.000000000 -0500
+++ /tmp/dpep.IDWarm/cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile	2005-06-13 09:45:37.637201936 -0400
@@ -1,7 +1,7 @@
 DoIncludePackage(higz)
 #include "pilot.h"
 
-SRCS_C=	igvers.c
+SRCS_C=	igvers.c kuwhag.c /* <-- moved here from packlib/kuip/code_kuip */
 
 #if defined(CERNLIB_FALCO) && !defined(CERNLIB_VAX)
 SRCS_C := $(SRCS_C) falint.c 
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile /tmp/dpep.IDWarm/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	2005-06-13 09:44:00.536042728 -0400
+++ /tmp/dpep.IDWarm/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	2005-06-13 09:44:41.448261682 -0400
@@ -2,7 +2,7 @@
 
 SRCS_C=	getline.c kalias.c kbrow.c kedit.c kexec.c khash.c kicon.c \ @@\
 	kienbr.c kipiaf.c kkern.c kmacro.c kmath.c kmenu.c kmisc.c \ @@\
-	kmodel.c kmterm.c kuinit.c kutrue.c kuvers.c kuwhag.c	   \ @@\
+	kmodel.c kmterm.c kuinit.c kutrue.c kuvers.c         	   \ @@\
 	kuwhat.c kvect.c \ @@\
 	kmutil.c
 	/* ^^ moved here from code_motif.  --Kevin McCarty */


--- NEW FILE 705-patch-paw_motif-paw-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 705-patch-paw_motif-paw-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	2005-06-13 16:04:27.418461884 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/Imakefile	2005-06-13 16:04:48.698899728 -0400
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= kernlib packlib code_motif pawlib graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile	1999-08-31 04:47:07.000000000 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile	2005-06-13 16:05:01.263206159 -0400
@@ -1,6 +1,6 @@
 #define IHaveCDF
 
-SRCS_CDF= pawcdf.cdf pamcdf.cdf mlpdef.cdf
+SRCS_CDF= pawcdf.cdf            mlpdef.cdf
 
 #ifdef CERNLIB_IBMRT
 /* Otherwise cc dies with internal compiler error on pawcdf. 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	2005-06-13 16:04:26.689618135 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	2005-06-13 16:04:33.962059051 -0400
@@ -11,8 +11,8 @@
 	pautit.F pavect.F paw.F pawbrk.F pawdef.F pawfca.F \ @@\
 	pawfitz.F pawfop.F pawfu1.F pawfu2.F \ @@\
 	pawfu3.F pawfud.F pawfun.F pawfuy.F pawild.F pawins.F pawint.F \ @@\
-	pawint1.F pawint2.F pawint3.F pawint4.F pawintm.F \ @@\
-	pawjoj.F pawloc.F pawork.F pawpp.F pawrit.F pawrop.F \ @@\
+	pawint1.F pawint2.F pawint3.F pawint4.F           \ @@\
+	pawjoj.F pawloc.F pawork.F         pawrit.F pawrop.F \ @@\
 	pawsim.F pawusr.F pawuwf.F paxcut.F pazdz.F pazfz.F pazrz.F \ @@\
 	pchain.F pchclo.F pchncd.F pchrop.F pcnext.F pfclos.F \ @@\
 	pfhigz.F pfindc.F pfindf.F pfindf1.F pfindv.F pfinit.F pflog.F \ @@\
diff -urNad cernlib-2005.05.09/src/pawlib/paw/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/Imakefile	2000-06-27 11:27:03.000000000 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/Imakefile	2005-06-13 16:04:33.962059051 -0400
@@ -9,6 +9,9 @@
 
 LIBDIRS= code cpaw cdf ntuple mlpfit
 
+/* Comment out this whole section; Motif code has been moved to
+   paw_motif at top level.  -- Kevin McCarty */
+#if 0
 #ifndef CERNLIB_WINNT
 LIBDIRS :=$(LIBDIRS) $(MOTIF_DIRS) $(PAWPP_DIRS)
 #endif
@@ -22,6 +25,7 @@
 MotifDependantMakeVar(PAWPP_DIRS,xbaevms)
 LIBDIRS := $(LIBDIRS) $(PAWPP_DIRS)
 #endif
+#endif
 
 SUBDIRS= $(LIBDIRS) programs piafs hbpiaf stagerd paw
 
diff -urNad cernlib-2005.05.09/src/paw_motif/cdf/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/cdf/Imakefile
--- cernlib-2005.05.09/src/paw_motif/cdf/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/cdf/Imakefile	2005-06-13 16:04:33.963058837 -0400
@@ -0,0 +1,5 @@
+#define IHaveCDF
+
+SRCS_CDF= pamcdf.cdf
+
+SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/paw_motif/code/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/code/Imakefile
--- cernlib-2005.05.09/src/paw_motif/code/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/code/Imakefile	2005-06-13 16:04:33.963058837 -0400
@@ -0,0 +1,7 @@
+SRCS_F=	pawintm.F pawpp.F
+
+DoIncludePackage(paw)
+#include "pilot.h"
+
+SubdirLibraryTarget(NullParameter,NullParameter)
+
diff -urNad cernlib-2005.05.09/src/paw_motif/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/Imakefile
--- cernlib-2005.05.09/src/paw_motif/Imakefile	2000-06-27 11:27:03.000000000 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/Imakefile	2005-06-13 16:04:33.963058837 -0400
@@ -7,7 +7,7 @@
 MotifDependantMakeVar(MOTIF_DIRS,cmotif fmotif fpanelsc)
 MotifDependantMakeVar(PAWPP_DIRS,fpanelsf tree uimx)
 
-LIBDIRS= code cpaw cdf ntuple mlpfit
+LIBDIRS= code cdf
 
 #ifndef CERNLIB_WINNT
 LIBDIRS :=$(LIBDIRS) $(MOTIF_DIRS) $(PAWPP_DIRS)
@@ -23,19 +23,11 @@
 LIBDIRS := $(LIBDIRS) $(PAWPP_DIRS)
 #endif
 
-SUBDIRS= $(LIBDIRS) programs piafs hbpiaf stagerd paw
-
-#if defined CERNLIB_WINNT
-SUBDIRS := $(LIBDIRS) programs
-#endif
-
-TopOfPackage(paw)
-
-SubdirLibraryTarget(paw,$(LIBDIRS))
+SUBDIRS= $(LIBDIRS)
 
-InstallBinSubdirs(programs)
+TopOfPackage(pawlib-lesstif)
 
-TestSubdirs(test)
+SubdirLibraryTarget(pawlib-lesstif,$(LIBDIRS))
 
-InstallIncludeSubdirs(paw)
+InstallLibrary(pawlib-lesstif,$(CERN_LIBDIR))
 


--- NEW FILE 800-implement-shared-library-rules-in-Imake.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 800-implement-shared-library-rules-in-Imake.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Implement macros for shared libraries on Linux in the Imake cfg files.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2005-11-29 17:07:32.035570303 +0000
+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2005-11-29 17:07:40.003888782 +0000
@@ -904,6 +904,8 @@
  * InstallSharedLibrary - generate rules to install the indicated sharable 
  * Library
  */
+/* Commented out because this appears to be overriding the definition
+ * in lnxLib.rules --Kevin McCarty, 16 May 2002
 #undef InstallSharedLibrary
 #ifndef InstallSharedLibrary
 #define InstallSharedLibrary(libname,rev,dest)				@@\
@@ -917,7 +919,8 @@
 	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS)  $< $@		@@\
 	RemoveFile($<)							@@\
 	$(LN) $@ $<
-#endif /* InstallSharedLibrary */
+#endif InstallSharedLibrary
+*/
 
 /*
  * InstallLinkKitLibrary - rule to install Link Kit library.
@@ -1963,6 +1966,15 @@
 #endif /* InstallSubdirs */
 
 /*
+ * InstallSharedLibSubdirs - generate rules to recursively install shared
+ * libraries.  Added by Kevin McCarty for Debian, 15 May 2002
+ */
+#ifndef InstallSharedLibSubdirs
+#define InstallSharedLibSubdirs(dirs) \
+NamedTargetSubdirs(install.shlib,dirs,"installing",DESTDIR=$(DESTDIR),install.shlib)
+#endif /* InstallSharedLibSubdirs */
+
+/*
  * InstallBinSubdirs - generate rules to recursively install programs and
  *		       scripts
  */
@@ -2341,9 +2353,12 @@
  */
 #ifndef DefinePackageLibrary
 #define DefinePackageLibrary(locallib) \
+/* commented out since these will be .so files. -Kevin */		@@\
+/*									@@\
 ifeq ($(strip $(PACKAGE_LIB)),)						@@\
 PACKAGE_LIB=$(TOP)$(PACKAGETOP)/LibraryTargetName($(PACKAGE_NAME))	@@\
 endif									@@\
+*/									@@\
 ifneq (locallib,)							@@\
 override PACKAGE_LIB:= LibraryTargetName(locallib) $(PACKAGE_LIB)	@@\
 									@@\
diff -urNad cernlib-2005.05.09.dfsg~/src/config/biglib.rules cernlib-2005.05.09.dfsg/src/config/biglib.rules
--- cernlib-2005.05.09.dfsg~/src/config/biglib.rules	2000-04-19 10:51:01.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/config/biglib.rules	2005-11-29 17:09:29.336812562 +0000
@@ -227,7 +227,7 @@
 	RanLibrary($@)
 #endif
 
-#if defined(HPArchitecture)
+#if defined(HPArchitecture) && !defined(LinuxArchitecture)
 
 #ifndef SharedLibraryTargetName
 #define SharedLibraryTargetName(name)Concat(lib,name.sl)
@@ -264,7 +264,7 @@
 	@date
 #endif
 
-#elif defined(AlphaArchitecture)
+#elif defined(AlphaArchitecture) && !defined(LinuxArchitecture)
 
 #ifndef SharedLibraryTargetName
 #define SharedLibraryTargetName(name)Concat(lib,name.so)
@@ -281,6 +281,41 @@
 	@date
 #endif
 
+#elif defined(LinuxArchitecture) /* added by Kevin McCarty
+				    for Debian, 15 May 2002 */
+#ifndef SharedLibraryTargetName
+#define SharedLibraryTargetName(name)Concat(lib,name.so.$(LIB_SONAME).$(CERN_LEVEL))
+#endif
+
+#ifndef SharedLibraryBuild
+#define SharedLibraryBuild(libname,version)				@@\
+SharedLibraryTargetName(libname): version/objects.list			@@\
+	@echo rebuild version library $@ in $(CURRENT_DIR)		@@\
+	@$(RM) $@							@@\
+	@date								@@\
+	@$(FCLINK) -shared -Wl,-soname=Concat(lib,libname.so.$(LIB_SONAME))\ @@\
+		-o $@ `cat version/objects.list` `cernlib -v "" -dy libname\ @@\
+		| sed s/Concat(-l,libname)//g`				@@\
+	@date
+#endif
+
+#elif defined(DarwinArchitecture) /* added by Kevin McCarty
+				      for fink, 10 May 2003 */
+#ifndef SharedLibraryTargetName
+#define SharedLibraryTargetName(name)Concat(lib,name.$(LIB_SONAME).$(CERN_LEVEL).dylib)
+#endif
+
+#ifndef SharedLibraryBuild
+#define SharedLibraryBuild(libname,version)				@@\
+SharedLibraryTargetName(libname): version/objects.list			@@\
+	@echo rebuild version library $@ in $(CURRENT_DIR)		@@\
+	@$(RM) $@							@@\
+	@/usr/bin/libtool -dynamic -o $@ -compatibility_version $(LIB_SONAME) \ @@\
+		`cat version/objects.list` `cernlib -v "" -dy libname	\ @@\
+		| sed s/Concat(-l,libname)//g`				@@\
+	@date
+#endif
+
 #elif 1 
 #ifndef SharedLibraryBuild
 #define SharedLibraryBuild(libname,version)				@@\
diff -urNad cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules cernlib-2005.05.09.dfsg/src/config/lnxLib.rules
--- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules	1995-12-20 15:26:45.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules	2005-11-29 17:07:40.004888571 +0000
@@ -43,6 +43,9 @@
 #ifndef PositionIndependentCplusplusFlags
 #define PositionIndependentCplusplusFlags -fPIC
 #endif
+#ifndef PositionIndependentFortranFlags
+#define PositionIndependentFortranFlags -fPIC
+#endif
 
 /*
  * InstallSharedLibrary - generate rules to install the shared library.
@@ -50,13 +53,20 @@
  */
 #ifndef InstallSharedLibrary
 #define	InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.so.rev) 					@@\
+.PHONY: install.shlib shlib/libname					@@\
+shlib/libname:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+install.shlib:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+$(DESTDIR)dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\
 	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
 	(T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
 		$(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T)	@@\
 	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
-	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
+	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so) @@\
+	$(RM) $<                                                        @@\
+	$(LN) $@ $<
 #endif /* InstallSharedLibrary */
 
 /*


--- NEW FILE 801-non-optimized-rule-uses-fPIC-g.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 801-non-optimized-rule-uses-fPIC-g.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Ensure that special rules for creating non-optimized object files
## DP: use -fPIC for files that go into shared libs, and -g for all files.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/config/fortran.rules /tmp/dpep.gResDB/cernlib-2005.05.09/src/config/fortran.rules
--- cernlib-2005.05.09/src/config/fortran.rules	1997-05-30 12:25:18.000000000 -0400
+++ /tmp/dpep.gResDB/cernlib-2005.05.09/src/config/fortran.rules	2005-06-09 10:37:19.092244331 -0400
@@ -345,9 +345,9 @@
 
 #ifndef SpecialFortranLibObjectRule
 #define SpecialFortranLibObjectRule(baseobj,basedep,options,cppoptions)	@@\
-SpecialFortranArchiveObjectRule(baseobj,basedep,options,cppoptions)	@@\
-SpecialFortranSharedObjectRule(baseobj,basedep,options,cppoptions)	@@\
-SpecialFortranDebugObjectRule(baseobj,basedep,options,cppoptions)
+SpecialFortranArchiveObjectRule(baseobj,basedep,options -g,cppoptions)	    @@\
+SpecialFortranSharedObjectRule(baseobj,basedep,options -g -fPIC,cppoptions) @@\
+SpecialFortranDebugObjectRule(baseobj,basedep,options -g,cppoptions)
 #endif
 
 #ifndef SpecialFortranArchiveObjectRule
diff -urNad cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile /tmp/dpep.gResDB/cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile
--- cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile	1996-09-23 10:20:46.000000000 -0400
+++ /tmp/dpep.gResDB/cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile	2005-06-09 10:37:55.631538119 -0400
@@ -3,7 +3,7 @@
 	plotisto.F pmhist.F pminit.F show_chain.F
 
 #ifdef CERNLIB_LINUX
-FORTRANOPTIONS = -fno-backslash  $(FORTRANSAVEOPTION) -fno-second-underscore
+FORTRANOPTIONS = -g -fno-backslash  $(FORTRANSAVEOPTION) -fno-second-underscore
 #endif
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile /tmp/dpep.gResDB/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	1999-09-14 05:20:08.000000000 -0400
+++ /tmp/dpep.gResDB/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	2005-06-09 10:40:47.421285771 -0400
@@ -46,8 +46,8 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
-SpecialObjectRule(archive/qp_execute.o,qp_execute.c archive/qp_execute.d,-O0 -o $@)
-SpecialObjectRule(debug/qp_execute.o,qp_execute.c debug/qp_execute.d,-O0 -o $@)
-SpecialObjectRule(shared/qp_execute.o,qp_execute.c shared/qp_execute.d,-O0 -o $@)
+#if defined(CERNLIB_LINUX)
+SpecialObjectRule(archive/qp_execute.o,qp_execute.c archive/qp_execute.d,-O0 -g -o $@)
+SpecialObjectRule(debug/qp_execute.o,qp_execute.c debug/qp_execute.d,-O0 -g -o $@)
+SpecialObjectRule(shared/qp_execute.o,qp_execute.c shared/qp_execute.d,-O0 -g -fPIC -o $@)
 #endif


--- NEW FILE 802-create-shared-libraries.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 802-create-shared-libraries.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Actually implement the rules to create shared libraries.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile
--- cernlib-2005.05.09.dfsg~/src/Imakefile	2005-12-01 15:19:24.191267776 +0000
+++ cernlib-2005.05.09.dfsg/src/Imakefile	2005-12-01 15:20:10.310483251 +0000
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib mathlib graflib code_motif mclibs phtools pawlib paw_motif geant321
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
@@ -15,6 +15,7 @@
 #endif
 
 InstallLibSubdirs($(LIBDIRS))
+InstallSharedLibSubdirs($(LIBDIRS))
 
 INCLUDEDIRS= $(LIBDIRS) cfortran
 
diff -urNad cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile cernlib-2005.05.09.dfsg/src/code_motif/Imakefile
--- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile	2005-12-01 15:19:24.062295137 +0000
+++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -31,3 +31,4 @@
 SubdirLibraryTarget(packlib-lesstif,NullParameter) 
 
 InstallLibrary(packlib-lesstif,$(CERN_LIBDIR))
+InstallSharedLibrary(packlib-lesstif,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-12-01 15:19:23.018516575 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -26,6 +26,7 @@
 
 InstallLibrary(geant321,$(CERN_LIBDIR))
 InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
+InstallSharedLibrary(geant321,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 /* Fluka removed from Debian source package for copyright reasons. */
 /*
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile	1996-12-19 14:19:18.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -10,6 +10,7 @@
 SubdirLibraryTarget(geant321_parallel,NullParameter)
 
 InstallLibrary(geant321_parallel,$(CERN_LIBDIR))
+InstallSharedLibrary(geant321_parallel,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 CopyFile(../gbase/grun.F,grun.F)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/Imakefile cernlib-2005.05.09.dfsg/src/graflib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/graflib/Imakefile	2001-12-11 15:06:28.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -11,9 +11,12 @@
 
 SubdirLibraryTarget(graflib,$(LIBDIRS))
 
-InstallLibrary(graflib,$(CERN_LIBDIR))
-
 InstallLibSubdirs(higz)
+InstallSharedLibSubdirs(higz)
+
+/* these lines follow the above because graflib depends on grafX11 */
+InstallLibrary(graflib,$(CERN_LIBDIR))
+InstallSharedLibrary(graflib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(higz)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile
--- cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile	1997-09-02 13:34:47.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -13,6 +13,7 @@
 SubdirLibraryTarget(grafX11,$(LIBDIRS))
 
 InstallLibrary(grafX11,$(CERN_LIBDIR))
+InstallSharedLibrary(grafX11,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(examples)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile	2002-04-26 14:37:20.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -14,6 +14,7 @@
 
 InstallLibrary(kernlib,$(CERN_LIBDIR))
 InstallLibraryAlias(kernlib,kernlib-shift,$(CERN_LIBDIR))
+InstallSharedLibrary(kernlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 test::	LibraryTargetName(kernlib)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile	2005-12-01 15:19:24.005307227 +0000
+++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -19,6 +19,7 @@
 SubdirLibraryTarget(mathlib,$(LIBDIRS))
 
 InstallLibrary(mathlib,$(CERN_LIBDIR))
+InstallSharedLibrary(mathlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 InstallIncludeSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile	2005-12-01 15:19:22.512623901 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -13,6 +13,7 @@
 TestSubdirs($(LIBDIRS))
 
 InstallLibSubdirs($(LIBDIRS))
+InstallSharedLibSubdirs($(LIBDIRS))
 
 /* Again, purge Pythia, Jetset and dependents. */
 INCLUDEDIRS= cojets eurodec herwig isajet pdf
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile	1996-05-06 20:06:50.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
 SubdirLibraryTarget(cojets,$(LIBDIRS))
 
 InstallLibrary(cojets,$(CERN_LIBDIR))
+InstallSharedLibrary(cojets,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 SubdirDataFile($(LIBRARY),cojets.dat,data)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile	1996-05-06 20:06:55.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
 SubdirLibraryTarget(eurodec,$(LIBDIRS))
 
 InstallLibrary(eurodec,$(CERN_LIBDIR))
+InstallSharedLibrary(eurodec,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 SubdirDataFile($(LIBRARY),eurodec.dat,data)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile	1997-01-06 17:06:41.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -10,6 +10,7 @@
 
 InstallLibrary(herwig59,$(CERN_LIBDIR))
 InstallLibraryAlias(herwig59,herwig,$(CERN_LIBDIR))
+InstallSharedLibrary(herwig59,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(test)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile	2001-10-08 14:03:02.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
 SubdirLibraryTarget(isajet758,$(LIBDIRS))
 
 InstallLibrary(isajet758,$(CERN_LIBDIR))
+InstallSharedLibrary(isajet758,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 SubdirDataFile($(LIBRARY),isajet.dat,data)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile	2000-05-29 14:49:59.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -15,6 +15,7 @@
 SubdirLibraryTarget(pdflib804,spdf npdf)
 
 InstallLibrary(pdflib804,$(CERN_LIBDIR))
+InstallSharedLibrary(pdflib804,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(tpdf)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile	1999-03-26 10:52:23.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -15,6 +15,7 @@
 SubdirLibraryTarget(photos202,code)
 
 InstallLibrary(photos202,$(CERN_LIBDIR))
+InstallSharedLibrary(photos202,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(test)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/Imakefile cernlib-2005.05.09.dfsg/src/packlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile	2005-12-01 15:19:23.885332680 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -14,6 +14,7 @@
 
 InstallLibrary(packlib,$(CERN_LIBDIR))
 InstallLibraryAlias(packlib,packlib-shift,$(CERN_LIBDIR))
+InstallSharedLibrary(packlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile
--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile	2005-12-01 15:19:24.192267563 +0000
+++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -30,4 +30,5 @@
 SubdirLibraryTarget(pawlib-lesstif,$(LIBDIRS))
 
 InstallLibrary(pawlib-lesstif,$(CERN_LIBDIR))
+InstallSharedLibrary(pawlib-lesstif,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile	1996-10-01 14:12:23.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -11,6 +11,7 @@
 SubdirLibraryTarget(pawlib,$(LIBDIRS))
 
 InstallLibrary(pawlib,$(CERN_LIBDIR))
+InstallSharedLibrary(pawlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 InstallIncludeSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/Imakefile cernlib-2005.05.09.dfsg/src/phtools/Imakefile
--- cernlib-2005.05.09.dfsg~/src/phtools/Imakefile	1996-11-14 16:44:33.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile	2005-12-01 15:19:31.189783029 +0000
@@ -11,7 +11,7 @@
 SubdirLibraryTarget(phtools,$(LIBDIRS))
 
 InstallLibrary(phtools,$(CERN_LIBDIR))
-InstallSharedLibrary(phtools,$(CERN_LEVEL),$(CERN_SHLIBDIR))
+InstallSharedLibrary(phtools,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(wicoexam)
 


--- NEW FILE 803-link-binaries-dynamically.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 803-link-binaries-dynamically.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Link binaries dynamically against Cern libraries.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/config/fortran.rules /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules
--- cernlib-2005.05.09/src/config/fortran.rules	2005-06-13 15:26:19.991403858 -0400
+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules	2005-06-13 15:26:23.699609849 -0400
@@ -189,13 +189,13 @@
  */
 #ifndef CernlibDependLibrary
 #define CernlibDependLibrary(cernlibs)\
-$(filter-out +%,$(filter-out -%,$(shell cernlib cernlibs)))
+$(filter-out +%,$(filter-out -%,$(shell cernlib -dy cernlibs)))
 #endif
 
 /* Helper to use cernlib command
  */
 #ifndef CernlibCmd
-#define CernlibCmd(libraries)cernlib libraries
+#define CernlibCmd(libraries)cernlib -dy libraries
 #endif
 /*
  * CernlibFortranProgramTarget - rule to link fortran program using
@@ -207,7 +207,7 @@
 ProgramTargetName(program): SetWin32ObjSuffix(objects) deplibs CernlibDependLibrary(cernlibs)	@@\
 	RemoveTargetProgram($@)						@@\
 	@echo "Linking with cern libraries"				@@\
-	@cernlib cernlibs						@@\
+	@cernlib -dy cernlibs						@@\
 	CernlibFortranLinkRule($@,$(FCLDOPTIONS),objects,locallibs $(LDLIBS),CernlibCmd(cernlibs)) @@\
 									@@\
 clean::									@@\
@@ -233,8 +233,8 @@
 ProgramTargetName(program): objects deplibs CernlibDependLibrary(cernlibs) @@\
 	RemoveTargetProgram($@)						@@\
 	@echo "Linking with cern libraries"				@@\
-	@cernlib cernlibs						@@\
-	CernlibLinkRule($@,$(LDOPTIONS),objects,locallibs $(LDLIBS),cernlib cernlibs) @@\
+	@cernlib -dy cernlibs						@@\
+	CernlibLinkRule($@,$(LDOPTIONS),objects,locallibs $(LDLIBS),cernlib -dy cernlibs) @@\
 									@@\
 clean::									@@\
 	RemoveFile(ProgramTargetName(program))				@@\
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-13 15:26:18.903636773 -0400
+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-13 15:26:23.699609849 -0400
@@ -13,14 +13,14 @@
 DefinePackageLibrary(kxtlib)
 
 #if defined(CERNLIB_UNIX)
-CLIBS= -G Motif kernlib
+CLIBS= -G Motif Xm
 #endif
 
 #if defined(CERNLIB_VAXVMS)
-CLIBS= graflib/motif packlib kernlib
+CLIBS= -G Motif Xm
 #endif
 
 
-CernlibCcProgramTarget(kxterm,kxterm.o,libkxtlib.a,libkxtlib.a,$(CLIBS))
+CernlibFortranProgramTarget(kxterm,kxterm.o,libkxtlib.a,libkxtlib.a,$(CLIBS))
 
 InstallProgram(kxterm,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-13 15:26:19.418526524 -0400
+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-13 15:27:38.102678258 -0400
@@ -20,7 +20,7 @@
 InstallScript(paw,$(CERN_BINDIR))
 
 #if defined (CERNLIB_UNIX) && !defined(CERNLIB_WINNT)
-CernlibFortranProgramTarget(pawX11,0pamain.o,NullParameter,NullParameter,pawlib graflib/X11 packlib mathlib kernlib)
+CernlibFortranProgramTarget(pawX11,0pamain.o,NullParameter,NullParameter,-G X11 pawlib)
 
 InstallProgram(pawX11,$(CERN_BINDIR))
 
@@ -34,7 +34,7 @@
 /* This is a gmake ifeq, not a Imake/cpp #if... ! */
 ifeq ($(DO_PAW_PP),YES)
 
-CernlibFortranProgramTarget(paw++,0pamainm.o,NullParameter,NullParameter,pawlib graflib/Motif packlib mathlib kernlib)
+CernlibFortranProgramTarget(paw++,0pamainm.o,NullParameter,NullParameter,-G Motif pawlib)
 
 InstallProgram(paw++,$(CERN_BINDIR))
 


--- NEW FILE 804-workaround-for-comis-mdpool-struct-location.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 804-workaround-for-comis-mdpool-struct-location.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Hack to workaround Comis not liking it when code has a negative
## DP: offset from the mdpool struct (as is the case when using shared
## DP: libraries on some arches).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/Examples/pamain.c /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/cfortran/Examples/pamain.c
--- cernlib-2005.05.09/src/cfortran/Examples/pamain.c	2002-09-12 12:05:18.000000000 -0400
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/cfortran/Examples/pamain.c	2005-06-11 09:59:51.875449396 -0400
@@ -2,6 +2,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define PAWC_SIZE 9000000
 
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc
--- cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc	2000-05-30 09:53:58.000000000 -0400
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc	2005-06-11 09:59:51.876449180 -0400
@@ -15,7 +15,9 @@
 *
 * cspar.inc
 *
-        PARAMETER (LHP=50006, KON1=17694720, KON2=KON1
+#include "comis/mdsize.h"
+
+        PARAMETER (LHP=MDSIZE, KON1=17694720, KON2=KON1
      +, KON3=2**16, LRECU=8,NRECU=5,MLRECU=NRECU*LRECU
      +, MXRECU=MLRECU-LRECU
      1,      LASTK=2000,LSSTK=50,KLENID=32
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h
--- cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,33 @@
+#ifndef _MDPOOL_H
+#define _MDPOOL_H
+
+/* mdpool.h */
+
+/* #include  or  in one source code file of
+ * your executable program dynamically linked against libpaw
+ * so that MDPOOL is defined in your executable.  This is
+ * necessary for proper functioning of the COMIS interpreter when
+ * dynamically linked.
+ */
+
+/* define MDSIZE: */
+#include 
+
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+  int iq[MDSIZE];
+} mdpool_def;
+
+#define MDPOOL COMMON_BLOCK(MDPOOL, mdpool)
+COMMON_BLOCK_DEF(mdpool_def, MDPOOL);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* _MDPOOL_H */
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc
--- cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc	1996-02-26 12:16:34.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc	2005-06-11 09:59:51.876449180 -0400
@@ -12,6 +12,8 @@
 *
 * mdpool.inc
 *
+#include "comis/cspar.inc"
+
       COMMON/MDPOOL/IQ(LHP)
       INTEGER ISEM(LHP),KD(LHP),IDA(LHP),KD1(99),KD2(99),KD3(99)
       EQUIVALENCE (IQ,ISEM),(IQ,KD),(IQ,IDA)
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h
--- cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,6 @@
+#ifndef _MDSIZE_H
+#define _MDSIZE_H
+
+#define MDSIZE 50006
+
+#endif
diff -urNad cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c
--- cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c	1999-11-15 08:36:24.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c	2005-06-11 09:59:51.875449396 -0400
@@ -39,21 +39,20 @@
 /*-- Author :*/
 
 #include 
+#include 
+#include 
+#include "comis/mdsize.h"
 
 typedef struct {
-    int iq[6];
+    int iq[MDSIZE]; /* instead of int iq[6] */
 } mdpool_def;
 
 #define MDPOOL COMMON_BLOCK(MDPOOL,mdpool)
-COMMON_BLOCK_DEF(mdpool_def,MDPOOL);
+extern COMMON_BLOCK_DEF(mdpool_def,MDPOOL);
 
-unsigned long iqpntr = (unsigned long)MDPOOL.iq;
+unsigned long iqpntr = 0;
 
 
-#ifdef CERNLIB_WINNT
-# include 
-#endif
-
 #if defined(CERNLIB_QX_SC)
 int type_of_call csallo_(lenb)
 #endif
@@ -65,11 +64,31 @@
 #endif
  int *lenb;
 {
-  long lpntr;
+  unsigned long lpntr;
   int pntr; 
 
+  if (! iqpntr)
+    iqpntr = (unsigned long)MDPOOL.iq;
   lpntr= (long)( malloc(*lenb) );
-  pntr=lpntr - iqpntr;
+  if (! lpntr) {
+    fprintf(stderr,
+	    "CSALLO: not enough dynamic memory to allocate %d bytes\n", *lenb);
+    exit(EXIT_FAILURE);
+  }
+
+  pntr = (long)lpntr - (long)iqpntr;
+  if (pntr < 0) {
+    fprintf(stderr, "CSALLO: heap below bss?!");
+#if defined (CERNLIB_DEBIAN)
+    fprintf(stderr, "\n"
+"See the file /usr/share/doc/libpawlib2-dev/README.Debian for more information.\n"
+"If it does not help to solve this problem, please file a bug report against\n"
+"the libpawlib2 package, including the source code of your executable.\n");
+#else
+    fprintf(stderr, "  Try linking against pawlib statically.\n");
+#endif
+    exit(EXIT_FAILURE);
+  }
   return pntr;
 }
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc
--- cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc	1996-03-01 11:50:06.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc	2005-06-11 09:59:51.875449396 -0400
@@ -28,5 +28,9 @@
 #include "paw/pawsmall.inc"
 #endif
 
+C      Include this file so that MDPOOL/IQ is present in pawX11 and
+C      paw++ dynamically linked executables.
+C      -- Kevin McCarty, for Debian, 1 Nov 2003
+#include "comis/mdpool.inc"
 
 #endif
diff -urNad cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc
--- cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc	1996-03-01 11:50:06.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc	2005-06-11 09:59:51.875449396 -0400
@@ -28,5 +28,9 @@
 #include "paw/pawsmall.inc"
 #endif
 
+C      Include this file so that MDPOOL/IQ is present in pawX11 and
+C      paw++ dynamically linked executables.
+C      -- Kevin McCarty, for Debian, 1 Nov 2003
+#include "comis/mdpool.inc"
 
 #endif


--- NEW FILE 805-expunge-missing-mathlib-kernlib-symbols.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 805-expunge-missing-mathlib-kernlib-symbols.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove some unreferenced symbols from mathlib and kernlib.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile
--- cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile	2002-09-19 12:44:52.000000000 -0400
+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile	2005-06-13 11:20:33.838151240 -0400
@@ -1,6 +1,8 @@
 #ifndef CERNLIB_VAXVMS
 
-SRCS_F= accessf.F chdirf.F getenvf.F getwdf.F lstatf.F perrorf.F \ @@\
+/* perrorf.F has been removed since it depends upon files which introduce
+   unreferenced dependencies into the shared libraries.  --Kevin McCarty */
+SRCS_F= accessf.F chdirf.F getenvf.F getwdf.F lstatf.F           \ @@\
 	readlnf.F renamef.F setenvf.F statf.F systemf.F tmpro.F \ @@\
 	tmproi.F toslat.F unlinkf.F
 
diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-13 11:12:24.894703741 -0400
+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-13 11:16:54.864966246 -0400
@@ -2,20 +2,22 @@
 #include "pilot.h"
 
 /* rgmlt*.F have been moved into packlib/hbook to remove circular dependencies.
+   Some other files have been removed from this list because they depend upon
+   non-existent functions.
    --Kevin McCarty, for Debian. */
-SRCS_F=	arithm.F c128.F c256.F c512.F c64.F cauchy64.F cft.F cfstft.F \ @@\
+SRCS_F=	         c128.F c256.F c512.F c64.F cauchy64.F cft.F cfstft.F \ @@\
 	rfstft.F cgauss.F d107d1.F d107r1.F d501l1.F d501l2.F d501n1.F \ @@\
         d501n2.F d501p1.F d501p2.F d501sf.F d700su.F d701bd.F \ @@\
         dadapt.F deqbs64.F deqmr64.F deriv64.F dfunft.F dgs56p.F \ @@\
         dmaxlk.F dsumsq.F elanal.F elpahy.F epdbps.F epdchk.F \ @@\
-        epdchn.F epdcj.F epde1.F epdecc.F epdfix.F epdin.F \ @@\
-        epditr.F epdje.F epdloc.F epdsrt.F epdtab.F errorf.F esolve.F \ @@\
-	fcn1.F fftrc.F fumili.F gauss.F i128.F i32.F i64.F linsq.F \ @@\
-	mconv.F mft.F minfc.F minsq.F monito.F newro.F old506.F radapt.F \ @@\
+                 epdcj.F                  epdfix.F epdin.F \ @@\
+        epditr.F epdje.F epdloc.F epdsrt.F epdtab.F          esolve.F \ @@\
+	       fftrc.F          gauss.F i128.F i32.F i64.F         \ @@\
+	mconv.F mft.F minfc.F         monito.F newro.F          radapt.F \ @@\
 	radmul.F rca.F rfrdh164.F rfrdh264.F rft.F           rgquad.F \ @@\
 	rgs56p.F rgset.F riwiad.F riwibd.F rknys64.F rknysd.F rkstp.F \ @@\
 	rpa.F rps.F rrkstp.F rsa.F rtriint.F s128.F s256.F s512.F \ @@\
-	s64.F scal.F sgz.F simps.F synt.F traper.F triint.F vd01a.F
+	s64.F scal.F       simps.F synt.F traper.F triint.F vd01a.F
 
 #if defined(CERNLIB_DOUBLE)
 SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
diff -urNad cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile	1996-05-01 09:21:53.000000000 -0400
+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile	2005-06-13 11:19:42.456136998 -0400
@@ -1,9 +1,12 @@
-SRCS_F=	addbnd.F bfgs.F bndopt.F bndtst.F bounds.F bucmve.F \ @@\
-	bufopt.F delbnd.F delete.F delslv.F divon.F dvcopy.F dvdot.F \ @@\
-	dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F fun.F genpnt.F \ @@\
-	grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\
-	newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\
-	quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\
+/* Some files deleted from the below list since they depend upon the
+   lepto63 library, which cannot be included in Debian for licensing reasons. */
+
+SRCS_F=	addbnd.F bfgs.F          bndtst.F bounds.F bucmve.F \ @@\
+	         delbnd.F delete.F                  dvcopy.F dvdot.F \ @@\
+	dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F                \ @@\
+	                  ldlsol.F          modchl.F          mxstep.F \ @@\
+	newptq.F nmdchl.F         nodaud.F orthvc.F         quad.F \ @@\
+	quasi.F ranums.F          rlen.F settol.F shrnk.F         \ @@\
 	treaud.F tredmp.F tstext.F usrint.F usrtrm.F
 
 FORTRANSAVEOPTION = FortranSaveFlags


--- NEW FILE 806-bump-mathlib-and-dependents-sonames.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 806-bump-mathlib-and-dependents-sonames.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Bump so versions of mathlib and dependents since it is now compiled
## DP: against liblapack3 instead of liblapack2.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-11-23 15:49:19.722162373 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-11-23 15:49:27.431512287 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 AllTarget(geant321)
 
 /* Fluka removed from Debian source package for copyright reasons. */
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile	2005-11-23 15:49:19.723162159 +0000
+++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile	2005-11-23 15:49:27.431512287 +0000
@@ -2,6 +2,7 @@
 #define IHaveSubdirs
 #define PassCDebugFlags 
 
+export LIB_SONAME := 2
 
 LIBDIRS= gen bvsl hbook /* hdiff stuff moved from packlib */
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile	2005-11-23 15:49:19.723162159 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile	2005-11-23 15:49:27.431512287 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 AllTarget(cojets)
 
 LIBDIRS= code cojdata cojtapew
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 SUBDIRS= code doc test herwig59
 
 TopOfPackage(herwig59)
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -3,6 +3,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 LIBDIRS= code isadata isasusy isarun isatape
 
 SUBDIRS= $(LIBDIRS) test data isajet
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -6,6 +6,8 @@
 IMAKE_DEFINES=-DFortranDoesCpp=NO
 #endif
 
+export LIB_SONAME := 2
+
 AllTarget(pdflib804)
 
 SUBDIRS= spdf npdf tpdf pdf
diff -urNad cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile
--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -1,6 +1,8 @@
 DoIncludePackage(paw)
 #include "paw/pilot.h"
 
+export LIB_SONAME := 2
+
 #define IHaveSubdirs
 #define PassCDebugFlags
 
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -2,6 +2,7 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
 
 LIBDIRS= comis paw sigma
 SUBDIRS= $(LIBDIRS)
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/Imakefile cernlib-2005.05.09.dfsg/src/phtools/Imakefile
--- cernlib-2005.05.09.dfsg~/src/phtools/Imakefile	2005-11-23 15:49:19.725161731 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 LIBDIRS= genbod fowl wico
 
 SUBDIRS= $(LIBDIRS) wicoexam

cernlib-enforce-FHS.diff:

--- NEW FILE cernlib-enforce-FHS.diff ---
diff -ur ../original-cernlib-source/src/geant321/miface/gmorin.F src/geant321/miface/gmorin.F
--- ../original-cernlib-source/src/geant321/miface/gmorin.F     Mon Sep 30 10:26:05 1996
+++ src/geant321/miface/gmorin.F     Tue Oct 22 07:27:55 2002
@@ -112,7 +112,7 @@
          OPEN(UNIT=MICROS,FILE=XSFILE, STATUS='OLD',READONLY)
 #endif
 #if defined(CERNLIB_UNIX)||defined(CERNLIB_CRAY)
-         XSFILE = 'xsneut95.dat'
+         XSFILE = 'DATADIR/xsneut95.dat'
          INQUIRE(FILE=XSFILE,EXIST=EXISTS)
          IF(.NOT.EXISTS) THEN
             CHROOT=' '
diff -ur ../original-cernlib-source/src/mclibs/cojets/test/test.F src/mclibs/cojets/test/test.F
--- ../original-cernlib-source/src/mclibs/cojets/test/test.F    Mon Mar 25 07:53:36 1996
+++ src/mclibs/cojets/test/test.F    Tue Oct 22 07:27:55 2002
@@ -6,7 +6,7 @@
 #if defined(CERNLIB_IBMVM)
       PARAMETER (DFILE='/COJETS DATA *')
 #else
-      PARAMETER (DFILE='cojets.dat')
+      PARAMETER (DFILE='DATADIR/cojets.dat')
 #endif
 C
 C          MAIN PROGRAM FOR COJETS
diff -ur ../original-cernlib-source/src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/eurodec/eurodec/eufiles.inc
--- ../original-cernlib-source/src/mclibs/eurodec/eurodec/eufiles.inc   Fri Mar  8 11:58:49 1996
+++ src/mclibs/eurodec/eurodec/eufiles.inc   Tue Oct 22 07:27:55 2002
@@ -18,7 +18,7 @@
       PARAMETER (ETFILE='/EUTITLE DAT   *')
 #endif
       CHARACTER*(*) EDFILE,ETFILE
-      PARAMETER (EDFILE='eurodec.dat')
+      PARAMETER (EDFILE='DATADIR/eurodec.dat')
       PARAMETER (ETFILE='eutitle.dat')

 #endif
diff -ur ../original-cernlib-source/src/mclibs/isajet/test/isajett.F src/mclibs/isajet/test/isajett.F
--- ../original-cernlib-source/src/mclibs/isajet/test/isajett.F Fri Mar 14 12:32:39 1997
+++ src/mclibs/isajet/test/isajett.F Tue Oct 22 07:27:55 2002
@@ -8,7 +8,7 @@
 #if defined(CERNLIB_VAXVMS)
       PARAMETER (DFILE='CERN_ROOT:[lib]isajet.dat')
 #else
-      PARAMETER (DFILE='isajet.dat')
+      PARAMETER (DFILE='DATADIR/isajet.dat')
 #endif
 #endif
 C

cernlib-gxint-script.diff:

--- NEW FILE cernlib-gxint-script.diff ---
--- src/scripts/gxint-old	2005-11-23 23:11:08.000000000 +0100
+++ src/scripts/gxint	2005-11-29 11:42:30.000000000 +0100
@@ -103,15 +103,8 @@
    echo "gxint_Warning: no user program specified"
 fi
  
- 
- 
-if [ -z "$CERN" ] ; then
-  if [ ! -d /cern ]; then
-   echo "gxint_Error: shell variable CERN must be set or /cern must exist"
-   exit 1
-  fi
-  CERN="/cern" ; export CERN
-fi
+# not used after the sed one liner in the spec file 
+if [ -z "$CERN" ] ; then CERN="/usr"
  
 if [ "$drv" = "/GKS" ] ; then
   if [ -z "$GKSR" ] ; then

cernlib-hwhiga_use_dimag.diff:

--- NEW FILE cernlib-hwhiga_use_dimag.diff ---
--- src/mclibs/herwig/code/hwhiga.F.old	2005-06-24 09:45:07.000000000 +0200
+++ src/mclibs/herwig/code/hwhiga.F	2005-06-24 10:11:59.000000000 +0200
@@ -73,7 +73,7 @@
       TAMP(7)=HWHIG5(U,T,S,EMH2,EMQ2,3,0,6,0,0,0)
       DO 20 I=1,7
       TAMPI(I)= DBLE(TAMP(I))
-  20  TAMPR(I)=-IMAG(TAMP(I))
+  20  TAMPR(I)=-DIMAG(TAMP(I))
 C Square and add prefactors
       WTGG=0.03125*FLOAT(NCOLO*(NCOLO**2-1))
      &    *(TAMPR(1)**2+TAMPI(1)**2+TAMPR(2)**2+TAMPI(2)**2

cernlib-hwuli2_use_dimag.diff:

--- NEW FILE cernlib-hwuli2_use_dimag.diff ---
--- src/mclibs/herwig/code/hwuli2.F.old	2005-06-24 10:09:09.000000000 +0200
+++ src/mclibs/herwig/code/hwuli2.F	2005-06-24 10:11:52.000000000 +0200
@@ -19,7 +19,7 @@
       PROD(Y,Y2)=Y*(ONE+A1*Y*(ONE+A2*Y*(ONE+A3*Y2*(ONE+A4*Y2*(ONE+A5*Y2*
      & (ONE+A6*Y2*(ONE+A7*Y2*(ONE+A8*Y2*(ONE+A9*Y2*(ONE+A10*Y2))))))))))
       XR=DBLE(X)
-      XI=IMAG(X)
+      XI=DIMAG(X)
       R2=XR*XR+XI*XI
       IF (R2.GT.ONE.AND.(XR/R2).GT.HALF) THEN
          Z=-LOG(ONE/X)

cernlib_2005.05.09.dfsg-2.diff:

***** Error reading new file: [Errno 2] No such file or directory: 'cernlib_2005.05.09.dfsg-2.diff'

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Nov 2005 23:34:07 -0000	1.2
+++ .cvsignore	9 Dec 2005 15:57:06 -0000	1.3
@@ -1,15 +1,15 @@
-include.tar.gz
-src_Imakefile.tar.gz
 src_car.tar.gz
+src_Imakefile.tar.gz
+src_patchy.tar.gz
 src_cfortran.tar.gz
-src_config.tar.gz
-src_geant321.tar.gz
-src_graflib.tar.gz
 src_include.tar.gz
-src_mathlib.tar.gz
-src_mclibs.tar.gz
-src_packlib.tar.gz
-src_patchy.tar.gz
 src_pawlib.tar.gz
+src_config.tar.gz
+src_mathlib.tar.gz
 src_phtools.tar.gz
+src_geant321.tar.gz
+src_mclibs.tar.gz
 src_scripts.tar.gz
+src_graflib.tar.gz
+src_packlib.tar.gz
+xsneut95.dat


Index: cernlib-deadpool.txt
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib-deadpool.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-deadpool.txt	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib-deadpool.txt	9 Dec 2005 15:57:06 -0000	1.2
@@ -2,26 +2,86 @@
 # for copyright reasons.  Given is the file or directory to delete
 # relative to $CERN_ROOT/src/.
 
-# --Kevin McCarty, 19 Aug. 2003
+# --Kevin McCarty, 23 Nov 2005
 
-# Authors of FLUKA and Pythia/Jetset did NOT give permission to release
+# Authors of Pythia/Jetset did NOT give permission to release
 # their code under GPL.  CERN should have checked this more carefully!!!
-geant321/data/flukaaf.dat
-geant321/fluka/
-car/geanf321.car
-car/geanf.car
-
-mclibs/jetset/
 car/jetset74.car
+mclibs/jetset/
 mclibs/pythia/
 
-# removal of Pythia/Jetset also necessitates removal of Fritiof, Lepto, Ariadne
+# Removal of Pythia/Jetset also necessitates removal of Fritiof, Lepto, Ariadne
 mclibs/fritiof/
 mclibs/ariadne/
 mclibs/ariadne_407/
 mclibs/lepto63/
 
-# other problematic files (mostly on VMS or obsolete archs)
+# The same applies to GEANT-FLUKA; see for instance the comments at
+# the web site http://www.fluka.org/Faq.html
+car/geanf.car
+car/geanf321.car
+#cmz/geanf.cmz
+#cmz/geanf321.cmz
+geant321/data/flukaaf.dat
+geant321/block/
+geant321/fiface/
+geant321/fluka/
+geant321/miface/gfmfin.F
+geant321/miface/gfmdis.F
+geant321/peanut/
+geant321/geant321/aadat.inc
+geant321/geant321/auxpar.inc
+geant321/geant321/balanc.inc
+geant321/geant321/bamjcm.inc
+geant321/geant321/cmsres.inc
+geant321/geant321/comcon.inc
+geant321/geant321/corinc.inc
+geant321/geant321/dblprc.inc
+geant321/geant321/decayc.inc
+geant321/geant321/decayc2.inc
+geant321/geant321/depnuc.inc
+geant321/geant321/dimpar.inc
+geant321/geant321/eva0.inc
+geant321/geant321/eva1.inc
+geant321/geant321/fheavy.inc
+geant321/geant321/finlsp.inc
+geant321/geant321/finlsp2.inc
+geant321/geant321/finlsp3.inc
+geant321/geant321/finpar.inc
+geant321/geant321/finpar2.inc
+geant321/geant321/finuc.inc
+geant321/geant321/finuc2.inc
+geant321/geant321/finuct.inc
+geant321/geant321/hadflg.inc
+geant321/geant321/hadpar.inc
+geant321/geant321/higfis.inc
+geant321/geant321/inpdat.inc
+geant321/geant321/inpdat2.inc
+geant321/geant321/inpflg.inc
+geant321/geant321/iounit.inc
+geant321/geant321/isotop.inc
+geant321/geant321/labcos.inc
+geant321/geant321/mapa.inc
+geant321/geant321/metlsp.inc
+geant321/geant321/nucdat.inc
+geant321/geant321/nucgeo.inc
+geant321/geant321/nuclev.inc
+geant321/geant321/nucpar.inc
+geant321/geant321/nucstf.inc
+geant321/geant321/paprop.inc
+geant321/geant321/parevt.inc
+geant321/geant321/parnuc.inc
+geant321/geant321/part.inc
+geant321/geant321/part2.inc
+geant321/geant321/part3.inc
+geant321/geant321/qquark.inc
+geant321/geant321/reac.inc
+geant321/geant321/redver.inc
+geant321/geant321/resnuc.inc
+geant321/geant321/split.inc
+geant321/geant321/xsepar.inc
+
+# Other problematic files (mostly on VMS or obsolete archs)
 graflib/higz/igold/golini.F
 packlib/cspack/sysreq/pwd_vms.h
 packlib/cspack/sysreq/sgtty.h


Index: cernlib.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib.README	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib.README	9 Dec 2005 15:57:06 -0000	1.2
@@ -48,3 +48,13 @@
 
 The cernlib script has been modified to use an external lapack and not
 the one provided with the cernlib.
+
+5) kernlib out of packlib
+
+kernlib has been moved outside of packlib. If you use the cernlib script
+for linking it should be taken into account, however if you link directly
+with packlib you could need to add the kernlib on your link command line.
+
+6) split of motif dependent libs from packlib and pawlib
+
+The motif dependent libs are in libpacklib-lesstif and libpawlib-lesstif.


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cernlib.spec	18 Nov 2005 12:45:03 -0000	1.6
+++ cernlib.spec	9 Dec 2005 15:57:06 -0000	1.7
@@ -1,11 +1,11 @@
 Name:          cernlib
 Version:       2005
-Release:       4%{?dist}.2
+Release:       8%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
 # http://borex.princeton.edu/~kmccarty/faq.html#44
-License:       GPL/LGPL/BSD
+License:       GPL/LGPL
 URL:           http://cernlib.web.cern.ch/cernlib/
 # mandrake
 #BuildRequires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
@@ -15,6 +15,7 @@
 BuildRequires: xorg-x11-devel lapack blas openmotif-devel 
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
 # build the cernlib
+#BuildRequires: imake lapack-devel blas-devel openmotif-devel 
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,8 +32,7 @@
 # not used during the build (if I'm not wrong)
 Source15: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_car.tar.gz
 # unmodified files
-Source0: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/include.tar.gz
-Source1: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_config.tar.gz
+Source0: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_config.tar.gz
 Source2: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_Imakefile.tar.gz
 Source5: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_include.tar.gz
 Source6: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_mathlib.tar.gz 
@@ -43,7 +43,7 @@
 Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz
 Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz
 Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat
-# A shell script that goes in /etc/profile.d
+# Shell scripts that go in /etc/profile.d
 Source100: cernlib.sh.in
 Source105: cernlib.csh.in
 # m4 macros for autoconf
@@ -59,58 +59,126 @@
 Source200: cernlib-remove-deadpool
 Source201: cernlib-deadpool.txt
 
-# change the cernlib script such that -llapack -lblas is used instead of 
-# cernlib lapack
-Patch: cernlib-cernlib.patch
-# debian cernlib patch full of good things
-Patch1: cernlib_2004.11.04-3.diff
-# modified, to have only DATADIR
-Patch2: 003-enforce-FHS
-Patch3: 005-enable-shadow-passwd
-Patch4: 007-delete-fluka-refs
-Patch5: 008-undef-PPC
-Patch6: 010-comis-allow-special-chars-in-path
-Patch7: 012-add-no-optimization-macro
-Patch8: 013-fix-paw-imakefile-special-rules
-Patch9: 014-fix-herwig-imakefile-special-rules
-Patch11: 015-fix-optimization
-# not applied, break build
-Patch12: 018-move-kernlib-to-toplevel
-Patch13: 022-no-assign-string-literals
+# debian patchset
+Patch0: cernlib_2005.05.09.dfsg-2.diff
+# change file to directory to DATADIR
+Patch1100: cernlib-enforce-FHS.diff
+Patch1: 001-fix-missing-fluka.dpatch
+Patch2: 002-fix-missing-mclibs.dpatch
+Patch3: 003-geant-dummy-functions.dpatch
+Patch100: 100-fix-isajet-manual-corruption.dpatch
+Patch101: 101-undefine-PPC.dpatch
+Patch102: 102-dont-optimize-some-code.dpatch
+Patch103: 103-ignore-overly-long-macro-in-gen.h.dpatch
+Patch104: 104-fix-undefined-insertchar-warning.dpatch
+Patch105: 105-fix-obsolete-xmfontlistcreate-warning.dpatch 
+Patch106: 106-fix-paw++-menus-in-lesstif.dpatch
+Patch107: 107-define-strdup-macro-safely.dpatch
+Patch108: 108-quote-protect-comis-script.dpatch
+# not used as xsneut.dat is at the right place
+#Patch109: 109-fix-broken-xsneut95.dat-link.dpatch
+Patch110: 110-ignore-included-lapack-rule.dpatch
+Patch111: 111-fix-kuesvr-install-location.dpatch
+Patch112: 112-remove-nonexistent-prototypes-from-gen.h.dpatch
+# a workaround for cups. Applied in doubt.
+Patch113: 113-cups-postscript-fix.dpatch
+Patch114: 114-install-scripts-properly.dpatch
+Patch200: 200-comis-allow-special-chars-in-path.dpatch
+Patch201: 201-update-kuip-helper-apps.dpatch
+Patch202: 202-fix-includes-in-minuit-example.dpatch
+Patch203: 203-compile-geant-with-ertrak.dpatch
+Patch204: 204-compile-isajet-with-isasrt.dpatch
+Patch205: 205-max-path-length-to-256.dpatch
+Patch206: 206-herwig-uses-DBLE-not-REAL.dpatch
+Patch207: 207-compile-temp-libs-with-fPIC.dpatch
+# without that patch the binaries are linked with something like
+# libzftplib.a /builddir/build/BUILD/cernlib-2005/2005/build/packlib/cspack/programs/zftp/libzftplib.a
+Patch208: 208-fix-redundant-packlib-dependencies.dpatch
+Patch209: 209-ignore-unneeded-headers-in-kmutil.c.dpatch
+Patch210: 210-improve-cfortran-header-files.dpatch
+# disabled in the debian patchset, enabled here
+Patch211: 211-fix-comis-on-64-bit-arches.dpatch
+Patch300: 300-skip-duplicate-lenocc.dpatch
+# Use another approach, see cernlib-enforce-FHS
+# Patch33: 301-datafiles-comply-with-FHS.dpatch
+# use cernlib-gxint-script.diff instead and sed for paw and dzedit.script
+# Patch34: 302-scripts-comply-with-FHS.dpatch
+Patch303: 303-shadow-passwords-supported.dpatch
+Patch304: 304-update-Imake-config-files.dpatch
+Patch305: 305-use-POWERPC-not-PPC-as-test.dpatch
+# the bug in /usr/include/assert.h seems to be present in FC-4. So a local
+# version is provided in that patch. Will have to look at newer glibc-headers
+# packages
+Patch306: 306-patch-assert.h-for-makedepend.dpatch
+Patch307: 307-use-canonical-cfortran.dpatch
+Patch308: 308-use-canonical-cfortran-location.dpatch
+Patch309: 309-define-dummy-herwig-routines.dpatch
+Patch310: 310-define-dummy-fowl-routines.dpatch
+# The zebra qnexte is a fake, removing it remove an unneeded dependency.
+# the other qnext don't seem to be the same code? They are duplicate symbols
+# anyway so one must be removed
+Patch311: 311-skip-duplicate-qnext.dpatch
+Patch312: 312-skip-duplicate-gamma.dpatch
+# It is a departure from upstream. Apply, but may revert if not agreed.  
+Patch313: 313-comis-preserves-filename-case.dpatch
+Patch314: 314-permit-using-regcomp-for-re_comp.dpatch
+Patch315: 315-fixes-for-MacOSX.dpatch
+Patch318: 318-additional-gcc-3.4-fixes.dpatch
+
+Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch
+Patch701: 701-patch-hbook-comis-Imakefiles.dpatch
+Patch702: 702-patch-Imakefiles-for-packlib-mathlib.dpatch
+# I would have preferred not to move the motif code to toplevel...
+Patch703: 703-patch-code_motif-packlib-Imakefiles.dpatch
+Patch704: 704-patch-code_kuip-higzcc-Imakefiles.dpatch
+# I would have preferred not to move the motif code to toplevel...
+Patch705: 705-patch-paw_motif-paw-Imakefiles.dpatch
+
+Patch800: 800-implement-shared-library-rules-in-Imake.dpatch
+Patch801: 801-non-optimized-rule-uses-fPIC-g.dpatch
+Patch802: 802-create-shared-libraries.dpatch
+# in the original cernlib kxterm is built with the C compiler, which cause
+# a failure if compiled with de cernlib debian script as -lg2c isn't found. 
+# It is corrected by
+Patch803: 803-link-binaries-dynamically.dpatch
+# 803 depends on 
+# 208-fix-redundant-packlib-dependencies.dpatch
+
+# no idea about what this does
+Patch804: 804-workaround-for-comis-mdpool-struct-location.dpatch
+Patch805: 805-expunge-missing-mathlib-kernlib-symbols.dpatch 
+# not needed but keep sync with debian, that'll avoid bumping sonames
+Patch806: 806-bump-mathlib-and-dependents-sonames.dpatch
+
+# not applied in newer debian patchset
+Patch3006: 022-no-assign-string-literals
 # fixed upstream
-Patch14: 027-use-tmpfile-not-mktemp
-Patch15: 028-fix-isajet-docs
-Patch16: 030-filename-length-to-256
-Patch17: 031-fix-varargs-use
-Patch18: 033-fix-undefined-insertchar
-Patch19: 035-do-not-use-XmFontListCreate
-Patch20: 038-fix-strndup-macro-problem
-Patch21: 039-use-DBLE-not-REAL
-Patch22: 044-fix-strdup-redefinition
-Patch23: 045-compile-with-isasrt
-Patch24: 047-fix-paw++-menus
+Patch3007: 027-use-tmpfile-not-mktemp
+# not applied in the newer debian patchset
+Patch3008: 031-fix-varargs-use
 # fixed upstream 
-Patch25: 048-log-to-var-log-not-tmp
+Patch3009: 048-log-to-var-log-not-tmp
 # fixed upstream
-Patch26: 049-fix-kuesvr-security-hole
+Patch3010: 049-fix-kuesvr-security-hole
 # fixed upstream
-Patch27: 050-make-secure-comis-tmpdir
+Patch3011: 050-make-secure-comis-tmpdir
 # fixed upstream
-Patch28: 051-fix-miscellaneous-tmp-uses
-# extracted from 001-enable-shared-libs
-Patch29: 001-delete-pythia-refs
-# prepare gxint for substitutions of path and version
-Patch30: gxint-script.diff
-Patch31: cernlib-XmDrawShadow-no-prototype.patch
-Patch32: cernlib-install_scripts.patch
-Patch33: cernlib-static-tcpaw.diff
-Patch34: cernlib-hwuli2_use_aimag.diff 
-Patch35: cernlib-hwhiga_use_aimag.diff
-Patch36: cernlib-gfortran.diff 
-Patch42: cernlib-rsrtnt64_goto_outer_block.diff
-Patch43: cernlib-v107z0_X_before_string.diff
-Patch44: cernlib-bimsel-nodouble-save.diff
+Patch3012: 051-fix-miscellaneous-tmp-uses
 
+# change the cernlib script such that -llapack -lblas is used instead of 
+# cernlib lapack
+# depend explicitely on libkernlib now that it is out of packlib
+# use lesstif-pawlib and lesstif-packlib
+# the modified script is renamed cernlib-static later and the debian cernlib
+# script is used instead.
+Patch1200: cernlib-cernlib_kernlib.patch
+# don't stop if the CERN variable isn't defined
+Patch1201: cernlib-gxint-script.diff
+Patch1203: cernlib-hwuli2_use_dimag.diff 
+Patch1204: cernlib-hwhiga_use_dimag.diff
+Patch1205: cernlib-gfortran.diff 
+Patch1206: cernlib-rsrtnt64_goto_outer_block.diff
+Patch1207: cernlib-v107z0_X_before_string.diff
 
 %description
 CERN program library is a large collection of general purpose libraries
@@ -120,12 +188,15 @@
 detectors simulation, data-handling etc... applicable to a wide range 
 of problems.
 
-The devel packages are parallel installable, but not the helper
+The main and devel packages are parallel installable, but not the helper
 scripts from the utils subpackage.
 
 %package devel
 Summary:       General purpose CERN library static libraries and headers
-Requires:      xorg-x11-devel lapack blas openmotif-devel
+Requires:      lapack-devel blas-devel openmotif-devel
+# workaround #173530
+Requires:      libXau-devel
+Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
 
 %description devel
@@ -142,7 +213,7 @@
 %package utils
 Summary:   CERN library compilation and environment setting scripts
 Group:     Applications/System
-Requires:  cernlib-devel = %{version}
+Requires:  %{name}-devel = %{version}-%{release}
 
 %description utils
 CERN library compilation and environment setting scripts.
@@ -201,7 +272,6 @@
 
 %prep
 %setup -c 
-%setup -T -D -a 1
 %setup -T -D -a 2
 %setup -T -D -a 3
 %setup -T -D -a 4
@@ -216,51 +286,187 @@
 %setup -T -D -a 14
 %setup -T -D -a 15
 
-%patch -P 1 -p1
+%patch -p1
 cd %{version}
-%patch 
-%patch -P 2 -p2
-%patch -P 3 -p2
-%patch -P 4
-%patch -P 5
-%patch -P 6
-%patch -P 7
-%patch -P 8
-%patch -P 9
-%patch -P 11
-#%patch -P 12
-%patch -P 13
-#%patch -P 14
-%patch -P 15
-%patch -P 16
-%patch -P 17 
-%patch -P 18 
-%patch -P 19 
-%patch -P 20
-%patch -P 21 
-%patch -P 22 
-%patch -P 23 
-%patch -P 24 
-#%patch -P 25 
-#%patch -P 26 
-#%patch -P 27 
-#%patch -P 28 
-%patch -P 29
-%patch -P 30
-%patch -P 31
-%patch -P 32
-%patch -P 33
-%patch -P 34
-%patch -P 35
+%patch -P 1100 -p2
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 100 -p1
+%patch -P 101 -p1
+%patch -P 102 -p1
+%patch -P 103 -p1
+%patch -P 104 -p1
+%patch -P 105 -p1
+%patch -P 106 -p1
+%patch -P 107 -p1
+%patch -P 108 -p1
+#%patch -P 109 -p1
+%patch -P 110 -p1
+%patch -P 111 -p1
+%patch -P 112 -p1
+%patch -P 113 -p1
+%patch -P 114 -p1
+%patch -P 200 -p1
+%patch -P 201 -p1
+%patch -P 202 -p1
+%patch -P 203 -p1
+%patch -P 204 -p1
+%patch -P 205 -p1
+%patch -P 206 -p1
+%patch -P 207 -p1
+%patch -P 208 -p1
+%patch -P 209 -p1
+%patch -P 210 -p1
+%patch -P 211 -p1
+%patch -P 300 -p1
+#%patch -P 301 -p1
+#%patch -P 302 -p1
+%patch -P 303 -p1
+%patch -P 304 -p1
+%patch -P 305 -p1
+%patch -P 306 -p1
+%patch -P 307 -p1
+%patch -P 308 -p1
+%patch -P 309 -p1
+%patch -P 310 -p1
+%patch -P 311 -p1
+%patch -P 312 -p1
+%patch -P 313 -p1
+%patch -P 314 -p1
+%patch -P 315 -p1
+
+# copy a paw include file to include directory (debian
+# 317-copy-converter.h-to-installed-headers-dir.sh.dpatch)
+cp src/pawlib/paw/tree/converter.h src/pawlib/paw/paw/
+
+%patch -P 318 -p1
+
+# move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch)
+mv src/packlib/kernlib src/kernlib
+
+%patch -P 700 -p1
+
+# move hkf1q.F and hkfill.F out of packlib/hbook and into
+# pawlib/comis where they obviously belong (it even says so in the files!)
+# (debian 701-move-packlib-hkfill-to-comis.sh.dpatch)
+pushd src
+                mv packlib/hbook/code/hkf1q.F  pawlib/comis/code/
+                mv packlib/hbook/code/hkfill.F pawlib/comis/code/
+                # these files also need some headers to go with them:
+                mkdir pawlib/comis/hbook
+                cp -p packlib/hbook/hbook/pilot.h    pawlib/comis/hbook/
+                cp -p packlib/hbook/hbook/hcbook.inc pawlib/comis/hbook/
+                cp -p packlib/hbook/hbook/hcbits.inc pawlib/comis/hbook/
+                cp -p packlib/hbook/hbook/hcfast.inc pawlib/comis/hbook/
+popd
+
+%patch -P 701 -p1
+
+# Must create dirs before applying following patch. 
+# Corresponds with 702-fix-packlib-mathlib-circular-mess.sh.dpatch
+
+pushd src
+                # Hdiff depends upon a bunch of mathlib files; move it into
+                # mathlib.
+                mkdir mathlib/hbook
+                mv packlib/hbook/hdiff mathlib/hbook/
+                cp -r packlib/hbook/hbook mathlib/hbook/
+
+                # Meanwhile, other packlib files depend upon these mathlib
+                # files which are easily moved:
+                mkdir packlib/hbook/d
+                mv mathlib/gen/d/rgmlt*.F packlib/hbook/d/
+                mv mathlib/gen/n          packlib/hbook/
+                cp -r mathlib/gen/gen     packlib/hbook/
+popd
+
+%patch -P 702 -p1
+
+# Script to move packlib/kuip/code_motif to top level, splitting it out
+# from packlib.  But keep kmutil.c in packlib, it's otherwise used.
+# debian 703-move-code_motif-to-top-level.sh.dpatch
+
+pushd src
+                mv packlib/kuip/code_motif/kmutil.c packlib/kuip/code_kuip/
+                mv packlib/kuip/code_motif          ./
+                cp -r packlib/kuip/kuip             code_motif/
+popd
+
+%patch -P 703 -p1
+
+# Script to move the file kuwhag.c from packlib/kuip/code_kuip/kuwhag.c
+# into graflib/higz/higzcc.  It appears to be the only file in code_kuip
+# that depends upon grafX11 and libX11, so it fits in better here.
+# debian 704-move-kuwhag.c-to-grafX11.sh.dpatch
+
+pushd src
+                mv packlib/kuip/code_kuip/kuwhag.c graflib/higz/higzcc/
+                cp -r packlib/kuip/kuip            graflib/higz/
+popd
+
+%patch -P 704 -p1
+
+# Script to move Lesstif-dependent Paw code into its own library.
+# debian 705-move-paw++-code-to-top-level.sh.dpatch
+
+pushd src
+                mkdir paw_motif
+                mv pawlib/paw/?motif pawlib/paw/fpanels? paw_motif/
+                mv pawlib/paw/tree pawlib/paw/uimx pawlib/paw/xbae* paw_motif/
+                cp -p pawlib/paw/Imakefile paw_motif/
+                
+                mkdir paw_motif/code
+                mv pawlib/paw/code/pawpp.F   paw_motif/code/
+                mv pawlib/paw/code/pawintm.F paw_motif/code/
+
+                mkdir paw_motif/cdf
+                mv pawlib/paw/cdf/pamcdf.cdf paw_motif/cdf/
+
+                cp -pr pawlib/paw/paw paw_motif/
+                cp -pr pawlib/paw/hpaw paw_motif/
+popd
+
+%patch -P 705 -p1
+
+%patch -P 800 -p1
+%patch -P 801 -p1
+%patch -P 802 -p1
+%patch -P 803 -p1
+
+# Shell script to link pawlib/comis/comis into the top-level include directory.
+# debian 804-link-to-comis-includes.sh.dpatch
+pushd src
+                ln -s ../pawlib/comis/comis include/comis
+popd
+
+%patch -P 804 -p1
+%patch -P 805 -p1
+%patch -P 806 -p1
+
+
+%patch -P 1200
+%patch -P 1201
+%patch -P 1203
+%patch -P 1204
 # use gfortran
-#%patch -P 36
+#%patch -P 1205
 # workaround gfortran bug
-%patch -P 42
-%patch -P 43
-%patch -P 44
+%patch -P 1206
+%patch -P 1207
 
+# remove CVS directories
+find . -depth -type d -name CVS -exec rm -rf {} ';' 
+
+# unset executable bit on source files
+chmod a-x src/kernlib/kerngen/ccgencf/cfstati.c \
+  src/cfortran/cfortran.*
+
+# remove empty header file not needed anywhere to shut up rpmlint
+rm src/pawlib/paw/ntuple/dbmalloc.h
 
 %build
+
 CERN=$RPM_BUILD_DIR/cernlib-%{version}
 CERN_LEVEL=%{version}
 CERN_ROOT=$CERN/$CERN_LEVEL
@@ -273,7 +479,10 @@
 export CVSCOSRC
 export PATH
 
-# set the CERN and CERN_LEVEL environment variables in a shell script
+LIB_SONAME=1
+export LIB_SONAME
+
+# set the CERN and CERN_LEVEL environment variables in shell scripts
 # meant to go to /etc/profile.d
 sed -e 's/==CERN_LEVEL==/%{version}/' -e 's:==CERN==:%{_libdir}/cernlib:' %{SOURCE100} > cernlib-%{version}.sh
 sed -e 's/==CERN_LEVEL==/%{version}/' -e 's:==CERN==:%{_libdir}/cernlib:' %{SOURCE105} > cernlib-%{version}.csh
@@ -281,6 +490,12 @@
 cp %{SOURCE101} .
 cp %{SOURCE102} .
 cp %{SOURCE103} .
+
+# Regenerate the copyright file (from debian/rules)
+grep -v DEADPOOL_LIST_GOES_HERE debian/copyright.in > copyright
+sed -e 's/#.*//g' -e '/^[[:space:]]*$$/d' %{SOURCE200} | \
+                sort | uniq >> copyright
+
 # copy xsneut.data in 2005/share/lib, where geant expects it to be
 # there is a link from 2005/lib
 mkdir -p %{version}/share/lib
@@ -288,33 +503,43 @@
 
 cd $CERN_ROOT
 
-# substitude the right defaults in the cernlib script
-sed -i -e 's:/cern:%{_libdir}/cernlib/:' -e 's:pro:%{version}:' src/scripts/cernlib
+# substitude the right defaults in the scripts
+sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{version}":' \
+	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
 # substitute version in gxint with the right version
 # substitute includedir in gxint to conform to FHS
-sed -e 's/==VERSION==/%{version}/' -e 's:==includedir==:%{_includedir}:' src/scripts/gxint > src/scripts/gxint.new
-cp src/scripts/gxint.new src/scripts/gxint
+sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib:%{_includedir}/cernlib/\${ver}:' src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
-for file in src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F; do
-  cp $file $file.bef
-  sed -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' $file.bef > $file
-done
+sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \
+  src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F
 
 # Create the build directory structure
+mkdir -p build bin lib shlib
 
-mkdir -p build bin lib build/log
+# rename the cernlib script cernlib-static and use the debian cernlib
+# script for dynamic libraries support
+# remove -lg2c to the link commands, because libg2c.so isn't available, 
+# it is found by g77 if needed
+mv src/scripts/cernlib bin/cernlib-static
+sed -e 's:@PREFIX@:%{_prefix}:g' \
+  -e 's:@LIBPREFIX@:%{_libdir}/cernlib/%{version}:g' \
+  -e 's/-lg2c//' \
+  ../debian/add-ons/bin/cernlib.in > src/scripts/cernlib
+chmod 0755 src/scripts/cernlib
 
+# install mkdirhier which is needed to make directories
 cp %{SOURCE104} bin/
 chmod a+x bin/mkdirhier
 
 # Create the top level Makefile with imake
-# the RPM optflags are not used
 
 cd $CERN_ROOT/build
 $CVSCOSRC/config/imake_boot
 
+# the RPM optflags are not used during the build
+
 # Install kuipc and the scripts (cernlib, paw and gxint) in $CERN_ROOT/bin
 
 make %{?_smp_mflags} bin/kuipc
@@ -327,6 +552,8 @@
 cd $CERN_ROOT/build
 #  %{?_smp_mflags} breaks the build
 make
+make install.shlib
+chmod a+x ../shlib/*.so.*
 
 # Build paw
 cd $CERN_ROOT/build/pawlib
@@ -345,7 +572,7 @@
 %{__install} -m755 cernlib-%{version}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
 %{__install} -d -m755 cfortran/Examples
-%{__install} -m644 %{version}/include/cfortran/Examples/*.c cfortran/Examples/
+%{__install} -m644 %{version}/src/cfortran/Examples/*.c cfortran/Examples/
 
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_datadir}/aclocal
 %{__install} -m644 cernlib.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/cernlib.m4
@@ -354,43 +581,74 @@
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_datadir}/cernlib/%{version}
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
+%{__install} -d -m755 $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/cfortran
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_bindir}/
 
 %{__install} -m644 lib/*.dat $RPM_BUILD_ROOT%{_datadir}/cernlib/%{version}
 %{__install} -m644 lib/gxint321.f $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
-(cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && %{__ln_s} gxint321.f gxint.f)
+%{__install} -m644 src/cfortran/*.h $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/
 
 %{__install} -m755 bin/* $RPM_BUILD_ROOT%{_bindir}/
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
-(cd include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -)
+(cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
+#(cd src/include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -)
 
-rm -rf $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/cfortran/Examples/
 rm -f $RPM_BUILD_ROOT%{_bindir}/mkdirhier
 
+# add links for cfortran header files in the top include directory
+pushd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
+for file in *.h; do
+	%{__ln_s} $file cfortran/$file
+done
+%{__ln_s} gxint321.f gxint.f
+popd
+
+cd src
+# install include directories for the cernlib libraries
+base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
+for dir in `cat ../../debian/add-ons/includelist.txt`; do
+	basedir=`basename $dir`
+	rm -rf $base_include/$basedir
+	cp -Rp $dir $base_include/
+done
+
+find $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} -name Imakefile -exec rm -f \{\} \;
+rm -f $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/ntuple/*.c
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%dir %{_libdir}/cernlib/
+%dir %{_libdir}/cernlib/%{version}
+%dir %{_libdir}/cernlib/%{version}/lib
+%{_libdir}/cernlib/%{version}/lib/*.so.*
+%{_datadir}/cernlib/
+%doc cernlib.README copyright
+%doc debian/debhelper/geant321.README.debian 
+%doc debian/debhelper/libpdflib804-2-dev.README.debian
+%doc debian/debhelper/libmathlib2.README.debian 
+%doc debian/debhelper/montecarlo-base.README.debian
+
 # the utils and devel are separated to have the possibility to install
 # parallel versions of the library
-
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/cernlib/%{version}
-%{_datadir}/cernlib/%{version}
-%{_includedir}/cernlib/%{version}
+%{_libdir}/cernlib/%{version}/lib/*.a
+%{_libdir}/cernlib/%{version}/lib/*.so
+%{_includedir}/cernlib/
 %{_datadir}/aclocal/cernlib.m4
-# those file should be in a cernlib main package
-%doc cernlib.README debian/copyright
-%doc debian/libgeant1.README.debian debian/libpdflib804-dev.README.debian
-%doc debian/libmathlib1.README.debian debian/montecarlo-base.README.debian
-# devel specific files
 %doc cfortran 
 
 %files utils
 %defattr(-,root,root,-)
-%{_bindir}/cernlib
+%{_bindir}/cernlib*
 %{_sysconfdir}/profile.d/cernlib-%{version}.sh
 %{_sysconfdir}/profile.d/cernlib-%{version}.csh
 
@@ -426,9 +684,20 @@
 %{_bindir}/hepdb
 %{_bindir}/kxterm
 %{_bindir}/zftp
-%doc debian/zftp.README.debian
+%doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8
+- update with newer debian patchset for cernlib, fix licence issues
+- remove the BSD in the licence because there is no library nor binary
+  under a BSD licence and someone could get the idea that there is 
+  some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
+  because of cfortran
+- don't use the include.tar.gz source, instead get include files from
+  the source files
+- build shared libraries
+- simplify the scripts modifications
+
 * Thu Nov 17 2005 Patrice Dumas  - 2005-4.2
 - on fc-3 there is no lapack-devel and blas-devel, but instead blas 
   and lapack


Index: paw.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/paw.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw.README	16 Nov 2005 23:34:07 -0000	1.1
+++ paw.README	9 Dec 2005 15:57:06 -0000	1.2
@@ -5,18 +5,17 @@
 
 If you experience corruption of the graphics window when other windows are
 moved over top of it, turn on the BackingStore option of the X server.
-In the "Screen" section of your /etc/X11/XF86Config-4 file or 
-/etc/X11/xorg.conf, you should have
-something like:
+In the "Screen" section of your /etc/X11/XF86Config-4 or /etc/X11/xorg.conf
+file (whichever one exists), you should have something like:
 
 Section "Screen"
-        .
-        .
-        .
+	.
+	.
+	.
     Option "BackingStore"
-        .
-        .
-        .
+	.
+	.
+	.
 EndSection
 
 2) Remote data files
@@ -32,12 +31,22 @@
 If you compile a FORTRAN script within PAW, the path to the file cannot
 be excessively long (more than 256 characters).
 
-4) 64-bit issues
+4) Filename case issues
+
+The default behavior has been set so that PAW is case-sensitive in its 
+treatment of filenames.  If you have any old Paw scripts that do not
+treat filenames in a case-sensitive way, you may need to add the line
+
+        filecase convert
+
+to the beginning of them.
+
+5) 64-bit issues
 
 Note that this package is not yet fully functional on 64-bit machines, as the
 COMIS portion of Pawlib does not yet work correctly on those architectures.
 
--- Kevin McCarty , Mon, 29 Nov 2004
+-- Kevin McCarty , Tue, 22 Nov 2005
 
 Adapted to the rpm package by 
--- Dumas Patrice , Tue, 16 Jun 2005
+-- Dumas Patrice 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Nov 2005 12:45:03 -0000	1.3
+++ sources	9 Dec 2005 15:57:06 -0000	1.4
@@ -1,16 +1,15 @@
-cdbd82c54aed8d1385f1ef0a10be8667  include.tar.gz
+9d37e3c16c336d1887029227b27a42d8  src_car.tar.gz
 03bfd1239e57a23ab087bf29fe48c8a8  src_Imakefile.tar.gz
-1f25e16563f89a69c1b15b8ed11af904  src_car.tar.gz
+fd20e80b3f58fc88168bcd6ce701f999  src_patchy.tar.gz
 9e686519ae3a52344222b21c9444ddd6  src_cfortran.tar.gz
-b72b89cb3a7f7c592d28b992c95b4eff  src_config.tar.gz
-2cf91d533315b430f4e36c1c6e23841a  src_geant321.tar.gz
-f09d0f28e5c7ecc1a3932369f5a15dab  src_graflib.tar.gz
 9ebd72a2b6e5349b25fc93e7b20c172a  src_include.tar.gz
+bb4e224a7713ac4b8c13598e388c17f3  src_pawlib.tar.gz
+b72b89cb3a7f7c592d28b992c95b4eff  src_config.tar.gz
 0ec66e6d4920af79999b4c73fd3b065a  src_mathlib.tar.gz
-ce6d941a50c3e1fdc8bdcc4ec2988116  src_mclibs.tar.gz
-d7d4628d136ed97f1e9ba164774a6878  src_packlib.tar.gz
-fd20e80b3f58fc88168bcd6ce701f999  src_patchy.tar.gz
-dcd46166a57a8a4ec45d872d79839f1a  src_pawlib.tar.gz
 f215b9adba3cfb3be4bd74d624f00d32  src_phtools.tar.gz
+24e2460fa61675df1cd74c7204a8d79e  src_geant321.tar.gz
+666d8a5c483c275463ebb1a3dd48c742  src_mclibs.tar.gz
 b30b121167ddf6508c22fc25a4272276  src_scripts.tar.gz
+67228b011eac13b44499c50219e21545  src_graflib.tar.gz
+4fdcdc9f819ebbb9c6d3a04f339cdcf8  src_packlib.tar.gz
 eecb52159458ead0ee6b0d00b90aab66  xsneut95.dat


--- 001-delete-pythia-refs DELETED ---


--- 003-enforce-FHS DELETED ---


--- 005-enable-shadow-passwd DELETED ---


--- 007-delete-fluka-refs DELETED ---


--- 008-undef-PPC DELETED ---


--- 010-comis-allow-special-chars-in-path DELETED ---


--- 012-add-no-optimization-macro DELETED ---


--- 013-fix-paw-imakefile-special-rules DELETED ---


--- 014-fix-herwig-imakefile-special-rules DELETED ---


--- 015-fix-optimization DELETED ---


--- 018-move-kernlib-to-toplevel DELETED ---


--- 028-fix-isajet-docs DELETED ---


--- 030-filename-length-to-256 DELETED ---


--- 033-fix-undefined-insertchar DELETED ---


--- 035-do-not-use-XmFontListCreate DELETED ---


--- 038-fix-strndup-macro-problem DELETED ---


--- 039-use-DBLE-not-REAL DELETED ---


--- 044-fix-strdup-redefinition DELETED ---


--- 045-compile-with-isasrt DELETED ---


--- 047-fix-paw++-menus DELETED ---


--- cernlib-XmDrawShadow-no-prototype.patch DELETED ---


--- cernlib-bimsel-nodouble-save.diff DELETED ---


--- cernlib-cernlib.patch DELETED ---


--- cernlib-hwhiga_use_aimag.diff DELETED ---


--- cernlib-hwuli2_use_aimag.diff DELETED ---


--- cernlib-install_scripts.patch DELETED ---


--- cernlib-static-tcpaw.diff DELETED ---


--- cernlib_2004.11.04-3.diff DELETED ---


--- gxint-script.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 16:06:06 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 11:06:06 -0500
Subject: rpms/cernlib/FC-3 cernlib-cernlib_kernlib.patch, NONE,
	1.1 cernlib.spec, 1.7, 1.8
Message-ID: <200512091606.jB9G66eV026115@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26100

Modified Files:
	cernlib.spec 
Added Files:
	cernlib-cernlib_kernlib.patch 
Log Message:
in fact the 64 bit fixes are included, and a patch was missing


cernlib-cernlib_kernlib.patch:

--- NEW FILE cernlib-cernlib_kernlib.patch ---
--- src/scripts/cernlib-old	2005-11-30 20:15:23.000000000 +0100
+++ src/scripts/cernlib	2005-11-30 20:15:23.000000000 +0100
@@ -16,12 +16,16 @@
   [ -z "$CERN_LEVEL" ] && gver="pro" || gver="$CERN_LEVEL"
  
   _P=0  ; _p=0 ;   _u=0 ; Gsys=""
+  #default is to use dynamic lapack
+  _l=1 ;
+  dynlapack=0;
   while [ $# -gt 0 ]
   do case $1 in
        -G) Gsys=$2   ; shift ;;
        -P) _P=1              ;;
        -s) _s="is an obsolete option"     ;;
        -u) _u=1 ; _p=1       ;;
+       -l) _l=0              ;;
        -v) gver=$2   ; shift ;;
        --) shift ; break     ;;
         *)         break     ;;
@@ -46,14 +50,29 @@
       [ $# -eq 2 -a $1 != "graflib" ] && lver=$2
       dir=$CERN/$lver/lib
          ln=$1
-      if [ $1 = "kernlib" -o $1 = "packlib" ] ; then
+      if [ $1 = "kernlib" ]; then
          _p=1
       fi
+      if [ $1 = "packlib" ]; then
+         _p=1
+         ln="packlib-lesstif.a $dir/libpacklib.a $dir/libkernlib"
+      fi
          [ $1 = "genlib"  ] && ln="mathlib.a $dir/libphtools"
          [ $1 = "bvsl"    ] && ln="mathlib"
          [ $1 = "mpalib"  ] && ln="mathlib"
-         [ $1 = "lapack"  ] && ln="lapack3.a $dir/libblas"
-	 [ $1 = "pawlib"  ] && ln="pawlib.a $dir/liblapack3.a $dir/libblas"
+         if [ $_l -eq 0 ] ; then
+           [ $1 = "pawlib"  ] && ln="pawlib-lesstif.a $dir/libpawlib.a $dir/liblapack3.a $dir/libblas"
+           [ $1 = "lapack"  ] && ln="lapack3.a $dir/libblas"
+         else
+           if [ $1 = "pawlib"  ] ; then 
+              ln="pawlib-lesstif.a $dir/libpawlib"
+              dynlapack=1
+           fi
+           if [ $1 = "lapack"  ] ; then
+              ln=""
+              dynlapack=1
+           fi
+         fi
          [ $1 = "pythia"  ] && ln="jetset"
       if [ $1 = "GKS" -o $1 = "gks" ] ; then
          drv="X11" ; glib="$1" ; dir="$CERN/gks/$lver/lib"
@@ -69,9 +88,9 @@
          [ $drv = "Motif" ] && drv="X11"
          ln="$ln.a $dir/libgraf$drv"
       fi
-         CERNLIB="$CERNLIB $dir/lib$ln.a"
+      [ -n "$ln" ] && CERNLIB="$CERNLIB $dir/lib$ln.a"
   done
-  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib.a"
+  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib-lesstif.a $CERN/$gver/lib/libpacklib.a $CERN/$gver/lib/libkernlib.a"
 
 #  get system name
   [ -d /NextAdmin ] && Msys="NeXT" || Msys=`uname -s`
@@ -110,10 +129,14 @@
                SYSGGL="-lfgl -lgl_s -lm -lbsd" ;
                SYSGMOTIF="-lXm -lXt -lX11 -lPW"
 	       ;;
-      Linux)   [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
+      Linux)   SYSGX11="-lX11"
+	       SYSGMOTIF="-lXm -lXt -lXp -lXext -lX11"
+	       [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
 	       [ -d /usr/X11/lib ] && SYSGX11="-L/usr/X11/lib -lX11"
 	       [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
+	       [ -d /usr/X11R6/lib64 ] && SYSGX11="-L/usr/X11R6/lib64 -lX11"
 	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
+	       [ -d /usr/X11R6/lib64 ] && SYSGMOTIF="-L/usr/X11R6/lib64 -lXm -lXt -lXp -lXext -lX11"
 	       [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
 	       ;;
       NeXT)    SYSGX11="/usr/lib/X11/libX11.r" ;
@@ -208,6 +231,10 @@
      fi
      if [ "$Msys" = "Linux" ] ; then
         CERNLIB="$CERNLIB -lnsl -lcrypt -ldl"
+#        echo $CERNLIB | grep pawlib >/dev/null &&   CERNLIB="$CERNLIB -llapack -lblas"
+     fi
+     if [ $dynlapack = 1 ] ; then
+         CERNLIB="$CERNLIB -llapack -lblas"
      fi
   fi
  


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cernlib.spec	9 Dec 2005 15:57:06 -0000	1.7
+++ cernlib.spec	9 Dec 2005 16:06:04 -0000	1.8
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}
+Release:       8%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -12,7 +12,12 @@
 #BuildRequires: gcc-g77
 #Requires:      libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
 # fedora core
-BuildRequires: xorg-x11-devel lapack blas openmotif-devel 
+# fc 3
+BuildRequires: xorg-x11-devel lapack blas openmotif-devel
+# fc 4
+BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
+# fc devel
+#BuildRequires: imake lapack-devel blas-devel openmotif-devel 
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
 # build the cernlib
 #BuildRequires: imake lapack-devel blas-devel openmotif-devel 
@@ -687,8 +692,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.1
 - update with newer debian patchset for cernlib, fix licence issues
+- enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary
   under a BSD licence and someone could get the idea that there is 
   some dual BSD/GPL licenced binaries or libraries. The LGPL is kept



From fedora-extras-commits at redhat.com  Fri Dec  9 16:09:21 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 11:09:21 -0500
Subject: rpms/cernlib/FC-4 003-geant-dummy-functions.dpatch, NONE,
 1.1 100-fix-isajet-manual-corruption.dpatch, NONE,
 1.1 101-undefine-PPC.dpatch, NONE, 1.1 102-dont-optimize-some-code.dpatch,
 NONE, 1.1 103-ignore-overly-long-macro-in-gen.h.dpatch, NONE,
 1.1 104-fix-undefined-insertchar-warning.dpatch, NONE,
 1.1 105-fix-obsolete-xmfontlistcreate-warning.dpatch, NONE,
 1.1 106-fix-paw++-menus-in-lesstif.dpatch, NONE,
 1.1 107-define-strdup-macro-safely.dpatch, NONE,
 1.1 108-quote-protect-comis-script.dpatch, NONE,
 1.1 110-ignore-included-lapack-rule.dpatch, NONE,
 1.1 111-fix-kuesvr-install-location.dpatch, NONE,
 1.1 112-remove-nonexistent-prototypes-from-gen.h.dpatch, NONE,
 1.1 113-cups-postscript-fix.dpatch, NONE,
 1.1 114-install-scripts-properly.dpatch, NONE,
 1.1 200-comis-allow-special-chars-in-path.dpatch, NONE,
 1.1 201-update-kuip-helper-apps.dpatch, NONE,
 1.1 202-fix-includes-in-minuit-example.dpatch, NONE,
 1.1 203-compile-geant-with-ertrak.dpatch, NONE,
 1.1 204-compile-isajet-with-isasrt.dpatch, NONE, 1.1 205-!
 max-path-length-to-256.dpatch, NONE, 1.1 206-herwig-uses-DBLE-not-REAL.dpatch,
 NONE, 1.1 207-compile-temp-libs-with-fPIC.dpatch, NONE,
 1.1 208-fix-redundant-packlib-dependencies.dpatch, NONE,
 1.1 209-ignore-unneeded-headers-in-kmutil.c.dpatch, NONE,
 1.1 210-improve-cfortran-header-files.dpatch, NONE,
 1.1 211-fix-comis-on-64-bit-arches.dpatch, NONE,
 1.1 300-skip-duplicate-lenocc.dpatch, NONE,
 1.1 303-shadow-passwords-supported.dpatch, NONE,
 1.1 304-update-Imake-config-files.dpatch, NONE,
 1.1 305-use-POWERPC-not-PPC-as-test.dpatch, NONE,
 1.1 306-patch-assert.h-for-makedepend.dpatch, NONE,
 1.1 307-use-canonical-cfortran.dpatch, NONE,
 1.1 308-use-canonical-cfortran-location.dpatch, NONE,
 1.1 309-define-dummy-herwig-routines.dpatch, NONE,
 1.1 310-define-dummy-fowl-routines.dpatch, NONE,
 1.1 311-skip-duplicate-qnext.dpatch, NONE,
 1.1 312-skip-duplicate-gamma.dpatch, NONE,
 1.1 313-comis-preserves-filename-case.dpatch, NONE,
 1.1 314-permit-using-regcomp-for-re_comp.dpatch, NONE,
 1.1 315-fixes-for-MacOSX.dpatch, NONE, 1.1 3!
 18-additional-gcc-3.4-fixes.dpatch,NONE,1.1 701-patch-hbook-co!
 mis-Im
Message-ID: <200512091609.jB9G9LKJ026243@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26165

Modified Files:
	001-fix-missing-fluka.dpatch 002-fix-missing-mclibs.dpatch 
	700-remove-kernlib-from-packlib-Imakefile.dpatch 
	cernlib-cernlib_kernlib.patch cernlib-deadpool.txt 
	cernlib-gxint-script.diff cernlib.README cernlib.spec 
	paw.README sources 
Added Files:
	003-geant-dummy-functions.dpatch 
	100-fix-isajet-manual-corruption.dpatch 
	101-undefine-PPC.dpatch 102-dont-optimize-some-code.dpatch 
	103-ignore-overly-long-macro-in-gen.h.dpatch 
	104-fix-undefined-insertchar-warning.dpatch 
	105-fix-obsolete-xmfontlistcreate-warning.dpatch 
	106-fix-paw++-menus-in-lesstif.dpatch 
	107-define-strdup-macro-safely.dpatch 
	108-quote-protect-comis-script.dpatch 
	110-ignore-included-lapack-rule.dpatch 
	111-fix-kuesvr-install-location.dpatch 
	112-remove-nonexistent-prototypes-from-gen.h.dpatch 
	113-cups-postscript-fix.dpatch 
	114-install-scripts-properly.dpatch 
	200-comis-allow-special-chars-in-path.dpatch 
	201-update-kuip-helper-apps.dpatch 
	202-fix-includes-in-minuit-example.dpatch 
	203-compile-geant-with-ertrak.dpatch 
	204-compile-isajet-with-isasrt.dpatch 
	205-max-path-length-to-256.dpatch 
	206-herwig-uses-DBLE-not-REAL.dpatch 
	207-compile-temp-libs-with-fPIC.dpatch 
	208-fix-redundant-packlib-dependencies.dpatch 
	209-ignore-unneeded-headers-in-kmutil.c.dpatch 
	210-improve-cfortran-header-files.dpatch 
	211-fix-comis-on-64-bit-arches.dpatch 
	300-skip-duplicate-lenocc.dpatch 
	303-shadow-passwords-supported.dpatch 
	304-update-Imake-config-files.dpatch 
	305-use-POWERPC-not-PPC-as-test.dpatch 
	306-patch-assert.h-for-makedepend.dpatch 
	307-use-canonical-cfortran.dpatch 
	308-use-canonical-cfortran-location.dpatch 
	309-define-dummy-herwig-routines.dpatch 
	310-define-dummy-fowl-routines.dpatch 
	311-skip-duplicate-qnext.dpatch 
	312-skip-duplicate-gamma.dpatch 
	313-comis-preserves-filename-case.dpatch 
	314-permit-using-regcomp-for-re_comp.dpatch 
	315-fixes-for-MacOSX.dpatch 
	318-additional-gcc-3.4-fixes.dpatch 
	701-patch-hbook-comis-Imakefiles.dpatch 
	702-patch-Imakefiles-for-packlib-mathlib.dpatch 
	703-patch-code_motif-packlib-Imakefiles.dpatch 
	704-patch-code_kuip-higzcc-Imakefiles.dpatch 
	705-patch-paw_motif-paw-Imakefiles.dpatch 
	800-implement-shared-library-rules-in-Imake.dpatch 
	801-non-optimized-rule-uses-fPIC-g.dpatch 
	802-create-shared-libraries.dpatch 
	803-link-binaries-dynamically.dpatch 
	804-workaround-for-comis-mdpool-struct-location.dpatch 
	805-expunge-missing-mathlib-kernlib-symbols.dpatch 
	806-bump-mathlib-and-dependents-sonames.dpatch 
	cernlib-enforce-FHS.diff cernlib-hwhiga_use_dimag.diff 
	cernlib-hwuli2_use_dimag.diff cernlib_2005.05.09.dfsg-2.diff 
Removed Files:
	003-enforce-FHS 005-enable-shadow-passwd 008-undef-PPC 
	010-comis-allow-special-chars-in-path 
	012-add-no-optimization-macro 
	013-fix-paw-imakefile-special-rules 
	013-fix-paw-imakefile-special-rules-modified 
	014-fix-herwig-imakefile-special-rules 015-fix-optimization 
	028-fix-isajet-docs 029-fixes-for-MacOSX 
	030-filename-length-to-256 032-use-regcomp-not-re_comp 
	033-fix-undefined-insertchar 035-do-not-use-XmFontListCreate 
	038-fix-strndup-macro-problem 039-use-DBLE-not-REAL 
	044-fix-strdup-redefinition 045-compile-with-isasrt 
	047-fix-paw++-menus cernlib-XmDrawShadow-no-prototype.patch 
	cernlib-bimsel-nodouble-save.diff cernlib-config_pmac.diff 
	cernlib-hwhiga_use_aimag.diff cernlib-hwuli2_use_aimag.diff 
	cernlib-includelist.txt cernlib-install_scripts.patch 
	cernlib-static-tcpaw.diff cernlib_2004.11.04-3.diff 
Log Message:
- use new debian patchset
- enable 64 bit fixes patch
- remove the BSD in the licence because there is no library nor binary
  under a BSD licence and someone could get the idea that there is 
  some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
  because of cfortran
- update with newer debian patchset for cernlib, fix licence issues
- build shared libraries
- simplify the scripts modifications

sync with devel



--- NEW FILE 003-geant-dummy-functions.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 003-geant-dummy-functions.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add stub Geant functions to avoid missing symbols due to Fluka removal.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gkine/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gkine/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/gkine/Imakefile	1996-03-28 16:21:20.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/gkine/Imakefile	2005-11-29 15:59:27.035065621 +0000
@@ -1,6 +1,9 @@
 SRCS_F= gfkine.F gfvert.F gludky.F glund.F glundi.F gpkine.F \ @@\
 	gpkinx.F gpvert.F gskine.F gskinu.F gsvert.F gsveru.F gtau.F
 
+/* Dummy file containing stubs for deleted Fluka and mclibs functions: */
+SRCS_C= dummy.c
+
 #ifdef CERNLIB_QMVAOS
  FORTRANSAVEOPTION=FortranSaveFlags
  FORTRANOPTIONS = -math_library accurate $(FORTRANSAVEOPTION)
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gkine/dummy.c cernlib-2005.05.09.dfsg/src/geant321/gkine/dummy.c
--- cernlib-2005.05.09.dfsg~/src/geant321/gkine/dummy.c	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/gkine/dummy.c	2005-11-29 16:55:14.274440352 +0000
@@ -0,0 +1,205 @@
+/* Dummy file to avoid undefined symbols in the library */
+/* Kevin McCarty, 14 Jan 2003 */
+/* Last revised 22 November 2005 */
+
+#include 
+#include 
+#include 
+
+/* Want the dummy functions to be weakly defined so they may be overridden
+ * without error. */
+
+#define kludge(x)    #x
+#define stringify(x) kludge(x)
+#define underline(x) __ ## x
+
+#define DUMMY(domain, UPPERNAME, fortranname_, returntype) \
+returntype fortranname_() {print_dummy(#domain,#UPPERNAME);}
+
+#define WEAKDUMMY(domain, UPPERNAME, fortranname_, returntype) \
+static returntype underline(fortranname_)() {print_dummy(#domain,#UPPERNAME);} \
+void fortranname_() \
+	__attribute__ ((weak, alias (stringify(underline(fortranname_))) ))
+
+static void print_dummy(const char *domain, const char *function)
+{
+  fprintf(stderr, "Geant321: Now in dummy %s routine.\n", function);
+  fprintf(stderr,
+"If you see this message, you are presumably trying to call (possibly\n"
+"indirectly) the %s routine");
+
+  if (strcmp(domain, "Jetset") == 0)
+    fprintf(stderr,
+" in the Jetset library.\n"
+#if defined (CERNLIB_DEBIAN)
+"To obtain the Jetset library, please see the file\n"
+"/usr/share/doc/geant321/README.Debian\n"
+#endif
+    );
+
+  else if (strcmp(domain, "Fluka") == 0)
+    fprintf(stderr,
+" in the FLUKA library.\n"
+"FLUKA is unfortunately not available in this distribution of Cernlib for\n"
+"licensing reasons"
+#if defined (CERNLIB_DEBIAN)
+"; please see the file /usr/share/doc/geant321/README.Debian\n"
+"for details.\n"
+#else
+".\n"
+#endif
+    );
+  
+  else if (strcmp(domain, "User") == 0)
+    fprintf(stderr, ".  This routine is not built into Geant;\n"
+"you must write code for it yourself.  Please see the documentation"
+#if defined (CERNLIB_DEBIAN)
+"\n(for instance in the geant321-doc package)"
+#endif
+".\n");
+  
+  exit(EXIT_FAILURE);
+}
+
+/* Functions that the user is supposed to set up */
+WEAKDUMMY(User, UGINIT, uginit_, void);
+WEAKDUMMY(User, UGLAST, uglast_, void);
+
+/* Functions in the non-free Jetset library, which can be used
+ * if it's installed */
+WEAKDUMMY(Jetset, LU1ENT, lu1ent_, void);
+WEAKDUMMY(Jetset, LUCOMP, lucomp_, int);
+WEAKDUMMY(Jetset, LUEEVT, lueevt_, void);
+WEAKDUMMY(Jetset, LUEXEC, luexec_, void);
+
+/* N.B.  When the libgeant321 dynamic soversion is bumped, at the same time
+ * everything below this point except the dummy FLDIST and FLINIT subroutines
+ * may be deleted; those should be turned into weak aliases in case anyone
+ * wants to create a separate GEANT-FLUKA library. */
+
+/* From src/geant321/fluka (not the complete set of functions, just
+ * those referenced from external files) */
+WEAKDUMMY(Fluka, DOST,   dost_,   double);
+WEAKDUMMY(Fluka, EEXLVL, eexlvl_, void);
+WEAKDUMMY(Fluka, EVENTV, eventv_, void);
+WEAKDUMMY(Fluka, EVEVAP, evevap_, void);
+WEAKDUMMY(Fluka, EVVINI, evvini_, void);
+WEAKDUMMY(Fluka, FKENER, fkener_, double);
+WEAKDUMMY(Fluka, FKZERO, fkzero_, void);
+WEAKDUMMY(Fluka, NIZLNW, nizlnw_, void);
+WEAKDUMMY(Fluka, NUCREL, nucrel_, void);
+WEAKDUMMY(Fluka, RACO,   raco_,   void);
+WEAKDUMMY(Fluka, SAMCST, samcst_, void);
+WEAKDUMMY(Fluka, SIGEL,  sigel_,  void);
+WEAKDUMMY(Fluka, SITSAO, sitsao_, double);
+
+/* The following dummy functions are added due to the removal
+ * of the corresponding code from Geant (it is also part of FLUKA).
+ * We are constrained to keep the ABI for the dynamic library, so
+ * these dummy functions must be kept until next time the libgeant321
+ * soversion is changed. */
+
+/* From src/geant321/fiface */
+DUMMY(Fluka, FLDIST, fldist_, void);
+DUMMY(Fluka, FLINIT, flinit_, void);
+DUMMY(Fluka, FLUFIN, flufin_, void);
+
+/* From src/geant321/miface */
+DUMMY(Fluka, GFMFIN, gfmfin_, void);
+DUMMY(Fluka, GFMDIS, gfmdis_, void);
+
+/* From src/geant321/block */
+DUMMY(Fluka, FDEVAP, fdevap_, void);
+DUMMY(Fluka, FDNOPT, fdnopt_, void);
+DUMMY(Fluka, FDPREE, fdpree_, void);
+DUMMY(Fluka, FLKDT1, flkdt1_, void);
+DUMMY(Fluka, FLKDT2, flkdt2_, void);
+DUMMY(Fluka, FLKDT3, flkdt3_, void);
+DUMMY(Fluka, FLKDT4, flkdt4_, void);
+DUMMY(Fluka, FLKDT5, flkdt5_, void);
+DUMMY(Fluka, FLKDT6, flkdt6_, void);
+DUMMY(Fluka, FLKDT7, flkdt7_, void);
+
+/* From src/geant321/peanut */
+DUMMY(Fluka, BIMNXT, bimnxt_, void);   /* alternate entry to BIMSEL */
+DUMMY(Fluka, BIMSEL, bimsel_, void);
+DUMMY(Fluka, COSLEG, cosleg_, double);
+DUMMY(Fluka, FEKFNC, fekfnc_, double);
+DUMMY(Fluka, FPFRNC, fpfrnc_, double);
+DUMMY(Fluka, FRADNC, fradnc_, double);
+DUMMY(Fluka, FRHINC, frhinc_, double);
+DUMMY(Fluka, FRHONC, frhonc_, double);
+DUMMY(Fluka, NCLVFX, nclvfx_, double); /* alternate entry to PFNCLV */
+DUMMY(Fluka, NCLVIN, nclvin_, void);
+DUMMY(Fluka, NCLVST, nclvst_, void);
+DUMMY(Fluka, NUCNUC, nucnuc_, void);
+DUMMY(Fluka, NWINXT, nwinxt_, void);   /* alternate entry to NWISEL */
+DUMMY(Fluka, NWISEL, nwisel_, void);
+DUMMY(Fluka, PEANUT, peanut_, void);
+DUMMY(Fluka, PFNCLV, pfnclv_, double);
+DUMMY(Fluka, PHDSET, phdset_, void);
+DUMMY(Fluka, PHDWLL, phdwll_, void);
+DUMMY(Fluka, PIOABS, pioabs_, void);
+DUMMY(Fluka, PREPRE, prepre_, void);
+DUMMY(Fluka, RSCOMP, rscomp_, void);   /* alternate entry to SBCOMP */
+DUMMY(Fluka, RSTNXT, rstnxt_, void);   /* alternate entry to RSTSEL */
+DUMMY(Fluka, RSTSEL, rstsel_, void);
+DUMMY(Fluka, SBCOMP, sbcomp_, void);
+DUMMY(Fluka, SIGFER, sigfer_, void);
+DUMMY(Fluka, UMOFIN, umofin_, void);
+DUMMY(Fluka, XINNEU, xinneu_, double);
+DUMMY(Fluka, XINPRO, xinpro_, double);
+
+/* The following dummy common blocks are added for the same reason.
+ * The number of bytes required was determined by inspecting the existing
+ * shared libraries in the 12 official Debian architectures and determining
+ * the maximum size of each common block there. */
+
+#define COMMON(fortranname_, size) \
+        struct { char c[size]; } fortranname_ = { { 0, } }
+
+COMMON(fkadhn_, 1376);
+COMMON(fkadhp_, 3712);
+COMMON(fkbala_,  288);
+COMMON(fkcd97_, 1152);
+COMMON(fkchpa_, 1472);
+COMMON(fkchpr_,  576);
+COMMON(fkcmcy_,  176);
+COMMON(fkcomc_, 7424);
+COMMON(fkcosp_,   64);
+COMMON(fkdecc_,10816);
+COMMON(fkdech_, 4328);
+COMMON(fkenco_,   16);
+COMMON(fkeva0_,60960);
+COMMON(fkfinu_,52000);
+COMMON(fkhadf_,  352);
+COMMON(fkheac_,   96);
+COMMON(fkheav_, 5408);
+COMMON(fkhet7_,   64);
+COMMON(fkhetp_,   32);
+COMMON(fkhigf_, 1632);
+COMMON(fkidgb_,   16);
+COMMON(fkinpf_,   32);
+COMMON(fkisot_,10208);
+COMMON(fkmapa_, 5824);
+COMMON(fknegx_,  128);
+COMMON(fknuct_,   16);
+COMMON(fknuda_, 1248);
+COMMON(fknuge_, 1120);
+COMMON(fknugi_,26944);
+COMMON(fknuii_, 1888);
+COMMON(fknule_,18048);
+COMMON(fknupw_,   32);
+COMMON(fkpapr_, 2400);
+COMMON(fkpare_,  256);
+COMMON(fkparn_, 7296);
+COMMON(fkpart_, 9696);
+COMMON(fkploc_, 2864);
+COMMON(fkquar_,  832);
+COMMON(fkreac_,50976);
+COMMON(fkredv_, 2368);
+COMMON(fkresn_,  256);
+COMMON(fkrun_,    32);
+COMMON(fkslop_,  608);
+COMMON(fkxsep_,13600);
+


--- NEW FILE 100-fix-isajet-manual-corruption.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 100-fix-isajet-manual-corruption.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix corruption in LaTeX source to the Isajet manual.
## DP: (Replacement text obtained from a PS version of the manual on the web.)

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc /tmp/dpep.tlmeFD/cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc
--- cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc	2001-10-08 10:03:08.000000000 -0400
+++ /tmp/dpep.tlmeFD/cernlib-2005.05.09/src/mclibs/isajet/doc/physics.doc	2005-06-08 16:12:37.814042242 -0400
@@ -122,7 +122,7 @@
 $W/Z$ decay. These were calculated using FORM 1.1 by J.~Vermaseren. The
 process $g + t \to W + b$ is {\it not} included. Both $g + b \to W^- +
 t$ and $g + \bar t \to W^- + \bar b$ of course give the same $W^- + t
-+\BARB_FINALSTATEAFTERQCDEVOLUTION
++\bar b$ final state after QCD evolution.  While the latter process is
 needed to describe the $m_t = 0$(!) mass singularity for $q_t \gg
 m_t$, it has a pole in the physical region at low $q_t$ from on-shell
 $t \to W + b$ decays. There is no obvious way to avoid this without


--- NEW FILE 101-undefine-PPC.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 101-undefine-PPC.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: If "PPC" is defined by compiler, undefine where it clashes with a
## DP: local variable.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F /tmp/dpep.aeMGeJ/cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F
--- cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F	1996-01-11 09:14:33.000000000 -0500
+++ /tmp/dpep.aeMGeJ/cernlib-2005.05.09/src/mclibs/cojets/code/bradlp.F	2005-06-08 17:00:48.403200778 -0400
@@ -37,6 +37,15 @@
 #include "cojets/zpar2.inc"
 #include "cojets/zwpar.inc"
 #include "cojets/weakon.inc"
+
+C     The following is necessary since PPC is defined in g77 on
+C     the powerpc architecture, but it's also a variable in this
+C     file.
+C       -- Kevin McCarty
+#ifdef PPC
+#undef PPC
+#endif
+
       DIMENSION QP(4),QM(4),QK(4),QE(4),QN(4)
       DIMENSION COEF(2,2),QQV(2)
 C


--- NEW FILE 102-dont-optimize-some-code.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 102-dont-optimize-some-code.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't allow the compiler to optimize several files that cause trouble
## DP: (either compiler crash or broken code generation).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	1996-06-12 11:25:38.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-09 11:14:52.470486750 -0400
@@ -19,6 +19,11 @@
 SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
 	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F rgmlt.F rkstp64.F \ @@\
 	simps64.F triint64.F 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(rderiv,rderiv,-O0,NullParameter)
+SpecialFortranLibObjectRule(rfrdh1,rfrdh1,-O0,NullParameter)
+#endif
 #else
 SRCS_F:= $(SRCS_F) cgauss128.F cauchy.F cauchy128.F deqbs128.F deqmr128.F \ @@\
 	deriv128.F minfc128.F rfrdh128.F rgmlt128.F rkstp128.F simps128.F \ @@\
@@ -37,6 +42,16 @@
 IMAKE_DEFINES=-DFortranDoesCpp=NO
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(rknysd,rknysd,-O0,NullParameter)
+SpecialFortranLibObjectRule(old506,old506,-O0,NullParameter)
+
+/* -O1 -fno-automatic optimization creates wrong code in g77 2.95, 3.3, 3.4
+   due to x86 chip extended precision, cf. http://bugs.debian.org/290438 */
+SpecialFortranLibObjectRule(radmul,radmul,-O0,NullParameter)
+#endif
+
 FORTRANSAVEOPTION = FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/mathlib/gen/e/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/e/Imakefile	1996-05-01 09:21:54.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile	2005-06-09 11:16:07.058731880 -0400
@@ -12,6 +12,11 @@
 
 #if defined(CERNLIB_DOUBLE)
 SRCS_F:= $(SRCS_F) chsum.F dchebn.F rchecf.F rcspln.F
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(rchecf,rchecf,-O0,NullParameter)
+SpecialFortranLibObjectRule(rcspln,rcspln,-O0,NullParameter)
+#endif
 #else
 SRCS_F:= $(SRCS_F) chsum128.F rchebn.F rcspln128.F
 #endif
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile	1996-05-06 11:19:44.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/isajet/isatape/Imakefile	2005-06-09 11:16:58.039286811 -0400
@@ -4,4 +4,8 @@
 
 FORTRANSAVEOPTION = FortranSaveFlags
 
+#if defined(CERNLIB_LINUX)
+SpecialFortranLibObjectRule(isawev,isawev,-O0,NullParameter)
+#endif
+
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile
--- cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile	2000-04-19 09:51:56.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mclibs/pdf/spdf/Imakefile	2005-06-09 11:22:02.812494322 -0400
@@ -97,4 +97,10 @@
 #ifdef CERNLIB_HPUX
 FORTRANOPTIONS += '-WF,-P'
 #endif
+
+#if defined(CERNLIB_LINUX)
+/* -O2 optimization on ARM breaks in g77 3.3.3 */
+SpecialFortranLibObjectRule(structm,structm,-O0,NullParameter)
+#endif
+
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile	1996-06-10 06:20:57.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile	2005-06-09 11:09:34.621022534 -0400
@@ -14,6 +14,11 @@
 FDEBUGFLAGS=+O1
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(muller,muller,-O0,NullParameter)
+#endif
+
 FORTRANSAVEOPTION = FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile	1996-06-12 06:04:36.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile	2005-06-09 11:10:40.068274255 -0400
@@ -4,6 +4,11 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* -O3 optimization breaks in g77 3.2 */
+SpecialFortranLibObjectRule(ranget,ranget,-O0,NullParameter)
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2001-09-14 09:08:51.000000000 -0400
+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-09 11:19:57.756983183 -0400
@@ -101,4 +101,10 @@
 SpecialFortranLibObjectRule(cskide,cskide,-O0,NullParameter)
 #endif
 
+#if defined(CERNLIB_LINUX)
+/* optimizing this file, even at -O1, causes runtime breakage with g77 3.3
+   cf. http://bugs.debian.org/233689 */
+SpecialFortranLibObjectRule(csrfun,csrfun,-O0,NullParameter)
+#endif
+
 SubdirLibraryTarget(NullParameter,NullParameter)


--- NEW FILE 103-ignore-overly-long-macro-in-gen.h.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 103-ignore-overly-long-macro-in-gen.h.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Comment out macro in cfortran/gen.h with too many arguments for cfortran
## DP: to accept.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/gen.h /tmp/dpep.weQ8Dc/cernlib-2005.05.09/src/cfortran/gen.h
--- cernlib-2005.05.09/src/cfortran/gen.h	2000-06-23 06:13:58.000000000 -0400
+++ /tmp/dpep.weQ8Dc/cernlib-2005.05.09/src/cfortran/gen.h	2005-06-09 11:43:16.729842789 -0400
@@ -1123,10 +1123,10 @@
 
 PROTOCCALLSFSUB3(NAMEZB,namezb,FLOAT,INT,INT)
 #define NAMEZB(A1,A2,A3)  CCALLSFSUB3(NAMEZB,namezb,FLOAT,INT,INT,A1,A2,A3)
-
+/*
 PROTOCCALLSFSUB29(NEWPTQ,newptq,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,PDOUBLE,DOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PINT,PINT)
 #define NEWPTQ(A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11,A12,A13,A14,A15,A16,A17,A18,A19,A20,A21,A22,A23,A24,A25,A26,A27,A28,A29)  CCALLSFSUB29(NEWPTQ,newptq,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,PDOUBLE,DOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PDOUBLE,PINT,PINT,A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11,A12,A13,A14,A15,A16,A17,A18,A19,A20,A21,A22,A23,A24,A25,A26,A27,A28,A29)
-
+*/
 PROTOCCALLSFSUB9(NEWRO,newro,INT,INT,INT,FLOAT,PFLOAT,FLOATV,FLOATV,FLOATV,FLOATV)
 #define NEWRO(A1,A2,A3,A4,A5,A6,A7,A8,A9)  CCALLSFSUB9(NEWRO,newro,INT,INT,INT,FLOAT,PFLOAT,FLOATV,FLOATV,FLOATV,FLOATV,A1,A2,A3,A4,A5,A6,A7,A8,A9)
 


--- NEW FILE 104-fix-undefined-insertchar-warning.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 104-fix-undefined-insertchar-warning.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Correct Lesstif warning about undefined InsertChar.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c /tmp/dpep.XJ5w0K/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c
--- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c	1996-03-08 10:33:04.000000000 -0500
+++ /tmp/dpep.XJ5w0K/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/kuipio.c	2005-06-09 14:36:52.509109480 -0400
@@ -573,7 +573,7 @@
                         EditMenu,
                         RES_CONVERT( XmNlabelString, "Copy" ),
                         RES_CONVERT( XmNmnemonic, "C" ),
-                        XmNaccelerator, "CtrlInsertChar",
+                        XmNaccelerator, "CtrlInsert",
                         RES_CONVERT( XmNacceleratorText, "Ctrl+Ins" ),
                         NULL );
         UxPutContext( copyButton, (char *) UxKuipIoContext );
@@ -585,7 +585,7 @@
                         EditMenu,
                         RES_CONVERT( XmNlabelString, "Paste" ),
                         RES_CONVERT( XmNmnemonic, "P" ),
-                        XmNaccelerator, "ShiftInsertChar",
+                        XmNaccelerator, "ShiftInsert",
                         RES_CONVERT( XmNacceleratorText, "Shift+Ins" ),
                         NULL );
         UxPutContext( pasteButton, (char *) UxKuipIoContext );


--- NEW FILE 105-fix-obsolete-xmfontlistcreate-warning.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 105-fix-obsolete-xmfontlistcreate-warning.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix Lesstif warning about use of obsolete XmFontListCreate() function

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	1996-10-24 08:13:41.000000000 -0400
+++ /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	2005-06-09 14:39:00.831812710 -0400
@@ -776,6 +776,7 @@
  ***********************************************************************/
 static void init_data ()
 {
+  /* This function edited not to use obsolete function XmFontListCreate() */
     int k;
 
     km_charset = XmSTRING_DEFAULT_CHARSET;
@@ -792,8 +793,11 @@
        if (help_font_struct == NULL)
            printf ("%s Warning: Font loaded for HELP (%s) is NULL \n",
                    main_prompt, srec.Help_font);
-       else
-           help_font = XmFontListCreate (help_font_struct,km_charset);
+       else {
+	   XmFontListEntry entry = XmFontListEntryCreate(
+	       km_charset, XmFONT_IS_FONT, (XtPointer)help_font_struct );
+           help_font = XmFontListAppendEntry( NULL, entry );
+       }
    }
 
    /*
diff -urNad cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c
--- cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c	2000-10-03 10:11:22.000000000 -0400
+++ /tmp/dpep.kv7bf1/cernlib-2005.05.09/src/pawlib/paw/cmotif/att_font.c	2005-06-09 14:39:00.803818666 -0400
@@ -215,18 +215,22 @@
  *****************************************************************************/
 static void MajButton(Widget w, Widget font,Widget pre,int postab)
 {
+   /* this function edited not to use obsolete function XmFontListCreate() */
    XmFontList police;
+   XmFontListEntry entry;
    XFontStruct *info_police;
    char strlabel[20];
    int prenum,policenum;
-
+   
    XtVaGetValues(pre,XmNuserData,&prenum,NULL);
    prenum--;
    XtVaGetValues(font,XmNuserData,&policenum,NULL);
    policenum--;
    if (( info_police=XLoadQueryFont(UxDisplay,StrFontTab[policenum]))== NULL)
       fprintf(stderr,"Unable to load font %s \n ",StrFontTab[policenum]);
-   police=XmFontListCreate(info_police,XmSTRING_DEFAULT_CHARSET);
+   entry = XmFontListEntryCreate(XmSTRING_DEFAULT_CHARSET,XmFONT_IS_FONT,
+				 (XtPointer)info_police);
+   police=XmFontListAppendEntry(NULL,entry);
    XtVaSetValues(w,XmNfontList,police,NULL);
    /* XFreeFont(UxDisplay,info_police);*/
 


--- NEW FILE 106-fix-paw++-menus-in-lesstif.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 106-fix-paw++-menus-in-lesstif.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix odd behavior of Paw++ menus when compiled against Lesstif.  The
## DP: problem is that Paw++ Motif code does some awfully weird things that
## DP: Lesstif doesn't support; cf. http://bugs.debian.org/270862 .

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c /tmp/dpep.KorIaA/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	2005-06-09 14:41:14.451377612 -0400
+++ /tmp/dpep.KorIaA/cernlib-2005.05.09/src/packlib/kuip/code_motif/mkuip.c	2005-06-09 14:41:22.929573007 -0400
@@ -1066,7 +1066,7 @@
 {
     int narg;
     Arg arglist[2];
-    Widget id_pdm;
+    Widget id_pdm, id_pdm_shell;
     Widget PdMenu[15];
 
     /*
@@ -1076,8 +1076,19 @@
     UxKuipBrowserContext = (_UxCkuipBrowser *)UxGetContext(parent);
 
     /*  create pulldown_menu */
-    id_pdm = XmCreatePulldownMenu (browserMenu,"OptionsPdMenu",arglist,0);
-
+    id_pdm_shell = XtVaCreatePopupShell ("OptionsPdMenu_shell",
+	xmMenuShellWidgetClass, browserMenu,
+	XmNwidth, 1,
+	XmNheight, 1,
+	XmNallowShellResize, TRUE,
+	XmNoverrideRedirect, TRUE,
+	NULL );
+    id_pdm = XtVaCreateWidget( "OptionsPdMenu",
+	xmRowColumnWidgetClass,
+	id_pdm_shell,
+	XmNrowColumnType, XmMENU_PULLDOWN,
+	NULL );
+/*  id_pdm = XmCreatePulldownMenu (browserMenu,"OptionsPdMenu",arglist,0); */
 
     /* create pulldown_menu_entry "Options" */
     XtVaCreateManagedWidget( "optionsMenu",
@@ -1091,7 +1102,7 @@
 /*  create list of push_buttons and separators for menu "Option"             */
 /*  create pulldown_menu for "Raise Window" (with list of appl. shells)       */
     narg = 0;
-#if XmREVISION == 99 /* problem with REVISION 2 ! */
+#if XmVERSION > 1 || XmREVISION >= 2
     XtSetArg(arglist[narg], XmNtearOffModel, XmTEAR_OFF_ENABLED); narg++;
 #endif
     kuipControlShellM = XmCreatePulldownMenu
@@ -1312,9 +1323,7 @@
 static void create_command_menu(parent)
    Widget parent;
 {
-    Widget id_pdme, id_pdm;
-    Arg    arglist[2];
-    int    narg;
+    Widget id_pdme, id_pdm, id_pdm_shell;
 
     /*
      *   find and restore the context for Browser
@@ -1323,12 +1332,26 @@
     UxKuipBrowserContext = (_UxCkuipBrowser *)UxGetContext(parent);
 
     /* create pulldown_menu_entry "Commands" for all commands */
-    narg = 0;
+
+    id_pdm_shell = XtVaCreatePopupShell ("CommandsPdMenu_shell",
+	xmMenuShellWidgetClass, browserMenu,
+	XmNwidth, 1,
+	XmNheight, 1,
+	XmNallowShellResize, TRUE,
+	XmNoverrideRedirect, TRUE,
+	NULL );
+    
+    id_pdm = XtVaCreateWidget( "CommandsPdMenu",
+	xmRowColumnWidgetClass,
+	id_pdm_shell,
+	XmNrowColumnType, XmMENU_PULLDOWN,
 #if XmVERSION > 1 || XmREVISION >= 2
-    XtSetArg(arglist[narg], XmNtearOffModel, XmTEAR_OFF_ENABLED); narg++;
+	XmNtearOffModel, XmTEAR_OFF_ENABLED,
 #endif
-    id_pdm = XmCreatePulldownMenu
-                     (browserMenu, "CommandsPdMenu", arglist, narg);
+	NULL );
+      
+/*      XmCreatePulldownMenu
+                     (browserMenu, "CommandsPdMenu", arglist, narg); */
 
     id_pdme = XtVaCreateManagedWidget( "id_pdme",
                         xmCascadeButtonGadgetClass, browserMenu,
@@ -1927,7 +1950,7 @@
    if (kuipControlShellM != NULL) XtDestroyWidget (kuipControlShellM);
 
    narg = 0;
-#if XmREVISION == 99 /* problem with REVISION 2 ! */
+#if XmVERSION > 1 || XmREVISION >= 2
    XtSetArg(arglist[narg], XmNtearOffModel, XmTEAR_OFF_ENABLED); narg++;
 #endif
    kuipControlShellM = XmCreatePulldownMenu


--- NEW FILE 107-define-strdup-macro-safely.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 107-define-strdup-macro-safely.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: In some cases strdup() and strndup() are macros, causing a build
## DP: failure.  Ensure any such macros are undefined before redeclaring them.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h /tmp/dpep.ieQnkg/cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h
--- cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h	1997-03-14 12:16:39.000000000 -0500
+++ /tmp/dpep.ieQnkg/cernlib-2005.05.09/src/packlib/kuip/kuip/kstring.h	2005-06-09 14:58:22.446739916 -0400
@@ -32,6 +32,9 @@
 
 extern char* strrstr( const char* str1, const char* str2 );
 
+#ifdef strdup
+# undef strdup /* otherwise the next function declaration may bomb */
+#endif
 #define strdup Strdup           /* prototype without const */
 extern char* strdup( const char* str );
 
@@ -46,6 +49,10 @@
                      const char* str4 );
 extern char* str5dup( const char* str1, const char* str2, const char* str3,
                      const char* str4, const char* str5 );
+
+#ifdef strndup
+# undef strndup /* otherwise the next function declaration may bomb */
+#endif
 extern char* strndup( const char* buf, size_t n );
 extern char* stridup( int i );
 


--- NEW FILE 108-quote-protect-comis-script.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 108-quote-protect-comis-script.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.tIRzzG/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
--- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2000-09-25 10:16:36.000000000 -0400
+++ /tmp/dpep.tIRzzG/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:41:16.757077306 -0400
@@ -70,7 +70,7 @@
       LEXEC=LENOCC(FEXEC)
       OPEN(LUNOUT,FILE=FEXEC(:LEXEC), STATUS='UNKNOWN',ERR=99)
       WRITE(LUNOUT,'(A)')         '#!/bin/sh'
-      WRITE(LUNOUT,'(A)')         'olddir=`pwd`'
+      WRITE(LUNOUT,'(A)')         'olddir="`pwd`"'
 *      WRITE(LUNOUT,'(A)')         'cd '//CHPATH(:LPATH)
       CHLINE=                     'cd '//CHPATH(:LPATH)
       L=LENOCC(CHLINE)
@@ -206,7 +206,7 @@
       CHLINE=                     '/bin/rm -f '//NAME(:LN)//'.o'
       L=LENOCC(CHLINE)
       WRITE(LUNOUT,'(A)')CHLINE(:L)
-      WRITE(LUNOUT,'(A)')         'cd $olddir'
+      WRITE(LUNOUT,'(A)')         'cd "$olddir"'
       WRITE(LUNOUT,'(A)')         'exit 0'
       CALL CSCLOS(LUNOUT)
       CLOSE(LUNOUT)


--- NEW FILE 110-ignore-included-lapack-rule.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 110-ignore-included-lapack-rule.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Comment out rule requiring liblapack in a subdirectory of mathlib code.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mathlib/Imakefile /tmp/dpep.Ib8j9x/cernlib-2005.05.09/src/mathlib/Imakefile
--- cernlib-2005.05.09/src/mathlib/Imakefile	1999-11-09 12:07:49.000000000 -0500
+++ /tmp/dpep.Ib8j9x/cernlib-2005.05.09/src/mathlib/Imakefile	2005-06-10 11:24:47.771309475 -0400
@@ -5,9 +5,12 @@
 
 LIBDIRS= gen bvsl
 
+/* Lapack is independent of Cernlib and should be installed as one of
+   the build dependencies.
 #ifndef WIN32
  LIBDIRS := $(LIBDIRS) lapack
 #endif
+*/
 
 SUBDIRS= $(LIBDIRS)
 


--- NEW FILE 111-fix-kuesvr-install-location.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 111-fix-kuesvr-install-location.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix install location of kuesvr binary.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile /tmp/dpep.ZmakmH/cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile	1996-03-11 10:43:22.000000000 -0500
+++ /tmp/dpep.ZmakmH/cernlib-2005.05.09/src/packlib/kuip/programs/kuesvr/Imakefile	2005-06-10 12:03:32.706178628 -0400
@@ -1,4 +1,4 @@
 
 NormalProgramTarget(kuesvr,kuesvr.o,NullParameter,NullParameter,NullParameter)
 
-InstallProgram(kuesvr,$(CERN)/$(CERN_LEVEL)/bin)
+InstallProgram(kuesvr,$(CERN_BINDIR))


--- NEW FILE 112-remove-nonexistent-prototypes-from-gen.h.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 112-remove-nonexistent-prototypes-from-gen.h.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove prototypes from gen.h of functions that don't exist in mathlib.
## DP: Because of the way cfortran works, their existence otherwise causes
## DP: linking failures in third-party code.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/gen.h /tmp/dpep.3jFEkx/cernlib-2005.05.09/src/cfortran/gen.h
--- cernlib-2005.05.09/src/cfortran/gen.h	2005-06-27 10:02:17.225463958 -0400
+++ /tmp/dpep.3jFEkx/cernlib-2005.05.09/src/cfortran/gen.h	2005-06-27 10:05:41.503584328 -0400
@@ -84,10 +84,10 @@
 
 PROTOCCALLSFFUN1(FLOAT,ALGAMA,algama,FLOAT)
 #define ALGAMA(A2)  CCALLSFFUN1(ALGAMA,algama,FLOAT,A2)
-
+/*
 PROTOCCALLSFFUN1(FLOAT,QLGAMA,qlgama,FLOAT)
 #define QLGAMA(A2)  CCALLSFFUN1(QLGAMA,qlgama,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(DOUBLE,DLGAMA,dlgama,DOUBLE)
 #define DLGAMA(A2)  CCALLSFFUN1(DLGAMA,dlgama,DOUBLE,A2)
 
@@ -141,10 +141,10 @@
 
 PROTOCCALLSFFUN5(DOUBLE,DCAUCH,dcauch,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE)
 #define DCAUCH(A2,A3,A4,A5,A6)  CCALLSFFUN5(DCAUCH,dcauch,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,A2,A3,A4,A5,A6)
-
+/*
 PROTOCCALLSFFUN6(DOUBLE,CHEBQU,chebqu,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,INT,DOUBLE)
 #define CHEBQU(A2,A3,A4,A5,A6,A7)  CCALLSFFUN6(CHEBQU,chebqu,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,INT,DOUBLE,A2,A3,A4,A5,A6,A7)
-
+*/
 PROTOCCALLSFFUN2(FLOAT,CHISIN,chisin,FLOAT,INT)
 #define CHISIN(A2,A3)  CCALLSFFUN2(CHISIN,chisin,FLOAT,INT,A2,A3)
 
@@ -204,13 +204,13 @@
 
 PROTOCCALLSFFUN3(DOUBLE,DVDOT,dvdot,INT,DOUBLEV,DOUBLEV)
 #define DVDOT(A2,A3,A4)  CCALLSFFUN3(DVDOT,dvdot,INT,DOUBLEV,DOUBLEV,A2,A3,A4)
-
+/*
 PROTOCCALLSFFUN2(DOUBLE,E401BD,e401bd,DOUBLE,DOUBLE)
 #define E401BD(A2,A3)  CCALLSFFUN2(E401BD,e401bd,DOUBLE,DOUBLE,A2,A3)
 
 PROTOCCALLSFFUN2(FLOAT,ELIN1,elin1,FLOAT,FLOAT)
 #define ELIN1(A2,A3)  CCALLSFFUN2(ELIN1,elin1,FLOAT,FLOAT,A2,A3)
-
+*/
 PROTOCCALLSFFUN1(FLOAT,ERF,erf,FLOAT)
 #define ERF(A2)  CCALLSFFUN1(ERF,erf,FLOAT,A2)
 
@@ -237,13 +237,13 @@
 
 PROTOCCALLSFFUN2(FLOAT,FREARG,frearg,FLOAT,FLOAT)
 #define FREARG(A2,A3)  CCALLSFFUN2(FREARG,frearg,FLOAT,FLOAT,A2,A3)
-
+/*
 PROTOCCALLSFFUN3(FLOAT,FRED2,fred2,FLOAT,FLOAT,FLOAT)
 #define FRED2(A2,A3,A4)  CCALLSFFUN3(FRED2,fred2,FLOAT,FLOAT,FLOAT,A2,A3,A4)
 
 PROTOCCALLSFFUN1(FLOAT,FRED3,fred3,FLOAT)
 #define FRED3(A2)  CCALLSFFUN1(FRED3,fred3,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(FLOAT,FREQ,freq,FLOAT)
 #define FREQ(A2)  CCALLSFFUN1(FREQ,freq,FLOAT,A2)
 
@@ -255,10 +255,10 @@
 
 PROTOCCALLSFFUN1(DOUBLE,DFRSIN,dfrsin,DOUBLE)
 #define DFRSIN(A2)  CCALLSFFUN1(DFRSIN,dfrsin,DOUBLE,A2)
-
+/*
 PROTOCCALLSFFUN2(FLOAT,FUN,fun,INT,FLOATV)
 #define FUN(A2,A3)  CCALLSFFUN2(FUN,fun,INT,FLOATV,A2,A3)
-
+*/
 PROTOCCALLSFFUN1(FLOAT,G116F1,g116f1,FLOAT)
 #define G116F1(A2)  CCALLSFFUN1(G116F1,g116f1,FLOAT,A2)
 
@@ -270,10 +270,10 @@
 
 PROTOCCALLSFFUN1(FLOAT,GAMMA,gamma,FLOAT)
 #define GAMMA(A2)  CCALLSFFUN1(GAMMA,gamma,FLOAT,A2)
-
+/*
 PROTOCCALLSFFUN1(FLOAT,QGAMMA,qgamma,FLOAT)
 #define QGAMMA(A2)  CCALLSFFUN1(QGAMMA,qgamma,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(DOUBLE,DGAMMA,dgamma,DOUBLE)
 #define DGAMMA(A2)  CCALLSFFUN1(DGAMMA,dgamma,DOUBLE,A2)
 
@@ -297,16 +297,16 @@
 
 PROTOCCALLSFFUN4(FLOAT,GAUSS,gauss,ROUTINE,FLOAT,FLOAT,FLOAT)
 #define GAUSS(A2,A3,A4,A5)  CCALLSFFUN4(GAUSS,gauss,ROUTINE,FLOAT,FLOAT,FLOAT,A2,A3,A4,A5)
-
+/*
 PROTOCCALLSFFUN4(FLOAT,QGAUSS,qgauss,ROUTINE,FLOAT,FLOAT,FLOAT)
 #define QGAUSS(A2,A3,A4,A5)  CCALLSFFUN4(QGAUSS,qgauss,ROUTINE,FLOAT,FLOAT,FLOAT,A2,A3,A4,A5)
-
+*/
 PROTOCCALLSFFUN4(DOUBLE,DGAUSS,dgauss,ROUTINE,DOUBLE,DOUBLE,DOUBLE)
 #define DGAUSS(A2,A3,A4,A5)  CCALLSFFUN4(DGAUSS,dgauss,ROUTINE,DOUBLE,DOUBLE,DOUBLE,A2,A3,A4,A5)
-
+/*
 PROTOCCALLSFFUN6(DOUBLE,GPINDP,gpindp,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,DOUBLE,INT)
 #define GPINDP(A2,A3,A4,A5,A6,A7)  CCALLSFFUN6(GPINDP,gpindp,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,DOUBLE,INT,A2,A3,A4,A5,A6,A7)
-
+*/
 PROTOCCALLSFFUN2(INT,IGET,iget,INTV,INT)
 #define IGET(A2,A3)  CCALLSFFUN2(IGET,iget,INTV,INT,A2,A3)
 
@@ -315,16 +315,16 @@
 
 PROTOCCALLSFFUN3(INT,ILSUM,ilsum,INT,LOGICALV,INT)
 #define ILSUM(A2,A3,A4)  CCALLSFFUN3(ILSUM,ilsum,INT,LOGICALV,INT,A2,A3,A4)
-
+/*
 PROTOCCALLSFFUN10(FLOAT,QLINSQ,qlinsq,INT,INT,INT,FLOATV,PFLOAT,FLOATV,FLOATV,FLOATV,PDOUBLE,INT)
 #define QLINSQ(A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)  CCALLSFFUN10(QLINSQ,qlinsq,INT,INT,INT,FLOATV,PFLOAT,FLOATV,FLOATV,FLOATV,PDOUBLE,INT,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)
-
+*/
 PROTOCCALLSFFUN3(INT,LKKSPL,lkkspl,DOUBLE,DOUBLEV,INT)
 #define LKKSPL(A2,A3,A4)  CCALLSFFUN3(LKKSPL,lkkspl,DOUBLE,DOUBLEV,INT,A2,A3,A4)
-
+/*
 PROTOCCALLSFFUN4(INT,LOCHAR,lochar,INTV,INT,INTV,INT)
 #define LOCHAR(A2,A3,A4,A5)  CCALLSFFUN4(LOCHAR,lochar,INTV,INT,INTV,INT,A2,A3,A4,A5)
-
+*/
 PROTOCCALLSFFUN2(INT,MAXFZE,maxfze,FLOATV,INT)
 #define MAXFZE(A2,A3)  CCALLSFFUN2(MAXFZE,maxfze,FLOATV,INT,A2,A3)
 
@@ -339,10 +339,10 @@
 
 PROTOCCALLSFFUN2(INT,NDIGIT,ndigit,DOUBLE,DOUBLE)
 #define NDIGIT(A2,A3)  CCALLSFFUN2(NDIGIT,ndigit,DOUBLE,DOUBLE,A2,A3)
-
+/*
 PROTOCCALLSFFUN1(INT,NEAR1,near1,FLOAT)
 #define NEAR1(A2)  CCALLSFFUN1(NEAR1,near1,FLOAT,A2)
-
+*/
 PROTOCCALLSFFUN1(INT,NIC311,nic311,FLOAT)
 #define NIC311(A2)  CCALLSFFUN1(NIC311,nic311,FLOAT,A2)
 


--- NEW FILE 113-cups-postscript-fix.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 113-cups-postscript-fix.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Re-order PostScript output to work around CUPS printing issue.

@DPATCH@
diff -urNad cernlib-2005.05.09~/src/graflib/higz/ipost/ipdef.F cernlib-2005.05.09/src/graflib/higz/ipost/ipdef.F
--- cernlib-2005.05.09~/src/graflib/higz/ipost/ipdef.F	2003-03-20 09:14:10.000000000 +0000
+++ cernlib-2005.05.09/src/graflib/higz/ipost/ipdef.F	2005-09-20 18:59:21.992348547 +0000
@@ -316,6 +316,7 @@
       CALL IPPSTR('%%EndProlog@')
 *
       CALL IPPSTR('%%BeginSetup@')
+      CALL IPPSTR('%%EndSetup@')
       CALL IPPSTF(8,'newpath ')
       CALL IPSVRT(1)
       IF (MODE.EQ.1.OR.MODE.EQ.4) THEN
@@ -333,7 +334,6 @@
       ENDIF
       CALL IPPSTF(15,' .25 .25 scale ')
       IF (MODE.NE.3) CALL IPSVRT(1)
-      CALL IPPSTR('%%EndSetup@')
 *
       NBSAV0 = NBSAVE
       IF (MODE.NE.3) CALL IPPSTR('%%Page: number 1@')


--- NEW FILE 114-install-scripts-properly.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 114-install-scripts-properly.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Install scripts properly (i.e. don't try to strip them).

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/scripts/Imakefile cernlib-2005.05.09.dfsg/src/scripts/Imakefile
--- cernlib-2005.05.09.dfsg~/src/scripts/Imakefile	2004-07-29 10:17:08.000000000 -0400
+++ cernlib-2005.05.09.dfsg/src/scripts/Imakefile	2005-12-02 10:45:23.091782817 -0500
@@ -1,10 +1,10 @@
 
-InstallProgram(paw,$(CERN_BINDIR))
+InstallNamedProg(paw,paw,$(CERN_BINDIR))
 
 #if defined(CERNLIB_SHIFT)
 InstallNamedProg(cernlib_shift,cernlib,$(CERN_BINDIR))
 #else
-InstallProgram(cernlib,$(CERN_BINDIR))
+InstallNamedProg(cernlib,cernlib,$(CERN_BINDIR))
 #endif
 
-InstallProgram(gxint,$(CERN_BINDIR))
+InstallNamedProg(gxint,gxint,$(CERN_BINDIR))


--- NEW FILE 200-comis-allow-special-chars-in-path.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 200-comis-allow-special-chars-in-path.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F /tmp/dpep.gkT1Y2/cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F
--- cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F	1997-05-20 05:37:58.000000000 -0400
+++ /tmp/dpep.gkT1Y2/cernlib-2005.05.09/src/pawlib/paw/code/pawfca.F	2005-06-08 19:34:43.101436210 -0400
@@ -29,6 +29,7 @@
 C.    *        CHFUNC may be the name of a COMIS function              *
 C.    *        or a file name. A file cannot contain one of            *
 C.    *        the following characters: +*=-()<>                      *
+C.    *        [n.b. patched to work around this. --Kevin McCarty]     *
 C.    *                                                                *
 C.    ******************************************************************
 #include "paw/pawcfu.inc"
@@ -60,7 +61,11 @@
       IF(NCH.LE.0)GO TO 99
       IFILE=0
       TFILE=' '
-      IF(INDEX(CHFUNC,']').EQ.0.AND.INDEX(CHFUNC,':').EQ.0)THEN
+* Added '/' as a character symbolizing a filename; otherwise Unix paths
+* containing +, *, =, -, etc. return a bogus "Unknown routine" error
+* (Fix by Kevin McCarty)
+      IF(INDEX(CHFUNC,']').EQ.0.AND.INDEX(CHFUNC,':').EQ.0.AND.
+     +   INDEX(CHFUNC,'/').EQ.0)THEN
          IF(INDEX(CHFUNC,'+').NE.0.OR.
      +      INDEX(CHFUNC,'*').NE.0.OR.
      +      INDEX(CHFUNC,'=').NE.0.OR.


--- NEW FILE 201-update-kuip-helper-apps.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 201-update-kuip-helper-apps.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Instead of "ghostview" and "lp", call the more modern helper apps
## DP: "gv" and "lpr" from KUIP.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2003-02-13 09:25:23.000000000 -0500
+++ /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2005-06-09 12:34:49.057760462 -0400
@@ -249,7 +249,7 @@
     host_psviewer = getenv( "PSVIEWER" );
   if( host_psviewer == NULL ) {
 #ifdef UNIX
-    host_psviewer = "ghostview";
+    host_psviewer = "gv";
 #endif
 #ifdef vms
     host_psviewer = "VIEW/FORM=PS/INTERFACE=DECWINDOWS";
@@ -277,7 +277,7 @@
 # if defined(MSDOS) || defined(CERNLIB_WINNT)
   ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'print $*'" );
 # else
-  ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'lp $*'" );
+  ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'lpr $*'" );
 # endif
 #else
   ku_exel( "/KUIP/SET_SHOW/HOST_PRINTER 'XPRINT $*'" );
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	1997-09-25 10:02:25.000000000 -0400
+++ /tmp/dpep.WCaWVF/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	2005-06-09 12:35:59.499480148 -0400
@@ -925,7 +925,7 @@
 The startup value can be defined by the environment variables
 'KUIPPSVIEWER' or 'PSVIEWER'.
 .
-On Unix workstations it is by default set to 'ghostview'.
+On Unix workstations it is by default set to 'gv'.
 On VAX/VMS the default commands is 'VIEW/FORM=PS/INTERFACE=DECWINDOWS'.
 
 >Action kxhostpsviewer%C


--- NEW FILE 202-fix-includes-in-minuit-example.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 202-fix-includes-in-minuit-example.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: minuit-main example should have <> instead of "" around include files.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c /tmp/dpep.SuauEf/cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c
--- cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c	2001-04-18 04:56:22.000000000 -0400
+++ /tmp/dpep.SuauEf/cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c	2005-06-09 13:22:59.567224997 -0400
@@ -15,8 +15,8 @@
 #define FCN fcn
 #endif
 
-#include "cfortran.h"
-#include "minuit.h"
+#include 
+#include 
 #define Ncont 20
 int main()
 {


--- NEW FILE 203-compile-geant-with-ertrak.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 203-compile-geant-with-ertrak.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Ertrak code added to library in Debian since I saw no reason to exclude.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-11-23 15:41:44.798536817 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-11-23 15:43:39.618959247 +0000
@@ -5,11 +5,12 @@
 AllTarget(geant321)
 
 /* Fluka removed from Debian source package for copyright reasons. */
+/* Ertrak added to Debian since I saw no reason to leave it out. */
 LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
          geocad ggeom gheisha ghits ghrout ghutils giface \ @@\
 	 giopa gkine gphys gscan gstrag gtrak guser gxint \ @@\
-	 miface miguti neutron
-
+	 miface miguti neutron        \ @@\
+	 erdecks erpremc matx55
 
 SUBDIRS= $(LIBDIRS) data examples gxuser geant321
 


--- NEW FILE 204-compile-isajet-with-isasrt.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 204-compile-isajet-with-isasrt.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Include isasrt in the Isajet library, by request (cf.
## DP: http://bugs.debian.org/260469 )

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile /tmp/dpep.PM12lm/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2001-10-08 09:06:49.000000000 -0400
+++ /tmp/dpep.PM12lm/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2005-06-09 14:25:29.621215677 -0400
@@ -9,7 +9,7 @@
 	 fortop.F frgjet.F frgmnt.F gamma.F getpt.F gettot.F heavyx.F \ @@\
 	 hevolv.F higgs.F idanti.F idgen.F iframs.F inisap.F ipartns.F \ @@\
 	 ipjset.F iprtns.F irmov0.F isabeg.F isaend.F isaevt.F isaini.F \ @@\
-	 isajet.F ispjet.F istrad.F iswdky.F jetgen.F \ @@\
+	 isajet.F isasrt.F ispjet.F istrad.F iswdky.F jetgen.F \ @@\
 	 label.F lboost.F logerr.F \ @@\
 	 logic.F logp.F logphi.F logphw.F logpt.F logqm.F logqt.F logthw.F \ @@\
 	 logx.F logxw.F logyth.F logyw.F lstsq.F mbias.F mbset.F nogood.F \ @@\


--- NEW FILE 205-max-path-length-to-256.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 205-max-path-length-to-256.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Set max path length to 256 in Hbook.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc /tmp/dpep.ceXWNa/cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc
--- cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc	2003-02-07 07:13:37.000000000 -0500
+++ /tmp/dpep.ceXWNa/cernlib-2005.05.09/src/packlib/hbook/hbook/hcdire.inc	2005-06-09 15:20:49.541661646 -0400
@@ -20,7 +20,7 @@
 *
 *CMZ :  4.20/03 28/07/93  09.33.32  by  Rene Brun
 *-- Author :
-      PARAMETER (NLPATM=100, MXFILES=50, LENHFN=128)
+      PARAMETER (NLPATM=100, MXFILES=50, LENHFN=256)
       COMMON /HCDIRN/NLCDIR,NLNDIR,NLPAT,ICDIR,NCHTOP,ICHTOP(MXFILES)
      +              ,ICHTYP(MXFILES),ICHLUN(MXFILES)
       CHARACTER*16   CHNDIR,    CHCDIR,    CHPAT    ,CHTOP


--- NEW FILE 206-herwig-uses-DBLE-not-REAL.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 206-herwig-uses-DBLE-not-REAL.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Have libherwig use double precision consistently

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F
--- cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F	1996-12-03 09:16:56.000000000 -0500
+++ /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwhiga.F	2005-06-09 15:22:00.263743792 -0400
@@ -72,7 +72,7 @@
       TAMP(6)=HWHIG5(T,S,U,EMH2,EMQ2,2,0,5,0,0,0)
       TAMP(7)=HWHIG5(U,T,S,EMH2,EMQ2,3,0,6,0,0,0)
       DO 20 I=1,7
-      TAMPI(I)= REAL(TAMP(I))
+      TAMPI(I)= DBLE(TAMP(I))
   20  TAMPR(I)=-IMAG(TAMP(I))
 C Square and add prefactors
       WTGG=0.03125*FLOAT(NCOLO*(NCOLO**2-1))
diff -urNad cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F
--- cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F	1996-12-03 09:17:04.000000000 -0500
+++ /tmp/dpep.1kYOCO/cernlib-2005.05.09/src/mclibs/herwig/code/hwuli2.F	2005-06-09 15:22:00.263743792 -0400
@@ -18,7 +18,7 @@
      &  1.644934066848226D0/
       PROD(Y,Y2)=Y*(ONE+A1*Y*(ONE+A2*Y*(ONE+A3*Y2*(ONE+A4*Y2*(ONE+A5*Y2*
      & (ONE+A6*Y2*(ONE+A7*Y2*(ONE+A8*Y2*(ONE+A9*Y2*(ONE+A10*Y2))))))))))
-      XR=REAL(X)
+      XR=DBLE(X)
       XI=IMAG(X)
       R2=XR*XR+XI*XI
       IF (R2.GT.ONE.AND.(XR/R2).GT.HALF) THEN


--- NEW FILE 207-compile-temp-libs-with-fPIC.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 207-compile-temp-libs-with-fPIC.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Compile temporary COMIS libraries with -fPIC for non-x86 arches.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.srSRmd/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
--- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2000-09-25 10:16:36.000000000 -0400
+++ /tmp/dpep.srSRmd/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:47:44.859676286 -0400
@@ -81,12 +81,12 @@
       WRITE(LUNOUT,'(A)')CHLINE(:L)
       IF(FEXT.EQ.'.c')THEN
         L=LENOCC(CHCC)
-*                                 'cc -c .... name.c'
-        CHLINE=CHCC(:L)//' '//NAME(:LN)// '.c'
+*                                 'cc -c .... -fPIC name.c'
+        CHLINE=CHCC(:L)//' -fPIC '//NAME(:LN)// '.c'
       ELSE
         L=LENOCC(CHF77)
-*                                 'f77 -c .... name.f'
-        CHLINE=CHF77(:L)//' '//NAME(:LN)// '.f'
+*                                 'f77 -c .... -fPIC name.f'
+        CHLINE=CHF77(:L)//' -fPIC '//NAME(:LN)// '.f'
       ENDIF
       L=LENOCC(CHLINE)
       WRITE(LUNOUT,'(A)')CHLINE(:L)
@@ -176,7 +176,7 @@
       ENDIF
 #endif
 #if defined(CERNLIB_LINUX)
-      CHLINE=                   'ld -shared -o '
+      CHLINE=                   'g77 -shared -o '
      +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
 #endif
 #if defined(CERNLIB_ALPHA_OSF)


--- NEW FILE 208-fix-redundant-packlib-dependencies.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 208-fix-redundant-packlib-dependencies.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove some redundancy in the libraries listed to be linked against.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile
--- cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile	1996-05-09 10:32:43.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/graflib/dzdoc/dzedit/Imakefile	2005-06-10 11:54:49.270360036 -0400
@@ -20,7 +20,7 @@
 NeedTcpipLib
 #endif
 
-CernlibFortranProgramTarget(dzeX11,dzedit.o,$(PACKAGE_LIB),$(PACKAGE_LIB),graflib/X11 packlib)
+CernlibFortranProgramTarget(dzeX11,dzedit.o,libdzdoc.a,libdzdoc.a,graflib/X11 packlib)
 
 InstallProgram(dzeX11,$(CERN_BINDIR))
 InstallScript(dzedit,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile
--- cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile	1996-04-16 04:09:49.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zftp/Imakefile	2005-06-10 11:55:33.872780414 -0400
@@ -14,6 +14,6 @@
 
 NeedTcpipLib
 
-CernlibFortranProgramTarget(zftp,zftp.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(zftp,zftp.o,libzftplib.a,libzftplib.a,packlib)
 
 InstallProgram(zftp,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile
--- cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile	1996-05-05 05:40:20.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/cspack/programs/zs/Imakefile	2005-06-10 11:56:23.109221943 -0400
@@ -31,10 +31,10 @@
 
 DefinePackageLibrary(zservlib)
 
-CernlibFortranProgramTarget(zserv,zs.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(zserv,zs.o,libzservlib.a,libzservlib.a,packlib)
 
 InstallProgram(zserv,$(CERN_BINDIR))
 
-CernlibFortranProgramTarget(pawserv,zs.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(pawserv,zs.o,libzservlib.a,libzservlib.a,packlib)
 
 InstallProgram(pawserv,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile
--- cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile	1996-11-05 04:32:29.000000000 -0500
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/fatmen/programs/fmkuip/Imakefile	2005-06-10 11:56:54.779438847 -0400
@@ -28,6 +28,6 @@
 NeedSysexe
 #endif
 
-CernlibFortranProgramTarget(fatmen,fatmen.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(fatmen,fatmen.o,libfmkuip.a,libfmkuip.a,packlib)
 
 InstallProgram(fatmen,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile
--- cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile	1996-04-02 05:03:43.000000000 -0500
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/hepdb/programs/hepdb/Imakefile	2005-06-10 11:57:39.794807919 -0400
@@ -17,6 +17,6 @@
 SpecialFortranObjectRule(hepdb,hepdb,'-WF,-P',NullParameter)
 #endif
 
-CernlibFortranProgramTarget(hepdb,hepdb.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(hepdb,hepdb.o,libdbmodule.a,libdbmodule.a,packlib)
 
 InstallProgram(hepdb,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	1996-04-18 12:33:08.000000000 -0400
+++ /tmp/dpep.ZL6s2h/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-10 12:00:35.355791756 -0400
@@ -21,6 +21,6 @@
 #endif
 
 
-CernlibCcProgramTarget(kxterm,kxterm.o,$(PACKAGE_LIB),$(PACKAGE_LIB),$(CLIBS))
+CernlibCcProgramTarget(kxterm,kxterm.o,libkxtlib.a,libkxtlib.a,$(CLIBS))
 
 InstallProgram(kxterm,$(CERN_BINDIR))


--- NEW FILE 209-ignore-unneeded-headers-in-kmutil.c.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 209-ignore-unneeded-headers-in-kmutil.c.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Comment out header files not actually needed in kmutil.c.
## DP: (This will be helpful when we move this file elsewhere to be part of
## DP: the Lesstif-dependent library split out from packlib.)

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c /tmp/dpep.BncUU7/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c	1996-03-08 10:33:09.000000000 -0500
+++ /tmp/dpep.BncUU7/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmutil.c	2005-06-10 12:06:07.198547576 -0400
@@ -20,12 +20,13 @@
 /******************************************************************************/
 
 #include "kuip/kuip.h"
+/* commented out, since this file doesn't need these includes. --Kevin McCarty
 #include "kuip/kfor.h"
 #include "kuip/kmenu.h"
 
 #include "mkutda.h"
 #include "kuip/mkutfu.h"
-
+*/
 
 /***********************************************************************
  *                                                                     *


--- NEW FILE 210-improve-cfortran-header-files.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 210-improve-cfortran-header-files.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Protect against multiple inclusion and add explicit dependency on
## DP: cfortran.h to the Cernlib C headers.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/comis.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/comis.h
--- cernlib-2005.05.09/src/cfortran/comis.h	1999-10-29 07:41:26.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/comis.h	2005-06-10 12:51:30.985999665 -0400
@@ -1,3 +1,11 @@
+#ifndef _COMIS_H
+#define _COMIS_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN1(INT,CSADDR,csaddr,STRING)
 #define	CSADDR(CHFILE) CCALLSFFUN1(CSADDR,csaddr,STRING,CHFILE)
 
@@ -30,3 +38,9 @@
 
 PROTOCCALLSFSUB2(CSTYPE,cstype,INT,PSTRING)
 #define CSTYPE(CADR,CHTYPE) CCALLSFSUB2(CSTYPE,cstype,INT,PSTRING,CADR,CHTYPE)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _COMIS_H */
diff -urNad cernlib-2005.05.09/src/cfortran/cspack.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/cspack.h
--- cernlib-2005.05.09/src/cfortran/cspack.h	1999-10-29 07:42:56.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/cspack.h	2005-06-10 12:51:31.013993690 -0400
@@ -1,5 +1,19 @@
+#ifndef _CSPACK_H
+#define _CSPACK_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB2(CZPUTA,czputa,STRING,PINT)
 #define CZPUTA(CHMAIL,ISTAT) CCALLSFSUB2(CZPUTA,czputa,STRING,PINT,CHMAIL,ISTAT)
 
 PROTOCCALLSFSUB2(CZGETA,czgeta,PSTRING,PINT)
 #define CZGETA(CHMAIL,ISTAT) CCALLSFSUB2(CZGETA,czgeta,PSTRING,PINT,CHMAIL,ISTAT)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _CSPACK_H */
diff -urNad cernlib-2005.05.09/src/cfortran/geant315.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant315.h
--- cernlib-2005.05.09/src/cfortran/geant315.h	1996-05-15 05:24:06.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant315.h	2005-06-10 12:51:31.080979393 -0400
@@ -1,3 +1,11 @@
+#ifndef _GEANT315_H
+#define _GEANT315_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*------------------------------------------------------------------
 fortran filename   : /cern/new/src/cfs/geant315/abbrch.f
 ------------------------------------------------------------------*/
@@ -4797,3 +4805,9 @@
 
 #define ZEREGS() CCALLSFSUB0(ZEREGS,zeregs)
 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GEANT315_H */
diff -urNad cernlib-2005.05.09/src/cfortran/geant321.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant321.h
--- cernlib-2005.05.09/src/cfortran/geant321.h	1996-05-15 05:24:07.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/geant321.h	2005-06-10 12:51:31.148964883 -0400
@@ -1,3 +1,11 @@
+#ifndef _GEANT321_H
+#define _GEANT321_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*------------------------------------------------------------------
 fortran filename   : abbrch.f
 ------------------------------------------------------------------*/
@@ -6099,3 +6107,9 @@
  PROTOCCALLSFFUN3(DOUBLE,XSEPRO,xsepro,DOUBLE,DOUBLE,DOUBLE)
 #define XSEPRO(A2,A3,A4)  CCALLSFFUN3(XSEPRO,xsepro,DOUBLE,DOUBLE,DOUBLE,A2,A3,A4)
 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GEANT321_H */
diff -urNad cernlib-2005.05.09/src/cfortran/gen.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/gen.h
--- cernlib-2005.05.09/src/cfortran/gen.h	2005-06-10 12:51:00.965407158 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/gen.h	2005-06-10 12:51:31.190955921 -0400
@@ -1,3 +1,11 @@
+#ifndef _GEN_H
+#define _GEN_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Subroutines/Functions with COMPLEX not supported ***
 
 #define CBSJA(A1,A2,A3,A4,A5)  CCALLSFSUB5(CBSJA,cbsja,COMPLEX,FLOAT,INT,INT,PCOMPLEX,A1,A2,A3,A4,A5)
@@ -1489,3 +1497,9 @@
 
 PROTOCCALLSFSUB6(ZEROX,zerox,FLOAT,FLOAT,FLOAT,INT,FLOAT,INT)
 #define ZEROX(A1,A2,A3,A4,A5,A6)  CCALLSFSUB6(ZEROX,zerox,FLOAT,FLOAT,FLOAT,INT,FLOAT,INT,A1,A2,A3,A4,A5,A6)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GEN_H */
diff -urNad cernlib-2005.05.09/src/cfortran/graflib.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/graflib.h
--- cernlib-2005.05.09/src/cfortran/graflib.h	1998-01-29 05:49:27.000000000 -0500
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/graflib.h	2005-06-10 12:51:31.220949519 -0400
@@ -1,2 +1,16 @@
-#include "higz.h"
-#include "hplot.h"
+#ifndef _GRAFLIB_H
+#define _GRAFLIB_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include 
+#include 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _GRAFLIB_H */
diff -urNad cernlib-2005.05.09/src/cfortran/jetset74.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/jetset74.h
--- cernlib-2005.05.09/src/cfortran/jetset74.h	1999-10-29 12:55:45.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/jetset74.h	2005-06-10 12:51:31.250943117 -0400
@@ -1,3 +1,11 @@
+#ifndef _JETSET74_H
+#define _JETSET74_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN2(INT,KLU,klu,INT,INT)
 #define KLU(A2,A3)  CCALLSFFUN2(KLU,klu,INT,INT,A2,A3)
 
@@ -327,3 +335,9 @@
 
 PROTOCCALLSFSUB11(STRUCTM,structm,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE)
 #define STRUCTM(A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)  CCALLSFSUB11(STRUCTM,structm,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,DOUBLE,PDOUBLE,A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _JETSET74_H */
diff -urNad cernlib-2005.05.09/src/cfortran/kernlib.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kernlib.h
--- cernlib-2005.05.09/src/cfortran/kernlib.h	2000-03-16 11:58:18.000000000 -0500
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kernlib.h	2005-06-10 12:51:31.291934368 -0400
@@ -1,3 +1,11 @@
+#ifndef _KERNLIB_H
+#define _KERNLIB_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN1(FLOAT,ALOGAM,alogam,FLOAT)
 #define ALOGAM(A2)  CCALLSFFUN1(ALOGAM,alogam,FLOAT,A2)
 
@@ -1512,3 +1520,9 @@
 
 PROTOCCALLSFSUB1(WORDSEP,wordsep,STRING)
 #define WORDSEP(A1)  CCALLSFSUB1(WORDSEP,wordsep,STRING,A1)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _KERNLIB_H */
diff -urNad cernlib-2005.05.09/src/cfortran/kuip.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kuip.h
--- cernlib-2005.05.09/src/cfortran/kuip.h	2000-10-05 10:27:54.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/kuip.h	2005-06-10 12:51:31.319928394 -0400
@@ -1,3 +1,11 @@
+#ifndef _KUIP_H
+#define _KUIP_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB3(KUCLOS,kuclos,INT,STRING,INT)
 #define KUCLOS(A1,A2,A3)    CCALLSFSUB3(KUCLOS,kuclos,INT,STRING,INT,A1,A2,A3)
 
@@ -6,3 +14,9 @@
 
 PROTOCCALLSFSUB0(KUWHAG,kuwhag)
 #define KUWHAG() CCALLSFSUB0(KUWHAG,kuwhag)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _KUIP_H */
diff -urNad cernlib-2005.05.09/src/cfortran/lapack.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lapack.h
--- cernlib-2005.05.09/src/cfortran/lapack.h	2000-06-23 06:13:58.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lapack.h	2005-06-10 12:51:31.348922205 -0400
@@ -1,2 +1,16 @@
+#ifndef _LAPACK_H
+#define _LAPACK_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB11(DGELS,dgels,STRING,INT,INT,INT,DOUBLEV,INT,DOUBLEV,INT,DOUBLEV,INT,PINT)
 #define DGELS(TRANS,M,N,NRHS,A,LDA,B,LDB,WORK,LWORK,INFO) CCALLSFSUB11(DGELS,dgels,STRING,INT,INT,INT,DOUBLEV,INT,DOUBLEV,INT,DOUBLEV,INT,PINT,TRANS,M,N,NRHS,A,LDA,B,LDB,WORK,LWORK,INFO)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _LAPACK_H */
diff -urNad cernlib-2005.05.09/src/cfortran/lepto62.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lepto62.h
--- cernlib-2005.05.09/src/cfortran/lepto62.h	1999-10-29 12:55:45.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/lepto62.h	2005-06-10 12:51:31.378915804 -0400
@@ -1,3 +1,11 @@
+#ifndef _LEPTO62_H
+#define _LEPTO62_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFFUN2(FLOAT,DCROSS,dcross,FLOAT,FLOAT)
 #define DCROSS(A2,A3)  CCALLSFFUN2(DCROSS,dcross,FLOAT,FLOAT,A2,A3)
 
@@ -174,3 +182,9 @@
 
 PROTOCCALLSFSUB0(RIWIBD,riwibd)
 #define RIWIBD() CCALLSFSUB0(RIWIBD,riwibd)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _LEPTO62_H */
diff -urNad cernlib-2005.05.09/src/cfortran/minuit.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/minuit.h
--- cernlib-2005.05.09/src/cfortran/minuit.h	1999-10-27 11:30:23.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/minuit.h	2005-06-10 12:51:31.407909615 -0400
@@ -1,3 +1,11 @@
+#ifndef _MINUIT_H
+#define _MINUIT_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  *  Interface to minuit using cfortran.h
  *
@@ -190,3 +198,9 @@
 
 PROTOCCALLSFSUB0(STAND,stand)
 #define STAND() CCALLSFSUB0(STAND,stand)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _MINUIT_H */
diff -urNad cernlib-2005.05.09/src/cfortran/packlib.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/packlib.h
--- cernlib-2005.05.09/src/cfortran/packlib.h	1998-01-29 11:17:45.000000000 -0500
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/packlib.h	2005-06-10 12:51:31.436903427 -0400
@@ -1,4 +1,18 @@
-#include "hbook.h"
-#include "minuit.h"
-#include "kuip.h"
-#include "zebra.h"
+#ifndef _PACKLIB_H
+#define _PACKLIB_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include 
+#include 
+#include 
+#include 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _PACKLIB_H */
diff -urNad cernlib-2005.05.09/src/cfortran/paw.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/paw.h
--- cernlib-2005.05.09/src/cfortran/paw.h	2000-10-05 10:27:55.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/paw.h	2005-06-10 12:51:31.464897452 -0400
@@ -1,6 +1,20 @@
+#ifndef _PAW_H
+#define _PAW_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB2(PAW,paw,INT,INT)
 #define PAW(A1,A2)  CCALLSFSUB2(PAW,paw,INT,INT,A1,A2)
 
 PROTOCCALLSFSUB0(PAEXIT,paexit)
 #define PAEXIT() CCALLSFSUB0(PAEXIT,paexit)
 
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _PAW_H */
diff -urNad cernlib-2005.05.09/src/cfortran/zebra.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/zebra.h
--- cernlib-2005.05.09/src/cfortran/zebra.h	1999-10-29 07:35:47.000000000 -0400
+++ /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/zebra.h	2005-06-10 12:51:31.496890624 -0400
@@ -1,5 +1,19 @@
+#ifndef _ZEBRA_H
+#define _ZEBRA_H
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 PROTOCCALLSFSUB1(MZEBRA,mzebra,INT)
 #define MZEBRA(A1)    CCALLSFSUB1(MZEBRA,mzebra,INT,A1)
 
 PROTOCCALLSFSUB2(MZPAW,mzpaw,INT,STRING)
 #define MZPAW(A1,A2)  CCALLSFSUB2(MZPAW,mzpaw,INT,STRING,A1,A2)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* #ifndef _ZEBRA_H */


--- NEW FILE 211-fix-comis-on-64-bit-arches.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-64-bit-arches.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09~/src/geant321/gphys/gphot.F cernlib-2005.05.09/src/geant321/gphys/gphot.F
--- cernlib-2005.05.09~/src/geant321/gphys/gphot.F	1995-10-24 10:21:29.000000000 +0000
+++ cernlib-2005.05.09/src/geant321/gphys/gphot.F	2005-09-20 19:27:10.734527890 +0000
@@ -240,7 +240,7 @@
                   ELSE
 C Radiative shell decay
                      JS = JFN+1+2*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 40 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
@@ -296,7 +296,7 @@
                   ELSE
 c Nonradiative decay
                      JS = JFN+1+3*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 60 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
diff -urNad cernlib-2005.05.09~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.05.09/src/packlib/kernlib/kerngen/ccgen/locb.c
--- cernlib-2005.05.09~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/kernlib/kerngen/ccgen/locb.c	2005-09-20 19:27:10.734527890 +0000
@@ -44,7 +44,25 @@
    DummyDef
 #endif
 {
+#if defined(CERNLIB_QMLXIA64)
+   const unsigned long long int mask=0x00000000ffffffff;
+   static unsigned long long int base=1;
+   unsigned long long int jadr=(unsigned long long int) iadr;
+   unsigned long long int jadrl = (mask & jadr);
+
+   if (base == 1) {
+     base = (~mask & jadr);
+   } else if(base != (~mask & jadr)) {
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+     printf("locb_() Warning: changing base from %lx to %lx!!!\n",
+     	   base, (~mask & jadr));
+     printf("This may result in program crash or incorrect results\n");
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+   }
+   return ((int) jadrl);
+#else
    return( (int) iadr );
+#endif
 }
 /*> END <----------------------------------------------------------*/
 #ifdef CERNLIB_TCGEN_LOCB
diff -urNad cernlib-2005.05.09~/src/packlib/zbook/code/zjump.c cernlib-2005.05.09/src/packlib/zbook/code/zjump.c
--- cernlib-2005.05.09~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/zbook/code/zjump.c	2005-09-20 19:27:10.734527890 +0000
@@ -7,6 +7,9 @@
  *
  */
 #include "zbook/pilot_c.h"
+#if defined(CERNLIB_QMLXIA64)
+static void (*target)();
+#endif
 #if defined(CERNLIB_UNIX)
 #if defined(CERNLIB_QX_SC)
 zjump_(name,p1,p2,p3,p4)
@@ -18,8 +21,23 @@
 ZJUMP(name,p1,p2,p3,p4)
 #endif
 char *p1, *p2, *p3, *p4;
+
+/*  LP64 compatibility:
+    name is taken from a Fortran array and therefore its address is 32 bit
+    which has to be converted to a 64 bit address to satisfy void (*) (H. Vogt) */
+
+#if defined(CERNLIB_QMLXIA64)
+int *name;
+{
+  long jadr;
+  jadr   = *name;  /* convert int to long */
+  target = (void (*)())jadr;
+  (*target)(p1, p2, p3, p4);
+}
+#else
 void (**name)();
 {
    (**name)(p1, p2, p3, p4);
 }
 #endif
+#endif
diff -urNad cernlib-2005.05.09~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.05.09/src/packlib/zebra/test/brztest/btest2.F
--- cernlib-2005.05.09~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
+++ cernlib-2005.05.09/src/packlib/zebra/test/brztest/btest2.F	2005-09-20 19:27:10.734527890 +0000
@@ -29,6 +29,15 @@
 ********************************************************************************
 *
       COMMON/CRZT/IXSTOR,IXDIV,IFENCE(2),LEV,LEVIN,BLVECT(30000)
+
+*     LP64 compatibility:
+*     For 64-bit pointer systems put local variables referenced by LOCF
+*     in a dummy named common block to keep addresses in the program region.
+*     see also: packlib/ffread/test/main.F (H. Vogt)
+
+#if defined(CERNLIB_QMLXIA64)
+      COMMON /TEST64/LBANK
+#endif
       DIMENSION LQ(999),IQ(999),Q(999)
       EQUIVALENCE (IQ(1),Q(1),LQ(9)),(LQ(1),LEV)
 C
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09~/src/pawlib/comis/code/Imakefile	2005-09-20 19:26:47.894420356 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-09-20 19:27:10.734527890 +0000
@@ -50,6 +50,10 @@
 SRCS_F := $(SRCS_F) cscrexec.F
 #endif
 
+#if defined(CERNLIB_QMLXIA64)
+SRCS_F := $(SRCS_F) csrtgpl.F csitgpl.F
+#endif
+
 #if defined(CERNLIB_OLD)
 SRCS_F := $(SRCS_F) cspdir.F csrmbk.F
 #endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csaddr.F	1996-02-26 17:16:25.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-09-20 19:27:10.735527676 +0000
@@ -17,8 +17,14 @@
       INTEGER CSLTGP,CSITGP
       CHARACTER*32 NAME
 #include "comis/cstab.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       INTEGER CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      INTEGER*8 CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)
       NAME=CHNAME
       NC=LENOCC(NAME)
       CALL CSCHID(NAME(:NC))
@@ -26,21 +32,39 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
+#endif
+#endif
+#if defined(CERNLIB_SHL)
           ELSE
             I=0
           ENDIF
         ENDIF
       ELSE
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+        IF(IADGPL.NE.0)THEN
+          IFCS=-2
+          ITYPGP=-2
+          I=CSITGPL(IPVS)
+        ENDIF
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
           I=CSITGP(IPVS)
         ENDIF
+#endif
       END IF
       CSADDR=I
 #endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csinit.F cernlib-2005.05.09/src/pawlib/comis/code/csinit.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csinit.F	2005-04-18 15:41:04.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csinit.F	2005-09-20 19:27:10.735527676 +0000
@@ -64,6 +64,9 @@
 #if defined(CERNLIB_SHL)
 #include "comis/cshlnm.inc"
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+#endif
 #if defined(CERNLIB_PAW)
 #include "paw/pcmode.inc"
 #include "comis/cshfill.inc"
@@ -159,6 +162,9 @@
       ICHMINU=ICHAR('-')
       ICHPLUS=ICHAR('+')
       ICHCOMM=ICHAR(',')
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+      IPIADGV=0
+#endif
 #if defined(CERNLIB_PAW)
       CALL CSPAWI
       MODHFI=0
@@ -209,11 +215,16 @@
       CHF77 ='f77 -c -pic'
       CHCC  ='cc -c -pic'
 #endif
-#if (defined(CERNLIB_LINUX))
+#if (defined(CERNLIB_LINUX))&&(!defined(CERNLIB_QMLXIA64))
       ITMPLEN=CSTMPD(CHPATH, 256)
       CHF77 ='g77 -c'
       CHCC  ='cc -c'
 #endif
+#if (defined(CERNLIB_LINUX))&&(defined(CERNLIB_QMLXIA64))
+      ITMPLEN=CSTMPD(CHPATH, 256)
+      CHF77 ='g77 -c -fPIC -fno-f2c'
+      CHCC  ='cc -c -fPIC -fno-f2c'
+#endif
 #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
       ITMPLEN=CSTMPD(CHPATH, 256)
       CHF77 ='f77 -c'
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csintx.F cernlib-2005.05.09/src/pawlib/comis/code/csintx.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csintx.F	1996-12-05 09:50:37.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csintx.F	2005-09-20 19:27:10.762521893 +0000
@@ -38,6 +38,9 @@
 #if defined(CERNLIB_PAW)
 #include "comis/cskucs.inc"
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_ALPHA_OSF))
       INTEGER CSTRCMP
 #endif
@@ -1105,6 +1108,32 @@
       ENDIF
 #endif
 #if (!defined(CERNLIB_VAX))&&(!defined(CERNLIB_APOLLO))
+#if defined(CERNLIB_QMLXIA64)
+      IF(IQ(IP+KSIFCS).EQ.-2)THEN
+*Dynamic linker may give long addresses
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ENDIF
+#else
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NPAR,IDA(IOFSPL))
       ELSEIF(ITP.EQ.2)THEN
@@ -1115,6 +1144,7 @@
         DCSRES=CSCALD(IADGP,NPAR,IDA(IOFSPL))
       ENDIF
 #endif
+#endif
       IPC=IPC+4
       GO TO 999
 *NUM I
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csitgpl.F cernlib-2005.05.09/src/pawlib/comis/code/csitgpl.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csitgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csitgpl.F	2005-09-20 19:27:10.763521679 +0000
@@ -0,0 +1,32 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZU:  1.16/16 04/10/93  12.14.52  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+      INTEGER FUNCTION CSITGPL(IP)
+***------------------------------
+*   it is last routine from the tables-set.
+***-----------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cspnts.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab64.inc"
+      I=MHLOC(KSIDP+NWIDEN)
+      IQ(I)=0
+      IQ(I+1)=NCIDEN
+      DO 1 K=1,NWIDEN
+        IQ(I+KSIDP-1+K)=IDEN(K)
+   1  CONTINUE
+      CALL CSRTGPL(I)
+      IF(IP.EQ.0)THEN
+        IPGP=I
+      ELSE
+        IQ(IP)=I
+      ENDIF
+      CSITGP=I
+      END
+#endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/cskcal.F cernlib-2005.05.09/src/pawlib/comis/code/cskcal.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/cskcal.F	1996-12-05 09:50:39.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/cskcal.F	2005-09-20 19:27:10.763521679 +0000
@@ -31,6 +31,9 @@
 #include "comis/cstab.inc"
 #include "comis/csfres.inc"
 #include "comis/cssysd.inc"
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
       CHARACTER PRONAME*32
       INTEGER CSCALI
       DOUBLE PRECISION CSCALD
@@ -232,6 +235,34 @@
         I2=I2+KS
         I=I+1
  9203 CONTINUE
+#if defined(CERNLIB_QMLXIA64)
+*  Dynamic linker may give long addresses
+      IF (IFCS.EQ.-2)THEN
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ENDIF
+#else
 *      IT=IABS(ITYPGP)
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NOPAR,IF77PL(1))
@@ -245,6 +276,7 @@
       ENDIF
 *+SELF,IF=UNIX,IF=-SGI,IF=-IBMRT,IF=-DECS,IF=-HPUX,IF=-SUN,IF=-MSDOS.
 #endif
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_STDUNIX))
       I=1
       DO 9203 K=ITA-NPAR+1,ITA
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/cslink.F cernlib-2005.05.09/src/pawlib/comis/code/cslink.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/cslink.F	1996-02-26 17:16:17.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/cslink.F	2005-09-20 19:27:10.763521679 +0000
@@ -21,10 +21,15 @@
 #include "comis/cstab.inc"
 #include "comis/cspnts.inc"
 #include "comis/cslun.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       CHARACTER*(KLENID) FNNAME
       INTEGER CS_GET_FUNC
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      CHARACTER*(KLENID) FNNAME
+      INTEGER*8 CS_GET_FUNC
+#endif
          COMMON/CSGSCM/IGS,JGS,NGS,CSJUNK(3)
       IF(ISTLIB.EQ.0 .AND. ITBS.EQ.0)RETURN
    2  I=IPGP
@@ -60,12 +65,20 @@
 #if defined(CERNLIB_SHL)
           CALL CSGTIDP(I,FNNAME,NC)
           CALL CUTOL(FNNAME(1:NC))
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(FNNAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+          ENDIF
+#else
           IADGP=CS_GET_FUNC(FNNAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
           ENDIF
 #endif
+#endif
           IP=0
         ENDIF
       ENDIF
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/code/csrtgpl.F cernlib-2005.05.09/src/pawlib/comis/code/csrtgpl.F
--- cernlib-2005.05.09~/src/pawlib/comis/code/csrtgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/code/csrtgpl.F	2005-09-20 19:27:10.764521465 +0000
@@ -0,0 +1,31 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZ :  1.18/14 10/01/95  15.41.06  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+
+      SUBROUTINE CSRTGPL(I)
+***--------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab.inc"
+#include "comis/cstab64.inc"
+
+      IPIADGV = IPIADGV + 1
+      IF (IPIADGV .GT. MAXIAD64)  THEN
+        WRITE (*,'(2a,I4)') 'to much addresses for dynamik linking, ',
+     &                      'limit is ', MAXIAD64
+        WRITE (*,'(2a)') 'increase MAXIAD64 in cstab64.inc and ',
+     &                    'recompile COMIS'
+
+        STOP
+      END IF
+      IADGPLV(IPIADGV) = IADGPL
+      IADGP            = IPIADGV
+      CALL CCOPYA(IADGP,IQ(I+2),KSIDP-2)
+      END
+#endif
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/comis/cstab64.inc cernlib-2005.05.09/src/pawlib/comis/comis/cstab64.inc
--- cernlib-2005.05.09~/src/pawlib/comis/comis/cstab64.inc	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/comis/cstab64.inc	2005-09-20 19:27:10.775519109 +0000
@@ -0,0 +1,10 @@
+*
+*
+* cstab64.inc
+*
+      PARAMETER (MAXIAD64=100) !maximum number of shared objects
+      INTEGER*8 IADGPL,IADGPLV(MAXIAD64)
+      INTEGER   IADGPL1, IADGPL2
+      COMMON /CSTB64/ IADGPL,IADGPLV
+      COMMON /CSTB64I/ IPIADGV
+      EQUIVALENCE (IADGPL, IADGPL1)
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/ccopys.c	1997-09-02 15:50:38.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/ccopys.c	2005-09-20 19:27:10.776518895 +0000
@@ -33,11 +33,25 @@
 #else
 void ccopys_(ja,jb,nn)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *nn;
+{
+  int i,n; char *a,*b;
+  n=*nn; (long)a=*ja; (long)b=*jb;
+#else
      char **ja, **jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+#endif
   if ( a >= b )
      for ( i=0; i
 #endif
@@ -274,6 +285,7 @@
 #endif
          p->next = f->first_proc;
          f->first_proc = p;
+         if (debug_level > 0) printf("function pointer is: %p\n", p->funcptr);
          return (void *)(p->funcptr);
       }
      f = f->next;
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscald.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscald.c	2004-10-27 09:01:54.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscald.c	2005-09-20 19:27:10.776518895 +0000
@@ -32,8 +32,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 double cscald_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -46,10 +45,41 @@
     int CSCALD (name,n,p)
 #  endif
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscald_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+double cscald_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[15];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = *fptr + (unsigned long)jumpad_;
+   if ( *fptr > 0 ) ptr = 0;
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  double (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    double d;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscali.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscali.c	2004-10-22 12:42:40.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscali.c	2005-09-20 19:27:10.777518681 +0000
@@ -29,8 +29,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 int cscali_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -39,10 +38,41 @@
 #if defined(CERNLIB_QXCAPT)
 int type_of_call CSCALI (name,n,p)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscali_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+int cscali_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[15];
+{
+   int jumpad_();
+   int (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   if ( *fptr > 0 ) ptr = 0;
+   ptr += *fptr;
+   name = (int (*)())ptr;
+/*    printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  int (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    int i;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09/src/pawlib/comis/deccc/cscalr.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cscalr.c	2004-10-22 12:03:16.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cscalr.c	2005-09-20 19:27:10.788516325 +0000
@@ -33,16 +33,12 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 float cscalr_ (name,n,p)
 #endif
-
 #if defined(CERNLIB_QXNO_SC)
 float cscalr (name,n,p)
 #endif
-
 #if defined(CERNLIB_QXCAPT)
 # if defined(CERNLIB_MSSTDCALL)
    float type_of_call CSCALR(name,n,p)
@@ -51,10 +47,39 @@
 # endif
 #endif
 
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscalr_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+float cscalr_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ int pin[15];
+{
+   int jumpad_();
+   float (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   ptr += *fptr;
+   name = (float (*)())ptr;
+/*    printf ("cscalr - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[15];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  float (type_of_call *(*name)) ();
  int *n;
  int *p[15];
 {
+#endif
    float r;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09~/src/pawlib/comis/deccc/cstrcmp.c	1997-09-02 15:50:44.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/comis/deccc/cstrcmp.c	2005-09-20 19:27:10.788516325 +0000
@@ -36,6 +36,27 @@
 #else
 int cstrcmp_(ja,na,jb,nb)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *na, *nb;
+{
+
+  int i,la,lb,k; char *a,*b;
+  if ( *na >= *nb )
+     {
+      (long)a=*ja; (long)b=*jb; la=*na; lb=*nb; k=1;
+      }
+  else
+    {
+      (long)a=*jb; (long)b=*ja; la=*nb; lb=*na; k=-1;
+     }
+#else
      char **ja, **jb;
      int *na, *nb;
 {
@@ -48,6 +69,7 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+#endif
   for ( i=0; i b[i]) ? k : -k ); }
diff -urNad cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_execute.c cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_execute.c
--- cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_execute.c	2001-09-18 13:41:35.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_execute.c	2005-09-20 19:27:10.789516111 +0000
@@ -245,7 +245,15 @@
 	char		ntname[MAX_NAME_LEN+6];
 	int		i, ierr, indx, itype, isize, ielem;
 	Int32 *		addr;
-	int		ibase[1], ioff, nuse;
+
+	/* LP64 compatibility:
+	   use static for ibase (at least) because its address is stored
+	   as Int32 in structure CWNBlock                                 
+	   static takes ibase from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int	ibase[1], ioff, nuse;
 	int		id = qe->id;
 	char *		path = qe->path;
 	char *		title;
@@ -871,8 +879,21 @@
 			if ( cmd->u.scan.pawpp ) {
 				char	buf[33];
 
+				/* for LP64 ABI matlab and matrow are 64 bit pointer, type is void*  
+				   but PCADDR.jmlab and PCADDR.jmrow are of type int
+				   see: c_pcaddr.h and qp_command.h
+				   it is related to CWNBlock -> see above (H. Vogt)*/
+
+#if defined(CERNLIB_QMLXIA64)
+				unsigned long long int	 myjmlab, myjmrow;
+				myjmlab = PCADDR.jmlab;
+				myjmrow = PCADDR.jmrow;
+				c->matlab = (TableCallBack) myjmlab;
+				c->matrow = (TableCallBack) myjmrow;
+#else
 				c->matlab = (TableCallBack) PCADDR.jmlab;
 				c->matrow = (TableCallBack) PCADDR.jmrow;
+#endif
 
 				qp_assert( qe->nexpr <= MAX_OUTSTR );
 
diff -urNad cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_hbook_if.c cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_hbook_if.c
--- cernlib-2005.05.09~/src/pawlib/paw/ntuple/qp_hbook_if.c	1999-07-05 15:43:35.000000000 +0000
+++ cernlib-2005.05.09/src/pawlib/paw/ntuple/qp_hbook_if.c	2005-09-20 19:27:10.801513541 +0000
@@ -149,7 +149,15 @@
 	int	idn, idtmp;
 	int	icycle;
 	int	ierr;
-	int     izero = 0;
+
+	/* LP64 compatibility:
+	   use static for izero because its address is fetched by hbname_
+	   using locb and locb expects 32 bit addresses only.
+	   static takes izero from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int     izero = 0;
 
 	/* split string into  path, id and cycle */
 
diff -urNad cernlib-2005.05.09~/src/scripts/cernlib cernlib-2005.05.09/src/scripts/cernlib
--- cernlib-2005.05.09~/src/scripts/cernlib	2003-01-23 14:00:37.000000000 +0000
+++ cernlib-2005.05.09/src/scripts/cernlib	2005-09-20 19:27:10.801513541 +0000
@@ -115,6 +115,12 @@
 	       [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
 	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
 	       [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
+#                      add path to lib64 for x86_64 architecture
+	       if [ `uname -m` = x86_64 ] && [ -d /usr/X11R6/lib64 ] ; then
+		  SYSGDIRS="-L/usr/X11R6/lib -L/usr/X11R6/lib64"
+		  SYSGX11="$SYSGDIRS -lX11"
+		  SYSGMOTIF="$SYSGDIRS -lXm -lXt -lXp -lXext -lX11"
+	       fi
 	       ;;
       NeXT)    SYSGX11="/usr/lib/X11/libX11.r" ;
                SYSGMOTIF="-lXm -lXt /usr/lib/X11/libX11.r" ;;


--- NEW FILE 300-skip-duplicate-lenocc.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 300-skip-duplicate-lenocc.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Only compile one of the two "lenocc()" functions.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile
--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile	2002-09-19 16:44:52.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile	2005-11-28 19:59:28.690293288 +0000
@@ -19,7 +19,9 @@
 SRCS_C += apofsz.c
 #endif
 
-#if defined(CERNLIB_WINNT)
+#if defined(CERNLIB_WINNT) || defined(CERNLIB_LINUX)
+/* Do not use lenocc.c in Linux; favor packlib/kernlib/kerngen/tcgen/lenocc.F
+ * instead.  --Kevin McCarty, for Debian */
 SRCS_C += lnblnk.c
 #endif
 
@@ -29,7 +31,7 @@
 
 #if defined(CERNLIB_DECS) || defined(CERNLIB_QMVAOS) \
  || defined(CERNLIB_HPUX) || defined(CERNLIB_IBMRT) || defined(CERNLIB_IBMRTD) \
- || defined(CERNLIB_OS9)  || defined(CERNLIB_LINUX)
+ || defined(CERNLIB_OS9)
 SRCS_C += lenocc.c lnblnk.c
 #endif
 


--- NEW FILE 303-shadow-passwords-supported.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 303-shadow-passwords-supported.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Allow Cern's server code to read from /etc/shadow.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.KyLyTI/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
--- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-04-18 11:39:28.000000000 -0400
+++ /tmp/dpep.KyLyTI/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-08 16:55:00.088372396 -0400
@@ -28,6 +28,9 @@
  *
  */
 #include "cspack/pilot.h"
+#if defined(CERNLIB_LINUX) && ! defined(CERNLIB_MACOSX)
+#define SHADOW_SUPPORT /* for Debian */
+#endif
 #if !defined(CERNLIB_IBM)||defined(CERNLIB_TCPSOCK)
 /*N.B. Must define sequence TCPLOG if a log file is required, e.g.*/
 /*#define LOGFILE "disk$dd:-ben.socks-serv.log"*/ /* VMS    */
@@ -231,7 +234,7 @@
 #endif /* OSK */
 #endif /* AUTHENT */
  
-#ifdef linux_softland
+#if defined(linux_softland) || defined(SHADOW_SUPPORT)
 #include 
 #endif /* linux_softland */
  
@@ -1780,10 +1783,10 @@
         union wait ret;
 #endif /* APOPWD1 */
  
-        char   *xpasswd, *crypt();
+        char   *xpasswd, *encrypted, *crypt();
         struct passwd *pw;
  
-#ifdef linux_softland
+#if defined(linux_softland) || defined(SHADOW_SUPPORT)
         struct spwd *spwd;
 #endif /* linux_softland */
  
@@ -1798,6 +1801,7 @@
                 reply("Unknown user %s.\n", user);
                 return(-2);
         }
+	encrypted = pw->pw_passwd;
  
 #ifdef linux_softland
         spwd = getspnam(user);
@@ -1805,6 +1809,29 @@
                 reply("User %s has illegal shadow password\n",user);
                 return(-2);
         }
+	encrypted = spwd->sp_pwdp;
+
+#elif defined(SHADOW_SUPPORT)
+	/* shadow passwords may not be enabled in Debian, so must check */
+	{
+		FILE *test = fopen("/etc/shadow", "r");
+		if (test) {
+			fclose(test);
+			spwd = getspnam(user);
+			if (spwd == NULL) {
+				reply("User %s has illegal shadow password\n",
+				      user);
+				return(-2);
+			}
+			encrypted = spwd->sp_pwdp;
+		}
+		else if (errno == EACCES) {
+			reply("Server has insufficient permissions to "
+			      "read /etc/shadow file\n");
+			return(-2);
+		}
+	}
+
 #endif /* linux_softland */
  
 #ifdef APOPWD1
@@ -1850,15 +1877,16 @@
 #else
  
 #ifdef linux_softland
-            xpasswd = pw_encrypt(pass,spwd->sp_pwdp);
+            xpasswd = pw_encrypt(pass, encrypted);
 #else
-            xpasswd = crypt(pass, pw->pw_passwd);
+            xpasswd = crypt(pass, encrypted);
 #endif /* linux_softland */
+
             /* The strcmp does not catch null passwords! */
-#ifdef linux_softland
-            if (spwd->sp_pwdp == '\0' || strcmp(xpasswd,spwd->sp_pwdp)) {
+#if defined(linux_softland) || defined(SHADOW_SUPPORT)
+            if (*encrypted == '\0' || strcmp(xpasswd,spwd->sp_pwdp)) {
 #else
-            if (*pw->pw_passwd == '\0' || strcmp(xpasswd,pw->pw_passwd)) {
+            if (*encrypted == '\0' || strcmp(xpasswd,pw->pw_passwd)) {
 #endif /* linux_softland */
  
 #endif /* AFS */


***** Error reading new file: [Errno 2] No such file or directory: '304-update-Imake-config-files.dpatch'

--- NEW FILE 305-use-POWERPC-not-PPC-as-test.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 305-use-POWERPC-not-PPC-as-test.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Since patch 304 changed the meaning of CERNLIB_PPC to a mere endianness
## DP: test, we now use CERNLIB_POWERPC to mean actually checking for a PowerPC
## DP: processor; fix the three occurences of this in Imakefiles.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile
--- cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile	1998-09-25 11:34:28.000000000 -0400
+++ /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/mclibs/herwig/code/Imakefile	2005-06-09 10:51:45.913019086 -0400
@@ -43,7 +43,7 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_PPC)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
 SpecialFortranLibObjectRule(hwuci2,hwuci2,-O0,NullParameter)
 #endif
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/Imakefile /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	1998-09-25 05:33:51.000000000 -0400
+++ /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	2005-06-09 10:50:47.068482917 -0400
@@ -56,7 +56,7 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_PPC)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
 SpecialFortranLibObjectRule(pawins,pawins,-O0,NullParameter)
 #endif
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	1999-09-14 05:20:08.000000000 -0400
+++ /tmp/dpep.fQy2EP/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	2005-06-09 10:51:15.807396176 -0400
@@ -46,7 +46,7 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_PPC)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
 SpecialObjectRule(archive/qp_execute.o,qp_execute.c archive/qp_execute.d,-O0 -o $@)
 SpecialObjectRule(debug/qp_execute.o,qp_execute.c debug/qp_execute.d,-O0 -o $@)
 SpecialObjectRule(shared/qp_execute.o,qp_execute.c shared/qp_execute.d,-O0 -o $@)


--- NEW FILE 306-patch-assert.h-for-makedepend.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 306-patch-assert.h-for-makedepend.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Include local copy of assert.h with a workaround for a bug of
## DP: makedepend (cf. Debian bug # 171908).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/include/assert.h /tmp/dpep.9sKNsJ/cernlib-2005.05.09/src/include/assert.h
--- cernlib-2005.05.09/src/include/assert.h	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.9sKNsJ/cernlib-2005.05.09/src/include/assert.h	2005-06-09 12:50:41.751880968 -0400
@@ -0,0 +1,153 @@
+#ifndef CERNLIB_LINUX
+# include "/usr/include/assert.h"
+#else
+
+/* Copyright (C) 1991,1992,1994-2001,2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/*
+ *	ISO C99 Standard: 7.2 Diagnostics	
+ */
+
+#ifdef	_ASSERT_H
+
+# undef	_ASSERT_H
+# undef	assert
+# undef __ASSERT_VOID_CAST
+
+# ifdef	__USE_GNU
+#  undef assert_perror
+# endif
+
+#endif /* assert.h	*/
+
+#define	_ASSERT_H	1
+#include 
+
+#if defined __cplusplus && __GNUC_PREREQ (2,95)
+# define __ASSERT_VOID_CAST static_cast
+#else
+# define __ASSERT_VOID_CAST (void)
+#endif
+
+/* void assert (int expression);
+
+   If NDEBUG is defined, do nothing.
+   If not, and EXPRESSION is zero, print an error message and abort.  */
+
+#ifdef	NDEBUG
+
+# define assert(expr)		(__ASSERT_VOID_CAST (0))
+
+/* void assert_perror (int errnum);
+
+   If NDEBUG is defined, do nothing.  If not, and ERRNUM is not zero, print an
+   error message with the error text for ERRNUM and abort.
+   (This is a GNU extension.) */
+
+# ifdef	__USE_GNU
+#  define assert_perror(errnum)	(__ASSERT_VOID_CAST (0))
+# endif
+
+#else /* Not NDEBUG.  */
+
+#ifndef _ASSERT_H_DECLS
+#define _ASSERT_H_DECLS
+__BEGIN_DECLS
+
+/* This prints an "Assertion failed" message and aborts.  */
+extern void __assert_fail (__const char *__assertion, __const char *__file,
+			   unsigned int __line, __const char *__function)
+     __THROW __attribute__ ((__noreturn__));
+
+/* Likewise, but prints the error text for ERRNUM.  */
+extern void __assert_perror_fail (int __errnum, __const char *__file,
+				  unsigned int __line,
+				  __const char *__function)
+     __THROW __attribute__ ((__noreturn__));
+
+
+/* The following is not at all used here but needed for standard
+   compliance.  */
+extern void __assert (const char *__assertion, const char *__file, int __line)
+     __THROW __attribute__ ((__noreturn__));
+
+
+__END_DECLS
+#endif /* Not _ASSERT_H_DECLS */
+
+/* For the macro definition we use gcc's __builtin_expect if possible
+   to generate good code for the non-error case.  gcc 3.0 is a good
+   enough estimate for when the feature became available.  */
+# if __GNUC_PREREQ (3, 0)
+#  define assert(expr) \
+  (__ASSERT_VOID_CAST (__builtin_expect (!!(expr), 1) ? 0 :		      \
+		       (__assert_fail (__STRING(expr), __FILE__, __LINE__,    \
+				       __ASSERT_FUNCTION), 0)))
+# else
+#  define assert(expr) \
+  (__ASSERT_VOID_CAST ((expr) ? 0 :					      \
+		       (__assert_fail (__STRING(expr), __FILE__, __LINE__,    \
+				       __ASSERT_FUNCTION), 0)))
+# endif
+
+# ifdef	__USE_GNU
+#  if __GNUC_PREREQ (3, 0)
+#   define assert_perror(errnum) \
+  (__ASSERT_VOID_CAST (__builtin_expect (!(errnum), 1) ? 0 :		      \
+		       (__assert_perror_fail ((errnum), __FILE__, __LINE__,   \
+					      __ASSERT_FUNCTION), 0)))
+#  else
+#   define assert_perror(errnum) \
+  (__ASSERT_VOID_CAST (!(errnum) ? 0 :					      \
+		       (__assert_perror_fail ((errnum), __FILE__, __LINE__,   \
+					      __ASSERT_FUNCTION), 0)))
+#  endif
+# endif
+
+/* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
+   which contains the name of the function currently being defined.
+   This is broken in G++ before version 2.6.
+   C9x has a similar variable called __func__, but prefer the GCC one since
+   it demangles C++ function names.  */
+
+/* The following commented-out line breaks makedepend (bug # 171908); a local
+ * patched version of assert.h is therefore included.
+ *   --Kevin McCarty, for Debian */
+/* # if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4) */
+
+/* begin fix to work around Debian Bug # 171908 */
+# if defined __cplusplus
+#  if __GNUC_PREREQ (2, 6)
+#   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
+#  endif
+# elif __GNUC_PREREQ (2, 4)
+/* end fix */
+
+#   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
+# else
+#  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#   define __ASSERT_FUNCTION	__func__
+#  else
+#   define __ASSERT_FUNCTION	((__const char *) 0)
+#  endif
+# endif
+
+#endif /* NDEBUG.  */
+
+#endif /* CERNLIB_LINUX */


--- NEW FILE 307-use-canonical-cfortran.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 307-use-canonical-cfortran.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Use the most recent version of cfortran.h and cfortran.doc from
## DP: Debian package of cfortran, version 4.4-6.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.doc /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc
--- cernlib-2005.05.09/src/cfortran/cfortran.doc	1998-12-11 12:17:09.000000000 -0500
+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc	2004-12-10 10:47:33.000000000 -0500
@@ -195,7 +195,7 @@
 HP9000> f77 -c cfortex.f
 HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest
 
-HP0000> # If old-style f77 +800 compiled objects are required:
+HP9000> # If old-style f77 +800 compiled objects are required:
 HP9000> # #define hpuxFortran800
 HP9000> cc -c -Aa -DhpuxFortran800 cfortest.c
 HP9000> f77 +800 -o cfortest cfortest.o cfortex.f
@@ -643,7 +643,7 @@
    [For an ancient math.h on a 386 or sparc, get similar from a new math.h.]
    #ifdef mc68000     /* 5 lines Copyright (c) 1988 by Sun Microsystems, Inc. */
    #define FLOATFUNCTIONTYPE	int
-   #define RETURNFLOAT(x) 		return (*(int *)(&(x)))
+   #define RETURNFLOAT(x) 	return (*(int *)(&(x)))
    #define ASSIGNFLOAT(x,y)	*(int *)(&x) = y
    #endif
 
@@ -874,7 +874,7 @@
 works everywhere and would seem to be an obvious choice.
 
 
-3. 
+3. 
 
 cfortran.h encourages the exact specification of the type and dimension of
 array parameters because it allows the C compiler to detect errors in the
@@ -1835,7 +1835,7 @@
 
 Unlike all other C compilers supported by cfortran.h,
 'gcc -traditional' promotes to double all functions returning float
-as demonstrated bu the following example.
+as demonstrated by the following example.
 
 /* m.c */
 #include 
@@ -2017,8 +2017,9 @@
 
 THIS PACKAGE, I.E. CFORTRAN.H, THIS DOCUMENT, AND THE CFORTRAN.H EXAMPLE
 PROGRAMS ARE PROPERTY OF THE AUTHOR WHO RESERVES ALL RIGHTS. THIS PACKAGE AND
-THE CODE IT PRODUCES MAY BE FREELY DISTRIBUTED WITHOUT FEES, SUBJECT TO THE
-FOLLOWING RESTRICTIONS:
+THE CODE IT PRODUCES MAY BE FREELY DISTRIBUTED WITHOUT FEES, SUBJECT
+(AT YOUR CHOICE) EITHER TO THE GNU LIBRARY GENERAL PUBLIC LICENSE
+AT http://www.gnu.org/licenses/lgpl.html OR TO THE FOLLOWING RESTRICTIONS:
 - YOU MUST ACCOMPANY ANY COPIES OR DISTRIBUTION WITH THIS (UNALTERED) NOTICE.
 - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA 
   (E.G. TAPE, DISK, COMPUTER, PAPER.)
diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.h /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h
--- cernlib-2005.05.09/src/cfortran/cfortran.h	2002-09-11 13:05:51.000000000 -0400
+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h	2004-12-10 10:47:34.000000000 -0500
@@ -1,4 +1,4 @@
-/* cfortran.h  4.4_cernlib2002 */
+/* cfortran.h  4.4 */
 /* http://www-zeus.desy.de/~burow/cfortran/                   */
 /* Burkhard Burow  burow at desy.de                 1990 - 2002. */
 
@@ -11,6 +11,32 @@
    MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE.
 */
 
+/* The following modifications were made by the authors of CFITSIO or by me. 
+ * I've flagged them below with "(CFITSIO)" or "(KMCCARTY)".
+ * PDW = Peter Wilson
+ * DM  = Doug Mink
+ * LEB = ??
+ * -- Kevin McCarty, for Debian (11/29/2003) */
+
+/*******
+   Modifications:
+      Oct 1997: Changed symbol name extname to appendus (PDW/HSTX)
+                (Conflicted with a common variable name in FTOOLS)
+      Nov 1997: If g77Fortran defined, also define f2cFortran (PDW/HSTX)
+      Feb 1998: Let VMS see the NUM_ELEMS code. Lets programs treat
+                single strings as vectors with single elements
+      Nov 1999: If macintoxh defined, also define f2cfortran (for Mac OS-X)
+      Apr 2000: If WIN32 defined, also define PowerStationFortran and
+                VISUAL_CPLUSPLUS (Visual C++)
+      Jun 2000: If __GNUC__ and linux defined, also define f2cFortran
+                (linux/gcc environment detection)
+      Apr 2002: If __CYGWIN__ is defined, also define f2cFortran
+      Nov 2002: If __APPLE__ defined, also define f2cfortran (for Mac OS-X)
+
+      Nov 2003: If __INTEL_COMPILER or INTEL_COMPILER defined, also define
+                f2cFortran (KMCCARTY)
+ *******/
+
 /* 
   Avoid symbols already used by compilers and system *.h:
   __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c
@@ -75,7 +101,8 @@
 
 /* Remainder of cfortran.h depends on the Fortran compiler. */
 
-#if defined(CLIPPERFortran) || defined(pgiFortran)
+/* 11/29/2003 (KMCCARTY): add *INTEL_COMPILER symbols here */
+#if defined(CLIPPERFortran) || defined(pgiFortran) || defined(__INTEL_COMPILER) || defined(INTEL_COMPILER)
 #define f2cFortran
 #endif
 
@@ -90,6 +117,27 @@
                            Support f2c or f77 with gcc, vcc with f2c. 
                            f77 with vcc works, missing link magic for f77 I/O.*/
 #endif
+/* 04/13/00 DM (CFITSIO): Add these lines for NT */
+/*   with PowerStationFortran and and Visual C++ */
+#if defined(WIN32) && !defined(__CYGWIN__)
+#define PowerStationFortran   
+#define VISUAL_CPLUSPLUS
+#endif
+#if defined(g77Fortran)                        /* 11/03/97 PDW (CFITSIO) */
+#define f2cFortran
+#endif
+#if        defined(__CYGWIN__)                 /* 04/11/02 LEB (CFITSIO) */
+#define       f2cFortran 
+#endif
+#if        defined(__GNUC__) && defined(linux) /* 06/21/00 PDW (CFITSIO) */
+#define       f2cFortran 
+#endif
+#if defined(macintosh)                         /* 11/1999 (CFITSIO) */
+#define f2cFortran
+#endif
+#if defined(__APPLE__)                         /* 11/2002 (CFITSIO) */
+#define f2cFortran
+#endif
 #if defined(__hpux)             /* 921107: Use __hpux instead of __hp9000s300 */
 #define       hpuxFortran       /*         Should also allow hp9000s7/800 use.*/
 #endif
@@ -131,6 +179,7 @@
 #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
 /* If your compiler barfs on ' #error', replace # with the trigraph for #     */
  #error "cfortran.h:  Can't find your environment among:\
+    - GNU gcc (g77) on Linux.                                            \
     - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...)     \
     - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000     \
     - VAX   VMS CC 3.1 and FORTRAN 5.4.                                  \
@@ -151,7 +200,8 @@
     - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran          \
     - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \
     - Absoft Pro Fortran: Use #define AbsoftProFortran \
-    - Portland Group Fortran: Use #define pgiFortran"
+    - Portland Group Fortran: Use #define pgiFortran \
+    - Intel Fortran: Use #define INTEL_COMPILER"
 /* Compiler must throw us out at this point! */
 #endif
 #endif
@@ -164,7 +214,8 @@
 
 /* Throughout cfortran.h we use: UN = Uppercase Name.  LN = Lowercase Name.   */
 
-#if defined(f2cFortran) || defined(NAGf90Fortran) || defined(DECFortran) || defined(mipsFortran) || defined(apolloFortran) || defined(sunFortran) || defined(CONVEXFortran) || defined(SXFortran) || defined(extname)
+/* "extname" changed to "appendus" below (CFITSIO) */
+#if defined(f2cFortran) || defined(NAGf90Fortran) || defined(DECFortran) || defined(mipsFortran) || defined(apolloFortran) || defined(sunFortran) || defined(CONVEXFortran) || defined(SXFortran) || defined(appendus)
 #define CFC_(UN,LN)            _(LN,_)      /* Lowercase FORTRAN symbols.     */
 #define orig_fcallsc(UN,LN)    CFC_(UN,LN)
 #else 
@@ -268,7 +319,8 @@
 #endif
 
 #ifndef apolloFortran
-#define COMMON_BLOCK_DEF(DEFINITION, NAME) DEFINITION NAME
+/* "extern" removed (CFITSIO) */
+#define COMMON_BLOCK_DEF(DEFINITION, NAME) /* extern */ DEFINITION NAME
 #define CF_NULL_PROTO
 #else                                         /* HP doesn't understand #elif. */
 /* Without ANSI prototyping, Apollo promotes float functions to double.    */
@@ -512,7 +564,7 @@
                     *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO)  ),   \
   (F).dsc$a_a0    =  ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length          ,(F))
 
-#else
+#endif      /* PDW: 2/10/98 (CFITSIO) -- Let VMS see NUM_ELEMS definitions */
 #define _NUM_ELEMS      -1
 #define _NUM_ELEM_ARG   -2
 #define NUM_ELEMS(A)    A,_NUM_ELEMS
@@ -540,7 +592,8 @@
 }
 return (int)num;
 }
-#endif
+/* #endif removed 2/10/98 (CFITSIO) */
+
 /*-------------------------------------------------------------------------*/
 
 /*           UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS       */


--- NEW FILE 308-use-canonical-cfortran-location.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 308-use-canonical-cfortran-location.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: All code compiled at Cernlib build-time should look for cfortran.h
## DP: at .

@DPATCH@
diff -urNad cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c /tmp/dpep.d3syqe/cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c
--- cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c	1996-02-14 08:10:26.000000000 -0500
+++ /tmp/dpep.d3syqe/cernlib-2005.05.09/src/graflib/higz/higzcc/tkhigz.c	2005-06-09 13:13:22.079711057 -0400
@@ -39,7 +39,7 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  */
 
-#include "higz/cfortran.h"
+#include 
 #if !defined(VMS) && !defined(_WINDOWS)
 #include "higz/tkConfig.h"
 #endif
diff -urNad cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c /tmp/dpep.d3syqe/cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c
--- cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c	1996-04-17 10:46:29.000000000 -0400
+++ /tmp/dpep.d3syqe/cernlib-2005.05.09/src/pawlib/paw/testsuite/tuple/tuple.c	2005-06-09 13:14:58.654908060 -0400
@@ -16,7 +16,7 @@
 #include	
 
 
-#include	"cfortran.h"
+#include	
 
 /* #include	"packlib.h" */
 #include	"hbook_interface.h"


--- NEW FILE 309-define-dummy-herwig-routines.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 309-define-dummy-herwig-routines.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Define stub functions for herwig routines that are supposed to be
## DP: provided by the user.  Also, comment out the dummy functions pdfset
## DP: and structm; real versions are provided in pdflib.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/Imakefile	2005-11-28 19:46:53.619963660 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/Imakefile	2005-11-28 19:46:58.890844233 +0000
@@ -24,8 +24,13 @@
 	hwulob.F hwulof.F hwulor.F hwumas.F hwupcm.F hwurap.F hwures.F \ @@\
 	hwurob.F hwurof.F hwurot.F hwusor.F hwusqr.F hwusta.F hwutab.F \ @@\
 	hwutim.F hwvdif.F hwvdot.F hwvequ.F hwvsca.F hwvsum.F hwvzro.F \ @@\
-	hwwarn.F ieupdg.F ipdgeu.F pdfset.F qqinit.F qqlmat.F sasano.F \ @@\
-	sasbeh.F sasdir.F sasgam.F sasvmd.F structm.F
+	hwwarn.F ieupdg.F ipdgeu.F /*pdfset.F*/ qqinit.F qqlmat.F sasano.F \ @@\
+	sasbeh.F sasdir.F sasgam.F sasvmd.F /*structm.F*/
+	/* comment out pdfset.F, structm.F; real versions are in pdflib */
+
+/* add the following file to define dummy routines as weak symbols */
+/* --Kevin McCarty, for Debian */
+SRCS_C= dummy.c
 
 FORTRANSAVEOPTION = FortranSaveFlags
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/dummy.c cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/dummy.c
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/code/dummy.c	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/code/dummy.c	2005-11-28 19:49:17.897320746 +0000
@@ -0,0 +1,34 @@
+/* Dummy file to avoid undefined symbols in the library */
+/* Kevin McCarty, 14 Jan 2003 */
+
+#include 
+#include 
+
+/* Want the dummy functions to be weakly defined so they may be overridden
+ * without error. */
+
+#define kludge(x)    #x
+#define stringify(x) kludge(x)
+#define underline(x) dummy_ ## x
+
+#define DUMMY(UPPERNAME, fortranname_, returntype) \
+static returntype underline(fortranname_)() { print_dummy(#UPPERNAME); } \
+void fortranname_() \
+	__attribute__ ((weak, alias (stringify(underline(fortranname_))) ))
+
+static void print_dummy(const char *function)
+{
+  fprintf(stderr, "herwig59: Now in dummy %s routine.\n", function);
+  fprintf(stderr,
+          "If you see this message, you should define your own such routine.\n"
+#if defined (CERNLIB_DEBIAN)
+	  "For details, see the file /usr/share/doc/libherwig59-2-dev/herwig59.txt.gz\n"
+#endif
+  );
+  exit(EXIT_FAILURE);
+}
+
+DUMMY(HWABEG, hwabeg_, void);
+DUMMY(HWANAL, hwanal_, void);
+DUMMY(HWAEND, hwaend_, void);
+


--- NEW FILE 310-define-dummy-fowl-routines.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 310-define-dummy-fowl-routines.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Define stub functions for routines in fowl that are supposed to be
## DP: user-defined.  Also, rename START to FSTART to avoid name clash
## DP: with mathlib.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/Imakefile cernlib-2005.05.09.dfsg/src/phtools/fowl/Imakefile
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/Imakefile	1996-04-26 07:13:52.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/Imakefile	2005-11-28 19:49:52.412989577 +0000
@@ -1,10 +1,12 @@
-SRCS_F=	 beamin.F breitw.F chmove.F delsq.F dumpme.F finish.F \ @@\
+SRCS_F=	 beamin.F breitw.F chmove.F delsq.F dumpme.F /* finish.F */ \ @@\
 	fmass.F fmassq.F fowl.F fowlmp.F fowlpr.F genev.F histey.F \ @@\
 	labsys.F pdk.F qqstrt.F rangnr.F redat2.F redata.F rotes2.F \ @@\
 	scout.F teedia.F tranch.F xplsdx.F
 
+SRCS_C= dummy.c /*"fake" defn of start, user, finish to avoid undefined syms*/
+
 #if !defined(CERNLIB_UNIX)
-SRCS_F := $(SRCS_F) start.F
+SRCS_F := $(SRCS_F) /* start.F */
 #endif
 
 SubdirLibraryTarget(fowl,NullParameter)
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/dummy.c cernlib-2005.05.09.dfsg/src/phtools/fowl/dummy.c
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/dummy.c	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/dummy.c	2005-11-28 19:53:31.287496776 +0000
@@ -0,0 +1,39 @@
+/* Dummy file to avoid undefined symbols in the library */
+/* Kevin McCarty, 26 Apr 2004 */
+/* Last revised 13 Aug 2004 */
+
+#include 
+#include 
+
+/* Want the dummy functions to be weakly defined so they may be overridden
+ * without error. */
+
+#define kludge(x)    #x
+#define stringify(x) kludge(x)
+#define underline(x) dummy_ ## x
+
+#define DUMMY(UPPERNAME, fortranname_, returntype) \
+static returntype underline(fortranname_)() { print_dummy(#UPPERNAME); } \
+void fortranname_() \
+	__attribute__ ((weak, alias (stringify(underline(fortranname_))) ))
+
+static void print_dummy(const char *function)
+{
+  fprintf(stderr, "phtools: Now in dummy %s routine.\n", function);
+  fprintf(stderr,
+          "If you see this message, you should define your own such routine.\n"
+	  "For details, see "
+#if defined (CERNLIB_DEBIAN)
+	                   "/usr/share/doc/libphtools2-dev/README.Debian\n"
+	  "and "
+#endif
+	      "the CERN writeup for FOWL (available at the URL\n"
+	  "http://wwwasdoc.web.cern.ch/wwwasdoc/Welcome.html ; scroll down\n"
+	  "to the link for W505 - FOWL.)\n");
+  exit(EXIT_FAILURE);
+}
+
+DUMMY(FSTART, fstart_, void);
+DUMMY(USER,   user_,   void);
+DUMMY(FINISH, finish_, void);
+
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/fowlmp.F cernlib-2005.05.09.dfsg/src/phtools/fowl/fowlmp.F
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/fowlmp.F	1996-03-22 16:42:46.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/fowlmp.F	2005-11-28 19:49:52.412989577 +0000
@@ -30,7 +30,7 @@
       CALL REDATA
       IF(NEVTOT.LT.NGRP) NGRP = NEVTOT
       N2 = MIN (NEVTOT/NGRP, 30000)
-      CALL START
+      CALL FSTART
       DO  500 I2= 1, N2
       DO  400  I= 1, NGRP
       IEVENT = IEVENT + 1
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/fowl/qqstrt.F cernlib-2005.05.09.dfsg/src/phtools/fowl/qqstrt.F
--- cernlib-2005.05.09.dfsg~/src/phtools/fowl/qqstrt.F	1996-03-22 16:42:47.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/fowl/qqstrt.F	2005-11-28 19:49:52.412989577 +0000
@@ -38,6 +38,9 @@
       COMMON
      +/TAPES / NTPIN     ,NTPOUT   ,NTPNCH   ,NTPBIN   ,KONSOL
       IF(JEVT.LE.0) RETURN
+#if 0
+C     Comment this section out; "which" is obsolete
+C     -- Kevin McCarty, for Debian, 26 April 2004
       CALL WHICH(ISIT,VAL)
       WRITE(6,700)JEVT,VAL
   700 FORMAT('0RANDOM NUMBER GENERATOR INITIATED TO',I12,
@@ -46,6 +49,7 @@
 C--     CDC   60-BIT WORD
 CDC                             )B10000000000000007171 .RO.  TVEJ( = POL
       GOTO 200
+#endif
   100 CONTINUE
 C         FOR -CDC JUST MAKE SURE IT IS ODD
       IGLOP = JEVT


--- NEW FILE 311-skip-duplicate-qnext.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 311-skip-duplicate-qnext.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't compile in redundant versions of qnext.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile	1998-03-05 08:17:18.000000000 -0500
+++ /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/kernlib/kerngen/tcgenc/Imakefile	2005-06-09 14:28:05.755053006 -0400
@@ -1,5 +1,6 @@
+/* don't compile qnexte.F --Kevin*/
 SRCS_F= abend.F accessf.F exitf.F \ @@\
-	intrac.F jumpxn.F lnblnk.F locb.F locf.F qnexte.F unlinkf.F
+	intrac.F jumpxn.F lnblnk.F locb.F locf.F unlinkf.F
 
 #ifndef CERNLIB_OS9
 SRCS_F := $(SRCS_F) timed.F timel.F timex.F 
diff -urNad cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile
--- cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile	1996-03-06 05:47:15.000000000 -0500
+++ /tmp/dpep.5v33rR/cernlib-2005.05.09/src/packlib/zebra/qutil/Imakefile	2005-06-09 14:28:05.755053006 -0400
@@ -1,6 +1,7 @@
+/* don't compile qnext.F --Kevin*/
 SRCS_F=	 izbcd.F izbcdt.F izbcdv.F izchav.F izhnum.F lzbyt.F \ @@\
 	lzfind.F lzfval.F lzlast.F lzlong.F nzbank.F nzfind.F nzlong.F \ @@\
-	qnext.F zhtoi.F zitoh.F zkrak.F zkrakn.F znumid.F zpress.F \ @@\
+	zhtoi.F zitoh.F zkrak.F zkrakn.F znumid.F zpress.F \ @@\
 	zshunt.F zsort.F zsorth.F zsorti.F zsorv.F zsorvh.F zsorvi.F \ @@\
 	ztopsy.F
 


--- NEW FILE 312-skip-duplicate-gamma.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 312-skip-duplicate-gamma.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't compile in redundant gamma function in isajet; use the mathlib one

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile /tmp/dpep.IX54UM/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2005-06-09 14:29:18.976494518 -0400
+++ /tmp/dpep.IX54UM/cernlib-2005.05.09/src/mclibs/isajet/code/Imakefile	2005-06-09 14:30:21.913126207 -0400
@@ -1,12 +1,13 @@
 DoIncludePackage(isajet)
 #include "pilot.h"
 
+/* gamma.F removed; use the one defined in mathlib/gen/c/gamma.F */
 SRCS_F= \ @@\
 	 amass.F charge.F cteq5l.F ctxc2i.F ctxi2c.F ctxin.F ctxout.F \ @@\
 	 dblpcm.F dblvec.F dboost.F decay.F decjet.F \ @@\
 	 domssm.F drllyn.F eebeg.F eemax.F elctrn.F epf.F evol01.F evol02.F \ @@\
 	 evol03.F evol05.F evol06.F evol07.F evolms.F evolve.F flavor.F \ @@\
-	 fortop.F frgjet.F frgmnt.F gamma.F getpt.F gettot.F heavyx.F \ @@\
+	 fortop.F frgjet.F frgmnt.F         getpt.F gettot.F heavyx.F \ @@\
 	 hevolv.F higgs.F idanti.F idgen.F iframs.F inisap.F ipartns.F \ @@\
 	 ipjset.F iprtns.F irmov0.F isabeg.F isaend.F isaevt.F isaini.F \ @@\
 	 isajet.F isasrt.F ispjet.F istrad.F iswdky.F jetgen.F \ @@\


--- NEW FILE 313-comis-preserves-filename-case.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 313-comis-preserves-filename-case.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Have COMIS preserve filename case when interpreting FORTRAN code.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2003-02-13 09:25:23.000000000 -0500
+++ /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuinit.c	2005-06-09 15:24:32.751560586 -0400
@@ -200,6 +200,14 @@
   ku_exel( "/KUIP/SET_SHOW/COLUMNS -1" );
   ku_exel( "/KUIP/SET_SHOW/DOLLAR 'ON'" );
 
+#if defined(UNIX) && (defined(WINNT) || !defined(MSDOS))
+/* Correct the default behavior of converting filenames to lower-case
+ * on a case-sensitive operating system... Not that I'm bitter or anything.
+ * --Kevin McCarty, for Debian
+ */
+  ku_exel( "/KUIP/SET_SHOW/FILECASE 'KEEP'" );
+#endif
+
   host_editor = getenv( "KUIPEDITOR" );
   if( host_editor == NULL )
     host_editor = getenv( "EDITOR" );
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	1997-09-25 10:02:25.000000000 -0400
+++ /tmp/dpep.GROFhd/cernlib-2005.05.09/src/packlib/kuip/code_kuip/kuipcdf.cdf	2005-06-09 15:23:49.276738602 -0400
@@ -1064,11 +1064,12 @@
 .
 This command has only an effect on Unix systems to select whether filenames
 are kept as entered on the command line.
-The startup value is 'CONVERT', i.e. filenames are converted to lowercase.
+The startup value is 'KEEP', i.e. filename cases are preserved.  With
+the 'CONVERT' setting, filenames are converted to lowercase.
 .
 On other systems filenames are always converted to uppercase.
 .
-The 'RESTORE' option set the conversion mode to the value effective
+The 'RESTORE' option sets the conversion mode to the value effective
 before the last FILECASE KEEP/CONVERT command.
 E.g. the sequence
      FILECASE KEEP; EDIT Read.Me; FILECASE RESTORE
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F /tmp/dpep.GROFhd/cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F
--- cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F	1999-05-20 03:37:18.000000000 -0400
+++ /tmp/dpep.GROFhd/cernlib-2005.05.09/src/pawlib/paw/code/pawint3.F	2005-06-09 15:23:49.276738602 -0400
@@ -140,7 +140,7 @@
       CHUTIT = ' '
 *
       IF (IPIAF.EQ.0) THEN
-         CALL KUOPEN(10,'PAW.METAFILE','UNKNOWN',ISTAT)
+         CALL KUOPEN(10,'paw.metafile','UNKNOWN',ISTAT)
 #if (defined(CERNLIB_IBM))&&(!defined(CERNLIB_IBMMVS))
          CALL HERMES(19)
          CALL VMCMS('FILEDEF 19 DISK GKSERROR OUTPUT A',IRET)


--- NEW FILE 314-permit-using-regcomp-for-re_comp.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 314-permit-using-regcomp-for-re_comp.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add a possibility to use regcomp() instead of re_comp() (selected at
## DP: compile time)

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c /tmp/dpep.OUDE1M/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c	1996-03-08 10:33:08.000000000 -0500
+++ /tmp/dpep.OUDE1M/cernlib-2005.05.09/src/packlib/kuip/code_motif/kmfile.c	2005-06-09 15:49:30.689188356 -0400
@@ -18,6 +18,11 @@
 #include "kuip/mkutfu.h"
 #include "mkutda.h"
 
+#ifdef MATCH_REGCOMP
+#include 
+#include      /* for regex_t */
+#endif
+
 static char **ftype_list = NULL;
 static char **class_list = NULL;
 static char **stext_list = NULL;
@@ -92,8 +97,12 @@
     DIR            *dirp;
     struct dirent  *dp;
     char           *pattern;
+#ifdef MATCH_REGCOMP
+    regex_t        *re = (regex_t *)malloc( sizeof(regex_t) );
+#else
     char           *re;
 #endif
+#endif
     struct stat     filestatus;
 
     ndlist     = 0;
@@ -221,11 +230,15 @@
       }
     }
     pattern = mstrcat( pattern, "$" );
+#ifdef MATCH_REGCOMP
+    regcomp( re, pattern, REG_NEWLINE );
+#else
 #ifdef MATCH_RE_COMP
     re = re_comp( pattern );
 #else
     re = regcmp( pattern, NULL );
 #endif
+#endif
     free( pattern );
 
     /*
@@ -260,12 +273,16 @@
         }
         else if( (filestatus.st_mode & S_IFMT) == S_IFREG ) {
           /* regular file: match name against regexp */
+#ifdef MATCH_REGCOMP
+          int match = (regexec( re, dp->d_name, 0, NULL, 0 ) == 0);
+#else
 #ifdef MATCH_RE_COMP
           int match = re_exec( dp->d_name );
 #else
           int match = (regex( re, dp->d_name ) != NULL);
 #endif
-          if( match == 1 ) {
+#endif
+          if( match ) {
             filelist = (char**)realloc( (char*)filelist,
                                        (nflist+1) * sizeof(char*) );
             filelist[nflist] = strdup( dp->d_name );
@@ -276,6 +293,9 @@
       closedir( dirp );
     }
 
+#ifdef MATCH_REGCOMP
+    regfree( re );
+#endif
 #ifndef MATCH_RE_COMP
     free( re );
 #endif


--- NEW FILE 315-fixes-for-MacOSX.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 315-fixes-for-MacOSX.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch set (mostly due to Keisuke Fujii) to allow Cernlib to compile
## DP: and run on OS X.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/config/Imake.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules
--- cernlib-2005.05.09/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules	2005-06-09 15:52:06.472072084 -0400
@@ -2171,7 +2171,7 @@
 #define CppScriptTarget(dst,src,defs,deplist)				@@\
 dst::  src deplist							@@\
 	RemoveFile($@)							@@\
-	$(CPP) defs $@				@@\
+	$(CPP) defs src | CppSedMagic >$@				@@\
 	chmod a+x $@							@@\
 									@@\
 clean::									@@\
@@ -2203,7 +2203,7 @@
 #define CppFileTarget(dst,src,defs,deplist)				@@\
 dst::  src deplist							@@\
 	RemoveFile($@)							@@\
-	$(CPP) defs $@				@@\
+	$(CPP) defs src | CppSedMagic >$@				@@\
 									@@\
 clean::									@@\
 	RemoveFiles(dst)
diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf
--- cernlib-2005.05.09/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,170 @@
+XCOMM platform:  $SFO: MOSXS.cf,v 1.0 95/11/19 23:21:00 sl Exp $
+
+#define OSVendor          Apple Computer, Inc.
+#ifdef MacOSXArchitecture
+#define OSName            MacOSX
+#define OSMajorVersion    DefaultOSMajorVersion
+#define OSMinorVersion    DefaultOSMinorVersion
+#define OSTeenyVersion    0
+#endif
+
+#define ProjectRulesFile  
+#define ProjectTmplFile   
+
+#define InstKmemFlags -m 2755 -g kmem
+/* #define ConstructMFLAGS		NO */
+
+#define HasNdbm     YES
+#define SetTtyGroup YES
+#define HasBsearch  YES
+#ifdef MacOSXArchitecture
+#define HasPutenv               YES
+#define MathLibrary             /**/
+#define DBMLibrary              /**/
+#define TermcapLibrary          /**/
+#define HasBSD44Sockets         YES
+#define HAS_SNPRINTF            YES
+#endif
+
+#define NeedConstPrototypes     YES
+#define NeedVarargsPrototypes   YES
+#define NeedFunctionPrototypes  YES
+#define NeedWidePrototypes      NO
+
+#define GzipFontCompression     YES
+#define CompressAllFonts        YES
+
+#ifndef HasShm
+# define HasShm			YES
+#endif
+#ifndef BuildGlxExt
+# define BuildGlxExt 	  	YES
+# define GlxUseNSGL             YES
+#endif
+#define BuildServer             YES
+#define BuildXprint             NO
+#define BuildFonts              YES
+#define BuildDPMS               NO
+
+#define TenonServer             YES
+#define XprtServer              NO
+#define XVendorString "Tenon Intersystems Xtools"
+#define XVendorRelease 1000
+#ifndef UseRgbTxt
+#define UseRgbTxt               YES
+#endif
+
+#define BuildPexExt             NO
+
+#ifndef BuildGLXLibrary
+# define BuildGLXLibrary	YES
+#endif
+
+/* no direct graphics extension */
+#define	BuildXF86DGA	NO
+
+/* no extra tablets and weird input devices */
+#define BuildXInputExt	NO
+
+/* Build Xinerama (aka panoramiX) extension */
+#define BuildXinerama		YES
+
+/* no Display Power Management extension */
+#define	BuildDPMSExt	NO
+
+# define BuildXvExt     NO
+
+#ifndef OptimizationLevel
+# define OptimizationLevel -O
+#endif
+#define OptimizedCDebugFlags OptimizationLevel -fPIC -pipe
+#define ExtraLoadFlags -L/usr/X11R6/lib -L/sw/lib -L/usr/lib -lc
+
+#define BuildExamples YES
+
+#define StandardDefines -DCERNLIB_LINUX -DCERNLIB_PPC -DCERNLIB_MACOSX \
+			-Dunix=unix -D__powerpc__ -D__DARWIN__
+/* -DX_NOT_POSIX -DX_LOCALE */
+
+#define HasVoidSignalReturn YES
+
+#ifndef DependFlags
+#define DependFlags -I/usr/include/ansi -I/usr/include/bsd -I/sw/include
+#endif
+
+#define StandardIncludes -I/sw/include
+
+#define InstallCmd	install	/* unlink old */
+
+/* #define ArCmd libtool -a -o */
+#define ArCmd ar -r
+
+#ifndef RanlibCmd
+#define RanlibCmd	ranlib -c -s
+#endif
+
+/* see below for ServerDefines */
+
+#define PrimaryScreenResolution 95	/* for 17 inch screen */
+
+#define ServerCDebugFlags OptimizationLevel -fPIC -g -pipe
+
+#ifndef HasGcc
+#define HasGcc YES
+#endif
+
+#undef CcCmd
+#undef CplusplusCmd
+#ifdef MacOSXArchitecture
+#define CcCmd		cc -g -arch "ppc" -no-cpp-precomp
+#define CplusplusCmd    c++ -g -no-cpp-precomp
+#endif
+#ifndef CcCmd
+#define CcCmd cc -g
+#endif
+
+#define CppCmd        /usr/bin/cpp
+
+#include 
+#include 
+#undef XFree86Server
+/* #define GLX_DIRECT_RENDERING */
+
+#define f2cFortran              YES
+#define FortranCmd              g77 -g
+#define XargsCmd                xargs
+#define FortranSaveFlags        /* */ /* Everything static !? */
+#define OptimisedFortranFlags	OptimizationLevel -fPIC -funroll-loops \
+				-fomit-frame-pointer
+#define DefaultCCOptions	OptimizationLevel
+#define DefaultFCOptions        -fno-automatic \
+				-fno-second-underscore \
+				-fno-f90 -fugly-complex -fno-globals \
+				-fugly-init -Wno-globals OptimizationLevel
+
+#ifndef CernlibLocalDefines
+# define CernlibLocalDefines
+#endif
+#define CernlibSystem           -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX \
+				-DCERNLIB_PPC -DCERNLIB_QMGLIBC \
+				-DCERNLIB_MACOSX CernlibLocalDefines
+
+#undef CERNLIB_SHIFT
+
+#define CERNLIB_LINUX
+#define CERNLIB_UNIX
+#define CERNLIB_LNX
+#define CERNLIB_PPC
+#define CERNLIB_QMGLIBC
+#define CERNLIB_MACOSX
+
+#define X11Includes             -I/usr/X11R6/include
+
+/*
+ *  Create a Make Variable to allow building with/out Motif
+ */
+#undef MotifDependantMakeVar
+#define MotifDependantMakeVar(variable,value) variable=value
+/* End  CERNLIB changes */
+
+
diff -urNad cernlib-2005.05.09/src/config/MacOSX.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules
--- cernlib-2005.05.09/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,123 @@
+XCOMM $XConsortium: MOSXS.rules,v 1.1 97/12/12 15:34:45 sl Exp $
+
+/*
+ * MacOSX shared library rules
+ */
+
+#define HasSharedLibraries YES
+
+#define ForceNormalLib NO
+
+#ifndef SharedDataSeparation
+#define SharedDataSeparation YES
+#endif
+#ifndef SharedCodeDef
+#define SharedCodeDef
+#endif
+#ifndef SharedLibraryDef
+#define SharedLibraryDef -fno-common
+#endif
+
+#define ShLibIncludeFile 
+
+#ifndef SharedLibraryLoadFlags
+#define SharedLibraryLoadFlags
+#endif
+#ifndef PositionIndependentCFlags
+#define PositionIndependentCFlags
+#endif
+
+
+/*
+ * InstallSharedLibrary - generate rules to install the shared library.
+ * Edited 2003-05-09 by Kevin McCarty to add an install.shlib target.
+ */
+#ifndef InstallSharedLibrary
+#define InstallSharedLibrary(libname,rev,dest)				@@\
+.PHONY: install.shlib shlib/libname					@@\
+shlib/libname:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+install.shlib:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+$(DESTDIR)dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\
+	MakeDir($(DESTDIR)dest)						@@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.rev.dylib) $(DESTDIR)dest @@\
+	(T=`echo Concat($(DESTDIR)dest/lib,libname.rev.dylib) | sed 's/\.[^\.d]*\.dylib/\.dylib/'`;\ @@\
+		$(RM) $$T && $(LN) Concat(lib,libname.rev.dylib) $$T)	@@\
+	$(RM) Concat($(DESTDIR)dest/lib,libname.dylib)			@@\
+	$(LN) Concat(lib,libname.rev.dylib) Concat($(DESTDIR)dest/lib,libname.dylib)
+#endif /* InstallSharedLibrary */
+
+/*
+ * NormalSharedLibraryTarget - generate rules to create a shared library;
+ * build it into a different name so that the we do not hose people by having
+ * the library gone for long periods.
+ */
+#ifndef SharedLibraryTarget
+#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
+AllTarget(Concat(lib,libname.dylib))					@@\
+									@@\
+Concat(lib,libname.dylib):  solist $(EXTRALIBRARYDEPS)			@@\
+	$(RM) $@~							@@\
+	(cd down; $(CC) -I/usr/X11R6/lib -dynamiclib -undefined suppress -install_name /usr/X11R6/lib/$@ -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.dylib)
+
+#endif /* SharedLibraryTarget */
+
+/*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepLibraryTarget
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.dylib))					@@\
+									@@\
+Concat(lib,libname.dylib):  deplist $(EXTRALIBRARYDEPS)		@@\
+	$(RM) $@~							@@\
+	(cd down; $(CC) -I/usr/X11R6/lib -dynamiclib -undefined suppress -install_name /usr/X11R6/lib/$@ -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
+	$(RM) $@							@@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.dylib)
+
+#endif /* SharedDepLibraryTarget */
+
+/*
+ * SharedLibraryDataTarget - generate rules to create shlib data file;
+ */
+#ifndef SharedLibraryDataTarget
+#define SharedLibraryDataTarget(libname,rev,salist)
+#endif /* SharedLibraryDataTarget */
+
+#ifndef InstallSharedLibraryData
+#define InstallSharedLibraryData(libname,rev,dest)
+#endif /* InstallSharedLibraryData */
+
+/*
+ * SharedLibReferences - variables for shared libraries
+ */
+#ifndef SharedLibReferences
+#define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
+revname = rev								@@\
+Concat3(DEP,varname,LIB) = SharedLibDependencies(libname,libsource,revname) @@\
+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
+LintLibReferences(varname,libname,libsource)
+#endif
+
+/*
+ * SharedDSLibReferences - variables for shared libraries
+ */
+#ifndef SharedDSLibReferences
+#define SharedDSLibReferences(varname,libname,libsource,revname,rev)	@@\
+revname = rev								@@\
+Concat3(DEP,varname,LIB) = SharedDSLibDependencies(libname,libsource,revname) @@\
+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) Concat3(Shared,libname,Reqs)		@@\
+LintLibReferences(varname,libname,libsource)
+#endif
+
+
diff -urNad cernlib-2005.05.09/src/config/MacOSX.tmpl /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl
--- cernlib-2005.05.09/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,67 @@
+XCOMM $XConsortium: MOSXS.tmpl,v 1.2 97/12/12 19:07:12 sl Exp $
+
+/*
+ * Xnext shared library template
+ */
+
+
+
+#ifndef SharedXtReqs
+#define SharedXtReqs /**/
+#endif
+#ifndef SharedXawReqs
+#define SharedXawReqs /**/
+#endif
+#ifndef SharedXmuReqs
+#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB)
+#endif
+
+#define SharedLibX11 YES
+#define SharedX11Rev F
+SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev)
+
+#define SharedLibXau NO		/* don't need shared form */
+#define SharedLibXdmcp NO	/* don't need shared form */
+
+#define SharedLibXmu YES
+#define SharedXmuRev F
+
+#define SharedOldXRev F
+
+#define SharedLibXext YES
+#define SharedXextRev F
+
+#define SharedLibXt YES
+#define SharedXtRev F
+SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev)
+
+#define SharedXawRev F
+
+#define SharedXtfRev A
+
+#define SharedLibXi YES
+#define SharedXiRev F
+SharedLibReferences(XI,Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev)
+
+#define SharedLibXtst YES
+#define SharedXtstRev F
+SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev)
+
+
+#define SharedPexRev F
+SharedLibReferences(PEX,PEX5,$(PEXLIBSRC),SOPEXREV,SharedPexRev)
+
+#define SharedLibXie YES
+#define SharedXieRev F
+
+#define SharedLibICE YES
+#define SharedICERev F
+SharedLibReferences(ICE,ICE,$(ICESRC),SOICEREV,SharedICERev)
+
+#define SharedLibSM YES
+#define SharedSMRev F
+SharedLibReferences(SM,SM,$(SMSRC),SOSMREV,SharedSMRev)
+
+#define SharedFSRev F
+SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
+
diff -urNad cernlib-2005.05.09/src/config/site.def /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def
--- cernlib-2005.05.09/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def	2005-06-09 15:52:06.472072084 -0400
@@ -99,9 +99,7 @@
 /*   if it is already defined and false, undef it! */
 /* do not use shift by default
 #if defined(CERNLIB_UNIX) && !defined(CERNLIB_WINNT)
-#if ! defined(CERNLIB_SHIFT)
-#define CERNLIB_SHIFT
-#elif  ! CERNLIB_SHIFT
+#if defined(CERNLIB_SHIFT) && !CERNLIB_SHIFT
 #undef CERNLIB_SHIFT
 #endif
 #endif
diff -urNad cernlib-2005.05.09/src/geant321/gxint/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile
--- cernlib-2005.05.09/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile	2005-06-09 15:52:06.472072084 -0400
@@ -30,7 +30,7 @@
 
 gxint321.f:  gxint.F
 	RemoveFile($@)
-	$(CPP) $(FORTRANALLDEFMDEPEND) < $^ | sed -e '/^$$/d' | CppSedMagic >$@
+	FortranCmd -E $(FORTRANALLDEFMDEPEND) $^ | sed -e '/^$$/d' | CppSedMagic >$@
 
 install.lib:: $(CERN_LIBDIR)/gxint.f
 
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile	2005-06-09 15:52:06.471072296 -0400
@@ -7,8 +7,12 @@
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
 #ifdef CERNLIB_UNIX
+#ifdef CERNLIB_MACOSX
+SUBDIRS:= $(SUBDIRS) scripts
+#else
 SUBDIRS:= $(SUBDIRS) scripts mgr
 #endif
+#endif
 
 InstallLibSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F
--- cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	2005-06-09 15:52:06.483069745 -0400
@@ -92,7 +92,11 @@
 #endif
       ENDIF
       WRITE(Z,'(2D26.16)') H,T
+#if defined(CERNLIB_MACOSX)
+      READ(Z,'(2(4X,D22.16))') H1,T1
+#else
       READ(Z,'(2(D22.16,4X))') H1,T1
+#endif
        IF(IDS .EQ. 1) THEN
       ERRMAX=MAX(ERRMAX,ABS(H1-T1))
       LTEST= LTEST .AND. ERRMAX .LE.  TSTERR
diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F
--- cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	2005-06-09 15:52:06.483069745 -0400
@@ -70,7 +70,11 @@
 #endif
       END IF
       WRITE(Z,'(2D26.16)') R,T
+#if defined(CERNLIB_MACOSX)
+      READ(Z,'(2(4X,D22.16))') R1,T1
+#else
       READ(Z,'(2(D22.16,4X))') R1,T1
+#endif
       ERMAX= MAX(ERMAX,ABS(R1-T1))
       IF(IDS .EQ. 3 .OR. IDS .EQ. 4) THEN
        WRITE(LOUT,'(1X,F10.3,2F25.16,1P,D10.1)') SX,R,T,ABS(R1-T1)
diff -urNad cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile
--- cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
@@ -1,11 +1,11 @@
 
 .SUFFIXES:
 
-CopyFile(cojets.cpp,cojets.cin)
+CopyFile(cojets.cpp,cojets.s)
 CopyFile(decay.cpp,decay.cin)
 CopyFile(table.cpp,table.cin)
 
-CppFileTarget(cojets.dat,cojets.cin,NullParameter,table.cin decay.cin)
+CppFileTarget(cojets.dat,cojets.s,-E -traditional,table.cin decay.cin)
 
 PackageDirFileTarget(cojets.dat)
 
diff -urNad cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile
--- cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
@@ -1,9 +1,9 @@
 
 .SUFFIXES:
 
-CopyFile(decay.cpp,decay.cin)
+CopyFile(decay.cpp,decay.s)
 
-CppFileTarget(isajet.dat,decay.cin,NullParameter,NullParameter)
+CppFileTarget(isajet.dat,decay.s,-E -traditional ,NullParameter)
 
 PackageDirFileTarget(isajet.dat)
 
diff -urNad cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c
--- cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2005-06-09 15:52:06.483069745 -0400
@@ -80,7 +80,7 @@
 static int pid;                 /* process identifier                   */
 static int logfd ;              /* logging file descriptor              */
 #if !defined(SOLARIS) && !defined(linux) && !defined(_AIX) \
-  && !defined(IRIX5) && !defined(apollo)
+  && !defined(IRIX5) && !defined(apollo) && !defined(__DARWIN__)
 extern int syslog();
 #endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX */
 extern char *getenv();
diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
--- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:51:53.621804393 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:52:06.485069320 -0400
@@ -2569,7 +2569,7 @@
 #if !defined(IBM) && !defined(_WIN32)
 /* I provide "getpass" myself as standard version truncates to 8 characters */
 #include 
-#ifdef CBREAK
+#if defined(CBREAK) || defined(CERNLIB_MACOSX)
 #define BSDTTY         /* First find out if BSD or SYSV terminal handling.. */
 #endif
  
@@ -2577,6 +2577,10 @@
 #include 
 #else
 #include 
+# if defined(CERNLIB_MACOSX)
+# define gtty(x,y) ioctl(x,TIOCGETP,y)
+# define stty(x,y) ioctl(x,TIOCSETP,y)
+# endif
 #endif
  
 /* Fails with gcc 3.4.3
@@ -3540,3 +3544,20 @@
  
 }
 #endif
+
+#if defined(CERNLIB_MACOSX)
+  /* need to define cuserid() for OS X */
+
+char * getlogin();
+
+char *
+cuserid(char *string)
+{
+  static char cuserid_str[L_cuserid];
+  char *result = (string ? string : cuserid_str);
+  
+  strncpy(result, getlogin(), L_cuserid - 1);
+  result[L_cuserid - 1] = '\0';
+  return result;
+}
+#endif /* CERNLIB_MACOSX */
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c
--- cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	2005-06-09 15:52:06.485069320 -0400
@@ -200,7 +200,7 @@
 || defined(_IBMR2) \
 || defined(__convexc__) \
 || defined(_OSK) \
-|| defined(__linux) || defined(__FreeBSD__)
+|| defined(__linux) || defined(__FreeBSD__) || defined(__DARWIN__)
 
   void systems_( command, buf, buflen, l, chars, rc, ovflw )
 
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
@@ -4,6 +4,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
@@ -10,6 +10,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -11,6 +11,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -6,6 +6,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -7,6 +7,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 	 
 
diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile
--- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -7,6 +7,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h
--- cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	2005-06-09 15:52:06.487068895 -0400
@@ -188,6 +188,17 @@
 #endif
 
 
+#ifdef CERNLIB_MACOSX
+#  define MACOSX
+#  define MACHINE_NAME "MACOSX"
+#  define UNIX
+#  define HAVE_MEMMOVE
+#  define HAVE_STRCASECMP
+#  define HAVE_SELECT
+#  define MATCH_REGCOMP         /* use regcomp/regexec */
+#endif
+
+
 #ifdef MSDOS
 #  define MACHINE_NAME "IBMPC"
 #  define OS_NAME "MSDOS"
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
@@ -26,7 +26,12 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+c     thanks to Keisuke Fujii for this patch for OS X
+#if defined(CERNLIB_MACOSX)
+          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
+#endif
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
@@ -35,7 +40,11 @@
           ENDIF
         ENDIF
       ELSE
+#if defined(CERNLIB_MACOSX)
+        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
+#endif
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
--- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:51:53.524825013 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:57:50.699841388 -0400
@@ -82,11 +82,19 @@
       IF(FEXT.EQ.'.c')THEN
         L=LENOCC(CHCC)
 *                                 'cc -c .... -fPIC name.c'
+#if defined(CERNLIB_MACOSX)
+        CHLINE=CHCC(:L)//' -fPIC -fno-common '//NAME(:LN)// '.c'
+#else
         CHLINE=CHCC(:L)//' -fPIC '//NAME(:LN)// '.c'
+#endif
       ELSE
         L=LENOCC(CHF77)
 *                                 'f77 -c .... -fPIC name.f'
+#if defined(CERNLIB_MACOSX)
+        CHLINE=CHF77(:L)//' -fPIC -fno-common '//NAME(:LN)// '.f'
+#else
         CHLINE=CHF77(:L)//' -fPIC '//NAME(:LN)// '.f'
+#endif
       ENDIF
       L=LENOCC(CHLINE)
       WRITE(LUNOUT,'(A)')CHLINE(:L)
@@ -176,8 +184,15 @@
       ENDIF
 #endif
 #if defined(CERNLIB_LINUX)
+# if defined(CERNLIB_MACOSX)
+      CHLINE= 'g77 -bundle -bind_at_load -bundle_loader '
+     +        '`/usr/bin/which pawX11` -o '
+     +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
+C     thanks to Keisuke Fujii for the above compiler command      
+# else
       CHLINE=                   'g77 -shared -o '
      +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
+# endif
 #endif
 #if defined(CERNLIB_ALPHA_OSF)
         CHLINE=                   'ld -shared -o '
diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-09 15:52:06.486069107 -0400
@@ -9,7 +9,7 @@
 EXTRA_LDOPTIONS=-Wl,-E
 #endif
 
-#if defined(CERNLIB_LINUX)
+#if defined(CERNLIB_LINUX) && !defined(CERNLIB_MACOSX)
 EXTRA_LDOPTIONS=-Wl,-E
 #endif
 


--- NEW FILE 318-additional-gcc-3.4-fixes.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 318-additional-gcc-3.4-fixes.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Additional fixes for gcc 3.4, courtesy of Andreas Jochens.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
--- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-14 12:31:12.078969103 -0400
+++ /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-14 12:33:16.618251997 -0400
@@ -2405,6 +2405,7 @@
  */
 
 static  FILE *cfile;
+static  rnetrc(), token();
  
 ruserpass(host, aname, apass)
         char *host, **aname, **apass;
@@ -2592,6 +2593,8 @@
 /*** NOTE MAXPASSWD IS DEFINED AS 8 IN ALL STANDARD UNIX SYSTEMS, BUT THIS
  *** GIVES US PROBLEMS INTERWORKING WITH VMS AND CRAY-SECURID SYSTEMS. ***/
 #define MAXPASSWD     20       /* max significant characters in password */
+
+static void (*sig)(), catch();
  
 char *
 getpass(prompt)
@@ -2608,7 +2611,6 @@
         register int c;
         FILE    *fi;
         static char pbuf[ MAXPASSWD + 1 ];
-        void    (*sig)(), catch();
  
         if((fi = fopen("/dev/tty", "r")) == NULL)
                 return((char*)NULL);
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c
--- cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c	1996-03-08 10:33:10.000000000 -0500
+++ /tmp/dpep.f5SU0N/cernlib-2005.05.09/src/packlib/kuip/code_motif/iconwidget.c	2005-06-14 12:33:43.511482468 -0400
@@ -31,7 +31,7 @@
 /* _Xm routine definitions  */
 void    _XmHighlightBorder ();
 void   _XmUnhighlightBorder ();
-void   _XmDrawShadow ();
+/* void   _XmDrawShadow (); */
 
 /* Motif1.1 ( except apollo, hpux has _XmPrimitive... with two args only
  * Gunter 30-jan-95


--- NEW FILE 701-patch-hbook-comis-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 701-patch-hbook-comis-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix up makefiles after moving hkfill.F and hkf1q.F in the other
## DP: 701 dpatch (a shell script).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/hbook/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile
--- cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	2005-06-10 17:04:08.866020136 -0400
@@ -19,8 +19,8 @@
 	hgn.F hgnf.F hgnpar.F hgstat.F hhipar.F hhxye.F hi.F \ @@\
 	hictoi.F hid1.F hid2.F hidall.F hidopt.F hidpos.F hie.F  \ @@\
 	hif.F hij.F hije.F hijxy.F hindex.F hinprx.F hinteg.F  \ @@\
-	hipak1.F histdo.F histgo.F hix.F hkf1.F hkf1q.F hkf2.F  \ @@\
-	hkff1.F hkff2.F hkffi1.F hkfi1.F hkfil2.F hkfill.F hkfilpf.F \ @@\
+	hipak1.F histdo.F histgo.F hix.F hkf1.F         hkf2.F  \ @@\
+	hkff1.F hkff2.F hkffi1.F hkfi1.F hkfil2.F          hkfilpf.F \ @@\
 	hkind.F hknul1.F hknuli.F hlabel.F hlabeq.F hlabnb.F \ @@\
 	hlattr.F hlccmp.F hldir.F hldir1.F hldir2.F hldirt.F \ @@\
 	hlgnxt.F hlhcmp.F hlimit.F hllsq.F hlnext.F hlocat.F \ @@\
diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:02:24.843306185 -0400
+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:05:09.955931988 -0400
@@ -37,7 +37,8 @@
 	csspar.F cssubr.F cssvpt.F cstadv.F cstarr.F csterr.F cstext.F \ @@\
 	cstfrf.F cstinf.F cstlgb.F cstlog.F cstpar.F cstran.F cstrer.F \ @@\
 	cstypar.F cstype.F csubad.F csunam.F csundf.F csxpar.F \ @@\
-	mcline.F mcsident.F
+	mcline.F mcsident.F \ @@\
+	hkfill.F hkf1q.F /* moved here from src/packlib/hbook/code */
 
 #if defined(CERNLIB_PAW)
 SRCS_F := $(SRCS_F) cspawi.F cskuix.F cktoiv.F cspawv.F csmkvd.F \ @@\


--- NEW FILE 702-patch-Imakefiles-for-packlib-mathlib.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 702-patch-Imakefiles-for-packlib-mathlib.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Hacks to Imakefiles to go along with the 702 shellscript for moving
## DP: files around.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-10 22:19:15.720962444 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-10 22:24:26.783925145 -0400
@@ -1,6 +1,8 @@
 DoIncludePackage(gen)
 #include "pilot.h"
 
+/* rgmlt*.F have been moved into packlib/hbook to remove circular dependencies.
+   --Kevin McCarty, for Debian. */
 SRCS_F=	arithm.F c128.F c256.F c512.F c64.F cauchy64.F cft.F cfstft.F \ @@\
 	rfstft.F cgauss.F d107d1.F d107r1.F d501l1.F d501l2.F d501n1.F \ @@\
         d501n2.F d501p1.F d501p2.F d501sf.F d700su.F d701bd.F \ @@\
@@ -10,14 +12,14 @@
         epditr.F epdje.F epdloc.F epdsrt.F epdtab.F errorf.F esolve.F \ @@\
 	fcn1.F fftrc.F fumili.F gauss.F i128.F i32.F i64.F linsq.F \ @@\
 	mconv.F mft.F minfc.F minsq.F monito.F newro.F old506.F radapt.F \ @@\
-	radmul.F rca.F rfrdh164.F rfrdh264.F rft.F rgmlt64.F rgquad.F \ @@\
+	radmul.F rca.F rfrdh164.F rfrdh264.F rft.F           rgquad.F \ @@\
 	rgs56p.F rgset.F riwiad.F riwibd.F rknys64.F rknysd.F rkstp.F \ @@\
 	rpa.F rps.F rrkstp.F rsa.F rtriint.F s128.F s256.F s512.F \ @@\
 	s64.F scal.F sgz.F simps.F synt.F traper.F triint.F vd01a.F
 
 #if defined(CERNLIB_DOUBLE)
 SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
-	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F rgmlt.F rkstp64.F \ @@\
+	rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F         rkstp64.F \ @@\
 	simps64.F triint64.F 
 #if defined(CERNLIB_LINUX)
 /* -O3 optimization breaks in g77 3.2 */
@@ -26,7 +28,7 @@
 #endif
 #else
 SRCS_F:= $(SRCS_F) cgauss128.F cauchy.F cauchy128.F deqbs128.F deqmr128.F \ @@\
-	deriv128.F minfc128.F rfrdh128.F rgmlt128.F rkstp128.F simps128.F \ @@\
+	deriv128.F minfc128.F rfrdh128.F            rkstp128.F simps128.F \ @@\
 	triint128.F 
 #endif
 
diff -urNad cernlib-2005.05.09/src/mathlib/gen/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/Imakefile	1996-10-02 12:09:45.000000000 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/gen/Imakefile	2005-06-10 22:20:55.683416711 -0400
@@ -8,7 +8,8 @@
 IMAKE_DEFINES=-DFortranDoesCpp=NO
 #endif
 
-LIBDIRS= a b c d divon e f g h j m n s u v x
+/* "n" subdir moved to packlib/hbook/  --Kevin McCarty, for Debian */
+LIBDIRS= a b c d divon e f g h j m   s u v x
 
 SUBDIRS= $(LIBDIRS) gen tests
 
diff -urNad cernlib-2005.05.09/src/mathlib/hbook/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/hbook/Imakefile
--- cernlib-2005.05.09/src/mathlib/hbook/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/hbook/Imakefile	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,12 @@
+/* this Imakefile used to get hdiff to compile within the mathlib tree */
+
+#define IHaveSubdirs
+#define PassCDebugFlags
+
+LIBDIRS= hdiff
+SUBDIRS= $(LIBDIRS) hbook
+
+TopOfPackage(hbook)
+SubdirLibraryTarget(hbook,$(LIBDIRS))
+DoIncludePackage(hbook)
+InstallIncludeSubdirs(hbook)
diff -urNad cernlib-2005.05.09/src/mathlib/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/Imakefile
--- cernlib-2005.05.09/src/mathlib/Imakefile	2005-06-10 22:19:15.834937877 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/mathlib/Imakefile	2005-06-10 22:20:05.279280394 -0400
@@ -3,7 +3,7 @@
 #define PassCDebugFlags 
 
 
-LIBDIRS= gen bvsl
+LIBDIRS= gen bvsl hbook /* hdiff stuff moved from packlib */
 
 /* Lapack is independent of Cernlib and should be installed as one of
    the build dependencies.
diff -urNad cernlib-2005.05.09/src/packlib/hbook/d/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/d/Imakefile
--- cernlib-2005.05.09/src/packlib/hbook/d/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/d/Imakefile	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,25 @@
+/* this Imakefile is used to get some things from mathlib/gen/d to compile
+   within the packlib/hbook tree */
+
+DoIncludePackage(gen)
+#include "pilot.h"
+
+SRCS_F=	rgmlt64.F
+
+#if defined(CERNLIB_DOUBLE)
+SRCS_F:= $(SRCS_F) rgmlt.F
+#else
+SRCS_F:= $(SRCS_F) rgmlt128.F
+#endif
+
+#ifdef CERNLIB_HPUX
+FORTRANOPTIONS += -WF,-P
+#endif
+
+#if defined(CERNLIB_SGI)
+IMAKE_DEFINES=-DFortranDoesCpp=NO
+#endif
+
+FORTRANSAVEOPTION = FortranSaveFlags
+
+SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/packlib/hbook/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/Imakefile
--- cernlib-2005.05.09/src/packlib/hbook/Imakefile	1997-04-28 04:21:23.000000000 -0400
+++ /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/Imakefile	2005-06-10 22:26:27.063010420 -0400
@@ -2,7 +2,9 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-LIBDIRS= hdiff hmerge hquad chbook fpclassc \ @@\
+/* hdiff moved to mathlib to avoid circular DLL dependencies; "d" and "n"
+   moved here from mathlib for the same reasons */
+LIBDIRS= d n   hmerge hquad chbook fpclassc \ @@\
 	 hrz code hmcstat hntup
 
 #ifdef CERNLIB_VAX


--- NEW FILE 703-patch-code_motif-packlib-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 703-patch-code_motif-packlib-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix up Imakefiles, etc. so that code_motif becomes a separate library
## DP: after moving it around in the patch 703 shell script.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/code_motif/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/code_motif/Imakefile
--- cernlib-2005.05.09/src/code_motif/Imakefile	1996-12-10 10:20:59.000000000 -0500
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/code_motif/Imakefile	2005-06-12 10:31:56.480928814 -0400
@@ -10,8 +10,10 @@
 	kuxxt.c mkdcmp.c mkdgra.c mkdpan.c mkmpan.c mkuip.c
 
 MotifDependantMakeVar(SRCS_C,$(MOTIF_SRCS_C))
-	
+
+/* Commented out since kmutil.c has been moved to packlib/kuip/code_kuip
 SRCS_C:= $(SRCS_C) kmutil.c
+*/
 
 #if defined(CERNLIB_VAXVMS)
 
@@ -22,4 +24,10 @@
  
 PACKAGE_INCLUDES := $(PACKAGE_INCLUDES) MotifIncludes X11Includes
 
-SubdirLibraryTarget(NullParameter,NullParameter)
+/* Top of package boilerplate to split this out as a separate library */
+
+TopOfPackage(packlib-lesstif)
+
+SubdirLibraryTarget(packlib-lesstif,NullParameter) 
+
+InstallLibrary(packlib-lesstif,$(CERN_LIBDIR))
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	2005-06-12 10:31:54.221414133 -0400
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/Imakefile	2005-06-12 10:32:20.947673659 -0400
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= kernlib packlib pawlib graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib code_motif pawlib graflib mathlib geant321 mclibs phtools
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	1999-11-24 04:52:07.000000000 -0500
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	2005-06-12 10:31:56.480928814 -0400
@@ -3,7 +3,9 @@
 SRCS_C=	getline.c kalias.c kbrow.c kedit.c kexec.c khash.c kicon.c \ @@\
 	kienbr.c kipiaf.c kkern.c kmacro.c kmath.c kmenu.c kmisc.c \ @@\
 	kmodel.c kmterm.c kuinit.c kutrue.c kuvers.c kuwhag.c	   \ @@\
-	kuwhat.c kvect.c
+	kuwhat.c kvect.c \ @@\
+	kmutil.c
+	/* ^^ moved here from code_motif.  --Kevin McCarty */
 
 #ifdef CERNLIB_WINNT
 SRCS_C :=$(SRCS_C) kmutil0.c
diff -urNad cernlib-2005.05.09/src/packlib/kuip/Imakefile /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/Imakefile	1997-11-28 12:26:56.000000000 -0500
+++ /tmp/dpep.mcTNBz/cernlib-2005.05.09/src/packlib/kuip/Imakefile	2005-06-12 10:31:56.480928814 -0400
@@ -4,11 +4,14 @@
 
 LIBDIRS= code_kuip 
 
+/* Commented out so that code_motif gives a separate shared library
+ * --Kevin McCarty
 #ifndef CERNLIB_WINNT
 LIBDIRS := $(LIBDIRS) code_motif
 #else
 LIBDIRS := $(LIBDIRS) code_windows
 #endif
+*/
 
 SUBDIRS= $(LIBDIRS) programs examples kuip
 


--- NEW FILE 704-patch-code_kuip-higzcc-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 704-patch-code_kuip-higzcc-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch Imakefiles after moving kuwhag.c from packlib to grafX11.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile /tmp/dpep.IDWarm/cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile
--- cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile	1998-11-16 04:36:53.000000000 -0500
+++ /tmp/dpep.IDWarm/cernlib-2005.05.09/src/graflib/higz/higzcc/Imakefile	2005-06-13 09:45:37.637201936 -0400
@@ -1,7 +1,7 @@
 DoIncludePackage(higz)
 #include "pilot.h"
 
-SRCS_C=	igvers.c
+SRCS_C=	igvers.c kuwhag.c /* <-- moved here from packlib/kuip/code_kuip */
 
 #if defined(CERNLIB_FALCO) && !defined(CERNLIB_VAX)
 SRCS_C := $(SRCS_C) falint.c 
diff -urNad cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile /tmp/dpep.IDWarm/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	2005-06-13 09:44:00.536042728 -0400
+++ /tmp/dpep.IDWarm/cernlib-2005.05.09/src/packlib/kuip/code_kuip/Imakefile	2005-06-13 09:44:41.448261682 -0400
@@ -2,7 +2,7 @@
 
 SRCS_C=	getline.c kalias.c kbrow.c kedit.c kexec.c khash.c kicon.c \ @@\
 	kienbr.c kipiaf.c kkern.c kmacro.c kmath.c kmenu.c kmisc.c \ @@\
-	kmodel.c kmterm.c kuinit.c kutrue.c kuvers.c kuwhag.c	   \ @@\
+	kmodel.c kmterm.c kuinit.c kutrue.c kuvers.c         	   \ @@\
 	kuwhat.c kvect.c \ @@\
 	kmutil.c
 	/* ^^ moved here from code_motif.  --Kevin McCarty */


--- NEW FILE 705-patch-paw_motif-paw-Imakefiles.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 705-patch-paw_motif-paw-Imakefiles.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	2005-06-13 16:04:27.418461884 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/Imakefile	2005-06-13 16:04:48.698899728 -0400
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= kernlib packlib code_motif pawlib graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile	1999-08-31 04:47:07.000000000 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/cdf/Imakefile	2005-06-13 16:05:01.263206159 -0400
@@ -1,6 +1,6 @@
 #define IHaveCDF
 
-SRCS_CDF= pawcdf.cdf pamcdf.cdf mlpdef.cdf
+SRCS_CDF= pawcdf.cdf            mlpdef.cdf
 
 #ifdef CERNLIB_IBMRT
 /* Otherwise cc dies with internal compiler error on pawcdf. 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/code/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	2005-06-13 16:04:26.689618135 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/code/Imakefile	2005-06-13 16:04:33.962059051 -0400
@@ -11,8 +11,8 @@
 	pautit.F pavect.F paw.F pawbrk.F pawdef.F pawfca.F \ @@\
 	pawfitz.F pawfop.F pawfu1.F pawfu2.F \ @@\
 	pawfu3.F pawfud.F pawfun.F pawfuy.F pawild.F pawins.F pawint.F \ @@\
-	pawint1.F pawint2.F pawint3.F pawint4.F pawintm.F \ @@\
-	pawjoj.F pawloc.F pawork.F pawpp.F pawrit.F pawrop.F \ @@\
+	pawint1.F pawint2.F pawint3.F pawint4.F           \ @@\
+	pawjoj.F pawloc.F pawork.F         pawrit.F pawrop.F \ @@\
 	pawsim.F pawusr.F pawuwf.F paxcut.F pazdz.F pazfz.F pazrz.F \ @@\
 	pchain.F pchclo.F pchncd.F pchrop.F pcnext.F pfclos.F \ @@\
 	pfhigz.F pfindc.F pfindf.F pfindf1.F pfindv.F pfinit.F pflog.F \ @@\
diff -urNad cernlib-2005.05.09/src/pawlib/paw/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/Imakefile	2000-06-27 11:27:03.000000000 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/pawlib/paw/Imakefile	2005-06-13 16:04:33.962059051 -0400
@@ -9,6 +9,9 @@
 
 LIBDIRS= code cpaw cdf ntuple mlpfit
 
+/* Comment out this whole section; Motif code has been moved to
+   paw_motif at top level.  -- Kevin McCarty */
+#if 0
 #ifndef CERNLIB_WINNT
 LIBDIRS :=$(LIBDIRS) $(MOTIF_DIRS) $(PAWPP_DIRS)
 #endif
@@ -22,6 +25,7 @@
 MotifDependantMakeVar(PAWPP_DIRS,xbaevms)
 LIBDIRS := $(LIBDIRS) $(PAWPP_DIRS)
 #endif
+#endif
 
 SUBDIRS= $(LIBDIRS) programs piafs hbpiaf stagerd paw
 
diff -urNad cernlib-2005.05.09/src/paw_motif/cdf/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/cdf/Imakefile
--- cernlib-2005.05.09/src/paw_motif/cdf/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/cdf/Imakefile	2005-06-13 16:04:33.963058837 -0400
@@ -0,0 +1,5 @@
+#define IHaveCDF
+
+SRCS_CDF= pamcdf.cdf
+
+SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/paw_motif/code/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/code/Imakefile
--- cernlib-2005.05.09/src/paw_motif/code/Imakefile	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/code/Imakefile	2005-06-13 16:04:33.963058837 -0400
@@ -0,0 +1,7 @@
+SRCS_F=	pawintm.F pawpp.F
+
+DoIncludePackage(paw)
+#include "pilot.h"
+
+SubdirLibraryTarget(NullParameter,NullParameter)
+
diff -urNad cernlib-2005.05.09/src/paw_motif/Imakefile /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/Imakefile
--- cernlib-2005.05.09/src/paw_motif/Imakefile	2000-06-27 11:27:03.000000000 -0400
+++ /tmp/dpep.Rec1V8/cernlib-2005.05.09/src/paw_motif/Imakefile	2005-06-13 16:04:33.963058837 -0400
@@ -7,7 +7,7 @@
 MotifDependantMakeVar(MOTIF_DIRS,cmotif fmotif fpanelsc)
 MotifDependantMakeVar(PAWPP_DIRS,fpanelsf tree uimx)
 
-LIBDIRS= code cpaw cdf ntuple mlpfit
+LIBDIRS= code cdf
 
 #ifndef CERNLIB_WINNT
 LIBDIRS :=$(LIBDIRS) $(MOTIF_DIRS) $(PAWPP_DIRS)
@@ -23,19 +23,11 @@
 LIBDIRS := $(LIBDIRS) $(PAWPP_DIRS)
 #endif
 
-SUBDIRS= $(LIBDIRS) programs piafs hbpiaf stagerd paw
-
-#if defined CERNLIB_WINNT
-SUBDIRS := $(LIBDIRS) programs
-#endif
-
-TopOfPackage(paw)
-
-SubdirLibraryTarget(paw,$(LIBDIRS))
+SUBDIRS= $(LIBDIRS)
 
-InstallBinSubdirs(programs)
+TopOfPackage(pawlib-lesstif)
 
-TestSubdirs(test)
+SubdirLibraryTarget(pawlib-lesstif,$(LIBDIRS))
 
-InstallIncludeSubdirs(paw)
+InstallLibrary(pawlib-lesstif,$(CERN_LIBDIR))
 


--- NEW FILE 800-implement-shared-library-rules-in-Imake.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 800-implement-shared-library-rules-in-Imake.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Implement macros for shared libraries on Linux in the Imake cfg files.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2005-11-29 17:07:32.035570303 +0000
+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2005-11-29 17:07:40.003888782 +0000
@@ -904,6 +904,8 @@
  * InstallSharedLibrary - generate rules to install the indicated sharable 
  * Library
  */
+/* Commented out because this appears to be overriding the definition
+ * in lnxLib.rules --Kevin McCarty, 16 May 2002
 #undef InstallSharedLibrary
 #ifndef InstallSharedLibrary
 #define InstallSharedLibrary(libname,rev,dest)				@@\
@@ -917,7 +919,8 @@
 	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS)  $< $@		@@\
 	RemoveFile($<)							@@\
 	$(LN) $@ $<
-#endif /* InstallSharedLibrary */
+#endif InstallSharedLibrary
+*/
 
 /*
  * InstallLinkKitLibrary - rule to install Link Kit library.
@@ -1963,6 +1966,15 @@
 #endif /* InstallSubdirs */
 
 /*
+ * InstallSharedLibSubdirs - generate rules to recursively install shared
+ * libraries.  Added by Kevin McCarty for Debian, 15 May 2002
+ */
+#ifndef InstallSharedLibSubdirs
+#define InstallSharedLibSubdirs(dirs) \
+NamedTargetSubdirs(install.shlib,dirs,"installing",DESTDIR=$(DESTDIR),install.shlib)
+#endif /* InstallSharedLibSubdirs */
+
+/*
  * InstallBinSubdirs - generate rules to recursively install programs and
  *		       scripts
  */
@@ -2341,9 +2353,12 @@
  */
 #ifndef DefinePackageLibrary
 #define DefinePackageLibrary(locallib) \
+/* commented out since these will be .so files. -Kevin */		@@\
+/*									@@\
 ifeq ($(strip $(PACKAGE_LIB)),)						@@\
 PACKAGE_LIB=$(TOP)$(PACKAGETOP)/LibraryTargetName($(PACKAGE_NAME))	@@\
 endif									@@\
+*/									@@\
 ifneq (locallib,)							@@\
 override PACKAGE_LIB:= LibraryTargetName(locallib) $(PACKAGE_LIB)	@@\
 									@@\
diff -urNad cernlib-2005.05.09.dfsg~/src/config/biglib.rules cernlib-2005.05.09.dfsg/src/config/biglib.rules
--- cernlib-2005.05.09.dfsg~/src/config/biglib.rules	2000-04-19 10:51:01.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/config/biglib.rules	2005-11-29 17:09:29.336812562 +0000
@@ -227,7 +227,7 @@
 	RanLibrary($@)
 #endif
 
-#if defined(HPArchitecture)
+#if defined(HPArchitecture) && !defined(LinuxArchitecture)
 
 #ifndef SharedLibraryTargetName
 #define SharedLibraryTargetName(name)Concat(lib,name.sl)
@@ -264,7 +264,7 @@
 	@date
 #endif
 
-#elif defined(AlphaArchitecture)
+#elif defined(AlphaArchitecture) && !defined(LinuxArchitecture)
 
 #ifndef SharedLibraryTargetName
 #define SharedLibraryTargetName(name)Concat(lib,name.so)
@@ -281,6 +281,41 @@
 	@date
 #endif
 
+#elif defined(LinuxArchitecture) /* added by Kevin McCarty
+				    for Debian, 15 May 2002 */
+#ifndef SharedLibraryTargetName
+#define SharedLibraryTargetName(name)Concat(lib,name.so.$(LIB_SONAME).$(CERN_LEVEL))
+#endif
+
+#ifndef SharedLibraryBuild
+#define SharedLibraryBuild(libname,version)				@@\
+SharedLibraryTargetName(libname): version/objects.list			@@\
+	@echo rebuild version library $@ in $(CURRENT_DIR)		@@\
+	@$(RM) $@							@@\
+	@date								@@\
+	@$(FCLINK) -shared -Wl,-soname=Concat(lib,libname.so.$(LIB_SONAME))\ @@\
+		-o $@ `cat version/objects.list` `cernlib -v "" -dy libname\ @@\
+		| sed s/Concat(-l,libname)//g`				@@\
+	@date
+#endif
+
+#elif defined(DarwinArchitecture) /* added by Kevin McCarty
+				      for fink, 10 May 2003 */
+#ifndef SharedLibraryTargetName
+#define SharedLibraryTargetName(name)Concat(lib,name.$(LIB_SONAME).$(CERN_LEVEL).dylib)
+#endif
+
+#ifndef SharedLibraryBuild
+#define SharedLibraryBuild(libname,version)				@@\
+SharedLibraryTargetName(libname): version/objects.list			@@\
+	@echo rebuild version library $@ in $(CURRENT_DIR)		@@\
+	@$(RM) $@							@@\
+	@/usr/bin/libtool -dynamic -o $@ -compatibility_version $(LIB_SONAME) \ @@\
+		`cat version/objects.list` `cernlib -v "" -dy libname	\ @@\
+		| sed s/Concat(-l,libname)//g`				@@\
+	@date
+#endif
+
 #elif 1 
 #ifndef SharedLibraryBuild
 #define SharedLibraryBuild(libname,version)				@@\
diff -urNad cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules cernlib-2005.05.09.dfsg/src/config/lnxLib.rules
--- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules	1995-12-20 15:26:45.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules	2005-11-29 17:07:40.004888571 +0000
@@ -43,6 +43,9 @@
 #ifndef PositionIndependentCplusplusFlags
 #define PositionIndependentCplusplusFlags -fPIC
 #endif
+#ifndef PositionIndependentFortranFlags
+#define PositionIndependentFortranFlags -fPIC
+#endif
 
 /*
  * InstallSharedLibrary - generate rules to install the shared library.
@@ -50,13 +53,20 @@
  */
 #ifndef InstallSharedLibrary
 #define	InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.so.rev) 					@@\
+.PHONY: install.shlib shlib/libname					@@\
+shlib/libname:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+install.shlib:: $(DESTDIR)dest/SharedLibraryTargetName(libname)		@@\
+									@@\
+$(DESTDIR)dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\
 	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
 	(T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
 		$(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T)	@@\
 	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
-	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
+	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so) @@\
+	$(RM) $<                                                        @@\
+	$(LN) $@ $<
 #endif /* InstallSharedLibrary */
 
 /*


--- NEW FILE 801-non-optimized-rule-uses-fPIC-g.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 801-non-optimized-rule-uses-fPIC-g.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Ensure that special rules for creating non-optimized object files
## DP: use -fPIC for files that go into shared libs, and -g for all files.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/config/fortran.rules /tmp/dpep.gResDB/cernlib-2005.05.09/src/config/fortran.rules
--- cernlib-2005.05.09/src/config/fortran.rules	1997-05-30 12:25:18.000000000 -0400
+++ /tmp/dpep.gResDB/cernlib-2005.05.09/src/config/fortran.rules	2005-06-09 10:37:19.092244331 -0400
@@ -345,9 +345,9 @@
 
 #ifndef SpecialFortranLibObjectRule
 #define SpecialFortranLibObjectRule(baseobj,basedep,options,cppoptions)	@@\
-SpecialFortranArchiveObjectRule(baseobj,basedep,options,cppoptions)	@@\
-SpecialFortranSharedObjectRule(baseobj,basedep,options,cppoptions)	@@\
-SpecialFortranDebugObjectRule(baseobj,basedep,options,cppoptions)
+SpecialFortranArchiveObjectRule(baseobj,basedep,options -g,cppoptions)	    @@\
+SpecialFortranSharedObjectRule(baseobj,basedep,options -g -fPIC,cppoptions) @@\
+SpecialFortranDebugObjectRule(baseobj,basedep,options -g,cppoptions)
 #endif
 
 #ifndef SpecialFortranArchiveObjectRule
diff -urNad cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile /tmp/dpep.gResDB/cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile
--- cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile	1996-09-23 10:20:46.000000000 -0400
+++ /tmp/dpep.gResDB/cernlib-2005.05.09/src/paw_motif/fmotif/Imakefile	2005-06-09 10:37:55.631538119 -0400
@@ -3,7 +3,7 @@
 	plotisto.F pmhist.F pminit.F show_chain.F
 
 #ifdef CERNLIB_LINUX
-FORTRANOPTIONS = -fno-backslash  $(FORTRANSAVEOPTION) -fno-second-underscore
+FORTRANOPTIONS = -g -fno-backslash  $(FORTRANSAVEOPTION) -fno-second-underscore
 #endif
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile /tmp/dpep.gResDB/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	1999-09-14 05:20:08.000000000 -0400
+++ /tmp/dpep.gResDB/cernlib-2005.05.09/src/pawlib/paw/ntuple/Imakefile	2005-06-09 10:40:47.421285771 -0400
@@ -46,8 +46,8 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_POWERPC)
-SpecialObjectRule(archive/qp_execute.o,qp_execute.c archive/qp_execute.d,-O0 -o $@)
-SpecialObjectRule(debug/qp_execute.o,qp_execute.c debug/qp_execute.d,-O0 -o $@)
-SpecialObjectRule(shared/qp_execute.o,qp_execute.c shared/qp_execute.d,-O0 -o $@)
+#if defined(CERNLIB_LINUX)
+SpecialObjectRule(archive/qp_execute.o,qp_execute.c archive/qp_execute.d,-O0 -g -o $@)
+SpecialObjectRule(debug/qp_execute.o,qp_execute.c debug/qp_execute.d,-O0 -g -o $@)
+SpecialObjectRule(shared/qp_execute.o,qp_execute.c shared/qp_execute.d,-O0 -g -fPIC -o $@)
 #endif


--- NEW FILE 802-create-shared-libraries.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 802-create-shared-libraries.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Actually implement the rules to create shared libraries.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile
--- cernlib-2005.05.09.dfsg~/src/Imakefile	2005-12-01 15:19:24.191267776 +0000
+++ cernlib-2005.05.09.dfsg/src/Imakefile	2005-12-01 15:20:10.310483251 +0000
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= kernlib packlib code_motif pawlib paw_motif graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib mathlib graflib code_motif mclibs phtools pawlib paw_motif geant321
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
@@ -15,6 +15,7 @@
 #endif
 
 InstallLibSubdirs($(LIBDIRS))
+InstallSharedLibSubdirs($(LIBDIRS))
 
 INCLUDEDIRS= $(LIBDIRS) cfortran
 
diff -urNad cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile cernlib-2005.05.09.dfsg/src/code_motif/Imakefile
--- cernlib-2005.05.09.dfsg~/src/code_motif/Imakefile	2005-12-01 15:19:24.062295137 +0000
+++ cernlib-2005.05.09.dfsg/src/code_motif/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -31,3 +31,4 @@
 SubdirLibraryTarget(packlib-lesstif,NullParameter) 
 
 InstallLibrary(packlib-lesstif,$(CERN_LIBDIR))
+InstallSharedLibrary(packlib-lesstif,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-12-01 15:19:23.018516575 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -26,6 +26,7 @@
 
 InstallLibrary(geant321,$(CERN_LIBDIR))
 InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
+InstallSharedLibrary(geant321,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 /* Fluka removed from Debian source package for copyright reasons. */
 /*
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile	1996-12-19 14:19:18.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -10,6 +10,7 @@
 SubdirLibraryTarget(geant321_parallel,NullParameter)
 
 InstallLibrary(geant321_parallel,$(CERN_LIBDIR))
+InstallSharedLibrary(geant321_parallel,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 CopyFile(../gbase/grun.F,grun.F)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/Imakefile cernlib-2005.05.09.dfsg/src/graflib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/graflib/Imakefile	2001-12-11 15:06:28.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/graflib/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -11,9 +11,12 @@
 
 SubdirLibraryTarget(graflib,$(LIBDIRS))
 
-InstallLibrary(graflib,$(CERN_LIBDIR))
-
 InstallLibSubdirs(higz)
+InstallSharedLibSubdirs(higz)
+
+/* these lines follow the above because graflib depends on grafX11 */
+InstallLibrary(graflib,$(CERN_LIBDIR))
+InstallSharedLibrary(graflib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(higz)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile
--- cernlib-2005.05.09.dfsg~/src/graflib/higz/Imakefile	1997-09-02 13:34:47.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/graflib/higz/Imakefile	2005-12-01 15:19:31.186783665 +0000
@@ -13,6 +13,7 @@
 SubdirLibraryTarget(grafX11,$(LIBDIRS))
 
 InstallLibrary(grafX11,$(CERN_LIBDIR))
+InstallSharedLibrary(grafX11,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(examples)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/kernlib/Imakefile	2002-04-26 14:37:20.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/kernlib/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -14,6 +14,7 @@
 
 InstallLibrary(kernlib,$(CERN_LIBDIR))
 InstallLibraryAlias(kernlib,kernlib-shift,$(CERN_LIBDIR))
+InstallSharedLibrary(kernlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 test::	LibraryTargetName(kernlib)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile	2005-12-01 15:19:24.005307227 +0000
+++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -19,6 +19,7 @@
 SubdirLibraryTarget(mathlib,$(LIBDIRS))
 
 InstallLibrary(mathlib,$(CERN_LIBDIR))
+InstallSharedLibrary(mathlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 InstallIncludeSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/Imakefile	2005-12-01 15:19:22.512623901 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -13,6 +13,7 @@
 TestSubdirs($(LIBDIRS))
 
 InstallLibSubdirs($(LIBDIRS))
+InstallSharedLibSubdirs($(LIBDIRS))
 
 /* Again, purge Pythia, Jetset and dependents. */
 INCLUDEDIRS= cojets eurodec herwig isajet pdf
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile	1996-05-06 20:06:50.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
 SubdirLibraryTarget(cojets,$(LIBDIRS))
 
 InstallLibrary(cojets,$(CERN_LIBDIR))
+InstallSharedLibrary(cojets,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 SubdirDataFile($(LIBRARY),cojets.dat,data)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/eurodec/Imakefile	1996-05-06 20:06:55.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/eurodec/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
 SubdirLibraryTarget(eurodec,$(LIBDIRS))
 
 InstallLibrary(eurodec,$(CERN_LIBDIR))
+InstallSharedLibrary(eurodec,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 SubdirDataFile($(LIBRARY),eurodec.dat,data)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile	1997-01-06 17:06:41.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -10,6 +10,7 @@
 
 InstallLibrary(herwig59,$(CERN_LIBDIR))
 InstallLibraryAlias(herwig59,herwig,$(CERN_LIBDIR))
+InstallSharedLibrary(herwig59,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(test)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile	2001-10-08 14:03:02.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile	2005-12-01 15:19:31.187783453 +0000
@@ -12,6 +12,7 @@
 SubdirLibraryTarget(isajet758,$(LIBDIRS))
 
 InstallLibrary(isajet758,$(CERN_LIBDIR))
+InstallSharedLibrary(isajet758,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 SubdirDataFile($(LIBRARY),isajet.dat,data)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile	2000-05-29 14:49:59.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -15,6 +15,7 @@
 SubdirLibraryTarget(pdflib804,spdf npdf)
 
 InstallLibrary(pdflib804,$(CERN_LIBDIR))
+InstallSharedLibrary(pdflib804,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(tpdf)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/photos/Imakefile	1999-03-26 10:52:23.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/photos/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -15,6 +15,7 @@
 SubdirLibraryTarget(photos202,code)
 
 InstallLibrary(photos202,$(CERN_LIBDIR))
+InstallSharedLibrary(photos202,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(test)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/Imakefile cernlib-2005.05.09.dfsg/src/packlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/packlib/Imakefile	2005-12-01 15:19:23.885332680 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -14,6 +14,7 @@
 
 InstallLibrary(packlib,$(CERN_LIBDIR))
 InstallLibraryAlias(packlib,packlib-shift,$(CERN_LIBDIR))
+InstallSharedLibrary(packlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile
--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile	2005-12-01 15:19:24.192267563 +0000
+++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -30,4 +30,5 @@
 SubdirLibraryTarget(pawlib-lesstif,$(LIBDIRS))
 
 InstallLibrary(pawlib-lesstif,$(CERN_LIBDIR))
+InstallSharedLibrary(pawlib-lesstif,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile	1996-10-01 14:12:23.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile	2005-12-01 15:19:31.188783241 +0000
@@ -11,6 +11,7 @@
 SubdirLibraryTarget(pawlib,$(LIBDIRS))
 
 InstallLibrary(pawlib,$(CERN_LIBDIR))
+InstallSharedLibrary(pawlib,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 InstallIncludeSubdirs($(LIBDIRS))
 
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/Imakefile cernlib-2005.05.09.dfsg/src/phtools/Imakefile
--- cernlib-2005.05.09.dfsg~/src/phtools/Imakefile	1996-11-14 16:44:33.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile	2005-12-01 15:19:31.189783029 +0000
@@ -11,7 +11,7 @@
 SubdirLibraryTarget(phtools,$(LIBDIRS))
 
 InstallLibrary(phtools,$(CERN_LIBDIR))
-InstallSharedLibrary(phtools,$(CERN_LEVEL),$(CERN_SHLIBDIR))
+InstallSharedLibrary(phtools,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
 
 TestSubdirs(wicoexam)
 


--- NEW FILE 803-link-binaries-dynamically.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 803-link-binaries-dynamically.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Link binaries dynamically against Cern libraries.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/config/fortran.rules /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules
--- cernlib-2005.05.09/src/config/fortran.rules	2005-06-13 15:26:19.991403858 -0400
+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules	2005-06-13 15:26:23.699609849 -0400
@@ -189,13 +189,13 @@
  */
 #ifndef CernlibDependLibrary
 #define CernlibDependLibrary(cernlibs)\
-$(filter-out +%,$(filter-out -%,$(shell cernlib cernlibs)))
+$(filter-out +%,$(filter-out -%,$(shell cernlib -dy cernlibs)))
 #endif
 
 /* Helper to use cernlib command
  */
 #ifndef CernlibCmd
-#define CernlibCmd(libraries)cernlib libraries
+#define CernlibCmd(libraries)cernlib -dy libraries
 #endif
 /*
  * CernlibFortranProgramTarget - rule to link fortran program using
@@ -207,7 +207,7 @@
 ProgramTargetName(program): SetWin32ObjSuffix(objects) deplibs CernlibDependLibrary(cernlibs)	@@\
 	RemoveTargetProgram($@)						@@\
 	@echo "Linking with cern libraries"				@@\
-	@cernlib cernlibs						@@\
+	@cernlib -dy cernlibs						@@\
 	CernlibFortranLinkRule($@,$(FCLDOPTIONS),objects,locallibs $(LDLIBS),CernlibCmd(cernlibs)) @@\
 									@@\
 clean::									@@\
@@ -233,8 +233,8 @@
 ProgramTargetName(program): objects deplibs CernlibDependLibrary(cernlibs) @@\
 	RemoveTargetProgram($@)						@@\
 	@echo "Linking with cern libraries"				@@\
-	@cernlib cernlibs						@@\
-	CernlibLinkRule($@,$(LDOPTIONS),objects,locallibs $(LDLIBS),cernlib cernlibs) @@\
+	@cernlib -dy cernlibs						@@\
+	CernlibLinkRule($@,$(LDOPTIONS),objects,locallibs $(LDLIBS),cernlib -dy cernlibs) @@\
 									@@\
 clean::									@@\
 	RemoveFile(ProgramTargetName(program))				@@\
diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile
--- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-13 15:26:18.903636773 -0400
+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile	2005-06-13 15:26:23.699609849 -0400
@@ -13,14 +13,14 @@
 DefinePackageLibrary(kxtlib)
 
 #if defined(CERNLIB_UNIX)
-CLIBS= -G Motif kernlib
+CLIBS= -G Motif Xm
 #endif
 
 #if defined(CERNLIB_VAXVMS)
-CLIBS= graflib/motif packlib kernlib
+CLIBS= -G Motif Xm
 #endif
 
 
-CernlibCcProgramTarget(kxterm,kxterm.o,libkxtlib.a,libkxtlib.a,$(CLIBS))
+CernlibFortranProgramTarget(kxterm,kxterm.o,libkxtlib.a,libkxtlib.a,$(CLIBS))
 
 InstallProgram(kxterm,$(CERN_BINDIR))
diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
--- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-13 15:26:19.418526524 -0400
+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-13 15:27:38.102678258 -0400
@@ -20,7 +20,7 @@
 InstallScript(paw,$(CERN_BINDIR))
 
 #if defined (CERNLIB_UNIX) && !defined(CERNLIB_WINNT)
-CernlibFortranProgramTarget(pawX11,0pamain.o,NullParameter,NullParameter,pawlib graflib/X11 packlib mathlib kernlib)
+CernlibFortranProgramTarget(pawX11,0pamain.o,NullParameter,NullParameter,-G X11 pawlib)
 
 InstallProgram(pawX11,$(CERN_BINDIR))
 
@@ -34,7 +34,7 @@
 /* This is a gmake ifeq, not a Imake/cpp #if... ! */
 ifeq ($(DO_PAW_PP),YES)
 
-CernlibFortranProgramTarget(paw++,0pamainm.o,NullParameter,NullParameter,pawlib graflib/Motif packlib mathlib kernlib)
+CernlibFortranProgramTarget(paw++,0pamainm.o,NullParameter,NullParameter,-G Motif pawlib)
 
 InstallProgram(paw++,$(CERN_BINDIR))
 


--- NEW FILE 804-workaround-for-comis-mdpool-struct-location.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 804-workaround-for-comis-mdpool-struct-location.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Hack to workaround Comis not liking it when code has a negative
## DP: offset from the mdpool struct (as is the case when using shared
## DP: libraries on some arches).

@DPATCH@
diff -urNad cernlib-2005.05.09/src/cfortran/Examples/pamain.c /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/cfortran/Examples/pamain.c
--- cernlib-2005.05.09/src/cfortran/Examples/pamain.c	2002-09-12 12:05:18.000000000 -0400
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/cfortran/Examples/pamain.c	2005-06-11 09:59:51.875449396 -0400
@@ -2,6 +2,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define PAWC_SIZE 9000000
 
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc
--- cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc	2000-05-30 09:53:58.000000000 -0400
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc	2005-06-11 09:59:51.876449180 -0400
@@ -15,7 +15,9 @@
 *
 * cspar.inc
 *
-        PARAMETER (LHP=50006, KON1=17694720, KON2=KON1
+#include "comis/mdsize.h"
+
+        PARAMETER (LHP=MDSIZE, KON1=17694720, KON2=KON1
      +, KON3=2**16, LRECU=8,NRECU=5,MLRECU=NRECU*LRECU
      +, MXRECU=MLRECU-LRECU
      1,      LASTK=2000,LSSTK=50,KLENID=32
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h
--- cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,33 @@
+#ifndef _MDPOOL_H
+#define _MDPOOL_H
+
+/* mdpool.h */
+
+/* #include  or  in one source code file of
+ * your executable program dynamically linked against libpaw
+ * so that MDPOOL is defined in your executable.  This is
+ * necessary for proper functioning of the COMIS interpreter when
+ * dynamically linked.
+ */
+
+/* define MDSIZE: */
+#include 
+
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+  int iq[MDSIZE];
+} mdpool_def;
+
+#define MDPOOL COMMON_BLOCK(MDPOOL, mdpool)
+COMMON_BLOCK_DEF(mdpool_def, MDPOOL);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* _MDPOOL_H */
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc
--- cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc	1996-02-26 12:16:34.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc	2005-06-11 09:59:51.876449180 -0400
@@ -12,6 +12,8 @@
 *
 * mdpool.inc
 *
+#include "comis/cspar.inc"
+
       COMMON/MDPOOL/IQ(LHP)
       INTEGER ISEM(LHP),KD(LHP),IDA(LHP),KD1(99),KD2(99),KD3(99)
       EQUIVALENCE (IQ,ISEM),(IQ,KD),(IQ,IDA)
diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h
--- cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h	2004-06-30 21:54:11.000000000 -0400
@@ -0,0 +1,6 @@
+#ifndef _MDSIZE_H
+#define _MDSIZE_H
+
+#define MDSIZE 50006
+
+#endif
diff -urNad cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c
--- cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c	1999-11-15 08:36:24.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c	2005-06-11 09:59:51.875449396 -0400
@@ -39,21 +39,20 @@
 /*-- Author :*/
 
 #include 
+#include 
+#include 
+#include "comis/mdsize.h"
 
 typedef struct {
-    int iq[6];
+    int iq[MDSIZE]; /* instead of int iq[6] */
 } mdpool_def;
 
 #define MDPOOL COMMON_BLOCK(MDPOOL,mdpool)
-COMMON_BLOCK_DEF(mdpool_def,MDPOOL);
+extern COMMON_BLOCK_DEF(mdpool_def,MDPOOL);
 
-unsigned long iqpntr = (unsigned long)MDPOOL.iq;
+unsigned long iqpntr = 0;
 
 
-#ifdef CERNLIB_WINNT
-# include 
-#endif
-
 #if defined(CERNLIB_QX_SC)
 int type_of_call csallo_(lenb)
 #endif
@@ -65,11 +64,31 @@
 #endif
  int *lenb;
 {
-  long lpntr;
+  unsigned long lpntr;
   int pntr; 
 
+  if (! iqpntr)
+    iqpntr = (unsigned long)MDPOOL.iq;
   lpntr= (long)( malloc(*lenb) );
-  pntr=lpntr - iqpntr;
+  if (! lpntr) {
+    fprintf(stderr,
+	    "CSALLO: not enough dynamic memory to allocate %d bytes\n", *lenb);
+    exit(EXIT_FAILURE);
+  }
+
+  pntr = (long)lpntr - (long)iqpntr;
+  if (pntr < 0) {
+    fprintf(stderr, "CSALLO: heap below bss?!");
+#if defined (CERNLIB_DEBIAN)
+    fprintf(stderr, "\n"
+"See the file /usr/share/doc/libpawlib2-dev/README.Debian for more information.\n"
+"If it does not help to solve this problem, please file a bug report against\n"
+"the libpawlib2 package, including the source code of your executable.\n");
+#else
+    fprintf(stderr, "  Try linking against pawlib statically.\n");
+#endif
+    exit(EXIT_FAILURE);
+  }
   return pntr;
 }
 
diff -urNad cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc
--- cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc	1996-03-01 11:50:06.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc	2005-06-11 09:59:51.875449396 -0400
@@ -28,5 +28,9 @@
 #include "paw/pawsmall.inc"
 #endif
 
+C      Include this file so that MDPOOL/IQ is present in pawX11 and
+C      paw++ dynamically linked executables.
+C      -- Kevin McCarty, for Debian, 1 Nov 2003
+#include "comis/mdpool.inc"
 
 #endif
diff -urNad cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc
--- cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc	1996-03-01 11:50:06.000000000 -0500
+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc	2005-06-11 09:59:51.875449396 -0400
@@ -28,5 +28,9 @@
 #include "paw/pawsmall.inc"
 #endif
 
+C      Include this file so that MDPOOL/IQ is present in pawX11 and
+C      paw++ dynamically linked executables.
+C      -- Kevin McCarty, for Debian, 1 Nov 2003
+#include "comis/mdpool.inc"
 
 #endif


--- NEW FILE 805-expunge-missing-mathlib-kernlib-symbols.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 805-expunge-missing-mathlib-kernlib-symbols.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove some unreferenced symbols from mathlib and kernlib.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile
--- cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile	2002-09-19 12:44:52.000000000 -0400
+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile	2005-06-13 11:20:33.838151240 -0400
@@ -1,6 +1,8 @@
 #ifndef CERNLIB_VAXVMS
 
-SRCS_F= accessf.F chdirf.F getenvf.F getwdf.F lstatf.F perrorf.F \ @@\
+/* perrorf.F has been removed since it depends upon files which introduce
+   unreferenced dependencies into the shared libraries.  --Kevin McCarty */
+SRCS_F= accessf.F chdirf.F getenvf.F getwdf.F lstatf.F           \ @@\
 	readlnf.F renamef.F setenvf.F statf.F systemf.F tmpro.F \ @@\
 	tmproi.F toslat.F unlinkf.F
 
diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-13 11:12:24.894703741 -0400
+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile	2005-06-13 11:16:54.864966246 -0400
@@ -2,20 +2,22 @@
 #include "pilot.h"
 
 /* rgmlt*.F have been moved into packlib/hbook to remove circular dependencies.
+   Some other files have been removed from this list because they depend upon
+   non-existent functions.
    --Kevin McCarty, for Debian. */
-SRCS_F=	arithm.F c128.F c256.F c512.F c64.F cauchy64.F cft.F cfstft.F \ @@\
+SRCS_F=	         c128.F c256.F c512.F c64.F cauchy64.F cft.F cfstft.F \ @@\
 	rfstft.F cgauss.F d107d1.F d107r1.F d501l1.F d501l2.F d501n1.F \ @@\
         d501n2.F d501p1.F d501p2.F d501sf.F d700su.F d701bd.F \ @@\
         dadapt.F deqbs64.F deqmr64.F deriv64.F dfunft.F dgs56p.F \ @@\
         dmaxlk.F dsumsq.F elanal.F elpahy.F epdbps.F epdchk.F \ @@\
-        epdchn.F epdcj.F epde1.F epdecc.F epdfix.F epdin.F \ @@\
-        epditr.F epdje.F epdloc.F epdsrt.F epdtab.F errorf.F esolve.F \ @@\
-	fcn1.F fftrc.F fumili.F gauss.F i128.F i32.F i64.F linsq.F \ @@\
-	mconv.F mft.F minfc.F minsq.F monito.F newro.F old506.F radapt.F \ @@\
+                 epdcj.F                  epdfix.F epdin.F \ @@\
+        epditr.F epdje.F epdloc.F epdsrt.F epdtab.F          esolve.F \ @@\
+	       fftrc.F          gauss.F i128.F i32.F i64.F         \ @@\
+	mconv.F mft.F minfc.F         monito.F newro.F          radapt.F \ @@\
 	radmul.F rca.F rfrdh164.F rfrdh264.F rft.F           rgquad.F \ @@\
 	rgs56p.F rgset.F riwiad.F riwibd.F rknys64.F rknysd.F rkstp.F \ @@\
 	rpa.F rps.F rrkstp.F rsa.F rtriint.F s128.F s256.F s512.F \ @@\
-	s64.F scal.F sgz.F simps.F synt.F traper.F triint.F vd01a.F
+	s64.F scal.F       simps.F synt.F traper.F triint.F vd01a.F
 
 #if defined(CERNLIB_DOUBLE)
 SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
diff -urNad cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile
--- cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile	1996-05-01 09:21:53.000000000 -0400
+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile	2005-06-13 11:19:42.456136998 -0400
@@ -1,9 +1,12 @@
-SRCS_F=	addbnd.F bfgs.F bndopt.F bndtst.F bounds.F bucmve.F \ @@\
-	bufopt.F delbnd.F delete.F delslv.F divon.F dvcopy.F dvdot.F \ @@\
-	dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F fun.F genpnt.F \ @@\
-	grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\
-	newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\
-	quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\
+/* Some files deleted from the below list since they depend upon the
+   lepto63 library, which cannot be included in Debian for licensing reasons. */
+
+SRCS_F=	addbnd.F bfgs.F          bndtst.F bounds.F bucmve.F \ @@\
+	         delbnd.F delete.F                  dvcopy.F dvdot.F \ @@\
+	dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F                \ @@\
+	                  ldlsol.F          modchl.F          mxstep.F \ @@\
+	newptq.F nmdchl.F         nodaud.F orthvc.F         quad.F \ @@\
+	quasi.F ranums.F          rlen.F settol.F shrnk.F         \ @@\
 	treaud.F tredmp.F tstext.F usrint.F usrtrm.F
 
 FORTRANSAVEOPTION = FortranSaveFlags


--- NEW FILE 806-bump-mathlib-and-dependents-sonames.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 806-bump-mathlib-and-dependents-sonames.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Bump so versions of mathlib and dependents since it is now compiled
## DP: against liblapack3 instead of liblapack2.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	2005-11-23 15:49:19.722162373 +0000
+++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-11-23 15:49:27.431512287 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 AllTarget(geant321)
 
 /* Fluka removed from Debian source package for copyright reasons. */
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mathlib/Imakefile	2005-11-23 15:49:19.723162159 +0000
+++ cernlib-2005.05.09.dfsg/src/mathlib/Imakefile	2005-11-23 15:49:27.431512287 +0000
@@ -2,6 +2,7 @@
 #define IHaveSubdirs
 #define PassCDebugFlags 
 
+export LIB_SONAME := 2
 
 LIBDIRS= gen bvsl hbook /* hdiff stuff moved from packlib */
 
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/Imakefile	2005-11-23 15:49:19.723162159 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/Imakefile	2005-11-23 15:49:27.431512287 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 AllTarget(cojets)
 
 LIBDIRS= code cojdata cojtapew
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/herwig/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/herwig/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 SUBDIRS= code doc test herwig59
 
 TopOfPackage(herwig59)
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -3,6 +3,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 LIBDIRS= code isadata isasusy isarun isatape
 
 SUBDIRS= $(LIBDIRS) test data isajet
diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile
--- cernlib-2005.05.09.dfsg~/src/mclibs/pdf/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/mclibs/pdf/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -6,6 +6,8 @@
 IMAKE_DEFINES=-DFortranDoesCpp=NO
 #endif
 
+export LIB_SONAME := 2
+
 AllTarget(pdflib804)
 
 SUBDIRS= spdf npdf tpdf pdf
diff -urNad cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile
--- cernlib-2005.05.09.dfsg~/src/paw_motif/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/paw_motif/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -1,6 +1,8 @@
 DoIncludePackage(paw)
 #include "paw/pilot.h"
 
+export LIB_SONAME := 2
+
 #define IHaveSubdirs
 #define PassCDebugFlags
 
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/Imakefile	2005-11-23 15:49:19.724161945 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -2,6 +2,7 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
 
 LIBDIRS= comis paw sigma
 SUBDIRS= $(LIBDIRS)
diff -urNad cernlib-2005.05.09.dfsg~/src/phtools/Imakefile cernlib-2005.05.09.dfsg/src/phtools/Imakefile
--- cernlib-2005.05.09.dfsg~/src/phtools/Imakefile	2005-11-23 15:49:19.725161731 +0000
+++ cernlib-2005.05.09.dfsg/src/phtools/Imakefile	2005-11-23 15:49:27.432512073 +0000
@@ -2,6 +2,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+export LIB_SONAME := 2
+
 LIBDIRS= genbod fowl wico
 
 SUBDIRS= $(LIBDIRS) wicoexam

cernlib-enforce-FHS.diff:

--- NEW FILE cernlib-enforce-FHS.diff ---
diff -ur ../original-cernlib-source/src/geant321/miface/gmorin.F src/geant321/miface/gmorin.F
--- ../original-cernlib-source/src/geant321/miface/gmorin.F     Mon Sep 30 10:26:05 1996
+++ src/geant321/miface/gmorin.F     Tue Oct 22 07:27:55 2002
@@ -112,7 +112,7 @@
          OPEN(UNIT=MICROS,FILE=XSFILE, STATUS='OLD',READONLY)
 #endif
 #if defined(CERNLIB_UNIX)||defined(CERNLIB_CRAY)
-         XSFILE = 'xsneut95.dat'
+         XSFILE = 'DATADIR/xsneut95.dat'
          INQUIRE(FILE=XSFILE,EXIST=EXISTS)
          IF(.NOT.EXISTS) THEN
             CHROOT=' '
diff -ur ../original-cernlib-source/src/mclibs/cojets/test/test.F src/mclibs/cojets/test/test.F
--- ../original-cernlib-source/src/mclibs/cojets/test/test.F    Mon Mar 25 07:53:36 1996
+++ src/mclibs/cojets/test/test.F    Tue Oct 22 07:27:55 2002
@@ -6,7 +6,7 @@
 #if defined(CERNLIB_IBMVM)
       PARAMETER (DFILE='/COJETS DATA *')
 #else
-      PARAMETER (DFILE='cojets.dat')
+      PARAMETER (DFILE='DATADIR/cojets.dat')
 #endif
 C
 C          MAIN PROGRAM FOR COJETS
diff -ur ../original-cernlib-source/src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/eurodec/eurodec/eufiles.inc
--- ../original-cernlib-source/src/mclibs/eurodec/eurodec/eufiles.inc   Fri Mar  8 11:58:49 1996
+++ src/mclibs/eurodec/eurodec/eufiles.inc   Tue Oct 22 07:27:55 2002
@@ -18,7 +18,7 @@
       PARAMETER (ETFILE='/EUTITLE DAT   *')
 #endif
       CHARACTER*(*) EDFILE,ETFILE
-      PARAMETER (EDFILE='eurodec.dat')
+      PARAMETER (EDFILE='DATADIR/eurodec.dat')
       PARAMETER (ETFILE='eutitle.dat')

 #endif
diff -ur ../original-cernlib-source/src/mclibs/isajet/test/isajett.F src/mclibs/isajet/test/isajett.F
--- ../original-cernlib-source/src/mclibs/isajet/test/isajett.F Fri Mar 14 12:32:39 1997
+++ src/mclibs/isajet/test/isajett.F Tue Oct 22 07:27:55 2002
@@ -8,7 +8,7 @@
 #if defined(CERNLIB_VAXVMS)
       PARAMETER (DFILE='CERN_ROOT:[lib]isajet.dat')
 #else
-      PARAMETER (DFILE='isajet.dat')
+      PARAMETER (DFILE='DATADIR/isajet.dat')
 #endif
 #endif
 C

cernlib-hwhiga_use_dimag.diff:

--- NEW FILE cernlib-hwhiga_use_dimag.diff ---
--- src/mclibs/herwig/code/hwhiga.F.old	2005-06-24 09:45:07.000000000 +0200
+++ src/mclibs/herwig/code/hwhiga.F	2005-06-24 10:11:59.000000000 +0200
@@ -73,7 +73,7 @@
       TAMP(7)=HWHIG5(U,T,S,EMH2,EMQ2,3,0,6,0,0,0)
       DO 20 I=1,7
       TAMPI(I)= DBLE(TAMP(I))
-  20  TAMPR(I)=-IMAG(TAMP(I))
+  20  TAMPR(I)=-DIMAG(TAMP(I))
 C Square and add prefactors
       WTGG=0.03125*FLOAT(NCOLO*(NCOLO**2-1))
      &    *(TAMPR(1)**2+TAMPI(1)**2+TAMPR(2)**2+TAMPI(2)**2

cernlib-hwuli2_use_dimag.diff:

--- NEW FILE cernlib-hwuli2_use_dimag.diff ---
--- src/mclibs/herwig/code/hwuli2.F.old	2005-06-24 10:09:09.000000000 +0200
+++ src/mclibs/herwig/code/hwuli2.F	2005-06-24 10:11:52.000000000 +0200
@@ -19,7 +19,7 @@
       PROD(Y,Y2)=Y*(ONE+A1*Y*(ONE+A2*Y*(ONE+A3*Y2*(ONE+A4*Y2*(ONE+A5*Y2*
      & (ONE+A6*Y2*(ONE+A7*Y2*(ONE+A8*Y2*(ONE+A9*Y2*(ONE+A10*Y2))))))))))
       XR=DBLE(X)
-      XI=IMAG(X)
+      XI=DIMAG(X)
       R2=XR*XR+XI*XI
       IF (R2.GT.ONE.AND.(XR/R2).GT.HALF) THEN
          Z=-LOG(ONE/X)

cernlib_2005.05.09.dfsg-2.diff:

***** Error reading new file: [Errno 2] No such file or directory: 'cernlib_2005.05.09.dfsg-2.diff'

Index: 001-fix-missing-fluka.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/001-fix-missing-fluka.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 001-fix-missing-fluka.dpatch	28 Nov 2005 10:43:24 -0000	1.1
+++ 001-fix-missing-fluka.dpatch	9 Dec 2005 16:09:19 -0000	1.2
@@ -1,23 +1,27 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 001-fix-missing-fluka.dpatch by  
+## 001-fix-missing-fluka.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Deal with FLUKA code having been purged from Debian's Cernlib source.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/geant321/Imakefile /tmp/dpep.yPljcw/cernlib-2005.05.09/src/geant321/Imakefile
---- cernlib-2005.05.09/src/geant321/Imakefile	1998-03-05 06:20:07.000000000 -0500
-+++ /tmp/dpep.yPljcw/cernlib-2005.05.09/src/geant321/Imakefile	2005-06-08 15:32:20.735091925 -0400
-@@ -4,7 +4,8 @@
+diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/Imakefile cernlib-2005.05.09.dfsg/src/geant321/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/geant321/Imakefile	1998-03-05 11:20:07.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/geant321/Imakefile	2005-11-23 17:41:29.886310858 +0000
+@@ -4,10 +4,11 @@
  
  AllTarget(geant321)
  
 -LIBDIRS= block cdf cgpack fiface fluka gbase gcons gdraw \ @@\
 +/* Fluka removed from Debian source package for copyright reasons. */
-+LIBDIRS= block cdf cgpack fiface       gbase gcons gdraw \ @@\
++LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
           geocad ggeom gheisha ghits ghrout ghutils giface \ @@\
  	 giopa gkine gphys gscan gstrag gtrak guser gxint \ @@\
- 	 miface miguti neutron peanut
+-	 miface miguti neutron peanut
++	 miface miguti neutron
+ 
+ 
+ SUBDIRS= $(LIBDIRS) data examples gxuser geant321
 @@ -25,9 +26,12 @@
  InstallLibrary(geant321,$(CERN_LIBDIR))
  InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
@@ -31,3 +35,13 @@
  
  /* This will install the correct link for xsneut95.dat at CERN;
   * If you want a local copy of the file, just copy it there
+diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/miface/Imakefile cernlib-2005.05.09.dfsg/src/geant321/miface/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/geant321/miface/Imakefile	1995-10-24 10:21:53.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/geant321/miface/Imakefile	2005-11-23 17:41:52.230563421 +0000
+@@ -1,5 +1,5 @@
+ SRCS_F= \ @@\
+-	 gfmdis.F gfmfin.F gmicap.F gmiset.F gmorin.F gmplxs.F gmxsec.F
++	                   gmicap.F gmiset.F gmorin.F gmplxs.F gmxsec.F
+ 
+ #ifdef CERNLIB_QMVAOS
+  FORTRANSAVEOPTION=FortranSaveFlags


Index: 002-fix-missing-mclibs.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/002-fix-missing-mclibs.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 002-fix-missing-mclibs.dpatch	28 Nov 2005 10:43:24 -0000	1.1
+++ 002-fix-missing-mclibs.dpatch	9 Dec 2005 16:09:19 -0000	1.2
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 002-fix-missing-mclibs.dpatch by  
+## 002-fix-missing-mclibs.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Deal with several of the MC libs having to be purged from source.


Index: 700-remove-kernlib-from-packlib-Imakefile.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/700-remove-kernlib-from-packlib-Imakefile.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 700-remove-kernlib-from-packlib-Imakefile.dpatch	28 Nov 2005 10:43:24 -0000	1.1
+++ 700-remove-kernlib-from-packlib-Imakefile.dpatch	9 Dec 2005 16:09:19 -0000	1.2
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 700-remove-kernlib-from-packlib-Imakefile.dpatch by  
+## 700-remove-kernlib-from-packlib-Imakefile.dpatch by  
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.

cernlib-cernlib_kernlib.patch:

Index: cernlib-cernlib_kernlib.patch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib-cernlib_kernlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-cernlib_kernlib.patch	28 Nov 2005 10:43:24 -0000	1.1
+++ cernlib-cernlib_kernlib.patch	9 Dec 2005 16:09:19 -0000	1.2
@@ -1,5 +1,5 @@
---- src/scripts/cernlib-orig	2005-11-24 13:51:54.000000000 +0100
-+++ src/scripts/cernlib	2005-11-24 14:02:25.000000000 +0100
+--- src/scripts/cernlib-old	2005-11-30 20:15:23.000000000 +0100
++++ src/scripts/cernlib	2005-11-30 20:15:23.000000000 +0100
 @@ -16,12 +16,16 @@
    [ -z "$CERN_LEVEL" ] && gver="pro" || gver="$CERN_LEVEL"
   
@@ -27,7 +27,7 @@
        fi
 +      if [ $1 = "packlib" ]; then
 +         _p=1
-+         ln="packlib.a $dir/libkernlib"
++         ln="packlib-lesstif.a $dir/libpacklib.a $dir/libkernlib"
 +      fi
           [ $1 = "genlib"  ] && ln="mathlib.a $dir/libphtools"
           [ $1 = "bvsl"    ] && ln="mathlib"
@@ -35,11 +35,11 @@
 -         [ $1 = "lapack"  ] && ln="lapack3.a $dir/libblas"
 -	 [ $1 = "pawlib"  ] && ln="pawlib.a $dir/liblapack3.a $dir/libblas"
 +         if [ $_l -eq 0 ] ; then
-+           [ $1 = "pawlib"  ] && ln="pawlib.a $dir/liblapack3.a $dir/libblas"
++           [ $1 = "pawlib"  ] && ln="pawlib-lesstif.a $dir/libpawlib.a $dir/liblapack3.a $dir/libblas"
 +           [ $1 = "lapack"  ] && ln="lapack3.a $dir/libblas"
 +         else
 +           if [ $1 = "pawlib"  ] ; then 
-+              ln="pawlib"
++              ln="pawlib-lesstif.a $dir/libpawlib"
 +              dynlapack=1
 +           fi
 +           if [ $1 = "lapack"  ] ; then
@@ -58,12 +58,18 @@
 +      [ -n "$ln" ] && CERNLIB="$CERNLIB $dir/lib$ln.a"
    done
 -  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib.a"
-+  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib.a $CERN/$gver/lib/libkernlib.a"
++  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib-lesstif.a $CERN/$gver/lib/libpacklib.a $CERN/$gver/lib/libkernlib.a"
  
  #  get system name
    [ -d /NextAdmin ] && Msys="NeXT" || Msys=`uname -s`
-@@ -113,7 +132,9 @@
-       Linux)   [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
+@@ -110,10 +129,14 @@
+                SYSGGL="-lfgl -lgl_s -lm -lbsd" ;
+                SYSGMOTIF="-lXm -lXt -lX11 -lPW"
+ 	       ;;
+-      Linux)   [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
++      Linux)   SYSGX11="-lX11"
++	       SYSGMOTIF="-lXm -lXt -lXp -lXext -lX11"
++	       [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
  	       [ -d /usr/X11/lib ] && SYSGX11="-L/usr/X11/lib -lX11"
  	       [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
 +	       [ -d /usr/X11R6/lib64 ] && SYSGX11="-L/usr/X11R6/lib64 -lX11"
@@ -72,7 +78,7 @@
  	       [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
  	       ;;
        NeXT)    SYSGX11="/usr/lib/X11/libX11.r" ;
-@@ -208,6 +229,10 @@
+@@ -208,6 +231,10 @@
       fi
       if [ "$Msys" = "Linux" ] ; then
          CERNLIB="$CERNLIB -lnsl -lcrypt -ldl"


Index: cernlib-deadpool.txt
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib-deadpool.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-deadpool.txt	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib-deadpool.txt	9 Dec 2005 16:09:19 -0000	1.2
@@ -2,26 +2,86 @@
 # for copyright reasons.  Given is the file or directory to delete
 # relative to $CERN_ROOT/src/.
 
-# --Kevin McCarty, 19 Aug. 2003
+# --Kevin McCarty, 23 Nov 2005
 
-# Authors of FLUKA and Pythia/Jetset did NOT give permission to release
+# Authors of Pythia/Jetset did NOT give permission to release
 # their code under GPL.  CERN should have checked this more carefully!!!
-geant321/data/flukaaf.dat
-geant321/fluka/
-car/geanf321.car
-car/geanf.car
-
-mclibs/jetset/
 car/jetset74.car
+mclibs/jetset/
 mclibs/pythia/
 
-# removal of Pythia/Jetset also necessitates removal of Fritiof, Lepto, Ariadne
+# Removal of Pythia/Jetset also necessitates removal of Fritiof, Lepto, Ariadne
 mclibs/fritiof/
 mclibs/ariadne/
 mclibs/ariadne_407/
 mclibs/lepto63/
 
-# other problematic files (mostly on VMS or obsolete archs)
+# The same applies to GEANT-FLUKA; see for instance the comments at
+# the web site http://www.fluka.org/Faq.html
+car/geanf.car
+car/geanf321.car
+#cmz/geanf.cmz
+#cmz/geanf321.cmz
+geant321/data/flukaaf.dat
+geant321/block/
+geant321/fiface/
+geant321/fluka/
+geant321/miface/gfmfin.F
+geant321/miface/gfmdis.F
+geant321/peanut/
+geant321/geant321/aadat.inc
+geant321/geant321/auxpar.inc
+geant321/geant321/balanc.inc
+geant321/geant321/bamjcm.inc
+geant321/geant321/cmsres.inc
+geant321/geant321/comcon.inc
+geant321/geant321/corinc.inc
+geant321/geant321/dblprc.inc
+geant321/geant321/decayc.inc
+geant321/geant321/decayc2.inc
+geant321/geant321/depnuc.inc
+geant321/geant321/dimpar.inc
+geant321/geant321/eva0.inc
+geant321/geant321/eva1.inc
+geant321/geant321/fheavy.inc
+geant321/geant321/finlsp.inc
+geant321/geant321/finlsp2.inc
+geant321/geant321/finlsp3.inc
+geant321/geant321/finpar.inc
+geant321/geant321/finpar2.inc
+geant321/geant321/finuc.inc
+geant321/geant321/finuc2.inc
+geant321/geant321/finuct.inc
+geant321/geant321/hadflg.inc
+geant321/geant321/hadpar.inc
+geant321/geant321/higfis.inc
+geant321/geant321/inpdat.inc
+geant321/geant321/inpdat2.inc
+geant321/geant321/inpflg.inc
+geant321/geant321/iounit.inc
+geant321/geant321/isotop.inc
+geant321/geant321/labcos.inc
+geant321/geant321/mapa.inc
+geant321/geant321/metlsp.inc
+geant321/geant321/nucdat.inc
+geant321/geant321/nucgeo.inc
+geant321/geant321/nuclev.inc
+geant321/geant321/nucpar.inc
+geant321/geant321/nucstf.inc
+geant321/geant321/paprop.inc
+geant321/geant321/parevt.inc
+geant321/geant321/parnuc.inc
+geant321/geant321/part.inc
+geant321/geant321/part2.inc
+geant321/geant321/part3.inc
+geant321/geant321/qquark.inc
+geant321/geant321/reac.inc
+geant321/geant321/redver.inc
+geant321/geant321/resnuc.inc
+geant321/geant321/split.inc
+geant321/geant321/xsepar.inc
+
+# Other problematic files (mostly on VMS or obsolete archs)
 graflib/higz/igold/golini.F
 packlib/cspack/sysreq/pwd_vms.h
 packlib/cspack/sysreq/sgtty.h

cernlib-gxint-script.diff:

Index: cernlib-gxint-script.diff
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib-gxint-script.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-gxint-script.diff	28 Nov 2005 10:43:24 -0000	1.1
+++ cernlib-gxint-script.diff	9 Dec 2005 16:09:19 -0000	1.2
@@ -1,21 +1,20 @@
---- src/scripts/gxint.orig	2005-06-12 14:12:21.183392960 +0200
-+++ src/scripts/gxint	2005-06-12 14:14:52.733353864 +0200
-@@ -78,7 +78,7 @@
-      fi
-   fi
+--- src/scripts/gxint-old	2005-11-23 23:11:08.000000000 +0100
++++ src/scripts/gxint	2005-11-29 11:42:30.000000000 +0100
+@@ -103,15 +103,8 @@
+    echo "gxint_Warning: no user program specified"
+ fi
   
--drv="/X11" ; ver="pro" ; OUT="${HOME}/GEANT$$"
-+drv="/X11" ; ver="==VERSION==" ; OUT="${HOME}/GEANT$$"
- gxint=""
+- 
+- 
+-if [ -z "$CERN" ] ; then
+-  if [ ! -d /cern ]; then
+-   echo "gxint_Error: shell variable CERN must be set or /cern must exist"
+-   exit 1
+-  fi
+-  CERN="/cern" ; export CERN
+-fi
++# not used after the sed one liner in the spec file 
++if [ -z "$CERN" ] ; then CERN="/usr"
   
- while [ $# -gt 0 ]
-@@ -142,7 +142,8 @@
-  
- CLIB="geant${gvs} pawlib graflib$drv packlib mathlib"
-  
--[ -z "$_m" ] && gxint="${CERN}/${ver}/lib/gxint${gvs}.$_o" 
-+#[ -z "$_m" ] && gxint="${CERN}/${ver}/lib/gxint${gvs}.$_o" 
-+[ -z "$_m" ] && gxint="==includedir==/cernlib/${ver}/gxint${gvs}.f" 
-  
- cat << EoD
- $line
+ if [ "$drv" = "/GKS" ] ; then
+   if [ -z "$GKSR" ] ; then


Index: cernlib.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib.README	28 Nov 2005 10:43:24 -0000	1.2
+++ cernlib.README	9 Dec 2005 16:09:19 -0000	1.3
@@ -54,3 +54,7 @@
 kernlib has been moved outside of packlib. If you use the cernlib script
 for linking it should be taken into account, however if you link directly
 with packlib you could need to add the kernlib on your link command line.
+
+6) split of motif dependent libs from packlib and pawlib
+
+The motif dependent libs are in libpacklib-lesstif and libpawlib-lesstif.


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cernlib.spec	28 Nov 2005 10:43:24 -0000	1.10
+++ cernlib.spec	9 Dec 2005 16:09:19 -0000	1.11
@@ -1,24 +1,27 @@
 Name:          cernlib
 Version:       2005
-Release:       4%{?dist}.8
+Release:       8%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
 # http://borex.princeton.edu/~kmccarty/faq.html#44
-License:       GPL/LGPL/BSD
+License:       GPL/LGPL
 URL:           http://cernlib.web.cern.ch/cernlib/
 # mandrake
 #BuildRequires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
 #BuildRequires: gcc-g77
 #Requires:      libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
 # fedora core
+# fc 3
+#BuildRequires: xorg-x11-devel lapack blas openmotif-devel
+# fc 4
 BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
+# fc devel
+#BuildRequires: imake lapack-devel blas-devel openmotif-devel 
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# f771 segfaults on x86_64
-ExcludeArch:   x86_64
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -44,7 +47,7 @@
 Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz
 Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz
 Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat
-# A shell script that goes in /etc/profile.d
+# Shell scripts that go in /etc/profile.d
 Source100: cernlib.sh.in
 Source105: cernlib.csh.in
 # m4 macros for autoconf
@@ -55,75 +58,131 @@
 Source103: cernlib.README
 # mkdirhier is used to create directories. Taken from xorg-x11
 Source104: mkdirhier
-# list of include directories (includelist.txt from debian)
-Source105: cernlib-includelist.txt
 # Files that can be used in the SOURCE directory to remove files with
 # GPL incompatible licences from upstream sources
 Source200: cernlib-remove-deadpool
 Source201: cernlib-deadpool.txt
 
-# change the cernlib script such that -llapack -lblas is used instead of 
-# cernlib lapack
-# and also depend explicitely on libkernlib now that it is out of packlib
-Patch49: cernlib-cernlib_kernlib.patch
-
-# debian cernlib patch full of good things
-Patch0: cernlib_2004.11.04-3.diff
+# debian patchset
+Patch0: cernlib_2005.05.09.dfsg-2.diff
+# change file to directory to DATADIR
+Patch1100: cernlib-enforce-FHS.diff
 Patch1: 001-fix-missing-fluka.dpatch
 Patch2: 002-fix-missing-mclibs.dpatch
-# modified, to have only DATADIR
-Patch3: 003-enforce-FHS
-Patch4: 005-enable-shadow-passwd
-#Patch4: 007-delete-fluka-refs
-Patch5: 008-undef-PPC
-Patch6: 010-comis-allow-special-chars-in-path
-Patch7: 012-add-no-optimization-macro
-# not applied, requires debian imake rules
-Patch8: 013-fix-paw-imakefile-special-rules
-# not applied, requires debian imake rules
-Patch9: 014-fix-herwig-imakefile-special-rules
-Patch11: 015-fix-optimization
-Patch12: 700-remove-kernlib-from-packlib-Imakefile.dpatch
-Patch13: 022-no-assign-string-literals
+Patch3: 003-geant-dummy-functions.dpatch
+Patch100: 100-fix-isajet-manual-corruption.dpatch
+Patch101: 101-undefine-PPC.dpatch
+Patch102: 102-dont-optimize-some-code.dpatch
+Patch103: 103-ignore-overly-long-macro-in-gen.h.dpatch
+Patch104: 104-fix-undefined-insertchar-warning.dpatch
+Patch105: 105-fix-obsolete-xmfontlistcreate-warning.dpatch 
+Patch106: 106-fix-paw++-menus-in-lesstif.dpatch
+Patch107: 107-define-strdup-macro-safely.dpatch
+Patch108: 108-quote-protect-comis-script.dpatch
+# not used as xsneut.dat is at the right place
+#Patch109: 109-fix-broken-xsneut95.dat-link.dpatch
+Patch110: 110-ignore-included-lapack-rule.dpatch
+Patch111: 111-fix-kuesvr-install-location.dpatch
+Patch112: 112-remove-nonexistent-prototypes-from-gen.h.dpatch
+# a workaround for cups. Applied in doubt.
+Patch113: 113-cups-postscript-fix.dpatch
+Patch114: 114-install-scripts-properly.dpatch
+Patch200: 200-comis-allow-special-chars-in-path.dpatch
+Patch201: 201-update-kuip-helper-apps.dpatch
+Patch202: 202-fix-includes-in-minuit-example.dpatch
+Patch203: 203-compile-geant-with-ertrak.dpatch
+Patch204: 204-compile-isajet-with-isasrt.dpatch
+Patch205: 205-max-path-length-to-256.dpatch
+Patch206: 206-herwig-uses-DBLE-not-REAL.dpatch
+Patch207: 207-compile-temp-libs-with-fPIC.dpatch
+# without that patch the binaries are linked with something like
+# libzftplib.a /builddir/build/BUILD/cernlib-2005/2005/build/packlib/cspack/programs/zftp/libzftplib.a
+Patch208: 208-fix-redundant-packlib-dependencies.dpatch
+Patch209: 209-ignore-unneeded-headers-in-kmutil.c.dpatch
+Patch210: 210-improve-cfortran-header-files.dpatch
+# disabled in the debian patchset, enabled here
+Patch211: 211-fix-comis-on-64-bit-arches.dpatch
+Patch300: 300-skip-duplicate-lenocc.dpatch
+# Use another approach, see cernlib-enforce-FHS
+# Patch33: 301-datafiles-comply-with-FHS.dpatch
+# use cernlib-gxint-script.diff instead and sed for paw and dzedit.script
+# Patch34: 302-scripts-comply-with-FHS.dpatch
+Patch303: 303-shadow-passwords-supported.dpatch
+Patch304: 304-update-Imake-config-files.dpatch
+Patch305: 305-use-POWERPC-not-PPC-as-test.dpatch
+# the bug in /usr/include/assert.h seems to be present in FC-4. So a local
+# version is provided in that patch. Will have to look at newer glibc-headers
+# packages
+Patch306: 306-patch-assert.h-for-makedepend.dpatch
+Patch307: 307-use-canonical-cfortran.dpatch
+Patch308: 308-use-canonical-cfortran-location.dpatch
+Patch309: 309-define-dummy-herwig-routines.dpatch
+Patch310: 310-define-dummy-fowl-routines.dpatch
+# The zebra qnexte is a fake, removing it remove an unneeded dependency.
+# the other qnext don't seem to be the same code? They are duplicate symbols
+# anyway so one must be removed
+Patch311: 311-skip-duplicate-qnext.dpatch
+Patch312: 312-skip-duplicate-gamma.dpatch
+# It is a departure from upstream. Apply, but may revert if not agreed.  
+Patch313: 313-comis-preserves-filename-case.dpatch
+Patch314: 314-permit-using-regcomp-for-re_comp.dpatch
+Patch315: 315-fixes-for-MacOSX.dpatch
+Patch318: 318-additional-gcc-3.4-fixes.dpatch
+
+Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch
+Patch701: 701-patch-hbook-comis-Imakefiles.dpatch
+Patch702: 702-patch-Imakefiles-for-packlib-mathlib.dpatch
+# I would have preferred not to move the motif code to toplevel...
+Patch703: 703-patch-code_motif-packlib-Imakefiles.dpatch
+Patch704: 704-patch-code_kuip-higzcc-Imakefiles.dpatch
+# I would have preferred not to move the motif code to toplevel...
+Patch705: 705-patch-paw_motif-paw-Imakefiles.dpatch
+
+Patch800: 800-implement-shared-library-rules-in-Imake.dpatch
+Patch801: 801-non-optimized-rule-uses-fPIC-g.dpatch
+Patch802: 802-create-shared-libraries.dpatch
+# in the original cernlib kxterm is built with the C compiler, which cause
+# a failure if compiled with de cernlib debian script as -lg2c isn't found. 
+# It is corrected by
+Patch803: 803-link-binaries-dynamically.dpatch
+# 803 depends on 
+# 208-fix-redundant-packlib-dependencies.dpatch
+
+# no idea about what this does
+Patch804: 804-workaround-for-comis-mdpool-struct-location.dpatch
+Patch805: 805-expunge-missing-mathlib-kernlib-symbols.dpatch 
+# not needed but keep sync with debian, that'll avoid bumping sonames
+Patch806: 806-bump-mathlib-and-dependents-sonames.dpatch
+
+# not applied in newer debian patchset
+Patch3006: 022-no-assign-string-literals
 # fixed upstream
-Patch14: 027-use-tmpfile-not-mktemp
-Patch15: 028-fix-isajet-docs
-Patch16: 030-filename-length-to-256
-Patch17: 031-fix-varargs-use
-Patch18: 033-fix-undefined-insertchar
-Patch19: 035-do-not-use-XmFontListCreate
-Patch20: 038-fix-strndup-macro-problem
-Patch21: 039-use-DBLE-not-REAL
-Patch22: 044-fix-strdup-redefinition
-Patch23: 045-compile-with-isasrt
-Patch24: 047-fix-paw++-menus
+Patch3007: 027-use-tmpfile-not-mktemp
+# not applied in the newer debian patchset
+Patch3008: 031-fix-varargs-use
 # fixed upstream 
-Patch25: 048-log-to-var-log-not-tmp
+Patch3009: 048-log-to-var-log-not-tmp
 # fixed upstream
-Patch26: 049-fix-kuesvr-security-hole
+Patch3010: 049-fix-kuesvr-security-hole
 # fixed upstream
-Patch27: 050-make-secure-comis-tmpdir
+Patch3011: 050-make-secure-comis-tmpdir
 # fixed upstream
-Patch28: 051-fix-miscellaneous-tmp-uses
-# extracted from 001-enable-shared-libs
-#Patch29: 001-delete-pythia-refs
-# prepare gxint for substitutions of path and version
-Patch30: cernlib-gxint-script.diff
-Patch31: cernlib-XmDrawShadow-no-prototype.patch
-Patch32: cernlib-install_scripts.patch
-Patch33: cernlib-static-tcpaw.diff
-Patch34: cernlib-hwuli2_use_aimag.diff 
-Patch35: cernlib-hwhiga_use_aimag.diff
-Patch36: cernlib-gfortran.diff 
-Patch42: cernlib-rsrtnt64_goto_outer_block.diff
-Patch43: cernlib-v107z0_X_before_string.diff
-Patch44: cernlib-bimsel-nodouble-save.diff
-Patch45: 029-fixes-for-MacOSX
-Patch46: cernlib-config_pmac.diff
-Patch47: 032-use-regcomp-not-re_comp
-# modified version of 013-fix-paw-imakefile-special-rules that doesn't
-# requires the debian imake rules
-Patch48: 013-fix-paw-imakefile-special-rules-modified
+Patch3012: 051-fix-miscellaneous-tmp-uses
+
+# change the cernlib script such that -llapack -lblas is used instead of 
+# cernlib lapack
+# depend explicitely on libkernlib now that it is out of packlib
+# use lesstif-pawlib and lesstif-packlib
+# the modified script is renamed cernlib-static later and the debian cernlib
+# script is used instead.
+Patch1200: cernlib-cernlib_kernlib.patch
+# don't stop if the CERN variable isn't defined
+Patch1201: cernlib-gxint-script.diff
+Patch1203: cernlib-hwuli2_use_dimag.diff 
+Patch1204: cernlib-hwhiga_use_dimag.diff
+Patch1205: cernlib-gfortran.diff 
+Patch1206: cernlib-rsrtnt64_goto_outer_block.diff
+Patch1207: cernlib-v107z0_X_before_string.diff
 
 %description
 CERN program library is a large collection of general purpose libraries
@@ -133,12 +192,15 @@
 detectors simulation, data-handling etc... applicable to a wide range 
 of problems.
 
-The devel packages are parallel installable, but not the helper
+The main and devel packages are parallel installable, but not the helper
 scripts from the utils subpackage.
 
 %package devel
 Summary:       General purpose CERN library static libraries and headers
-Requires:      xorg-x11-devel lapack-devel blas-devel openmotif-devel
+Requires:      lapack-devel blas-devel openmotif-devel
+# workaround #173530
+Requires:      libXau-devel
+Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
 
 %description devel
@@ -155,7 +217,7 @@
 %package utils
 Summary:   CERN library compilation and environment setting scripts
 Group:     Applications/System
-Requires:  cernlib-devel = %{version}
+Requires:  %{name}-devel = %{version}-%{release}
 
 %description utils
 CERN library compilation and environment setting scripts.
@@ -230,56 +292,185 @@
 
 %patch -p1
 cd %{version}
+%patch -P 1100 -p2
 %patch -P 1 -p1
 %patch -P 2 -p1
-%patch -P 3 -p2
-%patch -P 4 -p2
-%patch -P 5
-%patch -P 6
-%patch -P 7
-#%patch -P 8
-#%patch -P 9
-%patch -P 11
-%patch -P 12 -p1
-%patch -P 13
-#%patch -P 14
-%patch -P 15
-%patch -P 16
-%patch -P 17 
-%patch -P 18 
-%patch -P 19 
-%patch -P 20
-%patch -P 21 
-%patch -P 22 
-%patch -P 23 
-%patch -P 24 
-#%patch -P 25 
-#%patch -P 26 
-#%patch -P 27 
-#%patch -P 28 
-# not needed anymore
-#%patch -P 29
-%patch -P 30
-%patch -P 31
-%patch -P 32
-%patch -P 33
-%patch -P 34
-%patch -P 35
+%patch -P 3 -p1
+%patch -P 100 -p1
+%patch -P 101 -p1
+%patch -P 102 -p1
+%patch -P 103 -p1
+%patch -P 104 -p1
+%patch -P 105 -p1
+%patch -P 106 -p1
+%patch -P 107 -p1
+%patch -P 108 -p1
+#%patch -P 109 -p1
+%patch -P 110 -p1
+%patch -P 111 -p1
+%patch -P 112 -p1
+%patch -P 113 -p1
+%patch -P 114 -p1
+%patch -P 200 -p1
+%patch -P 201 -p1
+%patch -P 202 -p1
+%patch -P 203 -p1
+%patch -P 204 -p1
+%patch -P 205 -p1
+%patch -P 206 -p1
+%patch -P 207 -p1
+%patch -P 208 -p1
+%patch -P 209 -p1
+%patch -P 210 -p1
+%patch -P 211 -p1
+%patch -P 300 -p1
+#%patch -P 301 -p1
+#%patch -P 302 -p1
+%patch -P 303 -p1
+%patch -P 304 -p1
+%patch -P 305 -p1
+%patch -P 306 -p1
+%patch -P 307 -p1
+%patch -P 308 -p1
+%patch -P 309 -p1
+%patch -P 310 -p1
+%patch -P 311 -p1
+%patch -P 312 -p1
+%patch -P 313 -p1
+%patch -P 314 -p1
+%patch -P 315 -p1
+
+# copy a paw include file to include directory (debian
+# 317-copy-converter.h-to-installed-headers-dir.sh.dpatch)
+cp src/pawlib/paw/tree/converter.h src/pawlib/paw/paw/
+
+%patch -P 318 -p1
+
+# move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch)
+mv src/packlib/kernlib src/kernlib
+
+%patch -P 700 -p1
+
+# move hkf1q.F and hkfill.F out of packlib/hbook and into
+# pawlib/comis where they obviously belong (it even says so in the files!)
+# (debian 701-move-packlib-hkfill-to-comis.sh.dpatch)
+pushd src
+                mv packlib/hbook/code/hkf1q.F  pawlib/comis/code/
+                mv packlib/hbook/code/hkfill.F pawlib/comis/code/
+                # these files also need some headers to go with them:
+                mkdir pawlib/comis/hbook
+                cp -p packlib/hbook/hbook/pilot.h    pawlib/comis/hbook/
+                cp -p packlib/hbook/hbook/hcbook.inc pawlib/comis/hbook/
+                cp -p packlib/hbook/hbook/hcbits.inc pawlib/comis/hbook/
+                cp -p packlib/hbook/hbook/hcfast.inc pawlib/comis/hbook/
+popd
+
+%patch -P 701 -p1
+
+# Must create dirs before applying following patch. 
+# Corresponds with 702-fix-packlib-mathlib-circular-mess.sh.dpatch
+
+pushd src
+                # Hdiff depends upon a bunch of mathlib files; move it into
+                # mathlib.
+                mkdir mathlib/hbook
+                mv packlib/hbook/hdiff mathlib/hbook/
+                cp -r packlib/hbook/hbook mathlib/hbook/
+
+                # Meanwhile, other packlib files depend upon these mathlib
+                # files which are easily moved:
+                mkdir packlib/hbook/d
+                mv mathlib/gen/d/rgmlt*.F packlib/hbook/d/
+                mv mathlib/gen/n          packlib/hbook/
+                cp -r mathlib/gen/gen     packlib/hbook/
+popd
+
+%patch -P 702 -p1
+
+# Script to move packlib/kuip/code_motif to top level, splitting it out
+# from packlib.  But keep kmutil.c in packlib, it's otherwise used.
+# debian 703-move-code_motif-to-top-level.sh.dpatch
+
+pushd src
+                mv packlib/kuip/code_motif/kmutil.c packlib/kuip/code_kuip/
+                mv packlib/kuip/code_motif          ./
+                cp -r packlib/kuip/kuip             code_motif/
+popd
+
+%patch -P 703 -p1
+
+# Script to move the file kuwhag.c from packlib/kuip/code_kuip/kuwhag.c
+# into graflib/higz/higzcc.  It appears to be the only file in code_kuip
+# that depends upon grafX11 and libX11, so it fits in better here.
+# debian 704-move-kuwhag.c-to-grafX11.sh.dpatch
+
+pushd src
+                mv packlib/kuip/code_kuip/kuwhag.c graflib/higz/higzcc/
+                cp -r packlib/kuip/kuip            graflib/higz/
+popd
+
+%patch -P 704 -p1
+
+# Script to move Lesstif-dependent Paw code into its own library.
+# debian 705-move-paw++-code-to-top-level.sh.dpatch
+
+pushd src
+                mkdir paw_motif
+                mv pawlib/paw/?motif pawlib/paw/fpanels? paw_motif/
+                mv pawlib/paw/tree pawlib/paw/uimx pawlib/paw/xbae* paw_motif/
+                cp -p pawlib/paw/Imakefile paw_motif/
+                
+                mkdir paw_motif/code
+                mv pawlib/paw/code/pawpp.F   paw_motif/code/
+                mv pawlib/paw/code/pawintm.F paw_motif/code/
+
+                mkdir paw_motif/cdf
+                mv pawlib/paw/cdf/pamcdf.cdf paw_motif/cdf/
+
+                cp -pr pawlib/paw/paw paw_motif/
+                cp -pr pawlib/paw/hpaw paw_motif/
+popd
+
+%patch -P 705 -p1
+
+%patch -P 800 -p1
+%patch -P 801 -p1
+%patch -P 802 -p1
+%patch -P 803 -p1
+
+# Shell script to link pawlib/comis/comis into the top-level include directory.
+# debian 804-link-to-comis-includes.sh.dpatch
+pushd src
+                ln -s ../pawlib/comis/comis include/comis
+popd
+
+%patch -P 804 -p1
+%patch -P 805 -p1
+%patch -P 806 -p1
+
+
+%patch -P 1200
+%patch -P 1201
+%patch -P 1203
+%patch -P 1204
 # use gfortran
-#%patch -P 36
+#%patch -P 1205
 # workaround gfortran bug
-%patch -P 42
-%patch -P 43
-%patch -P 44
-# try to build on ppc
-%patch -P 45
-%patch -P 46
-%patch -P 47
-%patch -P 48
-%patch -P 49
+%patch -P 1206
+%patch -P 1207
+
+# remove CVS directories
+find . -depth -type d -name CVS -exec rm -rf {} ';' 
 
+# unset executable bit on source files
+chmod a-x src/kernlib/kerngen/ccgencf/cfstati.c \
+  src/cfortran/cfortran.*
+
+# remove empty header file not needed anywhere to shut up rpmlint
+rm src/pawlib/paw/ntuple/dbmalloc.h
 
 %build
+
 CERN=$RPM_BUILD_DIR/cernlib-%{version}
 CERN_LEVEL=%{version}
 CERN_ROOT=$CERN/$CERN_LEVEL
@@ -292,7 +483,10 @@
 export CVSCOSRC
 export PATH
 
-# set the CERN and CERN_LEVEL environment variables in a shell script
+LIB_SONAME=1
+export LIB_SONAME
+
+# set the CERN and CERN_LEVEL environment variables in shell scripts
 # meant to go to /etc/profile.d
 sed -e 's/==CERN_LEVEL==/%{version}/' -e 's:==CERN==:%{_libdir}/cernlib:' %{SOURCE100} > cernlib-%{version}.sh
 sed -e 's/==CERN_LEVEL==/%{version}/' -e 's:==CERN==:%{_libdir}/cernlib:' %{SOURCE105} > cernlib-%{version}.csh
@@ -300,6 +494,12 @@
 cp %{SOURCE101} .
 cp %{SOURCE102} .
 cp %{SOURCE103} .
+
+# Regenerate the copyright file (from debian/rules)
+grep -v DEADPOOL_LIST_GOES_HERE debian/copyright.in > copyright
+sed -e 's/#.*//g' -e '/^[[:space:]]*$$/d' %{SOURCE200} | \
+                sort | uniq >> copyright
+
 # copy xsneut.data in 2005/share/lib, where geant expects it to be
 # there is a link from 2005/lib
 mkdir -p %{version}/share/lib
@@ -307,36 +507,43 @@
 
 cd $CERN_ROOT
 
-find . -type d -name CVS -depth -exec rm -rf {} ';' 
-
-# substitude the right defaults in the cernlib script
-sed -i -e 's:/cern:%{_libdir}/cernlib/:' -e 's:pro:%{version}:' src/scripts/cernlib
+# substitude the right defaults in the scripts
+sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{version}":' \
+	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
 # substitute version in gxint with the right version
 # substitute includedir in gxint to conform to FHS
-sed -i -e 's/==VERSION==/%{version}/' -e 's:==includedir==:%{_includedir}:' src/scripts/gxint 
+sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib:%{_includedir}/cernlib/\${ver}:' src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
-for file in src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F; do
-  sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' $file
-done
-
-# move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch)
-mv src/packlib/kernlib src/kernlib
+sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \
+  src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F
 
 # Create the build directory structure
+mkdir -p build bin lib shlib
 
-mkdir -p build bin lib build/log
+# rename the cernlib script cernlib-static and use the debian cernlib
+# script for dynamic libraries support
+# remove -lg2c to the link commands, because libg2c.so isn't available, 
+# it is found by g77 if needed
+mv src/scripts/cernlib bin/cernlib-static
+sed -e 's:@PREFIX@:%{_prefix}:g' \
+  -e 's:@LIBPREFIX@:%{_libdir}/cernlib/%{version}:g' \
+  -e 's/-lg2c//' \
+  ../debian/add-ons/bin/cernlib.in > src/scripts/cernlib
+chmod 0755 src/scripts/cernlib
 
+# install mkdirhier which is needed to make directories
 cp %{SOURCE104} bin/
 chmod a+x bin/mkdirhier
 
 # Create the top level Makefile with imake
-# the RPM optflags are not used
 
 cd $CERN_ROOT/build
 $CVSCOSRC/config/imake_boot
 
+# the RPM optflags are not used during the build
+
 # Install kuipc and the scripts (cernlib, paw and gxint) in $CERN_ROOT/bin
 
 make %{?_smp_mflags} bin/kuipc
@@ -349,6 +556,8 @@
 cd $CERN_ROOT/build
 #  %{?_smp_mflags} breaks the build
 make
+make install.shlib
+chmod a+x ../shlib/*.so.*
 
 # Build paw
 cd $CERN_ROOT/build/pawlib
@@ -386,10 +595,12 @@
 %{__install} -m755 bin/* $RPM_BUILD_ROOT%{_bindir}/
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
+(cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
 #(cd src/include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -)
- 
+
 rm -f $RPM_BUILD_ROOT%{_bindir}/mkdirhier
 
+# add links for cfortran header files in the top include directory
 pushd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
 for file in *.h; do
 	%{__ln_s} $file cfortran/$file
@@ -398,38 +609,50 @@
 popd
 
 cd src
+# install include directories for the cernlib libraries
 base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
-for dir in `cat %{SOURCE105}`; do
+for dir in `cat ../../debian/add-ons/includelist.txt`; do
 	basedir=`basename $dir`
 	rm -rf $base_include/$basedir
 	cp -Rp $dir $base_include/
 done
 
 find $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} -name Imakefile -exec rm -f \{\} \;
-#rm -rf $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/cfortran/Examples/
+rm -f $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/ntuple/*.c
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%dir %{_libdir}/cernlib/
+%dir %{_libdir}/cernlib/%{version}
+%dir %{_libdir}/cernlib/%{version}/lib
+%{_libdir}/cernlib/%{version}/lib/*.so.*
+%{_datadir}/cernlib/
+%doc cernlib.README copyright
+%doc debian/debhelper/geant321.README.debian 
+%doc debian/debhelper/libpdflib804-2-dev.README.debian
+%doc debian/debhelper/libmathlib2.README.debian 
+%doc debian/debhelper/montecarlo-base.README.debian
+
 # the utils and devel are separated to have the possibility to install
 # parallel versions of the library
-
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/cernlib/%{version}
-%{_datadir}/cernlib/%{version}
-%{_includedir}/cernlib/%{version}
+%{_libdir}/cernlib/%{version}/lib/*.a
+%{_libdir}/cernlib/%{version}/lib/*.so
+%{_includedir}/cernlib/
 %{_datadir}/aclocal/cernlib.m4
-# those file should be in a cernlib main package
-%doc cernlib.README debian/copyright
-%doc debian/libgeant1.README.debian debian/libpdflib804-dev.README.debian
-%doc debian/libmathlib1.README.debian debian/montecarlo-base.README.debian
-# devel specific files
 %doc cfortran 
 
 %files utils
 %defattr(-,root,root,-)
-%{_bindir}/cernlib
+%{_bindir}/cernlib*
 %{_sysconfdir}/profile.d/cernlib-%{version}.sh
 %{_sysconfdir}/profile.d/cernlib-%{version}.csh
 
@@ -465,9 +688,20 @@
 %{_bindir}/hepdb
 %{_bindir}/kxterm
 %{_bindir}/zftp
-%doc debian/zftp.README.debian
+%doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8
+- use new debian patchset
+- enable 64 bit fixes patch
+- remove the BSD in the licence because there is no library nor binary
+  under a BSD licence and someone could get the idea that there is 
+  some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
+  because of cfortran
+- update with newer debian patchset for cernlib, fix licence issues
+- build shared libraries
+- simplify the scripts modifications
+
 * Fri Nov 25 2005 Patrice Dumas  - 2005-4.8
 - use debian patches of the cernlib 2005 patchset for the files removal
 - move kernlib out of packlib


Index: paw.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/paw.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw.README	16 Nov 2005 23:34:07 -0000	1.1
+++ paw.README	9 Dec 2005 16:09:19 -0000	1.2
@@ -5,18 +5,17 @@
 
 If you experience corruption of the graphics window when other windows are
 moved over top of it, turn on the BackingStore option of the X server.
-In the "Screen" section of your /etc/X11/XF86Config-4 file or 
-/etc/X11/xorg.conf, you should have
-something like:
+In the "Screen" section of your /etc/X11/XF86Config-4 or /etc/X11/xorg.conf
+file (whichever one exists), you should have something like:
 
 Section "Screen"
-        .
-        .
-        .
+	.
+	.
+	.
     Option "BackingStore"
-        .
-        .
-        .
+	.
+	.
+	.
 EndSection
 
 2) Remote data files
@@ -32,12 +31,22 @@
 If you compile a FORTRAN script within PAW, the path to the file cannot
 be excessively long (more than 256 characters).
 
-4) 64-bit issues
+4) Filename case issues
+
+The default behavior has been set so that PAW is case-sensitive in its 
+treatment of filenames.  If you have any old Paw scripts that do not
+treat filenames in a case-sensitive way, you may need to add the line
+
+        filecase convert
+
+to the beginning of them.
+
+5) 64-bit issues
 
 Note that this package is not yet fully functional on 64-bit machines, as the
 COMIS portion of Pawlib does not yet work correctly on those architectures.
 
--- Kevin McCarty , Mon, 29 Nov 2004
+-- Kevin McCarty , Tue, 22 Nov 2005
 
 Adapted to the rpm package by 
--- Dumas Patrice , Tue, 16 Jun 2005
+-- Dumas Patrice 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2005 10:43:24 -0000	1.4
+++ sources	9 Dec 2005 16:09:19 -0000	1.5
@@ -1,15 +1,15 @@
-1f25e16563f89a69c1b15b8ed11af904  src_car.tar.gz
+9d37e3c16c336d1887029227b27a42d8  src_car.tar.gz
 03bfd1239e57a23ab087bf29fe48c8a8  src_Imakefile.tar.gz
 fd20e80b3f58fc88168bcd6ce701f999  src_patchy.tar.gz
 9e686519ae3a52344222b21c9444ddd6  src_cfortran.tar.gz
 9ebd72a2b6e5349b25fc93e7b20c172a  src_include.tar.gz
-dcd46166a57a8a4ec45d872d79839f1a  src_pawlib.tar.gz
+bb4e224a7713ac4b8c13598e388c17f3  src_pawlib.tar.gz
 b72b89cb3a7f7c592d28b992c95b4eff  src_config.tar.gz
 0ec66e6d4920af79999b4c73fd3b065a  src_mathlib.tar.gz
 f215b9adba3cfb3be4bd74d624f00d32  src_phtools.tar.gz
-2cf91d533315b430f4e36c1c6e23841a  src_geant321.tar.gz
-ce6d941a50c3e1fdc8bdcc4ec2988116  src_mclibs.tar.gz
+24e2460fa61675df1cd74c7204a8d79e  src_geant321.tar.gz
+666d8a5c483c275463ebb1a3dd48c742  src_mclibs.tar.gz
 b30b121167ddf6508c22fc25a4272276  src_scripts.tar.gz
-f09d0f28e5c7ecc1a3932369f5a15dab  src_graflib.tar.gz
-d7d4628d136ed97f1e9ba164774a6878  src_packlib.tar.gz
+67228b011eac13b44499c50219e21545  src_graflib.tar.gz
+4fdcdc9f819ebbb9c6d3a04f339cdcf8  src_packlib.tar.gz
 eecb52159458ead0ee6b0d00b90aab66  xsneut95.dat


--- 003-enforce-FHS DELETED ---


--- 005-enable-shadow-passwd DELETED ---


--- 008-undef-PPC DELETED ---


--- 010-comis-allow-special-chars-in-path DELETED ---


--- 012-add-no-optimization-macro DELETED ---


--- 013-fix-paw-imakefile-special-rules DELETED ---


--- 013-fix-paw-imakefile-special-rules-modified DELETED ---


--- 014-fix-herwig-imakefile-special-rules DELETED ---


--- 015-fix-optimization DELETED ---


--- 028-fix-isajet-docs DELETED ---


--- 029-fixes-for-MacOSX DELETED ---


--- 030-filename-length-to-256 DELETED ---


--- 032-use-regcomp-not-re_comp DELETED ---


--- 033-fix-undefined-insertchar DELETED ---


--- 035-do-not-use-XmFontListCreate DELETED ---


--- 038-fix-strndup-macro-problem DELETED ---


--- 039-use-DBLE-not-REAL DELETED ---


--- 044-fix-strdup-redefinition DELETED ---


--- 045-compile-with-isasrt DELETED ---


--- 047-fix-paw++-menus DELETED ---


--- cernlib-XmDrawShadow-no-prototype.patch DELETED ---


--- cernlib-bimsel-nodouble-save.diff DELETED ---


--- cernlib-config_pmac.diff DELETED ---


--- cernlib-hwhiga_use_aimag.diff DELETED ---


--- cernlib-hwuli2_use_aimag.diff DELETED ---


--- cernlib-includelist.txt DELETED ---


--- cernlib-install_scripts.patch DELETED ---


--- cernlib-static-tcpaw.diff DELETED ---


--- cernlib_2004.11.04-3.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 16:17:33 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 11:17:33 -0500
Subject: rpms/cernlib/FC-3 cernlib.spec,1.8,1.9
Message-ID: <200512091618.jB9GI39g026381@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26363

Modified Files:
	cernlib.spec 
Log Message:
Correct wrongly uncommmented BuildRequires line



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cernlib.spec	9 Dec 2005 16:06:04 -0000	1.8
+++ cernlib.spec	9 Dec 2005 16:17:31 -0000	1.9
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.1
+Release:       8%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -15,7 +15,7 @@
 # fc 3
 BuildRequires: xorg-x11-devel lapack blas openmotif-devel
 # fc 4
-BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
+#BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
 # fc devel
 #BuildRequires: imake lapack-devel blas-devel openmotif-devel 
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
@@ -692,7 +692,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8.1
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.2
 - update with newer debian patchset for cernlib, fix licence issues
 - enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary



From fedora-extras-commits at redhat.com  Fri Dec  9 17:28:15 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 12:28:15 -0500
Subject: rpms/cernlib/FC-4 315-fixes-for-MacOSX.dpatch, 1.1, 1.2 cernlib.spec,
	1.11, 1.12
Message-ID: <200512091728.jB9HSjCk028302@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28282

Modified Files:
	315-fixes-for-MacOSX.dpatch cernlib.spec 
Log Message:
Correct patch 315 that conflicts with 211



Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 315-fixes-for-MacOSX.dpatch	9 Dec 2005 16:09:19 -0000	1.1
+++ 315-fixes-for-MacOSX.dpatch	9 Dec 2005 17:28:12 -0000	1.2
@@ -679,10 +679,10 @@
 diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
 --- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
 +++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
-@@ -26,7 +26,12 @@
-       I=CSLTGP(IPVS)
-       IF(I.GT.0)THEN
-         IF(IFCS.EQ.0)THEN
+@@ -38,7 +38,12 @@
+             IFCS=-2
+             CALL CSRTGPL(I)
+ #else
 +c     thanks to Keisuke Fujii for this patch for OS X
 +#if defined(CERNLIB_MACOSX)
 +          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
@@ -692,10 +692,10 @@
            IF(IADGP.NE.0)THEN
              IFCS=-2
              CALL CSRTGP(I)
-@@ -35,7 +40,11 @@
-           ENDIF
+@@ -58,7 +63,11 @@
+           I=CSITGPL(IPVS)
          ENDIF
-       ELSE
+ #else
 +#if defined(CERNLIB_MACOSX)
 +        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cernlib.spec	9 Dec 2005 16:09:19 -0000	1.11
+++ cernlib.spec	9 Dec 2005 17:28:12 -0000	1.12
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}
+Release:       8%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -691,7 +691,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.1
 - use new debian patchset
 - enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary



From fedora-extras-commits at redhat.com  Fri Dec  9 17:31:19 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 12:31:19 -0500
Subject: rpms/cernlib/FC-3 315-fixes-for-MacOSX.dpatch, 1.1, 1.2 cernlib.spec,
	1.9, 1.10
Message-ID: <200512091731.jB9HVngc028362@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28313

Modified Files:
	315-fixes-for-MacOSX.dpatch cernlib.spec 
Log Message:
Modify patch 315 that conflicted with 211



Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 315-fixes-for-MacOSX.dpatch	9 Dec 2005 15:57:06 -0000	1.1
+++ 315-fixes-for-MacOSX.dpatch	9 Dec 2005 17:31:10 -0000	1.2
@@ -679,10 +679,10 @@
 diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
 --- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
 +++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
-@@ -26,7 +26,12 @@
-       I=CSLTGP(IPVS)
-       IF(I.GT.0)THEN
-         IF(IFCS.EQ.0)THEN
+@@ -38,7 +38,12 @@
+             IFCS=-2
+             CALL CSRTGPL(I)
+ #else
 +c     thanks to Keisuke Fujii for this patch for OS X
 +#if defined(CERNLIB_MACOSX)
 +          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
@@ -692,10 +692,10 @@
            IF(IADGP.NE.0)THEN
              IFCS=-2
              CALL CSRTGP(I)
-@@ -35,7 +40,11 @@
-           ENDIF
+@@ -58,7 +63,11 @@
+           I=CSITGPL(IPVS)
          ENDIF
-       ELSE
+ #else
 +#if defined(CERNLIB_MACOSX)
 +        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cernlib.spec	9 Dec 2005 16:17:31 -0000	1.9
+++ cernlib.spec	9 Dec 2005 17:31:10 -0000	1.10
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.2
+Release:       8%{?dist}.3
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -692,7 +692,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8.2
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.3
 - update with newer debian patchset for cernlib, fix licence issues
 - enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary



From fedora-extras-commits at redhat.com  Fri Dec  9 19:14:27 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri,  9 Dec 2005 14:14:27 -0500
Subject: rpms/ircd-hybrid import.log,1.12,1.13
Message-ID: <200512091914.jB9JEvND031835@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31798

Modified Files:
	import.log 
Log Message:
auto-import ircd-hybrid-7.2.0-2 on branch devel from ircd-hybrid-7.2.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- import.log	19 Nov 2005 12:40:13 -0000	1.12
+++ import.log	9 Dec 2005 19:14:25 -0000	1.13
@@ -9,3 +9,4 @@
 ircd-hybrid-7_1_3-11:HEAD:ircd-hybrid-7.1.3-11.src.rpm:1132403221
 ircd-hybrid-7_1_3-11:FC-3:ircd-hybrid-7.1.3-11.src.rpm:1132403904
 ircd-hybrid-7_1_3-11:FC-4:ircd-hybrid-7.1.3-11.src.rpm:1132404003
+ircd-hybrid-7_2_0-2:HEAD:ircd-hybrid-7.2.0-2.src.rpm:1134155655



From fedora-extras-commits at redhat.com  Fri Dec  9 19:14:33 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri,  9 Dec 2005 14:14:33 -0500
Subject: rpms/ircd-hybrid/devel .cvsignore, 1.2, 1.3 ircd-hybrid.spec, 1.5,
	1.6 sources, 1.2, 1.3 ircd-hybrid-7.1.3-openssl.diff, 1.1, NONE
Message-ID: <200512091915.jB9JF3f4031842@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31798/devel

Modified Files:
	.cvsignore ircd-hybrid.spec sources 
Removed Files:
	ircd-hybrid-7.1.3-openssl.diff 
Log Message:
auto-import ircd-hybrid-7.2.0-2 on branch devel from ircd-hybrid-7.2.0-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2005 18:50:08 -0000	1.2
+++ .cvsignore	9 Dec 2005 19:14:31 -0000	1.3
@@ -1 +1 @@
-ircd-hybrid-7.1.3.tgz
+ircd-hybrid-7.2.0.tgz


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/devel/ircd-hybrid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ircd-hybrid.spec	19 Nov 2005 12:27:17 -0000	1.5
+++ ircd-hybrid.spec	9 Dec 2005 19:14:31 -0000	1.6
@@ -9,14 +9,13 @@
 
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
-Version: 7.1.3
-Release: 11%{?dist}
+Version: 7.2.0
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
-Patch0:	ircd-hybrid-7.1.3-openssl.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): fedora-usermgmt
@@ -33,16 +32,16 @@
 
 %prep
 %setup -q
-%patch0 -p1
-sed -i 's?\r??' doc/Tao-of-IRC.940110
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
+# Change modules/autoload path (IRCD_PREFIX "/modules/autoload/" - by default)
 # Change modules path (IRCD_PREFIX "/modules/" - by default)
 %{__perl} -pi -e 's|(^#define ETCPATH) .*|$1 "%{_sysconfdir}/ircd"|g;
                   s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g;
+		   s|(^#define AUTOMODPATH IRCD_PREFIX) .*|#define AUTOMODPATH "%{_libdir}/ircd/modules/autoload/"|g;
                   s|(^#define MODPATH) .*|$1 "%{_libdir}/ircd/modules/"|g' \
-    include/defaults.h
+   include/defaults.h
 #Added for x86_64 arch support
 sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
@@ -50,7 +49,7 @@
 %build
 %configure \
     --sysconfdir=%{_sysconfdir}/ircd \
-    --with-nicklen=%{nicklen} \
+   --with-nicklen=%{nicklen} \
     --with-topiclen=%{topiclen} \
     --with-maxconn=%{maxconn}
 %{__make} %{?_smp_mflags}
@@ -70,7 +69,7 @@
 
 # Move binaries with generic and potentially conflicting names ouf of the way
 %{__mkdir_p} %{buildroot}%{_libexecdir}/ircd/
-%{__mv} %{buildroot}%{_bindir}/{conv*,encspeed,mkpasswd,vi*} \
+%{__mv} %{buildroot}%{_bindir}/{encspeed,mkpasswd} \
         %{buildroot}%{_libexecdir}/ircd/
 
 # Move empty directory which we changed previously (src/Makefile.in would need
@@ -113,7 +112,7 @@
 %files
 %defattr(-, root, root, -)
 %doc BUGS ChangeLog Hybrid-team LICENSE README.FIRST RELNOTES TODO
-%doc doc/{*.txt,server-version-info,Tao-of-IRC.940110,technical/}
+%doc doc/{*.txt,server-version-info,technical/}
 %doc etc/*.conf*
 %attr(770,ircd,ircd) %dir %{_sysconfdir}/ircd/
 %attr(640,ircd,ircd) %config(noreplace) %{_sysconfdir}/ircd/*
@@ -126,10 +125,16 @@
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-%exclude %{_includedir}
+%exclude %{_prefix}/help
 
 
 %changelog
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-2
+- Modify spec file to take into account the 7.2.0 update
+
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-1
+- Update to 7.2.0
+
 * Fri Nov 18 2005 Eric Tanguy 7.1.3-11
 - modify changelog
 - modify abslolute path to relative one for doc/Tao-of-IRC.940110


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2005 18:50:08 -0000	1.2
+++ sources	9 Dec 2005 19:14:31 -0000	1.3
@@ -1 +1 @@
-4f3a69eed68b00bf72bfede35fffb70d  ircd-hybrid-7.1.3.tgz
+e3c716fef0c62eaba147df06f32ea87d  ircd-hybrid-7.2.0.tgz


--- ircd-hybrid-7.1.3-openssl.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 20:16:03 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 15:16:03 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.12,1.13
Message-ID: <200512092016.jB9KGXA3001260@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1242

Modified Files:
	cernlib.spec 
Log Message:
re exclude x86_64



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cernlib.spec	9 Dec 2005 17:28:12 -0000	1.12
+++ cernlib.spec	9 Dec 2005 20:16:01 -0000	1.13
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.1
+Release:       8%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -22,6 +22,8 @@
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# f771 segfaults on x86_64
+ExcludeArch:   x86_64
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -691,7 +693,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8.1
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.2
 - use new debian patchset
 - enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary



From fedora-extras-commits at redhat.com  Fri Dec  9 20:39:10 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri,  9 Dec 2005 15:39:10 -0500
Subject: rpms/cernlib/devel 315-fixes-for-MacOSX.dpatch, 1.1,
	1.2 cernlib.spec, 1.7, 1.8
Message-ID: <200512092039.jB9KdeIB001354@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1329

Modified Files:
	315-fixes-for-MacOSX.dpatch cernlib.spec 
Log Message:
Correct patch 315 that conflicts with 211




Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 315-fixes-for-MacOSX.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 315-fixes-for-MacOSX.dpatch	9 Dec 2005 20:39:08 -0000	1.2
@@ -679,10 +679,10 @@
 diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
 --- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
 +++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
-@@ -26,7 +26,12 @@
-       I=CSLTGP(IPVS)
-       IF(I.GT.0)THEN
-         IF(IFCS.EQ.0)THEN
+@@ -38,7 +38,12 @@
+             IFCS=-2
+             CALL CSRTGPL(I)
+ #else
 +c     thanks to Keisuke Fujii for this patch for OS X
 +#if defined(CERNLIB_MACOSX)
 +          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
@@ -692,10 +692,10 @@
            IF(IADGP.NE.0)THEN
              IFCS=-2
              CALL CSRTGP(I)
-@@ -35,7 +40,11 @@
-           ENDIF
+@@ -58,7 +63,11 @@
+           I=CSITGPL(IPVS)
          ENDIF
-       ELSE
+ #else
 +#if defined(CERNLIB_MACOSX)
 +        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cernlib.spec	9 Dec 2005 13:18:44 -0000	1.7
+++ cernlib.spec	9 Dec 2005 20:39:08 -0000	1.8
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}
+Release:       8%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -12,10 +12,14 @@
 #BuildRequires: gcc-g77
 #Requires:      libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
 # fedora core
+# fc 3
+#BuildRequires: xorg-x11-devel lapack blas openmotif-devel
+# fc 4
+#BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
+# fc devel
 BuildRequires: imake lapack-devel blas-devel openmotif-devel 
 # workaround #173530
 BuildRequires: libXau-devel
-#BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
 # build the cernlib
 BuildRequires: /usr/bin/g77
@@ -689,7 +693,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.1
 - use new debian patchset
 - enable 64 bit fixes patch
 



From fedora-extras-commits at redhat.com  Fri Dec  9 22:03:54 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri,  9 Dec 2005 17:03:54 -0500
Subject: rpms/ircd-hybrid import.log,1.13,1.14
Message-ID: <200512092204.jB9M4OW7004842@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4801

Modified Files:
	import.log 
Log Message:
auto-import ircd-hybrid-7.2.0-2 on branch FC-4 from ircd-hybrid-7.2.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	9 Dec 2005 19:14:25 -0000	1.13
+++ import.log	9 Dec 2005 22:03:51 -0000	1.14
@@ -10,3 +10,4 @@
 ircd-hybrid-7_1_3-11:FC-3:ircd-hybrid-7.1.3-11.src.rpm:1132403904
 ircd-hybrid-7_1_3-11:FC-4:ircd-hybrid-7.1.3-11.src.rpm:1132404003
 ircd-hybrid-7_2_0-2:HEAD:ircd-hybrid-7.2.0-2.src.rpm:1134155655
+ircd-hybrid-7_2_0-2:FC-4:ircd-hybrid-7.2.0-2.src.rpm:1134165805



From fedora-extras-commits at redhat.com  Fri Dec  9 22:04:14 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri,  9 Dec 2005 17:04:14 -0500
Subject: rpms/ircd-hybrid/FC-4 .cvsignore, 1.2, 1.3 ircd-hybrid.spec, 1.4,
	1.5 sources, 1.2, 1.3 ircd-hybrid-7.1.3-openssl.diff, 1.1, NONE
Message-ID: <200512092204.jB9M4i4r004847@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4801/FC-4

Modified Files:
	.cvsignore ircd-hybrid.spec sources 
Removed Files:
	ircd-hybrid-7.1.3-openssl.diff 
Log Message:
auto-import ircd-hybrid-7.2.0-2 on branch FC-4 from ircd-hybrid-7.2.0-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2005 18:50:08 -0000	1.2
+++ .cvsignore	9 Dec 2005 22:04:11 -0000	1.3
@@ -1 +1 @@
-ircd-hybrid-7.1.3.tgz
+ircd-hybrid-7.2.0.tgz


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-4/ircd-hybrid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ircd-hybrid.spec	19 Nov 2005 12:40:19 -0000	1.4
+++ ircd-hybrid.spec	9 Dec 2005 22:04:11 -0000	1.5
@@ -9,14 +9,13 @@
 
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
-Version: 7.1.3
-Release: 11%{?dist}
+Version: 7.2.0
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
-Patch0:	ircd-hybrid-7.1.3-openssl.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): fedora-usermgmt
@@ -33,16 +32,16 @@
 
 %prep
 %setup -q
-%patch0 -p1
-sed -i 's?\r??' doc/Tao-of-IRC.940110
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
+# Change modules/autoload path (IRCD_PREFIX "/modules/autoload/" - by default)
 # Change modules path (IRCD_PREFIX "/modules/" - by default)
 %{__perl} -pi -e 's|(^#define ETCPATH) .*|$1 "%{_sysconfdir}/ircd"|g;
                   s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g;
+		   s|(^#define AUTOMODPATH IRCD_PREFIX) .*|#define AUTOMODPATH "%{_libdir}/ircd/modules/autoload/"|g;
                   s|(^#define MODPATH) .*|$1 "%{_libdir}/ircd/modules/"|g' \
-    include/defaults.h
+   include/defaults.h
 #Added for x86_64 arch support
 sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
@@ -50,7 +49,7 @@
 %build
 %configure \
     --sysconfdir=%{_sysconfdir}/ircd \
-    --with-nicklen=%{nicklen} \
+   --with-nicklen=%{nicklen} \
     --with-topiclen=%{topiclen} \
     --with-maxconn=%{maxconn}
 %{__make} %{?_smp_mflags}
@@ -70,7 +69,7 @@
 
 # Move binaries with generic and potentially conflicting names ouf of the way
 %{__mkdir_p} %{buildroot}%{_libexecdir}/ircd/
-%{__mv} %{buildroot}%{_bindir}/{conv*,encspeed,mkpasswd,vi*} \
+%{__mv} %{buildroot}%{_bindir}/{encspeed,mkpasswd} \
         %{buildroot}%{_libexecdir}/ircd/
 
 # Move empty directory which we changed previously (src/Makefile.in would need
@@ -113,7 +112,7 @@
 %files
 %defattr(-, root, root, -)
 %doc BUGS ChangeLog Hybrid-team LICENSE README.FIRST RELNOTES TODO
-%doc doc/{*.txt,server-version-info,Tao-of-IRC.940110,technical/}
+%doc doc/{*.txt,server-version-info,technical/}
 %doc etc/*.conf*
 %attr(770,ircd,ircd) %dir %{_sysconfdir}/ircd/
 %attr(640,ircd,ircd) %config(noreplace) %{_sysconfdir}/ircd/*
@@ -126,10 +125,16 @@
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-%exclude %{_includedir}
+%exclude %{_prefix}/help
 
 
 %changelog
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-2
+- Modify spec file to take into account the 7.2.0 update
+
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-1
+- Update to 7.2.0
+
 * Fri Nov 18 2005 Eric Tanguy 7.1.3-11
 - modify changelog
 - modify abslolute path to relative one for doc/Tao-of-IRC.940110


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2005 18:50:08 -0000	1.2
+++ sources	9 Dec 2005 22:04:11 -0000	1.3
@@ -1 +1 @@
-4f3a69eed68b00bf72bfede35fffb70d  ircd-hybrid-7.1.3.tgz
+e3c716fef0c62eaba147df06f32ea87d  ircd-hybrid-7.2.0.tgz


--- ircd-hybrid-7.1.3-openssl.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:08:49 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri,  9 Dec 2005 17:08:49 -0500
Subject: rpms/ircd-hybrid import.log,1.14,1.15
Message-ID: <200512092209.jB9M9JxE004952@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4916

Modified Files:
	import.log 
Log Message:
auto-import ircd-hybrid-7.2.0-2 on branch FC-3 from ircd-hybrid-7.2.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- import.log	9 Dec 2005 22:03:51 -0000	1.14
+++ import.log	9 Dec 2005 22:08:28 -0000	1.15
@@ -11,3 +11,4 @@
 ircd-hybrid-7_1_3-11:FC-4:ircd-hybrid-7.1.3-11.src.rpm:1132404003
 ircd-hybrid-7_2_0-2:HEAD:ircd-hybrid-7.2.0-2.src.rpm:1134155655
 ircd-hybrid-7_2_0-2:FC-4:ircd-hybrid-7.2.0-2.src.rpm:1134165805
+ircd-hybrid-7_2_0-2:FC-3:ircd-hybrid-7.2.0-2.src.rpm:1134166074



From fedora-extras-commits at redhat.com  Fri Dec  9 22:08:52 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri,  9 Dec 2005 17:08:52 -0500
Subject: rpms/ircd-hybrid/FC-3 .cvsignore, 1.2, 1.3 ircd-hybrid.spec, 1.4,
	1.5 sources, 1.2, 1.3 ircd-hybrid-7.1.3-openssl.diff, 1.1, NONE
Message-ID: <200512092209.jB9M9MCW004957@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4916/FC-3

Modified Files:
	.cvsignore ircd-hybrid.spec sources 
Removed Files:
	ircd-hybrid-7.1.3-openssl.diff 
Log Message:
auto-import ircd-hybrid-7.2.0-2 on branch FC-3 from ircd-hybrid-7.2.0-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2005 18:50:08 -0000	1.2
+++ .cvsignore	9 Dec 2005 22:08:50 -0000	1.3
@@ -1 +1 @@
-ircd-hybrid-7.1.3.tgz
+ircd-hybrid-7.2.0.tgz


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/ircd-hybrid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ircd-hybrid.spec	19 Nov 2005 12:38:40 -0000	1.4
+++ ircd-hybrid.spec	9 Dec 2005 22:08:50 -0000	1.5
@@ -9,14 +9,13 @@
 
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
-Version: 7.1.3
-Release: 11%{?dist}
+Version: 7.2.0
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
-Patch0:	ircd-hybrid-7.1.3-openssl.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): fedora-usermgmt
@@ -33,16 +32,16 @@
 
 %prep
 %setup -q
-%patch0 -p1
-sed -i 's?\r??' doc/Tao-of-IRC.940110
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
+# Change modules/autoload path (IRCD_PREFIX "/modules/autoload/" - by default)
 # Change modules path (IRCD_PREFIX "/modules/" - by default)
 %{__perl} -pi -e 's|(^#define ETCPATH) .*|$1 "%{_sysconfdir}/ircd"|g;
                   s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g;
+		   s|(^#define AUTOMODPATH IRCD_PREFIX) .*|#define AUTOMODPATH "%{_libdir}/ircd/modules/autoload/"|g;
                   s|(^#define MODPATH) .*|$1 "%{_libdir}/ircd/modules/"|g' \
-    include/defaults.h
+   include/defaults.h
 #Added for x86_64 arch support
 sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
@@ -50,7 +49,7 @@
 %build
 %configure \
     --sysconfdir=%{_sysconfdir}/ircd \
-    --with-nicklen=%{nicklen} \
+   --with-nicklen=%{nicklen} \
     --with-topiclen=%{topiclen} \
     --with-maxconn=%{maxconn}
 %{__make} %{?_smp_mflags}
@@ -70,7 +69,7 @@
 
 # Move binaries with generic and potentially conflicting names ouf of the way
 %{__mkdir_p} %{buildroot}%{_libexecdir}/ircd/
-%{__mv} %{buildroot}%{_bindir}/{conv*,encspeed,mkpasswd,vi*} \
+%{__mv} %{buildroot}%{_bindir}/{encspeed,mkpasswd} \
         %{buildroot}%{_libexecdir}/ircd/
 
 # Move empty directory which we changed previously (src/Makefile.in would need
@@ -113,7 +112,7 @@
 %files
 %defattr(-, root, root, -)
 %doc BUGS ChangeLog Hybrid-team LICENSE README.FIRST RELNOTES TODO
-%doc doc/{*.txt,server-version-info,Tao-of-IRC.940110,technical/}
+%doc doc/{*.txt,server-version-info,technical/}
 %doc etc/*.conf*
 %attr(770,ircd,ircd) %dir %{_sysconfdir}/ircd/
 %attr(640,ircd,ircd) %config(noreplace) %{_sysconfdir}/ircd/*
@@ -126,10 +125,16 @@
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-%exclude %{_includedir}
+%exclude %{_prefix}/help
 
 
 %changelog
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-2
+- Modify spec file to take into account the 7.2.0 update
+
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-1
+- Update to 7.2.0
+
 * Fri Nov 18 2005 Eric Tanguy 7.1.3-11
 - modify changelog
 - modify abslolute path to relative one for doc/Tao-of-IRC.940110


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2005 18:50:08 -0000	1.2
+++ sources	9 Dec 2005 22:08:50 -0000	1.3
@@ -1 +1 @@
-4f3a69eed68b00bf72bfede35fffb70d  ircd-hybrid-7.1.3.tgz
+e3c716fef0c62eaba147df06f32ea87d  ircd-hybrid-7.2.0.tgz


--- ircd-hybrid-7.1.3-openssl.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:13:31 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri,  9 Dec 2005 17:13:31 -0500
Subject: fedora-security/audit fc4,1.101,1.102 fc5,1.13,1.14
Message-ID: <200512092214.jB9ME2eY005142@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5121

Modified Files:
	fc4 fc5 
Log Message:
* We are still vulnerable to an old gd issue.
* Add a new ethereal CVE id.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- fc4	8 Dec 2005 19:35:27 -0000	1.101
+++ fc4	9 Dec 2005 22:13:29 -0000	1.102
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2005-4077 VULNERABLE (curl)
+CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)
 CVE-2005-3193 VULNERABLE (tetex)
@@ -703,7 +704,7 @@
 CVE-2004-1004 version (mc, fixed 4.6.0)
 CVE-2004-1002 ignore (ppp) not a security issue
 CVE-2004-0996 backport (cscope, not fixed in 15.5)
-CVE-2004-0990 version (gd, fixed 2.0.29)
+CVE-2004-0990 VULNERABLE (gd)
 CVE-2004-0989 version (libxml2, fixed 2.6.15)
 CVE-2004-0986 version (iptables, fixed 1.2.12)
 CVE-2004-0983 version (ruby, fixed 1.8.2)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fc5	8 Dec 2005 19:35:28 -0000	1.13
+++ fc5	9 Dec 2005 22:13:29 -0000	1.14
@@ -13,6 +13,7 @@
 ** are items that need attention
 
 CVE-2005-4077 VULNERABLE (curl)
+CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)
 CVE-2005-3193 VULNERABLE (tetex)
@@ -743,7 +744,7 @@
 CVE-2004-1004 version (mc, fixed 4.6.0)
 CVE-2004-1002 ignore (ppp) not a security issue
 CVE-2004-0996 backport (cscope) not fixed in 15.5
-CVE-2004-0990 version (gd, fixed 2.0.29)
+CVE-2004-0990 VULNERABLE (gd)
 CVE-2004-0989 version (libxml2, fixed 2.6.15)
 CVE-2004-0986 version (iptables, fixed 1.2.12)
 CVE-2004-0983 version (ruby, fixed 1.8.2)



From fedora-extras-commits at redhat.com  Fri Dec  9 22:21:51 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:21:51 -0500
Subject: rpms/xfce4-windowlist-plugin - New directory
Message-ID: <200512092221.jB9MLpn1005254@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5245/xfce4-windowlist-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-windowlist-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:21:56 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:21:56 -0500
Subject: rpms/xfce4-windowlist-plugin/devel - New directory
Message-ID: <200512092221.jB9MLuwJ005270@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5245/xfce4-windowlist-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-windowlist-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:22:17 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:22:17 -0500
Subject: rpms/xfce4-windowlist-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512092222.jB9MMHnE005305@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5292

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-windowlist-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-windowlist-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:22:25 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:22:25 -0500
Subject: rpms/xfce4-windowlist-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512092222.jB9MMPV1005327@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5292/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-windowlist-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:23:31 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:23:31 -0500
Subject: rpms/xfce4-windowlist-plugin import.log,1.1,1.2
Message-ID: <200512092224.jB9MO2en005408@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5371

Modified Files:
	import.log 
Log Message:
auto-import xfce4-windowlist-plugin-0.1.0-4.fc4 on branch devel from xfce4-windowlist-plugin-0.1.0-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-windowlist-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Dec 2005 22:22:15 -0000	1.1
+++ import.log	9 Dec 2005 22:23:29 -0000	1.2
@@ -0,0 +1 @@
+xfce4-windowlist-plugin-0_1_0-4_fc4:HEAD:xfce4-windowlist-plugin-0.1.0-4.fc4.src.rpm:1134166999



From fedora-extras-commits at redhat.com  Fri Dec  9 22:23:37 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:23:37 -0500
Subject: rpms/xfce4-windowlist-plugin/devel xfce4-windowlist-plugin.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512092224.jB9MO7Av005412@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5371/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-windowlist-plugin.spec 
Log Message:
auto-import xfce4-windowlist-plugin-0.1.0-4.fc4 on branch devel from xfce4-windowlist-plugin-0.1.0-4.fc4.src.rpm


--- NEW FILE xfce4-windowlist-plugin.spec ---
Name:		xfce4-windowlist-plugin
Version:	0.1.0
Release:	4%{?dist}
Summary:	Windowlist plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
Windowlist plugin for the Xfce panel. The menubutton shows the icon of the 
active window and leftclick pops up a window list. Leftclick on one of the 
items activates the selected window, rightclick pops up a window action menu.

%prep
%setup -q -n %{name}

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.1.0-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.1.0-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.1.0-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.1.0-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.1.0-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-windowlist-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Dec 2005 22:22:23 -0000	1.1
+++ .cvsignore	9 Dec 2005 22:23:35 -0000	1.2
@@ -0,0 +1 @@
+xfce4-windowlist-plugin-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-windowlist-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Dec 2005 22:22:23 -0000	1.1
+++ sources	9 Dec 2005 22:23:35 -0000	1.2
@@ -0,0 +1 @@
+29b1a752003734c0b8171200dfafb733  xfce4-windowlist-plugin-0.1.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 22:31:42 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:31:42 -0500
Subject: rpms/xfce4-datetime-plugin - New directory
Message-ID: <200512092231.jB9MVgwK005551@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5542/xfce4-datetime-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-datetime-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:31:47 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:31:47 -0500
Subject: rpms/xfce4-datetime-plugin/devel - New directory
Message-ID: <200512092231.jB9MVlu1005567@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5542/xfce4-datetime-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-datetime-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:32:08 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:32:08 -0500
Subject: rpms/xfce4-datetime-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512092232.jB9MW8KZ005602@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5589

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-datetime-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-datetime-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:32:14 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:32:14 -0500
Subject: rpms/xfce4-datetime-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512092232.jB9MWEDe005623@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5589/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-datetime-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:33:22 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:33:22 -0500
Subject: rpms/xfce4-datetime-plugin import.log,1.1,1.2
Message-ID: <200512092233.jB9MXqsV005695@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5659

Modified Files:
	import.log 
Log Message:
auto-import xfce4-datetime-plugin-0.3.1-4.fc4 on branch devel from xfce4-datetime-plugin-0.3.1-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Dec 2005 22:32:06 -0000	1.1
+++ import.log	9 Dec 2005 22:33:19 -0000	1.2
@@ -0,0 +1 @@
+xfce4-datetime-plugin-0_3_1-4_fc4:HEAD:xfce4-datetime-plugin-0.3.1-4.fc4.src.rpm:1134167590



From fedora-extras-commits at redhat.com  Fri Dec  9 22:33:27 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:33:27 -0500
Subject: rpms/xfce4-datetime-plugin/devel xfce4-datetime-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512092233.jB9MXvWs005699@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5659/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-datetime-plugin.spec 
Log Message:
auto-import xfce4-datetime-plugin-0.3.1-4.fc4 on branch devel from xfce4-datetime-plugin-0.3.1-4.fc4.src.rpm


--- NEW FILE xfce4-datetime-plugin.spec ---
Name:		xfce4-datetime-plugin
Version:	0.3.1
Release:	4%{?dist}
Summary:	Date/time plugin 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.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxml2-devel, gettext

%description
An alternative clock plugin for the Xfce panel. A calendar appears when you 
left-click on it.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang xfce4-datetime

%clean
rm -rf $RPM_BUILD_ROOT

%files -f xfce4-datetime.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Fri Nov 25 2005 Christoph Wickert  - 0.3.1-4
- Rebuild with new source because of md5sum mismatch.

* Mon Nov 14 2005 Christoph Wickert  - 0.3.1-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.3.1-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.3.1-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.3.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Dec 2005 22:32:11 -0000	1.1
+++ .cvsignore	9 Dec 2005 22:33:25 -0000	1.2
@@ -0,0 +1 @@
+xfce4-datetime-plugin-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Dec 2005 22:32:11 -0000	1.1
+++ sources	9 Dec 2005 22:33:25 -0000	1.2
@@ -0,0 +1 @@
+92b7ebee7f0c8074f5cf590f77f676f2  xfce4-datetime-plugin-0.3.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 22:36:31 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:36:31 -0500
Subject: rpms/xfce4-genmon-plugin - New directory
Message-ID: <200512092236.jB9MaVCJ005787@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5778/xfce4-genmon-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-genmon-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:36:36 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:36:36 -0500
Subject: rpms/xfce4-genmon-plugin/devel - New directory
Message-ID: <200512092236.jB9MaaEq005803@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5778/xfce4-genmon-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-genmon-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:36:57 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:36:57 -0500
Subject: rpms/xfce4-genmon-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512092236.jB9MavMJ005838@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5825

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-genmon-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-genmon-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:37:03 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:37:03 -0500
Subject: rpms/xfce4-genmon-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512092237.jB9Mb3JP005859@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5825/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-genmon-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:38:00 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:38:00 -0500
Subject: rpms/xfce4-genmon-plugin import.log,1.1,1.2
Message-ID: <200512092238.jB9McUox005934@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5898

Modified Files:
	import.log 
Log Message:
auto-import xfce4-genmon-plugin-1.1-4.fc4 on branch devel from xfce4-genmon-plugin-1.1-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Dec 2005 22:36:55 -0000	1.1
+++ import.log	9 Dec 2005 22:37:58 -0000	1.2
@@ -0,0 +1 @@
+xfce4-genmon-plugin-1_1-4_fc4:HEAD:xfce4-genmon-plugin-1.1-4.fc4.src.rpm:1134167869



From fedora-extras-commits at redhat.com  Fri Dec  9 22:38:06 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:38:06 -0500
Subject: rpms/xfce4-genmon-plugin/devel xfce4-genmon-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512092238.jB9McaQp005940@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5898/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-genmon-plugin.spec 
Log Message:
auto-import xfce4-genmon-plugin-1.1-4.fc4 on branch devel from xfce4-genmon-plugin-1.1-4.fc4.src.rpm


--- NEW FILE xfce4-genmon-plugin.spec ---
Name:		xfce4-genmon-plugin
Version:	1.1
Release:	4%{?dist}
Summary:	Generic monitor plugin for the Xfce panel

Group:		User Interface/Desktops
License:	LGPL
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
The GenMon plugin cyclically spawns the indicated script/program,
captures its output and displays it as a string into the panel.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 1.1-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 1.1-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 1.1-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 1.1-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 1.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Dec 2005 22:37:01 -0000	1.1
+++ .cvsignore	9 Dec 2005 22:38:04 -0000	1.2
@@ -0,0 +1 @@
+xfce4-genmon-plugin-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Dec 2005 22:37:01 -0000	1.1
+++ sources	9 Dec 2005 22:38:04 -0000	1.2
@@ -0,0 +1 @@
+130be5e17d4ae41f86bbb952adb6a95d  xfce4-genmon-plugin-1.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 22:40:38 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:40:38 -0500
Subject: rpms/xfce4-weather-plugin - New directory
Message-ID: <200512092240.jB9Mecr0006025@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6016/xfce4-weather-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-weather-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:40:43 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:40:43 -0500
Subject: rpms/xfce4-weather-plugin/devel - New directory
Message-ID: <200512092240.jB9MehZP006041@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6016/xfce4-weather-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-weather-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:41:03 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:41:03 -0500
Subject: rpms/xfce4-weather-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512092241.jB9Mf3NU006076@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-weather-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-weather-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:41:09 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:41:09 -0500
Subject: rpms/xfce4-weather-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512092241.jB9Mf9s5006097@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-weather-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:42:40 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:42:40 -0500
Subject: rpms/xfce4-weather-plugin import.log,1.1,1.2
Message-ID: <200512092243.jB9MhANq006180@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6138

Modified Files:
	import.log 
Log Message:
auto-import xfce4-weather-plugin-0.4.9-4.fc4 on branch devel from xfce4-weather-plugin-0.4.9-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Dec 2005 22:41:01 -0000	1.1
+++ import.log	9 Dec 2005 22:42:38 -0000	1.2
@@ -0,0 +1 @@
+xfce4-weather-plugin-0_4_9-4_fc4:HEAD:xfce4-weather-plugin-0.4.9-4.fc4.src.rpm:1134168149



From fedora-extras-commits at redhat.com  Fri Dec  9 22:42:45 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:42:45 -0500
Subject: rpms/xfce4-weather-plugin/devel xfce4-weather-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512092243.jB9MhGwo006184@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6138/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-weather-plugin.spec 
Log Message:
auto-import xfce4-weather-plugin-0.4.9-4.fc4 on branch devel from xfce4-weather-plugin-0.4.9-4.fc4.src.rpm


--- NEW FILE xfce4-weather-plugin.spec ---
Name:		xfce4-weather-plugin
Version:	0.4.9
Release:	4%{?dist}
Summary:	Weather plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
A weather plugin for the Xfce panel. It shows the current temperature and 
weather condition, using weather data provided by xoap.weather.com.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang xfce4-weather

%clean
rm -rf $RPM_BUILD_ROOT

%files -f xfce4-weather.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so
%{_datadir}/xfce4/*

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.4.9-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.4.9-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.4.9-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.4.9-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.4.9-1.fc3.cw
- Updated to version 0.4.9.

* Wed Apr 13 2005 Christoph Wickert  - 0.3.9.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Dec 2005 22:41:06 -0000	1.1
+++ .cvsignore	9 Dec 2005 22:42:43 -0000	1.2
@@ -0,0 +1 @@
+xfce4-weather-plugin-0.4.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Dec 2005 22:41:06 -0000	1.1
+++ sources	9 Dec 2005 22:42:43 -0000	1.2
@@ -0,0 +1 @@
+1d5ba253c8eae5a9ad5e3d7002a0dae0  xfce4-weather-plugin-0.4.9.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 22:45:54 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:45:54 -0500
Subject: rpms/xfce4-xmms-plugin - New directory
Message-ID: <200512092245.jB9MjsPX006285@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6276/xfce4-xmms-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-xmms-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:46:01 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:46:01 -0500
Subject: rpms/xfce4-xmms-plugin/devel - New directory
Message-ID: <200512092246.jB9Mk17n006303@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6276/xfce4-xmms-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-xmms-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:46:28 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:46:28 -0500
Subject: rpms/xfce4-xmms-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512092246.jB9MkSkP006338@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6325

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-xmms-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-xmms-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:46:33 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:46:33 -0500
Subject: rpms/xfce4-xmms-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512092246.jB9MkXcd006359@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6325/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-xmms-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:47:57 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:47:57 -0500
Subject: rpms/xfce4-xmms-plugin import.log,1.1,1.2
Message-ID: <200512092248.jB9MmS9F006452@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6407

Modified Files:
	import.log 
Log Message:
auto-import xfce4-xmms-plugin-0.3.1-4.fc4 on branch devel from xfce4-xmms-plugin-0.3.1-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Dec 2005 22:46:25 -0000	1.1
+++ import.log	9 Dec 2005 22:47:55 -0000	1.2
@@ -0,0 +1 @@
+xfce4-xmms-plugin-0_3_1-4_fc4:HEAD:xfce4-xmms-plugin-0.3.1-4.fc4.src.rpm:1134168466



From fedora-extras-commits at redhat.com  Fri Dec  9 22:48:03 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:48:03 -0500
Subject: rpms/xfce4-xmms-plugin/devel xfce4-xmms-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512092248.jB9MmXUB006456@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6407/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-xmms-plugin.spec 
Log Message:
auto-import xfce4-xmms-plugin-0.3.1-4.fc4 on branch devel from xfce4-xmms-plugin-0.3.1-4.fc4.src.rpm


--- NEW FILE xfce4-xmms-plugin.spec ---
Name:		xfce4-xmms-plugin
Version:	0.3.1
Release:	4%{?dist}
Summary:	XMMS plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildRequires:	gettext, xmms-devel >= 1.2
Requires:	xmms >= 1.2


%description
Control XMMS from the Xfce panel.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so
%{_datadir}/xfce4/*

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.3.1-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.3.1-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.3.1-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.3.1-1.fc4.cw
- Updated to version 0.3.1.
- Rebuild for Core 4.

* Thu Apr 14 2005 Christoph Wickert  - 0.1.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Dec 2005 22:46:31 -0000	1.1
+++ .cvsignore	9 Dec 2005 22:48:01 -0000	1.2
@@ -0,0 +1 @@
+xfce4-xmms-plugin-0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Dec 2005 22:46:31 -0000	1.1
+++ sources	9 Dec 2005 22:48:01 -0000	1.2
@@ -0,0 +1 @@
+0dac8795b192383c13b1d5cd072b754a  xfce4-xmms-plugin-0.3.1.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec  9 22:51:19 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:51:19 -0500
Subject: rpms/xfce4-cpugraph-plugin - New directory
Message-ID: <200512092251.jB9MpJav006553@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6543/xfce4-cpugraph-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-cpugraph-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:51:24 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:51:24 -0500
Subject: rpms/xfce4-cpugraph-plugin/devel - New directory
Message-ID: <200512092251.jB9MpOHL006569@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6543/xfce4-cpugraph-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-cpugraph-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec  9 22:51:45 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:51:45 -0500
Subject: rpms/xfce4-cpugraph-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512092251.jB9Mpjbs006607@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6594

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-cpugraph-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-cpugraph-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:51:50 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:51:50 -0500
Subject: rpms/xfce4-cpugraph-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512092251.jB9Mpo8g006628@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6594/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-cpugraph-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec  9 22:52:45 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:52:45 -0500
Subject: rpms/xfce4-cpugraph-plugin import.log,1.1,1.2
Message-ID: <200512092253.jB9MrFLO006716@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6675

Modified Files:
	import.log 
Log Message:
auto-import xfce4-cpugraph-plugin-0.2.2-4.fc4 on branch devel from xfce4-cpugraph-plugin-0.2.2-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Dec 2005 22:51:43 -0000	1.1
+++ import.log	9 Dec 2005 22:52:42 -0000	1.2
@@ -0,0 +1 @@
+xfce4-cpugraph-plugin-0_2_2-4_fc4:HEAD:xfce4-cpugraph-plugin-0.2.2-4.fc4.src.rpm:1134168753



From fedora-extras-commits at redhat.com  Fri Dec  9 22:52:50 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 17:52:50 -0500
Subject: rpms/xfce4-cpugraph-plugin/devel xfce4-cpugraph-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512092253.jB9MrKjE006722@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6675/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-cpugraph-plugin.spec 
Log Message:
auto-import xfce4-cpugraph-plugin-0.2.2-4.fc4 on branch devel from xfce4-cpugraph-plugin-0.2.2-4.fc4.src.rpm


--- NEW FILE xfce4-cpugraph-plugin.spec ---
Name:		xfce4-cpugraph-plugin
Version:	0.2.2
Release:	4%{?dist}
Summary:	CPU monitor for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel  >= 4.2, libxml2-devel

%description
A CPU monitor plugin for the Xfce panel. It offers multiple display modes 
(LED, gradient, fire, etc...) to show the current CPU load of the system. The 
colors and the size of the plugin are customizable.

%prep
%setup -q -n %{name}

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README TODO
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Mon Nov 28 2005 Christoph Wickert  - 0.2.2-4
- Rebuild with new source because of md5sum mismatch.
- Add libxfcegui4-devel BuildReqs.

* Mon Nov 14 2005 Christoph Wickert  - 0.2.2-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.2.2-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.2.2-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.2.2-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Dec 2005 22:51:48 -0000	1.1
+++ .cvsignore	9 Dec 2005 22:52:48 -0000	1.2
@@ -0,0 +1 @@
+xfce4-cpugraph-plugin-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Dec 2005 22:51:48 -0000	1.1
+++ sources	9 Dec 2005 22:52:48 -0000	1.2
@@ -0,0 +1 @@
+bde4c578ef469aade3f6b58a9bde8ec6  xfce4-cpugraph-plugin-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec  9 23:00:53 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 18:00:53 -0500
Subject: rpms/xfce4-datetime-plugin/devel xfce4-datetime-plugin.spec, 1.1,
	1.2
Message-ID: <200512092301.jB9N1M9j008389@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6830/devel

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
add missing libxfce4gui-devel BuildReq


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/xfce4-datetime-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-datetime-plugin.spec	9 Dec 2005 22:33:25 -0000	1.1
+++ xfce4-datetime-plugin.spec	9 Dec 2005 23:00:51 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-datetime-plugin
 Version:	0.3.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Date/time plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -9,7 +9,8 @@
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.2, libxml2-devel, gettext
+BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel  >= 4.2
+BuildRequires:	libxml2-devel, gettext
 
 %description
 An alternative clock plugin for the Xfce panel. A calendar appears when you 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Nov 29 2005 Christoph Wickert  - 0.3.1-5
+- Add libxfcegui4-devel BuildReqs.
+
 * Fri Nov 25 2005 Christoph Wickert  - 0.3.1-4
 - Rebuild with new source because of md5sum mismatch.
 



From fedora-extras-commits at redhat.com  Fri Dec  9 23:30:23 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri,  9 Dec 2005 18:30:23 -0500
Subject: owners owners.list,1.438,1.439
Message-ID: <200512092330.jB9NUrAB008629@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8603

Modified Files:
	owners.list 
Log Message:
add xfce4-cpugraph-plugin xfce4-datetime-plugin xfce4-genmon-plugin xce4-weather-plugin xfce4-windowlist-plugin xfce4-xmms-plugin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- owners.list	9 Dec 2005 10:14:04 -0000	1.438
+++ owners.list	9 Dec 2005 23:30:21 -0000	1.439
@@ -1218,6 +1218,9 @@
 Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-appfinder|Appfinder for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1226,6 +1229,9 @@
 Fedora Extras|xfce4-systray|Systray for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-toys|Small Xfce4 applications|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-trigger-launcher|Trigger launcher for Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-weather-plugin|Weather plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-windowlist-plugin|Windowlist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-xmms-plugin|Control XMMS from the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-plugins|Plugins for multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-utils|Utilities for the Xfce Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 10 11:59:20 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 10 Dec 2005 06:59:20 -0500
Subject: rpms/fedora-usermgmt/FC-3 fedora-usermgmt-wrapper, 1.1,
	1.2 fedora-usermgmt.spec, 1.5, 1.6
Message-ID: <200512101159.jBABxpE2030048@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/fedora-usermgmt/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29993/FC-3

Modified Files:
	fedora-usermgmt-wrapper fedora-usermgmt.spec 
Log Message:
- fixed URL metadata (bz #172758)
- execute 'nscd -i ...' before and after creating users/groups; this
  should workaround nscd caching problems
- minor cleanups and logging enhancements in the wrapper script
- removed epoch



Index: fedora-usermgmt-wrapper
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/FC-3/fedora-usermgmt-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-usermgmt-wrapper	8 Nov 2004 04:16:50 -0000	1.1
+++ fedora-usermgmt-wrapper	10 Dec 2005 11:59:18 -0000	1.2
@@ -18,9 +18,27 @@
 #  
 
 PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
-
 BASE_DIR=/etc/fedora/usermgmt
 
+function invalidateCache {
+    local rc=0
+    {
+	# Enforce some nscd activity
+	id root
+	id nscd
+
+	# Clear the caches
+	/usr/sbin/nscd -i group  || rc=1
+	/usr/sbin/nscd -i passwd || rc=1
+
+	# Enforce some nscd activity
+	id root
+	id nscd
+    } &>/dev/null
+
+    return $rc
+}
+
 test -r "$BASE_DIR/baseuid" && BASE_UID=`cat "$BASE_DIR/baseuid"` || BASE_UID=300
 test -r "$BASE_DIR/basegid" && BASE_GID=`cat "$BASE_DIR/basegid"` || BASE_GID=$BASE_UID
 
@@ -32,8 +50,8 @@
     test -x "$i" && { exec_name=$i; break; }
 done
 
-case "$skin" in
-    useradd)
+case $skin in
+    (useradd)
 	test "$1" != "--help" || {
 	    printf $"Usage: %s  +\n" "$(basename $0)"
 	    exit 0
@@ -48,7 +66,7 @@
 	shift
 	set -- "$v" "$@"
 	;;
-    groupadd)
+    (groupadd)
 	test "$1" != "--help" || {
 	    printf $"Usage: %s  +\n" "$(basename $0)"
 	    exit 0
@@ -63,19 +81,27 @@
 	shift
 	set -- "$v" "$@"
 	;;
-    *)  test "$exec_name" || exec_name=$skin;;
+    (*)  test "$exec_name" || exec_name=$skin;;
 esac
 
 log="$BASE_DIR/log"
 if test -e "$log"  -a -L "$log"; then
-    echo "`date`: '$exec_name' $*" >>"$BASE_DIR/log"
+    echo "`date` [$$]: '$exec_name' $*" >>"$BASE_DIR/log"
     exec 1>>"$BASE_DIR/log"
     exec 2>>"$BASE_DIR/log"
 fi
 
-test "$exec_name" || {
+test -n "$exec_name" || {
     echo $"Wrapper could not be found; aborting" >&2
     exit 1
 }
 
-exec "$exec_name" "$@"
+invalidateCache
+"$exec_name" "$@"
+rc=$?
+invalidateCache && sleep 1
+invalidateCache
+
+test $rc -eq 0 || echo "`date` [$$]: failed with '$rc'" >&2
+
+exit $rc


Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/FC-3/fedora-usermgmt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-usermgmt.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ fedora-usermgmt.spec	10 Dec 2005 11:59:18 -0000	1.6
@@ -6,13 +6,13 @@
 
 Summary:	Fedora tools for user management
 Name:		fedora-usermgmt
-Version:	0.7
-Release:	2
-Epoch:		0
+Version:	0.8
+Release:	1
+
 License:	GPL
 BuildArch:	noarch
 Group:		Applications/System
-URL:		http://www.fedora.us/wiki/PackageUserCreation
+URL:		http://fedoraproject.org/wiki/PackageUserCreation
 Source0:	fedora-usermgmt-wrapper
 Source1:	fedora-usermgmt-README
 Requires(pre):	instance(fedora-usermgmt)
@@ -40,7 +40,7 @@
 Source20:	fedora-usermgmt-groupadd.legacy
 Source21:	fedora-usermgmt-useradd.legacy
 Provides:	instance(fedora-usermgmt)
-Requires:	%name = %epoch:%version-%release
+Requires:	%name = %version-%release
 Requires(pre):		%confdir
 Requires(postun):	%confdir
 Requires(post):		%alternatives
@@ -145,6 +145,13 @@
 
 
 %changelog
+* Sat Dec 10 2005 Enrico Scholz  - 0.8-1
+- fixed URL metadata (bz #172758)
+- execute 'nscd -i ...' before and after creating users/groups; this
+  should workaround nscd caching problems
+- minor cleanups and logging enhancements in the wrapper script
+- removed epoch
+
 * Sat Mar 20 2004 Enrico Scholz  - 0:0.7-0.fdr.2
 - applied patch from https://bugzilla.fedora.us/show_bug.cgi?id=701#c10
   I should not defer such things but apply them immediatly...



From fedora-extras-commits at redhat.com  Sat Dec 10 11:59:26 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 10 Dec 2005 06:59:26 -0500
Subject: rpms/fedora-usermgmt/FC-4 fedora-usermgmt-wrapper, 1.1,
	1.2 fedora-usermgmt.spec, 1.7, 1.8
Message-ID: <200512101159.jBABxvT2030052@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/fedora-usermgmt/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29993/FC-4

Modified Files:
	fedora-usermgmt-wrapper fedora-usermgmt.spec 
Log Message:
- fixed URL metadata (bz #172758)
- execute 'nscd -i ...' before and after creating users/groups; this
  should workaround nscd caching problems
- minor cleanups and logging enhancements in the wrapper script
- removed epoch



Index: fedora-usermgmt-wrapper
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/FC-4/fedora-usermgmt-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-usermgmt-wrapper	8 Nov 2004 04:16:50 -0000	1.1
+++ fedora-usermgmt-wrapper	10 Dec 2005 11:59:24 -0000	1.2
@@ -18,9 +18,27 @@
 #  
 
 PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
-
 BASE_DIR=/etc/fedora/usermgmt
 
+function invalidateCache {
+    local rc=0
+    {
+	# Enforce some nscd activity
+	id root
+	id nscd
+
+	# Clear the caches
+	/usr/sbin/nscd -i group  || rc=1
+	/usr/sbin/nscd -i passwd || rc=1
+
+	# Enforce some nscd activity
+	id root
+	id nscd
+    } &>/dev/null
+
+    return $rc
+}
+
 test -r "$BASE_DIR/baseuid" && BASE_UID=`cat "$BASE_DIR/baseuid"` || BASE_UID=300
 test -r "$BASE_DIR/basegid" && BASE_GID=`cat "$BASE_DIR/basegid"` || BASE_GID=$BASE_UID
 
@@ -32,8 +50,8 @@
     test -x "$i" && { exec_name=$i; break; }
 done
 
-case "$skin" in
-    useradd)
+case $skin in
+    (useradd)
 	test "$1" != "--help" || {
 	    printf $"Usage: %s  +\n" "$(basename $0)"
 	    exit 0
@@ -48,7 +66,7 @@
 	shift
 	set -- "$v" "$@"
 	;;
-    groupadd)
+    (groupadd)
 	test "$1" != "--help" || {
 	    printf $"Usage: %s  +\n" "$(basename $0)"
 	    exit 0
@@ -63,19 +81,27 @@
 	shift
 	set -- "$v" "$@"
 	;;
-    *)  test "$exec_name" || exec_name=$skin;;
+    (*)  test "$exec_name" || exec_name=$skin;;
 esac
 
 log="$BASE_DIR/log"
 if test -e "$log"  -a -L "$log"; then
-    echo "`date`: '$exec_name' $*" >>"$BASE_DIR/log"
+    echo "`date` [$$]: '$exec_name' $*" >>"$BASE_DIR/log"
     exec 1>>"$BASE_DIR/log"
     exec 2>>"$BASE_DIR/log"
 fi
 
-test "$exec_name" || {
+test -n "$exec_name" || {
     echo $"Wrapper could not be found; aborting" >&2
     exit 1
 }
 
-exec "$exec_name" "$@"
+invalidateCache
+"$exec_name" "$@"
+rc=$?
+invalidateCache && sleep 1
+invalidateCache
+
+test $rc -eq 0 || echo "`date` [$$]: failed with '$rc'" >&2
+
+exit $rc


Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/FC-4/fedora-usermgmt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-usermgmt.spec	6 Apr 2005 22:11:37 -0000	1.7
+++ fedora-usermgmt.spec	10 Dec 2005 11:59:24 -0000	1.8
@@ -6,13 +6,13 @@
 
 Summary:	Fedora tools for user management
 Name:		fedora-usermgmt
-Version:	0.7
-Release:	3
+Version:	0.8
+Release:	1
 
 License:	GPL
 BuildArch:	noarch
 Group:		Applications/System
-URL:		http://www.fedora.us/wiki/PackageUserCreation
+URL:		http://fedoraproject.org/wiki/PackageUserCreation
 Source0:	fedora-usermgmt-wrapper
 Source1:	fedora-usermgmt-README
 Requires(pre):	instance(fedora-usermgmt)
@@ -113,8 +113,8 @@
 
 
 %preun shadow-utils
-test "$1" != "0" || %alternatives --remove %name %confdir/scripts.shadow-utils
-test "$1" != "0" || %alternatives --remove %name %confdir/scripts.legacy
+test "$1" != 0 || %alternatives --remove %name %confdir/scripts.shadow-utils
+test "$1" != 0 || %alternatives --remove %name %confdir/scripts.legacy
 
 
 %clean
@@ -145,6 +145,12 @@
 
 
 %changelog
+* Sat Dec 10 2005 Enrico Scholz  - 0.8-1
+- fixed URL metadata (bz #172758)
+- execute 'nscd -i ...' before and after creating users/groups; this
+  should workaround nscd caching problems
+- minor cleanups and logging enhancements in the wrapper script
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sat Dec 10 11:59:32 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 10 Dec 2005 06:59:32 -0500
Subject: rpms/fedora-usermgmt/devel fedora-usermgmt-wrapper, 1.1,
	1.2 fedora-usermgmt.spec, 1.7, 1.8
Message-ID: <200512101200.jBAC02dJ030061@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/fedora-usermgmt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29993/devel

Modified Files:
	fedora-usermgmt-wrapper fedora-usermgmt.spec 
Log Message:
- fixed URL metadata (bz #172758)
- execute 'nscd -i ...' before and after creating users/groups; this
  should workaround nscd caching problems
- minor cleanups and logging enhancements in the wrapper script
- removed epoch



Index: fedora-usermgmt-wrapper
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/fedora-usermgmt-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-usermgmt-wrapper	8 Nov 2004 04:16:50 -0000	1.1
+++ fedora-usermgmt-wrapper	10 Dec 2005 11:59:30 -0000	1.2
@@ -18,9 +18,27 @@
 #  
 
 PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
-
 BASE_DIR=/etc/fedora/usermgmt
 
+function invalidateCache {
+    local rc=0
+    {
+	# Enforce some nscd activity
+	id root
+	id nscd
+
+	# Clear the caches
+	/usr/sbin/nscd -i group  || rc=1
+	/usr/sbin/nscd -i passwd || rc=1
+
+	# Enforce some nscd activity
+	id root
+	id nscd
+    } &>/dev/null
+
+    return $rc
+}
+
 test -r "$BASE_DIR/baseuid" && BASE_UID=`cat "$BASE_DIR/baseuid"` || BASE_UID=300
 test -r "$BASE_DIR/basegid" && BASE_GID=`cat "$BASE_DIR/basegid"` || BASE_GID=$BASE_UID
 
@@ -32,8 +50,8 @@
     test -x "$i" && { exec_name=$i; break; }
 done
 
-case "$skin" in
-    useradd)
+case $skin in
+    (useradd)
 	test "$1" != "--help" || {
 	    printf $"Usage: %s  +\n" "$(basename $0)"
 	    exit 0
@@ -48,7 +66,7 @@
 	shift
 	set -- "$v" "$@"
 	;;
-    groupadd)
+    (groupadd)
 	test "$1" != "--help" || {
 	    printf $"Usage: %s  +\n" "$(basename $0)"
 	    exit 0
@@ -63,19 +81,27 @@
 	shift
 	set -- "$v" "$@"
 	;;
-    *)  test "$exec_name" || exec_name=$skin;;
+    (*)  test "$exec_name" || exec_name=$skin;;
 esac
 
 log="$BASE_DIR/log"
 if test -e "$log"  -a -L "$log"; then
-    echo "`date`: '$exec_name' $*" >>"$BASE_DIR/log"
+    echo "`date` [$$]: '$exec_name' $*" >>"$BASE_DIR/log"
     exec 1>>"$BASE_DIR/log"
     exec 2>>"$BASE_DIR/log"
 fi
 
-test "$exec_name" || {
+test -n "$exec_name" || {
     echo $"Wrapper could not be found; aborting" >&2
     exit 1
 }
 
-exec "$exec_name" "$@"
+invalidateCache
+"$exec_name" "$@"
+rc=$?
+invalidateCache && sleep 1
+invalidateCache
+
+test $rc -eq 0 || echo "`date` [$$]: failed with '$rc'" >&2
+
+exit $rc


Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/fedora-usermgmt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-usermgmt.spec	6 Apr 2005 22:11:37 -0000	1.7
+++ fedora-usermgmt.spec	10 Dec 2005 11:59:30 -0000	1.8
@@ -6,13 +6,13 @@
 
 Summary:	Fedora tools for user management
 Name:		fedora-usermgmt
-Version:	0.7
-Release:	3
+Version:	0.8
+Release:	1
 
 License:	GPL
 BuildArch:	noarch
 Group:		Applications/System
-URL:		http://www.fedora.us/wiki/PackageUserCreation
+URL:		http://fedoraproject.org/wiki/PackageUserCreation
 Source0:	fedora-usermgmt-wrapper
 Source1:	fedora-usermgmt-README
 Requires(pre):	instance(fedora-usermgmt)
@@ -113,8 +113,8 @@
 
 
 %preun shadow-utils
-test "$1" != "0" || %alternatives --remove %name %confdir/scripts.shadow-utils
-test "$1" != "0" || %alternatives --remove %name %confdir/scripts.legacy
+test "$1" != 0 || %alternatives --remove %name %confdir/scripts.shadow-utils
+test "$1" != 0 || %alternatives --remove %name %confdir/scripts.legacy
 
 
 %clean
@@ -145,6 +145,12 @@
 
 
 %changelog
+* Sat Dec 10 2005 Enrico Scholz  - 0.8-1
+- fixed URL metadata (bz #172758)
+- execute 'nscd -i ...' before and after creating users/groups; this
+  should workaround nscd caching problems
+- minor cleanups and logging enhancements in the wrapper script
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sat Dec 10 13:10:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 10 Dec 2005 08:10:32 -0500
Subject: rpms/abcde/devel abcde-2.3.99-conf.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 abcde.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200512101311.jBADB2un001136@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/abcde/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1080

Modified Files:
	.cvsignore abcde.spec sources 
Added Files:
	abcde-2.3.99-conf.patch 
Log Message:
* Sat Dec 10 2005 Ville Skytt??  - 2.3.99-1
- 2.3.99, minor config file fixes.


abcde-2.3.99-conf.patch:

--- NEW FILE abcde-2.3.99-conf.patch ---
--- abcde.conf~	2005-12-10 13:38:05.000000000 +0200
+++ abcde.conf	2005-12-10 13:44:45.000000000 +0200
@@ -40,12 +40,12 @@
 # so they can be reused when ripping CDs.
 #CDDBUSELOCAL="n"
 
-# List, separated with a coma, the fields we want the parsing function to
+# List, separated with a comma, the fields we want the parsing function to
 # output. Defaults to YEAR and GENRE, for a complete list of fields provided by
 # CDDB.
 # The fields are not case sensitive. Actually, "y,g" will work as fine as "Y,G"
 # or "YEAR, GENRE"
-#SHOWPARSEDFIELDS=year,genre
+#SHOWCDDBFIELDS=year,genre
 
 # Specify the style of encoder to use here - 
 # oggenc, vorbize - for OGGENCODERSYNTAX
@@ -271,7 +271,7 @@
 # * Translate spaces and forward slashes to underscores
 # * Translate stars into pluses.
 # To change that, redefine the mungefilename function.
-# mungefilename recieves the CDDB data (artist, track, title, whatever)
+# mungefilename receives the CDDB data (artist, track, title, whatever)
 # as $1 and outputs it on stdout.
 #mungefilename ()
 #{
@@ -280,7 +280,7 @@
 
 # Custom genre munging:
 # By default we just transform uppercase to lowercase. Not much of a fancy
-# function, with not much use, but one can disable it ot just turn the first
+# function, with not much use, but one can disable it or just turn the first
 # Uppercase.
 #mungegenre ()
 #{
@@ -290,7 +290,7 @@
 
 # Custom pre-read function
 # By default it does nothing.
-# You can set some things to get abcde funtion in better ways:
+# You can set some things to get abcde function in better ways:
 # * Close the CD tray using eject -t (if available in eject and supported by 
 #   your CD device.
 # * Set the CD speed. You can also use the built-in options, but you can also 
@@ -305,7 +305,7 @@
 
 # Custom post-read function
 # By default it does nothing.
-# You can set some things to get abcde funtion in better ways:
+# You can set some things to get abcde function in better ways:
 # * Store a copy of the CD TOC.
 # KEEP IN MIND that executables included in post_read must be in your $PATH or
 # you have to define them with full /path/to/binary
@@ -325,5 +325,5 @@
 #REMOTEHOSTS=foo,bar,baz,quux,qiix
 
 # Set to obtain some information about actions happening in the background
-# Usefull if you have a slow network or CDDB servers seem irresponsive.
+# Useful if you have a slow network or CDDB servers seem irresponsive.
 #EXTRAVERBOSE=n


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Sep 2005 15:28:45 -0000	1.6
+++ .cvsignore	10 Dec 2005 13:10:30 -0000	1.7
@@ -1 +1 @@
-abcde_2.3.4.orig.tar.gz
+abcde_2.3.99.orig.tar.gz


Index: abcde.spec
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/abcde.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- abcde.spec	6 Sep 2005 15:28:45 -0000	1.7
+++ abcde.spec	10 Dec 2005 13:10:30 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.3.4
+Version:        2.3.99
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
@@ -7,7 +7,8 @@
 License:        GPL or Artistic
 URL:            http://www.hispalinux.es/~data/abcde.php
 Source0:        http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
-Patch0:         abcde-2.1.19-inst.patch
+Patch0:         %{name}-2.1.19-inst.patch
+Patch1:         %{name}-2.3.99-conf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -27,8 +28,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1
 sed -i 's/normalize-audio/normalize/g' abcde*
-iconv -f iso-8859-1 -t utf-8 abcde.1 > abcde.1.utf8 ; mv abcde.1.utf8 abcde.1
 
 
 %install
@@ -44,7 +45,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc changelog COPYING README TODO FAQ examples/
+%doc COPYING FAQ README TODO USEPIPES changelog examples/
 %config(noreplace) %{_sysconfdir}/abcde.conf
 %{_bindir}/abcde
 %{_bindir}/cddb-tool
@@ -53,6 +54,9 @@
 
 
 %changelog
+* Sat Dec 10 2005 Ville Skytt??  - 2.3.99-1
+- 2.3.99, minor config file fixes.
+
 * Mon Sep  5 2005 Ville Skytt??  - 2.3.4-1
 - 2.3.4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Sep 2005 15:28:45 -0000	1.6
+++ sources	10 Dec 2005 13:10:30 -0000	1.7
@@ -1 +1 @@
-fc7e2364c8e25af34e5721ba9e2eda46  abcde_2.3.4.orig.tar.gz
+1310c7d2319dbee4baa27e8deeedc776  abcde_2.3.99.orig.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 10 15:52:55 2005
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sat, 10 Dec 2005 10:52:55 -0500
Subject: rpms/dkms/FC-3 .cvsignore, 1.3, 1.4 dkms.spec, 1.6, 1.7 sources, 1.4,
	1.5
Message-ID: <200512101553.jBAFrPJo006017@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5963

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
update to 2.0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2005 03:48:02 -0000	1.3
+++ .cvsignore	10 Dec 2005 15:52:53 -0000	1.4
@@ -1 +1 @@
-dkms-2.0.8.tar.gz
+dkms-2.0.9.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-3/dkms.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dkms.spec	8 Nov 2005 03:48:02 -0000	1.6
+++ dkms.spec	10 Dec 2005 15:52:53 -0000	1.7
@@ -1,6 +1,6 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.8
+Version: 2.0.9
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -8,6 +8,7 @@
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
 Requires: bash > 1.99
 Provides: dkms-minimal
+URL: http://linux.dell.com/dkms
 Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: kernel-devel
@@ -102,6 +103,17 @@
 
 
 %changelog
+* Sat Dec 10 2005 Matt Domsch  2.0.9-1
+- Added URL tag
+- Update to 2.0.9
+  - fix DF28947 (remove word 'only') from a printed message
+  - gzip -9 dkms.8 manpage
+  - look to DKMS_DIRECTIVE* environment variables to override dkms.conf settings
+  - don't create/remove (unused) /var/lock/subsys/dkms files in autoinstaller
+  - Multi driver suse driver disk support (thanks to Sreenivas.Bagalkote at engenio.com)
+  - Cleanup tempdir when ldtarball fails
+  - mkrpm now is built with -ba, not -bb (creates source RPM)
+
 * Mon Nov  7 2005 Matt Domsch  2.0.8-1
 - Update to 2.0.8 from Gary Lerhaupt
   - In dkms_autoinstaller added -no-clean-kernel to builds of multiple


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2005 03:48:02 -0000	1.4
+++ sources	10 Dec 2005 15:52:53 -0000	1.5
@@ -1 +1 @@
-06587f9312aca2a6070eb946abe6baa4  dkms-2.0.8.tar.gz
+a0f0cff22c84386cbe897e812a2eda29  dkms-2.0.9.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 10 15:53:52 2005
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sat, 10 Dec 2005 10:53:52 -0500
Subject: rpms/dkms/FC-4 .cvsignore, 1.3, 1.4 dkms.spec, 1.6, 1.7 sources, 1.4,
	1.5
Message-ID: <200512101553.jBAFrqd7006080@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6054

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
update to 2.0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2005 03:33:56 -0000	1.3
+++ .cvsignore	10 Dec 2005 15:53:50 -0000	1.4
@@ -1 +1 @@
-dkms-2.0.8.tar.gz
+dkms-2.0.9.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-4/dkms.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dkms.spec	8 Nov 2005 03:24:44 -0000	1.6
+++ dkms.spec	10 Dec 2005 15:53:50 -0000	1.7
@@ -1,6 +1,6 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.8
+Version: 2.0.9
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -8,6 +8,7 @@
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
 Requires: bash > 1.99
 Provides: dkms-minimal
+URL: http://linux.dell.com/dkms
 Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: kernel-devel
@@ -102,6 +103,17 @@
 
 
 %changelog
+* Sat Dec 10 2005 Matt Domsch  2.0.9-1
+- Added URL tag
+- Update to 2.0.9
+  - fix DF28947 (remove word 'only') from a printed message
+  - gzip -9 dkms.8 manpage
+  - look to DKMS_DIRECTIVE* environment variables to override dkms.conf settings
+  - don't create/remove (unused) /var/lock/subsys/dkms files in autoinstaller
+  - Multi driver suse driver disk support (thanks to Sreenivas.Bagalkote at engenio.com)
+  - Cleanup tempdir when ldtarball fails
+  - mkrpm now is built with -ba, not -bb (creates source RPM)
+
 * Mon Nov  7 2005 Matt Domsch  2.0.8-1
 - Update to 2.0.8 from Gary Lerhaupt
   - In dkms_autoinstaller added -no-clean-kernel to builds of multiple


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2005 03:33:56 -0000	1.4
+++ sources	10 Dec 2005 15:53:50 -0000	1.5
@@ -1 +1 @@
-06587f9312aca2a6070eb946abe6baa4  dkms-2.0.8.tar.gz
+a0f0cff22c84386cbe897e812a2eda29  dkms-2.0.9.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 10 15:54:12 2005
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sat, 10 Dec 2005 10:54:12 -0500
Subject: rpms/dkms/devel .cvsignore, 1.4, 1.5 dkms.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <200512101554.jBAFsh89006165@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/dkms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6108

Modified Files:
	.cvsignore dkms.spec sources 
Log Message:
update to 2.0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2005 03:03:47 -0000	1.4
+++ .cvsignore	10 Dec 2005 15:54:10 -0000	1.5
@@ -1 +1 @@
-dkms-2.0.8.tar.gz
+dkms-2.0.9.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dkms.spec	8 Nov 2005 03:19:39 -0000	1.7
+++ dkms.spec	10 Dec 2005 15:54:10 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.8
+Version: 2.0.9
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -8,6 +8,7 @@
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
 Requires: bash > 1.99
 Provides: dkms-minimal
+URL: http://linux.dell.com/dkms
 Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: kernel-devel
@@ -102,6 +103,17 @@
 
 
 %changelog
+* Sat Dec 10 2005 Matt Domsch  2.0.9-1
+- Added URL tag
+- Update to 2.0.9
+  - fix DF28947 (remove word 'only') from a printed message
+  - gzip -9 dkms.8 manpage
+  - look to DKMS_DIRECTIVE* environment variables to override dkms.conf settings
+  - don't create/remove (unused) /var/lock/subsys/dkms files in autoinstaller
+  - Multi driver suse driver disk support (thanks to Sreenivas.Bagalkote at engenio.com)
+  - Cleanup tempdir when ldtarball fails
+  - mkrpm now is built with -ba, not -bb (creates source RPM)
+
 * Mon Nov  7 2005 Matt Domsch  2.0.8-1
 - Update to 2.0.8 from Gary Lerhaupt
   - In dkms_autoinstaller added -no-clean-kernel to builds of multiple


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2005 03:03:47 -0000	1.4
+++ sources	10 Dec 2005 15:54:10 -0000	1.5
@@ -1 +1 @@
-06587f9312aca2a6070eb946abe6baa4  dkms-2.0.8.tar.gz
+a0f0cff22c84386cbe897e812a2eda29  dkms-2.0.9.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 10 20:37:23 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 10 Dec 2005 15:37:23 -0500
Subject: rpms/libapreq2/devel libapreq2.spec,1.5,1.6
Message-ID: <200512102037.jBAKbr3f015718@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/libapreq2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15700

Modified Files:
	libapreq2.spec 
Log Message:
* Sat Dec 10 2005 Ville Skytt??  - 2.07-0.2.rc3
- Filter unversioned perl(*) provides for which a versioned one exists.



Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libapreq2.spec	8 Dec 2005 20:32:12 -0000	1.5
+++ libapreq2.spec	10 Dec 2005 20:37:21 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.07
-Release:        0.1.rc3%{?dist}
+Release:        0.2.rc3%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -56,6 +56,18 @@
 
 %prep
 %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)
@@ -68,9 +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
 
 
@@ -139,6 +153,9 @@
 
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Sat Dec 10 21:06:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 10 Dec 2005 16:06:27 -0500
Subject: rpms/xemacs-sumo/devel xemacs-sumo-20051208-hypb-posix.patch, NONE,
	1.1 xemacs-sumo-20051208-pydoc-path.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xemacs-sumo.spec,
	1.12, 1.13
Message-ID: <200512102107.jBAL7WKd017508@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17481

Modified Files:
	.cvsignore sources xemacs-sumo.spec 
Added Files:
	xemacs-sumo-20051208-hypb-posix.patch 
	xemacs-sumo-20051208-pydoc-path.patch 
Log Message:
* Fri Dec  9 2005 Ville Skytt??  - 20051208-1
- 2005-12-08.
- Patch hyperbole to not require csh.
- Patch pydoc.el to find pydoc_lisp.py out of the box.
- Include bytecompiled python files.
- Set %lang for various docs and info files.
- Prune changelog entries from pre-xemacs-sumo times.


xemacs-sumo-20051208-hypb-posix.patch:

--- NEW FILE xemacs-sumo-20051208-hypb-posix.patch ---
--- xemacs-packages/lisp/hyperbole/smart-clib-sym	27 Jun 2003 05:11:53 -0000	1.1.1.1
+++ xemacs-packages/lisp/hyperbole/smart-clib-sym	8 Dec 2005 19:08:52 -0000
@@ -1,4 +1,4 @@
-#!/bin/csh -f
+#!/bin/sh
 #
 # SUMMARY:      Test whether symbol appears within a set of C libraries.
 # USAGE:         
@@ -26,37 +26,26 @@
 #
 # DESCRIP-END.
 
-# Perl script used to tell whether one file is newer than another.
-#
-set fn = "file-newer"
-
 # Create this file and place in the file the full path for each C, C++ or
 # Objective-C library that you want scanned for symbol names.  One filename
 # per line.  Do not quote the filenames.
 #
-set clib_list = "~/.CLIBS-LIST"
-
+clib_list="$HOME/.CLIBS-LIST"
 
 # This file will automatically be created to cache the symbol names.
 # Remove it if you ever want to rebuild the symbol table.
 #
-set clib_symbols = "~/.clibs-symbols"
-
-# Try to locate 'perl' and 'file-newer' script for use.
-
-which perl >& /dev/null
-if ($status) unset fn
+clib_symbols="$HOME/.clibs-symbols"
 
-set st = 0 rebuild = 0
-if (-e $clib_list) then
-   if (! -e $clib_symbols || -z $clib_symbols) set rebuild = 1
-   if (! $rebuild  && $?fn) @ rebuild = `perl $fn $clib_list $clib_symbols`
-   if ($rebuild) then
-      nm -g `cat $clib_list` | grep '^[0-9 ].* _[A-Za-z]' | sed -e 's/^[^_][^_]*_//g' | sort | uniq > $clib_symbols
-   endif
-   fgrep -sx $1 $clib_symbols >& /dev/null
-   @ st = ! $status
-endif
+st=0
+if [ -s $clib_list ] ; then
+    if [ ! -s $clib_symbols ] || \
+       [ -n "`find $clib_list -prune -newer $clib_symbols`" ] ; then
+        nm -gP `cat $clib_list` 2>/dev/null | grep '^_[A-Za-z]' \
+        | sed -e 's/^_//' -e 's/ .*//' | sort -u > $clib_symbols
+    fi
+    grep -Fx "$1" $clib_symbols >/dev/null 2>&1 && st=1
+fi
 
 echo $st
 exit $st

xemacs-sumo-20051208-pydoc-path.patch:

--- NEW FILE xemacs-sumo-20051208-pydoc-path.patch ---
--- xemacs-packages/lisp/python-modes/pydoc.el	18 Sep 2002 06:04:19 -0000	1.1
+++ xemacs-packages/lisp/python-modes/pydoc.el	9 Dec 2005 22:16:38 -0000
@@ -383,18 +383,23 @@
 
 (defun pydoc-initialize()
   (message "Please wait a moment while the Python help system is initialized...")
-  (let (output-buf)
+  (let ((output-buf)
+	(pydir (locate-data-directory "python-modes")))
     (save-window-excursion
       ;; Start a Python interpreter if not already running.
       (py-shell)
       (pydoc-wait-for-output (current-buffer) 3.0)
       (setq output-buf
 	    (py-execute-string
-	     "if not vars().has_key('pydoc_lisp'):
+	     (format
+	      "if not vars().has_key('pydoc_lisp'):
+    import sys
+    if not '%s' in sys.path:
+        sys.path.append('%s')
     import pydoc_lisp
 
 pydoc_lisp.pydoc_output_lisp()
-"))
+" pydir pydir)))
       ;; current vintages of python-mode.el (4.6 at least)
       ;; no longer return a buffer [name].  We get t from the
       ;; final kill-buffer instead.  If we see t we use the


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Jul 2005 16:37:57 -0000	1.6
+++ .cvsignore	10 Dec 2005 21:06:20 -0000	1.7
@@ -1,2 +1,2 @@
-xemacs-mule-sumo-2005-07-15.tar.bz2
-xemacs-sumo-2005-07-15.tar.bz2
+xemacs-mule-sumo-2005-12-08.tar.bz2
+xemacs-sumo-2005-12-08.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Jul 2005 16:37:57 -0000	1.6
+++ sources	10 Dec 2005 21:06:20 -0000	1.7
@@ -1,2 +1,2 @@
-016362256e4de4b150d6c2f8d686dd3f  xemacs-mule-sumo-2005-07-15.tar.bz2
-28b92fa2e0bcd0c8e81fd6286d37af30  xemacs-sumo-2005-07-15.tar.bz2
+553da38bc36b4365ab98e0565a0530b8  xemacs-mule-sumo-2005-12-08.tar.bz2
+1927c40affd04ff7c10b979ef24548d0  xemacs-sumo-2005-12-08.tar.bz2


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xemacs-sumo.spec	17 Jul 2005 16:37:57 -0000	1.12
+++ xemacs-sumo.spec	10 Dec 2005 21:06:20 -0000	1.13
@@ -1,4 +1,4 @@
-%define sumo    2005-07-15
+%define sumo    2005-12-08
 %define pkgdir  %{_datadir}/xemacs
 
 Name:           xemacs-sumo
@@ -19,6 +19,8 @@
 Source15:       Emacs.ad.ko_KR.UTF-8
 Source16:       Emacs.ad.zh_CN.UTF-8
 Source17:       Emacs.ad.zh_TW.UTF-8
+Patch0:         %{name}-20051208-hypb-posix.patch
+Patch1:         %{name}-20051208-pydoc-path.patch
 Patch6:         auctex-texsite-jlatex-detect-69129.patch
 Patch7:         auctex-texjp-platex.patch
 Patch8:         egg-wnn-host-unix-79826.patch
@@ -33,8 +35,10 @@
 BuildRequires:  xemacs-nox
 BuildRequires:  sed >= 3.95
 BuildRequires:  /sbin/install-info
+BuildRequires:  %{__python}
 Requires:       xemacs-common
-Provides:       apel-xemacs = 10.2
+# Fake release in this provision in order to avoid self-obsoletion (for now).
+Provides:       apel-xemacs = 10.6-6
 Provides:       ruby-mode-xemacs
 Obsoletes:      apel-xemacs < 10.6-6
 Obsoletes:      ruby-mode-xemacs
@@ -76,6 +80,13 @@
 
 %prep
 %setup -q -c -a1
+# get rid of csh dependency
+%patch0 -p0
+rm xemacs-packages/lisp/hyperbole/file-newer
+# find pydoc_lisp.py out-of-the-box
+%patch1 -p0
+install -dm 755 xemacs-packages/etc/python-modes
+mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes}
 # fix jlatex autodetection
 %patch6 -p0
 # use ptex rather jtex by default for Japanese
@@ -94,7 +105,9 @@
 %patch15 -p0
 
 sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \
-  xemacs-packages/{lisp/hyperbole/file-newer,etc/bbdb/*.pl}
+  xemacs-packages/etc/bbdb/*.pl
+
+chmod -c -x xemacs-packages/lisp/edit-utils/crm.el
 
 # remove game we shouldn't ship
 rm xemacs-packages/lisp/games/tetris.el*
@@ -155,7 +168,7 @@
 find $RPM_BUILD_ROOT%{pkgdir} -type f -name '*.info*' | xargs gzip -9
 
 # separate files
-rm -f *.files base-files el-files info-files
+rm -f *.files
 echo "%%defattr(-,root,root,-)" > base-files
 echo "%%defattr(-,root,root,-)" > el-files
 echo "%%defattr(-,root,root,-)" > info-files
@@ -163,15 +176,21 @@
 find $RPM_BUILD_ROOT%{pkgdir}/* \
   \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \
   \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \
-  \( -type d -name info -fprint info.files -prune \) -o \
-  \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \
+  \( -type d -not -name info -fprintf dir.files "%%%%dir %%p\n" \) -o \
   \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \
      -fprint base-el-not-bytecomped.files \) \)
 
 sed -i -e "s|$RPM_BUILD_ROOT||" *.files
-cat base-*.files dir.files >> base-files
-cat el-*.files   dir.files >> el-files
-cat info.files             >> info-files
+cat base-*.files dir.files | grep -v /info/ >> base-files
+cat el-*.files dir.files                    >> el-files
+cat base-non-el.files | grep /info/         >> info-files
+
+sed -i -e 's/^\(.*\(\.ja\|-ja\.texi\)\)$/%lang(ja) \1/' base-files
+sed -i -e 's/^\(.*[_-]ja\.info.*\)$/%lang(ja) \1/' info-files
+
+# in case redhat-rpm-config is not installed or doesn't do this for us:
+%{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/python-modes', ddir='/', force=1)"
+%{__python} -O -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/etc/python-modes', ddir='/', force=1)"
 
 
 %clean
@@ -179,13 +198,24 @@
 
 
 %files -f base-files
+%{pkgdir}/xemacs-packages/etc/python-modes/*.pyc
+%ghost %{pkgdir}/xemacs-packages/etc/python-modes/*.pyo
 
 %files el -f el-files
 
 %files info -f info-files
+%dir %{pkgdir}/*-packages/info/
 
 
 %changelog
+* Fri Dec  9 2005 Ville Skytt??  - 20051208-1
+- 2005-12-08.
+- Patch hyperbole to not require csh.
+- Patch pydoc.el to find pydoc_lisp.py out of the box.
+- Include bytecompiled python files.
+- Set %%lang for various docs and info files.
+- Prune changelog entries from pre-xemacs-sumo times.
+
 * Sat Jul 16 2005 Ville Skytt??  - 20050715-1
 - 2005-07-15; jde font-lock, sql-mode abbrev, w3 stylesheet and file
   permissions fixed upstream.
@@ -308,243 +338,3 @@
 * Mon May 12 2003 Jens Petersen  - 20030414-1
 - new package to separate xemacs-sumo and xemacs-mule-sumo from
   main xemacs package
-
-
-* Sat May 10 2003 Jens Petersen  - 21.4.12-11
-- build with system malloc on ppc64
-
-* Tue Apr 22 2003 Jens Petersen  - 21.4.12-10
-- obsoletes ruby-mode-xemacs (#84673)
-- move obsoletes xemacs-sumo-el to -el subpackage
-- fix links in jde html documentation (#89499)
-
-* Tue Apr 15 2003 Jens Petersen  - 21.4.12-8
-- comment out ja and ko menubar translations in X resource files for now,
-  to avoid startup hanging in utf-8 locale (#88860)
-- use default menubar font in ja and ko locale
-- in a UTF-8 locale set default coding systems to utf-8 (partly #77130
-  and #74227)
-- set Info-directory-list in site-start.el again
-- move psgml setup into site-start.el
-- move previous contents of "dotxemacs-init.el" to new "default.el"
-
-* Mon Mar 31 2003 Akira TAGOH  21.4.12-7
-- Rebuild against the latest Canna.
-
-* Thu Feb 20 2003 Jens Petersen  - 21.4.12-6
-- default browse-url to use htmlview and update psgml-html browser
-  defaults (#84262)
-
-* Tue Feb 11 2003 Jens Petersen  - 21.4.12-5
-- build with system-malloc on alpha and ia64
-- skip redundant check-features target
-
-* Thu Feb  6 2003 Jens Petersen  - 21.4.12-4
-- fix "libexec dir" to be under lib64 on multilib archs
-- set default ftp to be non-kerberos in site-start.el
-- update sumos to 2003-02-05
-- mspec patch and rpm-spec-mode update no longer needed
-- buildrequire autoconf213
-- add ".xemacs/init.el" to /etc/skel
-- skip redundant check-features target on s390 and s390x
-
-* Wed Jan 22 2003 Tim Powers 
-- rebuilt
-
-* Tue Jan 21 2003 Jens Petersen  - 21.4.12-2
-- fix `paths-emacs-root-p' (find-paths.el) to look in share not lib
-- don't generate backup files when updating autoloads
-- try startup notification in desktop file
-- cleanup desktop file to use name XEmacs and add encoding key
-
-* Fri Jan 17 2003 Jens Petersen  21.4.12-1
-- update to 21.4.12 bugfix release (21.4 series now declared stable branch)
-- renumbered sumo package patches to be greater than 100
-- install sumo packages by copying rather than moving
-- patch sh-script.el to append m?spec entry to auto-mode-alist
-- avoid ppc.ldscript and build on ppc
-- remove games that we shouldn't ship
-- update to latest rcs2log
-- update to latest rpm-spec-mode.el
-- use _smp_mflags for lib-src and src
-- run batch-update-directory and batch-byte-recompile-directory on sumo lisp
-  dirs
-- improve datadir/xemacs-version/ ownership
-
-* Sat Jan  4 2003 Jens Petersen  21.4.11-1
-- update to 21.4.11
-- don't configure with union-type, since it causes runtime problems apparently
-- only do postun info dir deletions when uninstalling
-
-* Wed Jan  1 2003 Jens Petersen  21.4.10-6
-- move apel to separate package and require it
-- renamed psgml-init.el-xemacs to xemacs-psgml-init.el
-- use datadir in site-start.el
-- really include the movemail mkstemp patch
-- use mapc to load site-start.d files
-
-* Tue Dec 31 2002 Ville Skytt?? 
-- New Sumos (2002-12-30).
-- Use `construct-emacs-version-name' in `paths-emacs-root-p' (find-paths.el),
-  fixing "Couldn't find obvious default for XEmacs hierarchy" warnings
-  (as in XEmacs 21.5).
-- Move site-start stuff to site-packages.
-- Don't set Info-directory-list in site-start.el.
-- Don't use --pkgdir, it's ignored.  Don't pass pkgdir to makeinstall.
-- Fix source tarball URLs.
-- Don't override the defcustom in psgml-init.el, set its default value instead.
-- Add rpmbuild option: "--with debug" for building a debug-enabled XEmacs.
-
-* Sun Dec 29 2002 Jens Petersen 
-- updates package sumos to 2002-12-26 release
-
-* Mon Dec 23 2002 Jens Petersen  21.4.10-5
-- patch find-paths.el to search in datadir
-- setup lisp packages under datadir not libdir
-- use buildroot macro instead of RPM_BUILD_ROOT
-- drop local configure macro
-- fix buildrequires and requires
-- list configure options one-per-line
-- improve psgml-init.el catalog setup
-- remove and add lisp packages with package-admin
-- rebyte-compile lisp packages
-- keep etags as etags.xemacs (#78106)
-- don't bother removing non-existent udp2tcp nor .cvsignore files
-- simply filelist generation to a single find search pass
-- put core .el files in -el package
-- put package info files into -info package
-- don't create backup files when patching in lisp packages tree
-- don't explicitly gzip lisp package info files
-- don't mark the applications files noreplace
-- exclude ppc, since __init_array_start undefined
-
-* Wed Dec 18 2002 Jens Petersen 
-- patch egg-wnn to default to unix domain socket (#79826)
-  [patch from ynakai at redhat.com]
-- add ia64 patch from SuSE
-- use mkstemp in movemail
-
-* Tue Nov 19 2002 Jens Petersen 
-- apply jlatex autodetect patch correctly and drop append to tex-site.el
-- default to pTeX and pLaTeX for Japanese TeX and LaTeX
-
-* Mon Nov 18 2002 Jens Petersen  21.4.10-3
-- backout uncommenting of deactivate-mark (#77696)
-- update psgml dtd catalog path in psgml-init.el (#78022)
-  [reported by ville.skytta at iki.fi]
-- build with --use-union-type (#78024)
-  [suggested by ville.skytta at iki.fi]
-
-* Fri Nov 15 2002 Jens Petersen 
-- fix autodetection of jlatex (#69129)
-
-* Tue Nov 12 2002 Elliot Lee  21.4.10-2
-- build on x86_64
-
-* Mon Nov 11 2002 Jens Petersen  21.4.10-1
-- update to 21.4.10
-- update sumos to 2002-09-19
-- no longer backout mule-ucs package
-- encode this file in utf-8
-- xemacs-21.1.14-xfs.patch no longer needed
-- use _libdir, _datadir, _bindir, _prefix
-- exclude x86_64 (requires Canna)
-- own /usr/lib/xemacs/{,mule-packages} and /usr/X11R6/lib/X11/ (#73982)
-  [reported by enrico.scholz at informatik.tu-chemnitz.de]
-- fix default italic font size (#75275)
-  [reported with fix by ville.skytta at iki.fi]
-- update ja menubar translations in ja locale X resource file (#76068)
-  [from ynakai at redhat.com]
-- update ko locale X resource file (#76072) [from ynakai at redhat.com]
-- add pkgdir rpm macro for packages dir
-- uncomment deactivate-mark in simple.el (#77696)
-
-* Mon Aug 26 2002 Trond Eivind Glomsr??d  21.4.8-16
-- some cleanups - and remove the info tarball, it's now part
-  of the base tarball. Wow, the package gets smaller. (#72480)
-
-* Mon Aug 19 2002 Trond Eivind Glomsr??d  21.4.8-15
-- Bug in specfile from -14 gave bug on startup (#71743)
-
-* Thu Aug 15 2002 Trond Eivind Glomsr??d  21.4.8-14
-- Use utf-8 by default for input/output (#71584 )
-- Make it not segfault when handling utf-8 (#71589)
-
-* Wed Aug  7 2002 Trond Eivind Glomsr??d  21.4.8-13
-- Add openmotif-devel to buildrequires, as it will use it for widgets
-  if it finds it
-
-* Fri Aug  2 2002 Trond Eivind Glomsr??d  21.4.8-12
-- Don't package po-mode separately, it's now in sumo
-- Compile with drag'n'drop support
-- Use the bundled rpm-spec-mode, it has some adaptions for XEmacs
-
-* Wed Jul 31 2002 Trond Eivind Glomsr??d  21.4.8-11
-- Don't use a separate ispell.el file anymore - the included one is newer
-- Fix html-mode (#64826)
-
-* Tue Jul 23 2002 Trond Eivind Glomsr??d  21.4.8-10
-- Update lisp tarballs
-- desktop file fixes (#69542)
-- Add bdb support (#65640)
-
-* Mon Jul  8 2002 Trond Eivind Glomsr??d  21.4.8-9
-- Make it provide ruby-mode-xemacs (request from tagoh)
-
-* Fri Jun 21 2002 Tim Powers 
-- automated rebuild
-
-* Mon Jun 17 2002 Trond Eivind Glomsr??d  21.4.8-7
-- #66835
-
-* Wed May 29 2002 Trond Eivind Glomsr??d  21.4.8-6
-- Make it build... Evil.
-- Exclude IA64
-- Upgrade sumo tarballs to 2002-05-22
-
-* Fri May 24 2002 Jens Petersen  21.4.8-5
-- Build using portable dumper, so that build with glibc-2.3 malloc is ok
-
-* Mon May 13 2002 Trond Eivind Glomsr??d  21.4.8-2
-- Remove the s390 patches so it builds on s390 :)
-
-* Fri May 10 2002 Trond Eivind Glomsr??d  21.4.8-1
-- 21.4.8
-
-* Tue May  7 2002 Trond Eivind Glomsr??d  21.4.6-9
-- Rebuild... chmod -x pstogif to work around an rpm bug until
-  it's fixed (#64320)
-
-* Tue Apr 23 2002 Trond Eivind Glomsr??d  21.4.6-8
-- New sumo packages
-
-* Thu Feb 21 2002 Trond Eivind Glomsr??d  21.4.6-7
-- Rebuild
-
-* Tue Jan 29 2002 Jens Petersen  21.4.6-6
-- Remove skk package, since it conflicts with ddskk-xemacs (newer)
-
-* Thu Jan 24 2002 Trond Eivind Glomsr??d  21.4.6-5
-- New sumos
-
-* Wed Jan 09 2002 Tim Powers 
-- automated rebuild
-
-* Wed Dec 19 2001 Jens Petersen  21.4.6-3
-- Fix fontlist pattern in Emacs.ad.Japanese.
-- CHANGES-beta is now CHANGES-release.
-- Obsolete xemacs-sumo xemacs-sumo-el
-
-* Wed Dec 19 2001 Jens Petersen  21.4.6-2
-- Don't obsolete flim.
-
-* Mon Dec 17 2001 Trond Eivind Glomsr??d  21.4.6-1
-- 21.4.6
-- New sumo packages
-- disable alpha
-
-* Wed Nov 14 2001 Jens Petersen  21.4.5-2
-- Add -znocombreloc configure option to override new ld default.
-
-* Tue Nov  6 2001 Trond Eivind Glomsr??d  21.4.5-1
-- 21.4.5. It builds on IA64 and fixes #55578



From fedora-extras-commits at redhat.com  Sun Dec 11 12:18:41 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 11 Dec 2005 07:18:41 -0500
Subject: rpms/tinyerp/FC-3 tinyerp.spec,1.6,1.7
Message-ID: <200512111219.jBBCJB2s014909@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14886

Modified Files:
	tinyerp.spec 
Log Message:
 - moved Requires(pre) to the -server package (Ville Skytta)



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tinyerp.spec	8 Dec 2005 17:11:43 -0000	1.6
+++ tinyerp.spec	11 Dec 2005 12:18:39 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -19,7 +19,6 @@
 BuildRequires:	python-psycopg, libxslt-python, pydot
 BuildRequires:	desktop-file-utils, xorg-x11-Xvfb
 Requires:	pygtk2, pygtk2-libglade, pydot
-Requires(pre):	fedora-usermgmt
 Patch0:		tinyerp-client.patch
 Patch1:		tinyerp-server.patch
 
@@ -38,6 +37,7 @@
 Requires:	libxslt-python, python-imaging
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
+Requires(pre):	fedora-usermgmt
 
 %description server
 Server components for Tiny ERP.
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Sun Dec 11 2005 Dan Horak  3.1.1-4
+- moved Requires(pre) to the -server package (Ville Skytt??)
+
 * Thu Dec  7 2005 Dan Horak  3.1.1-3
 - chown for log and spool is not required
 



From fedora-extras-commits at redhat.com  Sun Dec 11 12:20:53 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 11 Dec 2005 07:20:53 -0500
Subject: rpms/tinyerp/FC-4 tinyerp.spec,1.8,1.9
Message-ID: <200512111221.jBBCLNeL014936@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14915

Modified Files:
	tinyerp.spec 
Log Message:
 - moved Requires(pre) to the -server package (Ville Skytta)



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tinyerp.spec	8 Dec 2005 17:12:49 -0000	1.8
+++ tinyerp.spec	11 Dec 2005 12:20:51 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -19,7 +19,6 @@
 BuildRequires:	python-psycopg, libxslt-python, pydot
 BuildRequires:	desktop-file-utils, xorg-x11-Xvfb
 Requires:	pygtk2, pygtk2-libglade, pydot
-Requires(pre):	fedora-usermgmt
 Patch0:		tinyerp-client.patch
 Patch1:		tinyerp-server.patch
 
@@ -38,6 +37,7 @@
 Requires:	libxslt-python, python-imaging
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
+Requires(pre):	fedora-usermgmt
 
 %description server
 Server components for Tiny ERP.
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Sun Dec 11 2005 Dan Horak  3.1.1-4
+- moved Requires(pre) to the -server package (Ville Skytt??)
+
 * Thu Dec  7 2005 Dan Horak  3.1.1-3
 - chown for log and spool is not required
 



From fedora-extras-commits at redhat.com  Sun Dec 11 18:33:22 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sun, 11 Dec 2005 13:33:22 -0500
Subject: rpms/gtkmathview/devel .cvsignore, 1.4, 1.5 gtkmathview.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200512111833.jBBIXq2l025649@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/gtkmathview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25602

Modified Files:
	.cvsignore gtkmathview.spec sources 
Log Message:
Update to 0.7.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Sep 2005 12:45:58 -0000	1.4
+++ .cvsignore	11 Dec 2005 18:33:20 -0000	1.5
@@ -1 +1 @@
-gtkmathview-0.7.5.tar.gz
+gtkmathview-0.7.6.tar.gz


Index: gtkmathview.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/devel/gtkmathview.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkmathview.spec	25 Sep 2005 12:45:58 -0000	1.3
+++ gtkmathview.spec	11 Dec 2005 18:33:20 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: A MathML rendering library
 Name: gtkmathview
-Version: 0.7.5
+Version: 0.7.6
 Release: 1
 Group: System Environment/Libraries
 License: GPL
@@ -75,6 +75,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Sun Dec 11 2005 Marc Maurer  - 0.7.6-1
+- Update to 0.7.6
+
 * Sun Sep 25 2005 Marc Maurer  - 0.7.5-1
 - Update to 0.7.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Sep 2005 12:45:58 -0000	1.4
+++ sources	11 Dec 2005 18:33:20 -0000	1.5
@@ -1 +1 @@
-94a4415a8226874075037a88972baa11  gtkmathview-0.7.5.tar.gz
+4bb348c98367228f0de0a2216a13d48f  gtkmathview-0.7.6.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 11 18:33:52 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sun, 11 Dec 2005 13:33:52 -0500
Subject: rpms/gtkmathview/FC-4 .cvsignore, 1.4, 1.5 gtkmathview.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512111834.jBBIYM9E025681@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/gtkmathview/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25631

Modified Files:
	.cvsignore gtkmathview.spec sources 
Log Message:
Update to 0.7.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Sep 2005 12:45:58 -0000	1.4
+++ .cvsignore	11 Dec 2005 18:33:50 -0000	1.5
@@ -1 +1 @@
-gtkmathview-0.7.5.tar.gz
+gtkmathview-0.7.6.tar.gz


Index: gtkmathview.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/FC-4/gtkmathview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkmathview.spec	26 Sep 2005 11:40:16 -0000	1.6
+++ gtkmathview.spec	11 Dec 2005 18:33:50 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: A MathML rendering library
 Name: gtkmathview
-Version: 0.7.5
-Release: 3%{?dist}
+Version: 0.7.6
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: GPL
 Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz
@@ -75,6 +75,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Sun Dec 11 2005 Marc Maurer  - 0.7.6-1.fc4
+- Update to 0.7.6
+
 * Mon Sep 25 2005 Marc Maurer  - 0.7.5-3.fc4
 - Escape the dist macro in the changelog
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Sep 2005 12:45:58 -0000	1.4
+++ sources	11 Dec 2005 18:33:50 -0000	1.5
@@ -1 +1 @@
-94a4415a8226874075037a88972baa11  gtkmathview-0.7.5.tar.gz
+4bb348c98367228f0de0a2216a13d48f  gtkmathview-0.7.6.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 11 18:34:08 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sun, 11 Dec 2005 13:34:08 -0500
Subject: rpms/gtkmathview/FC-3 .cvsignore, 1.4, 1.5 gtkmathview.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200512111834.jBBIYcCG025691@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/gtkmathview/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25659

Modified Files:
	.cvsignore gtkmathview.spec sources 
Log Message:
Update to 0.7.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Sep 2005 12:45:58 -0000	1.4
+++ .cvsignore	11 Dec 2005 18:34:06 -0000	1.5
@@ -1 +1 @@
-gtkmathview-0.7.5.tar.gz
+gtkmathview-0.7.6.tar.gz


Index: gtkmathview.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/FC-3/gtkmathview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtkmathview.spec	2 Oct 2005 16:09:28 -0000	1.4
+++ gtkmathview.spec	11 Dec 2005 18:34:06 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: A MathML rendering library
 Name: gtkmathview
-Version: 0.7.5
+Version: 0.7.6
 Release: 1%{?dist}
 Group: System Environment/Libraries
 License: GPL
@@ -75,5 +75,8 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Sun Dec 11 2005 Marc Maurer  - 0.7.6-1.fc3
+- Update to 0.7.6
+
 * Sun Oct 2 2005 Marc Maurer  - 0.7.5-1.fc3
 - Initial release into FC-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmathview/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Sep 2005 12:45:58 -0000	1.4
+++ sources	11 Dec 2005 18:34:06 -0000	1.5
@@ -1 +1 @@
-94a4415a8226874075037a88972baa11  gtkmathview-0.7.5.tar.gz
+4bb348c98367228f0de0a2216a13d48f  gtkmathview-0.7.6.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 11 20:14:28 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Sun, 11 Dec 2005 15:14:28 -0500
Subject: fedora-security/audit fc4,1.102,1.103
Message-ID: <200512112014.jBBKExTa029190@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29172

Modified Files:
	fc4 
Log Message:
Clear a few eay mails



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- fc4	9 Dec 2005 22:13:29 -0000	1.102
+++ fc4	11 Dec 2005 20:14:26 -0000	1.103
@@ -3,20 +3,20 @@
 
 ** are items that need attention
 
-CVE-2005-4077 VULNERABLE (curl)
+CVE-2005-4077 backport (curl) [since FEDORA-2005-1129]
 CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)
-CVE-2005-3193 VULNERABLE (tetex)
-CVE-2005-3193 VULNERABLE (poppler)
+CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3193 backport (poppler) [since FEDORA-2005-1132]
 CVE-2005-3192 VULNERABLE (xpdf)
 CVE-2005-3192 VULNERABLE (kdegraphics)
-CVE-2005-3192 VULNERABLE (tetex)
-CVE-2005-3192 VULNERABLE (poppler)
+CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3192 backport (poppler) [since FEDORA-2005-1132]
 CVE-2005-3191 VULNERABLE (xpdf)
 CVE-2005-3191 VULNERABLE (kdegraphics)
-CVE-2005-3191 VULNERABLE (tetex)
-CVE-2005-3191 VULNERABLE (poppler)
+CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3191 backport (poppler) [since FEDORA-2005-1132]
 CVE-2005-3964 VULNERABLE (openmotif)
 CVE-2005-3962 backport (perl) [since FEDORA-2005-1113]
 CVE-2005-3912 backport (perl) [since FEDORA-2005-1113]
@@ -77,7 +77,7 @@
 CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1122]
 CVE-2005-3186 backport (gdk-pixbuf) [since FEDORA-2005-1085]
 CVE-2005-3186 backport (gtk2) [since FEDORA-2005-1088]
-CVE-2005-3185 blocked (curl) by FORTIFY_SOURCE
+CVE-2005-3185 backport (curl) [since FEDORA-2005-1129] was blocked (curl) by FORTIFY_SOURCE
 CVE-2005-3185 blocked (wget) by FORTIFY_SOURCE
 CVE-2005-3184 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3183 backport (w3c-libwww) [since FEDORA-2005-952]
@@ -117,6 +117,7 @@
 CVE-2005-2959 ignore (sudo) not a vulnerability
 CVE-2005-2946 VULNERABLE (openssl, fixed 0.9.8) (as it uses md5 md)
 CVE-2005-2933 VULNERABLE (uw-imap) bz#171345
+CVE-2005-2933 backport (libc-client) [since FEDORA-2005-1115]
 CVE-2005-2929 backport (lynx) [since FEDORA-2005-1079]
 CVE-2005-2917 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913]
 CVE-2005-2876 backport (util-linux) [since FEDORA-2005-887]



From fedora-extras-commits at redhat.com  Sun Dec 11 21:57:10 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 11 Dec 2005 16:57:10 -0500
Subject: rpms/libopensync - New directory
Message-ID: <200512112157.jBBLvA1N030989@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30980/libopensync

Log Message:
Directory /cvs/extras/rpms/libopensync added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 11 21:57:16 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 11 Dec 2005 16:57:16 -0500
Subject: rpms/libopensync/devel - New directory
Message-ID: <200512112157.jBBLvGAB031007@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30980/libopensync/devel

Log Message:
Directory /cvs/extras/rpms/libopensync/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 11 21:57:35 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 11 Dec 2005 16:57:35 -0500
Subject: rpms/libopensync Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512112157.jBBLvZc7031044@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31031

Added Files:
	Makefile import.log 
Log Message:
Setup of module libopensync


--- NEW FILE Makefile ---
# Top level Makefile for module libopensync
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 11 21:57:41 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 11 Dec 2005 16:57:41 -0500
Subject: rpms/libopensync/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512112157.jBBLvffR031067@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31031/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libopensync


--- NEW 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 Dec 11 21:58:40 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 11 Dec 2005 16:58:40 -0500
Subject: rpms/libopensync import.log,1.1,1.2
Message-ID: <200512112159.jBBLxAHb031168@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31124

Modified Files:
	import.log 
Log Message:
auto-import libopensync-0.18-3 on branch devel from libopensync-0.18-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopensync/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Dec 2005 21:57:33 -0000	1.1
+++ import.log	11 Dec 2005 21:58:38 -0000	1.2
@@ -0,0 +1 @@
+libopensync-0_18-3:HEAD:libopensync-0.18-3.src.rpm:1134338309



From fedora-extras-commits at redhat.com  Sun Dec 11 21:58:46 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 11 Dec 2005 16:58:46 -0500
Subject: rpms/libopensync/devel libopensync-32.conf, NONE,
	1.1 libopensync-64.conf, NONE, 1.1 libopensync-rpath.patch,
	NONE, 1.1 libopensync.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512112158.jBBLwk0i031161@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31124/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libopensync-32.conf libopensync-64.conf 
	libopensync-rpath.patch libopensync.spec 
Log Message:
auto-import libopensync-0.18-3 on branch devel from libopensync-0.18-3.src.rpm


--- NEW FILE libopensync-32.conf ---
/usr/lib/opensync/
/usr/lib/opensync/formats/
/usr/lib/opensync/plugins/


--- NEW FILE libopensync-64.conf ---
/usr/lib64/opensync/
/usr/lib64/opensync/formats/
/usr/lib64/opensync/plugins/

libopensync-rpath.patch:

--- NEW FILE libopensync-rpath.patch ---
--- tools/Makefile.am.orig	2005-11-29 15:05:27.000000000 +0100
+++ tools/Makefile.am	2005-11-29 15:05:04.000000000 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
+AM_CFLAGS = -Wall @GCOV_CFLAGS@
 
 INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
 
@@ -9,23 +9,23 @@
 endif
 
 osyncdump_SOURCES = osyncdump.c
-osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
 osyncdump_LDADD = $(top_builddir)/opensync/libopensync.la
 
 osyncstress_SOURCES = osyncstress.c
-osyncstress_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncstress_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osyncstress_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
 
 osyncplugin_SOURCES = osyncplugin.c
-osyncplugin_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncplugin_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osyncplugin_LDADD = $(top_builddir)/opensync/libopensync.la
 
 osynctest_SOURCES = osynctest.c
-osynctest_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osynctest_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osynctest_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
 
 osyncbinary_SOURCES = osyncbinary.c
-osyncbinary_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
+osyncbinary_LDFLAGS = @PACKAGE_LIBS@
 osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
 
 CLEANFILES = \
--- osengine/Makefile.am.orig	2005-11-29 15:10:14.000000000 +0100
+++ osengine/Makefile.am	2005-11-29 15:12:13.000000000 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CFLAGS = -Werror -Wall @GCOV_CFLAGS@
+AM_CFLAGS = -Wall @GCOV_CFLAGS@
 
 INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ 
 
@@ -47,5 +47,5 @@
 	*.bbg \
 	*.da
 
-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
 libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
--- osengine/Makefile.in.orig	2005-11-29 15:14:18.000000000 +0100
+++ osengine/Makefile.in	2005-11-29 15:20:32.000000000 +0100
@@ -270,7 +270,7 @@
 	*.bbg \
 	*.da
 
-libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
+libosengine_la_LDFLAGS = $(PACKAGE_LIBS) @GCOV_LDFLAGS@
 libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
 all: all-am
 
--- wrapper/Makefile.am.orig	2005-11-29 15:27:35.000000000 +0100
+++ wrapper/Makefile.am	2005-11-29 15:27:48.000000000 +0100
@@ -22,5 +22,5 @@
 endif
 
 nodist__opensync_la_SOURCES = opensync_wrap.c
-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
 _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
--- wrapper/Makefile.in.orig	2005-11-29 15:30:22.000000000 +0100
+++ wrapper/Makefile.in	2005-11-29 15:31:52.000000000 +0100
@@ -235,7 +235,7 @@
 @HAVE_PYTHON_TRUE at osbindingsdir = $(pythondir)
 @HAVE_PYTHON_TRUE at osbindings_LTLIBRARIES = _opensync.la
 nodist__opensync_la_SOURCES = opensync_wrap.c
-_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module
+_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -module
 _opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
 all: all-am
 
--- tools/Makefile.in.orig	2005-11-29 15:37:42.000000000 +0100
+++ tools/Makefile.in	2005-11-29 15:38:03.000000000 +0100
@@ -237,19 +237,19 @@
 AM_CFLAGS = -Wall -Werror @GCOV_CFLAGS@
 INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ @XML_CFLAGS@ -I$(top_srcdir)/osengine
 osyncdump_SOURCES = osyncdump.c
-osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ @GCOV_LDFLAGS@
 osyncdump_LDADD = $(top_builddir)/opensync/libopensync.la
 osyncstress_SOURCES = osyncstress.c
-osyncstress_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncstress_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osyncstress_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
 osyncplugin_SOURCES = osyncplugin.c
-osyncplugin_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osyncplugin_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osyncplugin_LDADD = $(top_builddir)/opensync/libopensync.la
 osynctest_SOURCES = osynctest.c
-osynctest_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
+osynctest_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
 osynctest_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
 osyncbinary_SOURCES = osyncbinary.c
-osyncbinary_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
+osyncbinary_LDFLAGS = @PACKAGE_LIBS@
 osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
 CLEANFILES = \
 	*.bb \


--- NEW FILE libopensync.spec ---
Name:           libopensync
Version:        0.18
Release:        3
Summary:        A synchronization framework

Group:          System Environment/Libraries
License:        LGPL
URL:            http://www.opensync.org/
# see http://www.opensync.org/wiki/download
Source0:        %{name}-%{version}.tar.gz
Source1:        libopensync-32.conf
Source2:        libopensync-64.conf
Patch0:         libopensync-rpath.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glib2-devel
BuildRequires:  libxml2-devel
BuildRequires:  sqlite-devel
BuildRequires:  zlib-devel
BuildRequires:  python-devel
BuildRequires:  swig
BuildRequires:  pkgconfig

%description
OpenSync is a synchronization framework that is platform and distribution
independent. It consists of several plugins that can be used to connect to
devices, a powerful sync-engine and the framework itself. The synchronization
framework is kept very flexible and is capable of synchronizing any type of
data, including contacts, calendar, tasks, notes and files. 

%package devel
Summary:        Development package for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       glib2-devel
Requires:       libxml2-devel
Requires:       zlib-devel
%description    devel
The %{name}-devel package contains the files needed for development
with %{name}.

%prep
%setup -q
%patch0
# some source files are marked executable
for dir in opensync osengine; do
    cd %{_builddir}/%{name}-%{version}/$dir
    chmod -x *
done

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT/%{_datadir}/opensync
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/opensync/formats
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/opensync/plugins

find $RPM_BUILD_ROOT -type f -name *.la -exec rm -f {} \;

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/

%ifarch x86_64
install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
%else
install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README TODO
%{_bindir}/*
%{_libdir}/*.so.*
%dir %{_libdir}/opensync
%dir %{_libdir}/opensync/formats
%dir %{_libdir}/opensync/plugins
%{_libdir}/opensync/formats/*
%{_libdir}/python*/*
%dir %{_datadir}/opensync
%config %{_sysconfdir}/ld.so.conf.d/*

%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/opensync-1.0
%{_includedir}/opensync-1.0/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%changelog
* Sun Dec 11 2005 Andreas Bierfert 
0.18-3
- .c and .h files should not be marked executable

* Sun Dec 04 2005 Andreas Bierfert 
0.18-2
- fix missing BR
- mark ldconf as config

* Sat Nov 12 2005 Andreas Bierfert 
0.18-1
- Version upgrade

* Mon Oct 03 2005 Andreas Bierfert 
0.17-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Dec 2005 21:57:39 -0000	1.1
+++ .cvsignore	11 Dec 2005 21:58:44 -0000	1.2
@@ -0,0 +1 @@
+libopensync-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Dec 2005 21:57:39 -0000	1.1
+++ sources	11 Dec 2005 21:58:44 -0000	1.2
@@ -0,0 +1 @@
+ce94a69fb7ae7533d1f8828b6402cec8  libopensync-0.18.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 11 23:44:55 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 11 Dec 2005 18:44:55 -0500
Subject: rpms/libopensync/devel libopensync.spec,1.1,1.2
Message-ID: <200512112345.jBBNjPEO002049@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2027

Modified Files:
	libopensync.spec 
Log Message:
- add dist



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync.spec	11 Dec 2005 21:58:44 -0000	1.1
+++ libopensync.spec	11 Dec 2005 23:44:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libopensync
 Version:        0.18
-Release:        3
+Release:        4%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -100,6 +100,10 @@
 
 %changelog
 * Sun Dec 11 2005 Andreas Bierfert 
+0.18-4
+- add dist
+
+* Sun Dec 11 2005 Andreas Bierfert 
 0.18-3
 - .c and .h files should not be marked executable
 



From fedora-extras-commits at redhat.com  Sun Dec 11 23:49:44 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 11 Dec 2005 18:49:44 -0500
Subject: rpms/perl-PatchReader - New directory
Message-ID: <200512112349.jBBNniGE002151@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/perl-PatchReader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2138/perl-PatchReader

Log Message:
Directory /cvs/extras/rpms/perl-PatchReader added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 11 23:49:50 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 11 Dec 2005 18:49:50 -0500
Subject: rpms/perl-PatchReader/devel - New directory
Message-ID: <200512112349.jBBNno7k002169@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/perl-PatchReader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2138/perl-PatchReader/devel

Log Message:
Directory /cvs/extras/rpms/perl-PatchReader/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 11 23:50:06 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 11 Dec 2005 18:50:06 -0500
Subject: rpms/perl-PatchReader Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512112350.jBBNo6Sj002205@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/perl-PatchReader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2192

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-PatchReader


--- NEW FILE Makefile ---
# Top level Makefile for module perl-PatchReader
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 11 23:50:11 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 11 Dec 2005 18:50:11 -0500
Subject: rpms/perl-PatchReader/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512112350.jBBNoBRY002226@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/perl-PatchReader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2192/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-PatchReader


--- NEW 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 Dec 11 23:50:39 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 11 Dec 2005 18:50:39 -0500
Subject: rpms/perl-PatchReader import.log,1.1,1.2
Message-ID: <200512112351.jBBNp9ss002296@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/perl-PatchReader
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2260

Modified Files:
	import.log 
Log Message:
auto-import perl-PatchReader-0.9.5-3 on branch devel from perl-PatchReader-0.9.5-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-PatchReader/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Dec 2005 23:50:04 -0000	1.1
+++ import.log	11 Dec 2005 23:50:37 -0000	1.2
@@ -0,0 +1 @@
+perl-PatchReader-0_9_5-3:HEAD:perl-PatchReader-0.9.5-3.src.rpm:1134344998



From fedora-extras-commits at redhat.com  Sun Dec 11 23:50:44 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 11 Dec 2005 18:50:44 -0500
Subject: rpms/perl-PatchReader/devel perl-PatchReader.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512112351.jBBNpFcB002300@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/perl-PatchReader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2260/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-PatchReader.spec 
Log Message:
auto-import perl-PatchReader-0.9.5-3 on branch devel from perl-PatchReader-0.9.5-3.src.rpm


--- NEW FILE perl-PatchReader.spec ---
Name:		perl-PatchReader
Version: 	0.9.5
Release: 	3%{?dist}
Summary:	Utilities to read and manipulate patches and CVS

Group: 		Development/Libraries
License: 	MPL
URL: 		http://search.cpan.org/dist/PatchReader/
Source: 	http://www.cpan.org/authors/id/J/JK/JKEISER/PatchReader-%{version}.tar.gz
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: 	noarch
BuildRequires: 	perl >= 1:5.6.1
BuildRequires:	perl(File::Temp)
Requires: 	cvs
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
PatchReader is a set of utilities for reading in, transforming, and doing
various other things with a patch.  It basically allows you to create a
chain of readers that can read a patch, remove files from a patch, add
CVS context, fix up the patch root according to CVS, and output the patch
as raw unified or through a template processor (used in some places to
output a patch as HTML).


%prep
%setup -q -n PatchReader-%{version}
chmod 644 Changes README
find . -name "*.pm" | xargs chmod 644
%{__perl} -pi -e 's/\r//g' Changes README


%build
%{__perl} Makefile.PL INSTALLDIRS="vendor"
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf ${RPM_BUILD_ROOT}
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
%{__rm} -rf ${RPM_BUILD_ROOT}


%files
%defattr(-, root, root, -)
%doc Changes README
%{_mandir}/man3/PatchReader.*
%{perl_vendorlib}/PatchReader.pm
%{perl_vendorlib}/PatchReader/


%changelog
* Sun Dec 11 2005 Paul W. Frields  - 0.9.5-3
- Final cosmetic tweaks

* Sat Dec 10 2005 Paul W. Frields  - 0.9.5-2
- Get in line with fedora-rpmdevtools standards

* Thu Dec  8 2005 Paul W. Frields  - 0.9.5-1
- Initial RPM version for Fedora Extras, based on Dag spec



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PatchReader/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Dec 2005 23:50:09 -0000	1.1
+++ .cvsignore	11 Dec 2005 23:50:42 -0000	1.2
@@ -0,0 +1 @@
+PatchReader-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PatchReader/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Dec 2005 23:50:09 -0000	1.1
+++ sources	11 Dec 2005 23:50:42 -0000	1.2
@@ -0,0 +1 @@
+8aca86b807aec3c82dcb981c7730f022  PatchReader-0.9.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 11 23:53:26 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 11 Dec 2005 18:53:26 -0500
Subject: owners owners.list,1.439,1.440
Message-ID: <200512112353.jBBNrufw002360@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2342

Modified Files:
	owners.list 
Log Message:
Added perl-PatchReader


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- owners.list	9 Dec 2005 23:30:21 -0000	1.439
+++ owners.list	11 Dec 2005 23:53:24 -0000	1.440
@@ -828,6 +828,7 @@
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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-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-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
 Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Dec 12 02:38:35 2005
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Sun, 11 Dec 2005 21:38:35 -0500
Subject: rpms/monotone/FC-4 README.monotone-server, NONE, 1.1 .cvsignore, 1.4,
	1.5 monotone.init, 1.5, 1.6 monotone.spec, 1.10,
	1.11 monotone.sysconfig, 1.1, 1.2 sources, 1.4, 1.5
Message-ID: <200512120239.jBC2d5qe009249@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9224

Modified Files:
	.cvsignore monotone.init monotone.spec monotone.sysconfig 
	sources 
Added Files:
	README.monotone-server 
Log Message:
Update to 0.24


--- NEW FILE README.monotone-server ---
The Fedora Extras build of monotone provides an extra RPM monotone-server.
This package is intended to make it easy to set up an unattended server
installation for Monotone's Netsync protocol (i.e. "monotone serve").

The package a standard Fedora-style init.d script with chkconfig support
for running the server, installed as /usr/sbin/monotone-server.
(This is just a symlink to monotone that the init script runs instead.
This enables matching "monotone-server" processes with ps to distinguish
server instances from people using monotone.)

The /etc/monotone directory serves as ~/.monotone for the server.  This
directory and its contents are not writable by the "monotone" user ID under
which the network server runs.  The database lives in /var/db/monotone,
which the "monotone" user ID must write to.

The init.d script will generate a private key for the server to use, if
none exists yet.  The key identification will be the host's FQDN (from
/bin/hostname -f).  You can use "service monotone genkey [IDENT]" to
generate the private key by hand and set up the unattended server to use
it, supplying a different key identification string if you like.

Before starting the server, the script will migrate an old database
format if you had a previous version of the monotone-server installation.
(This includes converting private keys from the old format.)
You can always do this explicitly with "service monotone migrate".

Access to the server is controlled by the /etc/monotone/read-permissions and
/etc/monotone/write-permissions files, unless you write your own Lua hooks
in /etc/monotone/monotonerc.  These files are not created or editted by the
RPM scripts, you must create them.  These files refer to key identification
strings for keys already the database.  Anyone allowed write access by the
netwrok server can put new keys in the database with "monotone push" using
the --key-to-push option.  To bootstrap this, /etc/monotone/write-permission
must allow some key and that key must be in the database already.  You can
put a key in the server's database easily with "service monotone import",
e.g. to import the public key for a private key in ~/.monotone/keys:

	monotone pubkey me at my.com | sudo service monotone import

For problems with this package or its scripts, please file bugs
at http://bugzilla.redhat.com/ for the "monotone" component
in th "Fedora Extras" product.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Oct 2005 03:02:27 -0000	1.4
+++ .cvsignore	12 Dec 2005 02:38:33 -0000	1.5
@@ -1 +1 @@
-monotone-0.23.tar.gz
+monotone-0.24.tar.gz


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- monotone.init	23 Aug 2005 09:47:30 -0000	1.5
+++ monotone.init	12 Dec 2005 02:38:33 -0000	1.6
@@ -7,7 +7,7 @@
 # processname: monotone-server
 # pidfile: /var/run/monotone-server.pid
 # config: /etc/sysconfig/monotone
-# config: /etc/monotonerc
+# config: /etc/monotone/monotonerc
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -31,7 +31,7 @@
 random_passphrase()
 {
 	# As of 0.22, 32 chars is the maximum pass phrase length.
-	dd if=/dev/urandom count=1 2> /dev/null | md5sum |
+	dd if=/dev/urandom bs=32 count=1 2> /dev/null | md5sum |
 	{ read sum rest; echo $sum; }
 }
 
@@ -40,8 +40,16 @@
 # See how we were called.
 case "$1" in
   start)
-	[ -e $MONOTONE_DBFILE ] || { $0 init && $0 genkey; }
+	if [ -e $MONOTONE_DBFILE ]; then
+		$0 migrate
+	else
+		$0 init
+	fi
 	RETVAL=$?
+	if [ $RETVAL = 0 ] && [ "x`ls $MONOTONE_KEYDIR`" = x ]; then
+		$0 genkey
+		RETVAL=$?
+	fi
 	if [ $RETVAL = 0 ]; then
 		# Start daemon.
 		echo -n $"Starting monotone server: "
@@ -60,7 +68,7 @@
         ;;
   stop)
         # Stop daemons.
-        echo -n "Stopping monotone server: "
+        echo -n $"Stopping monotone server: "
         killproc $MTSERVER
         RETVAL=$?
         [ $RETVAL = 0 ] && rm -f /var/lock/subsys/monotone
@@ -78,7 +86,7 @@
 	RETVAL=$?
 	;;
   init)
-	echo -n $"Initializing $MONOTONE_DBFILE: "
+	echo -n $"Initializing database" "$MONOTONE_DBFILE" ": "
 	{ [ -d /var/db/monotone ] ||
  	  /usr/bin/install -o ${MONOTONE_USER:-monotone} \
 			   -g ${MONOTONE_GROUP:-monotone} \
@@ -91,7 +99,7 @@
 	echo
 	;;
   genkey)
-	MONOTONE_KEYID=${MONOTONE_KEYID:-`/bin/hostname -f`}
+	MONOTONE_KEYID=${2:-${MONOTONE_KEYID:-`/bin/hostname -f`}}
 	MONOTONE_PPFILE=${MONOTONE_PPFILE:-/var/db/monotone/passphrase.lua}
 	echo -n $"Generating RSA key for server $MONOTONE_KEYID"
 	tmp=/tmp/mtserver$$
@@ -106,9 +114,8 @@
   return "$passphrase"
 end
 EOF
-		/usr/bin/install -o ${MONOTONE_USER:-monotone} \
-		    		 -g ${MONOTONE_GROUP:-monotone} \
-				 -m 0600 $tmp ${MONOTONE_PPFILE}
+		/usr/bin/install -o root -g ${MONOTONE_GROUP:-monotone} \
+				 -m 0440 $tmp ${MONOTONE_PPFILE}
 	then
 		success $"key generation"
 	else
@@ -118,8 +125,47 @@
 	rm -f $tmp
 	echo
 	;;
+  migrate)
+  	oppfile=/var/db/monotone/passphrase.lua
+	RETVAL=0
+	if [ ! -e $MONOTONE_PPFILE ] && [ -e $oppfile ]; then
+		echo -n $"Moving old server passphrase file to new location: "
+		/usr/bin/install -o root -g ${MONOTONE_GROUP:-monotone} \
+				 -m 0440 $oppfile ${MONOTONE_PPFILE} &&
+		success $"move passphrase file" ||
+		failure $"move passphrase file"
+		RETVAL=$?
+		echo
+	fi
+	[ $RETVAL -eq 0 ] || exit $RETVAL
+	# Note this must run as root in case migration is writing
+	# into /etc/monotone/private-keys.
+	echo $"Checking database format in" "${MONOTONE_DBFILE}:"
+	(umask 027
+	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db migrate &&
+	 /bin/chgrp -R ${MONOTONE_GROUP:-monotone} $MONOTONE_KEYDIR)
+		success $"database check" ||
+		failure $"database check"
+	RETVAL=$?
+	echo
+	;;
+  # Use "monotone pubkey me at my.com | service monotone import"
+  # to import the first keys to enable in /etc/monotone/write-permission.
+  # Thereafter, those with write permission can add other keys via
+  # netsync with "monotone push --key-to-push=IDENT" and then IDENT
+  # can be used in the read-permission and write-permission files.
+  import)
+	echo -n $"Importing packets to monotone database: "
+	runuser -s /bin/bash - ${MONOTONE_USER:-monotone} -c "umask 007; \
+		$MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS read" &&
+		success $"packet import" ||
+		failure $"packet import"
+	RETVAL=$?
+	echo
+	;;
   *)
-	echo "Usage: $0 {start|stop|restart|status|condrestart|init|genkey}"
+	echo "\
+Usage: $0 {start|stop|restart|status|condrestart|init|import|genkey [IDENT]}"
 	RETVAL=1
 	;;
 esac


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monotone.spec	4 Oct 2005 03:02:27 -0000	1.10
+++ monotone.spec	12 Dec 2005 02:38:33 -0000	1.11
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.23
+Version: 0.24
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -10,14 +10,12 @@
 Source0: http://www.venge.net/monotone/downloads/%{name}-%{version}.tar.gz
 Source1: monotone.init
 Source2: monotone.sysconfig
-
-Patch1: monotone-xfail-if-root.patch
+Source3: README.monotone-server
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
 BuildRequires: boost-devel >= 1.32.0
-BuildRequires: lua
 %if 1
 %define bundled_sqlite yes
 %else
@@ -25,6 +23,11 @@
 BuildRequires: sqlite-devel >= 3.2.7
 %define bundled_sqlite no
 %endif
+# monotone has local hacks in lua 5.0.2 as well, sigh.
+%define bundled_lua 1
+%if %{bundled_lua} == 0
+BuildRequires: lua
+%endif
 
 # The test suite needs cvs.
 BuildRequires: cvs
@@ -56,14 +59,13 @@
 %prep
 %setup -q
 
-%patch1 -p1
-
 %build
-%configure --with-bundled-lua=no --with-bundled-sqlite=%{bundled_sqlite}
+%configure --with-bundled-lua=%{bundled_lua} \
+	   --with-bundled-sqlite=%{bundled_sqlite}
 make %{?_smp_mflags}
 
 %check
-make check || { cat testsuite.log; false; }
+#make check || { cat testsuite.log; false; }
 
 %install
 rm -rf %{buildroot}
@@ -84,14 +86,21 @@
 ln -snf ../bin/monotone %{buildroot}%{_sbindir}/monotone-server
 %{__install} -c -m 0555 %{SOURCE1} %{buildroot}/etc/init.d/monotone
 %{__install} -c -m 0644 %{SOURCE2} %{buildroot}/etc/sysconfig/monotone
-%{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotonerc
+%{__install} -d -m 0755 %{buildroot}/etc/monotone
+%{__install} -d -m 0750 %{buildroot}/etc/monotone/private-keys
 %{__install} -d -m 0770 %{buildroot}/var/db/monotone
 
 # These do not actually wind up in the package, due to %%ghost.
+%{__install} -c -m 0440 /dev/null %{buildroot}/etc/monotone/passphrase.lua
+%{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/read-permissions
+%{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/write-permissions
+%{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotone/monotonerc
 touch %{buildroot}/var/db/monotone/server.db
-touch %{buildroot}/var/db/monotone/passphrase.lua
+
+cp %{SOURCE3} .
 
 %clean
+rm -f README.monotone-server
 rm -rf %{buildroot}
 
 %post
@@ -118,14 +127,20 @@
 
 
 %files server
+%doc README.monotone-server
 %defattr(-,root,root,-)
 %{_sbindir}/monotone-server
 /etc/init.d/monotone
-%config(noreplace) /etc/sysconfig/monotone
-%config(noreplace) /etc/monotonerc
+%config /etc/sysconfig/monotone
+%dir %attr(0755,root,monotone) /etc/monotone
+%dir %attr(0750,root,monotone) /etc/monotone/private-keys
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/monotonerc
+%attr(0440,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/passphrase.lua
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/read-permissions
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/write-permissions
+ %attr(0750,root,monotone) /etc/monotone/private-keys
 %dir %attr(0770,monotone,monotone) /var/db/monotone
 %attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.db
-%attr(0600,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/passphrase.lua
 
 %pre server
 # Add the "monotone" user
@@ -136,6 +151,9 @@
 # Register the monotone service
 /sbin/chkconfig --add monotone
 
+# Restart the running server, which will update its db format when needed.
+/sbin/service monotone condrestart
+
 %preun server
 if [ $1 = 0 ]; then
 	/sbin/service monotone stop > /dev/null 2>&1
@@ -144,6 +162,9 @@
 
 
 %changelog
+* Sun Dec 11 2005 Roland McGrath  - 0.24-1
+- Updated for 0.24 release.
+
 * Mon Oct  3 2005 Roland McGrath  - 0.23-1
 - Updated for 0.23 release.
 


Index: monotone.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monotone.sysconfig	23 Aug 2005 05:31:11 -0000	1.1
+++ monotone.sysconfig	12 Dec 2005 02:38:33 -0000	1.2
@@ -1,9 +1,10 @@
-MONOTONERC=/etc/monotonerc
+MONOTONE_CONFDIR=/etc/monotone
+MONOTONE_KEYDIR=/etc/monotone/private-keys
 MONOTONE_DBFILE=/var/db/monotone/server.db
-MONOTONE_PPFILE=/var/db/monotone/passphrase.lua
+MONOTONE_PPFILE=/etc/monotone/passphrase.lua
 
-MONOTONE_RCOPTS="--norc --rcfile=$MONOTONERC"
-MONOTONE_DBOPTS="--db=$MONOTONE_DBFILE"
+MONOTONE_RCOPTS="--confdir=$MONOTONE_CONFDIR"
+MONOTONE_DBOPTS="--db=$MONOTONE_DBFILE --keydir=$MONOTONE_KEYDIR"
 MONOTONE_PPOPTS="--rcfile=$MONOTONE_PPFILE"
 
-MONOTONE_SERVE_OPTS="0.0.0.0 '*'"
+MONOTONE_SERVE_OPTS="'*'"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Oct 2005 03:02:27 -0000	1.4
+++ sources	12 Dec 2005 02:38:33 -0000	1.5
@@ -1 +1 @@
-6d9e909480c2be0b23e2820c3a42e6f1  monotone-0.23.tar.gz
+8193203c8b48104500d956f9e524bfcd  monotone-0.24.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 02:42:33 2005
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Sun, 11 Dec 2005 21:42:33 -0500
Subject: rpms/monotone/FC-4 monotone-xfail-if-root.patch,1.1,NONE
Message-ID: <200512120242.jBC2gXDc009326@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9316

Removed Files:
	monotone-xfail-if-root.patch 
Log Message:
Remove obsolete patch


--- monotone-xfail-if-root.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Dec 12 10:01:31 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Dec 2005 05:01:31 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.13,1.14
Message-ID: <200512121002.jBCA22dN023445@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23409

Modified Files:
	cernlib.spec 
Log Message:
remove devel specific Requires



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cernlib.spec	9 Dec 2005 20:16:01 -0000	1.13
+++ cernlib.spec	12 Dec 2005 10:01:28 -0000	1.14
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.2
+Release:       8%{?dist}.3
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -200,8 +200,6 @@
 %package devel
 Summary:       General purpose CERN library static libraries and headers
 Requires:      lapack-devel blas-devel openmotif-devel
-# workaround #173530
-Requires:      libXau-devel
 Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
 
@@ -693,7 +691,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8.2
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.3
 - use new debian patchset
 - enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary



From fedora-extras-commits at redhat.com  Mon Dec 12 10:04:06 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 12 Dec 2005 05:04:06 -0500
Subject: rpms/cernlib/FC-3 cernlib.spec,1.10,1.11
Message-ID: <200512121004.jBCA4cLj023517@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23493

Modified Files:
	cernlib.spec 
Log Message:
Modify Requires to suit FC-3 and not FC-4/devel



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cernlib.spec	9 Dec 2005 17:31:10 -0000	1.10
+++ cernlib.spec	12 Dec 2005 10:04:04 -0000	1.11
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.3
+Release:       8%{?dist}.4
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -198,9 +198,7 @@
 
 %package devel
 Summary:       General purpose CERN library static libraries and headers
-Requires:      lapack-devel blas-devel openmotif-devel
-# workaround #173530
-Requires:      libXau-devel
+Requires:      lapack blas openmotif-devel
 Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
 
@@ -692,7 +690,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas  - 2005-8.3
+* Fri Dec  9 2005 Patrice Dumas  - 2005-8.4
 - update with newer debian patchset for cernlib, fix licence issues
 - enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary



From fedora-extras-commits at redhat.com  Mon Dec 12 11:30:15 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 12 Dec 2005 06:30:15 -0500
Subject: rpms/kasumi/FC-3 .cvsignore, 1.3, 1.4 kasumi.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200512121130.jBCBUjVv025390@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/kasumi/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25365

Modified Files:
	.cvsignore kasumi.spec sources 
Log Message:
* Mon Dec 12 2005 Akira TAGOH  - 1.0-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kasumi/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2005 07:28:58 -0000	1.3
+++ .cvsignore	12 Dec 2005 11:30:13 -0000	1.4
@@ -1,2 +1,3 @@
 kasumi-0.9.tar.gz
 kasumi-0.10.tar.gz
+kasumi-1.0.tar.gz


Index: kasumi.spec
===================================================================
RCS file: /cvs/extras/rpms/kasumi/FC-3/kasumi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kasumi.spec	13 Oct 2005 07:28:58 -0000	1.3
+++ kasumi.spec	12 Dec 2005 11:30:13 -0000	1.4
@@ -1,5 +1,5 @@
 Name:    kasumi
-Version: 0.10
+Version: 1.0
 Release: 1%{?dist}
 
 License: GPL
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Dec 12 2005 Akira TAGOH  - 1.0-1
+- New upstream release.
+
 * Thu Oct 13 2005 Akira TAGOH  - 0.10-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kasumi/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2005 07:28:58 -0000	1.3
+++ sources	12 Dec 2005 11:30:13 -0000	1.4
@@ -1 +1 @@
-bfeba1ef78a15da7f180f04ec271f987  kasumi-0.10.tar.gz
+15314d8eaaf83abf5fd41b93be8ce91f  kasumi-1.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 13:11:08 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 12 Dec 2005 08:11:08 -0500
Subject: rpms/gnome-sudoku - New directory
Message-ID: <200512121311.jBCDB81F028817@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28808/gnome-sudoku

Log Message:
Directory /cvs/extras/rpms/gnome-sudoku added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 12 13:11:13 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 12 Dec 2005 08:11:13 -0500
Subject: rpms/gnome-sudoku/devel - New directory
Message-ID: <200512121311.jBCDBD6N028833@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28808/gnome-sudoku/devel

Log Message:
Directory /cvs/extras/rpms/gnome-sudoku/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 12 13:11:27 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 12 Dec 2005 08:11:27 -0500
Subject: rpms/gnome-sudoku Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512121311.jBCDBR7P028868@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28855

Added Files:
	Makefile import.log 
Log Message:
Setup of module gnome-sudoku


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-sudoku
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 12 13:11:32 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 12 Dec 2005 08:11:32 -0500
Subject: rpms/gnome-sudoku/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512121311.jBCDBWRh028887@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28855/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-sudoku


--- NEW 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 Dec 12 13:12:01 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 12 Dec 2005 08:12:01 -0500
Subject: rpms/gnome-sudoku import.log,1.1,1.2
Message-ID: <200512121312.jBCDCVq9028959@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28921

Modified Files:
	import.log 
Log Message:
auto-import gnome-sudoku-0.3.4-1 on branch devel from gnome-sudoku-0.3.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Dec 2005 13:11:25 -0000	1.1
+++ import.log	12 Dec 2005 13:11:59 -0000	1.2
@@ -0,0 +1 @@
+gnome-sudoku-0_3_4-1:HEAD:gnome-sudoku-0.3.4-1.src.rpm:1134393082



From fedora-extras-commits at redhat.com  Mon Dec 12 13:12:06 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 12 Dec 2005 08:12:06 -0500
Subject: rpms/gnome-sudoku/devel gnome-sudoku.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512121312.jBCDCb9Y028963@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28921/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-sudoku.spec 
Log Message:
auto-import gnome-sudoku-0.3.4-1 on branch devel from gnome-sudoku-0.3.4-1.src.rpm


--- NEW FILE gnome-sudoku.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:           gnome-sudoku
Version:        0.3.4
Release:        1%{?dist}
Summary:        GNOME based Sudoku, a logic puzzle game

Group:          Amusements/Games
License:        GPL
URL:            http://gnome-sudoku.sourceforge.net
Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  pygtk2-libglade
BuildRequires:	gnome-python2-gnomeprint, python-imaging
BuildRequires:	desktop-file-utils
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
Requires:   gnome-python2-gnomeprint, python-imaging

%description
GNOME Sudoku is a Japanese logic puzzle game.  GNOME Sudoku takes care
to generate valid sudoku -- symmetrical puzzles for which there is a
unique solution.

%prep
%setup -q
# Fix one hardcoding instance
sed -i 's!/usr/local!%{_prefix}!g' src/lib/game_selector.py
# This must be something internal to the developer's system
for i in src/lib/*.py ; do
    sed -i 's!.*simple_debug.*!!g' "$i"
done


%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
desktop-file-install --vendor fedora \
		     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
		     --add-category X-Fedora \
		     ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING FAQ README
%dir %{python_sitelib}/gnome_sudoku/
%{python_sitelib}/gnome_sudoku/*
%{_datadir}/applications/fedora-%{name}.desktop
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/*
%{_datadir}/pixmaps/sudoku.png
%{_bindir}/%{name}


%changelog
* Sun Dec 11 2005 Paul W. Frields  - 0.3.4-1
- Fix to fedora-rpmdevtools standards

* Sat Dec  3 2005 Paul W. Frields  - 0.3.4-0.9
- Initial RPM version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Dec 2005 13:11:30 -0000	1.1
+++ .cvsignore	12 Dec 2005 13:12:04 -0000	1.2
@@ -0,0 +1 @@
+gnome-sudoku-0.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Dec 2005 13:11:30 -0000	1.1
+++ sources	12 Dec 2005 13:12:04 -0000	1.2
@@ -0,0 +1 @@
+6b411c8f925b0f9ce0ac195400c08f6a  gnome-sudoku-0.3.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 13:15:40 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 12 Dec 2005 08:15:40 -0500
Subject: owners owners.list,1.440,1.441
Message-ID: <200512121316.jBCDGARE029029@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29011

Modified Files:
	owners.list 
Log Message:
Added gnome-sudoku


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- owners.list	11 Dec 2005 23:53:24 -0000	1.440
+++ owners.list	12 Dec 2005 13:15:38 -0000	1.441
@@ -289,6 +289,7 @@
 Fedora Extras|gnome-common|Useful things common to building gnome packages from scratch|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-cpufreq-applet|CPU frequency scaling monitor applet|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-password-generator|Graphical secure password generator|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-sudoku|GNOME based Sudoku, a logic puzzle game|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnomesword|GNOME-based Bible research tool|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-telnet|A fancy GNOME telnet client|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks|An attractive GTK+ 2 engine with a focus on usability|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 12 14:05:35 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 12 Dec 2005 09:05:35 -0500
Subject: rpms/perl-Crypt-DH/FC-3 perl-Crypt-DH.spec,1.2,1.3
Message-ID: <200512121406.jBCE66H2030821@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30797

Modified Files:
	perl-Crypt-DH.spec 
Log Message:
Add support for FC-3, which doesn't have %bcond_with{,out} predefined



Index: perl-Crypt-DH.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DH/FC-3/perl-Crypt-DH.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Crypt-DH.spec	9 Dec 2005 08:32:25 -0000	1.2
+++ perl-Crypt-DH.spec	12 Dec 2005 14:05:33 -0000	1.3
@@ -1,11 +1,13 @@
 # To skip the lengthy test suite, use:
 # rpmbuild --without checks
+%{!?bcond_with:%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}}
+%{!?bcond_without:%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}}
 %bcond_without checks
 
 Summary:	Perl module implementing the Diffie-Hellman key exchange system
 Name:		perl-Crypt-DH
 Version:	0.06
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-DH/
@@ -48,6 +50,9 @@
 %{_mandir}/man3/Crypt::DH.3pm*
 
 %changelog
+* Mon Dec 12 2005 Paul Howarth  0.06-3
+- Add support for FC-3, which doesn't have %%bcond_with{,out} predefined
+
 * Fri Dec  9 2005 Paul Howarth  0.06-2
 - Add facility to skip test suite at build time if desired
 



From fedora-extras-commits at redhat.com  Mon Dec 12 14:07:32 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 12 Dec 2005 09:07:32 -0500
Subject: rpms/perl-Crypt-DH/FC-4 perl-Crypt-DH.spec,1.2,1.3
Message-ID: <200512121408.jBCE838N030857@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30831

Modified Files:
	perl-Crypt-DH.spec 
Log Message:
resync with FC-3



Index: perl-Crypt-DH.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DH/FC-4/perl-Crypt-DH.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Crypt-DH.spec	9 Dec 2005 08:32:25 -0000	1.2
+++ perl-Crypt-DH.spec	12 Dec 2005 14:07:30 -0000	1.3
@@ -1,11 +1,13 @@
 # To skip the lengthy test suite, use:
 # rpmbuild --without checks
+%{!?bcond_with:%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}}
+%{!?bcond_without:%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}}
 %bcond_without checks
 
 Summary:	Perl module implementing the Diffie-Hellman key exchange system
 Name:		perl-Crypt-DH
 Version:	0.06
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-DH/
@@ -48,6 +50,9 @@
 %{_mandir}/man3/Crypt::DH.3pm*
 
 %changelog
+* Mon Dec 12 2005 Paul Howarth  0.06-3
+- Add support for FC-3, which doesn't have %%bcond_with{,out} predefined
+
 * Fri Dec  9 2005 Paul Howarth  0.06-2
 - Add facility to skip test suite at build time if desired
 



From fedora-extras-commits at redhat.com  Mon Dec 12 14:09:20 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 12 Dec 2005 09:09:20 -0500
Subject: rpms/perl-Crypt-DH/devel perl-Crypt-DH.spec,1.2,1.3
Message-ID: <200512121409.jBCE9pn2030888@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-DH/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30863

Modified Files:
	perl-Crypt-DH.spec 
Log Message:
resync with FC-3



Index: perl-Crypt-DH.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DH/devel/perl-Crypt-DH.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Crypt-DH.spec	9 Dec 2005 08:32:25 -0000	1.2
+++ perl-Crypt-DH.spec	12 Dec 2005 14:09:13 -0000	1.3
@@ -1,11 +1,13 @@
 # To skip the lengthy test suite, use:
 # rpmbuild --without checks
+%{!?bcond_with:%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}}
+%{!?bcond_without:%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}}
 %bcond_without checks
 
 Summary:	Perl module implementing the Diffie-Hellman key exchange system
 Name:		perl-Crypt-DH
 Version:	0.06
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Crypt-DH/
@@ -48,6 +50,9 @@
 %{_mandir}/man3/Crypt::DH.3pm*
 
 %changelog
+* Mon Dec 12 2005 Paul Howarth  0.06-3
+- Add support for FC-3, which doesn't have %%bcond_with{,out} predefined
+
 * Fri Dec  9 2005 Paul Howarth  0.06-2
 - Add facility to skip test suite at build time if desired
 



From fedora-extras-commits at redhat.com  Mon Dec 12 14:10:03 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 12 Dec 2005 09:10:03 -0500
Subject: fedora-security/audit fc4,1.103,1.104 fc5,1.14,1.15
Message-ID: <200512121410.jBCEAZa9030910@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30887

Modified Files:
	fc4 fc5 
Log Message:
Deal with kernel FC4 update



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- fc4	11 Dec 2005 20:14:26 -0000	1.103
+++ fc4	12 Dec 2005 14:10:01 -0000	1.104
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20051207
-Up to date FC4 as of 200501127
+Up to date CVE as of CVE email 20051211
+Up to date FC4 as of 20051211
 
 ** are items that need attention
 
@@ -17,7 +17,7 @@
 CVE-2005-3191 VULNERABLE (kdegraphics)
 CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3191 backport (poppler) [since FEDORA-2005-1132]
-CVE-2005-3964 VULNERABLE (openmotif)
+CVE-2005-3964 VULNERABLE (openmotif) bz#174815
 CVE-2005-3962 backport (perl) [since FEDORA-2005-1113]
 CVE-2005-3912 backport (perl) [since FEDORA-2005-1113]
 CVE-2005-3883 VULNERABLE (php)
@@ -25,14 +25,14 @@
 CVE-2005-3857 VULNERABLE (kernel, fixed 2.6.15)
 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 VULNERABLE (kernel, fixed 2.6.15) affects 2.6.14 only [vulnerable since FEDORA-2005-1067]
-CVE-2005-3809 VULNERABLE (kernel, fixed 2.6.15) affects 2.6.14 only [vulnerable since FEDORA-2005-1067]
-CVE-2005-3808 VULNERABLE (kernel)
-CVE-2005-3807 VULNERABLE (kernel) bz#172691
+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-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 VULNERABLE (kernel, fixed 2.6.15)
-CVE-2005-3783 VULNERABLE (kernel, fixed 2.6.14.2)
+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-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
@@ -136,6 +136,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-2708 ignore (kernel) not reproducable on x86_64
 CVE-2005-2707 version (thunderbird) [since FEDORA-2005-963]
 CVE-2005-2707 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
@@ -567,6 +568,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
+CVE-2004-2607 version (kernel, fixed 2.6.5)
 CVE-2004-2589 version (gaim, fixed 0.82)
 CVE-2004-2546 version (samba, fixed 3.0.6)
 CVE-2004-2541 blocked (cscope) by FORTIFY_SOURCE


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fc5	9 Dec 2005 22:13:29 -0000	1.14
+++ fc5	12 Dec 2005 14:10:01 -0000	1.15
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20051207
+Up to date CVE as of CVE email 20051211
 Up to date FC5 as of FC5-Test1-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -141,6 +141,7 @@
 CVE-2005-2794 version (squid, fixed 2.5.STABLE11)
 CVE-2005-2728 backport (httpd, fixed 2.0.55) 
 CVE-2005-2710 version (HelixPlayer, fixed 1.0.6)
+CVE-2005-2709 VULNERABLE (kernel, fixed 2.6.14.3)
 CVE-2005-2708 ignore (kernel) not reproducable on x86_64
 CVE-2005-2707 version (thunderbird)
 CVE-2005-2707 version (firefox, fixed 1.0.7)
@@ -598,6 +599,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
+CVE-2004-2607 version (kernel, fixed 2.6.5)
 CVE-2004-2589 version (gaim, fixed 0.82)
 CVE-2004-2546 version (samba, fixed 3.0.6)
 CVE-2004-2541 blocked (cscope) by FORTIFY_SOURCE



From fedora-extras-commits at redhat.com  Mon Dec 12 15:13:30 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 12 Dec 2005 10:13:30 -0500
Subject: rpms/ircd-hybrid import.log,1.15,1.16
Message-ID: <200512121514.jBCFE1RC000345@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv306

Modified Files:
	import.log 
Log Message:
auto-import ircd-hybrid-7.2.0-4 on branch devel from ircd-hybrid-7.2.0-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- import.log	9 Dec 2005 22:08:28 -0000	1.15
+++ import.log	12 Dec 2005 15:13:28 -0000	1.16
@@ -12,3 +12,4 @@
 ircd-hybrid-7_2_0-2:HEAD:ircd-hybrid-7.2.0-2.src.rpm:1134155655
 ircd-hybrid-7_2_0-2:FC-4:ircd-hybrid-7.2.0-2.src.rpm:1134165805
 ircd-hybrid-7_2_0-2:FC-3:ircd-hybrid-7.2.0-2.src.rpm:1134166074
+ircd-hybrid-7_2_0-4:HEAD:ircd-hybrid-7.2.0-4.src.rpm:1134400398



From fedora-extras-commits at redhat.com  Mon Dec 12 15:13:36 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 12 Dec 2005 10:13:36 -0500
Subject: rpms/ircd-hybrid/devel ircd-hybrid-7.2.0-help.diff, NONE,
	1.1 ircd-hybrid.spec, 1.6, 1.7
Message-ID: <200512121514.jBCFE6Zn000348@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv306/devel

Modified Files:
	ircd-hybrid.spec 
Added Files:
	ircd-hybrid-7.2.0-help.diff 
Log Message:
auto-import ircd-hybrid-7.2.0-4 on branch devel from ircd-hybrid-7.2.0-4.src.rpm

ircd-hybrid-7.2.0-help.diff:

--- NEW FILE ircd-hybrid-7.2.0-help.diff ---
--- ircd-hybrid-7.2.0/help/Makefile.old	2005-12-09 06:52:54.000000000 +0100
+++ ircd-hybrid-7.2.0/help/Makefile.in	2005-12-12 15:26:05.000000000 +0100
@@ -41,7 +41,8 @@
 	done
 	@for link in $(SYMLINKS); do \
 		rm -f $(uhelpdir)/$$link; \
-		ln -s $(ohelpdir)/$$link $(uhelpdir); \
+		cd $(uhelpdir); \
+		ln -s ../opers/$$link .; \
 	done
 
 distclean:


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/devel/ircd-hybrid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ircd-hybrid.spec	9 Dec 2005 19:14:31 -0000	1.6
+++ ircd-hybrid.spec	12 Dec 2005 15:13:34 -0000	1.7
@@ -10,12 +10,13 @@
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
 Version: 7.2.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
+Patch0:  ircd-hybrid-7.2.0-help.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): fedora-usermgmt
@@ -32,24 +33,23 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
 # Change modules/autoload path (IRCD_PREFIX "/modules/autoload/" - by default)
 # Change modules path (IRCD_PREFIX "/modules/" - by default)
 %{__perl} -pi -e 's|(^#define ETCPATH) .*|$1 "%{_sysconfdir}/ircd"|g;
-                  s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g;
-		   s|(^#define AUTOMODPATH IRCD_PREFIX) .*|#define AUTOMODPATH "%{_libdir}/ircd/modules/autoload/"|g;
-                  s|(^#define MODPATH) .*|$1 "%{_libdir}/ircd/modules/"|g' \
+                  s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g' \
    include/defaults.h
 #Added for x86_64 arch support
 sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
-
 %build
 %configure \
+    --prefix=%{_libdir}/ircd \
     --sysconfdir=%{_sysconfdir}/ircd \
-   --with-nicklen=%{nicklen} \
+    --with-nicklen=%{nicklen} \
     --with-topiclen=%{topiclen} \
     --with-maxconn=%{maxconn}
 %{__make} %{?_smp_mflags}
@@ -57,8 +57,10 @@
 
 %install
 %{__rm} -rf %{buildroot}
+
 %makeinstall \
-    sysconfdir=%{buildroot}%{_sysconfdir}/ircd
+   prefix=%{buildroot}%{_libdir}/ircd \
+   sysconfdir=%{buildroot}%{_sysconfdir}/ircd
 
 %{__install} -m 0755 -D %{SOURCE1} %{buildroot}%{_initrddir}/ircd
 %{__install} -m 0640 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ircd
@@ -77,13 +79,9 @@
 %{__rm} -r   %{buildroot}%{_localstatedir}/logs/
 %{__mkdir_p} %{buildroot}%{_var}/log/ircd/
 
-chmod 755 %{buildroot}%{_prefix}/modules/*.so
-chmod 755 %{buildroot}%{_prefix}/modules/autoload/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd/modules/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd/modules/autoload/*.so
 
-# Move modules directory which we changed previously (same remark as above)
-%{__mkdir_p} %{buildroot}%{_libdir}/ircd/modules/
-%{__mv}      %{buildroot}%{_prefix}/modules/* \
-             %{buildroot}%{_libdir}/ircd/modules/.
 %{__mkdir_p} %{buildroot}%{_var}/lib/ircd
 
 %clean
@@ -120,15 +118,20 @@
 %{_sysconfdir}/rc.d/init.d/ircd
 %{_bindir}/ircd
 %{_bindir}/servlink
-%{_libdir}/ircd/
+%{_libdir}/ircd
 %{_libexecdir}/ircd/
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-%exclude %{_prefix}/help
 
 
 %changelog
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-4
+- Modify spec file to help files
+
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-3
+- Modify spec file to use configure correctly 
+
 * Fri Dec 09 2005 Eric Tanguy 7.2.0-2
 - Modify spec file to take into account the 7.2.0 update
 



From fedora-extras-commits at redhat.com  Mon Dec 12 15:15:08 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 12 Dec 2005 10:15:08 -0500
Subject: rpms/ircd-hybrid import.log,1.16,1.17
Message-ID: <200512121515.jBCFFcaL000447@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv410

Modified Files:
	import.log 
Log Message:
auto-import ircd-hybrid-7.2.0-4 on branch FC-4 from ircd-hybrid-7.2.0-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- import.log	12 Dec 2005 15:13:28 -0000	1.16
+++ import.log	12 Dec 2005 15:15:06 -0000	1.17
@@ -13,3 +13,4 @@
 ircd-hybrid-7_2_0-2:FC-4:ircd-hybrid-7.2.0-2.src.rpm:1134165805
 ircd-hybrid-7_2_0-2:FC-3:ircd-hybrid-7.2.0-2.src.rpm:1134166074
 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



From fedora-extras-commits at redhat.com  Mon Dec 12 15:15:14 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 12 Dec 2005 10:15:14 -0500
Subject: rpms/ircd-hybrid/FC-4 ircd-hybrid-7.2.0-help.diff, NONE,
	1.1 ircd-hybrid.spec, 1.5, 1.6
Message-ID: <200512121515.jBCFFite000450@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv410/FC-4

Modified Files:
	ircd-hybrid.spec 
Added Files:
	ircd-hybrid-7.2.0-help.diff 
Log Message:
auto-import ircd-hybrid-7.2.0-4 on branch FC-4 from ircd-hybrid-7.2.0-4.src.rpm

ircd-hybrid-7.2.0-help.diff:

--- NEW FILE ircd-hybrid-7.2.0-help.diff ---
--- ircd-hybrid-7.2.0/help/Makefile.old	2005-12-09 06:52:54.000000000 +0100
+++ ircd-hybrid-7.2.0/help/Makefile.in	2005-12-12 15:26:05.000000000 +0100
@@ -41,7 +41,8 @@
 	done
 	@for link in $(SYMLINKS); do \
 		rm -f $(uhelpdir)/$$link; \
-		ln -s $(ohelpdir)/$$link $(uhelpdir); \
+		cd $(uhelpdir); \
+		ln -s ../opers/$$link .; \
 	done
 
 distclean:


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-4/ircd-hybrid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ircd-hybrid.spec	9 Dec 2005 22:04:11 -0000	1.5
+++ ircd-hybrid.spec	12 Dec 2005 15:15:12 -0000	1.6
@@ -10,12 +10,13 @@
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
 Version: 7.2.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
+Patch0:  ircd-hybrid-7.2.0-help.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): fedora-usermgmt
@@ -32,24 +33,23 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
 # Change modules/autoload path (IRCD_PREFIX "/modules/autoload/" - by default)
 # Change modules path (IRCD_PREFIX "/modules/" - by default)
 %{__perl} -pi -e 's|(^#define ETCPATH) .*|$1 "%{_sysconfdir}/ircd"|g;
-                  s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g;
-		   s|(^#define AUTOMODPATH IRCD_PREFIX) .*|#define AUTOMODPATH "%{_libdir}/ircd/modules/autoload/"|g;
-                  s|(^#define MODPATH) .*|$1 "%{_libdir}/ircd/modules/"|g' \
+                  s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g' \
    include/defaults.h
 #Added for x86_64 arch support
 sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
-
 %build
 %configure \
+    --prefix=%{_libdir}/ircd \
     --sysconfdir=%{_sysconfdir}/ircd \
-   --with-nicklen=%{nicklen} \
+    --with-nicklen=%{nicklen} \
     --with-topiclen=%{topiclen} \
     --with-maxconn=%{maxconn}
 %{__make} %{?_smp_mflags}
@@ -57,8 +57,10 @@
 
 %install
 %{__rm} -rf %{buildroot}
+
 %makeinstall \
-    sysconfdir=%{buildroot}%{_sysconfdir}/ircd
+   prefix=%{buildroot}%{_libdir}/ircd \
+   sysconfdir=%{buildroot}%{_sysconfdir}/ircd
 
 %{__install} -m 0755 -D %{SOURCE1} %{buildroot}%{_initrddir}/ircd
 %{__install} -m 0640 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ircd
@@ -77,13 +79,9 @@
 %{__rm} -r   %{buildroot}%{_localstatedir}/logs/
 %{__mkdir_p} %{buildroot}%{_var}/log/ircd/
 
-chmod 755 %{buildroot}%{_prefix}/modules/*.so
-chmod 755 %{buildroot}%{_prefix}/modules/autoload/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd/modules/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd/modules/autoload/*.so
 
-# Move modules directory which we changed previously (same remark as above)
-%{__mkdir_p} %{buildroot}%{_libdir}/ircd/modules/
-%{__mv}      %{buildroot}%{_prefix}/modules/* \
-             %{buildroot}%{_libdir}/ircd/modules/.
 %{__mkdir_p} %{buildroot}%{_var}/lib/ircd
 
 %clean
@@ -120,15 +118,20 @@
 %{_sysconfdir}/rc.d/init.d/ircd
 %{_bindir}/ircd
 %{_bindir}/servlink
-%{_libdir}/ircd/
+%{_libdir}/ircd
 %{_libexecdir}/ircd/
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-%exclude %{_prefix}/help
 
 
 %changelog
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-4
+- Modify spec file to help files
+
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-3
+- Modify spec file to use configure correctly 
+
 * Fri Dec 09 2005 Eric Tanguy 7.2.0-2
 - Modify spec file to take into account the 7.2.0 update
 



From fedora-extras-commits at redhat.com  Mon Dec 12 15:16:32 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 12 Dec 2005 10:16:32 -0500
Subject: rpms/ircd-hybrid import.log,1.17,1.18
Message-ID: <200512121517.jBCFH3iV000560@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv516

Modified Files:
	import.log 
Log Message:
auto-import ircd-hybrid-7.2.0-4 on branch FC-3 from ircd-hybrid-7.2.0-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- import.log	12 Dec 2005 15:15:06 -0000	1.17
+++ import.log	12 Dec 2005 15:16:30 -0000	1.18
@@ -14,3 +14,4 @@
 ircd-hybrid-7_2_0-2:FC-3:ircd-hybrid-7.2.0-2.src.rpm:1134166074
 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



From fedora-extras-commits at redhat.com  Mon Dec 12 15:16:38 2005
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Mon, 12 Dec 2005 10:16:38 -0500
Subject: rpms/ircd-hybrid/FC-3 ircd-hybrid-7.2.0-help.diff, NONE,
	1.1 ircd-hybrid.spec, 1.5, 1.6
Message-ID: <200512121517.jBCFH8kc000563@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ircd-hybrid/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv516/FC-3

Modified Files:
	ircd-hybrid.spec 
Added Files:
	ircd-hybrid-7.2.0-help.diff 
Log Message:
auto-import ircd-hybrid-7.2.0-4 on branch FC-3 from ircd-hybrid-7.2.0-4.src.rpm

ircd-hybrid-7.2.0-help.diff:

--- NEW FILE ircd-hybrid-7.2.0-help.diff ---
--- ircd-hybrid-7.2.0/help/Makefile.old	2005-12-09 06:52:54.000000000 +0100
+++ ircd-hybrid-7.2.0/help/Makefile.in	2005-12-12 15:26:05.000000000 +0100
@@ -41,7 +41,8 @@
 	done
 	@for link in $(SYMLINKS); do \
 		rm -f $(uhelpdir)/$$link; \
-		ln -s $(ohelpdir)/$$link $(uhelpdir); \
+		cd $(uhelpdir); \
+		ln -s ../opers/$$link .; \
 	done
 
 distclean:


Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/ircd-hybrid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ircd-hybrid.spec	9 Dec 2005 22:08:50 -0000	1.5
+++ ircd-hybrid.spec	12 Dec 2005 15:16:36 -0000	1.6
@@ -10,12 +10,13 @@
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
 Version: 7.2.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
+Patch0:  ircd-hybrid-7.2.0-help.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): fedora-usermgmt
@@ -32,24 +33,23 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
 # Change modules/autoload path (IRCD_PREFIX "/modules/autoload/" - by default)
 # Change modules path (IRCD_PREFIX "/modules/" - by default)
 %{__perl} -pi -e 's|(^#define ETCPATH) .*|$1 "%{_sysconfdir}/ircd"|g;
-                  s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g;
-		   s|(^#define AUTOMODPATH IRCD_PREFIX) .*|#define AUTOMODPATH "%{_libdir}/ircd/modules/autoload/"|g;
-                  s|(^#define MODPATH) .*|$1 "%{_libdir}/ircd/modules/"|g' \
+                  s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g' \
    include/defaults.h
 #Added for x86_64 arch support
 sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
-
 %build
 %configure \
+    --prefix=%{_libdir}/ircd \
     --sysconfdir=%{_sysconfdir}/ircd \
-   --with-nicklen=%{nicklen} \
+    --with-nicklen=%{nicklen} \
     --with-topiclen=%{topiclen} \
     --with-maxconn=%{maxconn}
 %{__make} %{?_smp_mflags}
@@ -57,8 +57,10 @@
 
 %install
 %{__rm} -rf %{buildroot}
+
 %makeinstall \
-    sysconfdir=%{buildroot}%{_sysconfdir}/ircd
+   prefix=%{buildroot}%{_libdir}/ircd \
+   sysconfdir=%{buildroot}%{_sysconfdir}/ircd
 
 %{__install} -m 0755 -D %{SOURCE1} %{buildroot}%{_initrddir}/ircd
 %{__install} -m 0640 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ircd
@@ -77,13 +79,9 @@
 %{__rm} -r   %{buildroot}%{_localstatedir}/logs/
 %{__mkdir_p} %{buildroot}%{_var}/log/ircd/
 
-chmod 755 %{buildroot}%{_prefix}/modules/*.so
-chmod 755 %{buildroot}%{_prefix}/modules/autoload/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd/modules/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd/modules/autoload/*.so
 
-# Move modules directory which we changed previously (same remark as above)
-%{__mkdir_p} %{buildroot}%{_libdir}/ircd/modules/
-%{__mv}      %{buildroot}%{_prefix}/modules/* \
-             %{buildroot}%{_libdir}/ircd/modules/.
 %{__mkdir_p} %{buildroot}%{_var}/lib/ircd
 
 %clean
@@ -120,15 +118,20 @@
 %{_sysconfdir}/rc.d/init.d/ircd
 %{_bindir}/ircd
 %{_bindir}/servlink
-%{_libdir}/ircd/
+%{_libdir}/ircd
 %{_libexecdir}/ircd/
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-%exclude %{_prefix}/help
 
 
 %changelog
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-4
+- Modify spec file to help files
+
+* Fri Dec 09 2005 Eric Tanguy 7.2.0-3
+- Modify spec file to use configure correctly 
+
 * Fri Dec 09 2005 Eric Tanguy 7.2.0-2
 - Modify spec file to take into account the 7.2.0 update
 



From fedora-extras-commits at redhat.com  Mon Dec 12 15:19:07 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Dec 2005 10:19:07 -0500
Subject: rpms/sobby - New directory
Message-ID: <200512121519.jBCFJ7e8000752@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/sobby
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv743/sobby

Log Message:
Directory /cvs/extras/rpms/sobby added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 12 15:19:12 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Dec 2005 10:19:12 -0500
Subject: rpms/sobby/devel - New directory
Message-ID: <200512121519.jBCFJCKk000768@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/sobby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv743/sobby/devel

Log Message:
Directory /cvs/extras/rpms/sobby/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 12 15:19:49 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Dec 2005 10:19:49 -0500
Subject: rpms/sobby Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512121519.jBCFJnJU000803@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/sobby
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv790

Added Files:
	Makefile import.log 
Log Message:
Setup of module sobby


--- NEW FILE Makefile ---
# Top level Makefile for module sobby
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 12 15:19:55 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Dec 2005 10:19:55 -0500
Subject: rpms/sobby/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512121519.jBCFJtNV000824@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/sobby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv790/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sobby


--- NEW 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 Dec 12 15:20:49 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Dec 2005 10:20:49 -0500
Subject: rpms/sobby import.log,1.1,1.2
Message-ID: <200512121521.jBCFLJeN000933@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/sobby
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv864

Modified Files:
	import.log 
Log Message:
auto-import sobby-0.3.0-1.rc3 on branch devel from sobby-0.3.0-1.rc3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sobby/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Dec 2005 15:19:47 -0000	1.1
+++ import.log	12 Dec 2005 15:20:47 -0000	1.2
@@ -0,0 +1 @@
+sobby-0_3_0-1_rc3:HEAD:sobby-0.3.0-1.rc3.src.rpm:1134401036



From fedora-extras-commits at redhat.com  Mon Dec 12 15:20:55 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Dec 2005 10:20:55 -0500
Subject: rpms/sobby/devel sobby.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200512121521.jBCFLPBk000937@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/sobby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv864/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sobby.spec 
Log Message:
auto-import sobby-0.3.0-1.rc3 on branch devel from sobby-0.3.0-1.rc3.src.rpm


--- NEW FILE sobby.spec ---
%define _rc rc3

Name:           sobby
Version:        0.3.0
Release:        1.%{_rc}%{?dist}
Summary:        Standalone obby server

Group:          Applications/Internet
License:        GPL
URL:            http://gobby.0x539.de
Source0:        http://releases.0x539.de/sobby/%{name}-%{version}%{_rc}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  obby-devel, glibmm24-devel

%description
Sobby is a standalone obby server.


%prep
%setup -q -n %{name}-%{version}%{_rc}


%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 README NEWS AUTHORS COPYING ChangeLog
%{_bindir}/sobby


%changelog
* Wed Dec 07 2005 Luke Macken  - 0.3.0-1.rc3
- Packaged for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sobby/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Dec 2005 15:19:53 -0000	1.1
+++ .cvsignore	12 Dec 2005 15:20:52 -0000	1.2
@@ -0,0 +1 @@
+sobby-0.3.0rc3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sobby/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Dec 2005 15:19:53 -0000	1.1
+++ sources	12 Dec 2005 15:20:52 -0000	1.2
@@ -0,0 +1 @@
+8c3538992f83527cfb9f0a42a9e2ed87  sobby-0.3.0rc3.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 15:21:54 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 12 Dec 2005 10:21:54 -0500
Subject: rpms/synce-gnomevfs - New directory
Message-ID: <200512121521.jBCFLs4x001003@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-gnomevfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv994/synce-gnomevfs

Log Message:
Directory /cvs/extras/rpms/synce-gnomevfs added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 12 15:22:00 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 12 Dec 2005 10:22:00 -0500
Subject: rpms/synce-gnomevfs/devel - New directory
Message-ID: <200512121522.jBCFM0tW001019@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-gnomevfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv994/synce-gnomevfs/devel

Log Message:
Directory /cvs/extras/rpms/synce-gnomevfs/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 12 15:22:22 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 12 Dec 2005 10:22:22 -0500
Subject: rpms/synce-gnomevfs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512121522.jBCFMMxC001056@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-gnomevfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1043

Added Files:
	Makefile import.log 
Log Message:
Setup of module synce-gnomevfs


--- NEW FILE Makefile ---
# Top level Makefile for module synce-gnomevfs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 12 15:22:28 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 12 Dec 2005 10:22:28 -0500
Subject: rpms/synce-gnomevfs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512121522.jBCFMSJr001077@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-gnomevfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1043/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module synce-gnomevfs


--- NEW 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 Dec 12 15:23:26 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 12 Dec 2005 10:23:26 -0500
Subject: rpms/synce-gnomevfs import.log,1.1,1.2
Message-ID: <200512121523.jBCFNuqu001159@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-gnomevfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1120

Modified Files:
	import.log 
Log Message:
auto-import synce-gnomevfs-0.9.0-1 on branch devel from synce-gnomevfs-0.9.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/synce-gnomevfs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Dec 2005 15:22:20 -0000	1.1
+++ import.log	12 Dec 2005 15:23:23 -0000	1.2
@@ -0,0 +1 @@
+synce-gnomevfs-0_9_0-1:HEAD:synce-gnomevfs-0.9.0-1.src.rpm:1134400993



From fedora-extras-commits at redhat.com  Mon Dec 12 15:23:31 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 12 Dec 2005 10:23:31 -0500
Subject: rpms/synce-gnomevfs/devel synce-gnomevfs-makefile.patch, NONE,
	1.1 synce-gnomevfs.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512121524.jBCFO1om001163@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-gnomevfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1120/devel

Modified Files:
	.cvsignore sources 
Added Files:
	synce-gnomevfs-makefile.patch synce-gnomevfs.spec 
Log Message:
auto-import synce-gnomevfs-0.9.0-1 on branch devel from synce-gnomevfs-0.9.0-1.src.rpm

synce-gnomevfs-makefile.patch:

--- NEW FILE synce-gnomevfs-makefile.patch ---
--- src/Makefile.am.orig	2005-08-23 01:29:41.000000000 +0200
+++ src/Makefile.am	2005-08-23 01:29:50.000000000 +0200
@@ -1,4 +1,4 @@
-AM_CFLAGS = -g -Wall -Werror
+AM_CFLAGS = -g -Wall
 module_flags = -export_dynamic -avoid-version -module -no-undefined
 
 INCLUDES=$(rapi_cflags) $(synce_cflags) $(VFS_CFLAGS)
--- src/Makefile.in.orig	2005-08-23 01:29:23.000000000 +0200
+++ src/Makefile.in	2005-08-23 01:29:39.000000000 +0200
@@ -187,7 +187,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AM_CFLAGS = -g -Wall -Werror
+AM_CFLAGS = -g -Wall
 module_flags = -export_dynamic -avoid-version -module -no-undefined
 INCLUDES = $(rapi_cflags) $(synce_cflags) $(VFS_CFLAGS)
 modulesconfdir = $(sysconfdir)/gnome-vfs-2.0/modules


--- NEW FILE synce-gnomevfs.spec ---
Name:           synce-gnomevfs
Version:        0.9.0
Release:        1
Summary:        Gnome-vfs module for synce

Group:          Applications/Communications
License:        MIT
URL:            http://synce.sourceforge.net/
Source0:        http://dl.sf.net/synce/synce-gnomevfs-0.9.0.tar.gz
Patch0:         synce-gnomevfs-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  synce-devel
BuildRequires:  gnome-vfs2-devel
BuildRequires:  ORBit2-devel
BuildRequires:  glib2-devel

Requires:       synce
Requires:       gnome-vfs2

%description
This is a gnome-vfs module that enables access to the Windows CE or Pocket
PC file system through the gnome-vfs functions.

%prep
%setup -q
%patch0

%build
%configure --disable-static --with-libsynce-include=%{_includedir} \
--with-libsynce-lib=%{_libdir} --with-librapi2-include=%{_includedir} \
--with-librapi2-lib=%{_libdir}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libsyncevfs.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog LICENSE NEWS
%{_bindir}/synce-in-computer-folder
%config(noreplace) %{_sysconfdir}/gnome-vfs-2.0/modules/synce-module.conf
%{_libdir}/gnome-vfs-2.0/modules/libsyncevfs.so
%{_datadir}/pixmaps/synce/synce-color.png
%{_datadir}/synce/synce-in-computer-folder.sh


%changelog
* Tue Aug 23 2005 Andreas Bierfert 
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synce-gnomevfs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Dec 2005 15:22:26 -0000	1.1
+++ .cvsignore	12 Dec 2005 15:23:29 -0000	1.2
@@ -0,0 +1 @@
+synce-gnomevfs-0.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synce-gnomevfs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Dec 2005 15:22:26 -0000	1.1
+++ sources	12 Dec 2005 15:23:29 -0000	1.2
@@ -0,0 +1 @@
+1fa8d653297331479edcd5d983a0f75e  synce-gnomevfs-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 15:31:59 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 12 Dec 2005 10:31:59 -0500
Subject: owners owners.list,1.441,1.442
Message-ID: <200512121532.jBCFWT0B001244@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1226

Modified Files:
	owners.list 
Log Message:
Add sobby



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- owners.list	12 Dec 2005 13:15:38 -0000	1.441
+++ owners.list	12 Dec 2005 15:31:57 -0000	1.442
@@ -1079,6 +1079,7 @@
 Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net
 Fedora Extras|snort|An intrusion detection system|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org|
+Fedora Extras|sobby|Standalone obby server|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sodipodi|Vector-based drawing program|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|sopwith|SDL port of sopwith|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|SoQt|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 12 16:07:08 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 12 Dec 2005 11:07:08 -0500
Subject: rpms/verbiste/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 verbiste.spec, 1.7, 1.8
Message-ID: <200512121607.jBCG7cTO002985@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/verbiste/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2940/devel

Modified Files:
	.cvsignore sources verbiste.spec 
Log Message:
Version 0.1.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/verbiste/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Oct 2005 02:34:17 -0000	1.5
+++ .cvsignore	12 Dec 2005 16:07:06 -0000	1.6
@@ -1 +1 @@
-verbiste-0.1.13.tar.gz
+verbiste-0.1.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/verbiste/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Oct 2005 02:34:17 -0000	1.5
+++ sources	12 Dec 2005 16:07:06 -0000	1.6
@@ -1 +1 @@
-972ae6c8136761e51755f6c193ab0626  verbiste-0.1.13.tar.gz
+8e19a1a0f6e1abdc9d34f025a02791f6  verbiste-0.1.14.tar.gz


Index: verbiste.spec
===================================================================
RCS file: /cvs/extras/rpms/verbiste/devel/verbiste.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- verbiste.spec	14 Oct 2005 02:34:17 -0000	1.7
+++ verbiste.spec	12 Dec 2005 16:07:06 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           verbiste
-Version:        0.1.13
+Version:        0.1.14
 Release:        1%{?dist}
 Summary:        French conjugation system
 
@@ -48,24 +48,24 @@
 
 
 %install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
-rm -rf %{buildroot}%{_defaultdocdir}
-rm -f %{buildroot}%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT%{_docdir}
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # This file gets created on x86_64 for no apparent reason.
 # It's owned by glibc-common.
-rm -f %{buildroot}%{_datadir}/locale/locale.alias
+rm -f $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias
 desktop-file-install \
   --delete-original                                     \
   --vendor fedora                                       \
-  --dir %{buildroot}%{_datadir}/applications            \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
   --add-category X-Fedora                               \
-  %{buildroot}%{_datadir}/applications/%{name}.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -101,6 +101,10 @@
 
 
 %changelog
+* Mon Dec 12 2005 Konstantin Ryabitsev  - 0.1.14-1
+- Version 0.1.14
+- Switch to RPM_BUILD_ROOT notation
+
 * Thu Oct 13 2005 Konstantin Ryabitsev  - 0.1.13-1
 - Version 0.1.13.
 



From fedora-extras-commits at redhat.com  Mon Dec 12 16:06:43 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 12 Dec 2005 11:06:43 -0500
Subject: rpms/verbiste/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 verbiste.spec, 1.8, 1.9
Message-ID: <200512121607.jBCG7lMN002990@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/verbiste/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2940/FC-4

Modified Files:
	.cvsignore sources verbiste.spec 
Log Message:
Version 0.1.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/verbiste/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Oct 2005 02:32:37 -0000	1.5
+++ .cvsignore	12 Dec 2005 16:06:40 -0000	1.6
@@ -1 +1 @@
-verbiste-0.1.13.tar.gz
+verbiste-0.1.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/verbiste/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Oct 2005 02:32:37 -0000	1.5
+++ sources	12 Dec 2005 16:06:41 -0000	1.6
@@ -1 +1 @@
-972ae6c8136761e51755f6c193ab0626  verbiste-0.1.13.tar.gz
+8e19a1a0f6e1abdc9d34f025a02791f6  verbiste-0.1.14.tar.gz


Index: verbiste.spec
===================================================================
RCS file: /cvs/extras/rpms/verbiste/FC-4/verbiste.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- verbiste.spec	14 Oct 2005 02:32:37 -0000	1.8
+++ verbiste.spec	12 Dec 2005 16:06:41 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           verbiste
-Version:        0.1.13
+Version:        0.1.14
 Release:        1%{?dist}
 Summary:        French conjugation system
 
@@ -48,24 +48,24 @@
 
 
 %install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
-rm -rf %{buildroot}%{_defaultdocdir}
-rm -f %{buildroot}%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT%{_docdir}
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # This file gets created on x86_64 for no apparent reason.
 # It's owned by glibc-common.
-rm -f %{buildroot}%{_datadir}/locale/locale.alias
+rm -f $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias
 desktop-file-install \
   --delete-original                                     \
   --vendor fedora                                       \
-  --dir %{buildroot}%{_datadir}/applications            \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
   --add-category X-Fedora                               \
-  %{buildroot}%{_datadir}/applications/%{name}.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
@@ -101,6 +101,10 @@
 
 
 %changelog
+* Mon Dec 12 2005 Konstantin Ryabitsev  - 0.1.14-1
+- Version 0.1.14
+- Switch to RPM_BUILD_ROOT notation
+
 * Thu Oct 13 2005 Konstantin Ryabitsev  - 0.1.13-1
 - Version 0.1.13.
 



From fedora-extras-commits at redhat.com  Mon Dec 12 16:22:30 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 12 Dec 2005 11:22:30 -0500
Subject: rpms/kdesvn/FC-4 .cvsignore, 1.2, 1.3 kdesvn.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200512121623.jBCGN0kM003142@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3120

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
- New upstream version 0.7.1
- Remove desktop patch fixed upstream
- locolor icons no longer shipped



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Nov 2005 21:12:30 -0000	1.2
+++ .cvsignore	12 Dec 2005 16:22:28 -0000	1.3
@@ -1 +1 @@
-kdesvn-0.6.3.tar.gz
+kdesvn-0.7.1.tar.gz


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/kdesvn.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdesvn.spec	7 Nov 2005 21:12:30 -0000	1.1
+++ kdesvn.spec	12 Dec 2005 16:22:28 -0000	1.2
@@ -1,13 +1,12 @@
 Name:           kdesvn
-Version:        0.6.3
-Release:        2%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        A subversion client for KDE
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://www.alwins-world.de/programs/kdesvn/
 Source0:        http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{version}.tar.gz
-Patch0:         kdesvn-0.6.3-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs-devel, neon-devel
@@ -29,7 +28,6 @@
 
 %prep
 %setup -q
-%patch -p1
 
 
 %build
@@ -91,11 +89,14 @@
 %{_datadir}/icons/hicolor/32x32/apps/kdesvn.png
 %{_datadir}/icons/hicolor/48x48/apps/kdesvn.png
 %{_datadir}/icons/hicolor/64x64/apps/kdesvn.png
-%{_datadir}/icons/locolor/16x16/apps/kdesvn.png
-%{_datadir}/icons/locolor/32x32/apps/kdesvn.png
 
 
 %changelog
+* Fri Dec  9 2005 - Orion Poplawski  - 0.7.1-1
+- New upstream version 0.7.1
+- Remove desktop patch fixed upstream
+- locolor icons no longer shipped
+
 * Fri Nov  4 2005 - Orion Poplawski  - 0.6.3-2
 - Make use of buildroot consistant
 - Just BuildRequires the "desktop-file-utils" package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Nov 2005 21:12:30 -0000	1.2
+++ sources	12 Dec 2005 16:22:28 -0000	1.3
@@ -1 +1 @@
-03becccdf357f9a711897f8805050974  kdesvn-0.6.3.tar.gz
+46c8acbd008c066e9101bc80b4549487  kdesvn-0.7.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 16:37:30 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 12 Dec 2005 11:37:30 -0500
Subject: rpms/kdesvn/devel .cvsignore, 1.3, 1.4 kdesvn.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200512121638.jBCGc13g003314@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3287

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
New upstream version 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2005 16:02:55 -0000	1.3
+++ .cvsignore	12 Dec 2005 16:37:28 -0000	1.4
@@ -1 +1 @@
-kdesvn-0.7.0rc1.tar.gz
+kdesvn-0.7.1.tar.gz


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdesvn.spec	21 Nov 2005 20:28:13 -0000	1.3
+++ kdesvn.spec	12 Dec 2005 16:37:28 -0000	1.4
@@ -1,8 +1,8 @@
-%define srcver  0.7.0rc1
+%define srcver  0.7.1
 
 Name:           kdesvn
-Version:        0.7.0
-Release:        0.rc1%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        A subversion client for KDE
 
 Group:          Development/Tools
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Fri Dec  9 2005 - Orion Poplawski  - 0.7.1-1
+- New upstream version 0.7.1
+
 * Sun Nov 20 2005 - Orion Poplawski  - 0.7.0-0.rc1
 - New upstream version 0.7.0rc1
 - Remove desktop patch fixed upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2005 16:02:55 -0000	1.3
+++ sources	12 Dec 2005 16:37:28 -0000	1.4
@@ -1 +1 @@
-22c209806517549af51d4137f184e26f  kdesvn-0.7.0rc1.tar.gz
+46c8acbd008c066e9101bc80b4549487  kdesvn-0.7.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 16:38:34 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 12 Dec 2005 11:38:34 -0500
Subject: rpms/synce-gnomevfs/devel synce-gnomevfs.spec,1.1,1.2
Message-ID: <200512121639.jBCGd4NZ003344@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-gnomevfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3325

Modified Files:
	synce-gnomevfs.spec 
Log Message:
- add dist tag



Index: synce-gnomevfs.spec
===================================================================
RCS file: /cvs/extras/rpms/synce-gnomevfs/devel/synce-gnomevfs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synce-gnomevfs.spec	12 Dec 2005 15:23:29 -0000	1.1
+++ synce-gnomevfs.spec	12 Dec 2005 16:38:32 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           synce-gnomevfs
 Version:        0.9.0
-Release:        1
+Release:        2%{?dist}
 Summary:        Gnome-vfs module for synce
 
 Group:          Applications/Communications
@@ -53,5 +53,10 @@
 
 
 %changelog
+* Mon Dec 12 2005 Andreas Bierfert 
+0.9.0-2
+- add dist tag
+
 * Tue Aug 23 2005 Andreas Bierfert 
+0.9.0-1
 - Initial Release



From fedora-extras-commits at redhat.com  Mon Dec 12 18:41:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 13:41:03 -0500
Subject: rpms/moodle - New directory
Message-ID: <200512121841.jBCIf3Xx007278@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/moodle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7269/moodle

Log Message:
Directory /cvs/extras/rpms/moodle added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 12 18:41:08 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 13:41:08 -0500
Subject: rpms/moodle/devel - New directory
Message-ID: <200512121841.jBCIf8ok007294@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7269/moodle/devel

Log Message:
Directory /cvs/extras/rpms/moodle/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 12 18:41:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 13:41:39 -0500
Subject: rpms/moodle Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512121841.jBCIfdoE007329@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/moodle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7316

Added Files:
	Makefile import.log 
Log Message:
Setup of module moodle


--- NEW FILE Makefile ---
# Top level Makefile for module moodle
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 12 18:41:44 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 13:41:44 -0500
Subject: rpms/moodle/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512121841.jBCIfiGu007348@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7316/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moodle


--- NEW 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 Dec 12 18:56:18 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 12 Dec 2005 13:56:18 -0500
Subject: rpms/kdesvn/devel kdesvn-0.7.1-x.patch, NONE, 1.1 kdesvn.spec, 1.4,
	1.5 kdesve-0.7.0rc1-x.patch, 1.1, NONE
Message-ID: <200512121856.jBCIum5w007479@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7444

Modified Files:
	kdesvn.spec 
Added Files:
	kdesvn-0.7.1-x.patch 
Removed Files:
	kdesve-0.7.0rc1-x.patch 
Log Message:
New patch - only remove check for X11 includes for pre-modular X compat


kdesvn-0.7.1-x.patch:

--- NEW FILE kdesvn-0.7.1-x.patch ---
--- kdesvn-0.7.1/configure.x11	2005-11-25 12:05:40.000000000 -0700
+++ kdesvn-0.7.1/configure	2005-12-12 10:27:42.000000000 -0700
@@ -26637,90 +26637,6 @@
 
 
 
-if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
-  # First, try using that file with no special directory specified.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$x_direct_test_include>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /usr/X11/include          \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done
-fi
-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = NO
-
 if test "$ac_x_libraries" = NO; then
   # Check for the libraries.
 


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdesvn.spec	12 Dec 2005 16:37:28 -0000	1.4
+++ kdesvn.spec	12 Dec 2005 18:56:16 -0000	1.5
@@ -9,7 +9,7 @@
 License:        GPL
 URL:            http://www.alwins-world.de/programs/kdesvn/
 Source0:        http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{srcver}.tar.gz
-Patch0:         kdesve-0.7.0rc1-x.patch
+Patch0:         kdesvn-0.7.1-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs-devel, neon-devel
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q -n %{name}-%{srcver}
-%patch -p1
+%patch -p1 -b .x11
 
 
 %build


--- kdesve-0.7.0rc1-x.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Dec 12 19:47:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 14:47:59 -0500
Subject: rpms/moodle import.log,1.1,1.2
Message-ID: <200512121948.jBCJmTCH009435@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/moodle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9386

Modified Files:
	import.log 
Log Message:
auto-import moodle-1.5.3-1 on branch devel from moodle-1.5.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/moodle/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Dec 2005 18:41:37 -0000	1.1
+++ import.log	12 Dec 2005 19:47:57 -0000	1.2
@@ -0,0 +1 @@
+moodle-1_5_3-1:HEAD:moodle-1.5.3-1.src.rpm:1134416867



From fedora-extras-commits at redhat.com  Mon Dec 12 19:48:05 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 14:48:05 -0500
Subject: rpms/moodle/devel moodle-1.5.2-mimetex-fedora.patch, NONE,
	1.1 moodle-1.5.2-mimetex-linux.patch, NONE,
	1.1 moodle-README-rpm, NONE, 1.1 moodle-config.php, NONE,
	1.1 moodle-cron, NONE, 1.1 moodle.conf, NONE, 1.1 moodle.cron,
	NONE, 1.1 moodle.init, NONE, 1.1 moodle.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512121948.jBCJm5AV009427@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9386/devel

Modified Files:
	.cvsignore sources 
Added Files:
	moodle-1.5.2-mimetex-fedora.patch 
	moodle-1.5.2-mimetex-linux.patch moodle-README-rpm 
	moodle-config.php moodle-cron moodle.conf moodle.cron 
	moodle.init moodle.spec 
Log Message:
auto-import moodle-1.5.3-1 on branch devel from moodle-1.5.3-1.src.rpm

moodle-1.5.2-mimetex-fedora.patch:

--- NEW FILE moodle-1.5.2-mimetex-fedora.patch ---
--- moodle/filter/tex/texdebug.php.mimetex-fedora	2005-10-10 16:27:00.000000000 -0400
+++ moodle/filter/tex/texdebug.php	2005-10-10 16:31:25.000000000 -0400
@@ -100,8 +100,8 @@
             if (file_exists($pathname)) {
                 unlink($pathname);
             }
-            $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.linux";
-            $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" ". escapeshellarg($texexp);
+            $commandpath="/var/www/cgi-bin/mimetex.cgi";
+            $cmd = "\"/var/www/cgi-bin/mimetex.cgi\" -e \"$pathname\" ". escapeshellarg($texexp);
             system($cmd, $status);
         }
         if ($return) {
--- moodle/filter/tex/texed.php.mimetex-fedora	2005-10-10 16:27:00.000000000 -0400
+++ moodle/filter/tex/texed.php	2005-10-10 16:31:35.000000000 -0400
@@ -23,7 +23,7 @@
             make_upload_directory($CFG->teximagedir);
         }
         $pathname = "$CFG->dataroot/$CFG->teximagedir/$image";
-        system("$CFG->dirroot/$CFG->texfilterdir/mimetex.linux -e $pathname -- ". escapeshellarg($texexp) );
+        system("/var/www/cgi-bin/mimetex.cgi -e $pathname -- ". escapeshellarg($texexp) );
         if (file_exists($pathname)) {
             $lastmodified = filemtime($pathname);
             header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastmodified) . " GMT");
--- moodle/filter/tex/pix.php.mimetex-fedora	2005-10-10 16:27:00.000000000 -0400
+++ moodle/filter/tex/pix.php	2005-10-10 16:30:51.000000000 -0400
@@ -41,7 +41,7 @@
             $texexp = preg_replace('!\r\n?!',' ',$texexp);
             $texexp = '\Large ' . $texexp;
 
-            $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" -- ". escapeshellarg($texexp);
+            $cmd = "\"/var/www/cgi-bin/mimetex.cgi\" -e \"$pathname\" -- ". escapeshellarg($texexp);
 
             system($cmd, $status);
         }

moodle-1.5.2-mimetex-linux.patch:

--- NEW FILE moodle-1.5.2-mimetex-linux.patch ---
--- web/filter/tex/texed.php.linux	2005-10-09 11:03:50.000000000 -0400
+++ web/filter/tex/texed.php	2005-10-09 11:04:14.000000000 -0400
@@ -23,20 +23,7 @@
             make_upload_directory($CFG->teximagedir);
         }
         $pathname = "$CFG->dataroot/$CFG->teximagedir/$image";
-        switch (PHP_OS) {
-            case "Linux":
-                system("$CFG->dirroot/$CFG->texfilterdir/mimetex.linux -e $pathname -- ". escapeshellarg($texexp) );
-            break;
-            case "WINNT":
-                case "WIN32":
-                case "Windows":
-                $texexp = str_replace('"','\"',$texexp);
-            system("$CFG->dirroot/$CFG->texfilterdir/mimetex.exe -e  $pathname -- \"$texexp\"");
-            break;
-            case "Darwin":
-                system("$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin -e $pathname -- ". escapeshellarg($texexp) );
-            break;
-        }
+        system("$CFG->dirroot/$CFG->texfilterdir/mimetex.linux -e $pathname -- ". escapeshellarg($texexp) );
         if (file_exists($pathname)) {
             $lastmodified = filemtime($pathname);
             header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastmodified) . " GMT");
--- web/filter/tex/texdebug.php.linux	2005-10-09 11:02:27.000000000 -0400
+++ web/filter/tex/texdebug.php	2005-10-09 11:03:19.000000000 -0400
@@ -100,34 +100,8 @@
             if (file_exists($pathname)) {
                 unlink($pathname);
             }
-            $commandpath = "";
-            $cmd = "";
-            switch (PHP_OS) {
-                case "Linux":
-                    $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.linux";           
-                $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" ". escapeshellarg($texexp);
-                break;
-                case "WINNT":
-                    case "WIN32":
-                    case "Windows":
-                    $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.exe";
-                $texexp = str_replace('"','\"',$texexp);
-                $cmd = str_replace(' ','^ ',$commandpath);
-                $cmd .= " ++ -e  \"$pathname\" \"$texexp\"";
-                break;
-                case "Darwin":
-                    $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin";
-                $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin\" -e \"$pathname\" ". escapeshellarg($texexp);
-                break;
-            }
-            if (!$cmd) {
-              if (is_executable("$CFG->dirroot/$CFG->texfilterdir/mimetex")) {   /// Use the custom binary
-                $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex";
-                $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex -e $pathname ". escapeshellarg($texexp);
-              } else {
-                error($error_message1);
-              }
-            }
+            $commandpath="$CFG->dirroot/$CFG->texfilterdir/mimetex.linux";
+            $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" ". escapeshellarg($texexp);
             system($cmd, $status);
         }
         if ($return) {
--- web/filter/tex/pix.php.linux	2005-10-09 10:59:13.000000000 -0400
+++ web/filter/tex/pix.php	2005-10-09 11:01:02.000000000 -0400
@@ -41,41 +41,8 @@
             $texexp = preg_replace('!\r\n?!',' ',$texexp);
             $texexp = '\Large ' . $texexp;
 
-            if ((PHP_OS == "WINNT") || (PHP_OS == "WIN32") || (PHP_OS == "Windows")) {
-                $texexp = str_replace('"','\"',$texexp);
-                $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex.exe";
-                $cmd = str_replace(' ','^ ',$cmd);
-                $cmd .= " ++ -e  \"$pathname\" -- \"$texexp\"";
-            } else if (is_executable("$CFG->dirroot/$CFG->texfilterdir/mimetex")) {   /// Use the custom binary
+            $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" -- ". escapeshellarg($texexp);
 
-                $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex -e $pathname -- ". escapeshellarg($texexp);
-
-            } else {                                                           /// Auto-detect the right TeX binary
-                switch (PHP_OS) {
-
-                    case "Linux":
-                        $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" -- ". escapeshellarg($texexp);
-                    break;
-
-                    case "Darwin":
-                        $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin\" -e \"$pathname\" -- ". escapeshellarg($texexp);
-                    break;
-
-                    default:      /// Nothing was found, so tell them how to fix it.
-                        if ($CFG->debug > 7) {
-                            echo "Make sure you have an appropriate MimeTeX binary here:\n\n";
-                            echo "    $CFG->dirroot/$CFG->texfilterdir/mimetex\n\n";
-                            echo "and that it has the right permissions set on it as executable program.\n\n";
-                            echo "You can get the latest binaries for your ".PHP_OS." platform from: \n\n";
-                            echo "    http://moodle.org/download/mimetex/";
-                        } else {
-                            echo "Mimetex executable was not found,\n";
-                            echo "Please turn on debug mode in site configuration to see more info here.";
-                        }
-                        die;
-                    break;
-                }
-            }
             system($cmd, $status);
         }
     }


--- NEW FILE moodle-README-rpm ---
Edit /var/www/moodle/web/config.php to the values you need to connect to your database. Once you've configured Moodle properly don't forget to run

 /sbin/service moodle start ; /sbin/chkconfig moodle on

in order to activate the Moodle cron job.


--- NEW FILE moodle-config.php ---
dbtype    = 'mysql'; // Valid values include: mysql postgres7
$CFG->dbhost    = '';
$CFG->dbname    = '';
$CFG->dbuser    = '';
$CFG->dbpass    = '';
$CFG->dbpersist =  false;
$CFG->prefix    = 'mdl_';

$CFG->wwwroot   = 'http://localhost/moodle';
$CFG->dirroot   = '/var/www/moodle/web';
$CFG->dataroot  = '/var/www/moodle/data';
$CFG->admin     = 'admin';

$CFG->directorypermissions = 00777;  // try 02777 on a server in Safe Mode

require_once("$CFG->dirroot/lib/setup.php");
// MAKE SURE WHEN YOU EDIT THIS FILE THAT THERE ARE NO SPACES, BLANK LINES,
// RETURNS, OR ANYTHING ELSE AFTER THE TWO CHARACTERS ON THE NEXT LINE.
?>


--- NEW FILE moodle-cron ---
#!/bin/sh

[ -f /var/lock/subsys/moodle ] && /usr/bin/php /var/www/moodle/web/admin/cron.php


--- NEW FILE moodle.conf ---
Alias /moodle /var/www/moodle/web

# Moodle public web pages - must be publically accessible

  Order allow,deny
  Allow from all


# Moodle private data - must NOT be publically accessible

  Order deny,allow
  Deny from all



--- NEW FILE moodle.cron ---
* * * * */5 apache /usr/sbin/moodle-cron


--- NEW FILE moodle.init ---
#!/bin/bash
#
# moodle        This shell script enables the cron job for Moodle
#
# Author:       Ignacio Vazquez-Abrams 
# Adapted from the yum initscript by Seth Vidal
#
# chkconfig: - 50 01
#
# description:  Enable the Moodle crom job
#

# source function library
. /etc/rc.d/init.d/functions

lockfile=/var/lock/subsys/moodle

RETVAL=0

start() {
	echo -n $"Enabling Moodle cron job: "
	touch "$lockfile" && success || failure
	RETVAL=$?
	echo
}

stop() {
	echo -n $"Disabling Moodle cron job: "
	rm -f "$lockfile" && success || failure
	RETVAL=$?
	echo
}

restart() {
	stop
	start
}

case "$1" in
  start)
	start
	;;
  stop) 
	stop
	;;
  restart|force-reload)
	restart
	;;
  reload)
	;;
  condrestart)
	[ -f "$lockfile" ] && restart
	;;
  status)
	if [ -f $lockfile ]; then
		echo $"Moodle cron job is enabled."
		RETVAL=0
	else
		echo $"Moodle cron job is disabled."
		RETVAL=3
	fi
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
	exit 1
esac

exit $RETVAL


--- NEW FILE moodle.spec ---
%define moodlewebdir %{_var}/www/moodle/web
%define moodledatadir %{_var}/www/moodle/data

# Suppress finding Perl libraries supplied by filter/algebra/*.p?
%define __perl_requires %{nil}
%define __perl_provides %{nil}

%define with_spellcheck 0

Name:           moodle
Version:        1.5.3
Release:        1
Summary:        A Course Management System

Group:          Applications/Publishing
License:        GPL
URL:            http://moodle.org/
Source0:        http://download.moodle.org/stable15/%{name}-%{version}.tgz
Source1:        moodle.conf
Source2:        moodle-config.php
Source3:        moodle.cron
Source4:        moodle-cron
Source5:        moodle.init
Source6:        moodle-README-rpm
Patch0:         moodle-1.5.2-mimetex-linux.patch
Patch1:         moodle-1.5.2-mimetex-fedora.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

#BuildRequires:  
Requires:       php-gd vixie-cron mimetex perl(lib)
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service

%description
Moodle is a course management system (CMS) - a free, Open Source software
package designed using sound pedagogical principles, to help educators create
effective online learning communities.

%package        af
Summary:        Moodle language pack for Afrikaans
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    af
This package contains the files needed to display Moodle in Afrikaans.

%files          af
%defattr (-,root,root,-)
%{moodlewebdir}/lang/af*

%package        ar
Summary:        Moodle language pack for Arabic
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ar
This package contains the files needed to display Moodle in Arabic.

%files          ar
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ar*

%package        be
Summary:        Moodle language pack for Byelorussian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    be
This package contains the files needed to display Moodle in Byelorussian.

%files          be
%defattr (-,root,root,-)
%{moodlewebdir}/lang/be*

%package        bg
Summary:        Moodle language pack for Bulgarian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    bg
This package contains the files needed to display Moodle in Bulgarian.

%files          bg
%defattr (-,root,root,-)
%{moodlewebdir}/lang/bg*

%package        bs
Summary:        Moodle language pack for Bosnian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    bs
This package contains the files needed to display Moodle in Bosnian.

%files          bs
%defattr (-,root,root,-)
%{moodlewebdir}/lang/bs*

%package        ca
Summary:        Moodle language pack for Catalan
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ca
This package contains the files needed to display Moodle in Catalan.

%files          ca
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ca*

%package        cs
Summary:        Moodle language pack for Czech
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    cs
This package contains the files needed to display Moodle in Czech.

%files          cs
%defattr (-,root,root,-)
%{moodlewebdir}/lang/cs*

%package        da
Summary:        Moodle language pack for Danish
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    da
This package contains the files needed to display Moodle in Danish.

%files          da
%defattr (-,root,root,-)
%{moodlewebdir}/lang/da*

%package        de
Summary:        Moodle language pack for German
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    de
This package contains the files needed to display Moodle in German.

%files          de
%defattr (-,root,root,-)
%{moodlewebdir}/lang/de*

%package        el
Summary:        Moodle language pack for Greek
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    el
This package contains the files needed to display Moodle in Greek.

%files          el
%defattr (-,root,root,-)
%{moodlewebdir}/lang/el*

%package        es
Summary:        Moodle language pack for Spanish
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    es
This package contains the files needed to display Moodle in Spanish.

%files          es
%defattr (-,root,root,-)
%{moodlewebdir}/lang/es*

%package        et
Summary:        Moodle language pack for Estonian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    et
This package contains the files needed to display Moodle in Estonian.

%files          et
%defattr (-,root,root,-)
%{moodlewebdir}/lang/et*

%package        eu
Summary:        Moodle language pack for Basque
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    eu
This package contains the files needed to display Moodle in Basque.

%files          eu
%defattr (-,root,root,-)
%{moodlewebdir}/lang/eu*

%package        fa
Summary:        Moodle language pack for Persian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    fa
This package contains the files needed to display Moodle in Persian.

%files          fa
%defattr (-,root,root,-)
%{moodlewebdir}/lang/fa*

%package        fi
Summary:        Moodle language pack for Finnish
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    fi
This package contains the files needed to display Moodle in Finnish.

%files          fi
%defattr (-,root,root,-)
%{moodlewebdir}/lang/fi*

%package        fr
Summary:        Moodle language pack for French
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    fr
This package contains the files needed to display Moodle in French.

%files          fr
%defattr (-,root,root,-)
%{moodlewebdir}/lang/fr*

%package        ga
Summary:        Moodle language pack for Irish
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ga
This package contains the files needed to display Moodle in Irish.

%files          ga
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ga*

%package        gl
Summary:        Moodle language pack for Galician
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    gl
This package contains the files needed to display Moodle in Galician.

%files          gl
%defattr (-,root,root,-)
%{moodlewebdir}/lang/gl*

%package        he
Summary:        Moodle language pack for Hebrew
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    he
This package contains the files needed to display Moodle in Hebrew.

%files          he
%defattr (-,root,root,-)
%{moodlewebdir}/lang/he*

%package        hu
Summary:        Moodle language pack for Hungarian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    hu
This package contains the files needed to display Moodle in Hungarian.

%files          hu
%defattr (-,root,root,-)
%{moodlewebdir}/lang/hu*

%package        id
Summary:        Moodle language pack for Indonesian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    id
This package contains the files needed to display Moodle in Indonesian.

%files          id
%defattr (-,root,root,-)
%{moodlewebdir}/lang/id*

%package        it
Summary:        Moodle language pack for Italian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    it
This package contains the files needed to display Moodle in Italian.

%files          it
%defattr (-,root,root,-)
%{moodlewebdir}/lang/it*

%package        ja
Summary:        Moodle language pack for Japanese
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ja
This package contains the files needed to display Moodle in Japanese.

%files          ja
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ja*

%package        ka
Summary:        Moodle language pack for Georgian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ka
This package contains the files needed to display Moodle in Georgian.

%files          ka
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ka*

%package        km
Summary:        Moodle language pack for Cambodian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    km
This package contains the files needed to display Moodle in Cambodian.

%files          km
%defattr (-,root,root,-)
%{moodlewebdir}/lang/km*

%package        kn
Summary:        Moodle language pack for Kannada
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    kn
This package contains the files needed to display Moodle in Kannada.

%files          kn
%defattr (-,root,root,-)
%{moodlewebdir}/lang/kn*

%package        ko
Summary:        Moodle language pack for Korean
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ko
This package contains the files needed to display Moodle in Korean.

%files          ko
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ko*

%package        lt
Summary:        Moodle language pack for Lithuanian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    lt
This package contains the files needed to display Moodle in Lithuanian.

%files          lt
%defattr (-,root,root,-)
%{moodlewebdir}/lang/lt*

%package        lv
Summary:        Moodle language pack for Latvian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    lv
This package contains the files needed to display Moodle in Latvian.

%files          lv
%defattr (-,root,root,-)
%{moodlewebdir}/lang/lv*

%package        mi
Summary:        Moodle language pack for Maori
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    mi
This package contains the files needed to display Moodle in Maori.

%files          mi
%defattr (-,root,root,-)
%{moodlewebdir}/lang/mi*

%package        ms
Summary:        Moodle language pack for Malay
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ms
This package contains the files needed to display Moodle in Malay.

%files          ms
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ms*

%package        nl
Summary:        Moodle language pack for Dutch
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    nl
This package contains the files needed to display Moodle in Dutch.

%files          nl
%defattr (-,root,root,-)
%{moodlewebdir}/lang/nl*

%package        no
Summary:        Moodle language pack for Norwegian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    no
This package contains the files needed to display Moodle in Norwegian.

%files          no
%defattr (-,root,root,-)
%{moodlewebdir}/lang/no*

%package        pl
Summary:        Moodle language pack for Polish
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    pl
This package contains the files needed to display Moodle in Polish.

%files          pl
%defattr (-,root,root,-)
%{moodlewebdir}/lang/pl*

%package        pt
Summary:        Moodle language pack for Portuguese
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    pt
This package contains the files needed to display Moodle in Portuguese.

%files          pt
%defattr (-,root,root,-)
%{moodlewebdir}/lang/pt*

%package        ro
Summary:        Moodle language pack for Romanian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ro
This package contains the files needed to display Moodle in Romanian.

%files          ro
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ro*

%package        ru
Summary:        Moodle language pack for Russian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    ru
This package contains the files needed to display Moodle in Russian.

%files          ru
%defattr (-,root,root,-)
%{moodlewebdir}/lang/ru*

%package        sk
Summary:        Moodle language pack for Slovak
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    sk
This package contains the files needed to display Moodle in Slovak.

%files          sk
%defattr (-,root,root,-)
%{moodlewebdir}/lang/sk*

%package        sl
Summary:        Moodle language pack for Slovenian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    sl
This package contains the files needed to display Moodle in Slovenian.

%files          sl
%defattr (-,root,root,-)
%{moodlewebdir}/lang/sl*

%package        sq
Summary:        Moodle language pack for Albanian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    sq
This package contains the files needed to display Moodle in Albanian.

%files          sq
%defattr (-,root,root,-)
%{moodlewebdir}/lang/sq*

%package        sr
Summary:        Moodle language pack for Serbian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    sr
This package contains the files needed to display Moodle in Serbian.

%files          sr
%defattr (-,root,root,-)
%{moodlewebdir}/lang/sr*

%package        sv
Summary:        Moodle language pack for Swedish
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    sv
This package contains the files needed to display Moodle in Swedish.

%files          sv
%defattr (-,root,root,-)
%{moodlewebdir}/lang/sv*

%package        th
Summary:        Moodle language pack for Thai
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    th
This package contains the files needed to display Moodle in Thai.

%files          th
%defattr (-,root,root,-)
%{moodlewebdir}/lang/th*

%package        tl
Summary:        Moodle language pack for Tagalog
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    tl
This package contains the files needed to display Moodle in Tagalog.

%files          tl
%defattr (-,root,root,-)
%{moodlewebdir}/lang/tl*

%package        tr
Summary:        Moodle language pack for Turkish
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    tr
This package contains the files needed to display Moodle in Turkish.

%files          tr
%defattr (-,root,root,-)
%{moodlewebdir}/lang/tr*

%package        uk
Summary:        Moodle language pack for Ukrainian
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    uk
This package contains the files needed to display Moodle in Ukrainian.

%files          uk
%defattr (-,root,root,-)
%{moodlewebdir}/lang/uk*

%package        vi
Summary:        Moodle language pack for Vietnamese
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    vi
This package contains the files needed to display Moodle in Vietnamese.

%files          vi
%defattr (-,root,root,-)
%{moodlewebdir}/lang/vi*

%package        zh
Summary:        Moodle language pack for Chinese
Group:          Applications/Publishing
Requires:       moodle = %{version}-%{release}

%description    zh
This package contains the files needed to display Moodle in Chinese.

%files          zh
%defattr (-,root,root,-)
%{moodlewebdir}/lang/zh*

%package        editor-spellcheck
Summary:        Spellcheck plugin for Moodle
Group:          Applications/Publishing
Requires:       %{name} = %{version}-%{release}
Requires:       perl(Encode) perl(Text::Aspell) perl(HTML::Parser)
Requires:       perl(HTML::Entities) perl(CGI)

%description    editor-spellcheck
This package contains the spellchecking plugin for Moodle's editor.

%prep
%setup -q -n %{name}
%patch0 -p1 -b .mimetex-linux
%patch1 -p1 -b .mimetex-fedora
cp %{SOURCE6} README-rpm
find $RPM_BUILD_DIR/%{name} -name \*.bak -exec rm {} \;
find $RPM_BUILD_DIR/%{name} -type f -exec chmod a-x {} \;
find $RPM_BUILD_DIR/%{name} -name \*.pl -exec chmod a+x {} \;
find $RPM_BUILD_DIR/%{name} -name \*.cgi -exec chmod a+x {} \;
sed -i 's/\r//' README.txt
sed -i 's/\r//' lib/editor/plugins/SpellChecker/spell-check-logic.cgi

%build
rm config-dist.php install.php tags filter/tex/mimetex.* filter/tex/README.mimetex

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{moodlewebdir}
mkdir -p $RPM_BUILD_ROOT%{moodledatadir}
cp -a * $RPM_BUILD_ROOT%{moodlewebdir}
rm $RPM_BUILD_ROOT%{moodlewebdir}/README*
install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/moodle.conf
install -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{moodlewebdir}/config.php
install -p -D -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/moodle
install -p -D -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/moodle-cron
install -p -D -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/moodle
%if %{with_spellcheck} < 1
rm -rf $RPM_BUILD_ROOT/lib/editor/plugins/SpellChecker
%endif
find $RPM_BUILD_ROOT -name \*.mimetex-\* -exec rm {} \;

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add %{name}

%preun
if [ $1 = 0 ]; then
  /sbin/service %{name} stop >/dev/null 2>&1
  /sbin/chkconfig --del %{name}
fi

%files
%defattr(-,root,root,-)
%doc README* doc/COPYRIGHT.txt
%dir %{_var}/www/moodle
%{moodlewebdir}/[a-ce-km-z]*
%doc %{moodlewebdir}/doc
%{moodlewebdir}/lib
%exclude %{moodlewebdir}/lib/editor/plugins/SpellChecker
%{moodlewebdir}/login
%dir %{moodlewebdir}/lang
%{moodlewebdir}/lang/en*
%doc %{moodlewebdir}/lang/README
%attr(-,apache,apache) %{moodledatadir}
%config(noreplace) %{_sysconfdir}/cron.d/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/moodle.conf
%{_initrddir}/%{name}
%{_sbindir}/%{name}-cron

%if %{with_spellcheck}
%files editor-spellcheck
%defattr(-,root,root,-)
%{moodlewebdir}/lib/editor/plugins/SpellChecker
%endif

%changelog
* Sat Dec 10 2005 Ignacio Vazquez-Abrams  1.5.3-1
- Update to 1.5.3
- Split off spell check package due to lack of Text::Aspell

* Mon Oct 12 2005 Ignacio Vazquez-Abrams  1.5.2-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Dec 2005 18:41:42 -0000	1.1
+++ .cvsignore	12 Dec 2005 19:48:03 -0000	1.2
@@ -0,0 +1 @@
+moodle-1.5.3.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Dec 2005 18:41:42 -0000	1.1
+++ sources	12 Dec 2005 19:48:03 -0000	1.2
@@ -0,0 +1 @@
+52dd50298fc1dd8b1b6d8d499608cdd6  moodle-1.5.3.tgz



From fedora-extras-commits at redhat.com  Mon Dec 12 20:46:40 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 12 Dec 2005 15:46:40 -0500
Subject: rpms/krusader/FC-3 .cvsignore, 1.2, 1.3 krusader.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200512122047.jBCKlANr011965@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/krusader/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11939

Modified Files:
	.cvsignore krusader.spec sources 
Log Message:
- Updated to version 1.60.1 which fix CVE-2005-3856



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2005 16:09:51 -0000	1.2
+++ .cvsignore	12 Dec 2005 20:46:38 -0000	1.3
@@ -1 +1,2 @@
 krusader-1.60.0.tar.gz
+krusader-1.60.1.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-3/krusader.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- krusader.spec	24 Oct 2005 18:17:39 -0000	1.3
+++ krusader.spec	12 Dec 2005 20:46:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		krusader
-Version:	1.60.0
-Release:	4%{?dist}
+Version:	1.60.1
+Release:	1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -103,6 +103,9 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* 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
 - Added update-mime-database and gtk-update-icon-cache (bug #171547)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2005 16:09:51 -0000	1.2
+++ sources	12 Dec 2005 20:46:38 -0000	1.3
@@ -1 +1,2 @@
 95f7900799bbd2810e6ac06fbf628536  krusader-1.60.0.tar.gz
+18b3b6f247c08b76113bcb9f2c666a6a  krusader-1.60.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 20:51:12 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 12 Dec 2005 15:51:12 -0500
Subject: rpms/krusader/FC-4 .cvsignore, 1.2, 1.3 krusader.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200512122051.jBCKphi6012038@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/krusader/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12016

Modified Files:
	.cvsignore krusader.spec sources 
Log Message:
- Updated to version 1.60.1 which fix CVE-2005-3856



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2005 16:09:51 -0000	1.2
+++ .cvsignore	12 Dec 2005 20:51:10 -0000	1.3
@@ -1 +1,2 @@
 krusader-1.60.0.tar.gz
+krusader-1.60.1.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-4/krusader.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- krusader.spec	25 Oct 2005 11:34:19 -0000	1.3
+++ krusader.spec	12 Dec 2005 20:51:10 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		krusader
-Version:	1.60.0
-Release:	4%{?dist}
+Version:	1.60.1
+Release:	1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -103,6 +103,9 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* 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
 - Added update-mime-database and gtk-update-icon-cache (bug #171547)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krusader/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2005 16:09:51 -0000	1.2
+++ sources	12 Dec 2005 20:51:10 -0000	1.3
@@ -1 +1,2 @@
 95f7900799bbd2810e6ac06fbf628536  krusader-1.60.0.tar.gz
+18b3b6f247c08b76113bcb9f2c666a6a  krusader-1.60.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 20:56:25 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 12 Dec 2005 15:56:25 -0500
Subject: rpms/krusader/devel .cvsignore, 1.2, 1.3 krusader.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200512122056.jBCKutZJ012129@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/krusader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12099

Modified Files:
	.cvsignore krusader.spec sources 
Log Message:
- Updated to version 1.60.1 which fix CVE-2005-3856



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2005 16:09:51 -0000	1.2
+++ .cvsignore	12 Dec 2005 20:56:23 -0000	1.3
@@ -1 +1,2 @@
 krusader-1.60.0.tar.gz
+krusader-1.60.1.tar.gz


Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- krusader.spec	24 Oct 2005 15:11:01 -0000	1.3
+++ krusader.spec	12 Dec 2005 20:56:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		krusader
-Version:	1.60.0
-Release:	4%{?dist}
+Version:	1.60.1
+Release:	1%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -103,6 +103,9 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* 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
 - Added update-mime-database and gtk-update-icon-cache (bug #171547)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2005 16:09:51 -0000	1.2
+++ sources	12 Dec 2005 20:56:23 -0000	1.3
@@ -1 +1,2 @@
 95f7900799bbd2810e6ac06fbf628536  krusader-1.60.0.tar.gz
+18b3b6f247c08b76113bcb9f2c666a6a  krusader-1.60.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 12 21:05:22 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 16:05:22 -0500
Subject: rpms/moodle/devel moodle.cron,1.1,1.2 moodle.spec,1.1,1.2
Message-ID: <200512122106.jBCL6J9J013777@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13755

Modified Files:
	moodle.cron moodle.spec 
Log Message:
Small typo, plus disttag


Index: moodle.cron
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/moodle.cron,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- moodle.cron	12 Dec 2005 19:48:03 -0000	1.1
+++ moodle.cron	12 Dec 2005 21:05:20 -0000	1.2
@@ -1 +1 @@
-* * * * */5 apache /usr/sbin/moodle-cron
+*/5 * * * * apache /usr/sbin/moodle-cron


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- moodle.spec	12 Dec 2005 19:48:03 -0000	1.1
+++ moodle.spec	12 Dec 2005 21:05:20 -0000	1.2
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.5.3
-Release:        1
+Release:        1%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing



From fedora-extras-commits at redhat.com  Mon Dec 12 21:08:11 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 16:08:11 -0500
Subject: owners owners.list,1.442,1.443
Message-ID: <200512122108.jBCL8fjv013813@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13792

Modified Files:
	owners.list 
Log Message:
moodle


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- owners.list	12 Dec 2005 15:31:57 -0000	1.442
+++ owners.list	12 Dec 2005 21:08:09 -0000	1.443
@@ -591,6 +591,7 @@
 Fedora Extras|moin-latex|LaTeX plugin for the MoinMoin wiki|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|monotone|A free, distributed version control system|roland at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|moodle|A Course Management System|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|moodss|Powerful modular monitoring graphical application|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 13 03:49:48 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 22:49:48 -0500
Subject: rpms/nsd - New directory
Message-ID: <200512130349.jBD3nmov024422@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24413/nsd

Log Message:
Directory /cvs/extras/rpms/nsd added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 03:49:53 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 22:49:53 -0500
Subject: rpms/nsd/devel - New directory
Message-ID: <200512130349.jBD3nr1S024438@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24413/nsd/devel

Log Message:
Directory /cvs/extras/rpms/nsd/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 03:50:09 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 22:50:09 -0500
Subject: rpms/nsd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512130350.jBD3o9nD024477@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24464

Added Files:
	Makefile import.log 
Log Message:
Setup of module nsd


--- NEW FILE Makefile ---
# Top level Makefile for module nsd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 03:50:15 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 22:50:15 -0500
Subject: rpms/nsd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512130350.jBD3oFJ0024500@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24464/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nsd


--- NEW 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 Dec 13 03:50:59 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 22:50:59 -0500
Subject: rpms/nsd import.log,1.1,1.2
Message-ID: <200512130351.jBD3pUnR024585@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24544

Modified Files:
	import.log 
Log Message:
auto-import nsd-2.3.3-2 on branch devel from nsd-2.3.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nsd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 03:50:07 -0000	1.1
+++ import.log	13 Dec 2005 03:50:57 -0000	1.2
@@ -0,0 +1 @@
+nsd-2_3_3-2:HEAD:nsd-2.3.3-2.src.rpm:1134445935



From fedora-extras-commits at redhat.com  Tue Dec 13 03:51:05 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 22:51:05 -0500
Subject: rpms/nsd/devel nsd-2.3.3-checking.patch, NONE, 1.1 nsd-2.3.3.spec,
	NONE, 1.1 nsd.init, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512130351.jBD3p5dP024578@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24544/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nsd-2.3.3-checking.patch nsd-2.3.3.spec nsd.init 
Log Message:
auto-import nsd-2.3.3-2 on branch devel from nsd-2.3.3-2.src.rpm

nsd-2.3.3-checking.patch:

--- NEW FILE nsd-2.3.3-checking.patch ---
diff -r -u nsd-2.3.3.orig/zonec.c nsd-2.3.3/zonec.c
--- nsd-2.3.3.orig/zonec.c	2005-10-11 09:08:41.000000000 -0400
+++ nsd-2.3.3/zonec.c	2005-12-13 03:26:57.000000000 -0500
@@ -1231,12 +1231,17 @@
 	/* Check consistency of rrtype descriptor table.  */
 	{
 		int i;
-		for (i = 0; i < RRTYPE_DESCRIPTORS_LENGTH; ++i) {
+		for (i = 0; i < TYPE_DNSKEY; ++i) {
 			if (i != rrtype_descriptors[i].type) {
 				fprintf(stderr, "error: type descriptor entry '%d' does not match type '%d', fix the definition in dns.c\n", i, rrtype_descriptors[i].type);
 				abort();
 			}
 		}
+		/* and then we have a bunch of zeros and the SPF record */
+		if (rrtype_descriptors[TYPE_SPF].type != TYPE_SPF) {
+			fprintf(stderr, "error: type descriptor entry '%d' does not match type '%d', fix the definition in dns.c\n", i, rrtype_descriptors[i].type);
+		abort();
+		}
 	}
 #endif
 	


--- NEW FILE nsd-2.3.3.spec ---
Summary: NSD is a complete implementation of an authoritative DNS name server
Name: nsd
Version: 2.3.3
Release: 2%{?dist}
License: BSD-like
Url: http://open.nlnetlabs.nl/nsd/
Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
Source1: nsd.init
Patch0: nsd-2.3.3-checking.patch
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Requires: 
BuildRequires: flex

%description
NSD is a complete implementation of an authoritative DNS name server.
For further information about what NSD is and what NSD is not please
consult the REQUIREMENTS document which is a part of this distribution
(thanks to Olaf).

%prep
%setup -q 
%patch0 -p1 -b .checking.patch

%configure --enable-bind8-stats --enable-plugins \
           --enable-mmap --with-pidfile=/var/run/nsd.pid --with-ssl \
           --with-user=nsd

%build
%{__make} %{?_smp_mflags}

%install
# Not using their 'make install' since it uses install-sh which does not
# get the correct install path within the RPM_BUILD_ROOT
#%{__make} install
rm -rf %{buildroot}
install -d 0755 %{buildroot}/%{_sysconfdir}/nsd
install -d 0755 %{buildroot}/%{_sbindir}
install -d 0755 %{buildroot}/%{_mandir}/man8
install -d 0755 %{buildroot}/%{_initrddir}

install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf
install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones
install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd

install -m 0755 nsd zonec nsd-notify nsd-xfer %{buildroot}/%{_sbindir}
install -m 0755 nsdc.sh %{buildroot}/%{_sbindir}/nsdc
install -m 0644 *.8 %{buildroot}/%{_mandir}/man8

%clean
rm -rf ${RPM_BUILD_ROOT}

%files 
%defattr(-,root,root)
%doc README LICENSE NSD-DATABASE DIFFERENCES dbaccess.c TODO RELNOTES REQUIREMENTS
%dir %{_sysconfdir}/nsd/
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
%attr(0755,root,root) %{_initrddir}/%{name}
%{_sbindir}/*
%{_mandir}/*/*

%pre
if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
if [ $1 = 2 -a -f /var/run/%{name}.pid ]; then
	/sbin/service %{name} stop
fi
# "Everyone is doing it, so why can't we?" 
exit 0

%post
# do not activate daemon upon request. Fedora Extra policy

%preun
if [ -f /var/run/%{name}.pid ]
then
        /sbin/service %{name} stop > /dev/null 2>&1
fi
if [ $1 -eq 0 ]
then
        /sbin/chkconfig --del %{name} > /dev/null 2>&1
fi
# "Everyone is doing it, so why can't we?"
exit 0

%postun
if [ "$1" -ge "1" ]; then
  /sbin/service %{name} condrestart 2>&1 >/dev/null
fi

%changelog
* Mon Dec 12 2005 Paul Wouters  - 2.3.3
- upgraded to nsd-2.3.3

* Wed Dec  7 2005 Tom "spot" Callaway  - 2.3.2-2
- minor cleanups

* Mon Dec  5 2005 Paul Wouters  - 2.3.2-1
- Upgraded to 2.3.2. Changed post scripts to comply to Fedora
  Extras policies (eg do not start daemon on fresh install)

* Tue Oct  4 2005 Paul Wouters  - 2.3.1-1
- Initial version


--- NEW FILE nsd.init ---
#!/bin/bash
#
# nsd:         Starts the NSD Name Server Daemon
#
# chkconfig: - 11 89
# description:  NSD is a complete implementation of an authoritative \
#               DNS name server. 
# processname: /usr/sbin/nsd
# config: /etc/nsd/nsdc.config
#
### BEGIN INIT INFO
# Provides: nsd
# Required-Start: $syslog
# Default-Stop: 0 11 89
# Short-Description: Starts the NSD Name Server Daemon
# Description:  NSD is a complete implementation of an authoritative \
#               DNS name server.
### END INIT INFO

# Sanity checks.
[ -f /etc/nsd/nsdc.conf ] || exit 0
[ -f /etc/nsd/nsd.zones ] || exit 0
[ -x /usr/sbin/nsd ] || exit 0

#extra verbosity
#ZONEC_VERBOSE=-v

OTHER_NSD_OPTS=""

# Source function library.
. /etc/init.d/functions

. /etc/sysconfig/network

# Check that networking is configured.
[ ${NETWORKING} = "no" ] && exit 0

start() {
	/usr/sbin/nsdc rebuild >/dev/null
	/usr/sbin/nsdc update >/dev/null
	echo -n $"Starting nsd... "
	nsd $OTHER_NSD_OPTS
	RETVAL=$?
	echo
	/usr/sbin/nsdc notify
	touch /var/lock/subsys/nsd
	return $RETVAL
}

stop() {
	echo -n $"Shutting down nsd services: "
	killproc nsd
	RETVAL=$?
	if [ $RETVAL -eq 0 ] ; then
	  rm -f /var/lock/subsys/nsd
	  rm -f /var/run/nsd.pid
	fi
	echo
	return $RETVAL
}

restart() {
	stop
	start
}

RETVAL=0

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
	restart
	;;
  condrestart)
        [ -f /var/lock/subsys/nsd ] && restart || :
	;;
  status)
	/usr/sbin/nsdc running
	;;
  stats|reload|rebuild|running|update|notify)
	/usr/sbin/nsdc $1 
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|condrestart|stats|notify|reload|rebuild|running|update}"
	exit 1
esac

exit $?


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 03:50:13 -0000	1.1
+++ .cvsignore	13 Dec 2005 03:51:03 -0000	1.2
@@ -0,0 +1 @@
+nsd-2.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 03:50:13 -0000	1.1
+++ sources	13 Dec 2005 03:51:03 -0000	1.2
@@ -0,0 +1 @@
+7e9f0ebfdf9dd29213170999cd60c20e  nsd-2.3.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 03:59:49 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 22:59:49 -0500
Subject: owners owners.list,1.443,1.444
Message-ID: <200512130400.jBD40JKX024716@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24666

Modified Files:
	owners.list 
Log Message:
added myself as maintainer for ldns and nsd in the owners.list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- owners.list	12 Dec 2005 21:08:09 -0000	1.443
+++ owners.list	13 Dec 2005 03:59:47 -0000	1.444
@@ -1279,3 +1279,5 @@
 Fedora Extras|yakuake|A Quake-like terminal application|dreadyman at gmail.com|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|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|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|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 13 04:00:20 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 12 Dec 2005 23:00:20 -0500
Subject: rpms/nmh/FC-4 nmh-1.1-annotate.patch,NONE,1.1 nmh.spec,1.9,1.10
Message-ID: <200512130400.jBD40pPM024748@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/extras/rpms/nmh/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24705/FC-4

Modified Files:
	nmh.spec 
Added Files:
	nmh-1.1-annotate.patch 
Log Message:
Fix repl's annotate.


nmh-1.1-annotate.patch:

--- NEW FILE nmh-1.1-annotate.patch ---
--- nmh-orig/uip/sendsbr.c	2005-12-12 15:51:52.000000000 -0500
+++ nmh/uip/sendsbr.c	2005-12-12 15:53:27.000000000 -0500
@@ -1020,7 +1020,7 @@
 	if (is_selected(mp, msgnum)) {
 	    if (debugsw)
 		advise (NULL, "annotate message %d", msgnum);
-	    annotate (m_name (msgnum), annotext, cp, inplace, 1, 0, 0);
+	    annotate (m_name (msgnum), annotext, cp, inplace, 1, -1, 0);
 	}
     }
 


Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/FC-4/nmh.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nmh.spec	5 Dec 2005 22:06:57 -0000	1.9
+++ nmh.spec	13 Dec 2005 04:00:18 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        12.fc4
+Release:        13.fc4
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 Patch0:         nmh-1.1-makefile.patch
 Patch1:         nmh-1.1-lock_file.patch
 Patch2:         nmh-1.1-empty-content-type.patch
+Patch3:         nmh-1.1-annotate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
@@ -32,6 +33,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 
 
 %build
@@ -66,6 +68,9 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Mon Dec 12 2005 Josh Bressers  0:1.1-13.fc4
+- Add a patch to allow repl to properly annotate messages.
+
 * Mon Dec 05 2005 Josh Bressers  0:1.1-12.fc4
 - Add a buildrequires on /bin/vi
 - Modify the sendmail buildrequires to use /usr/sbin/sendmail



From fedora-extras-commits at redhat.com  Tue Dec 13 04:00:26 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 12 Dec 2005 23:00:26 -0500
Subject: rpms/nmh/devel nmh-1.1-annotate.patch,NONE,1.1 nmh.spec,1.9,1.10
Message-ID: <200512130400.jBD40ugL024751@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/extras/rpms/nmh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24705/devel

Modified Files:
	nmh.spec 
Added Files:
	nmh-1.1-annotate.patch 
Log Message:
Fix repl's annotate.


nmh-1.1-annotate.patch:

--- NEW FILE nmh-1.1-annotate.patch ---
--- nmh-orig/uip/sendsbr.c	2005-12-12 15:51:52.000000000 -0500
+++ nmh/uip/sendsbr.c	2005-12-12 15:53:27.000000000 -0500
@@ -1020,7 +1020,7 @@
 	if (is_selected(mp, msgnum)) {
 	    if (debugsw)
 		advise (NULL, "annotate message %d", msgnum);
-	    annotate (m_name (msgnum), annotext, cp, inplace, 1, 0, 0);
+	    annotate (m_name (msgnum), annotext, cp, inplace, 1, -1, 0);
 	}
     }
 


Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/devel/nmh.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nmh.spec	5 Dec 2005 22:07:03 -0000	1.9
+++ nmh.spec	13 Dec 2005 04:00:24 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        12.fc5
+Release:        13.fc5
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 Patch0:         nmh-1.1-makefile.patch
 Patch1:         nmh-1.1-lock_file.patch
 Patch2:         nmh-1.1-empty-content-type.patch
+Patch3:         nmh-1.1-annotate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
@@ -32,6 +33,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 
 
 %build
@@ -66,6 +68,9 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Mon Dec 12 2005 Josh Bressers  0:1.1-13.fc5
+- Add a patch to allow repl to properly annotate messages.
+
 * Mon Dec 05 2005 Josh Bressers  0:1.1-12.fc5
 - Add a buildrequires on /bin/vi
 - Modify the sendmail buildrequires to use /usr/sbin/sendmail



From fedora-extras-commits at redhat.com  Tue Dec 13 04:03:55 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 23:03:55 -0500
Subject: rpms/ldns - New directory
Message-ID: <200512130403.jBD43t4e026433@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26424/ldns

Log Message:
Directory /cvs/extras/rpms/ldns added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 04:04:13 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 23:04:13 -0500
Subject: rpms/ldns/devel - New directory
Message-ID: <200512130404.jBD44DDc026450@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26424/ldns/devel

Log Message:
Directory /cvs/extras/rpms/ldns/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 04:04:51 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 23:04:51 -0500
Subject: rpms/ldns Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512130404.jBD44piY026484@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26471

Added Files:
	Makefile import.log 
Log Message:
Setup of module ldns


--- NEW FILE Makefile ---
# Top level Makefile for module ldns
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 04:05:17 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 23:05:17 -0500
Subject: rpms/ldns/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512130405.jBD45H4X026502@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26471/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ldns


--- NEW 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 Dec 13 04:08:27 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 23:08:27 -0500
Subject: rpms/ldns/devel ldns.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200512130409.jBD493Jm026576@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26539/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ldns.spec 
Log Message:
auto-import ldns-1.0.0-5 on branch devel from ldns-1.0.0-5.src.rpm


--- NEW FILE ldns.spec ---
Summary: Lowlevel DNS(SEC) library with API
Name: ldns
Version: 1.0.0
Release: 5%{?dist}
License: BSD
Url: http://open.nlnetlabs.nl/%{name}/
Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool, autoconf, automake, gcc-c++, openssl-devel, doxygen

%description
ldns is a library with the aim to simplify DNS programing in C. All
lowlevel DNS/DNSSEC operations are supported. We also define a higher
level API which allows a programmer to (for instance) create or sign
packets.

%package devel
Summary: Development package that includes the ldns header files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, openssl-devel

%description devel
The devel package contains the ldns library and the include files

%prep
%setup -q 
rm config.sub config.guess
libtoolize
autoreconf

%configure


%build
%{__make} %{?_smp_mflags} allautoconf
%{__make} %{?_smp_mflags}
%{__make} %{?_smp_mflags} drill
%{__make} %{?_smp_mflags} examples
%{__make} %{?_smp_mflags} doc

%install
rm -rf %{buildroot}

export DESTDIR=%{buildroot}
%{__make} install
%{__make} examples-install
%{__make} install-doc
%{__make} drill-install
#remove doc stubs
rm -rf doc/.svn
#remove double set of man pages
rm -rf doc/man
# remove .la files
rm -rf %{buildroot}%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%files 
%defattr(-,root,root)
%{_libdir}/libldns*so
%{_bindir}/drill
%{_bindir}/ldns-*
%doc README LICENSE ROADMAP TODO 
%{_mandir}/*/*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libldns.a
%dir %{_includedir}/ldns/*
%doc doc Changelog COMPILE 

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Sun Dec 11 2005 Tom "spot" Callaway  1.0.0-5
- minor cleanups

* Wed Oct  5 2005 Paul Wouters  0.70_1205
- reworked for svn version

* Sun Sep 25 2005 Paul Wouters  - 0.70
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 04:05:15 -0000	1.1
+++ .cvsignore	13 Dec 2005 04:08:25 -0000	1.2
@@ -0,0 +1 @@
+ldns-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 04:05:15 -0000	1.1
+++ sources	13 Dec 2005 04:08:25 -0000	1.2
@@ -0,0 +1 @@
+bf8ff0868cacd2d4487ed1e28ea6c239  ldns-1.0.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 04:08:03 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 23:08:03 -0500
Subject: rpms/ldns import.log,1.1,1.2
Message-ID: <200512130409.jBD49BPs026579@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26539

Modified Files:
	import.log 
Log Message:
auto-import ldns-1.0.0-5 on branch devel from ldns-1.0.0-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ldns/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 04:04:49 -0000	1.1
+++ import.log	13 Dec 2005 04:08:01 -0000	1.2
@@ -0,0 +1 @@
+ldns-1_0_0-5:HEAD:ldns-1.0.0-5.src.rpm:1134446913



From fedora-extras-commits at redhat.com  Tue Dec 13 04:10:40 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 12 Dec 2005 23:10:40 -0500
Subject: rpms/nsd/devel nsd.spec,NONE,1.1 nsd-2.3.3.spec,1.1,NONE
Message-ID: <200512130410.jBD4AesO026635@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26624

Added Files:
	nsd.spec 
Removed Files:
	nsd-2.3.3.spec 
Log Message:
Renamed versioned spec to unversioned spec (eg nsd.spec)



--- NEW FILE nsd.spec ---
Summary: NSD is a complete implementation of an authoritative DNS name server
Name: nsd
Version: 2.3.3
Release: 2%{?dist}
License: BSD-like
Url: http://open.nlnetlabs.nl/nsd/
Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
Source1: nsd.init
Patch0: nsd-2.3.3-checking.patch
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Requires: 
BuildRequires: flex

%description
NSD is a complete implementation of an authoritative DNS name server.
For further information about what NSD is and what NSD is not please
consult the REQUIREMENTS document which is a part of this distribution
(thanks to Olaf).

%prep
%setup -q 
%patch0 -p1 -b .checking.patch

%configure --enable-bind8-stats --enable-plugins \
           --enable-mmap --with-pidfile=/var/run/nsd.pid --with-ssl \
           --with-user=nsd

%build
%{__make} %{?_smp_mflags}

%install
# Not using their 'make install' since it uses install-sh which does not
# get the correct install path within the RPM_BUILD_ROOT
#%{__make} install
rm -rf %{buildroot}
install -d 0755 %{buildroot}/%{_sysconfdir}/nsd
install -d 0755 %{buildroot}/%{_sbindir}
install -d 0755 %{buildroot}/%{_mandir}/man8
install -d 0755 %{buildroot}/%{_initrddir}

install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf
install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones
install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd

install -m 0755 nsd zonec nsd-notify nsd-xfer %{buildroot}/%{_sbindir}
install -m 0755 nsdc.sh %{buildroot}/%{_sbindir}/nsdc
install -m 0644 *.8 %{buildroot}/%{_mandir}/man8

%clean
rm -rf ${RPM_BUILD_ROOT}

%files 
%defattr(-,root,root)
%doc README LICENSE NSD-DATABASE DIFFERENCES dbaccess.c TODO RELNOTES REQUIREMENTS
%dir %{_sysconfdir}/nsd/
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
%attr(0755,root,root) %{_initrddir}/%{name}
%{_sbindir}/*
%{_mandir}/*/*

%pre
if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
if [ $1 = 2 -a -f /var/run/%{name}.pid ]; then
	/sbin/service %{name} stop
fi
# "Everyone is doing it, so why can't we?" 
exit 0

%post
# do not activate daemon upon request. Fedora Extra policy

%preun
if [ -f /var/run/%{name}.pid ]
then
        /sbin/service %{name} stop > /dev/null 2>&1
fi
if [ $1 -eq 0 ]
then
        /sbin/chkconfig --del %{name} > /dev/null 2>&1
fi
# "Everyone is doing it, so why can't we?"
exit 0

%postun
if [ "$1" -ge "1" ]; then
  /sbin/service %{name} condrestart 2>&1 >/dev/null
fi

%changelog
* Mon Dec 12 2005 Paul Wouters  - 2.3.3
- upgraded to nsd-2.3.3

* Wed Dec  7 2005 Tom "spot" Callaway  - 2.3.2-2
- minor cleanups

* Mon Dec  5 2005 Paul Wouters  - 2.3.2-1
- Upgraded to 2.3.2. Changed post scripts to comply to Fedora
  Extras policies (eg do not start daemon on fresh install)

* Tue Oct  4 2005 Paul Wouters  - 2.3.1-1
- Initial version


--- nsd-2.3.3.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 04:43:40 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 12 Dec 2005 23:43:40 -0500
Subject: rpms/deskbar-applet/devel .cvsignore, 1.5, 1.6 deskbar-applet.spec,
	1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200512130444.jBD4iAVk027366@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27338

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Dec 2005 05:19:15 -0000	1.5
+++ .cvsignore	13 Dec 2005 04:43:38 -0000	1.6
@@ -1 +1 @@
-deskbar-applet-0.8.6.tar.bz2
+deskbar-applet-0.8.6.1.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- deskbar-applet.spec	9 Dec 2005 04:44:25 -0000	1.10
+++ deskbar-applet.spec	13 Dec 2005 04:43:38 -0000	1.11
@@ -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:        0.8.6
+Version:        0.8.6.1
 Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
@@ -59,6 +59,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Mon Dec 12 2005 Ignacio Vazquez-Abrams  0.8.6.1-1
+- Upstream update
+
 * Thu Dec  8 2005 Ignacio Vazquez-Abrams  0.8.6-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Dec 2005 05:19:15 -0000	1.5
+++ sources	13 Dec 2005 04:43:38 -0000	1.6
@@ -1 +1 @@
-67507881804181b749d5e317a76b91ee  deskbar-applet-0.8.6.tar.bz2
+6a4d4169cdb568f5555e3c824a856637  deskbar-applet-0.8.6.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Dec 13 07:33:56 2005
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 13 Dec 2005 02:33:56 -0500
Subject: rpms/monotone/FC-4 monotone.spec,1.11,1.12
Message-ID: <200512130734.jBD7YQGL032615@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32597

Modified Files:
	monotone.spec 
Log Message:
Uncomment make check



Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- monotone.spec	12 Dec 2005 02:38:33 -0000	1.11
+++ monotone.spec	13 Dec 2005 07:33:54 -0000	1.12
@@ -65,7 +65,7 @@
 make %{?_smp_mflags}
 
 %check
-#make check || { cat testsuite.log; false; }
+make check || { cat testsuite.log; false; }
 
 %install
 rm -rf %{buildroot}



From fedora-extras-commits at redhat.com  Tue Dec 13 07:35:09 2005
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 13 Dec 2005 02:35:09 -0500
Subject: rpms/monotone/devel README.monotone-server, NONE, 1.1 .cvsignore,
	1.4, 1.5 monotone.init, 1.2, 1.3 monotone.spec, 1.6,
	1.7 monotone.sysconfig, 1.1, 1.2 sources, 1.4,
	1.5 monotone-xfail-if-root.patch, 1.1, NONE
Message-ID: <200512130735.jBD7Zd6k032646@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32621

Modified Files:
	.cvsignore monotone.init monotone.spec monotone.sysconfig 
	sources 
Added Files:
	README.monotone-server 
Removed Files:
	monotone-xfail-if-root.patch 
Log Message:
0.24 update copied from FC-4 branch


--- NEW FILE README.monotone-server ---
The Fedora Extras build of monotone provides an extra RPM monotone-server.
This package is intended to make it easy to set up an unattended server
installation for Monotone's Netsync protocol (i.e. "monotone serve").

The package a standard Fedora-style init.d script with chkconfig support
for running the server, installed as /usr/sbin/monotone-server.
(This is just a symlink to monotone that the init script runs instead.
This enables matching "monotone-server" processes with ps to distinguish
server instances from people using monotone.)

The /etc/monotone directory serves as ~/.monotone for the server.  This
directory and its contents are not writable by the "monotone" user ID under
which the network server runs.  The database lives in /var/db/monotone,
which the "monotone" user ID must write to.

The init.d script will generate a private key for the server to use, if
none exists yet.  The key identification will be the host's FQDN (from
/bin/hostname -f).  You can use "service monotone genkey [IDENT]" to
generate the private key by hand and set up the unattended server to use
it, supplying a different key identification string if you like.

Before starting the server, the script will migrate an old database
format if you had a previous version of the monotone-server installation.
(This includes converting private keys from the old format.)
You can always do this explicitly with "service monotone migrate".

Access to the server is controlled by the /etc/monotone/read-permissions and
/etc/monotone/write-permissions files, unless you write your own Lua hooks
in /etc/monotone/monotonerc.  These files are not created or editted by the
RPM scripts, you must create them.  These files refer to key identification
strings for keys already the database.  Anyone allowed write access by the
netwrok server can put new keys in the database with "monotone push" using
the --key-to-push option.  To bootstrap this, /etc/monotone/write-permission
must allow some key and that key must be in the database already.  You can
put a key in the server's database easily with "service monotone import",
e.g. to import the public key for a private key in ~/.monotone/keys:

	monotone pubkey me at my.com | sudo service monotone import

For problems with this package or its scripts, please file bugs
at http://bugzilla.redhat.com/ for the "monotone" component
in th "Fedora Extras" product.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Oct 2005 03:45:52 -0000	1.4
+++ .cvsignore	13 Dec 2005 07:35:07 -0000	1.5
@@ -1 +1 @@
-monotone-0.23.tar.gz
+monotone-0.24.tar.gz


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monotone.init	4 Oct 2005 03:45:02 -0000	1.2
+++ monotone.init	13 Dec 2005 07:35:07 -0000	1.3
@@ -7,7 +7,7 @@
 # processname: monotone-server
 # pidfile: /var/run/monotone-server.pid
 # config: /etc/sysconfig/monotone
-# config: /etc/monotonerc
+# config: /etc/monotone/monotonerc
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -31,7 +31,7 @@
 random_passphrase()
 {
 	# As of 0.22, 32 chars is the maximum pass phrase length.
-	dd if=/dev/urandom count=1 2> /dev/null | md5sum |
+	dd if=/dev/urandom bs=32 count=1 2> /dev/null | md5sum |
 	{ read sum rest; echo $sum; }
 }
 
@@ -40,8 +40,16 @@
 # See how we were called.
 case "$1" in
   start)
-	[ -e $MONOTONE_DBFILE ] || { $0 init && $0 genkey; }
+	if [ -e $MONOTONE_DBFILE ]; then
+		$0 migrate
+	else
+		$0 init
+	fi
 	RETVAL=$?
+	if [ $RETVAL = 0 ] && [ "x`ls $MONOTONE_KEYDIR`" = x ]; then
+		$0 genkey
+		RETVAL=$?
+	fi
 	if [ $RETVAL = 0 ]; then
 		# Start daemon.
 		echo -n $"Starting monotone server: "
@@ -60,7 +68,7 @@
         ;;
   stop)
         # Stop daemons.
-        echo -n "Stopping monotone server: "
+        echo -n $"Stopping monotone server: "
         killproc $MTSERVER
         RETVAL=$?
         [ $RETVAL = 0 ] && rm -f /var/lock/subsys/monotone
@@ -78,7 +86,7 @@
 	RETVAL=$?
 	;;
   init)
-	echo -n $"Initializing $MONOTONE_DBFILE: "
+	echo -n $"Initializing database" "$MONOTONE_DBFILE" ": "
 	{ [ -d /var/db/monotone ] ||
  	  /usr/bin/install -o ${MONOTONE_USER:-monotone} \
 			   -g ${MONOTONE_GROUP:-monotone} \
@@ -91,7 +99,7 @@
 	echo
 	;;
   genkey)
-	MONOTONE_KEYID=${MONOTONE_KEYID:-`/bin/hostname -f`}
+	MONOTONE_KEYID=${2:-${MONOTONE_KEYID:-`/bin/hostname -f`}}
 	MONOTONE_PPFILE=${MONOTONE_PPFILE:-/var/db/monotone/passphrase.lua}
 	echo -n $"Generating RSA key for server $MONOTONE_KEYID"
 	tmp=/tmp/mtserver$$
@@ -106,9 +114,8 @@
   return "$passphrase"
 end
 EOF
-		/usr/bin/install -o ${MONOTONE_USER:-monotone} \
-		    		 -g ${MONOTONE_GROUP:-monotone} \
-				 -m 0600 $tmp ${MONOTONE_PPFILE}
+		/usr/bin/install -o root -g ${MONOTONE_GROUP:-monotone} \
+				 -m 0440 $tmp ${MONOTONE_PPFILE}
 	then
 		success $"key generation"
 	else
@@ -118,8 +125,47 @@
 	rm -f $tmp
 	echo
 	;;
+  migrate)
+  	oppfile=/var/db/monotone/passphrase.lua
+	RETVAL=0
+	if [ ! -e $MONOTONE_PPFILE ] && [ -e $oppfile ]; then
+		echo -n $"Moving old server passphrase file to new location: "
+		/usr/bin/install -o root -g ${MONOTONE_GROUP:-monotone} \
+				 -m 0440 $oppfile ${MONOTONE_PPFILE} &&
+		success $"move passphrase file" ||
+		failure $"move passphrase file"
+		RETVAL=$?
+		echo
+	fi
+	[ $RETVAL -eq 0 ] || exit $RETVAL
+	# Note this must run as root in case migration is writing
+	# into /etc/monotone/private-keys.
+	echo $"Checking database format in" "${MONOTONE_DBFILE}:"
+	(umask 027
+	 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db migrate &&
+	 /bin/chgrp -R ${MONOTONE_GROUP:-monotone} $MONOTONE_KEYDIR)
+		success $"database check" ||
+		failure $"database check"
+	RETVAL=$?
+	echo
+	;;
+  # Use "monotone pubkey me at my.com | service monotone import"
+  # to import the first keys to enable in /etc/monotone/write-permission.
+  # Thereafter, those with write permission can add other keys via
+  # netsync with "monotone push --key-to-push=IDENT" and then IDENT
+  # can be used in the read-permission and write-permission files.
+  import)
+	echo -n $"Importing packets to monotone database: "
+	runuser -s /bin/bash - ${MONOTONE_USER:-monotone} -c "umask 007; \
+		$MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS read" &&
+		success $"packet import" ||
+		failure $"packet import"
+	RETVAL=$?
+	echo
+	;;
   *)
-	echo "Usage: $0 {start|stop|restart|status|condrestart|init|genkey}"
+	echo "\
+Usage: $0 {start|stop|restart|status|condrestart|init|import|genkey [IDENT]}"
 	RETVAL=1
 	;;
 esac


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- monotone.spec	4 Oct 2005 03:45:02 -0000	1.6
+++ monotone.spec	13 Dec 2005 07:35:07 -0000	1.7
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.23
+Version: 0.24
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -10,14 +10,12 @@
 Source0: http://www.venge.net/monotone/downloads/%{name}-%{version}.tar.gz
 Source1: monotone.init
 Source2: monotone.sysconfig
-
-Patch1: monotone-xfail-if-root.patch
+Source3: README.monotone-server
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
 BuildRequires: boost-devel >= 1.32.0
-BuildRequires: lua
 %if 1
 %define bundled_sqlite yes
 %else
@@ -25,6 +23,11 @@
 BuildRequires: sqlite-devel >= 3.2.7
 %define bundled_sqlite no
 %endif
+# monotone has local hacks in lua 5.0.2 as well, sigh.
+%define bundled_lua 1
+%if %{bundled_lua} == 0
+BuildRequires: lua
+%endif
 
 # The test suite needs cvs.
 BuildRequires: cvs
@@ -56,10 +59,9 @@
 %prep
 %setup -q
 
-%patch1 -p1
-
 %build
-%configure --with-bundled-lua=no --with-bundled-sqlite=%{bundled_sqlite}
+%configure --with-bundled-lua=%{bundled_lua} \
+	   --with-bundled-sqlite=%{bundled_sqlite}
 make %{?_smp_mflags}
 
 %check
@@ -84,14 +86,21 @@
 ln -snf ../bin/monotone %{buildroot}%{_sbindir}/monotone-server
 %{__install} -c -m 0555 %{SOURCE1} %{buildroot}/etc/init.d/monotone
 %{__install} -c -m 0644 %{SOURCE2} %{buildroot}/etc/sysconfig/monotone
-%{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotonerc
+%{__install} -d -m 0755 %{buildroot}/etc/monotone
+%{__install} -d -m 0750 %{buildroot}/etc/monotone/private-keys
 %{__install} -d -m 0770 %{buildroot}/var/db/monotone
 
 # These do not actually wind up in the package, due to %%ghost.
+%{__install} -c -m 0440 /dev/null %{buildroot}/etc/monotone/passphrase.lua
+%{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/read-permissions
+%{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/write-permissions
+%{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotone/monotonerc
 touch %{buildroot}/var/db/monotone/server.db
-touch %{buildroot}/var/db/monotone/passphrase.lua
+
+cp %{SOURCE3} .
 
 %clean
+rm -f README.monotone-server
 rm -rf %{buildroot}
 
 %post
@@ -118,14 +127,20 @@
 
 
 %files server
+%doc README.monotone-server
 %defattr(-,root,root,-)
 %{_sbindir}/monotone-server
 /etc/init.d/monotone
-%config(noreplace) /etc/sysconfig/monotone
-%config(noreplace) /etc/monotonerc
+%config /etc/sysconfig/monotone
+%dir %attr(0755,root,monotone) /etc/monotone
+%dir %attr(0750,root,monotone) /etc/monotone/private-keys
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/monotonerc
+%attr(0440,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/passphrase.lua
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/read-permissions
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/write-permissions
+ %attr(0750,root,monotone) /etc/monotone/private-keys
 %dir %attr(0770,monotone,monotone) /var/db/monotone
 %attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.db
-%attr(0600,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/passphrase.lua
 
 %pre server
 # Add the "monotone" user
@@ -136,6 +151,9 @@
 # Register the monotone service
 /sbin/chkconfig --add monotone
 
+# Restart the running server, which will update its db format when needed.
+/sbin/service monotone condrestart
+
 %preun server
 if [ $1 = 0 ]; then
 	/sbin/service monotone stop > /dev/null 2>&1
@@ -144,6 +162,9 @@
 
 
 %changelog
+* Sun Dec 11 2005 Roland McGrath  - 0.24-1
+- Updated for 0.24 release.
+
 * Mon Oct  3 2005 Roland McGrath  - 0.23-1
 - Updated for 0.23 release.
 


Index: monotone.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monotone.sysconfig	23 Aug 2005 07:04:05 -0000	1.1
+++ monotone.sysconfig	13 Dec 2005 07:35:07 -0000	1.2
@@ -1,9 +1,10 @@
-MONOTONERC=/etc/monotonerc
+MONOTONE_CONFDIR=/etc/monotone
+MONOTONE_KEYDIR=/etc/monotone/private-keys
 MONOTONE_DBFILE=/var/db/monotone/server.db
-MONOTONE_PPFILE=/var/db/monotone/passphrase.lua
+MONOTONE_PPFILE=/etc/monotone/passphrase.lua
 
-MONOTONE_RCOPTS="--norc --rcfile=$MONOTONERC"
-MONOTONE_DBOPTS="--db=$MONOTONE_DBFILE"
+MONOTONE_RCOPTS="--confdir=$MONOTONE_CONFDIR"
+MONOTONE_DBOPTS="--db=$MONOTONE_DBFILE --keydir=$MONOTONE_KEYDIR"
 MONOTONE_PPOPTS="--rcfile=$MONOTONE_PPFILE"
 
-MONOTONE_SERVE_OPTS="0.0.0.0 '*'"
+MONOTONE_SERVE_OPTS="'*'"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Oct 2005 03:45:02 -0000	1.4
+++ sources	13 Dec 2005 07:35:07 -0000	1.5
@@ -1 +1 @@
-6d9e909480c2be0b23e2820c3a42e6f1  monotone-0.23.tar.gz
+8193203c8b48104500d956f9e524bfcd  monotone-0.24.tar.gz


--- monotone-xfail-if-root.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 08:17:28 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:17:28 -0500
Subject: rpms/libopensync/FC-3 libopensync.spec, 1.2, 1.3 libopensync-32.conf,
	1.1, NONE libopensync-64.conf, 1.1, NONE
Message-ID: <200512130817.jBD8Hxqh002013@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1963/FC-3

Modified Files:
	libopensync.spec 
Removed Files:
	libopensync-32.conf libopensync-64.conf 
Log Message:
- change handling of ld.conf.so files



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/libopensync.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync.spec	11 Dec 2005 23:44:53 -0000	1.2
+++ libopensync.spec	13 Dec 2005 08:17:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync
 Version:        0.18
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -8,8 +8,6 @@
 URL:            http://www.opensync.org/
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Source1:        libopensync-32.conf
-Source2:        libopensync-64.conf
 Patch0:         libopensync-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,11 +63,11 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 
-%ifarch x86_64
-install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-%else
-install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-%endif
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/opensync.conf << EOF
+%{_libdir}/opensync/
+%{_libdir}/opensync/formats/
+%{_libdir}/opensync/plugins/
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,6 +97,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert 
+0.18-5
+- change handling of ld.so.conf files
+
 * Sun Dec 11 2005 Andreas Bierfert 
 0.18-4
 - add dist


--- libopensync-32.conf DELETED ---


--- libopensync-64.conf DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 08:17:34 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:17:34 -0500
Subject: rpms/libopensync/FC-4 libopensync.spec, 1.2, 1.3 libopensync-32.conf,
	1.1, NONE libopensync-64.conf, 1.1, NONE
Message-ID: <200512130818.jBD8I4iv002016@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1963/FC-4

Modified Files:
	libopensync.spec 
Removed Files:
	libopensync-32.conf libopensync-64.conf 
Log Message:
- change handling of ld.conf.so files



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-4/libopensync.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync.spec	11 Dec 2005 23:44:53 -0000	1.2
+++ libopensync.spec	13 Dec 2005 08:17:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync
 Version:        0.18
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -8,8 +8,6 @@
 URL:            http://www.opensync.org/
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Source1:        libopensync-32.conf
-Source2:        libopensync-64.conf
 Patch0:         libopensync-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,11 +63,11 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 
-%ifarch x86_64
-install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-%else
-install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-%endif
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/opensync.conf << EOF
+%{_libdir}/opensync/
+%{_libdir}/opensync/formats/
+%{_libdir}/opensync/plugins/
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,6 +97,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert 
+0.18-5
+- change handling of ld.so.conf files
+
 * Sun Dec 11 2005 Andreas Bierfert 
 0.18-4
 - add dist


--- libopensync-32.conf DELETED ---


--- libopensync-64.conf DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 08:17:39 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:17:39 -0500
Subject: rpms/libopensync/devel libopensync.spec, 1.2,
	1.3 libopensync-32.conf, 1.1, NONE libopensync-64.conf, 1.1, NONE
Message-ID: <200512130818.jBD8IA1L002019@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1963/devel

Modified Files:
	libopensync.spec 
Removed Files:
	libopensync-32.conf libopensync-64.conf 
Log Message:
- change handling of ld.conf.so files



Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync.spec	11 Dec 2005 23:44:53 -0000	1.2
+++ libopensync.spec	13 Dec 2005 08:17:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync
 Version:        0.18
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -8,8 +8,6 @@
 URL:            http://www.opensync.org/
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
-Source1:        libopensync-32.conf
-Source2:        libopensync-64.conf
 Patch0:         libopensync-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,11 +63,11 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 
-%ifarch x86_64
-install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-%else
-install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-%endif
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/opensync.conf << EOF
+%{_libdir}/opensync/
+%{_libdir}/opensync/formats/
+%{_libdir}/opensync/plugins/
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,6 +97,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert 
+0.18-5
+- change handling of ld.so.conf files
+
 * Sun Dec 11 2005 Andreas Bierfert 
 0.18-4
 - add dist


--- libopensync-32.conf DELETED ---


--- libopensync-64.conf DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 08:39:01 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:39:01 -0500
Subject: rpms/libopensync-plugin-palm - New directory
Message-ID: <200512130839.jBD8d1BF002193@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2184/libopensync-plugin-palm

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-palm added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 08:39:07 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:39:07 -0500
Subject: rpms/libopensync-plugin-palm/devel - New directory
Message-ID: <200512130839.jBD8d72j002209@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2184/libopensync-plugin-palm/devel

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-palm/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 08:39:28 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:39:28 -0500
Subject: rpms/libopensync-plugin-palm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512130839.jBD8dSFT002244@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2231

Added Files:
	Makefile import.log 
Log Message:
Setup of module libopensync-plugin-palm


--- NEW FILE Makefile ---
# Top level Makefile for module libopensync-plugin-palm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 08:39:34 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:39:34 -0500
Subject: rpms/libopensync-plugin-palm/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512130839.jBD8dYeM002267@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2231/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libopensync-plugin-palm


--- NEW 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 Dec 13 08:40:22 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:40:22 -0500
Subject: rpms/libopensync-plugin-palm import.log,1.1,1.2
Message-ID: <200512130840.jBD8erW0002355@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2314

Modified Files:
	import.log 
Log Message:
auto-import libopensync-plugin-palm-0.18-1 on branch devel from libopensync-plugin-palm-0.18-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 08:39:26 -0000	1.1
+++ import.log	13 Dec 2005 08:40:20 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-palm-0_18-1:HEAD:libopensync-plugin-palm-0.18-1.src.rpm:1134463211



From fedora-extras-commits at redhat.com  Tue Dec 13 08:40:28 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 03:40:28 -0500
Subject: rpms/libopensync-plugin-palm/devel
	libopensync-plugin-palm-Makefile.patch, NONE,
	1.1 libopensync-plugin-palm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512130840.jBD8ewV6002359@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2314/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libopensync-plugin-palm-Makefile.patch 
	libopensync-plugin-palm.spec 
Log Message:
auto-import libopensync-plugin-palm-0.18-1 on branch devel from libopensync-plugin-palm-0.18-1.src.rpm

libopensync-plugin-palm-Makefile.patch:

--- NEW FILE libopensync-plugin-palm-Makefile.patch ---
--- src/Makefile.in.orig	2005-11-29 13:42:25.000000000 +0100
+++ src/Makefile.in	2005-11-29 13:42:46.000000000 +0100
@@ -196,7 +196,7 @@
 configdir = @OPENSYNC_CONFIGDIR@
 formatsdir = @OPENSYNC_FORMATSDIR@
 opensyncheaderdir = @OPENSYNC_HEADERDIR@
-AM_CFLAGS = @PILOT_CFLAGS@ @PACKAGE_CFLAGS@ -Wall -Werror
+AM_CFLAGS = @PILOT_CFLAGS@ @PACKAGE_CFLAGS@ -Wall
 EXTRA_DIST = \
 	palm-sync
 
--- src/Makefile.am.orig	2005-11-29 13:42:19.000000000 +0100
+++ src/Makefile.am	2005-11-29 13:42:57.000000000 +0100
@@ -3,7 +3,7 @@
 formatsdir=@OPENSYNC_FORMATSDIR@
 opensyncheaderdir=@OPENSYNC_HEADERDIR@
 
-AM_CFLAGS = @PILOT_CFLAGS@ @PACKAGE_CFLAGS@ -Wall -Werror
+AM_CFLAGS = @PILOT_CFLAGS@ @PACKAGE_CFLAGS@ -Wall
 
 EXTRA_DIST = \
 	palm-sync


--- NEW FILE libopensync-plugin-palm.spec ---
Name:           libopensync-plugin-palm
Version:        0.18
Release:        1
Summary:        Palm 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
Patch0:         %{name}-Makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libopensync-devel
BuildRequires:  pilot-link-devel
%description
%{summary}

%package devel
Summary:        Development package for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       libopensync-devel

%description    devel
The %{name}-devel package contains the files needed for development
with %{name}.

%prep
%setup -q
%patch0

%build
%configure
# does not like smp flags
make


%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 AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/opensync/formats/palm*.so
%{_libdir}/opensync/plugins/palm*.so
%{_datadir}/opensync/defaults/palm-sync

%files devel
%defattr(-,root,root,-)
%{_includedir}/opensync-1.0/opensync/palm*.h

%changelog
* Fri Nov 25 2005 Andreas Bierfert  0.18-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 08:39:32 -0000	1.1
+++ .cvsignore	13 Dec 2005 08:40:26 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-palm-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 08:39:32 -0000	1.1
+++ sources	13 Dec 2005 08:40:26 -0000	1.2
@@ -0,0 +1 @@
+d1b7e52318676294d205e3bcf5281294  libopensync-plugin-palm-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 09:55:02 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 04:55:02 -0500
Subject: rpms/koffice/FC-4 koffice-krita-kisfilter.patch, NONE,
	1.1 koffice.spec, 1.10, 1.11
Message-ID: <200512130955.jBD9tWnB004797@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4757/FC-4

Modified Files:
	koffice.spec 
Added Files:
	koffice-krita-kisfilter.patch 
Log Message:
- add krita compile fix


koffice-krita-kisfilter.patch:

--- NEW FILE koffice-krita-kisfilter.patch ---
--- krita/core/kis_filter_registry.h.orig	2005-12-13 10:49:29.000000000 +0100
+++ krita/core/kis_filter_registry.h	2005-12-13 10:49:50.000000000 +0100
@@ -26,7 +26,6 @@
 #include "kis_types.h"
 #include "kis_generic_registry.h"
 #include "kaction.h"
-#include "kis_filter.h"
 
 class QString;
 class KisView;


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- koffice.spec	8 Dec 2005 12:20:06 -0000	1.10
+++ koffice.spec	13 Dec 2005 09:55:00 -0000	1.11
@@ -13,6 +13,8 @@
 Patch0:         koffice-admin-gcc4isok.patch
 # CAN-2005-3193 see #175260
 Patch1:         koffice-CAN-2005-3193.diff
+
+Patch100:       koffice-krita-kisfilter.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -193,6 +195,7 @@
 %setup -q
 %patch0 -p1
 %patch1
+%patch100
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -749,6 +752,7 @@
 * Thu Dec 08 2005 Andreas Bierfert 
 1.4.2-2
 - fix CAN-2005-3193
+- add compile patch for krita
 
 * Fri Oct 14 2005 Andreas Bierfert 
 1.4.2-1



From fedora-extras-commits at redhat.com  Tue Dec 13 09:55:08 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 04:55:08 -0500
Subject: rpms/koffice/devel koffice-krita-kisfilter.patch, NONE,
	1.1 koffice.spec, 1.16, 1.17
Message-ID: <200512130955.jBD9tcCM004800@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4757/devel

Modified Files:
	koffice.spec 
Added Files:
	koffice-krita-kisfilter.patch 
Log Message:
- add krita compile fix


koffice-krita-kisfilter.patch:

--- NEW FILE koffice-krita-kisfilter.patch ---
--- krita/core/kis_filter_registry.h.orig	2005-12-13 10:49:29.000000000 +0100
+++ krita/core/kis_filter_registry.h	2005-12-13 10:49:50.000000000 +0100
@@ -26,7 +26,6 @@
 #include "kis_types.h"
 #include "kis_generic_registry.h"
 #include "kaction.h"
-#include "kis_filter.h"
 
 class QString;
 class KisView;


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- koffice.spec	8 Dec 2005 12:24:10 -0000	1.16
+++ koffice.spec	13 Dec 2005 09:55:06 -0000	1.17
@@ -15,6 +15,8 @@
 # fix CAN-2005-3193 see #175260
 Patch1:         koffice-CAN-2005-3193.diff
 
+Patch100:       koffice-krita-kisfilter.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -195,6 +197,7 @@
 %setup -q
 %patch0 -p1
 %patch1
+%patch100
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -751,6 +754,7 @@
 * Thu Dec 08 2005 Andreas Bierfert 
 1.4.2-3
 - fix CAN-2005-3193
+- add krita compile fix
 
 * Thu Nov 10 2005 Andreas Bierfert 
 1.4.2-2



From fedora-extras-commits at redhat.com  Tue Dec 13 11:42:18 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Dec 2005 06:42:18 -0500
Subject: rpms/ipxripd - New directory
Message-ID: <200512131142.jBDBgIqh008321@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/ipxripd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8312/ipxripd

Log Message:
Directory /cvs/extras/rpms/ipxripd added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 11:42:23 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Dec 2005 06:42:23 -0500
Subject: rpms/ipxripd/devel - New directory
Message-ID: <200512131142.jBDBgNcJ008337@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/ipxripd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8312/ipxripd/devel

Log Message:
Directory /cvs/extras/rpms/ipxripd/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 11:42:43 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Dec 2005 06:42:43 -0500
Subject: rpms/ipxripd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512131142.jBDBghEn008372@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/ipxripd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8359

Added Files:
	Makefile import.log 
Log Message:
Setup of module ipxripd


--- NEW FILE Makefile ---
# Top level Makefile for module ipxripd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 11:42:48 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Dec 2005 06:42:48 -0500
Subject: rpms/ipxripd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512131142.jBDBgmun008393@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/ipxripd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8359/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ipxripd


--- NEW 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 Dec 13 11:43:41 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Dec 2005 06:43:41 -0500
Subject: rpms/ipxripd import.log,1.1,1.2
Message-ID: <200512131144.jBDBiCwr008494@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/ipxripd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8447

Modified Files:
	import.log 
Log Message:
auto-import ipxripd-0.8-2 on branch devel from ipxripd-0.8-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ipxripd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 11:42:41 -0000	1.1
+++ import.log	13 Dec 2005 11:43:39 -0000	1.2
@@ -0,0 +1 @@
+ipxripd-0_8-2:HEAD:ipxripd-0.8-2.src.rpm:1134474211



From fedora-extras-commits at redhat.com  Tue Dec 13 11:43:47 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Dec 2005 06:43:47 -0500
Subject: rpms/ipxripd/devel ipxripd-0.7-gcc3.patch, NONE,
	1.1 ipxripd-0.7-kernel2.6.patch, NONE,
	1.1 ipxripd-0.8-glibc2.1.patch, NONE, 1.1 ipxripd.init, NONE,
	1.1 ipxripd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512131143.jBDBhlpi008487@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/ipxripd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8447/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ipxripd-0.7-gcc3.patch ipxripd-0.7-kernel2.6.patch 
	ipxripd-0.8-glibc2.1.patch ipxripd.init ipxripd.spec 
Log Message:
auto-import ipxripd-0.8-2 on branch devel from ipxripd-0.8-2.src.rpm

ipxripd-0.7-gcc3.patch:

--- NEW FILE ipxripd-0.7-gcc3.patch ---
diff -Nrbu ipxripd/ipxd.c ipxripd.OK/ipxd.c
--- ipxripd/ipxd.c	2004-08-03 15:36:01.000000000 +0400
+++ ipxripd.OK/ipxd.c	2004-08-03 15:35:33.000000000 +0400
@@ -19,6 +19,7 @@
 
 */
 
+#include 
 #include 
 #include 
 #include 
diff -Nrbu ipxripd/ipxd.h ipxripd.OK/ipxd.h
--- ipxripd/ipxd.h	1996-02-08 19:07:56.000000000 +0300
+++ ipxripd.OK/ipxd.h	2004-08-03 15:34:42.000000000 +0400
@@ -23,6 +23,7 @@
 #define _IPXD_H_
 
 #include 
+#include 
 #include 
 #include "ipxutil.h"
 #include "ipxkern.h"
@@ -55,7 +56,7 @@
 extern FILE *log_file;
 extern int passive;
 
-extern int check_request;
+extern volatile int check_request;
 
 struct ipx_interface *first_interface(void);
 struct ipx_interface *next_interface(struct ipx_interface *ifc);

ipxripd-0.7-kernel2.6.patch:

--- NEW FILE ipxripd-0.7-kernel2.6.patch ---
diff -Nrbu ipxripd/ipxkern.c ipxripd-OK/ipxkern.c
--- ipxripd/ipxkern.c	1996-02-01 19:56:07.000000000 +0300
+++ ipxripd-OK/ipxkern.c	2005-03-10 18:09:53.215272940 +0300
@@ -51,7 +51,9 @@
 	FILE *ipx_route;
 	char buf[512];
 
-	ipx_route = fopen("/proc/net/ipx_route", "r");
+	ipx_route = fopen("/proc/net/ipx/route", "r");
+	if (!ipx_route)
+		ipx_route = fopen("/proc/net/ipx_route", "r"); /* old kernels */
 
 	if (ipx_route == NULL)
 	{
@@ -109,7 +111,9 @@
 	FILE *ipx_ifc;
 	char buf[512];
 
-	ipx_ifc = fopen("/proc/net/ipx_interface", "r");
+	ipx_ifc = fopen("/proc/net/ipx/interface", "r");
+	if (!ipx_ifc)
+		ipx_ifc = fopen("/proc/net/ipx_interface", "r"); /*old kernels*/
 
 	if (ipx_ifc == NULL)
 	{

ipxripd-0.8-glibc2.1.patch:

--- NEW FILE ipxripd-0.8-glibc2.1.patch ---
diff -Nrbu ipxripd-0.8/ipxd.c ipxripd-0.8-OK/ipxd.c
--- ipxripd-0.8/ipxd.c	2001-07-01 01:07:34.000000000 +0400
+++ ipxripd-0.8-OK/ipxd.c	2005-10-13 16:19:25.000000000 +0400
@@ -333,8 +333,6 @@
 	struct itimerval itval;
 	int i;
 
-	log_file=stderr;
-	
 	LOG_ENTRY;
 	LOG_START;
 	fprintf(log_file,"Init start\n");
@@ -717,6 +715,7 @@
 int
 main(int argc,char** argv)
 {
+	log_file = stderr;
 	if (parse_cmdline(argc,argv))
 	{
 		daemonize();
diff -Nrbu ipxripd-0.8/ipxripd.c ipxripd-0.8-OK/ipxripd.c
--- ipxripd-0.8/ipxripd.c	2001-07-01 01:07:34.000000000 +0400
+++ ipxripd-0.8-OK/ipxripd.c	2005-10-13 16:18:07.000000000 +0400
@@ -39,7 +39,6 @@
 #include 
 #include 
 #include 
-#include 
 #include "ipxutil.h"
 #include "ipxkern.h"
 #include "ipxrip.h"
diff -Nrbu ipxripd-0.8/ipxsapd.c ipxripd-0.8-OK/ipxsapd.c
--- ipxripd-0.8/ipxsapd.c	2001-07-01 01:07:34.000000000 +0400
+++ ipxripd-0.8-OK/ipxsapd.c	2005-10-13 16:18:07.000000000 +0400
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 #include "ipxutil.h"
 #include "ipxkern.h"
 #include "ipxsap.h"
diff -Nrbu ipxripd-0.8/ipxutil.h ipxripd-0.8-OK/ipxutil.h
--- ipxripd-0.8/ipxutil.h	1996-02-01 19:58:48.000000000 +0300
+++ ipxripd-0.8-OK/ipxutil.h	2005-10-13 16:18:07.000000000 +0400
@@ -25,7 +25,7 @@
 #define __IPXUTIL_H__
 
 #include 
-#include 
+#include 
 
 #define IPX_MAX_ERROR	(255)
 #define IPX_THIS_NET 	(0)


--- NEW FILE ipxripd.init ---
#! /bin/sh
# chkconfig: - 55 55
# description: ipxripd is an implementation of Novell's RIP and SAP
#              protocols.
# processname: ipxd

# Source function library.
. /etc/rc.d/init.d/functions

# Get config.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

# See how we were called.
case "$1" in
  start)
	echo -n "Starting ipxd services: "
	daemon ipxd
	[ $? -eq 0 ] && touch /var/lock/subsys/ipxd
	echo
	;;
  stop)
	echo -n "Stopping ipxd services: "
	killproc ipxd
	rm -f /var/lock/subsys/ipxd
	echo
	;;
  status)
	status ipxd
	;;
  restart|reload)
	$0 stop
	$0 start
	;;
  condrestart)
	[ -f /var/lock/subsys/ipxd ] && $0 restart
	;;
  *)
	echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
	exit 1
esac

exit 0


--- NEW FILE ipxripd.spec ---
Summary: IPX RIP/SAP daemon - routing for IPX networks
Name: ipxripd
Version: 0.8
Release: 2%{?dist}
Group: System Environment/Daemons
License: GPL
URL: ftp://ftp.ibiblio.org/pub/Linux/system/filesystems/ncpfs/
Source0: ftp://ftp.ibiblio.org/pub/Linux/system/filesystems/ncpfs/ipxripd-%{version}.tar.gz
Source1: ipxripd.init
Patch0: ipxripd-0.8-glibc2.1.patch
Patch1: ipxripd-0.7-gcc3.patch
Patch2: ipxripd-0.7-kernel2.6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig, /sbin/service
Requires(postun): /sbin/service


%description
%{name} is an implementation of Novell's RIP and SAP protocols.
It automagically builds and updates IPX routing table in the Linux kernel.
%{name} can be useful to get a Linux box to act as an IPX router.


%prep
%setup -q
%patch0  -p1
%patch1  -p1
%patch2  -p1


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_sbindir}
install -m755 ipxd $RPM_BUILD_ROOT%{_sbindir}

install -d $RPM_BUILD_ROOT%{_mandir}/man8
install -d $RPM_BUILD_ROOT%{_mandir}/man5
install -p ipxd.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p ipx_ticks.5 $RPM_BUILD_ROOT%{_mandir}/man5

install -d $RPM_BUILD_ROOT%{_initrddir}
install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ipxd


%post

/sbin/chkconfig --add ipxd


%preun
if [ $1 = 0 ]; then
   /sbin/service ipxd stop >/dev/null 2>&1
   /sbin/chkconfig --del ipxd
fi


%postun
if [ $1 != 0 ]; then
   /sbin/service ipxd condrestart >/dev/null 2>&1
fi


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README ipx_ticks ipxripd-*.lsm
%{_sbindir}/*
%{_initrddir}/*
%{_mandir}/*/*


%changelog
* Tue Dec 13 2005 Dmitry Butskoy  - 0.8-2
- spec file cleanups
- accepted for Fedora Extra (review by John Mahowald )

* Thu Oct 13 2005 Dmitry Butskoy  - 0.8-1
- upgrade to 0.8
- cleanups of initrd script

* Thu Mar 10 2005 Dmitry Butskoy  - 0.7-1
- add patch for kernel >= 2.6

* Tue Aug  3 2004 Dmitry Butskoy 
- replace old patches by new one from PLD distribution (common "glibc2.1.patch")
- add gcc3 compilation patch to build on Fedora Core 1

* Tue Dec 14 1999 Joerg Dorchain 
- added init script

* Wed Jul  8 1998 Andrzej K. Brandt 
- First version of the RPM package
- Added a quick and dirty hack to this thing to compile under glibc
  I tested it and it works fine



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipxripd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 11:42:46 -0000	1.1
+++ .cvsignore	13 Dec 2005 11:43:45 -0000	1.2
@@ -0,0 +1 @@
+ipxripd-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipxripd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 11:42:46 -0000	1.1
+++ sources	13 Dec 2005 11:43:45 -0000	1.2
@@ -0,0 +1 @@
+decd5c1eb2c763e25c7a2db3c385cdf0  ipxripd-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 11:48:25 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 13 Dec 2005 06:48:25 -0500
Subject: owners owners.list,1.444,1.445
Message-ID: <200512131148.jBDBmtrw008599@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8578

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- owners.list	13 Dec 2005 03:59:47 -0000	1.444
+++ owners.list	13 Dec 2005 11:48:23 -0000	1.445
@@ -393,6 +393,7 @@
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|iozone|A file system performance analysis tool|nhorman at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ip-sentinel|Tool to prevent unauthorized usage of IP addresses|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|ipxripd|IPX RIP/SAP daemon - routing for IPX networks|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|ipython|An enhanced interactive Python shell|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|ircd-hybrid|Internet Relay Chat Server|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|irssi|Modular text mode IRC client with Perl scripting|anvil at livna.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 13 12:11:14 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 13 Dec 2005 07:11:14 -0500
Subject: rpms/kasumi/FC-4 .cvsignore, 1.3, 1.4 kasumi.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200512131211.jBDCBqaC010304@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/kasumi/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10282

Modified Files:
	.cvsignore kasumi.spec sources 
Log Message:
* Mon Dec 12 2005 Akira TAGOH  - 1.0-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kasumi/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2005 07:33:57 -0000	1.3
+++ .cvsignore	13 Dec 2005 12:11:10 -0000	1.4
@@ -1,2 +1,3 @@
 kasumi-0.9.tar.gz
 kasumi-0.10.tar.gz
+kasumi-1.0.tar.gz


Index: kasumi.spec
===================================================================
RCS file: /cvs/extras/rpms/kasumi/FC-4/kasumi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kasumi.spec	13 Oct 2005 07:33:57 -0000	1.3
+++ kasumi.spec	13 Dec 2005 12:11:10 -0000	1.4
@@ -1,5 +1,5 @@
 Name:    kasumi
-Version: 0.10
+Version: 1.0
 Release: 1%{?dist}
 
 License: GPL
@@ -52,10 +52,13 @@
 
 
 %changelog
+* Mon Dec 12 2005 Akira TAGOH  - 1.0-1
+- New upstream release.
+
 * Thu Oct 13 2005 Akira TAGOH  - 0.10-1
 - New upstream release.
 
-* Tue Aug 23 2005 Akira TAGOH  - 0.9-4.fc4
+* Tue Aug 23 2005 Akira TAGOH  - 0.9-4
 - sync from devel.
 
 * Tue Aug 16 2005 Akira TAGOH  - 0.9-3.fc5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kasumi/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2005 07:33:57 -0000	1.3
+++ sources	13 Dec 2005 12:11:10 -0000	1.4
@@ -1 +1 @@
-bfeba1ef78a15da7f180f04ec271f987  kasumi-0.10.tar.gz
+15314d8eaaf83abf5fd41b93be8ce91f  kasumi-1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 12:58:49 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Tue, 13 Dec 2005 07:58:49 -0500
Subject: rpms/blogtk/devel blogtk.spec,1.1,1.2
Message-ID: <200512131259.jBDCxJhA010635@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/blogtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10580/devel

Modified Files:
	blogtk.spec 
Log Message:
Bring package in line with current fedora-rpmdevtools standards (1.1-5)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/devel/blogtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blogtk.spec	27 Sep 2005 22:48:15 -0000	1.1
+++ blogtk.spec	13 Dec 2005 12:58:47 -0000	1.2
@@ -1,27 +1,29 @@
-# Note to Fedora Extras reviewers: The developer is very inconsistent
-# about the capitalization of the program name.  I have erred on the
-# conservative side.
-Name:		blogtk
-Version:	1.1
-Release:	4%{?dist}
-Summary:	Gnome application for editing/maintaining blogs
-Group:		Applications/Internet
-License:	BSD
-URL:		http://blogtk.sourceforge.net
-Source0:	http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
+%{!?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:           blogtk
+Version:        1.1
+Release:        5%{?dist}
+Summary:        GNOME application for editing/maintaining blogs
+
+Group:          Applications/Internet
+License:        BSD
+URL:            http://blogtk.sourceforge.net
+Source0:        http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
 Source1:	BSD
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  pygtk2-devel >= 2.00
+BuildRequires:	glib2-devel
+BuildRequires:	desktop-file-utils
+Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
-BuildRequires:  pygtk2-devel >= 2.00
-BuildRequires:	glib2-devel
-BuildRequires:  desktop-file-utils
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
-
 %description
 BloGTK is a weblog posting client written in Python for any platform that
 supports Python and the GTK widget set. BloGTK allows you to connect to your
@@ -34,17 +36,19 @@
 
 
 %build
+# Developer does not use setup.py
+#CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 # Cope with developer's Makefile and Fedora standards
-%define pyver %(python -c "import sys; x = sys.version_info; print '%%s.%%s' %% (x[0], x[1])")
 install -m 755 -d $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 -d $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}
+install -m 755 -d $RPM_BUILD_ROOT/%{python_sitelib}/%{name}
 install -m 755 -d $RPM_BUILD_ROOT/%{_datadir}/{%{name},pixmaps/%{name}}
 install -m 755 src/* \
-	$RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}
+	$RPM_BUILD_ROOT/%{python_sitelib}/%{name}
 install -m 644 pixmaps/blogtk.glade \
 	$RPM_BUILD_ROOT/%{_datadir}/%{name}
 install -m 644 pixmaps/*.png $RPM_BUILD_ROOT/%{_datadir}/%{name}
@@ -55,7 +59,7 @@
 	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
 cat << EOF > $RPM_BUILD_ROOT/%{_bindir}/blogtk
 #!/bin/sh
-exec %{_libdir}/python%{pyver}/site-packages/%{name}/BloGTK.py
+exec %{python_sitelib}/%{name}/BloGTK.py
 EOF
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/blogtk
 desktop-file-install --vendor=fedora \
@@ -65,7 +69,7 @@
 	--add-category=Network \
 	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
 
-
+ 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -74,8 +78,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README BSD
 %{_bindir}/*
-%dir %{_libdir}/python%{pyver}/site-packages/%{name}
-%{_libdir}/python%{pyver}/site-packages/%{name}/*
+%dir %{python_sitelib}/%{name}
+%{python_sitelib}/%{name}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/fedora-blogtk.desktop
@@ -83,6 +87,9 @@
 
 
 %changelog
+* Tue Dec 13 2005 Paul W. Frields  - 1.1-5
+- Bring package in line with current fedora-rpmdevtools standards
+
 * Mon Aug 29 2005 Paul W. Frields  - 1.1-4
 - Add BSD license file
 



From fedora-extras-commits at redhat.com  Tue Dec 13 12:59:05 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Tue, 13 Dec 2005 07:59:05 -0500
Subject: rpms/blogtk/FC-3 blogtk.spec,1.1,1.2
Message-ID: <200512131259.jBDCxaqe010641@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/blogtk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10580/FC-3

Modified Files:
	blogtk.spec 
Log Message:
Bring package in line with current fedora-rpmdevtools standards (1.1-5)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/FC-3/blogtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blogtk.spec	27 Sep 2005 22:48:15 -0000	1.1
+++ blogtk.spec	13 Dec 2005 12:59:03 -0000	1.2
@@ -1,27 +1,29 @@
-# Note to Fedora Extras reviewers: The developer is very inconsistent
-# about the capitalization of the program name.  I have erred on the
-# conservative side.
-Name:		blogtk
-Version:	1.1
-Release:	4%{?dist}
-Summary:	Gnome application for editing/maintaining blogs
-Group:		Applications/Internet
-License:	BSD
-URL:		http://blogtk.sourceforge.net
-Source0:	http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
+%{!?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:           blogtk
+Version:        1.1
+Release:        5%{?dist}
+Summary:        GNOME application for editing/maintaining blogs
+
+Group:          Applications/Internet
+License:        BSD
+URL:            http://blogtk.sourceforge.net
+Source0:        http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
 Source1:	BSD
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  pygtk2-devel >= 2.00
+BuildRequires:	glib2-devel
+BuildRequires:	desktop-file-utils
+Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
-BuildRequires:  pygtk2-devel >= 2.00
-BuildRequires:	glib2-devel
-BuildRequires:  desktop-file-utils
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
-
 %description
 BloGTK is a weblog posting client written in Python for any platform that
 supports Python and the GTK widget set. BloGTK allows you to connect to your
@@ -34,17 +36,19 @@
 
 
 %build
+# Developer does not use setup.py
+#CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 # Cope with developer's Makefile and Fedora standards
-%define pyver %(python -c "import sys; x = sys.version_info; print '%%s.%%s' %% (x[0], x[1])")
 install -m 755 -d $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 -d $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}
+install -m 755 -d $RPM_BUILD_ROOT/%{python_sitelib}/%{name}
 install -m 755 -d $RPM_BUILD_ROOT/%{_datadir}/{%{name},pixmaps/%{name}}
 install -m 755 src/* \
-	$RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}
+	$RPM_BUILD_ROOT/%{python_sitelib}/%{name}
 install -m 644 pixmaps/blogtk.glade \
 	$RPM_BUILD_ROOT/%{_datadir}/%{name}
 install -m 644 pixmaps/*.png $RPM_BUILD_ROOT/%{_datadir}/%{name}
@@ -55,7 +59,7 @@
 	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
 cat << EOF > $RPM_BUILD_ROOT/%{_bindir}/blogtk
 #!/bin/sh
-exec %{_libdir}/python%{pyver}/site-packages/%{name}/BloGTK.py
+exec %{python_sitelib}/%{name}/BloGTK.py
 EOF
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/blogtk
 desktop-file-install --vendor=fedora \
@@ -65,7 +69,7 @@
 	--add-category=Network \
 	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
 
-
+ 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -74,8 +78,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README BSD
 %{_bindir}/*
-%dir %{_libdir}/python%{pyver}/site-packages/%{name}
-%{_libdir}/python%{pyver}/site-packages/%{name}/*
+%dir %{python_sitelib}/%{name}
+%{python_sitelib}/%{name}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/fedora-blogtk.desktop
@@ -83,6 +87,9 @@
 
 
 %changelog
+* Tue Dec 13 2005 Paul W. Frields  - 1.1-5
+- Bring package in line with current fedora-rpmdevtools standards
+
 * Mon Aug 29 2005 Paul W. Frields  - 1.1-4
 - Add BSD license file
 



From fedora-extras-commits at redhat.com  Tue Dec 13 12:59:11 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Tue, 13 Dec 2005 07:59:11 -0500
Subject: rpms/blogtk/FC-4 blogtk.spec,1.1,1.2
Message-ID: <200512131259.jBDCxfsW010645@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/blogtk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10580/FC-4

Modified Files:
	blogtk.spec 
Log Message:
Bring package in line with current fedora-rpmdevtools standards (1.1-5)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/FC-4/blogtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blogtk.spec	27 Sep 2005 22:48:15 -0000	1.1
+++ blogtk.spec	13 Dec 2005 12:59:09 -0000	1.2
@@ -1,27 +1,29 @@
-# Note to Fedora Extras reviewers: The developer is very inconsistent
-# about the capitalization of the program name.  I have erred on the
-# conservative side.
-Name:		blogtk
-Version:	1.1
-Release:	4%{?dist}
-Summary:	Gnome application for editing/maintaining blogs
-Group:		Applications/Internet
-License:	BSD
-URL:		http://blogtk.sourceforge.net
-Source0:	http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
+%{!?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:           blogtk
+Version:        1.1
+Release:        5%{?dist}
+Summary:        GNOME application for editing/maintaining blogs
+
+Group:          Applications/Internet
+License:        BSD
+URL:            http://blogtk.sourceforge.net
+Source0:        http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
 Source1:	BSD
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  pygtk2-devel >= 2.00
+BuildRequires:	glib2-devel
+BuildRequires:	desktop-file-utils
+Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
-BuildRequires:  pygtk2-devel >= 2.00
-BuildRequires:	glib2-devel
-BuildRequires:  desktop-file-utils
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
-
 %description
 BloGTK is a weblog posting client written in Python for any platform that
 supports Python and the GTK widget set. BloGTK allows you to connect to your
@@ -34,17 +36,19 @@
 
 
 %build
+# Developer does not use setup.py
+#CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 # Cope with developer's Makefile and Fedora standards
-%define pyver %(python -c "import sys; x = sys.version_info; print '%%s.%%s' %% (x[0], x[1])")
 install -m 755 -d $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 -d $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}
+install -m 755 -d $RPM_BUILD_ROOT/%{python_sitelib}/%{name}
 install -m 755 -d $RPM_BUILD_ROOT/%{_datadir}/{%{name},pixmaps/%{name}}
 install -m 755 src/* \
-	$RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}
+	$RPM_BUILD_ROOT/%{python_sitelib}/%{name}
 install -m 644 pixmaps/blogtk.glade \
 	$RPM_BUILD_ROOT/%{_datadir}/%{name}
 install -m 644 pixmaps/*.png $RPM_BUILD_ROOT/%{_datadir}/%{name}
@@ -55,7 +59,7 @@
 	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
 cat << EOF > $RPM_BUILD_ROOT/%{_bindir}/blogtk
 #!/bin/sh
-exec %{_libdir}/python%{pyver}/site-packages/%{name}/BloGTK.py
+exec %{python_sitelib}/%{name}/BloGTK.py
 EOF
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/blogtk
 desktop-file-install --vendor=fedora \
@@ -65,7 +69,7 @@
 	--add-category=Network \
 	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
 
-
+ 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -74,8 +78,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README BSD
 %{_bindir}/*
-%dir %{_libdir}/python%{pyver}/site-packages/%{name}
-%{_libdir}/python%{pyver}/site-packages/%{name}/*
+%dir %{python_sitelib}/%{name}
+%{python_sitelib}/%{name}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/fedora-blogtk.desktop
@@ -83,6 +87,9 @@
 
 
 %changelog
+* Tue Dec 13 2005 Paul W. Frields  - 1.1-5
+- Bring package in line with current fedora-rpmdevtools standards
+
 * Mon Aug 29 2005 Paul W. Frields  - 1.1-4
 - Add BSD license file
 



From fedora-extras-commits at redhat.com  Tue Dec 13 13:32:26 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 13 Dec 2005 08:32:26 -0500
Subject: rpms/paps/devel paps-0.6.1-makefile.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 paps.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200512131332.jBDDWuIh012538@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/paps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12513

Modified Files:
	.cvsignore paps.spec sources 
Added Files:
	paps-0.6.1-makefile.patch 
Log Message:
* Tue Dec 13 2005 Akira TAGOH  - 0.6.1-1
- New upstream release.
- paps-0.6.1-makefile.patch: applied to install docs on the proper dir.

paps-0.6.1-makefile.patch:

--- NEW FILE paps-0.6.1-makefile.patch ---
diff -ruN paps-0.6.1.orig/doc/Makefile.am paps-0.6.1/doc/Makefile.am
--- paps-0.6.1.orig/doc/Makefile.am	2005-12-13 22:16:48.000000000 +0900
+++ paps-0.6.1/doc/Makefile.am	2005-12-13 22:19:38.000000000 +0900
@@ -10,7 +10,7 @@
 
 EXTRA_DIST = Doxyfile example-output.png mainpage.h
 
-htmldir = share/doc/libpaps/html
+htmldir = $(datadir)/doc/paps-$(VERSION)/html
-install-data-hook:
-	mkdir -p $(prefix)/$(htmldir)
-	cp -dpR doxygen-html/* $(prefix)/$(htmldir)
+#install-data-hook:
+#	mkdir -p $(prefix)/$(htmldir)
+#	cp -dpR doxygen-html/* $(prefix)/$(htmldir)
diff -ruN paps-0.6.1.orig/src/Makefile.am paps-0.6.1/src/Makefile.am
--- paps-0.6.1.orig/src/Makefile.am	2005-12-13 22:16:48.000000000 +0900
+++ paps-0.6.1/src/Makefile.am	2005-12-13 22:18:55.000000000 +0900
@@ -1,4 +1,4 @@
-lib_LIBRARIES = libpaps.a
+noinst_LIBRARIES = libpaps.a
 libpaps_a_SOURCES = libpaps.c
 libpaps_a_inc_HEADERS = libpaps.h
 libpaps_a_incdir = $(includedir)
@@ -6,7 +6,7 @@
 bin_PROGRAMS = paps
 paps_CFLAGS  = -Wall 
 paps_SOURCES = paps.c
-paps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+paps_LDADD = $(noinst_LIBRARIES) $(all_libraries)
 paps_LDFLAGS = `pkg-config --libs pangoft2`
 paps_DEPENDENCIES = $(lib_LIBRARIES)
 
@@ -20,7 +20,7 @@
 
 
 test_libpaps_SOURCES = test_libpaps.c
-test_libpaps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+test_libpaps_LDADD = $(noinst_LIBRARIES) $(all_libraries)
 test_libpaps_LDFLAGS = `pkg-config --libs pangoft2`
 test_libpaps_DEPENDENCIES = $(lib_LIBRARIES) 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Nov 2005 06:28:10 -0000	1.3
+++ .cvsignore	13 Dec 2005 13:32:23 -0000	1.4
@@ -1,2 +1,6 @@
+*gz
+*bz2
+*rpm
 paps-0.3.tgz
 paps-0.5.tgz
+paps-0.6.1.tar.gz


Index: paps.spec
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paps.spec	4 Nov 2005 06:28:10 -0000	1.2
+++ paps.spec	13 Dec 2005 13:32:24 -0000	1.3
@@ -1,12 +1,13 @@
 Name:		paps
-Version:	0.5
+Version:	0.6.1
 Release:	1%{?dist}
 
 License:	LGPL
-URL:		http://imagic.weizmann.ac.il/~dov/freesw/paps/
-Source0:	http://imagic.weizmann.ac.il/~dov/freesw/paps/paps-%{version}.tgz
+URL:		http://paps.sourceforge.net/
+Source0:	http://paps.sourceforge.net/paps-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pango-devel
+Patch0:		paps-0.6.1-makefile.patch
 
 Summary:	Plain Text to PostScript converter
 Group:		Applications/Publishing
@@ -15,29 +16,38 @@
 
 
 %prep
-%setup -q -n paps
+%setup -q
+%patch0 -p1 -b .makefile
+aclocal
+automake
+autoconf
 
 
 %build
-make %{?_smp_mflags} CC="gcc $RPM_OPT_FLAGS"
+%configure
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m0755 paps $RPM_BUILD_ROOT%{_bindir}
 
+%makeinstall
+rm -rf $RPM_BUILD_ROOT%{_includedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%doc COPYING
+%doc AUTHORS COPYING.LIB README NEWS TODO
 %{_bindir}/paps
 
 
 %changelog
+* Tue Dec 13 2005 Akira TAGOH  - 0.6.1-1
+- New upstream release.
+- paps-0.6.1-makefile.patch: applied to install docs on the proper dir.
+
 * Fri Nov  4 2005 Akira TAGOH  - 0.5-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Nov 2005 06:28:10 -0000	1.3
+++ sources	13 Dec 2005 13:32:24 -0000	1.4
@@ -1 +1 @@
-85466c651087c70341ddf46dd9281722  paps-0.5.tgz
+9de11306b1db7c87e754b66e3328b212  paps-0.6.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 13:43:03 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 13 Dec 2005 08:43:03 -0500
Subject: rpms/nmh/FC-3 nmh-1.1-annotate.patch,NONE,1.1 nmh.spec,1.9,1.10
Message-ID: <200512131343.jBDDhXJO012643@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/extras/rpms/nmh/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12620

Modified Files:
	nmh.spec 
Added Files:
	nmh-1.1-annotate.patch 
Log Message:
Fix repl's annotate switch.


nmh-1.1-annotate.patch:

--- NEW FILE nmh-1.1-annotate.patch ---
--- nmh-orig/uip/sendsbr.c	2005-12-12 15:51:52.000000000 -0500
+++ nmh/uip/sendsbr.c	2005-12-12 15:53:27.000000000 -0500
@@ -1020,7 +1020,7 @@
 	if (is_selected(mp, msgnum)) {
 	    if (debugsw)
 		advise (NULL, "annotate message %d", msgnum);
-	    annotate (m_name (msgnum), annotext, cp, inplace, 1, 0, 0);
+	    annotate (m_name (msgnum), annotext, cp, inplace, 1, -1, 0);
 	}
     }
 


Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/FC-3/nmh.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nmh.spec	5 Dec 2005 22:06:49 -0000	1.9
+++ nmh.spec	13 Dec 2005 13:43:01 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        12.fc3
+Release:        13.fc3
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 Patch0:         nmh-1.1-makefile.patch
 Patch1:         nmh-1.1-lock_file.patch
 Patch2:         nmh-1.1-empty-content-type.patch
+Patch3:         nmh-1.1-annotate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
@@ -32,6 +33,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 
 
 %build
@@ -66,6 +68,9 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Tue Dec 13 2005 Josh Bressers  0:1.1-13.fc3
+- Add a patch to allow repl to properly annotate messages.
+
 * Mon Dec 05 2005 Josh Bressers  0:1.1-12.fc3
 - Add a buildrequires on /bin/vi
 - Modify the sendmail buildrequires to use /usr/sbin/sendmail



From fedora-extras-commits at redhat.com  Tue Dec 13 13:46:22 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 08:46:22 -0500
Subject: rpms/libopensync/FC-3 libopensync-configure.patch, NONE,
	1.1 libopensync.spec, 1.3, 1.4
Message-ID: <200512131346.jBDDkqsQ012777@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12680/FC-3

Modified Files:
	libopensync.spec 
Added Files:
	libopensync-configure.patch 
Log Message:
- patch configure for x86_64 python


libopensync-configure.patch:

--- NEW FILE libopensync-configure.patch ---
--- configure.orig	2005-12-13 14:35:40.000000000 +0100
+++ configure	2005-12-13 14:40:03.000000000 +0100
@@ -22352,7 +22352,7 @@
 if test "${am_cv_python_pythondir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
 fi
 echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-3/libopensync.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync.spec	13 Dec 2005 08:17:26 -0000	1.3
+++ libopensync.spec	13 Dec 2005 13:46:20 -0000	1.4
@@ -9,6 +9,7 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
+Patch1:         libopensync-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -41,6 +42,8 @@
 %prep
 %setup -q
 %patch0
+%patch1
+
 # some source files are marked executable
 for dir in opensync osengine; do
     cd %{_builddir}/%{name}-%{version}/$dir
@@ -100,6 +103,7 @@
 * Tue Dec 13 2005 Andreas Bierfert 
 0.18-5
 - change handling of ld.so.conf files
+- patch configure for x86_64 python
 
 * Sun Dec 11 2005 Andreas Bierfert 
 0.18-4



From fedora-extras-commits at redhat.com  Tue Dec 13 13:46:28 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 08:46:28 -0500
Subject: rpms/libopensync/FC-4 libopensync-configure.patch, NONE,
	1.1 libopensync.spec, 1.3, 1.4
Message-ID: <200512131346.jBDDkwVa012780@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12680/FC-4

Modified Files:
	libopensync.spec 
Added Files:
	libopensync-configure.patch 
Log Message:
- patch configure for x86_64 python


libopensync-configure.patch:

--- NEW FILE libopensync-configure.patch ---
--- configure.orig	2005-12-13 14:35:40.000000000 +0100
+++ configure	2005-12-13 14:40:03.000000000 +0100
@@ -22352,7 +22352,7 @@
 if test "${am_cv_python_pythondir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
 fi
 echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/FC-4/libopensync.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync.spec	13 Dec 2005 08:17:32 -0000	1.3
+++ libopensync.spec	13 Dec 2005 13:46:26 -0000	1.4
@@ -9,6 +9,7 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
+Patch1:         libopensync-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -41,6 +42,8 @@
 %prep
 %setup -q
 %patch0
+%patch1
+
 # some source files are marked executable
 for dir in opensync osengine; do
     cd %{_builddir}/%{name}-%{version}/$dir
@@ -100,6 +103,7 @@
 * Tue Dec 13 2005 Andreas Bierfert 
 0.18-5
 - change handling of ld.so.conf files
+- patch configure for x86_64 python
 
 * Sun Dec 11 2005 Andreas Bierfert 
 0.18-4



From fedora-extras-commits at redhat.com  Tue Dec 13 13:46:33 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 08:46:33 -0500
Subject: rpms/libopensync/devel libopensync-configure.patch, NONE,
	1.1 libopensync.spec, 1.3, 1.4
Message-ID: <200512131347.jBDDl4RX012783@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12680/devel

Modified Files:
	libopensync.spec 
Added Files:
	libopensync-configure.patch 
Log Message:
- patch configure for x86_64 python


libopensync-configure.patch:

--- NEW FILE libopensync-configure.patch ---
--- configure.orig	2005-12-13 14:35:40.000000000 +0100
+++ configure	2005-12-13 14:40:03.000000000 +0100
@@ -22352,7 +22352,7 @@
 if test "${am_cv_python_pythondir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
 fi
 echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync.spec	13 Dec 2005 08:17:37 -0000	1.3
+++ libopensync.spec	13 Dec 2005 13:46:31 -0000	1.4
@@ -9,6 +9,7 @@
 # see http://www.opensync.org/wiki/download
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
+Patch1:         libopensync-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -41,6 +42,8 @@
 %prep
 %setup -q
 %patch0
+%patch1
+
 # some source files are marked executable
 for dir in opensync osengine; do
     cd %{_builddir}/%{name}-%{version}/$dir
@@ -100,6 +103,7 @@
 * Tue Dec 13 2005 Andreas Bierfert 
 0.18-5
 - change handling of ld.so.conf files
+- patch configure for x86_64 python
 
 * Sun Dec 11 2005 Andreas Bierfert 
 0.18-4



From fedora-extras-commits at redhat.com  Tue Dec 13 13:49:28 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue, 13 Dec 2005 08:49:28 -0500
Subject: rpms/nsd/devel nsd.spec,1.1,1.2
Message-ID: <200512131349.jBDDnx3I012903@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12848

Modified Files:
	nsd.spec 
Log Message:
Added dependancies on openssl (I thought this was in the base system)
and openssl-devel (should have been part of BuildRequires).



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsd.spec	13 Dec 2005 04:10:38 -0000	1.1
+++ nsd.spec	13 Dec 2005 13:49:26 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -9,8 +9,8 @@
 Patch0: nsd-2.3.3-checking.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#Requires: 
-BuildRequires: flex
+Requires: openssl
+BuildRequires: flex, openssl-devel
 
 %description
 NSD is a complete implementation of an authoritative DNS name server.



From fedora-extras-commits at redhat.com  Tue Dec 13 14:05:50 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue, 13 Dec 2005 09:05:50 -0500
Subject: rpms/nsd/devel nsd.spec,1.2,1.3
Message-ID: <200512131406.jBDE6LmA014676@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14639

Modified Files:
	nsd.spec 
Log Message:
bumped version



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsd.spec	13 Dec 2005 13:49:26 -0000	1.2
+++ nsd.spec	13 Dec 2005 14:05:48 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 14:05:52 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 13 Dec 2005 09:05:52 -0500
Subject: rpms/gtkwave/devel gtkwave.spec, 1.2, 1.3 sources, 1.3,
	1.4 .cvsignore, 1.3, 1.4
Message-ID: <200512131406.jBDE6hfH014685@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14637

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Update to 1.3.81



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtkwave.spec	27 Nov 2005 10:39:52 -0000	1.2
+++ gtkwave.spec	13 Dec 2005 14:05:50 -0000	1.3
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.80
+Version:		1.3.81
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Tue Dec 13 2005 Paul Howarth  1.3.81-1
+- update to 1.3.81
+
 * Sun Nov 27 2005 Paul Howarth  1.3.80-1
 - update to 1.3.80
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2005 10:39:52 -0000	1.3
+++ sources	13 Dec 2005 14:05:50 -0000	1.4
@@ -1 +1 @@
-039763bbb4cd593297eb3644e3e65c63  gtkwave-1.3.80.tgz
+3dfd17856187c816b533aec1e78e80cb  gtkwave-1.3.81.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2005 10:39:52 -0000	1.3
+++ .cvsignore	13 Dec 2005 14:05:50 -0000	1.4
@@ -1 +1 @@
-gtkwave-1.3.80.tgz
+gtkwave-1.3.81.tgz



From fedora-extras-commits at redhat.com  Tue Dec 13 14:09:48 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 13 Dec 2005 09:09:48 -0500
Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.2, 1.3 sources, 1.3,
	1.4 .cvsignore, 1.3, 1.4
Message-ID: <200512131410.jBDEAISZ014795@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14770

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtkwave.spec	27 Nov 2005 10:44:56 -0000	1.2
+++ gtkwave.spec	13 Dec 2005 14:09:46 -0000	1.3
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.80
+Version:		1.3.81
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Tue Dec 13 2005 Paul Howarth  1.3.81-1
+- update to 1.3.81
+
 * Sun Nov 27 2005 Paul Howarth  1.3.80-1
 - update to 1.3.80
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2005 10:44:56 -0000	1.3
+++ sources	13 Dec 2005 14:09:46 -0000	1.4
@@ -1 +1 @@
-039763bbb4cd593297eb3644e3e65c63  gtkwave-1.3.80.tgz
+3dfd17856187c816b533aec1e78e80cb  gtkwave-1.3.81.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2005 10:44:56 -0000	1.3
+++ .cvsignore	13 Dec 2005 14:09:46 -0000	1.4
@@ -1 +1 @@
-gtkwave-1.3.80.tgz
+gtkwave-1.3.81.tgz



From fedora-extras-commits at redhat.com  Tue Dec 13 14:12:20 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 13 Dec 2005 09:12:20 -0500
Subject: rpms/gtkwave/FC-3 gtkwave.spec, 1.2, 1.3 sources, 1.3,
	1.4 .cvsignore, 1.3, 1.4
Message-ID: <200512131412.jBDECoLG014870@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14848

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/gtkwave.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtkwave.spec	27 Nov 2005 10:49:17 -0000	1.2
+++ gtkwave.spec	13 Dec 2005 14:12:18 -0000	1.3
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.80
+Version:		1.3.81
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Tue Dec 13 2005 Paul Howarth  1.3.81-1
+- update to 1.3.81
+
 * Sun Nov 27 2005 Paul Howarth  1.3.80-1
 - update to 1.3.80
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2005 10:49:17 -0000	1.3
+++ sources	13 Dec 2005 14:12:18 -0000	1.4
@@ -1 +1 @@
-039763bbb4cd593297eb3644e3e65c63  gtkwave-1.3.80.tgz
+3dfd17856187c816b533aec1e78e80cb  gtkwave-1.3.81.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Nov 2005 10:49:17 -0000	1.3
+++ .cvsignore	13 Dec 2005 14:12:18 -0000	1.4
@@ -1 +1 @@
-gtkwave-1.3.80.tgz
+gtkwave-1.3.81.tgz



From fedora-extras-commits at redhat.com  Tue Dec 13 14:14:00 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:14:00 -0500
Subject: rpms/libopensync/devel libopensync-wrapper.patch, NONE,
	1.1 libopensync.spec, 1.4, 1.5
Message-ID: <200512131414.jBDEEU2I014961@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14889

Modified Files:
	libopensync.spec 
Added Files:
	libopensync-wrapper.patch 
Log Message:
- add wrapper compile patch (no Werror)


libopensync-wrapper.patch:

--- NEW FILE libopensync-wrapper.patch ---
--- wrapper/Makefile.am.orig	2005-12-13 15:05:22.000000000 +0100
+++ wrapper/Makefile.am	2005-12-13 15:06:07.000000000 +0100
@@ -1,10 +1,10 @@
 
-AM_CFLAGS = -Werror
+AM_CFLAGS = 
 
 INCLUDES= @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
 
 opensync_wrap.c: $(srcdir)/opensync.i
-	$(SWIG) -Werror -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
+	$(SWIG) -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
 
 EXTRA_DIST = opensync.i
 
--- wrapper/Makefile.in.orig	2005-12-13 15:05:26.000000000 +0100
+++ wrapper/Makefile.in	2005-12-13 15:06:27.000000000 +0100
@@ -222,7 +222,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AM_CFLAGS = -Werror
+AM_CFLAGS = 
 INCLUDES = @PACKAGE_CFLAGS@ $(PYTHON_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/opensync
 EXTRA_DIST = opensync.i
 CLEANFILES = \
@@ -542,7 +542,7 @@
 
 
 opensync_wrap.c: $(srcdir)/opensync.i
-	$(SWIG) -Werror -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
+	$(SWIG) -python -modern -I$(top_srcdir)/opensync $(PYTHON_INCLUDES) -o opensync_wrap.c $(srcdir)/opensync.i
 # 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:


Index: libopensync.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libopensync.spec	13 Dec 2005 13:46:31 -0000	1.4
+++ libopensync.spec	13 Dec 2005 14:13:57 -0000	1.5
@@ -10,6 +10,7 @@
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         libopensync-rpath.patch
 Patch1:         libopensync-configure.patch
+Patch2:         libopensync-wrapper.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -43,6 +44,7 @@
 %setup -q
 %patch0
 %patch1
+%patch2
 
 # some source files are marked executable
 for dir in opensync osengine; do
@@ -104,6 +106,7 @@
 0.18-5
 - change handling of ld.so.conf files
 - patch configure for x86_64 python
+- add wrapper compile patch (no Werror)
 
 * Sun Dec 11 2005 Andreas Bierfert 
 0.18-4



From fedora-extras-commits at redhat.com  Tue Dec 13 14:21:37 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:21:37 -0500
Subject: rpms/libopensync-plugin-evolution2 - New directory
Message-ID: <200512131421.jBDELbIL015154@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15144/libopensync-plugin-evolution2

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-evolution2 added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:21:43 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:21:43 -0500
Subject: rpms/libopensync-plugin-evolution2/devel - New directory
Message-ID: <200512131421.jBDELhr3015181@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-serv15144/libopensync-plugin-evolution2/devel

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-evolution2/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:22:06 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:22:06 -0500
Subject: rpms/libopensync-plugin-evolution2 Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200512131422.jBDEM6JM015224@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15211

Added Files:
	Makefile import.log 
Log Message:
Setup of module libopensync-plugin-evolution2


--- NEW FILE Makefile ---
# Top level Makefile for module libopensync-plugin-evolution2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 14:22:11 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:22:11 -0500
Subject: rpms/libopensync-plugin-evolution2/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512131422.jBDEMB8W015243@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-serv15211/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libopensync-plugin-evolution2


--- NEW 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 Dec 13 14:21:42 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:21:42 -0500
Subject: rpms/wv2/devel wv2.spec,1.2,1.3
Message-ID: <200512131422.jBDEMCeg015246@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wv2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15145

Modified Files:
	wv2.spec 
Log Message:
- rebuild



Index: wv2.spec
===================================================================
RCS file: /cvs/extras/rpms/wv2/devel/wv2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wv2.spec	5 Jul 2005 10:47:40 -0000	1.2
+++ wv2.spec	13 Dec 2005 14:21:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           wv2
 Version:        0.2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A library which allows access to Microsoft?? Word files
 
 Group:          System Environment/Libraries
@@ -67,6 +67,9 @@
 %{_includedir}/wv2
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert  0.2.2-6
+- rebuild
+
 * Tue Jul 05 2005 Andreas Bierfert  0.2.2-5
 - add dist tag
 



From fedora-extras-commits at redhat.com  Tue Dec 13 14:22:56 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:22:56 -0500
Subject: rpms/libopensync-plugin-evolution2 import.log,1.1,1.2
Message-ID: <200512131423.jBDENQuX015421@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15339

Modified Files:
	import.log 
Log Message:
auto-import libopensync-plugin-evolution2-0.18-2 on branch devel from libopensync-plugin-evolution2-0.18-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 14:22:04 -0000	1.1
+++ import.log	13 Dec 2005 14:22:54 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-evolution2-0_18-2:HEAD:libopensync-plugin-evolution2-0.18-2.src.rpm:1134483765



From fedora-extras-commits at redhat.com  Tue Dec 13 14:23:01 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:23:01 -0500
Subject: rpms/libopensync-plugin-evolution2/devel
	libopensync-plugin-evolution2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512131423.jBDENWES015425@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-serv15339/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libopensync-plugin-evolution2.spec 
Log Message:
auto-import libopensync-plugin-evolution2-0.18-2 on branch devel from libopensync-plugin-evolution2-0.18-2.src.rpm


--- NEW FILE libopensync-plugin-evolution2.spec ---
Name:           libopensync-plugin-evolution2
Version:        0.18
Release:        2
Summary:        Evolution 2 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:  evolution-data-server-devel

%description
%{summary}

%package devel
Summary:        Development package for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       libopensync-devel

%description    devel
The %{name}-devel package contains the files
needed for development with %{name}.

%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 AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/opensync/plugins/evo2_sync.so
%{_datadir}/opensync/defaults/evo2-sync

%files devel
%defattr(-,root,root,-)
%{_includedir}/opensync-1.0/opensync/evo2_sync.h

%changelog
* Tue Dec 13 2005 Andreas Bierfert  0.18-2
- add missing BR

* Fri Nov 25 2005 Andreas Bierfert  0.18-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 14:22:09 -0000	1.1
+++ .cvsignore	13 Dec 2005 14:22:59 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-evolution2-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 14:22:09 -0000	1.1
+++ sources	13 Dec 2005 14:22:59 -0000	1.2
@@ -0,0 +1 @@
+64f182fa37483419ca09721dec2d6f1e  libopensync-plugin-evolution2-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 14:26:39 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:26:39 -0500
Subject: rpms/libopensync-plugin-file - New directory
Message-ID: <200512131426.jBDEQdLm015554@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15545/libopensync-plugin-file

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-file added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:26:45 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:26:45 -0500
Subject: rpms/libopensync-plugin-file/devel - New directory
Message-ID: <200512131426.jBDEQjTD015570@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15545/libopensync-plugin-file/devel

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-file/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:27:07 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:27:07 -0500
Subject: rpms/libopensync-plugin-file Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512131427.jBDER7fs015605@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15592

Added Files:
	Makefile import.log 
Log Message:
Setup of module libopensync-plugin-file


--- NEW FILE Makefile ---
# Top level Makefile for module libopensync-plugin-file
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 14:27:12 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:27:12 -0500
Subject: rpms/libopensync-plugin-file/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512131427.jBDERCAn015626@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15592/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libopensync-plugin-file


--- NEW 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 Dec 13 14:28:00 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:28:00 -0500
Subject: rpms/libopensync-plugin-file import.log,1.1,1.2
Message-ID: <200512131428.jBDESU7q015700@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15662

Modified Files:
	import.log 
Log Message:
auto-import libopensync-plugin-file-0.18-2 on branch devel from libopensync-plugin-file-0.18-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 14:27:05 -0000	1.1
+++ import.log	13 Dec 2005 14:27:58 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-file-0_18-2:HEAD:libopensync-plugin-file-0.18-2.src.rpm:1134484068



From fedora-extras-commits at redhat.com  Tue Dec 13 14:28:06 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:28:06 -0500
Subject: rpms/libopensync-plugin-file/devel libopensync-plugin-file.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512131428.jBDESabL015704@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15662/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libopensync-plugin-file.spec 
Log Message:
auto-import libopensync-plugin-file-0.18-2 on branch devel from libopensync-plugin-file-0.18-2.src.rpm


--- NEW FILE libopensync-plugin-file.spec ---
Name:           libopensync-plugin-file
Version:        0.18
Release:        2
Summary:        File 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:  gamin-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 AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/opensync/plugins/file_sync.so
%{_datadir}/opensync/defaults/file-sync

%changelog
* Tue Dec 13 2005 Andreas Bierfert  0.18-2
- add missing BR

* Fri Nov 25 2005 Andreas Bierfert  0.18-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 14:27:10 -0000	1.1
+++ .cvsignore	13 Dec 2005 14:28:03 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-file-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 14:27:10 -0000	1.1
+++ sources	13 Dec 2005 14:28:03 -0000	1.2
@@ -0,0 +1 @@
+a9ffd002169406fb31eee885c9742c26  libopensync-plugin-file-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 14:35:22 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:35:22 -0500
Subject: rpms/libopensync-plugin-python - New directory
Message-ID: <200512131435.jBDEZMdm015875@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15866/libopensync-plugin-python

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-python added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:35:27 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:35:27 -0500
Subject: rpms/libopensync-plugin-python/devel - New directory
Message-ID: <200512131435.jBDEZRwc015891@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15866/libopensync-plugin-python/devel

Log Message:
Directory /cvs/extras/rpms/libopensync-plugin-python/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:35:50 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:35:50 -0500
Subject: rpms/libopensync-plugin-python Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200512131435.jBDEZoVt015930@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15917

Added Files:
	Makefile import.log 
Log Message:
Setup of module libopensync-plugin-python


--- NEW FILE Makefile ---
# Top level Makefile for module libopensync-plugin-python
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 14:35:55 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:35:55 -0500
Subject: rpms/libopensync-plugin-python/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512131435.jBDEZtCK015951@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15917/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libopensync-plugin-python


--- NEW 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 Dec 13 14:36:43 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:36:43 -0500
Subject: rpms/libopensync-plugin-python import.log,1.1,1.2
Message-ID: <200512131437.jBDEbDhv016025@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15985

Modified Files:
	import.log 
Log Message:
auto-import libopensync-plugin-python-0.18-2 on branch devel from libopensync-plugin-python-0.18-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 14:35:48 -0000	1.1
+++ import.log	13 Dec 2005 14:36:40 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-python-0_18-2:HEAD:libopensync-plugin-python-0.18-2.src.rpm:1134484590



From fedora-extras-commits at redhat.com  Tue Dec 13 14:36:48 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:36:48 -0500
Subject: rpms/libopensync-plugin-python/devel libopensync-plugin-python.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512131437.jBDEbIjt016029@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15985/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libopensync-plugin-python.spec 
Log Message:
auto-import libopensync-plugin-python-0.18-2 on branch devel from libopensync-plugin-python-0.18-2.src.rpm


--- NEW FILE libopensync-plugin-python.spec ---
Name:           libopensync-plugin-python
Version:        0.18
Release:        2
Summary:        Python 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:  python-devel

%description
%{summary}

%package devel
Summary:        Development package for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       libopensync-devel

%description    devel
The %{name}-devel package contains the files
needed for development with %{name}.

%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 AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/opensync/plugins/python*.so
%{_libdir}/opensync/python-plugins/

%changelog
* Tue Dec 13 2005 Andreas Bierfert  0.18-2
- add missing BR
- own python-plugin dir

* Fri Nov 25 2005 Andreas Bierfert  0.18-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 14:35:53 -0000	1.1
+++ .cvsignore	13 Dec 2005 14:36:46 -0000	1.2
@@ -0,0 +1 @@
+libopensync-plugin-python-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 14:35:53 -0000	1.1
+++ sources	13 Dec 2005 14:36:46 -0000	1.2
@@ -0,0 +1 @@
+8030db5af7c9f8ca82a5dbd8657979fb  libopensync-plugin-python-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 14:56:54 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:56:54 -0500
Subject: rpms/synce-software-manager - New directory
Message-ID: <200512131456.jBDEus9S016701@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-software-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16689/synce-software-manager

Log Message:
Directory /cvs/extras/rpms/synce-software-manager added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:56:59 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:56:59 -0500
Subject: rpms/synce-software-manager/devel - New directory
Message-ID: <200512131456.jBDEuxF9016722@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-software-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16689/synce-software-manager/devel

Log Message:
Directory /cvs/extras/rpms/synce-software-manager/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 14:57:22 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:57:22 -0500
Subject: rpms/synce-software-manager Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512131457.jBDEvMCZ016788@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-software-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16773

Added Files:
	Makefile import.log 
Log Message:
Setup of module synce-software-manager


--- NEW FILE Makefile ---
# Top level Makefile for module synce-software-manager
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 14:57:27 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:57:27 -0500
Subject: rpms/synce-software-manager/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512131457.jBDEvRjP016813@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-software-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16773/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module synce-software-manager


--- NEW 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 Dec 13 14:57:52 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:57:52 -0500
Subject: rpms/libopensync-plugin-evolution2/devel
	libopensync-plugin-evolution2.spec, 1.1, 1.2
Message-ID: <200512131458.jBDEwNpQ016927@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-serv16650

Modified Files:
	libopensync-plugin-evolution2.spec 
Log Message:
- add dist



Index: libopensync-plugin-evolution2.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/libopensync-plugin-evolution2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-evolution2.spec	13 Dec 2005 14:22:59 -0000	1.1
+++ libopensync-plugin-evolution2.spec	13 Dec 2005 14:57:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-evolution2
 Version:        0.18
-Release:        2
+Release:        3%{?dist}
 Summary:        Evolution 2 plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -58,6 +58,9 @@
 %{_includedir}/opensync-1.0/opensync/evo2_sync.h
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert  0.18-3
+- add dist
+
 * Tue Dec 13 2005 Andreas Bierfert  0.18-2
 - add missing BR
 



From fedora-extras-commits at redhat.com  Tue Dec 13 14:58:25 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:58:25 -0500
Subject: rpms/synce-software-manager import.log,1.1,1.2
Message-ID: <200512131458.jBDEwtq8017047@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-software-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16925

Modified Files:
	import.log 
Log Message:
auto-import synce-software-manager-0.9.0-3 on branch devel from synce-software-manager-0.9.0-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/synce-software-manager/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 14:57:20 -0000	1.1
+++ import.log	13 Dec 2005 14:58:23 -0000	1.2
@@ -0,0 +1 @@
+synce-software-manager-0_9_0-3:HEAD:synce-software-manager-0.9.0-3.src.rpm:1134485892



From fedora-extras-commits at redhat.com  Tue Dec 13 14:58:31 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 09:58:31 -0500
Subject: rpms/synce-software-manager/devel synce-software-manager.desktop,
	NONE, 1.1 synce-software-manager.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512131459.jBDEx1LX017055@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-software-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16925/devel

Modified Files:
	.cvsignore sources 
Added Files:
	synce-software-manager.desktop synce-software-manager.spec 
Log Message:
auto-import synce-software-manager-0.9.0-3 on branch devel from synce-software-manager-0.9.0-3.src.rpm


--- NEW FILE synce-software-manager.desktop ---
[Desktop Entry]
Name=synce-software-manager
Comment=Software Manager for synce devices
Exec=synce-software-manager
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE synce-software-manager.spec ---
Name:           synce-software-manager
Version:        0.9.0
Release:        3
Summary:        Software manager for use with synce

Group:          Applications/Communications
License:        MIT
URL:            http://synce.sourceforge.net/ 
Source0:        http://dl.sf.net/synce/synce-software-manager-0.9.0.tar.gz 
Source1:        synce-software-manager.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  synce-devel
BuildRequires:  libxml2-devel
BuildRequires:  zlib-devel
BuildRequires:  pango-devel
BuildRequires:  gtk2-devel
BuildRequires:  gnome-vfs2-devel
BuildRequires:  glib2-devel
BuildRequires:  libgnome-devel
BuildRequires:  libgnomeui-devel
BuildRequires:  libglade2-devel
BuildRequires:  atk-devel
BuildRequires:  libart_lgpl-devel
BuildRequires:  ORBit2-devel
BuildRequires:  desktop-file-utils

%description
%{summary}

%prep
%setup -q


%build
%configure --disable-static --with-librapi2-include=%{_includedir} \
--with-librapi2-lib=%{_libdir}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install \
  --vendor=fedora \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category=X-Fedora \
  %{SOURCE1}

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPYING
%{_bindir}/synce-software-manager
%{_datadir}/synce/synce_software_manager.glade
%{_datadir}/applications/*
%changelog
* Fri Dec 09 2005 Andreas Bierfert  0.9.0-3
- add .desktop file

* Thu Dec 08 2005 Jef Spaleta  0.9.0-2
- Specfile cleanups

* Tue Aug 23 2005 Andreas Bierfert  0.9.0-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synce-software-manager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 14:57:25 -0000	1.1
+++ .cvsignore	13 Dec 2005 14:58:29 -0000	1.2
@@ -0,0 +1 @@
+synce-software-manager-0.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synce-software-manager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 14:57:25 -0000	1.1
+++ sources	13 Dec 2005 14:58:29 -0000	1.2
@@ -0,0 +1 @@
+d9fd5f5dceff3e7eb0ded05d0a395f7e  synce-software-manager-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 15:00:32 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 10:00:32 -0500
Subject: rpms/synce-software-manager/devel synce-software-manager.spec, 1.1,
	1.2
Message-ID: <200512131501.jBDF122S018533@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-software-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17183

Modified Files:
	synce-software-manager.spec 
Log Message:
- add dist



Index: synce-software-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/synce-software-manager/devel/synce-software-manager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synce-software-manager.spec	13 Dec 2005 14:58:29 -0000	1.1
+++ synce-software-manager.spec	13 Dec 2005 15:00:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           synce-software-manager
 Version:        0.9.0
-Release:        3
+Release:        4%{?dist}
 Summary:        Software manager for use with synce
 
 Group:          Applications/Communications
@@ -61,6 +61,9 @@
 %{_datadir}/synce/synce_software_manager.glade
 %{_datadir}/applications/*
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert  0.9.0-4
+- add dist
+
 * Fri Dec 09 2005 Andreas Bierfert  0.9.0-3
 - add .desktop file
 



From fedora-extras-commits at redhat.com  Tue Dec 13 15:07:59 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue, 13 Dec 2005 10:07:59 -0500
Subject: rpms/OpenSceneGraph/devel .cvsignore, 1.2, 1.3 OpenSceneGraph.spec,
	1.9, 1.10 sources, 1.2, 1.3
Message-ID: <200512131509.jBDF92kP018892@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18870

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Dec 2005 02:50:38 -0000	1.2
+++ .cvsignore	13 Dec 2005 15:07:53 -0000	1.3
@@ -1,2 +1,2 @@
-OSG_OP_OT-0.9.9.zip
-OpenSceneGraph-0.9.9.diff
+OSG_OP_OT-1.0.zip
+OpenSceneGraph-1.0.diff


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- OpenSceneGraph.spec	8 Dec 2005 11:11:30 -0000	1.9
+++ OpenSceneGraph.spec	13 Dec 2005 15:07:53 -0000	1.10
@@ -4,19 +4,20 @@
 # package are under the same license as the package itself.
 #
 
-%define apivers 0.9.9
+%define apivers 1.0
+%define srcvers 1.0
 
 Name:           OpenSceneGraph
-Version:        0.9.9
-Release:        5%{?dist}
+Version:        %{srcvers}
+Release:        1%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
 License:        OSGPL
 URL:            http://www.openscenegraph.org/
-Source0:        http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{version}.zip
+Source0:        http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{srcvers}.zip
 
-Patch0:		OpenSceneGraph-0.9.9.diff
+Patch0:		OpenSceneGraph-%{srcvers}.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,7 +47,7 @@
 for rapid development of graphics applications.
 
 %prep
-%setup -q -n OSG_OP_OT-%{version}
+%setup -q -n OSG_OP_OT-%{srcvers}
 %patch0 -p1
 
 # backup, we hack this file later
@@ -200,14 +201,18 @@
 %{_bindir}/osgbillboard
 %{_bindir}/osgblendequation
 %{_bindir}/osgcallback
+%{_bindir}/osgcamera
 %{_bindir}/osgcatch
 %{_bindir}/osgcameragroup
 %{_bindir}/osgclip
 %{_bindir}/osgcluster
 %{_bindir}/osgcopy
 %{_bindir}/osgcubemap
+%{_bindir}/osgdelaunay
+%{_bindir}/osgdepthpartition
 %{_bindir}/osgdepthshadow
 %{_bindir}/osgdistortion
+%{_bindir}/osgfbo
 %{_bindir}/osgforest
 %{_bindir}/osgfxbrowser
 %{_bindir}/osggeodemo
@@ -224,9 +229,11 @@
 %{_bindir}/osglogo
 %{_bindir}/osgmotionblur
 %{_bindir}/osgmovie
+%{_bindir}/osgmultiplecameras
 %{_bindir}/osgmultitexture
 %{_bindir}/osgoccluder
 %{_bindir}/osgpagedlod
+%{_bindir}/osgparametric
 %{_bindir}/osgparticle
 %{_bindir}/osgparticleeffects
 %{_bindir}/osgpbuffer
@@ -241,6 +248,7 @@
 %{_bindir}/osgscribe
 %{_bindir}/osgsequence
 %{_bindir}/osgshaders
+%{_bindir}/osgshaderterrain
 %{_bindir}/osgshadowtexture
 %{_bindir}/osgshape
 %{_bindir}/osgsimple
@@ -358,6 +366,9 @@
 %{_includedir}/Producer
 
 %changelog
+* Sat Dec 10 2005 Ralf Cors??pius  - 1.0-1
+- Upstream update.
+
 * Wed Dec 07 2005 Ralf Cors??pius  - 0.9.9-5
 - Try at getting this package buildable with modular X11.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Dec 2005 02:50:38 -0000	1.2
+++ sources	13 Dec 2005 15:07:53 -0000	1.3
@@ -1,2 +1,2 @@
-711773db3874320967091327473dbc31  OSG_OP_OT-0.9.9.zip
-b1d2366ab6db7c8102153bd262a4a145  OpenSceneGraph-0.9.9.diff
+dfb3eca46b32625602dabe9aa46c6b6f  OSG_OP_OT-1.0.zip
+c8dfb2766674965a367d5c3777c9738b  OpenSceneGraph-1.0.diff



From fedora-extras-commits at redhat.com  Tue Dec 13 15:09:40 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 10:09:40 -0500
Subject: rpms/libopensync-plugin-file/devel libopensync-plugin-file.spec, 1.1,
	1.2
Message-ID: <200512131510.jBDFABka018949@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-file/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18856

Modified Files:
	libopensync-plugin-file.spec 
Log Message:
- add dist



Index: libopensync-plugin-file.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-file/devel/libopensync-plugin-file.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-file.spec	13 Dec 2005 14:28:03 -0000	1.1
+++ libopensync-plugin-file.spec	13 Dec 2005 15:09:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-file
 Version:        0.18
-Release:        2
+Release:        3%{?dist}
 Summary:        File plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -44,6 +44,9 @@
 %{_datadir}/opensync/defaults/file-sync
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert  0.18-3
+- add dist
+
 * Tue Dec 13 2005 Andreas Bierfert  0.18-2
 - add missing BR
 



From fedora-extras-commits at redhat.com  Tue Dec 13 15:12:13 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 10:12:13 -0500
Subject: rpms/libopensync-plugin-palm/devel libopensync-plugin-palm.spec, 1.1,
	1.2
Message-ID: <200512131512.jBDFChfv019018@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-palm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18984

Modified Files:
	libopensync-plugin-palm.spec 
Log Message:
- add dist



Index: libopensync-plugin-palm.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/devel/libopensync-plugin-palm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-palm.spec	13 Dec 2005 08:40:26 -0000	1.1
+++ libopensync-plugin-palm.spec	13 Dec 2005 15:12:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-palm
 Version:        0.18
-Release:        1
+Release:        2%{?dist}
 Summary:        Palm plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -60,5 +60,8 @@
 %{_includedir}/opensync-1.0/opensync/palm*.h
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert  0.18-2
+- add dist
+
 * Fri Nov 25 2005 Andreas Bierfert  0.18-1
 - initial version



From fedora-extras-commits at redhat.com  Tue Dec 13 15:50:45 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 10:50:45 -0500
Subject: rpms/digikam/devel digikam-0.8.0-modular-X.patch, NONE,
	1.1 digikam.spec, 1.5, 1.6
Message-ID: <200512131551.jBDFpGv6019230@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19194

Modified Files:
	digikam.spec 
Added Files:
	digikam-0.8.0-modular-X.patch 
Log Message:
- Add new paths for modular X.Org


digikam-0.8.0-modular-X.patch:

--- NEW FILE digikam-0.8.0-modular-X.patch ---
diff -urN digikam-0.8.0-orig/acinclude.m4 digikam-0.8.0/acinclude.m4
--- digikam-0.8.0-orig/acinclude.m4	2005-11-21 20:14:06.000000000 +0100
+++ digikam-0.8.0/acinclude.m4	2005-12-13 16:37:55.000000000 +0100
@@ -44,6 +44,7 @@
 [# Look for the header file in a standard set of common directories.
 # Check X11 before X11Rn because it is often a symlink to the current release.
   for ac_dir in               \
+    /usr/share/X11/include    \
     /usr/X11/include          \
     /usr/X11R6/include        \
     /usr/X11R5/include        \
@@ -104,6 +105,7 @@
 # First see if replacing the include by lib works.
 # Check X11 before X11Rn because it is often a symlink to the current release.
 for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
+    /usr/share/X11/lib${kdelibsuff}     \
     /usr/X11/lib${kdelibsuff}           \
     /usr/X11R6/lib${kdelibsuff}         \
     /usr/X11R5/lib${kdelibsuff}         \


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- digikam.spec	9 Dec 2005 15:53:16 -0000	1.5
+++ digikam.spec	13 Dec 2005 15:50:43 -0000	1.6
@@ -1,17 +1,18 @@
 Name:		digikam
 Version:	0.8.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		digikam-0.8.0-modular-X.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:	gettext autoconf
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -37,14 +38,15 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
+autoreconf
+
 %configure \
-	--with-extra-includes=/usr/share/X11/ \
-	--with-extra-libs=/usr/share/X11/ \
 	--disable-rpath \
 	--disable-debug
 make %{?_smp_mflags}
@@ -117,6 +119,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Work around for modular X.Org paths
 



From fedora-extras-commits at redhat.com  Tue Dec 13 15:55:31 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 10:55:31 -0500
Subject: rpms/libopensync-plugin-python/devel libopensync-plugin-python.spec,
	1.1, 1.2
Message-ID: <200512131556.jBDFu1tX019320@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19298

Modified Files:
	libopensync-plugin-python.spec 
Log Message:
- add dist



Index: libopensync-plugin-python.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-python/devel/libopensync-plugin-python.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-python.spec	13 Dec 2005 14:36:46 -0000	1.1
+++ libopensync-plugin-python.spec	13 Dec 2005 15:55:28 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-python
 Version:        0.18
-Release:        2
+Release:        3%{?dist}
 Summary:        Python plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -54,6 +54,9 @@
 %{_libdir}/opensync/python-plugins/
 
 %changelog
+* Tue Dec 13 2005 Andreas Bierfert  0.18-3
+- add dist
+
 * Tue Dec 13 2005 Andreas Bierfert  0.18-2
 - add missing BR
 - own python-plugin dir



From fedora-extras-commits at redhat.com  Tue Dec 13 16:06:29 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 11:06:29 -0500
Subject: rpms/xemacs/devel xemacs-sitestart.el, 1.1, 1.2 xemacs.spec, 1.18,
	1.19
Message-ID: <200512131607.jBDG70ew021013@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20987

Modified Files:
	xemacs-sitestart.el xemacs.spec 
Log Message:
* 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).



Index: xemacs-sitestart.el
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs-sitestart.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xemacs-sitestart.el	1 Mar 2005 22:11:36 -0000	1.1
+++ xemacs-sitestart.el	13 Dec 2005 16:06:03 -0000	1.2
@@ -2,11 +2,6 @@
 ;;;
 ;;; The "-no-site-file" option to xemacs prevents this file from being loaded.
 
-;; fix default info path
-(setq Info-directory-list '("/usr/share/info/"
-			    "/usr/share/xemacs/xemacs-packages/info/"
-			    "/usr/share/xemacs/mule-packages/info/"))
-
 ;;; psgml catalog list
 (setq sgml-catalog-files
 	      (if (getenv "SGML_CATALOG_FILES")


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xemacs.spec	5 Dec 2005 17:27:05 -0000	1.18
+++ xemacs.spec	13 Dec 2005 16:06:27 -0000	1.19
@@ -447,6 +447,10 @@
 
 
 %changelog
+* 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).
+
 * Mon Dec  5 2005 Ville Skytt?? 
 - Fix typo in -info summary.
 - Point to main man page for xemacs-nox.



From fedora-extras-commits at redhat.com  Tue Dec 13 16:16:46 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 11:16:46 -0500
Subject: rpms/configure-thinkpad/devel configure-thinkpad.spec,1.9,1.10
Message-ID: <200512131617.jBDGHGau021130@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/configure-thinkpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21112

Modified Files:
	configure-thinkpad.spec 
Log Message:
Add note about KDE reserving /dev/thinkpad.


Index: configure-thinkpad.spec
===================================================================
RCS file: /cvs/extras/rpms/configure-thinkpad/devel/configure-thinkpad.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure-thinkpad.spec	6 Apr 2005 22:11:36 -0000	1.9
+++ configure-thinkpad.spec	13 Dec 2005 16:16:44 -0000	1.10
@@ -1,7 +1,10 @@
+# TODO: When running KDE, kded seems to grab /dev/thinkpad if it exists, so
+# we cannot access it.  Maybe add NotShowIn=KDE to the desktop entry unless
+# a better solution is found?
+
 Name:           configure-thinkpad
 Version:        0.9
 Release:        2
-
 Summary:        Graphical ThinkPad configuration utility
 
 Group:          Applications/System



From fedora-extras-commits at redhat.com  Tue Dec 13 16:23:29 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue, 13 Dec 2005 11:23:29 -0500
Subject: rpms/ldns/devel ldns.spec,1.1,1.2
Message-ID: <200512131623.jBDGNxhk021223@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21205

Modified Files:
	ldns.spec 
Log Message:
* Sun Dec 13 2005 Paul Wouters  1.0.0-6
- added a make clean for 2.3.3 since .o files were left behind upstream,
  causing failure on ppc platform



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ldns.spec	13 Dec 2005 04:08:25 -0000	1.1
+++ ldns.spec	13 Dec 2005 16:23:27 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.0.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -28,6 +28,8 @@
 rm config.sub config.guess
 libtoolize
 autoreconf
+# only for 2.3.3, since upstream left .o files in release
+make clean
 
 %configure
 
@@ -76,6 +78,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Dec 13 2005 Paul Wouters  1.0.0-6
+- added a make clean for 2.3.3 since .o files were left behind upstream,
+  causing failure on ppc platform
+
 * Sun Dec 11 2005 Tom "spot" Callaway  1.0.0-5
 - minor cleanups
 



From fedora-extras-commits at redhat.com  Tue Dec 13 16:25:48 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue, 13 Dec 2005 11:25:48 -0500
Subject: rpms/ldns/devel ldns.spec,1.2,1.3
Message-ID: <200512131626.jBDGQJLk021355@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21282

Modified Files:
	ldns.spec 
Log Message:
fixed version in changelog message.



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ldns.spec	13 Dec 2005 16:23:27 -0000	1.2
+++ ldns.spec	13 Dec 2005 16:25:46 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.0.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -79,7 +79,7 @@
 
 %changelog
 * Sun Dec 13 2005 Paul Wouters  1.0.0-6
-- added a make clean for 2.3.3 since .o files were left behind upstream,
+- added a make clean for 1.0.0 since .o files were left behind upstream,
   causing failure on ppc platform
 
 * Sun Dec 11 2005 Tom "spot" Callaway  1.0.0-5



From fedora-extras-commits at redhat.com  Tue Dec 13 16:55:33 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 13 Dec 2005 11:55:33 -0500
Subject: rpms/kdesvn/devel kdesvn-0.7.1-x.patch,1.1,1.2
Message-ID: <200512131656.jBDGu4iW023029@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23004

Modified Files:
	kdesvn-0.7.1-x.patch 
Log Message:
Don't error out on no X11 includes


kdesvn-0.7.1-x.patch:

Index: kdesvn-0.7.1-x.patch
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn-0.7.1-x.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdesvn-0.7.1-x.patch	12 Dec 2005 18:56:16 -0000	1.1
+++ kdesvn-0.7.1-x.patch	13 Dec 2005 16:55:31 -0000	1.2
@@ -1,5 +1,5 @@
 --- kdesvn-0.7.1/configure.x11	2005-11-25 12:05:40.000000000 -0700
-+++ kdesvn-0.7.1/configure	2005-12-12 10:27:42.000000000 -0700
++++ kdesvn-0.7.1/configure	2005-12-13 09:54:20.000000000 -0700
 @@ -26637,90 +26637,6 @@
  
  
@@ -91,3 +91,16 @@
  if test "$ac_x_libraries" = NO; then
    # Check for the libraries.
  
+@@ -26887,12 +26803,6 @@
+   kde_x_libraries=$ac_x_libraries
+ fi
+ 
+-if test "$kde_x_includes" = NO; then
+-  { { echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5
+-echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+ if test "$kde_x_libraries" = NO; then
+   { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
+ echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}



From fedora-extras-commits at redhat.com  Tue Dec 13 18:16:03 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Tue, 13 Dec 2005 13:16:03 -0500
Subject: rpms/nsd/devel nsd.spec,1.3,1.4
Message-ID: <200512131816.jBDIGXM9027015@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26995

Modified Files:
	nsd.spec 
Log Message:
* Tue Dec 13 2005 Paul Wouters  - 2.3.3-5
- Added BuildRequires for openssl-devel, removed Requires for openssl.



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsd.spec	13 Dec 2005 14:05:48 -0000	1.3
+++ nsd.spec	13 Dec 2005 18:16:01 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -9,7 +9,6 @@
 Patch0: nsd-2.3.3-checking.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: openssl
 BuildRequires: flex, openssl-devel
 
 %description
@@ -89,7 +88,10 @@
 fi
 
 %changelog
-* Mon Dec 12 2005 Paul Wouters  - 2.3.3
+* Tue Dec 13 2005 Paul Wouters  - 2.3.3-5
+- Added BuildRequires for openssl-devel, removed Requires for openssl.
+
+* Mon Dec 12 2005 Paul Wouters  - 2.3.3-4
 - upgraded to nsd-2.3.3
 
 * Wed Dec  7 2005 Tom "spot" Callaway  - 2.3.2-2



From fedora-extras-commits at redhat.com  Tue Dec 13 19:25:41 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 13 Dec 2005 14:25:41 -0500
Subject: rpms/gramps/devel .cvsignore, 1.11, 1.12 gramps.spec, 1.12,
	1.13 sources, 1.11, 1.12
Message-ID: <200512131926.jBDJQBbj028837@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gramps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28812

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
* Tue Dec 13 2005 Brian Pepple  - 2.0.9-2
- Make noarch. (#170974)
- Update to 2.0.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Sep 2005 23:12:40 -0000	1.11
+++ .cvsignore	13 Dec 2005 19:25:39 -0000	1.12
@@ -1 +1 @@
-gramps-2.0.8.tar.gz
+gramps-2.0.9.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gramps.spec	7 Sep 2005 23:12:40 -0000	1.12
+++ gramps.spec	13 Dec 2005 19:25:39 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           gramps
-Version:        2.0.8
+Version:        2.0.9
 Release:        2%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
@@ -8,6 +8,7 @@
 URL:            http://gramps.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -98,7 +99,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS ChangeLog FAQ INSTALL NEWS README TODO
-%{_bindir}/*
+%{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/application-registry/%{name}.applications
 %{_datadir}/%{name}/
@@ -112,6 +113,10 @@
 
 
 %changelog
+* Tue Dec 13 2005 Brian Pepple  - 2.0.9-2
+- Make noarch. (#170974)
+- Update to 2.0.9.
+
 * Wed Sep  7 2005 Brian Pepple  - 2.0.8-2
 - Update to 2.0.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Sep 2005 23:12:40 -0000	1.11
+++ sources	13 Dec 2005 19:25:39 -0000	1.12
@@ -1 +1 @@
-84f2659b292b5e2abc92a8d56148495b  gramps-2.0.8.tar.gz
+900646bf8c2cbf37e3fb81f5892d1141  gramps-2.0.9.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 19:27:50 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 13 Dec 2005 14:27:50 -0500
Subject: rpms/gramps/FC-4 .cvsignore, 1.11, 1.12 gramps.spec, 1.12,
	1.13 sources, 1.11, 1.12
Message-ID: <200512131928.jBDJSKY1028905@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gramps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28883

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
* Tue Dec 13 2005 Brian Pepple  - 2.0.9
- Make noarch. (#170974)
- Update to 2.0.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gramps/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Sep 2005 23:13:44 -0000	1.11
+++ .cvsignore	13 Dec 2005 19:27:48 -0000	1.12
@@ -1 +1 @@
-gramps-2.0.8.tar.gz
+gramps-2.0.9.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/FC-4/gramps.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gramps.spec	7 Sep 2005 23:13:44 -0000	1.12
+++ gramps.spec	13 Dec 2005 19:27:48 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           gramps
-Version:        2.0.8
+Version:        2.0.9
 Release:        1%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
@@ -8,6 +8,7 @@
 URL:            http://gramps.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -98,7 +99,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS ChangeLog FAQ INSTALL NEWS README TODO
-%{_bindir}/*
+%{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/application-registry/%{name}.applications
 %{_datadir}/%{name}/
@@ -112,6 +113,10 @@
 
 
 %changelog
+* Tue Dec 13 2005 Brian Pepple  - 2.0.9
+- Make noarch. (#170974)
+- Update to 2.0.9.
+
 * Wed Sep  7 2005 Brian Pepple  - 2.0.8-1
 - Update to 2.0.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gramps/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Sep 2005 23:13:44 -0000	1.11
+++ sources	13 Dec 2005 19:27:48 -0000	1.12
@@ -1 +1 @@
-84f2659b292b5e2abc92a8d56148495b  gramps-2.0.8.tar.gz
+900646bf8c2cbf37e3fb81f5892d1141  gramps-2.0.9.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 20:06:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Dec 2005 15:06:21 -0500
Subject: rpms/perl-IPC-Shareable - New directory
Message-ID: <200512132006.jBDK6L7a030677@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IPC-Shareable
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30668/perl-IPC-Shareable

Log Message:
Directory /cvs/extras/rpms/perl-IPC-Shareable added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 20:06:28 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Dec 2005 15:06:28 -0500
Subject: rpms/perl-IPC-Shareable/devel - New directory
Message-ID: <200512132006.jBDK6SJI030693@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IPC-Shareable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30668/perl-IPC-Shareable/devel

Log Message:
Directory /cvs/extras/rpms/perl-IPC-Shareable/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 20:07:08 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Dec 2005 15:07:08 -0500
Subject: rpms/perl-IPC-Shareable Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512132007.jBDK78hn030728@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IPC-Shareable
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30715

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-IPC-Shareable


--- NEW FILE Makefile ---
# Top level Makefile for module perl-IPC-Shareable
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 20:07:19 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Dec 2005 15:07:19 -0500
Subject: rpms/perl-IPC-Shareable/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512132007.jBDK7JKR030753@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IPC-Shareable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30715/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-IPC-Shareable


--- NEW 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 Dec 13 20:08:26 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Dec 2005 15:08:26 -0500
Subject: rpms/perl-IPC-Shareable/devel perl-IPC-Shareable.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512132008.jBDK8wGC030818@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IPC-Shareable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30781/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-IPC-Shareable.spec 
Log Message:
auto-import perl-IPC-Shareable-0.60-1 on branch devel from perl-IPC-Shareable-0.60-1.src.rpm


--- NEW FILE perl-IPC-Shareable.spec ---
Name:           perl-IPC-Shareable
Version:        0.60
Release:        1%{?dist}
Summary:        Share Perl variables between processes

Group:          Development/Libraries
License:        GPL
URL:            http://search.cpan.org/dist/IPC-Shareable/
Source0:        http://www.cpan.org/authors/id/B/BS/BSUGARS/IPC-Shareable-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
IPC::Shareable allows you to tie a variable to shared memory making it
easy to share the contents of that variable with other Perl processes.
Scalars, arrays, and hashes can be tied.  The variable being tied may
contain arbitrarily complex data structures - including references to
arrays, hashes of hashes, etc.


%prep
%setup -q -n IPC-Shareable-%{version}
find eg -type f | xargs chmod 644


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES COPYING CREDITS DISCLAIMER README TO_DO eg/
%{perl_vendorlib}/IPC/
%{_mandir}/man3/*.3*


%changelog
* Sat Oct 22 2005 Jose Pedro Oliveira  - 0.60-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Shareable/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 20:07:17 -0000	1.1
+++ .cvsignore	13 Dec 2005 20:08:24 -0000	1.2
@@ -0,0 +1 @@
+IPC-Shareable-0.60.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Shareable/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 20:07:17 -0000	1.1
+++ sources	13 Dec 2005 20:08:24 -0000	1.2
@@ -0,0 +1 @@
+51462dabfb4eec81e0b3417a9f9add4e  IPC-Shareable-0.60.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 20:08:00 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Dec 2005 15:08:00 -0500
Subject: rpms/perl-IPC-Shareable import.log,1.1,1.2
Message-ID: <200512132009.jBDK9HxD030821@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IPC-Shareable
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30781

Modified Files:
	import.log 
Log Message:
auto-import perl-IPC-Shareable-0.60-1 on branch devel from perl-IPC-Shareable-0.60-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Shareable/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 20:07:06 -0000	1.1
+++ import.log	13 Dec 2005 20:07:57 -0000	1.2
@@ -0,0 +1 @@
+perl-IPC-Shareable-0_60-1:HEAD:perl-IPC-Shareable-0.60-1.src.rpm:1134504469



From fedora-extras-commits at redhat.com  Tue Dec 13 20:24:04 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 13 Dec 2005 15:24:04 -0500
Subject: owners owners.list,1.445,1.446
Message-ID: <200512132024.jBDKOZge030999@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30981

Modified Files:
	owners.list 
Log Message:
New component: perl-IPC-Shareable (#171638)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- owners.list	13 Dec 2005 11:48:23 -0000	1.445
+++ owners.list	13 Dec 2005 20:24:02 -0000	1.446
@@ -791,6 +791,7 @@
 Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Zlib|For bugs related to the perl-IO-Zlib component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IPC-Shareable|Share Perl variables between processes|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-SharedCache|Perl module to manage a cache in SysV IPC shared memory|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-ShareLite|Light-weight Perl interface to shared memory|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Jcode|Perl extension interface for converting Japanese text|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Dec 13 20:44:24 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 15:44:24 -0500
Subject: rpms/pcsc-tools - New directory
Message-ID: <200512132044.jBDKiO4K031151@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31142/pcsc-tools

Log Message:
Directory /cvs/extras/rpms/pcsc-tools added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 20:44:30 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 15:44:30 -0500
Subject: rpms/pcsc-tools/devel - New directory
Message-ID: <200512132044.jBDKiUMo031167@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31142/pcsc-tools/devel

Log Message:
Directory /cvs/extras/rpms/pcsc-tools/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 20:44:49 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 15:44:49 -0500
Subject: rpms/pcsc-tools Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512132044.jBDKin2V031202@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31189

Added Files:
	Makefile import.log 
Log Message:
Setup of module pcsc-tools


--- NEW FILE Makefile ---
# Top level Makefile for module pcsc-tools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 20:44:55 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 15:44:55 -0500
Subject: rpms/pcsc-tools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512132044.jBDKitp6031223@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31189/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pcsc-tools


--- NEW 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 Dec 13 20:45:45 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 15:45:45 -0500
Subject: rpms/pcsc-tools import.log,1.1,1.2
Message-ID: <200512132046.jBDKkGSi031318@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31270

Modified Files:
	import.log 
Log Message:
auto-import pcsc-tools-1.4.1-1 on branch devel from pcsc-tools-1.4.1-1.src.rpm
Initial import (#170905).


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 20:44:47 -0000	1.1
+++ import.log	13 Dec 2005 20:45:43 -0000	1.2
@@ -0,0 +1 @@
+pcsc-tools-1_4_1-1:HEAD:pcsc-tools-1.4.1-1.src.rpm:1134506739



From fedora-extras-commits at redhat.com  Tue Dec 13 20:45:51 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 15:45:51 -0500
Subject: rpms/pcsc-tools/devel pcsc-tools-gscriptor.desktop, NONE,
	1.1 pcsc-tools.spec, NONE, 1.1 smartcard_list.txt, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512132045.jBDKjplI031305@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31270/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pcsc-tools-gscriptor.desktop pcsc-tools.spec 
	smartcard_list.txt 
Log Message:
auto-import pcsc-tools-1.4.1-1 on branch devel from pcsc-tools-1.4.1-1.src.rpm
Initial import (#170905).


--- NEW FILE pcsc-tools-gscriptor.desktop ---
[Desktop Entry]
Name=Gscriptor
Comment=Send commands to smart cards
Exec=gscriptor
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Application;Utility;GTK;


--- NEW FILE pcsc-tools.spec ---
Name:           pcsc-tools
Version:        1.4.1
Release:        1%{?dist}
Summary:        Tools to be used with smart cards and PC/SC

Group:          Development/Tools
License:        GPL
URL:            http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
Source0:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/%{name}-%{version}.tar.gz
Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
Source2:        %{name}-gscriptor.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  pcsc-lite-devel
Requires:       pcsc-lite

%description
The pcsc-tools package contains some tools useful for a PC/SC user.
The tools provided are:
* pcsc_scan(1) scans available smart card readers and print detected
  events: card insertion with ATR, card removal;
* ATR_analysis(1) analyses a smart card ATR (Anwser To Reset)
* scriptor(1) Perl script to send commands to a smart card using a
  batch file or stdin;
* gscriptor(1) the same idea as scriptor(1) but with Perl-Gtk GUI.


%prep
%setup -q
sed -i -e 's/-O2 -g/$(RPM_OPT_FLAGS)/' Makefile
sed -i -e 's|/usr/lib/pcsc\b|%{_datadir}/pcsc|' ATR_analysis*
if ! pkg-config --atleast-version 1.2.9 libpcsclite ; then
sed -i -e 's/LPTSTR/LPSTR/' pcsc_scan.c
fi
iconv -f iso-8859-1 -t utf-8 %{SOURCE1} > smartcard_list.txt
cp -p %{SOURCE2} gscriptor.desktop


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT%{_prefix}
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pcsc
mv $RPM_BUILD_ROOT%{_prefix}/pcsc/* $RPM_BUILD_ROOT%{_datadir}/pcsc
rmdir $RPM_BUILD_ROOT%{_prefix}/pcsc
desktop-file-install \
  --vendor=fedora \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
  --mode=644 \
  --add-category=X-Fedora \
  gscriptor.desktop
# TODO: icon


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changelog LICENCE README TODO
%{_bindir}/*
%{_datadir}/applications/*gscriptor.desktop
%{_datadir}/pcsc/
%{_mandir}/man1/*.1*


%changelog
* Tue Dec 13 2005 Ville Skytt??  - 1.4.1-1
- Update smartcard_list.txt to 20051127 and convert it to UTF-8.
- Improve summary and description.
- Add "Application" desktop entry category for legacy distros.
- Drop BR: sed.

* Sat Oct 15 2005 Ville Skytt??  - 1.4.1-0.2
- Update smartcard_list.txt to 20051011.
- Specfile cleanups.

* Wed Oct  5 2005 Ville Skytt??  - 1.4.1-0.1
- 1.4.1, patched to compile with pcsc-lite < 1.2.9-beta4.
- Move smartcard_list.txt to %%{_datadir}/pcsc.
- Add menu entry for gscriptor.

* Sat May 28 2005 Ville Skytt??  - 1.3.3-0.1
- Rebuild for FC4.

* Thu Jul  1 2004 Ville Skytt??  - 0:1.3.3-0.fdr.4
- Requires pcsc-lite (not too useful without the daemon).
- Update smartcard_list.txt to 1.72.

* Thu May 27 2004 Ville Skytt??  - 0:1.3.3-0.fdr.3
- Due to use of pkg-config, BuildRequires pcsc-lite-devel >= 1.2.0 (bug 1282).
- Update smartcard_list.txt to 1.71 (bug 1282).

* Wed May 12 2004 Ville Skytt??  - 0:1.3.3-0.fdr.2
- Patch to get PC/SC Lite CFLAGS and libs from pkg-config.
- Update smartcard_list (1.70).

* Fri Apr  2 2004 Ville Skytt??  - 0:1.3.3-0.fdr.1
- Update to 1.3.3.

* Tue Feb 10 2004 Ville Skytt??  - 0:1.3.2-0.fdr.2
- Update smartcard_list (1.64).

* Wed Dec 17 2003 Ville Skytt??  - 0:1.3.2-0.fdr.1
- Update to 1.3.2.

* Thu Oct 30 2003 Ville Skytt??  - 0:1.3.1-0.fdr.1
- Update to 1.3.1.

* Sun Sep 14 2003 Ville Skytt??  - 0:1.3.0-0.fdr.4
- Own %%{_libdir}/pcsc.
- Spec cleanups.

* Sun Aug 31 2003 Ville Skytt??  - 0:1.3.0-0.fdr.3
- Updated smartcard_list.txt (1.43).

* Wed Aug 27 2003 Ville Skytt??  - 0:1.3.0-0.fdr.2
- Spec cleanups.

* Sun Jun  1 2003 Ville Skytt??  - 0:1.3.0-0.fdr.1
- Update to 1.3.0.

* Sun May 25 2003 Ville Skytt??  - 0:1.2.5-0.fdr.1
- Update to 1.2.5.

* Fri May 23 2003 Ville Skytt??  - 0:1.2.4-0.fdr.1
- First build.


--- NEW FILE smartcard_list.txt ---
#
#    smartcard_list.txt
#    Copyright (C) 2002-2005  Ludovic Rousseau
#
#    This program is free software; you can redistribute it and/or modify
#    it under the terms of the GNU General Public License as published by
#    the Free Software Foundation; either version 2 of the License, or
#    (at your option) any later version.
#
#    This program is distributed in the hope that it will be useful,
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
#    GNU General Public License for more details.
#
#    You should have received a copy of the GNU General Public License
#    along with this program; if not, write to the Free Software
#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
#    02111-1307  USA

#
# This list contains a match between an ATR and a card type
# The list is sorted for edition purposes
#
# You can get the latest version of this file from:
# http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools.html
#
# $Id: smartcard_list.txt,v 1.155 2005/11/27 16:44:55 rousseau Exp $
#

# syntax:
# ATR in regular expression form
# \t descriptive text
# \t descriptive text
# \t descriptive text
# empty line

3B 02 14 50
	Schlumberger Multiflex 3k

3B 02 53 01
	Gemplus GemClub Memo

3B 04 41 11 77 81
	Sample Mifare DESFire contactless smartcard from Phillips

3B 04 41 11 77 B1
	IBM JCOP 30 contactless

3B 04 49 32 43 2E
	German Health Insurance Card

3B 05 68 01 01 02 05
	Certinomis card (electronic certificates)

3B 09 41 04 11 DD 82 2F 00 00 88
	1k contactless Mifare

3B 0A 20 62 0C 01 4F 53 45 99 14 AA
	GSM-SIM BEN (1800MHz)

3B 0F 80 6A 16 32 46 49 53 45 53 8C E0 FF 07 90 00
	GSM-SIM Sonera (from 1998)

3B 0F FF C1 B5 CC 72 CA 00 00 ??
	Mifare Std 1K

3B 15 13 80 53 41 52 03
	Eutron CryptoIdentity (ATMEL AT903232C - 6464C Cryptographic
	processors, 64KB EEPROM, RSA 2048)

3B 15 94 C3 02 08 16 01
	GSM-SIM EMT (Estonia)

3B 16 94 71 01 01 00 27 00
	Cingular GSM SIM Card

3B 16 94 81 10 06 01 81 2F
	Schlumberger Cyberflex Access Augmented Crypto

3B 16 94 81 10 06 01 81 3F
	Schlumberger Cyberflex Access Crypto

3B 17 13 9C 12 02 01 01 07 40
	Schlumberger Cyberflex Access Developer 32k

3B 17 94 18 02 01 25 01 41 93
	AT&T Wireless GSM SIM Card

3B 17 94 89 01 02 01 02 41 87
	Vodafone/Omnitel 16K GSM SIM

3B 19 14 55 90 01 01 01 00 05 08 B0
	Schlumberger Multiflex 8k

3B 19 14 55 90 01 02 01 00 05 04 B0
	Schlumberger Multiflex 4k

3B 19 14 59 01 01 0F 01 00 05 08 B0
	Schlumberger Multiflex 8k

3B 19 94 31 02 05 10 45 98 01 02 4E
	GSM-SIM EMT (Estonia)

3B 1F 11 00 67 80 42 46 49 53 45 10 52 66 FF 81 90 00
	Nokia branded SC (Setec)

3B 1F 11 00 6A 01 38 46 49 53 45 10 8C 02 FF 07 90 00
	GSM-SIM Saunalahti (from 2004)

3B 1F 11 80 6A 16 32 46 49 53 45 15 8C E6 FF 07 90 00
	GSM SIM card - Tele2 Estonia - http://www.tele2.ee

3B 1F 11 80 6A 32 37 46 49 53 45 12 8C 02 FF 07 90 00
	GSM-SIM DNA Finland (from 2001)

3B 1F 11 80 6A 80 34 46 49 53 45 53 94 36 FF 07 90 00
	RSA SecurID 3100

3B 1F 94 00 6A 01 38 46 49 53 45 10 8C 02 FF 07 90 00
	GSM-SIM Saunalahti (from 2004)

3B 1F 94 80 6A 16 32 46 49 53 45 15 8C E6 FF 07 90 00
	GSM-SIM Sonera (from 2002)

3B 23 00 00 36 41 81
	Schlumberger Payflex 4k SAM

3B 23 00 35 11 80
	Schlumberger Payflex 1k User

3B 23 00 35 11 81
	Schlumberger Payflex 1k SAM

3B 23 00 35 13 80
	Schlumberger Cyberflex Access Campus

3B 23 00 35 13 FF
	Schlumberger MicroPayflex

3B 24 00 .. .. .. 45
	Conax

3B 24 00 30 42 30 30
	ComHem Digital-TV smartcard (Sweden)

3B 24 00 80 72 94 43
	MPCOS-3DES 64K \ EMV Filter (Gemplus)

3B 26 00 00 26 40 00 90 00
	Schlumberger, purse?

3B 26 00 11 04 5C 03 90 00
	Caixa Abierta (Barcelona, Spain) Cash/Visa Electron

3B 27 00 80 65 A2 .. 01 01 37
	Gemplus GemSAFE Smart Card (4K)

3B 27 00 80 65 A2 00 01 01 37
	Gemplus GemSAFE Card CSP v1.0

3B 27 00 80 65 A2 02 02 82 37
	Gemplus GPK2000s

3B 27 00 80 65 A2 02 03 82 37
	Gemplus GPK2000sp

3B 27 00 80 65 A2 04 01 01 37
	Gemplus GPK4000s

3B 27 00 80 65 A2 05 01 01 37
	Gemplus GPK4000sp

3B 27 00 80 65 A2 06 01 01 37
	GPK 4000, RSA 512 bits Sign, Unwrap 40 bits

3B 27 00 80 65 A2 0C 01 01 37
	Gemplus GPK4000

3B 27 00 80 65 A2 8C 3B 27 00
	GPK 4000, RSA 1024 bits Sign, Unwrap 256 bits

3B 29 00 80 72 A4 45 64 00 00 D0 15
	Moeda Electronica Bradesco (Gemplus MPCOS?) (Brasilia)

3B 29 00 80 72 A4 45 64 00 FF 00 10
	MPCOS-3DES 8K (Gemplus)

3B 2A 00 80 65 A2 01 00 00 00 72 D6 41
	MPCOS_EMV_1B

3B 2A 00 80 65 A2 01 00 00 00 72 D6 43
	MPCOS_EMV_4B

3B 2A 00 80 65 A2 01 .. .. .. 72 D6 41
	Gemplus MPCOS EMV 1 Byte sectors

3B 2A 00 80 65 A2 01 .. .. .. 72 D6 43
	Gemplus MPCOS EMV 4 Byte sectors

3B 32 15 00 06 80
	Schlumberger Multiflex 8k

3B 32 15 00 06 95
	Schlumberger Multiflex 8k DES

3B 37 11 00 46 4C 4F 4D 41 90 00
	SLE 4428

3B 3B .. 00 80 6. A[F,E] 03 0[C,D] .. .. 83 .. 90 00
	GemXplore Xpresso V3

3B 3B 11 00 80 65 AF 03 0C 01 6F 83 0F 90 00
	Gemplus GemX{plore,presso} V3-B1

3B 3B 11 00 80 69 AF 03 0C 01 6F 83 0[0,1] 90 00
	GemXplore'Xpresso V3 64K

3B 3B 94 00 80 65 AF 03 0D 01 74 83 0F 90 00
	Gemplus GemXplore Xpresso V3 B1P
	Mobistar SIM - Belgium (Gemplus)

3B 3C 94 00 4B 31 25 A2 10 13 14 47 83 83 90 00
	GSM SFR

3B 3F 11 00 6F AF 65 03 12 01 80 73 32 21 1B 83 0F 90 00
	GSM SIM card Orange J2RE postpaid

3B 3F 94 00 80 69 AF 03 07 06 67 09 97 0A 0E 83 3E 9F 16
	BASE SIM - Belgium (Gemplus)

3B 3F 95 00 80 65 AF 03 12 01 6F 73 32 21 1B 83 00 90 00
	Gemplus GemXpresso PRO 64 PK SIM

3B 3F 95 00 80 69 AF 03 0F 02 80 FF FF 06 0E 83 3E 9F 16
	AT&T Wireless GSM SIM Card

3B 63 00 00 36 41 80
	Schlumberger Payflex 4k User

3B 64 00 00 80 62 0. 51
	Setec SetCOS 5.1.0 EMV

3B 64 .. FF 80 62 .. A2
	JCOP20

3B 65 00 00 29 05 01 02 01
	ActivCard (Schlumberger) CyberFlex 64K V1

3B 65 00 00 58 01 01 00 80
	RBS Advanta Platinum Reserve Master Card

3B 65 00 00 9C 02 02 07 02
	US Department of Defense, TEST Common Access Card (CAC)
	Schlumberger Cyberflex Access #2

3B 65 00 00 9C 1[0,1] 01 01 03
	Schlumberger Cyberflex Palmera

3B 66 00 FF 4A 43 4F 50 30 33
	IBM JCOP 30

3B 67 00 00 00 00 00 00 00 90 00
	Axa Bank (Belgium) Mastercard Gold / Axa Bank Belgium
	MisterCash & Proton card
	VISA Card (emitted by Bank Card Company - Belgium)

3B 67 00 00 29 20 00 6F 78 90 00
	Postbank Chippas (chipknip) Netherlands

3B 67 00 00 2D 20 36 00 78 90 00
	Swedish cashcard, http://www.ida.liu.se/~TDDB31/Cashcard.pdf
	Bank Card (ING - Belgium)

3B 67 00 00 85 20 36 30 78 90 00
	Belgium Fortis Bank
	Belgium Keytrade Bank
	Belgium Post Bank

3B 67 00 00 9C 10 01 01 03 FF 07
	Schlumberger Cyberflex Palmera Protect

3B 67 00 00 A5 20 40 10 1F 90 00
	Swedish eLegitimation (eID) from Nordea Bank http://www.elegitimation.se/

3B 67 25 00 2A 20 00 4[0,5] 68 90 00
	Swedish cashcard (proton)

3B 67 25 00 62 24 33 03 ..
	Bull TB1000 ? (SAM for ATM in Luxemburg)

3B 68 00 00 56 53 44 43 4C 43 31 30
	VISA (Estonian), made by www.trueb.ch

3B 68 00 00 80 66 A2 06 02 01 32 0E
	Gemplus GemClub 1K

3B 69 00 00 24 94 01 02 01 00 01 01 A9
	Chipcard from SUN to be used in SunRay's
	370-4328-01 (31091)

3B 69 00 00 24 94 01 03 01 00 01 00 A9
	Schlumberger MicroPayflex S card

3B 69 00 00 50 01 01 04 01 00 01 01 A9
	Sample card given to all attendees of the CTST 2004 SmartCard Conference

3B 69 00 FF 53 6D 40 72 74 43 61 66 65
	G&D (Giesecke&Devrient) Sm at rtCaf?

3B 6A 00 00 80 31 C0 A1 02 03 01 32 81 16
	Lloyds TSB Visa Credit/Debit Card

3B 6A 00 00 80 65 A2 01 01 01 3D 72 D6 43
	GemSafe Xpresso 16k

3B 6A 00 00 80 66 A1 09 02 01 63 0E 90 00
	Danish Visa/Dankort

3B 6B 00 00 00 31 80 64 2D A0 02 0C 8C 61 27
	SmartEMV prototype

3B 6B 00 00 00 31 80 64 43 B0 02 00 8C 61 27
	Bull Odyssey 1.2 (Javacard 2.0)

3B 6B 00 00 80 65 B0 83 01 01 74 83 00 90 00
	GemXpresso Pro R3 with 64K EEPROM

3B 6B 00 00 80 65 B0 83 01 03 74 83 00 90 00
	Gemplus GemXpresso PRO 64 PK

3B 6B .. FF 80 62 .. A2 56 46 69 6E 45 49 44
	JCOP20 v2.x

3B 6C 00 00 10 10 10 30 00 00 00 00 00 00 00 00
	Datacard Group Aptura Development Card V1.1b

3B 6D 00 00 00 31 C0 71 D6 64 34 C7 01 00 84 90 00
	DeLaRue ProlifIC

3B 6D 00 00 00 31 C0 71 D6 64 34 C7 02 00 84 90 00
	Cybelys card (Thalys fidelity card)

3B 6D 00 00 00 31 C0 71 D6 64 38 D0 02 00 84 90 00
	EMV Visa Electron (Oberthur)

3B 6D 00 00 00 31 C0 71 D6 64 38 D0 03 00 84 90 00
	HSBC Visa/MasterCard credit card
	Barclay Card MasterCard

3B 6D 00 00 80 31 80 65 B0 06 01 01 77 83 00 90 00
	GemXpresso Lite: with EMV application

3B 6D 00 00 80 31 80 65 B0 43 01 00 77 83 00 90 00
	Gemplus GemXpresso Lite

3B 6D 00 FF 00 31 80 71 8E 64 48 D5 02 00 82 90 00
	Blue for Business, American Express at Business

3B 6E 00 00 00 31 80 71 86 65 01 67 02 A0 0A 83 90 00
	Australian ANZ First Visa Card from the ANZ
	(Australia and New Zealand) Bank

3B 6E 00 00 00 31 80 71 86 65 47 44 23 01 02 83 90 00
	Nat West Master Card

3B 6E 00 00 00 62 .. 43 57 41 56 41 4E 54 10 81 90 00
	Setec SetCOS 4.3.0

3B 6E 00 00 00 62 00 00 57 41 56 41 4E 54 10 81 90 00
	Setec SetCOS 5.1.0 EMV + AVANT

3B 6E 00 00 80 31 80 65 B0 03 01 01 5E 83 00 00 90 00
	FirstUSA Visa

3B 6E 00 00 80 31 80 65 B0 03 02 01 5E 83 00 00 90 00
	Gemplus GemXpresso 211is

3B 6E 00 FF 45 73 74 45 49 44 20 76 65 72 20 31 2E 30
	Estonian Identity Card (EstEID warm)

3B 6F 00 00 00 67 2. 43 46 49 53 45 12 52 66 FF 81 90 00
	Setec SetCOS 4.3.2

3B 6F 00 00 80 31 E0 5B 4E 4F 4B 00 00 00 00 00 00 02 00
	Norsk-Tipping (Buypass) Monodex card

3B 6F 00 00 80 31 E0 6B 04 06 03 04 40 55 55 55 55 55 55
	Blue American Express Card

3B 6F 00 00 80 5A 08 03 03 00 00 00 24 22 0E E7 82 90 00
	Navigo (contact mode)

3B 6F 00 00 80 5A 08 03 03 00 00 00 24 2A 4A 09 82 90 00
	Navigo (contact mode)

3B 6F 00 00 80 5A 08 03 03 00 00 00 24 2E C1 0D 82 90 00
	passe Navigo, carte int?grale RATP (French metro in Paris)

3B 6F 00 00 80 5A 0A 01 03 20 03 11 24 34 A3 C7 82 90 00
	Navigo Imagine R ((French metro in Paris)

3B 6F 00 FF 53 46 53 45 2D 43 58 33 32 32 2D 56 18 02 02
	Giesecke & Devrient SmartCafe Expert 2.0

3B 75 94 00 00 62 02 02 0[1-3] 01
	Schlumberger Cyberflex 32K e-gate

3B 76 11 00 00 00 9C 11 01 02 02
	Schlumberger Cyberflex Access 32K

3B 76 11 00 00 00 9C 11 01 02 03
	RSA SecureID 5100

3B 76 12 00 00 00 9C 11 01 03 03
	Precise BioMatch (TM) JavaCard (Schlumberger)
	www.precisebiometrics.com

3B 76 98 00 00 00 9C 11 01 01 02
	CyberFlex Access 32

3B 7A 94 00 00 80 65 A2 01 01 01 3D 72 D6 43
	Gemplus GemXpresso Pro R3 E32 PK

3B 7B .. 00 00 80 62 0. 51 56 46 69 6E 45 49 44
	Setec SetCOS 5.1.0

3B 7B 94 00 00 80 65 B0 83 01 0[1,3] 74 83 00 90 00
	Gemplus GemXpresso Pro R3 (E64 PK)

3B 7D 11 00 00 00 31 80 71 8E 64 52 D9 01 00 82 90 00 
	Oberthur Galactic V2

3B 7D 11 00 00 00 31 80 71 8E 64 77 E3 01 00 82 90 00
	Oberthur Cosmo 64k RSA v5

3B 7D 11 00 00 00 31 80 71 8E 64 77 E3 02 00 82 90 00
	Oberthur 64k v5/2.2.0

3B 7D 11 00 00 00 31 80 71 8E 64 86 D6 01 00 81 90 00
	DOD-CAC

3B 7D 18 00 00 00 31 80 71 8E 64 77 E3 01 00 82 90 00
	Oberthur 64k v4/2.1.1

3B 7D 94 00 00 80 31 80 65 B0 83 01 02 90 83 00 90 00
	Gem e-Seal
	(GemSafeXpresso 16k R3.2?)

3B 7D 94 00 00 80 31 80 65 B0 83 01 01 90 83 00 90 00
	GemSafeXpresso 16k R3.2

3B 7E 11 00 00 00 6A 11 63 54 08 30 24 01 .. .. 21 90 01
	Sagem Windows for smart cards

3B 7F 11 00 00 80 31 C0 52 21 57 64 02 18 19 53 83 83 90 00
	banking card (www.caixacatalunya.com)
	student id of Universitat  Autonoma de Barcelona

3B 7E 13 00 00 00 6A 11 63 54 05 48 .. .. .. 01 22 90 00
	Sagem Windows for smart cards

3B 7F 11 00 00 00 31 C0 53 CA C4 01 64 52 D9 04 00 82 90 00
	DoD CAC, Oberthur CosmopolIC V4

3B 7F 18 00 00 00 31 C0 73 9E 01 0B 64 52 D9 03 00 82 90 00
	Oberthur Galactic V3 (32k)

3B 7F 18 00 00 00 31 C0 73 9E 01 0B 64 52 D9 04 00 82 90 00
	Oberthur CosmopolIC

3B 7F 18 00 00 00 31 C0 73 9E 01 0B 64 52 D9 05 00 82 90 00
	Oberthur 32k BIO

3B 81 1F 00 CC 52
	eToken R2 2242

3B 81 80 01 80 80
	Mifare DESFire

3B 82 00 55 22
	GSM-SIM TELE2 Smart (Estonia, prepaid)

3B 82 81 31 76 43 C0 02 C5
	CardOS/M2 V2.01(SLE44CxxS)

3B 82 81 31 76 43 C1 03 C5
	i.ti (ticket card for Collogne/Bonn)
	CardOS M2 Combi V2.02 (SLE44R42S)

3B 83 00 12 10 96
	GSM-SIM T-Mobil D1 (900MHz)

3B 85 00 12 02 01 00 96
	GSM-SIM Victorvox D1 (900MHz)

3B 85 00 87 25 01 38 02
	GSM-SIM Viag Interkom E2 Loop GSM (1800MHz)

3B 85 00 87 25 01 39 00
	GSM-SIM Telfort (Netherlands) 900 MHz

3B 85 40 20 68 01 01 .. ..
	Schlumberger Cryptoflex 8k

3B 85 40 20 68 01 01 03 05
	Schlumberger Cryptoflex Key Generation

3B 85 40 20 68 01 01 05 01
	Schlumberger Cryptoflex 8k

3B 86 40 20 68 01 01 02 04 AC
	Activcard Gold, SchlumbergerSema Cryptoflex 8k

3B 86 80 01 4A 43 4F 50 33 30 12
	Mifare ProX T=CL

3B 87 81 31 40 43 4D 46 43 20 31 33 31 6F
	Telekom Paycard

3B 89 00 91 26 91 06 00 01 22 01 00
	BT Cellnet SIM

3B 89 40 14 47 47 32 36 4D 35 32 38 30
	GSM-SIM e-plus (1800MHz)

3B 8A 00 91 01 00 16 00 01 16 01 00 96
	GSM-SIM T-Mobil D1 (900MHz)

3B 8A 00 91 01 00 16 00 01 20 01 00 96
	GSM-SIM T-D1 prepaid (Xtra)

3B 8A 00 91 91 00 17 00 01 07 03 00 96
	T-Mobile prepaid 2G SIM

3B 8E 80 01 80 91 91 31 C0 64 77 E3 03 00 83 82 90 00 1C
	Belgian Passport

3B 90 95 80 1F C3 59
	Dai Nippon Printing Co., DNP Standard-J T3.1

3B 95 15 40 .. 68 01 02 .. ..
	Schlumberger CryptoFlex 8k v2

3B 95 18 40 FF 62 01 02 01 04
	Schlumberger Cryptoflex 32K e-gate

3B 95 18 40 FF 62 04 01 01 05
	Schlumberger CryptoFlex 32Ko V1

3B 95 18 40 FF 64 02 01 01 02
	Schlumberger CryptoFlex 32Ko

3B 95 94 40 FF 63 01 01 02 01
	Schlumberger Cryptoflex 16Ko

3B 98 13 40 0A A5 03 01 01 01 AD 13 11
	Belgium Electronic ID card

3B 99 94 00 91 08 91 06 00 01 06 06 00
	GSM-SIM Orange-UK (1800)

3B 9A 94 00 91 01 00 17 00 01 23 10 00 96
	GSM-SIM Victorvox D1 (900MHz)

3B 9A 94 00 91 01 00 17 00 01 23 11 00 96
	GSM-SIM Card T-D1 (900MHz)

3B 9B 95 80 1F 47 80 31 A0 73 BE 21 00 53 34 99 05 D0
	GSM-SIM EMT "Diil", prepaid (Estonia)

3B 9D 94 40 23 00 68 20 01 4D 69 6F 43 4F 53 00 90 00
	Miotec (http://www.miotec.fi) smartcard running Miocos 2.0 on an Atmel AT90SC646

3B 9E 95 80 1F C3 80 31 A0 73 BE 21 13 67 29 02 01 04 04 CD 39
	Hutchison/3 3G USIM
	J+ SWIM WIB UMTS SIM Test card
	  http://www.exceldata.es/microprocess/j%2Bswinwibusim.html

3B 9F 21 0E 49 52 44 45 54 4F 20 41 43 53 20 56 34 2E 31 9D
	Foxtel paytv decoder in Australia acs 4.1 Irdeto2

3B 9F .. 80 1F C3 00 68 1. 44 05 01 46 49 53 45 31 C8 .. 90 00 ..
	Setec SetCOS 4.4.1

3B 9F 94 40 1E 00 67 11 43 46 49 53 45 10 52 66 FF 81 90 00
	Setec / FINEID

3B 9F 94 40 1E 00 67 16 43 46 49 53 45 10 52 66 FF 81 90 00
	RSA SecurID 3100 or SETEC or a Utimaco Safeware Smartcard

3B 9F 94 40 1E 00 67 .. 43 46 49 53 45 10 52 66 FF 81 90 00
	SLE66CX160S running SETCOS 4.3.1

3B 9F 94 80 1F C3 00 68 10 44 05 01 46 49 53 45 31 C8 07 90 00 18
	SetCOS 4.3.0 32K RSA
	Instant EID IP2

3B 9F 95 80 1F C3 80 31 E0 73 FE 21 1B B3 E2 01 74 83 0F 90 00 88
	Gemplus GemXplore 3G USIM

3B 9F 96 80 1F C3 80 31 E0 73 FE 21 1B B3 E2 02 7E 83 0F 90 00 82
	Vodafone SIM Card (D2, 1800Mhz, Germany, Twincard, possibly others too?), manufactured by Gemplus (See stamp on the chip)

3B A7 00 40 .. 80 65 A2 08 .. .. ..
	Gemplus GemSAFE Smart Card (8K)

3B A7 00 40 14 80 65 A2 14 01 01 37
	Gemplus GPK4000sdo

3B A7 00 40 18 80 65 A2 08 01 01 52
	Gemplus GPK8000
	GemSAFE Smart Card (8K)

3B A7 00 40 18 80 65 A2 09 01 01 52
	Gemplus GPK16000

3B A7 00 40 18 80 65 A2 09 01 02 52
	Gemplus GPK16000

3B A7 00 40 18 80 65 A2 09 01 03 52
	Gemplus GemSAFE std (GPK16000?)

3B A8 00 81 71 46 5D 00 54 43 4F 53 31 2E 32 00 65
	Telesec TCOS 1.2

3B A8 00 81 71 46 5D 00 54 43 4F 53 31 2E 32 4B 2E
	CeloCom Card with TCOS 1.2

3B AA 00 40 14 47 47 32 47 54 35 53 34 38 30
	GSM-SIM Libertel (900MHz)

3B AA 00 40 80 53 4F 80 53 45 03 04 11 AA A3
	"open platform" ATMEGA "new Generation"
	http://www.masterixweb-italy.com/new/images/articoli/atmega.jpg

3B AB 00 81 31 40 45 80 31 C0 65 08 06 80 00 00 00 00 84
	Reloadable Visa Cash card (Schlumberger), Bank of America

3B AD 00 40 FF 80 31 80 65 B0 05 01 01 5E 83 00 90 00
	Dallas Semiconductor iButton
	JIB

3B B0 11 00 81 31 90 73 F2
	SamOS 2.7

3B B2 11 00 10 80 00 02
	AT88SC0204C (Atmel memory card)

3B B7 11 00 81 31 90 43 A5 .. .. .. .. .. .. ..
	Siemens CardOS/M V1.4 (SLE44C80S)

3B B7 11 00 81 31 90 53 B5 .. .. .. .. .. .. ..
	CardOS EM/V1.4 (SLE44CR80S)

3B B7 18 00 81 31 FE 65 53 50 4B 32 34 90 00 5A
	Giesecke & Devrient Starcos 2.4

3B B7 94 00 81 31 FE 65 53 50 4B 32 32 90 00 D0
	Giesecke & Devrient STARCOS SPK2.2

3B B7 94 00 81 31 FE 65 53 50 4B 32 33 90 00 D1
	Giesecke & Devrient Starcos 2.3
	Deutsche Bank WebSign (RSA-Card)

3B B9 94 00 40 14 47 47 33 4E 48 38 36 34 30
	GSM-SIM card of the Austrian mobile phone provider One, http://www.one.at
	Proximus SIM - Belgium (SetCOS?)

3B BA 13 00 81 31 86 5D 00 64 05 0A 02 01 31 80 90 00 8B
	Telesec TCOS 2 (SLE44)
	 Cryptokarte with RSA-Controller, T=1 Protocol

3B BA 14 00 81 31 86 5D 00 64 05 14 02 02 31 80 90 00 91
	Telesec TCOS 2 (SLE66)

3B BA 94 00 40 14
	GG3RS732S0 ?

3B BA 94 00 40 14 47 47 33 52 53 37 31 36 53 30
	GSM-SIM Viag Interkom E2 Loop (1800MHz)
	GSM-SIM card of the Austrian A1, http://www.a1.net/privat/home

3B BA 96 00 81 31 86 5D 00 64 05 60 02 03 31 80 90 00 66
	Telesec TCOS 2 (SLE66P)

3B BC 94 00 40 14 47 47 33 48 33 35 58 53 32 30 30 30
	GSM-SIM Era-PL
	T-Mobile GSM SIM Card

3B BC 94 00 40 14 47 47 33 48 33 35 58 56 32 30 30 30
	GSM SIM CARD 32K, Vodafone

3B BE 11 00 00 41 01 38 00 00 00 00 00 00 00 00 01 90 00
	ACS (Advanced Card System) ACOS-1

3B BE 11 00 00 41 01 38 00 00 00 00 00 00 00 00 02 90 00
	ACS (Advanced Card System) ACOS-1 8K

3B BE 11 00 00 41 01 38 01 00 03 00 00 00 00 00 02 90 00
	ACOS2 test card from ACS reading off a ACR38U

3B BF 11 00 81 31 FE 45 45 50 41 00 00 00 00 21 00 93 42 00 00 00 00 01
	Austrian BankCard (Old Version - ca. 2004)

3B BF 11 00 81 31 FE 45 45 50 41 00 00 00 00 26 24 68 30 00 00 00 00 AB
	Austrian BankCard  (Maestro + Quick) (New Version, since 02/2005,
	with Digital-Signature etc.)

3B BF 11 00 81 31 .. 45 45 50 41 00 00 00 00 .. .. .. .. 00 00 .. .. ..
	Austrian Quick E-purse

3B BD 18 00 81 31 FE 45 80 51 02 67 04 14 B1 01 01 02 00 81 05 3D
	Austrian "e-Card" (=Health Card), BRANDNEW (since 06/2005)
	special Version of Starcos 3.1

3B BF 11 00 C0 10 31 FE 44 53 4D 40 52 54 20 43 41 46 45 20 31 2E 31 43 C1
	Giesecke&Devrient SmartCafe 1.1

3B BF 18 00 80 31 70 35 53 54 41 52 43 4F 53 20 53 32 31 20 43 90 00 9B
	Giesecke & Devrient STARCOS S2.1

3B BF 18 00 81 31 70 55 53 54 41 52 43 4F 53 20 53 32 31 20 43 90 00 FA
	Giesecke & Devrient STARCOS S2.1

3B BF 18 00 C0 20 31 70 52 53 54 41 52 43 4F 53 20 53 32 31 20 43 90 00 9C
	Giesecke & Devrient SPK 2.1 C

3B BF 94 00 81 31 FE 65 45 4C 55 20 41 75 73 74 72 69 61 20 31 2E 32 38
	A-Trust: trust-sign (Old Version, ca. 2002) for Digital Signature etc.
	A-Trust: a-sign-premium (ca. 2004) "B?rgerkarte" ("Citizen-Card")
	for Identifikation, Digital Signature etc.
	("should be" Starcos 2.3)

3B BF 94 00 81 31 FE 65 45 4C 55 20 41 75 73 74 72 69 61 20 31 2E 32 38

3B D0 A8 FF 81 F1 FB 24 00 1F C3 F4
	Philips DESFire SAM

3B D6 18 00 81 B1 80 7D 1F 03 80 51 00 61 10 30 8F
	ASECard Crypto, http://www.athena-scs.com/product.asp?pid=8

3B DB 11 FF 50 00 FF 00 00 00 00 00 00 00 07 92 16 03
	NEC V-WAY64 v2.1

3B E0 00 00 81 31 20 40 30
	SmarTEC

3B E2 00 00 40 20 49 ..
	Schlumberger Cryptoflex 4k

3B E2 00 00 40 20 49 05
	Schlumberger Cryptoflex DES

3B E2 00 00 40 20 49 06
	Schlumberger Cryptoflex

3B E2 00 00 40 20 49 07
	Schlumberger Cryptoflex Key Generation

3B E2 00 FF C1 10 31 FE 55 C8 02 9C
	Aladdin eToken PRO (USB token)
	Siemens CardOS M4.0

3B E3 00 FF 91 81 71 26 44 00 01 13 20 2D
	Metrebus Card
	(used in Rome to store personal information and Atac subscription.
	Atac is the public transport company of the city of Rome.)
	http://www.atac.roma.it/smart/smart.asp?A=2&S=22&PR=4&LNG=2

3B E6 00 FF 81 31 FE 45 4A 43 4F 50 30 33 07
	IBM JCOP 30/16

3B E6 00 FF 81 31 FE 45 4A 43 4F 50 31 30 05
	IBM JCOP 10/16

3B E6 00 FF 81 31 FE 45 4A 43 4F 50 32 30 06
	IBM JCOP 20/16
	or Datakey Smart Card Model 330J
	(http://www.datakey.com/products/smart_cards/products_sc_330j.shtml)

3B E6 00 FF 81 31 FE 45 4A 43 4F 50 32 31 07
	IBM JCOP ID21

3B E6 00 FF 81 31 FE 45 4A 43 4F 50 33 30 07
	Mifare ProX T=1

3B E6 00 FF 81 31 FE 45 4A 43 4F 50 33 31 06
	IBM JCOP 30/31bio (contact interface)

3B E9 00 00 81 31 FE 45 4A 43 4F 50 34 31 56 32 32 A7
	IBM JCOP v2.2 41

3B E9 00 FF C1 10 31 FE 55 C8 01 20 50 4E 34 30 31 32 AD
	Siemens CardOS/M 3.0 (SLE66CX160S)

3B EA 00 FF 81 31 20 75 00 64 05 14 01 02 31 00 90 00 27
	GCOS-MDK

3B EA 00 FF 81 31 FE 45 54 55 42 2D 43 4B 01 03 01 00 7B
	Technische Universit?t Berlin - Campus Karte
	Maybe Sm at rtCaf? Expert 2.0 (Giesecke & Devrient)
	or GemXpresso 211 PK (Gemplus)
	Includes a Mifare-Chip (1 KB - Memory-Chip)

3B EB 00 00 81 31 42 45 4E 4C 43 68 53 43 4B 30 34 30 31 2B
	Dutch University accesscard & Electronic purse & telphone card

3B EB 00 00 81 31 42 45 4E 4C 43 68 69 70 70 65 72 30 31 0A
	Dutch Post (Chipper)

3B EC 00 FF 81 31 FE 45 A0 00 00 00 56 33 33 30 4A 33 06 00 A1
	Datakey model 330J card, www.datakey.com
	http://www.hmk.de/downloads/datakey/Model_330J_Smart_Card.pdf
	Model 330J JavaCard v2.1.1
	Global Platform v2.0.1 specifications.
	JCCOS operating system applet (Java-based Cryptographic Card
	Operating System)

3B EF 00 00 40 14 80 25 43 45 52 45 53 57 01 16 01 01 03 90 00
	Electronic Identification Card from the FNMT, the Spanish Official
	Certification Authority

3B EF 00 FF 81 31 20 45 42 61 73 69 63 43 61 72 64 20 5A 43 32 2E 33 BD
	ZeitControl BasicCard Enhanced 2.3

3B EF 00 FF 81 31 20 45 42 61 73 69 63 43 61 72 64 20 5A 43 33 2E 33 BC
	Electronic Purse (Elton Senegal)

3B EF 00 FF 81 31 20 75 42 61 73 69 63 43 61 72 64 20 5A 43 33 2E 33 8C
	ZeitControl BasicCard Enhanced 3.3

3B EF 00 FF 81 31 20 75 42 61 73 69 63 43 61 72 64 20 5A 43 33 2E 37 88
	ZeitControl BasicCard Enhanced 3.7

3B EF 00 FF 81 31 20 75 42 61 73 69 63 43 61 72 64 20 5A 43 33 2E 39 86
	ZeitControl BasicCard Enhanced 3.9

3B EF 00 FF 81 31 42 45 .* 38
	UNI-Card

3B EF 00 FF 81 31 50 45 42 61 73 69 63 43 61 72 64 20 5A 43 31 2E 31 CC
	ZeitControl BasicCard Compact 1.1

3B EF 00 FF 81 31 50 45 65 63 .. .. .. .. .. .. .. .. .. .. .. .. .. ..
	GeldKarte v2 (Germany)

3B EF 00 FF 81 31 50 45 65 63 00 00 00 00 00 00 00 00 00 00 00 00 00 00
	Geldkarte v2

3B EF 00 FF 81 31 52 45 4D 46 43 20 49 42 4D 20 34 30 48 39 36 30 31 FB
	IBM MFC 3.5 file system smart card
	(Card from the book "Smart Card Application Development Using Java")

3B EF 00 FF 81 31 60 45 65 63 04 02 11 00 00 00 00 00 A5 32 A5 01 11 B6
	GledKarte
	Siemens M3-Module with a Motorola SC-28.
	G&D (Giesecke&Devrient) Geldkarten-OS mit der Version 11

3B EF 00 FF 81 31 60 45 65 63 06 03 14 02 50 00 06 51 08 11 5E 01 41 90
	Geldkarte from Deutsche Bank, Thomson-Chip

3B EF 00 FF 81 31 66 45 49 42 4D 20 4D 46 43 34 30 30 32 30 38 33 31 A1
	IBM MFC 4.1 file system smart card
	Card from the book "Smart Card Application Development Using Java"
	authors: Uwe Hansmann, Martin. S. Nicklous, Thomas Sch?ck, Achim Schneider, Frank Seliger

3B EF 00 FF 81 31 66 45 65 63 20 20 49 42 4D 20 33 2E 31 20 20 20 20
	IBM eCash

3B EF 00 FF 81 31 66 45 65 63 20 20 49 42 4D 20 33 2E 31 20 20 20 20 CF
	IBM eCash

3B EF 00 FF 81 31 86 45 49 42 4D 20 4D 46 43 34 30 30 30 30 38 33 31 43
	ComCard MFC 4.1

3B EF 00 FF 81 31 FE 45 65 63 11 04 01 02 80 00 0F 27 40 00 03 01 00 E1
	Postbank Geldkarte

3B EF 00 FF 81 31 FE 45 65 63 11 04 01 02 80 00 0F 46 20 04 23 01 00 C4
	Postbank ec/Maestro (Germany)

3B EF 00 FF 81 31 FE 45 80 31 C0 6B 49 42 4D 20 4A 65 74 5A 20 4D 32 39
	UBS Internet Card (IBM JetZ M2)

3B F2 98 00 FF C1 10 31 FE 55 C8 03 15
	Siemens CardOS M 4.01 (SLE66CX320P)

3B F2 18 00 02 C1 0A 31 FE 58 C8 08 74
	Siemens CardOS V4.3B

3B F2 18 00 02 C1 0A 31 FE 55 C8 07 76
	Siemens CardOS V4.3

3B F2 18 00 02 C1 0A 31 FE 58 C8 09 75
	 Siemens CardOS V4.2B

3B F2 18 00 FF C1 0A 31 FE 55 C8 06 8A
	Siemens CardOS M 4.2 (SLE66CX642P)

3B F2 98 00 FF C1 10 31 FE 55 C8 04 12
	CardOS M4.01a (SLE66CX322P)

3B F5 91 00 FF 91 81 71 FE 40 00 41 08 00 00 00 0D
	Contactless Mifare

3B F5 91 00 FF 91 81 71 FE 40 00 41 88 00 00 00 8D
	Contactless Mifare 1k or 4k

3B F6 18 00 FF 81 31 FE 45 4A 43 4F 50 32 30 0E
	IBM JCOP20

3B F6 18 00 FF 81 31 FE 45 4A 43 4F 50 33 31 0E
	IBM JCOP BIO31

3B FA 11 00 02 40 60 43 C6 02 F8 03 03 00 00 90 00
	DeLaRue DX(?)

3B FA 13 00 FF 81 31 80 45 00 31 C1 73 C0 01 00 00 90 00 B1
	OpenPGP

3B FA 94 00 00 81 31 20 43 80 65 A2 01 01 01 3D 72 D6 43 21
	GemXpresso Pro R3 32PK (MPCOS, T=1)

3B FB 13 00 FF 81 31 80 75 5A 43 36 2E 35 20 52 45 56 20 43 64
	ZeitControl BasicCard 6.5, multiapplication with 30 kByte EEPROM

3B FB 13 00 FF 81 31 80 75 5A 43 35 2E 35 20 52 45 56 20 47 63
	ZeitControl BasicCard 5.5

3B FB 13 00 FF C0 80 31 80 75 5A 43 35 2E 34 20 52 45 56 20 41 A5
	ZeitControl BasicCard Professional 5.4 Revision A

3B FB 98 00 FF C1 10 31 FE 55 00 64 05 20 47 03 31 80 00 90 00 F3
	Gemplus GemGate 32K
	distributed by Postecert (www.postecert.it) to legally sign documents

3B FC 98 00 FF C1 10 31 FE 55 C8 03 49 6E 66 6F 63 61 6D 65 72 65 28
	New Card Infocamere (Italy) series 1402...
	 http://www.card.infocamere.it/
	 Siemens Informatica - Siemens M4.01a
	 chip Infineon SLE66CX322P (CC EAL5)
	 Memory EEPROM: 32KB
	 Operating system CARDOS
	 Max numero dei tentativi PIN: 3
	 Pin: da 5 a 8 digit
	 Unblocked by tool CARDOS API 2.2

3B FD 18 00 00 80 31 FE 45 00 31 80 71 8E 64 52 D9 04 00 81 90 00 5B
	Oberthur Card Systems, authentIC

3B FD 94 00 00 81 31 60 65 80 31 C0 69 4D 54 43 4F 53 73 01 01 11 E0
	MTCOS Light, http://www.masktech.de/products/mtcoslight/index.html

3B FE 94 00 FF 80 B1 FA 45 1F 03 45 73 74 45 49 44 20 76 65 72 20 31 2E 30 43
	ESTEID Estonian Identity Card (EstEID cold)

3B FF 11 00 00 81 31 FE 4D 80 25 A0 00 00 00 56 57 44 4B 33 33 30 06 00 D0
	Datakey 32K PKI Smart Card Model 330
	(http://www.datakey.com/products/smart_cards/products_sc_330.shtml)

3B FF 11 00 00 81 71 40 42 00 00 21 01 31 42 52 00 0[0,5] 63 .. .. .. .. 90 00.*
	Smart Card "The Smart Way to Login"
	Used on Acer TravelMate to secure boot

3B FF 11 00 02 40 64 80 69 A2 07 01 03 57 00 00 FF 00 83 00 90 00
	Gemplus GemXpresso

3B FF 13 00 FF 81 31 FE 45 65 63 11 04 50 02 80 00 08 54 00 04 23 05 02 A5
	Maestrocard/Geldkarte (Stadtsparkasse Haltern, Germany)

3B FF 13 00 FF 81 31 FE 5D 80 25 A0 00 00 00 56 57 44 4B 33 32 30 05 00 3F
	Datakey DCOS model 320

3B FF 18 00 FF 81 31 3C 45 65 63 0D 02 31 02 50 00 10 90 00 26 00 04 10 09
	Maestrocard/Geldkarte (Postbank, Germany)

3B FF 18 00 FF 81 31 3C 45 65 63 0D 02 31 02 50 00 10 90 01 55 00 04 10 7B
	Volksbank VR-BankCard (GeldKarte)

3B FF 18 00 FF 81 31 3C 45 65 63 0D 02 31 02 50 00 10 90 07 88 00 04 10 A0
	HBCI-Karte (Berliner Sparkasse, Germany)

3B FF 18 00 FF 81 31 3C 45 65 63 0D 02 31 02 50 00 10 90 05 29 00 04 10 03
	Geldkarte/HBCI(DDV-1) (Stadtsparkasse Vorpommern, Germany)

3B FF 18 00 FF 81 31 3C 45 65 63 0D 02 31 02 50 00 10 90 14 06 00 04 10 3D
	Geldkarte/HBCI(DDV-1) (Staedtische Sparkasse Offenbach, Germany)

3B FF 18 00 FF 81 31 3C 45 65 63 0D 02 31 02 80 00 12 24 30 00 20 04 10 59
	Geldkarte (Germany)

3B FF 18 00 FF 81 31 50 45 65 63 .. .. .. .. .. .. .. .. .. .. .. .. .. ..
	GeldKarte v3 (Germany)

3B FF 18 00 FF 81 31 FE 45 65 63 0D 04 50 02 80 00 08 90 09 70 00 05 00 2A
	Landesbank baden-W?rttemberg Geldkarte

3B FF 18 00 FF 81 31 FE 45 65 63 11 06 40 02 50 00 10 05 50 03 10 05 00 43
	HBCI-Karte (Bordesholmer Sparkasse, Germany)

3B FF 18 00 FF 81 31 FE 45 65 63 11 06 40 02 50 00 10 27 80 03 25 05 00 84
	Volksbank VR-BankCard (GeldKarte)

3B FF 94 00 FF 80 B1 FE 45 1F 03 00 68 D2 76 00 00 28 FF 05 1E 31 80 00 90 00 23
	D-Trust Signature Card (www.d-trust.net):
	- Citizencard of the People of Ulm in Germany (B?rgerkarte)
	- Qualified Electronic Signature Card (Qualifizierte Signaturkarte)

3B FF 95 00 FF 40 0A 80 31 00 73 1A 21 13 57 4A 50 48 60 31 41 47
	Vodafone 64 KB SIM with Javacard

3B FF 95 00 FF 40 0A 80 31 E8 73 F6 21 13 67 4A 47 48 60 31 42 00
	Giesecke & Devrient STARSIM

3F 05 DC 20 FC 00 01
	DigiCash Facility Card

3F 28 00 00 11 14 00 03 68 90 00
	SIMEMU - a DIY GSM SIM card - http://simemu.cjb.net/

3F 2D 00 27 A0 51 82 7D 00 00 00 52 00 0C 90 00
	Porta Moedas Multibanco (Portugeese electronic purse)

3F 2F 00 80 59 AF 02 01 01 30 00 00 0A 0E 83 06 9F 12
	Gemplus GemXplore

3F 2F 00 80 69 AE 02 02 01 36 00 00 0A 0E 83 3E 9F 16
	GSM-SIM e-plus (1800MHz)

3F 2F 00 80 69 AF 02 04 01 36 00 02 0A 0E 83 3E 9F 16
	GSM-SIM D2 CallYa (900MHz)

3F 2F 00 80 69 AF 03 07 03 52 00 00 0A 0E 83 3E 9F 16
	GemXplore 98 V1 16K

3F 2F 00 80 69 AF 03 07 03 52 00 0D 0A 0E 83 3E 9F 16
	GSM-SIM Debitel D2 (900MHz)

3F 2F 00 80 69 AF 03 07 03 5A 00 15 0A 0E 83 3E 9F 16
	Virgin Mobile SIM (Gemplus)

3F 67 25 00 21 20 00 0F 78 90 00
	Bank Nederlandse Gemeenten, BNG Data Services

3F 65 25 .. .. 04 6C 90 .0
	Carte Bancaire (french banking card)

3F 65 25 00 2[2,C] 09 [F,6]9 90 00
	Sesam Vitale (french health card)

3F 65 25 00 2B 09 62 90 00
	Coinamatic SmartyCity smartcard

3F 65 25 00 2B 09 EB 90 00
	Bull Scot 5

3F 65 25 00 52 09 6A 90 00
	French carte Vitale

3F 65 25 08 22 04 68 90 00
	France Telecom card (ex Pastel card)

3F 65 25 08 33 04 20 90 00
	D-Trust card

3F 65 35 64 02 04 6C 90 40
	Postcard (Switzerland)

3F 67 25 00 26 14 00 20 68 90 00
	Pay-TV card from Casema Cable Television, Netherland

3F 67 25 00 2A 20 00 0F 68 90 00
	Carte Grand Voyageur (SNCF : french train company)

3F 67 25 00 2A 20 00 40 68 9F 00
	Swiss Cash card

3F 67 25 00 2A 20 00 4[0,1] 68 90 00
	Dutch ChipKnip, Proton
	(chip Bull CC 60 V1, Bull CC 60 V2 or Bull CC 1000)

3F 67 25 04 21 20 00 07 68 90 00
	Philips TB100 (C-MOS chip)

3F 67 2F 04 11 20 00 00 68 90 00
	BULL HN ITALIA 06/92 - 100.000 - 64MP
	La Sapienza - Universita' di Roma

3F 69 00 00 24 AF 01 70 01 01 FF 90 00
	French GSM SIM card (900MHz)

3F 6C 00 00 24 A0 30 00 FF 00 00 01 00 04 90 00
	Gemplus MCOS 16K DES Sample Card

3F 6C 00 00 25 A0 30 89 76 00 00 04 01 0C 90 00
	MCOS 24k EEPROM

3F 6D 00 00 80 31 80 65 B0 05 01 02 5E 83 00 90 00
	Gemplus GemXpresso 211PK or 211PK-IS

3F 77 18 25 00 29 14 00 62 68 90 00
	Viaccess card

3F 78 12 25 01 40 B0 03 4A 50 20 48 55
	DSS/DTV H

3F 7E 11 25 05 40 B0 08 00 00 4D 59 00 00 00 53 4B 0B 07
	BSkyB Series 11 (DSS satellite TV card)

3F 7F 13 25 03 38 B0 04 FF FF 4A 50 00 00 29 48 55 .. .. ..
	DSS/DTV HU

3F 78 13 25 03 40 B0 20 FF FF 4A 50 00
	DSS/DTV P4

3F FF 95 00 FF 91 81 71 A0 47 00 44 4E 41 53 50 30 31 30 20 52 65 76 41 32 30 48
	DSS/DISH ROM10

3F FF 95 00 FF 91 81 71 A0 47 00 44 4E 41 53 50 30 31 30 20 52 65 76 41 32 31 49
	PayTV card for DishNetwork Sat receiver http://www.dishnetwork.com/

3F FF 95 00 FF 91 81 71 A0 47 00 44 4E 41 53 50 30 31 31 20 52 65 76 42
	NTL digial TV card (Nagravision)

3F FF 95 00 FF 91 81 71 A0 47 00 44 4E 41 53 50 30 31 31 20 52 65 76 42 30 36 4E
	Telewest Broadband (Nagravision)

# do not delete


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 20:44:52 -0000	1.1
+++ .cvsignore	13 Dec 2005 20:45:49 -0000	1.2
@@ -0,0 +1 @@
+pcsc-tools-1.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 20:44:52 -0000	1.1
+++ sources	13 Dec 2005 20:45:49 -0000	1.2
@@ -0,0 +1 @@
+517cb2a5e6d3170f408cc7550223ed89  pcsc-tools-1.4.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 20:51:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 15:51:31 -0500
Subject: owners owners.list,1.446,1.447
Message-ID: <200512132052.jBDKq11p031461@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31443

Modified Files:
	owners.list 
Log Message:
+pcsc-tools, Cc perl devel list on pcsc-perl.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- owners.list	13 Dec 2005 20:24:02 -0000	1.446
+++ owners.list	13 Dec 2005 20:51:28 -0000	1.447
@@ -665,7 +665,8 @@
 Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|pcsc-tools|Tools to be used with smart cards and PC/SC|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 13 21:18:33 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Tue, 13 Dec 2005 16:18:33 -0500
Subject: rpms/gnomesword/devel .cvsignore, 1.2, 1.3 gnomesword.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200512132119.jBDLJ3eh000993@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv971

Modified Files:
	.cvsignore gnomesword.spec sources 
Log Message:
New upstream version, compiles against rawhide gtkhtml3
Does not work (segmentation fault) so no build request in rawhide until that
is resolved. But it does compile.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jun 2005 12:04:31 -0000	1.2
+++ .cvsignore	13 Dec 2005 21:18:31 -0000	1.3
@@ -1 +1,2 @@
 gnomesword-2.1.2.tar.gz
+gnomesword-2.1.3.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnomesword.spec	15 Sep 2005 12:48:30 -0000	1.5
+++ gnomesword.spec	13 Dec 2005 21:18:31 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           gnomesword           
-Version:        2.1.2
-Release:        2.3%{?dist}
+Version:        2.1.3
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-Patch0:         gnomesword-2.1.2-gettext64.patch
+#Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -15,16 +15,13 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-spell
-BuildRequires:  gtkhtml3-devel
+BuildRequires:  gtkhtml3-devel >= 3.6
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
-# currently broken on x86_64
-# ExcludeArch:    x86_64
-# for x86_64
-%ifarch x86_64
-BuildRequires:  libtool automake autoconf
-%endif
+#%%ifarch x86_64
+#BuildRequires:  libtool automake autoconf
+#%%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -39,16 +36,16 @@
 
 %prep
 %setup -q
-%ifarch x86_64
-%patch0 -p1 -b .gettext64 
-%endif
+#%%ifarch x86_64
+#%%patch0 -p1 -b .gettext64 
+#%%endif
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
-%ifarch x86_64
-libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
-%endif
+#%%ifarch x86_64
+#libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
+#%%endif
 %configure
 make %{?_smp_mflags}
 
@@ -85,11 +82,16 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS ChangeLog NEWS README TODO
 %_bindir/gnomesword2
+%_datadir/gnomesword
 %_datadir/pixmaps/gnomesword
 %_datadir/applications/fedora-gnomesword.desktop
 
 
 %changelog
+* Tue Dec 13 2005 Michael A. Peters  - 2.1.3-1
+- New upstream version, works with gtkhtml3-3.8
+- disable x86_64 patch
+
 * Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.3
 - trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
 - 160186


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jun 2005 12:04:31 -0000	1.2
+++ sources	13 Dec 2005 21:18:31 -0000	1.3
@@ -1 +1,2 @@
 ce1171f19a40256cfdd31f42c979d91c  gnomesword-2.1.2.tar.gz
+b9bb8f16890feb2371d06982505fdbc2  gnomesword-2.1.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 21:52:46 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 13 Dec 2005 16:52:46 -0500
Subject: fedora-security/audit fc4,1.104,1.105 fc5,1.15,1.16
Message-ID: <200512132153.jBDLrGqT001173@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1153

Modified Files:
	fc4 fc5 
Log Message:
Add outstanding CVE ids.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- fc4	12 Dec 2005 14:10:01 -0000	1.104
+++ fc4	13 Dec 2005 21:52:44 -0000	1.105
@@ -3,6 +3,8 @@
 
 ** are items that need attention
 
+CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
+CVE-2005-4154 ignore (php) don't install untrusted pear packages
 CVE-2005-4077 backport (curl) [since FEDORA-2005-1129]
 CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3193 VULNERABLE (xpdf)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fc5	12 Dec 2005 14:10:01 -0000	1.15
+++ fc5	13 Dec 2005 21:52:44 -0000	1.16
@@ -12,6 +12,8 @@
 
 ** are items that need attention
 
+CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
+CVE-2005-4154 ignore (php) don't install untrusted pear packages
 CVE-2005-4077 VULNERABLE (curl)
 CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3193 VULNERABLE (xpdf)



From fedora-extras-commits at redhat.com  Tue Dec 13 21:54:24 2005
From: fedora-extras-commits at redhat.com (Robert Theisen (trobert))
Date: Tue, 13 Dec 2005 16:54:24 -0500
Subject: web/html/download mirrors.php,1.31,1.32
Message-ID: <200512132154.jBDLss7m001234@cvs-int.fedora.redhat.com>

Author: trobert

Update of /cvs/fedora/web/html/download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1179

Modified Files:
	mirrors.php 
Log Message:
Added coblitz.planet-lab.org links for several geos



Index: mirrors.php
===================================================================
RCS file: /cvs/fedora/web/html/download/mirrors.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mirrors.php	22 Nov 2005 21:33:51 -0000	1.31
+++ mirrors.php	13 Dec 2005 21:54:22 -0000	1.32
@@ -87,6 +87,7 @@
 	    
  • http://srl.cs.jhu.edu/YUM/fedora-core/
    • 
 	    
  •  rsync://srl.cs.jhu.edu/YUM/fedora-core/
    • 
 	    
  • http://fedora.secs.oakland.edu/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
         
 	
 	
  • USA West
@@ -123,6 +124,7 @@
 	    
  • ftp://ftp.applios.net/pub/fedora/linux/core
    • 
 	    
  • ftp://calserv.unl.edu/pub/linux/fedora/linux/core/
    • 
 	    
  • ftp://mirrors.imagi.net/fedora/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Canada
@@ -275,6 +277,7 @@
 	    
  • ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/
    • 
 	    
  • http://download.atrpms.net/mirrors/fedoracore/
    • 
 	    
  • ftp://ftp.fu-berlin.de/linux/fedora/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Greece
@@ -460,6 +463,7 @@
 	    
  • http://mirror.poundhost.com/fedora.redhat.com/
    • 
 	    
  • ftp://mirror.poundhost.com/pub/fedora.redhat.com/
    • 
 	    
  • ftp://ftp2.newnet.co.uk/pub/fedora/linux/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
      
@@ -528,6 +532,7 @@
 	   
  • rsync://ftp.nara.wide.ad.jp/fedora/
    • 
 	   
  • ftp://ftp.dti.ad.jp/pub/Linux/Fedora/core/
    • 
 	   
  • http://ftp.dti.ad.jp/pub/Linux/Fedora/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Korea
@@ -536,6 +541,7 @@
 	   
  • rsync://ftp.kreonet.re.kr/fedora/core/
    • 
 	   
  • ftp://mirror.hostway.co.kr/pub/fedora/
    • 
 	   
  • ftp://ftp.kaist.ac.kr/pub/fedora/linux/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Malaysia



From fedora-extras-commits at redhat.com  Tue Dec 13 21:55:34 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 13 Dec 2005 16:55:34 -0500
Subject: rpms/libsafe/devel README, NONE, 1.1 Makefile, 1.2,
	NONE libsafe-2.0-16.spec, 1.7, NONE libsafe-2.0-16c.patch, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200512132155.jBDLtYvQ001288@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libsafe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1267

Added Files:
	README 
Removed Files:
	Makefile libsafe-2.0-16.spec libsafe-2.0-16c.patch sources 
Log Message:
libsafe is removed from FE4+ because it is redundant to gcc FORTIFY_SOURCE and stack protector.



--- NEW FILE README ---
libsafe is removed from FE4+ because it is redundant to gcc FORTIFY_SOURCE and stack protector.


--- Makefile DELETED ---


--- libsafe-2.0-16.spec DELETED ---


--- libsafe-2.0-16c.patch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 21:56:02 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Tue, 13 Dec 2005 16:56:02 -0500
Subject: rpms/libsafe/FC-4 README, NONE, 1.1 Makefile, 1.2, NONE branch, 1.1,
	NONE libsafe-2.0-16.spec, 1.7, NONE libsafe-2.0-16c.patch, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200512132156.jBDLu2eu001347@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/libsafe/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1325

Added Files:
	README 
Removed Files:
	Makefile branch libsafe-2.0-16.spec libsafe-2.0-16c.patch 
	sources 
Log Message:
libsafe is removed from FE4+ because it is redundant to gcc FORTIFY_SOURCE and stack protector.



--- NEW FILE README ---
libsafe is removed from FE4+ because it is redundant to gcc FORTIFY_SOURCE and stack protector.


--- Makefile DELETED ---


--- branch DELETED ---


--- libsafe-2.0-16.spec DELETED ---


--- libsafe-2.0-16c.patch DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 22:06:56 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 13 Dec 2005 17:06:56 -0500
Subject: rpms/tla/devel tla.spec,1.17,1.18
Message-ID: <200512132207.jBDM7QMs003015@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/tla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2997

Modified Files:
	tla.spec 
Log Message:
* Tue Dec 13 2005 Ville Skytt??  - 1.3.3-2
- Rebuild against new OpenSSL.



Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tla.spec	13 Jun 2005 17:07:15 -0000	1.17
+++ tla.spec	13 Dec 2005 22:06:39 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           tla
 Version:        1.3.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
@@ -71,7 +71,10 @@
 %{_bindir}/tla
 
 %changelog
-* Mon Jun 13 2005 Shahms E. King  - 0.1.3.3-1
+* Tue Dec 13 2005 Ville Skytt??  - 1.3.3-2
+- Rebuild against new OpenSSL.
+
+* Mon Jun 13 2005 Shahms E. King  - 1.3.3-1
 - Update to new upstream version
 
 * Sun May 22 2005 Jeremy Katz  - 1.3.2



From fedora-extras-commits at redhat.com  Tue Dec 13 22:12:01 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 13 Dec 2005 17:12:01 -0500
Subject: rpms/kdesvn/FC-4 kdesvn-0.6.3-desktop.patch,1.1,NONE
Message-ID: <200512132212.jBDMC1PK003088@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3073

Removed Files:
	kdesvn-0.6.3-desktop.patch 
Log Message:
Fixed upstream



--- kdesvn-0.6.3-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 22:16:36 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 13 Dec 2005 17:16:36 -0500
Subject: rpms/kdesvn/devel kdesvn-0.7.1-x.patch,1.2,1.3
Message-ID: <200512132217.jBDMH612003207@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3184

Modified Files:
	kdesvn-0.7.1-x.patch 
Log Message:
Revert to full patch that works on FC5


kdesvn-0.7.1-x.patch:

Index: kdesvn-0.7.1-x.patch
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn-0.7.1-x.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdesvn-0.7.1-x.patch	13 Dec 2005 16:55:31 -0000	1.2
+++ kdesvn-0.7.1-x.patch	13 Dec 2005 22:16:34 -0000	1.3
@@ -1,9 +1,36 @@
---- kdesvn-0.7.1/configure.x11	2005-11-25 12:05:40.000000000 -0700
-+++ kdesvn-0.7.1/configure	2005-12-13 09:54:20.000000000 -0700
-@@ -26637,90 +26637,6 @@
- 
+--- kdesvn-0.7.1/configure.orig	2005-11-11 14:25:22.000000000 -0700
++++ kdesvn-0.7.1/configure	2005-11-21 13:16:23.000000000 -0700
+@@ -26605,535 +26605,6 @@
  
+ fi;
  
+-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
+-
+-echo "$as_me:$LINENO: checking for X" >&5
+-echo $ECHO_N "checking for X... $ECHO_C" >&6
+-
+-if test "${kde_cv_have_x+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  # One or both of the vars are not set, and there is no cached value.
+-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
+-   kde_x_includes=NO
+-else
+-   kde_x_includes=$x_includes
+-fi
+-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
+-   kde_x_libraries=NO
+-else
+-   kde_x_libraries=$x_libraries
+-fi
+-
+-# below we use the standard autoconf calls
+-ac_x_libraries=$kde_x_libraries
+-ac_x_includes=$kde_x_includes
+-
+-
+-
+-
 -if test "$ac_x_includes" = NO; then
 -  # Guess where to find include files, by looking for this one X11 .h file.
 -  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
@@ -88,19 +115,424 @@
 -rm -f conftest.err conftest.$ac_ext
 -fi # $ac_x_includes = NO
 -
- if test "$ac_x_libraries" = NO; then
-   # Check for the libraries.
- 
-@@ -26887,12 +26803,6 @@
-   kde_x_libraries=$ac_x_libraries
- fi
- 
+-if test "$ac_x_libraries" = NO; then
+-  # Check for the libraries.
+-
+-  test -z "$x_direct_test_library" && x_direct_test_library=Xt
+-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
+-
+-  # See if we find them without any special options.
+-  # Don't add to $LIBS permanently.
+-  ac_save_LIBS="$LIBS"
+-  LIBS="-l$x_direct_test_library $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-${x_direct_test_function}()
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  LIBS="$ac_save_LIBS"
+-# We can link X programs with no special library path.
+-ac_x_libraries=
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-LIBS="$ac_save_LIBS"
+-# First see if replacing the include by lib works.
+-# Check X11 before X11Rn because it is often a symlink to the current release.
+-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
+-    /usr/X11/lib${kdelibsuff}           \
+-    /usr/X11R6/lib${kdelibsuff}         \
+-    /usr/X11R5/lib${kdelibsuff}         \
+-    /usr/X11R4/lib${kdelibsuff}         \
+-                                        \
+-    /usr/lib${kdelibsuff}/X11           \
+-    /usr/lib${kdelibsuff}/X11R6         \
+-    /usr/lib${kdelibsuff}/X11R5         \
+-    /usr/lib${kdelibsuff}/X11R4         \
+-                                        \
+-    /usr/local/X11/lib${kdelibsuff}     \
+-    /usr/local/X11R6/lib${kdelibsuff}   \
+-    /usr/local/X11R5/lib${kdelibsuff}   \
+-    /usr/local/X11R4/lib${kdelibsuff}   \
+-                                        \
+-    /usr/local/lib${kdelibsuff}/X11     \
+-    /usr/local/lib${kdelibsuff}/X11R6   \
+-    /usr/local/lib${kdelibsuff}/X11R5   \
+-    /usr/local/lib${kdelibsuff}/X11R4   \
+-                                        \
+-    /usr/X386/lib${kdelibsuff}          \
+-    /usr/x386/lib${kdelibsuff}          \
+-    /usr/XFree86/lib${kdelibsuff}/X11   \
+-                                        \
+-    /usr/lib${kdelibsuff}               \
+-    /usr/local/lib${kdelibsuff}         \
+-    /usr/unsupported/lib${kdelibsuff}   \
+-    /usr/athena/lib${kdelibsuff}        \
+-    /usr/local/x11r5/lib${kdelibsuff}   \
+-    /usr/lpp/Xamples/lib${kdelibsuff}   \
+-    /lib/usr/lib${kdelibsuff}/X11       \
+-                                        \
+-    /usr/openwin/lib${kdelibsuff}       \
+-    /usr/openwin/share/lib${kdelibsuff} \
+-    ; \
+-do
+-  for ac_extension in a so sl; do
+-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
+-      ac_x_libraries=$ac_dir
+-      break 2
+-    fi
+-  done
+-done
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi # $ac_x_libraries = NO
+-
+-case "$host" in
+-mips-sgi-irix6*)
+-  ;;
+-*-*-solaris*)
+-  ;;
+-*)
+-  rm -fr conftest.dir
+-if mkdir conftest.dir; then
+-  cd conftest.dir
+-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+-  cat >Imakefile <<'_ACEOF'
+-acfindx:
+-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+-_ACEOF
+-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+-    for ac_extension in a so sl; do
+-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+-	 test -f $ac_im_libdir/libX11.$ac_extension; then
+-	ac_im_usrlibdir=$ac_im_libdir; break
+-      fi
+-    done
+-    # Screen out bogus values from the imake configuration.  They are
+-    # bogus both because they are the default anyway, and because
+-    # using them would break gcc on systems where it needs fixed includes.
+-    case $ac_im_incroot in
+-	/usr/include) ;;
+-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+-    esac
+-    case $ac_im_usrlibdir in
+-	/usr/lib | /lib) ;;
+-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+-    esac
+-  fi
+-  cd ..
+-  rm -fr conftest.dir
+-fi
+-
+-  if test -z "$ac_x_includes"; then
+-    ac_x_includes="."
+-  fi
+-  if test -z "$ac_x_libraries"; then
+-    ac_x_libraries="/usr/lib${kdelibsuff}"
+-  fi
+-esac
+-#from now on we use our own again
+-
+-# when the user already gave --x-includes, we ignore
+-# what the standard autoconf macros told us.
+-if test "$kde_x_includes" = NO; then
+-  kde_x_includes=$ac_x_includes
+-fi
+-
+-# for --x-libraries too
+-if test "$kde_x_libraries" = NO; then
+-  kde_x_libraries=$ac_x_libraries
+-fi
+-
 -if test "$kde_x_includes" = NO; then
 -  { { echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5
 -echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
 -
- if test "$kde_x_libraries" = NO; then
-   { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
- echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}
+-if test "$kde_x_libraries" = NO; then
+-  { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
+-echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+-# Record where we found X for the cache.
+-kde_cv_have_x="have_x=yes \
+-         kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
+-
+-fi
+-
+-eval "$kde_cv_have_x"
+-
+-if test "$have_x" != yes; then
+-  echo "$as_me:$LINENO: result: $have_x" >&5
+-echo "${ECHO_T}$have_x" >&6
+-  no_x=yes
+-else
+-  echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
+-echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
+-fi
+-
+-if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
+-  X_INCLUDES=""
+-  x_includes=".";  else
+-  x_includes=$kde_x_includes
+-  X_INCLUDES="-I$x_includes"
+-fi
+-
+-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
+-  X_LDFLAGS=""
+-  x_libraries="/usr/lib";  else
+-  x_libraries=$kde_x_libraries
+-  X_LDFLAGS="-L$x_libraries"
+-fi
+-all_includes="$X_INCLUDES"
+-all_libraries="$X_LDFLAGS"
+-
+-# Check for libraries that X11R6 Xt/Xaw programs need.
+-ac_save_LDFLAGS="$LDFLAGS"
+-LDFLAGS="$LDFLAGS $X_LDFLAGS"
+-# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+-# check for ICE first), but we must link in the order -lSM -lICE or
+-# we get undefined symbols.  So assume we have SM if we have ICE.
+-# These have to be linked with before -lX11, unlike the other
+-# libraries we check for below, so use a different variable.
+-#  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
+-echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char IceConnectionNumber ();
+-int
+-main ()
+-{
+-IceConnectionNumber ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_ICE_IceConnectionNumber=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_ICE_IceConnectionNumber=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+-  LIBSM="-lSM -lICE"
+-fi
+-
+-LDFLAGS="$ac_save_LDFLAGS"
+-
+-LIB_X11='-lX11 $(LIBSOCKET)'
+-
+-echo "$as_me:$LINENO: checking for libXext" >&5
+-echo $ECHO_N "checking for libXext... $ECHO_C" >&6
+-if test "${kde_cv_have_libXext+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-kde_ldflags_safe="$LDFLAGS"
+-kde_libs_safe="$LIBS"
+-
+-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
+-LIBS="-lXext -lX11 $LIBSOCKET"
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include 
+-#ifdef STDC_HEADERS
+-# include 
+-#endif
+-
+-int
+-main ()
+-{
+-
+-printf("hello Xext\n");
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  kde_cv_have_libXext=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-kde_cv_have_libXext=no
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-
+-LDFLAGS=$kde_ldflags_safe
+-LIBS=$kde_libs_safe
+-
+-fi
+-
+-
+-echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
+-echo "${ECHO_T}$kde_cv_have_libXext" >&6
+-
+-if test "$kde_cv_have_libXext" = "no"; then
+-  { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
+-can't find it itself, we stop here assuming that make wouldn't find
+-them either." >&5
+-echo "$as_me: error: We need a working libXext to proceed. Since configure
+-can't find it itself, we stop here assuming that make wouldn't find
+-them either." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+-LIB_XEXT="-lXext"
+-QTE_NORTTI=""
+-
+-elif test "$kde_use_qt_emb" = "yes"; then
+-    CPPFLAGS=-DQWS
+-  CXXFLAGS="$CXXFLAGS -fno-rtti"
+-  QTE_NORTTI="-fno-rtti -DQWS"
+-  X_PRE_LIBS=""
+-  LIB_X11=""
+-  LIB_XEXT=""
+-  LIB_XRENDER=""
+-  LIBSM=""
+-  X_INCLUDES=""
+-  X_LDFLAGS=""
+-  x_includes=""
+-  x_libraries=""
+-elif test "$kde_use_qt_mac" = "yes"; then
+-      CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
+-  CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
+-  X_PRE_LIBS=""
+-  LIB_X11=""
+-  LIB_XEXT=""
+-  LIB_XRENDER=""
+-  LIBSM=""
+-  X_INCLUDES=""
+-  X_LDFLAGS=""
+-  x_includes=""
+-  x_libraries=""
+-fi
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ 
+ 
+   LIBPTHREAD=""



From fedora-extras-commits at redhat.com  Tue Dec 13 22:30:53 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Tue, 13 Dec 2005 17:30:53 -0500
Subject: CVSROOT avail,1.18,1.19
Message-ID: <200512132231.jBDMVNij003438@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3416

Modified Files:
	avail 
Log Message:
let gdk fix his mess :)


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- avail	7 Dec 2005 18:03:02 -0000	1.18
+++ avail	13 Dec 2005 22:30:51 -0000	1.19
@@ -13,7 +13,7 @@
 # Lock down the CVSROOT directory so ACLs make sense
 unavail | | CVSROOT
 # Access to all files to policy setters
-avail | notting,sopwith,wtogami,katzj | CVSROOT
+avail | notting,sopwith,wtogami,katzj,gdk | CVSROOT
 # trusted developers that can add modules
 avail | | CVSROOT/modules
 avail | kwade | CVSROOT/avail



From fedora-extras-commits at redhat.com  Tue Dec 13 22:34:01 2005
From: fedora-extras-commits at redhat.com (Robert Theisen (trobert))
Date: Tue, 13 Dec 2005 17:34:01 -0500
Subject: web/html/download mirrors.php,1.32,1.33
Message-ID: <200512132234.jBDMYVv0003478@cvs-int.fedora.redhat.com>

Author: trobert

Update of /cvs/fedora/web/html/download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3452

Modified Files:
	mirrors.php 
Log Message:
Updated link for mymirror.asiaosc.org



Index: mirrors.php
===================================================================
RCS file: /cvs/fedora/web/html/download/mirrors.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mirrors.php	13 Dec 2005 21:54:22 -0000	1.32
+++ mirrors.php	13 Dec 2005 22:33:59 -0000	1.33
@@ -546,7 +546,7 @@
 	
    • 
 	
  • Malaysia
 	
 	
    • 
 	
  • New Zealand



From fedora-extras-commits at redhat.com  Tue Dec 13 22:40:13 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 17:40:13 -0500
Subject: rpms/digikam/devel digikam.spec,1.6,1.7
Message-ID: <200512132240.jBDMehNZ003565@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3533

Modified Files:
	digikam.spec 
Log Message:
- Try to build for modular X.Org



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- digikam.spec	13 Dec 2005 15:50:43 -0000	1.6
+++ digikam.spec	13 Dec 2005 22:40:11 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -12,7 +12,7 @@
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	gettext autoconf
+BuildRequires:	gettext autoconf libXt-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -48,7 +48,8 @@
 
 %configure \
 	--disable-rpath \
-	--disable-debug
+	--disable-debug \
+	--with-extra-libs=%{_libdir}
 make %{?_smp_mflags}
 
 %install
@@ -119,6 +120,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Add new paths for modular X.Org
 



From fedora-extras-commits at redhat.com  Tue Dec 13 22:54:36 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 17:54:36 -0500
Subject: rpms/digikam/devel digikam.spec, 1.7,
	1.8 digikam-0.8.0-modular-X.patch, 1.1, NONE
Message-ID: <200512132255.jBDMt6G4003644@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3626

Modified Files:
	digikam.spec 
Removed Files:
	digikam-0.8.0-modular-X.patch 
Log Message:
- Last chance to make it right (modular X.Org)



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- digikam.spec	13 Dec 2005 22:40:11 -0000	1.7
+++ digikam.spec	13 Dec 2005 22:54:34 -0000	1.8
@@ -1,18 +1,17 @@
 Name:		digikam
 Version:	0.8.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		digikam-0.8.0-modular-X.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	gettext autoconf libXt-devel
+BuildRequires:	libXt-devel libtiff-devel gettext
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -48,8 +47,7 @@
 
 %configure \
 	--disable-rpath \
-	--disable-debug \
-	--with-extra-libs=%{_libdir}
+	--disable-debug
 make %{?_smp_mflags}
 
 %install
@@ -120,6 +118,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Try to build for modular X.Org
 


--- digikam-0.8.0-modular-X.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 13 22:56:57 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 17:56:57 -0500
Subject: rpms/digikam/devel digikam.spec,1.8,1.9
Message-ID: <200512132257.jBDMvR9i003721@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3687

Modified Files:
	digikam.spec 
Log Message:
- Too fast, remove %patch macro



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- digikam.spec	13 Dec 2005 22:54:34 -0000	1.8
+++ digikam.spec	13 Dec 2005 22:56:54 -0000	1.9
@@ -37,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh



From fedora-extras-commits at redhat.com  Tue Dec 13 22:58:53 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 17:58:53 -0500
Subject: rpms/digikam/devel digikam.spec,1.9,1.10
Message-ID: <200512132259.jBDMxNeS003795@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3770

Modified Files:
	digikam.spec 
Log Message:
- Remove patch



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- digikam.spec	13 Dec 2005 22:56:54 -0000	1.9
+++ digikam.spec	13 Dec 2005 22:58:51 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -117,6 +117,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Dec 13 2005 Marcin Garski  0.8.0-6
+- Remove patch
+
 * Tue Dec 13 2005 Marcin Garski  0.8.0-5
 - Last chance to make it right (modular X.Org)
 



From fedora-extras-commits at redhat.com  Tue Dec 13 23:09:15 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 13 Dec 2005 18:09:15 -0500
Subject: rpms/kdesvn/devel kdesvn.spec,1.5,1.6
Message-ID: <200512132309.jBDN9kP9005521@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5503

Modified Files:
	kdesvn.spec 
Log Message:
Add apr-devel BuildRequires



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdesvn.spec	12 Dec 2005 18:56:16 -0000	1.5
+++ kdesvn.spec	13 Dec 2005 23:09:12 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           kdesvn
 Version:        0.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A subversion client for KDE
 
 Group:          Development/Tools
@@ -12,7 +12,7 @@
 Patch0:         kdesvn-0.7.1-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  subversion-devel, kdelibs-devel, neon-devel
+BuildRequires:  subversion-devel, kdelibs-devel, neon-devel, apr-devel
 BuildRequires:  desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Tue Dec 13 2005 - Orion Poplawski  - 0.7.1-2
+- Add apr-devel BuildRequires
+
 * Fri Dec  9 2005 - Orion Poplawski  - 0.7.1-1
 - New upstream version 0.7.1
 



From fedora-extras-commits at redhat.com  Tue Dec 13 23:15:19 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 18:15:19 -0500
Subject: rpms/digikam/devel digikam.spec,1.10,1.11
Message-ID: <200512132315.jBDNFnih005699@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5643

Modified Files:
	digikam.spec 
Log Message:
- Remove autoreconf



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- digikam.spec	13 Dec 2005 22:58:51 -0000	1.10
+++ digikam.spec	13 Dec 2005 23:15:17 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -42,8 +42,6 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
-autoreconf
-
 %configure \
 	--disable-rpath \
 	--disable-debug
@@ -117,6 +115,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Dec 13 2005 Marcin Garski  0.8.0-7
+- Remove autoreconf
+
 * Tue Dec 13 2005 Marcin Garski  0.8.0-6
 - Remove patch
 



From fedora-extras-commits at redhat.com  Tue Dec 13 23:16:08 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:16:08 -0500
Subject: rpms/synce-trayicon - New directory
Message-ID: <200512132316.jBDNG8W6005757@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5745/synce-trayicon

Log Message:
Directory /cvs/extras/rpms/synce-trayicon added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 23:16:13 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:16:13 -0500
Subject: rpms/synce-trayicon/devel - New directory
Message-ID: <200512132316.jBDNGDvj005777@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5745/synce-trayicon/devel

Log Message:
Directory /cvs/extras/rpms/synce-trayicon/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 13 23:16:40 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:16:40 -0500
Subject: rpms/synce-trayicon Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512132316.jBDNGeB9005814@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5801

Added Files:
	Makefile import.log 
Log Message:
Setup of module synce-trayicon


--- NEW FILE Makefile ---
# Top level Makefile for module synce-trayicon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 13 23:16:45 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:16:45 -0500
Subject: rpms/synce-trayicon/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512132316.jBDNGjFd005835@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5801/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module synce-trayicon


--- NEW 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 Dec 13 23:17:48 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:17:48 -0500
Subject: rpms/synce-trayicon import.log,1.1,1.2
Message-ID: <200512132318.jBDNIIaa005931@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5874

Modified Files:
	import.log 
Log Message:
auto-import synce-trayicon-0.9.0-3 on branch devel from synce-trayicon-0.9.0-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/synce-trayicon/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Dec 2005 23:16:38 -0000	1.1
+++ import.log	13 Dec 2005 23:17:46 -0000	1.2
@@ -0,0 +1 @@
+synce-trayicon-0_9_0-3:HEAD:synce-trayicon-0.9.0-3.src.rpm:1134515854



From fedora-extras-commits at redhat.com  Tue Dec 13 23:17:53 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:17:53 -0500
Subject: rpms/synce-trayicon/devel synce-trayicon.desktop, NONE,
	1.1 synce-trayicon.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512132318.jBDNIOmo005943@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5874/devel

Modified Files:
	.cvsignore sources 
Added Files:
	synce-trayicon.desktop synce-trayicon.spec 
Log Message:
auto-import synce-trayicon-0.9.0-3 on branch devel from synce-trayicon-0.9.0-3.src.rpm


--- NEW FILE synce-trayicon.desktop ---
[Desktop Entry]
Name=synce-trayicon
Comment=Showing synce device information in the system tray
Exec=synce-trayicon
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE synce-trayicon.spec ---
Name:           synce-trayicon
Version:        0.9.0
Release:        3
Summary:        Tray icon for use with gnome and synce

Group:          Applications/Communications
License:        GPL
URL:            http://synce.sourceforge.net/
Source0:        http://dl.sf.net/synce/synce-trayicon-0.9.0.tar.gz
Source1:        synce-trayicon.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  synce-devel
BuildRequires:  libgnomeui-devel
BuildRequires:  libgtop2-devel
BuildRequires:  libxml2-devel
BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils

%description
%{summary}

%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
#make install DESTDIR=$RPM_BUILD_ROOT
%makeinstall
%find_lang synce-trayicon

desktop-file-install \
  --vendor=fedora \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category=X-Fedora \
  %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f synce-trayicon.lang
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/synce-trayicon
%{_datadir}/synce/synce_trayicon_properties.glade
%{_datadir}/pixmaps/synce/*.png
%{_datadir}/applications/*

%changelog
* Tue Dec 13 2005 Andreas Bierfert 
0.9.0-3
- add desktop file

* Mon Dec 12 2005 Andreas Bierfert 
0.9.0-2
- fix BR

* Tue Aug 23 2005 Andreas Bierfert 
0.9.0-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synce-trayicon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Dec 2005 23:16:43 -0000	1.1
+++ .cvsignore	13 Dec 2005 23:17:51 -0000	1.2
@@ -0,0 +1 @@
+synce-trayicon-0.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synce-trayicon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Dec 2005 23:16:43 -0000	1.1
+++ sources	13 Dec 2005 23:17:51 -0000	1.2
@@ -0,0 +1 @@
+b639e3f681d01d69e6a1c703ab4fc8e8  synce-trayicon-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 13 23:18:16 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 13 Dec 2005 18:18:16 -0500
Subject: rpms/kdesvn/devel kdesvn.spec,1.6,1.7
Message-ID: <200512132318.jBDNIkVi005972@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5914

Modified Files:
	kdesvn.spec 
Log Message:
Make that apr-util-devel!



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdesvn.spec	13 Dec 2005 23:09:12 -0000	1.6
+++ kdesvn.spec	13 Dec 2005 23:18:14 -0000	1.7
@@ -12,7 +12,7 @@
 Patch0:         kdesvn-0.7.1-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  subversion-devel, kdelibs-devel, neon-devel, apr-devel
+BuildRequires:  subversion-devel, kdelibs-devel, neon-devel, apr-util-devel
 BuildRequires:  desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -97,7 +97,7 @@
 
 %changelog
 * Tue Dec 13 2005 - Orion Poplawski  - 0.7.1-2
-- Add apr-devel BuildRequires
+- Add apr-util-devel BuildRequires
 
 * Fri Dec  9 2005 - Orion Poplawski  - 0.7.1-1
 - New upstream version 0.7.1



From fedora-extras-commits at redhat.com  Tue Dec 13 23:21:21 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:21:21 -0500
Subject: rpms/synce-trayicon/devel synce-trayicon.desktop, 1.1,
	1.2 synce-trayicon.spec, 1.1, 1.2
Message-ID: <200512132321.jBDNLqtL006044@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6014

Modified Files:
	synce-trayicon.desktop synce-trayicon.spec 
Log Message:
- add dist
- tune desktop file



Index: synce-trayicon.desktop
===================================================================
RCS file: /cvs/extras/rpms/synce-trayicon/devel/synce-trayicon.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synce-trayicon.desktop	13 Dec 2005 23:17:51 -0000	1.1
+++ synce-trayicon.desktop	13 Dec 2005 23:21:19 -0000	1.2
@@ -1,5 +1,7 @@
 [Desktop Entry]
 Name=synce-trayicon
+GenericName=Tray icon for SynCE devices
+Icon=synce/synce-color-small.png
 Comment=Showing synce device information in the system tray
 Exec=synce-trayicon
 Terminal=false


Index: synce-trayicon.spec
===================================================================
RCS file: /cvs/extras/rpms/synce-trayicon/devel/synce-trayicon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synce-trayicon.spec	13 Dec 2005 23:17:51 -0000	1.1
+++ synce-trayicon.spec	13 Dec 2005 23:21:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           synce-trayicon
 Version:        0.9.0
-Release:        3
+Release:        4%{?dist}
 Summary:        Tray icon for use with gnome and synce
 
 Group:          Applications/Communications
@@ -53,6 +53,11 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Dec 14 2005 Andreas Bierfert 
+0.9.0-4
+- add dist
+- fix desktop file
+
 * Tue Dec 13 2005 Andreas Bierfert 
 0.9.0-3
 - add desktop file



From fedora-extras-commits at redhat.com  Tue Dec 13 23:28:16 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 18:28:16 -0500
Subject: rpms/krusader/devel krusader.spec,1.4,1.5
Message-ID: <200512132328.jBDNSk1m006126@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/krusader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6108

Modified Files:
	krusader.spec 
Log Message:
- Fix for modular X.Org



Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- krusader.spec	12 Dec 2005 20:56:23 -0000	1.4
+++ krusader.spec	13 Dec 2005 23:28:14 -0000	1.5
@@ -15,7 +15,7 @@
 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:	libXt-devel gettext
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -103,6 +103,9 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Tue Dec 13 23:29:34 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 18:29:34 -0500
Subject: rpms/krusader/devel krusader.spec,1.5,1.6
Message-ID: <200512132330.jBDNU5WN006181@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/krusader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6132

Modified Files:
	krusader.spec 
Log Message:
- Typo



Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- krusader.spec	13 Dec 2005 23:28:14 -0000	1.5
+++ krusader.spec	13 Dec 2005 23:29:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		krusader
 Version:	1.60.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File



From fedora-extras-commits at redhat.com  Tue Dec 13 23:31:36 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 13 Dec 2005 18:31:36 -0500
Subject: owners owners.list,1.447,1.448
Message-ID: <200512132332.jBDNW6oL006261@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6243

Modified Files:
	owners.list 
Log Message:
- add libopensync
- add libopensync-plugin-evolution2
- add libopensync-plugin-file
- add libopensync-plugin-palm
- add libopensync-plugin-python
- add synce-gnomevfs
- add synce-software-manager
- add synce-trayicon



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- owners.list	13 Dec 2005 20:51:28 -0000	1.447
+++ owners.list	13 Dec 2005 23:31:34 -0000	1.448
@@ -505,6 +505,11 @@
 Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|liboil|Library of Optimized Inner Loops, CPU optimized functions|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|libol|Support library for syslog-ng|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
+Fedora Extras|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-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|
 Fedora Extras|libosip|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libotr|Off-The-Record Messaging library and toolkit|paul at xtdnet.nl|extras-qa at fedoraproject.org|
@@ -1114,6 +1119,9 @@
 Fedora Extras|sylpheed|GTK+ based, lightweight, and fast email client|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|synaptic|Graphical frontend for APT package manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|synce|For bugs related to the synce component|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|synce-gnomevfs|Gnome-vfs module for synce|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|synce-software-manager|Software manager for use with synce|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|synce-trayicon|Tray icon for use with gnome and synce|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|synergy|Mouse and keyboard sharing utility|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|system-config-control|Centralized tool for Fedora configuration utilities|ankit644 at yahoo.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 13 23:47:59 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 18:47:59 -0500
Subject: rpms/krusader/devel krusader.spec,1.6,1.7
Message-ID: <200512132348.jBDNmTm6006335@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/krusader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6317

Modified Files:
	krusader.spec 
Log Message:
- Add to BR libacl-devel



Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- krusader.spec	13 Dec 2005 23:29:32 -0000	1.6
+++ krusader.spec	13 Dec 2005 23:47:57 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		krusader
 Version:	1.60.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -14,8 +14,8 @@
 
 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:	libXt-devel gettext
+BuildRequires:	libXt-devel libpng-devel libselinux-devel libacl-devel
+BuildRequires:	automake desktop-file-utils gettext
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -103,6 +103,9 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Tue Dec 13 23:57:27 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 18:57:27 -0500
Subject: rpms/digikam/devel digikam-0.8.0-gcc41.patch, NONE, 1.1 digikam.spec,
	1.11, 1.12
Message-ID: <200512132357.jBDNvvj8006447@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6422

Modified Files:
	digikam.spec 
Added Files:
	digikam-0.8.0-gcc41.patch 
Log Message:
- Fix compile on GCC 4.1


digikam-0.8.0-gcc41.patch:

--- NEW FILE digikam-0.8.0-gcc41.patch ---
diff -urN digikam-0.8.0-orig/digikam/digikam/albumdb.h digikam-0.8.0/digikam/digikam/albumdb.h
--- digikam-0.8.0-orig/digikam/digikam/albumdb.h	2005-11-21 20:14:05.000000000 +0100
+++ digikam-0.8.0/digikam/digikam/albumdb.h	2005-12-14 00:52:52.000000000 +0100
@@ -436,7 +436,7 @@
      * @param albumID the id of the albumdb
      * @return the url of the albumdb
      */
-    QString AlbumDB::getAlbumURL(int albumID);
+    QString getAlbumURL(int albumID);
 
     /**
      * Returns the average date of all images for that album.


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- digikam.spec	13 Dec 2005 23:15:17 -0000	1.11
+++ digikam.spec	13 Dec 2005 23:57:25 -0000	1.12
@@ -1,12 +1,13 @@
 Name:		digikam
 Version:	0.8.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		digikam-0.8.0-gcc41.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
@@ -37,6 +38,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -115,6 +117,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Remove autoreconf
 



From fedora-extras-commits at redhat.com  Wed Dec 14 00:16:33 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 19:16:33 -0500
Subject: rpms/digikam/devel digikam.spec,1.12,1.13
Message-ID: <200512140017.jBE0H3kd008247@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8229

Modified Files:
	digikam.spec 
Log Message:
- Add libidn-devel to BR



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- digikam.spec	13 Dec 2005 23:57:25 -0000	1.12
+++ digikam.spec	14 Dec 2005 00:16:31 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -12,7 +12,7 @@
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	libXt-devel libtiff-devel gettext
+BuildRequires:	libXt-devel libtiff-devel libidn-devel gettext
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -117,6 +117,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Fix compile on GCC 4.1
 



From fedora-extras-commits at redhat.com  Wed Dec 14 00:28:54 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 19:28:54 -0500
Subject: rpms/digikam/devel digikam.spec,1.13,1.14
Message-ID: <200512140029.jBE0TTd1008346@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8328

Modified Files:
	digikam.spec 
Log Message:
- Add libacl-devel to BR



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- digikam.spec	14 Dec 2005 00:16:31 -0000	1.13
+++ digikam.spec	14 Dec 2005 00:28:52 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -12,7 +12,7 @@
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	libXt-devel libtiff-devel libidn-devel gettext
+BuildRequires:	libXt-devel libtiff-devel libidn-devel libacl-devel gettext
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -117,6 +117,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Add libidn-devel to BR
 



From fedora-extras-commits at redhat.com  Wed Dec 14 00:47:46 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 13 Dec 2005 19:47:46 -0500
Subject: rpms/digikam/devel digikam.spec,1.14,1.15
Message-ID: <200512140048.jBE0mGtQ008421@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8403

Modified Files:
	digikam.spec 
Log Message:
- Add libart_lgpl-devel and gamin-devel to BR



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- digikam.spec	14 Dec 2005 00:28:52 -0000	1.14
+++ digikam.spec	14 Dec 2005 00:47:43 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -13,6 +13,7 @@
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
 BuildRequires:	libXt-devel libtiff-devel libidn-devel libacl-devel gettext
+BuildRequires:	libart_lgpl-devel gamin-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -117,6 +118,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* 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
 - Add libacl-devel to BR
 



From fedora-extras-commits at redhat.com  Wed Dec 14 02:37:50 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 13 Dec 2005 21:37:50 -0500
Subject: rpms/nmh/FC-3 nmh-1.1-context_read.patch, NONE, 1.1 nmh.spec, 1.10,
	1.11
Message-ID: <200512140238.jBE2cLvE012159@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/extras/rpms/nmh/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12100/FC-3

Modified Files:
	nmh.spec 
Added Files:
	nmh-1.1-context_read.patch 
Log Message:
Add a patch to prevent multiple reads to read_context from squashing
mhn.defaults settings.


nmh-1.1-context_read.patch:

--- NEW FILE nmh-1.1-context_read.patch ---
diff -urNp nmh-orig/sbr/context_read.c nmh/sbr/context_read.c
--- nmh-orig/sbr/context_read.c	2005-12-13 21:13:07.000000000 -0500
+++ nmh/sbr/context_read.c	2005-12-13 21:13:54.000000000 -0500
@@ -39,6 +39,13 @@ context_read (void)
     register	FILE		*ib;		/* profile and context file pointer */
 
     /*
+     *  If this routine _is_ called again (despite the wanings in the
+     *  comments above), return immediately.
+     */
+    if ( m_defs != 0 )
+        return;
+
+    /*
      *	Find user's home directory.  Try the HOME environment variable first,
      *	the home directory field in the password file if that's not found.
      */


Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/FC-3/nmh.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nmh.spec	13 Dec 2005 13:43:01 -0000	1.10
+++ nmh.spec	14 Dec 2005 02:37:48 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        13.fc3
+Release:        14.fc3
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Patch1:         nmh-1.1-lock_file.patch
 Patch2:         nmh-1.1-empty-content-type.patch
 Patch3:         nmh-1.1-annotate.patch
+Patch4:         nmh-1.1-context_read.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
@@ -34,6 +35,7 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -68,6 +70,10 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Tue Dec 13 2005 Josh Bressers  0:1.1-14.fc3
+- Add a patch to prevent multiple calls to context_read from squashing
+  settings.
+
 * Tue Dec 13 2005 Josh Bressers  0:1.1-13.fc3
 - Add a patch to allow repl to properly annotate messages.
 



From fedora-extras-commits at redhat.com  Wed Dec 14 02:37:56 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 13 Dec 2005 21:37:56 -0500
Subject: rpms/nmh/FC-4 nmh-1.1-context_read.patch, NONE, 1.1 nmh.spec, 1.10,
	1.11
Message-ID: <200512140238.jBE2cRYi012162@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/extras/rpms/nmh/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12100/FC-4

Modified Files:
	nmh.spec 
Added Files:
	nmh-1.1-context_read.patch 
Log Message:
Add a patch to prevent multiple reads to read_context from squashing
mhn.defaults settings.


nmh-1.1-context_read.patch:

--- NEW FILE nmh-1.1-context_read.patch ---
diff -urNp nmh-orig/sbr/context_read.c nmh/sbr/context_read.c
--- nmh-orig/sbr/context_read.c	2005-12-13 21:13:07.000000000 -0500
+++ nmh/sbr/context_read.c	2005-12-13 21:13:54.000000000 -0500
@@ -39,6 +39,13 @@ context_read (void)
     register	FILE		*ib;		/* profile and context file pointer */
 
     /*
+     *  If this routine _is_ called again (despite the wanings in the
+     *  comments above), return immediately.
+     */
+    if ( m_defs != 0 )
+        return;
+
+    /*
      *	Find user's home directory.  Try the HOME environment variable first,
      *	the home directory field in the password file if that's not found.
      */


Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/FC-4/nmh.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nmh.spec	13 Dec 2005 04:00:18 -0000	1.10
+++ nmh.spec	14 Dec 2005 02:37:54 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        13.fc4
+Release:        14.fc4
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Patch1:         nmh-1.1-lock_file.patch
 Patch2:         nmh-1.1-empty-content-type.patch
 Patch3:         nmh-1.1-annotate.patch
+Patch4:         nmh-1.1-context_read.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
@@ -34,6 +35,7 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -68,6 +70,10 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Tue Dec 13 2005 Josh Bressers  0:1.1-14.fc4
+- Add a patch to prevent multiple calls to context_read from squashing
+  settings.
+
 * Mon Dec 12 2005 Josh Bressers  0:1.1-13.fc4
 - Add a patch to allow repl to properly annotate messages.
 



From fedora-extras-commits at redhat.com  Wed Dec 14 02:38:02 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 13 Dec 2005 21:38:02 -0500
Subject: rpms/nmh/devel nmh-1.1-context_read.patch, NONE, 1.1 nmh.spec, 1.10,
	1.11
Message-ID: <200512140238.jBE2cWnb012165@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/extras/rpms/nmh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12100/devel

Modified Files:
	nmh.spec 
Added Files:
	nmh-1.1-context_read.patch 
Log Message:
Add a patch to prevent multiple reads to read_context from squashing
mhn.defaults settings.


nmh-1.1-context_read.patch:

--- NEW FILE nmh-1.1-context_read.patch ---
diff -urNp nmh-orig/sbr/context_read.c nmh/sbr/context_read.c
--- nmh-orig/sbr/context_read.c	2005-12-13 21:13:07.000000000 -0500
+++ nmh/sbr/context_read.c	2005-12-13 21:13:54.000000000 -0500
@@ -39,6 +39,13 @@ context_read (void)
     register	FILE		*ib;		/* profile and context file pointer */
 
     /*
+     *  If this routine _is_ called again (despite the wanings in the
+     *  comments above), return immediately.
+     */
+    if ( m_defs != 0 )
+        return;
+
+    /*
      *	Find user's home directory.  Try the HOME environment variable first,
      *	the home directory field in the password file if that's not found.
      */


Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/devel/nmh.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nmh.spec	13 Dec 2005 04:00:24 -0000	1.10
+++ nmh.spec	14 Dec 2005 02:38:00 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        13.fc5
+Release:        14.fc5
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Patch1:         nmh-1.1-lock_file.patch
 Patch2:         nmh-1.1-empty-content-type.patch
 Patch3:         nmh-1.1-annotate.patch
+Patch4:         nmh-1.1-context_read.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    libtermcap-devel
 BuildRequires:  db4-devel
@@ -34,6 +35,7 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -68,6 +70,10 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Tue Dec 13 2005 Josh Bressers  0:1.1-14.fc5
+- Add a patch to prevent multiple calls to context_read from squashing
+  settings.
+
 * Mon Dec 12 2005 Josh Bressers  0:1.1-13.fc5
 - Add a patch to allow repl to properly annotate messages.
 



From fedora-extras-commits at redhat.com  Wed Dec 14 03:37:14 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 13 Dec 2005 22:37:14 -0500
Subject: rpms/munin - New directory
Message-ID: <200512140337.jBE3bEBV015190@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15181/munin

Log Message:
Directory /cvs/extras/rpms/munin added to the repository




From fedora-extras-commits at redhat.com  Wed Dec 14 03:37:20 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 13 Dec 2005 22:37:20 -0500
Subject: rpms/munin/devel - New directory
Message-ID: <200512140337.jBE3bK9Q015206@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15181/munin/devel

Log Message:
Directory /cvs/extras/rpms/munin/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Dec 14 03:37:31 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 13 Dec 2005 22:37:31 -0500
Subject: rpms/munin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512140337.jBE3bVOQ015241@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15228

Added Files:
	Makefile import.log 
Log Message:
Setup of module munin


--- NEW FILE Makefile ---
# Top level Makefile for module munin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 14 03:37:37 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 13 Dec 2005 22:37:37 -0500
Subject: rpms/munin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512140337.jBE3bbes015262@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15228/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module munin


--- NEW 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 Dec 14 03:38:01 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 13 Dec 2005 22:38:01 -0500
Subject: rpms/munin import.log,1.1,1.2
Message-ID: <200512140338.jBE3cVi5015333@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15296

Modified Files:
	import.log 
Log Message:
auto-import munin-1.2.4-2.fc5 on branch devel from munin-1.2.4-2.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/munin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Dec 2005 03:37:29 -0000	1.1
+++ import.log	14 Dec 2005 03:37:59 -0000	1.2
@@ -0,0 +1 @@
+munin-1_2_4-2_fc5:HEAD:munin-1.2.4-2.fc5.src.rpm:1134531472



From fedora-extras-commits at redhat.com  Wed Dec 14 03:38:06 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 13 Dec 2005 22:38:06 -0500
Subject: rpms/munin/devel munin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200512140338.jBE3c6O9015326@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15296/devel

Modified Files:
	.cvsignore sources 
Added Files:
	munin.spec 
Log Message:
auto-import munin-1.2.4-2.fc5 on branch devel from munin-1.2.4-2.fc5.src.rpm


--- NEW FILE munin.spec ---
Name:      munin
Version:   1.2.4
Release:   2%{?dist}
Summary:   Network-wide graphing framework (grapher/gatherer)
License:   GPL
Group:     System Environment/Daemons
URL:       http://munin.projects.linpro.no/

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
BuildArchitectures: noarch
Provides: perl(RRDs)
Requires: perl-HTML-Template
Requires: perl-Net-Server
Requires: rrdtool
Requires: logrotate
Requires(pre):		fedora-usermgmt >= 0.7
Requires(postun):	fedora-usermgmt >= 0.7

%description
Munin is a highly flexible and powerful solution used to create graphs of
virtually everything imaginable throughout your network, while still
maintaining a rattling ease of installation and configuration.

This package contains the grapher/gatherer. You will only need one instance of
it in your network. It will periodically poll all the nodes in your network
it's aware of for data, which it in turn will use to create graphs and HTML
pages, suitable for viewing with your graphical web browser of choice.

Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent
RRDtool. 

%package node
Group: System Environment/Daemons
Summary: Network-wide graphing framework (node)
BuildArchitectures: noarch
Requires: perl-Net-Server
Requires: procps >= 2.0.7
Requires: sysstat
Requires(pre):		fedora-usermgmt >= 0.7
Requires(postun):	fedora-usermgmt >= 0.7
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service

%description node
Munin is a highly flexible and powerful solution used to create graphs of
virtually everything imaginable throughout your network, while still
maintaining a rattling ease of installation and configuration.

This package contains node software. You should install it on all the nodes
in your network. It will know how to extract all sorts of data from the
node it runs on, and will wait for the gatherer to request this data for
further processing.

It includes a range of plugins capable of extracting common values such as
cpu usage, network usage, load average, and so on. Creating your own plugins
which are capable of extracting other system-specific values is very easy,
and is often done in a matter of minutes. You can also create plugins which
relay information from other devices in your network that can't run Munin,
such as a switch or a server running another operating system, by using
SNMP or similar technology.

Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent
RRDtool. 

%prep
%setup -q
rm -rf %{buildroot}
mkdir -p %{buildroot}

%build

# htmldoc and html2text are not available for Red Hat. Quick hack with perl:
# Skip the PDFs.
perl -pi -e 's,htmldoc munin,cat munin, or s,html(2text|doc),# $&,' Makefile
perl -pi -e 's,\$\(INSTALL.+\.(pdf|txt) \$\(DOCDIR,# $&,' Makefile
make 	CONFIG=dists/redhat/Makefile.config build

%install

## Node
make 	CONFIG=dists/redhat/Makefile.config \
	DOCDIR=%{buildroot}%{_docdir}/%{name}-%{version} \
	MANDIR=%{buildroot}%{_mandir} \
	DESTDIR=%{buildroot} \
    	install-main install-node-non-snmp install-node-plugins install-doc install-man

mkdir -p %{buildroot}/etc/rc.d/init.d
mkdir -p %{buildroot}/etc/munin/plugins
mkdir -p %{buildroot}/etc/munin/plugin-conf.d
mkdir -p %{buildroot}/etc/logrotate.d
mkdir -p %{buildroot}/var/lib/munin
mkdir -p %{buildroot}/var/log/munin

# 
# don't enable munin-node by default. 
#
cat dists/redhat/munin-node.rc | sed -e 's/2345/\-/' > %{buildroot}/etc/rc.d/init.d/munin-node
chmod 755 %{buildroot}/etc/rc.d/init.d/munin-node

install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/
install -m0644 dists/tarball/plugins.conf %{buildroot}/etc/munin/plugin-conf.d/munin-node
install -m0644 dists/debian/munin.logrotate %{buildroot}/etc/logrotate.d/munin
install -m0644 dists/debian/munin-node.logrotate %{buildroot}/etc/logrotate.d/munin-node

# 
# remove the Net::SNMP and Sybase plugins for now, as they need perl modules 
# that are not in extras. We can readd them when/if those modules are added. 
#
rm -f %{buildroot}/usr/share/munin/plugins/pm3users_
rm -f %{buildroot}/usr/share/munin/plugins/snmp_*
rm -f %{buildroot}/usr/share/munin/plugins/sybase_space

## Server
make 	CONFIG=dists/redhat/Makefile.config \
	DESTDIR=%{buildroot} \
	install-main

mkdir -p %{buildroot}/var/www/html/munin
mkdir -p %{buildroot}/var/log/munin
mkdir -p %{buildroot}/etc/cron.d

install -m 0644 dists/redhat/munin.cron.d %{buildroot}/etc/cron.d/munin
install -m 0644 server/style.css %{buildroot}/var/www/html/munin
install -m 0644 ChangeLog %{buildroot}%{_docdir}/%{name}-%{version}/ChangeLog

%clean
rm -rf $RPM_BUILD_ROOT

#
# node package scripts
# uid 18 is the next uid in http://fedoraproject.org/wiki/PackageUserRegistry
#
%pre node
/usr/sbin/fedora-groupadd 18 -r munin &>/dev/null || :
/usr/sbin/fedora-useradd 18 -r -s /sbin/nologin -d /var/lib/munin -M \
                            -c 'Munin user' -g munin munin &>/dev/null || :

%post node
/sbin/chkconfig --add munin-node
/usr/sbin/munin-node-configure --shell | sh

%preun node
test "$1" != 0 || %{_initrddir}/munin-node stop &>/dev/null || :
test "$1" != 0 || /sbin/chkconfig --del munin-node

%postun node
test "$1" != 0 || /usr/sbin/fedora-userdel munin &>/dev/null || :
test "$1" != 0 || /usr/sbin/fedora-groupdel munin &>/dev/null || :

# 
# main package scripts
# uid 18 is the next uid in http://fedoraproject.org/wiki/PackageUserRegistry
#
%pre
/usr/sbin/fedora-groupadd 18 -r munin &>/dev/null || :
/usr/sbin/fedora-useradd 18 -r -s /sbin/nologin -d /var/lib/munin -M \
                            -c 'Munin user' -g munin munin &>/dev/null || :

%postun
test "$1" != 0 || /usr/sbin/fedora-userdel munin &>/dev/null || :
test "$1" != 0 || /usr/sbin/fedora-groupdel munin &>/dev/null || :
 
%files
%defattr(-, root, root)
%doc %{_docdir}/%{name}-%{version}/README.api
%doc %{_docdir}/%{name}-%{version}/README.plugins
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/ChangeLog
%doc %{_docdir}/%{name}-%{version}/README-apache-cgi
%{_bindir}/munin-cron
%{_datadir}/munin/munin-graph
%{_datadir}/munin/munin-html
%{_datadir}/munin/munin-limits
%{_datadir}/munin/munin-update
%{_libdir}/perl5/*perl/5.*/Munin.pm
/var/www/html/munin/cgi/munin-cgi-graph
%dir /etc/munin/templates
%dir /etc/munin
%config(noreplace) /etc/munin/templates/*
%config(noreplace) /etc/cron.d/munin
%config(noreplace) /etc/munin/munin.conf
%config(noreplace) /etc/logrotate.d/munin

%attr(-, munin, munin) %dir /var/lib/munin
%attr(-, munin, munin) %dir /var/run/munin
%attr(-, munin, munin) %dir /var/log/munin
%attr(-, munin, munin) %dir /var/www/html/munin
%attr(-, root, root) %dir /var/www/html/munin/cgi
%attr(-, root, root) /var/www/html/munin/style.css
%doc %{_mandir}/man8/munin-graph*
%doc %{_mandir}/man8/munin-update*
%doc %{_mandir}/man8/munin-limits*
%doc %{_mandir}/man8/munin-html*
%doc %{_mandir}/man8/munin-cron*
%doc %{_mandir}/man5/munin.conf*

%files node
%defattr(-, root, root)
%config(noreplace) /etc/munin/munin-node.conf
%config(noreplace) /etc/munin/plugin-conf.d/munin-node
%config(noreplace) /etc/logrotate.d/munin-node
/etc/rc.d/init.d/munin-node
%config(noreplace) /etc/munin/plugins.conf
%{_sbindir}/munin-run
%{_sbindir}/munin-node
%{_sbindir}/munin-node-configure
%dir /var/log/munin
%dir %{_datadir}/munin
%dir /etc/munin/plugins
%dir /etc/munin
%dir /var/lib/munin
%dir %attr(-, munin, munin) /var/lib/munin/plugin-state
%{_datadir}/munin/plugins/*
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/munin-doc.html
%doc %{_docdir}/%{name}-%{version}/munin-faq.html
%doc %{_mandir}/man8/munin-run*
%doc %{_mandir}/man8/munin-node*
%doc %{_mandir}/man5/munin-node*

%changelog
* Mon Dec 12 2005 Kevin Fenzi  - 1.2.4-2
- Removed plugins that require Net-SNMP and Sybase 

* Tue Dec  6 2005 Kevin Fenzi  - 1.2.4-1
- Inital cleanup for fedora-extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Dec 2005 03:37:34 -0000	1.1
+++ .cvsignore	14 Dec 2005 03:38:04 -0000	1.2
@@ -0,0 +1 @@
+munin_1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Dec 2005 03:37:34 -0000	1.1
+++ sources	14 Dec 2005 03:38:04 -0000	1.2
@@ -0,0 +1 @@
+f91f5d96c01d8527db1d2f4b3f0f4cc5  munin_1.2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 03:41:18 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 13 Dec 2005 22:41:18 -0500
Subject: owners owners.list,1.448,1.449
Message-ID: <200512140341.jBE3fmNb015398@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15378

Modified Files:
	owners.list 
Log Message:
add munin



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- owners.list	13 Dec 2005 23:31:34 -0000	1.448
+++ owners.list	14 Dec 2005 03:41:15 -0000	1.449
@@ -601,6 +601,7 @@
 Fedora Extras|moodss|Powerful modular monitoring graphical application|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Dec 14 07:59:10 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 14 Dec 2005 02:59:10 -0500
Subject: rpms/gnumeric/devel gnumeric.spec,1.12,1.13
Message-ID: <200512140759.jBE7xelR023077@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnumeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23052

Modified Files:
	gnumeric.spec 
Log Message:
Switch to core version of libgsf now Core has 1.13


Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnumeric.spec	30 Nov 2005 18:42:26 -0000	1.12
+++ gnumeric.spec	14 Dec 2005 07:59:08 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:        A spreadsheet program for GNOME.
 Name:     	gnumeric
 Version: 	1.6.1
-Release: 	1
+Release: 	2
 Epoch:		1
 License:	GPL
 Group:		Applications/Productivity
@@ -18,12 +18,12 @@
 BuildRequires:  libgnomeui-devel >= 2.4.0
 BuildRequires:  libgnomeprintui22-devel >= 2.8.2
 BuildRequires:  python-devel
-BuildRequires:  libgsf113-devel >= 1.13.2
+BuildRequires:  libgsf-devel >= 1.13.2
 BuildRequires:  automake autoconf libtool
 BuildRequires:  intltool scrollkeeper gettext
 BuildRequires:  libgnomedb-devel >= 1.0.4
 BuildRequires:  pygtk2-devel >= 2.6.0
-BuildRequires:  goffice-devel >= 0.1.2
+BuildRequires:  goffice-devel >= 0.1.2-3
 BuildRequires:  guile-devel
 Patch0: gnumeric-1.6.1-desktop.patch
 Patch1: gnumeric-1.4.1-excelcrash.patch
@@ -50,7 +50,6 @@
 %build
 libtoolize --force --copy && aclocal && autoconf
 export mllibname=%{_lib}
-export PKG_CONFIG_PATH=%{_libdir}/libgsf-1.13/lib/pkgconfig
 %configure --without-gb --enable-ssindex
 
 OLD_PO_FILE_INPUT=yes make
@@ -133,6 +132,10 @@
 %{_datadir}/gnumeric/%{version}/idl/*.idl
 
 %changelog
+* Thu Dec  8 2005 Hans de Goede  1:1.6.1-2
+- Switch to core version of libgsf now Core has 1.13 instead of using special
+  Extras libgsf113 version.
+
 * Sat Nov 26 2005 Hans de Goede  1:1.6.1-1
 - new upstream stable version 1.6.1
 - drop 2 integrated patches



From fedora-extras-commits at redhat.com  Wed Dec 14 09:30:43 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 14 Dec 2005 04:30:43 -0500
Subject: fedora-security/audit fc4,1.105,1.106 fc5,1.16,1.17
Message-ID: <200512140931.jBE9VE81027064@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27044

Modified Files:
	fc4 fc5 
Log Message:
Update for today



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- fc4	13 Dec 2005 21:52:44 -0000	1.105
+++ fc4	14 Dec 2005 09:30:41 -0000	1.106
@@ -1,12 +1,13 @@
-Up to date CVE as of CVE email 20051211
+Up to date CVE as of CVE email 20051213
 Up to date FC4 as of 20051211
 
 ** are items that need attention
 
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
-CVE-2005-4077 backport (curl) [since FEDORA-2005-1129]
+CVE-2005-4077 backport (curl) [since FEDORA-2005-1137]
 CVE-2005-3651 VULNERABLE (ethereal)
+CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)
 CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
@@ -216,7 +217,7 @@
 CVE-2005-2360 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655]
 CVE-2005-2353 ignore (thunderbird) debug mode only
 CVE-2005-2337 version (ruby, fixed 1.8.3) [since FEDORA-2005-936]
-CVE-2005-2335 backport (fetchmail) [since FEDORA-2005-613]
+CVE-2005-2335 version (fetchmail, fixed 6.2.5.2) [since FEDORA-2005-1108] was backport since FEDORA-2005-613
 CVE-2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 CVE-2005-2270 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fc5	13 Dec 2005 21:52:44 -0000	1.16
+++ fc5	14 Dec 2005 09:30:41 -0000	1.17
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20051211
+Up to date CVE as of CVE email 20051213
 Up to date FC5 as of FC5-Test1-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -16,6 +16,7 @@
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
 CVE-2005-4077 VULNERABLE (curl)
 CVE-2005-3651 VULNERABLE (ethereal)
+CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)
 CVE-2005-3193 VULNERABLE (tetex)
@@ -220,7 +221,7 @@
 CVE-2005-2360 version (ethereal, fixed 0.10.12)
 CVE-2005-2353 ignore (thunderbird) debug mode only
 CVE-2005-2337 version (ruby, fixed 1.8.3)
-CVE-2005-2335 version (fetchmail, fixed 6.2.5.1)
+CVE-2005-2335 version (fetchmail, fixed 6.2.5.2)
 CVE-2005-2270 version (firefox, fixed 1.0.5)
 CVE-2005-2270 version (mozilla, fixed 1.7.9)
 CVE-2005-2270 version (thunderbird, fixed 1.0.5)



From fedora-extras-commits at redhat.com  Wed Dec 14 09:44:53 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 14 Dec 2005 04:44:53 -0500
Subject: rpms/inkscape/FC-4 inkscape.spec, 1.13,
	1.14 inkscape-0.41-64bit.patch, 1.2, NONE inkscape-gcc4.patch,
	1.1, NONE
Message-ID: <200512140945.jBE9jNA3027122@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/inkscape/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27102

Modified Files:
	inkscape.spec 
Removed Files:
	inkscape-0.41-64bit.patch inkscape-gcc4.patch 
Log Message:
Update to 0.43. Removed unused patches.


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-4/inkscape.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- inkscape.spec	29 Jul 2005 13:51:35 -0000	1.13
+++ inkscape.spec	14 Dec 2005 09:44:50 -0000	1.14
@@ -1,13 +1,12 @@
 Name:           inkscape
-Version:        0.42
-Release:        2%{?dist}
+Version:        0.43
+Release:        1%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://inkscape.sourceforge.net/
 Source0:        http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2
-Patch0:         inkscape-0.42-gettext-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  atk-devel
@@ -18,6 +17,7 @@
 BuildRequires:  gtkmm24-devel
 BuildRequires:  libart_lgpl-devel >= 2.3.10
 BuildRequires:  libgnomeprintui22-devel >= 2.2.0
+BuildRequires:  libgnomeprint22-devel
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libsigc++20-devel
@@ -50,7 +50,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dgettext
 
 
 %build
@@ -59,9 +58,13 @@
 --with-xinerama                \
 --enable-static=no             \
 --with-python                  \
+--with-perl                    \
+--with-gnome-vfs               \
 --with-inkjar
-#temporarily disabled until I can look into it further
-#--with-gnome-print             \
+# turned off, seems very unstable at this point
+#--enable-inkboard             \
+# temporarily disabled until I can look into it further
+#--with-gnome-print            \
 
 make %{?_smp_mflags}
 
@@ -92,7 +95,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README HACKING
+%doc AUTHORS COPYING ChangeLog NEWS README
 %doc %{_mandir}/man1/*
 %{_bindir}/*
 %{_datadir}/%{name}/


--- inkscape-0.41-64bit.patch DELETED ---


--- inkscape-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 14 09:45:44 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 14 Dec 2005 04:45:44 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.25,1.26
Message-ID: <200512140946.jBE9kEe0027148@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27128

Modified Files:
	Inventor.spec 
Log Message:
- Remove BR: libXext-devel (Impl. R'd by openmotif-devel).
- Remove BR: xorg-x11-proto-devel (PR #175256).



Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Inventor.spec	8 Dec 2005 08:45:37 -0000	1.25
+++ Inventor.spec	14 Dec 2005 09:45:41 -0000	1.26
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        15%{?dist}
+Release:        16%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -43,9 +43,6 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  libGL-devel
 BuildRequires:	libGLw-devel
-BuildRequires:	libXext-devel
-# Work around to RH shipping libXext without headers
-BuildRequires:  xorg-x11-proto-devel
 # Work around to xorg-x11-proto-devel missing to require X11/Xauth.h
 BuildRequires:	libXau-devel
 # FIXME: Why is libXi required?
@@ -100,8 +97,6 @@
 Requires:	InventorXt = %{version}-%{release}
 Requires:	Inventor-devel = %{version}-%{release}
 Requires:	pkgconfig
-# PR 175256: Missing openmotif-devel dep
-Requires:	xorg-x11-proto-devel
 Requires:	openmotif-devel
 
 %description    -n InventorXt-devel
@@ -317,6 +312,10 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Wed Dec 14 2005 Ralf Corsepius  - 2.1.5-16
+- Remove BR: libXext-devel (Impl. R'd by openmotif-devel).
+- Remove BR: xorg-x11-proto-devel (PR #175256).
+
 * Thu Dec 8 2005 Ralf Corsepius  - 2.1.5-15
 - Further modular X fixes.
 - Reflect modular X pkgconfigs.



From fedora-extras-commits at redhat.com  Wed Dec 14 09:51:44 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 14 Dec 2005 04:51:44 -0500
Subject: rpms/gdesklets import.log,1.2,1.3
Message-ID: <200512140952.jBE9qEtI027242@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27207

Modified Files:
	import.log 
Log Message:
auto-import gdesklets-0.35.2-22 on branch devel from gdesklets-0.35.2-22.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	7 Dec 2005 22:14:44 -0000	1.2
+++ import.log	14 Dec 2005 09:51:42 -0000	1.3
@@ -1 +1,2 @@
 gdesklets-0_35_2-20:HEAD:gdesklets-0.35.2-20.src.rpm:1133993681
+gdesklets-0_35_2-22:HEAD:gdesklets-0.35.2-22.src.rpm:1134553897



From fedora-extras-commits at redhat.com  Wed Dec 14 09:51:49 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 14 Dec 2005 04:51:49 -0500
Subject: rpms/gdesklets/devel gdesklets.spec,1.1,1.2
Message-ID: <200512140952.jBE9qJij027245@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27207/devel

Modified Files:
	gdesklets.spec 
Log Message:
auto-import gdesklets-0.35.2-22 on branch devel from gdesklets-0.35.2-22.src.rpm


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdesklets.spec	7 Dec 2005 22:14:49 -0000	1.1
+++ gdesklets.spec	14 Dec 2005 09:51:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.2
-Release:        20%{?dist}
+Release:        22%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -12,17 +12,16 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
-############################################################################
-#
-# Starting from 0.35.x, gDesklets no longer requires GConf. Future maintainers
-# must avoid using it.
-#
-##########################################################################
+#############################################################
+#							    #
+# Starting from 0.35.x, gDesklets no longer requires GConf. #
+#							    #
+#############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1
+BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
-BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0
-# Requires:	gnome-python2-gconf >= 2.6.0
+BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
+Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
@@ -35,27 +34,23 @@
 tiny displays that sit on your desktop such as status meters, icon
 bars, weather sensors, news tickers.
 
+
 %prep
 %setup -q -n gDesklets-%{version}
 %patch0 -p1 
 
 %build
 
+
 %configure \
-  --disable-schemas-install
+ --disable-schemas-install
 make %{?_smp_mflags}
 
-
-#%_install
-#rm -rf ${RPM_BUILD_ROOT}
-#make -e install DESTDIR=${RPM_BUILD_ROOT}
-
 %install
-[ -n $RPM_BUILD_ROOT -a $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
-env DESTDIR=$RPM_BUILD_ROOT make -e install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
-
 desktop-file-install --vendor=fedora  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
   --add-category X-Fedora \
@@ -64,7 +59,6 @@
   --add-category Utility \
         data/%{name}.desktop
 
-
 mkdir -p  ${RPM_BUILD_ROOT}{%{_bindir},%{_datadir}/%{name}/data/}
 ln -sf ../../../../%{_datadir}/pixmaps/%{name}.png ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/data/%{name}.png
 ln -sf ../../%{_libdir}/%{name}/%{name} ${RPM_BUILD_ROOT}%{_bindir}/%{name}
@@ -85,7 +79,7 @@
 
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 
 %files -f %{name}.lang
@@ -105,6 +99,14 @@
 
 
 %changelog
+* Wed Dec 14 2005 Luya Tshimbalanga  - 0.35.2-22
+- Added desktop-file-utils for build requirement
+- Clean up
+
+* Tue Dec 6 2005 Luya Tshimbalanga  - 0.35.2-21
+- Removed unnecessary comment  
+- More clean up
+
 * Tue Dec 6 2005 Luya Tshimbalanga  - 0.35.2-20
 - Clean up 
 - Fixed the right path for symbolic link



From fedora-extras-commits at redhat.com  Wed Dec 14 09:52:56 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 14 Dec 2005 04:52:56 -0500
Subject: rpms/inkscape/FC-4 .cvsignore, 1.6, 1.7 inkscape.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <200512140953.jBE9rQEj027308@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/inkscape/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27281

Modified Files:
	.cvsignore inkscape.spec sources 
Log Message:
Update to 0.43. Removed unused patches.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jul 2005 13:51:35 -0000	1.6
+++ .cvsignore	14 Dec 2005 09:52:54 -0000	1.7
@@ -1,2 +1 @@
-inkscape-0.42.tar.bz2
-inkscape-0.42.tar.bz2.sig
+inkscape-0.43.tar.bz2


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-4/inkscape.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- inkscape.spec	14 Dec 2005 09:44:50 -0000	1.14
+++ inkscape.spec	14 Dec 2005 09:52:54 -0000	1.15
@@ -17,7 +17,6 @@
 BuildRequires:  gtkmm24-devel
 BuildRequires:  libart_lgpl-devel >= 2.3.10
 BuildRequires:  libgnomeprintui22-devel >= 2.2.0
-BuildRequires:  libgnomeprint22-devel
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libsigc++20-devel
@@ -105,6 +104,11 @@
 
 
 %changelog
+* Wed Dec 14 2005 Denis Leroy  - 0.43-1
+- Update to 0.43
+- Enabled Perl script execution
+- Gettext patch no longer necessary, fixed upstream
+
 * Fri Jul 29 2005 Michael Schwendt  - 0.42-2
 - Extend ngettext/dgettext patch for x86_64 build.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jul 2005 13:51:35 -0000	1.6
+++ sources	14 Dec 2005 09:52:54 -0000	1.7
@@ -1,2 +1 @@
-4af587b942647bf9e27861e2238844c8  inkscape-0.42.tar.bz2
-e0a299ff70044fd9a424961bd3ad8c13  inkscape-0.42.tar.bz2.sig
+97c606182f5e177eef70c1e8a55efc1f  inkscape-0.43.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 14 09:58:45 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 14 Dec 2005 04:58:45 -0500
Subject: rpms/tla/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tla.spec, 1.18,
	1.19 tla-sysneon.patch, 1.3, NONE
Message-ID: <200512140959.jBE9xFUD027402@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/tla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27380

Modified Files:
	.cvsignore sources tla.spec 
Removed Files:
	tla-sysneon.patch 
Log Message:
* Wed Dec 14 2005 Ville Skytt??  - 1.3.3-2
- Apply 1.3.3-3 patchset from Debian; includes system neon patch, adds
  man page and hopefully fixes ppc segfaults etc.
- Specfile cleanups.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Jun 2005 17:07:15 -0000	1.8
+++ .cvsignore	14 Dec 2005 09:58:41 -0000	1.9
@@ -1,2 +1,3 @@
 tla-1.3.3.tar.gz
 tla-1.3.3.tar.gz.sig
+tla_1.3.3-3.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Jun 2005 17:07:15 -0000	1.8
+++ sources	14 Dec 2005 09:58:43 -0000	1.9
@@ -1,2 +1,3 @@
 61d5dea41e071f78a8319401ee07ab0b  tla-1.3.3.tar.gz
 2e176f99458250c04c6cbdb2f71b6b27  tla-1.3.3.tar.gz.sig
+feb23c5632fec91307f29738ec246c12  tla_1.3.3-3.diff.gz


Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tla.spec	13 Dec 2005 22:06:39 -0000	1.18
+++ tla.spec	14 Dec 2005 09:58:43 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           tla
 Version:        1.3.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
@@ -10,7 +10,7 @@
 Source1:        http://ftp.gnu.org/gnu/gnu-arch/%{name}-%{version}.tar.gz.sig
 # Patch0 from SuSE 9.1's tla-1.2-15
 Patch0:         tla-1.2pre0-posix.patch
-Patch1:         tla-sysneon.patch
+Patch1:         http://ftp.debian.org/debian/pool/main/t/tla/tla_1.3.3-3.diff.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +38,6 @@
 %build
 mkdir src/=build
 cd src/=build
-#export CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
 ../configure \
   --prefix=%{_prefix} --with-install-link-tools=yes --with-cc=%{__cc}
 make CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)" # %{?_smp_mflags} # 1.[23] is not parallel build clean
@@ -47,18 +46,20 @@
 mkdir -p docs-tla/html
 (cd ../docs-tla; find .  -name \*.css -o -name \*.html | xargs tar -cf- ) | \
 (cd docs-tla/html; tar -xf-)
+cd ../..
+
+mkdir debian/tmp
+PATH="`pwd`/src/=build/tla/tla:$PATH" perl debian/generate-manpage.pl tla.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd src/=build
-make install destdir=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
+make -C src/=build install \
+    destdir=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
+install -Dpm 644 debian/tmp/tla.1 $RPM_BUILD_ROOT%{_mandir}/man1/tla.1
+rm $RPM_BUILD_ROOT%{_bindir}/awiki
 
-%check || :
-cd src/=build
-make test CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
-
-# don't install "awiki"
-rm $RPM_BUILD_ROOT%{_prefix}/bin/awiki
+%check
+make -C src/=build test CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,8 +70,14 @@
 %{_bindir}/make-links
 %{_bindir}/remove-links
 %{_bindir}/tla
+%{_mandir}/man1/tla.1*
 
 %changelog
+* Wed Dec 14 2005 Ville Skytt??  - 1.3.3-2
+- Apply 1.3.3-3 patchset from Debian; includes system neon patch, adds
+  man page and hopefully fixes ppc segfaults etc.
+- Specfile cleanups.
+
 * Tue Dec 13 2005 Ville Skytt??  - 1.3.3-2
 - Rebuild against new OpenSSL.
 


--- tla-sysneon.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 14 10:00:44 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 14 Dec 2005 05:00:44 -0500
Subject: rpms/tla/devel tla.spec,1.19,1.20
Message-ID: <200512141001.jBEA1Eh3028995@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/tla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27426

Modified Files:
	tla.spec 
Log Message:
...


Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tla.spec	14 Dec 2005 09:58:43 -0000	1.19
+++ tla.spec	14 Dec 2005 10:00:42 -0000	1.20
@@ -73,7 +73,7 @@
 %{_mandir}/man1/tla.1*
 
 %changelog
-* Wed Dec 14 2005 Ville Skytt??  - 1.3.3-2
+* 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.
 - Specfile cleanups.



From fedora-extras-commits at redhat.com  Wed Dec 14 10:08:21 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 14 Dec 2005 05:08:21 -0500
Subject: rpms/inkscape/FC-4 inkscape-0.42-gettext-x86_64.patch,1.1,NONE
Message-ID: <200512141008.jBEA8L16029125@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/inkscape/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29115

Removed Files:
	inkscape-0.42-gettext-x86_64.patch 
Log Message:
Update to 0.43. Removed unused patches.


--- inkscape-0.42-gettext-x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 14 10:15:48 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 14 Dec 2005 05:15:48 -0500
Subject: owners owners.list,1.449,1.450
Message-ID: <200512141016.jBEAGIq3029330@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29312

Modified Files:
	owners.list 
Log Message:
Taking ownership of inkscape


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- owners.list	14 Dec 2005 03:41:15 -0000	1.449
+++ owners.list	14 Dec 2005 10:15:46 -0000	1.450
@@ -387,7 +387,7 @@
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org|
-Fedora Extras|inkscape|A vector-based drawing program using SVG|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|inkscape|A vector-based drawing program using SVG|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Dec 14 10:37:40 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 14 Dec 2005 05:37:40 -0500
Subject: owners owners.list,1.450,1.451
Message-ID: <200512141038.jBEAcA5W029403@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29385

Modified Files:
	owners.list 
Log Message:
Updated my email address to be consistent with Fedora Account system


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -r1.450 -r1.451
--- owners.list	14 Dec 2005 10:15:46 -0000	1.450
+++ owners.list	14 Dec 2005 10:37:38 -0000	1.451
@@ -234,15 +234,15 @@
 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|compton at pcompton.com|extras-qa at fedoraproject.org|
-Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denisleroy at yahoo.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|
 Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gcfilms|Movies collections management|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gcl|GNU Common Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -270,7 +270,7 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 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)|denisleroy at yahoo.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|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|
@@ -296,7 +296,7 @@
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-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|denisleroy at yahoo.com|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|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|compton at pcompton.com|extras-qa at fedoraproject.org|
@@ -333,8 +333,8 @@
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -387,7 +387,7 @@
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org|
-Fedora Extras|inkscape|A vector-based drawing program using SVG|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
@@ -477,15 +477,15 @@
 Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm20|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm24|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm20|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm24|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libgnomedb|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libgsf113|GNOME Structured File library 1.13|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libibverbs|A library for direct userspace use of InfiniBand|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libid3tag|ID3 tag manipulation library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -523,7 +523,7 @@
 Fedora Extras|libsexy|Funky fresh graphical widgets for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
-Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++|Typesafe Signal Framework for C++|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Dec 14 11:42:17 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 14 Dec 2005 06:42:17 -0500
Subject: fedora-security/audit fc4,1.106,1.107 fc5,1.17,1.18
Message-ID: <200512141142.jBEBglYc031179@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31159

Modified Files:
	fc4 fc5 
Log Message:
Deal with kernel



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- fc4	14 Dec 2005 09:30:41 -0000	1.106
+++ fc4	14 Dec 2005 11:42:15 -0000	1.107
@@ -7,6 +7,7 @@
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
 CVE-2005-4077 backport (curl) [since FEDORA-2005-1137]
 CVE-2005-3651 VULNERABLE (ethereal)
+CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)
@@ -65,7 +66,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 VULNERABLE (kernel)
+CVE-2005-3257 backport (kernel, fixed 2.6.15) [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]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fc5	14 Dec 2005 09:30:41 -0000	1.17
+++ fc5	14 Dec 2005 11:42:15 -0000	1.18
@@ -16,6 +16,7 @@
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
 CVE-2005-4077 VULNERABLE (curl)
 CVE-2005-3651 VULNERABLE (ethereal)
+CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)



From fedora-extras-commits at redhat.com  Wed Dec 14 14:24:30 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 14 Dec 2005 09:24:30 -0500
Subject: rpms/tinyerp/FC-3 tinyerp.spec,1.7,1.8
Message-ID: <200512141425.jBEEP0fB004041@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4019

Modified Files:
	tinyerp.spec 
Log Message:
 - added fedora-usermgmt as Requires(postun) of the server package
 - changed shell for the tinyerp user to /bin/bash



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tinyerp.spec	11 Dec 2005 12:18:39 -0000	1.7
+++ tinyerp.spec	14 Dec 2005 14:24:27 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -38,6 +38,7 @@
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
 Requires(pre):	fedora-usermgmt
+Requires(postun):	fedora-usermgmt
 
 %description server
 Server components for Tiny ERP.
@@ -106,7 +107,7 @@
 
 %pre server
 /usr/sbin/fedora-groupadd 13 -r tinyerp &>/dev/null || :
-/usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
+/usr/sbin/fedora-useradd 13 -r -s /bin/bash -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
 exit 0
@@ -130,6 +131,10 @@
 
 
 %changelog
+* Wed Dec 14 2005 Dan Horak  3.1.1-5
+- added Requires(postun) to the -server package (Ville Skytt??)
+- tinyerp user requires a real shell
+
 * Sun Dec 11 2005 Dan Horak  3.1.1-4
 - moved Requires(pre) to the -server package (Ville Skytt??)
 



From fedora-extras-commits at redhat.com  Wed Dec 14 14:26:19 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 14 Dec 2005 09:26:19 -0500
Subject: rpms/tinyerp/FC-4 tinyerp.spec,1.9,1.10
Message-ID: <200512141426.jBEEQnR2004070@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4052

Modified Files:
	tinyerp.spec 
Log Message:
 - added fedora-usermgmt as Requires(postun) of the server package
 - changed shell for the tinyerp user to /bin/bash



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tinyerp.spec	11 Dec 2005 12:20:51 -0000	1.9
+++ tinyerp.spec	14 Dec 2005 14:26:17 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -38,6 +38,7 @@
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
 Requires(pre):	fedora-usermgmt
+Requires(postun):	fedora-usermgmt
 
 %description server
 Server components for Tiny ERP.
@@ -106,7 +107,7 @@
 
 %pre server
 /usr/sbin/fedora-groupadd 13 -r tinyerp &>/dev/null || :
-/usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
+/usr/sbin/fedora-useradd 13 -r -s /bin/bash -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
 exit 0
@@ -130,6 +131,10 @@
 
 
 %changelog
+* Wed Dec 14 2005 Dan Horak  3.1.1-5
+- added Requires(postun) to the -server package (Ville Skytt??)
+- tinyerp user requires a real shell
+
 * Sun Dec 11 2005 Dan Horak  3.1.1-4
 - moved Requires(pre) to the -server package (Ville Skytt??)
 



From fedora-extras-commits at redhat.com  Wed Dec 14 15:17:07 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 14 Dec 2005 10:17:07 -0500
Subject: rpms/perl-Set-IntSpan/FC-4 .cvsignore, 1.3,
	1.4 perl-Set-IntSpan.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200512141517.jBEFHc8B005905@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Set-IntSpan/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5859/FC-4

Modified Files:
	.cvsignore perl-Set-IntSpan.spec sources 
Log Message:
* Wed Dec 14 2005 Ville Skytt??  - 1.09-1
- 1.09.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-IntSpan/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Oct 2005 06:33:25 -0000	1.3
+++ .cvsignore	14 Dec 2005 15:17:05 -0000	1.4
@@ -1 +1 @@
-Set-IntSpan-1.08.tar.gz
+Set-IntSpan-1.09.tar.gz


Index: perl-Set-IntSpan.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-IntSpan/FC-4/perl-Set-IntSpan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Set-IntSpan.spec	16 Oct 2005 06:33:25 -0000	1.6
+++ perl-Set-IntSpan.spec	14 Dec 2005 15:17:05 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Set-IntSpan
-Version:        1.08
+Version:        1.09
 Release:        1%{?dist}
 Summary:        Perl module for managing sets of integers
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Dec 14 2005 Ville Skytt??  - 1.09-1
+- 1.09.
+
 * Sun Oct 16 2005 Ville Skytt??  - 1.08-1
 - 1.08 (#170944).
 - Specfile cleanups.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-IntSpan/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Oct 2005 06:33:25 -0000	1.3
+++ sources	14 Dec 2005 15:17:05 -0000	1.4
@@ -1 +1 @@
-9d44f23bd2e4f3852e53f703f73fc699  Set-IntSpan-1.08.tar.gz
+161b53631199cc9baf7c7f96ad68a31c  Set-IntSpan-1.09.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 15:17:13 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 14 Dec 2005 10:17:13 -0500
Subject: rpms/perl-Set-IntSpan/devel .cvsignore, 1.3,
	1.4 perl-Set-IntSpan.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200512141517.jBEFHhfu005910@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Set-IntSpan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5859/devel

Modified Files:
	.cvsignore perl-Set-IntSpan.spec sources 
Log Message:
* Wed Dec 14 2005 Ville Skytt??  - 1.09-1
- 1.09.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-IntSpan/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Oct 2005 06:33:26 -0000	1.3
+++ .cvsignore	14 Dec 2005 15:17:11 -0000	1.4
@@ -1 +1 @@
-Set-IntSpan-1.08.tar.gz
+Set-IntSpan-1.09.tar.gz


Index: perl-Set-IntSpan.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-IntSpan/devel/perl-Set-IntSpan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Set-IntSpan.spec	16 Oct 2005 06:33:26 -0000	1.6
+++ perl-Set-IntSpan.spec	14 Dec 2005 15:17:11 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Set-IntSpan
-Version:        1.08
+Version:        1.09
 Release:        1%{?dist}
 Summary:        Perl module for managing sets of integers
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Dec 14 2005 Ville Skytt??  - 1.09-1
+- 1.09.
+
 * Sun Oct 16 2005 Ville Skytt??  - 1.08-1
 - 1.08 (#170944).
 - Specfile cleanups.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-IntSpan/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Oct 2005 06:33:26 -0000	1.3
+++ sources	14 Dec 2005 15:17:11 -0000	1.4
@@ -1 +1 @@
-9d44f23bd2e4f3852e53f703f73fc699  Set-IntSpan-1.08.tar.gz
+161b53631199cc9baf7c7f96ad68a31c  Set-IntSpan-1.09.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 15:55:21 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 14 Dec 2005 10:55:21 -0500
Subject: rpms/ufsparse/devel sources,1.3,1.4 ufsparse.spec,1.5,1.6
Message-ID: <200512141555.jBEFtpK8006183@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ufsparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6135

Modified Files:
	sources ufsparse.spec 
Log Message:
Update to new upstream sources, which contain some new libraries.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Oct 2005 13:21:47 -0000	1.3
+++ sources	14 Dec 2005 15:55:19 -0000	1.4
@@ -1 +1 @@
-78d824bc3261569e3e8c3e4a280ff44d  UFsparse.tar.gz
+8fabcd1b918612cb181bd8935d728ca2  UFsparse.tar.gz


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ufsparse.spec	25 Oct 2005 13:21:47 -0000	1.5
+++ ufsparse.spec	14 Dec 2005 15:55:19 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           ufsparse
-Version:        0.91
-Release:        2%{?dist}
+Version:        0.92
+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/Oct10_2005/UFsparse.tar.gz
+Source0:        http://www.cise.ufl.edu/research/sparse/beta/Dec8_2005/UFsparse.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  blas-devel
@@ -16,12 +16,13 @@
 ufsparse is a collection of libraries for computations involving sparse
 matrices.  The package includes the following libraries:
   AMD         approximate minimum degree ordering
+  BTF         permutation to block triangular form (beta)
   COLAMD      column approximate minimum degree ordering
   CCOLAMD     constrained column approximate minimum degree ordering
   CHOLMOD     sparse Cholesky factorization
   KLU         sparse LU factorization, primarily for circuit simulation
   UMFPACK     sparse LU factorization
-
+  UFconfig    configuration file for all the above packages.
 
 
 %package devel
@@ -63,6 +64,23 @@
   ln -sf libamd.so.%{amd_version} libamd.so
 popd
 
+%define btf_version 0.7
+%define btf_version_major 0
+pushd BTF
+  pushd Lib
+    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libbtf.a
+    gcc -shared -Wl,-soname,libbtf.so.%{btf_version_major} -o libbtf.so.%{btf_version} `ls *.o`
+  popd
+  cp Lib/*.a Lib/*.so* ../Lib
+  cp Include/*.h ../Include
+  mkdir ../Doc/BTF/
+  cp README.txt Doc/lesser.txt ../Doc/BTF/
+popd
+pushd Lib
+  ln -sf libbtf.so.%{btf_version} libbtf.so.%{btf_version_major}
+  ln -sf libbtf.so.%{btf_version} libbtf.so
+popd
+
 %define ccolamd_version 1.0
 %define ccolamd_version_major 1
 pushd CCOLAMD
@@ -78,8 +96,8 @@
   ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so
 popd
 
-%define cholmod_version 0.7
-%define cholmod_version_major 0
+%define cholmod_version 1.0
+%define cholmod_version_major 1
 ### CHOLMOD can also be compiled to use the METIS library, but it is not
 ### used here because its licensing terms exclude it from Fedora Extras.
 ### To compile with METIS, change the definition below to
@@ -122,6 +140,25 @@
   ln -sf libcolamd.so.%{colamd_version} libcolamd.so
 popd
 
+%define klu_version 0.7
+%define klu_version_major 0
+pushd KLU
+  pushd Lib
+    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libklu.a
+    gcc -shared -Wl,-soname,libklu.so.%{klu_version_major} -o libklu.so.%{klu_version} `ls *.o`
+  popd
+  cp Lib/*.a Lib/*.so* ../Lib
+  cp Include/*.h ../Include
+  mkdir ../Doc/KLU/
+  cp README.txt Doc/lesser.txt ../Doc/KLU/
+  mkdir ../Devel/KLU/
+  cp Doc/thesis.pdf Doc/README ../Devel/KLU/
+popd
+pushd Lib
+  ln -sf libklu.so.%{klu_version} libklu.so.%{klu_version_major}
+  ln -sf libklu.so.%{klu_version} libklu.so
+popd
+
 %define ldl_version 1.2
 %define ldl_version_major 1
 pushd LDL
@@ -196,6 +233,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Tue Oct 25 2005 Quentin Spencer  0.92-1
+- Update to Dec 8 2005 version.
+
 * Tue Oct 25 2005 Quentin Spencer  0.91-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Dec 14 15:56:09 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 14 Dec 2005 10:56:09 -0500
Subject: rpms/ufsparse/devel ufsparse.spec,1.6,1.7
Message-ID: <200512141556.jBEFud76006217@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ufsparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6193

Modified Files:
	ufsparse.spec 
Log Message:
Oops, wrong date in changelog.


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ufsparse.spec	14 Dec 2005 15:55:19 -0000	1.6
+++ ufsparse.spec	14 Dec 2005 15:56:07 -0000	1.7
@@ -233,7 +233,7 @@
 %{_libdir}/lib*.so
 
 %changelog
-* Tue Oct 25 2005 Quentin Spencer  0.92-1
+* Wed Dec 14 2005 Quentin Spencer  0.92-1
 - Update to Dec 8 2005 version.
 
 * Tue Oct 25 2005 Quentin Spencer  0.91-2



From fedora-extras-commits at redhat.com  Wed Dec 14 16:12:42 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 14 Dec 2005 11:12:42 -0500
Subject: rpms/abcde/devel .cvsignore, 1.7, 1.8 abcde.spec, 1.8, 1.9 sources,
	1.7, 1.8 abcde-2.3.99-conf.patch, 1.1, NONE
Message-ID: <200512141613.jBEGDCfW007917@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/abcde/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7871

Modified Files:
	.cvsignore abcde.spec sources 
Removed Files:
	abcde-2.3.99-conf.patch 
Log Message:
* Wed Dec 14 2005 Ville Skytt??  - 2.3.99.2-1
- 2.3.99.2, config file fixes mostly applied upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Dec 2005 13:10:30 -0000	1.7
+++ .cvsignore	14 Dec 2005 16:12:39 -0000	1.8
@@ -1 +1 @@
-abcde_2.3.99.orig.tar.gz
+abcde_2.3.99.2-1.tar.gz


Index: abcde.spec
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/abcde.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abcde.spec	10 Dec 2005 13:10:30 -0000	1.8
+++ abcde.spec	14 Dec 2005 16:12:39 -0000	1.9
@@ -1,14 +1,13 @@
 Name:           abcde
-Version:        2.3.99
+Version:        2.3.99.2
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
 Group:          Applications/Multimedia
 License:        GPL or Artistic
 URL:            http://www.hispalinux.es/~data/abcde.php
-Source0:        http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
+Source0:        http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}-1.tar.gz
 Patch0:         %{name}-2.1.19-inst.patch
-Patch1:         %{name}-2.3.99-conf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -28,8 +27,8 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1
-sed -i 's/normalize-audio/normalize/g' abcde*
+sed -i -e 's/normalize-audio/normalize/g' abcde*
+sed -i -e 's/^#NOGAP$/#NOGAP=y/' abcde.conf
 
 
 %install
@@ -45,7 +44,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING FAQ README TODO USEPIPES changelog examples/
+%doc COPYING FAQ README TODO USEPIPES debian/changelog examples/
 %config(noreplace) %{_sysconfdir}/abcde.conf
 %{_bindir}/abcde
 %{_bindir}/cddb-tool
@@ -54,6 +53,9 @@
 
 
 %changelog
+* Wed Dec 14 2005 Ville Skytt??  - 2.3.99.2-1
+- 2.3.99.2, config file fixes mostly applied upstream.
+
 * Sat Dec 10 2005 Ville Skytt??  - 2.3.99-1
 - 2.3.99, minor config file fixes.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcde/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Dec 2005 13:10:30 -0000	1.7
+++ sources	14 Dec 2005 16:12:39 -0000	1.8
@@ -1 +1 @@
-1310c7d2319dbee4baa27e8deeedc776  abcde_2.3.99.orig.tar.gz
+c76a00786096f89d6b0aa6c052410f67  abcde_2.3.99.2-1.tar.gz


--- abcde-2.3.99-conf.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 14 16:15:59 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 14 Dec 2005 11:15:59 -0500
Subject: rpms/cernlib/FC-4 115-rsrtnt64-goto-outer-block.dpatch, NONE,
	1.1 116-fix-fconc64-spaghetti-code.dpatch, NONE,
	1.1 117-fix-optimizer-bug-in-gphot.dpatch, NONE,
	1.1 211-fix-comis-on-amd64.dpatch, NONE,
	1.1 211-fix-comis-on-ia64.dpatch, NONE,
	1.1 cernlib_2005.05.09.dfsg-3.diff, NONE,
	1.1 304-update-Imake-config-files.dpatch, 1.1,
	1.2 307-use-canonical-cfortran.dpatch, 1.1,
	1.2 315-fixes-for-MacOSX.dpatch, 1.2,
	1.3 701-patch-hbook-comis-Imakefiles.dpatch, 1.1,
	1.2 cernlib.m4, 1.1, 1.2 cernlib.spec, 1.14, 1.15 paw.README,
	1.2, 1.3 211-fix-comis-on-64-bit-arches.dpatch, 1.1,
	NONE cernlib-rsrtnt64_goto_outer_block.diff, 1.1,
	NONE cernlib_2005.05.09.dfsg-2.diff, 1.1, NONE
Message-ID: <200512141615.jBEGFxEV007995@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7970

Modified Files:
	304-update-Imake-config-files.dpatch 
	307-use-canonical-cfortran.dpatch 315-fixes-for-MacOSX.dpatch 
	701-patch-hbook-comis-Imakefiles.dpatch cernlib.m4 
	cernlib.spec paw.README 
Added Files:
	115-rsrtnt64-goto-outer-block.dpatch 
	116-fix-fconc64-spaghetti-code.dpatch 
	117-fix-optimizer-bug-in-gphot.dpatch 
	211-fix-comis-on-amd64.dpatch 211-fix-comis-on-ia64.dpatch 
	cernlib_2005.05.09.dfsg-3.diff 
Removed Files:
	211-fix-comis-on-64-bit-arches.dpatch 
	cernlib-rsrtnt64_goto_outer_block.diff 
	cernlib_2005.05.09.dfsg-2.diff 
Log Message:
- use newer debian patchset

retry build on x86_64, who knows...



--- NEW FILE 115-rsrtnt64-goto-outer-block.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 115-rsrtnt64-goto-outer-block.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch from Patrice Dumas  to fix spaghetti code in
## DP: rsrtnt64.F that breaks linking step on Itanium.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/b/rsrtnt64.F cernlib-2005.05.09.dfsg/src/mathlib/gen/b/rsrtnt64.F
--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/b/rsrtnt64.F	1996-04-01 10:01:51.000000000 -0500
+++ cernlib-2005.05.09.dfsg/src/mathlib/gen/b/rsrtnt64.F	2005-12-06 11:22:08.500724891 -0500
@@ -117,8 +117,15 @@
         ENDIF
        ELSE
         IF(N .EQ. 1) THEN
-         ASSIGN 11 TO JMP1
-         GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    11    IF(K .EQ. 0) THEN
           H=H
          ELSEIF(K .EQ. 1) THEN
@@ -174,14 +181,28 @@
            H=2*((H1+B*U)/RT(U)-(H1+B*V)/RT(V))/DELTA
            LB1=11
           ELSEIF(K .EQ. 2) THEN
-           ASSIGN 12 TO JMP1
-           GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    12      H1=DELTA-B**2
            H2=2*A*B
            H=(((H1*U-H2)/RT(U)-(H1*V-H2)/RT(V))/DELTA+H)/C
           ELSEIF(K .EQ. 3) THEN
-           ASSIGN 13 TO JMP1
-           GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    13      H1=C*DELTA
            G1=A*C
            G2=3*B**2
@@ -217,8 +238,32 @@
         ENDIF
        ELSE
         IF(N .EQ. 1) THEN
-         ASSIGN 21 TO JMP2
-         GO TO 20
+      IF(C .EQ. 0) THEN
+       IF(B .EQ. 0) THEN
+        H=LOG(ABS(V/U))/SQRT(A)
+       ELSE
+        IF(A .LT. 0) THEN
+         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
+        ELSE
+         WA=SQRT(A)
+         WU=SQRT(A+B*U)
+         WV=SQRT(A+B*V)
+         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
+        ENDIF
+       ENDIF
+      ELSE
+       A2=2*A
+       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
+        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
+     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
+       ELSEIF(DELTA .EQ. 0) THEN
+        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
+        IF(U*V .GT. 0) H=SIGN(H,U)
+       ELSE
+        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
+        IF(U .LT. 0 .AND. V .LT. 0) H=-H
+       ENDIF
+      ENDIF
    21    IF(K .EQ. -1) THEN
           H=H
          ELSEIF(K .EQ. -2) THEN
@@ -257,8 +302,32 @@
            IF(U. LT. -X0) H=-H
           ENDIF
          ELSE
-          ASSIGN 22 TO JMP2
-          GO TO 20
+      IF(C .EQ. 0) THEN
+       IF(B .EQ. 0) THEN
+        H=LOG(ABS(V/U))/SQRT(A)
+       ELSE
+        IF(A .LT. 0) THEN
+         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
+        ELSE
+         WA=SQRT(A)
+         WU=SQRT(A+B*U)
+         WV=SQRT(A+B*V)
+         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
+        ENDIF
+       ENDIF
+      ELSE
+       A2=2*A
+       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
+        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
+     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
+       ELSEIF(DELTA .EQ. 0) THEN
+        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
+        IF(U*V .GT. 0) H=SIGN(H,U)
+       ELSE
+        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
+        IF(U .LT. 0 .AND. V .LT. 0) H=-H
+       ENDIF
+      ENDIF
    22     IF(K .EQ. -1) THEN
            H1=B*C
            H2=B**2-2*A*C
@@ -287,46 +356,7 @@
         ENDIF
        ENDIF
       ENDIF
-      GO TO 9
-
-   10 C2=2*C
-      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
-       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
-     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
-      ELSEIF(DELTA .EQ. 0) THEN
-       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
-      ELSE
-       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
-      ENDIF
-      GO TO JMP1, (11,12,13)
 
-   20 IF(C .EQ. 0) THEN
-       IF(B .EQ. 0) THEN
-        H=LOG(ABS(V/U))/SQRT(A)
-       ELSE
-        IF(A .LT. 0) THEN
-         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
-        ELSE
-         WA=SQRT(A)
-         WU=SQRT(A+B*U)
-         WV=SQRT(A+B*V)
-         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
-        ENDIF
-       ENDIF
-      ELSE
-       A2=2*A
-       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
-        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
-     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
-       ELSEIF(DELTA .EQ. 0) THEN
-        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
-        IF(U*V .GT. 0) H=SIGN(H,U)
-       ELSE
-        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
-        IF(U .LT. 0 .AND. V .LT. 0) H=-H
-       ENDIF
-      ENDIF
-      GO TO JMP2, (21,22)
 
     9 RES=SIGN(R1,V1-U1)*H
       LRL=LLL


--- NEW FILE 116-fix-fconc64-spaghetti-code.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 116-fix-fconc64-spaghetti-code.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Work around FTBFS on ia64 with recent binutils, apparently caused
## DP: by assignment of goto labels in this file.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/c/fconc64.F cernlib-2005.05.09.dfsg/src/mathlib/gen/c/fconc64.F
--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/c/fconc64.F	1996-04-01 10:02:04.000000000 -0500
+++ cernlib-2005.05.09.dfsg/src/mathlib/gen/c/fconc64.F	2005-12-12 12:58:23.885981128 -0500
@@ -190,15 +190,167 @@
       A=HF*((HF-FM)-TI)
       B=HF*((HF-FM)+TI)
       C=HF
-      ASSIGN 1 TO JP
-      GO TO 20
+   20 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 21 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 1
+       DO 22 J = 1,3
+       V(J-1)=V(J)
+   22  U(J-1)=U(J)
+   21  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 23 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 1
+   23  CONTINUE
+      END IF
+      GO TO 24
     1 R1=R
       R1=R1/ABS(CGM(A+HF))**2
       A=HF*((TH-FM)-TI)
       B=HF*((TH-FM)+TI)
       C=TH
-      ASSIGN 2 TO JP
-      GO TO 20
+  120 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 121 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 2
+       DO 122 J = 1,3
+       V(J-1)=V(J)
+  122  U(J-1)=U(J)
+  121  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 123 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 2
+  123  CONTINUE
+      END IF
+      GO TO 24
     2 R2=R
       FC=RPI*(R1-2*X*R2/ABS(CGM(A-HF))**2)
       IF(LM1) FC=2*FC/SQRT(1-X1)
@@ -209,8 +361,84 @@
       A=(HF+FM)-TI
       B=(HF+FM)+TI
       C=FM+1
-      ASSIGN 3 TO JP
-      GO TO 20
+  220 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 221 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 3
+       DO 222 J = 1,3
+       V(J-1)=V(J)
+  222  U(J-1)=U(J)
+  221  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 223 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 3
+  223  CONTINUE
+      END IF
+      GO TO 24
     3 FC=R
       IF(LM1) FC=SIGN(HF,1-X)*(TAU**2+HF**2)*SQRT(ABS(X**2-1))*FC
       GO TO 99
@@ -220,15 +448,7 @@
       A=HF*((HF-FM)-TI)
       B=HF*((TH-FM)-TI)
       C=1-TI
-      ASSIGN 4 TO JP
-      GO TO 20
-    4 R1=EXP((TI-HF)*LOG(X+X)+CLG(1+TI)-CLG((TH-FM)+TI))*
-     1        R*((HF-FM)+TI)/TI
-      FC=RPW*R1
-      IF(LM1) FC=FC/SQRT(1-X1)
-      GO TO 99
-
-   20 IF(LTA) THEN
+  320 IF(LTA) THEN
        Y=-X1
        Y2=Y**2
        Y3=Y*Y2
@@ -257,7 +477,7 @@
        U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
 
        R=1
-       DO 21 N = 3,NMAX
+       DO 321 N = 3,NMAX
        FN=N
        RR=R
        H(1)=FN-1
@@ -289,23 +509,29 @@
        V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
        U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
        R=U(3)/V(3)
-       IF(ABS(R-RR) .LT. EPS) GO TO JP, (1,2,3,4)
-       DO 22 J = 1,3
+       IF(ABS(R-RR) .LT. EPS) GO TO 4
+       DO 322 J = 1,3
        V(J-1)=V(J)
-   22  U(J-1)=U(J)
-   21  CONTINUE
+  322  U(J-1)=U(J)
+  321  CONTINUE
       ELSE
        W(1)=X1*A*B/C
        R=1+W(1)
-       DO 23 N = 1,NMAX
+       DO 323 N = 1,NMAX
        FN=N
        RR=R
        W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
        R=R+W(1)
-       IF(ABS(R-RR) .LT. EPS) GO TO JP, (1,2,3,4)
-   23  CONTINUE
+       IF(ABS(R-RR) .LT. EPS) GO TO 4
+  323  CONTINUE
       END IF
-      FC=0
+      GO TO 24
+    4 R1=EXP((TI-HF)*LOG(X+X)+CLG(1+TI)-CLG((TH-FM)+TI))*
+     1        R*((HF-FM)+TI)/TI
+      FC=RPW*R1
+      IF(LM1) FC=FC/SQRT(1-X1)
+      GO TO 99
+   24 FC=0
       WRITE(ERRTXT,102) X
       CALL MTLPRT(NAME,'C331.2',ERRTXT)
 #if defined(CERNLIB_DOUBLE)


--- NEW FILE 117-fix-optimizer-bug-in-gphot.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 117-fix-optimizer-bug-in-gphot.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch by Harald Vogt  to work around compiler
## DP: optimization problems in src/geant321/gphys/gphot.F.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gphys/gphot.F cernlib-2005.05.09.dfsg/src/geant321/gphys/gphot.F
--- cernlib-2005.05.09.dfsg~/src/geant321/gphys/gphot.F	1995-10-24 06:21:29.000000000 -0400
+++ cernlib-2005.05.09.dfsg/src/geant321/gphys/gphot.F	2005-12-07 15:01:52.558184613 -0500
@@ -240,7 +240,7 @@
                   ELSE
 C Radiative shell decay
                      JS = JFN+1+2*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 40 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
@@ -296,7 +296,7 @@
                   ELSE
 c Nonradiative decay
                      JS = JFN+1+3*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 60 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN


--- NEW FILE 211-fix-comis-on-amd64.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-amd64.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Large patch from Harald Vogt  to make PAW and Paw++ work
## DP: (at least when statically linked) on 64-bit architectures.
## DP: Slightly modified in an attempt to keep ABI compatibility of the
## DP: dynamic libraries; not that it matters much as they don't work well
## DP: when dynamically linked on 64-bit anyway.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/hbook.h cernlib-2005.05.09.dfsg/src/cfortran/hbook.h
--- cernlib-2005.05.09.dfsg~/src/cfortran/hbook.h	1999-11-15 17:01:12.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/cfortran/hbook.h	2005-12-09 13:27:45.465589336 +0000
@@ -489,6 +489,10 @@
 #define HBALLOC(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
         CCALLSFSUB11(HBALLOC,hballoc,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PINT,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
 
+PROTOCCALLSFSUB11(HBALLOC64,hballoc64,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PLONG,PINT)
+#define HBALLOC64(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
+        CCALLSFSUB11(HBALLOC64,hballoc64,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PLONG,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
+
 PROTOCCALLSFSUB1(HBFREE,hbfree,INT)
 #define HBFREE(LUN) CCALLSFSUB1(HBFREE,hbfree,INT,LUN)
 
@@ -508,6 +512,13 @@
 #define HGNTBF(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)\
         CCALLSFSUB6(HGNTBF,hgntbf,INT,ZTRINGV,INTV,INT,INT,PINT,IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
 
+PROTOCCALLSFSUB6(HGNTBF64,hgntbf64,INT,ZTRINGV,LONGV,INT,INT,PINT)
+/* fix the element length of VAR to 32 */
+#define hgntbf64_ELEMS_2          ZTRINGV_ARGS(4)
+#define hgntbf64_ELEMLEN_2        ZTRINGV_NUM(32)
+#define HGNTBF64(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)\
+        CCALLSFSUB6(HGNTBF64,hgntbf64,INT,ZTRINGV,LONGV,INT,INT,PINT,IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
+
 PROTOCCALLSFSUB1(HGTDIR,hgtdir,PSTRING)
 #define HGTDIR(CHDIR) CCALLSFSUB1(HGTDIR,hgtdir,PSTRING,CHDIR)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/cspack/hcntpar.inc cernlib-2005.05.09.dfsg/src/packlib/cspack/cspack/hcntpar.inc
--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/cspack/hcntpar.inc	1996-03-08 15:44:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/cspack/cspack/hcntpar.inc	2005-12-09 13:27:45.465589336 +0000
@@ -22,7 +22,7 @@
      +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
      +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
      +          ZARIND=11, ZIBLOK=8,  ZNBLOK=10, ZIBANK=9,  ZIFTMP=11,
-     +          ZITMP=10,  ZNTMP=5,   ZNTMP1=3,  ZLINK=6)
+     +          ZITMP=10,  ZNTMP=5,   ZNTMP1=4,  ZLINK=6)
 *
 
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hbook/hcntpar.inc cernlib-2005.05.09.dfsg/src/packlib/hbook/hbook/hcntpar.inc
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hbook/hcntpar.inc	1996-01-16 17:07:52.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hbook/hcntpar.inc	2005-12-09 13:27:46.373451320 +0000
@@ -24,7 +24,7 @@
      +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
      +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
      +          ZARIND=11, ZIBLOK=8,  ZNBLOK=10, ZIBANK=9,  ZIFTMP=11,
-     +          ZID=12,    ZITMP=10,  ZNTMP=6,   ZNTMP1=3,  ZLINK=6)
+     +          ZID=12,    ZITMP=10,  ZNTMP=6,   ZNTMP1=4,  ZLINK=6)
 *
 
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hballoc.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hballoc.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hballoc.F	1996-01-16 17:07:56.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hballoc.F	2005-12-09 13:27:46.617414232 +0000
@@ -42,3 +42,26 @@
       ENDIF
 *
       END
+*
+*     64-bit version (separate to preserve ABI compatibility)
+      SUBROUTINE HBALLOC64(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,
+     +                     IBASE,IOFF,NUSE)
+*
+      CHARACTER*(*)  CHDIR, VAR, BLOCK
+      INTEGER        IDN, ITYPE, ISIZE, NELEM, NUSE, IFIRST, IBASE(1)
+      INTEGER*8      IBUF(1), IOFF
+*
+      LC = LENOCC(CHDIR)
+      LV = LENOCC(VAR)
+      LB = LENOCC(BLOCK)
+*
+      CALL HBALLO1(IDN, CHDIR, LC, VAR, LV, BLOCK, LB, ITYPE, ISIZE,
+     +             IFIRST, NELEM, IBUF, NUSE)
+*
+      IF (NUSE .EQ. 0) THEN
+         IOFF = 0
+      ELSE
+         IOFF = IBUF(1) - %LOC(IBASE(1))/4
+      ENDIF
+*
+      END
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hbnt.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hbnt.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hbnt.F	1996-01-16 17:07:56.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hbnt.F	2005-12-09 13:27:46.644410128 +0000
@@ -269,11 +269,13 @@
  ************************************************************************
  *      *         *                                                     *
  *   1  *         *     Number of variables to be read out              *
- *      *         *     *** For every variable 3 words (ZNTMP1) ***     *
+ *      *         *     *** For every variable 4 words (ZNTMP1) ***     *
  *   2  *         *     Index of variable in LNAME bank                 *
  *   3  *         *     Offset of variable in LNAME bank (INDX-1)*ZNADDR*
  *   4  *         *     Offset in dynamically allocated buffer (only    *
  *      *         *     used via HGNTBF) otherwise 0                    *
+ *   5  *         *     spare (used in 64 bit architectures for upper   *
+ *      *         *     address part)                                   *
  ************************************************************************
 #endif
 *
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgnt2.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgnt2.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgnt2.F	1999-03-05 15:42:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgnt2.F	2005-12-09 13:27:46.644410128 +0000
@@ -34,7 +34,13 @@
 #include "hbook/hcrecv.inc"
 *
       CHARACTER*(*) VAR1(*)
+#if defined(CERNLIB_QMLXIA64)
+      INTEGER*8     IVOFF(*), IOFFST, IOFFSTT
+      INTEGER       IOFFSTV(2)
+      EQUIVALENCE   (IOFFSTV, IOFFSTT)
+#else
       INTEGER       IVOFF(*)
+#endif
       CHARACTER*32  VAR
       INTEGER       ILOGIC, HNMPTR
       LOGICAL       LOGIC, INDVAR, ALLVAR, USEBUF, CHKOFF
@@ -452,10 +458,15 @@
          IQ(LTMP1+JTMP+1)      = IOFF
          IF (USEBUF) THEN
             IF (IEDIF .EQ. 0) THEN
-               IQ(LTMP1+JTMP+2) = IOFFST
+               IOFFSTT = IOFFST
             ELSE
-               IQ(LTMP1+JTMP+2) = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
+               IOFFSTT = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
             ENDIF
+            IQ(LTMP1+JTMP+2) = IOFFSTT
+#if defined(CERNLIB_QMLXIA64)
+*           store upper part of 64 bit address
+            IQ(LTMP1+JTMP+3) = IOFFSTV(2)
+#endif
          ELSE
             IQ(LTMP1+JTMP+2)   = 0
          ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntbf.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntbf.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntbf.F	1996-01-16 17:07:57.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntbf.F	2005-12-09 13:27:46.645409976 +0000
@@ -26,3 +26,13 @@
       CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
 *
       END
+*
+*     64-bit version (separate to preserve ABI compatibility)
+      SUBROUTINE HGNTBF64(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
+      CHARACTER*(*) VAR(*)
+      INTEGER*8     IOFFST(*)
+*
+      NVAR1 = -NVAR
+      CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
+*
+      END
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntf.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntf.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntf.F	1999-03-05 15:42:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntf.F	2005-12-09 13:27:46.645409976 +0000
@@ -37,6 +37,13 @@
       INTEGER       ILOGIC
       LOGICAL       LOGIC, INDVAR, USEBUF
       EQUIVALENCE  (LOGIC, ILOGIC)
+
+#if defined(CERNLIB_QMLXIA64)
+      INTEGER*8     IOFFST, IOFFSTT
+      INTEGER       IOFFSTV(2)
+      EQUIVALENCE   (IOFFSTV, IOFFSTT)
+#endif
+
 *
 #include "hbook/jbyt.inc"
 *
@@ -76,6 +83,12 @@
          INDX   = IQ(LTMP1+JTMP)
          IOFF   = IQ(LTMP1+JTMP+1)
          IOFFST = IQ(LTMP1+JTMP+2)
+#if defined(CERNLIB_QMLXIA64)
+*        fetch full 64 bit address
+         IOFFSTV(1) = IQ(LTMP1+JTMP+2)
+         IOFFSTV(2) = IQ(LTMP1+JTMP+3)
+         IOFFST     = IOFFSTT
+#endif
          IF (IOFFST .EQ. 0) THEN
             USEBUF = .FALSE.
          ELSE
@@ -442,10 +455,15 @@
 *
          IF (USEBUF) THEN
             IF (IEDIF .EQ. 0) THEN
-               IQ(LTMP1+JTMP+2) = IOFFST
+               IOFFSTT = IOFFST
             ELSE
-               IQ(LTMP1+JTMP+2) = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
+               IOFFSTT = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
             ENDIF
+            IQ(LTMP1+JTMP+2) = IOFFSTT
+#if defined(CERNLIB_QMLXIA64)
+*           store upper part of 64 bit address
+            IQ(LTMP1+JTMP+3) = IOFFSTV(2)
+#endif
          ELSE
             IQ(LTMP1+JTMP+2) = 0
          ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c
--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c	2005-12-09 13:27:46.645409976 +0000
@@ -44,7 +44,25 @@
    DummyDef
 #endif
 {
+#if defined(CERNLIB_QMLXIA64)
+   const unsigned long long int mask=0x00000000ffffffff;
+   static unsigned long long int base=1;
+   unsigned long long int jadr=(unsigned long long int) iadr;
+   unsigned long long int jadrl = (mask & jadr);
+
+   if (base == 1) {
+     base = (~mask & jadr);
+   } else if(base != (~mask & jadr)) {
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+     printf("locb_() Warning: changing base from %lx to %lx!!!\n",
+     	   base, (~mask & jadr));
+     printf("This may result in program crash or incorrect results\n");
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+   }
+   return ((int) jadrl);
+#else
    return( (int) iadr );
+#endif
 }
 /*> END <----------------------------------------------------------*/
 #ifdef CERNLIB_TCGEN_LOCB
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/zbook/code/zjump.c cernlib-2005.05.09.dfsg/src/packlib/zbook/code/zjump.c
--- cernlib-2005.05.09.dfsg~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/zbook/code/zjump.c	2005-12-09 13:27:46.971360424 +0000
@@ -7,6 +7,9 @@
  *
  */
 #include "zbook/pilot_c.h"
+#if defined(CERNLIB_QMLXIA64)
+static void (*target)();
+#endif
 #if defined(CERNLIB_UNIX)
 #if defined(CERNLIB_QX_SC)
 zjump_(name,p1,p2,p3,p4)
@@ -18,8 +21,23 @@
 ZJUMP(name,p1,p2,p3,p4)
 #endif
 char *p1, *p2, *p3, *p4;
+
+/*  LP64 compatibility:
+    name is taken from a Fortran array and therefore its address is 32 bit
+    which has to be converted to a 64 bit address to satisfy void (*) (H. Vogt) */
+
+#if defined(CERNLIB_QMLXIA64)
+int *name;
+{
+  long jadr;
+  jadr   = *name;  /* convert int to long */
+  target = (void (*)())jadr;
+  (*target)(p1, p2, p3, p4);
+}
+#else
 void (**name)();
 {
    (**name)(p1, p2, p3, p4);
 }
 #endif
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.05.09.dfsg/src/packlib/zebra/test/brztest/btest2.F
--- cernlib-2005.05.09.dfsg~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/zebra/test/brztest/btest2.F	2005-12-09 13:27:46.971360424 +0000
@@ -29,6 +29,15 @@
 ********************************************************************************
 *
       COMMON/CRZT/IXSTOR,IXDIV,IFENCE(2),LEV,LEVIN,BLVECT(30000)
+
+*     LP64 compatibility:
+*     For 64-bit pointer systems put local variables referenced by LOCF
+*     in a dummy named common block to keep addresses in the program region.
+*     see also: packlib/ffread/test/main.F (H. Vogt)
+
+#if defined(CERNLIB_QMLXIA64)
+      COMMON /TEST64/LBANK
+#endif
       DIMENSION LQ(999),IQ(999),Q(999)
       EQUIVALENCE (IQ(1),Q(1),LQ(9)),(LQ(1),LEV)
 C
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile	2005-12-09 13:27:38.969576880 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile	2005-12-09 13:27:46.971360424 +0000
@@ -50,6 +50,10 @@
 SRCS_F := $(SRCS_F) cscrexec.F
 #endif
 
+#if defined(CERNLIB_QMLXIA64)
+SRCS_F := $(SRCS_F) csrtgpl.F csitgpl.F
+#endif
+
 #if defined(CERNLIB_OLD)
 SRCS_F := $(SRCS_F) cspdir.F csrmbk.F
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F	1996-02-26 17:16:25.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F	2005-12-09 13:27:46.972360272 +0000
@@ -17,8 +17,14 @@
       INTEGER CSLTGP,CSITGP
       CHARACTER*32 NAME
 #include "comis/cstab.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       INTEGER CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      INTEGER*8 CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)
       NAME=CHNAME
       NC=LENOCC(NAME)
       CALL CSCHID(NAME(:NC))
@@ -26,21 +32,39 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
+#endif
+#endif
+#if defined(CERNLIB_SHL)
           ELSE
             I=0
           ENDIF
         ENDIF
       ELSE
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+        IF(IADGPL.NE.0)THEN
+          IFCS=-2
+          ITYPGP=-2
+          I=CSITGPL(IPVS)
+        ENDIF
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
           I=CSITGP(IPVS)
         ENDIF
+#endif
       END IF
       CSADDR=I
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csinit.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csinit.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csinit.F	2005-04-18 15:41:04.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csinit.F	2005-12-09 13:27:46.972360272 +0000
@@ -64,6 +64,9 @@
 #if defined(CERNLIB_SHL)
 #include "comis/cshlnm.inc"
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+#endif
 #if defined(CERNLIB_PAW)
 #include "paw/pcmode.inc"
 #include "comis/cshfill.inc"
@@ -159,6 +162,9 @@
       ICHMINU=ICHAR('-')
       ICHPLUS=ICHAR('+')
       ICHCOMM=ICHAR(',')
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+      IPIADGV=0
+#endif
 #if defined(CERNLIB_PAW)
       CALL CSPAWI
       MODHFI=0
@@ -211,8 +217,8 @@
 #endif
 #if (defined(CERNLIB_LINUX))
       ITMPLEN=CSTMPD(CHPATH, 256)
-      CHF77 ='g77 -c'
-      CHCC  ='cc -c'
+      CHF77 ='g77 -c -fPIC'
+      CHCC  ='cc -c -fPIC'
 #endif
 #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
       ITMPLEN=CSTMPD(CHPATH, 256)
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csintx.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csintx.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csintx.F	1996-12-05 09:50:37.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csintx.F	2005-12-09 13:27:46.973360120 +0000
@@ -38,6 +38,9 @@
 #if defined(CERNLIB_PAW)
 #include "comis/cskucs.inc"
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_ALPHA_OSF))
       INTEGER CSTRCMP
 #endif
@@ -1105,6 +1108,32 @@
       ENDIF
 #endif
 #if (!defined(CERNLIB_VAX))&&(!defined(CERNLIB_APOLLO))
+#if defined(CERNLIB_QMLXIA64)
+      IF(IQ(IP+KSIFCS).EQ.-2)THEN
+*Dynamic linker may give long addresses
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ENDIF
+#else
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NPAR,IDA(IOFSPL))
       ELSEIF(ITP.EQ.2)THEN
@@ -1115,6 +1144,7 @@
         DCSRES=CSCALD(IADGP,NPAR,IDA(IOFSPL))
       ENDIF
 #endif
+#endif
       IPC=IPC+4
       GO TO 999
 *NUM I
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csitgpl.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csitgpl.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csitgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csitgpl.F	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,32 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZU:  1.16/16 04/10/93  12.14.52  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+      INTEGER FUNCTION CSITGPL(IP)
+***------------------------------
+*   it is last routine from the tables-set.
+***-----------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cspnts.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab64.inc"
+      I=MHLOC(KSIDP+NWIDEN)
+      IQ(I)=0
+      IQ(I+1)=NCIDEN
+      DO 1 K=1,NWIDEN
+        IQ(I+KSIDP-1+K)=IDEN(K)
+   1  CONTINUE
+      CALL CSRTGPL(I)
+      IF(IP.EQ.0)THEN
+        IPGP=I
+      ELSE
+        IQ(IP)=I
+      ENDIF
+      CSITGP=I
+      END
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cskcal.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cskcal.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cskcal.F	1996-12-05 09:50:39.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cskcal.F	2005-12-09 13:27:46.973360120 +0000
@@ -31,6 +31,9 @@
 #include "comis/cstab.inc"
 #include "comis/csfres.inc"
 #include "comis/cssysd.inc"
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
       CHARACTER PRONAME*32
       INTEGER CSCALI
       DOUBLE PRECISION CSCALD
@@ -232,6 +235,34 @@
         I2=I2+KS
         I=I+1
  9203 CONTINUE
+#if defined(CERNLIB_QMLXIA64)
+*  Dynamic linker may give long addresses
+      IF (IFCS.EQ.-2)THEN
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ENDIF
+#else
 *      IT=IABS(ITYPGP)
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NOPAR,IF77PL(1))
@@ -245,6 +276,7 @@
       ENDIF
 *+SELF,IF=UNIX,IF=-SGI,IF=-IBMRT,IF=-DECS,IF=-HPUX,IF=-SUN,IF=-MSDOS.
 #endif
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_STDUNIX))
       I=1
       DO 9203 K=ITA-NPAR+1,ITA
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cslink.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cslink.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cslink.F	1996-02-26 17:16:17.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cslink.F	2005-12-09 13:27:46.973360120 +0000
@@ -21,10 +21,15 @@
 #include "comis/cstab.inc"
 #include "comis/cspnts.inc"
 #include "comis/cslun.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       CHARACTER*(KLENID) FNNAME
       INTEGER CS_GET_FUNC
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      CHARACTER*(KLENID) FNNAME
+      INTEGER*8 CS_GET_FUNC
+#endif
          COMMON/CSGSCM/IGS,JGS,NGS,CSJUNK(3)
       IF(ISTLIB.EQ.0 .AND. ITBS.EQ.0)RETURN
    2  I=IPGP
@@ -60,12 +65,20 @@
 #if defined(CERNLIB_SHL)
           CALL CSGTIDP(I,FNNAME,NC)
           CALL CUTOL(FNNAME(1:NC))
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(FNNAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+          ENDIF
+#else
           IADGP=CS_GET_FUNC(FNNAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
           ENDIF
 #endif
+#endif
           IP=0
         ENDIF
       ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csrtgpl.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csrtgpl.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csrtgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csrtgpl.F	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,31 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZ :  1.18/14 10/01/95  15.41.06  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+
+      SUBROUTINE CSRTGPL(I)
+***--------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab.inc"
+#include "comis/cstab64.inc"
+
+      IPIADGV = IPIADGV + 1
+      IF (IPIADGV .GT. MAXIAD64)  THEN
+        WRITE (*,'(2a,I4)') 'to much addresses for dynamik linking, ',
+     &                      'limit is ', MAXIAD64
+        WRITE (*,'(2a)') 'increase MAXIAD64 in cstab64.inc and ',
+     &                    'recompile COMIS'
+
+        STOP
+      END IF
+      IADGPLV(IPIADGV) = IADGPL
+      IADGP            = IPIADGV
+      CALL CCOPYA(IADGP,IQ(I+2),KSIDP-2)
+      END
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/comis/cstab64.inc cernlib-2005.05.09.dfsg/src/pawlib/comis/comis/cstab64.inc
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/comis/cstab64.inc	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/comis/cstab64.inc	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,10 @@
+*
+*
+* cstab64.inc
+*
+      PARAMETER (MAXIAD64=100) !maximum number of shared objects
+      INTEGER*8 IADGPL,IADGPLV(MAXIAD64)
+      INTEGER   IADGPL1, IADGPL2
+      COMMON /CSTB64/ IADGPL,IADGPLV
+      COMMON /CSTB64I/ IPIADGV
+      EQUIVALENCE (IADGPL, IADGPL1)
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c	1997-09-02 15:50:38.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c	2005-12-09 13:27:46.974359968 +0000
@@ -33,11 +33,25 @@
 #else
 void ccopys_(ja,jb,nn)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *nn;
+{
+  int i,n; char *a,*b;
+  n=*nn; a=*ja; b=*jb;
+#else
      char **ja, **jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+#endif
   if ( a >= b )
      for ( i=0; inext = f->first_proc;
          f->first_proc = p;
+         if (debug_level > 0) printf("function pointer is: %p\n", p->funcptr);
          return (void *)(p->funcptr);
       }
      f = f->next;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c	2004-10-27 09:01:54.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c	2005-12-09 13:27:46.974359968 +0000
@@ -32,8 +32,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 double cscald_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -46,10 +45,41 @@
     int CSCALD (name,n,p)
 #  endif
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscald_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+double cscald_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[16];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = *fptr + (unsigned long)jumpad_;
+   /* if ( *fptr > 0 ) ptr = 0; */
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  double (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
+#endif
    double d;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c	2004-10-22 12:42:40.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c	2005-12-09 13:27:46.974359968 +0000
@@ -29,8 +29,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 int cscali_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -39,10 +38,41 @@
 #if defined(CERNLIB_QXCAPT)
 int type_of_call CSCALI (name,n,p)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscali_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+int cscali_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[16];
+{
+   int jumpad_();
+   int (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   /* if ( *fptr > 0 ) ptr = 0; */
+   ptr += *fptr;
+   name = (int (*)())ptr;
+/*    printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  int (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
+#endif
    int i;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c	2004-10-22 12:03:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c	2005-12-09 13:27:46.974359968 +0000
@@ -35,7 +35,7 @@
 #endif
 
 
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 float cscalr_ (name,n,p)
 #endif
 
@@ -51,11 +51,51 @@
 # endif
 #endif
 
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscalr_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+/* Additional note: g77 generates code such that it expects REAL functions
+ * to return "double".  Hence C functions to be used in FORTRAN as REAL
+ * must return "double", and declarations of REAL FORTRAN functions in C files
+ * must also return "double".  On most architectures one can get away with
+ * using "float" instead, but not on amd64 ... see
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15397
+ * 
+ * -- Kevin McCarty
+ */
+	
+#if defined(CERNLIB_QMLXIA64)
+double cscalr_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ int pin[16];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscalr - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+   double r;
+#else
  float (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
    float r;
+#endif
    switch (*n)
    {
       case 0:
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c	1997-09-02 15:50:44.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 13:27:46.975359816 +0000
@@ -36,6 +36,27 @@
 #else
 int cstrcmp_(ja,na,jb,nb)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *na, *nb;
+{
+
+  int i,la,lb,k; char *a,*b;
+  if ( *na >= *nb )
+     {
+      a=*ja; b=*jb; la=*na; lb=*nb; k=1;
+      }
+  else
+    {
+      a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
+     }
+#else
      char **ja, **jb;
      int *na, *nb;
 {
@@ -48,6 +69,7 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+#endif
   for ( i=0; i b[i]) ? k : -k ); }
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/c_hcntpar.h cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/c_hcntpar.h
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/c_hcntpar.h	1996-04-23 18:37:45.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/c_hcntpar.h	2005-12-09 13:27:46.975359816 +0000
@@ -47,7 +47,7 @@
 #define ZID	12
 #define ZITMP	10
 #define ZNTMP	6
-#define ZNTMP1	3
+#define ZNTMP1	4
 #define ZLINK	6
 
 #endif	/*	CERN_C_HCNTPAR	*/
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_execute.c cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_execute.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_execute.c	2001-09-18 13:41:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_execute.c	2005-12-09 13:31:01.495788216 +0000
@@ -184,12 +184,19 @@
 					/* all definitions for the stack */
 #undef INIT_STACK_TO_NULL		/* are kept together in this file */
 
+#if defined(CERNLIB_QMLXIA64)
+# undef HBALLOC
+# undef HGNTBF
+# define HBALLOC HBALLOC64
+# define HGNTBF HGNTBF64
+#endif
+
 /* extern functions */
 extern void qp_exec_evt( QueryExe *, long, long, QPCmd *, int *);
 
 typedef		char	tName[MAX_NAME_LEN+1];
 tName		*namelist;
-int		*offsetlist;
+long		*offsetlist;
 int		*indexlist;
 
 
@@ -245,7 +252,23 @@
 	char		ntname[MAX_NAME_LEN+6];
 	int		i, ierr, indx, itype, isize, ielem;
 	Int32 *		addr;
-	int		ibase[1], ioff, nuse;
+
+	/* LP64 compatibility:
+	   - use static for ibase (at least) because its address is stored
+	     as Int32 in structure CWNBlock
+	     static takes ibase from the stack and puts it the code area.
+	   - use type long for ioff and offsetlist[i]
+	     (for 32 bit architectures type long is 4 Bytes as it is used
+	      also in packlib/hbook/chbook/halloc.c in hballo1 !)
+	   The x86-64 ABI has the code area in the 32 bit address space
+	   but addresses to the stack and to dynamically allocated areas
+	   may and will be above the 32 bit address space (below 0x80000000000).
+	   See also: http://www.x86-64.org/documentation/abi-0.96.pdf
+	   (H. Vogt, Oct. 2005) */
+
+	static int	ibase[1];
+	long		ioff;
+	int		nuse;
 	int		id = qe->id;
 	char *		path = qe->path;
 	char *		title;
@@ -286,7 +309,11 @@
 	CWNBlock = (RefCWN *) calloc( CWNCount + 1, sizeof( RefCWN ) );
 	qp_assert( MAX_NAME_LEN == 32 ); /* see hbook.h (HGNTBF) */
 	namelist = (tName *) calloc( CWNCount + 1, sizeof(tName) );
-	offsetlist = (int *) calloc( CWNCount + 1, sizeof(int) );
+
+	/* offsetlist should be of type long (see above) (H. Vogt, Oct. 2005) */
+
+	offsetlist = (long *) calloc( CWNCount + 1, sizeof(long) );
+
 	indexlist = (int *) calloc( CWNCount + 1, sizeof(int) );
 	qp_assert(
 		CWNBlock != 0 &&
@@ -381,6 +408,7 @@
 						offsetlist[nt_load_cnt]=
 						CWNBlock[index].p -
 						PAWC.iq_eqv;
+
 						strncpy(
 						namelist[nt_load_cnt],
 						vi->name,
@@ -871,8 +899,21 @@
 			if ( cmd->u.scan.pawpp ) {
 				char	buf[33];
 
+				/* for LP64 ABI matlab and matrow are 64 bit pointer, type is void*  
+				   but PCADDR.jmlab and PCADDR.jmrow are of type int
+				   see: c_pcaddr.h and qp_command.h
+				   it is related to CWNBlock -> see above (H. Vogt)*/
+
+#if defined(CERNLIB_QMLXIA64)
+				unsigned long long int	 myjmlab, myjmrow;
+				myjmlab = PCADDR.jmlab;
+				myjmrow = PCADDR.jmrow;
+				c->matlab = (TableCallBack) myjmlab;
+				c->matrow = (TableCallBack) myjmrow;
+#else
 				c->matlab = (TableCallBack) PCADDR.jmlab;
 				c->matrow = (TableCallBack) PCADDR.jmrow;
+#endif
 
 				qp_assert( qe->nexpr <= MAX_OUTSTR );
 
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_hbook_if.c cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_hbook_if.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_hbook_if.c	1999-07-05 15:43:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_hbook_if.c	2005-12-09 13:27:46.976359664 +0000
@@ -149,7 +149,15 @@
 	int	idn, idtmp;
 	int	icycle;
 	int	ierr;
-	int     izero = 0;
+
+	/* LP64 compatibility:
+	   use static for izero because its address is fetched by hbname_
+	   using locb and locb expects 32 bit addresses only.
+	   static takes izero from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int     izero = 0;
 
 	/* split string into  path, id and cycle */
 


--- NEW FILE 211-fix-comis-on-ia64.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-ia64.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Further patch building on Harald Vogt's amd64 patch that should
## DP: fix PAW on Itanium Linux.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c	2005-12-09 09:45:33.649333472 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c	2005-12-09 10:01:36.149011280 +0000
@@ -39,12 +39,32 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium, the situation is even worse.  Itanium architecture is such
+ * that the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ * -- Kevin McCarty
+ */
+	
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+# if defined (__ia64__)
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a +
+	  (((unsigned long)a > 0x80000000) ? autobase : 0x6000000000000000);
+  b = (unsigned long)b +
+	  (((unsigned long)b > 0x80000000) ? autobase : 0x6000000000000000);
+# endif
 #else
      char **ja, **jb;
      int *nn;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 09:45:33.650333320 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 10:05:36.432482640 +0000
@@ -42,6 +42,19 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium, the situation is even worse.  Itanium architecture is such
+ * that the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ * -- Kevin McCarty
+ */
+
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *na, *nb;
@@ -56,6 +69,13 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+# if defined (__ia64__)
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a +
+          (((unsigned long)a > 0x80000000) ? autobase : 0x6000000000000000);
+  b = (unsigned long)b +
+          (((unsigned long)b > 0x80000000) ? autobase : 0x6000000000000000);
+# endif
 #else
      char **ja, **jb;
      int *na, *nb;

cernlib_2005.05.09.dfsg-3.diff:

--- NEW FILE cernlib_2005.05.09.dfsg-3.diff ---
--- cernlib-2005.05.09.dfsg.orig/debian/control
+++ cernlib-2005.05.09.dfsg/debian/control
@@ -0,0 +1,896 @@
+Source: cernlib
+Maintainer: Kevin B. McCarty 
+Standards-Version: 3.6.2
+Priority: optional
+Section: science
+Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin
+
+Package: cernlib-base
+Architecture: all
+Section: devel
+Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev
+Description: script to determine Cernlib library dependencies
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This package includes the "cernlib" script that lists the command-line
+ options needed for linking against Cernlib libraries.  The script has
+ been rewritten from the upstream version to calculate
+ dependencies recursively.  Also included are a README.Debian with a summary
+ of changes made to Cernlib to fit it into Debian packaging practices,
+ and a contributed set of Autoconf macros to test for Cernlib libraries.
+
+Package: cernlib-core-dev
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit
+Description: Cernlib development headers, tools, and static libraries
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides the header files and static libraries likely to be
+ wanted by developers using the Cern libraries who are not interested
+ specifically in high energy physics.  It also provides the Cernlib
+ development tools DZedit and KUIPC.  Cernlib analysis programs may be
+ obtained by installing the cernlib-core metapackage.
+
+Package: cernlib-core
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos
+Description: Cernlib main libraries and programs
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides the libraries and analysis tools (e.g. PAW) likely
+ to be wanted by most users of the Cern libraries who are not interested
+ specifically in high energy physics.  You cannot do program development by
+ installing only this metapackage; development libraries and tools may
+ be obtained by installing the cernlib-core-dev metapackage or individual
+ lib*-dev packages.
+
+Package: cernlib-extras
+Architecture: all
+Priority: extra
+Section: science
+Depends: cernlib-base (= ${Source-Version}), pawserv, zftp
+Description: miscellaneous Cernlib programs unlikely to be used by many
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides a few additional Cernlib programs not included
+ in any other Cernlib metapackage.  Very few people are likely to be
+ interested in them; currently they include zftp, pawserv and zserv.
+ Notice that the latter two programs run as daemons through inetd and may
+ reduce your system's security!
+ .
+ Installing this package along with the "cernlib" metapackage will supply
+ a complete set of all Cernlib programs and libraries included in Debian.
+
+Package: cernlib-montecarlo
+Architecture: all
+Section: science
+Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev
+Recommends: libisajet758-2-dev
+Description: Cernlib Monte Carlo libraries
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides various Monte Carlo libraries included in Cernlib
+ (both shared and static).  Likely only physicists will be interested in
+ these packages.  Note that the Geant 3.21 program is not included, but it may
+ be obtained by also installing the geant321 Debian package.
+ .
+ Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are
+ not available within Debian due to licensing issues; see the README.Debian
+ file in the montecarlo-base package for information on obtaining them.
+ .
+ Additionally, the Isajet library is not available on the m68k architecture
+ due to a compiler flaw.
+
+Package: cernlib
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev
+Description: almost complete set of Debian Cernlib packages
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides almost all of the programs and libraries contained
+ in Cernlib.  Most people will likely want only a subset of these.  A few
+ extra Cernlib programs, not of interest to many people, may be obtained via
+ the cernlib-extras metapackage.
+
+Package: dzedit
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: libpacklib1-dev
+Description: Cernlib's ZEBRA documentation editor
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system
+ developed at CERN.  ZEBRA, part of the Packlib library, permits a developer to
+ create complex data structures in the FORTRAN 77 language; the DZDOC system
+ allows the developer to generate and maintain documentation of ZEBRA data
+ structures.
+
+Package: geant321-data
+Architecture: all
+Section: science
+Depends: cernlib-base
+Description: [Physics] Data for Geant 3.21 detector simulator
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes data files for use by Geant.
+
+Package: geant321-doc
+Architecture: all
+Section: doc
+Depends: cernlib-base
+Description: [Physics] Documentation for Geant 3.21
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes some documentation about Geant.
+
+Package: geant321
+Architecture: all
+Section: science
+Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77
+Suggests: kxterm, geant321-doc
+Description: [Physics] Particle detector description and simulation tool
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes gxint, the script used to perform this linking step.
+
+Package: kuipc
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, cernlib-base
+Recommends: libpacklib1-dev
+Suggests: libpacklib1-lesstif-dev
+Description: Cernlib's Kit for a User Interface Package (KUIP) compiler
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify
+ the writing of a program's user interface code.  It takes as
+ input a Command Definition File (CDF) that describes the
+ commands to be understood by the program, and outputs C or FORTRAN code that
+ makes the appropriate function calls to set up the user interface.  This
+ code can then be compiled and linked with the rest of the program.  Since
+ the generated code uses KUIP routines, the program must also be linked
+ against the Packlib library that contains them.
+ .
+ KUIPC is no longer actively developed, so aside from its use in the build
+ process of Cernlib, it is of mainly historical interest.
+
+Package: kxterm
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}, cernlib-base
+Description: Cernlib's KUIP terminal emulator
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ KXterm is a terminal emulator which combines the best features from
+ the (now defunct) Apollo DM pads (like: input and transcript
[...20906 lines suppressed...]
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ./pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, C??? hai"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "M??y ph???c v??? c???n ch???y t??? tr??nh inetd"
+
+#. Type: select
+#. Description
+#: ./pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr "G??i tin n??y bao g???m c??? hai tr??nh n???n (d??mon) pawserv (m?? cho ph??p m??y t??? xa ?????c t???p tin ?????a ph????ng trong khi ch???y PAW/Paw++) v?? tr??nh n???n zserv (m?? cho ph??p m??y t??? xa ????ng nh???p d??ng giao th???c ZFTP c???a CERN). C??? hai tr??nh ph???c v??? n??y ???????c ch???y t??? tr??nh n???n inetd; b???n c?? th??? hi???u l???c m???t hay c??? hai ??i???u. Tuy nhi??n, tr??? b???n c???n thi???t l??m vi???c r???t ?????c bi???t, r???t c?? th??? l?? b???n s??? mu???n hi???u l???c ch??? tr??nh pawserv."
--- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po
+++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po
@@ -0,0 +1,55 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib\n"
+"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-05-26 16:05-0300\n"
+"Last-Translator: Andr? Lu?s Lopes \n"
+"Language-Team: Debian-BR Project \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Ambos"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servidores a serem executados a partir do inetd"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr ""
+"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos "
+"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv "
+"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP "
+"do CERN). Esses servidores s?o executados a partir do inetd; voc? "
+"pode habilitar cada um deles separadamente ou ambos. A menos que voc? "
+"possua necessidades bastante especializadas, voc? provavelmente ir? "
+"desejar habilitar somente o pawserv."
--- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po
+++ cernlib-2005.05.09.dfsg/debian/po/sv.po
@@ -0,0 +1,53 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib 2005.05.09-4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-10-06 23:50+0200\n"
+"Last-Translator: Daniel Nylander \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, B?da"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servrar som ska k?ras fr?n inetd"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr ""
+"Detta paket inkluderar b?de pawserver-daemonen (till?ter fj?rrsystem att "
+"l?sa lokala filer n?r PAW/Paw++ k?rs) och zserv-daemonen (till?ter fj?rrsystem "
+"att logga in med CERN's ZFTP-protokoll).  Dessa servrar k?rs fr?n inetd; du m?ste "
+"aktivera n?gon eller b?da av dom. Om du inte har speciella krav s? r?cker det gott "
+"om pawserv aktiveras."
+
--- cernlib-2005.05.09.dfsg.orig/debian/po/es.po
+++ cernlib-2005.05.09.dfsg/debian/po/es.po
@@ -0,0 +1,55 @@
+# cernlib po-debconf translation to Spanish
+# Copyright (C) 2005 Software in the Public Interest
+# This file is distributed under the same license as the cernlib package.
+#
+# Changes:
+#  - Initial translation
+#         C??sar G??mez Mart??n 
+#
+#   Traductores, si no conoce el formato PO, merece la pena leer la
+#   documentaci??n de gettext, especialmente las secciones dedicadas a este
+#   formato, por ejemplo ejecutando:
+#          info -n '(gettext)PO Files'
+#          info -n '(gettext)Header Entry'
+# Equipo de traducci??n al espa??ol, por favor, lean antes de traducir
+# los siguientes documentos:
+#
+#  - El proyecto de traducci??n de Debian al espa??ol
+#    http://www.debian.org/intl/spanish/
+#    especialmente las notas de traducci??n en
+#    http://www.debian.org/intl/spanish/notas
+#
+#  - La gu??a de traducci??n de po's de debconf:
+#    /usr/share/doc/po-debconf/README-trans
+#    o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-09-01 17:49+0100\n"
+"Last-Translator: C??sar G??mez Mart??n \n"
+"Language-Team: Debian l10n spanish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: SPAIN\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Type: select
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Ambos"
+
+#. Type: select
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servidores a ejecutar desde inetd"
+
+#. Type: select
+#: ../pawserv.templates.master:6
+msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol).  These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv."
+msgstr "Este paquete incluye el demonio pawserv (permite a las m??quinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++)  y el demonio zserv (permite a las m??quinas remotas conectarse a trav??s del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo m??s probable es que s??lo quiera habilitar pawserv."
+


Index: 304-update-Imake-config-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/304-update-Imake-config-files.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 304-update-Imake-config-files.dpatch	9 Dec 2005 16:09:19 -0000	1.1
+++ 304-update-Imake-config-files.dpatch	14 Dec 2005 16:15:57 -0000	1.2
@@ -7,25 +7,17 @@
 ## DP: to support most Linux architectures.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/Imake.cf /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/Imake.cf
---- cernlib-2005.05.09/src/config/Imake.cf	2004-10-05 11:54:40.000000000 -0400
-+++ /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/Imake.cf	2005-06-09 10:47:36.470829080 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.cf cernlib-2005.05.09.dfsg/src/config/Imake.cf
+--- cernlib-2005.05.09.dfsg~/src/config/Imake.cf	2004-10-05 11:54:40.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/Imake.cf	2005-12-12 09:42:08.529220732 -0500
 @@ -1,24 +1,10 @@
 -/* $Id$
 - *
 - * $Log$
-- * Revision 1.1  2005/12/09 16:09:19  pertusus
-- * - use new debian patchset
-- * - enable 64 bit fixes patch
-- * - remove the BSD in the licence because there is no library nor binary
-- *   under a BSD licence and someone could get the idea that there is
-- *   some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
-- *   because of cfortran
-- * - update with newer debian patchset for cernlib, fix licence issues
-- * - build shared libraries
-- * - simplify the scripts modifications
+- * Revision 1.2  2005/12/14 16:15:57  pertusus
+- * - use newer debian patchset
 - *
-- * sync with devel
+- * retry build on x86_64, who knows...
 - *
 - * Revision 1.5  2004/10/05 15:54:40  mclareni
 - * Add configuration file linux-lp64 for Linux 64-bit pointer systems like AMD Opteron and Intel IA64.
@@ -1280,9 +1272,9 @@
  
  #ifndef MacroIncludeFile
  XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
-diff -urNad cernlib-2005.05.09/src/config/linux.cf /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/linux.cf
---- cernlib-2005.05.09/src/config/linux.cf	2004-10-05 11:56:45.000000000 -0400
-+++ /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/linux.cf	2005-06-09 10:47:36.471828868 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/linux.cf cernlib-2005.05.09.dfsg/src/config/linux.cf
+--- cernlib-2005.05.09.dfsg~/src/config/linux.cf	2004-10-05 11:56:45.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/linux.cf	2005-12-12 09:42:42.505976387 -0500
 @@ -65,20 +65,20 @@
  #define OSVendor		/**/
  #define OSMajorVersion		2
@@ -1308,7 +1300,7 @@
  #endif
  #define HasPutenv		YES
  #define HasShm			YES
-@@ -94,38 +94,300 @@
+@@ -94,38 +94,302 @@
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
@@ -1599,6 +1591,8 @@
 +#  define OptimizedCDebugFlags  OptimizationLevel
 +# endif
 +# define LinuxMachineDefines    -D__x86_64__
++# define DefaultFCOptions       -fno-automatic \
++                                -fno-second-underscore -fugly-complex
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 +# define CernlibMachineDefines  -DCERNLIB_QMLXIA64
@@ -1623,7 +1617,7 @@
  /* Some of these man page defaults are overriden in the above OS sections */
  #ifndef ManSuffix
  # define ManSuffix	1x
-@@ -160,7 +422,7 @@
+@@ -160,7 +424,7 @@
  #define FortranSaveFlags	/* */ /* Everything static !? */
  #define OptimisedFortranFlags   -g -pc 64 -tp p6
  #define DefaultFCOptions        -Msave -fpic -Kieee
@@ -1632,7 +1626,7 @@
  
  #else
  
-@@ -171,19 +433,18 @@
+@@ -171,19 +435,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1664,7 +1658,7 @@
   
  #else
  
-@@ -194,19 +455,18 @@
+@@ -194,19 +457,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1696,7 +1690,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */
-@@ -221,17 +481,32 @@
+@@ -221,17 +483,32 @@
  /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */
  /*  Adapted to CERN style GF. 20-Sep-96 */
  
@@ -1732,7 +1726,7 @@
  
  # endif
  # endif
-@@ -251,7 +526,7 @@
+@@ -251,7 +528,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */


Index: 307-use-canonical-cfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/307-use-canonical-cfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 307-use-canonical-cfortran.dpatch	9 Dec 2005 16:09:19 -0000	1.1
+++ 307-use-canonical-cfortran.dpatch	14 Dec 2005 16:15:57 -0000	1.2
@@ -6,10 +6,10 @@
 ## DP: Debian package of cfortran, version 4.4-6.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.doc /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc
---- cernlib-2005.05.09/src/cfortran/cfortran.doc	1998-12-11 12:17:09.000000000 -0500
-+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc	2004-12-10 10:47:33.000000000 -0500
-@@ -195,7 +195,7 @@
+diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc	1998-12-11 17:17:09.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc	2005-12-09 18:01:09.000000000 +0000
+@@ -195,13 +195,13 @@
  HP9000> f77 -c cfortex.f
  HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest
  
@@ -18,7 +18,28 @@
  HP9000> # #define hpuxFortran800
  HP9000> cc -c -Aa -DhpuxFortran800 cfortest.c
  HP9000> f77 +800 -o cfortest cfortest.o cfortex.f
-@@ -643,7 +643,7 @@
+ 
+ f2c> # In the following, 'CC' is any C compiler.
+-f2c> f2c -R cfortex.f
++f2c> f2c cfortex.f
+ f2c> CC -o cfortest -Df2cFortran cfortest.c cfortex.c -lf2c  &&  cfortest
+ 
+ Portland Group $ # Presumably other C compilers also work.
+@@ -533,9 +533,10 @@
+ FORTRAN_REAL thus corresponds to FORTRAN's REAL on all machines, including t3e.
+ 
+ 
+-o f2c
+-  f2c, by default promotes REAL functions to double. cfortran.h does not (yet)
+-support this, so the f2c -R option must be used to turn this promotion off.
++o f2c / g77
++  f2c and g77 by default promote REAL functions to double.  As of December 9,
++2005, the Debian package of cfortran supports this behavior, so the f2c -R
++option must *NOT* be used to turn this promotion off.
+ 
+ o f2c
+ [Thanks to Dario Autiero for pointing out the following.]
+@@ -643,7 +644,7 @@
     [For an ancient math.h on a 386 or sparc, get similar from a new math.h.]
     #ifdef mc68000     /* 5 lines Copyright (c) 1988 by Sun Microsystems, Inc. */
     #define FLOATFUNCTIONTYPE	int
@@ -27,7 +48,7 @@
     #define ASSIGNFLOAT(x,y)	*(int *)(&x) = y
     #endif
  
-@@ -874,7 +874,7 @@
+@@ -874,7 +875,7 @@
  works everywhere and would seem to be an obvious choice.
  
  
@@ -36,7 +57,7 @@
  
  cfortran.h encourages the exact specification of the type and dimension of
  array parameters because it allows the C compiler to detect errors in the
-@@ -1835,7 +1835,7 @@
+@@ -1835,7 +1836,7 @@
  
  Unlike all other C compilers supported by cfortran.h,
  'gcc -traditional' promotes to double all functions returning float
@@ -45,7 +66,7 @@
  
  /* m.c */
  #include 
-@@ -2017,8 +2017,9 @@
+@@ -2017,8 +2018,9 @@
  
  THIS PACKAGE, I.E. CFORTRAN.H, THIS DOCUMENT, AND THE CFORTRAN.H EXAMPLE
  PROGRAMS ARE PROPERTY OF THE AUTHOR WHO RESERVES ALL RIGHTS. THIS PACKAGE AND
@@ -57,16 +78,16 @@
  - YOU MUST ACCOMPANY ANY COPIES OR DISTRIBUTION WITH THIS (UNALTERED) NOTICE.
  - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA 
    (E.G. TAPE, DISK, COMPUTER, PAPER.)
-diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.h /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h
---- cernlib-2005.05.09/src/cfortran/cfortran.h	2002-09-11 13:05:51.000000000 -0400
-+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h	2004-12-10 10:47:34.000000000 -0500
+diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h	2002-09-11 17:05:51.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h	2005-12-09 18:01:09.000000000 +0000
 @@ -1,4 +1,4 @@
 -/* cfortran.h  4.4_cernlib2002 */
 +/* cfortran.h  4.4 */
  /* http://www-zeus.desy.de/~burow/cfortran/                   */
  /* Burkhard Burow  burow at desy.de                 1990 - 2002. */
  
-@@ -11,6 +11,32 @@
+@@ -11,6 +11,35 @@
     MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE.
  */
  
@@ -94,12 +115,15 @@
 +
 +      Nov 2003: If __INTEL_COMPILER or INTEL_COMPILER defined, also define
 +                f2cFortran (KMCCARTY)
++      Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN
++                returning "double" in C.  This was one of the items on
++		Burkhard's TODO list. (KMCCARTY)
 + *******/
 +
  /* 
    Avoid symbols already used by compilers and system *.h:
    __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c
-@@ -75,7 +101,8 @@
+@@ -75,7 +104,8 @@
  
  /* Remainder of cfortran.h depends on the Fortran compiler. */
  
@@ -109,7 +133,7 @@
  #define f2cFortran
  #endif
  
-@@ -90,6 +117,27 @@
+@@ -90,6 +120,27 @@
                             Support f2c or f77 with gcc, vcc with f2c. 
                             f77 with vcc works, missing link magic for f77 I/O.*/
  #endif
@@ -137,7 +161,7 @@
  #if defined(__hpux)             /* 921107: Use __hpux instead of __hp9000s300 */
  #define       hpuxFortran       /*         Should also allow hp9000s7/800 use.*/
  #endif
-@@ -131,6 +179,7 @@
+@@ -131,6 +182,7 @@
  #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
  /* If your compiler barfs on ' #error', replace # with the trigraph for #     */
   #error "cfortran.h:  Can't find your environment among:\
@@ -145,7 +169,7 @@
      - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...)     \
      - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000     \
      - VAX   VMS CC 3.1 and FORTRAN 5.4.                                  \
-@@ -151,7 +200,8 @@
+@@ -151,7 +203,8 @@
      - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran          \
      - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \
      - Absoft Pro Fortran: Use #define AbsoftProFortran \
@@ -155,7 +179,7 @@
  /* Compiler must throw us out at this point! */
  #endif
  #endif
-@@ -164,7 +214,8 @@
+@@ -164,7 +217,8 @@
  
  /* Throughout cfortran.h we use: UN = Uppercase Name.  LN = Lowercase Name.   */
  
@@ -165,7 +189,7 @@
  #define CFC_(UN,LN)            _(LN,_)      /* Lowercase FORTRAN symbols.     */
  #define orig_fcallsc(UN,LN)    CFC_(UN,LN)
  #else 
-@@ -268,7 +319,8 @@
+@@ -268,7 +322,8 @@
  #endif
  
  #ifndef apolloFortran
@@ -175,7 +199,7 @@
  #define CF_NULL_PROTO
  #else                                         /* HP doesn't understand #elif. */
  /* Without ANSI prototyping, Apollo promotes float functions to double.    */
-@@ -512,7 +564,7 @@
+@@ -512,7 +567,7 @@
                      *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO)  ),   \
    (F).dsc$a_a0    =  ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length          ,(F))
  
@@ -184,7 +208,7 @@
  #define _NUM_ELEMS      -1
  #define _NUM_ELEM_ARG   -2
  #define NUM_ELEMS(A)    A,_NUM_ELEMS
-@@ -540,7 +592,8 @@
+@@ -540,7 +595,8 @@
  }
  return (int)num;
  }
@@ -194,3 +218,56 @@
  /*-------------------------------------------------------------------------*/
  
  /*           UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS       */
+@@ -1451,7 +1507,12 @@
+ #define      BYTE_cfPU(A)   CFextern INTEGER_BYTE      FCALLSC_QUALIFIER A
+ #define    DOUBLE_cfPU(A)   CFextern DOUBLE_PRECISION  FCALLSC_QUALIFIER A
+ #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define     FLOAT_cfPU(A)   CFextern DOUBLE_PRECISION  FCALLSC_QUALIFIER A
++#else
+ #define     FLOAT_cfPU(A)   CFextern FORTRAN_REAL      FCALLSC_QUALIFIER A
++#endif
+ #else				   	                   
+ #define     FLOAT_cfPU(A)   CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A
+ #endif				   	                   
+@@ -2088,7 +2149,12 @@
+ #ifndef __CF__KnR
+ /* The void is req'd by the Apollo, to make this an ANSI function declaration.
+    The Apollo promotes K&R float functions to double. */
+-#define   FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define FLOAT_cfFZ(UN,LN) DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#else
++#define FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#endif
+ #ifdef vmsFortran
+ #define  STRING_cfFZ(UN,LN) void  FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS
+ #else
+@@ -2104,7 +2170,12 @@
+ #endif
+ #else
+ #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define   FLOAT_cfFZ(UN,LN) DOUBLE_PRECISION  FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#else
+ #define   FLOAT_cfFZ(UN,LN) FORTRAN_REAL      FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#endif
+ #else
+ #define   FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)(
+ #endif
+@@ -2118,7 +2189,12 @@
+ #define    BYTE_cfF(UN,LN)     BYTE_cfFZ(UN,LN)
+ #define  DOUBLE_cfF(UN,LN)   DOUBLE_cfFZ(UN,LN)
+ #ifndef __CF_KnR
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define   FLOAT_cfF(UN,LN)  DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#else
+ #define   FLOAT_cfF(UN,LN)  FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#endif
+ #else
+ #define   FLOAT_cfF(UN,LN)    FLOAT_cfFZ(UN,LN)
+ #endif


Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 315-fixes-for-MacOSX.dpatch	9 Dec 2005 17:28:12 -0000	1.2
+++ 315-fixes-for-MacOSX.dpatch	14 Dec 2005 16:15:57 -0000	1.3
@@ -6,9 +6,25 @@
 ## DP: and run on OS X.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/Imake.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules
---- cernlib-2005.05.09/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/Imakefile	2005-12-07 14:47:34.141148558 -0500
+@@ -7,8 +7,12 @@
+ SUBDIRS= $(LIBDIRS) patchy cfortran
+ 
+ #ifdef CERNLIB_UNIX
++#ifdef CERNLIB_MACOSX
++SUBDIRS:= $(SUBDIRS) scripts
++#else
+ SUBDIRS:= $(SUBDIRS) scripts mgr
+ #endif
++#endif
+ 
+ InstallLibSubdirs($(LIBDIRS))
+ 
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
+--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2005-12-07 14:47:34.139148983 -0500
 @@ -2171,7 +2171,7 @@
  #define CppScriptTarget(dst,src,defs,deplist)				@@\
  dst::  src deplist							@@\
@@ -27,9 +43,9 @@
  									@@\
  clean::									@@\
  	RemoveFiles(dst)
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf
---- cernlib-2005.05.09/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.cf cernlib-2005.05.09.dfsg/src/config/MacOSX.cf
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.cf	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,170 @@
 +XCOMM platform:  $SFO: MOSXS.cf,v 1.0 95/11/19 23:21:00 sl Exp $
 +
@@ -201,9 +217,9 @@
 +/* End  CERNLIB changes */
 +
 +
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules
---- cernlib-2005.05.09/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.rules cernlib-2005.05.09.dfsg/src/config/MacOSX.rules
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.rules	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,123 @@
 +XCOMM $XConsortium: MOSXS.rules,v 1.1 97/12/12 15:34:45 sl Exp $
 +
@@ -328,9 +344,9 @@
 +#endif
 +
 +
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.tmpl /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl
---- cernlib-2005.05.09/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.tmpl cernlib-2005.05.09.dfsg/src/config/MacOSX.tmpl
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.tmpl	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,67 @@
 +XCOMM $XConsortium: MOSXS.tmpl,v 1.2 97/12/12 19:07:12 sl Exp $
 +
@@ -399,9 +415,9 @@
 +#define SharedFSRev F
 +SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
 +
-diff -urNad cernlib-2005.05.09/src/config/site.def /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def
---- cernlib-2005.05.09/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/site.def cernlib-2005.05.09.dfsg/src/config/site.def
+--- cernlib-2005.05.09.dfsg~/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/site.def	2005-12-07 14:47:34.140148771 -0500
 @@ -99,9 +99,7 @@
  /*   if it is already defined and false, undef it! */
  /* do not use shift by default
@@ -413,9 +429,9 @@
  #undef CERNLIB_SHIFT
  #endif
  #endif
-diff -urNad cernlib-2005.05.09/src/geant321/gxint/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile
---- cernlib-2005.05.09/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gxint/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gxint/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/geant321/gxint/Imakefile	2005-12-07 14:47:34.140148771 -0500
 @@ -30,7 +30,7 @@
  
  gxint321.f:  gxint.F
@@ -425,25 +441,9 @@
  
  install.lib:: $(CERN_LIBDIR)/gxint.f
  
-diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile
---- cernlib-2005.05.09/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile	2005-06-09 15:52:06.471072296 -0400
-@@ -7,8 +7,12 @@
- SUBDIRS= $(LIBDIRS) patchy cfortran
- 
- #ifdef CERNLIB_UNIX
-+#ifdef CERNLIB_MACOSX
-+SUBDIRS:= $(SUBDIRS) scripts
-+#else
- SUBDIRS:= $(SUBDIRS) scripts mgr
- #endif
-+#endif
- 
- InstallLibSubdirs($(LIBDIRS))
- 
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F
---- cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c327m.F cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c327m.F
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c327m.F	2005-12-07 14:47:34.141148558 -0500
 @@ -92,7 +92,11 @@
  #endif
        ENDIF
@@ -456,9 +456,9 @@
         IF(IDS .EQ. 1) THEN
        ERRMAX=MAX(ERRMAX,ABS(H1-T1))
        LTEST= LTEST .AND. ERRMAX .LE.  TSTERR
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F
---- cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c342m.F cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c342m.F
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c342m.F	2005-12-07 14:47:34.141148558 -0500
 @@ -70,7 +70,11 @@
  #endif
        END IF
@@ -471,9 +471,9 @@
        ERMAX= MAX(ERMAX,ABS(R1-T1))
        IF(IDS .EQ. 3 .OR. IDS .EQ. 4) THEN
         WRITE(LOUT,'(1X,F10.3,2F25.16,1P,D10.1)') SX,R,T,ABS(R1-T1)
-diff -urNad cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile
---- cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/data/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/data/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/data/Imakefile	2005-12-07 14:47:34.141148558 -0500
 @@ -1,11 +1,11 @@
  
  .SUFFIXES:
@@ -488,9 +488,9 @@
  
  PackageDirFileTarget(cojets.dat)
  
-diff -urNad cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile
---- cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/data/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/data/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/data/Imakefile	2005-12-07 14:47:34.141148558 -0500
 @@ -1,9 +1,9 @@
  
  .SUFFIXES:
@@ -503,9 +503,9 @@
  
  PackageDirFileTarget(isajet.dat)
  
-diff -urNad cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c
---- cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/sysreq/log.c cernlib-2005.05.09.dfsg/src/packlib/cspack/sysreq/log.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/cspack/sysreq/log.c	2005-12-07 14:47:34.142148345 -0500
 @@ -80,7 +80,7 @@
  static int pid;                 /* process identifier                   */
  static int logfd ;              /* logging file descriptor              */
@@ -515,9 +515,9 @@
  extern int syslog();
  #endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX */
  extern char *getenv();
-diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
---- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:51:53.621804393 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.05.09.dfsg/src/packlib/cspack/tcpaw/tcpaw.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c	2005-12-07 14:47:25.920897902 -0500
++++ cernlib-2005.05.09.dfsg/src/packlib/cspack/tcpaw/tcpaw.c	2005-12-07 14:47:34.146147494 -0500
 @@ -2569,7 +2569,7 @@
  #if !defined(IBM) && !defined(_WIN32)
  /* I provide "getpass" myself as standard version truncates to 8 characters */
@@ -559,9 +559,9 @@
 +  return result;
 +}
 +#endif /* CERNLIB_MACOSX */
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c
---- cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernbit/z268/systems.c cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernbit/z268/systems.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernbit/z268/systems.c	2005-12-07 14:47:34.146147494 -0500
 @@ -200,7 +200,7 @@
  || defined(_IBMR2) \
  || defined(__convexc__) \
@@ -571,9 +571,9 @@
  
    void systems_( command, buf, buflen, l, chars, rc, ovflw )
  
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/d704fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/d704fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-12-07 14:47:34.146147494 -0500
 @@ -4,6 +4,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -585,9 +585,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f002fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f002fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-12-07 14:47:34.146147494 -0500
 @@ -10,6 +10,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -599,9 +599,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f003fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f003fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -11,6 +11,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -613,9 +613,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f004fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f004fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -6,6 +6,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -627,9 +627,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f010fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f010fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -7,6 +7,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -641,9 +641,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  	 
  
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f011fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f011fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -7,6 +7,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -655,9 +655,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h
---- cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	2005-06-09 15:52:06.487068895 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kuip/kuip/ksys.h cernlib-2005.05.09.dfsg/src/packlib/kuip/kuip/ksys.h
+--- cernlib-2005.05.09.dfsg~/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kuip/kuip/ksys.h	2005-12-07 14:47:34.147147281 -0500
 @@ -188,6 +188,17 @@
  #endif
  
@@ -676,15 +676,15 @@
  #ifdef MSDOS
  #  define MACHINE_NAME "IBMPC"
  #  define OS_NAME "MSDOS"
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
---- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F	2005-12-07 14:47:25.807921944 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F	2005-12-07 14:55:23.810167859 -0500
 @@ -38,7 +38,12 @@
              IFCS=-2
              CALL CSRTGPL(I)
  #else
-+c     thanks to Keisuke Fujii for this patch for OS X
-+#if defined(CERNLIB_MACOSX)
++c     thanks to Keisuke Fujii for this patch for OS X            
++#if defined (CERNLIB_MACOSX)
 +          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else
            IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
@@ -696,7 +696,7 @@
            I=CSITGPL(IPVS)
          ENDIF
  #else
-+#if defined(CERNLIB_MACOSX)
++#if defined (CERNLIB_MACOSX)
 +        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else
          IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
@@ -704,9 +704,9 @@
          IF(IADGP.NE.0)THEN
            IFCS=-2
            ITYPGP=-2
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
---- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:51:53.524825013 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:57:50.699841388 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cscrexec.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cscrexec.F
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cscrexec.F	2005-12-07 14:47:25.687947476 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cscrexec.F	2005-12-07 14:47:34.148147068 -0500
 @@ -82,11 +82,19 @@
        IF(FEXT.EQ.'.c')THEN
          L=LENOCC(CHCC)
@@ -743,9 +743,9 @@
  #endif
  #if defined(CERNLIB_ALPHA_OSF)
          CHLINE=                   'ld -shared -o '
-diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
---- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/programs/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/paw/programs/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/pawlib/paw/programs/Imakefile	2005-12-07 14:47:34.148147068 -0500
 @@ -9,7 +9,7 @@
  EXTRA_LDOPTIONS=-Wl,-E
  #endif


Index: 701-patch-hbook-comis-Imakefiles.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/701-patch-hbook-comis-Imakefiles.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 701-patch-hbook-comis-Imakefiles.dpatch	9 Dec 2005 16:09:19 -0000	1.1
+++ 701-patch-hbook-comis-Imakefiles.dpatch	14 Dec 2005 16:15:57 -0000	1.2
@@ -6,9 +6,9 @@
 ## DP: 701 dpatch (a shell script).
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/packlib/hbook/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile
---- cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
-+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	2005-06-10 17:04:08.866020136 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/code/Imakefile cernlib-2005.05.09.dfsg/src/packlib/hbook/code/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/hbook/code/Imakefile	2005-12-07 14:59:31.519940694 -0500
 @@ -19,8 +19,8 @@
  	hgn.F hgnf.F hgnpar.F hgstat.F hhipar.F hhxye.F hi.F \ @@\
  	hictoi.F hid1.F hid2.F hidall.F hidopt.F hidpos.F hie.F  \ @@\
@@ -20,9 +20,9 @@
  	hkind.F hknul1.F hknuli.F hlabel.F hlabeq.F hlabnb.F \ @@\
  	hlattr.F hlccmp.F hldir.F hldir1.F hldir2.F hldirt.F \ @@\
  	hlgnxt.F hlhcmp.F hlimit.F hllsq.F hlnext.F hlocat.F \ @@\
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
---- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:02:24.843306185 -0400
-+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:05:09.955931988 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile	2005-12-07 14:59:22.782783593 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile	2005-12-07 14:59:31.519940694 -0500
 @@ -37,7 +37,8 @@
  	csspar.F cssubr.F cssvpt.F cstadv.F cstarr.F csterr.F cstext.F \ @@\
  	cstfrf.F cstinf.F cstlgb.F cstlog.F cstpar.F cstran.F cstrer.F \ @@\


Index: cernlib.m4
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib.m4	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib.m4	14 Dec 2005 16:15:57 -0000	1.2
@@ -1,6 +1,6 @@
 dnl                                                      -*- Autoconf -*- 
 dnl  autoconf macros for the cernlib libraries
-dnl  Copyright (C) 2004 Patrice Dumas
+dnl  Copyright (C) 2004, 2005 Patrice Dumas
 dnl
 dnl  This program is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
@@ -16,28 +16,33 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-dnl A basic axample of the macros usage:
+dnl A basic axample of the macro usage:
 dnl 
-dnl AC_CERNLIB
-dnl AC_LIB_CERNLIB(kernlib,CLTOU)
-dnl AC_LIB_CERNLIB(mathlib,GAUSS)
-dnl LIBS="$CERNLIB_LIBS $LIBS"
-
-dnl The macro AC_CERNLIB tries to determine the cernlib location and
-dnl whether the linking should be static or not. It should be called once and
-dnl before a particular cernlib library is detected with the second macro.
+dnl AC_LIB_CERNLIB(kernlib,CLTOU,
+dnl [
+dnl    AC_LIB_CERNLIB(mathlib,GAUSS,[LIBS="$CERNLIB_LIBS $LIBS"])
+dnl ])
+
+dnl
 dnl --with-static-cernlib forces the static or dynamic linking.
 dnl --with-cernlib gives the location of cernlib.
 dnl
-dnl If the type of linking isn't forced it is detected as follow:
-dnl - if the environment variable CERNLIB exists it is assumed to be the
+dnl If the type of linking isn't specified it is assumed to be static.
+dnl
+dnl For static linking:
+dnl - if the binary program 'cernlib-static' or 'cernlib' is in the path it is 
+dnl   assumed that a static linking using the information reported by that 
+dnl   script is wanted.
+dnl - otherwise if the environment variable CERNLIB exists it is assumed to be the
 dnl   location of the static library.
 dnl - otherwise if the environment variable CERN_ROOT exists it is assumed 
 dnl   that CERN_ROOT/lib is the location of the static library.
-dnl - otherwise if the binary program 'cernlib' is in the path it is assumed 
-dnl   that a static linking using the information reported by that binary is 
-dnl   wanted.
-dnl - otherwise a dynamic linking is performed.
+dnl - otherwise a simple linking is performed.
+dnl 
+dnl If a dynamic linking is selected:
+dnl - if the binary program 'cernlib' is in the path it is assumed that it is the 
+dnl   debian script and it is called with -dy.
+dnl - otherwise a simple linking is performed.
 dnl
 dnl AC_LIB_CERNLIB ([LIBRARY = kernlib], [FUNCTION = CLTOU], [ACTION-IF-FOUND],
 dnl          [ACTION-IF-NOT-FOUND]) 
@@ -53,7 +58,7 @@
 # statically linked or not.
 AC_DEFUN([AC_CERNLIB], [
 CERNLIB_LIB_PATH=
-CERNLIB_STATIC=
+CERNLIB_STATIC=yes
 AC_ARG_WITH(static_cernlib,
 [  --with-static-cernlib             link statically with the cernlib],
 [  CERNLIB_STATIC=$withval      ])
@@ -64,27 +69,24 @@
 
 
 if test "z$CERNLIB_STATIC" != "zno"; then    
-    CERNLIB_BIN=no
+    CERNLIB_STATIC=yes
     if test "z$CERNLIB_LIB_PATH" = z; then
-        if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
-            CERNLIB_LIB_PATH=$CERNLIB
-            CERNLIB_STATIC="yes"
-            AC_MSG_NOTICE([using the CERNLIB environment variable for cernlib location])
-        elif test "z$CERN_ROOT" != z -a -d "$CERN_ROOT/lib"; then
-            CERNLIB_LIB_PATH=$CERN_ROOT/lib
-            CERNLIB_STATIC="yes"
-            AC_MSG_NOTICE([using the CERN_ROOT environment variable for cernlib location])
-        fi
-        if test "z$CERNLIB_LIB_PATH" = "z"; then
+        AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no)
+        if test $CERNLIB_BIN = no; then
             AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
-            if test $CERNLIB_BIN != no; then
-                CERNLIB_STATIC="yes"
+        fi
+        if test $CERNLIB_BIN = no; then
+            if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
+               CERNLIB_LIB_PATH=$CERNLIB
+               AC_MSG_NOTICE([using the CERNLIB environment variable for cernlib location])
+            elif test "z$CERN_ROOT" != z -a -d "$CERN_ROOT/lib"; then
+                CERNLIB_LIB_PATH=$CERN_ROOT/lib
+                AC_MSG_NOTICE([using the CERN_ROOT environment variable for cernlib location])
             fi
         fi
     fi
-fi
-
-if test "z$CERNLIB_STATIC" != "zyes"; then
+else
+    AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
     if test "z$CERNLIB_LIB_PATH" != z; then
          LDFLAGS="$LDFLAGS -L$CERNLIB_LIB_PATH"
     fi
@@ -95,6 +97,7 @@
 #          [ACTION-IF-NOT-FOUND]) 
 # check for a function in a library of the cernlib
 AC_DEFUN([AC_LIB_CERNLIB], [
+AC_REQUIRE([AC_CERNLIB])
 
 cernlib_lib_ok="no"
 
@@ -110,10 +113,12 @@
     cern_func=$2
 fi
 
+save_CERNLIB_LIBS=$CERNLIB_LIBS
+save_LIBS=$LIBS
+
 if test "z$CERNLIB_STATIC" = "zyes"; then
     cernlib_lib_static_found=no
     AC_MSG_NOTICE([cernlib: linking with a static $cern_library])
-    save_CERNLIB_LIBS="$CERNLIB_LIBS"
     if test "z$CERNLIB_BIN" != "zno"; then
         cernlib_bin_out=`$CERNLIB_BIN $cern_library`
         CERNLIB_LIBS="$cernlib_bin_out $CERNLIB_LIBS"
@@ -127,37 +132,34 @@
     fi
     if test "z$cernlib_lib_static_found" = zno; then
         AC_MSG_WARN([cannot determine the cernlib location for static linking])
+    fi
+else
+    AC_MSG_NOTICE([trying a dynamical link with $cern_library])
+    if test "z$CERNLIB_BIN" != "zno"; then
+        # try link with debian cernlib script with -dy
+        cernlib_bin_out=`$CERNLIB_BIN -dy $cern_library`
+        CERNLIB_LIBS="$cernlib_bin_out $CERNLIB_LIBS"
     else
+        CERNLIB_LIBS="-l$cern_library $CERNLIB_LIBS"
+    fi
+fi
+
 dnl now try the link
-        AC_LANG_PUSH(Fortran 77)
-        save_LIBS="$LIBS"; LIBS="$CERNLIB_LIBS $LIBS"
-        AC_LINK_IFELSE([      program main
+LIBS="$CERNLIB_LIBS $LIBS"
+AC_LANG_PUSH(Fortran 77)
+AC_LINK_IFELSE([      program main
       call $cern_func
       end
 ], 
-        [ 
-            cernlib_lib_ok=yes
-        ],
-        [
-            CERNLIB_LIBS="$save_CERNLIB_LIBS"
-        ])
-        LIBS="$save_LIBS"
-        AC_LANG_POP(Fortran 77)
-    fi
-else
-    AC_MSG_NOTICE([trying a dynamical link with $cern_library])
-dnl FIXME ther could also be something like
-dnl save_LIBS="$LIBS"; LIBS="$CERNLIB_LIBS $LIBS"
-dnl CERNLIB_LIBS="-l$cern_library $CERNLIB_LIBS" 
-dnl LIBS="$save_LIBS"
-    AC_CHECK_LIB([$cern_library], [$cern_func],
-       [ 
-         AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
-         LIBS="-l$1 $LIBS"
-
-         cernlib_lib_ok=yes 
-       ])
-fi
+[ 
+    cernlib_lib_ok=yes
+],
+[
+    CERNLIB_LIBS=$save_CERNLIB_LIBS
+])
+AC_LANG_POP(Fortran 77)
+LIBS=$save_LIBS
+AC_SUBST([CERNLIB_LIBS])
 
 AS_IF([test x"$cernlib_lib_ok" = xyes],
       [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_CERNLIB_${cern_library}_${cern_func}))


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cernlib.spec	12 Dec 2005 10:01:28 -0000	1.14
+++ cernlib.spec	14 Dec 2005 16:15:57 -0000	1.15
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.3
+Release:       9%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -23,7 +23,7 @@
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # f771 segfaults on x86_64
-ExcludeArch:   x86_64
+#ExcludeArch:   x86_64
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -66,7 +66,7 @@
 Source201: cernlib-deadpool.txt
 
 # debian patchset
-Patch0: cernlib_2005.05.09.dfsg-2.diff
+Patch0: cernlib_2005.05.09.dfsg-3.diff
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: 001-fix-missing-fluka.dpatch
@@ -89,6 +89,9 @@
 # a workaround for cups. Applied in doubt.
 Patch113: 113-cups-postscript-fix.dpatch
 Patch114: 114-install-scripts-properly.dpatch
+Patch115: 115-rsrtnt64-goto-outer-block.dpatch
+Patch116: 116-fix-fconc64-spaghetti-code.dpatch
+Patch117: 117-fix-optimizer-bug-in-gphot.dpatch
 Patch200: 200-comis-allow-special-chars-in-path.dpatch
 Patch201: 201-update-kuip-helper-apps.dpatch
 Patch202: 202-fix-includes-in-minuit-example.dpatch
@@ -102,8 +105,9 @@
 Patch208: 208-fix-redundant-packlib-dependencies.dpatch
 Patch209: 209-ignore-unneeded-headers-in-kmutil.c.dpatch
 Patch210: 210-improve-cfortran-header-files.dpatch
-# disabled in the debian patchset, enabled here
-Patch211: 211-fix-comis-on-64-bit-arches.dpatch
+# split in newer debian patchset
+Patch2110: 211-fix-comis-on-amd64.dpatch
+Patch2111: 211-fix-comis-on-ia64.dpatch
 Patch300: 300-skip-duplicate-lenocc.dpatch
 # Use another approach, see cernlib-enforce-FHS
 # Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -183,7 +187,6 @@
 Patch1203: cernlib-hwuli2_use_dimag.diff 
 Patch1204: cernlib-hwhiga_use_dimag.diff
 Patch1205: cernlib-gfortran.diff 
-Patch1206: cernlib-rsrtnt64_goto_outer_block.diff
 Patch1207: cernlib-v107z0_X_before_string.diff
 
 %description
@@ -311,6 +314,9 @@
 %patch -P 112 -p1
 %patch -P 113 -p1
 %patch -P 114 -p1
+%patch -P 115 -p1
+%patch -P 116 -p1
+%patch -P 117 -p1
 %patch -P 200 -p1
 %patch -P 201 -p1
 %patch -P 202 -p1
@@ -322,7 +328,8 @@
 %patch -P 208 -p1
 %patch -P 209 -p1
 %patch -P 210 -p1
-%patch -P 211 -p1
+%patch -P 2110 -p1
+%patch -P 2111 -p1
 %patch -P 300 -p1
 #%patch -P 301 -p1
 #%patch -P 302 -p1
@@ -691,6 +698,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Wed Dec 14 2005 Patrice Dumas  - 2005-9
+- use new debian patchset
+
 * Fri Dec  9 2005 Patrice Dumas  - 2005-8.3
 - use new debian patchset
 - enable 64 bit fixes patch


Index: paw.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/paw.README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paw.README	9 Dec 2005 16:09:19 -0000	1.2
+++ paw.README	14 Dec 2005 16:15:57 -0000	1.3
@@ -41,11 +41,6 @@
 
 to the beginning of them.
 
-5) 64-bit issues
-
-Note that this package is not yet fully functional on 64-bit machines, as the
-COMIS portion of Pawlib does not yet work correctly on those architectures.
-
 -- Kevin McCarty , Tue, 22 Nov 2005
 
 Adapted to the rpm package by 


--- 211-fix-comis-on-64-bit-arches.dpatch DELETED ---


--- cernlib-rsrtnt64_goto_outer_block.diff DELETED ---


--- cernlib_2005.05.09.dfsg-2.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 14 16:17:19 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 14 Dec 2005 11:17:19 -0500
Subject: rpms/liboil/devel .cvsignore, 1.5, 1.6 liboil.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200512141617.jBEGHnd9008077@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/liboil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8051

Modified Files:
	.cvsignore liboil.spec sources 
Log Message:
Update to 0.3.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liboil/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Nov 2005 15:27:55 -0000	1.5
+++ .cvsignore	14 Dec 2005 16:17:17 -0000	1.6
@@ -1 +1 @@
-liboil-0.3.5.tar.gz
+liboil-0.3.6.tar.gz


Index: liboil.spec
===================================================================
RCS file: /cvs/extras/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- liboil.spec	14 Nov 2005 09:30:29 -0000	1.11
+++ liboil.spec	14 Dec 2005 16:17:17 -0000	1.12
@@ -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
+* 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.
 - Parallel make seems to have worked for 0.3.5 on devel, but just in case...


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liboil/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Nov 2005 15:27:55 -0000	1.5
+++ sources	14 Dec 2005 16:17:17 -0000	1.6
@@ -1 +1 @@
-f365f0a4cc31b2ff029e37deccb09ff6  liboil-0.3.5.tar.gz
+a36b2d9cc71d75d814d7bdca2263290f  liboil-0.3.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 16:17:55 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 14 Dec 2005 11:17:55 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.15,1.16
Message-ID: <200512141618.jBEGIPvV008097@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8074

Modified Files:
	cernlib.spec 
Log Message:
forgot to remove a %patch



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cernlib.spec	14 Dec 2005 16:15:57 -0000	1.15
+++ cernlib.spec	14 Dec 2005 16:17:53 -0000	1.16
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       9%{?dist}
+Release:       9%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -463,7 +463,6 @@
 # use gfortran
 #%patch -P 1205
 # workaround gfortran bug
-%patch -P 1206
 %patch -P 1207
 
 # remove CVS directories
@@ -698,7 +697,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Wed Dec 14 2005 Patrice Dumas  - 2005-9
+* Wed Dec 14 2005 Patrice Dumas  - 2005-9.1
 - use new debian patchset
 
 * Fri Dec  9 2005 Patrice Dumas  - 2005-8.3



From fedora-extras-commits at redhat.com  Wed Dec 14 16:32:32 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 14 Dec 2005 11:32:32 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.16,1.17
Message-ID: <200512141633.jBEGX32P008204@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8185

Modified Files:
	cernlib.spec 
Log Message:
Still a f771 segfault on x86_64



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cernlib.spec	14 Dec 2005 16:17:53 -0000	1.16
+++ cernlib.spec	14 Dec 2005 16:32:30 -0000	1.17
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       9%{?dist}.1
+Release:       9%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -23,7 +23,7 @@
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # f771 segfaults on x86_64
-#ExcludeArch:   x86_64
+ExcludeArch:   x86_64
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -697,7 +697,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Wed Dec 14 2005 Patrice Dumas  - 2005-9.1
+* Wed Dec 14 2005 Patrice Dumas  - 2005-9.2
 - use new debian patchset
 
 * Fri Dec  9 2005 Patrice Dumas  - 2005-8.3



From fedora-extras-commits at redhat.com  Wed Dec 14 16:33:21 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 14 Dec 2005 11:33:21 -0500
Subject: rpms/python-quixote/FC-4 .cvsignore, 1.6, 1.7 python-quixote.spec,
	1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200512141633.jBEGXqIg008304@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-serv8223/FC-4

Modified Files:
	.cvsignore python-quixote.spec sources 
Log Message:
Update to new upstream verion 2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Oct 2005 20:31:53 -0000	1.6
+++ .cvsignore	14 Dec 2005 16:33:19 -0000	1.7
@@ -1 +1 @@
-Quixote-2.3.tar.gz
+Quixote-2.4.tar.gz


Index: python-quixote.spec
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/FC-4/python-quixote.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-quixote.spec	19 Oct 2005 20:31:53 -0000	1.7
+++ python-quixote.spec	14 Dec 2005 16:33:19 -0000	1.8
@@ -3,7 +3,7 @@
 %define srcname Quixote
 
 Name:           python-quixote
-Version:        2.3
+Version:        2.4
 Release:        1%{?dist}
 Summary:        A highly Pythonic Web application framework
 
@@ -70,6 +70,9 @@
 %ghost %{python_sitearch}/quixote/html/*.pyo
 
 %changelog
+* Wed Dec 14 2005 Shahms E. King  2.4-2
+- update to new upstream 2.4
+
 * Wed Oct 19 2005 Shahms E. King  2.3-1
 - update to new upstream 2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Oct 2005 20:31:53 -0000	1.6
+++ sources	14 Dec 2005 16:33:19 -0000	1.7
@@ -1 +1 @@
-ad947a8f4d8c8f48e8bd6f0572a755b0  Quixote-2.3.tar.gz
+5dc36613faba7dee6c8c6d24c1334303  Quixote-2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 16:33:27 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 14 Dec 2005 11:33:27 -0500
Subject: rpms/python-quixote/devel .cvsignore, 1.6, 1.7 python-quixote.spec,
	1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200512141633.jBEGXvNX008311@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-quixote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8223/devel

Modified Files:
	.cvsignore python-quixote.spec sources 
Log Message:
Update to new upstream verion 2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Oct 2005 20:31:54 -0000	1.6
+++ .cvsignore	14 Dec 2005 16:33:25 -0000	1.7
@@ -1 +1 @@
-Quixote-2.3.tar.gz
+Quixote-2.4.tar.gz


Index: python-quixote.spec
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/python-quixote.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-quixote.spec	19 Oct 2005 20:31:54 -0000	1.7
+++ python-quixote.spec	14 Dec 2005 16:33:25 -0000	1.8
@@ -3,7 +3,7 @@
 %define srcname Quixote
 
 Name:           python-quixote
-Version:        2.3
+Version:        2.4
 Release:        1%{?dist}
 Summary:        A highly Pythonic Web application framework
 
@@ -70,6 +70,9 @@
 %ghost %{python_sitearch}/quixote/html/*.pyo
 
 %changelog
+* Wed Dec 14 2005 Shahms E. King  2.4-2
+- update to new upstream 2.4
+
 * Wed Oct 19 2005 Shahms E. King  2.3-1
 - update to new upstream 2.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-quixote/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Oct 2005 20:31:54 -0000	1.6
+++ sources	14 Dec 2005 16:33:25 -0000	1.7
@@ -1 +1 @@
-ad947a8f4d8c8f48e8bd6f0572a755b0  Quixote-2.3.tar.gz
+5dc36613faba7dee6c8c6d24c1334303  Quixote-2.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 16:52:28 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 14 Dec 2005 11:52:28 -0500
Subject: rpms/cernlib/devel 115-rsrtnt64-goto-outer-block.dpatch, NONE,
	1.1 116-fix-fconc64-spaghetti-code.dpatch, NONE,
	1.1 117-fix-optimizer-bug-in-gphot.dpatch, NONE,
	1.1 211-fix-comis-on-amd64.dpatch, NONE,
	1.1 211-fix-comis-on-ia64.dpatch, NONE,
	1.1 304-update-Imake-config-files.dpatch, 1.2,
	1.3 307-use-canonical-cfortran.dpatch, 1.1,
	1.2 315-fixes-for-MacOSX.dpatch, 1.2,
	1.3 701-patch-hbook-comis-Imakefiles.dpatch, 1.1,
	1.2 cernlib.m4, 1.1, 1.2 cernlib.spec, 1.8, 1.9 paw.README,
	1.2, 1.3 211-fix-comis-on-64-bit-arches.dpatch, 1.1,
	NONE cernlib-rsrtnt64_goto_outer_block.diff, 1.1,
	NONE cernlib_2005.05.09.dfsg-2.diff, 1.1, NONE
Message-ID: <200512141652.jBEGqS4q008479@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8457

Modified Files:
	304-update-Imake-config-files.dpatch 
	307-use-canonical-cfortran.dpatch 315-fixes-for-MacOSX.dpatch 
	701-patch-hbook-comis-Imakefiles.dpatch cernlib.m4 
	cernlib.spec paw.README 
Added Files:
	115-rsrtnt64-goto-outer-block.dpatch 
	116-fix-fconc64-spaghetti-code.dpatch 
	117-fix-optimizer-bug-in-gphot.dpatch 
	211-fix-comis-on-amd64.dpatch 211-fix-comis-on-ia64.dpatch 
Removed Files:
	211-fix-comis-on-64-bit-arches.dpatch 
	cernlib-rsrtnt64_goto_outer_block.diff 
	cernlib_2005.05.09.dfsg-2.diff 
Log Message:
- use new debian patchset 




--- NEW FILE 115-rsrtnt64-goto-outer-block.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 115-rsrtnt64-goto-outer-block.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch from Patrice Dumas  to fix spaghetti code in
## DP: rsrtnt64.F that breaks linking step on Itanium.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/b/rsrtnt64.F cernlib-2005.05.09.dfsg/src/mathlib/gen/b/rsrtnt64.F
--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/b/rsrtnt64.F	1996-04-01 10:01:51.000000000 -0500
+++ cernlib-2005.05.09.dfsg/src/mathlib/gen/b/rsrtnt64.F	2005-12-06 11:22:08.500724891 -0500
@@ -117,8 +117,15 @@
         ENDIF
        ELSE
         IF(N .EQ. 1) THEN
-         ASSIGN 11 TO JMP1
-         GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    11    IF(K .EQ. 0) THEN
           H=H
          ELSEIF(K .EQ. 1) THEN
@@ -174,14 +181,28 @@
            H=2*((H1+B*U)/RT(U)-(H1+B*V)/RT(V))/DELTA
            LB1=11
           ELSEIF(K .EQ. 2) THEN
-           ASSIGN 12 TO JMP1
-           GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    12      H1=DELTA-B**2
            H2=2*A*B
            H=(((H1*U-H2)/RT(U)-(H1*V-H2)/RT(V))/DELTA+H)/C
           ELSEIF(K .EQ. 3) THEN
-           ASSIGN 13 TO JMP1
-           GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    13      H1=C*DELTA
            G1=A*C
            G2=3*B**2
@@ -217,8 +238,32 @@
         ENDIF
        ELSE
         IF(N .EQ. 1) THEN
-         ASSIGN 21 TO JMP2
-         GO TO 20
+      IF(C .EQ. 0) THEN
+       IF(B .EQ. 0) THEN
+        H=LOG(ABS(V/U))/SQRT(A)
+       ELSE
+        IF(A .LT. 0) THEN
+         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
+        ELSE
+         WA=SQRT(A)
+         WU=SQRT(A+B*U)
+         WV=SQRT(A+B*V)
+         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
+        ENDIF
+       ENDIF
+      ELSE
+       A2=2*A
+       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
+        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
+     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
+       ELSEIF(DELTA .EQ. 0) THEN
+        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
+        IF(U*V .GT. 0) H=SIGN(H,U)
+       ELSE
+        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
+        IF(U .LT. 0 .AND. V .LT. 0) H=-H
+       ENDIF
+      ENDIF
    21    IF(K .EQ. -1) THEN
           H=H
          ELSEIF(K .EQ. -2) THEN
@@ -257,8 +302,32 @@
            IF(U. LT. -X0) H=-H
           ENDIF
          ELSE
-          ASSIGN 22 TO JMP2
-          GO TO 20
+      IF(C .EQ. 0) THEN
+       IF(B .EQ. 0) THEN
+        H=LOG(ABS(V/U))/SQRT(A)
+       ELSE
+        IF(A .LT. 0) THEN
+         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
+        ELSE
+         WA=SQRT(A)
+         WU=SQRT(A+B*U)
+         WV=SQRT(A+B*V)
+         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
+        ENDIF
+       ENDIF
+      ELSE
+       A2=2*A
+       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
+        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
+     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
+       ELSEIF(DELTA .EQ. 0) THEN
+        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
+        IF(U*V .GT. 0) H=SIGN(H,U)
+       ELSE
+        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
+        IF(U .LT. 0 .AND. V .LT. 0) H=-H
+       ENDIF
+      ENDIF
    22     IF(K .EQ. -1) THEN
            H1=B*C
            H2=B**2-2*A*C
@@ -287,46 +356,7 @@
         ENDIF
        ENDIF
       ENDIF
-      GO TO 9
-
-   10 C2=2*C
-      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
-       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
-     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
-      ELSEIF(DELTA .EQ. 0) THEN
-       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
-      ELSE
-       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
-      ENDIF
-      GO TO JMP1, (11,12,13)
 
-   20 IF(C .EQ. 0) THEN
-       IF(B .EQ. 0) THEN
-        H=LOG(ABS(V/U))/SQRT(A)
-       ELSE
-        IF(A .LT. 0) THEN
-         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
-        ELSE
-         WA=SQRT(A)
-         WU=SQRT(A+B*U)
-         WV=SQRT(A+B*V)
-         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
-        ENDIF
-       ENDIF
-      ELSE
-       A2=2*A
-       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
-        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
-     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
-       ELSEIF(DELTA .EQ. 0) THEN
-        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
-        IF(U*V .GT. 0) H=SIGN(H,U)
-       ELSE
-        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
-        IF(U .LT. 0 .AND. V .LT. 0) H=-H
-       ENDIF
-      ENDIF
-      GO TO JMP2, (21,22)
 
     9 RES=SIGN(R1,V1-U1)*H
       LRL=LLL


--- NEW FILE 116-fix-fconc64-spaghetti-code.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 116-fix-fconc64-spaghetti-code.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Work around FTBFS on ia64 with recent binutils, apparently caused
## DP: by assignment of goto labels in this file.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/c/fconc64.F cernlib-2005.05.09.dfsg/src/mathlib/gen/c/fconc64.F
--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/c/fconc64.F	1996-04-01 10:02:04.000000000 -0500
+++ cernlib-2005.05.09.dfsg/src/mathlib/gen/c/fconc64.F	2005-12-12 12:58:23.885981128 -0500
@@ -190,15 +190,167 @@
       A=HF*((HF-FM)-TI)
       B=HF*((HF-FM)+TI)
       C=HF
-      ASSIGN 1 TO JP
-      GO TO 20
+   20 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 21 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 1
+       DO 22 J = 1,3
+       V(J-1)=V(J)
+   22  U(J-1)=U(J)
+   21  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 23 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 1
+   23  CONTINUE
+      END IF
+      GO TO 24
     1 R1=R
       R1=R1/ABS(CGM(A+HF))**2
       A=HF*((TH-FM)-TI)
       B=HF*((TH-FM)+TI)
       C=TH
-      ASSIGN 2 TO JP
-      GO TO 20
+  120 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 121 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 2
+       DO 122 J = 1,3
+       V(J-1)=V(J)
+  122  U(J-1)=U(J)
+  121  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 123 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 2
+  123  CONTINUE
+      END IF
+      GO TO 24
     2 R2=R
       FC=RPI*(R1-2*X*R2/ABS(CGM(A-HF))**2)
       IF(LM1) FC=2*FC/SQRT(1-X1)
@@ -209,8 +361,84 @@
       A=(HF+FM)-TI
       B=(HF+FM)+TI
       C=FM+1
-      ASSIGN 3 TO JP
-      GO TO 20
+  220 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 221 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 3
+       DO 222 J = 1,3
+       V(J-1)=V(J)
+  222  U(J-1)=U(J)
+  221  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 223 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 3
+  223  CONTINUE
+      END IF
+      GO TO 24
     3 FC=R
       IF(LM1) FC=SIGN(HF,1-X)*(TAU**2+HF**2)*SQRT(ABS(X**2-1))*FC
       GO TO 99
@@ -220,15 +448,7 @@
       A=HF*((HF-FM)-TI)
       B=HF*((TH-FM)-TI)
       C=1-TI
-      ASSIGN 4 TO JP
-      GO TO 20
-    4 R1=EXP((TI-HF)*LOG(X+X)+CLG(1+TI)-CLG((TH-FM)+TI))*
-     1        R*((HF-FM)+TI)/TI
-      FC=RPW*R1
-      IF(LM1) FC=FC/SQRT(1-X1)
-      GO TO 99
-
-   20 IF(LTA) THEN
+  320 IF(LTA) THEN
        Y=-X1
        Y2=Y**2
        Y3=Y*Y2
@@ -257,7 +477,7 @@
        U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
 
        R=1
-       DO 21 N = 3,NMAX
+       DO 321 N = 3,NMAX
        FN=N
        RR=R
        H(1)=FN-1
@@ -289,23 +509,29 @@
        V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
        U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
        R=U(3)/V(3)
-       IF(ABS(R-RR) .LT. EPS) GO TO JP, (1,2,3,4)
-       DO 22 J = 1,3
+       IF(ABS(R-RR) .LT. EPS) GO TO 4
+       DO 322 J = 1,3
        V(J-1)=V(J)
-   22  U(J-1)=U(J)
-   21  CONTINUE
+  322  U(J-1)=U(J)
+  321  CONTINUE
       ELSE
        W(1)=X1*A*B/C
        R=1+W(1)
-       DO 23 N = 1,NMAX
+       DO 323 N = 1,NMAX
        FN=N
        RR=R
        W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
        R=R+W(1)
-       IF(ABS(R-RR) .LT. EPS) GO TO JP, (1,2,3,4)
-   23  CONTINUE
+       IF(ABS(R-RR) .LT. EPS) GO TO 4
+  323  CONTINUE
       END IF
-      FC=0
+      GO TO 24
+    4 R1=EXP((TI-HF)*LOG(X+X)+CLG(1+TI)-CLG((TH-FM)+TI))*
+     1        R*((HF-FM)+TI)/TI
+      FC=RPW*R1
+      IF(LM1) FC=FC/SQRT(1-X1)
+      GO TO 99
+   24 FC=0
       WRITE(ERRTXT,102) X
       CALL MTLPRT(NAME,'C331.2',ERRTXT)
 #if defined(CERNLIB_DOUBLE)


--- NEW FILE 117-fix-optimizer-bug-in-gphot.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 117-fix-optimizer-bug-in-gphot.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch by Harald Vogt  to work around compiler
## DP: optimization problems in src/geant321/gphys/gphot.F.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gphys/gphot.F cernlib-2005.05.09.dfsg/src/geant321/gphys/gphot.F
--- cernlib-2005.05.09.dfsg~/src/geant321/gphys/gphot.F	1995-10-24 06:21:29.000000000 -0400
+++ cernlib-2005.05.09.dfsg/src/geant321/gphys/gphot.F	2005-12-07 15:01:52.558184613 -0500
@@ -240,7 +240,7 @@
                   ELSE
 C Radiative shell decay
                      JS = JFN+1+2*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 40 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
@@ -296,7 +296,7 @@
                   ELSE
 c Nonradiative decay
                      JS = JFN+1+3*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 60 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN


--- NEW FILE 211-fix-comis-on-amd64.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-amd64.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Large patch from Harald Vogt  to make PAW and Paw++ work
## DP: (at least when statically linked) on 64-bit architectures.
## DP: Slightly modified in an attempt to keep ABI compatibility of the
## DP: dynamic libraries; not that it matters much as they don't work well
## DP: when dynamically linked on 64-bit anyway.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/hbook.h cernlib-2005.05.09.dfsg/src/cfortran/hbook.h
--- cernlib-2005.05.09.dfsg~/src/cfortran/hbook.h	1999-11-15 17:01:12.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/cfortran/hbook.h	2005-12-09 13:27:45.465589336 +0000
@@ -489,6 +489,10 @@
 #define HBALLOC(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
         CCALLSFSUB11(HBALLOC,hballoc,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PINT,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
 
+PROTOCCALLSFSUB11(HBALLOC64,hballoc64,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PLONG,PINT)
+#define HBALLOC64(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
+        CCALLSFSUB11(HBALLOC64,hballoc64,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PLONG,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
+
 PROTOCCALLSFSUB1(HBFREE,hbfree,INT)
 #define HBFREE(LUN) CCALLSFSUB1(HBFREE,hbfree,INT,LUN)
 
@@ -508,6 +512,13 @@
 #define HGNTBF(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)\
         CCALLSFSUB6(HGNTBF,hgntbf,INT,ZTRINGV,INTV,INT,INT,PINT,IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
 
+PROTOCCALLSFSUB6(HGNTBF64,hgntbf64,INT,ZTRINGV,LONGV,INT,INT,PINT)
+/* fix the element length of VAR to 32 */
+#define hgntbf64_ELEMS_2          ZTRINGV_ARGS(4)
+#define hgntbf64_ELEMLEN_2        ZTRINGV_NUM(32)
+#define HGNTBF64(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)\
+        CCALLSFSUB6(HGNTBF64,hgntbf64,INT,ZTRINGV,LONGV,INT,INT,PINT,IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
+
 PROTOCCALLSFSUB1(HGTDIR,hgtdir,PSTRING)
 #define HGTDIR(CHDIR) CCALLSFSUB1(HGTDIR,hgtdir,PSTRING,CHDIR)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/cspack/hcntpar.inc cernlib-2005.05.09.dfsg/src/packlib/cspack/cspack/hcntpar.inc
--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/cspack/hcntpar.inc	1996-03-08 15:44:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/cspack/cspack/hcntpar.inc	2005-12-09 13:27:45.465589336 +0000
@@ -22,7 +22,7 @@
      +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
      +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
      +          ZARIND=11, ZIBLOK=8,  ZNBLOK=10, ZIBANK=9,  ZIFTMP=11,
-     +          ZITMP=10,  ZNTMP=5,   ZNTMP1=3,  ZLINK=6)
+     +          ZITMP=10,  ZNTMP=5,   ZNTMP1=4,  ZLINK=6)
 *
 
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hbook/hcntpar.inc cernlib-2005.05.09.dfsg/src/packlib/hbook/hbook/hcntpar.inc
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hbook/hcntpar.inc	1996-01-16 17:07:52.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hbook/hcntpar.inc	2005-12-09 13:27:46.373451320 +0000
@@ -24,7 +24,7 @@
      +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
      +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
      +          ZARIND=11, ZIBLOK=8,  ZNBLOK=10, ZIBANK=9,  ZIFTMP=11,
-     +          ZID=12,    ZITMP=10,  ZNTMP=6,   ZNTMP1=3,  ZLINK=6)
+     +          ZID=12,    ZITMP=10,  ZNTMP=6,   ZNTMP1=4,  ZLINK=6)
 *
 
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hballoc.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hballoc.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hballoc.F	1996-01-16 17:07:56.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hballoc.F	2005-12-09 13:27:46.617414232 +0000
@@ -42,3 +42,26 @@
       ENDIF
 *
       END
+*
+*     64-bit version (separate to preserve ABI compatibility)
+      SUBROUTINE HBALLOC64(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,
+     +                     IBASE,IOFF,NUSE)
+*
+      CHARACTER*(*)  CHDIR, VAR, BLOCK
+      INTEGER        IDN, ITYPE, ISIZE, NELEM, NUSE, IFIRST, IBASE(1)
+      INTEGER*8      IBUF(1), IOFF
+*
+      LC = LENOCC(CHDIR)
+      LV = LENOCC(VAR)
+      LB = LENOCC(BLOCK)
+*
+      CALL HBALLO1(IDN, CHDIR, LC, VAR, LV, BLOCK, LB, ITYPE, ISIZE,
+     +             IFIRST, NELEM, IBUF, NUSE)
+*
+      IF (NUSE .EQ. 0) THEN
+         IOFF = 0
+      ELSE
+         IOFF = IBUF(1) - %LOC(IBASE(1))/4
+      ENDIF
+*
+      END
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hbnt.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hbnt.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hbnt.F	1996-01-16 17:07:56.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hbnt.F	2005-12-09 13:27:46.644410128 +0000
@@ -269,11 +269,13 @@
  ************************************************************************
  *      *         *                                                     *
  *   1  *         *     Number of variables to be read out              *
- *      *         *     *** For every variable 3 words (ZNTMP1) ***     *
+ *      *         *     *** For every variable 4 words (ZNTMP1) ***     *
  *   2  *         *     Index of variable in LNAME bank                 *
  *   3  *         *     Offset of variable in LNAME bank (INDX-1)*ZNADDR*
  *   4  *         *     Offset in dynamically allocated buffer (only    *
  *      *         *     used via HGNTBF) otherwise 0                    *
+ *   5  *         *     spare (used in 64 bit architectures for upper   *
+ *      *         *     address part)                                   *
  ************************************************************************
 #endif
 *
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgnt2.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgnt2.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgnt2.F	1999-03-05 15:42:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgnt2.F	2005-12-09 13:27:46.644410128 +0000
@@ -34,7 +34,13 @@
 #include "hbook/hcrecv.inc"
 *
       CHARACTER*(*) VAR1(*)
+#if defined(CERNLIB_QMLXIA64)
+      INTEGER*8     IVOFF(*), IOFFST, IOFFSTT
+      INTEGER       IOFFSTV(2)
+      EQUIVALENCE   (IOFFSTV, IOFFSTT)
+#else
       INTEGER       IVOFF(*)
+#endif
       CHARACTER*32  VAR
       INTEGER       ILOGIC, HNMPTR
       LOGICAL       LOGIC, INDVAR, ALLVAR, USEBUF, CHKOFF
@@ -452,10 +458,15 @@
          IQ(LTMP1+JTMP+1)      = IOFF
          IF (USEBUF) THEN
             IF (IEDIF .EQ. 0) THEN
-               IQ(LTMP1+JTMP+2) = IOFFST
+               IOFFSTT = IOFFST
             ELSE
-               IQ(LTMP1+JTMP+2) = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
+               IOFFSTT = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
             ENDIF
+            IQ(LTMP1+JTMP+2) = IOFFSTT
+#if defined(CERNLIB_QMLXIA64)
+*           store upper part of 64 bit address
+            IQ(LTMP1+JTMP+3) = IOFFSTV(2)
+#endif
          ELSE
             IQ(LTMP1+JTMP+2)   = 0
          ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntbf.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntbf.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntbf.F	1996-01-16 17:07:57.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntbf.F	2005-12-09 13:27:46.645409976 +0000
@@ -26,3 +26,13 @@
       CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
 *
       END
+*
+*     64-bit version (separate to preserve ABI compatibility)
+      SUBROUTINE HGNTBF64(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
+      CHARACTER*(*) VAR(*)
+      INTEGER*8     IOFFST(*)
+*
+      NVAR1 = -NVAR
+      CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
+*
+      END
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntf.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntf.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntf.F	1999-03-05 15:42:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntf.F	2005-12-09 13:27:46.645409976 +0000
@@ -37,6 +37,13 @@
       INTEGER       ILOGIC
       LOGICAL       LOGIC, INDVAR, USEBUF
       EQUIVALENCE  (LOGIC, ILOGIC)
+
+#if defined(CERNLIB_QMLXIA64)
+      INTEGER*8     IOFFST, IOFFSTT
+      INTEGER       IOFFSTV(2)
+      EQUIVALENCE   (IOFFSTV, IOFFSTT)
+#endif
+
 *
 #include "hbook/jbyt.inc"
 *
@@ -76,6 +83,12 @@
          INDX   = IQ(LTMP1+JTMP)
          IOFF   = IQ(LTMP1+JTMP+1)
          IOFFST = IQ(LTMP1+JTMP+2)
+#if defined(CERNLIB_QMLXIA64)
+*        fetch full 64 bit address
+         IOFFSTV(1) = IQ(LTMP1+JTMP+2)
+         IOFFSTV(2) = IQ(LTMP1+JTMP+3)
+         IOFFST     = IOFFSTT
+#endif
          IF (IOFFST .EQ. 0) THEN
             USEBUF = .FALSE.
          ELSE
@@ -442,10 +455,15 @@
 *
          IF (USEBUF) THEN
             IF (IEDIF .EQ. 0) THEN
-               IQ(LTMP1+JTMP+2) = IOFFST
+               IOFFSTT = IOFFST
             ELSE
-               IQ(LTMP1+JTMP+2) = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
+               IOFFSTT = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
             ENDIF
+            IQ(LTMP1+JTMP+2) = IOFFSTT
+#if defined(CERNLIB_QMLXIA64)
+*           store upper part of 64 bit address
+            IQ(LTMP1+JTMP+3) = IOFFSTV(2)
+#endif
          ELSE
             IQ(LTMP1+JTMP+2) = 0
          ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c
--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c	2005-12-09 13:27:46.645409976 +0000
@@ -44,7 +44,25 @@
    DummyDef
 #endif
 {
+#if defined(CERNLIB_QMLXIA64)
+   const unsigned long long int mask=0x00000000ffffffff;
+   static unsigned long long int base=1;
+   unsigned long long int jadr=(unsigned long long int) iadr;
+   unsigned long long int jadrl = (mask & jadr);
+
+   if (base == 1) {
+     base = (~mask & jadr);
+   } else if(base != (~mask & jadr)) {
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+     printf("locb_() Warning: changing base from %lx to %lx!!!\n",
+     	   base, (~mask & jadr));
+     printf("This may result in program crash or incorrect results\n");
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+   }
+   return ((int) jadrl);
+#else
    return( (int) iadr );
+#endif
 }
 /*> END <----------------------------------------------------------*/
 #ifdef CERNLIB_TCGEN_LOCB
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/zbook/code/zjump.c cernlib-2005.05.09.dfsg/src/packlib/zbook/code/zjump.c
--- cernlib-2005.05.09.dfsg~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/zbook/code/zjump.c	2005-12-09 13:27:46.971360424 +0000
@@ -7,6 +7,9 @@
  *
  */
 #include "zbook/pilot_c.h"
+#if defined(CERNLIB_QMLXIA64)
+static void (*target)();
+#endif
 #if defined(CERNLIB_UNIX)
 #if defined(CERNLIB_QX_SC)
 zjump_(name,p1,p2,p3,p4)
@@ -18,8 +21,23 @@
 ZJUMP(name,p1,p2,p3,p4)
 #endif
 char *p1, *p2, *p3, *p4;
+
+/*  LP64 compatibility:
+    name is taken from a Fortran array and therefore its address is 32 bit
+    which has to be converted to a 64 bit address to satisfy void (*) (H. Vogt) */
+
+#if defined(CERNLIB_QMLXIA64)
+int *name;
+{
+  long jadr;
+  jadr   = *name;  /* convert int to long */
+  target = (void (*)())jadr;
+  (*target)(p1, p2, p3, p4);
+}
+#else
 void (**name)();
 {
    (**name)(p1, p2, p3, p4);
 }
 #endif
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.05.09.dfsg/src/packlib/zebra/test/brztest/btest2.F
--- cernlib-2005.05.09.dfsg~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/zebra/test/brztest/btest2.F	2005-12-09 13:27:46.971360424 +0000
@@ -29,6 +29,15 @@
 ********************************************************************************
 *
       COMMON/CRZT/IXSTOR,IXDIV,IFENCE(2),LEV,LEVIN,BLVECT(30000)
+
+*     LP64 compatibility:
+*     For 64-bit pointer systems put local variables referenced by LOCF
+*     in a dummy named common block to keep addresses in the program region.
+*     see also: packlib/ffread/test/main.F (H. Vogt)
+
+#if defined(CERNLIB_QMLXIA64)
+      COMMON /TEST64/LBANK
+#endif
       DIMENSION LQ(999),IQ(999),Q(999)
       EQUIVALENCE (IQ(1),Q(1),LQ(9)),(LQ(1),LEV)
 C
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile	2005-12-09 13:27:38.969576880 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile	2005-12-09 13:27:46.971360424 +0000
@@ -50,6 +50,10 @@
 SRCS_F := $(SRCS_F) cscrexec.F
 #endif
 
+#if defined(CERNLIB_QMLXIA64)
+SRCS_F := $(SRCS_F) csrtgpl.F csitgpl.F
+#endif
+
 #if defined(CERNLIB_OLD)
 SRCS_F := $(SRCS_F) cspdir.F csrmbk.F
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F	1996-02-26 17:16:25.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F	2005-12-09 13:27:46.972360272 +0000
@@ -17,8 +17,14 @@
       INTEGER CSLTGP,CSITGP
       CHARACTER*32 NAME
 #include "comis/cstab.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       INTEGER CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      INTEGER*8 CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)
       NAME=CHNAME
       NC=LENOCC(NAME)
       CALL CSCHID(NAME(:NC))
@@ -26,21 +32,39 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
+#endif
+#endif
+#if defined(CERNLIB_SHL)
           ELSE
             I=0
           ENDIF
         ENDIF
       ELSE
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+        IF(IADGPL.NE.0)THEN
+          IFCS=-2
+          ITYPGP=-2
+          I=CSITGPL(IPVS)
+        ENDIF
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
           I=CSITGP(IPVS)
         ENDIF
+#endif
       END IF
       CSADDR=I
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csinit.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csinit.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csinit.F	2005-04-18 15:41:04.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csinit.F	2005-12-09 13:27:46.972360272 +0000
@@ -64,6 +64,9 @@
 #if defined(CERNLIB_SHL)
 #include "comis/cshlnm.inc"
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+#endif
 #if defined(CERNLIB_PAW)
 #include "paw/pcmode.inc"
 #include "comis/cshfill.inc"
@@ -159,6 +162,9 @@
       ICHMINU=ICHAR('-')
       ICHPLUS=ICHAR('+')
       ICHCOMM=ICHAR(',')
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+      IPIADGV=0
+#endif
 #if defined(CERNLIB_PAW)
       CALL CSPAWI
       MODHFI=0
@@ -211,8 +217,8 @@
 #endif
 #if (defined(CERNLIB_LINUX))
       ITMPLEN=CSTMPD(CHPATH, 256)
-      CHF77 ='g77 -c'
-      CHCC  ='cc -c'
+      CHF77 ='g77 -c -fPIC'
+      CHCC  ='cc -c -fPIC'
 #endif
 #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
       ITMPLEN=CSTMPD(CHPATH, 256)
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csintx.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csintx.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csintx.F	1996-12-05 09:50:37.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csintx.F	2005-12-09 13:27:46.973360120 +0000
@@ -38,6 +38,9 @@
 #if defined(CERNLIB_PAW)
 #include "comis/cskucs.inc"
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_ALPHA_OSF))
       INTEGER CSTRCMP
 #endif
@@ -1105,6 +1108,32 @@
       ENDIF
 #endif
 #if (!defined(CERNLIB_VAX))&&(!defined(CERNLIB_APOLLO))
+#if defined(CERNLIB_QMLXIA64)
+      IF(IQ(IP+KSIFCS).EQ.-2)THEN
+*Dynamic linker may give long addresses
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ENDIF
+#else
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NPAR,IDA(IOFSPL))
       ELSEIF(ITP.EQ.2)THEN
@@ -1115,6 +1144,7 @@
         DCSRES=CSCALD(IADGP,NPAR,IDA(IOFSPL))
       ENDIF
 #endif
+#endif
       IPC=IPC+4
       GO TO 999
 *NUM I
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csitgpl.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csitgpl.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csitgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csitgpl.F	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,32 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZU:  1.16/16 04/10/93  12.14.52  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+      INTEGER FUNCTION CSITGPL(IP)
+***------------------------------
+*   it is last routine from the tables-set.
+***-----------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cspnts.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab64.inc"
+      I=MHLOC(KSIDP+NWIDEN)
+      IQ(I)=0
+      IQ(I+1)=NCIDEN
+      DO 1 K=1,NWIDEN
+        IQ(I+KSIDP-1+K)=IDEN(K)
+   1  CONTINUE
+      CALL CSRTGPL(I)
+      IF(IP.EQ.0)THEN
+        IPGP=I
+      ELSE
+        IQ(IP)=I
+      ENDIF
+      CSITGP=I
+      END
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cskcal.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cskcal.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cskcal.F	1996-12-05 09:50:39.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cskcal.F	2005-12-09 13:27:46.973360120 +0000
@@ -31,6 +31,9 @@
 #include "comis/cstab.inc"
 #include "comis/csfres.inc"
 #include "comis/cssysd.inc"
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
       CHARACTER PRONAME*32
       INTEGER CSCALI
       DOUBLE PRECISION CSCALD
@@ -232,6 +235,34 @@
         I2=I2+KS
         I=I+1
  9203 CONTINUE
+#if defined(CERNLIB_QMLXIA64)
+*  Dynamic linker may give long addresses
+      IF (IFCS.EQ.-2)THEN
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ENDIF
+#else
 *      IT=IABS(ITYPGP)
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NOPAR,IF77PL(1))
@@ -245,6 +276,7 @@
       ENDIF
 *+SELF,IF=UNIX,IF=-SGI,IF=-IBMRT,IF=-DECS,IF=-HPUX,IF=-SUN,IF=-MSDOS.
 #endif
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_STDUNIX))
       I=1
       DO 9203 K=ITA-NPAR+1,ITA
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cslink.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cslink.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cslink.F	1996-02-26 17:16:17.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cslink.F	2005-12-09 13:27:46.973360120 +0000
@@ -21,10 +21,15 @@
 #include "comis/cstab.inc"
 #include "comis/cspnts.inc"
 #include "comis/cslun.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       CHARACTER*(KLENID) FNNAME
       INTEGER CS_GET_FUNC
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      CHARACTER*(KLENID) FNNAME
+      INTEGER*8 CS_GET_FUNC
+#endif
          COMMON/CSGSCM/IGS,JGS,NGS,CSJUNK(3)
       IF(ISTLIB.EQ.0 .AND. ITBS.EQ.0)RETURN
    2  I=IPGP
@@ -60,12 +65,20 @@
 #if defined(CERNLIB_SHL)
           CALL CSGTIDP(I,FNNAME,NC)
           CALL CUTOL(FNNAME(1:NC))
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(FNNAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+          ENDIF
+#else
           IADGP=CS_GET_FUNC(FNNAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
           ENDIF
 #endif
+#endif
           IP=0
         ENDIF
       ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csrtgpl.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csrtgpl.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csrtgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csrtgpl.F	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,31 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZ :  1.18/14 10/01/95  15.41.06  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+
+      SUBROUTINE CSRTGPL(I)
+***--------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab.inc"
+#include "comis/cstab64.inc"
+
+      IPIADGV = IPIADGV + 1
+      IF (IPIADGV .GT. MAXIAD64)  THEN
+        WRITE (*,'(2a,I4)') 'to much addresses for dynamik linking, ',
+     &                      'limit is ', MAXIAD64
+        WRITE (*,'(2a)') 'increase MAXIAD64 in cstab64.inc and ',
+     &                    'recompile COMIS'
+
+        STOP
+      END IF
+      IADGPLV(IPIADGV) = IADGPL
+      IADGP            = IPIADGV
+      CALL CCOPYA(IADGP,IQ(I+2),KSIDP-2)
+      END
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/comis/cstab64.inc cernlib-2005.05.09.dfsg/src/pawlib/comis/comis/cstab64.inc
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/comis/cstab64.inc	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/comis/cstab64.inc	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,10 @@
+*
+*
+* cstab64.inc
+*
+      PARAMETER (MAXIAD64=100) !maximum number of shared objects
+      INTEGER*8 IADGPL,IADGPLV(MAXIAD64)
+      INTEGER   IADGPL1, IADGPL2
+      COMMON /CSTB64/ IADGPL,IADGPLV
+      COMMON /CSTB64I/ IPIADGV
+      EQUIVALENCE (IADGPL, IADGPL1)
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c	1997-09-02 15:50:38.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c	2005-12-09 13:27:46.974359968 +0000
@@ -33,11 +33,25 @@
 #else
 void ccopys_(ja,jb,nn)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *nn;
+{
+  int i,n; char *a,*b;
+  n=*nn; a=*ja; b=*jb;
+#else
      char **ja, **jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+#endif
   if ( a >= b )
      for ( i=0; inext = f->first_proc;
          f->first_proc = p;
+         if (debug_level > 0) printf("function pointer is: %p\n", p->funcptr);
          return (void *)(p->funcptr);
       }
      f = f->next;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c	2004-10-27 09:01:54.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c	2005-12-09 13:27:46.974359968 +0000
@@ -32,8 +32,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 double cscald_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -46,10 +45,41 @@
     int CSCALD (name,n,p)
 #  endif
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscald_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+double cscald_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[16];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = *fptr + (unsigned long)jumpad_;
+   /* if ( *fptr > 0 ) ptr = 0; */
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  double (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
+#endif
    double d;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c	2004-10-22 12:42:40.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c	2005-12-09 13:27:46.974359968 +0000
@@ -29,8 +29,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 int cscali_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -39,10 +38,41 @@
 #if defined(CERNLIB_QXCAPT)
 int type_of_call CSCALI (name,n,p)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscali_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+int cscali_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[16];
+{
+   int jumpad_();
+   int (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   /* if ( *fptr > 0 ) ptr = 0; */
+   ptr += *fptr;
+   name = (int (*)())ptr;
+/*    printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  int (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
+#endif
    int i;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c	2004-10-22 12:03:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c	2005-12-09 13:27:46.974359968 +0000
@@ -35,7 +35,7 @@
 #endif
 
 
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 float cscalr_ (name,n,p)
 #endif
 
@@ -51,11 +51,51 @@
 # endif
 #endif
 
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscalr_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+/* Additional note: g77 generates code such that it expects REAL functions
+ * to return "double".  Hence C functions to be used in FORTRAN as REAL
+ * must return "double", and declarations of REAL FORTRAN functions in C files
+ * must also return "double".  On most architectures one can get away with
+ * using "float" instead, but not on amd64 ... see
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15397
+ * 
+ * -- Kevin McCarty
+ */
+	
+#if defined(CERNLIB_QMLXIA64)
+double cscalr_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ int pin[16];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscalr - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+   double r;
+#else
  float (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
    float r;
+#endif
    switch (*n)
    {
       case 0:
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c	1997-09-02 15:50:44.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 13:27:46.975359816 +0000
@@ -36,6 +36,27 @@
 #else
 int cstrcmp_(ja,na,jb,nb)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *na, *nb;
+{
+
+  int i,la,lb,k; char *a,*b;
+  if ( *na >= *nb )
+     {
+      a=*ja; b=*jb; la=*na; lb=*nb; k=1;
+      }
+  else
+    {
+      a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
+     }
+#else
      char **ja, **jb;
      int *na, *nb;
 {
@@ -48,6 +69,7 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+#endif
   for ( i=0; i b[i]) ? k : -k ); }
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/c_hcntpar.h cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/c_hcntpar.h
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/c_hcntpar.h	1996-04-23 18:37:45.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/c_hcntpar.h	2005-12-09 13:27:46.975359816 +0000
@@ -47,7 +47,7 @@
 #define ZID	12
 #define ZITMP	10
 #define ZNTMP	6
-#define ZNTMP1	3
+#define ZNTMP1	4
 #define ZLINK	6
 
 #endif	/*	CERN_C_HCNTPAR	*/
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_execute.c cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_execute.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_execute.c	2001-09-18 13:41:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_execute.c	2005-12-09 13:31:01.495788216 +0000
@@ -184,12 +184,19 @@
 					/* all definitions for the stack */
 #undef INIT_STACK_TO_NULL		/* are kept together in this file */
 
+#if defined(CERNLIB_QMLXIA64)
+# undef HBALLOC
+# undef HGNTBF
+# define HBALLOC HBALLOC64
+# define HGNTBF HGNTBF64
+#endif
+
 /* extern functions */
 extern void qp_exec_evt( QueryExe *, long, long, QPCmd *, int *);
 
 typedef		char	tName[MAX_NAME_LEN+1];
 tName		*namelist;
-int		*offsetlist;
+long		*offsetlist;
 int		*indexlist;
 
 
@@ -245,7 +252,23 @@
 	char		ntname[MAX_NAME_LEN+6];
 	int		i, ierr, indx, itype, isize, ielem;
 	Int32 *		addr;
-	int		ibase[1], ioff, nuse;
+
+	/* LP64 compatibility:
+	   - use static for ibase (at least) because its address is stored
+	     as Int32 in structure CWNBlock
+	     static takes ibase from the stack and puts it the code area.
+	   - use type long for ioff and offsetlist[i]
+	     (for 32 bit architectures type long is 4 Bytes as it is used
+	      also in packlib/hbook/chbook/halloc.c in hballo1 !)
+	   The x86-64 ABI has the code area in the 32 bit address space
+	   but addresses to the stack and to dynamically allocated areas
+	   may and will be above the 32 bit address space (below 0x80000000000).
+	   See also: http://www.x86-64.org/documentation/abi-0.96.pdf
+	   (H. Vogt, Oct. 2005) */
+
+	static int	ibase[1];
+	long		ioff;
+	int		nuse;
 	int		id = qe->id;
 	char *		path = qe->path;
 	char *		title;
@@ -286,7 +309,11 @@
 	CWNBlock = (RefCWN *) calloc( CWNCount + 1, sizeof( RefCWN ) );
 	qp_assert( MAX_NAME_LEN == 32 ); /* see hbook.h (HGNTBF) */
 	namelist = (tName *) calloc( CWNCount + 1, sizeof(tName) );
-	offsetlist = (int *) calloc( CWNCount + 1, sizeof(int) );
+
+	/* offsetlist should be of type long (see above) (H. Vogt, Oct. 2005) */
+
+	offsetlist = (long *) calloc( CWNCount + 1, sizeof(long) );
+
 	indexlist = (int *) calloc( CWNCount + 1, sizeof(int) );
 	qp_assert(
 		CWNBlock != 0 &&
@@ -381,6 +408,7 @@
 						offsetlist[nt_load_cnt]=
 						CWNBlock[index].p -
 						PAWC.iq_eqv;
+
 						strncpy(
 						namelist[nt_load_cnt],
 						vi->name,
@@ -871,8 +899,21 @@
 			if ( cmd->u.scan.pawpp ) {
 				char	buf[33];
 
+				/* for LP64 ABI matlab and matrow are 64 bit pointer, type is void*  
+				   but PCADDR.jmlab and PCADDR.jmrow are of type int
+				   see: c_pcaddr.h and qp_command.h
+				   it is related to CWNBlock -> see above (H. Vogt)*/
+
+#if defined(CERNLIB_QMLXIA64)
+				unsigned long long int	 myjmlab, myjmrow;
+				myjmlab = PCADDR.jmlab;
+				myjmrow = PCADDR.jmrow;
+				c->matlab = (TableCallBack) myjmlab;
+				c->matrow = (TableCallBack) myjmrow;
+#else
 				c->matlab = (TableCallBack) PCADDR.jmlab;
 				c->matrow = (TableCallBack) PCADDR.jmrow;
+#endif
 
 				qp_assert( qe->nexpr <= MAX_OUTSTR );
 
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_hbook_if.c cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_hbook_if.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_hbook_if.c	1999-07-05 15:43:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_hbook_if.c	2005-12-09 13:27:46.976359664 +0000
@@ -149,7 +149,15 @@
 	int	idn, idtmp;
 	int	icycle;
 	int	ierr;
-	int     izero = 0;
+
+	/* LP64 compatibility:
+	   use static for izero because its address is fetched by hbname_
+	   using locb and locb expects 32 bit addresses only.
+	   static takes izero from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int     izero = 0;
 
 	/* split string into  path, id and cycle */
 


--- NEW FILE 211-fix-comis-on-ia64.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-ia64.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Further patch building on Harald Vogt's amd64 patch that should
## DP: fix PAW on Itanium Linux.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c	2005-12-09 09:45:33.649333472 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c	2005-12-09 10:01:36.149011280 +0000
@@ -39,12 +39,32 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium, the situation is even worse.  Itanium architecture is such
+ * that the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ * -- Kevin McCarty
+ */
+	
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+# if defined (__ia64__)
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a +
+	  (((unsigned long)a > 0x80000000) ? autobase : 0x6000000000000000);
+  b = (unsigned long)b +
+	  (((unsigned long)b > 0x80000000) ? autobase : 0x6000000000000000);
+# endif
 #else
      char **ja, **jb;
      int *nn;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 09:45:33.650333320 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 10:05:36.432482640 +0000
@@ -42,6 +42,19 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium, the situation is even worse.  Itanium architecture is such
+ * that the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ * -- Kevin McCarty
+ */
+
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *na, *nb;
@@ -56,6 +69,13 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+# if defined (__ia64__)
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a +
+          (((unsigned long)a > 0x80000000) ? autobase : 0x6000000000000000);
+  b = (unsigned long)b +
+          (((unsigned long)b > 0x80000000) ? autobase : 0x6000000000000000);
+# endif
 #else
      char **ja, **jb;
      int *na, *nb;


Index: 304-update-Imake-config-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/304-update-Imake-config-files.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 304-update-Imake-config-files.dpatch	30 Nov 2005 23:17:11 -0000	1.2
+++ 304-update-Imake-config-files.dpatch	14 Dec 2005 16:52:26 -0000	1.3
@@ -7,15 +7,15 @@
 ## DP: to support most Linux architectures.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/Imake.cf /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/Imake.cf
---- cernlib-2005.05.09/src/config/Imake.cf	2004-10-05 11:54:40.000000000 -0400
-+++ /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/Imake.cf	2005-06-09 10:47:36.470829080 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.cf cernlib-2005.05.09.dfsg/src/config/Imake.cf
+--- cernlib-2005.05.09.dfsg~/src/config/Imake.cf	2004-10-05 11:54:40.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/Imake.cf	2005-12-12 09:42:08.529220732 -0500
 @@ -1,24 +1,10 @@
 -/* $Id$
 - *
 - * $Log$
-- * Revision 1.2  2005/11/30 23:17:11  pertusus
-- * Don't expand keywords
+- * Revision 1.3  2005/12/14 16:52:26  pertusus
+- * - use new debian patchset
 - *
 - * Revision 1.5  2004/10/05 15:54:40  mclareni
 - * Add configuration file linux-lp64 for Linux 64-bit pointer systems like AMD Opteron and Intel IA64.
@@ -1270,9 +1270,9 @@
  
  #ifndef MacroIncludeFile
  XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
-diff -urNad cernlib-2005.05.09/src/config/linux.cf /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/linux.cf
---- cernlib-2005.05.09/src/config/linux.cf	2004-10-05 11:56:45.000000000 -0400
-+++ /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/linux.cf	2005-06-09 10:47:36.471828868 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/linux.cf cernlib-2005.05.09.dfsg/src/config/linux.cf
+--- cernlib-2005.05.09.dfsg~/src/config/linux.cf	2004-10-05 11:56:45.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/linux.cf	2005-12-12 09:42:42.505976387 -0500
 @@ -65,20 +65,20 @@
  #define OSVendor		/**/
  #define OSMajorVersion		2
@@ -1298,7 +1298,7 @@
  #endif
  #define HasPutenv		YES
  #define HasShm			YES
-@@ -94,38 +94,300 @@
+@@ -94,38 +94,302 @@
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
@@ -1589,6 +1589,8 @@
 +#  define OptimizedCDebugFlags  OptimizationLevel
 +# endif
 +# define LinuxMachineDefines    -D__x86_64__
++# define DefaultFCOptions       -fno-automatic \
++                                -fno-second-underscore -fugly-complex
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 +# define CernlibMachineDefines  -DCERNLIB_QMLXIA64
@@ -1613,7 +1615,7 @@
  /* Some of these man page defaults are overriden in the above OS sections */
  #ifndef ManSuffix
  # define ManSuffix	1x
-@@ -160,7 +422,7 @@
+@@ -160,7 +424,7 @@
  #define FortranSaveFlags	/* */ /* Everything static !? */
  #define OptimisedFortranFlags   -g -pc 64 -tp p6
  #define DefaultFCOptions        -Msave -fpic -Kieee
@@ -1622,7 +1624,7 @@
  
  #else
  
-@@ -171,19 +433,18 @@
+@@ -171,19 +435,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1654,7 +1656,7 @@
   
  #else
  
-@@ -194,19 +455,18 @@
+@@ -194,19 +457,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1686,7 +1688,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */
-@@ -221,17 +481,32 @@
+@@ -221,17 +483,32 @@
  /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */
  /*  Adapted to CERN style GF. 20-Sep-96 */
  
@@ -1722,7 +1724,7 @@
  
  # endif
  # endif
-@@ -251,7 +526,7 @@
+@@ -251,7 +528,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */


Index: 307-use-canonical-cfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/307-use-canonical-cfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 307-use-canonical-cfortran.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 307-use-canonical-cfortran.dpatch	14 Dec 2005 16:52:26 -0000	1.2
@@ -6,10 +6,10 @@
 ## DP: Debian package of cfortran, version 4.4-6.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.doc /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc
---- cernlib-2005.05.09/src/cfortran/cfortran.doc	1998-12-11 12:17:09.000000000 -0500
-+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc	2004-12-10 10:47:33.000000000 -0500
-@@ -195,7 +195,7 @@
+diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc	1998-12-11 17:17:09.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc	2005-12-09 18:01:09.000000000 +0000
+@@ -195,13 +195,13 @@
  HP9000> f77 -c cfortex.f
  HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest
  
@@ -18,7 +18,28 @@
  HP9000> # #define hpuxFortran800
  HP9000> cc -c -Aa -DhpuxFortran800 cfortest.c
  HP9000> f77 +800 -o cfortest cfortest.o cfortex.f
-@@ -643,7 +643,7 @@
+ 
+ f2c> # In the following, 'CC' is any C compiler.
+-f2c> f2c -R cfortex.f
++f2c> f2c cfortex.f
+ f2c> CC -o cfortest -Df2cFortran cfortest.c cfortex.c -lf2c  &&  cfortest
+ 
+ Portland Group $ # Presumably other C compilers also work.
+@@ -533,9 +533,10 @@
+ FORTRAN_REAL thus corresponds to FORTRAN's REAL on all machines, including t3e.
+ 
+ 
+-o f2c
+-  f2c, by default promotes REAL functions to double. cfortran.h does not (yet)
+-support this, so the f2c -R option must be used to turn this promotion off.
++o f2c / g77
++  f2c and g77 by default promote REAL functions to double.  As of December 9,
++2005, the Debian package of cfortran supports this behavior, so the f2c -R
++option must *NOT* be used to turn this promotion off.
+ 
+ o f2c
+ [Thanks to Dario Autiero for pointing out the following.]
+@@ -643,7 +644,7 @@
     [For an ancient math.h on a 386 or sparc, get similar from a new math.h.]
     #ifdef mc68000     /* 5 lines Copyright (c) 1988 by Sun Microsystems, Inc. */
     #define FLOATFUNCTIONTYPE	int
@@ -27,7 +48,7 @@
     #define ASSIGNFLOAT(x,y)	*(int *)(&x) = y
     #endif
  
-@@ -874,7 +874,7 @@
+@@ -874,7 +875,7 @@
  works everywhere and would seem to be an obvious choice.
  
  
@@ -36,7 +57,7 @@
  
  cfortran.h encourages the exact specification of the type and dimension of
  array parameters because it allows the C compiler to detect errors in the
-@@ -1835,7 +1835,7 @@
+@@ -1835,7 +1836,7 @@
  
  Unlike all other C compilers supported by cfortran.h,
  'gcc -traditional' promotes to double all functions returning float
@@ -45,7 +66,7 @@
  
  /* m.c */
  #include 
-@@ -2017,8 +2017,9 @@
+@@ -2017,8 +2018,9 @@
  
  THIS PACKAGE, I.E. CFORTRAN.H, THIS DOCUMENT, AND THE CFORTRAN.H EXAMPLE
  PROGRAMS ARE PROPERTY OF THE AUTHOR WHO RESERVES ALL RIGHTS. THIS PACKAGE AND
@@ -57,16 +78,16 @@
  - YOU MUST ACCOMPANY ANY COPIES OR DISTRIBUTION WITH THIS (UNALTERED) NOTICE.
  - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA 
    (E.G. TAPE, DISK, COMPUTER, PAPER.)
-diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.h /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h
---- cernlib-2005.05.09/src/cfortran/cfortran.h	2002-09-11 13:05:51.000000000 -0400
-+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h	2004-12-10 10:47:34.000000000 -0500
+diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h	2002-09-11 17:05:51.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h	2005-12-09 18:01:09.000000000 +0000
 @@ -1,4 +1,4 @@
 -/* cfortran.h  4.4_cernlib2002 */
 +/* cfortran.h  4.4 */
  /* http://www-zeus.desy.de/~burow/cfortran/                   */
  /* Burkhard Burow  burow at desy.de                 1990 - 2002. */
  
-@@ -11,6 +11,32 @@
+@@ -11,6 +11,35 @@
     MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE.
  */
  
@@ -94,12 +115,15 @@
 +
 +      Nov 2003: If __INTEL_COMPILER or INTEL_COMPILER defined, also define
 +                f2cFortran (KMCCARTY)
++      Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN
++                returning "double" in C.  This was one of the items on
++		Burkhard's TODO list. (KMCCARTY)
 + *******/
 +
  /* 
    Avoid symbols already used by compilers and system *.h:
    __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c
-@@ -75,7 +101,8 @@
+@@ -75,7 +104,8 @@
  
  /* Remainder of cfortran.h depends on the Fortran compiler. */
  
@@ -109,7 +133,7 @@
  #define f2cFortran
  #endif
  
-@@ -90,6 +117,27 @@
+@@ -90,6 +120,27 @@
                             Support f2c or f77 with gcc, vcc with f2c. 
                             f77 with vcc works, missing link magic for f77 I/O.*/
  #endif
@@ -137,7 +161,7 @@
  #if defined(__hpux)             /* 921107: Use __hpux instead of __hp9000s300 */
  #define       hpuxFortran       /*         Should also allow hp9000s7/800 use.*/
  #endif
-@@ -131,6 +179,7 @@
+@@ -131,6 +182,7 @@
  #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
  /* If your compiler barfs on ' #error', replace # with the trigraph for #     */
   #error "cfortran.h:  Can't find your environment among:\
@@ -145,7 +169,7 @@
      - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...)     \
      - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000     \
      - VAX   VMS CC 3.1 and FORTRAN 5.4.                                  \
-@@ -151,7 +200,8 @@
+@@ -151,7 +203,8 @@
      - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran          \
      - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \
      - Absoft Pro Fortran: Use #define AbsoftProFortran \
@@ -155,7 +179,7 @@
  /* Compiler must throw us out at this point! */
  #endif
  #endif
-@@ -164,7 +214,8 @@
+@@ -164,7 +217,8 @@
  
  /* Throughout cfortran.h we use: UN = Uppercase Name.  LN = Lowercase Name.   */
  
@@ -165,7 +189,7 @@
  #define CFC_(UN,LN)            _(LN,_)      /* Lowercase FORTRAN symbols.     */
  #define orig_fcallsc(UN,LN)    CFC_(UN,LN)
  #else 
-@@ -268,7 +319,8 @@
+@@ -268,7 +322,8 @@
  #endif
  
  #ifndef apolloFortran
@@ -175,7 +199,7 @@
  #define CF_NULL_PROTO
  #else                                         /* HP doesn't understand #elif. */
  /* Without ANSI prototyping, Apollo promotes float functions to double.    */
-@@ -512,7 +564,7 @@
+@@ -512,7 +567,7 @@
                      *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO)  ),   \
    (F).dsc$a_a0    =  ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length          ,(F))
  
@@ -184,7 +208,7 @@
  #define _NUM_ELEMS      -1
  #define _NUM_ELEM_ARG   -2
  #define NUM_ELEMS(A)    A,_NUM_ELEMS
-@@ -540,7 +592,8 @@
+@@ -540,7 +595,8 @@
  }
  return (int)num;
  }
@@ -194,3 +218,56 @@
  /*-------------------------------------------------------------------------*/
  
  /*           UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS       */
+@@ -1451,7 +1507,12 @@
+ #define      BYTE_cfPU(A)   CFextern INTEGER_BYTE      FCALLSC_QUALIFIER A
+ #define    DOUBLE_cfPU(A)   CFextern DOUBLE_PRECISION  FCALLSC_QUALIFIER A
+ #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define     FLOAT_cfPU(A)   CFextern DOUBLE_PRECISION  FCALLSC_QUALIFIER A
++#else
+ #define     FLOAT_cfPU(A)   CFextern FORTRAN_REAL      FCALLSC_QUALIFIER A
++#endif
+ #else				   	                   
+ #define     FLOAT_cfPU(A)   CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A
+ #endif				   	                   
+@@ -2088,7 +2149,12 @@
+ #ifndef __CF__KnR
+ /* The void is req'd by the Apollo, to make this an ANSI function declaration.
+    The Apollo promotes K&R float functions to double. */
+-#define   FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define FLOAT_cfFZ(UN,LN) DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#else
++#define FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#endif
+ #ifdef vmsFortran
+ #define  STRING_cfFZ(UN,LN) void  FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS
+ #else
+@@ -2104,7 +2170,12 @@
+ #endif
+ #else
+ #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define   FLOAT_cfFZ(UN,LN) DOUBLE_PRECISION  FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#else
+ #define   FLOAT_cfFZ(UN,LN) FORTRAN_REAL      FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#endif
+ #else
+ #define   FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)(
+ #endif
+@@ -2118,7 +2189,12 @@
+ #define    BYTE_cfF(UN,LN)     BYTE_cfFZ(UN,LN)
+ #define  DOUBLE_cfF(UN,LN)   DOUBLE_cfFZ(UN,LN)
+ #ifndef __CF_KnR
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define   FLOAT_cfF(UN,LN)  DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#else
+ #define   FLOAT_cfF(UN,LN)  FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#endif
+ #else
+ #define   FLOAT_cfF(UN,LN)    FLOAT_cfFZ(UN,LN)
+ #endif


Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 315-fixes-for-MacOSX.dpatch	9 Dec 2005 20:39:08 -0000	1.2
+++ 315-fixes-for-MacOSX.dpatch	14 Dec 2005 16:52:26 -0000	1.3
@@ -6,9 +6,25 @@
 ## DP: and run on OS X.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/Imake.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules
---- cernlib-2005.05.09/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/Imakefile	2005-12-07 14:47:34.141148558 -0500
+@@ -7,8 +7,12 @@
+ SUBDIRS= $(LIBDIRS) patchy cfortran
+ 
+ #ifdef CERNLIB_UNIX
++#ifdef CERNLIB_MACOSX
++SUBDIRS:= $(SUBDIRS) scripts
++#else
+ SUBDIRS:= $(SUBDIRS) scripts mgr
+ #endif
++#endif
+ 
+ InstallLibSubdirs($(LIBDIRS))
+ 
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
+--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2005-12-07 14:47:34.139148983 -0500
 @@ -2171,7 +2171,7 @@
  #define CppScriptTarget(dst,src,defs,deplist)				@@\
  dst::  src deplist							@@\
@@ -27,9 +43,9 @@
  									@@\
  clean::									@@\
  	RemoveFiles(dst)
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf
---- cernlib-2005.05.09/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.cf cernlib-2005.05.09.dfsg/src/config/MacOSX.cf
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.cf	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,170 @@
 +XCOMM platform:  $SFO: MOSXS.cf,v 1.0 95/11/19 23:21:00 sl Exp $
 +
@@ -201,9 +217,9 @@
 +/* End  CERNLIB changes */
 +
 +
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules
---- cernlib-2005.05.09/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.rules cernlib-2005.05.09.dfsg/src/config/MacOSX.rules
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.rules	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,123 @@
 +XCOMM $XConsortium: MOSXS.rules,v 1.1 97/12/12 15:34:45 sl Exp $
 +
@@ -328,9 +344,9 @@
 +#endif
 +
 +
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.tmpl /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl
---- cernlib-2005.05.09/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.tmpl cernlib-2005.05.09.dfsg/src/config/MacOSX.tmpl
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.tmpl	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,67 @@
 +XCOMM $XConsortium: MOSXS.tmpl,v 1.2 97/12/12 19:07:12 sl Exp $
 +
@@ -399,9 +415,9 @@
 +#define SharedFSRev F
 +SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
 +
-diff -urNad cernlib-2005.05.09/src/config/site.def /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def
---- cernlib-2005.05.09/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/site.def cernlib-2005.05.09.dfsg/src/config/site.def
+--- cernlib-2005.05.09.dfsg~/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/site.def	2005-12-07 14:47:34.140148771 -0500
 @@ -99,9 +99,7 @@
  /*   if it is already defined and false, undef it! */
  /* do not use shift by default
@@ -413,9 +429,9 @@
  #undef CERNLIB_SHIFT
  #endif
  #endif
-diff -urNad cernlib-2005.05.09/src/geant321/gxint/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile
---- cernlib-2005.05.09/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gxint/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gxint/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/geant321/gxint/Imakefile	2005-12-07 14:47:34.140148771 -0500
 @@ -30,7 +30,7 @@
  
  gxint321.f:  gxint.F
@@ -425,25 +441,9 @@
  
  install.lib:: $(CERN_LIBDIR)/gxint.f
  
-diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile
---- cernlib-2005.05.09/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile	2005-06-09 15:52:06.471072296 -0400
-@@ -7,8 +7,12 @@
- SUBDIRS= $(LIBDIRS) patchy cfortran
- 
- #ifdef CERNLIB_UNIX
-+#ifdef CERNLIB_MACOSX
-+SUBDIRS:= $(SUBDIRS) scripts
-+#else
- SUBDIRS:= $(SUBDIRS) scripts mgr
- #endif
-+#endif
- 
- InstallLibSubdirs($(LIBDIRS))
- 
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F
---- cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c327m.F cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c327m.F
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c327m.F	2005-12-07 14:47:34.141148558 -0500
 @@ -92,7 +92,11 @@
  #endif
        ENDIF
@@ -456,9 +456,9 @@
         IF(IDS .EQ. 1) THEN
        ERRMAX=MAX(ERRMAX,ABS(H1-T1))
        LTEST= LTEST .AND. ERRMAX .LE.  TSTERR
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F
---- cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c342m.F cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c342m.F
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c342m.F	2005-12-07 14:47:34.141148558 -0500
 @@ -70,7 +70,11 @@
  #endif
        END IF
@@ -471,9 +471,9 @@
        ERMAX= MAX(ERMAX,ABS(R1-T1))
        IF(IDS .EQ. 3 .OR. IDS .EQ. 4) THEN
         WRITE(LOUT,'(1X,F10.3,2F25.16,1P,D10.1)') SX,R,T,ABS(R1-T1)
-diff -urNad cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile
---- cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/data/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/data/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/data/Imakefile	2005-12-07 14:47:34.141148558 -0500
 @@ -1,11 +1,11 @@
  
  .SUFFIXES:
@@ -488,9 +488,9 @@
  
  PackageDirFileTarget(cojets.dat)
  
-diff -urNad cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile
---- cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/data/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/data/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/data/Imakefile	2005-12-07 14:47:34.141148558 -0500
 @@ -1,9 +1,9 @@
  
  .SUFFIXES:
@@ -503,9 +503,9 @@
  
  PackageDirFileTarget(isajet.dat)
  
-diff -urNad cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c
---- cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/sysreq/log.c cernlib-2005.05.09.dfsg/src/packlib/cspack/sysreq/log.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/cspack/sysreq/log.c	2005-12-07 14:47:34.142148345 -0500
 @@ -80,7 +80,7 @@
  static int pid;                 /* process identifier                   */
  static int logfd ;              /* logging file descriptor              */
@@ -515,9 +515,9 @@
  extern int syslog();
  #endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX */
  extern char *getenv();
-diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
---- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:51:53.621804393 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.05.09.dfsg/src/packlib/cspack/tcpaw/tcpaw.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c	2005-12-07 14:47:25.920897902 -0500
++++ cernlib-2005.05.09.dfsg/src/packlib/cspack/tcpaw/tcpaw.c	2005-12-07 14:47:34.146147494 -0500
 @@ -2569,7 +2569,7 @@
  #if !defined(IBM) && !defined(_WIN32)
  /* I provide "getpass" myself as standard version truncates to 8 characters */
@@ -559,9 +559,9 @@
 +  return result;
 +}
 +#endif /* CERNLIB_MACOSX */
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c
---- cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernbit/z268/systems.c cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernbit/z268/systems.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernbit/z268/systems.c	2005-12-07 14:47:34.146147494 -0500
 @@ -200,7 +200,7 @@
  || defined(_IBMR2) \
  || defined(__convexc__) \
@@ -571,9 +571,9 @@
  
    void systems_( command, buf, buflen, l, chars, rc, ovflw )
  
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/d704fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/d704fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-12-07 14:47:34.146147494 -0500
 @@ -4,6 +4,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -585,9 +585,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f002fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f002fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-12-07 14:47:34.146147494 -0500
 @@ -10,6 +10,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -599,9 +599,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f003fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f003fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -11,6 +11,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -613,9 +613,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f004fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f004fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -6,6 +6,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -627,9 +627,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f010fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f010fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -7,6 +7,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -641,9 +641,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  	 
  
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f011fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f011fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -7,6 +7,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -655,9 +655,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h
---- cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	2005-06-09 15:52:06.487068895 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kuip/kuip/ksys.h cernlib-2005.05.09.dfsg/src/packlib/kuip/kuip/ksys.h
+--- cernlib-2005.05.09.dfsg~/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kuip/kuip/ksys.h	2005-12-07 14:47:34.147147281 -0500
 @@ -188,6 +188,17 @@
  #endif
  
@@ -676,15 +676,15 @@
  #ifdef MSDOS
  #  define MACHINE_NAME "IBMPC"
  #  define OS_NAME "MSDOS"
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
---- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F	2005-12-07 14:47:25.807921944 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F	2005-12-07 14:55:23.810167859 -0500
 @@ -38,7 +38,12 @@
              IFCS=-2
              CALL CSRTGPL(I)
  #else
-+c     thanks to Keisuke Fujii for this patch for OS X
-+#if defined(CERNLIB_MACOSX)
++c     thanks to Keisuke Fujii for this patch for OS X            
++#if defined (CERNLIB_MACOSX)
 +          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else
            IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
@@ -696,7 +696,7 @@
            I=CSITGPL(IPVS)
          ENDIF
  #else
-+#if defined(CERNLIB_MACOSX)
++#if defined (CERNLIB_MACOSX)
 +        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else
          IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
@@ -704,9 +704,9 @@
          IF(IADGP.NE.0)THEN
            IFCS=-2
            ITYPGP=-2
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
---- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:51:53.524825013 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:57:50.699841388 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cscrexec.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cscrexec.F
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cscrexec.F	2005-12-07 14:47:25.687947476 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cscrexec.F	2005-12-07 14:47:34.148147068 -0500
 @@ -82,11 +82,19 @@
        IF(FEXT.EQ.'.c')THEN
          L=LENOCC(CHCC)
@@ -743,9 +743,9 @@
  #endif
  #if defined(CERNLIB_ALPHA_OSF)
          CHLINE=                   'ld -shared -o '
-diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
---- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/programs/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/paw/programs/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/pawlib/paw/programs/Imakefile	2005-12-07 14:47:34.148147068 -0500
 @@ -9,7 +9,7 @@
  EXTRA_LDOPTIONS=-Wl,-E
  #endif


Index: 701-patch-hbook-comis-Imakefiles.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/701-patch-hbook-comis-Imakefiles.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 701-patch-hbook-comis-Imakefiles.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 701-patch-hbook-comis-Imakefiles.dpatch	14 Dec 2005 16:52:26 -0000	1.2
@@ -6,9 +6,9 @@
 ## DP: 701 dpatch (a shell script).
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/packlib/hbook/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile
---- cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
-+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	2005-06-10 17:04:08.866020136 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/code/Imakefile cernlib-2005.05.09.dfsg/src/packlib/hbook/code/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/hbook/code/Imakefile	2005-12-07 14:59:31.519940694 -0500
 @@ -19,8 +19,8 @@
  	hgn.F hgnf.F hgnpar.F hgstat.F hhipar.F hhxye.F hi.F \ @@\
  	hictoi.F hid1.F hid2.F hidall.F hidopt.F hidpos.F hie.F  \ @@\
@@ -20,9 +20,9 @@
  	hkind.F hknul1.F hknuli.F hlabel.F hlabeq.F hlabnb.F \ @@\
  	hlattr.F hlccmp.F hldir.F hldir1.F hldir2.F hldirt.F \ @@\
  	hlgnxt.F hlhcmp.F hlimit.F hllsq.F hlnext.F hlocat.F \ @@\
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
---- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:02:24.843306185 -0400
-+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:05:09.955931988 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile	2005-12-07 14:59:22.782783593 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile	2005-12-07 14:59:31.519940694 -0500
 @@ -37,7 +37,8 @@
  	csspar.F cssubr.F cssvpt.F cstadv.F cstarr.F csterr.F cstext.F \ @@\
  	cstfrf.F cstinf.F cstlgb.F cstlog.F cstpar.F cstran.F cstrer.F \ @@\


Index: cernlib.m4
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib.m4	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib.m4	14 Dec 2005 16:52:26 -0000	1.2
@@ -1,6 +1,6 @@
 dnl                                                      -*- Autoconf -*- 
 dnl  autoconf macros for the cernlib libraries
-dnl  Copyright (C) 2004 Patrice Dumas
+dnl  Copyright (C) 2004, 2005 Patrice Dumas
 dnl
 dnl  This program is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
@@ -16,28 +16,33 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-dnl A basic axample of the macros usage:
+dnl A basic axample of the macro usage:
 dnl 
-dnl AC_CERNLIB
-dnl AC_LIB_CERNLIB(kernlib,CLTOU)
-dnl AC_LIB_CERNLIB(mathlib,GAUSS)
-dnl LIBS="$CERNLIB_LIBS $LIBS"
-
-dnl The macro AC_CERNLIB tries to determine the cernlib location and
-dnl whether the linking should be static or not. It should be called once and
-dnl before a particular cernlib library is detected with the second macro.
+dnl AC_LIB_CERNLIB(kernlib,CLTOU,
+dnl [
+dnl    AC_LIB_CERNLIB(mathlib,GAUSS,[LIBS="$CERNLIB_LIBS $LIBS"])
+dnl ])
+
+dnl
 dnl --with-static-cernlib forces the static or dynamic linking.
 dnl --with-cernlib gives the location of cernlib.
 dnl
-dnl If the type of linking isn't forced it is detected as follow:
-dnl - if the environment variable CERNLIB exists it is assumed to be the
+dnl If the type of linking isn't specified it is assumed to be static.
+dnl
+dnl For static linking:
+dnl - if the binary program 'cernlib-static' or 'cernlib' is in the path it is 
+dnl   assumed that a static linking using the information reported by that 
+dnl   script is wanted.
+dnl - otherwise if the environment variable CERNLIB exists it is assumed to be the
 dnl   location of the static library.
 dnl - otherwise if the environment variable CERN_ROOT exists it is assumed 
 dnl   that CERN_ROOT/lib is the location of the static library.
-dnl - otherwise if the binary program 'cernlib' is in the path it is assumed 
-dnl   that a static linking using the information reported by that binary is 
-dnl   wanted.
-dnl - otherwise a dynamic linking is performed.
+dnl - otherwise a simple linking is performed.
+dnl 
+dnl If a dynamic linking is selected:
+dnl - if the binary program 'cernlib' is in the path it is assumed that it is the 
+dnl   debian script and it is called with -dy.
+dnl - otherwise a simple linking is performed.
 dnl
 dnl AC_LIB_CERNLIB ([LIBRARY = kernlib], [FUNCTION = CLTOU], [ACTION-IF-FOUND],
 dnl          [ACTION-IF-NOT-FOUND]) 
@@ -53,7 +58,7 @@
 # statically linked or not.
 AC_DEFUN([AC_CERNLIB], [
 CERNLIB_LIB_PATH=
-CERNLIB_STATIC=
+CERNLIB_STATIC=yes
 AC_ARG_WITH(static_cernlib,
 [  --with-static-cernlib             link statically with the cernlib],
 [  CERNLIB_STATIC=$withval      ])
@@ -64,27 +69,24 @@
 
 
 if test "z$CERNLIB_STATIC" != "zno"; then    
-    CERNLIB_BIN=no
+    CERNLIB_STATIC=yes
     if test "z$CERNLIB_LIB_PATH" = z; then
-        if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
-            CERNLIB_LIB_PATH=$CERNLIB
-            CERNLIB_STATIC="yes"
-            AC_MSG_NOTICE([using the CERNLIB environment variable for cernlib location])
-        elif test "z$CERN_ROOT" != z -a -d "$CERN_ROOT/lib"; then
-            CERNLIB_LIB_PATH=$CERN_ROOT/lib
-            CERNLIB_STATIC="yes"
-            AC_MSG_NOTICE([using the CERN_ROOT environment variable for cernlib location])
-        fi
-        if test "z$CERNLIB_LIB_PATH" = "z"; then
+        AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no)
+        if test $CERNLIB_BIN = no; then
             AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
-            if test $CERNLIB_BIN != no; then
-                CERNLIB_STATIC="yes"
+        fi
+        if test $CERNLIB_BIN = no; then
+            if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
+               CERNLIB_LIB_PATH=$CERNLIB
+               AC_MSG_NOTICE([using the CERNLIB environment variable for cernlib location])
+            elif test "z$CERN_ROOT" != z -a -d "$CERN_ROOT/lib"; then
+                CERNLIB_LIB_PATH=$CERN_ROOT/lib
+                AC_MSG_NOTICE([using the CERN_ROOT environment variable for cernlib location])
             fi
         fi
     fi
-fi
-
-if test "z$CERNLIB_STATIC" != "zyes"; then
+else
+    AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
     if test "z$CERNLIB_LIB_PATH" != z; then
          LDFLAGS="$LDFLAGS -L$CERNLIB_LIB_PATH"
     fi
@@ -95,6 +97,7 @@
 #          [ACTION-IF-NOT-FOUND]) 
 # check for a function in a library of the cernlib
 AC_DEFUN([AC_LIB_CERNLIB], [
+AC_REQUIRE([AC_CERNLIB])
 
 cernlib_lib_ok="no"
 
@@ -110,10 +113,12 @@
     cern_func=$2
 fi
 
+save_CERNLIB_LIBS=$CERNLIB_LIBS
+save_LIBS=$LIBS
+
 if test "z$CERNLIB_STATIC" = "zyes"; then
     cernlib_lib_static_found=no
     AC_MSG_NOTICE([cernlib: linking with a static $cern_library])
-    save_CERNLIB_LIBS="$CERNLIB_LIBS"
     if test "z$CERNLIB_BIN" != "zno"; then
         cernlib_bin_out=`$CERNLIB_BIN $cern_library`
         CERNLIB_LIBS="$cernlib_bin_out $CERNLIB_LIBS"
@@ -127,37 +132,34 @@
     fi
     if test "z$cernlib_lib_static_found" = zno; then
         AC_MSG_WARN([cannot determine the cernlib location for static linking])
+    fi
+else
+    AC_MSG_NOTICE([trying a dynamical link with $cern_library])
+    if test "z$CERNLIB_BIN" != "zno"; then
+        # try link with debian cernlib script with -dy
+        cernlib_bin_out=`$CERNLIB_BIN -dy $cern_library`
+        CERNLIB_LIBS="$cernlib_bin_out $CERNLIB_LIBS"
     else
+        CERNLIB_LIBS="-l$cern_library $CERNLIB_LIBS"
+    fi
+fi
+
 dnl now try the link
-        AC_LANG_PUSH(Fortran 77)
-        save_LIBS="$LIBS"; LIBS="$CERNLIB_LIBS $LIBS"
-        AC_LINK_IFELSE([      program main
+LIBS="$CERNLIB_LIBS $LIBS"
+AC_LANG_PUSH(Fortran 77)
+AC_LINK_IFELSE([      program main
       call $cern_func
       end
 ], 
-        [ 
-            cernlib_lib_ok=yes
-        ],
-        [
-            CERNLIB_LIBS="$save_CERNLIB_LIBS"
-        ])
-        LIBS="$save_LIBS"
-        AC_LANG_POP(Fortran 77)
-    fi
-else
-    AC_MSG_NOTICE([trying a dynamical link with $cern_library])
-dnl FIXME ther could also be something like
-dnl save_LIBS="$LIBS"; LIBS="$CERNLIB_LIBS $LIBS"
-dnl CERNLIB_LIBS="-l$cern_library $CERNLIB_LIBS" 
-dnl LIBS="$save_LIBS"
-    AC_CHECK_LIB([$cern_library], [$cern_func],
-       [ 
-         AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
-         LIBS="-l$1 $LIBS"
-
-         cernlib_lib_ok=yes 
-       ])
-fi
+[ 
+    cernlib_lib_ok=yes
+],
+[
+    CERNLIB_LIBS=$save_CERNLIB_LIBS
+])
+AC_LANG_POP(Fortran 77)
+LIBS=$save_LIBS
+AC_SUBST([CERNLIB_LIBS])
 
 AS_IF([test x"$cernlib_lib_ok" = xyes],
       [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_CERNLIB_${cern_library}_${cern_func}))


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cernlib.spec	9 Dec 2005 20:39:08 -0000	1.8
+++ cernlib.spec	14 Dec 2005 16:52:26 -0000	1.9
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.1
+Release:       9%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -66,7 +66,7 @@
 Source201: cernlib-deadpool.txt
 
 # debian patchset
-Patch0: cernlib_2005.05.09.dfsg-2.diff
+Patch0: cernlib_2005.05.09.dfsg-3.diff
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: 001-fix-missing-fluka.dpatch
@@ -89,6 +89,9 @@
 # a workaround for cups. Applied in doubt.
 Patch113: 113-cups-postscript-fix.dpatch
 Patch114: 114-install-scripts-properly.dpatch
+Patch115: 115-rsrtnt64-goto-outer-block.dpatch
+Patch116: 116-fix-fconc64-spaghetti-code.dpatch
+Patch117: 117-fix-optimizer-bug-in-gphot.dpatch
 Patch200: 200-comis-allow-special-chars-in-path.dpatch
 Patch201: 201-update-kuip-helper-apps.dpatch
 Patch202: 202-fix-includes-in-minuit-example.dpatch
@@ -102,8 +105,9 @@
 Patch208: 208-fix-redundant-packlib-dependencies.dpatch
 Patch209: 209-ignore-unneeded-headers-in-kmutil.c.dpatch
 Patch210: 210-improve-cfortran-header-files.dpatch
-# disabled in the debian patchset, enabled here
-Patch211: 211-fix-comis-on-64-bit-arches.dpatch
+# split in newer debian patchset
+Patch2110: 211-fix-comis-on-amd64.dpatch
+Patch2111: 211-fix-comis-on-ia64.dpatch
 Patch300: 300-skip-duplicate-lenocc.dpatch
 # Use another approach, see cernlib-enforce-FHS
 # Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -183,7 +187,6 @@
 Patch1203: cernlib-hwuli2_use_dimag.diff 
 Patch1204: cernlib-hwhiga_use_dimag.diff
 Patch1205: cernlib-gfortran.diff 
-Patch1206: cernlib-rsrtnt64_goto_outer_block.diff
 Patch1207: cernlib-v107z0_X_before_string.diff
 
 %description
@@ -313,6 +316,9 @@
 %patch -P 112 -p1
 %patch -P 113 -p1
 %patch -P 114 -p1
+%patch -P 115 -p1
+%patch -P 116 -p1
+%patch -P 117 -p1
 %patch -P 200 -p1
 %patch -P 201 -p1
 %patch -P 202 -p1
@@ -324,7 +330,8 @@
 %patch -P 208 -p1
 %patch -P 209 -p1
 %patch -P 210 -p1
-%patch -P 211 -p1
+%patch -P 2110 -p1
+%patch -P 2111 -p1
 %patch -P 300 -p1
 #%patch -P 301 -p1
 #%patch -P 302 -p1
@@ -458,7 +465,6 @@
 # use gfortran
 #%patch -P 1205
 # workaround gfortran bug
-%patch -P 1206
 %patch -P 1207
 
 # remove CVS directories
@@ -693,6 +699,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Wed Dec 14 2005 Patrice Dumas  - 2005-9
+- use new debian patchset
+
 * Fri Dec  9 2005 Patrice Dumas  - 2005-8.1
 - use new debian patchset
 - enable 64 bit fixes patch


Index: paw.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/paw.README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paw.README	30 Nov 2005 22:01:01 -0000	1.2
+++ paw.README	14 Dec 2005 16:52:26 -0000	1.3
@@ -41,11 +41,6 @@
 
 to the beginning of them.
 
-5) 64-bit issues
-
-Note that this package is not yet fully functional on 64-bit machines, as the
-COMIS portion of Pawlib does not yet work correctly on those architectures.
-
 -- Kevin McCarty , Tue, 22 Nov 2005
 
 Adapted to the rpm package by 


--- 211-fix-comis-on-64-bit-arches.dpatch DELETED ---


--- cernlib-rsrtnt64_goto_outer_block.diff DELETED ---


--- cernlib_2005.05.09.dfsg-2.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 14 17:02:38 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed, 14 Dec 2005 12:02:38 -0500
Subject: CVSROOT avail,1.19,1.20
Message-ID: <200512141703.jBEH38hd010184@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10169

Modified Files:
	avail 
Log Message:
Updating avail for new directory structure.


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- avail	13 Dec 2005 22:30:51 -0000	1.19
+++ avail	14 Dec 2005 17:02:35 -0000	1.20
@@ -22,27 +22,27 @@
 unavail | | web
 avail | tfox,notting,sopwith,gdk,katzj,kwade | web
 avail | havill,hp,nman64,ivazquez | web
-avail | katzj | web/html/projects/anaconda-installer
-avail | bfox | web/html/projects/config-tools
-avail | blizzard,krh | web/html/projects/desktop
-avail | wcohen | web/html/projects/additional-projects/benchmarks
-avail | sopwith,dwalsh,kwade | web/html/projects/selinux
-avail | ezannoni | web/html/projects/additional-projects/gdb
-avail | alikins,trobert | web/html/download
-avail | llch | web/html/projects/i18n
-avail | sarahs | web/html/projects/translations
-avail | harald | web/html/projects/config-tools
+avail | katzj | web/html/About/Projects/anaconda-installer
+#avail | bfox | web/html/projects/config-tools
+avail | blizzard,krh | web/html/About/Projects/desktop
+#avail | wcohen | web/html/projects/additional-projects/benchmarks
+avail | sopwith,dwalsh,kwade | web/html/About/Projects
+#avail | ezannoni | web/html/projects/additional-projects/gdb
+avail | alikins,trobert | web/html/Download
+avail | llch | web/html/About/Projects/i18n
+avail | sarahs | web/html/About/Projects/translations
+#avail | harald | web/html/projects/config-tools
 avail | kwade,pfrields | web/html/docs
-avail | sarahs | web/html/participate/translation-faq
-avail | sarahs | web/html/participate/translation-guide
-avail | sarahs | web/html/participate/translation-windows
-avail | dmalcolm | web/html/projects/stateless
+avail | sarahs | web/html/docs/translation-faq
+avail | sarahs | web/html/docs/translation-guide
+avail | sarahs | web/html/docs/translation-windows
+avail | dmalcolm | web/html/About/Projects/stateless
 avail | dmalcolm | web/html/docs/stateless
 avail | riel | web/html/docs/virtualisation
-avail | riel | web/html/projects/virtualisation
-avail | ezannoni | web/html/projects/systemtap
+avail | riel | web/html/About/Projects/virtualisation
+#avail | ezannoni | web/html/projects/systemtap
 avail | harald | web/html/docs/udev
-avail | cfeist | web/html/projects/cluster
+#avail | cfeist | web/html/projects/cluster
 
 unavail | | fedora-security
 avail | mjc,bressers,jorton,notting,sopwith,katzj | fedora-security



From fedora-extras-commits at redhat.com  Wed Dec 14 17:44:07 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 14 Dec 2005 12:44:07 -0500
Subject: rpms/synaptic/devel synaptic.spec,1.13,1.14
Message-ID: <200512141744.jBEHicd2010336@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/synaptic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10318

Modified Files:
	synaptic.spec 
Log Message:
Rebuild for new openssl and apt



Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- synaptic.spec	18 Aug 2005 18:15:25 -0000	1.13
+++ synaptic.spec	14 Dec 2005 17:44:05 -0000	1.14
@@ -2,7 +2,7 @@
 
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
-Version: 0.57.2
+Version: 0.57.3
 Release: 2%{?dist}
 
 License: GPL
@@ -99,6 +99,9 @@
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Wed Dec 14 2005 Deji Akingunola  - 0.57.2-3
+- Rebuild for new openssl and apt in devel.
+
 * Wed Aug 17 2005 Ville Skytt??  - 0.57.2-2
 - Rebuild for new libcairo in devel.
 



From fedora-extras-commits at redhat.com  Wed Dec 14 17:46:56 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 14 Dec 2005 12:46:56 -0500
Subject: rpms/synaptic/devel synaptic.spec,1.14,1.15
Message-ID: <200512141747.jBEHlQvw010362@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/synaptic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10344

Modified Files:
	synaptic.spec 
Log Message:
Bump the release field and not the version



Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- synaptic.spec	14 Dec 2005 17:44:05 -0000	1.14
+++ synaptic.spec	14 Dec 2005 17:46:54 -0000	1.15
@@ -2,7 +2,7 @@
 
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
-Version: 0.57.3
+Version: 0.57.2
 Release: 2%{?dist}
 
 License: GPL



From fedora-extras-commits at redhat.com  Wed Dec 14 17:51:20 2005
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 14 Dec 2005 12:51:20 -0500
Subject: rpms/synaptic/devel synaptic.spec,1.15,1.16
Message-ID: <200512141751.jBEHppEL010432@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/synaptic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10383

Modified Files:
	synaptic.spec 
Log Message:
Oops, sorry. Doing it right this time



Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- synaptic.spec	14 Dec 2005 17:46:54 -0000	1.15
+++ synaptic.spec	14 Dec 2005 17:51:18 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
 Version: 0.57.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group: Applications/System



From fedora-extras-commits at redhat.com  Wed Dec 14 17:51:49 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 14 Dec 2005 12:51:49 -0500
Subject: rpms/xchat-gnome/devel xchat-gnome-323944.patch, NONE,
	1.1 xchat-gnome.spec, 1.6, 1.7
Message-ID: <200512141752.jBEHqKmC010475@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10417

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-gnome-323944.patch 
Log Message:
* Wed Dec 14 2005 Brian Pepple  - 0.7-4
- Add patch to fix #175751. 


xchat-gnome-323944.patch:

--- NEW FILE xchat-gnome-323944.patch ---
Index: xchat-gnome-0.7/src/fe-gnome/navigation-tree.c
===================================================================
--- xchat-gnome-0.7/src/fe-gnome/navigation-tree.c	(revision 9898)
+++ xchat-gnome-0.7/src/fe-gnome/navigation-tree.c	(working copy)
@@ -1060,6 +1060,9 @@
 	gpointer *s;
 	session *sess;
 
+	if (gui.server_tree == NULL)
+		return;
+
 	treeview = GTK_TREE_VIEW (glade_xml_get_widget (gui.xml, "userlist"));
 
 	if (gui.server_tree->current_path != NULL)


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xchat-gnome.spec	30 Nov 2005 16:43:43 -0000	1.6
+++ xchat-gnome.spec	14 Dec 2005 17:51:47 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:           xchat-gnome
 Version:        0.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -15,6 +15,7 @@
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-datadir.patch
 Patch1:		%{name}-config.patch
+Patch2:		%{name}-323944.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -53,6 +54,7 @@
 %setup -q
 %patch0 -p1 -b .datadir
 %patch1 -p1 -b .config
+%patch2 -p1 -b .323944
 
 
 %build
@@ -148,6 +150,9 @@
 
 
 %changelog
+* Wed Dec 14 2005 Brian Pepple  - 0.7-4
+- Add patch to fix #175751. 
+
 * Wed Nov 30 2005 Brian Pepple  - 0.7-3
 - Disable dbus support, until FE Bug #174592 is fixed.
 



From fedora-extras-commits at redhat.com  Wed Dec 14 18:18:47 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 14 Dec 2005 13:18:47 -0500
Subject: rpms/cernlib/devel cernlib_2005.05.09.dfsg-3.diff, NONE,
	1.1 cernlib.spec, 1.9, 1.10
Message-ID: <200512141818.jBEIIlou012216@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12200

Modified Files:
	cernlib.spec 
Added Files:
	cernlib_2005.05.09.dfsg-3.diff 
Log Message:
forgot to add cernlib_2005.05.09.dfsg-3.diff


cernlib_2005.05.09.dfsg-3.diff:

--- NEW FILE cernlib_2005.05.09.dfsg-3.diff ---
--- cernlib-2005.05.09.dfsg.orig/debian/control
+++ cernlib-2005.05.09.dfsg/debian/control
@@ -0,0 +1,896 @@
+Source: cernlib
+Maintainer: Kevin B. McCarty 
+Standards-Version: 3.6.2
+Priority: optional
+Section: science
+Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin
+
+Package: cernlib-base
+Architecture: all
+Section: devel
+Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev
+Description: script to determine Cernlib library dependencies
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This package includes the "cernlib" script that lists the command-line
+ options needed for linking against Cernlib libraries.  The script has
+ been rewritten from the upstream version to calculate
+ dependencies recursively.  Also included are a README.Debian with a summary
+ of changes made to Cernlib to fit it into Debian packaging practices,
+ and a contributed set of Autoconf macros to test for Cernlib libraries.
+
+Package: cernlib-core-dev
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit
+Description: Cernlib development headers, tools, and static libraries
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides the header files and static libraries likely to be
+ wanted by developers using the Cern libraries who are not interested
+ specifically in high energy physics.  It also provides the Cernlib
+ development tools DZedit and KUIPC.  Cernlib analysis programs may be
+ obtained by installing the cernlib-core metapackage.
+
+Package: cernlib-core
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos
+Description: Cernlib main libraries and programs
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides the libraries and analysis tools (e.g. PAW) likely
+ to be wanted by most users of the Cern libraries who are not interested
+ specifically in high energy physics.  You cannot do program development by
+ installing only this metapackage; development libraries and tools may
+ be obtained by installing the cernlib-core-dev metapackage or individual
+ lib*-dev packages.
+
+Package: cernlib-extras
+Architecture: all
+Priority: extra
+Section: science
+Depends: cernlib-base (= ${Source-Version}), pawserv, zftp
+Description: miscellaneous Cernlib programs unlikely to be used by many
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides a few additional Cernlib programs not included
+ in any other Cernlib metapackage.  Very few people are likely to be
+ interested in them; currently they include zftp, pawserv and zserv.
+ Notice that the latter two programs run as daemons through inetd and may
+ reduce your system's security!
+ .
+ Installing this package along with the "cernlib" metapackage will supply
+ a complete set of all Cernlib programs and libraries included in Debian.
+
+Package: cernlib-montecarlo
+Architecture: all
+Section: science
+Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev
+Recommends: libisajet758-2-dev
+Description: Cernlib Monte Carlo libraries
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides various Monte Carlo libraries included in Cernlib
+ (both shared and static).  Likely only physicists will be interested in
+ these packages.  Note that the Geant 3.21 program is not included, but it may
+ be obtained by also installing the geant321 Debian package.
+ .
+ Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are
+ not available within Debian due to licensing issues; see the README.Debian
+ file in the montecarlo-base package for information on obtaining them.
+ .
+ Additionally, the Isajet library is not available on the m68k architecture
+ due to a compiler flaw.
+
+Package: cernlib
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev
+Description: almost complete set of Debian Cernlib packages
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides almost all of the programs and libraries contained
+ in Cernlib.  Most people will likely want only a subset of these.  A few
+ extra Cernlib programs, not of interest to many people, may be obtained via
+ the cernlib-extras metapackage.
+
+Package: dzedit
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: libpacklib1-dev
+Description: Cernlib's ZEBRA documentation editor
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system
+ developed at CERN.  ZEBRA, part of the Packlib library, permits a developer to
+ create complex data structures in the FORTRAN 77 language; the DZDOC system
+ allows the developer to generate and maintain documentation of ZEBRA data
+ structures.
+
+Package: geant321-data
+Architecture: all
+Section: science
+Depends: cernlib-base
+Description: [Physics] Data for Geant 3.21 detector simulator
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes data files for use by Geant.
+
+Package: geant321-doc
+Architecture: all
+Section: doc
+Depends: cernlib-base
+Description: [Physics] Documentation for Geant 3.21
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes some documentation about Geant.
+
+Package: geant321
+Architecture: all
+Section: science
+Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77
+Suggests: kxterm, geant321-doc
+Description: [Physics] Particle detector description and simulation tool
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes gxint, the script used to perform this linking step.
+
+Package: kuipc
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, cernlib-base
+Recommends: libpacklib1-dev
+Suggests: libpacklib1-lesstif-dev
+Description: Cernlib's Kit for a User Interface Package (KUIP) compiler
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify
+ the writing of a program's user interface code.  It takes as
+ input a Command Definition File (CDF) that describes the
+ commands to be understood by the program, and outputs C or FORTRAN code that
+ makes the appropriate function calls to set up the user interface.  This
+ code can then be compiled and linked with the rest of the program.  Since
+ the generated code uses KUIP routines, the program must also be linked
+ against the Packlib library that contains them.
+ .
+ KUIPC is no longer actively developed, so aside from its use in the build
+ process of Cernlib, it is of mainly historical interest.
+
+Package: kxterm
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}, cernlib-base
+Description: Cernlib's KUIP terminal emulator
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ KXterm is a terminal emulator which combines the best features from
+ the (now defunct) Apollo DM pads (like: input and transcript
[...20906 lines suppressed...]
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ./pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, C??? hai"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "M??y ph???c v??? c???n ch???y t??? tr??nh inetd"
+
+#. Type: select
+#. Description
+#: ./pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr "G??i tin n??y bao g???m c??? hai tr??nh n???n (d??mon) pawserv (m?? cho ph??p m??y t??? xa ?????c t???p tin ?????a ph????ng trong khi ch???y PAW/Paw++) v?? tr??nh n???n zserv (m?? cho ph??p m??y t??? xa ????ng nh???p d??ng giao th???c ZFTP c???a CERN). C??? hai tr??nh ph???c v??? n??y ???????c ch???y t??? tr??nh n???n inetd; b???n c?? th??? hi???u l???c m???t hay c??? hai ??i???u. Tuy nhi??n, tr??? b???n c???n thi???t l??m vi???c r???t ?????c bi???t, r???t c?? th??? l?? b???n s??? mu???n hi???u l???c ch??? tr??nh pawserv."
--- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po
+++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po
@@ -0,0 +1,55 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib\n"
+"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-05-26 16:05-0300\n"
+"Last-Translator: Andr? Lu?s Lopes \n"
+"Language-Team: Debian-BR Project \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Ambos"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servidores a serem executados a partir do inetd"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr ""
+"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos "
+"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv "
+"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP "
+"do CERN). Esses servidores s?o executados a partir do inetd; voc? "
+"pode habilitar cada um deles separadamente ou ambos. A menos que voc? "
+"possua necessidades bastante especializadas, voc? provavelmente ir? "
+"desejar habilitar somente o pawserv."
--- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po
+++ cernlib-2005.05.09.dfsg/debian/po/sv.po
@@ -0,0 +1,53 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib 2005.05.09-4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-10-06 23:50+0200\n"
+"Last-Translator: Daniel Nylander \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, B?da"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servrar som ska k?ras fr?n inetd"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr ""
+"Detta paket inkluderar b?de pawserver-daemonen (till?ter fj?rrsystem att "
+"l?sa lokala filer n?r PAW/Paw++ k?rs) och zserv-daemonen (till?ter fj?rrsystem "
+"att logga in med CERN's ZFTP-protokoll).  Dessa servrar k?rs fr?n inetd; du m?ste "
+"aktivera n?gon eller b?da av dom. Om du inte har speciella krav s? r?cker det gott "
+"om pawserv aktiveras."
+
--- cernlib-2005.05.09.dfsg.orig/debian/po/es.po
+++ cernlib-2005.05.09.dfsg/debian/po/es.po
@@ -0,0 +1,55 @@
+# cernlib po-debconf translation to Spanish
+# Copyright (C) 2005 Software in the Public Interest
+# This file is distributed under the same license as the cernlib package.
+#
+# Changes:
+#  - Initial translation
+#         C??sar G??mez Mart??n 
+#
+#   Traductores, si no conoce el formato PO, merece la pena leer la
+#   documentaci??n de gettext, especialmente las secciones dedicadas a este
+#   formato, por ejemplo ejecutando:
+#          info -n '(gettext)PO Files'
+#          info -n '(gettext)Header Entry'
+# Equipo de traducci??n al espa??ol, por favor, lean antes de traducir
+# los siguientes documentos:
+#
+#  - El proyecto de traducci??n de Debian al espa??ol
+#    http://www.debian.org/intl/spanish/
+#    especialmente las notas de traducci??n en
+#    http://www.debian.org/intl/spanish/notas
+#
+#  - La gu??a de traducci??n de po's de debconf:
+#    /usr/share/doc/po-debconf/README-trans
+#    o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-09-01 17:49+0100\n"
+"Last-Translator: C??sar G??mez Mart??n \n"
+"Language-Team: Debian l10n spanish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: SPAIN\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Type: select
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Ambos"
+
+#. Type: select
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servidores a ejecutar desde inetd"
+
+#. Type: select
+#: ../pawserv.templates.master:6
+msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol).  These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv."
+msgstr "Este paquete incluye el demonio pawserv (permite a las m??quinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++)  y el demonio zserv (permite a las m??quinas remotas conectarse a trav??s del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo m??s probable es que s??lo quiera habilitar pawserv."
+


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cernlib.spec	14 Dec 2005 16:52:26 -0000	1.9
+++ cernlib.spec	14 Dec 2005 18:18:45 -0000	1.10
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       9%{?dist}
+Release:       9%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -699,7 +699,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Wed Dec 14 2005 Patrice Dumas  - 2005-9
+* Wed Dec 14 2005 Patrice Dumas  - 2005-9.1
 - use new debian patchset
 
 * Fri Dec  9 2005 Patrice Dumas  - 2005-8.1



From fedora-extras-commits at redhat.com  Wed Dec 14 18:49:39 2005
From: fedora-extras-commits at redhat.com (Robert Theisen (trobert))
Date: Wed, 14 Dec 2005 13:49:39 -0500
Subject: web/html/Download mirrors.php,1.1,1.2
Message-ID: <200512141850.jBEIo9Ra012323@cvs-int.fedora.redhat.com>

Author: trobert

Update of /cvs/fedora/web/html/Download
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12305

Modified Files:
	mirrors.php 
Log Message:
Added new sites and corrected a couple of old site paths.



Index: mirrors.php
===================================================================
RCS file: /cvs/fedora/web/html/Download/mirrors.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mirrors.php	29 Nov 2005 17:32:36 -0000	1.1
+++ mirrors.php	14 Dec 2005 18:49:37 -0000	1.2
@@ -87,6 +87,7 @@
 	    
  • http://srl.cs.jhu.edu/YUM/fedora-core/
    • 
 	    
  •  rsync://srl.cs.jhu.edu/YUM/fedora-core/
    • 
 	    
  • http://fedora.secs.oakland.edu/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
         
 	
 	
  • USA West
@@ -123,6 +124,7 @@
 	    
  • ftp://ftp.applios.net/pub/fedora/linux/core
    • 
 	    
  • ftp://calserv.unl.edu/pub/linux/fedora/linux/core/
    • 
 	    
  • ftp://mirrors.imagi.net/fedora/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Canada
@@ -275,6 +277,7 @@
 	    
  • ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/
    • 
 	    
  • http://download.atrpms.net/mirrors/fedoracore/
    • 
 	    
  • ftp://ftp.fu-berlin.de/linux/fedora/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Greece
@@ -460,6 +463,7 @@
 	    
  • http://mirror.poundhost.com/fedora.redhat.com/
    • 
 	    
  • ftp://mirror.poundhost.com/pub/fedora.redhat.com/
    • 
 	    
  • ftp://ftp2.newnet.co.uk/pub/fedora/linux/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
      
@@ -528,6 +532,7 @@
 	   
  • rsync://ftp.nara.wide.ad.jp/fedora/
    • 
 	   
  • ftp://ftp.dti.ad.jp/pub/Linux/Fedora/core/
    • 
 	   
  • http://ftp.dti.ad.jp/pub/Linux/Fedora/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Korea
@@ -536,11 +541,12 @@
 	   
  • rsync://ftp.kreonet.re.kr/fedora/core/
    • 
 	   
  • ftp://mirror.hostway.co.kr/pub/fedora/
    • 
 	   
  • ftp://ftp.kaist.ac.kr/pub/fedora/linux/core/
    • 
+	    
  • http://coblitz.planet-lab.org/pub/fedora/linux/core/
    • 
 	
 	
 	
  • Malaysia
 	
 	
    • 
 	
  • New Zealand
@@ -561,8 +567,8 @@
 	
 	
    • 
      



From fedora-extras-commits at redhat.com  Wed Dec 14 19:21:29 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 14 Dec 2005 14:21:29 -0500
Subject: rpms/SDL_ttf/devel SDL_ttf-2.0.7-freetype-internals.patch, NONE,
	1.1 SDL_ttf.spec, 1.8, 1.9
Message-ID: <200512141921.jBEJLx0k014046@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/SDL_ttf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14025

Modified Files:
	SDL_ttf.spec 
Added Files:
	SDL_ttf-2.0.7-freetype-internals.patch 
Log Message:
* Wed Dec 14 2005 Brian Pepple  - 2.0.7-3
- Add patch for Bug #171020.


SDL_ttf-2.0.7-freetype-internals.patch:

--- NEW FILE SDL_ttf-2.0.7-freetype-internals.patch ---
--- SDL_ttf-2.0.7/SDL_ttf.c.freetype-internals	2005-10-17 09:05:19.000000000 -0400
+++ SDL_ttf-2.0.7/SDL_ttf.c	2005-10-17 09:05:36.000000000 -0400
@@ -48,7 +48,6 @@
 #include 
 #include 
 */
-#include 
 
 #ifndef FT_OPEN_STREAM
 #define FT_OPEN_STREAM ft_open_stream
@@ -275,7 +274,6 @@
 	}
 	memset(stream, 0, sizeof(*stream));
 
-	stream->memory = library->memory;
 	stream->read = RWread;
 	stream->descriptor.pointer = src;
 	stream->pos = (unsigned long)position;


Index: SDL_ttf.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_ttf/devel/SDL_ttf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SDL_ttf.spec	29 Sep 2005 19:57:18 -0000	1.8
+++ SDL_ttf.spec	14 Dec 2005 19:21:27 -0000	1.9
@@ -1,12 +1,13 @@
 Name:		SDL_ttf
 Version:	2.0.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Simple DirectMedia Layer TrueType Font library
 
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.libsdl.org/projects/SDL_ttf/
 Source0:	http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz
+Patch1:		%{name}-%{version}-freetype-internals.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	SDL-devel >= 1.2.4
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .freetype
 
 
 %build
@@ -70,6 +72,9 @@
 
 
 %changelog
+* Wed Dec 14 2005 Brian Pepple  - 2.0.7-3
+- Add patch for Bug #171020.
+
 * Thu Sep 29 2005 Brian Pepple  - 2.0.7-2
 - General spec formatting changes.
 - Rebuild for FC4 upgrade path.



From fedora-extras-commits at redhat.com  Wed Dec 14 19:23:16 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 14 Dec 2005 14:23:16 -0500
Subject: rpms/munin/FC-3 munin.spec,1.1,1.2
Message-ID: <200512141923.jBEJNkJT014116@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14098

Modified Files:
	munin.spec 
Log Message:
Fixed libdir messup to allow builds on x86_64



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-3/munin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- munin.spec	14 Dec 2005 03:38:04 -0000	1.1
+++ munin.spec	14 Dec 2005 19:23:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -175,7 +175,7 @@
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
-%{_libdir}/perl5/*perl/5.*/Munin.pm
+%{perl_vendorlib}/Munin.pm
 /var/www/html/munin/cgi/munin-cgi-graph
 %dir /etc/munin/templates
 %dir /etc/munin
@@ -222,6 +222,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
+- Fixed libdir messup to allow builds on x86_64
+
 * Mon Dec 12 2005 Kevin Fenzi  - 1.2.4-2
 - Removed plugins that require Net-SNMP and Sybase 
 



From fedora-extras-commits at redhat.com  Wed Dec 14 19:26:09 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 14 Dec 2005 14:26:09 -0500
Subject: rpms/munin/FC-4 munin.spec,1.1,1.2
Message-ID: <200512141926.jBEJQdOL014185@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14167

Modified Files:
	munin.spec 
Log Message:
Fixed libdir messup to allow builds on x86_64



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-4/munin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- munin.spec	14 Dec 2005 03:38:04 -0000	1.1
+++ munin.spec	14 Dec 2005 19:26:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -175,7 +175,7 @@
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
-%{_libdir}/perl5/*perl/5.*/Munin.pm
+%{perl_vendorlib}/Munin.pm
 /var/www/html/munin/cgi/munin-cgi-graph
 %dir /etc/munin/templates
 %dir /etc/munin
@@ -222,6 +222,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
+- Fixed libdir messup to allow builds on x86_64
+
 * Mon Dec 12 2005 Kevin Fenzi  - 1.2.4-2
 - Removed plugins that require Net-SNMP and Sybase 
 



From fedora-extras-commits at redhat.com  Wed Dec 14 19:27:29 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 14 Dec 2005 14:27:29 -0500
Subject: rpms/munin/devel munin.spec,1.1,1.2
Message-ID: <200512141927.jBEJRxVR014254@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14236

Modified Files:
	munin.spec 
Log Message:
Fixed libdir messup to allow builds on x86_64



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- munin.spec	14 Dec 2005 03:38:04 -0000	1.1
+++ munin.spec	14 Dec 2005 19:27:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -175,7 +175,7 @@
 %{_datadir}/munin/munin-html
 %{_datadir}/munin/munin-limits
 %{_datadir}/munin/munin-update
-%{_libdir}/perl5/*perl/5.*/Munin.pm
+%{perl_vendorlib}/Munin.pm
 /var/www/html/munin/cgi/munin-cgi-graph
 %dir /etc/munin/templates
 %dir /etc/munin
@@ -222,6 +222,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
+- Fixed libdir messup to allow builds on x86_64
+
 * Mon Dec 12 2005 Kevin Fenzi  - 1.2.4-2
 - Removed plugins that require Net-SNMP and Sybase 
 



From fedora-extras-commits at redhat.com  Wed Dec 14 20:37:54 2005
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Wed, 14 Dec 2005 15:37:54 -0500
Subject: rpms/xscorch/devel xscorch.spec,1.1,1.2
Message-ID: <200512142038.jBEKcOEK016328@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/xscorch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16309

Modified Files:
	xscorch.spec 
Log Message:
- Prepare for modular X.Org



Index: xscorch.spec
===================================================================
RCS file: /cvs/extras/rpms/xscorch/devel/xscorch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xscorch.spec	27 Aug 2005 16:25:13 -0000	1.1
+++ xscorch.spec	14 Dec 2005 20:37:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xscorch
 Version:	0.2.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A Scorched Earth clone
 
 Group:		Amusements/Games
@@ -13,7 +13,7 @@
 Patch2:		xscorch-0.2.0-termcap.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xorg-x11-devel gtk2-devel >= 2.4.0 desktop-file-utils
+BuildRequires:	libX11-devel libXpm-devel gtk2-devel >= 2.4.0 desktop-file-utils
 #BuildRequires:	readline-devel
 
 %description
@@ -56,6 +56,9 @@
 %{_datadir}/applications/*xscorch.desktop
 
 %changelog
+* 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
 - Disable network
 - Patch fixing stack smashing



From fedora-extras-commits at redhat.com  Wed Dec 14 21:07:25 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 14 Dec 2005 16:07:25 -0500
Subject: rpms/lirc/devel .cvsignore, 1.6, 1.7 lirc.spec, 1.9, 1.10 sources,
	1.6, 1.7 lirc-0.8.0pre1-2615usb.patch, 1.1,
	NONE lirc-cvs20051129.patch, 1.1, NONE
Message-ID: <200512142107.jBEL7uQm018123@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18100

Modified Files:
	.cvsignore lirc.spec sources 
Removed Files:
	lirc-0.8.0pre1-2615usb.patch lirc-cvs20051129.patch 
Log Message:
* Wed Dec 14 2005 Ville Skytt??  - 0.8.0-0.2.pre2
- 0.8.0pre2, kernel >= 2.6.15 USB patch applied upstream.
- lirc_clientd renamed to lircrcd.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Nov 2005 08:58:17 -0000	1.6
+++ .cvsignore	14 Dec 2005 21:07:23 -0000	1.7
@@ -1 +1 @@
-lirc-0.8.0pre1.tar.bz2
+lirc-0.8.0pre2.tar.bz2


Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lirc.spec	29 Nov 2005 08:58:17 -0000	1.9
+++ lirc.spec	14 Dec 2005 21:07:23 -0000	1.10
@@ -16,19 +16,17 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        0.2.pre1%{?dist}
+Release:        0.2.pre2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre1.tar.bz2
+Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre2.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
-Patch1:         %{name}-cvs20051129.patch
-Patch2:         %{name}-0.8.0pre1-2615usb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{!?_with_modules:1}
@@ -78,18 +76,24 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre1
+%setup -q -n %{name}-%{version}pre2
 %patch0 -p1
-%patch1 -p1
-%patch2
+
+# *cough*
 echo %{kver} | grep -q _FC5 && \
-   sed -i -e s/2,6,15/2,6,14/ drivers/lirc_{dev,imon,sasem}/lirc_*.c # *cough*
+   sed -i -e 's/KERNEL_VERSION(2,\s*6,\s*15)/KERNEL_VERSION(2,6,14)/' \
+   drivers/kcompat.h drivers/lirc_{imon,sasem}/lirc_*.c
+
 chmod 644 contrib/*
-# cmdir: unknown symbols
+
+sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
+
+# cmdir: unknown symbols (cmdir_{read,write}, set_tx_channels)
 # gpio: missing drivers/media/video/{bttv,bttvp}.h in kernel-devel
 for drv in cmdir gpio ; do
   sed -i -e "/^\\s*(lirc_dev lirc_$drv)/d" -e "/^\\s*lirc_$drv/d" configure*
 done
+
 touch -r aclocal.m4 configure.in # avoid autofoo re-run
 
 
@@ -179,7 +183,7 @@
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
 %{_libdir}/liblirc_client.so.*
-%{_mandir}/man1/ir*.1*
+%{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
 %{_mandir}/man8/lirc*d.8*
 %ghost /dev/lirc*
@@ -198,6 +202,10 @@
 
 
 %changelog
+* Wed Dec 14 2005 Ville Skytt??  - 0.8.0-0.2.pre2
+- 0.8.0pre2, kernel >= 2.6.15 USB patch applied upstream.
+- lirc_clientd renamed to lircrcd.
+
 * Tue Nov 29 2005 Ville Skytt??  - 0.8.0-0.2.pre1
 - Pull security fix for the new lirc_clientd from upstream CVS, and
   while at it, some other useful post-0.8.0pre1 changes.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Nov 2005 08:58:17 -0000	1.6
+++ sources	14 Dec 2005 21:07:23 -0000	1.7
@@ -1 +1 @@
-d115ec757ee1f3b25071f24c8256ee31  lirc-0.8.0pre1.tar.bz2
+80aaee5c1b5815f115b1e14d49f36cd5  lirc-0.8.0pre2.tar.bz2


--- lirc-0.8.0pre1-2615usb.patch DELETED ---


--- lirc-cvs20051129.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Dec 14 21:09:20 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 14 Dec 2005 16:09:20 -0500
Subject: rpms/perl-MailTools/devel perl-MailTools.spec,1.11,1.12
Message-ID: <200512142110.jBELA3R1018161@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MailTools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18139

Modified Files:
	perl-MailTools.spec 
Log Message:
* Wed Dec 14 2005 Ville Skytt??  - 1.67-2
- Fix demo scripts.
- Sync with fedora-rpmdevtools' perl spec template.



Index: perl-MailTools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-MailTools.spec	1 Jul 2005 11:16:47 -0000	1.11
+++ perl-MailTools.spec	14 Dec 2005 21:09:15 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:        Various mail-related perl modules
 Name:           perl-MailTools
 Version:        1.67
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -10,8 +10,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(Net::Domain), perl(Net::SMTP)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl(Net::Domain)
+BuildRequires:  perl(Net::SMTP)
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 MailTools is a set of Perl modules related to mail applications.
@@ -19,26 +21,31 @@
 
 %prep
 %setup -q -n MailTools-%{version}
+cd examples
+for file in *.PL ; do %{__perl} $file ; done ; chmod -x *_demo
+rm *.PL # yeah, causes warnings from MakeMaker, but we don't care
+cd ..
 
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
-%{__rm} -rf "$RPM_BUILD_ROOT"
-%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-%{_bindir}/find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} -f {} ';'
-%{_bindir}/find $RPM_BUILD_ROOT -type d -depth -exec %{__rmdir} {} 2>/dev/null ';'
+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
+%check
+make test
 
 
 %clean
-%{__rm} -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 
 %files
@@ -50,6 +57,10 @@
 
 
 %changelog
+* Wed Dec 14 2005 Ville Skytt??  - 1.67-2
+- Fix demo scripts.
+- Sync with fedora-rpmdevtools' perl spec template.
+
 * Fri Jul  1 2005 Paul Howarth  - 1.67-1
 - update to 1.67 (#161830)
 - assume perl_vendorlib is set
@@ -58,7 +69,7 @@
 - use macros consistently
 - add dist tag
 
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Apr  7 2005 Michael Schwendt  - 1.66-2
 - rebuilt
 
 * Sat Jan 22 2005 Ville Skytt??  - 0:1.66-1



From fedora-extras-commits at redhat.com  Wed Dec 14 22:08:47 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 14 Dec 2005 17:08:47 -0500
Subject: rpms/gramps/devel gramps.spec,1.13,1.14
Message-ID: <200512142209.jBEM9H6O020050@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gramps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20026

Modified Files:
	gramps.spec 
Log Message:
* Wed Dec 14 2005 Brian Pepple  - 2.0.9-3
- Add requires for gnome-python2-gnomeprint.



Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gramps.spec	13 Dec 2005 19:25:39 -0000	1.13
+++ gramps.spec	14 Dec 2005 22:08:45 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gramps
 Version:        2.0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -27,6 +27,7 @@
 Requires:       gnome-python2-gconf
 Requires:       gnome-python2-gnomevfs
 Requires:       gnome-python2
+Requires:	gnome-python2-gnomeprint
 Requires:       ImageMagick
 Requires:       pygtk2
 Requires:       pygtk2-libglade
@@ -113,6 +114,9 @@
 
 
 %changelog
+* Wed Dec 14 2005 Brian Pepple  - 2.0.9-3
+- Add requires for gnome-python2-gnomeprint.
+
 * Tue Dec 13 2005 Brian Pepple  - 2.0.9-2
 - Make noarch. (#170974)
 - Update to 2.0.9.



From fedora-extras-commits at redhat.com  Wed Dec 14 22:12:15 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 14 Dec 2005 17:12:15 -0500
Subject: rpms/gramps/FC-4 gramps.spec,1.13,1.14
Message-ID: <200512142212.jBEMCkhH020150@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gramps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20132

Modified Files:
	gramps.spec 
Log Message:
* Wed Dec 14 2005 Brian Pepple  - 2.0.9-2
- Add requires for gnome-python2-gnomeprint.



Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/FC-4/gramps.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gramps.spec	13 Dec 2005 19:27:48 -0000	1.13
+++ gramps.spec	14 Dec 2005 22:12:10 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gramps
 Version:        2.0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -27,6 +27,7 @@
 Requires:       gnome-python2-gconf
 Requires:       gnome-python2-gnomevfs
 Requires:       gnome-python2
+Requires:	gnome-python2-gnomeprint
 Requires:       ImageMagick
 Requires:       pygtk2
 Requires:       pygtk2-libglade
@@ -113,7 +114,10 @@
 
 
 %changelog
-* Tue Dec 13 2005 Brian Pepple  - 2.0.9
+* Wed Dec 14 2005 Brian Pepple  - 2.0.9-2
+- Add requires for gnome-python2-gnomeprint.
+
+* Tue Dec 13 2005 Brian Pepple  - 2.0.9-1
 - Make noarch. (#170974)
 - Update to 2.0.9.
 



From fedora-extras-commits at redhat.com  Wed Dec 14 22:20:16 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 14 Dec 2005 17:20:16 -0500
Subject: rpms/rlog - New directory
Message-ID: <200512142220.jBEMKGn1020267@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/rlog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20251/rlog

Log Message:
Directory /cvs/extras/rpms/rlog added to the repository




From fedora-extras-commits at redhat.com  Wed Dec 14 22:20:18 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 14 Dec 2005 17:20:18 -0500
Subject: rpms/rlog/devel - New directory
Message-ID: <200512142220.jBEMKIXP020276@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/rlog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20251/rlog/devel

Log Message:
Directory /cvs/extras/rpms/rlog/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Dec 14 22:20:48 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 14 Dec 2005 17:20:48 -0500
Subject: rpms/rlog Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512142220.jBEMKmvk020315@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/rlog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20301

Added Files:
	Makefile import.log 
Log Message:
Setup of module rlog


--- NEW FILE Makefile ---
# Top level Makefile for module rlog
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 14 22:20:53 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 14 Dec 2005 17:20:53 -0500
Subject: rpms/rlog/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512142220.jBEMKrTE020336@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/rlog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20301/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rlog


--- NEW 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 Dec 14 22:22:13 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 14 Dec 2005 17:22:13 -0500
Subject: rpms/rlog import.log,1.1,1.2
Message-ID: <200512142222.jBEMMhSG020418@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/rlog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20375

Modified Files:
	import.log 
Log Message:
auto-import rlog-1.3.7-1 on branch devel from rlog-1.3.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rlog/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Dec 2005 22:20:45 -0000	1.1
+++ import.log	14 Dec 2005 22:22:10 -0000	1.2
@@ -0,0 +1 @@
+rlog-1_3_7-1:HEAD:rlog-1.3.7-1.src.rpm:1134598919



From fedora-extras-commits at redhat.com  Wed Dec 14 22:22:18 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 14 Dec 2005 17:22:18 -0500
Subject: rpms/rlog/devel rlog-1.3.7.tgz.asc, NONE, 1.1 rlog.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512142222.jBEMMm2J020427@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/rlog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20375/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rlog-1.3.7.tgz.asc rlog.spec 
Log Message:
auto-import rlog-1.3.7-1 on branch devel from rlog-1.3.7-1.src.rpm


--- NEW FILE rlog-1.3.7.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQBDRBfiWp20Ay6vTYARApsUAJ9xRj/7QGqOGN7ETfq70BRMWGrX/wCeKOEE
2JPWA1g2WavJZYtvLP+XZT0=
=ryRv
-----END PGP SIGNATURE-----


--- NEW FILE rlog.spec ---
Name: 		rlog
Summary: 	Runtime Logging for C++
Version: 	1.3.7
Release: 	1%{?dist}
License: 	LGPL
Group: 		Development/Libraries
Url: 		http://arg0.net/wiki/rlog
Source0: 	http://arg0.net/users/vgough/download/%{name}-%{version}.tgz
Source1:	http://arg0.net/users/vgough/download/%{name}-%{version}.tgz.asc
%ifarch i386
BuildRequires:	valgrind
%endif
Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
RLog provides a flexible message logging facility for C++ programs and
libraries.  It is meant to be fast enough to leave in production code.

%package devel
Summary:	Runtime Logging for C++ - development files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	pkgconfig
BuildRequires:	doxygen tetex-latex

%description devel
Files needed for developing apps using rlog

%prep
%setup -q
%{__rm} -rf docs/html
%{__rm} -rf docs/latex

%build
%configure \
	--disable-static \
%ifarch i386
	--enable-valgrind
%else
	--disable-valgrind
%endif
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
%{__rm} -f %{buildroot}/%{_libdir}/*.la
%{__rm} -rf %{buildroot}/%{_docdir}/rlog

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_libdir}/librlog.so.*
%doc README AUTHORS COPYING 

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/pkgconfig/*
%{_libdir}/librlog.so
%doc docs/html docs/latex/refman.pdf

%changelog
* Sun Nov 13 2005 Peter Lemenkov  1.3.7-1
- Initial build for FC-Extras
- Release v1.3.7

* Mon Nov 8 2004 Valient Gough 
- Release v1.3.5
- Add initial attempt at Win32 support (due to help from Vadim Zeitlin)
- Fixes to build on Suse 9.2 (replaced old KDE based autoconf scripts)
- Add "info" channel, and rInfo() macro.
* Mon May 31 2004 Valient Gough 
- Release v1.3.4
- Portibility changes to allow rlog to build with older C++ compilers and on
  non-x86 computers.
- Add extra ERROR_FMT() macro which allows format string to be passed on Error
  construction.
- Add valgrind support to allow valgrind trace from any assert when running
  under valgrind.
- Update admin dir.
* Sat Mar 13 2004 Valient Gough 
- Release v1.3.1
- added pkg-config file librlog.pc
- changed license to LGPL
- added rAssertSilent macro
- fixes for special case checks of printf attribute
* Sat Feb 8 2004 Valient Gough 
- Release v1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rlog/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Dec 2005 22:20:51 -0000	1.1
+++ .cvsignore	14 Dec 2005 22:22:16 -0000	1.2
@@ -0,0 +1 @@
+rlog-1.3.7.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rlog/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Dec 2005 22:20:51 -0000	1.1
+++ sources	14 Dec 2005 22:22:16 -0000	1.2
@@ -0,0 +1 @@
+a3bc4e4d9d2b838fdc32e6de64270b68  rlog-1.3.7.tgz



From fedora-extras-commits at redhat.com  Wed Dec 14 22:30:02 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 14 Dec 2005 17:30:02 -0500
Subject: owners owners.list,1.451,1.452
Message-ID: <200512142230.jBEMUWIa020503@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20482

Modified Files:
	owners.list 
Log Message:

Added info about rlog.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -r1.451 -r1.452
--- owners.list	14 Dec 2005 10:37:38 -0000	1.451
+++ owners.list	14 Dec 2005 22:30:00 -0000	1.452
@@ -1035,6 +1035,7 @@
 Fedora Extras|R-hdf5|R Interface to the NCSA HDF5 library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|extras-qa at fedoraproject.org|
+Fedora Extras|rlog|Runtime Logging for C++|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|R-mAr|R module to evaluate functions for multivariate AutoRegressive analysis|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|roundup|Simple and flexible issue-tracking system|redhat at flyn.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Dec 14 23:07:43 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 14 Dec 2005 18:07:43 -0500
Subject: rpms/kdesvn/devel kdesvn.spec,1.7,1.8
Message-ID: <200512142308.jBEN8DMm022284@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22262

Modified Files:
	kdesvn.spec 
Log Message:
Specify apr-1-config and apu-1-config to configure



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdesvn.spec	13 Dec 2005 23:18:14 -0000	1.7
+++ kdesvn.spec	14 Dec 2005 23:07:40 -0000	1.8
@@ -12,7 +12,7 @@
 Patch0:         kdesvn-0.7.1-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  subversion-devel, kdelibs-devel, neon-devel, apr-util-devel
+BuildRequires:  subversion-devel, kdelibs-devel, neon-devel
 BuildRequires:  desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -37,7 +37,8 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-%configure --disable-rpath --with-svn-lib=%{_libdir}
+%configure --disable-rpath --with-svn-lib=%{_libdir} \
+           --with-apr-config=apr-1-config --with-apu-config=apu-1-config
 make %{?_smp_mflags}
 
 
@@ -97,7 +98,7 @@
 
 %changelog
 * Tue Dec 13 2005 - Orion Poplawski  - 0.7.1-2
-- Add apr-util-devel BuildRequires
+- Specify apr-1-config and apu-1-config to configure
 
 * Fri Dec  9 2005 - Orion Poplawski  - 0.7.1-1
 - New upstream version 0.7.1



From fedora-extras-commits at redhat.com  Wed Dec 14 23:09:26 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Wed, 14 Dec 2005 18:09:26 -0500
Subject: rpms/sword/devel sword.spec,1.6,1.7
Message-ID: <200512142309.jBEN9uZw022313@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/sword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22295

Modified Files:
	sword.spec 
Log Message:
Needs a rebuild in devel branch



Index: sword.spec
===================================================================
RCS file: /cvs/extras/rpms/sword/devel/sword.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sword.spec	21 Nov 2005 17:47:03 -0000	1.6
+++ sword.spec	14 Dec 2005 23:09:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           sword           
 Version:        1.5.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
@@ -29,7 +29,7 @@
 %package devel
 Summary:  Development files for the sword project
 Group:    Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
 
 %description devel
 This package contains the development headers and libraries for the
@@ -46,7 +46,8 @@
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make 
+#%%{?_smp_mflags} sometimes causes build failure
 
 
 %install
@@ -86,6 +87,11 @@
 
 
 %changelog
+* Wed Dec 14 2005 Michael A. Peters  - 1.5.8-6
+- rebuild in devel branch with new compiler suite
+- remove specific release from devel requires of main package
+- do not build with %%{_smp_mflags}
+
 * Mon Nov 21 2005 Michael A. Peters  - 1.5.8-5
 - disable static library
 



From fedora-extras-commits at redhat.com  Wed Dec 14 23:16:02 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Wed, 14 Dec 2005 18:16:02 -0500
Subject: rpms/gnomesword/FC-4 .cvsignore, 1.2, 1.3 gnomesword.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200512142316.jBENGWnt022428@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22406

Modified Files:
	.cvsignore gnomesword.spec sources 
Log Message:
New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jun 2005 12:04:31 -0000	1.2
+++ .cvsignore	14 Dec 2005 23:16:00 -0000	1.3
@@ -1 +1,2 @@
 gnomesword-2.1.2.tar.gz
+gnomesword-2.1.5.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-4/gnomesword.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnomesword.spec	15 Sep 2005 12:28:14 -0000	1.5
+++ gnomesword.spec	14 Dec 2005 23:16:00 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           gnomesword           
-Version:        2.1.2
-Release:        2.3%{?dist}
+Version:        2.1.5
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-Patch0:         gnomesword-2.1.2-gettext64.patch
+#Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -15,16 +15,13 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-spell
-BuildRequires:  gtkhtml3-devel
+BuildRequires:  gtkhtml3-devel >= 3.6
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
-# currently broken on x86_64
-# ExcludeArch:    x86_64
-# for x86_64
-%ifarch x86_64
-BuildRequires:  libtool automake autoconf
-%endif
+#%%ifarch x86_64
+#BuildRequires:  libtool automake autoconf
+#%%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -39,16 +36,17 @@
 
 %prep
 %setup -q
-%ifarch x86_64
-%patch0 -p1 -b .gettext64 
-%endif
+#%%ifarch x86_64
+#%%patch0 -p1 -b .gettext64 
+#%%endif
+
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
-%ifarch x86_64
-libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
-%endif
+#%%ifarch x86_64
+#libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
+#%%endif
 %configure
 make %{?_smp_mflags}
 
@@ -85,11 +83,16 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS ChangeLog NEWS README TODO
 %_bindir/gnomesword2
+%_datadir/gnomesword
 %_datadir/pixmaps/gnomesword
 %_datadir/applications/fedora-gnomesword.desktop
 
 
 %changelog
+* Wed Dec 14 2005 Michael A. Peters  - 2.1.5-1
+- New upstream version, works with gtkhtml3-3.8
+- disable x86_64 patch
+
 * Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.3
 - trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
 - 160186


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jun 2005 12:04:31 -0000	1.2
+++ sources	14 Dec 2005 23:16:00 -0000	1.3
@@ -1 +1,2 @@
 ce1171f19a40256cfdd31f42c979d91c  gnomesword-2.1.2.tar.gz
+61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 23:30:17 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Wed, 14 Dec 2005 18:30:17 -0500
Subject: rpms/gnomesword/FC-3 gnomesword.spec,1.5,1.6 sources,1.2,1.3
Message-ID: <200512142330.jBENUlFs022536@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22498/FC-3

Modified Files:
	gnomesword.spec sources 
Log Message:
upstream update, including ability to build against rawhide gtkhtml3



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-3/gnomesword.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnomesword.spec	15 Sep 2005 23:33:47 -0000	1.5
+++ gnomesword.spec	14 Dec 2005 23:30:15 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           gnomesword           
-Version:        2.1.2
-Release:        2.3%{?dist}
+Version:        2.1.5
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-Patch0:         gnomesword-2.1.2-gettext64.patch
+#Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -15,16 +15,13 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-spell
-BuildRequires:  gtkhtml3-devel
+BuildRequires:  gtkhtml3-devel >= 3.6
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
-# currently broken on x86_64
-# ExcludeArch:    x86_64
-# for x86_64
-%ifarch x86_64
-BuildRequires:  libtool automake autoconf
-%endif
+#%%ifarch x86_64
+#BuildRequires:  libtool automake autoconf
+#%%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -39,16 +36,17 @@
 
 %prep
 %setup -q
-%ifarch x86_64
-%patch0 -p1 -b .gettext64 
-%endif
+#%%ifarch x86_64
+#%%patch0 -p1 -b .gettext64 
+#%%endif
+
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
-%ifarch x86_64
-libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
-%endif
+#%%ifarch x86_64
+#libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
+#%%endif
 %configure
 make %{?_smp_mflags}
 
@@ -85,11 +83,16 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS ChangeLog NEWS README TODO
 %_bindir/gnomesword2
+%_datadir/gnomesword
 %_datadir/pixmaps/gnomesword
 %_datadir/applications/fedora-gnomesword.desktop
 
 
 %changelog
+* Wed Dec 14 2005 Michael A. Peters  - 2.1.5-1
+- New upstream version, works with gtkhtml3-3.8
+- disable x86_64 patch
+
 * Thu Sep 15 2005 Michael A. Peters  - 2.1.2-2.3
 - trying patch suggested by Tom 'spot' Callaway to fix x86_64 bug
 - 160186


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jun 2005 12:04:31 -0000	1.2
+++ sources	14 Dec 2005 23:30:15 -0000	1.3
@@ -1 +1,2 @@
 ce1171f19a40256cfdd31f42c979d91c  gnomesword-2.1.2.tar.gz
+61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 23:30:22 2005
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Wed, 14 Dec 2005 18:30:22 -0500
Subject: rpms/gnomesword/devel gnomesword.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200512142330.jBENUrL7022540@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22498/devel

Modified Files:
	gnomesword.spec sources 
Log Message:
upstream update, including ability to build against rawhide gtkhtml3



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnomesword.spec	13 Dec 2005 21:18:31 -0000	1.6
+++ gnomesword.spec	14 Dec 2005 23:30:20 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           gnomesword           
-Version:        2.1.3
+Version:        2.1.5
 Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
@@ -39,6 +39,7 @@
 #%%ifarch x86_64
 #%%patch0 -p1 -b .gettext64 
 #%%endif
+
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
@@ -88,7 +89,7 @@
 
 
 %changelog
-* Tue Dec 13 2005 Michael A. Peters  - 2.1.3-1
+* Wed Dec 14 2005 Michael A. Peters  - 2.1.5-1
 - New upstream version, works with gtkhtml3-3.8
 - disable x86_64 patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Dec 2005 21:18:31 -0000	1.3
+++ sources	14 Dec 2005 23:30:20 -0000	1.4
@@ -1,2 +1,2 @@
 ce1171f19a40256cfdd31f42c979d91c  gnomesword-2.1.2.tar.gz
-b9bb8f16890feb2371d06982505fdbc2  gnomesword-2.1.3.tar.gz
+61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 14 23:41:37 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 14 Dec 2005 18:41:37 -0500
Subject: rpms/mlmmj/FC-4 .cvsignore, 1.5, 1.6 mlmmj.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <200512142342.jBENg7aD022670@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22648

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Thu Dec 15 2005 Michael Fleming  1.2.9-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jun 2005 03:14:33 -0000	1.5
+++ .cvsignore	14 Dec 2005 23:41:35 -0000	1.6
@@ -1 +1 @@
-mlmmj-1.2.8.tar.bz2
+mlmmj-1.2.9.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/mlmmj.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mlmmj.spec	21 Jun 2005 03:14:33 -0000	1.12
+++ mlmmj.spec	14 Dec 2005 23:41:35 -0000	1.13
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.8
+Version: 1.2.9
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Thu Dec 15 2005 Michael Fleming  1.2.9-1
+- New upstream release
+
 * Tue Jun 21 2005 Michael Fleming  1.2.8-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Jun 2005 03:14:33 -0000	1.5
+++ sources	14 Dec 2005 23:41:35 -0000	1.6
@@ -1 +1 @@
-778a236716df9511670dddfccfa1d257  mlmmj-1.2.8.tar.bz2
+6011ba93fa907289b4ed3d4c3552a90e  mlmmj-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 00:07:06 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 14 Dec 2005 19:07:06 -0500
Subject: rpms/mlmmj/devel .cvsignore, 1.6, 1.7 mlmmj.spec, 1.14, 1.15 sources,
	1.6, 1.7
Message-ID: <200512150007.jBF07aFB026121@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26102

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Thu Dec 15 2005 Michael Fleming  1.2.9-1
- New upstream stable release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Oct 2005 11:20:26 -0000	1.6
+++ .cvsignore	15 Dec 2005 00:06:39 -0000	1.7
@@ -1 +1 @@
-mlmmj-1.2.9-RC1.tar.bz2
+mlmmj-1.2.9.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mlmmj.spec	10 Oct 2005 11:20:26 -0000	1.14
+++ mlmmj.spec	15 Dec 2005 00:06:39 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
 Version: 1.2.9
-Release: 0.rc1%{?dist}
+Release: 1.%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}-RC1.tar.bz2
@@ -19,7 +19,7 @@
 
 %prep
 
-%setup -n %{name}-%{version}-RC1
+%setup
 
 %build
 %configure
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Thu Dec 15 2005 Michael Fleming  1.2.9-1
+- New upstream stable release
+
 * Mon Oct 10 2005 Michael Fleming  1.2.9-0.rc1
 - New upstream release candidate
 - Fixed typo in the Description that I hope noone noticed.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Oct 2005 11:20:26 -0000	1.6
+++ sources	15 Dec 2005 00:06:39 -0000	1.7
@@ -1 +1 @@
-57710086f9a346cda83db905d6038297  mlmmj-1.2.9-RC1.tar.bz2
+6011ba93fa907289b4ed3d4c3552a90e  mlmmj-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 00:15:13 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 14 Dec 2005 19:15:13 -0500
Subject: rpms/mlmmj/devel mlmmj.spec,1.15,1.16
Message-ID: <200512150015.jBF0FihR026218@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26195

Modified Files:
	mlmmj.spec 
Log Message:
* Thu Dec 15 2005 Michael Fleming  1.2.9-2
- New upstream stable release
- Fix Release tag



Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mlmmj.spec	15 Dec 2005 00:06:39 -0000	1.15
+++ mlmmj.spec	15 Dec 2005 00:14:58 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
 Version: 1.2.9
-Release: 1.%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}-RC1.tar.bz2
@@ -48,8 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
-* Thu Dec 15 2005 Michael Fleming  1.2.9-1
+* Thu Dec 15 2005 Michael Fleming  1.2.9-2
 - New upstream stable release
+- Fix Release tag
 
 * Mon Oct 10 2005 Michael Fleming  1.2.9-0.rc1
 - New upstream release candidate



From fedora-extras-commits at redhat.com  Thu Dec 15 03:05:16 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:05:16 -0500
Subject: rpms/xfce4-battery-plugin - New directory
Message-ID: <200512150305.jBF35GPM032486@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32477/xfce4-battery-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-battery-plugin added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:05:32 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:05:32 -0500
Subject: rpms/xfce4-battery-plugin/devel - New directory
Message-ID: <200512150305.jBF35Wio032502@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32477/xfce4-battery-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-battery-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:06:55 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:06:55 -0500
Subject: rpms/xfce4-battery-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512150306.jBF36tie032557@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32527/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-battery-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:06:54 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:06:54 -0500
Subject: rpms/xfce4-battery-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512150306.jBF36suO032554@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32527

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-battery-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-battery-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:10:05 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:10:05 -0500
Subject: rpms/xfce4-battery-plugin/devel GPL, NONE,
	1.1 xfce4-battery-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512150310.jBF3A59d032643@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32611/devel

Modified Files:
	.cvsignore sources 
Added Files:
	GPL xfce4-battery-plugin.spec 
Log Message:
auto-import xfce4-battery-plugin-0.3.0-3.fc4 on branch devel from xfce4-battery-plugin-0.3.0-3.fc4.src.rpm


--- NEW FILE GPL ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    
    Copyright (C)   

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year  name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  , 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.


--- NEW FILE xfce4-battery-plugin.spec ---
Name:		xfce4-battery-plugin
Version:	0.3.0
Release:	3%{?dist}
Summary:	Battery 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.gz
Source1:	GPL
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxml2-devel

%description
A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.

%prep
%setup -q

%build
%configure --disable-static
make

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

# replace wrong BSD license with a copy of GPL
%__cp %{SOURCE1} COPYING

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Sat Nov 19 2005 Christoph Wickert  - 0.3.0-3
- Use %{?_smp_mflags}.
- Replace wrong BSD license with a copy of the GPL (#173105).

* Mon Nov 14 2005 Christoph Wickert  - 0.3.0-2
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.3.0-1.fc4.cw
- Update to 0.3.0.
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.2.0-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.2.0-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 03:06:52 -0000	1.1
+++ .cvsignore	15 Dec 2005 03:10:03 -0000	1.2
@@ -0,0 +1 @@
+xfce4-battery-plugin-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 03:06:52 -0000	1.1
+++ sources	15 Dec 2005 03:10:03 -0000	1.2
@@ -0,0 +1 @@
+04e121df1ff264281e56e12a8ff5f155  xfce4-battery-plugin-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 03:09:48 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:09:48 -0500
Subject: rpms/xfce4-battery-plugin import.log,1.1,1.2
Message-ID: <200512150310.jBF3AsOE032654@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32611

Modified Files:
	import.log 
Log Message:
auto-import xfce4-battery-plugin-0.3.0-3.fc4 on branch devel from xfce4-battery-plugin-0.3.0-3.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 03:06:29 -0000	1.1
+++ import.log	15 Dec 2005 03:09:46 -0000	1.2
@@ -0,0 +1 @@
+xfce4-battery-plugin-0_3_0-3_fc4:HEAD:xfce4-battery-plugin-0.3.0-3.fc4.src.rpm:1134616160



From fedora-extras-commits at redhat.com  Thu Dec 15 03:16:20 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:16:20 -0500
Subject: rpms/xfce4-showdesktop-plugin - New directory
Message-ID: <200512150316.jBF3GKXb000363@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv354/xfce4-showdesktop-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-showdesktop-plugin added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:16:25 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:16:25 -0500
Subject: rpms/xfce4-showdesktop-plugin/devel - New directory
Message-ID: <200512150316.jBF3GPFS000379@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv354/xfce4-showdesktop-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-showdesktop-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:16:44 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:16:44 -0500
Subject: rpms/xfce4-showdesktop-plugin Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200512150316.jBF3Gixc000414@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv401

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-showdesktop-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-showdesktop-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:16:49 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:16:49 -0500
Subject: rpms/xfce4-showdesktop-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512150316.jBF3Gn2O000435@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv401/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-showdesktop-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:17:44 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:17:44 -0500
Subject: rpms/xfce4-showdesktop-plugin import.log,1.1,1.2
Message-ID: <200512150318.jBF3IEYZ000505@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv469

Modified Files:
	import.log 
Log Message:
auto-import xfce4-showdesktop-plugin-0.4.0-4.fc4 on branch devel from xfce4-showdesktop-plugin-0.4.0-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-showdesktop-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 03:16:42 -0000	1.1
+++ import.log	15 Dec 2005 03:17:42 -0000	1.2
@@ -0,0 +1 @@
+xfce4-showdesktop-plugin-0_4_0-4_fc4:HEAD:xfce4-showdesktop-plugin-0.4.0-4.fc4.src.rpm:1134616651



From fedora-extras-commits at redhat.com  Thu Dec 15 03:17:49 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:17:49 -0500
Subject: rpms/xfce4-showdesktop-plugin/devel xfce4-showdesktop-plugin.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512150318.jBF3IJ67000509@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv469/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-showdesktop-plugin.spec 
Log Message:
auto-import xfce4-showdesktop-plugin-0.4.0-4.fc4 on branch devel from xfce4-showdesktop-plugin-0.4.0-4.fc4.src.rpm


--- NEW FILE xfce4-showdesktop-plugin.spec ---
Name:		xfce4-showdesktop-plugin
Version:	0.4.0
Release:	4%{?dist}
Summary:	Show-Desktop plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildRequires:  gettext

%description
This is a little Xfce plugin, to minimize and unminimize all windows on the
current workspace. You can unhide all windows with a left-click, or just 
unhide the last window group with a middle click.

%prep
%setup -q -n %{name}

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang xfce4-showdesktop

%clean
rm -rf $RPM_BUILD_ROOT

%files -f xfce4-showdesktop.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.4.0-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.4.0-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.4.0-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.4.0-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.4.0-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-showdesktop-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 03:16:47 -0000	1.1
+++ .cvsignore	15 Dec 2005 03:17:47 -0000	1.2
@@ -0,0 +1 @@
+xfce4-showdesktop-plugin-0.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-showdesktop-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 03:16:47 -0000	1.1
+++ sources	15 Dec 2005 03:17:47 -0000	1.2
@@ -0,0 +1 @@
+4cf1da73f50a81088bc03ad9222821a9  xfce4-showdesktop-plugin-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 03:19:48 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:19:48 -0500
Subject: rpms/xfce4-taskbar-plugin - New directory
Message-ID: <200512150319.jBF3Jm3A000603@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv594/xfce4-taskbar-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-taskbar-plugin added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:19:53 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:19:53 -0500
Subject: rpms/xfce4-taskbar-plugin/devel - New directory
Message-ID: <200512150319.jBF3JrCn000619@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv594/xfce4-taskbar-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-taskbar-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:20:12 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:20:12 -0500
Subject: rpms/xfce4-taskbar-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512150320.jBF3KC8B000675@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv662

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-taskbar-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-taskbar-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:20:18 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:20:18 -0500
Subject: rpms/xfce4-taskbar-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512150320.jBF3KI26000696@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv662/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-taskbar-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:21:06 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:21:06 -0500
Subject: rpms/xfce4-taskbar-plugin import.log,1.1,1.2
Message-ID: <200512150321.jBF3LbTS000771@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv734

Modified Files:
	import.log 
Log Message:
auto-import xfce4-taskbar-plugin-0.2.2-4.fc4 on branch devel from xfce4-taskbar-plugin-0.2.2-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskbar-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 03:20:10 -0000	1.1
+++ import.log	15 Dec 2005 03:21:04 -0000	1.2
@@ -0,0 +1 @@
+xfce4-taskbar-plugin-0_2_2-4_fc4:HEAD:xfce4-taskbar-plugin-0.2.2-4.fc4.src.rpm:1134616857



From fedora-extras-commits at redhat.com  Thu Dec 15 03:21:12 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:21:12 -0500
Subject: rpms/xfce4-taskbar-plugin/devel xfce4-taskbar-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512150321.jBF3LgJt000775@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv734/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-taskbar-plugin.spec 
Log Message:
auto-import xfce4-taskbar-plugin-0.2.2-4.fc4 on branch devel from xfce4-taskbar-plugin-0.2.2-4.fc4.src.rpm


--- NEW FILE xfce4-taskbar-plugin.spec ---
Name:		xfce4-taskbar-plugin
Version:	0.2.2
Release:	4%{?dist}
Summary:	Tasklist plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
A tasklist plugin for the Xfce panel. The size of the taskbar can be changed 
via the properties dialog. It includes an "expand the panel to fill the screen"
feature.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%doc AUTHORS COPYING ChangeLog README
%defattr(-,root,root,-)
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.2.2-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.2.2-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.2.2-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.2.2-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.2.2-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskbar-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 03:20:16 -0000	1.1
+++ .cvsignore	15 Dec 2005 03:21:10 -0000	1.2
@@ -0,0 +1 @@
+xfce4-taskbar-plugin-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskbar-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 03:20:16 -0000	1.1
+++ sources	15 Dec 2005 03:21:10 -0000	1.2
@@ -0,0 +1 @@
+06ad356d728cadd8e78a12ec86235593  xfce4-taskbar-plugin-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 03:44:44 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:44:44 -0500
Subject: rpms/xfce4-notes-plugin - New directory
Message-ID: <200512150344.jBF3ii6j000933@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv924/xfce4-notes-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-notes-plugin added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:44:49 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:44:49 -0500
Subject: rpms/xfce4-notes-plugin/devel - New directory
Message-ID: <200512150344.jBF3inrn000949@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv924/xfce4-notes-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-notes-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:45:09 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:45:09 -0500
Subject: rpms/xfce4-notes-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512150345.jBF3j9nD000986@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv973

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-notes-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-notes-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:45:14 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:45:14 -0500
Subject: rpms/xfce4-notes-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512150345.jBF3jEsh001007@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv973/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-notes-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:46:07 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:46:07 -0500
Subject: rpms/xfce4-notes-plugin import.log,1.1,1.2
Message-ID: <200512150346.jBF3kc3S001081@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1043

Modified Files:
	import.log 
Log Message:
auto-import xfce4-notes-plugin-0.11.1-2.fc4 on branch devel from xfce4-notes-plugin-0.11.1-2.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 03:45:07 -0000	1.1
+++ import.log	15 Dec 2005 03:46:05 -0000	1.2
@@ -0,0 +1 @@
+xfce4-notes-plugin-0_11_1-2_fc4:HEAD:xfce4-notes-plugin-0.11.1-2.fc4.src.rpm:1134618356



From fedora-extras-commits at redhat.com  Thu Dec 15 03:46:13 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:46:13 -0500
Subject: rpms/xfce4-notes-plugin/devel xfce4-notes-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512150346.jBF3khcp001085@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1043/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-notes-plugin.spec 
Log Message:
auto-import xfce4-notes-plugin-0.11.1-2.fc4 on branch devel from xfce4-notes-plugin-0.11.1-2.fc4.src.rpm


--- NEW FILE xfce4-notes-plugin.spec ---
Name:		xfce4-notes-plugin
Version:	0.11.1
Release:	2%{?dist}
Summary:	Notes plugin 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.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
This plugin provides sticky notes for your desktop. You can create a note by 
clicking on the customizable icon with the middle button of your mouse, 
show/hide the notes using the left one, edit the titlebar, change the notes 
background color and much more.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/xfce4/panel-plugins/*.so
%{_datadir}/xfce4/*

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.11.1-2
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.11.1-1
- Initial Fedora Extras version.
- Update to 0.11.1.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.10.0-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.10.0-1.fc4.cw
- Rebuild for Core 4.

* Thu Apr 14 2005 Christoph Wickert  - 0.10.0-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 03:45:12 -0000	1.1
+++ .cvsignore	15 Dec 2005 03:46:11 -0000	1.2
@@ -0,0 +1 @@
+xfce4-notes-plugin-0.11.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 03:45:12 -0000	1.1
+++ sources	15 Dec 2005 03:46:11 -0000	1.2
@@ -0,0 +1 @@
+bc663b4be052ba184898b553141f08e3  xfce4-notes-plugin-0.11.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 03:48:32 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:48:32 -0500
Subject: rpms/xfce4-modemlights-plugin - New directory
Message-ID: <200512150348.jBF3mWk3001172@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1163/xfce4-modemlights-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-modemlights-plugin added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:48:37 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:48:37 -0500
Subject: rpms/xfce4-modemlights-plugin/devel - New directory
Message-ID: <200512150348.jBF3mboX001189@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1163/xfce4-modemlights-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-modemlights-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:48:56 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:48:56 -0500
Subject: rpms/xfce4-modemlights-plugin Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200512150348.jBF3muDZ001224@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1211

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-modemlights-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-modemlights-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:49:01 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:49:01 -0500
Subject: rpms/xfce4-modemlights-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512150349.jBF3n1Sb001245@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1211/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-modemlights-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:49:52 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:49:52 -0500
Subject: rpms/xfce4-modemlights-plugin import.log,1.1,1.2
Message-ID: <200512150350.jBF3oMXa001326@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1283

Modified Files:
	import.log 
Log Message:
auto-import xfce4-modemlights-plugin-0.1.1-3.fc4 on branch devel from xfce4-modemlights-plugin-0.1.1-3.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 03:48:54 -0000	1.1
+++ import.log	15 Dec 2005 03:49:50 -0000	1.2
@@ -0,0 +1 @@
+xfce4-modemlights-plugin-0_1_1-3_fc4:HEAD:xfce4-modemlights-plugin-0.1.1-3.fc4.src.rpm:1134618582



From fedora-extras-commits at redhat.com  Thu Dec 15 03:49:58 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:49:58 -0500
Subject: rpms/xfce4-modemlights-plugin/devel xfce4-modemlights-plugin.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512150350.jBF3oSZw001330@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1283/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-modemlights-plugin.spec 
Log Message:
auto-import xfce4-modemlights-plugin-0.1.1-3.fc4 on branch devel from xfce4-modemlights-plugin-0.1.1-3.fc4.src.rpm


--- NEW FILE xfce4-modemlights-plugin.spec ---
Name: 		xfce4-modemlights-plugin
Version: 	0.1.1
Release: 	3%{?dist}
Summary: 	Modemlights 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.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
A Xfce4 panel applet intended to simplify establishing a ppp connection via 
a modem.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/xfce4/panel-plugins/*.so
%{_datadir}/xfce4/*

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.1.1-3
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.1.1-2
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.1.1-1.fc4.cw
- Initial Fedora Extras version.
- Update to 0.1.1
- Add libxml2 BuildReqs.

* Sat Jul 30 2005 Christoph Wickert  - 0.1.0-1.fc4.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 03:48:59 -0000	1.1
+++ .cvsignore	15 Dec 2005 03:49:55 -0000	1.2
@@ -0,0 +1 @@
+xfce4-modemlights-plugin-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 03:48:59 -0000	1.1
+++ sources	15 Dec 2005 03:49:55 -0000	1.2
@@ -0,0 +1 @@
+7f7bafc619f6422e0d8b7b72eb53859a  xfce4-modemlights-plugin-0.1.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 03:51:52 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:51:52 -0500
Subject: rpms/xfce4-minicmd-plugin - New directory
Message-ID: <200512150351.jBF3pqrC001425@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1416/xfce4-minicmd-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-minicmd-plugin added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:51:57 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:51:57 -0500
Subject: rpms/xfce4-minicmd-plugin/devel - New directory
Message-ID: <200512150351.jBF3pvf0001441@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1416/xfce4-minicmd-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-minicmd-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 03:52:19 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:52:19 -0500
Subject: rpms/xfce4-minicmd-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512150352.jBF3qJke001483@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1470

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-minicmd-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-minicmd-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:52:24 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:52:24 -0500
Subject: rpms/xfce4-minicmd-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512150352.jBF3qOth001504@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1470/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-minicmd-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Dec 15 03:53:15 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:53:15 -0500
Subject: rpms/xfce4-minicmd-plugin import.log,1.1,1.2
Message-ID: <200512150353.jBF3rjxS001584@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1545

Modified Files:
	import.log 
Log Message:
auto-import xfce4-minicmd-plugin-0.3.0-4.fc4 on branch devel from xfce4-minicmd-plugin-0.3.0-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 03:52:17 -0000	1.1
+++ import.log	15 Dec 2005 03:53:12 -0000	1.2
@@ -0,0 +1 @@
+xfce4-minicmd-plugin-0_3_0-4_fc4:HEAD:xfce4-minicmd-plugin-0.3.0-4.fc4.src.rpm:1134618784



From fedora-extras-commits at redhat.com  Thu Dec 15 03:53:20 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 22:53:20 -0500
Subject: rpms/xfce4-minicmd-plugin/devel xfce4-minicmd-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512150353.jBF3rofP001588@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1545/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-minicmd-plugin.spec 
Log Message:
auto-import xfce4-minicmd-plugin-0.3.0-4.fc4 on branch devel from xfce4-minicmd-plugin-0.3.0-4.fc4.src.rpm


--- NEW FILE xfce4-minicmd-plugin.spec ---
Name:		xfce4-minicmd-plugin
Version:	0.3.0
Release:	4%{?dist}
Summary:	Mini command-line plugin 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.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
A mini command-line plugin for the Xfce panel. You can execute programs by 
typing their names in the widget and hitting Enter or Ctrl+Enter. The latter 
runs the command in a terminal. It maintains history which is shared with 
xfrun4. This history can be accessed by Up and Down keys.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.3.0-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.3.0-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.3.0-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.3.0-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.3.0-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 03:52:22 -0000	1.1
+++ .cvsignore	15 Dec 2005 03:53:18 -0000	1.2
@@ -0,0 +1 @@
+xfce4-minicmd-plugin-0.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 03:52:22 -0000	1.1
+++ sources	15 Dec 2005 03:53:18 -0000	1.2
@@ -0,0 +1 @@
+fe52a8ed8451ed41366d5b4abb2dbf9e  xfce4-minicmd-plugin-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 04:39:30 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 23:39:30 -0500
Subject: rpms/xfce4-wavelan-plugin - New directory
Message-ID: <200512150439.jBF4dUaN003433@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3424/xfce4-wavelan-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-wavelan-plugin added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 04:39:35 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 23:39:35 -0500
Subject: rpms/xfce4-wavelan-plugin/devel - New directory
Message-ID: <200512150439.jBF4dZGY003449@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3424/xfce4-wavelan-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-wavelan-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 04:39:54 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 23:39:54 -0500
Subject: rpms/xfce4-wavelan-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512150439.jBF4dsdR003485@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3471

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-wavelan-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-wavelan-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Dec 15 04:40:00 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 23:40:00 -0500
Subject: rpms/xfce4-wavelan-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512150440.jBF4e0Ow003506@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3471/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-wavelan-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Dec 15 04:40:50 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 23:40:50 -0500
Subject: rpms/xfce4-wavelan-plugin import.log,1.1,1.2
Message-ID: <200512150441.jBF4fK3j003584@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3542

Modified Files:
	import.log 
Log Message:
auto-import xfce4-wavelan-plugin-0.4.1-4.fc4 on branch devel from xfce4-wavelan-plugin-0.4.1-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 04:39:52 -0000	1.1
+++ import.log	15 Dec 2005 04:40:48 -0000	1.2
@@ -0,0 +1 @@
+xfce4-wavelan-plugin-0_4_1-4_fc4:HEAD:xfce4-wavelan-plugin-0.4.1-4.fc4.src.rpm:1134621640



From fedora-extras-commits at redhat.com  Thu Dec 15 04:40:56 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Wed, 14 Dec 2005 23:40:56 -0500
Subject: rpms/xfce4-wavelan-plugin/devel xfce4-wavelan-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512150441.jBF4fQ07003588@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3542/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-wavelan-plugin.spec 
Log Message:
auto-import xfce4-wavelan-plugin-0.4.1-4.fc4 on branch devel from xfce4-wavelan-plugin-0.4.1-4.fc4.src.rpm


--- NEW FILE xfce4-wavelan-plugin.spec ---
Name:		xfce4-wavelan-plugin
Version:	0.4.1
Release:	4%{?dist}
Summary:	WaveLAN plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
A plugin for the Xfce panel that monitors a wireless LAN interface. It 
displays stats for signal state, signal quality and network name (SSID).

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.4.1-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.4.1-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.4.1-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.4.1-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.4.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 04:39:58 -0000	1.1
+++ .cvsignore	15 Dec 2005 04:40:53 -0000	1.2
@@ -0,0 +1 @@
+xfce4-wavelan-plugin-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 04:39:58 -0000	1.1
+++ sources	15 Dec 2005 04:40:53 -0000	1.2
@@ -0,0 +1 @@
+5ca7df0f3bfe3ee67e2a1fd6c7b60eb0  xfce4-wavelan-plugin-0.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 04:50:34 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Wed, 14 Dec 2005 23:50:34 -0500
Subject: rpms/nsd/devel nsd.spec,1.4,1.5
Message-ID: <200512150451.jBF4p5Af003652@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3634

Modified Files:
	nsd.spec 
Log Message:
* Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
- Moved pid file to /var/run/nsd/nsd.pid.
- Use %{_localstatedir} instead of "/var"



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsd.spec	13 Dec 2005 18:16:01 -0000	1.4
+++ nsd.spec	15 Dec 2005 04:50:32 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -22,7 +22,7 @@
 %patch0 -p1 -b .checking.patch
 
 %configure --enable-bind8-stats --enable-plugins \
-           --enable-mmap --with-pidfile=/var/run/nsd.pid --with-ssl \
+           --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
            --with-user=nsd
 
 %build
@@ -37,6 +37,7 @@
 install -d 0755 %{buildroot}/%{_sbindir}
 install -d 0755 %{buildroot}/%{_mandir}/man8
 install -d 0755 %{buildroot}/%{_initrddir}
+install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name}
 
 install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf
 install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones
@@ -56,12 +57,13 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
+%attr(0700,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /var/run/%{name}.pid ]; then
+if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
 	/sbin/service %{name} stop
 fi
 # "Everyone is doing it, so why can't we?" 
@@ -71,7 +73,7 @@
 # do not activate daemon upon request. Fedora Extra policy
 
 %preun
-if [ -f /var/run/%{name}.pid ]
+if [ -f /%{_localstatedir}/run/%{name}/%{name}.pid ]
 then
         /sbin/service %{name} stop > /dev/null 2>&1
 fi
@@ -88,6 +90,10 @@
 fi
 
 %changelog
+* Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
+- Moved pid file to /var/run/nsd/nsd.pid.
+- Use %{_localstatedir} instead of "/var"
+
 * Tue Dec 13 2005 Paul Wouters  - 2.3.3-5
 - Added BuildRequires for openssl-devel, removed Requires for openssl.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 04:52:16 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Wed, 14 Dec 2005 23:52:16 -0500
Subject: rpms/nsd/FC-4 nsd.spec,1.3,1.4
Message-ID: <200512150452.jBF4qlu1003724@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3706

Modified Files:
	nsd.spec 
Log Message:
* Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
- Moved pid file to /var/run/nsd/nsd.pid.
- Use %{_localstatedir} instead of "/var"



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsd.spec	13 Dec 2005 14:05:48 -0000	1.3
+++ nsd.spec	15 Dec 2005 04:52:14 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -9,7 +9,6 @@
 Patch0: nsd-2.3.3-checking.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: openssl
 BuildRequires: flex, openssl-devel
 
 %description
@@ -23,7 +22,7 @@
 %patch0 -p1 -b .checking.patch
 
 %configure --enable-bind8-stats --enable-plugins \
-           --enable-mmap --with-pidfile=/var/run/nsd.pid --with-ssl \
+           --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
            --with-user=nsd
 
 %build
@@ -38,6 +37,7 @@
 install -d 0755 %{buildroot}/%{_sbindir}
 install -d 0755 %{buildroot}/%{_mandir}/man8
 install -d 0755 %{buildroot}/%{_initrddir}
+install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name}
 
 install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf
 install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones
@@ -57,12 +57,13 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
+%attr(0700,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /var/run/%{name}.pid ]; then
+if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
 	/sbin/service %{name} stop
 fi
 # "Everyone is doing it, so why can't we?" 
@@ -72,7 +73,7 @@
 # do not activate daemon upon request. Fedora Extra policy
 
 %preun
-if [ -f /var/run/%{name}.pid ]
+if [ -f /%{_localstatedir}/run/%{name}/%{name}.pid ]
 then
         /sbin/service %{name} stop > /dev/null 2>&1
 fi
@@ -89,7 +90,14 @@
 fi
 
 %changelog
-* Mon Dec 12 2005 Paul Wouters  - 2.3.3
+* Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
+- Moved pid file to /var/run/nsd/nsd.pid.
+- Use %{_localstatedir} instead of "/var"
+
+* Tue Dec 13 2005 Paul Wouters  - 2.3.3-5
+- Added BuildRequires for openssl-devel, removed Requires for openssl.
+
+* Mon Dec 12 2005 Paul Wouters  - 2.3.3-4
 - upgraded to nsd-2.3.3
 
 * Wed Dec  7 2005 Tom "spot" Callaway  - 2.3.2-2



From fedora-extras-commits at redhat.com  Thu Dec 15 04:53:20 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Wed, 14 Dec 2005 23:53:20 -0500
Subject: rpms/nsd/FC-3 nsd.spec,1.3,1.4
Message-ID: <200512150453.jBF4rpOl003796@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3776

Modified Files:
	nsd.spec 
Log Message:
* Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
- Moved pid file to /var/run/nsd/nsd.pid.
- Use %{_localstatedir} instead of "/var"



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsd.spec	13 Dec 2005 14:05:48 -0000	1.3
+++ nsd.spec	15 Dec 2005 04:53:18 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -9,7 +9,6 @@
 Patch0: nsd-2.3.3-checking.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: openssl
 BuildRequires: flex, openssl-devel
 
 %description
@@ -23,7 +22,7 @@
 %patch0 -p1 -b .checking.patch
 
 %configure --enable-bind8-stats --enable-plugins \
-           --enable-mmap --with-pidfile=/var/run/nsd.pid --with-ssl \
+           --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \
            --with-user=nsd
 
 %build
@@ -38,6 +37,7 @@
 install -d 0755 %{buildroot}/%{_sbindir}
 install -d 0755 %{buildroot}/%{_mandir}/man8
 install -d 0755 %{buildroot}/%{_initrddir}
+install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name}
 
 install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf
 install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones
@@ -57,12 +57,13 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
+%attr(0700,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /var/run/%{name}.pid ]; then
+if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
 	/sbin/service %{name} stop
 fi
 # "Everyone is doing it, so why can't we?" 
@@ -72,7 +73,7 @@
 # do not activate daemon upon request. Fedora Extra policy
 
 %preun
-if [ -f /var/run/%{name}.pid ]
+if [ -f /%{_localstatedir}/run/%{name}/%{name}.pid ]
 then
         /sbin/service %{name} stop > /dev/null 2>&1
 fi
@@ -89,7 +90,14 @@
 fi
 
 %changelog
-* Mon Dec 12 2005 Paul Wouters  - 2.3.3
+* Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
+- Moved pid file to /var/run/nsd/nsd.pid.
+- Use %{_localstatedir} instead of "/var"
+
+* Tue Dec 13 2005 Paul Wouters  - 2.3.3-5
+- Added BuildRequires for openssl-devel, removed Requires for openssl.
+
+* Mon Dec 12 2005 Paul Wouters  - 2.3.3-4
 - upgraded to nsd-2.3.3
 
 * Wed Dec  7 2005 Tom "spot" Callaway  - 2.3.2-2



From fedora-extras-commits at redhat.com  Thu Dec 15 04:57:06 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 14 Dec 2005 23:57:06 -0500
Subject: rpms/tcldom - New directory
Message-ID: <200512150457.jBF4v6gg004009@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4000/tcldom

Log Message:
Directory /cvs/extras/rpms/tcldom added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 04:57:11 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 14 Dec 2005 23:57:11 -0500
Subject: rpms/tcldom/devel - New directory
Message-ID: <200512150457.jBF4vBoe004025@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4000/tcldom/devel

Log Message:
Directory /cvs/extras/rpms/tcldom/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 04:57:23 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 14 Dec 2005 23:57:23 -0500
Subject: rpms/tcldom Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512150457.jBF4vNFA004060@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4047

Added Files:
	Makefile import.log 
Log Message:
Setup of module tcldom


--- NEW FILE Makefile ---
# Top level Makefile for module tcldom
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 15 04:57:28 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 14 Dec 2005 23:57:28 -0500
Subject: rpms/tcldom/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512150457.jBF4vSw3004081@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4047/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tcldom


--- NEW 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 Dec 15 04:57:56 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 14 Dec 2005 23:57:56 -0500
Subject: rpms/tcldom import.log,1.1,1.2
Message-ID: <200512150458.jBF4wQjk004170@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4130

Modified Files:
	import.log 
Log Message:
auto-import tcldom-3.1-2 on branch devel from tcldom-3.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tcldom/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 04:57:20 -0000	1.1
+++ import.log	15 Dec 2005 04:57:54 -0000	1.2
@@ -0,0 +1 @@
+tcldom-3_1-2:HEAD:tcldom-3.1-2.src.rpm:1134622670



From fedora-extras-commits at redhat.com  Thu Dec 15 04:58:02 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 14 Dec 2005 23:58:02 -0500
Subject: rpms/tcldom/devel tcldom.patch, NONE, 1.1 tcldom.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512150458.jBF4w2bX004163@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4130/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tcldom.patch tcldom.spec 
Log Message:
auto-import tcldom-3.1-2 on branch devel from tcldom-3.1-2.src.rpm

tcldom.patch:

--- NEW FILE tcldom.patch ---
diff -Naur --exclude '*.swp' tcldom-3.1/library/dom.tcl tcldom-3.1.new/library/dom.tcl
--- tcldom-3.1/library/dom.tcl	2004-02-25 12:10:28.000000000 -0800
+++ tcldom-3.1.new/library/dom.tcl	2005-12-13 14:57:29.000000000 -0800
@@ -15,9 +15,9 @@
 
 # We need the xml package, so that we get Name defined
 
-package require xml 3.0
+package require xml 3.1
 
-package provide dom::tcl 3.0
+package provide dom::tcl 3.1
 
 # Define generic constants
 
diff -Naur --exclude '*.swp' tcldom-3.1/library/xmlswitch.tcl tcldom-3.1.new/library/xmlswitch.tcl
--- tcldom-3.1/library/xmlswitch.tcl	2003-12-08 20:56:43.000000000 -0800
+++ tcldom-3.1.new/library/xmlswitch.tcl	2005-12-13 14:57:55.000000000 -0800
@@ -17,8 +17,8 @@
 
 # We need the xml, dom and xpath packages
 
-package require xml 3.0
-package require dom 3.0
+package require xml 3.1
+package require dom 3.1
 package require xpath 1.0
 
 namespace eval xmlswitch {
diff -Naur --exclude '*.swp' tcldom-3.1/src/configure tcldom-3.1.new/src/configure
--- tcldom-3.1/src/configure	2003-04-04 14:07:50.000000000 -0800
+++ tcldom-3.1.new/src/configure	2005-11-27 13:50:34.000000000 -0800
@@ -1898,10 +1898,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
diff -Naur --exclude '*.swp' tcldom-3.1/src-libxml2/configure tcldom-3.1.new/src-libxml2/configure
--- tcldom-3.1/src-libxml2/configure	2005-11-03 22:36:59.000000000 -0800
+++ tcldom-3.1.new/src-libxml2/configure	2005-11-27 13:40:37.000000000 -0800
@@ -1539,10 +1539,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
@@ -5330,9 +5332,11 @@
 
 LIBXML2_LIBDIR=""
 for d in 		\
+    $libdir     	\
     $with_xml2lib	\
     $exec_prefix/lib	\
     /usr/lib		\
+    /usr/lib64		\
     /usr/local/lib
 do
     if test -f "$d/libxml2.so" ; then
diff -Naur --exclude '*.swp' tcldom-3.1/src-libxml2/configure.in tcldom-3.1.new/src-libxml2/configure.in
--- tcldom-3.1/src-libxml2/configure.in	2005-05-20 07:07:35.000000000 -0700
+++ tcldom-3.1.new/src-libxml2/configure.in	2005-11-27 13:40:08.000000000 -0800
@@ -233,9 +233,11 @@
 
 LIBXML2_LIBDIR=""
 for d in 		\
+    $libdir      	\
     $with_xml2lib	\
     $exec_prefix/lib	\
     /usr/lib		\
+    /usr/lib64		\
     /usr/local/lib
 do
     if test -f "$d/libxml2.so" ; then
diff -Naur --exclude '*.swp' tcldom-3.1/tclconfig/tcl.m4 tcldom-3.1.new/tclconfig/tcl.m4
--- tcldom-3.1/tclconfig/tcl.m4	2003-12-03 12:18:44.000000000 -0800
+++ tcldom-3.1.new/tclconfig/tcl.m4	2005-11-27 13:37:00.000000000 -0800
@@ -73,10 +73,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


--- NEW FILE tcldom.spec ---
Summary: TclDOM is a package that provides a DOM binding for the Tcl scripting language
Name: tcldom
Version: 3.1
Release: 2%{?dist}
License: BSD
Group: Development/Libraries
URL:	http://tclxml.sourceforge.net/
Source: http://dl.sf.net/tclxml/tcldom-3.1.tar.gz
Patch0: tcldom.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcl tcl-devel libxml2-devel tclxml-devel
Requires: tcl tclxml tcllib libxml2

%description
This package provides a DOM binding for Tcl.  It provides one of the following
implementations:
    *     A Tcl-only implementation (slow, but no compilation required),
    *     A wrapper for the Gnome libxml2 library [http://xmlsoft.org/]
          (also fast and compatiable with TclXSLT/libxslt
          [http://tclxml.sourceforge.net/tclxslt.html]).

%package libxml2
Summary: The Tcl dom parser built with the libxml2 xml parser
Group: Development/Libraries
Requires: tcldom = %{version} tclxml-libxml2
%description libxml2
This package provides an optimized Tcl dom parser built with the libxml2
xml parser.

%package devel
Summary: The Tcl dom parser development files
Group: Development/Libraries
Requires: tcldom = %{version} tclxml-devel
%description devel
Development headers and libraries needed to link new applications against
tcldom.

%prep
%setup -q
%patch0 -p1
%{__sed} -i 's/\r//' examples/tkxmllint.tcl

%build
cd src-libxml2
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
# We have to hand-install the base Tcl files since the configure script
# doesn't take care of that.
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}
install -m 0644 library/*.tcl $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}
sed -e 's/@VERSION@/%{version}/' < library/pkgIndex.tcl.in > $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/pkgIndex.tcl

cd src-libxml2
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_datadir}/%{name}%{version}
%doc ChangeLog README MANIFEST RELNOTES LICENSE
%doc docs/* examples/*

%files libxml2
%defattr(-,root,root)
%dir %{_libdir}/%{name}_libxml2%{version}
%{_libdir}/%{name}_libxml2%{version}/*.tcl
%{_libdir}/%{name}_libxml2%{version}/*.so

%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/%{name}libxml2Config.sh
%{_libdir}/%{name}_libxml2%{version}/*.a

%changelog
* Tue Dec 13 2005 Wart  - 3.1-2
- Update patch to fix version numbers that weren't updated upstream
* Sun Nov 27 2005 Wart  - 3.1-1
- Update to new upstream sources.
* Sat Nov 26 2005 Wart  - 3.0-2
- Minor spec file changes to remove rpmlint warnings
* Fri Jun 17 2005 Wart  - 3.0-1
- New spec file to conform to Fedora Core 4 standards.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcldom/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 04:57:26 -0000	1.1
+++ .cvsignore	15 Dec 2005 04:58:00 -0000	1.2
@@ -0,0 +1 @@
+tcldom-3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcldom/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 04:57:26 -0000	1.1
+++ sources	15 Dec 2005 04:58:00 -0000	1.2
@@ -0,0 +1 @@
+b5af0e29e5cf2109d1f1a9b1a6ec2d81  tcldom-3.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 05:16:10 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 15 Dec 2005 00:16:10 -0500
Subject: rpms/munin/devel munin.spec,1.2,1.3
Message-ID: <200512150516.jBF5GfNT005885@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5862

Modified Files:
	munin.spec 
Log Message:
Fixed ownership for /var/lib/munin in node subpackage



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- munin.spec	14 Dec 2005 19:27:27 -0000	1.2
+++ munin.spec	15 Dec 2005 05:16:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -211,7 +211,7 @@
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
 %dir /etc/munin
-%dir /var/lib/munin
+%attr(-, munin, munin) %dir /var/lib/munin
 %dir %attr(-, munin, munin) /var/lib/munin/plugin-state
 %{_datadir}/munin/plugins/*
 %doc %{_docdir}/%{name}-%{version}/COPYING
@@ -223,6 +223,9 @@
 
 %changelog
 * Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
+- Fixed ownership for /var/lib/munin in node subpackage
+
+* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
 - Fixed libdir messup to allow builds on x86_64
 
 * Mon Dec 12 2005 Kevin Fenzi  - 1.2.4-2



From fedora-extras-commits at redhat.com  Thu Dec 15 05:19:46 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 15 Dec 2005 00:19:46 -0500
Subject: rpms/munin/FC-4 munin.spec,1.2,1.3
Message-ID: <200512150520.jBF5KGOt005955@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5936

Modified Files:
	munin.spec 
Log Message:
Fixed ownership for /var/lib/munin in node subpackage



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-4/munin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- munin.spec	14 Dec 2005 19:26:07 -0000	1.2
+++ munin.spec	15 Dec 2005 05:19:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -211,7 +211,7 @@
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
 %dir /etc/munin
-%dir /var/lib/munin
+%attr(-, munin, munin) %dir /var/lib/munin
 %dir %attr(-, munin, munin) /var/lib/munin/plugin-state
 %{_datadir}/munin/plugins/*
 %doc %{_docdir}/%{name}-%{version}/COPYING
@@ -222,6 +222,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-4
+- Fixed ownership for /var/lib/munin in node subpackage
+
 * Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
 - Fixed libdir messup to allow builds on x86_64
 



From fedora-extras-commits at redhat.com  Thu Dec 15 05:22:08 2005
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 15 Dec 2005 00:22:08 -0500
Subject: rpms/munin/FC-3 munin.spec,1.2,1.3
Message-ID: <200512150522.jBF5MdId006022@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6004

Modified Files:
	munin.spec 
Log Message:
Fixed ownership for /var/lib/munin in node subpackage



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-3/munin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- munin.spec	14 Dec 2005 19:23:14 -0000	1.2
+++ munin.spec	15 Dec 2005 05:22:06 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -211,7 +211,7 @@
 %dir %{_datadir}/munin
 %dir /etc/munin/plugins
 %dir /etc/munin
-%dir /var/lib/munin
+%attr(-, munin, munin) %dir /var/lib/munin
 %dir %attr(-, munin, munin) /var/lib/munin/plugin-state
 %{_datadir}/munin/plugins/*
 %doc %{_docdir}/%{name}-%{version}/COPYING
@@ -222,6 +222,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-4
+- Fixed ownership for /var/lib/munin in node subpackage
+
 * Wed Dec 14 2005 Kevin Fenzi  - 1.2.4-3
 - Fixed libdir messup to allow builds on x86_64
 



From fedora-extras-commits at redhat.com  Thu Dec 15 05:31:52 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 15 Dec 2005 00:31:52 -0500
Subject: owners owners.list,1.452,1.453
Message-ID: <200512150532.jBF5WMTM006100@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6082

Modified Files:
	owners.list 
Log Message:
Added entry for tcldom




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- owners.list	14 Dec 2005 22:30:00 -0000	1.452
+++ owners.list	15 Dec 2005 05:31:50 -0000	1.453
@@ -1133,6 +1133,7 @@
 Fedora Extras|taarich|Display Hebrew date|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 15 06:45:17 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 15 Dec 2005 01:45:17 -0500
Subject: rpms/kawa/devel kawa.spec,1.2,1.3
Message-ID: <200512150645.jBF6jlVc008126@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/kawa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8106

Modified Files:
	kawa.spec 
Log Message:
Increment revision.  Build with gcc 4.1



Index: kawa.spec
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/kawa.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kawa.spec	8 Oct 2005 23:18:15 -0000	1.2
+++ kawa.spec	15 Dec 2005 06:45:14 -0000	1.3
@@ -5,14 +5,14 @@
 %define nversion 1.8
 %define dversion 1.8
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://www.gnu.org/software/kawa/
 Source0: %{name}-%{nversion}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{nversion}-%{release}-root
-BuildPrereq: gcc-java >= 3.3.0
-Requires: libgcj >= 3.3.0
+BuildPrereq: gcc-java >= 4.1.0
+Requires: libgcj >= 4.1.0
 BuildRequires:    texinfo
 BuildRequires:    readline-devel
 BuildRequires:    ant >= 1.6
@@ -84,6 +84,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Nov 14 2005 Anthony Green  - 1:1.8-2
+- Rebuild with GCC 4.1.
+
 * Sat Oct  8 2005 Anthony Green  - 1:1.8-1
 - Upgrade to 1.8.
 - Add qexo man page.



From fedora-extras-commits at redhat.com  Thu Dec 15 06:50:08 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 15 Dec 2005 01:50:08 -0500
Subject: rpms/kawa/devel kawa.spec,1.3,1.4
Message-ID: <200512150650.jBF6oc09008210@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/kawa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8191

Modified Files:
	kawa.spec 
Log Message:
Rev 3



Index: kawa.spec
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/kawa.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kawa.spec	15 Dec 2005 06:45:14 -0000	1.3
+++ kawa.spec	15 Dec 2005 06:50:06 -0000	1.4
@@ -5,7 +5,7 @@
 %define nversion 1.8
 %define dversion 1.8
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://www.gnu.org/software/kawa/
@@ -84,7 +84,7 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
-* Wed Nov 14 2005 Anthony Green  - 1:1.8-2
+* Wed Nov 14 2005 Anthony Green  - 1:1.8-3
 - Rebuild with GCC 4.1.
 
 * Sat Oct  8 2005 Anthony Green  - 1:1.8-1



From fedora-extras-commits at redhat.com  Thu Dec 15 06:54:38 2005
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 15 Dec 2005 01:54:38 -0500
Subject: rpms/jogl/devel jogl.spec,1.12,1.13
Message-ID: <200512150655.jBF6t8C9008293@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/jogl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8275

Modified Files:
	jogl.spec 
Log Message:
Increment revision.  Build with GCC 4.1.



Index: jogl.spec
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jogl.spec	19 Nov 2005 23:42:50 -0000	1.12
+++ jogl.spec	15 Dec 2005 06:54:36 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           jogl
 Version:        1.1.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Java bindings for the OpenGL API
 
 Group:          System Environment/Libraries
@@ -107,6 +107,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sat Dec 14 2005 Anthony Green  - 0:1.1.1-12
+- Build with GCC 4.1.
+
 * Sat Nov 19 2005 Anthony Green  - 0:1.1.1-11
 - Add Patch3 for X change.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 07:43:55 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 15 Dec 2005 02:43:55 -0500
Subject: rpms/mlmmj/devel mlmmj.spec,1.16,1.17
Message-ID: <200512150744.jBF7iQ6c010173@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10155

Modified Files:
	mlmmj.spec 
Log Message:
Fix the broken Source: line in the spec, entirely my fault.



Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mlmmj.spec	15 Dec 2005 00:14:58 -0000	1.16
+++ mlmmj.spec	15 Dec 2005 07:43:52 -0000	1.17
@@ -3,10 +3,10 @@
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
 Version: 1.2.9
-Release: 2%{?dist}
+Release: 2.1%{?dist}
 License: MIT
 Group: Applications/Internet
-Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}-RC1.tar.bz2
+Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: smtpdaemon
 URL: http://mlmmj.mmj.dk/
@@ -48,7 +48,7 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
-* Thu Dec 15 2005 Michael Fleming  1.2.9-2
+* Thu Dec 15 2005 Michael Fleming  1.2.9-2.1
 - New upstream stable release
 - Fix Release tag
 



From fedora-extras-commits at redhat.com  Thu Dec 15 07:47:44 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 15 Dec 2005 02:47:44 -0500
Subject: rpms/sobby/FC-3 .cvsignore, 1.2, 1.3 sobby.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200512150748.jBF7mEdX010322@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/sobby/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10287

Modified Files:
	.cvsignore sobby.spec sources 
Log Message:
* Thu Dec 15 2005 Luke Macken  - 0.2.0-1
- Regress package to 0.2.0 for FC-{3,4}




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2005 15:20:52 -0000	1.2
+++ .cvsignore	15 Dec 2005 07:47:42 -0000	1.3
@@ -1 +1 @@
-sobby-0.3.0rc3.tar.gz
+sobby-0.2.0.tar.gz


Index: sobby.spec
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-3/sobby.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sobby.spec	12 Dec 2005 15:20:52 -0000	1.1
+++ sobby.spec	15 Dec 2005 07:47:42 -0000	1.2
@@ -1,14 +1,12 @@
-%define _rc rc3
-
 Name:           sobby
-Version:        0.3.0
-Release:        1.%{_rc}%{?dist}
+Version:        0.2.0
+Release:        2%{?dist}
 Summary:        Standalone obby server
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gobby.0x539.de
-Source0:        http://releases.0x539.de/sobby/%{name}-%{version}%{_rc}.tar.gz
+Source0:        http://releases.0x539.de/sobby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  obby-devel, glibmm24-devel
@@ -18,7 +16,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{_rc}
+%setup -q
 
 
 %build
@@ -42,5 +40,8 @@
 
 
 %changelog
+* Thu Dec 15 2005 Luke Macken  - 0.2.0-2
+- Regress package to 0.2.0 for FC-{3,4}
+
 * Wed Dec 07 2005 Luke Macken  - 0.3.0-1.rc3
 - Packaged for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2005 15:20:52 -0000	1.2
+++ sources	15 Dec 2005 07:47:42 -0000	1.3
@@ -1 +1 @@
-8c3538992f83527cfb9f0a42a9e2ed87  sobby-0.3.0rc3.tar.gz
+68e740d9ad051e7939de29fa2c28da56  sobby-0.2.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 07:51:55 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 15 Dec 2005 02:51:55 -0500
Subject: rpms/mlmmj/FC-3 .cvsignore, 1.5, 1.6 mlmmj.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <200512150752.jBF7qPZN010436@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10414

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Thu Dec 15 2005 Michael Fleming  1.2.9-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jun 2005 04:06:00 -0000	1.5
+++ .cvsignore	15 Dec 2005 07:51:53 -0000	1.6
@@ -1 +1 @@
-mlmmj-1.2.8.tar.bz2
+mlmmj-1.2.9.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/mlmmj.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mlmmj.spec	21 Jun 2005 04:06:00 -0000	1.12
+++ mlmmj.spec	15 Dec 2005 07:51:53 -0000	1.13
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.8
+Version: 1.2.9
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Thu Dec 15 2005 Michael Fleming  1.2.9-1
+- New upstream release
+
 * Tue Jun 21 2005 Michael Fleming  1.2.8-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Jun 2005 04:06:00 -0000	1.5
+++ sources	15 Dec 2005 07:51:53 -0000	1.6
@@ -1 +1 @@
-778a236716df9511670dddfccfa1d257  mlmmj-1.2.8.tar.bz2
+6011ba93fa907289b4ed3d4c3552a90e  mlmmj-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 08:19:09 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 03:19:09 -0500
Subject: rpms/koffice/devel koffice-krita-kisclipboard.patch, NONE,
	1.1 koffice.spec, 1.17, 1.18
Message-ID: <200512150819.jBF8JeTp012160@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12139

Modified Files:
	koffice.spec 
Added Files:
	koffice-krita-kisclipboard.patch 
Log Message:
- more krita compile fixes


koffice-krita-kisclipboard.patch:

--- NEW FILE koffice-krita-kisclipboard.patch ---
--- branches/koffice/1.4/koffice/krita/core/kis_clipboard.h	2005/05/27 09:18:23	418647
+++ branches/koffice/1.4/koffice/krita/core/kis_clipboard.h	2005/10/18 12:57:53	471689
@@ -35,7 +35,7 @@
 
 public:
 
-	virtual KisClipboard::~KisClipboard();
+	virtual ~KisClipboard();
 
 	static KisClipboard* instance();


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- koffice.spec	13 Dec 2005 09:55:06 -0000	1.17
+++ koffice.spec	15 Dec 2005 08:19:07 -0000	1.18
@@ -16,7 +16,7 @@
 Patch1:         koffice-CAN-2005-3193.diff
 
 Patch100:       koffice-krita-kisfilter.patch
-
+Patch101:       koffice-krita-kisclipboard.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -198,6 +198,7 @@
 %patch0 -p1
 %patch1
 %patch100
+%patch101 -p4
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -754,7 +755,7 @@
 * Thu Dec 08 2005 Andreas Bierfert 
 1.4.2-3
 - fix CAN-2005-3193
-- add krita compile fix
+- add krita compile fixs
 
 * Thu Nov 10 2005 Andreas Bierfert 
 1.4.2-2



From fedora-extras-commits at redhat.com  Thu Dec 15 09:05:15 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 04:05:15 -0500
Subject: rpms/koffice/devel koffice-kspread.patch, NONE, 1.1 koffice.spec,
	1.18, 1.19
Message-ID: <200512150905.jBF95qEo014256@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14235

Modified Files:
	koffice.spec 
Added Files:
	koffice-kspread.patch 
Log Message:
- add kspread compile fixes


koffice-kspread.patch:

--- NEW FILE koffice-kspread.patch ---
--- branches/koffice/1.4/koffice/kspread/kspread_cell.h	2005/05/27 09:18:23	418647
+++ branches/koffice/1.4/koffice/kspread/kspread_cell.h	2005/10/18 15:34:45	471722
@@ -596,7 +596,7 @@
      *
      * @return the cell that decides the format for the cell in question.
      */
-    KSpreadCell *KSpreadCell::ultimateObscuringCell() const;
+    KSpreadCell *ultimateObscuringCell() const;
 
     /**
      * @return the obscuring cell list (might be empty)


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- koffice.spec	15 Dec 2005 08:19:07 -0000	1.18
+++ koffice.spec	15 Dec 2005 09:05:08 -0000	1.19
@@ -17,6 +17,7 @@
 
 Patch100:       koffice-krita-kisfilter.patch
 Patch101:       koffice-krita-kisclipboard.patch
+Patch102:       koffice-kspread.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -199,6 +200,7 @@
 %patch1
 %patch100
 %patch101 -p4
+%patch102 -p4
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -755,7 +757,8 @@
 * Thu Dec 08 2005 Andreas Bierfert 
 1.4.2-3
 - fix CAN-2005-3193
-- add krita compile fixs
+- add krita compile fixes
+- add kspread compile fixes
 
 * Thu Nov 10 2005 Andreas Bierfert 
 1.4.2-2



From fedora-extras-commits at redhat.com  Thu Dec 15 10:04:25 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 15 Dec 2005 05:04:25 -0500
Subject: rpms/liboil/FC-4 .cvsignore, 1.4, 1.5 liboil.spec, 1.9, 1.10 sources,
	1.4, 1.5
Message-ID: <200512151004.jBFA4taS018540@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/liboil/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18513

Modified Files:
	.cvsignore liboil.spec sources 
Log Message:
Update FC-4 branch to 0.3.6 too.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liboil/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 19:06:01 -0000	1.4
+++ .cvsignore	15 Dec 2005 10:04:15 -0000	1.5
@@ -1 +1 @@
-liboil-0.3.5.tar.gz
+liboil-0.3.6.tar.gz


Index: liboil.spec
===================================================================
RCS file: /cvs/extras/rpms/liboil/FC-4/liboil.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- liboil.spec	14 Nov 2005 09:30:23 -0000	1.9
+++ liboil.spec	15 Dec 2005 10:04:16 -0000	1.10
@@ -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
+* 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.
 - Parallel make seems to have worked for 0.3.5 on devel, but just in case...


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liboil/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 19:06:01 -0000	1.4
+++ sources	15 Dec 2005 10:04:16 -0000	1.5
@@ -1 +1 @@
-f365f0a4cc31b2ff029e37deccb09ff6  liboil-0.3.5.tar.gz
+a36b2d9cc71d75d814d7bdca2263290f  liboil-0.3.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 10:13:58 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 05:13:58 -0500
Subject: rpms/WindowMaker/devel WindowMaker.spec,1.14,1.15
Message-ID: <200512151013.jBFADwL9018635@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/WindowMaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18620

Modified Files:
	WindowMaker.spec 
Log Message:
- finish modular x integration



Index: WindowMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WindowMaker.spec	25 Nov 2005 08:30:18 -0000	1.14
+++ WindowMaker.spec	15 Dec 2005 10:13:44 -0000	1.15
@@ -22,6 +22,8 @@
 BuildRequires:  libXpm-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  automake14 libtool
 
 %package devel
 Summary:	libraries needed for WindowMaker.
@@ -62,7 +64,8 @@
 NLSDIR="%{_datadir}/locale"
 export LINGUAS NLSDIR GNUSTEP_LOCAL_ROOT
 %configure --enable-gnome --enable-kde --enable-usermenu --enable-xinerama \
---enable-fast-install --enable-modelock
+--enable-fast-install --enable-modelock --x-includes=%{_includedir} \
+--x-libraries=%{_libdir}
 
 make %{?_smp_mflags}
 



From fedora-extras-commits at redhat.com  Thu Dec 15 10:16:33 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 05:16:33 -0500
Subject: rpms/koffice/devel koffice-kexi.patch, NONE, 1.1 koffice.spec, 1.19,
	1.20
Message-ID: <200512151017.jBFAH3pa018769@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18741

Modified Files:
	koffice.spec 
Added Files:
	koffice-kexi.patch 
Log Message:
- add kexi compile fixes


koffice-kexi.patch:

--- NEW FILE koffice-kexi.patch ---
--- branches/koffice/1.4/koffice/kexi/migration/mysql/mysqlmigrate.h	2005/05/27 09:18:23	418647
+++ branches/koffice/1.4/koffice/kexi/migration/mysql/mysqlmigrate.h	2005/10/18 15:34:45	471722
@@ -60,7 +60,7 @@
 			~MySQLMigrate();
 			//Constructor
 			MySQLMigrate();
-			MySQLMigrate::MySQLMigrate(QObject *parent, const char *name, const QStringList& args = QStringList());
+			MySQLMigrate(QObject *parent, const char *name, const QStringList& args = QStringList());
 			
 			KexiDB::Field::Type type(const QString& table, const MYSQL_FIELD* t);
 			
@@ -69,8 +69,8 @@
 			
 			QStringList examineEnumField(const QString& table,
 			                             const MYSQL_FIELD* fld);
-			void MySQLMigrate::getConstraints(int mysqlConstraints, KexiDB::Field* fld);
-			void MySQLMigrate::getOptions(int flags, KexiDB::Field* fld);
+			void getConstraints(int mysqlConstraints, KexiDB::Field* fld);
+			void getOptions(int flags, KexiDB::Field* fld);
 
 		/*! driver's static version information, it is automatically implemented
 		 in implementation using KEXIDB_DRIVER macro (see driver_p.h) */


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- koffice.spec	15 Dec 2005 09:05:08 -0000	1.19
+++ koffice.spec	15 Dec 2005 10:16:31 -0000	1.20
@@ -18,6 +18,7 @@
 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 ;)
@@ -201,6 +202,7 @@
 %patch100
 %patch101 -p4
 %patch102 -p4
+%patch103 -p4
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -757,8 +759,10 @@
 * Thu Dec 08 2005 Andreas Bierfert 
 1.4.2-3
 - fix CAN-2005-3193
-- add krita compile fixes
-- add kspread compile fixes
+- gcc 4.1.0:
+    - add krita compile fixes
+    - add kspread compile fixes
+    - add kexi compile fixes
 
 * Thu Nov 10 2005 Andreas Bierfert 
 1.4.2-2



From fedora-extras-commits at redhat.com  Thu Dec 15 11:18:16 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 15 Dec 2005 06:18:16 -0500
Subject: rpms/uim/devel uim-init.el, NONE, 1.1 uim.spec, 1.20,
	1.21 uim-0.4.6-dont-require-devel-pkgs.patch, 1.1,
	NONE uim-0.4.6-fix-typo-in-configure.patch, 1.1,
	NONE uim-0.4.6-multilib.patch, 1.1, NONE
Message-ID: <200512151118.jBFBIkVO020690@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20671

Modified Files:
	uim.spec 
Added Files:
	uim-init.el 
Removed Files:
	uim-0.4.6-dont-require-devel-pkgs.patch 
	uim-0.4.6-fix-typo-in-configure.patch uim-0.4.6-multilib.patch 
Log Message:
* Thu Dec 15 2005 Akira TAGOH  - 1.0.0-0.1.alpha
- New upstream release.
- added uim-m17n package. (#175600)
- added uim-el package.
- uim-0.4.6-dont-require-devel-pkgs.patch: removed.


--- NEW FILE uim-init.el ---
(require 'uim-leim)

(add-to-list 'load-path "/usr/share/emacs/site-lisp/uim-el")
(setq uim-el-agent "/usr/bin/uim-el-agent")
;(setq uim-candidate-display-inline t)
;(setq default-input-method "japanese-anthy-uim")


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- uim.spec	30 Sep 2005 08:40:52 -0000	1.20
+++ uim.spec	15 Dec 2005 11:18:13 -0000	1.21
@@ -2,23 +2,25 @@
 %define inst_xinput for llcc in %{uim_locale}; do alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim 50 ; done
 %define uninst_xinput for llcc in %{uim_locale}; do alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/uim ; done
 
-Summary:	A multilingual input method library
 Name:		uim
-Version:	0.4.9.1
-Release:	1%{?dist}
+Version:	1.0.0
+Release:	0.1.alpha%{?dist}
 License:	GPL/BSD
-Group:		System Environment/Libraries
 URL:		http://uim.freedesktop.org/
-Source0:	http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz
-Source1:	xinput.d-uim
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
-BuildRequires:	anthy-devel Canna-devel
+BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
+BuildRequires:	emacs
+Source0:	http://uim.freedesktop.org/release/%{name}-%{version}-alpha.tar.gz
+Source1:	xinput.d-uim
+Source2:	uim-init.el
+
+
+Summary:	A multilingual input method library
+Group:		System Environment/Libraries
 Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
 Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
 
-Patch2:		uim-0.4.6-dont-require-devel-pkgs.patch
-
 %package	devel
 Summary:	Development files for the Uim library
 Group:		Development/Libraries
@@ -43,6 +45,17 @@
 Group:		User Interface/Desktops
 Requires:	uim = %{version}-%{release}
 
+%package	el
+Summary:	Emacs support for Uim
+Group:		System Environment/Libraries
+Requires:	%{name}-el-common = %{version}
+Requires:	emacs-common
+
+%package	el-common
+Summary:	Common package for Emacsen support for Uim
+Group:		System Environment/Libraries
+Requires:	uim = %{version}-%{release}
+
 %package	anthy
 Summary:	Anthy support for Uim
 Group:		System Environment/Libraries
@@ -67,6 +80,13 @@
 Requires(post):	gtk2
 Requires(postun): gtk2
 
+%package	m17n
+Summary:	m17n-lib support for Uim
+Group:		System Environment/Libraries
+Requires:	uim = %{version}-%{release}
+Requires(post):	gtk2
+Requires(postun): gtk2
+
 %description
 Uim is a multilingual input method library. Uim aims to
 provide secure and useful input methods for all
@@ -110,6 +130,12 @@
 
 This package provides the Qt IM module and helper programs.
 
+%description	el
+This package provides Emacs support.
+
+%description	el-common
+This package provides an utility to use Emacsen support for Uim.
+
 %description	anthy
 This package provides support for Anthy, a Japanese input method.
 
@@ -119,19 +145,18 @@
 %description	skk
 This package provides support for SKK, a Japanese input method.
 
+%description	m17n
+This package provides support for m17n-lib, which allows input of
+many languages using the input table map from m17n-db.
+
 %define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules )
 
 %prep
-%setup -q
-%patch2 -p1 -b .dlopen
+%setup -q -n %{name}-%{version}-alpha
 
-# patch creation:
-libtoolize --force && aclocal-1.9 -I m4 && autoheader && automake-1.9 --foreign && autoconf
-# touch uim/config.h.in, otherwise autoheader will run again
-touch uim/config.h.in
 
 %build
-%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule --without-scim
+%configure --with-canna --with-anthy --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
 make
 
 %install
@@ -141,10 +166,13 @@
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim
+install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/
 
 %find_lang %{name}
+%find_lang uim-chardict-qt
 
-find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk)" > scm.list
+find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|m17n)" > scm.list
 cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
 
 # compress large doc
@@ -210,21 +238,29 @@
 	%{gtk_im_update}
 fi
 
+%post	m17n
+umask 022
+%{gtk_im_update}
+
+%postun m17n
+umask 022
+if [ $1 = 0 ]; then
+	%{gtk_im_update}
+fi
+
 %files -f %{name}.lang
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog* NEWS README
-%lang(ja) %doc README.ja
 %{_bindir}/uim-fep*
-%{_bindir}/uim-helper-server
 %{_bindir}/uim-module-manager
 %{_bindir}/uim-sh
 %{_bindir}/uim-xim
 %{_libdir}/lib*.so.*
 %dir %{_datadir}/uim
-%{_datadir}/uim/tables
 %{_sysconfdir}/X11/xinit/xinput.d
 %dir %{_libdir}/uim
 %{_libdir}/uim/plugin/libuim-custom-enabler.so
+%{_libexecdir}/uim-helper-server
 %{_datadir}/uim/pixmaps
 %{_datadir}/uim/helperdata
 %{_mandir}/man1/uim-xim.1*
@@ -241,8 +277,6 @@
 
 %files	gtk2
 %defattr (-, root, root)
-%{_bindir}/uim-candwin-gtk
-%{_bindir}/uim-helper-candwin-gtk
 %{_bindir}/uim-helper-toolbar-gtk
 %{_bindir}/uim-helper-toolbar-gtk-systray
 %{_bindir}/uim-pref-gtk
@@ -251,6 +285,7 @@
 %{_bindir}/uim-im-switcher-gtk
 %{_bindir}/uim-input-pad-ja
 %{_libdir}/gtk-2.0/2.*/immodules
+%{_libexecdir}/uim-candwin-gtk
 %exclude %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a
 %dir %{_datadir}/uim
 %{_datadir}/applications/uim.desktop
@@ -261,16 +296,27 @@
 %{_libexecdir}/uim-toolbar-applet
 %{_libdir}/bonobo/servers/GNOME_UimApplet.server
 
-%files	qt
+%files	-f uim-chardict-qt.lang qt
 %defattr (-, root, root)
-%{_bindir}/uim-candwin-qt
 %{_bindir}/uim-chardict-qt
 %{_bindir}/uim-im-switcher-qt
 %{_bindir}/uim-pref-qt
 %{_bindir}/uim-toolbar-qt
 %{_libdir}/qt-3.*/plugins/inputmethods
+%{_libexecdir}/uim-candwin-qt
 %exclude %{_libdir}/qt-3.*/plugins/inputmethods/lib*.*a
 
+%files	el
+%defattr (-, root, root)
+%doc emacs/COPYING emacs/README
+%lang(ja) %doc emacs/README.ja
+%{_datadir}/emacs/site-lisp/uim-el
+%{_datadir}/emacs/site-lisp/site-start.d/uim-init.el
+
+%files el-common
+%defattr (-, root, root)
+%{_bindir}/uim-el-agent
+
 %files	anthy
 %defattr (-, root, root)
 %{_libdir}/uim/plugin/libuim-anthy.so
@@ -289,7 +335,19 @@
 %dir %{_datadir}/uim
 %{_datadir}/uim/skk*.scm
 
+%files m17n
+%defattr (-, root, root)
+%{_libdir}/uim/plugin/libuim-m17nlib.so
+%dir %{_datadir}/uim
+%{_datadir}/uim/m17nlib.scm
+
 %changelog
+* Thu Dec 15 2005 Akira TAGOH  - 1.0.0-0.1.alpha
+- New upstream release.
+- added uim-m17n package. (#175600)
+- added uim-el package.
+- uim-0.4.6-dont-require-devel-pkgs.patch: removed.
+
 * Fri Sep 30 2005 Akira TAGOH  - 0.4.9.1-1
 - New upstream release.
 


--- uim-0.4.6-dont-require-devel-pkgs.patch DELETED ---


--- uim-0.4.6-fix-typo-in-configure.patch DELETED ---


--- uim-0.4.6-multilib.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec 15 11:32:12 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 15 Dec 2005 06:32:12 -0500
Subject: rpms/uim/devel .cvsignore,1.10,1.11 sources,1.9,1.10
Message-ID: <200512151132.jBFBWha7020801@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20781

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Sep 2005 08:40:52 -0000	1.10
+++ .cvsignore	15 Dec 2005 11:32:10 -0000	1.11
@@ -9,3 +9,4 @@
 uim-0.4.7.1.tar.gz
 uim-0.4.8.tar.gz
 uim-0.4.9.1.tar.gz
+uim-1.0.0-alpha.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2005 08:40:52 -0000	1.9
+++ sources	15 Dec 2005 11:32:10 -0000	1.10
@@ -1 +1 @@
-0e2625cc926917d7864c4d0c341c535a  uim-0.4.9.1.tar.gz
+9c277a46e16a0bf90d72aabbf8094cfc  uim-1.0.0-alpha.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 12:07:10 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 15 Dec 2005 07:07:10 -0500
Subject: rpms/cernlib/FC-3 115-rsrtnt64-goto-outer-block.dpatch, NONE,
	1.1 116-fix-fconc64-spaghetti-code.dpatch, NONE,
	1.1 117-fix-optimizer-bug-in-gphot.dpatch, NONE,
	1.1 211-fix-comis-on-amd64.dpatch, NONE,
	1.1 211-fix-comis-on-ia64.dpatch, NONE,
	1.1 cernlib_2005.05.09.dfsg-3.diff, NONE,
	1.1 304-update-Imake-config-files.dpatch, 1.1,
	1.2 307-use-canonical-cfortran.dpatch, 1.1,
	1.2 315-fixes-for-MacOSX.dpatch, 1.2,
	1.3 701-patch-hbook-comis-Imakefiles.dpatch, 1.1,
	1.2 cernlib.m4, 1.1, 1.2 cernlib.spec, 1.11, 1.12 paw.README,
	1.2, 1.3 211-fix-comis-on-64-bit-arches.dpatch, 1.1,
	NONE cernlib-rsrtnt64_goto_outer_block.diff, 1.1,
	NONE cernlib_2005.05.09.dfsg-2.diff, 1.1, NONE
Message-ID: <200512151207.jBFC7AjL022505@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22481

Modified Files:
	304-update-Imake-config-files.dpatch 
	307-use-canonical-cfortran.dpatch 315-fixes-for-MacOSX.dpatch 
	701-patch-hbook-comis-Imakefiles.dpatch cernlib.m4 
	cernlib.spec paw.README 
Added Files:
	115-rsrtnt64-goto-outer-block.dpatch 
	116-fix-fconc64-spaghetti-code.dpatch 
	117-fix-optimizer-bug-in-gphot.dpatch 
	211-fix-comis-on-amd64.dpatch 211-fix-comis-on-ia64.dpatch 
	cernlib_2005.05.09.dfsg-3.diff 
Removed Files:
	211-fix-comis-on-64-bit-arches.dpatch 
	cernlib-rsrtnt64_goto_outer_block.diff 
	cernlib_2005.05.09.dfsg-2.diff 
Log Message:
- use new debian patchset




--- NEW FILE 115-rsrtnt64-goto-outer-block.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 115-rsrtnt64-goto-outer-block.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch from Patrice Dumas  to fix spaghetti code in
## DP: rsrtnt64.F that breaks linking step on Itanium.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/b/rsrtnt64.F cernlib-2005.05.09.dfsg/src/mathlib/gen/b/rsrtnt64.F
--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/b/rsrtnt64.F	1996-04-01 10:01:51.000000000 -0500
+++ cernlib-2005.05.09.dfsg/src/mathlib/gen/b/rsrtnt64.F	2005-12-06 11:22:08.500724891 -0500
@@ -117,8 +117,15 @@
         ENDIF
        ELSE
         IF(N .EQ. 1) THEN
-         ASSIGN 11 TO JMP1
-         GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    11    IF(K .EQ. 0) THEN
           H=H
          ELSEIF(K .EQ. 1) THEN
@@ -174,14 +181,28 @@
            H=2*((H1+B*U)/RT(U)-(H1+B*V)/RT(V))/DELTA
            LB1=11
           ELSEIF(K .EQ. 2) THEN
-           ASSIGN 12 TO JMP1
-           GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    12      H1=DELTA-B**2
            H2=2*A*B
            H=(((H1*U-H2)/RT(U)-(H1*V-H2)/RT(V))/DELTA+H)/C
           ELSEIF(K .EQ. 3) THEN
-           ASSIGN 13 TO JMP1
-           GO TO 10
+      C2=2*C
+      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
+       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
+     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
+      ELSEIF(DELTA .EQ. 0) THEN
+       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
+      ELSE
+       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
+      ENDIF
    13      H1=C*DELTA
            G1=A*C
            G2=3*B**2
@@ -217,8 +238,32 @@
         ENDIF
        ELSE
         IF(N .EQ. 1) THEN
-         ASSIGN 21 TO JMP2
-         GO TO 20
+      IF(C .EQ. 0) THEN
+       IF(B .EQ. 0) THEN
+        H=LOG(ABS(V/U))/SQRT(A)
+       ELSE
+        IF(A .LT. 0) THEN
+         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
+        ELSE
+         WA=SQRT(A)
+         WU=SQRT(A+B*U)
+         WV=SQRT(A+B*V)
+         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
+        ENDIF
+       ENDIF
+      ELSE
+       A2=2*A
+       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
+        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
+     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
+       ELSEIF(DELTA .EQ. 0) THEN
+        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
+        IF(U*V .GT. 0) H=SIGN(H,U)
+       ELSE
+        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
+        IF(U .LT. 0 .AND. V .LT. 0) H=-H
+       ENDIF
+      ENDIF
    21    IF(K .EQ. -1) THEN
           H=H
          ELSEIF(K .EQ. -2) THEN
@@ -257,8 +302,32 @@
            IF(U. LT. -X0) H=-H
           ENDIF
          ELSE
-          ASSIGN 22 TO JMP2
-          GO TO 20
+      IF(C .EQ. 0) THEN
+       IF(B .EQ. 0) THEN
+        H=LOG(ABS(V/U))/SQRT(A)
+       ELSE
+        IF(A .LT. 0) THEN
+         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
+        ELSE
+         WA=SQRT(A)
+         WU=SQRT(A+B*U)
+         WV=SQRT(A+B*V)
+         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
+        ENDIF
+       ENDIF
+      ELSE
+       A2=2*A
+       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
+        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
+     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
+       ELSEIF(DELTA .EQ. 0) THEN
+        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
+        IF(U*V .GT. 0) H=SIGN(H,U)
+       ELSE
+        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
+        IF(U .LT. 0 .AND. V .LT. 0) H=-H
+       ENDIF
+      ENDIF
    22     IF(K .EQ. -1) THEN
            H1=B*C
            H2=B**2-2*A*C
@@ -287,46 +356,7 @@
         ENDIF
        ENDIF
       ENDIF
-      GO TO 9
-
-   10 C2=2*C
-      IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. C .GT. 0) THEN
-       H=LOG(ABS((2*SQRT(C*P(V))+C2*V+B)/
-     1           (2*SQRT(C*P(U))+C2*U+B)))/SQRT(C)
-      ELSEIF(DELTA .EQ. 0) THEN
-       H=ABS(LOG(ABS((C2*V+B)/(C2*U+B))))/SQRT(C)
-      ELSE
-       H=(ASIN((C2*U+B)/RTD)-ASIN((C2*V+B)/RTD))/SQRT(-C)
-      ENDIF
-      GO TO JMP1, (11,12,13)
 
-   20 IF(C .EQ. 0) THEN
-       IF(B .EQ. 0) THEN
-        H=LOG(ABS(V/U))/SQRT(A)
-       ELSE
-        IF(A .LT. 0) THEN
-         H=2*(ATAN(SQRT(-(A+B*V)/A))-ATAN(SQRT(-(A+B*U)/A)))/SQRT(-A)
-        ELSE
-         WA=SQRT(A)
-         WU=SQRT(A+B*U)
-         WV=SQRT(A+B*V)
-         H=LOG(ABS((WV-WA)*(WU+WA)/((WV+WA)*(WU-WA))))/WA
-        ENDIF
-       ENDIF
-      ELSE
-       A2=2*A
-       IF(DELTA .GT. 0 .OR. DELTA .LT. 0 .AND. A .GT. 0) THEN
-        H=LOG(ABS((-2*SQRT(A*P(V))+B*V+A2)*U/
-     1           ((-2*SQRT(A*P(U))+B*U+A2)*V)))/SQRT(A)
-       ELSEIF(DELTA .EQ. 0) THEN
-        H=LOG(ABS((B*U+A2)*V/((B*V+A2)*U)))/SQRT(A)
-        IF(U*V .GT. 0) H=SIGN(H,U)
-       ELSE
-        H=(ASIN((B*V+A2)/(V*RTD))-ASIN((B*U+A2)/(U*RTD)))/SQRT(-A)
-        IF(U .LT. 0 .AND. V .LT. 0) H=-H
-       ENDIF
-      ENDIF
-      GO TO JMP2, (21,22)
 
     9 RES=SIGN(R1,V1-U1)*H
       LRL=LLL


--- NEW FILE 116-fix-fconc64-spaghetti-code.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 116-fix-fconc64-spaghetti-code.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Work around FTBFS on ia64 with recent binutils, apparently caused
## DP: by assignment of goto labels in this file.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/c/fconc64.F cernlib-2005.05.09.dfsg/src/mathlib/gen/c/fconc64.F
--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/c/fconc64.F	1996-04-01 10:02:04.000000000 -0500
+++ cernlib-2005.05.09.dfsg/src/mathlib/gen/c/fconc64.F	2005-12-12 12:58:23.885981128 -0500
@@ -190,15 +190,167 @@
       A=HF*((HF-FM)-TI)
       B=HF*((HF-FM)+TI)
       C=HF
-      ASSIGN 1 TO JP
-      GO TO 20
+   20 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 21 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 1
+       DO 22 J = 1,3
+       V(J-1)=V(J)
+   22  U(J-1)=U(J)
+   21  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 23 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 1
+   23  CONTINUE
+      END IF
+      GO TO 24
     1 R1=R
       R1=R1/ABS(CGM(A+HF))**2
       A=HF*((TH-FM)-TI)
       B=HF*((TH-FM)+TI)
       C=TH
-      ASSIGN 2 TO JP
-      GO TO 20
+  120 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 121 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 2
+       DO 122 J = 1,3
+       V(J-1)=V(J)
+  122  U(J-1)=U(J)
+  121  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 123 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 2
+  123  CONTINUE
+      END IF
+      GO TO 24
     2 R2=R
       FC=RPI*(R1-2*X*R2/ABS(CGM(A-HF))**2)
       IF(LM1) FC=2*FC/SQRT(1-X1)
@@ -209,8 +361,84 @@
       A=(HF+FM)-TI
       B=(HF+FM)+TI
       C=FM+1
-      ASSIGN 3 TO JP
-      GO TO 20
+  220 IF(LTA) THEN
+       Y=-X1
+       Y2=Y**2
+       Y3=Y*Y2
+       W(1)=A+1
+       W(2)=A+2
+       W(3)=B+1
+       W(4)=B+2
+       W(5)=C+1
+       W(6)=C*W(5)
+       W(7)=A+B
+       W(8)=A*B
+       W(9)=(W(8)/C)*Y
+       W(10)=W(1)*W(3)
+       W(11)=W(2)*W(4)
+       W(12)=1+(W(11)/(W(5)+W(5)))*Y
+       W(13)=W(7)-6
+       W(14)=W(7)+6
+       W(15)=2-W(8)
+       W(16)=W(15)-W(7)-W(7)
+
+       V(0)=1
+       V(1)=1+(W(10)/(C+C))*Y
+       V(2)=W(12)+(W(10)*W(11)/(12*W(6)))*Y2
+       U(0)=1
+       U(1)=V(1)-W(9)
+       U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
+
+       R=1
+       DO 221 N = 3,NMAX
+       FN=N
+       RR=R
+       H(1)=FN-1
+       H(2)=FN-2
+       H(3)=FN-3
+       H(4)=FN+FN
+       H(5)=H(4)-3
+       H(6)=H(5)+H(5)
+       H(7)=4*(H(4)-1)*H(5)
+       H(8)=8*H(5)**2*(H(4)-5)
+       H(9)=3*FN**2
+       W(1)=A+H(1)
+       W(2)=A+H(2)
+       W(3)=B+H(1)
+       W(4)=B+H(2)
+       W(5)=C+H(1)
+       W(6)=C+H(2)
+       W(7)=C+H(3)
+       W(8)=H(2)-A
+       W(9)=H(2)-B
+       W(10)=H(1)-C
+       W(11)=W(1)*W(3)
+       W(12)=W(5)*W(6)
+
+       W(17)=1+((H(9)+W(13)*FN+W(16))/(H(6)*W(5)))*Y
+       W(18)=-((W(11)*W(10)/H(6)+(H(9)-W(14)*FN+W(15))*W(11)*Y/H(7))/
+     1          W(12))*Y
+       W(19)=(W(2)*W(11)*W(4)*W(8)*W(9)/(H(8)*W(7)*W(12)))*Y3
+       V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
+       U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
+       R=U(3)/V(3)
+       IF(ABS(R-RR) .LT. EPS) GO TO 3
+       DO 222 J = 1,3
+       V(J-1)=V(J)
+  222  U(J-1)=U(J)
+  221  CONTINUE
+      ELSE
+       W(1)=X1*A*B/C
+       R=1+W(1)
+       DO 223 N = 1,NMAX
+       FN=N
+       RR=R
+       W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
+       R=R+W(1)
+       IF(ABS(R-RR) .LT. EPS) GO TO 3
+  223  CONTINUE
+      END IF
+      GO TO 24
     3 FC=R
       IF(LM1) FC=SIGN(HF,1-X)*(TAU**2+HF**2)*SQRT(ABS(X**2-1))*FC
       GO TO 99
@@ -220,15 +448,7 @@
       A=HF*((HF-FM)-TI)
       B=HF*((TH-FM)-TI)
       C=1-TI
-      ASSIGN 4 TO JP
-      GO TO 20
-    4 R1=EXP((TI-HF)*LOG(X+X)+CLG(1+TI)-CLG((TH-FM)+TI))*
-     1        R*((HF-FM)+TI)/TI
-      FC=RPW*R1
-      IF(LM1) FC=FC/SQRT(1-X1)
-      GO TO 99
-
-   20 IF(LTA) THEN
+  320 IF(LTA) THEN
        Y=-X1
        Y2=Y**2
        Y3=Y*Y2
@@ -257,7 +477,7 @@
        U(2)=V(2)-W(9)*W(12)+(W(8)*W(10)/(W(6)+W(6)))*Y2
 
        R=1
-       DO 21 N = 3,NMAX
+       DO 321 N = 3,NMAX
        FN=N
        RR=R
        H(1)=FN-1
@@ -289,23 +509,29 @@
        V(3)=W(17)*V(2)+W(18)*V(1)+W(19)*V(0)
        U(3)=W(17)*U(2)+W(18)*U(1)+W(19)*U(0)
        R=U(3)/V(3)
-       IF(ABS(R-RR) .LT. EPS) GO TO JP, (1,2,3,4)
-       DO 22 J = 1,3
+       IF(ABS(R-RR) .LT. EPS) GO TO 4
+       DO 322 J = 1,3
        V(J-1)=V(J)
-   22  U(J-1)=U(J)
-   21  CONTINUE
+  322  U(J-1)=U(J)
+  321  CONTINUE
       ELSE
        W(1)=X1*A*B/C
        R=1+W(1)
-       DO 23 N = 1,NMAX
+       DO 323 N = 1,NMAX
        FN=N
        RR=R
        W(1)=W(1)*X1*(A+FN)*(B+FN)/((C+FN)*(FN+1))
        R=R+W(1)
-       IF(ABS(R-RR) .LT. EPS) GO TO JP, (1,2,3,4)
-   23  CONTINUE
+       IF(ABS(R-RR) .LT. EPS) GO TO 4
+  323  CONTINUE
       END IF
-      FC=0
+      GO TO 24
+    4 R1=EXP((TI-HF)*LOG(X+X)+CLG(1+TI)-CLG((TH-FM)+TI))*
+     1        R*((HF-FM)+TI)/TI
+      FC=RPW*R1
+      IF(LM1) FC=FC/SQRT(1-X1)
+      GO TO 99
+   24 FC=0
       WRITE(ERRTXT,102) X
       CALL MTLPRT(NAME,'C331.2',ERRTXT)
 #if defined(CERNLIB_DOUBLE)


--- NEW FILE 117-fix-optimizer-bug-in-gphot.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 117-fix-optimizer-bug-in-gphot.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch by Harald Vogt  to work around compiler
## DP: optimization problems in src/geant321/gphys/gphot.F.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gphys/gphot.F cernlib-2005.05.09.dfsg/src/geant321/gphys/gphot.F
--- cernlib-2005.05.09.dfsg~/src/geant321/gphys/gphot.F	1995-10-24 06:21:29.000000000 -0400
+++ cernlib-2005.05.09.dfsg/src/geant321/gphys/gphot.F	2005-12-07 15:01:52.558184613 -0500
@@ -240,7 +240,7 @@
                   ELSE
 C Radiative shell decay
                      JS = JFN+1+2*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 40 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN
@@ -296,7 +296,7 @@
                   ELSE
 c Nonradiative decay
                      JS = JFN+1+3*NSHELL+ISHELL
-                     JS = JPHFN+Q(JS)
+                     JS = JPHFN + INT (Q(JS))    ! compiler optimiztion problem H. Vogt 2004/04/29
                      NPOINT = Q(JS)
                      DO 60 I = 1,NPOINT
                         IF(RN05.LT.Q(JS+I)) THEN


--- NEW FILE 211-fix-comis-on-amd64.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-amd64.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Large patch from Harald Vogt  to make PAW and Paw++ work
## DP: (at least when statically linked) on 64-bit architectures.
## DP: Slightly modified in an attempt to keep ABI compatibility of the
## DP: dynamic libraries; not that it matters much as they don't work well
## DP: when dynamically linked on 64-bit anyway.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/hbook.h cernlib-2005.05.09.dfsg/src/cfortran/hbook.h
--- cernlib-2005.05.09.dfsg~/src/cfortran/hbook.h	1999-11-15 17:01:12.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/cfortran/hbook.h	2005-12-09 13:27:45.465589336 +0000
@@ -489,6 +489,10 @@
 #define HBALLOC(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
         CCALLSFSUB11(HBALLOC,hballoc,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PINT,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
 
+PROTOCCALLSFSUB11(HBALLOC64,hballoc64,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PLONG,PINT)
+#define HBALLOC64(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
+        CCALLSFSUB11(HBALLOC64,hballoc64,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PLONG,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
+
 PROTOCCALLSFSUB1(HBFREE,hbfree,INT)
 #define HBFREE(LUN) CCALLSFSUB1(HBFREE,hbfree,INT,LUN)
 
@@ -508,6 +512,13 @@
 #define HGNTBF(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)\
         CCALLSFSUB6(HGNTBF,hgntbf,INT,ZTRINGV,INTV,INT,INT,PINT,IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
 
+PROTOCCALLSFSUB6(HGNTBF64,hgntbf64,INT,ZTRINGV,LONGV,INT,INT,PINT)
+/* fix the element length of VAR to 32 */
+#define hgntbf64_ELEMS_2          ZTRINGV_ARGS(4)
+#define hgntbf64_ELEMLEN_2        ZTRINGV_NUM(32)
+#define HGNTBF64(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)\
+        CCALLSFSUB6(HGNTBF64,hgntbf64,INT,ZTRINGV,LONGV,INT,INT,PINT,IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
+
 PROTOCCALLSFSUB1(HGTDIR,hgtdir,PSTRING)
 #define HGTDIR(CHDIR) CCALLSFSUB1(HGTDIR,hgtdir,PSTRING,CHDIR)
 
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/cspack/hcntpar.inc cernlib-2005.05.09.dfsg/src/packlib/cspack/cspack/hcntpar.inc
--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/cspack/hcntpar.inc	1996-03-08 15:44:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/cspack/cspack/hcntpar.inc	2005-12-09 13:27:45.465589336 +0000
@@ -22,7 +22,7 @@
      +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
      +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
      +          ZARIND=11, ZIBLOK=8,  ZNBLOK=10, ZIBANK=9,  ZIFTMP=11,
-     +          ZITMP=10,  ZNTMP=5,   ZNTMP1=3,  ZLINK=6)
+     +          ZITMP=10,  ZNTMP=5,   ZNTMP1=4,  ZLINK=6)
 *
 
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hbook/hcntpar.inc cernlib-2005.05.09.dfsg/src/packlib/hbook/hbook/hcntpar.inc
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hbook/hcntpar.inc	1996-01-16 17:07:52.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hbook/hcntpar.inc	2005-12-09 13:27:46.373451320 +0000
@@ -24,7 +24,7 @@
      +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
      +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
      +          ZARIND=11, ZIBLOK=8,  ZNBLOK=10, ZIBANK=9,  ZIFTMP=11,
-     +          ZID=12,    ZITMP=10,  ZNTMP=6,   ZNTMP1=3,  ZLINK=6)
+     +          ZID=12,    ZITMP=10,  ZNTMP=6,   ZNTMP1=4,  ZLINK=6)
 *
 
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hballoc.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hballoc.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hballoc.F	1996-01-16 17:07:56.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hballoc.F	2005-12-09 13:27:46.617414232 +0000
@@ -42,3 +42,26 @@
       ENDIF
 *
       END
+*
+*     64-bit version (separate to preserve ABI compatibility)
+      SUBROUTINE HBALLOC64(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,
+     +                     IBASE,IOFF,NUSE)
+*
+      CHARACTER*(*)  CHDIR, VAR, BLOCK
+      INTEGER        IDN, ITYPE, ISIZE, NELEM, NUSE, IFIRST, IBASE(1)
+      INTEGER*8      IBUF(1), IOFF
+*
+      LC = LENOCC(CHDIR)
+      LV = LENOCC(VAR)
+      LB = LENOCC(BLOCK)
+*
+      CALL HBALLO1(IDN, CHDIR, LC, VAR, LV, BLOCK, LB, ITYPE, ISIZE,
+     +             IFIRST, NELEM, IBUF, NUSE)
+*
+      IF (NUSE .EQ. 0) THEN
+         IOFF = 0
+      ELSE
+         IOFF = IBUF(1) - %LOC(IBASE(1))/4
+      ENDIF
+*
+      END
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hbnt.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hbnt.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hbnt.F	1996-01-16 17:07:56.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hbnt.F	2005-12-09 13:27:46.644410128 +0000
@@ -269,11 +269,13 @@
  ************************************************************************
  *      *         *                                                     *
  *   1  *         *     Number of variables to be read out              *
- *      *         *     *** For every variable 3 words (ZNTMP1) ***     *
+ *      *         *     *** For every variable 4 words (ZNTMP1) ***     *
  *   2  *         *     Index of variable in LNAME bank                 *
  *   3  *         *     Offset of variable in LNAME bank (INDX-1)*ZNADDR*
  *   4  *         *     Offset in dynamically allocated buffer (only    *
  *      *         *     used via HGNTBF) otherwise 0                    *
+ *   5  *         *     spare (used in 64 bit architectures for upper   *
+ *      *         *     address part)                                   *
  ************************************************************************
 #endif
 *
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgnt2.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgnt2.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgnt2.F	1999-03-05 15:42:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgnt2.F	2005-12-09 13:27:46.644410128 +0000
@@ -34,7 +34,13 @@
 #include "hbook/hcrecv.inc"
 *
       CHARACTER*(*) VAR1(*)
+#if defined(CERNLIB_QMLXIA64)
+      INTEGER*8     IVOFF(*), IOFFST, IOFFSTT
+      INTEGER       IOFFSTV(2)
+      EQUIVALENCE   (IOFFSTV, IOFFSTT)
+#else
       INTEGER       IVOFF(*)
+#endif
       CHARACTER*32  VAR
       INTEGER       ILOGIC, HNMPTR
       LOGICAL       LOGIC, INDVAR, ALLVAR, USEBUF, CHKOFF
@@ -452,10 +458,15 @@
          IQ(LTMP1+JTMP+1)      = IOFF
          IF (USEBUF) THEN
             IF (IEDIF .EQ. 0) THEN
-               IQ(LTMP1+JTMP+2) = IOFFST
+               IOFFSTT = IOFFST
             ELSE
-               IQ(LTMP1+JTMP+2) = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
+               IOFFSTT = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
             ENDIF
+            IQ(LTMP1+JTMP+2) = IOFFSTT
+#if defined(CERNLIB_QMLXIA64)
+*           store upper part of 64 bit address
+            IQ(LTMP1+JTMP+3) = IOFFSTV(2)
+#endif
          ELSE
             IQ(LTMP1+JTMP+2)   = 0
          ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntbf.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntbf.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntbf.F	1996-01-16 17:07:57.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntbf.F	2005-12-09 13:27:46.645409976 +0000
@@ -26,3 +26,13 @@
       CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
 *
       END
+*
+*     64-bit version (separate to preserve ABI compatibility)
+      SUBROUTINE HGNTBF64(IDN,VAR,IOFFST,NVAR,IDNEVT,IERROR)
+      CHARACTER*(*) VAR(*)
+      INTEGER*8     IOFFST(*)
+*
+      NVAR1 = -NVAR
+      CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
+*
+      END
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntf.F cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntf.F
--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/hntup/hgntf.F	1999-03-05 15:42:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/hbook/hntup/hgntf.F	2005-12-09 13:27:46.645409976 +0000
@@ -37,6 +37,13 @@
       INTEGER       ILOGIC
       LOGICAL       LOGIC, INDVAR, USEBUF
       EQUIVALENCE  (LOGIC, ILOGIC)
+
+#if defined(CERNLIB_QMLXIA64)
+      INTEGER*8     IOFFST, IOFFSTT
+      INTEGER       IOFFSTV(2)
+      EQUIVALENCE   (IOFFSTV, IOFFSTT)
+#endif
+
 *
 #include "hbook/jbyt.inc"
 *
@@ -76,6 +83,12 @@
          INDX   = IQ(LTMP1+JTMP)
          IOFF   = IQ(LTMP1+JTMP+1)
          IOFFST = IQ(LTMP1+JTMP+2)
+#if defined(CERNLIB_QMLXIA64)
+*        fetch full 64 bit address
+         IOFFSTV(1) = IQ(LTMP1+JTMP+2)
+         IOFFSTV(2) = IQ(LTMP1+JTMP+3)
+         IOFFST     = IOFFSTT
+#endif
          IF (IOFFST .EQ. 0) THEN
             USEBUF = .FALSE.
          ELSE
@@ -442,10 +455,15 @@
 *
          IF (USEBUF) THEN
             IF (IEDIF .EQ. 0) THEN
-               IQ(LTMP1+JTMP+2) = IOFFST
+               IOFFSTT = IOFFST
             ELSE
-               IQ(LTMP1+JTMP+2) = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
+               IOFFSTT = IOFFST + (IEDIF*ISHFT(ISIZE,-2))
             ENDIF
+            IQ(LTMP1+JTMP+2) = IOFFSTT
+#if defined(CERNLIB_QMLXIA64)
+*           store upper part of 64 bit address
+            IQ(LTMP1+JTMP+3) = IOFFSTV(2)
+#endif
          ELSE
             IQ(LTMP1+JTMP+2) = 0
          ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c
--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c	1997-09-02 14:26:37.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c	2005-12-09 13:27:46.645409976 +0000
@@ -44,7 +44,25 @@
    DummyDef
 #endif
 {
+#if defined(CERNLIB_QMLXIA64)
+   const unsigned long long int mask=0x00000000ffffffff;
+   static unsigned long long int base=1;
+   unsigned long long int jadr=(unsigned long long int) iadr;
+   unsigned long long int jadrl = (mask & jadr);
+
+   if (base == 1) {
+     base = (~mask & jadr);
+   } else if(base != (~mask & jadr)) {
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+     printf("locb_() Warning: changing base from %lx to %lx!!!\n",
+     	   base, (~mask & jadr));
+     printf("This may result in program crash or incorrect results\n");
+     printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+   }
+   return ((int) jadrl);
+#else
    return( (int) iadr );
+#endif
 }
 /*> END <----------------------------------------------------------*/
 #ifdef CERNLIB_TCGEN_LOCB
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/zbook/code/zjump.c cernlib-2005.05.09.dfsg/src/packlib/zbook/code/zjump.c
--- cernlib-2005.05.09.dfsg~/src/packlib/zbook/code/zjump.c	1996-03-08 12:01:12.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/zbook/code/zjump.c	2005-12-09 13:27:46.971360424 +0000
@@ -7,6 +7,9 @@
  *
  */
 #include "zbook/pilot_c.h"
+#if defined(CERNLIB_QMLXIA64)
+static void (*target)();
+#endif
 #if defined(CERNLIB_UNIX)
 #if defined(CERNLIB_QX_SC)
 zjump_(name,p1,p2,p3,p4)
@@ -18,8 +21,23 @@
 ZJUMP(name,p1,p2,p3,p4)
 #endif
 char *p1, *p2, *p3, *p4;
+
+/*  LP64 compatibility:
+    name is taken from a Fortran array and therefore its address is 32 bit
+    which has to be converted to a 64 bit address to satisfy void (*) (H. Vogt) */
+
+#if defined(CERNLIB_QMLXIA64)
+int *name;
+{
+  long jadr;
+  jadr   = *name;  /* convert int to long */
+  target = (void (*)())jadr;
+  (*target)(p1, p2, p3, p4);
+}
+#else
 void (**name)();
 {
    (**name)(p1, p2, p3, p4);
 }
 #endif
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.05.09.dfsg/src/packlib/zebra/test/brztest/btest2.F
--- cernlib-2005.05.09.dfsg~/src/packlib/zebra/test/brztest/btest2.F	1997-09-02 15:16:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/packlib/zebra/test/brztest/btest2.F	2005-12-09 13:27:46.971360424 +0000
@@ -29,6 +29,15 @@
 ********************************************************************************
 *
       COMMON/CRZT/IXSTOR,IXDIV,IFENCE(2),LEV,LEVIN,BLVECT(30000)
+
+*     LP64 compatibility:
+*     For 64-bit pointer systems put local variables referenced by LOCF
+*     in a dummy named common block to keep addresses in the program region.
+*     see also: packlib/ffread/test/main.F (H. Vogt)
+
+#if defined(CERNLIB_QMLXIA64)
+      COMMON /TEST64/LBANK
+#endif
       DIMENSION LQ(999),IQ(999),Q(999)
       EQUIVALENCE (IQ(1),Q(1),LQ(9)),(LQ(1),LEV)
 C
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile	2005-12-09 13:27:38.969576880 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile	2005-12-09 13:27:46.971360424 +0000
@@ -50,6 +50,10 @@
 SRCS_F := $(SRCS_F) cscrexec.F
 #endif
 
+#if defined(CERNLIB_QMLXIA64)
+SRCS_F := $(SRCS_F) csrtgpl.F csitgpl.F
+#endif
+
 #if defined(CERNLIB_OLD)
 SRCS_F := $(SRCS_F) cspdir.F csrmbk.F
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F	1996-02-26 17:16:25.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F	2005-12-09 13:27:46.972360272 +0000
@@ -17,8 +17,14 @@
       INTEGER CSLTGP,CSITGP
       CHARACTER*32 NAME
 #include "comis/cstab.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       INTEGER CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      INTEGER*8 CS_GET_FUNC
+#endif
+#if defined(CERNLIB_SHL)
       NAME=CHNAME
       NC=LENOCC(NAME)
       CALL CSCHID(NAME(:NC))
@@ -26,21 +32,39 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
+#endif
+#endif
+#if defined(CERNLIB_SHL)
           ELSE
             I=0
           ENDIF
         ENDIF
       ELSE
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(NAME(1:NC)//'_')
+        IF(IADGPL.NE.0)THEN
+          IFCS=-2
+          ITYPGP=-2
+          I=CSITGPL(IPVS)
+        ENDIF
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
           I=CSITGP(IPVS)
         ENDIF
+#endif
       END IF
       CSADDR=I
 #endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csinit.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csinit.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csinit.F	2005-04-18 15:41:04.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csinit.F	2005-12-09 13:27:46.972360272 +0000
@@ -64,6 +64,9 @@
 #if defined(CERNLIB_SHL)
 #include "comis/cshlnm.inc"
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+#endif
 #if defined(CERNLIB_PAW)
 #include "paw/pcmode.inc"
 #include "comis/cshfill.inc"
@@ -159,6 +162,9 @@
       ICHMINU=ICHAR('-')
       ICHPLUS=ICHAR('+')
       ICHCOMM=ICHAR(',')
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+      IPIADGV=0
+#endif
 #if defined(CERNLIB_PAW)
       CALL CSPAWI
       MODHFI=0
@@ -211,8 +217,8 @@
 #endif
 #if (defined(CERNLIB_LINUX))
       ITMPLEN=CSTMPD(CHPATH, 256)
-      CHF77 ='g77 -c'
-      CHCC  ='cc -c'
+      CHF77 ='g77 -c -fPIC'
+      CHCC  ='cc -c -fPIC'
 #endif
 #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
       ITMPLEN=CSTMPD(CHPATH, 256)
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csintx.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csintx.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csintx.F	1996-12-05 09:50:37.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csintx.F	2005-12-09 13:27:46.973360120 +0000
@@ -38,6 +38,9 @@
 #if defined(CERNLIB_PAW)
 #include "comis/cskucs.inc"
 #endif
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_ALPHA_OSF))
       INTEGER CSTRCMP
 #endif
@@ -1105,6 +1108,32 @@
       ENDIF
 #endif
 #if (!defined(CERNLIB_VAX))&&(!defined(CERNLIB_APOLLO))
+#if defined(CERNLIB_QMLXIA64)
+      IF(IQ(IP+KSIFCS).EQ.-2)THEN
+*Dynamic linker may give long addresses
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ELSEIF(ITP.EQ.7)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IDA(IOFSPL))
+        ENDIF
+      ENDIF
+#else
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NPAR,IDA(IOFSPL))
       ELSEIF(ITP.EQ.2)THEN
@@ -1115,6 +1144,7 @@
         DCSRES=CSCALD(IADGP,NPAR,IDA(IOFSPL))
       ENDIF
 #endif
+#endif
       IPC=IPC+4
       GO TO 999
 *NUM I
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csitgpl.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csitgpl.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csitgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csitgpl.F	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,32 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZU:  1.16/16 04/10/93  12.14.52  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+      INTEGER FUNCTION CSITGPL(IP)
+***------------------------------
+*   it is last routine from the tables-set.
+***-----------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cspnts.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab64.inc"
+      I=MHLOC(KSIDP+NWIDEN)
+      IQ(I)=0
+      IQ(I+1)=NCIDEN
+      DO 1 K=1,NWIDEN
+        IQ(I+KSIDP-1+K)=IDEN(K)
+   1  CONTINUE
+      CALL CSRTGPL(I)
+      IF(IP.EQ.0)THEN
+        IPGP=I
+      ELSE
+        IQ(IP)=I
+      ENDIF
+      CSITGP=I
+      END
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cskcal.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cskcal.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cskcal.F	1996-12-05 09:50:39.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cskcal.F	2005-12-09 13:27:46.973360120 +0000
@@ -31,6 +31,9 @@
 #include "comis/cstab.inc"
 #include "comis/csfres.inc"
 #include "comis/cssysd.inc"
+#if defined(CERNLIB_QMLXIA64)
+#include "comis/cstab64.inc"
+#endif
       CHARACTER PRONAME*32
       INTEGER CSCALI
       DOUBLE PRECISION CSCALD
@@ -232,6 +235,34 @@
         I2=I2+KS
         I=I+1
  9203 CONTINUE
+#if defined(CERNLIB_QMLXIA64)
+*  Dynamic linker may give long addresses
+      IF (IFCS.EQ.-2)THEN
+        IADGPL = IADGPLV(IADGP)
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ELSE
+        IADGPL = IADGP
+        IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
+          ICSRES=CSCALI(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.2)THEN
+          RCSRES=CSCALR(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.5)THEN
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ELSEIF(ITP.EQ.7)THEN
+*  I think it will works correctly
+          DCSRES=CSCALD(IADGPL,NPAR,IF77PL(1))
+        ENDIF
+      ENDIF
+#else
 *      IT=IABS(ITYPGP)
       IF(ITP.EQ.1.OR.ITP.EQ.4.OR.ITP.EQ.6)THEN
         ICSRES=CSCALI(IADGP,NOPAR,IF77PL(1))
@@ -245,6 +276,7 @@
       ENDIF
 *+SELF,IF=UNIX,IF=-SGI,IF=-IBMRT,IF=-DECS,IF=-HPUX,IF=-SUN,IF=-MSDOS.
 #endif
+#endif
 #if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_STDUNIX))
       I=1
       DO 9203 K=ITA-NPAR+1,ITA
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cslink.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cslink.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cslink.F	1996-02-26 17:16:17.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cslink.F	2005-12-09 13:27:46.973360120 +0000
@@ -21,10 +21,15 @@
 #include "comis/cstab.inc"
 #include "comis/cspnts.inc"
 #include "comis/cslun.inc"
-#if defined(CERNLIB_SHL)
+#if defined(CERNLIB_SHL)&&(!defined(CERNLIB_QMLXIA64))
       CHARACTER*(KLENID) FNNAME
       INTEGER CS_GET_FUNC
 #endif
+#if defined(CERNLIB_SHL)&&(defined(CERNLIB_QMLXIA64))
+#include "comis/cstab64.inc"
+      CHARACTER*(KLENID) FNNAME
+      INTEGER*8 CS_GET_FUNC
+#endif
          COMMON/CSGSCM/IGS,JGS,NGS,CSJUNK(3)
       IF(ISTLIB.EQ.0 .AND. ITBS.EQ.0)RETURN
    2  I=IPGP
@@ -60,12 +65,20 @@
 #if defined(CERNLIB_SHL)
           CALL CSGTIDP(I,FNNAME,NC)
           CALL CUTOL(FNNAME(1:NC))
+#if defined (CERNLIB_QMLXIA64)
+          IADGPL=CS_GET_FUNC(FNNAME(1:NC)//'_')
+          IF(IADGPL.NE.0)THEN
+            IFCS=-2
+            CALL CSRTGPL(I)
+          ENDIF
+#else
           IADGP=CS_GET_FUNC(FNNAME(1:NC)//'_')
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
           ENDIF
 #endif
+#endif
           IP=0
         ENDIF
       ENDIF
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csrtgpl.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csrtgpl.F
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csrtgpl.F	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csrtgpl.F	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,31 @@
+* Comis
+*
+*
+#if (defined(CERNLIB_QMLXIA64))
+#include "comis/pilot.h"
+*CMZ :  1.18/14 10/01/95  15.41.06  by  Vladimir Berezhnoi
+*-- Author : V.Berezhnoi
+* special for 64 bit addresses for dynamic linking (H. Vogt)
+
+      SUBROUTINE CSRTGPL(I)
+***--------------------------
+#include "comis/cspar.inc"
+#include "comis/mdpool.inc"
+#include "comis/cstabps.inc"
+#include "comis/cstab.inc"
+#include "comis/cstab64.inc"
+
+      IPIADGV = IPIADGV + 1
+      IF (IPIADGV .GT. MAXIAD64)  THEN
+        WRITE (*,'(2a,I4)') 'to much addresses for dynamik linking, ',
+     &                      'limit is ', MAXIAD64
+        WRITE (*,'(2a)') 'increase MAXIAD64 in cstab64.inc and ',
+     &                    'recompile COMIS'
+
+        STOP
+      END IF
+      IADGPLV(IPIADGV) = IADGPL
+      IADGP            = IPIADGV
+      CALL CCOPYA(IADGP,IQ(I+2),KSIDP-2)
+      END
+#endif
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/comis/cstab64.inc cernlib-2005.05.09.dfsg/src/pawlib/comis/comis/cstab64.inc
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/comis/cstab64.inc	1970-01-01 00:00:00.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/comis/cstab64.inc	2005-12-09 13:27:46.973360120 +0000
@@ -0,0 +1,10 @@
+*
+*
+* cstab64.inc
+*
+      PARAMETER (MAXIAD64=100) !maximum number of shared objects
+      INTEGER*8 IADGPL,IADGPLV(MAXIAD64)
+      INTEGER   IADGPL1, IADGPL2
+      COMMON /CSTB64/ IADGPL,IADGPLV
+      COMMON /CSTB64I/ IPIADGV
+      EQUIVALENCE (IADGPL, IADGPL1)
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c	1997-09-02 15:50:38.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c	2005-12-09 13:27:46.974359968 +0000
@@ -33,11 +33,25 @@
 #else
 void ccopys_(ja,jb,nn)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *nn;
+{
+  int i,n; char *a,*b;
+  n=*nn; a=*ja; b=*jb;
+#else
      char **ja, **jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+#endif
   if ( a >= b )
      for ( i=0; inext = f->first_proc;
          f->first_proc = p;
+         if (debug_level > 0) printf("function pointer is: %p\n", p->funcptr);
          return (void *)(p->funcptr);
       }
      f = f->next;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c	2004-10-27 09:01:54.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c	2005-12-09 13:27:46.974359968 +0000
@@ -32,8 +32,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 double cscald_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -46,10 +45,41 @@
     int CSCALD (name,n,p)
 #  endif
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscald_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+double cscald_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[16];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = *fptr + (unsigned long)jumpad_;
+   /* if ( *fptr > 0 ) ptr = 0; */
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  double (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
+#endif
    double d;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c	2004-10-22 12:42:40.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c	2005-12-09 13:27:46.974359968 +0000
@@ -29,8 +29,7 @@
 #ifdef CERNLIB_WINNT
 # include 
 #endif
-
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 int cscali_ (name,n,p)
 #endif
 #if defined(CERNLIB_QXNO_SC)
@@ -39,10 +38,41 @@
 #if defined(CERNLIB_QXCAPT)
 int type_of_call CSCALI (name,n,p)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscali_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+int cscali_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ unsigned pin[16];
+{
+   int jumpad_();
+   int (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   /* if ( *fptr > 0 ) ptr = 0; */
+   ptr += *fptr;
+   name = (int (*)())ptr;
+/*    printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+#else
  int (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
+#endif
    int i;
    switch (*n)
    {
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c	2004-10-22 12:03:16.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c	2005-12-09 13:27:46.974359968 +0000
@@ -35,7 +35,7 @@
 #endif
 
 
-#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))
+#if (defined(CERNLIB_QX_SC))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_QMLXIA64))
 float cscalr_ (name,n,p)
 #endif
 
@@ -51,11 +51,51 @@
 # endif
 #endif
 
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below 
+ * using the CERNLIB_QMLXIA64 macro definition (H. Vogt - Sep 2005)
+ * This code will be consistent with that of jumptn.c and jumpxn.c
+ * in packlib/kernlib/kerngen/ccgen (usage of jumpad_)
+ *
+ * for shared objects loaded by the dynamic linker content of the 1st arg
+ * in cscalr_ is a pointer which may be above the 32 bit address space
+ * therefore *fptr has been changed to type long
+ * see changes in csintx.F, cskcal.F, ... (introduction of INTEGER*8 array for
+ * those pointers)
+ */
+
+/* Additional note: g77 generates code such that it expects REAL functions
+ * to return "double".  Hence C functions to be used in FORTRAN as REAL
+ * must return "double", and declarations of REAL FORTRAN functions in C files
+ * must also return "double".  On most architectures one can get away with
+ * using "float" instead, but not on amd64 ... see
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15397
+ * 
+ * -- Kevin McCarty
+ */
+	
+#if defined(CERNLIB_QMLXIA64)
+double cscalr_ (fptr,n,pin)
+ long *fptr;
+ int *n;
+ int pin[16];
+{
+   int jumpad_();
+   double (*name)();
+   unsigned long ptr = (unsigned long)jumpad_;
+   ptr += *fptr;
+   name = (double (*)())ptr;
+/*    printf ("cscalr - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
+   long p[16];
+   int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+   double r;
+#else
  float (type_of_call *(*name)) ();
  int *n;
- int *p[15];
+ int *p[16];
 {
    float r;
+#endif
    switch (*n)
    {
       case 0:
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c	1997-09-02 15:50:44.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 13:27:46.975359816 +0000
@@ -36,6 +36,27 @@
 #else
 int cstrcmp_(ja,na,jb,nb)
 #endif
+
+/*
+ * 64-bit pointer systems require a special treatment of addresses - see below -
+ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
+ */
+
+#if defined(CERNLIB_QMLXIA64)
+     int *ja, *jb;
+     int *na, *nb;
+{
+
+  int i,la,lb,k; char *a,*b;
+  if ( *na >= *nb )
+     {
+      a=*ja; b=*jb; la=*na; lb=*nb; k=1;
+      }
+  else
+    {
+      a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
+     }
+#else
      char **ja, **jb;
      int *na, *nb;
 {
@@ -48,6 +69,7 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+#endif
   for ( i=0; i b[i]) ? k : -k ); }
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/c_hcntpar.h cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/c_hcntpar.h
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/c_hcntpar.h	1996-04-23 18:37:45.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/c_hcntpar.h	2005-12-09 13:27:46.975359816 +0000
@@ -47,7 +47,7 @@
 #define ZID	12
 #define ZITMP	10
 #define ZNTMP	6
-#define ZNTMP1	3
+#define ZNTMP1	4
 #define ZLINK	6
 
 #endif	/*	CERN_C_HCNTPAR	*/
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_execute.c cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_execute.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_execute.c	2001-09-18 13:41:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_execute.c	2005-12-09 13:31:01.495788216 +0000
@@ -184,12 +184,19 @@
 					/* all definitions for the stack */
 #undef INIT_STACK_TO_NULL		/* are kept together in this file */
 
+#if defined(CERNLIB_QMLXIA64)
+# undef HBALLOC
+# undef HGNTBF
+# define HBALLOC HBALLOC64
+# define HGNTBF HGNTBF64
+#endif
+
 /* extern functions */
 extern void qp_exec_evt( QueryExe *, long, long, QPCmd *, int *);
 
 typedef		char	tName[MAX_NAME_LEN+1];
 tName		*namelist;
-int		*offsetlist;
+long		*offsetlist;
 int		*indexlist;
 
 
@@ -245,7 +252,23 @@
 	char		ntname[MAX_NAME_LEN+6];
 	int		i, ierr, indx, itype, isize, ielem;
 	Int32 *		addr;
-	int		ibase[1], ioff, nuse;
+
+	/* LP64 compatibility:
+	   - use static for ibase (at least) because its address is stored
+	     as Int32 in structure CWNBlock
+	     static takes ibase from the stack and puts it the code area.
+	   - use type long for ioff and offsetlist[i]
+	     (for 32 bit architectures type long is 4 Bytes as it is used
+	      also in packlib/hbook/chbook/halloc.c in hballo1 !)
+	   The x86-64 ABI has the code area in the 32 bit address space
+	   but addresses to the stack and to dynamically allocated areas
+	   may and will be above the 32 bit address space (below 0x80000000000).
+	   See also: http://www.x86-64.org/documentation/abi-0.96.pdf
+	   (H. Vogt, Oct. 2005) */
+
+	static int	ibase[1];
+	long		ioff;
+	int		nuse;
 	int		id = qe->id;
 	char *		path = qe->path;
 	char *		title;
@@ -286,7 +309,11 @@
 	CWNBlock = (RefCWN *) calloc( CWNCount + 1, sizeof( RefCWN ) );
 	qp_assert( MAX_NAME_LEN == 32 ); /* see hbook.h (HGNTBF) */
 	namelist = (tName *) calloc( CWNCount + 1, sizeof(tName) );
-	offsetlist = (int *) calloc( CWNCount + 1, sizeof(int) );
+
+	/* offsetlist should be of type long (see above) (H. Vogt, Oct. 2005) */
+
+	offsetlist = (long *) calloc( CWNCount + 1, sizeof(long) );
+
 	indexlist = (int *) calloc( CWNCount + 1, sizeof(int) );
 	qp_assert(
 		CWNBlock != 0 &&
@@ -381,6 +408,7 @@
 						offsetlist[nt_load_cnt]=
 						CWNBlock[index].p -
 						PAWC.iq_eqv;
+
 						strncpy(
 						namelist[nt_load_cnt],
 						vi->name,
@@ -871,8 +899,21 @@
 			if ( cmd->u.scan.pawpp ) {
 				char	buf[33];
 
+				/* for LP64 ABI matlab and matrow are 64 bit pointer, type is void*  
+				   but PCADDR.jmlab and PCADDR.jmrow are of type int
+				   see: c_pcaddr.h and qp_command.h
+				   it is related to CWNBlock -> see above (H. Vogt)*/
+
+#if defined(CERNLIB_QMLXIA64)
+				unsigned long long int	 myjmlab, myjmrow;
+				myjmlab = PCADDR.jmlab;
+				myjmrow = PCADDR.jmrow;
+				c->matlab = (TableCallBack) myjmlab;
+				c->matrow = (TableCallBack) myjmrow;
+#else
 				c->matlab = (TableCallBack) PCADDR.jmlab;
 				c->matrow = (TableCallBack) PCADDR.jmrow;
+#endif
 
 				qp_assert( qe->nexpr <= MAX_OUTSTR );
 
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_hbook_if.c cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_hbook_if.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/ntuple/qp_hbook_if.c	1999-07-05 15:43:35.000000000 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/paw/ntuple/qp_hbook_if.c	2005-12-09 13:27:46.976359664 +0000
@@ -149,7 +149,15 @@
 	int	idn, idtmp;
 	int	icycle;
 	int	ierr;
-	int     izero = 0;
+
+	/* LP64 compatibility:
+	   use static for izero because its address is fetched by hbname_
+	   using locb and locb expects 32 bit addresses only.
+	   static takes izero from the stack and puts it the code area
+	   and the LP64 ABI has the code area in the 32 bit address space
+	   but the stack starts downward from 0x80000000000 (H. Vogt) */
+
+	static int     izero = 0;
 
 	/* split string into  path, id and cycle */
 


--- NEW FILE 211-fix-comis-on-ia64.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-ia64.dpatch by  
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Further patch building on Harald Vogt's amd64 patch that should
## DP: fix PAW on Itanium Linux.

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c	2005-12-09 09:45:33.649333472 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c	2005-12-09 10:01:36.149011280 +0000
@@ -39,12 +39,32 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium, the situation is even worse.  Itanium architecture is such
+ * that the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ * -- Kevin McCarty
+ */
+	
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+# if defined (__ia64__)
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a +
+	  (((unsigned long)a > 0x80000000) ? autobase : 0x6000000000000000);
+  b = (unsigned long)b +
+	  (((unsigned long)b > 0x80000000) ? autobase : 0x6000000000000000);
+# endif
 #else
      char **ja, **jb;
      int *nn;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 09:45:33.650333320 +0000
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c	2005-12-09 10:05:36.432482640 +0000
@@ -42,6 +42,19 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium, the situation is even worse.  Itanium architecture is such
+ * that the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ * -- Kevin McCarty
+ */
+
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *na, *nb;
@@ -56,6 +69,13 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+# if defined (__ia64__)
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a +
+          (((unsigned long)a > 0x80000000) ? autobase : 0x6000000000000000);
+  b = (unsigned long)b +
+          (((unsigned long)b > 0x80000000) ? autobase : 0x6000000000000000);
+# endif
 #else
      char **ja, **jb;
      int *na, *nb;

cernlib_2005.05.09.dfsg-3.diff:

--- NEW FILE cernlib_2005.05.09.dfsg-3.diff ---
--- cernlib-2005.05.09.dfsg.orig/debian/control
+++ cernlib-2005.05.09.dfsg/debian/control
@@ -0,0 +1,896 @@
+Source: cernlib
+Maintainer: Kevin B. McCarty 
+Standards-Version: 3.6.2
+Priority: optional
+Section: science
+Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin
+
+Package: cernlib-base
+Architecture: all
+Section: devel
+Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev
+Description: script to determine Cernlib library dependencies
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This package includes the "cernlib" script that lists the command-line
+ options needed for linking against Cernlib libraries.  The script has
+ been rewritten from the upstream version to calculate
+ dependencies recursively.  Also included are a README.Debian with a summary
+ of changes made to Cernlib to fit it into Debian packaging practices,
+ and a contributed set of Autoconf macros to test for Cernlib libraries.
+
+Package: cernlib-core-dev
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit
+Description: Cernlib development headers, tools, and static libraries
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides the header files and static libraries likely to be
+ wanted by developers using the Cern libraries who are not interested
+ specifically in high energy physics.  It also provides the Cernlib
+ development tools DZedit and KUIPC.  Cernlib analysis programs may be
+ obtained by installing the cernlib-core metapackage.
+
+Package: cernlib-core
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos
+Description: Cernlib main libraries and programs
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides the libraries and analysis tools (e.g. PAW) likely
+ to be wanted by most users of the Cern libraries who are not interested
+ specifically in high energy physics.  You cannot do program development by
+ installing only this metapackage; development libraries and tools may
+ be obtained by installing the cernlib-core-dev metapackage or individual
+ lib*-dev packages.
+
+Package: cernlib-extras
+Architecture: all
+Priority: extra
+Section: science
+Depends: cernlib-base (= ${Source-Version}), pawserv, zftp
+Description: miscellaneous Cernlib programs unlikely to be used by many
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides a few additional Cernlib programs not included
+ in any other Cernlib metapackage.  Very few people are likely to be
+ interested in them; currently they include zftp, pawserv and zserv.
+ Notice that the latter two programs run as daemons through inetd and may
+ reduce your system's security!
+ .
+ Installing this package along with the "cernlib" metapackage will supply
+ a complete set of all Cernlib programs and libraries included in Debian.
+
+Package: cernlib-montecarlo
+Architecture: all
+Section: science
+Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev
+Recommends: libisajet758-2-dev
+Description: Cernlib Monte Carlo libraries
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides various Monte Carlo libraries included in Cernlib
+ (both shared and static).  Likely only physicists will be interested in
+ these packages.  Note that the Geant 3.21 program is not included, but it may
+ be obtained by also installing the geant321 Debian package.
+ .
+ Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are
+ not available within Debian due to licensing issues; see the README.Debian
+ file in the montecarlo-base package for information on obtaining them.
+ .
+ Additionally, the Isajet library is not available on the m68k architecture
+ due to a compiler flaw.
+
+Package: cernlib
+Architecture: all
+Section: science
+Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev
+Description: almost complete set of Debian Cernlib packages
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ This metapackage provides almost all of the programs and libraries contained
+ in Cernlib.  Most people will likely want only a subset of these.  A few
+ extra Cernlib programs, not of interest to many people, may be obtained via
+ the cernlib-extras metapackage.
+
+Package: dzedit
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: libpacklib1-dev
+Description: Cernlib's ZEBRA documentation editor
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system
+ developed at CERN.  ZEBRA, part of the Packlib library, permits a developer to
+ create complex data structures in the FORTRAN 77 language; the DZDOC system
+ allows the developer to generate and maintain documentation of ZEBRA data
+ structures.
+
+Package: geant321-data
+Architecture: all
+Section: science
+Depends: cernlib-base
+Description: [Physics] Data for Geant 3.21 detector simulator
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes data files for use by Geant.
+
+Package: geant321-doc
+Architecture: all
+Section: doc
+Depends: cernlib-base
+Description: [Physics] Documentation for Geant 3.21
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes some documentation about Geant.
+
+Package: geant321
+Architecture: all
+Section: science
+Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77
+Suggests: kxterm, geant321-doc
+Description: [Physics] Particle detector description and simulation tool
+ Geant simulates the passage of subatomic particles through matter, for
+ instance, particle detectors.  For maximum flexibility, Geant simulations
+ are performed by linking Fortran code supplied by the user with the Geant
+ libraries, then running the resulting executable.
+ .
+ This package includes gxint, the script used to perform this linking step.
+
+Package: kuipc
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, cernlib-base
+Recommends: libpacklib1-dev
+Suggests: libpacklib1-lesstif-dev
+Description: Cernlib's Kit for a User Interface Package (KUIP) compiler
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify
+ the writing of a program's user interface code.  It takes as
+ input a Command Definition File (CDF) that describes the
+ commands to be understood by the program, and outputs C or FORTRAN code that
+ makes the appropriate function calls to set up the user interface.  This
+ code can then be compiled and linked with the rest of the program.  Since
+ the generated code uses KUIP routines, the program must also be linked
+ against the Packlib library that contains them.
+ .
+ KUIPC is no longer actively developed, so aside from its use in the build
+ process of Cernlib, it is of mainly historical interest.
+
+Package: kxterm
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}, cernlib-base
+Description: Cernlib's KUIP terminal emulator
+ Cernlib is a suite of data analysis tools and libraries created for
+ use in physics experiments, but also with applications to other
+ fields such as the biological sciences.
+ .
+ KXterm is a terminal emulator which combines the best features from
+ the (now defunct) Apollo DM pads (like: input and transcript
[...20906 lines suppressed...]
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ./pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, C??? hai"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "M??y ph???c v??? c???n ch???y t??? tr??nh inetd"
+
+#. Type: select
+#. Description
+#: ./pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr "G??i tin n??y bao g???m c??? hai tr??nh n???n (d??mon) pawserv (m?? cho ph??p m??y t??? xa ?????c t???p tin ?????a ph????ng trong khi ch???y PAW/Paw++) v?? tr??nh n???n zserv (m?? cho ph??p m??y t??? xa ????ng nh???p d??ng giao th???c ZFTP c???a CERN). C??? hai tr??nh ph???c v??? n??y ???????c ch???y t??? tr??nh n???n inetd; b???n c?? th??? hi???u l???c m???t hay c??? hai ??i???u. Tuy nhi??n, tr??? b???n c???n thi???t l??m vi???c r???t ?????c bi???t, r???t c?? th??? l?? b???n s??? mu???n hi???u l???c ch??? tr??nh pawserv."
--- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po
+++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po
@@ -0,0 +1,55 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib\n"
+"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-05-26 16:05-0300\n"
+"Last-Translator: Andr? Lu?s Lopes \n"
+"Language-Team: Debian-BR Project \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Ambos"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servidores a serem executados a partir do inetd"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr ""
+"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos "
+"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv "
+"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP "
+"do CERN). Esses servidores s?o executados a partir do inetd; voc? "
+"pode habilitar cada um deles separadamente ou ambos. A menos que voc? "
+"possua necessidades bastante especializadas, voc? provavelmente ir? "
+"desejar habilitar somente o pawserv."
--- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po
+++ cernlib-2005.05.09.dfsg/debian/po/sv.po
@@ -0,0 +1,53 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib 2005.05.09-4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-10-06 23:50+0200\n"
+"Last-Translator: Daniel Nylander \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: select
+#. Choices
+#. Note to translators: only the English word "Both" below should be translated
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, B?da"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servrar som ska k?ras fr?n inetd"
+
+#. Type: select
+#. Description
+#: ../pawserv.templates.master:6
+msgid ""
+"This package includes both the pawserv daemon (permitting remote hosts to "
+"read local files while running PAW/Paw++) and the zserv daemon (allowing "
+"remote hosts to log in using CERN's ZFTP protocol).  These servers are run "
+"from inetd; you may enable either or both of them. Unless you have very "
+"specialized requirements, most likely you only want to enable pawserv."
+msgstr ""
+"Detta paket inkluderar b?de pawserver-daemonen (till?ter fj?rrsystem att "
+"l?sa lokala filer n?r PAW/Paw++ k?rs) och zserv-daemonen (till?ter fj?rrsystem "
+"att logga in med CERN's ZFTP-protokoll).  Dessa servrar k?rs fr?n inetd; du m?ste "
+"aktivera n?gon eller b?da av dom. Om du inte har speciella krav s? r?cker det gott "
+"om pawserv aktiveras."
+
--- cernlib-2005.05.09.dfsg.orig/debian/po/es.po
+++ cernlib-2005.05.09.dfsg/debian/po/es.po
@@ -0,0 +1,55 @@
+# cernlib po-debconf translation to Spanish
+# Copyright (C) 2005 Software in the Public Interest
+# This file is distributed under the same license as the cernlib package.
+#
+# Changes:
+#  - Initial translation
+#         C??sar G??mez Mart??n 
+#
+#   Traductores, si no conoce el formato PO, merece la pena leer la
+#   documentaci??n de gettext, especialmente las secciones dedicadas a este
+#   formato, por ejemplo ejecutando:
+#          info -n '(gettext)PO Files'
+#          info -n '(gettext)Header Entry'
+# Equipo de traducci??n al espa??ol, por favor, lean antes de traducir
+# los siguientes documentos:
+#
+#  - El proyecto de traducci??n de Debian al espa??ol
+#    http://www.debian.org/intl/spanish/
+#    especialmente las notas de traducci??n en
+#    http://www.debian.org/intl/spanish/notas
+#
+#  - La gu??a de traducci??n de po's de debconf:
+#    /usr/share/doc/po-debconf/README-trans
+#    o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cernlib\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-25 17:23-0500\n"
+"PO-Revision-Date: 2005-09-01 17:49+0100\n"
+"Last-Translator: C??sar G??mez Mart??n \n"
+"Language-Team: Debian l10n spanish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: SPAIN\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Type: select
+#: ../pawserv.templates.master:4
+msgid "Pawserv, Zserv, Both"
+msgstr "Pawserv, Zserv, Ambos"
+
+#. Type: select
+#: ../pawserv.templates.master:6
+msgid "Servers to be run from inetd"
+msgstr "Servidores a ejecutar desde inetd"
+
+#. Type: select
+#: ../pawserv.templates.master:6
+msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol).  These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv."
+msgstr "Este paquete incluye el demonio pawserv (permite a las m??quinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++)  y el demonio zserv (permite a las m??quinas remotas conectarse a trav??s del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo m??s probable es que s??lo quiera habilitar pawserv."
+


Index: 304-update-Imake-config-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/304-update-Imake-config-files.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 304-update-Imake-config-files.dpatch	9 Dec 2005 15:57:06 -0000	1.1
+++ 304-update-Imake-config-files.dpatch	15 Dec 2005 12:07:03 -0000	1.2
@@ -7,25 +7,15 @@
 ## DP: to support most Linux architectures.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/Imake.cf /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/Imake.cf
---- cernlib-2005.05.09/src/config/Imake.cf	2004-10-05 11:54:40.000000000 -0400
-+++ /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/Imake.cf	2005-06-09 10:47:36.470829080 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.cf cernlib-2005.05.09.dfsg/src/config/Imake.cf
+--- cernlib-2005.05.09.dfsg~/src/config/Imake.cf	2004-10-05 11:54:40.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/Imake.cf	2005-12-12 09:42:08.529220732 -0500
 @@ -1,24 +1,10 @@
 -/* $Id$
 - *
 - * $Log$
-- * Revision 1.1  2005/12/09 15:57:06  pertusus
-- * - update with newer debian patchset for cernlib, fix licence issues
-- * - remove the BSD in the licence because there is no library nor binary
-- *   under a BSD licence and someone could get the idea that there is
-- *   some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
-- *   because of cfortran
-- * - don't use the include.tar.gz source, instead get include files from
-- *   the source files
-- * - build shared libraries
-- * - simplify the scripts modifications
-- *
-- * sync with devel, except 64 bit fixes
+- * Revision 1.2  2005/12/15 12:07:03  pertusus
+- * - use new debian patchset
 - *
 - * Revision 1.5  2004/10/05 15:54:40  mclareni
 - * Add configuration file linux-lp64 for Linux 64-bit pointer systems like AMD Opteron and Intel IA64.
@@ -1280,9 +1270,9 @@
  
  #ifndef MacroIncludeFile
  XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
-diff -urNad cernlib-2005.05.09/src/config/linux.cf /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/linux.cf
---- cernlib-2005.05.09/src/config/linux.cf	2004-10-05 11:56:45.000000000 -0400
-+++ /tmp/dpep.kbbTMH/cernlib-2005.05.09/src/config/linux.cf	2005-06-09 10:47:36.471828868 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/linux.cf cernlib-2005.05.09.dfsg/src/config/linux.cf
+--- cernlib-2005.05.09.dfsg~/src/config/linux.cf	2004-10-05 11:56:45.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/linux.cf	2005-12-12 09:42:42.505976387 -0500
 @@ -65,20 +65,20 @@
  #define OSVendor		/**/
  #define OSMajorVersion		2
@@ -1308,7 +1298,7 @@
  #endif
  #define HasPutenv		YES
  #define HasShm			YES
-@@ -94,38 +94,300 @@
+@@ -94,38 +94,302 @@
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
@@ -1599,6 +1589,8 @@
 +#  define OptimizedCDebugFlags  OptimizationLevel
 +# endif
 +# define LinuxMachineDefines    -D__x86_64__
++# define DefaultFCOptions       -fno-automatic \
++                                -fno-second-underscore -fugly-complex
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 +# define CernlibMachineDefines  -DCERNLIB_QMLXIA64
@@ -1623,7 +1615,7 @@
  /* Some of these man page defaults are overriden in the above OS sections */
  #ifndef ManSuffix
  # define ManSuffix	1x
-@@ -160,7 +422,7 @@
+@@ -160,7 +424,7 @@
  #define FortranSaveFlags	/* */ /* Everything static !? */
  #define OptimisedFortranFlags   -g -pc 64 -tp p6
  #define DefaultFCOptions        -Msave -fpic -Kieee
@@ -1632,7 +1624,7 @@
  
  #else
  
-@@ -171,19 +433,18 @@
+@@ -171,19 +435,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1664,7 +1656,7 @@
   
  #else
  
-@@ -194,19 +455,18 @@
+@@ -194,19 +457,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1696,7 +1688,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */
-@@ -221,17 +481,32 @@
+@@ -221,17 +483,32 @@
  /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */
  /*  Adapted to CERN style GF. 20-Sep-96 */
  
@@ -1732,7 +1724,7 @@
  
  # endif
  # endif
-@@ -251,7 +526,7 @@
+@@ -251,7 +528,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */


Index: 307-use-canonical-cfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/307-use-canonical-cfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 307-use-canonical-cfortran.dpatch	9 Dec 2005 15:57:06 -0000	1.1
+++ 307-use-canonical-cfortran.dpatch	15 Dec 2005 12:07:03 -0000	1.2
@@ -6,10 +6,10 @@
 ## DP: Debian package of cfortran, version 4.4-6.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.doc /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc
---- cernlib-2005.05.09/src/cfortran/cfortran.doc	1998-12-11 12:17:09.000000000 -0500
-+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.doc	2004-12-10 10:47:33.000000000 -0500
-@@ -195,7 +195,7 @@
+diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc	1998-12-11 17:17:09.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc	2005-12-09 18:01:09.000000000 +0000
+@@ -195,13 +195,13 @@
  HP9000> f77 -c cfortex.f
  HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest
  
@@ -18,7 +18,28 @@
  HP9000> # #define hpuxFortran800
  HP9000> cc -c -Aa -DhpuxFortran800 cfortest.c
  HP9000> f77 +800 -o cfortest cfortest.o cfortex.f
-@@ -643,7 +643,7 @@
+ 
+ f2c> # In the following, 'CC' is any C compiler.
+-f2c> f2c -R cfortex.f
++f2c> f2c cfortex.f
+ f2c> CC -o cfortest -Df2cFortran cfortest.c cfortex.c -lf2c  &&  cfortest
+ 
+ Portland Group $ # Presumably other C compilers also work.
+@@ -533,9 +533,10 @@
+ FORTRAN_REAL thus corresponds to FORTRAN's REAL on all machines, including t3e.
+ 
+ 
+-o f2c
+-  f2c, by default promotes REAL functions to double. cfortran.h does not (yet)
+-support this, so the f2c -R option must be used to turn this promotion off.
++o f2c / g77
++  f2c and g77 by default promote REAL functions to double.  As of December 9,
++2005, the Debian package of cfortran supports this behavior, so the f2c -R
++option must *NOT* be used to turn this promotion off.
+ 
+ o f2c
+ [Thanks to Dario Autiero for pointing out the following.]
+@@ -643,7 +644,7 @@
     [For an ancient math.h on a 386 or sparc, get similar from a new math.h.]
     #ifdef mc68000     /* 5 lines Copyright (c) 1988 by Sun Microsystems, Inc. */
     #define FLOATFUNCTIONTYPE	int
@@ -27,7 +48,7 @@
     #define ASSIGNFLOAT(x,y)	*(int *)(&x) = y
     #endif
  
-@@ -874,7 +874,7 @@
+@@ -874,7 +875,7 @@
  works everywhere and would seem to be an obvious choice.
  
  
@@ -36,7 +57,7 @@
  
  cfortran.h encourages the exact specification of the type and dimension of
  array parameters because it allows the C compiler to detect errors in the
-@@ -1835,7 +1835,7 @@
+@@ -1835,7 +1836,7 @@
  
  Unlike all other C compilers supported by cfortran.h,
  'gcc -traditional' promotes to double all functions returning float
@@ -45,7 +66,7 @@
  
  /* m.c */
  #include 
-@@ -2017,8 +2017,9 @@
+@@ -2017,8 +2018,9 @@
  
  THIS PACKAGE, I.E. CFORTRAN.H, THIS DOCUMENT, AND THE CFORTRAN.H EXAMPLE
  PROGRAMS ARE PROPERTY OF THE AUTHOR WHO RESERVES ALL RIGHTS. THIS PACKAGE AND
@@ -57,16 +78,16 @@
  - YOU MUST ACCOMPANY ANY COPIES OR DISTRIBUTION WITH THIS (UNALTERED) NOTICE.
  - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA 
    (E.G. TAPE, DISK, COMPUTER, PAPER.)
-diff -urNad cernlib-2005.05.09/src/cfortran/cfortran.h /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h
---- cernlib-2005.05.09/src/cfortran/cfortran.h	2002-09-11 13:05:51.000000000 -0400
-+++ /tmp/dpep.haCnaO/cernlib-2005.05.09/src/cfortran/cfortran.h	2004-12-10 10:47:34.000000000 -0500
+diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h	2002-09-11 17:05:51.000000000 +0000
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h	2005-12-09 18:01:09.000000000 +0000
 @@ -1,4 +1,4 @@
 -/* cfortran.h  4.4_cernlib2002 */
 +/* cfortran.h  4.4 */
  /* http://www-zeus.desy.de/~burow/cfortran/                   */
  /* Burkhard Burow  burow at desy.de                 1990 - 2002. */
  
-@@ -11,6 +11,32 @@
+@@ -11,6 +11,35 @@
     MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE.
  */
  
@@ -94,12 +115,15 @@
 +
 +      Nov 2003: If __INTEL_COMPILER or INTEL_COMPILER defined, also define
 +                f2cFortran (KMCCARTY)
++      Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN
++                returning "double" in C.  This was one of the items on
++		Burkhard's TODO list. (KMCCARTY)
 + *******/
 +
  /* 
    Avoid symbols already used by compilers and system *.h:
    __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c
-@@ -75,7 +101,8 @@
+@@ -75,7 +104,8 @@
  
  /* Remainder of cfortran.h depends on the Fortran compiler. */
  
@@ -109,7 +133,7 @@
  #define f2cFortran
  #endif
  
-@@ -90,6 +117,27 @@
+@@ -90,6 +120,27 @@
                             Support f2c or f77 with gcc, vcc with f2c. 
                             f77 with vcc works, missing link magic for f77 I/O.*/
  #endif
@@ -137,7 +161,7 @@
  #if defined(__hpux)             /* 921107: Use __hpux instead of __hp9000s300 */
  #define       hpuxFortran       /*         Should also allow hp9000s7/800 use.*/
  #endif
-@@ -131,6 +179,7 @@
+@@ -131,6 +182,7 @@
  #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
  /* If your compiler barfs on ' #error', replace # with the trigraph for #     */
   #error "cfortran.h:  Can't find your environment among:\
@@ -145,7 +169,7 @@
      - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...)     \
      - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000     \
      - VAX   VMS CC 3.1 and FORTRAN 5.4.                                  \
-@@ -151,7 +200,8 @@
+@@ -151,7 +203,8 @@
      - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran          \
      - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \
      - Absoft Pro Fortran: Use #define AbsoftProFortran \
@@ -155,7 +179,7 @@
  /* Compiler must throw us out at this point! */
  #endif
  #endif
-@@ -164,7 +214,8 @@
+@@ -164,7 +217,8 @@
  
  /* Throughout cfortran.h we use: UN = Uppercase Name.  LN = Lowercase Name.   */
  
@@ -165,7 +189,7 @@
  #define CFC_(UN,LN)            _(LN,_)      /* Lowercase FORTRAN symbols.     */
  #define orig_fcallsc(UN,LN)    CFC_(UN,LN)
  #else 
-@@ -268,7 +319,8 @@
+@@ -268,7 +322,8 @@
  #endif
  
  #ifndef apolloFortran
@@ -175,7 +199,7 @@
  #define CF_NULL_PROTO
  #else                                         /* HP doesn't understand #elif. */
  /* Without ANSI prototyping, Apollo promotes float functions to double.    */
-@@ -512,7 +564,7 @@
+@@ -512,7 +567,7 @@
                      *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO)  ),   \
    (F).dsc$a_a0    =  ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length          ,(F))
  
@@ -184,7 +208,7 @@
  #define _NUM_ELEMS      -1
  #define _NUM_ELEM_ARG   -2
  #define NUM_ELEMS(A)    A,_NUM_ELEMS
-@@ -540,7 +592,8 @@
+@@ -540,7 +595,8 @@
  }
  return (int)num;
  }
@@ -194,3 +218,56 @@
  /*-------------------------------------------------------------------------*/
  
  /*           UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS       */
+@@ -1451,7 +1507,12 @@
+ #define      BYTE_cfPU(A)   CFextern INTEGER_BYTE      FCALLSC_QUALIFIER A
+ #define    DOUBLE_cfPU(A)   CFextern DOUBLE_PRECISION  FCALLSC_QUALIFIER A
+ #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define     FLOAT_cfPU(A)   CFextern DOUBLE_PRECISION  FCALLSC_QUALIFIER A
++#else
+ #define     FLOAT_cfPU(A)   CFextern FORTRAN_REAL      FCALLSC_QUALIFIER A
++#endif
+ #else				   	                   
+ #define     FLOAT_cfPU(A)   CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A
+ #endif				   	                   
+@@ -2088,7 +2149,12 @@
+ #ifndef __CF__KnR
+ /* The void is req'd by the Apollo, to make this an ANSI function declaration.
+    The Apollo promotes K&R float functions to double. */
+-#define   FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define FLOAT_cfFZ(UN,LN) DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#else
++#define FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(void
++#endif
+ #ifdef vmsFortran
+ #define  STRING_cfFZ(UN,LN) void  FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS
+ #else
+@@ -2104,7 +2170,12 @@
+ #endif
+ #else
+ #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define   FLOAT_cfFZ(UN,LN) DOUBLE_PRECISION  FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#else
+ #define   FLOAT_cfFZ(UN,LN) FORTRAN_REAL      FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#endif
+ #else
+ #define   FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)(
+ #endif
+@@ -2118,7 +2189,12 @@
+ #define    BYTE_cfF(UN,LN)     BYTE_cfFZ(UN,LN)
+ #define  DOUBLE_cfF(UN,LN)   DOUBLE_cfFZ(UN,LN)
+ #ifndef __CF_KnR
++#if defined (f2cFortran)
++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */
++#define   FLOAT_cfF(UN,LN)  DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#else
+ #define   FLOAT_cfF(UN,LN)  FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#endif
+ #else
+ #define   FLOAT_cfF(UN,LN)    FLOAT_cfFZ(UN,LN)
+ #endif


Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 315-fixes-for-MacOSX.dpatch	9 Dec 2005 17:31:10 -0000	1.2
+++ 315-fixes-for-MacOSX.dpatch	15 Dec 2005 12:07:03 -0000	1.3
@@ -6,9 +6,25 @@
 ## DP: and run on OS X.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/Imake.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules
---- cernlib-2005.05.09/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/Imake.rules	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/Imakefile cernlib-2005.05.09.dfsg/src/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/Imakefile	2005-12-07 14:47:34.141148558 -0500
+@@ -7,8 +7,12 @@
+ SUBDIRS= $(LIBDIRS) patchy cfortran
+ 
+ #ifdef CERNLIB_UNIX
++#ifdef CERNLIB_MACOSX
++SUBDIRS:= $(SUBDIRS) scripts
++#else
+ SUBDIRS:= $(SUBDIRS) scripts mgr
+ #endif
++#endif
+ 
+ InstallLibSubdirs($(LIBDIRS))
+ 
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
+--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2005-04-18 11:39:25.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2005-12-07 14:47:34.139148983 -0500
 @@ -2171,7 +2171,7 @@
  #define CppScriptTarget(dst,src,defs,deplist)				@@\
  dst::  src deplist							@@\
@@ -27,9 +43,9 @@
  									@@\
  clean::									@@\
  	RemoveFiles(dst)
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.cf /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf
---- cernlib-2005.05.09/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.cf	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.cf cernlib-2005.05.09.dfsg/src/config/MacOSX.cf
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.cf	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.cf	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,170 @@
 +XCOMM platform:  $SFO: MOSXS.cf,v 1.0 95/11/19 23:21:00 sl Exp $
 +
@@ -201,9 +217,9 @@
 +/* End  CERNLIB changes */
 +
 +
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.rules /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules
---- cernlib-2005.05.09/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.rules	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.rules cernlib-2005.05.09.dfsg/src/config/MacOSX.rules
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.rules	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.rules	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,123 @@
 +XCOMM $XConsortium: MOSXS.rules,v 1.1 97/12/12 15:34:45 sl Exp $
 +
@@ -328,9 +344,9 @@
 +#endif
 +
 +
-diff -urNad cernlib-2005.05.09/src/config/MacOSX.tmpl /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl
---- cernlib-2005.05.09/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/MacOSX.tmpl	2004-06-30 21:54:11.000000000 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/MacOSX.tmpl cernlib-2005.05.09.dfsg/src/config/MacOSX.tmpl
+--- cernlib-2005.05.09.dfsg~/src/config/MacOSX.tmpl	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/MacOSX.tmpl	2005-12-07 14:47:34.140148771 -0500
 @@ -0,0 +1,67 @@
 +XCOMM $XConsortium: MOSXS.tmpl,v 1.2 97/12/12 19:07:12 sl Exp $
 +
@@ -399,9 +415,9 @@
 +#define SharedFSRev F
 +SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
 +
-diff -urNad cernlib-2005.05.09/src/config/site.def /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def
---- cernlib-2005.05.09/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/config/site.def	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/config/site.def cernlib-2005.05.09.dfsg/src/config/site.def
+--- cernlib-2005.05.09.dfsg~/src/config/site.def	2002-04-26 10:46:04.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/site.def	2005-12-07 14:47:34.140148771 -0500
 @@ -99,9 +99,7 @@
  /*   if it is already defined and false, undef it! */
  /* do not use shift by default
@@ -413,9 +429,9 @@
  #undef CERNLIB_SHIFT
  #endif
  #endif
-diff -urNad cernlib-2005.05.09/src/geant321/gxint/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile
---- cernlib-2005.05.09/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/geant321/gxint/Imakefile	2005-06-09 15:52:06.472072084 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gxint/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gxint/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/geant321/gxint/Imakefile	1997-01-29 11:37:40.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/geant321/gxint/Imakefile	2005-12-07 14:47:34.140148771 -0500
 @@ -30,7 +30,7 @@
  
  gxint321.f:  gxint.F
@@ -425,25 +441,9 @@
  
  install.lib:: $(CERN_LIBDIR)/gxint.f
  
-diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile
---- cernlib-2005.05.09/src/Imakefile	1996-12-16 10:08:41.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/Imakefile	2005-06-09 15:52:06.471072296 -0400
-@@ -7,8 +7,12 @@
- SUBDIRS= $(LIBDIRS) patchy cfortran
- 
- #ifdef CERNLIB_UNIX
-+#ifdef CERNLIB_MACOSX
-+SUBDIRS:= $(SUBDIRS) scripts
-+#else
- SUBDIRS:= $(SUBDIRS) scripts mgr
- #endif
-+#endif
- 
- InstallLibSubdirs($(LIBDIRS))
- 
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F
---- cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c327m.F	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c327m.F cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c327m.F
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c327m.F	1996-04-01 10:01:17.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c327m.F	2005-12-07 14:47:34.141148558 -0500
 @@ -92,7 +92,11 @@
  #endif
        ENDIF
@@ -456,9 +456,9 @@
         IF(IDS .EQ. 1) THEN
        ERRMAX=MAX(ERRMAX,ABS(H1-T1))
        LTEST= LTEST .AND. ERRMAX .LE.  TSTERR
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F
---- cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mathlib/gen/tests/c342m.F	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c342m.F cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c342m.F
+--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/tests/c342m.F	1996-04-01 10:01:19.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/tests/c342m.F	2005-12-07 14:47:34.141148558 -0500
 @@ -70,7 +70,11 @@
  #endif
        END IF
@@ -471,9 +471,9 @@
        ERMAX= MAX(ERMAX,ABS(R1-T1))
        IF(IDS .EQ. 3 .OR. IDS .EQ. 4) THEN
         WRITE(LOUT,'(1X,F10.3,2F25.16,1P,D10.1)') SX,R,T,ABS(R1-T1)
-diff -urNad cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile
---- cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/cojets/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/cojets/data/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/cojets/data/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/cojets/data/Imakefile	1996-03-27 04:31:06.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mclibs/cojets/data/Imakefile	2005-12-07 14:47:34.141148558 -0500
 @@ -1,11 +1,11 @@
  
  .SUFFIXES:
@@ -488,9 +488,9 @@
  
  PackageDirFileTarget(cojets.dat)
  
-diff -urNad cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile
---- cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/mclibs/isajet/data/Imakefile	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/mclibs/isajet/data/Imakefile cernlib-2005.05.09.dfsg/src/mclibs/isajet/data/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/mclibs/isajet/data/Imakefile	1996-03-27 04:33:19.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/mclibs/isajet/data/Imakefile	2005-12-07 14:47:34.141148558 -0500
 @@ -1,9 +1,9 @@
  
  .SUFFIXES:
@@ -503,9 +503,9 @@
  
  PackageDirFileTarget(isajet.dat)
  
-diff -urNad cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c
---- cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/sysreq/log.c	2005-06-09 15:52:06.483069745 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/sysreq/log.c cernlib-2005.05.09.dfsg/src/packlib/cspack/sysreq/log.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/sysreq/log.c	2003-09-02 08:47:16.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/cspack/sysreq/log.c	2005-12-07 14:47:34.142148345 -0500
 @@ -80,7 +80,7 @@
  static int pid;                 /* process identifier                   */
  static int logfd ;              /* logging file descriptor              */
@@ -515,9 +515,9 @@
  extern int syslog();
  #endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX */
  extern char *getenv();
-diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
---- cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:51:53.621804393 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c cernlib-2005.05.09.dfsg/src/packlib/cspack/tcpaw/tcpaw.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/cspack/tcpaw/tcpaw.c	2005-12-07 14:47:25.920897902 -0500
++++ cernlib-2005.05.09.dfsg/src/packlib/cspack/tcpaw/tcpaw.c	2005-12-07 14:47:34.146147494 -0500
 @@ -2569,7 +2569,7 @@
  #if !defined(IBM) && !defined(_WIN32)
  /* I provide "getpass" myself as standard version truncates to 8 characters */
@@ -559,9 +559,9 @@
 +  return result;
 +}
 +#endif /* CERNLIB_MACOSX */
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c
---- cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernbit/z268/systems.c	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernbit/z268/systems.c cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernbit/z268/systems.c
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernbit/z268/systems.c	1998-08-25 08:45:56.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernbit/z268/systems.c	2005-12-07 14:47:34.146147494 -0500
 @@ -200,7 +200,7 @@
  || defined(_IBMR2) \
  || defined(__convexc__) \
@@ -571,9 +571,9 @@
  
    void systems_( command, buf, buflen, l, chars, rc, ovflw )
  
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/d704fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/d704fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/d704fort/Imakefile	1996-06-12 06:03:53.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/d704fort/Imakefile	2005-12-07 14:47:34.146147494 -0500
 @@ -4,6 +4,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -585,9 +585,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-06-09 15:52:06.485069320 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f002fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f002fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f002fort/Imakefile	1996-06-12 06:04:09.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f002fort/Imakefile	2005-12-07 14:47:34.146147494 -0500
 @@ -10,6 +10,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -599,9 +599,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f003fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f003fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f003fort/Imakefile	1996-06-12 06:04:12.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f003fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -11,6 +11,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -613,9 +613,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f004fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f004fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f004fort/Imakefile	1996-06-12 06:04:16.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f004fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -6,6 +6,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -627,9 +627,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f010fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f010fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f010fort/Imakefile	1996-06-12 06:04:19.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f010fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -7,6 +7,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -641,9 +641,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  	 
  
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f011fort/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f011fort/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kernnum/f011fort/Imakefile	1996-06-12 06:04:24.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kernnum/f011fort/Imakefile	2005-12-07 14:47:34.147147281 -0500
 @@ -7,6 +7,10 @@
  FDEBUGFLAGS=NoOpFortranDebugFlags
  #endif
@@ -655,9 +655,9 @@
  FORTRANSAVEOPTION=FortranSaveFlags
  
  SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h
---- cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/packlib/kuip/kuip/ksys.h	2005-06-09 15:52:06.487068895 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kuip/kuip/ksys.h cernlib-2005.05.09.dfsg/src/packlib/kuip/kuip/ksys.h
+--- cernlib-2005.05.09.dfsg~/src/packlib/kuip/kuip/ksys.h	1997-09-02 10:50:01.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/kuip/kuip/ksys.h	2005-12-07 14:47:34.147147281 -0500
 @@ -188,6 +188,17 @@
  #endif
  
@@ -676,15 +676,15 @@
  #ifdef MSDOS
  #  define MACHINE_NAME "IBMPC"
  #  define OS_NAME "MSDOS"
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
---- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/csaddr.F	2005-12-07 14:47:25.807921944 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/csaddr.F	2005-12-07 14:55:23.810167859 -0500
 @@ -38,7 +38,12 @@
              IFCS=-2
              CALL CSRTGPL(I)
  #else
-+c     thanks to Keisuke Fujii for this patch for OS X
-+#if defined(CERNLIB_MACOSX)
++c     thanks to Keisuke Fujii for this patch for OS X            
++#if defined (CERNLIB_MACOSX)
 +          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else
            IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
@@ -696,7 +696,7 @@
            I=CSITGPL(IPVS)
          ENDIF
  #else
-+#if defined(CERNLIB_MACOSX)
++#if defined (CERNLIB_MACOSX)
 +        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else
          IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
@@ -704,9 +704,9 @@
          IF(IADGP.NE.0)THEN
            IFCS=-2
            ITYPGP=-2
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F
---- cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:51:53.524825013 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/cscrexec.F	2005-06-09 15:57:50.699841388 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cscrexec.F cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cscrexec.F
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/cscrexec.F	2005-12-07 14:47:25.687947476 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/cscrexec.F	2005-12-07 14:47:34.148147068 -0500
 @@ -82,11 +82,19 @@
        IF(FEXT.EQ.'.c')THEN
          L=LENOCC(CHCC)
@@ -743,9 +743,9 @@
  #endif
  #if defined(CERNLIB_ALPHA_OSF)
          CHLINE=                   'ld -shared -o '
-diff -urNad cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile
---- cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
-+++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/paw/programs/Imakefile	2005-06-09 15:52:06.486069107 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/paw/programs/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/paw/programs/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/pawlib/paw/programs/Imakefile	2002-04-25 06:20:11.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/pawlib/paw/programs/Imakefile	2005-12-07 14:47:34.148147068 -0500
 @@ -9,7 +9,7 @@
  EXTRA_LDOPTIONS=-Wl,-E
  #endif


Index: 701-patch-hbook-comis-Imakefiles.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/701-patch-hbook-comis-Imakefiles.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 701-patch-hbook-comis-Imakefiles.dpatch	9 Dec 2005 15:57:06 -0000	1.1
+++ 701-patch-hbook-comis-Imakefiles.dpatch	15 Dec 2005 12:07:03 -0000	1.2
@@ -6,9 +6,9 @@
 ## DP: 701 dpatch (a shell script).
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/packlib/hbook/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile
---- cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
-+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/packlib/hbook/code/Imakefile	2005-06-10 17:04:08.866020136 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/hbook/code/Imakefile cernlib-2005.05.09.dfsg/src/packlib/hbook/code/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/packlib/hbook/code/Imakefile	1997-09-02 09:09:01.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/packlib/hbook/code/Imakefile	2005-12-07 14:59:31.519940694 -0500
 @@ -19,8 +19,8 @@
  	hgn.F hgnf.F hgnpar.F hgstat.F hhipar.F hhxye.F hi.F \ @@\
  	hictoi.F hid1.F hid2.F hidall.F hidopt.F hidpos.F hie.F  \ @@\
@@ -20,9 +20,9 @@
  	hkind.F hknul1.F hknuli.F hlabel.F hlabeq.F hlabnb.F \ @@\
  	hlattr.F hlccmp.F hldir.F hldir1.F hldir2.F hldirt.F \ @@\
  	hlgnxt.F hlhcmp.F hlimit.F hllsq.F hlnext.F hlocat.F \ @@\
-diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/Imakefile /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile
---- cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:02:24.843306185 -0400
-+++ /tmp/dpep.3VyhWr/cernlib-2005.05.09/src/pawlib/comis/code/Imakefile	2005-06-10 17:05:09.955931988 -0400
+diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile
+--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/code/Imakefile	2005-12-07 14:59:22.782783593 -0500
++++ cernlib-2005.05.09.dfsg/src/pawlib/comis/code/Imakefile	2005-12-07 14:59:31.519940694 -0500
 @@ -37,7 +37,8 @@
  	csspar.F cssubr.F cssvpt.F cstadv.F cstarr.F csterr.F cstext.F \ @@\
  	cstfrf.F cstinf.F cstlgb.F cstlog.F cstpar.F cstran.F cstrer.F \ @@\


Index: cernlib.m4
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib.m4	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib.m4	15 Dec 2005 12:07:03 -0000	1.2
@@ -1,6 +1,6 @@
 dnl                                                      -*- Autoconf -*- 
 dnl  autoconf macros for the cernlib libraries
-dnl  Copyright (C) 2004 Patrice Dumas
+dnl  Copyright (C) 2004, 2005 Patrice Dumas
 dnl
 dnl  This program is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
@@ -16,28 +16,33 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-dnl A basic axample of the macros usage:
+dnl A basic axample of the macro usage:
 dnl 
-dnl AC_CERNLIB
-dnl AC_LIB_CERNLIB(kernlib,CLTOU)
-dnl AC_LIB_CERNLIB(mathlib,GAUSS)
-dnl LIBS="$CERNLIB_LIBS $LIBS"
-
-dnl The macro AC_CERNLIB tries to determine the cernlib location and
-dnl whether the linking should be static or not. It should be called once and
-dnl before a particular cernlib library is detected with the second macro.
+dnl AC_LIB_CERNLIB(kernlib,CLTOU,
+dnl [
+dnl    AC_LIB_CERNLIB(mathlib,GAUSS,[LIBS="$CERNLIB_LIBS $LIBS"])
+dnl ])
+
+dnl
 dnl --with-static-cernlib forces the static or dynamic linking.
 dnl --with-cernlib gives the location of cernlib.
 dnl
-dnl If the type of linking isn't forced it is detected as follow:
-dnl - if the environment variable CERNLIB exists it is assumed to be the
+dnl If the type of linking isn't specified it is assumed to be static.
+dnl
+dnl For static linking:
+dnl - if the binary program 'cernlib-static' or 'cernlib' is in the path it is 
+dnl   assumed that a static linking using the information reported by that 
+dnl   script is wanted.
+dnl - otherwise if the environment variable CERNLIB exists it is assumed to be the
 dnl   location of the static library.
 dnl - otherwise if the environment variable CERN_ROOT exists it is assumed 
 dnl   that CERN_ROOT/lib is the location of the static library.
-dnl - otherwise if the binary program 'cernlib' is in the path it is assumed 
-dnl   that a static linking using the information reported by that binary is 
-dnl   wanted.
-dnl - otherwise a dynamic linking is performed.
+dnl - otherwise a simple linking is performed.
+dnl 
+dnl If a dynamic linking is selected:
+dnl - if the binary program 'cernlib' is in the path it is assumed that it is the 
+dnl   debian script and it is called with -dy.
+dnl - otherwise a simple linking is performed.
 dnl
 dnl AC_LIB_CERNLIB ([LIBRARY = kernlib], [FUNCTION = CLTOU], [ACTION-IF-FOUND],
 dnl          [ACTION-IF-NOT-FOUND]) 
@@ -53,7 +58,7 @@
 # statically linked or not.
 AC_DEFUN([AC_CERNLIB], [
 CERNLIB_LIB_PATH=
-CERNLIB_STATIC=
+CERNLIB_STATIC=yes
 AC_ARG_WITH(static_cernlib,
 [  --with-static-cernlib             link statically with the cernlib],
 [  CERNLIB_STATIC=$withval      ])
@@ -64,27 +69,24 @@
 
 
 if test "z$CERNLIB_STATIC" != "zno"; then    
-    CERNLIB_BIN=no
+    CERNLIB_STATIC=yes
     if test "z$CERNLIB_LIB_PATH" = z; then
-        if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
-            CERNLIB_LIB_PATH=$CERNLIB
-            CERNLIB_STATIC="yes"
-            AC_MSG_NOTICE([using the CERNLIB environment variable for cernlib location])
-        elif test "z$CERN_ROOT" != z -a -d "$CERN_ROOT/lib"; then
-            CERNLIB_LIB_PATH=$CERN_ROOT/lib
-            CERNLIB_STATIC="yes"
-            AC_MSG_NOTICE([using the CERN_ROOT environment variable for cernlib location])
-        fi
-        if test "z$CERNLIB_LIB_PATH" = "z"; then
+        AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no)
+        if test $CERNLIB_BIN = no; then
             AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
-            if test $CERNLIB_BIN != no; then
-                CERNLIB_STATIC="yes"
+        fi
+        if test $CERNLIB_BIN = no; then
+            if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
+               CERNLIB_LIB_PATH=$CERNLIB
+               AC_MSG_NOTICE([using the CERNLIB environment variable for cernlib location])
+            elif test "z$CERN_ROOT" != z -a -d "$CERN_ROOT/lib"; then
+                CERNLIB_LIB_PATH=$CERN_ROOT/lib
+                AC_MSG_NOTICE([using the CERN_ROOT environment variable for cernlib location])
             fi
         fi
     fi
-fi
-
-if test "z$CERNLIB_STATIC" != "zyes"; then
+else
+    AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
     if test "z$CERNLIB_LIB_PATH" != z; then
          LDFLAGS="$LDFLAGS -L$CERNLIB_LIB_PATH"
     fi
@@ -95,6 +97,7 @@
 #          [ACTION-IF-NOT-FOUND]) 
 # check for a function in a library of the cernlib
 AC_DEFUN([AC_LIB_CERNLIB], [
+AC_REQUIRE([AC_CERNLIB])
 
 cernlib_lib_ok="no"
 
@@ -110,10 +113,12 @@
     cern_func=$2
 fi
 
+save_CERNLIB_LIBS=$CERNLIB_LIBS
+save_LIBS=$LIBS
+
 if test "z$CERNLIB_STATIC" = "zyes"; then
     cernlib_lib_static_found=no
     AC_MSG_NOTICE([cernlib: linking with a static $cern_library])
-    save_CERNLIB_LIBS="$CERNLIB_LIBS"
     if test "z$CERNLIB_BIN" != "zno"; then
         cernlib_bin_out=`$CERNLIB_BIN $cern_library`
         CERNLIB_LIBS="$cernlib_bin_out $CERNLIB_LIBS"
@@ -127,37 +132,34 @@
     fi
     if test "z$cernlib_lib_static_found" = zno; then
         AC_MSG_WARN([cannot determine the cernlib location for static linking])
+    fi
+else
+    AC_MSG_NOTICE([trying a dynamical link with $cern_library])
+    if test "z$CERNLIB_BIN" != "zno"; then
+        # try link with debian cernlib script with -dy
+        cernlib_bin_out=`$CERNLIB_BIN -dy $cern_library`
+        CERNLIB_LIBS="$cernlib_bin_out $CERNLIB_LIBS"
     else
+        CERNLIB_LIBS="-l$cern_library $CERNLIB_LIBS"
+    fi
+fi
+
 dnl now try the link
-        AC_LANG_PUSH(Fortran 77)
-        save_LIBS="$LIBS"; LIBS="$CERNLIB_LIBS $LIBS"
-        AC_LINK_IFELSE([      program main
+LIBS="$CERNLIB_LIBS $LIBS"
+AC_LANG_PUSH(Fortran 77)
+AC_LINK_IFELSE([      program main
       call $cern_func
       end
 ], 
-        [ 
-            cernlib_lib_ok=yes
-        ],
-        [
-            CERNLIB_LIBS="$save_CERNLIB_LIBS"
-        ])
-        LIBS="$save_LIBS"
-        AC_LANG_POP(Fortran 77)
-    fi
-else
-    AC_MSG_NOTICE([trying a dynamical link with $cern_library])
-dnl FIXME ther could also be something like
-dnl save_LIBS="$LIBS"; LIBS="$CERNLIB_LIBS $LIBS"
-dnl CERNLIB_LIBS="-l$cern_library $CERNLIB_LIBS" 
-dnl LIBS="$save_LIBS"
-    AC_CHECK_LIB([$cern_library], [$cern_func],
-       [ 
-         AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
-         LIBS="-l$1 $LIBS"
-
-         cernlib_lib_ok=yes 
-       ])
-fi
+[ 
+    cernlib_lib_ok=yes
+],
+[
+    CERNLIB_LIBS=$save_CERNLIB_LIBS
+])
+AC_LANG_POP(Fortran 77)
+LIBS=$save_LIBS
+AC_SUBST([CERNLIB_LIBS])
 
 AS_IF([test x"$cernlib_lib_ok" = xyes],
       [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_CERNLIB_${cern_library}_${cern_func}))


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cernlib.spec	12 Dec 2005 10:04:04 -0000	1.11
+++ cernlib.spec	15 Dec 2005 12:07:03 -0000	1.12
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.4
+Release:       9%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -65,7 +65,7 @@
 Source201: cernlib-deadpool.txt
 
 # debian patchset
-Patch0: cernlib_2005.05.09.dfsg-2.diff
+Patch0: cernlib_2005.05.09.dfsg-3.diff
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: 001-fix-missing-fluka.dpatch
@@ -88,6 +88,9 @@
 # a workaround for cups. Applied in doubt.
 Patch113: 113-cups-postscript-fix.dpatch
 Patch114: 114-install-scripts-properly.dpatch
+Patch115: 115-rsrtnt64-goto-outer-block.dpatch
+Patch116: 116-fix-fconc64-spaghetti-code.dpatch
+Patch117: 117-fix-optimizer-bug-in-gphot.dpatch
 Patch200: 200-comis-allow-special-chars-in-path.dpatch
 Patch201: 201-update-kuip-helper-apps.dpatch
 Patch202: 202-fix-includes-in-minuit-example.dpatch
@@ -101,8 +104,9 @@
 Patch208: 208-fix-redundant-packlib-dependencies.dpatch
 Patch209: 209-ignore-unneeded-headers-in-kmutil.c.dpatch
 Patch210: 210-improve-cfortran-header-files.dpatch
-# disabled in the debian patchset, enabled here
-Patch211: 211-fix-comis-on-64-bit-arches.dpatch
+# split in newer debian patchset
+Patch2110: 211-fix-comis-on-amd64.dpatch
+Patch2111: 211-fix-comis-on-ia64.dpatch
 Patch300: 300-skip-duplicate-lenocc.dpatch
 # Use another approach, see cernlib-enforce-FHS
 # Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -182,7 +186,6 @@
 Patch1203: cernlib-hwuli2_use_dimag.diff 
 Patch1204: cernlib-hwhiga_use_dimag.diff
 Patch1205: cernlib-gfortran.diff 
-Patch1206: cernlib-rsrtnt64_goto_outer_block.diff
 Patch1207: cernlib-v107z0_X_before_string.diff
 
 %description
@@ -310,6 +313,9 @@
 %patch -P 112 -p1
 %patch -P 113 -p1
 %patch -P 114 -p1
+%patch -P 115 -p1
+%patch -P 116 -p1
+%patch -P 117 -p1
 %patch -P 200 -p1
 %patch -P 201 -p1
 %patch -P 202 -p1
@@ -321,7 +327,8 @@
 %patch -P 208 -p1
 %patch -P 209 -p1
 %patch -P 210 -p1
-%patch -P 211 -p1
+%patch -P 2110 -p1
+%patch -P 2111 -p1
 %patch -P 300 -p1
 #%patch -P 301 -p1
 #%patch -P 302 -p1
@@ -455,7 +462,6 @@
 # use gfortran
 #%patch -P 1205
 # workaround gfortran bug
-%patch -P 1206
 %patch -P 1207
 
 # remove CVS directories
@@ -690,6 +696,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Wed Dec 14 2005 Patrice Dumas  - 2005-9
+- use new debian patchset
+
 * Fri Dec  9 2005 Patrice Dumas  - 2005-8.4
 - update with newer debian patchset for cernlib, fix licence issues
 - enable 64 bit fixes patch


Index: paw.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/paw.README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paw.README	9 Dec 2005 15:57:06 -0000	1.2
+++ paw.README	15 Dec 2005 12:07:04 -0000	1.3
@@ -41,11 +41,6 @@
 
 to the beginning of them.
 
-5) 64-bit issues
-
-Note that this package is not yet fully functional on 64-bit machines, as the
-COMIS portion of Pawlib does not yet work correctly on those architectures.
-
 -- Kevin McCarty , Tue, 22 Nov 2005
 
 Adapted to the rpm package by 


--- 211-fix-comis-on-64-bit-arches.dpatch DELETED ---


--- cernlib-rsrtnt64_goto_outer_block.diff DELETED ---


--- cernlib_2005.05.09.dfsg-2.diff DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec 15 12:53:38 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 15 Dec 2005 07:53:38 -0500
Subject: rpms/Coin2/devel Coin2.spec,1.20,1.21
Message-ID: <200512151254.jBFCs8Nw022769@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Coin2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22748

Modified Files:
	Coin2.spec 
Log Message:
- More hacks for modular X11.



Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Coin2.spec	21 Nov 2005 09:35:04 -0000	1.20
+++ Coin2.spec	15 Dec 2005 12:53:36 -0000	1.21
@@ -13,7 +13,7 @@
 Summary: High-level 3D visualization library
 Name: Coin2
 Version: 2.4.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -33,8 +33,6 @@
 BuildRequires: libGL-devel
 # Missing in libGL-devel, libXext-devel
 BuildRequires: libX11-devel
-# Missing in libXext-devel
-BuildRequires: xorg-x11-proto-devel
 
 BuildRequires: zlib-devel
 BuildRequires: bzip2-devel
@@ -52,9 +50,13 @@
 
 %package devel
 Summary: Development files for Coin
-Requires: %{name} = %{version}-%{release}
-Requires: xorg-x11-devel zlib-devel bzip2-devel
 Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: zlib-devel bzip2-devel
+Requires: libGLU-devel
+Requires: libGL-devel
+# Missing in libGL-devel, libXext-devel
+BuildRequires: libX11-devel
 
 %description devel
 Development package for Coin
@@ -120,6 +122,9 @@
 %doc %{coin_htmldir}
 
 %changelog
+* Thu Dec 15 2005 Ralf Corsepius  - 2.4.4-5
+- More hacks for modular X11.
+
 * Mon Nov 21 2005 Ralf Corsepius  - 2.4.4-4
 - Try to work around modular X having broken package deps.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 13:20:46 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 15 Dec 2005 08:20:46 -0500
Subject: rpms/Coin2/devel Coin-2.4.4-gcc-4.1.diff,NONE,1.1
Message-ID: <200512151320.jBFDKk23024659@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Coin2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24646

Added Files:
	Coin-2.4.4-gcc-4.1.diff 
Log Message:
New.

Coin-2.4.4-gcc-4.1.diff:

--- NEW FILE Coin-2.4.4-gcc-4.1.diff ---
--- Coin-2.4.4.orig/src/nodes/SoExtSelection.cpp	2005-06-09 13:35:44.000000000 +0200
+++ Coin-2.4.4/src/nodes/SoExtSelection.cpp	2005-12-15 14:14:54.000000000 +0100
@@ -348,7 +348,7 @@
     SbList coords;
     SoTimerSensor * updatetimer;
 
-    SelectionState::SelectionState(SoExtSelection * t)
+    SelectionState(SoExtSelection * t)
     {
       this->updatetimer = new SoTimerSensor(&SoExtSelectionP::timercallback, t);
       this->updatetimer->setBaseTime(SbTime::zero());
@@ -356,7 +356,7 @@
       this->reset();
     }
 
-    SelectionState::~SelectionState()
+    ~SelectionState()
     {
       delete this->updatetimer;
     }



From fedora-extras-commits at redhat.com  Thu Dec 15 13:21:48 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 15 Dec 2005 08:21:48 -0500
Subject: rpms/Coin2/devel Coin2.spec,1.21,1.22
Message-ID: <200512151322.jBFDMIPh024701@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Coin2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24678

Modified Files:
	Coin2.spec 
Log Message:
GCC-4.1 fixes


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Coin2.spec	15 Dec 2005 12:53:36 -0000	1.21
+++ Coin2.spec	15 Dec 2005 13:21:46 -0000	1.22
@@ -23,6 +23,7 @@
 
 Patch0: coin-2.3.0-simage-soname.diff
 Patch1: coin-2.3.0-openal-soname.diff
+Patch2: Coin2-2.4.4-gcc-4.1.diff
 Patch5: coin-2.3.0-man3.diff
 
 BuildRequires: libGLU-devel
@@ -65,6 +66,7 @@
 %setup -q -n Coin-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch5 -p1
 
 sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \
@@ -124,6 +126,7 @@
 %changelog
 * Thu Dec 15 2005 Ralf Corsepius  - 2.4.4-5
 - More hacks for modular X11.
+- Add Coin-2.4.4-gcc-4.1.diff.
 
 * Mon Nov 21 2005 Ralf Corsepius  - 2.4.4-4
 - Try to work around modular X having broken package deps.



From fedora-extras-commits at redhat.com  Thu Dec 15 13:35:44 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Thu, 15 Dec 2005 08:35:44 -0500
Subject: rpms/ghdl/devel .cvsignore, 1.2, 1.3 ghdl.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200512151336.jBFDaEQQ024774@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24752

Modified Files:
	.cvsignore ghdl.spec sources 
Log Message:
update to svn35



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Nov 2005 11:19:29 -0000	1.2
+++ .cvsignore	15 Dec 2005 13:35:42 -0000	1.3
@@ -1,2 +1,5 @@
 gcc-core-4.0.2.tar.bz2
 ghdl-0.21dev.tar.bz2
+ghdl-0.20-svn35.patch
+ghdl-imagef64fix.patch
+ghdl-0.20.tar.bz2


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghdl.spec	2 Dec 2005 16:40:11 -0000	1.3
+++ ghdl.spec	15 Dec 2005 13:35:42 -0000	1.4
@@ -1,10 +1,10 @@
 %define gccver 4.0.2
-%define versuffix dev
+%define ghdlver 0.20
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.21
-Release: 0.24svn.3%{?dist}
+Release: 0.35svn.1%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -12,15 +12,17 @@
 # check out the SVN repo
 # cd translate/gcc/
 # ./dist.sh sources
-Source0: http://ghdl.free.fr/ghdl-%{version}%{versuffix}.tar.bz2
+Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
-Patch0: ghdl-0.21-infodirentry.patch
+Patch0: ghdl-0.20-svn35.patch
+Patch1: ghdl-0.21-infodirentry.patch
+Patch2: ghdl-imagef64fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+Requires: gcc
 # gcc-gnat missing on ppc: Bug 174720
-# mock does not install glibc-devel.i386 on x86_64, therefore
 ExcludeArch: ppc
 
 # Make sure we don't use clashing namespaces
@@ -51,8 +53,12 @@
 
 %prep
 %setup -q -n gcc-%{gccver} -T -b 1 -a 0
-%{__mv} ghdl-%{version}%{versuffix}/vhdl gcc/
-%patch0 -p0
+pushd ghdl-%{ghdlver}
+%patch0 -p1
+%patch2 -p0 -b .imgf64
+%{__mv} vhdl ../gcc/
+popd
+%patch1 -p0
 
 %build
 %{__mkdir} obj-%{gcc_target_platform}
@@ -95,7 +101,7 @@
 	--mandir=%{_mandir} \
 	--infodir=%{_infodir} \
 	--enable-languages=vhdl \
-	--disable-multilib \
+	%{!?_without_mock:--disable-multilib} \
 %ifarch sparc
 	--host=%{gcc_target_platform} \
 	--build=%{gcc_target_platform} \
@@ -112,6 +118,8 @@
 	--host=%{gcc_target_platform}
 %endif
 
+%{__mkdir} -p gcc/vhdl
+%{__cp} ../gcc/vhdl/grt/grt.ver gcc/vhdl
 # Parallel make doesn't work, so not using %{?_smp_mflags}
 %{__make}
 
@@ -121,6 +129,37 @@
 %{__rm} -rf %{buildroot}
 %{__make} -C obj-%{gcc_target_platform} DESTDIR=%{buildroot} install
 
+%ifarch x86_64
+pushd obj-%{gcc_target_platform}/gcc/vhdl
+P32=%{buildroot}/%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib/32/
+%{__install} -d -o 0 -g 0 ${P32}
+make ghdllibs-clean
+%if %{!?_without_mock:0}%{?_without_mock:1}
+make grt-clean
+make GRT_FLAGS=-m32 GRT_TARGET_OBJS="i386.o linux.o times.o" ghdllib
+make grt.lst
+%{__install} -m 644 libgrt.a ${P32}/libgrt.a
+%{__install} -m 644 grt.lst ${P32}/grt.lst
+%{__install} -m 644 grt.ver ${P32}/grt.ver
+%endif
+PDIR=`pwd`
+pushd ${P32}/../..
+%{__install} -d -o 0 -g 0 lib/32/v93
+%{__install} -d -o 0 -g 0 lib/32/v87
+%{__make} -f ${PDIR}/Makefile REL_DIR=../../../.. \
+         LIBSRC_DIR="src" LIB93_DIR=lib/32/v93 LIB87_DIR=lib/32/v87 \
+         ANALYZE="${PDIR}/../ghdl -a -m32 --GHDL1=${PDIR}/../ghdl1 --ieee=none" \
+         std.v93 std.v87 ieee.v93 ieee.v87 synopsys.v93 synopsys.v87 mentor.v93
+popd
+../ghdl1 -m32 --std=87 -quiet -o std_standard.s --compile-standard
+../xgcc -m32 -c -o std_standard.o std_standard.s
+%{__mv} std_standard.o ${P32}/v87/std/std_standard.o
+../ghdl1 -m32 --std=93 -quiet -o std_standard.s --compile-standard
+../xgcc -m32 -c -o std_standard.o std_standard.s
+%{__mv} std_standard.o ${P32}/v93/std/std_standard.o
+popd
+%endif
+
 # Add additional libraries to link
 (
 echo "-lm"
@@ -145,6 +184,11 @@
 	.%{_exec_prefix}/lib/libmudflap.* \
 	.%{_exec_prefix}/lib/libmudflapth.* \
 	.%{_libdir}/32/libiberty.a
+# Remove crt/libgcc, as ghdl invokes the native gcc to perform the linking
+%{__rm} -f \
+	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/crt* \
+	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/libgc* \
+	.%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/{cc1,collect2}
 
 # Remove directory hierarchies not to be packaged
 %{__rm} -rf \
@@ -166,7 +210,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ghdl-%{version}%{versuffix}/COPYING
+%doc ghdl-%{ghdlver}/COPYING
 %{_bindir}/ghdl
 %{_infodir}/ghdl.info.gz
 # Need to own directory %{_libdir}/gcc even though we only want the
@@ -177,6 +221,18 @@
 %{_libexecdir}/gcc/
 
 %changelog
+* Thu Dec 15 2005 Thomas Sailer  - 0.21-0.35svn.1
+- update to svn35 for more x86_64 "Ada cannot portably call C vararg functions"
+  fixes
+- first stab at -m32 library building
+
+* Sat Dec 10 2005 Thomas Sailer  - 0.21-0.33svn.1
+- update to svn33, to fix x86_64 issues (real'image, -m32)
+- rpmbuild option --without mock enables multilib builds
+
+* Mon Dec  5 2005 Thomas Sailer  - 0.21-0.24svn.3
+- disable multilib and remove exclude of x86_64
+
 * Thu Dec  1 2005 Thomas Sailer  - 0.21-0.24svn.2
 - Exclude ppc because gcc-gnat is missing
 - Exclude x86_64 because of mock build issues


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Nov 2005 11:19:29 -0000	1.2
+++ sources	15 Dec 2005 13:35:42 -0000	1.3
@@ -1,2 +1,5 @@
 f7781398ada62ba255486673e6274b26  gcc-core-4.0.2.tar.bz2
 93d0d169eaca9119fa2eb3302f1a7ecc  ghdl-0.21dev.tar.bz2
+9903c648fb586c3abed0d3c9d574a1bb  ghdl-0.20-svn35.patch
+d7302c5e11b51ffec0ada78ee5f3764f  ghdl-imagef64fix.patch
+7d761a9469115e05dc965d68d9760f5b  ghdl-0.20.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 13:40:22 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 15 Dec 2005 08:40:22 -0500
Subject: rpms/meanwhile/devel .cvsignore, 1.4, 1.5 meanwhile.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200512151340.jBFDeqEp024839@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24815

Modified Files:
	.cvsignore meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Oct 2005 19:10:16 -0000	1.4
+++ .cvsignore	15 Dec 2005 13:40:20 -0000	1.5
@@ -1 +1 @@
-meanwhile-0.5.0.tar.gz
+meanwhile-1.0.0.tar.gz


Index: meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/meanwhile.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- meanwhile.spec	30 Oct 2005 19:10:16 -0000	1.4
+++ meanwhile.spec	15 Dec 2005 13:40:20 -0000	1.5
@@ -6,13 +6,12 @@
 Summary:	Lotus Sametime Community Client library
 License:	LGPL
 Group:		Applications/Internet
-Version:	0.5.0
+Version:	1.0.0
 Release:	1%{?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)
-BuildRequires: glib2-devel, gmp-devel, doxygen
-Requires: gmp
+BuildRequires: glib2-devel, doxygen
 
 %description
 The heart of the Meanwhile Project is the Meanwhile library, providing the
@@ -78,6 +77,10 @@
 %{_datadir}/doc/%{name}-doc-%{version}/
 
 %changelog
+* Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.0.0-1
+- Update to latest release
+- gmp and gmp-devel are no longer required since meanwhile uses mpi now
+
 * Sat Oct 29 2005 - jwboyer at jdub.homelinux.org 0.5.0-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Oct 2005 19:10:16 -0000	1.4
+++ sources	15 Dec 2005 13:40:20 -0000	1.5
@@ -1 +1 @@
-302229afe751c7bf889b13f276581dfc  meanwhile-0.5.0.tar.gz
+d1b78beabcb0f4255635edf772d63e52  meanwhile-1.0.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 13:42:09 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 15 Dec 2005 08:42:09 -0500
Subject: rpms/meanwhile/FC-4 .cvsignore, 1.4, 1.5 meanwhile.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200512151342.jBFDgerl024923@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24890

Modified Files:
	.cvsignore meanwhile.spec sources 
Log Message:
Update to latest release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Oct 2005 19:09:55 -0000	1.4
+++ .cvsignore	15 Dec 2005 13:42:07 -0000	1.5
@@ -1 +1 @@
-meanwhile-0.5.0.tar.gz
+meanwhile-1.0.0.tar.gz


Index: meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/meanwhile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- meanwhile.spec	30 Oct 2005 19:09:55 -0000	1.3
+++ meanwhile.spec	15 Dec 2005 13:42:07 -0000	1.4
@@ -6,13 +6,12 @@
 Summary:	Lotus Sametime Community Client library
 License:	LGPL
 Group:		Applications/Internet
-Version:	0.5.0
+Version:	1.0.0
 Release:	1%{?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)
-BuildRequires: glib2-devel, gmp-devel, doxygen
-Requires: gmp
+BuildRequires: glib2-devel, doxygen
 
 %description
 The heart of the Meanwhile Project is the Meanwhile library, providing the
@@ -78,6 +77,10 @@
 %{_datadir}/doc/%{name}-doc-%{version}/
 
 %changelog
+* Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.0.0-1
+- Update to latest release
+- gmp and gmp-devel are no longer required since meanwhile uses mpi now
+
 * Sat Oct 29 2005 - jwboyer at jdub.homelinux.org 0.5.0-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Oct 2005 19:09:55 -0000	1.4
+++ sources	15 Dec 2005 13:42:07 -0000	1.5
@@ -1 +1 @@
-302229afe751c7bf889b13f276581dfc  meanwhile-0.5.0.tar.gz
+d1b78beabcb0f4255635edf772d63e52  meanwhile-1.0.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 13:43:16 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 15 Dec 2005 08:43:16 -0500
Subject: rpms/gaim-meanwhile/devel .cvsignore, 1.5, 1.6 gaim-meanwhile.spec,
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200512151343.jBFDhkoD024994@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24972

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Oct 2005 19:14:53 -0000	1.5
+++ .cvsignore	15 Dec 2005 13:43:14 -0000	1.6
@@ -1 +1 @@
-gaim-meanwhile-1.2.5.tar.gz
+gaim-meanwhile-1.2.6.tar.gz


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gaim-meanwhile.spec	30 Oct 2005 19:14:53 -0000	1.6
+++ gaim-meanwhile.spec	15 Dec 2005 13:43:14 -0000	1.7
@@ -6,13 +6,13 @@
 Summary:	Lotus Sametime Community Client plugin for Gaim
 License:	GPL
 Group:		Applications/Internet
-Version:	1.2.5
+Version:	1.2.6
 Release:	1%{?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)
 BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 0.5.0
-Requires: gaim >= 1.2.1, meanwhile >= 0.5.0, meanwhile < 0.6.0
+Requires: gaim >= 1.2.1, meanwhile < 2.0.0
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
@@ -39,6 +39,9 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.2.6-1
+- Update to latest release
+
 * Sun Oct 30 2005 - jwboyer at jdub.homelinux.org 1.2.5-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Oct 2005 19:14:53 -0000	1.5
+++ sources	15 Dec 2005 13:43:14 -0000	1.6
@@ -1 +1 @@
-23cb1450dc6ecd2cb827bc9d1ec7048d  gaim-meanwhile-1.2.5.tar.gz
+215adb1af37e700f54a4b890788c587d  gaim-meanwhile-1.2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 13:44:45 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 15 Dec 2005 08:44:45 -0500
Subject: rpms/gaim-meanwhile/FC-4 .cvsignore, 1.5, 1.6 gaim-meanwhile.spec,
	1.6, 1.7 sources, 1.6, 1.7
Message-ID: <200512151345.jBFDjFWe025077@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25043

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Oct 2005 19:14:48 -0000	1.5
+++ .cvsignore	15 Dec 2005 13:44:43 -0000	1.6
@@ -1 +1 @@
-gaim-meanwhile-1.2.5.tar.gz
+gaim-meanwhile-1.2.6.tar.gz


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gaim-meanwhile.spec	30 Oct 2005 19:14:48 -0000	1.6
+++ gaim-meanwhile.spec	15 Dec 2005 13:44:43 -0000	1.7
@@ -6,13 +6,13 @@
 Summary:	Lotus Sametime Community Client plugin for Gaim
 License:	GPL
 Group:		Applications/Internet
-Version:	1.2.5
+Version:	1.2.6
 Release:	1%{?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)
 BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 0.5.0
-Requires: gaim >= 1.2.1, meanwhile >= 0.5.0, meanwhile < 0.6.0
+Requires: gaim >= 1.2.1, meanwhile < 2.0.0
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
@@ -39,6 +39,9 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.2.6-1
+- Update to latest release
+
 * Sun Oct 30 2005 - jwboyer at jdub.homelinux.org 1.2.5-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Oct 2005 19:14:48 -0000	1.6
+++ sources	15 Dec 2005 13:44:43 -0000	1.7
@@ -1 +1 @@
-23cb1450dc6ecd2cb827bc9d1ec7048d  gaim-meanwhile-1.2.5.tar.gz
+215adb1af37e700f54a4b890788c587d  gaim-meanwhile-1.2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 13:45:30 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 08:45:30 -0500
Subject: rpms/koffice/devel koffice.spec,1.20,1.21
Message-ID: <200512151346.jBFDk2RH025147@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25071

Modified Files:
	koffice.spec 
Log Message:
- with modular x libxslt-devel needs to be pulled in



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- koffice.spec	15 Dec 2005 10:16:31 -0000	1.20
+++ koffice.spec	15 Dec 2005 13:45:28 -0000	1.21
@@ -58,7 +58,8 @@
 BuildRequires:  doxygen
 BuildRequires:  graphviz-devel
 BuildRequires:  aspell-devel
-BuildRequireS:  libacl-devel
+BuildRequires:  libacl-devel
+BuildRequires:  libxslt-devel
 
 %description
 KOffice - Integrated Office Suite



From fedora-extras-commits at redhat.com  Thu Dec 15 13:46:10 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 15 Dec 2005 08:46:10 -0500
Subject: rpms/Coin2/devel Coin2.spec,1.22,1.23
Message-ID: <200512151346.jBFDkeEO025202@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Coin2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25154

Modified Files:
	Coin2.spec 
Log Message:
Fix typo.


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Coin2.spec	15 Dec 2005 13:21:46 -0000	1.22
+++ Coin2.spec	15 Dec 2005 13:46:07 -0000	1.23
@@ -23,7 +23,7 @@
 
 Patch0: coin-2.3.0-simage-soname.diff
 Patch1: coin-2.3.0-openal-soname.diff
-Patch2: Coin2-2.4.4-gcc-4.1.diff
+Patch2: Coin-2.4.4-gcc-4.1.diff
 Patch5: coin-2.3.0-man3.diff
 
 BuildRequires: libGLU-devel



From fedora-extras-commits at redhat.com  Thu Dec 15 13:51:38 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 08:51:38 -0500
Subject: rpms/orange/devel orange.spec,1.1,1.2
Message-ID: <200512151352.jBFDq8f4025288@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/orange/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25270

Modified Files:
	orange.spec 
Log Message:
- rebuild



Index: orange.spec
===================================================================
RCS file: /cvs/extras/rpms/orange/devel/orange.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- orange.spec	24 Nov 2005 23:38:26 -0000	1.1
+++ orange.spec	15 Dec 2005 13:51:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           orange
 Version:        0.3
-Release:        0.cvs20051118%{?dist}
+Release:        0.cvs20051118%{?dist}.1
 Summary:        Squeeze out installable Microsoft cabinet files
 
 Group:          Applications/Communications
@@ -71,6 +71,9 @@
 %{_includedir}/liborange.h
 
 %changelog
+* Thu Dec 15 2005 Andreas Bierfert 
+- rebuild
+
 * Fri Nov 18 2005 Christian Iseli  0.3-0
 - grab latest from CVS to use libgsf instead of obsolete libole2
 



From fedora-extras-commits at redhat.com  Thu Dec 15 14:24:14 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 15 Dec 2005 09:24:14 -0500
Subject: rpms/gaim-meanwhile/devel gaim-meanwhile.spec,1.7,1.8
Message-ID: <200512151424.jBFEOjh7027049@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27031

Modified Files:
	gaim-meanwhile.spec 
Log Message:
Fix meanwhile requires


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gaim-meanwhile.spec	15 Dec 2005 13:43:14 -0000	1.7
+++ gaim-meanwhile.spec	15 Dec 2005 14:24:02 -0000	1.8
@@ -7,12 +7,12 @@
 License:	GPL
 Group:		Applications/Internet
 Version:	1.2.6
-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)
-BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 0.5.0
-Requires: gaim >= 1.2.1, meanwhile < 2.0.0
+BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 1.0.0
+Requires: gaim >= 1.2.1, meanwhile >= 1.0.0, meanwhile < 2.0.0
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
@@ -39,6 +39,9 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Thu Dec 15 2005 - jwboyer at jdub.homelinux.org 1.2.6-2
+- Fix meanwhile requires
+
 * Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.2.6-1
 - Update to latest release
 



From fedora-extras-commits at redhat.com  Thu Dec 15 14:33:18 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Thu, 15 Dec 2005 09:33:18 -0500
Subject: rpms/gaim-meanwhile/FC-4 gaim-meanwhile.spec,1.7,1.8
Message-ID: <200512151433.jBFEXmF1027156@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27138

Modified Files:
	gaim-meanwhile.spec 
Log Message:
Fix meanwhile requires


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gaim-meanwhile.spec	15 Dec 2005 13:44:43 -0000	1.7
+++ gaim-meanwhile.spec	15 Dec 2005 14:33:16 -0000	1.8
@@ -7,12 +7,12 @@
 License:	GPL
 Group:		Applications/Internet
 Version:	1.2.6
-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)
-BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 0.5.0
-Requires: gaim >= 1.2.1, meanwhile < 2.0.0
+BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 1.0.0
+Requires: gaim >= 1.2.1, meanwhile >= 1.0.0, meanwhile < 2.0.0
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
@@ -39,6 +39,9 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Thu Dec 15 2005 - jwboyer at jdub.homelinux.org 1.2.6-2
+- Fix meanwhile requires
+
 * Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.2.6-1
 - Update to latest release
 



From fedora-extras-commits at redhat.com  Thu Dec 15 14:42:41 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 09:42:41 -0500
Subject: rpms/libAfterImage/devel libAfterImage.spec,1.2,1.3
Message-ID: <200512151443.jBFEhCrQ027275@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libAfterImage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27256

Modified Files:
	libAfterImage.spec 
Log Message:
- modular X



Index: libAfterImage.spec
===================================================================
RCS file: /cvs/extras/rpms/libAfterImage/devel/libAfterImage.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libAfterImage.spec	20 Aug 2005 13:26:23 -0000	1.2
+++ libAfterImage.spec	15 Dec 2005 14:42:39 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libAfterImage
 Version:        1.07
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A generic image manipulation library
 
 Group:          System Environment/Libraries
@@ -12,14 +12,13 @@
 Patch1:         libAfterImage-afterimage-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xorg-x11-devel
 BuildRequires:  freetype-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libungif-devel
 BuildRequires:  libjpeg-devel
-
+BuildRequires:  libX11-devel
 %description
 libAfterImage   is a generic image manipulation library. It was initially
 implemented to address AfterStep Window Manager's needs for image handling,
@@ -44,7 +43,7 @@
 Requires: libtiff-devel
 Requires: libjpeg-devel
 Requires: libpng-devel
-Requires: xorg-x11-devel
+Requires: libx11-devel
 
 %description devel
 The %{name}-devel package contains the files needed for development with
@@ -59,7 +58,7 @@
 %configure --enable-i18n --enable-sharedlibs \
 --with-xpm --without-builtin-ungif --disable-staticlibs --enable-glx \
 --without-afterbase --disable-mmx-optimization \
---x-includes=%{_prefix}/X11R6/include --x-libraries=%{_prefix}/X11R6/%{_lib} \
+--x-includes=%{_includedir} --x-libraries=%{_libdir}
 
 make CCFLAGS="-DNO_DEBUG_OUTPUT -fPIC $RPM_OPT_FLAGS" %{?_smp_mflags} \
 LIBAFTERIMAGE_PATH=../
@@ -93,6 +92,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Dec 15 2005 Andreas Bierfert 
+1.07-5
+- modular X
+
 * Sat Aug 20 2005 Andreas Bierfert 
 1.07-4
 - add -fPIC



From fedora-extras-commits at redhat.com  Thu Dec 15 14:44:57 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 09:44:57 -0500
Subject: rpms/gnome-applet-timer/devel .cvsignore, 1.2,
	1.3 gnome-applet-timer.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512151445.jBFEjRiW027348@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-serv27317

Modified Files:
	.cvsignore gnome-applet-timer.spec sources 
Log Message:
update to 1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Sep 2005 15:16:22 -0000	1.2
+++ .cvsignore	15 Dec 2005 14:44:55 -0000	1.3
@@ -1 +1 @@
-timer-applet-1.1.1.tar.gz
+timer-applet-1.2.tar.gz


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-applet-timer.spec	22 Sep 2005 16:31:23 -0000	1.2
+++ gnome-applet-timer.spec	15 Dec 2005 14:44:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
-Version:        1.1.1
-Release:        9%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -31,28 +31,12 @@
 %configure
 make %{?_smp_mflags}
 
-# Part one of omf install hack
-sed -i 's!!!' help/C/timer-applet-C.omf
-sed -i 's!!!' help/fr/timer-applet-fr.omf
-
-# Part one of libexec install hack
-sed -i 's!!!' GNOME_TimerApplet.server
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # For GConf apps: prevent schemas from being installed at this stage
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Part two of omf install hack
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-install -m 0644 -p help/C/timer-applet-C.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-install -m 0644 -p help/fr/timer-applet-fr.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-
-# Part two of libexec install hack
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
-mv ${RPM_BUILD_ROOT}%{_bindir}/timer-applet ${RPM_BUILD_ROOT}%{_libexecdir}/timer-applet
-
 %find_lang timer-applet
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -105,6 +89,10 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Wed Dec 15 2005 Christoph Wickert  - 1.2-1
+- Update to 1.2.
+- Remove all specfile hacks, problems are fixed upstream.
+
 * Thu Sep 22 2005 Christoph Wickert  - 1.1.1-9
 - Increase release due to tag collision.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2005 15:16:22 -0000	1.2
+++ sources	15 Dec 2005 14:44:55 -0000	1.3
@@ -1 +1 @@
-db9dacfa6bd35904dc88740764b1750e  timer-applet-1.1.1.tar.gz
+00dfc31e32a9a4cad3084b78a49c8a40  timer-applet-1.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 15:07:38 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 10:07:38 -0500
Subject: rpms/gnome-applet-timer/FC-4 .cvsignore, 1.2,
	1.3 gnome-applet-timer.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512151508.jBFF89xQ029134@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29104

Modified Files:
	.cvsignore gnome-applet-timer.spec sources 
Log Message:
update to 1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Sep 2005 15:16:22 -0000	1.2
+++ .cvsignore	15 Dec 2005 15:07:36 -0000	1.3
@@ -1 +1 @@
-timer-applet-1.1.1.tar.gz
+timer-applet-1.2.tar.gz


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-4/gnome-applet-timer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-applet-timer.spec	22 Sep 2005 17:03:13 -0000	1.2
+++ gnome-applet-timer.spec	15 Dec 2005 15:07:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
-Version:        1.1.1
-Release:        9%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -31,28 +31,12 @@
 %configure
 make %{?_smp_mflags}
 
-# Part one of omf install hack
-sed -i 's!!!' help/C/timer-applet-C.omf
-sed -i 's!!!' help/fr/timer-applet-fr.omf
-
-# Part one of libexec install hack
-sed -i 's!!!' GNOME_TimerApplet.server
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # For GConf apps: prevent schemas from being installed at this stage
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Part two of omf install hack
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-install -m 0644 -p help/C/timer-applet-C.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-install -m 0644 -p help/fr/timer-applet-fr.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-
-# Part two of libexec install hack
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
-mv ${RPM_BUILD_ROOT}%{_bindir}/timer-applet ${RPM_BUILD_ROOT}%{_libexecdir}/timer-applet
-
 %find_lang timer-applet
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -105,6 +89,10 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Wed Dec 15 2005 Christoph Wickert  - 1.2-1
+- Update to 1.2.
+- Remove all specfile hacks, problems are fixed upstream.
+
 * Thu Sep 22 2005 Christoph Wickert  - 1.1.1-9
 - Increase release due to tag collision.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2005 15:16:22 -0000	1.2
+++ sources	15 Dec 2005 15:07:36 -0000	1.3
@@ -1 +1 @@
-db9dacfa6bd35904dc88740764b1750e  timer-applet-1.1.1.tar.gz
+00dfc31e32a9a4cad3084b78a49c8a40  timer-applet-1.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 15:08:57 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Dec 2005 10:08:57 -0500
Subject: rpms/kmymoney2/FC-4 kmymoney2.spec,1.3,1.4
Message-ID: <200512151508.jBFF8v1E029231@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29123/FC-4

Modified Files:
	kmymoney2.spec 
Log Message:
change >= conditionals to >



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/kmymoney2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmymoney2.spec	14 Nov 2005 17:35:12 -0000	1.3
+++ kmymoney2.spec	15 Dec 2005 15:08:35 -0000	1.4
@@ -1,9 +1,9 @@
 
-%if "%{?fedora}" >= "3"
+%if "%{?fedora}" > "2"
 %define _with_ofxbanking --with-ofxbanking
 %endif
 
-%if "%{?rhel}" >= "4"
+%if "%{?rhel}" > "3"
 %define _with_ofxbanking --with-ofxbanking
 %endif
 



From fedora-extras-commits at redhat.com  Thu Dec 15 15:08:30 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Dec 2005 10:08:30 -0500
Subject: rpms/kmymoney2/FC-3 kmymoney2.spec,1.3,1.4
Message-ID: <200512151509.jBFF90Wp029238@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29123/FC-3

Modified Files:
	kmymoney2.spec 
Log Message:
change >= conditionals to >



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/kmymoney2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmymoney2.spec	14 Nov 2005 17:35:07 -0000	1.3
+++ kmymoney2.spec	15 Dec 2005 15:08:28 -0000	1.4
@@ -1,9 +1,9 @@
 
-%if "%{?fedora}" >= "3"
+%if "%{?fedora}" > "2"
 %define _with_ofxbanking --with-ofxbanking
 %endif
 
-%if "%{?rhel}" >= "4"
+%if "%{?rhel}" > "3"
 %define _with_ofxbanking --with-ofxbanking
 %endif
 



From fedora-extras-commits at redhat.com  Thu Dec 15 15:08:15 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Dec 2005 10:08:15 -0500
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.3,1.4
Message-ID: <200512151509.jBFF9J78029247@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29123/devel

Modified Files:
	kmymoney2.spec 
Log Message:
change >= conditionals to >



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmymoney2.spec	14 Nov 2005 17:35:17 -0000	1.3
+++ kmymoney2.spec	15 Dec 2005 15:08:12 -0000	1.4
@@ -1,9 +1,9 @@
 
-%if "%{?fedora}" >= "3"
+%if "%{?fedora}" > "2"
 %define _with_ofxbanking --with-ofxbanking
 %endif
 
-%if "%{?rhel}" >= "4"
+%if "%{?rhel}" > "3"
 %define _with_ofxbanking --with-ofxbanking
 %endif
 



From fedora-extras-commits at redhat.com  Thu Dec 15 15:10:00 2005
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Thu, 15 Dec 2005 10:10:00 -0500
Subject: rpms/nedit/devel nedit.spec,1.3,1.4
Message-ID: <200512151510.jBFFAUgt029276@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/nedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29251/nedit/devel

Modified Files:
	nedit.spec 
Log Message:
- rebuilt to fix X dependency



Index: nedit.spec
===================================================================
RCS file: /cvs/extras/rpms/nedit/devel/nedit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nedit.spec	17 Oct 2005 08:16:21 -0000	1.3
+++ nedit.spec	15 Dec 2005 15:09:57 -0000	1.4
@@ -5,7 +5,7 @@
 Summary: A GUI text editor for systems with X and Motif.
 Name: nedit
 Version: 5.5
-Release: 5
+Release: 6
 Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2
 Source1: nedit.desktop
 Source2: nedit-icon.png
@@ -80,6 +80,9 @@
 %endif
 
 %changelog
+* Thu Dec 15 2005 Jindrich Novy  5.5-6
+- rebuilt to fix X dependencies
+
 * Mon Oct 10 2005 Jindrich Novy  5.5-5
 - update nedit file locations to new xorg standards (#167208, #170937)
 - rename nc to nedit-client to avoid conflict with netcat and



From fedora-extras-commits at redhat.com  Thu Dec 15 15:11:47 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:11:47 -0500
Subject: rpms/chmlib - New directory
Message-ID: <200512151511.jBFFBlsH029327@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29318/chmlib

Log Message:
Directory /cvs/extras/rpms/chmlib added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 15:11:53 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:11:53 -0500
Subject: rpms/chmlib/devel - New directory
Message-ID: <200512151511.jBFFBrED029346@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29318/chmlib/devel

Log Message:
Directory /cvs/extras/rpms/chmlib/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 15:13:05 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:13:05 -0500
Subject: rpms/chmlib Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512151513.jBFFD5jj029391@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29378

Added Files:
	Makefile import.log 
Log Message:
Setup of module chmlib


--- NEW FILE Makefile ---
# Top level Makefile for module chmlib
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 15 15:13:24 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:13:24 -0500
Subject: rpms/chmlib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512151513.jBFFDPhh029410@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29378/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module chmlib


--- NEW 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 Dec 15 15:14:31 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 10:14:31 -0500
Subject: rpms/gnome-applet-timer/FC-3 .cvsignore, 1.2,
	1.3 gnome-applet-timer.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512151515.jBFFFApa029466@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29437

Modified Files:
	.cvsignore gnome-applet-timer.spec sources 
Log Message:
update to 1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Sep 2005 15:16:22 -0000	1.2
+++ .cvsignore	15 Dec 2005 15:14:24 -0000	1.3
@@ -1 +1 @@
-timer-applet-1.1.1.tar.gz
+timer-applet-1.2.tar.gz


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-3/gnome-applet-timer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-applet-timer.spec	22 Sep 2005 17:06:25 -0000	1.2
+++ gnome-applet-timer.spec	15 Dec 2005 15:14:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
-Version:        1.1.1
-Release:        9%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -31,28 +31,12 @@
 %configure
 make %{?_smp_mflags}
 
-# Part one of omf install hack
-sed -i 's!!!' help/C/timer-applet-C.omf
-sed -i 's!!!' help/fr/timer-applet-fr.omf
-
-# Part one of libexec install hack
-sed -i 's!!!' GNOME_TimerApplet.server
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # For GConf apps: prevent schemas from being installed at this stage
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Part two of omf install hack
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-install -m 0644 -p help/C/timer-applet-C.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-install -m 0644 -p help/fr/timer-applet-fr.omf $RPM_BUILD_ROOT%{_datadir}/omf/timer-applet
-
-# Part two of libexec install hack
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
-mv ${RPM_BUILD_ROOT}%{_bindir}/timer-applet ${RPM_BUILD_ROOT}%{_libexecdir}/timer-applet
-
 %find_lang timer-applet
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -105,6 +89,10 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Wed Dec 15 2005 Christoph Wickert  - 1.2-1
+- Update to 1.2.
+- Remove all specfile hacks, problems are fixed upstream.
+
 * Thu Sep 22 2005 Christoph Wickert  - 1.1.1-9
 - Increase release due to tag collision.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2005 15:16:22 -0000	1.2
+++ sources	15 Dec 2005 15:14:24 -0000	1.3
@@ -1 +1 @@
-db9dacfa6bd35904dc88740764b1750e  timer-applet-1.1.1.tar.gz
+00dfc31e32a9a4cad3084b78a49c8a40  timer-applet-1.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 15:16:05 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:16:05 -0500
Subject: rpms/chmlib import.log,1.1,1.2
Message-ID: <200512151516.jBFFGanJ029590@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29549

Modified Files:
	import.log 
Log Message:
auto-import chmlib-0.37.4-1 on branch devel from chmlib-0.37.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/chmlib/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 15:13:03 -0000	1.1
+++ import.log	15 Dec 2005 15:16:03 -0000	1.2
@@ -0,0 +1 @@
+chmlib-0_37_4-1:HEAD:chmlib-0.37.4-1.src.rpm:1134659729



From fedora-extras-commits at redhat.com  Thu Dec 15 15:16:11 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:16:11 -0500
Subject: rpms/chmlib/devel chmlib.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512151516.jBFFGfrm029596@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29549/devel

Modified Files:
	.cvsignore sources 
Added Files:
	chmlib.spec 
Log Message:
auto-import chmlib-0.37.4-1 on branch devel from chmlib-0.37.4-1.src.rpm


--- NEW FILE chmlib.spec ---
Name: 		chmlib
Summary: 	Library for dealing with ITSS/CHM format files
Version: 	0.37.4
Release: 	1
License: 	LGPL
Group: 		Development/Libraries
Url: 		http://66.93.236.84/~jedwin/projects/chmlib/
Source: 	http://66.93.236.84/~jedwin/projects/chmlib/%{name}-%{version}.tgz
Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
CHMLIB is a library for dealing with ITSS/CHM format files. Right now, it is 
a very simple library, but sufficient for dealing with all of the .chm files 
I've come across. Due to the fairly well-designed indexing built into this 
particular file format, even a small library is able to gain reasonably good 
performance indexing into ITSS archives.

%package devel
Summary:	Library for dealing with ITSS/CHM format files - development files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Files needed for developing apps using chmlib.

%prep
%setup -q -n chmlib-0.37

%build
%configure --disable-static
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
%{__rm} -f %{buildroot}/%{_libdir}/*.la

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_libdir}/libchm.so.*
%doc README AUTHORS COPYING NEWS

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/libchm.so

%changelog

* Sat Nov 12 2005 Peter Lemenkov  0.37.4-1
- Initial build for FC-Extras



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 15:13:19 -0000	1.1
+++ .cvsignore	15 Dec 2005 15:16:09 -0000	1.2
@@ -0,0 +1 @@
+chmlib-0.37.4.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 15:13:19 -0000	1.1
+++ sources	15 Dec 2005 15:16:09 -0000	1.2
@@ -0,0 +1 @@
+458c14c7a38c441263e6984924a05b24  chmlib-0.37.4.tgz



From fedora-extras-commits at redhat.com  Thu Dec 15 15:22:52 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:22:52 -0500
Subject: owners owners.list,1.453,1.454
Message-ID: <200512151523.jBFFNMQd029727@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29698

Modified Files:
	owners.list 
Log Message:

Added chmlib-module.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- owners.list	15 Dec 2005 05:31:50 -0000	1.453
+++ owners.list	15 Dec 2005 15:22:50 -0000	1.454
@@ -96,6 +96,7 @@
 Fedora Extras|cgoban|X board for playing go|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
+Fedora Extras|chmlib|Library for dealing with ITSS/CHM format files|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|clamav|End-user tools for the Clam Antivirus scanner|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 15 15:23:37 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 10:23:37 -0500
Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec,1.3,1.4
Message-ID: <200512151524.jBFFO7Nh029756@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-serv29733

Modified Files:
	gnome-applet-timer.spec 
Log Message:
Bump release due to tag collision in Core 4


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applet-timer.spec	15 Dec 2005 14:44:55 -0000	1.3
+++ gnome-applet-timer.spec	15 Dec 2005 15:23:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -89,6 +89,9 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Wed 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
 - Update to 1.2.
 - Remove all specfile hacks, problems are fixed upstream.



From fedora-extras-commits at redhat.com  Thu Dec 15 15:25:32 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 10:25:32 -0500
Subject: rpms/gnome-applet-timer/FC-4 gnome-applet-timer.spec,1.3,1.4
Message-ID: <200512151526.jBFFQ3UK029788@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29770

Modified Files:
	gnome-applet-timer.spec 
Log Message:
Bump release due to tag collision in Core 4


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-4/gnome-applet-timer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applet-timer.spec	15 Dec 2005 15:07:36 -0000	1.3
+++ gnome-applet-timer.spec	15 Dec 2005 15:25:30 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -89,6 +89,9 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Wed 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
 - Update to 1.2.
 - Remove all specfile hacks, problems are fixed upstream.



From fedora-extras-commits at redhat.com  Thu Dec 15 15:29:45 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 15 Dec 2005 10:29:45 -0500
Subject: rpms/chmlib/devel chmlib.spec,1.1,1.2
Message-ID: <200512151530.jBFFUGAT029844@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29824/devel

Modified Files:
	chmlib.spec 
Log Message:

Added missing dist tag.




Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chmlib.spec	15 Dec 2005 15:16:09 -0000	1.1
+++ chmlib.spec	15 Dec 2005 15:29:43 -0000	1.2
@@ -1,7 +1,7 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.37.4
-Release: 	1
+Release: 	1%{?dist}
 License: 	LGPL
 Group: 		Development/Libraries
 Url: 		http://66.93.236.84/~jedwin/projects/chmlib/



From fedora-extras-commits at redhat.com  Thu Dec 15 15:48:30 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 10:48:30 -0500
Subject: rpms/gnome-applet-timer/FC-3 gnome-applet-timer.spec,1.3,1.4
Message-ID: <200512151549.jBFFn0Zn030036@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30003

Modified Files:
	gnome-applet-timer.spec 
Log Message:
Bump release due to tag collision in Core 4


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/FC-3/gnome-applet-timer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applet-timer.spec	15 Dec 2005 15:14:24 -0000	1.3
+++ gnome-applet-timer.spec	15 Dec 2005 15:48:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gnome-applet-timer
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -89,6 +89,9 @@
 %{_datadir}/pixmaps/timer-applet
 
 %changelog
+* Wed 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
 - Update to 1.2.
 - Remove all specfile hacks, problems are fixed upstream.



From fedora-extras-commits at redhat.com  Thu Dec 15 15:49:01 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 10:49:01 -0500
Subject: rpms/nsd/devel nsd.spec,1.5,1.6
Message-ID: <200512151549.jBFFnWuK030053@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30021

Modified Files:
	nsd.spec 
Log Message:
* Thu Dec 15 2005 Paul Wouters  - 2.3.3-7
- chkconfig and attribute  changes as proposed by Dmitry Butskoy



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsd.spec	15 Dec 2005 04:50:32 -0000	1.5
+++ nsd.spec	15 Dec 2005 15:48:59 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -29,10 +29,10 @@
 %{__make} %{?_smp_mflags}
 
 %install
+rm -rf %{buildroot}
 # Not using their 'make install' since it uses install-sh which does not
 # get the correct install path within the RPM_BUILD_ROOT
 #%{__make} install
-rm -rf %{buildroot}
 install -d 0755 %{buildroot}/%{_sysconfdir}/nsd
 install -d 0755 %{buildroot}/%{_sbindir}
 install -d 0755 %{buildroot}/%{_mandir}/man8
@@ -51,7 +51,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %files 
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README LICENSE NSD-DATABASE DIFFERENCES dbaccess.c TODO RELNOTES REQUIREMENTS
 %dir %{_sysconfdir}/nsd/
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
@@ -70,19 +70,13 @@
 exit 0
 
 %post
-# do not activate daemon upon request. Fedora Extra policy
+/sbin/chkconfig --add %{name}
 
 %preun
-if [ -f /%{_localstatedir}/run/%{name}/%{name}.pid ]
-then
+if [ $1 -eq 0 ]; then
         /sbin/service %{name} stop > /dev/null 2>&1
+        /sbin/chkconfig --del %{name} 
 fi
-if [ $1 -eq 0 ]
-then
-        /sbin/chkconfig --del %{name} > /dev/null 2>&1
-fi
-# "Everyone is doing it, so why can't we?"
-exit 0
 
 %postun
 if [ "$1" -ge "1" ]; then
@@ -90,6 +84,9 @@
 fi
 
 %changelog
+* Thu Dec 15 2005 Paul Wouters  - 2.3.3-7
+- chkconfig and attribute  changes as proposed by Dmitry Butskoy
+
 * Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
 - Moved pid file to /var/run/nsd/nsd.pid.
 - Use %{_localstatedir} instead of "/var"



From fedora-extras-commits at redhat.com  Thu Dec 15 15:50:33 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 10:50:33 -0500
Subject: rpms/aterm/devel aterm.spec,1.10,1.11
Message-ID: <200512151551.jBFFp3Pt030095@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/aterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30077

Modified Files:
	aterm.spec 
Log Message:
- modular X



Index: aterm.spec
===================================================================
RCS file: /cvs/extras/rpms/aterm/devel/aterm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- aterm.spec	20 Aug 2005 09:00:49 -0000	1.10
+++ aterm.spec	15 Dec 2005 15:50:31 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           aterm
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Afterstep XVT, VT102 emulator for the X Window system
 Group:          User Interface/X
@@ -10,9 +10,11 @@
 Source1:        aterm.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:  xorg-x11-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libAfterImage-devel
+BuildRequires:  libXt-devel
+BuildRequires:  libXext-devel
+BuildRequires:  mesa-libGL-devel
 
 %description
 aterm,  version  1.00 is  a colour vt102 terminal emulator, based on
@@ -31,7 +33,8 @@
 --enable-next-scroll --enable-utmp --enable-wtmp \
 --enable-menubar --enable-graphics -enable-kanji \
 --enable-big5 --enable-greek --enable-ttygid \
---enable-xgetdefault --with-term=xterm --with-x
+--enable-xgetdefault --with-term=xterm \
+--x-includes=%{_includedir} --x-libraries=%{_libdir}
 
 make %{?_smp_mflags}
 



From fedora-extras-commits at redhat.com  Thu Dec 15 16:14:08 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 15 Dec 2005 11:14:08 -0500
Subject: rpms/libAfterImage/devel libAfterImage.spec,1.3,1.4
Message-ID: <200512151614.jBFGEd8K031872@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libAfterImage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31854

Modified Files:
	libAfterImage.spec 
Log Message:
- fix typo



Index: libAfterImage.spec
===================================================================
RCS file: /cvs/extras/rpms/libAfterImage/devel/libAfterImage.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libAfterImage.spec	15 Dec 2005 14:42:39 -0000	1.3
+++ libAfterImage.spec	15 Dec 2005 16:14:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libAfterImage
 Version:        1.07
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A generic image manipulation library
 
 Group:          System Environment/Libraries
@@ -43,7 +43,7 @@
 Requires: libtiff-devel
 Requires: libjpeg-devel
 Requires: libpng-devel
-Requires: libx11-devel
+Requires: libX11-devel
 
 %description devel
 The %{name}-devel package contains the files needed for development with
@@ -93,6 +93,10 @@
 
 %changelog
 * Thu Dec 15 2005 Andreas Bierfert 
+1.07-6
+- fix typo
+
+* Thu Dec 15 2005 Andreas Bierfert 
 1.07-5
 - modular X
 



From fedora-extras-commits at redhat.com  Thu Dec 15 16:21:54 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 11:21:54 -0500
Subject: rpms/nsd/FC-3 nsd.spec,1.4,1.5
Message-ID: <200512151622.jBFGMOEw031947@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31924

Modified Files:
	nsd.spec 
Log Message:
* Thu Dec 15 2005 Paul Wouters  - 2.3.3-7
- chkconfig and attribute  changes as proposed by Dmitry Butskoy



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsd.spec	15 Dec 2005 04:53:18 -0000	1.4
+++ nsd.spec	15 Dec 2005 16:21:52 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -29,10 +29,10 @@
 %{__make} %{?_smp_mflags}
 
 %install
+rm -rf %{buildroot}
 # Not using their 'make install' since it uses install-sh which does not
 # get the correct install path within the RPM_BUILD_ROOT
 #%{__make} install
-rm -rf %{buildroot}
 install -d 0755 %{buildroot}/%{_sysconfdir}/nsd
 install -d 0755 %{buildroot}/%{_sbindir}
 install -d 0755 %{buildroot}/%{_mandir}/man8
@@ -51,7 +51,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %files 
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README LICENSE NSD-DATABASE DIFFERENCES dbaccess.c TODO RELNOTES REQUIREMENTS
 %dir %{_sysconfdir}/nsd/
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
@@ -70,19 +70,13 @@
 exit 0
 
 %post
-# do not activate daemon upon request. Fedora Extra policy
+/sbin/chkconfig --add %{name}
 
 %preun
-if [ -f /%{_localstatedir}/run/%{name}/%{name}.pid ]
-then
+if [ $1 -eq 0 ]; then
         /sbin/service %{name} stop > /dev/null 2>&1
+        /sbin/chkconfig --del %{name} 
 fi
-if [ $1 -eq 0 ]
-then
-        /sbin/chkconfig --del %{name} > /dev/null 2>&1
-fi
-# "Everyone is doing it, so why can't we?"
-exit 0
 
 %postun
 if [ "$1" -ge "1" ]; then
@@ -90,6 +84,9 @@
 fi
 
 %changelog
+* Thu Dec 15 2005 Paul Wouters  - 2.3.3-7
+- chkconfig and attribute  changes as proposed by Dmitry Butskoy
+
 * Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
 - Moved pid file to /var/run/nsd/nsd.pid.
 - Use %{_localstatedir} instead of "/var"



From fedora-extras-commits at redhat.com  Thu Dec 15 16:24:10 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 11:24:10 -0500
Subject: rpms/nsd/FC-4 nsd.spec,1.4,1.5
Message-ID: <200512151624.jBFGOe4H032081@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32059

Modified Files:
	nsd.spec 
Log Message:
* Thu Dec 15 2005 Paul Wouters  - 2.3.3-7
- chkconfig and attribute  changes as proposed by Dmitry Butskoy



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsd.spec	15 Dec 2005 04:52:14 -0000	1.4
+++ nsd.spec	15 Dec 2005 16:24:07 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -29,10 +29,10 @@
 %{__make} %{?_smp_mflags}
 
 %install
+rm -rf %{buildroot}
 # Not using their 'make install' since it uses install-sh which does not
 # get the correct install path within the RPM_BUILD_ROOT
 #%{__make} install
-rm -rf %{buildroot}
 install -d 0755 %{buildroot}/%{_sysconfdir}/nsd
 install -d 0755 %{buildroot}/%{_sbindir}
 install -d 0755 %{buildroot}/%{_mandir}/man8
@@ -51,7 +51,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %files 
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README LICENSE NSD-DATABASE DIFFERENCES dbaccess.c TODO RELNOTES REQUIREMENTS
 %dir %{_sysconfdir}/nsd/
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
@@ -70,19 +70,13 @@
 exit 0
 
 %post
-# do not activate daemon upon request. Fedora Extra policy
+/sbin/chkconfig --add %{name}
 
 %preun
-if [ -f /%{_localstatedir}/run/%{name}/%{name}.pid ]
-then
+if [ $1 -eq 0 ]; then
         /sbin/service %{name} stop > /dev/null 2>&1
+        /sbin/chkconfig --del %{name} 
 fi
-if [ $1 -eq 0 ]
-then
-        /sbin/chkconfig --del %{name} > /dev/null 2>&1
-fi
-# "Everyone is doing it, so why can't we?"
-exit 0
 
 %postun
 if [ "$1" -ge "1" ]; then
@@ -90,6 +84,9 @@
 fi
 
 %changelog
+* Thu Dec 15 2005 Paul Wouters  - 2.3.3-7
+- chkconfig and attribute  changes as proposed by Dmitry Butskoy
+
 * Thu Dec 15 2005 Paul Wouters  - 2.3.3-6
 - Moved pid file to /var/run/nsd/nsd.pid.
 - Use %{_localstatedir} instead of "/var"



From fedora-extras-commits at redhat.com  Thu Dec 15 16:24:46 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 15 Dec 2005 11:24:46 -0500
Subject: rpms/plplot/devel plplot.spec,1.5,1.6
Message-ID: <200512151625.jBFGPHQY032104@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32080

Modified Files:
	plplot.spec 
Log Message:
Rebuild for gcc 4.1



Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plplot.spec	30 Aug 2005 15:53:16 -0000	1.5
+++ plplot.spec	15 Dec 2005 16:24:44 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           plplot
 Version:        5.5.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -308,6 +308,9 @@
 %{_datadir}/plplot%{version}/examples/tk/
 
 %changelog
+* Thu Dec 15 2005 - Orion Poplawski  - 5.5.3-9
+- Rebuild for gcc 4.1
+
 * Tue Aug 30 2005 - Orion Poplawski  - 5.5.3-8
 - Re-enable java on ppc - should be fixed in upstream rawhide
 



From fedora-extras-commits at redhat.com  Thu Dec 15 16:27:00 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 15 Dec 2005 11:27:00 -0500
Subject: rpms/tla/FC-4 tla.spec,1.17,1.18
Message-ID: <200512151627.jBFGRU3E032210@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/tla/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32189

Modified Files:
	tla.spec 
Log Message:
Don't build on PPC



Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/FC-4/tla.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tla.spec	13 Jun 2005 17:08:03 -0000	1.17
+++ tla.spec	15 Dec 2005 16:26:58 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           tla
 Version:        1.3.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
@@ -16,6 +16,7 @@
 
 BuildRequires:  neon-devel, which
 Requires:       tar, diffutils, patch
+ExcludeArch:    ppc
 
 %description
 Arch is a really nifty revision control system. It's "whole-tree changeset
@@ -71,6 +72,9 @@
 %{_bindir}/tla
 
 %changelog
+* Thu Dec 15 2005 Shahms E. King  - 1.3.3-2
+- Don't build on PPC on FC4 as it fails
+
 * Mon Jun 13 2005 Shahms E. King  - 0.1.3.3-1
 - Update to new upstream version
 



From fedora-extras-commits at redhat.com  Thu Dec 15 16:28:27 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu, 15 Dec 2005 11:28:27 -0500
Subject: fedora-security/audit fc4,1.107,1.108 fc5,1.18,1.19
Message-ID: <200512151628.jBFGSvMn032296@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32264

Modified Files:
	fc4 fc5 
Log Message:
Updates for 20051214



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- fc4	14 Dec 2005 11:42:15 -0000	1.107
+++ fc4	15 Dec 2005 16:28:25 -0000	1.108
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20051213
-Up to date FC4 as of 20051211
+Up to date CVE as of CVE email 20051214
+Up to date FC4 as of 20051214
 
 ** are items that need attention
 
@@ -9,21 +9,24 @@
 CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
+CVE-2005-3193 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)
 CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3193 backport (poppler) [since FEDORA-2005-1132]
+CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3192 VULNERABLE (xpdf)
 CVE-2005-3192 VULNERABLE (kdegraphics)
 CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3192 backport (poppler) [since FEDORA-2005-1132]
+CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3191 VULNERABLE (xpdf)
 CVE-2005-3191 VULNERABLE (kdegraphics)
 CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3191 backport (poppler) [since FEDORA-2005-1132]
 CVE-2005-3964 VULNERABLE (openmotif) bz#174815
-CVE-2005-3962 backport (perl) [since FEDORA-2005-1113]
-CVE-2005-3912 backport (perl) [since FEDORA-2005-1113]
+CVE-2005-3962 backport (perl) [since FEDORA-2005-1144]
+CVE-2005-3912 backport (perl) [since FEDORA-2005-1144]
 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)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fc5	14 Dec 2005 11:42:15 -0000	1.18
+++ fc5	15 Dec 2005 16:28:25 -0000	1.19
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20051213
+Up to date CVE as of CVE email 20051214
 Up to date FC5 as of FC5-Test1-RC
 
 1. Removed packages with security issues that are no longer in FC5 



From fedora-extras-commits at redhat.com  Thu Dec 15 16:30:38 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 11:30:38 -0500
Subject: rpms/nsd/FC-4 nsd.spec,1.5,1.6
Message-ID: <200512151631.jBFGV8c7032354@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32334

Modified Files:
	nsd.spec 
Log Message:
bump version



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsd.spec	15 Dec 2005 16:24:07 -0000	1.5
+++ nsd.spec	15 Dec 2005 16:30:36 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
 Version: 2.3.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 16:40:57 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 15 Dec 2005 11:40:57 -0500
Subject: rpms/mod_auth_pam/devel mod_auth_pam.spec,1.3,1.4
Message-ID: <200512151641.jBFGfRkN032517@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-serv32499

Modified Files:
	mod_auth_pam.spec 
Log Message:
Bump for Apache 2.2.0


Index: mod_auth_pam.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_auth_pam/devel/mod_auth_pam.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_auth_pam.spec	7 Oct 2005 13:56:21 -0000	1.3
+++ mod_auth_pam.spec	15 Dec 2005 16:40:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           mod_auth_pam
 Version:        1.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PAM authentication module for Apache
 
 Group:          System Environment/Daemons
@@ -52,6 +52,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Thu Dec 15 2005 Ignacio Vazquez-Abrams  1.1.1-3
+- Bump for Apache 2.2.0
+
 * Fri Oct  7 2005 Ignacio Vazquez-Abrams  1.1.1-2
 - Use include instead of pam_stack
 



From fedora-extras-commits at redhat.com  Thu Dec 15 17:17:54 2005
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 15 Dec 2005 12:17:54 -0500
Subject: rpms/tla/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tla.spec, 1.18,
	1.19 tla-sysneon.patch, 1.3, NONE
Message-ID: <200512151718.jBFHIPmU001794@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/tla/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1772

Modified Files:
	.cvsignore sources tla.spec 
Removed Files:
	tla-sysneon.patch 
Log Message:
Backport Ville's patches from devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tla/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Jun 2005 17:08:03 -0000	1.8
+++ .cvsignore	15 Dec 2005 17:17:52 -0000	1.9
@@ -1,2 +1,3 @@
 tla-1.3.3.tar.gz
 tla-1.3.3.tar.gz.sig
+tla_1.3.3-3.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tla/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Jun 2005 17:08:03 -0000	1.8
+++ sources	15 Dec 2005 17:17:52 -0000	1.9
@@ -1,2 +1,3 @@
 61d5dea41e071f78a8319401ee07ab0b  tla-1.3.3.tar.gz
 2e176f99458250c04c6cbdb2f71b6b27  tla-1.3.3.tar.gz.sig
+feb23c5632fec91307f29738ec246c12  tla_1.3.3-3.diff.gz


Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/FC-4/tla.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tla.spec	15 Dec 2005 16:26:58 -0000	1.18
+++ tla.spec	15 Dec 2005 17:17:52 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           tla
 Version:        1.3.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
@@ -10,13 +10,12 @@
 Source1:        http://ftp.gnu.org/gnu/gnu-arch/%{name}-%{version}.tar.gz.sig
 # Patch0 from SuSE 9.1's tla-1.2-15
 Patch0:         tla-1.2pre0-posix.patch
-Patch1:         tla-sysneon.patch
+Patch1:         http://ftp.debian.org/debian/pool/main/t/tla/tla_1.3.3-3.diff.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  neon-devel, which
 Requires:       tar, diffutils, patch
-ExcludeArch:    ppc
 
 %description
 Arch is a really nifty revision control system. It's "whole-tree changeset
@@ -39,7 +38,6 @@
 %build
 mkdir src/=build
 cd src/=build
-#export CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
 ../configure \
   --prefix=%{_prefix} --with-install-link-tools=yes --with-cc=%{__cc}
 make CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)" # %{?_smp_mflags} # 1.[23] is not parallel build clean
@@ -48,18 +46,20 @@
 mkdir -p docs-tla/html
 (cd ../docs-tla; find .  -name \*.css -o -name \*.html | xargs tar -cf- ) | \
 (cd docs-tla/html; tar -xf-)
+cd ../..
+
+mkdir debian/tmp
+PATH="`pwd`/src/=build/tla/tla:$PATH" perl debian/generate-manpage.pl tla.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd src/=build
-make install destdir=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
+make -C src/=build install \
+    destdir=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
+install -Dpm 644 debian/tmp/tla.1 $RPM_BUILD_ROOT%{_mandir}/man1/tla.1
+rm $RPM_BUILD_ROOT%{_bindir}/awiki
 
-%check || :
-cd src/=build
-make test CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
-
-# don't install "awiki"
-rm $RPM_BUILD_ROOT%{_prefix}/bin/awiki
+%check
+make -C src/=build test CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,12 +70,18 @@
 %{_bindir}/make-links
 %{_bindir}/remove-links
 %{_bindir}/tla
+%{_mandir}/man1/tla.1*
 
 %changelog
-* Thu Dec 15 2005 Shahms E. King  - 1.3.3-2
-- Don't build on PPC on FC4 as it fails
+* 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.
+- Specfile cleanups.
+
+* Tue Dec 13 2005 Ville Skytt??  - 1.3.3-2
+- Rebuild against new OpenSSL.
 
-* Mon Jun 13 2005 Shahms E. King  - 0.1.3.3-1
+* Mon Jun 13 2005 Shahms E. King  - 1.3.3-1
 - Update to new upstream version
 
 * Sun May 22 2005 Jeremy Katz  - 1.3.2


--- tla-sysneon.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec 15 17:52:43 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Dec 2005 12:52:43 -0500
Subject: rpms/kile/devel kile.spec,1.20,1.21
Message-ID: <200512151753.jBFHrE1Q002008@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1940/devel

Modified Files:
	kile.spec 
Log Message:
use handier loop for icon handling



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kile.spec	10 Nov 2005 19:23:53 -0000	1.20
+++ kile.spec	15 Dec 2005 17:52:41 -0000	1.21
@@ -96,13 +96,17 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 



From fedora-extras-commits at redhat.com  Thu Dec 15 17:52:49 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Dec 2005 12:52:49 -0500
Subject: rpms/kile/FC-3 kile.spec,1.14,1.15
Message-ID: <200512151753.jBFHrJiV002026@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1940/FC-3

Modified Files:
	kile.spec 
Log Message:
use handier loop for icon handling



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/kile.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kile.spec	10 Nov 2005 19:23:42 -0000	1.14
+++ kile.spec	15 Dec 2005 17:52:47 -0000	1.15
@@ -96,13 +96,17 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 



From fedora-extras-commits at redhat.com  Thu Dec 15 17:52:54 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 15 Dec 2005 12:52:54 -0500
Subject: rpms/kile/FC-4 kile.spec,1.18,1.19
Message-ID: <200512151753.jBFHrPvo002038@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1940/FC-4

Modified Files:
	kile.spec 
Log Message:
use handier loop for icon handling



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-4/kile.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kile.spec	10 Nov 2005 19:23:47 -0000	1.18
+++ kile.spec	15 Dec 2005 17:52:52 -0000	1.19
@@ -96,13 +96,17 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 



From fedora-extras-commits at redhat.com  Thu Dec 15 17:53:15 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 15 Dec 2005 12:53:15 -0500
Subject: rpms/amarok/FC-4 amarok.spec,1.33,1.34
Message-ID: <200512151753.jBFHrj7G002041@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1998/FC-4

Modified Files:
	amarok.spec 
Log Message:
- touch icon dir on %post and %postun


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- amarok.spec	9 Dec 2005 10:24:48 -0000	1.33
+++ amarok.spec	15 Dec 2005 17:53:13 -0000	1.34
@@ -149,6 +149,7 @@
 %post
 /sbin/ldconfig
 # update icon themes if necessary
+touch --no-create %{_datadir}/icons/crystalsvg || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
     # needed because amarok 1.2 puts icon in hicolor
@@ -160,6 +161,7 @@
 %postun
 /sbin/ldconfig
 # update icon themes if necessary
+touch --no-create %{_datadir}/icons/crystalsvg || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 fi



From fedora-extras-commits at redhat.com  Thu Dec 15 17:53:21 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 15 Dec 2005 12:53:21 -0500
Subject: rpms/amarok/devel amarok.spec,1.31,1.32
Message-ID: <200512151753.jBFHrpAB002044@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1998/devel

Modified Files:
	amarok.spec 
Log Message:
- touch icon dir on %post and %postun


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- amarok.spec	9 Dec 2005 10:24:54 -0000	1.31
+++ amarok.spec	15 Dec 2005 17:53:19 -0000	1.32
@@ -149,6 +149,7 @@
 %post
 /sbin/ldconfig
 # update icon themes if necessary
+touch --no-create %{_datadir}/icons/crystalsvg || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
     # needed because amarok 1.2 puts icon in hicolor
@@ -160,6 +161,7 @@
 %postun
 /sbin/ldconfig
 # update icon themes if necessary
+touch --no-create %{_datadir}/icons/crystalsvg || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 fi



From fedora-extras-commits at redhat.com  Thu Dec 15 18:25:20 2005
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 15 Dec 2005 13:25:20 -0500
Subject: rpms/pdftk/devel pdftk.spec,1.1,1.2
Message-ID: <200512151825.jBFIPpb9003811@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3788

Modified Files:
	pdftk.spec 
Log Message:

  Description:
    Rebuilt becouse broken deps.
    Remove strange '//SID ' comment.




Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/pdftk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pdftk.spec	3 Aug 2005 17:51:01 -0000	1.1
+++ pdftk.spec	15 Dec 2005 18:25:18 -0000	1.2
@@ -1,11 +1,12 @@
 Summary: 	The PDF Tool Kit
 Name: 		pdftk
 Version: 	1.12
-Release: 	3
+Release: 	4
 License:	GPL
 URL: 		http://www.accesspdf.com/pdftk/
 Source0: 	http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2
 Source1:        gpl.txt
+Patch1:         pdftk-1.12-rmsid.patch
 Group: 		Applications/Publishing
 BuildRoot: 	%{_tmppath}/%{name}-root
 BuildRequires:	gcc-java
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .org
 
 %build
 unset CLASSPATH && cd pdftk && make -f Makefile.RedHat && cd -
@@ -54,6 +56,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Dec 15 2005 Jochen Schmitt  1.12-4
+- Rebuild
+- Remove strange '//SID' comment.
+
 * Sun Jul 31 2005 Jochen Schmitt  1.12-3
 - Add literal GPL text as Source1
 



From fedora-extras-commits at redhat.com  Thu Dec 15 18:32:57 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 13:32:57 -0500
Subject: rpms/nethack-vultures/FC-3 .cvsignore, 1.2,
	1.3 nethack-vultures.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512151833.jBFIXSkA003962@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3879/FC-3

Modified Files:
	.cvsignore nethack-vultures.spec sources 
Log Message:
Upgraded to 1.11




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Nov 2005 02:16:56 -0000	1.2
+++ .cvsignore	15 Dec 2005 18:32:55 -0000	1.3
@@ -1 +1 @@
-vultures-1.10.1-full.tar.bz2
+vultures-1.11.0-full.tar.bz2


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack-vultures.spec	22 Nov 2005 19:46:49 -0000	1.2
+++ nethack-vultures.spec	15 Dec 2005 18:32:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.10.1
-Release:        1.0%{?dist}
+Version:        1.11.0
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -36,7 +36,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2
-%patch3
 sed -i -e 's|/usr/games/lib/nethackdir|%{_prefix}/games/vultureseye|g' \
     nethack/doc/{nethack,recover}.6 nethack/include/config.h
 sed -i -e 's|/var/lib/games/nethack|%{_var}/games/vultureseye|g' \
@@ -162,7 +161,12 @@
 
 
 %changelog
-* Mon Nov 21 2005 Karen Pease  - 1.10.1-0.5
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
+- Upgraded the tarball to the latest release
+- Upped the version
+- Removed a patch that's now part of the source
+
+* Mon Nov 21 2005 Karen Pease  - 1.10.1-1%{?dist}
 - Made it so I don't have to manually tinker with revisions between dists
 - Using a 1.x release
 - Removed excess tarball


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Nov 2005 02:16:56 -0000	1.2
+++ sources	15 Dec 2005 18:32:55 -0000	1.3
@@ -1 +1 @@
-5a6b99e6159e358757991a6221871b89  vultures-1.10.1-full.tar.bz2
+1c9957f9c46bd1bbb096a111f04a2f48  vultures-1.11.0-full.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 18:33:03 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 13:33:03 -0500
Subject: rpms/nethack-vultures/FC-4 .cvsignore, 1.2,
	1.3 nethack-vultures.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200512151833.jBFIXXaW003967@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-serv3879/FC-4

Modified Files:
	.cvsignore nethack-vultures.spec sources 
Log Message:
Upgraded to 1.11




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Nov 2005 02:16:56 -0000	1.2
+++ .cvsignore	15 Dec 2005 18:33:01 -0000	1.3
@@ -1 +1 @@
-vultures-1.10.1-full.tar.bz2
+vultures-1.11.0-full.tar.bz2


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-vultures.spec	22 Nov 2005 19:46:56 -0000	1.3
+++ nethack-vultures.spec	15 Dec 2005 18:33:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.10.1
-Release:        1.0%{?dist}
+Version:        1.11.0
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -36,7 +36,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2
-%patch3
 sed -i -e 's|/usr/games/lib/nethackdir|%{_prefix}/games/vultureseye|g' \
     nethack/doc/{nethack,recover}.6 nethack/include/config.h
 sed -i -e 's|/var/lib/games/nethack|%{_var}/games/vultureseye|g' \
@@ -162,7 +161,12 @@
 
 
 %changelog
-* Mon Nov 21 2005 Karen Pease  - 1.10.1-0.5
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
+- Upgraded the tarball to the latest release
+- Upped the version
+- Removed a patch that's now part of the source
+
+* Mon Nov 21 2005 Karen Pease  - 1.10.1-1%{?dist}
 - Made it so I don't have to manually tinker with revisions between dists
 - Using a 1.x release
 - Removed excess tarball


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Nov 2005 02:16:56 -0000	1.2
+++ sources	15 Dec 2005 18:33:01 -0000	1.3
@@ -1 +1 @@
-5a6b99e6159e358757991a6221871b89  vultures-1.10.1-full.tar.bz2
+1c9957f9c46bd1bbb096a111f04a2f48  vultures-1.11.0-full.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 18:33:08 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 13:33:08 -0500
Subject: rpms/nethack-vultures/devel .cvsignore, 1.2,
	1.3 nethack-vultures.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200512151833.jBFIXdLp003972@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3879/devel

Modified Files:
	.cvsignore nethack-vultures.spec sources 
Log Message:
Upgraded to 1.11




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Nov 2005 02:16:56 -0000	1.2
+++ .cvsignore	15 Dec 2005 18:33:06 -0000	1.3
@@ -1 +1 @@
-vultures-1.10.1-full.tar.bz2
+vultures-1.11.0-full.tar.bz2


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-vultures.spec	22 Nov 2005 19:47:04 -0000	1.3
+++ nethack-vultures.spec	15 Dec 2005 18:33:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.10.1
-Release:        1.0%{?dist}
+Version:        1.11.0
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -10,7 +10,6 @@
 Patch0:         %{name}-1.10.1-optflags.patch
 Patch1:         %{name}-1.10.1-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
-Patch3:         %{name}-1.10.1-log2stderr.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -36,7 +35,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2
-%patch3
 sed -i -e 's|/usr/games/lib/nethackdir|%{_prefix}/games/vultureseye|g' \
     nethack/doc/{nethack,recover}.6 nethack/include/config.h
 sed -i -e 's|/var/lib/games/nethack|%{_var}/games/vultureseye|g' \
@@ -162,7 +160,12 @@
 
 
 %changelog
-* Mon Nov 21 2005 Karen Pease  - 1.10.1-0.5
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
+- Upgraded the tarball to the latest release
+- Upped the version
+- Removed a patch that's now part of the source
+
+* Mon Nov 21 2005 Karen Pease  - 1.10.1-1%{?dist}
 - Made it so I don't have to manually tinker with revisions between dists
 - Using a 1.x release
 - Removed excess tarball


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Nov 2005 02:16:56 -0000	1.2
+++ sources	15 Dec 2005 18:33:06 -0000	1.3
@@ -1 +1 @@
-5a6b99e6159e358757991a6221871b89  vultures-1.10.1-full.tar.bz2
+1c9957f9c46bd1bbb096a111f04a2f48  vultures-1.11.0-full.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 18:35:04 2005
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 15 Dec 2005 13:35:04 -0500
Subject: rpms/pdftk/devel pdftk-1.12-rmsid.patch,NONE,1.1
Message-ID: <200512151835.jBFIZ4Cl004001@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3988

Added Files:
	pdftk-1.12-rmsid.patch 
Log Message:

  Description:
   Added forgotten patch.


pdftk-1.12-rmsid.patch:

--- NEW FILE pdftk-1.12-rmsid.patch ---
--- pdftk-1.12/java_libs/com/lowagie/text/pdf/codec/PngImage.java.org	2005-12-15 18:28:24.000000000 +0100
+++ pdftk-1.12/java_libs/com/lowagie/text/pdf/codec/PngImage.java	2005-12-15 18:29:04.000000000 +0100
@@ -93,7 +93,7 @@
 
 import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.Image;
-//SID import com.lowagie.text.ImgRaw;
+import com.lowagie.text.ImgRaw;
 import com.lowagie.text.pdf.ByteBuffer;
 import com.lowagie.text.pdf.PdfArray;
 import com.lowagie.text.pdf.PdfDictionary;



From fedora-extras-commits at redhat.com  Thu Dec 15 18:42:49 2005
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 15 Dec 2005 13:42:49 -0500
Subject: rpms/pdftk/devel pdftk.spec,1.2,1.3
Message-ID: <200512151843.jBFIhJlQ004325@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4302

Modified Files:
	pdftk.spec 
Log Message:

  Description:
    Change release number becouse trouble with cvs tagging.



Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/pdftk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pdftk.spec	15 Dec 2005 18:25:18 -0000	1.2
+++ pdftk.spec	15 Dec 2005 18:42:46 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: 	The PDF Tool Kit
 Name: 		pdftk
 Version: 	1.12
-Release: 	4
+Release: 	5
 License:	GPL
 URL: 		http://www.accesspdf.com/pdftk/
 Source0: 	http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2
@@ -56,7 +56,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Thu Dec 15 2005 Jochen Schmitt  1.12-4
+* Thu Dec 15 2005 Jochen Schmitt  1.12-5
 - Rebuild
 - Remove strange '//SID' comment.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 18:47:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 15 Dec 2005 13:47:39 -0500
Subject: rpms/sqlite/FC-3 sqlite.spec,1.10,1.11
Message-ID: <200512151848.jBFImASv004413@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/sqlite/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4390

Modified Files:
	sqlite.spec 
Log Message:
Add tcl BR


Index: sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/sqlite/FC-3/sqlite.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sqlite.spec	23 Apr 2005 07:22:42 -0000	1.10
+++ sqlite.spec	15 Dec 2005 18:47:37 -0000	1.11
@@ -8,7 +8,7 @@
 Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
 Patch0: sqlite-3.1.2-doc.patch
 Obsoletes: sqlite3 sqlite3-devel
-BuildRequires: ncurses-devel readline-devel
+BuildRequires: ncurses-devel readline-devel tcl
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -107,8 +107,8 @@
 %endif
 
 %changelog
-* Sat Apr 23 2005 Ignacio Vazquez-Abrams  3.1.2-0.4
-- Bump
+* Thu Dec 15 2005 Ignacio Vazquez-Abrams  3.1.2-0.4
+- Add tcl BR
 
 * Tue Apr 19 2005 Ignacio Vazquez-Abrams  3.1.2-0.3
 - Release drop



From fedora-extras-commits at redhat.com  Thu Dec 15 18:48:20 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 15 Dec 2005 13:48:20 -0500
Subject: rpms/amarok/FC-4 amarok.spec,1.34,1.35
Message-ID: <200512151848.jBFImolj004453@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4419/FC-4

Modified Files:
	amarok.spec 
Log Message:
- really fix bug 175841


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- amarok.spec	15 Dec 2005 17:53:13 -0000	1.34
+++ amarok.spec	15 Dec 2005 18:48:18 -0000	1.35
@@ -147,23 +147,18 @@
 
 
 %post
-/sbin/ldconfig
 # update icon themes if necessary
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-    # needed because amarok 1.2 puts icon in hicolor
-    # and the RPM did not update the cache on uninstall
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 # update icon themes if necessary
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
 
@@ -178,7 +173,7 @@
 %{_bindir}/amarok
 %{_bindir}/amarokapp
 %{_datadir}/apps/%{name}
-%{_datadir}/icons/*/*/*
+%{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop



From fedora-extras-commits at redhat.com  Thu Dec 15 18:48:26 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 15 Dec 2005 13:48:26 -0500
Subject: rpms/amarok/devel amarok.spec,1.32,1.33
Message-ID: <200512151848.jBFImu0l004456@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4419/devel

Modified Files:
	amarok.spec 
Log Message:
- really fix bug 175841


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- amarok.spec	15 Dec 2005 17:53:19 -0000	1.32
+++ amarok.spec	15 Dec 2005 18:48:24 -0000	1.33
@@ -147,23 +147,18 @@
 
 
 %post
-/sbin/ldconfig
 # update icon themes if necessary
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-    # needed because amarok 1.2 puts icon in hicolor
-    # and the RPM did not update the cache on uninstall
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 # update icon themes if necessary
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
 
@@ -178,7 +173,7 @@
 %{_bindir}/amarok
 %{_bindir}/amarokapp
 %{_datadir}/apps/%{name}
-%{_datadir}/icons/*/*/*
+%{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop



From fedora-extras-commits at redhat.com  Thu Dec 15 19:09:28 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 15 Dec 2005 14:09:28 -0500
Subject: rpms/amarok/devel amarok.spec,1.33,1.34
Message-ID: <200512151909.jBFJ9wRZ006174@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6140/devel

Modified Files:
	amarok.spec 
Log Message:
- add BR: kdebase-devel to help kde-redhat


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- amarok.spec	15 Dec 2005 18:48:24 -0000	1.33
+++ amarok.spec	15 Dec 2005 19:09:26 -0000	1.34
@@ -28,6 +28,7 @@
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
+BuildRequires:  kdebase-devel
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif



From fedora-extras-commits at redhat.com  Thu Dec 15 19:09:00 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 15 Dec 2005 14:09:00 -0500
Subject: rpms/amarok/FC-4 amarok.spec,1.35,1.36
Message-ID: <200512151910.jBFJA04i006175@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6140/FC-4

Modified Files:
	amarok.spec 
Log Message:
- add BR: kdebase-devel to help kde-redhat


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- amarok.spec	15 Dec 2005 18:48:18 -0000	1.35
+++ amarok.spec	15 Dec 2005 19:08:57 -0000	1.36
@@ -28,6 +28,7 @@
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
+BuildRequires:  kdebase-devel
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif



From fedora-extras-commits at redhat.com  Thu Dec 15 19:13:34 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 14:13:34 -0500
Subject: rpms/l2tpd - New directory
Message-ID: <200512151913.jBFJDYn8006270@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/l2tpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6261/l2tpd

Log Message:
Directory /cvs/extras/rpms/l2tpd added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 19:13:40 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 14:13:40 -0500
Subject: rpms/l2tpd/devel - New directory
Message-ID: <200512151913.jBFJDeZI006286@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/l2tpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6261/l2tpd/devel

Log Message:
Directory /cvs/extras/rpms/l2tpd/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 15 19:13:58 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 14:13:58 -0500
Subject: rpms/l2tpd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512151913.jBFJDwrh006321@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/l2tpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6308

Added Files:
	Makefile import.log 
Log Message:
Setup of module l2tpd


--- NEW FILE Makefile ---
# Top level Makefile for module l2tpd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 15 19:14:04 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 14:14:04 -0500
Subject: rpms/l2tpd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512151914.jBFJE4kU006342@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/l2tpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6308/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module l2tpd


--- NEW 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 Dec 15 19:15:30 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 14:15:30 -0500
Subject: rpms/l2tpd import.log,1.1,1.2
Message-ID: <200512151916.jBFJG0DO006559@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/l2tpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6473

Modified Files:
	import.log 
Log Message:
auto-import l2tpd-0.69-0.1.20051030.2 on branch devel from l2tpd-0.69-0.1.20051030.2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/l2tpd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2005 19:13:56 -0000	1.1
+++ import.log	15 Dec 2005 19:15:28 -0000	1.2
@@ -0,0 +1 @@
+l2tpd-0_69-0_1_20051030_2:HEAD:l2tpd-0.69-0.1.20051030.2.src.rpm:1134674205



From fedora-extras-commits at redhat.com  Thu Dec 15 19:15:35 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 14:15:35 -0500
Subject: rpms/l2tpd/devel l2tpd-async-sync.patch, NONE,
	1.1 l2tpd-changelog.patch, NONE, 1.1 l2tpd-chapsecrets.sample,
	NONE, 1.1 l2tpd-gcc4-fixes.patch, NONE,
	1.1 l2tpd-log-strerr.patch, NONE, 1.1 l2tpd-log.patch, NONE,
	1.1 l2tpd-max-retries.patch, NONE, 1.1 l2tpd-moredebug.patch,
	NONE, 1.1 l2tpd-move-pty-logic.patch, NONE,
	1.1 l2tpd-nodebug-default.patch, NONE, 1.1 l2tpd-options.l2tpd,
	NONE, 1.1 l2tpd-patents.patch, NONE, 1.1 l2tpd-socket.patch,
	NONE, 1.1 l2tpd-solaris.patch, NONE, 1.1 l2tpd-stopccn.patch,
	NONE, 1.1 l2tpd-uaddr.patch, NONE, 1.1 l2tpd-version.patch,
	NONE, 1.1 l2tpd.conf, NONE, 1.1 l2tpd.init, NONE,
	1.1 l2tpd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512151915.jBFJFZ4I006524@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/l2tpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6473/devel

Modified Files:
	.cvsignore sources 
Added Files:
	l2tpd-async-sync.patch l2tpd-changelog.patch 
	l2tpd-chapsecrets.sample l2tpd-gcc4-fixes.patch 
	l2tpd-log-strerr.patch l2tpd-log.patch l2tpd-max-retries.patch 
	l2tpd-moredebug.patch l2tpd-move-pty-logic.patch 
	l2tpd-nodebug-default.patch l2tpd-options.l2tpd 
	l2tpd-patents.patch l2tpd-socket.patch l2tpd-solaris.patch 
	l2tpd-stopccn.patch l2tpd-uaddr.patch l2tpd-version.patch 
	l2tpd.conf l2tpd.init l2tpd.spec 
Log Message:
auto-import l2tpd-0.69-0.1.20051030.2 on branch devel from l2tpd-0.69-0.1.20051030.2.src.rpm

l2tpd-async-sync.patch:

--- NEW FILE l2tpd-async-sync.patch ---
diff-tree b240ad8ce83e0a0dbee533cb2862a5eafb937504 (from e64441dcd5c020067921fb370c738aeb20de7dd8)
Author: Michael Richardson 
Date:   Fri Nov 25 13:04:50 2005 -0500

    async/sync conversion routines must be ready for possibility
    that the read will block due to routing loops

diff --git a/call.c b/call.c
--- a/call.c
+++ b/call.c
@@ -97,88 +97,112 @@ int read_packet (struct buffer *buf, int
     static unsigned char rbuf[MAX_RECV_SIZE];
     static int pos = 0;
     static int max = 0;
     int res;
     int errors = 0;
+
     /* Read a packet, doing async->sync conversion if necessary */
     p = buf->start;
     while (1)
     {
         if (pos >= max)
         {
-            max = read (fd, rbuf, sizeof (rbuf));
+            max = read(fd, rbuf, sizeof (rbuf));
             res = max;
             pos = 0;
         }
         else
         {
             res = 1;
         }
+
         c = rbuf[pos++];
+
+	/* if there was a short read, then see what is about */
         if (res < 1)
         {
             if (res == 0)
             {
                 /*
                    * Hmm..  Nothing to read.  It happens
                  */
+		pos=0;
+		max=0;
                 return 0;
-/*			} else if ((errno == EINTR ) || (errno == EAGAIN)) { */
             }
             else if ((errno == EIO) || (errno == EINTR) || (errno == EAGAIN))
             {
 
                 /*
                    * Oops, we were interrupted!
                    * Or, we ran out of data too soon
                    * anyway, we discared whatever it is we
                    * have
                  */
+		pos=0;
+		max=0;
                 return 0;
             }
             errors++;
             l2tp_log (LOG_DEBUG, "%s: Error %d (%s)\n", __FUNCTION__, errno,
                  strerror (errno));
             if (errors > 10)
             {
                 l2tp_log (LOG_DEBUG,
                      "%s: Too many errors.  Declaring call dead.\n",
                      __FUNCTION__);
+		pos=0;
+		max=0;
                 return -errno;
             }
             continue;
         }
+
         switch (c)
         {
         case PPP_FLAG:
             if (escape)
             {
                 l2tp_log (LOG_DEBUG, "%s: got an escaped PPP_FLAG\n",
                      __FUNCTION__);
+		pos=0;
+		max=0;
                 return -EINVAL;
             }
+
             if (convert)
             {
-                if (!buf->len)
+                if (buf->len == 0) {
+		    /* if the buffer is empty, then we have the beginning
+		     * of a packet, not the end
+		     */
                     break;
-                /* Drop the FCS */
+		}
+		
+                /* must be the end, drop the FCS */
                 buf->len -= 2;
             }
             else
             {
+		/* if there is space, then insert the byte */
                 if (buf->len < buf->maxlen)
                 {
                     *p = c;
                     p++;
                     buf->len++;
                 }
             }
+
+	    /* return what we have now */
             return buf->len;
+
         case PPP_ESCAPE:
             escape = PPP_TRANS;
             if (convert)
                 break;
+
+	    /* fall through */
         default:
             if (convert)
                 c ^= escape;
             escape = 0;
             if (buf->len < buf->maxlen)
@@ -187,10 +211,12 @@ int read_packet (struct buffer *buf, int
                 p++;
                 buf->len++;
                 break;
             };
             l2tp_log (LOG_WARN, "%s: read overrun\n", __FUNCTION__);
+	    pos=0;
+	    max=0;
             return -EINVAL;
         }
     }
 
     /* I should never get here */

l2tpd-changelog.patch:

--- NEW FILE l2tpd-changelog.patch ---
--- l2tpd-0.69cvs20051030/CHANGELOG.Xelerance	1969-12-31 19:00:00.000000000 -0500
+++ l2tpd/CHANGELOG.Xelerance	2005-11-27 18:50:17.000000000 -0500
@@ -0,0 +1,16 @@
+changes to the sourceforge.net sources by Xelerance
+
+- fixes for gcc 4.xx compilation
+- various debugging added, but debugging should not be on by default
+- async/sync conversion routines must be ready for possibility that the read
+  will block due to routing loops
+- refactor control socket handling.
+- use man page in doc/
+- move all logic about pty usage to pty.c try ptmx first. if it fails try
+  legacy ptys
+- rename log() to l2tp_log(), as "log" is a math function.
+- First version managed by Xelerance, called xl2tpd.
+- if we aren't deamonized, then log to stderr.
+- added install: and DESTDIR support 
+
+


--- NEW FILE l2tpd-chapsecrets.sample ---
# Secrets for authentication using CHAP
# client        server  secret                  IP addresses
jacco           *       "mysecret"              192.168.1.128/25
*               jacco   "mysecret"              192.168.1.128/25
sam             *       "rumpelstiltskin"       192.168.1.5
*               sam     "rumpelstiltskin"       192.168.1.5


l2tpd-gcc4-fixes.patch:

--- NEW FILE l2tpd-gcc4-fixes.patch ---
diff-tree a30a4defe933ca15aea4986535664774520ec9fa (from f09c91543dc84206a7a82db62bab09b8a52da44a)
Author: Michael Richardson 
Date:   Fri Nov 25 14:18:37 2005 -0500

    fixes for gcc 4.xx
    (cherry picked from bfbd2c3c96ffc17453427ea3ea62c70572be5cae commit)

diff --git a/aaa.c b/aaa.c
--- a/aaa.c
+++ b/aaa.c
@@ -23,11 +23,11 @@
 
 extern void bufferDump (char *, int);
 
 /* FIXME: Accounting? */
 
-static struct addr_ent *uaddr[ADDR_HASH_SIZE];
+struct addr_ent *uaddr[ADDR_HASH_SIZE];
 
 void init_addr ()
 {
     int x;
     for (x = 0; x < ADDR_HASH_SIZE; x++)
@@ -45,11 +45,11 @@ static int ip_used (unsigned int addr)
         tmp = tmp->next;
     }
     return 0;
 }
 
-void mk_challenge (char *c, int length)
+void mk_challenge (unsigned char *c, int length)
 {
     get_entropy(c, length);
 
     /* int x;
     int *s = (int *) c;
@@ -131,11 +131,11 @@ unsigned int get_addr (struct iprange *i
         ipr = ipr->next;
     }
     return 0;
 }
 
-int get_secret (char *us, char *them, char *secret, int size)
+int get_secret (char *us, char *them, unsigned char *secret, int size)
 {
     FILE *f;
     char buf[STRLEN];
     char *u, *t, *s;
     int num = 0;
@@ -204,11 +204,11 @@ int get_secret (char *us, char *them, ch
 #ifdef DEBUG_AUTH
             l2tp_log (LOG_DEBUG,
                  "%s: we are '%s', they are '%s', secret is '%s'\n",
                  __FUNCTION__, u, t, s);
 #endif
-            strncpy (secret, s, size);
+            strncpy ((char *)secret, s, size);
             fclose(f);
             return -1;
         }
     }
     fclose(f);
@@ -249,10 +249,11 @@ int handle_challenge (struct tunnel *t, 
         if (t->lac->peername[0])
             them = t->lac->peername;
         else
             them = t->hostname;
     }
+
     if (!get_secret (us, them, chal->secret, sizeof (chal->secret)))
     {
         l2tp_log (LOG_DEBUG, "%s: no secret found for us='%s' and them='%s'\n",
              __FUNCTION__, us, them);
         return -1;
@@ -270,11 +271,11 @@ int handle_challenge (struct tunnel *t, 
 #endif
 
     memset (chal->response, 0, MD_SIG_SIZE);
     MD5Init (&chal->md5);
     MD5Update (&chal->md5, &chal->ss, 1);
-    MD5Update (&chal->md5, chal->secret, strlen (chal->secret));
+    MD5Update (&chal->md5, chal->secret, strlen ((char *)chal->secret));
     MD5Update (&chal->md5, chal->challenge, chal->chal_len);
     MD5Final (chal->response, &chal->md5);
 #ifdef DEBUG_AUTH
     l2tp_log (LOG_DEBUG, "response is %X%X%X%X to '%s' and %X%X%X%X, %d\n",
          *((int *) &chal->response[0]),
@@ -366,11 +367,11 @@ void encrypt_avp (struct buffer *buf, _u
     struct avp_hdr *new_hdr =
         (struct avp_hdr *) (buf->start + buf->len - len);
     struct avp_hdr *old_hdr =
         (struct avp_hdr *) (buf->start + buf->len - len + 2);
     _u16 length, flags, attr;   /* New length, old flags */
-    char *ptr, *end;
+    unsigned char *ptr, *end;
     int cnt;
     unsigned char digest[MD_SIG_SIZE];
     unsigned char *previous_segment;
 
     /* FIXME: Should I pad more randomly? Right now I pad to nearest 16 bytes */
@@ -390,17 +391,17 @@ void encrypt_avp (struct buffer *buf, _u
     /* Back to the beginning of real data, including the original length AVP */
 
     MD5Init (&t->chal_them.md5);
     MD5Update (&t->chal_them.md5, (void *) &attr, 2);
     MD5Update (&t->chal_them.md5, t->chal_them.secret,
-               strlen (t->chal_them.secret));
+               strlen ((char *)t->chal_them.secret));
     MD5Update (&t->chal_them.md5, t->chal_them.vector, VECTOR_SIZE);
     MD5Final (digest, &t->chal_them.md5);
 
     /* Though not a "MUST" in the spec, our subformat length is always a multiple of 16 */
-    ptr = ((char *) new_hdr) + sizeof (struct avp_hdr);
-    end = ((char *) new_hdr) + length;
+    ptr = ((unsigned char *) new_hdr) + sizeof (struct avp_hdr);
+    end = ((unsigned char *) new_hdr) + length;
     previous_segment = ptr;
     while (ptr < end)
     {
 #if DEBUG_HIDDEN
         l2tp_log (LOG_DEBUG, "%s: The digest to be XOR'ed\n", __FUNCTION__);
@@ -418,11 +419,11 @@ void encrypt_avp (struct buffer *buf, _u
 #endif
         if (ptr < end)
         {
             MD5Init (&t->chal_them.md5);
             MD5Update (&t->chal_them.md5, t->chal_them.secret,
-                       strlen (t->chal_them.secret));
+                       strlen ((char *)t->chal_them.secret));
             MD5Update (&t->chal_them.md5, previous_segment, MD_SIG_SIZE);
             MD5Final (digest, &t->chal_them.md5);
         }
         previous_segment = ptr;
     }
@@ -433,17 +434,17 @@ int decrypt_avp (char *buf, struct tunne
     /* Decrypts a hidden AVP pointed to by buf.  The
        new header will be exptected to be two characters
        offset from the old */
     int cnt = 0;
     int len, olen, flags;
-    char digest[MD_SIG_SIZE];
+    unsigned char digest[MD_SIG_SIZE];
     char *ptr, *end;
     _u16 attr;
     struct avp_hdr *old_hdr = (struct avp_hdr *) buf;
     struct avp_hdr *new_hdr = (struct avp_hdr *) (buf + 2);
     int saved_segment_len;      /* maybe less 16; may be used if the cipher is longer than 16 octets */
-    char saved_segment[MD_SIG_SIZE];
+    unsigned char saved_segment[MD_SIG_SIZE];
     ptr = ((char *) old_hdr) + sizeof (struct avp_hdr);
     olen = old_hdr->length & 0x0FFF;
     end = buf + olen;
     if (!t->chal_us.vector)
     {
@@ -456,11 +457,11 @@ int decrypt_avp (char *buf, struct tunne
        have to be more careful than when encrypting */
     attr = ntohs (old_hdr->attr);
     MD5Init (&t->chal_us.md5);
     MD5Update (&t->chal_us.md5, (void *) &attr, 2);
     MD5Update (&t->chal_us.md5, t->chal_us.secret,
-               strlen (t->chal_us.secret));
+               strlen ((char *)t->chal_us.secret));
     MD5Update (&t->chal_us.md5, t->chal_us.vector, t->chal_us.vector_len);
     MD5Final (digest, &t->chal_us.md5);
 #ifdef DEBUG_HIDDEN
     l2tp_log (LOG_DEBUG, "attribute is %d and challenge is: ", attr);
     print_challenge (&t->chal_us);
@@ -471,11 +472,11 @@ int decrypt_avp (char *buf, struct tunne
     {
         if (cnt >= MD_SIG_SIZE)
         {
             MD5Init (&t->chal_us.md5);
             MD5Update (&t->chal_us.md5, t->chal_us.secret,
-                       strlen (t->chal_us.secret));
+                       strlen ((char *)t->chal_us.secret));
             MD5Update (&t->chal_us.md5, saved_segment, MD_SIG_SIZE);
             MD5Final (digest, &t->chal_us.md5);
             cnt = 0;
         }
         /* at the beginning of each segment, we save the current segment (16 octets or less) of cipher 
diff --git a/aaa.h b/aaa.h
--- a/aaa.h
+++ b/aaa.h
@@ -50,7 +50,7 @@ extern struct lns *get_lns (struct tunne
 extern unsigned int get_addr (struct iprange *);
 extern void reserve_addr (unsigned int);
 extern void unreserve_addr (unsigned int);
 extern void init_addr ();
 extern int handle_challenge (struct tunnel *, struct challenge *);
-extern void mk_challenge (char *, int);
+extern void mk_challenge (unsigned char *, int);
 #endif
diff --git a/avp.h b/avp.h
--- a/avp.h
+++ b/avp.h
@@ -112,11 +112,11 @@ extern int ignore_avp (struct tunnel *, 
 extern int seq_reqd_avp (struct tunnel *, struct call *, void *, int);
 extern int challenge_avp (struct tunnel *, struct call *, void *, int);
 extern int chalresp_avp (struct tunnel *, struct call *, void *, int);
 extern int rand_vector_avp (struct tunnel *, struct call *, void *, int);
 
-extern int add_challenge_avp (struct buffer *, char *, int);
+extern int add_challenge_avp (struct buffer *, unsigned char *, int);
 extern int add_avp_rws (struct buffer *, _u16);
 extern int add_tunnelid_avp (struct buffer *, _u16);
 extern int add_vendor_avp (struct buffer *);
 extern int add_hostname_avp (struct buffer *, const char *);
 extern int add_firmware_avp (struct buffer *);
@@ -135,10 +135,10 @@ extern int add_callid_avp (struct buffer
 #else
 extern int add_callid_avp (struct buffer *, _u16);
 #endif
 extern int add_ppd_avp (struct buffer *, _u16);
 extern int add_seqreqd_avp (struct buffer *);
-extern int add_chalresp_avp (struct buffer *, char *, int);
-extern int add_randvect_avp (struct buffer *, char *, int);
+extern int add_chalresp_avp (struct buffer *, unsigned char *, int);
+extern int add_randvect_avp (struct buffer *, unsigned char *, int);
 extern int add_minbps_avp (struct buffer *buf, int speed);      /* jz: needed for outgoing call */
 extern int add_maxbps_avp (struct buffer *buf, int speed);      /* jz: needed for outgoing call */
 extern int add_number_avp (struct buffer *buf, char *no);       /* jz: needed for outgoing call */
diff --git a/avpsend.c b/avpsend.c
--- a/avpsend.c
+++ b/avpsend.c
@@ -125,27 +125,27 @@ int add_avp_rws (struct buffer *buf, _u1
     ptr->s0 = htons (rws);
     buf->len += 0x8;
     return 0;
 }
 
-int add_challenge_avp (struct buffer *buf, char *c, int len)
+int add_challenge_avp (struct buffer *buf, unsigned char *c, int len)
 {
     add_header(buf, (0x6 + len), 0xB);
     memcpy((char *) (buf->start + buf->len + sizeof(struct avp_hdr)), c, len);
     buf->len += 0x6 + len;
     return 0;
 }
 
-int add_chalresp_avp (struct buffer *buf, char *c, int len)
+int add_chalresp_avp (struct buffer *buf, unsigned char *c, int len)
 {
     add_header(buf, (0x6 + len), 0xD);
     memcpy((char *) (buf->start + buf->len + sizeof(struct avp_hdr)), c, len);
     buf->len += 0x6 + len;
     return 0;
 }
 
-int add_randvect_avp (struct buffer *buf, char *c, int len)
+int add_randvect_avp (struct buffer *buf, unsigned char *c, int len)
 {
     add_header(buf, (0x6 + len), 0x24);
     memcpy((char *) (buf->start + buf->len + sizeof(struct avp_hdr)), c, len);
     buf->len += 0x6 + len;
     return 0;
diff --git a/call.c b/call.c
--- a/call.c
+++ b/call.c
@@ -502,11 +502,11 @@ void destroy_call (struct call *c)
 }
 
 
 struct call *new_call (struct tunnel *parent)
 {
-    char entropy_buf[2] = "\0";
+    unsigned char entropy_buf[2] = "\0";
     struct call *tmp = malloc (sizeof (struct call));
 
     if (!tmp)
         return NULL;
     tmp->tx_pkts = 0;
diff --git a/l2tp.h b/l2tp.h
--- a/l2tp.h
+++ b/l2tp.h
@@ -214,11 +214,11 @@ extern void control_xmit (void *);
 extern int ppd;
 extern int switch_io;           /* jz */
 extern int control_fd;
 extern int start_pppd (struct call *c, struct ppp_opts *);
 extern void magic_lac_dial (void *);
-extern int get_entropy (char *, int);
+extern int get_entropy (unsigned char *, int);
 
 #ifndef MIN
 #define MIN(a,b) (((a)<(b)) ? (a) : (b))
 #endif
 #endif
diff --git a/l2tpd.c b/l2tpd.c
--- a/l2tpd.c
+++ b/l2tpd.c
@@ -731,11 +731,11 @@ void lac_disconnect (int tid)
 }
 
 struct tunnel *new_tunnel ()
 {
     struct tunnel *tmp = malloc (sizeof (struct tunnel));
-    char entropy_buf[2] = "\0";
+    unsigned char entropy_buf[2] = "\0";
     if (!tmp)
         return NULL;
     tmp->control_seq_num = 0;
     tmp->control_rec_seq_num = 0;
     tmp->cLr = 0;
diff --git a/misc.c b/misc.c
--- a/misc.c
+++ b/misc.c
@@ -90,22 +90,22 @@ inline void recycle_buf (struct buffer *
     b->start = b->rstart;
     b->len = b->maxlen;
 }
 
 #define bufferDumpWIDTH 16
-void bufferDump (char *buf, int buflen)
+void bufferDump (unsigned char *buf, int buflen)
 {
     int i = 0, j = 0;
     /* we need TWO characters to DISPLAY ONE byte */
-    unsigned char line[2 * bufferDumpWIDTH + 1], *c;
+    char line[2 * bufferDumpWIDTH + 1], *c;
 
     for (i = 0; i < buflen / bufferDumpWIDTH; i++)
     {
         c = line;
         for (j = 0; j < bufferDumpWIDTH; j++)
         {
-            sprintf (c, "%02x ", (buf[i * bufferDumpWIDTH + j]) & 0xff);
+	  sprintf (c, "%02x ", (buf[i * bufferDumpWIDTH + j]) & 0xff);
             c++;
             c++;                /* again two characters to display ONE byte */
         }
         *c = '\0';
         l2tp_log (LOG_WARN, "%s: buflen=%d, buffer[%d]: *%s*\n", __FUNCTION__,
@@ -242,11 +242,11 @@ void opt_destroy (struct ppp_opts *optio
 int get_egd_entropy(char *buf, int count)
 {
     return -1;
 }
 
-int get_sys_entropy(char *buf, int count)
+int get_sys_entropy(unsigned char *buf, int count)
 {
     /*
      * This way of filling buf with rand() generated data is really
      * fairly inefficient from a function call point of view...rand()
      * returns four bytes of data (on most systems, sizeof(int))
@@ -263,11 +263,11 @@ int get_sys_entropy(char *buf, int count
     bufferDump (buf, count);
 #endif
     return count;
 }
 
-int get_dev_entropy(char *buf, int count)
+int get_dev_entropy(unsigned char *buf, int count)
 {
     int devrandom;
     ssize_t entropy_amount;
 
     devrandom = open ("/dev/urandom", O_RDONLY | O_NONBLOCK);
@@ -283,11 +283,11 @@ int get_dev_entropy(char *buf, int count
     entropy_amount = read(devrandom, buf, count);
     close(devrandom);
     return entropy_amount;
 }
 
-int get_entropy (char *buf, int count)
+int get_entropy (unsigned char *buf, int count)
 {
     if (rand_source == RAND_SYS)
     {
         return get_sys_entropy(buf, count);
     }
diff --git a/network.c b/network.c
--- a/network.c
+++ b/network.c
@@ -33,11 +33,11 @@ int kernel_support;             /* Kerne
 
 
 int init_network (void)
 {
     long arg;
-    int length = sizeof (server);
+    unsigned int length = sizeof (server);
     gethostname (hostname, sizeof (hostname));
     server.sin_family = AF_INET;
     server.sin_addr.s_addr = gconfig.listenaddr; 
     server.sin_port = htons (gconfig.port);
     if ((server_socket = socket (PF_INET, SOCK_DGRAM, 0)) < 0)
@@ -304,21 +304,25 @@ void network_thread ()
 {
     /*
      * We loop forever waiting on either data from the ppp drivers or from
      * our network socket.  Control handling is no longer done here.
      */
-    int fromlen;                /* Length of the address */
+    unsigned int fromlen;                /* Length of the address */
     int tunnel, call;           /* Tunnel and call */
     int recvsize;               /* Length of data received */
     struct buffer *buf;         /* Payload buffer */
     struct call *c, *sc;        /* Call to send this off to */
     struct tunnel *st;          /* Tunnel */
     fd_set readfds;             /* Descriptors to watch for reading */
     int max;                    /* Highest fd */
     struct timeval tv;          /* Timeout for select */
     /* This one buffer can be recycled for everything except control packets */
     buf = new_buf (MAX_RECV_SIZE);
+
+    tunnel = 0;
+    call = 0;
+
     for (;;)
     {
         max = build_fdset (&readfds);
         tv.tv_sec = 1;
         tv.tv_usec = 0;

l2tpd-log-strerr.patch:

--- NEW FILE l2tpd-log-strerr.patch ---
diff-tree a07fa321367d2640217391b12b9cc393a4c61869 (from 95c2f93c9ec71103a75f8657c417759e2a553839)
Author: Michael Richardson 
Date:   Tue Nov 22 23:21:40 2005 -0500

    if we aren't deamonized, then log to stderr.

diff --git a/misc.c b/misc.c
--- a/misc.c
+++ b/misc.c
@@ -27,20 +27,33 @@
 # include 
 #endif
 #include 
 #include "l2tp.h"
 
+void init_log()
+{
+    static int logopen=0;
+    
+    if(!logopen) {
+	openlog (BINARY, LOG_PID, LOG_DAEMON);
+    }
+}
 
 void l2tp_log (int level, const char *fmt, ...)
 {
     char buf[256];
     va_list args;
     va_start (args, fmt);
     vsnprintf (buf, sizeof (buf), fmt, args);
     va_end (args);
-    openlog (BINARY, LOG_PID, LOG_DAEMON);
-    syslog (level, "%s", buf);
+    
+    if(gconfig.daemon) {
+	init_log();
+	syslog (level, "%s", buf);
+    } else {
+	fprintf(stderr, "l2tpd[%d]: %s", getpid(), buf);
+    }
 }
 
 void set_error (struct call *c, int error, const char *fmt, ...)
 {
     va_list args;

l2tpd-log.patch:

--- NEW FILE l2tpd-log.patch ---
diff-tree 752fcab3fb646b8db314575fdd902aaf40f96f38 (from ce2515775cecaedc26eef65c30c7eb2153af6982)
Author: Michael Richardson 
Date:   Mon Nov 21 04:14:48 2005 -0500

    merge of log->l2tp_log cherry pick

diff --git a/aaa.c b/aaa.c
--- a/aaa.c
+++ b/aaa.c
@@ -140,11 +140,11 @@ int get_secret (char *us, char *them, ch
     char *u, *t, *s;
     int num = 0;
     f = fopen (gconfig.authfile, "r");
     if (!f)
     {
-        log (LOG_WARN, "%s : Unable to open '%s' for authentication\n",
+        l2tp_log (LOG_WARN, "%s : Unable to open '%s' for authentication\n",
              __FUNCTION__, gconfig.authfile);
         return 0;
     }
     while (!feof (f))
     {
@@ -164,11 +164,11 @@ int get_secret (char *us, char *them, ch
         while (*u && (*u < 33))
             u++;
         /* us */
         if (!*u)
         {
-            log (LOG_WARN,
+            l2tp_log (LOG_WARN,
                  "%s: Invalid authentication info (no us), line %d\n",
                  __FUNCTION__, num);
             continue;
         }
         t = u;
@@ -178,11 +178,11 @@ int get_secret (char *us, char *them, ch
         while (*t && (*t < 33))
             t++;
         /* them */
         if (!*t)
         {
-            log (LOG_WARN,
+            l2tp_log (LOG_WARN,
                  "%s: Invalid authentication info (nothem), line %d\n",
                  __FUNCTION__, num);
             continue;
         }
         s = t;
@@ -191,20 +191,20 @@ int get_secret (char *us, char *them, ch
         *(s++) = 0;
         while (*s && (*s < 33))
             s++;
         if (!*s)
         {
-            log (LOG_WARN,
+            l2tp_log (LOG_WARN,
                  "%s: Invalid authentication info (no secret), line %d\n",
                  __FUNCTION__, num);
             continue;
         }
         if ((!strcasecmp (u, us) || !strcasecmp (u, "*")) &&
             (!strcasecmp (t, them) || !strcasecmp (t, "*")))
         {
 #ifdef DEBUG_AUTH
-            log (LOG_DEBUG,
+            l2tp_log (LOG_DEBUG,
                  "%s: we are '%s', they are '%s', secret is '%s'\n",
                  __FUNCTION__, u, t, s);
 #endif
             strncpy (secret, s, size);
             fclose(f);
@@ -219,16 +219,16 @@ int handle_challenge (struct tunnel *t, 
 {
     char *us;
     char *them;
     if (!t->lns && !t->lac)
     {
-        log (LOG_DEBUG, "%s: No LNS or LAC to handle challenge!\n",
+        l2tp_log (LOG_DEBUG, "%s: No LNS or LAC to handle challenge!\n",
              __FUNCTION__);
         return -1;
     }
 #ifdef DEBUG_AUTH
-    log (LOG_DEBUG, "%s: making response for tunnel: %d\n", __FUNCTION__,
+    l2tp_log (LOG_DEBUG, "%s: making response for tunnel: %d\n", __FUNCTION__,
          t->ourtid);
 #endif
     if (t->lns)
     {
         if (t->lns->hostname[0])
@@ -251,34 +251,34 @@ int handle_challenge (struct tunnel *t, 
         else
             them = t->hostname;
     }
     if (!get_secret (us, them, chal->secret, sizeof (chal->secret)))
     {
-        log (LOG_DEBUG, "%s: no secret found for us='%s' and them='%s'\n",
+        l2tp_log (LOG_DEBUG, "%s: no secret found for us='%s' and them='%s'\n",
              __FUNCTION__, us, them);
         return -1;
     }
 
 #if DEBUG_AUTH
-    log (LOG_DEBUG, "*%s: Here comes the chal->ss:\n", __FUNCTION__);
+    l2tp_log (LOG_DEBUG, "*%s: Here comes the chal->ss:\n", __FUNCTION__);
     bufferDump (&chal->ss, 1);
 
-    log (LOG_DEBUG, "%s: Here comes the secret\n", __FUNCTION__);
+    l2tp_log (LOG_DEBUG, "%s: Here comes the secret\n", __FUNCTION__);
     bufferDump (chal->secret, strlen (chal->secret));
 
-    log (LOG_DEBUG, "%s: Here comes the challenge\n", __FUNCTION__);
+    l2tp_log (LOG_DEBUG, "%s: Here comes the challenge\n", __FUNCTION__);
     bufferDump (chal->challenge, chal->chal_len);
 #endif
 
     memset (chal->response, 0, MD_SIG_SIZE);
     MD5Init (&chal->md5);
     MD5Update (&chal->md5, &chal->ss, 1);
     MD5Update (&chal->md5, chal->secret, strlen (chal->secret));
     MD5Update (&chal->md5, chal->challenge, chal->chal_len);
     MD5Final (chal->response, &chal->md5);
 #ifdef DEBUG_AUTH
-    log (LOG_DEBUG, "response is %X%X%X%X to '%s' and %X%X%X%X, %d\n",
+    l2tp_log (LOG_DEBUG, "response is %X%X%X%X to '%s' and %X%X%X%X, %d\n",
          *((int *) &chal->response[0]),
          *((int *) &chal->response[4]),
          *((int *) &chal->response[8]),
          *((int *) &chal->response[12]),
          chal->secret,
@@ -317,11 +317,11 @@ struct lns *get_lns (struct tunnel *t)
         {
             if ((ntohl (t->peer.sin_addr.s_addr) >= ntohl (ipr->start)) &&
                 (ntohl (t->peer.sin_addr.s_addr) <= ntohl (ipr->end)))
             {
 #ifdef DEBUG_AAA
-                log (LOG_DEBUG,
+                l2tp_log (LOG_DEBUG,
                      "get_lns: Rule %s to %s, sense %s matched %s\n",
                      IPADDY (ipr->start), IPADDY (ipr->end),
                      (ipr->sense ? "allow" : "deny"), IPADDY (t->peer.sin_addr.s_addr));
 #endif
                 allow = ipr->sense;
@@ -345,18 +345,18 @@ struct lns *get_lns (struct tunnel *t)
 
 #ifdef DEBUG_HIDDEN
 void print_md5 (void *md5)
 {
     int *i = (int *) md5;
-    log (LOG_DEBUG, "%X%X%X%X\n", i[0], i[1], i[2], i[3], i[4]);
+    l2tp_log (LOG_DEBUG, "%X%X%X%X\n", i[0], i[1], i[2], i[3], i[4]);
 }
 
 inline void print_challenge (struct challenge *chal)
 {
-    log (LOG_DEBUG, "vector: ");
+    l2tp_log (LOG_DEBUG, "vector: ");
     print_md5 (chal->vector);
-    log (LOG_DEBUG, "secret: %s\n", chal->secret);
+    l2tp_log (LOG_DEBUG, "secret: %s\n", chal->secret);
 }
 #endif
 void encrypt_avp (struct buffer *buf, _u16 len, struct tunnel *t)
 {
     /* Encrypts an AVP of len, at data.  We assume there
@@ -401,21 +401,21 @@ void encrypt_avp (struct buffer *buf, _u
     end = ((char *) new_hdr) + length;
     previous_segment = ptr;
     while (ptr < end)
     {
 #if DEBUG_HIDDEN
-        log (LOG_DEBUG, "%s: The digest to be XOR'ed\n", __FUNCTION__);
+        l2tp_log (LOG_DEBUG, "%s: The digest to be XOR'ed\n", __FUNCTION__);
         bufferDump (digest, MD_SIG_SIZE);
-        log (LOG_DEBUG, "%s: The plaintext to be XOR'ed\n", __FUNCTION__);
+        l2tp_log (LOG_DEBUG, "%s: The plaintext to be XOR'ed\n", __FUNCTION__);
         bufferDump (ptr, MD_SIG_SIZE);
 #endif
         for (cnt = 0; cnt < MD_SIG_SIZE; cnt++, ptr++)
         {
             *ptr = *ptr ^ digest[cnt];
         }
 #if DEBUG_HIDDEN
-        log (LOG_DEBUG, "%s: The result of XOR\n", __FUNCTION__);
+        l2tp_log (LOG_DEBUG, "%s: The result of XOR\n", __FUNCTION__);
         bufferDump (previous_segment, MD_SIG_SIZE);
 #endif
         if (ptr < end)
         {
             MD5Init (&t->chal_them.md5);
@@ -445,11 +445,11 @@ int decrypt_avp (char *buf, struct tunne
     ptr = ((char *) old_hdr) + sizeof (struct avp_hdr);
     olen = old_hdr->length & 0x0FFF;
     end = buf + olen;
     if (!t->chal_us.vector)
     {
-        log (LOG_DEBUG,
+        l2tp_log (LOG_DEBUG,
              "decrypt_avp: Hidden bit set, but no random vector specified!\n");
[...4088 lines suppressed...]
     {
-        log (LOG_WARN, "%s: called on NULL buffer!\n", __FUNCTION__);
+        l2tp_log (LOG_WARN, "%s: called on NULL buffer!\n", __FUNCTION__);
         return;
     }
 
     buf->retries++;
     t = buf->tunnel;
@@ -170,11 +170,11 @@ void control_xmit (void *b)
     if (t)
     {
         if (ns < t->cLr)
         {
 #ifdef DEBUG_CONTROL_XMIT
-            log (LOG_DEBUG, "%s: Tossing packet %d\n", __FUNCTION__, ns);
+            l2tp_log (LOG_DEBUG, "%s: Tossing packet %d\n", __FUNCTION__, ns);
 #endif
             /* Okay, it's been received.  Let's toss it now */
             toss (buf);
             return;
         }
@@ -187,19 +187,19 @@ void control_xmit (void *b)
          */
         if (t)
         {
             if (t->self->needclose)
             {
-                log (LOG_DEBUG,
+                l2tp_log (LOG_DEBUG,
                      "Unable to deliver closing message for tunnel %d. Destroying anyway.\n",
                      t->ourtid);
                 t->self->needclose = 0;
                 t->self->closing = -1;
             }
             else
             {
-                log (LOG_NOTICE,
+                l2tp_log (LOG_NOTICE,
                      "Maximum retries exceeded for tunnel %d.  Closing.\n",
                      t->ourtid);
                 strcpy (t->self->errormsg, "Timeout");
                 t->self->needclose = -1;
             }
@@ -214,11 +214,11 @@ void control_xmit (void *b)
          */
         tv.tv_sec = 1;
         tv.tv_usec = 0;
         schedule (tv, control_xmit, buf);
 #ifdef DEBUG_CONTROL_XMIT
-        log (LOG_DEBUG, "%s: Scheduling and transmitting packet %d\n",
+        l2tp_log (LOG_DEBUG, "%s: Scheduling and transmitting packet %d\n",
              __FUNCTION__, ns);
 #endif
         udp_xmit (buf);
     }
 }
@@ -277,11 +277,11 @@ int build_fdset (fd_set *readfds)
 		 * closing, check if the tunnel needs to be closed too
 		 */
 		if (tun->self->needclose ^ tun->self->closing)
 		{
 			if (gconfig.debug_tunnel)
-				log (LOG_DEBUG, "%s: closing down tunnel %d\n",
+				l2tp_log (LOG_DEBUG, "%s: closing down tunnel %d\n",
 						__FUNCTION__, tun->ourtid);
 			call_close (tun->self);
 			/* Reset the while loop
 			 * and check for NULL */
 			tun = tunnels.head;
@@ -345,26 +345,26 @@ void network_thread ()
             if (recvsize < MIN_PAYLOAD_HDR_LEN)
             {
                 if (recvsize < 0)
                 {
                     if (errno != EAGAIN)
-                        log (LOG_WARN,
+                        l2tp_log (LOG_WARN,
                              "%s: recvfrom returned error %d (%s)\n",
                              __FUNCTION__, errno, strerror (errno));
                 }
                 else
                 {
-                    log (LOG_WARN, "%s: received too small a packet\n",
+                    l2tp_log (LOG_WARN, "%s: received too small a packet\n",
                          __FUNCTION__);
                 }
             }
             else
             {
                 buf->len = recvsize;
                 if (gconfig.debug_network)
                 {
-                    log (LOG_DEBUG, "%s: recv packet from %s, size = %d, "
+                    l2tp_log (LOG_DEBUG, "%s: recv packet from %s, size = %d, "
 							"tunnel = %d, call = %d\n", __FUNCTION__,
 							inet_ntoa (from.sin_addr), recvsize, tunnel, call);
                 }
                 if (gconfig.packet_dump)
                 {
@@ -388,17 +388,17 @@ void network_thread ()
                          * this from closing the tunnel, if we get a call on a valid
                          * tunnel, but not with a valid CID, we'll just send a ZLB
                          * to ack receiving the packet.
                          */
                         if (gconfig.debug_tunnel)
-                            log (LOG_DEBUG,
+                            l2tp_log (LOG_DEBUG,
                                  "%s: no such call %d on tunnel %d.  Sending special ZLB\n",
                                  __FUNCTION__);
                         handle_special (buf, c, call);
                     }
                     else
-                        log (LOG_DEBUG,
+                        l2tp_log (LOG_DEBUG,
                              "%s: unable to find call or tunnel to handle packet.  call = %d, tunnel = %d Dumping.\n",
                              __FUNCTION__, call, tunnel);
 
                 }
                 else
@@ -407,11 +407,11 @@ void network_thread ()
                     /* Handle the packet */
                     c->container->chal_us.vector = NULL;
                     if (handle_packet (buf, c->container, c))
                     {
                         if (gconfig.debug_tunnel)
-                            log (LOG_DEBUG, "%s: bad packet\n", __FUNCTION__);
+                            l2tp_log (LOG_DEBUG, "%s: bad packet\n", __FUNCTION__);
                     };
                     if (c->cnu)
                     {
                         /* Send Zero Byte Packet */
                         control_zlb (buf, c->container, c);
@@ -431,11 +431,11 @@ void network_thread ()
                 {
                     /* Got some payload to send */
                     int result;
                     recycle_payload (buf, sc->container->peer);
 #ifdef DEBUG_FLOW_MORE
-                    log (LOG_DEBUG, "%s: rws = %d, pSs = %d, pLr = %d\n",
+                    l2tp_log (LOG_DEBUG, "%s: rws = %d, pSs = %d, pLr = %d\n",
                          __FUNCTION__, sc->rws, sc->pSs, sc->pLr);
 #endif
 /*					if ((sc->rws>0) && (sc->pSs > sc->pLr + sc->rws) && !sc->rbit) {
 #ifdef DEBUG_FLOW
 						log(LOG_DEBUG, "%s: throttling payload (call = %d, tunnel = %d, Lr = %d, Ss = %d, rws = %d)!\n",__FUNCTION__,
@@ -472,11 +472,11 @@ void network_thread ()
                         udp_xmit (buf);
                         recycle_payload (buf, sc->container->peer);
                     }
                     if (result != 0)
                     {
-                        log (LOG_WARN,
+                        l2tp_log (LOG_WARN,
                              "%s: tossing read packet, error = %s (%d).  Closing call.\n",
                              __FUNCTION__, strerror (-result), -result);
                         strcpy (sc->errormsg, strerror (-result));
                         sc->needclose = -1;
                     }
diff --git a/pty.c b/pty.c
--- a/pty.c
+++ b/pty.c
@@ -55,8 +55,8 @@ int getPtyMaster (char *tty10, char *tty
                 *tty01 = *p01;
                 return fd;
             }
         }
     }
-    log (LOG_CRIT, "%s: No more free pseudo-tty's\n", __FUNCTION__);
+    l2tp_log (LOG_CRIT, "%s: No more free pseudo-tty's\n", __FUNCTION__);
     return -1;
 }
diff --git a/scheduler.c b/scheduler.c
--- a/scheduler.c
+++ b/scheduler.c
@@ -54,11 +54,11 @@ void alarm_handler (int signal)
     static int cnt = 0;
     cnt++;
     if (cnt != 1)
     {
         /* Whoa, we got called from within ourselves! */
-        log (LOG_DEBUG, "%s : Whoa... cnt = %d\n", __FUNCTION__, cnt);
+        l2tp_log (LOG_DEBUG, "%s : Whoa... cnt = %d\n", __FUNCTION__, cnt);
         return;
     }
     while (events)
     {
         gettimeofday (&now, NULL);
@@ -87,11 +87,11 @@ void alarm_handler (int signal)
             then.tv_sec -= 1;
             then.tv_usec += 1000000;
         }
         if ((then.tv_sec <= 0) && (then.tv_usec <= 0))
         {
-            log (LOG_WARN, "%s: Whoa...  Scheduling for <=0 time???\n",
+            l2tp_log (LOG_WARN, "%s: Whoa...  Scheduling for <=0 time???\n",
                  __FUNCTION__);
         }
         else
         {
             itv.it_interval = zero;

l2tpd-max-retries.patch:

--- NEW FILE l2tpd-max-retries.patch ---
diff --git a/l2tp.h b/l2tp.h
--- a/l2tp.h
+++ b/l2tp.h
@@ -88,11 +88,16 @@ struct payload_hdr
                                    a zero byte packet */
 
 #define PAYLOAD_BUF 10          /* Provide 10 expansion bytes
                                    so we can "decompress" the
                                    payloads and simplify coding */
-#define DEFAULT_MAX_RETRIES 5   /* Recommended value from spec */
+#if 1
+#define DEFAULT_MAX_RETRIES 5    /* Recommended value from spec */
+#else
+#define DEFAULT_MAX_RETRIES 95   /* give us more time to debug */
+#endif
+
 #define DEFAULT_RWS_SIZE   4    /* Default max outstanding 
                                    control packets in queue */
 #define DEFAULT_TX_BPS		10000000        /* For outgoing calls, report this speed */
 #define DEFAULT_RX_BPS		10000000
 #define DEFAULT_MAX_BPS		10000000        /* jz: outgoing calls max bps */

l2tpd-moredebug.patch:

--- NEW FILE l2tpd-moredebug.patch ---
diff-tree a61da5a7451135f3504012f68bb7307abaf42657 (from 7493cefcda7a70ce3da5f244ef2df4782c551c87)
Author: Michael Richardson 
Date:   Fri Nov 25 13:06:02 2005 -0500

    various debugging added

diff --git a/control.c b/control.c
--- a/control.c
+++ b/control.c
@@ -1545,11 +1545,11 @@ inline int write_packet (struct buffer *
     static unsigned char wbuf[MAX_RECV_SIZE];
     int pos = 0;
 
     if (c->fd < 0)
     {
-        if (DEBUG)
+        if (DEBUG || 1)
             l2tp_log (LOG_DEBUG, "%s: tty is not open yet.\n", __FUNCTION__);
         return -EIO;
     }
     /*
      * Skip over header 
@@ -1561,11 +1561,10 @@ inline int write_packet (struct buffer *
     c->rx_bytes += buf->len;
 
     /*
      * FIXME:  What about offset?
      */
-
     while (!convert)
     {
         /* We are given async frames, so write them
            directly to the tty */
         err = write (c->fd, buf->start, buf->len);
@@ -1633,22 +1632,31 @@ inline int write_packet (struct buffer *
         }
         wbuf[pos++] = e;
 
     }
     wbuf[pos++] = PPP_FLAG;
+
+#if 0
+    if(DEBUG) {
+      l2tp_log(LOG_DEBUG, "after sync->async, expanded %d->%d\n",
+	       buf->len, pos);
+    }
+#endif
+
     x = write (c->fd, wbuf, pos);
     if (x < pos)
     {
+      if (DEBUG)
+	l2tp_log (LOG_WARN, "%s: %s(%d)\n", __FUNCTION__, strerror (errno),
+		  errno);
+
         if (!(errno == EINTR) && !(errno == EAGAIN))
         {
             /*
                * I guess pppd died.  we'll pretend
                * everything ended normally
              */
-            if (DEBUG)
-                l2tp_log (LOG_WARN, "%s: %s(%d)\n", __FUNCTION__, strerror (errno),
-                     errno);
             c->needclose = -1;
             c->fd = -1;
             return -EIO;
         }
     }

l2tpd-move-pty-logic.patch:

--- NEW FILE l2tpd-move-pty-logic.patch ---
diff-tree 95c2f93c9ec71103a75f8657c417759e2a553839 (from c61f0a0bd1a0c8029b7770e20950aa83c79a9a1f)
Author: Michael Richardson 
Date:   Tue Nov 22 23:21:29 2005 -0500

    move all logic about pty usage to pty.c
    try ptmx first. if it fails try legacy ptys

diff --git a/l2tpd.c b/l2tpd.c
--- a/l2tpd.c
+++ b/l2tpd.c
@@ -288,11 +288,11 @@ void death_handler (int signal)
 }
 
 int start_pppd (struct call *c, struct ppp_opts *opts)
 {
     /* char a, b; */
-    char *tty;
+    char tty[512];
     char *stropt[80];
     struct ppp_opts *p;
 #ifdef USE_KERNEL
     struct l2tp_call_opts co;
 #endif
@@ -337,71 +337,35 @@ int start_pppd (struct call *c, struct p
         snprintf (stropt[pos], 10, "%d", co.id);
         pos++;
         stropt[pos] = NULL;
     }
     else
-    {
 #endif
-	c->fd = open("/dev/ptmx", O_RDWR);
-	if (c->fd == -1)
-	{
-		l2tp_log (LOG_WARN, "%s: unable to open /dev/ptmx to allocate pty\n",
-				__FUNCTION__);
-		return -EINVAL;
-	} else
-	{
-	    if (grantpt(c->fd))
-	    {
-		l2tp_log (LOG_WARN, "%s: unable to grantpt() on pty\n",
-				__FUNCTION__);
-		close(c->fd);
-		return -EINVAL;
-	    }
-	    if (unlockpt(c->fd))
-	    {
-		l2tp_log (LOG_WARN, "%s: unable to unlockpt() on pty\n",
-			__FUNCTION__);
-		close(c->fd);
-		return -EINVAL;
-	    }
-	    tty = ptsname(c->fd);
-	    if (tty == NULL)
-	    {
-		l2tp_log (LOG_WARN, "%s: unable to obtain name of slave tty\n",
-			__FUNCTION__);
-		close(c->fd);
-		return -EINVAL;
-	    }
-	}
-	
-	
- /*	if ((c->fd = getPtyMaster (&a, &b)) < 0)
+    {
+	if ((c->fd = getPtyMaster (tty, sizeof(tty))) < 0)
         {
             l2tp_log (LOG_WARN, "%s: unable to allocate pty, abandoning!\n",
-                 __FUNCTION__);
+		      __FUNCTION__);
             return -EINVAL;
-        } */
+        } 
 
         /* set fd opened above to not echo so we don't see read our own packets
            back of the file descriptor that we just wrote them to */
         tcgetattr (c->fd, &ptyconf);
         *(c->oldptyconf) = ptyconf;
         ptyconf.c_cflag &= ~(ICANON | ECHO);
         ptyconf.c_lflag &= ~ECHO;
         tcsetattr (c->fd, TCSANOW, &ptyconf);
 
-/*        snprintf (tty, sizeof (tty), "/dev/tty%c%c", a, b); */
         fd2 = open (tty, O_RDWR);
         if (fd2 < 0) {
             l2tp_log (LOG_WARN, "unable to open tty %s, cannot start pppd", tty);
             return -EINVAL;
         }
 	stropt[pos++] = strdup(tty);	
 	stropt[pos] = NULL;
-#ifdef USE_KERNEL
     }
-#endif
 
 #ifdef DEBUG_PPPD
     l2tp_log (LOG_DEBUG, "%s: I'm running:  ", __FUNCTION__);
     for (x = 0; stropt[x]; x++)
     {
@@ -1151,11 +1115,11 @@ void init (int argc,char *argv[])
     if (init_config ())
     {
         l2tp_log (LOG_CRIT, "%s: Unable to load config file\n", __FUNCTION__);
         exit (1);
     }
-    if (uname (&uts))
+    if (uname (&uts)<0)
     {
         l2tp_log (LOG_CRIT, "%s : Unable to determine host system\n",
              __FUNCTION__);
         exit (1);
     }
diff --git a/misc.h b/misc.h
--- a/misc.h
+++ b/misc.h
@@ -71,11 +71,11 @@ extern void udppush_handler (int);
 extern int addfcs (struct buffer *buf);
 extern inline void swaps (void *, int);
 extern void do_packet_dump (struct buffer *);
 extern void status (const char *fmt, ...);
 extern void status_handler (int signal);
-extern int getPtyMaster (char *a, char *b);
+extern int getPtyMaster(char *, int);
 extern void do_control (void);
 extern void recycle_buf (struct buffer *);
 extern void safe_copy (char *, char *, int);
 extern void opt_destroy (struct ppp_opts *);
 extern struct ppp_opts *add_opt (struct ppp_opts *, char *, ...);
diff --git a/pty.c b/pty.c
--- a/pty.c
+++ b/pty.c
@@ -12,12 +12,24 @@
  * Pseudo-pty allocation routines...  Concepts and code borrowed
  * from pty-redir by Magosanyi Arpad.
  *
  */
 
-#include "l2tp.h"
+#define _ISOC99_SOURCE
+#define _XOPEN_SOURCE
+#define _BSD_SOURCE
+#define _XOPEN_SOURCE_EXTENDED
+
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
+#include "l2tp.h"
+
+
 
 #ifdef SOLARIS
 #define PTY00 "/dev/ptyXX"
 #define PTY10 "pqrstuvwxyz"
 #define PTY01 "0123456789abcdef"
@@ -33,11 +45,11 @@
 #define PTY00 "/dev/ptyXX"
 #define PTY10 "p"
 #define PTY01 "0123456789abcdefghijklmnopqrstuv"
 #endif
 
-int getPtyMaster (char *tty10, char *tty01)
+int getPtyMaster_pty (char *tty10, char *tty01)
 {
     char *p10;
     char *p01;
     static char dev[] = PTY00;
     int fd;
@@ -58,5 +70,70 @@ int getPtyMaster (char *tty10, char *tty
         }
     }
     l2tp_log (LOG_CRIT, "%s: No more free pseudo-tty's\n", __FUNCTION__);
     return -1;
 }
+
+int getPtyMaster_ptmx(char *ttybuf, int ttybuflen)
+{
+    int fd;
+    char *tty;
+
+    fd = open("/dev/ptmx", O_RDWR);
+    if (fd == -1)
+    {
+	l2tp_log (LOG_WARN, "%s: unable to open /dev/ptmx to allocate pty\n",
+		  __FUNCTION__);
+	return -EINVAL;
+    }
+
+    /* change the onwership */
+    if (grantpt(fd))
+    {
+	l2tp_log (LOG_WARN, "%s: unable to grantpt() on pty\n",
+		  __FUNCTION__);
+	close(fd);
+	return -EINVAL;
+    }
+
+    if (unlockpt(fd))
+    {
+	l2tp_log (LOG_WARN, "%s: unable to unlockpt() on pty\n",
+		  __FUNCTION__);
+	close(fd);
+	return -EINVAL;
+    }
+
+    tty = ptsname(fd);
+    if (tty == NULL)
+    {
+	l2tp_log (LOG_WARN, "%s: unable to obtain name of slave tty\n",
+		  __FUNCTION__);
+	close(fd);
+	return -EINVAL;
+    }
+    ttybuf[0]='\0';
+    strncat(ttybuf, tty, ttybuflen);
+
+    return fd;
+}
+	
+int getPtyMaster(char *ttybuf, int ttybuflen)
+{
+    int fd = getPtyMaster_ptmx(ttybuf, ttybuflen);
+    char a, b;
+    
+    if(fd >= 0) {
+	return fd;
+    }
+
+    l2tp_log (LOG_WARN, "%s: failed to use pts -- using legacy ptys\n", __FUNCTION__);
+    fd = getPtyMaster_pty(&a,&b);
+    
+    if(fd >= 0) {
+	snprintf(ttybuf, ttybuflen, "/dev/tty%c%c", a, b);
+	return fd;
+    }
+
+    return -EINVAL;
+}
+	

l2tpd-nodebug-default.patch:

--- NEW FILE l2tpd-nodebug-default.patch ---
diff-tree 30715d7b0838372bd42ecd9fb6b9c708d522e72d (from b240ad8ce83e0a0dbee533cb2862a5eafb937504)
Author: Michael Richardson 
Date:   Fri Nov 25 13:05:21 2005 -0500

    debugging should not be on by default

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -24,11 +24,11 @@
 # -DTEST_HIDDEN makes Assigned Call ID sent as a hidden AVP
 #
 # Also look at the top of network.c for some other (eventually to 
 # become runtime options) debugging flags
 #
-DFLAGS= -g -O2 -DDEBUG_PPPD -DDEBUG_PAYLOAD
+DFLAGS= -g -O2 
 #
 # Uncomment the next line for Linux
 #
 OSFLAGS= -DLINUX
 #


--- NEW FILE l2tpd-options.l2tpd ---
ipcp-accept-local
ipcp-accept-remote
ms-dns  192.168.1.1
ms-dns  192.168.1.3
ms-wins 192.168.1.2
ms-wins 192.168.1.4
noccp
auth
crtscts
idle 1800
mtu 1410
mru 1410
nodefaultroute
debug
lock
proxyarp
connect-delay 5000

l2tpd-patents.patch:

--- NEW FILE l2tpd-patents.patch ---
--- l2tpd-0.69cvs20051030/README.patents	1969-12-31 19:00:00.000000000 -0500
+++ l2tpd/README.patents	2005-11-27 19:45:38.000000000 -0500
@@ -0,0 +1,50 @@
+
+http://www.ietf.org/ietf/IPR/CISCO-L2TP
+
+The following was received on March 2, 1999 from
+Andy Valencia  (vandys at cisco.com)
+
+Cisco has a patent pending that may relate to this proposed standard. If
+this proposed standard is adopted by IETF and any patents issue to Cisco or
+its subsidiaries with claims that are necessary for practicing this
+standard, any party will be able to obtain the right to implement, use and
+distribute the technology or works when implementing, using or distributing
+technology based upon the specific specification(s) under openly specified,
+reasonable, non-discriminatory terms.
+
+
+Requests may be sent to:
+
+Robert Barr
+Suite 280
+2882 Sand Hill Road
+Menlo Park Ca 94025
+
+Phone: 650-926-6205
+
+
+Note: On July 30, 1999, we were informed that the patent office had assigned 
+      the number 5,918,019 for the patent
+
+--------------------------
+Cisco allows anyone to use their patent as long as it is IETF RFC
+compliant. This is Cisco's standard policy on patents for their IETF
+work. In fact, their statement was made before being awarded the
+patent. They complied fully with the IPR disclosure policy of the
+IETF. The IETF does not release RFC's that are limited or in any way
+discriminatory in their use. The patent holder (in this case Ciso)
+agree to a royalty free, unrevocable use of their patent as needed for
+implementing the IETF standards.
+
+If there were any limitations on the implementation and use of L2TP,
+the L2TP working group would not exist any more, and no new protocol
+additions or changes would be accepted as RFC standard.
+
+The L2TP became an IETF standard, see http://www.ietf.org/rfc/rfc2661.txt
+
+Notice the RFC was issued after the disclosure for IPR by Cisco, so
+the IETF fully knew about the patent and confirmed that there were no
+restrictions before it issued the RFC.
+
+   --- Paul Wouters 
+

l2tpd-socket.patch:

--- NEW FILE l2tpd-socket.patch ---
diff --git a/l2tpd.c b/l2tpd.c
--- a/l2tpd.c
+++ b/l2tpd.c
@@ -58,10 +58,12 @@ int control_fd;                 /* descr
 char *args;
 
 char *dial_no_tmp;              /* jz: Dialnumber for Outgoing Call */
 int switch_io = 0;              /* jz: Switch for Incoming or Outgoing Call */
 
+static void open_controlfd(void);
+
 void init_tunnel_list (struct tunnel_list *t)
 {
     t->head = NULL;
     t->count = 0;
     t->calls = 0;
@@ -353,10 +356,14 @@ int start_pppd (struct call *c, struct p
         tcgetattr (c->fd, &ptyconf);
         *(c->oldptyconf) = ptyconf;
         ptyconf.c_cflag &= ~(ICANON | ECHO);
         ptyconf.c_lflag &= ~ECHO;
         tcsetattr (c->fd, TCSANOW, &ptyconf);
+	if(fcntl(c->fd, F_SETFL, O_NONBLOCK)!=0) {
+	    l2tp_log(LOG_WARN, "failed to set nonblock: %s\n", strerror(errno));
+	    return -EINVAL;
+	}
 
         fd2 = open (tty, O_RDWR);
         if (fd2 < 0) {
             l2tp_log (LOG_WARN, "unable to open tty %s, cannot start pppd", tty);
             return -EINVAL;
@@ -809,170 +818,176 @@ void do_control ()
     char *tmp_ptr;              /* jz: use by the strtok function */
     struct lac *lac;
     int call;
     int tunl;
     int cnt = -1;
-    while (cnt)
+    int done = 0;
+
+    buf[0]='\0';
+
+    while (!done)
     {
-        cnt = read (control_fd, buf, sizeof (buf));
-        if (cnt > 0)
-        {
-            if (buf[cnt - 1] == '\n')
-                buf[--cnt] = 0;
+	cnt = read (control_fd, buf, sizeof (buf));
+	if (cnt <= 0)
+	{
+	    if(cnt < 0 && errno != EINTR) {
+		perror("controlfd");
+	    }
+	    done=1;
+	    break;
+	}
+
+	if (buf[cnt - 1] == '\n')
+	    buf[--cnt] = 0;
 #ifdef DEBUG_CONTROL
-            l2tp_log (LOG_DEBUG, "%s: Got message %s (%d bytes long)\n",
-                 __FUNCTION__, buf, cnt);
+	l2tp_log (LOG_DEBUG, "%s: Got message %s (%d bytes long)\n",
+		  __FUNCTION__, buf, cnt);
 #endif
-            switch (buf[0])
-            {
-            case 't':
-                host = strchr (buf, ' ') + 1;
+	switch (buf[0])
+	{
+	case 't':
+	    host = strchr (buf, ' ') + 1;
 #ifdef DEBUG_CONTROL
-                l2tp_log (LOG_DEBUG, "%s: Attempting to tunnel to %s\n",
-                     __FUNCTION__, host);
+	    l2tp_log (LOG_DEBUG, "%s: Attempting to tunnel to %s\n",
+		      __FUNCTION__, host);
 #endif
-                l2tp_call (host, UDP_LISTEN_PORT, NULL, NULL);
-                break;
-            case 'c':
-
-                switch_io = 1;  /* jz: Switch for Incoming - Outgoing Calls */
-
-                tunstr = strchr (buf, ' ') + 1;
-                lac = laclist;
-                while (lac)
-                {
-                    if (!strcasecmp (lac->entname, tunstr))
-                    {
-                        lac->active = -1;
-                        lac->rtries = 0;
-                        if (!lac->c)
-                            magic_lac_dial (lac);
-                        else
-                            l2tp_log (LOG_DEBUG,
-                                 "Session '%s' already active!\n", lac->entname);
-                        break;
-                    }
-                    lac = lac->next;
-                }
-                if (lac)
-                    break;
-                tunl = atoi (tunstr);
-                if (!tunl)
-                {
-                    l2tp_log (LOG_DEBUG, "No such tunnel '%s'\n", tunstr);
-                    break;
-                }
+	    l2tp_call (host, UDP_LISTEN_PORT, NULL, NULL);
+	    break;
+	case 'c':
+	    switch_io = 1;  /* jz: Switch for Incoming - Outgoing Calls */
+	    
+	    tunstr = strchr (buf, ' ') + 1;
+	    lac = laclist;
+	    while (lac && strcasecmp (lac->entname, tunstr)!=0)
+	    {
+		lac = lac->next;
+	    }
+
+	    if(lac) {
+		lac->active = -1;
+		lac->rtries = 0;
+		if (!lac->c)
+		    magic_lac_dial (lac);
+		else {
+		    l2tp_log (LOG_DEBUG,
+			      "Session '%s' already active!\n", lac->entname);
+		}
+		break;
+	    }
+
+	    /* did not find a tunnel by name, look by number */
+	    tunl = atoi (tunstr);
+	    if (!tunl)
+	    {
+		l2tp_log (LOG_DEBUG, "No such tunnel '%s'\n", tunstr);
+		break;
+	    }
 #ifdef DEBUG_CONTROL
-                l2tp_log (LOG_DEBUG, "%s: Attempting to call on tunnel %d\n",
-                     __FUNCTION__, tunl);
+	    l2tp_log (LOG_DEBUG, "%s: Attempting to call on tunnel %d\n",
+		      __FUNCTION__, tunl);
 #endif
-                lac_call (tunl, NULL, NULL);
-                break;
-
-            case 'o':          /* jz: option 'o' for doing a outgoing call */
-
-                switch_io = 0;  /* jz: Switch for incoming - outgoing Calls */
-
-                sub_str = strchr (buf, ' ') + 1;
-
-                tunstr = strtok (sub_str, " "); /* jz: using strtok function to get */
-                tmp_ptr = strtok (NULL, " ");   /*     params out of the pipe       */
-                strcpy (dial_no_tmp, tmp_ptr);
-
-                lac = laclist;
-                while (lac)
-                {
-                    if (!strcasecmp (lac->entname, tunstr))
-                    {
-                        lac->active = -1;
-                        lac->rtries = 0;
-                        if (!lac->c)
-                            magic_lac_dial (lac);
-                        else
-                            l2tp_log (LOG_DEBUG,
-                                 "Session '%s' already active!\n",
-                                lac->entname);
-                        break;
-                    }
-                    lac = lac->next;
-                }
-                if (lac)
-                    break;
-                tunl = atoi (tunstr);
-                if (!tunl)
-                {
-                    l2tp_log (LOG_DEBUG, "No such tunnel '%s'\n", tunstr);
-                    break;
-                }
+	    lac_call (tunl, NULL, NULL);
+	    break;
+	    
+	case 'o':          /* jz: option 'o' for doing a outgoing call */
+	    switch_io = 0;  /* jz: Switch for incoming - outgoing Calls */
+	    
+	    sub_str = strchr (buf, ' ') + 1;
+	    tunstr = strtok (sub_str, " "); /* jz: using strtok function to get */
+	    tmp_ptr = strtok (NULL, " ");   /*     params out of the pipe       */
+	    strcpy (dial_no_tmp, tmp_ptr);
+	    
+	    lac = laclist;
+	    while (lac && strcasecmp (lac->entname, tunstr)!=0)
+	    {
+		lac = lac->next;
+	    }
+
+	    if(lac) {
+		lac->active = -1;
+		lac->rtries = 0;
+		if (!lac->c)
+		    magic_lac_dial (lac);
+		else
+		    l2tp_log (LOG_DEBUG,
+			      "Session '%s' already active!\n",
+			      lac->entname);
+		break;
+	    }
+
+	    /* did not find a tunnel by name, look by number */
+	    tunl = atoi (tunstr);
+	    if (!tunl)
+	    {
+		l2tp_log (LOG_DEBUG, "No such tunnel '%s'\n", tunstr);
+		break;
+	    }
 #ifdef DEBUG_CONTROL
-                l2tp_log (LOG_DEBUG, "%s: Attempting to call on tunnel %d\n",
-                     __FUNCTION__, tunl);
+	    l2tp_log (LOG_DEBUG, "%s: Attempting to call on tunnel %d\n",
+		      __FUNCTION__, tunl);
 #endif
-                lac_call (tunl, NULL, NULL);
-                break;
-
-            case 'h':
-                callstr = strchr (buf, ' ') + 1;
-                call = atoi (callstr);
+	    lac_call (tunl, NULL, NULL);
+	    break;
+	    
+	case 'h':
+	    callstr = strchr (buf, ' ') + 1;
+	    call = atoi (callstr);
 #ifdef DEBUG_CONTROL
-                l2tp_log (LOG_DEBUG, "%s: Attempting to hangup call %d\n", __FUNCTION__,
-                     call);
+	    l2tp_log (LOG_DEBUG, "%s: Attempting to hangup call %d\n", __FUNCTION__,
+		      call);
 #endif
-                lac_hangup (call);
-                break;
-            case 'd':
-                tunstr = strchr (buf, ' ') + 1;
-                lac = laclist;
-                while (lac)
-                {
-                    if (!strcasecmp (lac->entname, tunstr))
-                    {
-                        lac->active = 0;
-                        lac->rtries = 0;
-                        if (lac->t)
-                            lac_disconnect (lac->t->ourtid);
-                        else
-                            l2tp_log (LOG_DEBUG, "Session '%s' not up\n",
-                                 lac->entname);
-                        break;
-                    }
-                    lac = lac->next;
-                }
-                if (lac)
-                    break;
-                tunl = atoi (tunstr);
-                if (!tunl)
-                {
-                    l2tp_log (LOG_DEBUG, "No such tunnel '%s'\n",
-                         tunstr);
-                    break;
-                }
+	    lac_hangup (call);
+	    break;
+
+	case 'd':
+	    tunstr = strchr (buf, ' ') + 1;
+	    lac = laclist;
+	    while (lac)
+	    {
+		if (!strcasecmp (lac->entname, tunstr))
+		{
+		    lac->active = 0;
+		    lac->rtries = 0;
+		    if (lac->t)
+			lac_disconnect (lac->t->ourtid);
+		    else
+			l2tp_log (LOG_DEBUG, "Session '%s' not up\n",
+				  lac->entname);
+		    break;
+		}
+		lac = lac->next;
+	    }
+	    if (lac)
+		break;
+	    tunl = atoi (tunstr);
+	    if (!tunl)
+	    {
+		l2tp_log (LOG_DEBUG, "No such tunnel '%s'\n",
+			  tunstr);
+		break;
+	    }
 #ifdef DEBUG_CONTROL
-                l2tp_log (LOG_DEBUG, "%s: Attempting to disconnect tunnel %d\n",
-                     __FUNCTION__, tunl);
+	    l2tp_log (LOG_DEBUG, "%s: Attempting to disconnect tunnel %d\n",
+		      __FUNCTION__, tunl);
 #endif
-                lac_disconnect (tunl);
-                break;
-            case 's':
-                show_status ();
-                break;
-            default:
-                l2tp_log (LOG_DEBUG, "Unknown command %c\n",
-                     buf[0]);
-            }
-        }
+	    lac_disconnect (tunl);
+	    break;
+	case 's':
+	    show_status ();
+	    break;
+	default:
+	    l2tp_log (LOG_DEBUG, "Unknown command %c\n",
+		      buf[0]);
+	}
     }
-    /* Otherwise select goes nuts */
+
+    /* Otherwise select goes nuts. Yeah, this just seems wrong */
     close (control_fd);
-    control_fd = open (gconfig.controlfile, O_RDONLY | O_NONBLOCK, 0600);
-    if (control_fd < 0)
-    {
-        l2tp_log (LOG_CRIT, "%s: Unable to open %s for reading.",
-             __FUNCTION__, gconfig.controlfile);
-    }
+    open_controlfd();
 }
 
+
 void usage(void) {
     printf("Usage: l2tpd -D -c [config file] -s [secret file] -p [pid file] -C [control file]\n");
     printf("\n");
     exit(1);
 }
@@ -1037,12 +1052,11 @@ void init_args(int argc, char *argv[]) {
 }
 
 
 void daemonize() {
     int pid=0;
-    int i,l;
-    char buf[STRLEN];
+    int i;
 
 #ifndef CONFIG_SNAPGEAR
     if((pid = fork()) < 0) {
         l2tp_log(LOG_LOG, "%s: Unable to fork ()\n",__FUNCTION__);
         close(server_socket);
@@ -1060,10 +1074,16 @@ void daemonize() {
             l2tp_log(LOG_LOG, "Redirect of stdout to /dev/null failed\n");
         if (dup2(0, 2) == -1)
             l2tp_log(LOG_LOG, "Redirect of stderr to /dev/null failed\n");
     }
 #endif
+}
+
+void consider_pidfile() {
+    int pid=0;
+    int i,l;
+    char buf[STRLEN];
 
     /* Read previous pid file. */
     i = open(gconfig.pidfile,O_RDONLY);
     if (i < 0) {
         /* l2tp_log(LOG_LOG, "%s: Unable to read pid file [%s]\n",
@@ -1098,11 +1118,27 @@ void daemonize() {
         write (i, buf, strlen(buf));
         close (i);
     }
 }
 
-
+static void open_controlfd() 
+{
+    control_fd = open (gconfig.controlfile, O_RDONLY | O_NONBLOCK, 0600);
+    if (control_fd < 0)
+    {
+        l2tp_log (LOG_CRIT, "%s: Unable to open %s for reading.\n",
+             __FUNCTION__, gconfig.controlfile);
+        exit (1);
+    }
+   
+    /* turn off O_NONBLOCK */
+    if(fcntl(control_fd, F_SETFL, O_RDONLY)==-1) {
+	l2tp_log(LOG_CRIT, "Can not turn off nonblocking mode for controlfd: %s\n",
+		 strerror(errno));
+	exit(1);
+    }
+}
 
 void init (int argc,char *argv[])
 {
     struct lac *lac;
     struct in_addr listenaddr;
@@ -1124,26 +1160,28 @@ void init (int argc,char *argv[])
         exit (1);
     }
     init_tunnel_list (&tunnels);
     if (init_network ())
         exit (1);
+
     if (gconfig.daemon)
 	daemonize ();
+
+    consider_pidfile();
+
     signal (SIGTERM, &death_handler);
     signal (SIGINT, &death_handler);
     signal (SIGCHLD, &child_handler);
     signal (SIGUSR1, &status_handler);
     signal (SIGHUP, &null_handler);
     init_scheduler ();
+
+    unlink(gconfig.controlfile);
     mkfifo (gconfig.controlfile, 0600);
-    control_fd = open (gconfig.controlfile, O_RDONLY | O_NONBLOCK, 0600);
-    if (control_fd < 0)
-    {
-        l2tp_log (LOG_CRIT, "%s: Unable to open %s for reading.",
-             __FUNCTION__, gconfig.controlfile);
-        exit (1);
-    }
+
+    open_controlfd();
+
     l2tp_log (LOG_LOG, "l2tpd version " SERVER_VERSION " started on %s PID:%d\n",
          hostname, getpid ());
     l2tp_log (LOG_LOG,
          "Written by Mark Spencer, Copyright (C) 1998, Adtran, Inc.\n");
     l2tp_log (LOG_LOG, "Forked by Scott Balmos and David Stipp, (C) 2001\n");

l2tpd-solaris.patch:

--- NEW FILE l2tpd-solaris.patch ---
diff-tree 4b265089250fa45cf123fc52a6b9492200913e33 (from 6b5bd2833d12585f2cf5d4c128438bb94ccd5a89)
Author: Michael Richardson 
Date:   Tue Nov 22 23:19:11 2005 -0500

    add comments for what to do on Solaris

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -24,11 +24,11 @@
 # -DTEST_HIDDEN makes Assigned Call ID sent as a hidden AVP
 #
 # Also look at the top of network.c for some other (eventually to 
 # become runtime options) debugging flags
 #
-#DFLAGS= -g -O2 -DDEBUG_PPPD
+DFLAGS= -g -O2 -DDEBUG_PPPD -DDEBUG_PAYLOAD
 #
 # Uncomment the next line for Linux
 #
 OSFLAGS= -DLINUX
 #
@@ -43,10 +43,11 @@ OSFLAGS= -DLINUX
 # Uncomment the next line for Solaris. For solaris, at least,
 # we don't want to specify -I/usr/include because it is in
 # the basic search path, and will over-ride some gcc-specific
 # include paths and cause problems.
 #
+#CC=gcc
 #OSFLAGS= -DSOLARIS
 #OSLIBS= -lnsl -lsocket
 #
 # Feature flags
 #
@@ -56,11 +57,12 @@ OSFLAGS= -DLINUX
 FFLAGS= -DIP_ALLOCATION
 
 CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(FFLAGS)
 HDRS=l2tp.h avp.h misc.h control.h call.h scheduler.h file.h aaa.h md5.h
 OBJS=l2tpd.o pty.o misc.o control.o avp.o call.o network.o avpsend.o scheduler.o file.o aaa.o md5.o
-#LIBS= $(OSLIB) # -lefence # efence for malloc checking
+SRCS=${OBJS:.o=.c} ${HDRS}
+#LIBS= $(OSLIBS) # -lefence # efence for malloc checking
 EXEC=l2tpd
 BINDIR=/usr/sbin
 
 all: $(EXEC)
 
@@ -74,5 +76,7 @@ romfs:
 	$(ROMFSINST) /bin/$(EXEC)
 
 install: ${EXEC}
 	install --mode=0755 ${EXEC} ${DESTDIR}${BINDIR}
 
+TAGS:	${SRCS}
+	etags ${SRCS}

l2tpd-stopccn.patch:

--- NEW FILE l2tpd-stopccn.patch ---
diff-tree c61f0a0bd1a0c8029b7770e20950aa83c79a9a1f (from 4b265089250fa45cf123fc52a6b9492200913e33)
Author: Michael Richardson 
Date:   Tue Nov 22 23:20:38 2005 -0500

    l2tp-patches/l2tpd-MSL2TP-StopCCN - make sure we compare against correct cid

diff --git a/control.c b/control.c
--- a/control.c
+++ b/control.c
@@ -666,16 +666,17 @@ int control_finish (struct tunnel *t, st
                 l2tp_log (LOG_DEBUG,
                      "%s: Peer tried to disconnect without specifying tunnel ID\n",
                      __FUNCTION__);
             return -EINVAL;
         }
-        if ((t->qtid != t->tid) && (t->tid > 0))
+
+        if ((t->qtid != t->ourtid) && (t->ourtid > 0))
         {
             if (DEBUG)
                 l2tp_log (LOG_DEBUG,
                      "%s: Peer tried to disconnect with invalid TID (%d != %d)\n",
-                     __FUNCTION__, t->qtid, t->tid);
+                     __FUNCTION__, t->qtid, t->ourtid);
             return -EINVAL;
         }
         /* In case they're disconnecting immediately after SCCN */
         if (!t->tid)
             t->tid = t->qtid;
@@ -1067,18 +1068,20 @@ int control_finish (struct tunnel *t, st
                          "%s: Unable to determine call to be disconnected.\n",
                          __FUNCTION__);
                 return -EINVAL;
             }
         }
-        else
+        else {
             p = c;
-        if ((c->qcid != p->cid) && p->cid > 0)
+	}
+
+        if ((c->qcid != p->cid) && p->ourcid > 0)
         {
             if (DEBUG)
                 l2tp_log (LOG_DEBUG,
                      "%s: Peer tried to disconnect with invalid CID (%d != %d)\n",
-                     __FUNCTION__, c->qcid, c->cid);
+                     __FUNCTION__, c->qcid, c->ourcid);
             return -EINVAL;
         }
         c->qcid = -1;
         if (c->result < 0)
         {

l2tpd-uaddr.patch:

--- NEW FILE l2tpd-uaddr.patch ---
diff-tree f09c91543dc84206a7a82db62bab09b8a52da44a (from df3ccc3ddfa5af6d0950f3308b546809947117fb)
Author: Michael Richardson 
Date:   Fri Nov 25 13:41:36 2005 -0500

    remove definition of uaddr[] --- it is not needed at present
    (cherry picked from 148ec348a69f28608d2bc671e96222a4c595d83d commit)

diff --git a/aaa.h b/aaa.h
--- a/aaa.h
+++ b/aaa.h
@@ -45,11 +45,10 @@ struct challenge
     unsigned int vector_len;
     int state;                  /* What state is challenge in? */
 };
 
 extern struct lns *get_lns (struct tunnel *);
-extern struct addr_ent *uaddr[];
 extern unsigned int get_addr (struct iprange *);
 extern void reserve_addr (unsigned int);
 extern void unreserve_addr (unsigned int);
 extern void init_addr ();
 extern int handle_challenge (struct tunnel *, struct challenge *);

l2tpd-version.patch:

--- NEW FILE l2tpd-version.patch ---
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -58,10 +58,11 @@ FFLAGS= -DIP_ALLOCATION
 CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(FFLAGS)
 HDRS=l2tp.h avp.h misc.h control.h call.h scheduler.h file.h aaa.h md5.h
 OBJS=l2tpd.o pty.o misc.o control.o avp.o call.o network.o avpsend.o scheduler.o file.o aaa.o md5.o
 #LIBS= $(OSLIB) # -lefence # efence for malloc checking
 EXEC=l2tpd
+BINDIR=/usr/sbin
 
 all: $(EXEC)
 
 clean:
 	rm -f $(OBJS) $(EXEC)
@@ -70,5 +71,8 @@ $(EXEC): $(OBJS) $(HDRS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
 
 romfs:
 	$(ROMFSINST) /bin/$(EXEC)
 
+install: ${EXEC}
+	install --mode=0755 ${EXEC} ${DESTDIR}${BINDIR}
+
diff --git a/l2tp.h b/l2tp.h
--- a/l2tp.h
+++ b/l2tp.h
@@ -34,12 +34,12 @@ typedef unsigned long long _u64;
 #include "common.h"
 
 #define CONTROL_PIPE "/var/run/l2tp-control"
 
 #define BINARY "l2tpd"
-#define SERVER_VERSION "0.69"
-#define VENDOR_NAME "l2tpd.org"
+#define SERVER_VERSION "0.69-FedoraExtra"
+#define VENDOR_NAME "FedoraExtra"
 #ifndef PPPD
 #define PPPD		"/usr/sbin/pppd"
 #endif
 #define CALL_PPP_OPTS "defaultroute"
 #define FIRMWARE_REV	0x0690  /* Revision of our firmware (software, in this case) */


--- NEW FILE l2tpd.conf ---
;
; This is a minimal sample l2tpd configuration file for use
; with L2TP over IPsec.
;
; The idea is to provide an L2TP daemon to which remote Windows L2TP/IPsec
; clients connect. In this example, the internal (protected) network 
; is 192.168.1.0/24.  A special IP range within this network is reserved
; for the remote clients: 192.168.1.128/25
; (i.e. 192.168.1.128 ... 192.168.1.254)
;
; The listen-addr parameter can be used if you want to bind the L2TP daemon
; to a specific IP address instead of to all interfaces. For instance,
; you could bind it to the interface of the internal LAN (e.g. 192.168.1.98
; in the example below). Yet another IP address (local ip, e.g. 192.168.1.99)
; will be used by l2tpd as its address on pppX interfaces.

[global]
; listen-addr = 192.168.1.98

[lns default]
ip range = 192.168.1.128-192.168.1.254
local ip = 192.168.1.99
require chap = yes
refuse pap = yes
require authentication = yes
name = LinuxVPNserver
ppp debug = yes
pppoptfile = /etc/ppp/options.l2tpd
length bit = yes


--- NEW FILE l2tpd.init ---
#!/bin/sh
#
# l2tpd		This shell script takes care of starting and stopping l2tpd.
#
# chkconfig: - 80 30
# description:	Layer 2 Tunnelling Protocol Daemon (RFC 2661)
#
# processname:	l2tpd
# config:	/etc/l2tpd/l2tpd.conf
# pidfile:	/var/run/l2tpd.pid

#Servicename
SERVICE=l2tpd

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

if [ ${NETWORKING} = "no" ]
then
	exit 0
fi

[ -x /usr/sbin/$SERVICE ] || exit 0

RETVAL=0

start() {
	echo -n "Starting $SERVICE: "
	daemon $SERVICE
	RETVAL=$?
	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
	echo ""
	return $RETVAL
}

stop() {
	echo -n "Stopping $SERVICE: "
	killproc $SERVICE
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$SERVICE
	return $RETVAL
}

restart() {
	stop
	start
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
	status $SERVICE
	RETVAL=$?
	;;
  restart|reload)
	restart
	;;
  condrestart)
	[ -f /var/lock/subsys/$SERVICE ] && restart || :
	;;
  *)
	echo "Usage: $SERVICE {start|stop|status|restart|reload|condrestart}"
	exit 1
esac


--- NEW FILE l2tpd.spec ---
%define cvs    20051030

Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
Name: l2tpd
Version: 0.69
Release: 0.1.%{cvs}.2
License: GPL
Url: http://sourceforge.net/projects/%{name}/
Group: System Environment/Daemons

# cvs is not available as tar ball on sourceforge.
# For cvs se: http://sourceforge.net/cvs/?group_id=18217
Source0: %{name}-%{version}.%{cvs}.tar.gz
Source1: %{name}.init
Source2: %{name}.conf
Source3: %{name}-options.l2tpd
Source4: %{name}-chapsecrets.sample

Patch0: %{name}-log.patch
Patch1: %{name}-version.patch
Patch2: %{name}-solaris.patch
Patch3: %{name}-stopccn.patch
Patch4: %{name}-move-pty-logic.patch
Patch5: %{name}-log-strerr.patch
Patch6: %{name}-socket.patch
Patch7: %{name}-async-sync.patch
Patch8: %{name}-nodebug-default.patch
Patch9: %{name}-moredebug.patch
Patch10: %{name}-max-retries.patch
Patch11: %{name}-uaddr.patch
Patch12: %{name}-gcc4-fixes.patch
Patch13: %{name}-changelog.patch
Patch14: %{name}-patents.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ppp 

Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig, /sbin/service
Requires(postun): /sbin/service

%description
l2tpd is an implementation of the Layer 2 Tunnelling Protocol (RFC 2661).
L2TP allows you to tunnel PPP over UDP. Some ISPs use L2TP to tunnel user
sessions from dial-in servers (modem banks, ADSL DSLAMs) to back-end PPP
servers. Another important application is Virtual Private Networks where
the IPsec protocol is used to secure the L2TP connection (L2TP/IPsec,
RFC 3193). The L2TP/IPsec protocol is mainly used by Windows and 
Mac OS X clients. On Linux, l2tpd can be used in combination with IPsec
implementations such as FreeS/WAN, Openswan, Strongswan and KAME.
Example configuration files for such a setup are included in this RPM.

l2tpd works by opening a pseudo-tty for communicating with pppd.
It runs completely in userspace.


%prep
%setup -q -n %{name}-%{version}.%{cvs}
%patch0 -p1 -b .log
%patch1 -p1 -b .version
%patch2 -p1 -b .solaris
%patch3 -p1 -b .stopccn
%patch4 -p1 -b .move-pty-logic
%patch5 -p1 -b .log-strerr
%patch6 -p1 -b .socket
%patch7 -p1 -b .async-sync
%patch8 -p1 -b .nodebug-default
%patch9 -p1 -b .moredebug
%patch10 -p1 -b .max-retries
%patch11 -p1 -b .uaddr
%patch12 -p1 -b .gcc4-fixes
%patch13 -p1 -b .changelog
%patch14 -p1 -b .patents

%build
make DFLAGS="$RPM_OPT_FLAGS -DDEBUG_PPPD -DDEBUG_CONTROL -DDEBUG_ENTROPY"
# Fix DOS file
tr -d '\r' CREDITS.new && mv -f CREDITS.new CREDITS

%install
rm -rf %{buildroot}
# There's no 'install' rule in the Makefile, so let's do it manually
install -d %{buildroot}%{_sbindir}
install -m755 %{name} %{buildroot}%{_sbindir}
install -d %{buildroot}%{_mandir}/{man5,man8}
install -m644 doc/%{name}.conf.5 %{buildroot}%{_mandir}/man5
install -m644 doc/l2tp-secrets.5 %{buildroot}%{_mandir}/man5/
install -m644 doc/%{name}.8 %{buildroot}%{_mandir}/man8
install -d %{buildroot}%{_sysconfdir}/{%{name},ppp,ipsec.d}
install -m644 doc/%{name}.conf.sample %{buildroot}%{_sysconfdir}/%{name}/
install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/ppp/options.l2tpd
install -m600 doc/l2tp-secrets.sample %{buildroot}%{_sysconfdir}/%{name}/l2tp-secrets
install -d %{buildroot}%{_initrddir}
install -m755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
install -m644 %{SOURCE4} .

%clean
rm -rf %{buildroot}

%post
/sbin/chkconfig --add %{name}

%preun
if [ $1 -eq 0 ]; then
        /sbin/service %{name} stop > /dev/null 2>&1
        /sbin/chkconfig --del %{name}
fi

%postun
if [ $1 -ge 1 ]; then
  /sbin/service %{name} condrestart 2>&1 >/dev/null
fi

%files
%defattr(-,root,root,-)
%doc BUGS CHANGELOG CREDITS LICENSE README TODO doc/rfc2661.txt 
%doc CHANGELOG.Xelerance README.patents l2tpd-chapsecrets.sample
%{_sbindir}/%{name}
%{_mandir}/*/*
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/*
%config(noreplace) %{_sysconfdir}/ppp/*
%attr(0755,root,root)  %{_initrddir}/%{name}


%changelog
* Wed Dec 14 2005 Paul Wouters  0.69-0.1.20051030
- incorporated fixes from Dmitry Butskoy

* Sun Nov 27 2005 Paul Wouters  0.69.20051030
- Pulled up sourceforget.net CVS fixes.
- various debugging added, but debugging should not be on by default.
- async/sync conversion routines must be ready for possibility that the read
  will block due to routing loops.
- refactor control socket handling.
- move all logic about pty usage to pty.c. Try ptmx first, if it fails try
  legacy ptys
- rename log() to l2tp_log(), as "log" is a math function.
- if we aren't deamonized, then log to stderr.
- added install: and DESTDIR support.

* Thu Oct 20 2005 Paul Wouters  0.69-13
- Removed suse/mandrake specifics. Comply for Fedora Extras guidelines

* Tue Jun 21 2005 Jacco de Leeuw  0.69-12jdl
- Added log() patch by Paul Wouters so that l2tpd compiles on FC4.

* Sat Jun 4 2005 Jacco de Leeuw 
- l2tpd.org has been hijacked. Project moved back to SourceForge:
  http://l2tpd.sourceforge.net 

* Tue May 3 2005 Jacco de Leeuw 
- Small Makefile fixes. Explicitly use gcc instead of cc. 
  Network services library was not linked on Solaris due to typo.

* Thu Mar 17 2005 Jacco de Leeuw  0.69-11jdl
- Choosing between SysV or BSD style ptys is now configurable through
  a compile-time boolean "unix98pty".

* Fri Feb 4 2005 Jacco de Leeuw 
- Added code from Roaring Penguin (rp-l2tp) to support SysV-style ptys.
  Requires the N_HDLC kernel module. 

* Fri Nov 26 2004 Jacco de Leeuw 
- Updated the README.

* Wed Nov 10 2004 Jacco de Leeuw  0.69-10jdl
- Patch by Marald Klein and Roger Luethi. Fixes writing PID file.
  (http://l2tpd.graffl.net/msg01790.html)
  Long overdue. Rereleasing 10jdl.

* Tue Nov 9 2004 Jacco de Leeuw  0.69-10jdl
- [SECURITY FIX] Added fix from Debian because of a bss-based
  buffer overflow.
  (http://www.mail-archive.com/l2tpd-devel at l2tpd.org/msg01071.html)
- Mandrake's FreeS/WAN, Openswan and Strongswan RPMS use configuration
  directories /etc/{freeswan,openswan,strongswan}. Install our
  configuration files to /etc/ipsec.d and create symbolic links in
  those directories.

* Tue Aug 18 2004 Jacco de Leeuw 
- Removed 'leftnexthop=' lines. Not relevant for recent versions
  of FreeS/WAN and derivates.

* Tue Jan 20 2004 Jacco de Leeuw   0.69-9jdl
- Added "noccp" because of too much MPPE/CCP messages sometimes.

* Wed Dec 31 2003 Jacco de Leeuw 
- Added patch in order to prevent StopCCN messages.

* Sat Aug 23 2003 Jacco de Leeuw 
- MTU/MRU 1410 seems to be the lowest possible for MSL2TP.
  For Windows 2000/XP it doesn't seem to matter.
- Typo in l2tpd.conf (192.168.128/25).

* Fri Aug 8 2003 Jacco de Leeuw   0.69-8jdl
- Added MTU/MRU 1400 to options.l2tpd. I don't know the optimal
  value but some apps had problems with the default value.

* Fri Aug 1 2003 Jacco de Leeuw 
- Added workaround for the missing hostname bug in the MSL2TP client
  ('Specify your hostname', error 629: "You have been disconnected
  from the computer you are dialing").

* Thu Jul 20 2003 Jacco de Leeuw   0.69-7jdl
- Added the "listen-addr" global parameter for l2tpd.conf. By
  default, the daemon listens on *all* interfaces. Use
  "listen-addr" if you want it to bind to one specific
  IP address (interface), for security reasons. (See also:
  http://www.jacco2.dds.nl/networking/freeswan-l2tp.html#Firewallwarning)
- Explained in l2tpd.conf that two different IP addresses should be
  used for 'listen-addr' and 'local ip'.
- Modified init script. Upgrades should work better now. You
  still need to start/chkconfig l2tpd manually.
- Renamed the example Openswan .conf files to better reflect
  the situation. There are two variants using different portselectors.
  Previously I thought Windows 2000/XP used portselector 17/0
  and the rest used 17/1701. But with the release of an updated 
  IPsec client by Microsoft, it turns out that 17/0 must have
  been a mistake: the updated client now also uses 17/1701.

* Mon Apr 10 2003 Jacco de Leeuw   0.69-6jdl
- Changed sample chap-secrets to be valid only for specific
  IP addresses.

* Thu Mar 13 2003 Bernhard Thoni 
- Adjustments for SuSE8.x (thanks, Bernhard!)
- Added sample chap-secrets.

* Thu Mar 6 2003 Jacco de Leeuw  0.69-5jdl
- Replaced Dominique's patch by Damion de Soto's, which does not
  depend on the N_HDLC kernel module. 

* Wed Feb 26 2003 Jacco de Leeuw  0.69-4jdl
- Seperate example config files for Win9x (MSL2TP) and Win2K/XP
  due to left/rightprotoport differences.
  Fixing preun for Red Hat.

* Mon Feb 3 2003 Jacco de Leeuw  0.69-3jdl
- Mandrake uses /etc/freeswan/ instead of /etc/ipsec.d/
  Error fixed: source6 was used for both PSK and CERT.

* Wed Jan 29 2003 Jacco de Leeuw  0.69-3jdl
- Added Dominique Cressatti's pty patch in another attempt to
  prevent the Windows 2000 Professional "loopback detected" error.
  Seems to work!

* Wed Dec 25 2002 Jacco de Leeuw  0.69-2jdl
- Added 'connect-delay' to PPP parameters in an attempt to
  prevent the Windows 2000 Professional "loopback detected" error.
  Didn't seem to work.

* Fri Dec 13 2002 Jacco de Leeuw  0.69-1jdl
- Did not build on Red Hat 8.0. Solved by adding comments(?!).
  Bug detected in spec file: chkconfig --list l2tpd does not work
  on Red Hat 8.0. Not important enough to look into yet.

* Sun Nov 17 2002 Jacco de Leeuw  0.69-1jdl
- Tested on Red Hat, required some changes. No gprintf. Used different
  pty patch, otherwise wouldn't run. Added buildroot sanity check.

* Sun Nov 10 2002 Jacco de Leeuw 
- Specfile adapted from Mandrake Cooker. The original RPM can be
  retrieved through:
  http://www.rpmfind.net/linux/rpm2html/search.php?query=l2tpd
- Config path changed from /etc/l2tp/ to /etc/l2tpd/ 
  (Seems more logical and rp-l2tp already uses /etc/l2tp/).
- Do not run at boot or install. The original RPM uses a config file
  which is completely commented out, but it still starts l2tpd on all
  interfaces. Could be a security risk. This RPM does not start l2tpd,
  the sysadmin has to edit the config file and start l2tpd explicitly.
- Renamed patches to start with l2tpd-
- Added dependencies for pppd, glibc-devel.
- Use %{name} as much as possible.
- l2tp-secrets contains passwords, thus should not be world readable.
- Removed dependency on rpm-helper.

* Mon Oct 21 2002 Lenny Cartier  0.69-3mdk
- from Per ?yvind Karlsen  :
 - PreReq and Requires
 - Fix preun_service

* Thu Oct 17 2002 Per ?yvind Karlsen  0.69-2mdk
- Move l2tpd from /usr/bin to /usr/sbin
- Added SysV initscript
- Patch0
- Patch1

* Thu Oct 17 2002 Per ?yvind Karlsen  0.69-1mdk
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/l2tpd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Dec 2005 19:14:02 -0000	1.1
+++ .cvsignore	15 Dec 2005 19:15:33 -0000	1.2
@@ -0,0 +1 @@
+l2tpd-0.69.20051030.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/l2tpd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Dec 2005 19:14:02 -0000	1.1
+++ sources	15 Dec 2005 19:15:33 -0000	1.2
@@ -0,0 +1 @@
+36144b856b70d58bdb4ac4805cb71bb2  l2tpd-0.69.20051030.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 19:18:54 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:18:54 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures-1.11.0-optflags.patch,
	NONE, 1.1 nethack-vultures.spec, 1.3, 1.4
Message-ID: <200512151919.jBFJJOFG006676@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6617/FC-3

Modified Files:
	nethack-vultures.spec 
Added Files:
	nethack-vultures-1.11.0-optflags.patch 
Log Message:
Fixed (?) some broken patches.



nethack-vultures-1.11.0-optflags.patch:

--- NEW FILE nethack-vultures-1.11.0-optflags.patch ---
--- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
@@ -164,7 +164,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -g -I../include -I../win/vultures/
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
 LFLAGS = 
 
 # The Qt and Be window systems are written in C++, while the rest of
--- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
@@ -89,7 +89,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -O -I../include -I../win/vultures -DVULTURESEYE
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures -DVULTURESEYE
 LFLAGS =
 
 LIBS =
--- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
@@ -157,7 +157,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -g -O -I../include -I../win/vultures
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
 LFLAGS =
 
 # Only used for the Gnome interface.
--- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
@@ -89,7 +89,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -O -I../include -I../win/vultures -DVULTURESCLAW
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures -DVULTURESCLAW
 LFLAGS =
 
 LIBS =


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-vultures.spec	15 Dec 2005 18:32:55 -0000	1.3
+++ nethack-vultures.spec	15 Dec 2005 19:18:52 -0000	1.4
@@ -7,10 +7,9 @@
 License:        NetHack General Public License
 URL:            http://www.darkarts.co.za/projects/vultures/
 Source0:        http://www.darkarts.co.za/projects/vultures/downloads/vultures-%{version}/vultures-%{version}-full.tar.bz2
-Patch0:         %{name}-1.10.1-optflags.patch
+Patch0:         %{name}-1.11.0-optflags.patch
 Patch1:         %{name}-1.10.1-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
-Patch3:         %{name}-1.10.1-log2stderr.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -161,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
+- Forgot to update the patches previously; done.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
 - Upgraded the tarball to the latest release
 - Upped the version



From fedora-extras-commits at redhat.com  Thu Dec 15 19:19:00 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:19:00 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures-1.11.0-optflags.patch,
	NONE, 1.1 nethack-vultures.spec, 1.4, 1.5
Message-ID: <200512151919.jBFJJU4r006679@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-serv6617/FC-4

Modified Files:
	nethack-vultures.spec 
Added Files:
	nethack-vultures-1.11.0-optflags.patch 
Log Message:
Fixed (?) some broken patches.



nethack-vultures-1.11.0-optflags.patch:

--- NEW FILE nethack-vultures-1.11.0-optflags.patch ---
--- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
@@ -164,7 +164,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -g -I../include -I../win/vultures/
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
 LFLAGS = 
 
 # The Qt and Be window systems are written in C++, while the rest of
--- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
@@ -89,7 +89,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -O -I../include -I../win/vultures -DVULTURESEYE
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures -DVULTURESEYE
 LFLAGS =
 
 LIBS =
--- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
@@ -157,7 +157,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -g -O -I../include -I../win/vultures
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
 LFLAGS =
 
 # Only used for the Gnome interface.
--- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
@@ -89,7 +89,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -O -I../include -I../win/vultures -DVULTURESCLAW
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures -DVULTURESCLAW
 LFLAGS =
 
 LIBS =


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nethack-vultures.spec	15 Dec 2005 18:33:01 -0000	1.4
+++ nethack-vultures.spec	15 Dec 2005 19:18:57 -0000	1.5
@@ -7,10 +7,9 @@
 License:        NetHack General Public License
 URL:            http://www.darkarts.co.za/projects/vultures/
 Source0:        http://www.darkarts.co.za/projects/vultures/downloads/vultures-%{version}/vultures-%{version}-full.tar.bz2
-Patch0:         %{name}-1.10.1-optflags.patch
+Patch0:         %{name}-1.11.0-optflags.patch
 Patch1:         %{name}-1.10.1-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
-Patch3:         %{name}-1.10.1-log2stderr.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -161,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
+- Forgot to update the patches previously; done.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
 - Upgraded the tarball to the latest release
 - Upped the version



From fedora-extras-commits at redhat.com  Thu Dec 15 19:19:05 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:19:05 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures-1.11.0-optflags.patch,
	NONE, 1.1 nethack-vultures.spec, 1.4, 1.5
Message-ID: <200512151919.jBFJJZk3006682@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6617/devel

Modified Files:
	nethack-vultures.spec 
Added Files:
	nethack-vultures-1.11.0-optflags.patch 
Log Message:
Fixed (?) some broken patches.



nethack-vultures-1.11.0-optflags.patch:

--- NEW FILE nethack-vultures-1.11.0-optflags.patch ---
--- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
@@ -164,7 +164,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -g -I../include -I../win/vultures/
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
 LFLAGS = 
 
 # The Qt and Be window systems are written in C++, while the rest of
--- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
@@ -89,7 +89,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -O -I../include -I../win/vultures -DVULTURESEYE
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures -DVULTURESEYE
 LFLAGS =
 
 LIBS =
--- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
@@ -157,7 +157,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -g -O -I../include -I../win/vultures
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
 LFLAGS =
 
 # Only used for the Gnome interface.
--- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
@@ -89,7 +89,7 @@
 # flags for debugging:
 # CFLAGS = -g -I../include
 
-CFLAGS = -O -I../include -I../win/vultures -DVULTURESCLAW
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures -DVULTURESCLAW
 LFLAGS =
 
 LIBS =


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nethack-vultures.spec	15 Dec 2005 18:33:06 -0000	1.4
+++ nethack-vultures.spec	15 Dec 2005 19:19:03 -0000	1.5
@@ -1,13 +1,13 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
 License:        NetHack General Public License
 URL:            http://www.darkarts.co.za/projects/vultures/
 Source0:        http://www.darkarts.co.za/projects/vultures/downloads/vultures-%{version}/vultures-%{version}-full.tar.bz2
-Patch0:         %{name}-1.10.1-optflags.patch
+Patch0:         %{name}-1.11.0-optflags.patch
 Patch1:         %{name}-1.10.1-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
+- Forgot to update the patches previously; done.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-1%{?dist}
 - Upgraded the tarball to the latest release
 - Upped the version



From fedora-extras-commits at redhat.com  Thu Dec 15 19:20:39 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:20:39 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.4,1.5
Message-ID: <200512151921.jBFJL9fF006816@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6782/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Forgot to up the revision




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nethack-vultures.spec	15 Dec 2005 19:18:52 -0000	1.4
+++ nethack-vultures.spec	15 Dec 2005 19:20:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games



From fedora-extras-commits at redhat.com  Thu Dec 15 19:20:44 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:20:44 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.5,1.6
Message-ID: <200512151921.jBFJLFm0006819@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-serv6782/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Forgot to up the revision




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nethack-vultures.spec	15 Dec 2005 19:18:57 -0000	1.5
+++ nethack-vultures.spec	15 Dec 2005 19:20:42 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games



From fedora-extras-commits at redhat.com  Thu Dec 15 19:23:31 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 15 Dec 2005 14:23:31 -0500
Subject: owners owners.list,1.454,1.455
Message-ID: <200512151924.jBFJO69A006966@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6947

Modified Files:
	owners.list 
Log Message:
Added package l2tpd.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -r1.454 -r1.455
--- owners.list	15 Dec 2005 15:22:50 -0000	1.454
+++ owners.list	15 Dec 2005 19:23:29 -0000	1.455
@@ -1296,3 +1296,4 @@
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|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|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
+Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 15 19:25:57 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 15 Dec 2005 14:25:57 -0500
Subject: rpms/naim/devel .cvsignore, 1.3, 1.4 naim.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200512151926.jBFJQRmj007013@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/naim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6986

Modified Files:
	.cvsignore naim.spec sources 
Log Message:
* Thu Dec 15 2005 Luke Macken  0.11.8.1-1
- Bump to 0.11.8.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/naim/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2005 23:21:10 -0000	1.3
+++ .cvsignore	15 Dec 2005 19:25:55 -0000	1.4
@@ -1 +1 @@
-naim-0.11.8.tar.bz2
+naim-0.11.8.1.tar.bz2


Index: naim.spec
===================================================================
RCS file: /cvs/extras/rpms/naim/devel/naim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- naim.spec	2 Oct 2005 23:21:10 -0000	1.4
+++ naim.spec	15 Dec 2005 19:25:55 -0000	1.5
@@ -1,5 +1,5 @@
 Name: naim
-Version: 0.11.8
+Version: 0.11.8.1
 Release: 1%{?dist}
 Summary: An ncurses-based console AIM, ICQ, IRC, and Lily client
 
@@ -38,6 +38,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Dec 15 2005 Luke Macken  0.11.8.1-1
+- Bump to 0.11.8.1
+
 * Sun Oct 02 2005 Luke Macken  0.11.8-1
 - Bumped to 0.11.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/naim/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2005 23:21:10 -0000	1.3
+++ sources	15 Dec 2005 19:25:55 -0000	1.4
@@ -1 +1 @@
-e66f29057ffc4016e814134b8d1f8681  naim-0.11.8.tar.bz2
+beb0a3b2bcb45cfe9b84075dced494b8  naim-0.11.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Dec 15 19:45:49 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:45:49 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures-1.11.0-optflags.patch,
	1.1, 1.2 nethack-vultures.spec, 1.5, 1.6
Message-ID: <200512151946.jBFJkJI9007146@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7075/FC-3

Modified Files:
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Darn, I didn't get that patch right :(  this should do it.



nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:18:52 -0000	1.1
+++ nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:45:47 -0000	1.2
@@ -1,16 +1,16 @@
---- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
-@@ -164,7 +164,7 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
--CFLAGS = -g -I../include -I../win/vultures/
+--- vultures-1.11.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+@@ -153,7 +153,7 @@
+ 
+ # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+ VULTURESCFLAGS = -Wall -g
+-CFLAGS = -g -I../include -I ../win/vultures/
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-1.11.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,19 +20,19 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
-@@ -157,7 +157,7 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
+--- vultures-1.11.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+@@ -147,7 +157,7 @@
+
+ # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+ VULTURESCFLAGS = -g -O -Wall
 -CFLAGS = -g -O -I../include -I../win/vultures
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-1.11.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nethack-vultures.spec	15 Dec 2005 19:20:37 -0000	1.5
+++ nethack-vultures.spec	15 Dec 2005 19:45:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-3
+- Didn't quite get that patch right.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
 - Forgot to update the patches previously; done.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 19:45:55 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:45:55 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures-1.11.0-optflags.patch,
	1.1, 1.2 nethack-vultures.spec, 1.6, 1.7
Message-ID: <200512151946.jBFJkQAs007150@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-serv7075/FC-4

Modified Files:
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Darn, I didn't get that patch right :(  this should do it.



nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:18:57 -0000	1.1
+++ nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:45:52 -0000	1.2
@@ -1,16 +1,16 @@
---- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
-@@ -164,7 +164,7 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
--CFLAGS = -g -I../include -I../win/vultures/
+--- vultures-1.11.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+@@ -153,7 +153,7 @@
+ 
+ # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+ VULTURESCFLAGS = -Wall -g
+-CFLAGS = -g -I../include -I ../win/vultures/
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-1.11.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,19 +20,19 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
-@@ -157,7 +157,7 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
+--- vultures-1.11.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+@@ -147,7 +157,7 @@
+
+ # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+ VULTURESCFLAGS = -g -O -Wall
 -CFLAGS = -g -O -I../include -I../win/vultures
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-1.11.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nethack-vultures.spec	15 Dec 2005 19:20:42 -0000	1.6
+++ nethack-vultures.spec	15 Dec 2005 19:45:52 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-3
+- Didn't quite get that patch right.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
 - Forgot to update the patches previously; done.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 19:46:00 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 14:46:00 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures-1.11.0-optflags.patch,
	1.1, 1.2 nethack-vultures.spec, 1.5, 1.6
Message-ID: <200512151946.jBFJkUPS007154@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7075/devel

Modified Files:
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Darn, I didn't get that patch right :(  this should do it.



nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:19:03 -0000	1.1
+++ nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:45:58 -0000	1.2
@@ -1,16 +1,16 @@
---- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
-@@ -164,7 +164,7 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
--CFLAGS = -g -I../include -I../win/vultures/
+--- vultures-1.11.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+@@ -153,7 +153,7 @@
+ 
+ # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+ VULTURESCFLAGS = -Wall -g
+-CFLAGS = -g -I../include -I ../win/vultures/
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-1.11.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,19 +20,19 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
-@@ -157,7 +157,7 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
+--- vultures-1.11.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+@@ -147,7 +157,7 @@
+
+ # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+ VULTURESCFLAGS = -g -O -Wall
 -CFLAGS = -g -O -I../include -I../win/vultures
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-1.11.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nethack-vultures.spec	15 Dec 2005 19:19:03 -0000	1.5
+++ nethack-vultures.spec	15 Dec 2005 19:45:58 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-3
+- Didn't quite get that patch right.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-2%{?dist}
 - Forgot to update the patches previously; done.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 20:19:36 2005
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 15 Dec 2005 15:19:36 -0500
Subject: rpms/sobby/FC-4 .cvsignore, 1.2, 1.3 sobby.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200512152020.jBFKK6NU009007@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/sobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8985

Modified Files:
	.cvsignore sobby.spec sources 
Log Message:
* Thu Dec 15 2005 Luke Macken  - 0.2.0-2
- Regress package to 0.2.0 for FC-{3,4}




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2005 15:20:52 -0000	1.2
+++ .cvsignore	15 Dec 2005 20:19:34 -0000	1.3
@@ -1 +1 @@
-sobby-0.3.0rc3.tar.gz
+sobby-0.2.0.tar.gz


Index: sobby.spec
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-4/sobby.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sobby.spec	12 Dec 2005 15:20:52 -0000	1.1
+++ sobby.spec	15 Dec 2005 20:19:34 -0000	1.2
@@ -1,14 +1,12 @@
-%define _rc rc3
-
 Name:           sobby
-Version:        0.3.0
-Release:        1.%{_rc}%{?dist}
+Version:        0.2.0
+Release:        2%{?dist}
 Summary:        Standalone obby server
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gobby.0x539.de
-Source0:        http://releases.0x539.de/sobby/%{name}-%{version}%{_rc}.tar.gz
+Source0:        http://releases.0x539.de/sobby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  obby-devel, glibmm24-devel
@@ -18,7 +16,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{_rc}
+%setup -q
 
 
 %build
@@ -42,5 +40,8 @@
 
 
 %changelog
+* Thu Dec 15 2005 Luke Macken  - 0.2.0-2
+- Regress package to 0.2.0 for FC-{3,4}
+
 * Wed Dec 07 2005 Luke Macken  - 0.3.0-1.rc3
 - Packaged for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2005 15:20:52 -0000	1.2
+++ sources	15 Dec 2005 20:19:34 -0000	1.3
@@ -1 +1 @@
-8c3538992f83527cfb9f0a42a9e2ed87  sobby-0.3.0rc3.tar.gz
+68e740d9ad051e7939de29fa2c28da56  sobby-0.2.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 15 20:46:58 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 15:46:58 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures-1.11.0-optflags.patch,
	1.2, 1.3 nethack-vultures.spec, 1.6, 1.7
Message-ID: <200512152047.jBFKlSQZ009187@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9122/FC-3

Modified Files:
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Ah, the follies of tweaking patches by hand.  I tested this time, I swear,
it works!  :)



nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:45:47 -0000	1.2
+++ nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:46:56 -0000	1.3
@@ -1,16 +1,16 @@
---- vultures-1.11.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -153,7 +153,7 @@
  
  # VULTURESCFLAGS will be passed to the sub-makefile for vultures
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -147,7 +157,7 @@
 
  # VULTURESCFLAGS will be passed to the sub-makefile for vultures
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nethack-vultures.spec	15 Dec 2005 19:45:47 -0000	1.6
+++ nethack-vultures.spec	15 Dec 2005 20:46:56 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-4
+- Once again with the patch - ah, the folly of doing diffs by hand.  Last error.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-3
 - Didn't quite get that patch right.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 20:47:04 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 15:47:04 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures-1.11.0-optflags.patch,
	1.2, 1.3 nethack-vultures.spec, 1.7, 1.8
Message-ID: <200512152047.jBFKlYjg009191@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-serv9122/FC-4

Modified Files:
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Ah, the follies of tweaking patches by hand.  I tested this time, I swear,
it works!  :)



nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:45:52 -0000	1.2
+++ nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:47:02 -0000	1.3
@@ -1,16 +1,16 @@
---- vultures-1.11.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -153,7 +153,7 @@
  
  # VULTURESCFLAGS will be passed to the sub-makefile for vultures
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -147,7 +157,7 @@
 
  # VULTURESCFLAGS will be passed to the sub-makefile for vultures
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nethack-vultures.spec	15 Dec 2005 19:45:52 -0000	1.7
+++ nethack-vultures.spec	15 Dec 2005 20:47:02 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-4
+- Once again with the patch - ah, the folly of doing diffs by hand.  Last error.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-3
 - Didn't quite get that patch right.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 20:47:09 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 15:47:09 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures-1.11.0-optflags.patch,
	1.2, 1.3 nethack-vultures.spec, 1.6, 1.7
Message-ID: <200512152047.jBFKldl4009195@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9122/devel

Modified Files:
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Ah, the follies of tweaking patches by hand.  I tested this time, I swear,
it works!  :)



nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:45:58 -0000	1.2
+++ nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:47:07 -0000	1.3
@@ -1,16 +1,16 @@
---- vultures-1.11.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -153,7 +153,7 @@
  
  # VULTURESCFLAGS will be passed to the sub-makefile for vultures
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -147,7 +157,7 @@
 
  # VULTURESCFLAGS will be passed to the sub-makefile for vultures
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nethack-vultures.spec	15 Dec 2005 19:45:58 -0000	1.6
+++ nethack-vultures.spec	15 Dec 2005 20:47:07 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-4
+- Once again with the patch - ah, the folly of doing diffs by hand.  Last error.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-3
 - Didn't quite get that patch right.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 21:54:08 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 15 Dec 2005 16:54:08 -0500
Subject: rpms/xchat-gnome/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xchat-gnome.spec, 1.7, 1.8 xchat-gnome-323944.patch, 1.1,
	NONE xchat-gnome-datadir.patch, 1.1, NONE
Message-ID: <200512152154.jBFLsc4v011517@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11468

Modified Files:
	.cvsignore sources xchat-gnome.spec 
Removed Files:
	xchat-gnome-323944.patch xchat-gnome-datadir.patch 
Log Message:
* Thu Dec 15 2005 Brian Pepple  - 0.8-01.rc1
- Update to 0.8rc1.
- Drop documentation removed from upstream tarball.
- Drop depreciated config options.
- Enable dbus support.
- Drop 323944 patch, since it's been applied upstream.
- Drop datadir patch, since it's been applied upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2005 19:49:40 -0000	1.3
+++ .cvsignore	15 Dec 2005 21:54:05 -0000	1.4
@@ -1 +1 @@
-xchat-gnome-0.7.tar.bz2
+xchat-gnome-0.8rc1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2005 19:49:40 -0000	1.3
+++ sources	15 Dec 2005 21:54:05 -0000	1.4
@@ -1 +1 @@
-a5f0940ee6389d58222a04facca0aa0d  xchat-gnome-0.7.tar.bz2
+9e43be1379796baf270e417202ef6c95  xchat-gnome-0.8rc1.tar.bz2


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xchat-gnome.spec	14 Dec 2005 17:51:47 -0000	1.7
+++ xchat-gnome.spec	15 Dec 2005 21:54:05 -0000	1.8
@@ -1,21 +1,19 @@
 %if "%fedora" >= "5"
-    %define with_dbus 0
+    %define with_dbus 1
 %else
     %define with_dbus 0
 %endif
 
 Name:           xchat-gnome
-Version:        0.7
-Release:        4%{?dist}
+Version:        0.8
+Release:        0.1.rc1%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://%{name}.navi.cx/
-Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-datadir.patch
-Patch1:		%{name}-config.patch
-Patch2:		%{name}-323944.patch
+Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}rc1.tar.bz2
+Patch0:		%{name}-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -51,24 +49,12 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .datadir
-%patch1 -p1 -b .config
-%patch2 -p1 -b .323944
+%setup -q -n %{name}-%{version}rc1
+%patch0 -p1 -b .config
 
 
 %build
-%configure --disable-gtkfe	\
-	   --disable-tcl	\
-	   --enable-ipv6	\
-	   --enable-shm		\
-	   --disable-libnotify	\
-%if %{with_dbus}
-	   --enable-dbus	
-%else
-	   --disable-dbus
-%endif
-
+%configure --disable-tcl
 make %{?_smp_mflags}
 
 
@@ -79,17 +65,13 @@
 %find_lang %{name}
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{l,}a
 
 desktop-file-install --vendor fedora --delete-original	\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
 	--add-category X-Fedora				\
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-# Remove duplicate files from xchat package.
-rm $RPM_BUILD_ROOT%{_datadir}/applications/xchat.desktop
-rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/xchat.png
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -133,7 +115,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING faq.html README plugins/plugin20.html
+%doc COPYING AUTHORS
 %doc plugins/perl/xchat2-perldocs.html
 %{_bindir}/%{name}
 %{_sysconfdir}/gconf/schemas/*.schemas
@@ -145,11 +127,19 @@
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/plugins/
 %if %{with_dbus}
-%{_bindir}/xchat-remote
+%{_bindir}/%{name}-remote
 %endif
 
 
 %changelog
+* Thu Dec 15 2005 Brian Pepple  - 0.8-01.rc1
+- Update to 0.8rc1.
+- Drop documentation removed from upstream tarball.
+- Drop depreciated config options.
+- Enable dbus support.
+- Drop 323944 patch, since it's been applied upstream.
+- Drop datadir patch, since it's been applied upstream.
+
 * Wed Dec 14 2005 Brian Pepple  - 0.7-4
 - Add patch to fix #175751. 
 


--- xchat-gnome-323944.patch DELETED ---


--- xchat-gnome-datadir.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec 15 22:36:15 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Thu, 15 Dec 2005 17:36:15 -0500
Subject: rpms/mod_security/devel mod_security.spec,1.8,1.9
Message-ID: <200512152236.jBFMaj1h013819@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13801

Modified Files:
	mod_security.spec 
Log Message:
* Fri Dec 16 2005 Michael Fleming  1.9.1-2
- Bump for new httpd



Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_security.spec	1 Dec 2005 11:32:58 -0000	1.8
+++ mod_security.spec	15 Dec 2005 22:36:12 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
 Version: 1.9.1
-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 Dec 16 2005 Michael Fleming  1.9.1-2
+- Bump for new httpd
+
 * Thu Dec 1 2005 Michael Fleming  1.9.1-1
 - New release 1.9.1 
 



From fedora-extras-commits at redhat.com  Thu Dec 15 22:38:28 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 17:38:28 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures-1.11.0-config.patch,
	NONE, 1.1 nethack-vultures.spec, 1.7, 1.8
Message-ID: <200512152238.jBFMcSbg013872@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13855/FC-3

Modified Files:
	nethack-vultures.spec 
Added Files:
	nethack-vultures-1.11.0-config.patch 
Log Message:
Fixed and tested patch 2, tested patch 3 (no errors)



nethack-vultures-1.11.0-config.patch:

--- NEW FILE nethack-vultures-1.11.0-config.patch ---
--- vultures-1.11.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
+++ vultures-1.11.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
@@ -150,10 +150,10 @@
 
 #ifndef WIZARD		/* allow for compile-time or Makefile changes */
 # ifndef KR1ED
-#  define WIZARD  "wizard" /* the person allowed to use the -D option */
+#  define WIZARD  "games" /* the person allowed to use the -D option */
 # else
 #  define WIZARD
-#  define WIZARD_NAME "wizard"
+#  define WIZARD_NAME "games"
 # endif
 #endif
 
@@ -176,8 +176,8 @@
 
 #ifdef UNIX
 /* path and file name extension for compression program */
-#define COMPRESS "/usr/bin/compress"   /* Lempel-Ziv compression */                                      
-#define COMPRESS_EXTENSION ".Z"        /* compress's extension */                                        
+#define COMPRESS "/usr/bin/bzip2"
+#define COMPRESS_EXTENSION ".bz2"
 /* An example of one alternative you might want to use: */
 /* #define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */                                
 /* #define COMPRESS_EXTENSION ".gz" */     /* normal gzip extension */                                   
@@ -192,7 +192,7 @@
  *	a tar-like file, thus making a neater installation.  See *conf.h
  *	for detailed configuration.
  */
-/* #define DLB */  /* not supported on all platforms */
+#define DLB  /* not supported on all platforms */
 
 /*
  *	Defining INSURANCE slows down level changes, but allows games that
@@ -221,7 +221,7 @@
  * since the user might create files in a directory of his choice.
  * Of course SECURE is meaningful only if HACKDIR is defined.
  */
-/* #define SECURE */	/* do setuid(getuid()) after chdir() */
+#define SECURE	/* do setuid(getuid()) after chdir() */
 
 /*
  * If it is desirable to limit the number of people that can play Hack
@@ -307,7 +307,7 @@
  * functions that have been macroized.
  */
 
-/* #define VISION_TABLES */ /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
 #ifndef VISION_TABLES
 # ifndef NO_MACRO_CPATH
 #  define MACRO_CPATH	/* use clear_path macros instead of functions */
@@ -345,7 +345,7 @@
 #endif
 
 #define EXP_ON_BOTL	/* Show experience on bottom line */
-/* #define SCORE_ON_BOTL */	/* added by Gary Erickson (erickson at ucivax) */
+#define SCORE_ON_BOTL	/* added by Gary Erickson (erickson at ucivax) */
 
 /*
  * Section 5:  EXPERIMENTAL STUFF
--- vultures-1.11.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
+++ vultures-1.11.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
@@ -37,7 +37,7 @@
 #define NETWORK		/* if running on a networked system */
 			/* e.g. Suns sharing a playground through NFS */
 /* #define SUNOS4 */	/* SunOS 4.x */
-/* #define LINUX */     /* Another Unix clone */
+#define LINUX		/* Another Unix clone */
 /* #define CYGWIN32 */	/* Unix on Win32 -- use with case sensitive defines */
 /* #define GENIX */	/* Yet Another Unix Clone */
 /* #define HISX */	/* Bull Unix for XPS Machines */
@@ -102,7 +102,7 @@
  * If you want the static parts of your playground on a read-only file
  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  */
-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
+#define VAR_PLAYGROUND "/var/lib/games/nethack"
 
 
 /*
@@ -204,7 +204,7 @@
  * You can also include any other strange options your compress needs.
  * If you have a normal compress, just leave it commented out.
  */
-/* #define COMPRESS_OPTIONS "-q" */
+#define COMPRESS_OPTIONS "-q9"
 #endif
 
 #define FCMASK	0660	/* file creation mask */
--- vultures-1.11.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.11.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
@@ -206,10 +206,10 @@
 
 #ifndef WIZARD		/* allow for compile-time or Makefile changes */
 # ifndef KR1ED
-#  define WIZARD  "wizard" /* the person allowed to use the -D option */
+#  define WIZARD  "games" /* the person allowed to use the -D option */
 # else
 #  define WIZARD
-#  define WIZARD_NAME "wizard"
+#  define WIZARD_NAME "games"
 # endif
 #endif
 
@@ -234,8 +234,8 @@
 
 #ifdef UNIX
 /* path and file name extension for compression program */
-# define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
-# define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
+#define COMPRESS "/usr/bin/bzip2"
+#define COMPRESS_EXTENSION ".bz2"
 
 /* An example of one alternative you might want to use: */
 /* # define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */
@@ -253,7 +253,7 @@
  *	a tar-like file, thus making a neater installation.  See *conf.h
  *	for detailed configuration.
  */
-/* #define DLB */             /* not supported on all platforms */
+#define DLB  /* not supported on all platforms */
 
 /*
  *	Defining INSURANCE slows down level changes, but allows games that
@@ -275,7 +275,7 @@
 #  ifdef __APPLE__
 #    define HACKDIR "nethackdir"      /* nethack directory */
 #  else
-#    define HACKDIR "."
+#    define HACKDIR "/usr/games/lib/nethackdir"
 #  endif
 # endif
 
@@ -286,7 +286,7 @@
  * since the user might create files in a directory of his choice.
  * Of course SECURE is meaningful only if HACKDIR is defined.
  */
-/* #define SECURE */	/* do setuid(getuid()) after chdir() */
+#define SECURE	/* do setuid(getuid()) after chdir() */
 
 /*
  * If it is desirable to limit the number of people that can play Hack
@@ -374,7 +374,7 @@
  * functions that have been macroized.
  */
 /* WAC Can be defined under DJGPP,  even though it's DOS*/
-/*#define VISION_TABLES */ /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
 #ifndef VISION_TABLES
 # ifndef NO_MACRO_CPATH
 #  define MACRO_CPATH	/* use clear_path macros instead of functions */
@@ -467,7 +467,7 @@
 #endif
 
 #define EXP_ON_BOTL	/* Show experience on bottom line */
-/* #define SCORE_ON_BOTL */	/* added by Gary Erickson (erickson at ucivax) */
+#define SCORE_ON_BOTL	/* added by Gary Erickson (erickson at ucivax) */
 /* #define BORG */            /* Works only under DOS */
 /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
 /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
--- vultures-1.11.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.11.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
@@ -38,7 +38,7 @@
 #define NETWORK		/* if running on a networked system */
 			/* e.g. Suns sharing a playground through NFS */
 /* #define SUNOS4 */	/* SunOS 4.x */
-/* #define LINUX */	/* Another Unix clone */
+#define LINUX	/* Another Unix clone */
 /* #define CYGWIN32 */	/* Unix on Win32 -- use with case sensitive defines */
 /* #define GENIX */	/* Yet Another Unix Clone */
 /* #define HISX */	/* Bull Unix for XPS Machines */
@@ -174,7 +174,7 @@
  * If you want the static parts of your playground on a read-only file
  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  */
-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
+#define VAR_PLAYGROUND "/var/lib/games/nethack"
 
 
 
@@ -267,7 +267,7 @@
  * You can also include any other strange options your compress needs.
  * If you have a normal compress, just leave it commented out.
  */
-/* #define COMPRESS_OPTIONS "-q" */
+#define COMPRESS_OPTIONS "-q9"
 #endif
 
 #define FCMASK	0660	/* file creation mask */


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nethack-vultures.spec	15 Dec 2005 20:46:56 -0000	1.7
+++ nethack-vultures.spec	15 Dec 2005 22:38:26 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -8,7 +8,7 @@
 URL:            http://www.darkarts.co.za/projects/vultures/
 Source0:        http://www.darkarts.co.za/projects/vultures/downloads/vultures-%{version}/vultures-%{version}-full.tar.bz2
 Patch0:         %{name}-1.11.0-optflags.patch
-Patch1:         %{name}-1.10.1-config.patch
+Patch1:         %{name}-1.11.0-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-5
+- That patch was fixed, but.. the folly of not checking all patches  :P
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-4
 - Once again with the patch - ah, the folly of doing diffs by hand.  Last error.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 22:38:34 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 17:38:34 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures-1.11.0-config.patch,
	NONE, 1.1 nethack-vultures.spec, 1.8, 1.9
Message-ID: <200512152238.jBFMcYS1013891@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-serv13855/FC-4

Modified Files:
	nethack-vultures.spec 
Added Files:
	nethack-vultures-1.11.0-config.patch 
Log Message:
Fixed and tested patch 2, tested patch 3 (no errors)



nethack-vultures-1.11.0-config.patch:

--- NEW FILE nethack-vultures-1.11.0-config.patch ---
--- vultures-1.11.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
+++ vultures-1.11.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
@@ -150,10 +150,10 @@
 
 #ifndef WIZARD		/* allow for compile-time or Makefile changes */
 # ifndef KR1ED
-#  define WIZARD  "wizard" /* the person allowed to use the -D option */
+#  define WIZARD  "games" /* the person allowed to use the -D option */
 # else
 #  define WIZARD
-#  define WIZARD_NAME "wizard"
+#  define WIZARD_NAME "games"
 # endif
 #endif
 
@@ -176,8 +176,8 @@
 
 #ifdef UNIX
 /* path and file name extension for compression program */
-#define COMPRESS "/usr/bin/compress"   /* Lempel-Ziv compression */                                      
-#define COMPRESS_EXTENSION ".Z"        /* compress's extension */                                        
+#define COMPRESS "/usr/bin/bzip2"
+#define COMPRESS_EXTENSION ".bz2"
 /* An example of one alternative you might want to use: */
 /* #define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */                                
 /* #define COMPRESS_EXTENSION ".gz" */     /* normal gzip extension */                                   
@@ -192,7 +192,7 @@
  *	a tar-like file, thus making a neater installation.  See *conf.h
  *	for detailed configuration.
  */
-/* #define DLB */  /* not supported on all platforms */
+#define DLB  /* not supported on all platforms */
 
 /*
  *	Defining INSURANCE slows down level changes, but allows games that
@@ -221,7 +221,7 @@
  * since the user might create files in a directory of his choice.
  * Of course SECURE is meaningful only if HACKDIR is defined.
  */
-/* #define SECURE */	/* do setuid(getuid()) after chdir() */
+#define SECURE	/* do setuid(getuid()) after chdir() */
 
 /*
  * If it is desirable to limit the number of people that can play Hack
@@ -307,7 +307,7 @@
  * functions that have been macroized.
  */
 
-/* #define VISION_TABLES */ /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
 #ifndef VISION_TABLES
 # ifndef NO_MACRO_CPATH
 #  define MACRO_CPATH	/* use clear_path macros instead of functions */
@@ -345,7 +345,7 @@
 #endif
 
 #define EXP_ON_BOTL	/* Show experience on bottom line */
-/* #define SCORE_ON_BOTL */	/* added by Gary Erickson (erickson at ucivax) */
+#define SCORE_ON_BOTL	/* added by Gary Erickson (erickson at ucivax) */
 
 /*
  * Section 5:  EXPERIMENTAL STUFF
--- vultures-1.11.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
+++ vultures-1.11.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
@@ -37,7 +37,7 @@
 #define NETWORK		/* if running on a networked system */
 			/* e.g. Suns sharing a playground through NFS */
 /* #define SUNOS4 */	/* SunOS 4.x */
-/* #define LINUX */     /* Another Unix clone */
+#define LINUX		/* Another Unix clone */
 /* #define CYGWIN32 */	/* Unix on Win32 -- use with case sensitive defines */
 /* #define GENIX */	/* Yet Another Unix Clone */
 /* #define HISX */	/* Bull Unix for XPS Machines */
@@ -102,7 +102,7 @@
  * If you want the static parts of your playground on a read-only file
  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  */
-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
+#define VAR_PLAYGROUND "/var/lib/games/nethack"
 
 
 /*
@@ -204,7 +204,7 @@
  * You can also include any other strange options your compress needs.
  * If you have a normal compress, just leave it commented out.
  */
-/* #define COMPRESS_OPTIONS "-q" */
+#define COMPRESS_OPTIONS "-q9"
 #endif
 
 #define FCMASK	0660	/* file creation mask */
--- vultures-1.11.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.11.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
@@ -206,10 +206,10 @@
 
 #ifndef WIZARD		/* allow for compile-time or Makefile changes */
 # ifndef KR1ED
-#  define WIZARD  "wizard" /* the person allowed to use the -D option */
+#  define WIZARD  "games" /* the person allowed to use the -D option */
 # else
 #  define WIZARD
-#  define WIZARD_NAME "wizard"
+#  define WIZARD_NAME "games"
 # endif
 #endif
 
@@ -234,8 +234,8 @@
 
 #ifdef UNIX
 /* path and file name extension for compression program */
-# define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
-# define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
+#define COMPRESS "/usr/bin/bzip2"
+#define COMPRESS_EXTENSION ".bz2"
 
 /* An example of one alternative you might want to use: */
 /* # define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */
@@ -253,7 +253,7 @@
  *	a tar-like file, thus making a neater installation.  See *conf.h
  *	for detailed configuration.
  */
-/* #define DLB */             /* not supported on all platforms */
+#define DLB  /* not supported on all platforms */
 
 /*
  *	Defining INSURANCE slows down level changes, but allows games that
@@ -275,7 +275,7 @@
 #  ifdef __APPLE__
 #    define HACKDIR "nethackdir"      /* nethack directory */
 #  else
-#    define HACKDIR "."
+#    define HACKDIR "/usr/games/lib/nethackdir"
 #  endif
 # endif
 
@@ -286,7 +286,7 @@
  * since the user might create files in a directory of his choice.
  * Of course SECURE is meaningful only if HACKDIR is defined.
  */
-/* #define SECURE */	/* do setuid(getuid()) after chdir() */
+#define SECURE	/* do setuid(getuid()) after chdir() */
 
 /*
  * If it is desirable to limit the number of people that can play Hack
@@ -374,7 +374,7 @@
  * functions that have been macroized.
  */
 /* WAC Can be defined under DJGPP,  even though it's DOS*/
-/*#define VISION_TABLES */ /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
 #ifndef VISION_TABLES
 # ifndef NO_MACRO_CPATH
 #  define MACRO_CPATH	/* use clear_path macros instead of functions */
@@ -467,7 +467,7 @@
 #endif
 
 #define EXP_ON_BOTL	/* Show experience on bottom line */
-/* #define SCORE_ON_BOTL */	/* added by Gary Erickson (erickson at ucivax) */
+#define SCORE_ON_BOTL	/* added by Gary Erickson (erickson at ucivax) */
 /* #define BORG */            /* Works only under DOS */
 /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
 /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
--- vultures-1.11.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.11.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
@@ -38,7 +38,7 @@
 #define NETWORK		/* if running on a networked system */
 			/* e.g. Suns sharing a playground through NFS */
 /* #define SUNOS4 */	/* SunOS 4.x */
-/* #define LINUX */	/* Another Unix clone */
+#define LINUX	/* Another Unix clone */
 /* #define CYGWIN32 */	/* Unix on Win32 -- use with case sensitive defines */
 /* #define GENIX */	/* Yet Another Unix Clone */
 /* #define HISX */	/* Bull Unix for XPS Machines */
@@ -174,7 +174,7 @@
  * If you want the static parts of your playground on a read-only file
  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  */
-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
+#define VAR_PLAYGROUND "/var/lib/games/nethack"
 
 
 
@@ -267,7 +267,7 @@
  * You can also include any other strange options your compress needs.
  * If you have a normal compress, just leave it commented out.
  */
-/* #define COMPRESS_OPTIONS "-q" */
+#define COMPRESS_OPTIONS "-q9"
 #endif
 
 #define FCMASK	0660	/* file creation mask */


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nethack-vultures.spec	15 Dec 2005 20:47:02 -0000	1.8
+++ nethack-vultures.spec	15 Dec 2005 22:38:32 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -8,7 +8,7 @@
 URL:            http://www.darkarts.co.za/projects/vultures/
 Source0:        http://www.darkarts.co.za/projects/vultures/downloads/vultures-%{version}/vultures-%{version}-full.tar.bz2
 Patch0:         %{name}-1.11.0-optflags.patch
-Patch1:         %{name}-1.10.1-config.patch
+Patch1:         %{name}-1.11.0-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-5
+- That patch was fixed, but.. the folly of not checking all patches  :P
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-4
 - Once again with the patch - ah, the folly of doing diffs by hand.  Last error.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 22:38:39 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 17:38:39 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures-1.11.0-config.patch,
	NONE, 1.1 nethack-vultures.spec, 1.7, 1.8
Message-ID: <200512152238.jBFMcdMf013910@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13855/devel

Modified Files:
	nethack-vultures.spec 
Added Files:
	nethack-vultures-1.11.0-config.patch 
Log Message:
Fixed and tested patch 2, tested patch 3 (no errors)



nethack-vultures-1.11.0-config.patch:

--- NEW FILE nethack-vultures-1.11.0-config.patch ---
--- vultures-1.11.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
+++ vultures-1.11.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
@@ -150,10 +150,10 @@
 
 #ifndef WIZARD		/* allow for compile-time or Makefile changes */
 # ifndef KR1ED
-#  define WIZARD  "wizard" /* the person allowed to use the -D option */
+#  define WIZARD  "games" /* the person allowed to use the -D option */
 # else
 #  define WIZARD
-#  define WIZARD_NAME "wizard"
+#  define WIZARD_NAME "games"
 # endif
 #endif
 
@@ -176,8 +176,8 @@
 
 #ifdef UNIX
 /* path and file name extension for compression program */
-#define COMPRESS "/usr/bin/compress"   /* Lempel-Ziv compression */                                      
-#define COMPRESS_EXTENSION ".Z"        /* compress's extension */                                        
+#define COMPRESS "/usr/bin/bzip2"
+#define COMPRESS_EXTENSION ".bz2"
 /* An example of one alternative you might want to use: */
 /* #define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */                                
 /* #define COMPRESS_EXTENSION ".gz" */     /* normal gzip extension */                                   
@@ -192,7 +192,7 @@
  *	a tar-like file, thus making a neater installation.  See *conf.h
  *	for detailed configuration.
  */
-/* #define DLB */  /* not supported on all platforms */
+#define DLB  /* not supported on all platforms */
 
 /*
  *	Defining INSURANCE slows down level changes, but allows games that
@@ -221,7 +221,7 @@
  * since the user might create files in a directory of his choice.
  * Of course SECURE is meaningful only if HACKDIR is defined.
  */
-/* #define SECURE */	/* do setuid(getuid()) after chdir() */
+#define SECURE	/* do setuid(getuid()) after chdir() */
 
 /*
  * If it is desirable to limit the number of people that can play Hack
@@ -307,7 +307,7 @@
  * functions that have been macroized.
  */
 
-/* #define VISION_TABLES */ /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
 #ifndef VISION_TABLES
 # ifndef NO_MACRO_CPATH
 #  define MACRO_CPATH	/* use clear_path macros instead of functions */
@@ -345,7 +345,7 @@
 #endif
 
 #define EXP_ON_BOTL	/* Show experience on bottom line */
-/* #define SCORE_ON_BOTL */	/* added by Gary Erickson (erickson at ucivax) */
+#define SCORE_ON_BOTL	/* added by Gary Erickson (erickson at ucivax) */
 
 /*
  * Section 5:  EXPERIMENTAL STUFF
--- vultures-1.11.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
+++ vultures-1.11.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
@@ -37,7 +37,7 @@
 #define NETWORK		/* if running on a networked system */
 			/* e.g. Suns sharing a playground through NFS */
 /* #define SUNOS4 */	/* SunOS 4.x */
-/* #define LINUX */     /* Another Unix clone */
+#define LINUX		/* Another Unix clone */
 /* #define CYGWIN32 */	/* Unix on Win32 -- use with case sensitive defines */
 /* #define GENIX */	/* Yet Another Unix Clone */
 /* #define HISX */	/* Bull Unix for XPS Machines */
@@ -102,7 +102,7 @@
  * If you want the static parts of your playground on a read-only file
  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  */
-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
+#define VAR_PLAYGROUND "/var/lib/games/nethack"
 
 
 /*
@@ -204,7 +204,7 @@
  * You can also include any other strange options your compress needs.
  * If you have a normal compress, just leave it commented out.
  */
-/* #define COMPRESS_OPTIONS "-q" */
+#define COMPRESS_OPTIONS "-q9"
 #endif
 
 #define FCMASK	0660	/* file creation mask */
--- vultures-1.11.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.11.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
@@ -206,10 +206,10 @@
 
 #ifndef WIZARD		/* allow for compile-time or Makefile changes */
 # ifndef KR1ED
-#  define WIZARD  "wizard" /* the person allowed to use the -D option */
+#  define WIZARD  "games" /* the person allowed to use the -D option */
 # else
 #  define WIZARD
-#  define WIZARD_NAME "wizard"
+#  define WIZARD_NAME "games"
 # endif
 #endif
 
@@ -234,8 +234,8 @@
 
 #ifdef UNIX
 /* path and file name extension for compression program */
-# define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
-# define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
+#define COMPRESS "/usr/bin/bzip2"
+#define COMPRESS_EXTENSION ".bz2"
 
 /* An example of one alternative you might want to use: */
 /* # define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */
@@ -253,7 +253,7 @@
  *	a tar-like file, thus making a neater installation.  See *conf.h
  *	for detailed configuration.
  */
-/* #define DLB */             /* not supported on all platforms */
+#define DLB  /* not supported on all platforms */
 
 /*
  *	Defining INSURANCE slows down level changes, but allows games that
@@ -275,7 +275,7 @@
 #  ifdef __APPLE__
 #    define HACKDIR "nethackdir"      /* nethack directory */
 #  else
-#    define HACKDIR "."
+#    define HACKDIR "/usr/games/lib/nethackdir"
 #  endif
 # endif
 
@@ -286,7 +286,7 @@
  * since the user might create files in a directory of his choice.
  * Of course SECURE is meaningful only if HACKDIR is defined.
  */
-/* #define SECURE */	/* do setuid(getuid()) after chdir() */
+#define SECURE	/* do setuid(getuid()) after chdir() */
 
 /*
  * If it is desirable to limit the number of people that can play Hack
@@ -374,7 +374,7 @@
  * functions that have been macroized.
  */
 /* WAC Can be defined under DJGPP,  even though it's DOS*/
-/*#define VISION_TABLES */ /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
 #ifndef VISION_TABLES
 # ifndef NO_MACRO_CPATH
 #  define MACRO_CPATH	/* use clear_path macros instead of functions */
@@ -467,7 +467,7 @@
 #endif
 
 #define EXP_ON_BOTL	/* Show experience on bottom line */
-/* #define SCORE_ON_BOTL */	/* added by Gary Erickson (erickson at ucivax) */
+#define SCORE_ON_BOTL	/* added by Gary Erickson (erickson at ucivax) */
 /* #define BORG */            /* Works only under DOS */
 /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
 /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
--- vultures-1.11.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.11.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
@@ -38,7 +38,7 @@
 #define NETWORK		/* if running on a networked system */
 			/* e.g. Suns sharing a playground through NFS */
 /* #define SUNOS4 */	/* SunOS 4.x */
-/* #define LINUX */	/* Another Unix clone */
+#define LINUX	/* Another Unix clone */
 /* #define CYGWIN32 */	/* Unix on Win32 -- use with case sensitive defines */
 /* #define GENIX */	/* Yet Another Unix Clone */
 /* #define HISX */	/* Bull Unix for XPS Machines */
@@ -174,7 +174,7 @@
  * If you want the static parts of your playground on a read-only file
  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  */
-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
+#define VAR_PLAYGROUND "/var/lib/games/nethack"
 
 
 
@@ -267,7 +267,7 @@
  * You can also include any other strange options your compress needs.
  * If you have a normal compress, just leave it commented out.
  */
-/* #define COMPRESS_OPTIONS "-q" */
+#define COMPRESS_OPTIONS "-q9"
 #endif
 
 #define FCMASK	0660	/* file creation mask */


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nethack-vultures.spec	15 Dec 2005 20:47:07 -0000	1.7
+++ nethack-vultures.spec	15 Dec 2005 22:38:37 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -8,7 +8,7 @@
 URL:            http://www.darkarts.co.za/projects/vultures/
 Source0:        http://www.darkarts.co.za/projects/vultures/downloads/vultures-%{version}/vultures-%{version}-full.tar.bz2
 Patch0:         %{name}-1.11.0-optflags.patch
-Patch1:         %{name}-1.10.1-config.patch
+Patch1:         %{name}-1.11.0-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-5
+- That patch was fixed, but.. the folly of not checking all patches  :P
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-4
 - Once again with the patch - ah, the folly of doing diffs by hand.  Last error.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 22:53:40 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 17:53:40 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.8,1.9
Message-ID: <200512152254.jBFMsAnF014149@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14092/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Added in BuildReq for SDL_image-devel now that we use png instead of pcx.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nethack-vultures.spec	15 Dec 2005 22:38:26 -0000	1.8
+++ nethack-vultures.spec	15 Dec 2005 22:53:38 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -14,6 +14,7 @@
 
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_image-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
 BuildRequires:  flex
@@ -160,6 +161,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-6
+- SDL image devel required for build to complete properly.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-5
 - That patch was fixed, but.. the folly of not checking all patches  :P
 



From fedora-extras-commits at redhat.com  Thu Dec 15 22:53:46 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 17:53:46 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.9,1.10
Message-ID: <200512152254.jBFMsGE5014152@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-serv14092/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Added in BuildReq for SDL_image-devel now that we use png instead of pcx.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nethack-vultures.spec	15 Dec 2005 22:38:32 -0000	1.9
+++ nethack-vultures.spec	15 Dec 2005 22:53:43 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -14,6 +14,7 @@
 
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_image-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
 BuildRequires:  flex
@@ -160,6 +161,12 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-6
+- SDL image devel required for build to complete properly.
+
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-5
+- That patch was fixed, but.. the folly of not checking all patches  :P
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-5
 - That patch was fixed, but.. the folly of not checking all patches  :P
 



From fedora-extras-commits at redhat.com  Thu Dec 15 22:53:51 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 17:53:51 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.8,1.9
Message-ID: <200512152254.jBFMsLHe014155@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14092/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Added in BuildReq for SDL_image-devel now that we use png instead of pcx.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nethack-vultures.spec	15 Dec 2005 22:38:37 -0000	1.8
+++ nethack-vultures.spec	15 Dec 2005 22:53:49 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -14,6 +14,7 @@
 
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_image-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
 BuildRequires:  flex
@@ -160,6 +161,12 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-6
+- SDL image devel required for build to complete properly.
+
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-6
+- SDL image devel required for build to complete properly.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-5
 - That patch was fixed, but.. the folly of not checking all patches  :P
 



From fedora-extras-commits at redhat.com  Thu Dec 15 23:15:26 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 18:15:26 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.9,1.10
Message-ID: <200512152315.jBFNFv21016069@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16019/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Added in libpng-devel dependency.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nethack-vultures.spec	15 Dec 2005 22:53:38 -0000	1.9
+++ nethack-vultures.spec	15 Dec 2005 23:15:24 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -15,6 +15,7 @@
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_image-devel
+BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
 BuildRequires:  flex
@@ -161,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-7
+- Apparently we're using libpng-devel now also (nobody told me)
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-6
 - SDL image devel required for build to complete properly.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 23:15:32 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 18:15:32 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.10,1.11
Message-ID: <200512152316.jBFNG2cH016072@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-serv16019/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Added in libpng-devel dependency.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nethack-vultures.spec	15 Dec 2005 22:53:43 -0000	1.10
+++ nethack-vultures.spec	15 Dec 2005 23:15:30 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -15,6 +15,7 @@
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_image-devel
+BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
 BuildRequires:  flex
@@ -161,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-7
+- Apparently we're using libpng-devel now also (nobody told me)
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-6
 - SDL image devel required for build to complete properly.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 23:15:37 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 18:15:37 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.9,1.10
Message-ID: <200512152316.jBFNG8RG016075@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16019/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Added in libpng-devel dependency.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nethack-vultures.spec	15 Dec 2005 22:53:49 -0000	1.9
+++ nethack-vultures.spec	15 Dec 2005 23:15:35 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -15,6 +15,7 @@
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_image-devel
+BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
 BuildRequires:  flex
@@ -161,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-7
+- Apparently we're using libpng-devel now also (nobody told me)
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-6
 - SDL image devel required for build to complete properly.
 



From fedora-extras-commits at redhat.com  Thu Dec 15 23:20:22 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu, 15 Dec 2005 18:20:22 -0500
Subject: owners owners.list,1.455,1.456
Message-ID: <200512152320.jBFNKrlW016215@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16197

Modified Files:
	owners.list 
Log Message:
remove broken e-mail address


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -r1.455 -r1.456
--- owners.list	15 Dec 2005 19:23:29 -0000	1.455
+++ owners.list	15 Dec 2005 23:20:20 -0000	1.456
@@ -158,7 +158,7 @@
 Fedora Extras|drivel|A journal or "blog" client|katzj at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|bescoto at stanford.edu|extras-qa at fedoraproject.org|
+Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|dvdisaster|CD/DVD media data loss/scratch/aging protection|dmitry at butskoy.name|extras-qa at fedoraproject.org|carsten at dvdisaster.de
 Fedora Extras|dxpc|A Differential X Protocol Compressor|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 15 23:49:04 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 18:49:04 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.10,1.11
Message-ID: <200512152349.jBFNnY0e016511@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16461/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Forgot to relocate docs for postbuild




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nethack-vultures.spec	15 Dec 2005 23:15:24 -0000	1.10
+++ nethack-vultures.spec	15 Dec 2005 23:49:02 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -124,7 +124,7 @@
 %files
 %defattr(-,root,root,-)
 %doc nethack/README nethack/dat/license nethack/dat/history nethack/dat/*help
-%doc slashem/readme.txt slashem/history.txt slashem/slamfaq.txt vultures/win/jtp/gamedata/manual/
+%doc slashem/readme.txt slashem/history.txt slashem/slamfaq.txt vultures/gamedata/manual/
 %{_bindir}/vultures*
 %dir %{_prefix}/games/vultureseye/
 %{_prefix}/games/vultureseye/config/
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-8
+- Forgot to relocate moved docs for postbuild.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-7
 - Apparently we're using libpng-devel now also (nobody told me)
 



From fedora-extras-commits at redhat.com  Thu Dec 15 23:49:09 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 18:49:09 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.11,1.12
Message-ID: <200512152349.jBFNneWm016514@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-serv16461/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Forgot to relocate docs for postbuild




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nethack-vultures.spec	15 Dec 2005 23:15:30 -0000	1.11
+++ nethack-vultures.spec	15 Dec 2005 23:49:07 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -124,7 +124,7 @@
 %files
 %defattr(-,root,root,-)
 %doc nethack/README nethack/dat/license nethack/dat/history nethack/dat/*help
-%doc slashem/readme.txt slashem/history.txt slashem/slamfaq.txt vultures/win/jtp/gamedata/manual/
+%doc slashem/readme.txt slashem/history.txt slashem/slamfaq.txt vultures/gamedata/manual/
 %{_bindir}/vultures*
 %dir %{_prefix}/games/vultureseye/
 %{_prefix}/games/vultureseye/config/
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-8
+- Forgot to relocate moved docs for postbuild.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-7
 - Apparently we're using libpng-devel now also (nobody told me)
 



From fedora-extras-commits at redhat.com  Thu Dec 15 23:49:15 2005
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 15 Dec 2005 18:49:15 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.10,1.11
Message-ID: <200512152349.jBFNnjlf016517@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16461/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Forgot to relocate docs for postbuild




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nethack-vultures.spec	15 Dec 2005 23:15:35 -0000	1.10
+++ nethack-vultures.spec	15 Dec 2005 23:49:13 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -124,7 +124,7 @@
 %files
 %defattr(-,root,root,-)
 %doc nethack/README nethack/dat/license nethack/dat/history nethack/dat/*help
-%doc slashem/readme.txt slashem/history.txt slashem/slamfaq.txt vultures/win/jtp/gamedata/manual/
+%doc slashem/readme.txt slashem/history.txt slashem/slamfaq.txt vultures/gamedata/manual/
 %{_bindir}/vultures*
 %dir %{_prefix}/games/vultureseye/
 %{_prefix}/games/vultureseye/config/
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Karen Pease  - 1.11.0-8
+- Forgot to relocate moved docs for postbuild.
+
 * Thu Dec 15 2005 Karen Pease  - 1.11.0-7
 - Apparently we're using libpng-devel now also (nobody told me)
 



From fedora-extras-commits at redhat.com  Fri Dec 16 01:17:13 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Thu, 15 Dec 2005 20:17:13 -0500
Subject: rpms/gnome-sudoku/FC-4 .cvsignore, 1.2, 1.3 gnome-sudoku.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200512160117.jBG1HiNR020266@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20244

Modified Files:
	.cvsignore gnome-sudoku.spec sources 
Log Message:
Updated to 0.4.0-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2005 13:12:04 -0000	1.2
+++ .cvsignore	16 Dec 2005 01:17:11 -0000	1.3
@@ -1 +1 @@
-gnome-sudoku-0.3.4.tar.gz
+gnome-sudoku-0.4.0.tar.gz


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/gnome-sudoku.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-sudoku.spec	12 Dec 2005 13:12:04 -0000	1.1
+++ gnome-sudoku.spec	16 Dec 2005 01:17:11 -0000	1.2
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gnome-sudoku
-Version:        0.3.4
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Paul W. Frields  - 0.4.0-1
+- Update to 0.4.0
+
 * Sun Dec 11 2005 Paul W. Frields  - 0.3.4-1
 - Fix to fedora-rpmdevtools standards
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2005 13:12:04 -0000	1.2
+++ sources	16 Dec 2005 01:17:11 -0000	1.3
@@ -1 +1 @@
-6b411c8f925b0f9ce0ac195400c08f6a  gnome-sudoku-0.3.4.tar.gz
+49690532247bf9c5786655036e8cec92  gnome-sudoku-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 16 01:18:55 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Thu, 15 Dec 2005 20:18:55 -0500
Subject: rpms/gnome-sudoku/devel .cvsignore, 1.2, 1.3 gnome-sudoku.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200512160119.jBG1JQNO020306@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20284

Modified Files:
	.cvsignore gnome-sudoku.spec sources 
Log Message:
Updated to 0.4.0-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2005 13:12:04 -0000	1.2
+++ .cvsignore	16 Dec 2005 01:18:53 -0000	1.3
@@ -1 +1 @@
-gnome-sudoku-0.3.4.tar.gz
+gnome-sudoku-0.4.0.tar.gz


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/gnome-sudoku.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-sudoku.spec	12 Dec 2005 13:12:04 -0000	1.1
+++ gnome-sudoku.spec	16 Dec 2005 01:18:53 -0000	1.2
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gnome-sudoku
-Version:        0.3.4
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Thu Dec 15 2005 Paul W. Frields  - 0.4.0-1
+- Update to 0.4.0
+
 * Sun Dec 11 2005 Paul W. Frields  - 0.3.4-1
 - Fix to fedora-rpmdevtools standards
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2005 13:12:04 -0000	1.2
+++ sources	16 Dec 2005 01:18:53 -0000	1.3
@@ -1 +1 @@
-6b411c8f925b0f9ce0ac195400c08f6a  gnome-sudoku-0.3.4.tar.gz
+49690532247bf9c5786655036e8cec92  gnome-sudoku-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 16 02:19:37 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 15 Dec 2005 21:19:37 -0500
Subject: rpms/uim/devel uim.spec,1.21,1.22
Message-ID: <200512160220.jBG2K7k1022114@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22096

Modified Files:
	uim.spec 
Log Message:
add X dependencies.


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- uim.spec	15 Dec 2005 11:18:13 -0000	1.21
+++ uim.spec	16 Dec 2005 02:19:35 -0000	1.22
@@ -8,6 +8,7 @@
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libXft-devel libX11-devel
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
 BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
 BuildRequires:	emacs
@@ -156,7 +157,7 @@
 
 
 %build
-%configure --with-canna --with-anthy --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
+%configure --with-x --with-xft --with-canna --with-anthy --with-m17nlib --without-scim --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
 make
 
 %install



From fedora-extras-commits at redhat.com  Fri Dec 16 04:07:15 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Thu, 15 Dec 2005 23:07:15 -0500
Subject: rpms/uim/devel uim.spec,1.22,1.23
Message-ID: <200512160407.jBG47jpk025651@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25633

Modified Files:
	uim.spec 
Log Message:
add X dependencies.


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- uim.spec	16 Dec 2005 02:19:35 -0000	1.22
+++ uim.spec	16 Dec 2005 04:06:54 -0000	1.23
@@ -8,7 +8,7 @@
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libXft-devel libX11-devel
+BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
 BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
 BuildRequires:	emacs



From fedora-extras-commits at redhat.com  Fri Dec 16 04:30:10 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 23:30:10 -0500
Subject: rpms/xfce4-clipman-plugin - New directory
Message-ID: <200512160430.jBG4UAmP025794@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25785/xfce4-clipman-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-clipman-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 04:30:16 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 23:30:16 -0500
Subject: rpms/xfce4-clipman-plugin/devel - New directory
Message-ID: <200512160430.jBG4UGSo025810@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25785/xfce4-clipman-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-clipman-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 04:30:49 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 23:30:49 -0500
Subject: rpms/xfce4-clipman-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512160430.jBG4Un02025845@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25832

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-clipman-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-clipman-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec 16 04:30:55 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 23:30:55 -0500
Subject: rpms/xfce4-clipman-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512160430.jBG4UtkY025866@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25832/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-clipman-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec 16 04:32:01 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 23:32:01 -0500
Subject: rpms/xfce4-clipman-plugin import.log,1.1,1.2
Message-ID: <200512160432.jBG4WWMX025938@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25900

Modified Files:
	import.log 
Log Message:
auto-import xfce4-clipman-plugin-0.4.1-4.fc4 on branch devel from xfce4-clipman-plugin-0.4.1-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Dec 2005 04:30:47 -0000	1.1
+++ import.log	16 Dec 2005 04:31:59 -0000	1.2
@@ -0,0 +1 @@
+xfce4-clipman-plugin-0_4_1-4_fc4:HEAD:xfce4-clipman-plugin-0.4.1-4.fc4.src.rpm:1134707507



From fedora-extras-commits at redhat.com  Fri Dec 16 04:32:12 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 15 Dec 2005 23:32:12 -0500
Subject: rpms/xfce4-clipman-plugin/devel xfce4-clipman-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512160432.jBG4WgVS025942@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25900/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-clipman-plugin.spec 
Log Message:
auto-import xfce4-clipman-plugin-0.4.1-4.fc4 on branch devel from xfce4-clipman-plugin-0.4.1-4.fc4.src.rpm


--- NEW FILE xfce4-clipman-plugin.spec ---
Name:		xfce4-clipman-plugin
Version:	0.4.1
Release:	4%{?dist}
Summary:	Clipboard manager plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
This is a simple cliboard history for Xfce panel. It includes a "Clear 
clipboard" option, and a drag-and-drop paste feature.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.4.1-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.4.1-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.4.1-2.fc4.cw
- Update to 0.4.1.
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.4.1-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.4.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Dec 2005 04:30:53 -0000	1.1
+++ .cvsignore	16 Dec 2005 04:32:10 -0000	1.2
@@ -0,0 +1 @@
+xfce4-clipman-plugin-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Dec 2005 04:30:53 -0000	1.1
+++ sources	16 Dec 2005 04:32:10 -0000	1.2
@@ -0,0 +1 @@
+664f6ca8500d8f240289c27d7bf4f419  xfce4-clipman-plugin-0.4.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 16 08:54:45 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 16 Dec 2005 03:54:45 -0500
Subject: rpms/bochs/devel bochs.spec,1.10,1.11
Message-ID: <200512160855.jBG8tFGY000633@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/bochs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv603

Modified Files:
	bochs.spec 
Log Message:
* Fri Dec 16 2005 Ville Skytt??  - 2.2.1-2
- Adapt to modular X.
- Fix build with g++ 4.1.0.
- Conditionalize wxGTK build and default it to off (build failures w/2.6.x).
- Use sed instead of dos2unix and perl during build.



Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bochs.spec	10 Jul 2005 16:14:58 -0000	1.10
+++ bochs.spec	16 Dec 2005 08:54:43 -0000	1.11
@@ -1,6 +1,9 @@
+%bcond_with     debugger
+%bcond_with     wx
+
 Name:           bochs
 Version:        2.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Portable x86 PC emulator
 
 Group:          Applications/Emulators
@@ -14,12 +17,16 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  docbook-utils
-BuildRequires:  wxGTK2-devel
+BuildRequires:  libXt-devel
+BuildRequires:  libXpm-devel
 BuildRequires:  ncurses-devel
-BuildRequires:  dos2unix
-BuildRequires:  %{__perl}
 BuildRequires:  SDL-devel
-%{?_with_debugger:BuildRequires: readline-devel}
+%if %{with wx}
+BuildRequires:  wxGTK-devel
+%endif
+%if %{with debugger}
+BuildRequires:  readline-devel
+%endif
 
 %description
 Bochs is a portable x86 PC emulation software package that emulates
@@ -43,17 +50,22 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+cp -p %{SOURCE1} .
+
 # Uh-oh, great!
-%{__perl} -pi -e \
-  's|wx_needs_gtk2=0|wx_needs_gtk2=1| ;
-   s|/opt/gnome/include/|%{_includedir}/|' \
+sed -i \
+  -e 's|wx_needs_gtk2=0|wx_needs_gtk2=1|' \
+  -e 's|/opt/gnome/include/|%{_includedir}/|' \
   configure*
+
 # Fix up some man page paths.
-%{__perl} -pi -e \
-  's|/usr/local/share/doc/bochs\b|%{_docdir}/%{name}-%{version}| ;
-   s|/usr/local/share/|%{_datadir}/|' \
+sed -i \
+  -e 's|/usr/local/share/doc/bochs/|%{_docdir}/%{name}-%{version}/|' \
+  -e 's|/usr/local/share/|%{_datadir}/|' \
   doc/man/*.*
-cp -p %{SOURCE1} .
+
+# Fix build error with g++ 4.1.0
+sed -i -e '/#ifndef PARANOID/,/#endif/d' iodev/harddrv.h
 
 
 %build
@@ -66,7 +78,7 @@
   --enable-pci \
   --enable-4meg-pages \
   --enable-pae \
-  %{?_with_debugger:--enable-debugger} \
+  %{?with_debugger:--enable-debugger} \
   --enable-all-optimizations \
   --enable-vbe \
   --enable-3dnow \
@@ -78,14 +90,14 @@
   --with-term \
   --with-rfb \
   --with-sdl \
-  --with-wx
+  --with%{!?with_wx:out}-wx
 
 make %{?_smp_mflags}
 make unpack_dlx
 
 # This needs to be done after "make unpack_dlx".
 %{__patch} -p0 < %{PATCH2}
-dos2unix dlxlinux/readme.txt dlxlinux/bochsrc.txt
+sed -i -e 's/\r//' dlxlinux/readme.txt dlxlinux/bochsrc.txt
 
 
 %install
@@ -122,6 +134,12 @@
 
 
 %changelog
+* Fri Dec 16 2005 Ville Skytt??  - 2.2.1-2
+- Adapt to modular X.
+- Fix build with g++ 4.1.0.
+- Conditionalize wxGTK build and default it to off (build failures w/2.6.x).
+- Use sed instead of dos2unix and perl during build.
+
 * Sat Jul  9 2005 Ville Skytt??  - 2.2.1-1
 - 2.2.1, precision patch applied upstream.
 



From fedora-extras-commits at redhat.com  Fri Dec 16 09:00:48 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri, 16 Dec 2005 04:00:48 -0500
Subject: fedora-security/audit fc4,1.108,1.109 fc5,1.19,1.20
Message-ID: <200512160901.jBG91L6T002358@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv770

Modified Files:
	fc4 fc5 
Log Message:
Add cpio CVE



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- fc4	15 Dec 2005 16:28:25 -0000	1.108
+++ fc4	16 Dec 2005 09:00:46 -0000	1.109
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
 CVE-2005-4077 backport (curl) [since FEDORA-2005-1137]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fc5	15 Dec 2005 16:28:25 -0000	1.19
+++ fc5	16 Dec 2005 09:00:46 -0000	1.20
@@ -12,6 +12,7 @@
 
 ** are items that need attention
 
+CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
 CVE-2005-4077 VULNERABLE (curl)



From fedora-extras-commits at redhat.com  Fri Dec 16 09:12:48 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 16 Dec 2005 04:12:48 -0500
Subject: rpms/perl-Class-ErrorHandler - New directory
Message-ID: <200512160912.jBG9Cmtc002757@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-ErrorHandler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2748/perl-Class-ErrorHandler

Log Message:
Directory /cvs/extras/rpms/perl-Class-ErrorHandler added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 09:13:12 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 16 Dec 2005 04:13:12 -0500
Subject: rpms/perl-Class-ErrorHandler/devel - New directory
Message-ID: <200512160913.jBG9DCi3002783@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-ErrorHandler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2748/perl-Class-ErrorHandler/devel

Log Message:
Directory /cvs/extras/rpms/perl-Class-ErrorHandler/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 09:14:21 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 16 Dec 2005 04:14:21 -0500
Subject: rpms/perl-Class-ErrorHandler Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512160914.jBG9ELwj002819@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-ErrorHandler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2806

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Class-ErrorHandler


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-ErrorHandler
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 16 09:14:38 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 16 Dec 2005 04:14:38 -0500
Subject: rpms/perl-Class-ErrorHandler/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512160914.jBG9Ecwl002838@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-ErrorHandler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2806/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-ErrorHandler


--- NEW 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 Dec 16 09:17:13 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 16 Dec 2005 04:17:13 -0500
Subject: rpms/perl-Class-ErrorHandler import.log,1.1,1.2
Message-ID: <200512160918.jBG9I4jK003151@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-ErrorHandler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2944

Modified Files:
	import.log 
Log Message:
auto-import perl-Class-ErrorHandler-0.01-2 on branch devel from perl-Class-ErrorHandler-0.01-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-ErrorHandler/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Dec 2005 09:14:19 -0000	1.1
+++ import.log	16 Dec 2005 09:17:11 -0000	1.2
@@ -0,0 +1 @@
+perl-Class-ErrorHandler-0_01-2:HEAD:perl-Class-ErrorHandler-0.01-2.src.rpm:1134724560



From fedora-extras-commits at redhat.com  Fri Dec 16 09:17:32 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 16 Dec 2005 04:17:32 -0500
Subject: rpms/perl-Class-ErrorHandler/devel perl-Class-ErrorHandler.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512160918.jBG9I44J003152@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-ErrorHandler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2944/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Class-ErrorHandler.spec 
Log Message:
auto-import perl-Class-ErrorHandler-0.01-2 on branch devel from perl-Class-ErrorHandler-0.01-2.src.rpm


--- NEW FILE perl-Class-ErrorHandler.spec ---
Name:           perl-Class-ErrorHandler
Version:        0.01
Release:        2%{?dist}
Summary:        Class::ErrorHandler Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Class-ErrorHandler/
Source0:        http://www.cpan.org/modules/by-module/Class/Class-ErrorHandler-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is Class::ErrorHandler, a base class for classes that need to do
error handling (which is, probably, most of them).

%prep
%setup -q -n Class-ErrorHandler-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README COPYING Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Sep 17 2005 Steven Pritchard  0.01-2
- Include license files.

* Fri Aug 26 2005 Steven Pritchard  0.01-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-ErrorHandler/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Dec 2005 09:14:35 -0000	1.1
+++ .cvsignore	16 Dec 2005 09:17:30 -0000	1.2
@@ -0,0 +1 @@
+Class-ErrorHandler-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-ErrorHandler/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Dec 2005 09:14:35 -0000	1.1
+++ sources	16 Dec 2005 09:17:30 -0000	1.2
@@ -0,0 +1 @@
+6a07ad34dfcdf510677f92e47643976d  Class-ErrorHandler-0.01.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 16 09:19:33 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Fri, 16 Dec 2005 04:19:33 -0500
Subject: rpms/xlockmore/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xlockmore.spec, 1.7, 1.8
Message-ID: <200512160920.jBG9K5Zl003226@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xlockmore/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3189

Modified Files:
	.cvsignore sources xlockmore.spec 
Log Message:
* Fri Dec 16 2005 Adrian Reber  - 5.20.1-1
- updated to 5.20.1
- changes for modular X
- removed "GENTOO" hack



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Sep 2005 20:51:55 -0000	1.5
+++ .cvsignore	16 Dec 2005 09:19:31 -0000	1.6
@@ -1 +1 @@
-xlockmore-5.19.tar.bz2
+xlockmore-5.20.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2005 20:51:55 -0000	1.5
+++ sources	16 Dec 2005 09:19:31 -0000	1.6
@@ -1 +1 @@
-c80ae7689bf8683033ec08b652e24d83  xlockmore-5.19.tar.bz2
+f70b24437d44cfa10ca259d00608deef  xlockmore-5.20.1.tar.bz2


Index: xlockmore.spec
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/devel/xlockmore.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xlockmore.spec	6 Sep 2005 20:51:55 -0000	1.7
+++ xlockmore.spec	16 Dec 2005 09:19:31 -0000	1.8
@@ -1,16 +1,17 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.19
+Version: 5.20.1
 Release: 1%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.19.tar.bz2
+Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.20.1.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
-BuildRequires: xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
-BuildRequires: desktop-file-utils
+BuildRequires: mesa-libGL-devel mesa-libGLU-devel
+BuildRequires: desktop-file-utils libXdmcp-devel
 BuildRequires: openmotif-devel gtk2-devel
+BuildRequires: libXau-devel
 
 %description
 Locks the local X display until a password is entered.
@@ -39,7 +40,7 @@
 %build
 %configure \
 	--with-crypt --enable-pam --enable-syslog --disable-setuid
-%{__make} %{?_smp_mflags} CFLAGS+=" -DGENTOO "
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
@@ -104,6 +105,11 @@
 %{_bindir}/xglock
 
 %changelog
+* Fri Dec 16 2005 Adrian Reber  - 5.20.1-1
+- updated to 5.20.1
+- changes for modular X
+- removed "GENTOO" hack
+
 * Sun Aug 21 2005 Adrian Reber  - 5.19-1
 - updated to 5.19
 - upstream included a fix for (BZ #161740), but "GENTOO" needs



From fedora-extras-commits at redhat.com  Fri Dec 16 09:25:28 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 16 Dec 2005 04:25:28 -0500
Subject: owners owners.list,1.456,1.457
Message-ID: <200512160926.jBG9Q0cD003351@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3302

Modified Files:
	owners.list 
Log Message:
Add perl-Class-ErrorHandler


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -r1.456 -r1.457
--- owners.list	15 Dec 2005 23:20:20 -0000	1.456
+++ owners.list	16 Dec 2005 09:25:26 -0000	1.457
@@ -717,6 +717,7 @@
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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|extras-orphan at fedoraproject.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-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



From fedora-extras-commits at redhat.com  Fri Dec 16 09:29:22 2005
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 16 Dec 2005 04:29:22 -0500
Subject: rpms/allegro/devel allegro.spec,1.17,1.18
Message-ID: <200512160929.jBG9Trl1003428@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3410/allegro/devel

Modified Files:
	allegro.spec 
Log Message:
* Fri Dec 16 2005 Jindrich Novy  4.2.0-2
- update dependencies for the new modular X
- disable _smp_mflags to workaround build failure caused
  by bad dependencies




Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- allegro.spec	19 Nov 2005 08:09:07 -0000	1.17
+++ allegro.spec	16 Dec 2005 09:29:20 -0000	1.18
@@ -16,7 +16,7 @@
 Patch2:         allegro-4.0.3-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
-BuildRequires:  libX11-devel
+BuildRequires:  libX11-devel, libXext-devel, libXau, libXdmcp
 
 %description
 Allegro is a cross-platform library intended for use in computer games
@@ -45,7 +45,8 @@
 Summary(it):    Una libreria per la programmazione di videogiochi
 Summary(cz):    Knihovna pro programov??n?? her
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, XFree86-devel
+Requires:       %{name} = %{version}-%{release}, libX11-devel
+Requires:       libXext-devel, libXau, libXdmcp
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -125,9 +126,11 @@
 %endif
   --enable-svgalib=no
 %ifnarch %{ix86}
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -DALLEGRO_USE_C -I%{_includedir}/kde/artsc"
+#make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -DALLEGRO_USE_C -I%{_includedir}/kde/artsc"
+make CFLAGS="$RPM_OPT_FLAGS -DALLEGRO_USE_C -I%{_includedir}/kde/artsc"
 %else
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/kde/artsc"
+#make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/kde/artsc"
+make CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/kde/artsc"
 %endif
 MKDATA_PRELOAD=../../lib/unix/liballeg-%{version}.so \
   DAT=../../tools/dat sh misc/mkdata.sh
@@ -201,8 +204,10 @@
 
 
 %changelog
-* Sat Nov 19 2005 Jindrich Novy  4.2.0-2
+* Fri Dec 16 2005 Jindrich Novy  4.2.0-2
 - update dependencies for the new modular X
+- disable _smp_mflags to workaround build failure caused
+  by bad dependencies
 
 * Wed May 25 2005 Jindrich Novy  4.2.0-1
 - update to 4.2.0



From fedora-extras-commits at redhat.com  Fri Dec 16 11:03:22 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Fri, 16 Dec 2005 06:03:22 -0500
Subject: rpms/uim/devel .cvsignore, 1.11, 1.12 sources, 1.10, 1.11 uim.spec,
	1.23, 1.24
Message-ID: <200512161104.jBGB4EfJ006923@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6901

Modified Files:
	.cvsignore sources uim.spec 
Log Message:
* Fri Dec 16 2005 Akira TAGOH  - 1.0.0-0.2.beta
- updates to 1.0.0-beta.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	15 Dec 2005 11:32:10 -0000	1.11
+++ .cvsignore	16 Dec 2005 11:03:20 -0000	1.12
@@ -10,3 +10,4 @@
 uim-0.4.8.tar.gz
 uim-0.4.9.1.tar.gz
 uim-1.0.0-alpha.tar.gz
+uim-1.0.0-beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Dec 2005 11:32:10 -0000	1.10
+++ sources	16 Dec 2005 11:03:20 -0000	1.11
@@ -1 +1 @@
-9c277a46e16a0bf90d72aabbf8094cfc  uim-1.0.0-alpha.tar.gz
+c68b7a8544551bd5b65df03dcb46d9e3  uim-1.0.0-beta.tar.gz


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- uim.spec	16 Dec 2005 04:06:54 -0000	1.23
+++ uim.spec	16 Dec 2005 11:03:20 -0000	1.24
@@ -4,7 +4,7 @@
 
 Name:		uim
 Version:	1.0.0
-Release:	0.1.alpha%{?dist}
+Release:	0.2.beta%{?dist}
 License:	GPL/BSD
 URL:		http://uim.freedesktop.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,7 +12,7 @@
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
 BuildRequires:	anthy-devel Canna-devel m17n-lib-devel
 BuildRequires:	emacs
-Source0:	http://uim.freedesktop.org/release/%{name}-%{version}-alpha.tar.gz
+Source0:	http://uim.freedesktop.org/release/%{name}-%{version}-beta.tar.gz
 Source1:	xinput.d-uim
 Source2:	uim-init.el
 
@@ -153,7 +153,7 @@
 %define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules )
 
 %prep
-%setup -q -n %{name}-%{version}-alpha
+%setup -q -n %{name}-%{version}-beta
 
 
 %build
@@ -343,6 +343,9 @@
 %{_datadir}/uim/m17nlib.scm
 
 %changelog
+* Fri Dec 16 2005 Akira TAGOH  - 1.0.0-0.2.beta
+- updates to 1.0.0-beta.
+
 * Thu Dec 15 2005 Akira TAGOH  - 1.0.0-0.1.alpha
 - New upstream release.
 - added uim-m17n package. (#175600)



From fedora-extras-commits at redhat.com  Fri Dec 16 11:24:09 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:24:09 -0500
Subject: rpms/perl-DBD-XBase - New directory
Message-ID: <200512161124.jBGBO9AI007108@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7099/perl-DBD-XBase

Log Message:
Directory /cvs/extras/rpms/perl-DBD-XBase added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 11:24:15 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:24:15 -0500
Subject: rpms/perl-DBD-XBase/devel - New directory
Message-ID: <200512161124.jBGBOF93007124@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7099/perl-DBD-XBase/devel

Log Message:
Directory /cvs/extras/rpms/perl-DBD-XBase/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 11:24:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:24:35 -0500
Subject: rpms/perl-DBD-XBase Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512161124.jBGBOZrg007161@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7148

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-DBD-XBase


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DBD-XBase
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec 16 11:24:40 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:24:40 -0500
Subject: rpms/perl-DBD-XBase/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512161124.jBGBOeOt007180@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7148/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DBD-XBase


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec 16 11:25:15 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:25:15 -0500
Subject: rpms/perl-DBD-XBase import.log,1.1,1.2
Message-ID: <200512161125.jBGBPj41007250@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7214

Modified Files:
	import.log 
Log Message:
auto-import perl-DBD-XBase-0.241-1 on branch devel from perl-DBD-XBase-0.241-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-XBase/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Dec 2005 11:24:33 -0000	1.1
+++ import.log	16 Dec 2005 11:25:13 -0000	1.2
@@ -0,0 +1 @@
+perl-DBD-XBase-0_241-1:HEAD:perl-DBD-XBase-0.241-1.src.rpm:1134732304



From fedora-extras-commits at redhat.com  Fri Dec 16 11:25:21 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:25:21 -0500
Subject: rpms/perl-DBD-XBase/devel perl-DBD-XBase.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512161125.jBGBPpsZ007254@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7214/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-DBD-XBase.spec 
Log Message:
auto-import perl-DBD-XBase-0.241-1 on branch devel from perl-DBD-XBase-0.241-1.src.rpm


--- NEW FILE perl-DBD-XBase.spec ---
Name:           perl-DBD-XBase
Version:        0.241
Release:        1%{?dist}
Summary:        Perl module for reading and writing the dbf files

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/DBD-XBase/
Source0:        http://www.cpan.org/authors/id/J/JA/JANPAZ/DBD-XBase-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(DBI)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module can read and write XBase database files, known as dbf in
dBase and FoxPro world. It also transparently reads memo fields from
the dbt, fpt and smt files and works with index files (ndx, ntx, mdx, idx,
cdx and SDBM). This module XBase.pm provides simple native interface
to XBase files. For DBI compliant database access, see DBD::XBase and
DBI modules and their man pages.


%prep
%setup -q -n DBD-XBase-%{version}
chmod a-x eg/*table

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README ToDo driver_characteristics new-XBase
%doc eg/
%{_bindir}/*
%{perl_vendorlib}/DBD/
%{perl_vendorlib}/XBase*
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3*


%changelog
* Sat Nov 05 2005 Jose Pedro Oliveira  - 0.241-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-XBase/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Dec 2005 11:24:38 -0000	1.1
+++ .cvsignore	16 Dec 2005 11:25:18 -0000	1.2
@@ -0,0 +1 @@
+DBD-XBase-0.241.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-XBase/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Dec 2005 11:24:38 -0000	1.1
+++ sources	16 Dec 2005 11:25:18 -0000	1.2
@@ -0,0 +1 @@
+ed36f8722f09406d35c8af801fa78c3b  DBD-XBase-0.241.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 16 11:40:42 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:40:42 -0500
Subject: rpms/perl-DBD-XBase/devel DBD-XBase-0.241-indexdump.PL.patch, NONE,
	1.1 perl-DBD-XBase.spec, 1.1, 1.2
Message-ID: <200512161141.jBGBfDIe007381@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7360

Modified Files:
	perl-DBD-XBase.spec 
Added Files:
	DBD-XBase-0.241-indexdump.PL.patch 
Log Message:
Patch to remove the duplicate shebang line in bin/indexdump (#175895)

DBD-XBase-0.241-indexdump.PL.patch:

--- NEW FILE DBD-XBase-0.241-indexdump.PL.patch ---
diff -ruN DBD-XBase-0.241-orig/bin/indexdump.PL DBD-XBase-0.241/bin/indexdump.PL
--- DBD-XBase-0.241-orig/bin/indexdump.PL	2001-01-22 19:46:19.000000000 +0000
+++ DBD-XBase-0.241/bin/indexdump.PL	2005-12-16 11:15:55.000000000 +0000
@@ -14,8 +14,6 @@
 
 print OUT <<'EOBODY';
 
-#!/usr/bin/perl -w 
-
 use strict;
 use XBase::Index;
 use Getopt::Long;


Index: perl-DBD-XBase.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-XBase/devel/perl-DBD-XBase.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-DBD-XBase.spec	16 Dec 2005 11:25:18 -0000	1.1
+++ perl-DBD-XBase.spec	16 Dec 2005 11:40:40 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           perl-DBD-XBase
 Version:        0.241
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl module for reading and writing the dbf files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/DBD-XBase/
 Source0:        http://www.cpan.org/authors/id/J/JA/JANPAZ/DBD-XBase-%{version}.tar.gz
+Patch0:         DBD-XBase-0.241-indexdump.PL.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -24,6 +25,7 @@
 
 %prep
 %setup -q -n DBD-XBase-%{version}
+%patch0 -p1
 chmod a-x eg/*table
 
 %build
@@ -59,5 +61,8 @@
 
 
 %changelog
+* Fri Dec 16 2005 Jose Pedro Oliveira  - 0.241-2
+- Patch to remove the duplicate shebang line in bin/indexdump (#175895).
+
 * Sat Nov 05 2005 Jose Pedro Oliveira  - 0.241-1
 - First build.



From fedora-extras-commits at redhat.com  Fri Dec 16 11:44:30 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 16 Dec 2005 06:44:30 -0500
Subject: owners owners.list,1.457,1.458
Message-ID: <200512161145.jBGBj0nF007428@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7410

Modified Files:
	owners.list 
Log Message:
New package: perl-DBD-XBase (#175895)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -r1.457 -r1.458
--- owners.list	16 Dec 2005 09:25:26 -0000	1.457
+++ owners.list	16 Dec 2005 11:44:28 -0000	1.458
@@ -741,6 +741,7 @@
 Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-DBD-XBase|Perl module for reading and writing the dbf files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-DBSchema|Database-independent schema objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-SearchBuilder|Encapsulate SQL queries and rows in simple perl objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Dec 16 13:40:46 2005
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 16 Dec 2005 08:40:46 -0500
Subject: rpms/yumex/FC-4 .cvsignore, 1.8, 1.9 sources, 1.10, 1.11 yumex.spec,
	1.10, 1.11
Message-ID: <200512161341.jBGDfHJq011173@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11151

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 0.44-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Oct 2005 12:23:47 -0000	1.8
+++ .cvsignore	16 Dec 2005 13:40:44 -0000	1.9
@@ -1 +1 @@
-yumex-0.42-7.tar.gz
+yumex-0.44-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	31 Oct 2005 08:22:30 -0000	1.10
+++ sources	16 Dec 2005 13:40:44 -0000	1.11
@@ -1 +1 @@
-362336685b1d6114df22e805a1511f60  yumex-0.42-9.tar.gz
+e7812008ac74652f58f8b87691f44f20  yumex-0.44-1.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-4/yumex.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- yumex.spec	31 Oct 2005 08:22:30 -0000	1.10
+++ yumex.spec	16 Dec 2005 13:40:44 -0000	1.11
@@ -1,8 +1,8 @@
-%define   build_v 9
+%define   build_v 1
 
 Name:     yumex
-Version:  0.42
-Release:  9.0%{?dist}
+Version:  0.44
+Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,14 +67,31 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Mon Oct 31 2005 Tim Lauridsen  - 0.42-8.0
-- Release 0.42-9.0
-- Removed syntax error in yumbase.py.
-* Mon Oct 31 2005 Tim Lauridsen  - 0.42-8.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
+- Release 0.43-10.0
+* Sat Dec 10 2005 Tim Lauridsen  - 0.43-9.0
+- Release 0.43-9.0
+* Wed Nov 23 2005 Tim Lauridsen  - 0.43-8.0
+- Release 0.43-8.0
+* Wed Nov 23 2005 Tim Lauridsen  - 0.43-7.0
+- Release 0.43-7.0
+* Fri Nov 18 2005 Tim Lauridsen  - 0.43-6.0
+- Release 0.43-6.0
+* Thu Nov 17 2005 Tim Lauridsen  - 0.43-5.0
+- Release 0.43-5.0
+* Wed Nov 16 2005 Tim Lauridsen  - 0.43-4.0
+- Release 0.43-4.0
+* Thu Nov 8 2005 Tim Lauridsen  - 0.43-3.0
+- Release 0.43-3.0
+* Thu Nov 7 2005 Tim Lauridsen  - 0.43-2.0
+- Release 0.43-2.0
+* Thu Nov 7 2005 Tim Lauridsen  - 0.43-1.0
+- Release 0.43-1.0
+- Lot of changes, check the ChangeLog
+* Thu Oct 13 2005 Tim Lauridsen  - 0.42-8.0
 - Release 0.42-8.0
-- Updated french traslation
-- Added Italien translation.
-- Added ETA truncation fix patches (Thanks to Dennis Cranston)
 * Thu Oct 13 2005 Tim Lauridsen  - 0.42-7.0
 - Release 0.42-7.0
 - Changed Requires: yum to >= 2.4



From fedora-extras-commits at redhat.com  Fri Dec 16 14:31:19 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Fri, 16 Dec 2005 09:31:19 -0500
Subject: rpms/l2tpd/devel l2tpd.spec,1.1,1.2
Message-ID: <200512161431.jBGEVnk8012948@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/l2tpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12930

Modified Files:
	l2tpd.spec 
Log Message:
* Fri Dec 16 2005 Paul Wouters  0.69-0.2.20051030
- Added dist tag and fixed version numbers



Index: l2tpd.spec
===================================================================
RCS file: /cvs/extras/rpms/l2tpd/devel/l2tpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- l2tpd.spec	15 Dec 2005 19:15:33 -0000	1.1
+++ l2tpd.spec	16 Dec 2005 14:31:17 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: l2tpd
 Version: 0.69
-Release: 0.1.%{cvs}.2
+Release: 0.2.%{cvs}%{?dist}
 License: GPL
 Url: http://sourceforge.net/projects/%{name}/
 Group: System Environment/Daemons
@@ -125,6 +125,9 @@
 
 
 %changelog
+* Fri Dec 16 2005 Paul Wouters  0.69-0.2.20051030
+- Added dist tag and fixed version numbers
+
 * Wed Dec 14 2005 Paul Wouters  0.69-0.1.20051030
 - incorporated fixes from Dmitry Butskoy
 



From fedora-extras-commits at redhat.com  Fri Dec 16 15:33:52 2005
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 16 Dec 2005 10:33:52 -0500
Subject: rpms/nedit/devel nedit-5.4-makefiles.patch, 1.1, 1.2 nedit.spec, 1.4,
	1.5
Message-ID: <200512161534.jBGFYNgI014800@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/nedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14777/nedit/devel

Modified Files:
	nedit-5.4-makefiles.patch nedit.spec 
Log Message:
* Thu Dec 16 2005 Jindrich Novy  5.5-6
- fix openmotif dependencies
- build with modular X



nedit-5.4-makefiles.patch:

Index: nedit-5.4-makefiles.patch
===================================================================
RCS file: /cvs/extras/rpms/nedit/devel/nedit-5.4-makefiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nedit-5.4-makefiles.patch	27 Jul 2005 08:46:29 -0000	1.1
+++ nedit-5.4-makefiles.patch	16 Dec 2005 15:33:50 -0000	1.2
@@ -12,12 +12,12 @@
  # add -DHAVE__XMVERSIONSTRING to CFLAGS
  #
 -CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
-+CFLAGS=$(RPM_OPT_FLAGS) -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
++CFLAGS=-I/usr/X11R6/include $(RPM_OPT_FLAGS) -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DBUILD_UNTESTED_NEDIT
  
  ARFLAGS=-urs
  
 -LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
-+LIBS= -L/usr/X11R6/$(LIB) -lXm -Xmu -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
++LIBS= -lXm -lXmu -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
  
  include Makefile.common
  


Index: nedit.spec
===================================================================
RCS file: /cvs/extras/rpms/nedit/devel/nedit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nedit.spec	15 Dec 2005 15:09:57 -0000	1.4
+++ nedit.spec	16 Dec 2005 15:33:50 -0000	1.5
@@ -19,7 +19,7 @@
 License: GPL
 Group: Applications/Editors
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: openmotif-devel >= 2.2.3
+BuildRequires: openmotif-devel >= 2.2.3, libXau-devel, libXpm-devel
 %if %{desktop_file}
 BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
 %endif
@@ -39,7 +39,9 @@
 %patch5 -p1 -b .nc-manfix
 
 %build
-make linux LIB=%{_lib}
+make linux LIB=%{_lib} << EOF
+
+EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,8 +82,9 @@
 %endif
 
 %changelog
-* Thu Dec 15 2005 Jindrich Novy  5.5-6
-- rebuilt to fix X dependencies
+* Thu Dec 16 2005 Jindrich Novy  5.5-6
+- fix openmotif dependencies
+- build with modular X
 
 * Mon Oct 10 2005 Jindrich Novy  5.5-5
 - update nedit file locations to new xorg standards (#167208, #170937)



From fedora-extras-commits at redhat.com  Fri Dec 16 16:39:24 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri, 16 Dec 2005 11:39:24 -0500
Subject: rpms/krecipes/FC-3 krecipes.spec,1.7,1.8
Message-ID: <200512161639.jBGGdtpM016692@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16674

Modified Files:
	krecipes.spec 
Log Message:
Update to 0.9.1



Index: krecipes.spec
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-3/krecipes.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- krecipes.spec	1 Dec 2005 04:03:33 -0000	1.7
+++ krecipes.spec	16 Dec 2005 16:39:22 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           krecipes
-Version:        0.9
-Release:        2%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        Application to manage recipes and shopping-lists
 
 Group:          Applications/Productivity
@@ -9,7 +9,7 @@
 Source0:        http://download.sourceforge.net/krecipes/krecipes-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel > 3.1, sqlite-devel, desktop-file-utils
+BuildRequires:  kdelibs-devel > 3.1, sqlite-devel, desktop-file-utils, libacl-devel
 Requires:       kdebase >= 3.1
 
 patch0:		krecipes-gcc4.patch
@@ -81,9 +81,11 @@
 %{_datadir}/mimelnk/*/*.desktop
 
 %changelog
-* Wed Nov 11 2005 Dennis Gilmore  - 0.9-2
+* Sun Dec 04 2005 Dennis Gilmore  - 0.9.1-1
+- Update to 0.9.1 fixes bug in creation of new mysql databses
+* Wed Nov 30 2005 Dennis Gilmore  - 0.9-2
 - fix missing files
-* Wed Nov 11 2005 Dennis Gilmore  - 0.9-1
+* Wed Nov 30 2005 Dennis Gilmore  - 0.9-1
 - update to 0.9
 * Sat Oct 20 2005 Dennis Gilmore  - 0.8.1-3%{?dist}
 - add BuildRequires desktop-file-utils  http://fedoraproject.org/wiki/QAChecklist



From fedora-extras-commits at redhat.com  Fri Dec 16 16:57:14 2005
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Fri, 16 Dec 2005 11:57:14 -0500
Subject: common Makefile.common,1.34,1.35
Message-ID: <200512161657.jBGGviUu017517@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17393

Modified Files:
	Makefile.common 
Log Message:
patch from enrico to allow the use of alternative plague client binary



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile.common	14 Oct 2005 18:26:06 -0000	1.34
+++ Makefile.common	16 Dec 2005 16:57:12 -0000	1.35
@@ -81,6 +81,7 @@
 CURL	?= $(shell if test -f /usr/bin/curl ; then echo "curl -H Pragma: -O -R -S --fail --show-error" ; fi)
 WGET	?= $(shell if test -f /usr/bin/wget ; then echo "wget -nd -m" ; fi)
 CLIENT	?= $(if $(CURL),$(CURL),$(if $(WGET),$(WGET)))
+PLAGUE_CLIENT ?= /usr/bin/plague-client
 
 # RPM with all the overrides in place; you can override this in your
 # .cvsextrasrc also, to use a default rpm setup
@@ -330,12 +331,12 @@
 	popd >/dev/null)
 
 build plague: $(COMMON_DIR)/branches
-	@if [ ! -x /usr/bin/plague-client ]; then echo "Must have plague-client installed - see http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup"; exit 1; fi
+	@if [ ! -x $(PLAGUE_CLIENT) ]; then echo "Must have plague-client installed - see http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup"; exit 1; fi
 	@if [ -z "$(TARGET)" -a ! -d CVS ]; then echo "Must be in a branch subdirectory"; exit 1; fi
 
 	@cvs status -v $(SPECFILE) 2>/dev/null | grep -q $(TAG); ret=$$? ;\
 	if [ $$ret -ne 0 ]; then echo "$(SPECFILE) not tagged with tag $(TAG)"; exit 1;  fi
-	/usr/bin/plague-client build $(NAME) $(TAG) $(TARGET)
+	$(PLAGUE_CLIENT) build $(NAME) $(TAG) $(TARGET)
 
 
 # "make new | less" to see what has changed since the last tag was assigned



From fedora-extras-commits at redhat.com  Fri Dec 16 17:27:26 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Fri, 16 Dec 2005 12:27:26 -0500
Subject: rpms/gnome-sudoku/FC-4 gnome-sudoku.spec,1.2,1.3
Message-ID: <200512161727.jBGHRuiH019675@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19641/FC-4

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix missing Requires: gnome-python2-gconf (thanks to Paul Dickson) (#175911)


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/gnome-sudoku.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-sudoku.spec	16 Dec 2005 01:17:11 -0000	1.2
+++ gnome-sudoku.spec	16 Dec 2005 17:27:24 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
@@ -17,7 +17,7 @@
 BuildRequires:	gnome-python2-gnomeprint, python-imaging
 BuildRequires:	desktop-file-utils
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:   gnome-python2-gnomeprint, python-imaging
+Requires:   gnome-python2-gnomeprint, python-imaging, gnome-python2-gconf
 
 %description
 GNOME Sudoku is a Japanese logic puzzle game.  GNOME Sudoku takes care
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Fri Dec 16 2005 Paul W. Frields  - 0.4.0-2
+- Fix missing Requires: gnome-python2-gconf (thanks to Paul Dickson) (#175911)
+
 * Thu Dec 15 2005 Paul W. Frields  - 0.4.0-1
 - Update to 0.4.0
 



From fedora-extras-commits at redhat.com  Fri Dec 16 17:27:32 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Fri, 16 Dec 2005 12:27:32 -0500
Subject: rpms/gnome-sudoku/devel gnome-sudoku.spec,1.2,1.3
Message-ID: <200512161728.jBGHS2q0019678@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19641/devel

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix missing Requires: gnome-python2-gconf (thanks to Paul Dickson) (#175911)


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/gnome-sudoku.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-sudoku.spec	16 Dec 2005 01:18:53 -0000	1.2
+++ gnome-sudoku.spec	16 Dec 2005 17:27:30 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
@@ -17,7 +17,7 @@
 BuildRequires:	gnome-python2-gnomeprint, python-imaging
 BuildRequires:	desktop-file-utils
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:   gnome-python2-gnomeprint, python-imaging
+Requires:   gnome-python2-gnomeprint, python-imaging, gnome-python2-gconf
 
 %description
 GNOME Sudoku is a Japanese logic puzzle game.  GNOME Sudoku takes care
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Fri Dec 16 2005 Paul W. Frields  - 0.4.0-2
+- Fix missing Requires: gnome-python2-gconf (thanks to Paul Dickson) (#175911)
+
 * Thu Dec 15 2005 Paul W. Frields  - 0.4.0-1
 - Update to 0.4.0
 



From fedora-extras-commits at redhat.com  Fri Dec 16 17:46:45 2005
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Fri, 16 Dec 2005 12:46:45 -0500
Subject: rpms/krecipes/FC-3 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200512161747.jBGHlGkx019862@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/krecipes/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19842

Modified Files:
	.cvsignore sources 
Log Message:
Make sure new source is in FC3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2005 03:36:05 -0000	1.3
+++ .cvsignore	16 Dec 2005 17:46:43 -0000	1.4
@@ -1 +1 @@
-krecipes-0.9.tar.gz
+krecipes-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/krecipes/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2005 03:36:05 -0000	1.3
+++ sources	16 Dec 2005 17:46:43 -0000	1.4
@@ -1 +1 @@
-ee1a1463946c63788ff8eeea302a7506  krecipes-0.9.tar.gz
+7414fd5210561801ba04ee3dad6561d9  krecipes-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 16 18:29:32 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 16 Dec 2005 13:29:32 -0500
Subject: rpms/kdesvn/FC-4 kdesvn.spec,1.2,1.3
Message-ID: <200512161830.jBGIU2KU021809@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21791

Modified Files:
	kdesvn.spec 
Log Message:
Add missing files not detected by mock



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/kdesvn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdesvn.spec	12 Dec 2005 16:22:28 -0000	1.2
+++ kdesvn.spec	16 Dec 2005 18:29:26 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           kdesvn
 Version:        0.7.1
-Release:        1%{?dist}
-Summary:        A subversion client for KDE
+Release:        2%{?dist}
+Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
 License:        GPL
@@ -51,6 +51,8 @@
 %find_lang %{name} || touch %{name}.lang
 #Fix doc link
 ln -sf ../common $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/en/%{name}
+#Don't conflict with kdebase
+rm $RPM_BUILD_ROOT%{_datadir)/services/svn*.protocol
 
 
 %clean
@@ -79,19 +81,23 @@
 %doc AUTHORS ChangeLog COPYING GPL.txt
 %{_bindir}/kdesvn
 %{_bindir}/kdesvnaskpass
-%{_libdir}/kde3/libkdesvnpart.*
+%{_libdir}/kde3/*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/kdesvn/
 %{_datadir}/apps/kdesvnpart/
+%{_datadir}/apps/konqueror/servicemenus/kdesvn*.desktop
 %{_datadir}/config.kcfg/kdesvn_part.kcfg
 %{_datadir}/doc/HTML/en/kdesvn/
-%{_datadir}/icons/hicolor/16x16/apps/kdesvn.png
-%{_datadir}/icons/hicolor/32x32/apps/kdesvn.png
-%{_datadir}/icons/hicolor/48x48/apps/kdesvn.png
-%{_datadir}/icons/hicolor/64x64/apps/kdesvn.png
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/hicolor/*/*/*.svgz
+%{_datadir}/services/kded/kdesvnd.desktop
+%{_datadir}/services/ksvn*.protocol
 
 
 %changelog
+* Fri Dec 16 2005 - Orion Poplawski  - 0.7.1-2
+- Add missing files not detected by mock
+
 * Fri Dec  9 2005 - Orion Poplawski  - 0.7.1-1
 - New upstream version 0.7.1
 - Remove desktop patch fixed upstream



From fedora-extras-commits at redhat.com  Fri Dec 16 18:33:39 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Fri, 16 Dec 2005 13:33:39 -0500
Subject: rpms/gnome-sudoku/FC-4 gnome-sudoku-0.4.0-pygtk2-nofs.patch, NONE,
	1.1 gnome-sudoku.spec, 1.3, 1.4
Message-ID: <200512161834.jBGIY9hs021901@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21880

Modified Files:
	gnome-sudoku.spec 
Added Files:
	gnome-sudoku-0.4.0-pygtk2-nofs.patch 
Log Message:
Add patch to fix full screen option, publish 0.4.0-3

gnome-sudoku-0.4.0-pygtk2-nofs.patch:

--- NEW FILE gnome-sudoku-0.4.0-pygtk2-nofs.patch ---
diff -uNr gnome-sudoku-0.4.0-original/src/lib/gnome_sudoku.py gnome-sudoku-0.4.0/src/lib/gnome_sudoku.py
--- gnome-sudoku-0.4.0-original/src/lib/gnome_sudoku.py	2005-12-16 13:03:38.000000000 -0500
+++ gnome-sudoku-0.4.0/src/lib/gnome_sudoku.py	2005-12-16 13:04:28.000000000 -0500
@@ -168,7 +168,7 @@
             ('ZoomOut',gtk.STOCK_ZOOM_OUT,'_Decrease size',
              'minus','Decrease the size of numbers and squares.',
              self.zoom_out_cb),
-            ('FullScreen',gtk.STOCK_FULLSCREEN,None,
+            ('FullScreen',None,'_Full screen',
              'F11',None,self.full_screen_cb),
             ('PuzzleInfo',gtk.STOCK_ABOUT,'Puzzle _Statistics',
              None,'Show statistics about current puzzle',


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/gnome-sudoku.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-sudoku.spec	16 Dec 2005 17:27:24 -0000	1.3
+++ gnome-sudoku.spec	16 Dec 2005 18:33:37 -0000	1.4
@@ -3,13 +3,14 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,6 +27,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # Fix one hardcoding instance
 sed -i 's!/usr/local!%{_prefix}!g' src/lib/game_selector.py
 # This must be something internal to the developer's system
@@ -65,6 +67,9 @@
 
 
 %changelog
+* Fri Dec 16 2005 Paul W. Frields  - 0.4.0-3
+- Fix broken full screen option
+
 * Fri Dec 16 2005 Paul W. Frields  - 0.4.0-2
 - Fix missing Requires: gnome-python2-gconf (thanks to Paul Dickson) (#175911)
 



From fedora-extras-commits at redhat.com  Fri Dec 16 18:42:19 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 16 Dec 2005 13:42:19 -0500
Subject: rpms/kdesvn/FC-4 kdesvn.spec,1.3,1.4
Message-ID: <200512161842.jBGIgoie021971@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21951

Modified Files:
	kdesvn.spec 
Log Message:
FIx typo



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/kdesvn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdesvn.spec	16 Dec 2005 18:29:26 -0000	1.3
+++ kdesvn.spec	16 Dec 2005 18:42:17 -0000	1.4
@@ -52,7 +52,7 @@
 #Fix doc link
 ln -sf ../common $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/en/%{name}
 #Don't conflict with kdebase
-rm $RPM_BUILD_ROOT%{_datadir)/services/svn*.protocol
+rm $RPM_BUILD_ROOT%{_datadir}/services/svn*.protocol
 
 
 %clean



From fedora-extras-commits at redhat.com  Fri Dec 16 21:34:48 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri, 16 Dec 2005 16:34:48 -0500
Subject: rpms/nmh/devel nmh.spec,1.11,1.12
Message-ID: <200512162135.jBGLZIQW027450@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/extras/rpms/nmh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27432

Modified Files:
	nmh.spec 
Log Message:
Add the -fno-builtin-strcasecmp cflag when building.



Index: nmh.spec
===================================================================
RCS file: /cvs/extras/rpms/nmh/devel/nmh.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nmh.spec	14 Dec 2005 02:38:00 -0000	1.11
+++ nmh.spec	16 Dec 2005 21:34:46 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.1
-Release:        14.fc5
+Release:        15.fc5
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -39,6 +39,7 @@
 
 
 %build
+CFLAGS='-fno-builtin-strcasecmp'
 %configure \
             --sysconfdir=%{_sysconfdir}/nmh \
             --libdir=%{_libdir}/nmh \
@@ -70,6 +71,9 @@
 %doc docs/TODO docs/README* COPYRIGHT
 
 %changelog
+* Fri Dec 16 2005 Josh Bressers  0:1.1-15.fc5
+- Add the -fno-builtin-strcasecmp cflag.
+
 * Tue Dec 13 2005 Josh Bressers  0:1.1-14.fc5
 - Add a patch to prevent multiple calls to context_read from squashing
   settings.



From fedora-extras-commits at redhat.com  Fri Dec 16 22:26:52 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:26:52 -0500
Subject: rpms/xfce4-xkb-plugin - New directory
Message-ID: <200512162226.jBGMQqdM029283@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29274/xfce4-xkb-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-xkb-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 22:26:58 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:26:58 -0500
Subject: rpms/xfce4-xkb-plugin/devel - New directory
Message-ID: <200512162226.jBGMQwnj029299@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29274/xfce4-xkb-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-xkb-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 22:27:18 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:27:18 -0500
Subject: rpms/xfce4-xkb-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512162227.jBGMRIea029334@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29321

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-xkb-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-xkb-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec 16 22:27:24 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:27:24 -0500
Subject: rpms/xfce4-xkb-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512162227.jBGMROZx029355@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29321/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-xkb-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec 16 22:28:29 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:28:29 -0500
Subject: rpms/xfce4-xkb-plugin import.log,1.1,1.2
Message-ID: <200512162228.jBGMSxdF029427@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29391

Modified Files:
	import.log 
Log Message:
auto-import xfce4-xkb-plugin-0.3.2-4.fc4 on branch devel from xfce4-xkb-plugin-0.3.2-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Dec 2005 22:27:16 -0000	1.1
+++ import.log	16 Dec 2005 22:28:27 -0000	1.2
@@ -0,0 +1 @@
+xfce4-xkb-plugin-0_3_2-4_fc4:HEAD:xfce4-xkb-plugin-0.3.2-4.fc4.src.rpm:1134772099



From fedora-extras-commits at redhat.com  Fri Dec 16 22:28:35 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:28:35 -0500
Subject: rpms/xfce4-xkb-plugin/devel xfce4-xkb-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512162229.jBGMT5kw029431@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29391/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-xkb-plugin.spec 
Log Message:
auto-import xfce4-xkb-plugin-0.3.2-4.fc4 on branch devel from xfce4-xkb-plugin-0.3.2-4.fc4.src.rpm


--- NEW FILE xfce4-xkb-plugin.spec ---
Name:		xfce4-xkb-plugin
Version:	0.3.2
Release:	4%{?dist}
Summary:	XKB layout switcher for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
keyboard layout, and refreshes when layout changes. The layout can be 
switched by simply clicking on the plugin. For now the keyboard layouts 
cannot be configured from the plugin itself, they should be set in the 
XF86Config file or some other way (e.g. setxkbmap).

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so
%dir %{_datadir}/xfce4/xkb/
%dir %{_datadir}/xfce4/xkb/flags
%{_datadir}/xfce4/xkb/flags/*.png

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.3.2-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.3.2-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.3.2-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.3.2-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.3.2-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Dec 2005 22:27:22 -0000	1.1
+++ .cvsignore	16 Dec 2005 22:28:33 -0000	1.2
@@ -0,0 +1 @@
+xfce4-xkb-plugin-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Dec 2005 22:27:22 -0000	1.1
+++ sources	16 Dec 2005 22:28:33 -0000	1.2
@@ -0,0 +1 @@
+b233819d685ab3b7f4a47c2da9fb6936  xfce4-xkb-plugin-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 16 22:33:10 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:33:10 -0500
Subject: rpms/xfce4-systemload-plugin - New directory
Message-ID: <200512162233.jBGMXAmh029531@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29522/xfce4-systemload-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-systemload-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 22:33:15 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:33:15 -0500
Subject: rpms/xfce4-systemload-plugin/devel - New directory
Message-ID: <200512162233.jBGMXFws029547@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29522/xfce4-systemload-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-systemload-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 16 22:33:35 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:33:35 -0500
Subject: rpms/xfce4-systemload-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512162233.jBGMXZPr029584@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29571

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-systemload-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-systemload-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Dec 16 22:33:41 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:33:41 -0500
Subject: rpms/xfce4-systemload-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512162233.jBGMXfYb029605@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29571/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-systemload-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec 16 22:34:37 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:34:37 -0500
Subject: rpms/xfce4-systemload-plugin import.log,1.1,1.2
Message-ID: <200512162235.jBGMZ7nf029676@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29640

Modified Files:
	import.log 
Log Message:
auto-import xfce4-systemload-plugin-0.3.6-4.fc4 on branch devel from xfce4-systemload-plugin-0.3.6-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Dec 2005 22:33:33 -0000	1.1
+++ import.log	16 Dec 2005 22:34:34 -0000	1.2
@@ -0,0 +1 @@
+xfce4-systemload-plugin-0_3_6-4_fc4:HEAD:xfce4-systemload-plugin-0.3.6-4.fc4.src.rpm:1134772466



From fedora-extras-commits at redhat.com  Fri Dec 16 22:34:42 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 17:34:42 -0500
Subject: rpms/xfce4-systemload-plugin/devel xfce4-systemload-plugin.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512162235.jBGMZCnW029680@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29640/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-systemload-plugin.spec 
Log Message:
auto-import xfce4-systemload-plugin-0.3.6-4.fc4 on branch devel from xfce4-systemload-plugin-0.3.6-4.fc4.src.rpm


--- NEW FILE xfce4-systemload-plugin.spec ---
Name:		xfce4-systemload-plugin
Version:	0.3.6
Release:	4%{?dist}
Summary:	Systemload monitor for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildRequires:	gettext

%description
A system-load monitor plugin for the Xfce panel. It displays the current CPU 
load, the memory in use, the swap space and the system uptime.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang xfce4-systemload

%clean
rm -rf $RPM_BUILD_ROOT

%files -f xfce4-systemload.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert  - 0.3.6-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert  - 0.3.6-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert  - 0.3.6-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert  - 0.3.6-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert  - 0.3.6-1.fc3.cw
- Updated to version 0.3.6.

* Wed Apr 13 2005 Christoph Wickert  - 0.3.4-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Dec 2005 22:33:38 -0000	1.1
+++ .cvsignore	16 Dec 2005 22:34:40 -0000	1.2
@@ -0,0 +1 @@
+xfce4-systemload-plugin-0.3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Dec 2005 22:33:38 -0000	1.1
+++ sources	16 Dec 2005 22:34:40 -0000	1.2
@@ -0,0 +1 @@
+fd73efa3bd7a73e3f5fdf8d4ed848c1f  xfce4-systemload-plugin-0.3.6.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 17 02:12:20 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 16 Dec 2005 21:12:20 -0500
Subject: owners owners.list,1.458,1.459
Message-ID: <200512170212.jBH2CoVs006816@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6793

Modified Files:
	owners.list 
Log Message:
add xfce4-battery-plugin, xfce4-showdesktop-plugin, xfce4-taskbar-plugin, xfce4-notes-plugin, xfce4-modemlights-plugin, xfce4-minicmd-plugin, xfce4-wavelan-plugin, xfce4-clipman-plugin, xfce4-xkb-plugin, xfce4-systemload-plugin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -r1.458 -r1.459
--- owners.list	16 Dec 2005 11:44:28 -0000	1.458
+++ owners.list	17 Dec 2005 02:12:17 -0000	1.459
@@ -1239,19 +1239,29 @@
 Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-appfinder|Appfinder for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-battery-plugin|Battery monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-clipman-plugin|Clipboard manager plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-minicmd-plugin|Mini command-line plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-showdesktop-plugin|Show-Desktop plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-systemload-plugin|Systemload monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-systray|Systray for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-taskbar-plugin|Tasklist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-toys|Small Xfce4 applications|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-trigger-launcher|Trigger launcher for Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-wavelan-plugin|WaveLAN plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-weather-plugin|Weather plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-windowlist-plugin|Windowlist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-xkb-plugin|XKB layout switcher for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xmms-plugin|Control XMMS from the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-plugins|Plugins for multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 17 02:57:11 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 16 Dec 2005 21:57:11 -0500
Subject: rpms/meanwhile/devel .cvsignore, 1.5, 1.6 meanwhile.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200512170257.jBH2vfiA006980@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6946

Modified Files:
	.cvsignore meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Dec 2005 13:40:20 -0000	1.5
+++ .cvsignore	17 Dec 2005 02:57:09 -0000	1.6
@@ -1 +1 @@
-meanwhile-1.0.0.tar.gz
+meanwhile-1.0.1.tar.gz


Index: meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/meanwhile.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- meanwhile.spec	15 Dec 2005 13:40:20 -0000	1.5
+++ meanwhile.spec	17 Dec 2005 02:57:09 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:	Lotus Sametime Community Client library
 License:	LGPL
 Group:		Applications/Internet
-Version:	1.0.0
+Version:	1.0.1
 Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
@@ -77,6 +77,10 @@
 %{_datadir}/doc/%{name}-doc-%{version}/
 
 %changelog
+* Fri Dec 16 2005 - jwboyer at jdub.homelinux.org 1.0.1-1
+- Update to latest release
+- Fixes mpi conflict with mozilla-nss
+
 * Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.0.0-1
 - Update to latest release
 - gmp and gmp-devel are no longer required since meanwhile uses mpi now


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Dec 2005 13:40:20 -0000	1.5
+++ sources	17 Dec 2005 02:57:09 -0000	1.6
@@ -1 +1 @@
-d1b78beabcb0f4255635edf772d63e52  meanwhile-1.0.0.tar.gz
+85587678afdf7bf1f5ea3bdefec093ba  meanwhile-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 17 02:59:00 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 16 Dec 2005 21:59:00 -0500
Subject: rpms/meanwhile/FC-4 .cvsignore, 1.5, 1.6 meanwhile.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200512170259.jBH2xUV4007046@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7024

Modified Files:
	.cvsignore meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Dec 2005 13:42:07 -0000	1.5
+++ .cvsignore	17 Dec 2005 02:58:58 -0000	1.6
@@ -1 +1 @@
-meanwhile-1.0.0.tar.gz
+meanwhile-1.0.1.tar.gz


Index: meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/meanwhile.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- meanwhile.spec	15 Dec 2005 13:42:07 -0000	1.4
+++ meanwhile.spec	17 Dec 2005 02:58:58 -0000	1.5
@@ -6,7 +6,7 @@
 Summary:	Lotus Sametime Community Client library
 License:	LGPL
 Group:		Applications/Internet
-Version:	1.0.0
+Version:	1.0.1
 Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
@@ -77,6 +77,10 @@
 %{_datadir}/doc/%{name}-doc-%{version}/
 
 %changelog
+* Fri Dec 16 2005 - jwboyer at jdub.homelinux.org 1.0.1-1
+- Update to latest release
+- Fixes mpi conflict with mozilla-nss
+
 * Wed Dec 14 2005 - jwboyer at jdub.homelinux.org 1.0.0-1
 - Update to latest release
 - gmp and gmp-devel are no longer required since meanwhile uses mpi now


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Dec 2005 13:42:07 -0000	1.5
+++ sources	17 Dec 2005 02:58:58 -0000	1.6
@@ -1 +1 @@
-d1b78beabcb0f4255635edf772d63e52  meanwhile-1.0.0.tar.gz
+85587678afdf7bf1f5ea3bdefec093ba  meanwhile-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 17 05:03:40 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 17 Dec 2005 00:03:40 -0500
Subject: owners owners.list,1.459,1.460
Message-ID: <200512170504.jBH54AdA012188@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10578

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -r1.459 -r1.460
--- owners.list	17 Dec 2005 02:12:17 -0000	1.459
+++ owners.list	17 Dec 2005 05:03:29 -0000	1.460
@@ -96,7 +96,6 @@
 Fedora Extras|cgoban|X board for playing go|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
-Fedora Extras|chmlib|Library for dealing with ITSS/CHM format files|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|clamav|End-user tools for the Clam Antivirus scanner|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -158,7 +157,7 @@
 Fedora Extras|drivel|A journal or "blog" client|katzj at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|bescoto at stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|dvdisaster|CD/DVD media data loss/scratch/aging protection|dmitry at butskoy.name|extras-qa at fedoraproject.org|carsten at dvdisaster.de
 Fedora Extras|dxpc|A Differential X Protocol Compressor|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -235,16 +234,17 @@
 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|compton at pcompton.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|galeon|GNOME2 Web browser based on Mozilla|denisleroy at yahoo.com|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|
 Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gcfilms|Movies collections management|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gcl|GNU Common Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gdesklets|Advanced architecture for desktop applets|luya256 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|general|For bugs not specific to any single component.|dkl at redhat.com|extras-qa at fedoraproject.org|
@@ -271,7 +271,7 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 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|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|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|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|
@@ -297,7 +297,7 @@
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-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|gnome-vfsmm26|C++ wrapper for gnome-vfs|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnugo|Text based go program|compton at pcompton.com|extras-qa at fedoraproject.org|
@@ -334,8 +334,8 @@
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -388,7 +388,7 @@
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org|
-Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|inkscape|A vector-based drawing program using SVG|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
@@ -478,15 +478,15 @@
 Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm20|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm24|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm20|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm24|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|libgnomedb|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|libgsf113|GNOME Structured File library 1.13|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libibverbs|A library for direct userspace use of InfiniBand|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libid3tag|ID3 tag manipulation library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -524,7 +524,7 @@
 Fedora Extras|libsexy|Funky fresh graphical widgets for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
-Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++|Typesafe Signal Framework for C++|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org|
@@ -717,7 +717,6 @@
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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|extras-orphan at fedoraproject.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-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
@@ -741,7 +740,6 @@
 Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-DBD-XBase|Perl module for reading and writing the dbf files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-DBSchema|Database-independent schema objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-SearchBuilder|Encapsulate SQL queries and rows in simple perl objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1038,7 +1036,6 @@
 Fedora Extras|R-hdf5|R Interface to the NCSA HDF5 library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|extras-qa at fedoraproject.org|
-Fedora Extras|rlog|Runtime Logging for C++|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|R-mAr|R module to evaluate functions for multivariate AutoRegressive analysis|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|roundup|Simple and flexible issue-tracking system|redhat at flyn.org|extras-qa at fedoraproject.org|
@@ -1136,7 +1133,6 @@
 Fedora Extras|taarich|Display Hebrew date|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
-Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
@@ -1239,29 +1235,19 @@
 Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-appfinder|Appfinder for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-battery-plugin|Battery monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-clipman-plugin|Clipboard manager plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-minicmd-plugin|Mini command-line plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-showdesktop-plugin|Show-Desktop plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-systemload-plugin|Systemload monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-systray|Systray for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-taskbar-plugin|Tasklist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-toys|Small Xfce4 applications|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-trigger-launcher|Trigger launcher for Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-wavelan-plugin|WaveLAN plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-weather-plugin|Weather plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-windowlist-plugin|Windowlist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-xkb-plugin|XKB layout switcher for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xmms-plugin|Control XMMS from the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-plugins|Plugins for multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1308,4 +1294,3 @@
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|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|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
-Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 17 06:10:38 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 17 Dec 2005 01:10:38 -0500
Subject: owners owners.list,1.460,1.461
Message-ID: <200512170611.jBH6B8Mn014060@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14019

Modified Files:
	owners.list 
Log Message:
Restore the broken entries


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -r1.460 -r1.461
--- owners.list	17 Dec 2005 05:03:29 -0000	1.460
+++ owners.list	17 Dec 2005 06:10:35 -0000	1.461
@@ -96,6 +96,7 @@
 Fedora Extras|cgoban|X board for playing go|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
+Fedora Extras|chmlib|Library for dealing with ITSS/CHM format files|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|clamav|End-user tools for the Clam Antivirus scanner|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -157,7 +158,7 @@
 Fedora Extras|drivel|A journal or "blog" client|katzj at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|bescoto at stanford.edu|extras-qa at fedoraproject.org|
+Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|dvdisaster|CD/DVD media data loss/scratch/aging protection|dmitry at butskoy.name|extras-qa at fedoraproject.org|carsten at dvdisaster.de
 Fedora Extras|dxpc|A Differential X Protocol Compressor|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -234,15 +235,15 @@
 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|compton at pcompton.com|extras-qa at fedoraproject.org|
-Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denisleroy at yahoo.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|
 Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gcfilms|Movies collections management|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gcl|GNU Common Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdesklets|Advanced architecture for desktop applets|luya256 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -271,7 +272,7 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 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)|denisleroy at yahoo.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|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|
@@ -297,7 +298,7 @@
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-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|denisleroy at yahoo.com|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|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|compton at pcompton.com|extras-qa at fedoraproject.org|
@@ -334,8 +335,8 @@
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -388,7 +389,7 @@
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org|
-Fedora Extras|inkscape|A vector-based drawing program using SVG|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
@@ -478,15 +479,15 @@
 Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm20|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm24|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm20|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm24|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libgnomedb|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libgsf113|GNOME Structured File library 1.13|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libibverbs|A library for direct userspace use of InfiniBand|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libid3tag|ID3 tag manipulation library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -524,7 +525,7 @@
 Fedora Extras|libsexy|Funky fresh graphical widgets for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
-Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++|Typesafe Signal Framework for C++|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org|
@@ -717,6 +718,7 @@
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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|extras-orphan at fedoraproject.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-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
@@ -740,6 +742,7 @@
 Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-DBD-XBase|Perl module for reading and writing the dbf files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-DBSchema|Database-independent schema objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-SearchBuilder|Encapsulate SQL queries and rows in simple perl objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1036,6 +1039,7 @@
 Fedora Extras|R-hdf5|R Interface to the NCSA HDF5 library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|extras-qa at fedoraproject.org|
+Fedora Extras|rlog|Runtime Logging for C++|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|R-mAr|R module to evaluate functions for multivariate AutoRegressive analysis|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|roundup|Simple and flexible issue-tracking system|redhat at flyn.org|extras-qa at fedoraproject.org|
@@ -1133,6 +1137,7 @@
 Fedora Extras|taarich|Display Hebrew date|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
@@ -1235,19 +1240,29 @@
 Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-appfinder|Appfinder for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-battery-plugin|Battery monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-clipman-plugin|Clipboard manager plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-minicmd-plugin|Mini command-line plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-showdesktop-plugin|Show-Desktop plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-systemload-plugin|Systemload monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-systray|Systray for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-taskbar-plugin|Tasklist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-toys|Small Xfce4 applications|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-trigger-launcher|Trigger launcher for Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-wavelan-plugin|WaveLAN plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-weather-plugin|Weather plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-windowlist-plugin|Windowlist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-xkb-plugin|XKB layout switcher for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xmms-plugin|Control XMMS from the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-plugins|Plugins for multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1294,3 +1309,4 @@
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|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|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
+Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 17 08:21:52 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:21:52 -0500
Subject: rpms/fuse-encfs - New directory
Message-ID: <200512170821.jBH8LqfH017710@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-encfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17701/fuse-encfs

Log Message:
Directory /cvs/extras/rpms/fuse-encfs added to the repository




From fedora-extras-commits at redhat.com  Sat Dec 17 08:21:58 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:21:58 -0500
Subject: rpms/fuse-encfs/devel - New directory
Message-ID: <200512170821.jBH8LwU7017726@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-encfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17701/fuse-encfs/devel

Log Message:
Directory /cvs/extras/rpms/fuse-encfs/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Dec 17 08:22:18 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:22:18 -0500
Subject: rpms/fuse-encfs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512170822.jBH8MIwb017762@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-encfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17748

Added Files:
	Makefile import.log 
Log Message:
Setup of module fuse-encfs


--- NEW FILE Makefile ---
# Top level Makefile for module fuse-encfs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 17 08:22:24 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:22:24 -0500
Subject: rpms/fuse-encfs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512170822.jBH8MOBD017782@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-encfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17748/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fuse-encfs


--- NEW 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 Dec 17 08:23:54 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:23:54 -0500
Subject: rpms/fuse-encfs import.log,1.1,1.2
Message-ID: <200512170824.jBH8OOVT017856@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-encfs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17819

Modified Files:
	import.log 
Log Message:
auto-import fuse-encfs-1.2.5-1 on branch devel from fuse-encfs-1.2.5-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse-encfs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Dec 2005 08:22:16 -0000	1.1
+++ import.log	17 Dec 2005 08:23:52 -0000	1.2
@@ -0,0 +1 @@
+fuse-encfs-1_2_5-1:HEAD:fuse-encfs-1.2.5-1.src.rpm:1134807820



From fedora-extras-commits at redhat.com  Sat Dec 17 08:24:00 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:24:00 -0500
Subject: rpms/fuse-encfs/devel fuse-encfs.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512170824.jBH8O0Tu017849@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-encfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17819/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fuse-encfs.spec 
Log Message:
auto-import fuse-encfs-1.2.5-1 on branch devel from fuse-encfs-1.2.5-1.src.rpm


--- NEW FILE fuse-encfs.spec ---
Name: 		fuse-encfs
Version: 	1.2.5
Release: 	1
Summary: 	Encrypted pass-thru filesystem in userspace 	
License: 	GPL
Group: 		System Environment/Kernel
Url: 		http://arg0.net/wiki/encfs
Source: 	http://arg0.net/vgough/download/encfs-%{version}-1.tgz
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: 	rlog-devel >= 1.3
BuildRequires: 	openssl-devel
BuildRequires: 	fuse-devel >= 2.2

%description
EncFS implements an encrypted filesystem in userspace using FUSE.  FUSE
provides a Linux kernel module which allows virtual filesystems to be written
in userspace.  EncFS encrypts all data and filenames in the filesystem and
passes access through to the underlying filesystem.  Similar to CFS except that
it does not use NFS. 

%prep
%setup -q -n encfs-%{version}

%build
%configure --disable-static
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%makeinstall
%{__rm} -f %{buildroot}/%{_libdir}/*.la

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog README
%{_bindir}/*
%{_libdir}/libencfs.so*
%{_datadir}/locale/*/LC_MESSAGES/encfs.mo
%{_mandir}/man1/*

%changelog
* Fri Dec 16 2005 Peter Lemenkov  1.2.5-1
- Initial build for FE
* Fri Nov 11 2005 Valient Gough 
- Release 1.2.5
- Fix race condition when using newer versions of GCC.  Fixes problem reported
  by Chris at x.nu.
- add encfssh script, thanks to David Rosenstrauch
* Fri Aug 26 2005 Valient Gough 
- Release 1.2.4
- fix segfault if small invalid filenames were encountered in the encrypted
  directory, reported by paulgfx.
- try and detect if user tries to mount the filesystem over the top of the
  encrypted directory, problem reported by paulgfx.
- environment variable ENCFS5_CONFIG can be used to override the location of
  the .encfs5 configuration file.
- add encfsctl 'export' command, patch from Janne Hellsten
  
* Tue Apr 19 2005 Valient Gough 
- Release 1.2.1
- add --public mount option
- add --stdinpass option to read password from stdin for scripting
- import latest rosetta translation updates

* Thu Feb 10 2005 Valient Gough 
- Release 1.2.0
- Fix bug with MAC headers and files > 2GB, reported by Damian Frank
- Fix bug with external password interface which could result in problems
  communicating with external password program.  Found by Olivier Dournaux.
- Switch to FUSE 2.2 API -- support for FUSE 1.x has been dropped.
- Add support for inode numbering pass-thru (when used 'use_ino' option to
  fuse).  This allows encoded filesystem to use the same inode numbers as the
  underlying filesystem.

* Wed Jan 12 2005 Valient Gough 
- Release 1.1.11
- add internationalization support.  Thanks to lots of contributors, there are
  translations for serveral languages.
- added workaround for libfuse mount failure with FUSE 1.4
- fix compile failure with FUSE 1.4

* Mon Nov 8 2004 Valient Gough 
- Release 1.1.10
- fix problems with recursive rename
- fix incorrect error codes from xattr functions

* Tue Aug 15 2004 Valient Gough 
- Release 1.1.9
- fix another rename bug (affected filesystems with 'paranoia' configuration)

* Mon Aug 14 2004 Valient Gough 
- Release 1.1.8
- Improve MAC block header processing.

* Sat Aug 12 2004 Valient Gough 
- Release 1.1.7
- fix bug in truncate() for unopened files.

* Mon Aug 9 2004 Valient Gough 
- Release 1.1.6
- fix header IV creation when truncate() used to create files.
- add support for IV chaining to old 0.x filesystem support code (useful for
  systems with old OpenSSL, like RedHat 7.x).

* Tue Jul 22 2004 Valient Gough 
- Release 1.1.5

* Sat Jul 10 2004 Valient Gough 
- Release 1.1.4
- add external password prompt support.

* Thu Jun 24 2004 Valient Gough 
- Release 1.1.3

* Fri May 28 2004 Valient Gough 
- Release 1.1.2
- Fix bug affecting filesystems with small empty directories (like XFS)
- Updates to recursive rename code to undo all changes on failure.
- Fix OpenSSL dependency path inclusion in build.

* Wed May 19 2004 Valient Gough 
- Release 1.1.1
- Fix MAC header memory size allocation error.
- Add file rename-while-open support needed for Evolution.

* Thu May 13 2004 Valient Gough 
- Second release candidate for version 1.1
- Add support for block mode filename encryption.
- Add support for per-file initialization vectors.
- Add support for directory IV chaining for per-directory initialization
  vectors.
- Add support for per-block MAC headers for file contents.
- Backward compatibility support dropped for filesystems created by version
  0.x.  Maintains backward compatible support for versions 1.0.x.

* Sun Apr 4 2004 Valient Gough 
- Release 1.0.5
- Allow truncate call to extend file (only shrinking was supported)

* Fri Mar 26 2004 Valient Gough 
- Release 1.0.4
- Large speed improvement.
- Add support for FUSE major version 2 API.

* Thu Mar 18 2004 Valient Gough 
- Release 1.0.3
- Fix bugs in truncation and padding code.

* Sat Mar 13 2004 Valient Gough 
- Release 1.0.2
- Use pkg-config to check for OpenSSL and RLog build settings
- Add support for '--' argument to encfs to pass arbitrary options to FUSE /
  fusermount.
- Add man pages.

* Tue Mar 2 2004 Valient Gough 
- Release 1.0.1
- Fix problem with using OpenSSL's EVP_BytesToKey function with variable
  key length ciphers like Blowfish, as it would only generate 128 bit keys.
- Some configure script changes to make it possible to use --with-extra-include
  configure option to pick up any necessary directories for OpenSSL.

* Fri Feb 27 2004 Valient Gough 
- Release 1.0
- Added some pre-defined configuration options at startup to make filesystem
  creation a bit more user friendly.

* Mon Feb 23 2004 Valient Gough 
- Merge development branch to mainline.  Source modularized to make it easier
  to support different algorithms.
- Added encfsctl program which can show information about an encrypted
  directory and can change the user password used to store the volume key.
- Added support for AES and BlowFish with user specified keys and block sizes
  (when building with OpenSSL >= 0.9.7).
- Backward compatible with old format, but new filesystems store configuration
  information in a new format which is not readable by old encfs versions.

* Sat Feb 7 2004 Valient Gough 
- Improved performance by fixing cache bug which caused cached data to not be
  used as often as it could have been.  Random seek performance improved by
  600% according to Bonnie++ benchmark.
- Fixed bugs preventing files larger then 2GB.  Limit should now be around
  128GB (untested - I don't have that much drive space).  > 2GB also requires
  recent version of FUSE module (from Feb 6 or later) and an underlying
  filesystem which supports large files.
- Release 0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse-encfs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Dec 2005 08:22:22 -0000	1.1
+++ .cvsignore	17 Dec 2005 08:23:58 -0000	1.2
@@ -0,0 +1 @@
+encfs-1.2.5-1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse-encfs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Dec 2005 08:22:22 -0000	1.1
+++ sources	17 Dec 2005 08:23:58 -0000	1.2
@@ -0,0 +1 @@
+f2d92d1f8e82f72cd0dd4cf9eea736c6  encfs-1.2.5-1.tgz



From fedora-extras-commits at redhat.com  Sat Dec 17 08:28:21 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:28:21 -0500
Subject: owners owners.list,1.461,1.462
Message-ID: <200512170828.jBH8SpXE017923@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17905

Modified Files:
	owners.list 
Log Message:

Added fuse-encfs




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -r1.461 -r1.462
--- owners.list	17 Dec 2005 06:10:35 -0000	1.461
+++ owners.list	17 Dec 2005 08:28:19 -0000	1.462
@@ -223,6 +223,7 @@
 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|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|fwbuilder|Firewall Builder|sgrubb at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 17 08:31:43 2005
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 17 Dec 2005 03:31:43 -0500
Subject: rpms/fuse-encfs/devel fuse-encfs.spec,1.1,1.2
Message-ID: <200512170832.jBH8WDgJ017954@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse-encfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17934

Modified Files:
	fuse-encfs.spec 
Log Message:

Added missing dist-tag. Small cleanup (added space between last changelog 
entry and all others entries).




Index: fuse-encfs.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse-encfs/devel/fuse-encfs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fuse-encfs.spec	17 Dec 2005 08:23:58 -0000	1.1
+++ fuse-encfs.spec	17 Dec 2005 08:31:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		fuse-encfs
 Version: 	1.2.5
-Release: 	1
+Release: 	1%{?dist}
 Summary: 	Encrypted pass-thru filesystem in userspace 	
 License: 	GPL
 Group: 		System Environment/Kernel
@@ -48,6 +48,7 @@
 %changelog
 * Fri Dec 16 2005 Peter Lemenkov  1.2.5-1
 - Initial build for FE
+
 * Fri Nov 11 2005 Valient Gough 
 - Release 1.2.5
 - Fix race condition when using newer versions of GCC.  Fixes problem reported



From fedora-extras-commits at redhat.com  Sat Dec 17 09:24:19 2005
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 17 Dec 2005 04:24:19 -0500
Subject: owners owners.list,1.462,1.463
Message-ID: <200512170924.jBH9OnIs020220@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20202

Modified Files:
	owners.list 
Log Message:
directfb back to thomas at apestaart.org


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -r1.462 -r1.463
--- owners.list	17 Dec 2005 08:28:19 -0000	1.462
+++ owners.list	17 Dec 2005 09:24:17 -0000	1.463
@@ -148,7 +148,7 @@
 Fedora Extras|digikamimageplugins|Plugins for Digikam|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|dillo|Very small and fast GUI web browser|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|diradmin|User control management tool for LDAP directories|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|djvulibre|DjVu viewers, encoders and utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|dkms|Dynamic Kernel Module Support (DKMS) method for installing module RPMS|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|tcallawa at redhat.com,gary_lerhaupt at dell.com
 Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 17 10:16:20 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 17 Dec 2005 05:16:20 -0500
Subject: rpms/scim-skk/FC-4 .cvsignore, 1.4, 1.5 scim-skk.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200512171016.jBHAGo99022011@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21987

Modified Files:
	.cvsignore scim-skk.spec sources 
Log Message:
update to 0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Dec 2005 14:54:50 -0000	1.4
+++ .cvsignore	17 Dec 2005 10:16:18 -0000	1.5
@@ -1 +1 @@
-scim-skk-0.5.0.tar.gz
+scim-skk-0.5.1.tar.gz


Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scim-skk.spec	2 Dec 2005 14:54:50 -0000	1.7
+++ scim-skk.spec	17 Dec 2005 10:16:18 -0000	1.8
@@ -1,5 +1,5 @@
-Name:		scim-skk
-Version:	0.5.0
+Name:	    scim-skk
+Version:	0.5.1
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -50,7 +50,10 @@
 
 
 %changelog
-* Fri Dec 2 2005 Ryo Dairiki  - 0.4.0-1
+* Sat Dec 17 2005 Ryo Dairiki  - 0.5.1-1
+- update to 0.5.1
+
+* Fri Dec 2 2005 Ryo Dairiki  - 0.5.0-1
 - update to 0.5.0
 
 * Tue Nov 1 2005 Ryo Diairki  - 0.4.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Dec 2005 14:54:50 -0000	1.4
+++ sources	17 Dec 2005 10:16:18 -0000	1.5
@@ -1 +1 @@
-37467db3142c5ae980a1bf67c6f422e9  scim-skk-0.5.0.tar.gz
+b2371a62949667f8f2d92b69a65b213d  scim-skk-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 17 10:17:03 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 17 Dec 2005 05:17:03 -0500
Subject: rpms/scim-skk/devel scim-skk.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <200512171017.jBHAHXjg022066@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22017

Modified Files:
	scim-skk.spec sources 
Log Message:
update to 0.5.1



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scim-skk.spec	2 Dec 2005 14:58:20 -0000	1.7
+++ scim-skk.spec	17 Dec 2005 10:17:01 -0000	1.8
@@ -1,5 +1,5 @@
-Name:		scim-skk
-Version:	0.5.0
+Name:	    scim-skk
+Version:	0.5.1
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -50,7 +50,10 @@
 
 
 %changelog
-* Fri Dec 2 2005 Ryo Dairiki  - 0.4.0-1
+* Sat Dec 17 2005 Ryo Dairiki  - 0.5.1-1
+- update to 0.5.1
+
+* Fri Dec 2 2005 Ryo Dairiki  - 0.5.0-1
 - update to 0.5.0
 
 * Tue Nov 1 2005 Ryo Diairki  - 0.4.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Dec 2005 15:12:19 -0000	1.4
+++ sources	17 Dec 2005 10:17:01 -0000	1.5
@@ -1 +1 @@
-37467db3142c5ae980a1bf67c6f422e9  scim-skk-0.5.0.tar.gz
+b2371a62949667f8f2d92b69a65b213d  scim-skk-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 17 10:19:42 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat, 17 Dec 2005 05:19:42 -0500
Subject: rpms/scim-skk/FC-3 scim-skk.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200512171020.jBHAKCAq022134@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22114

Modified Files:
	scim-skk.spec sources 
Log Message:
update to 0.5.1



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scim-skk.spec	3 Dec 2005 01:02:57 -0000	1.8
+++ scim-skk.spec	17 Dec 2005 10:19:39 -0000	1.9
@@ -1,5 +1,5 @@
-Name:		scim-skk
-Version:	0.5.0
+Name:	    scim-skk
+Version:	0.5.1
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -7,9 +7,10 @@
 License:	GPL
 URL:		http://scim-imengine.sourceforge.jp/
 Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
-Patch0:	gtkComboBox.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:	gtkComboBox.patch
+
 Requires:		scim skkdic
 BuildRequires:	scim-devel
 
@@ -52,7 +53,10 @@
 
 
 %changelog
-* Fri Dec 2 2005 Ryo Dairiki  - 0.4.0-1
+* Sat Dec 17 2005 Ryo Dairiki  - 0.5.1-1
+- update to 0.5.1
+
+* Fri Dec 2 2005 Ryo Dairiki  - 0.5.0-1
 - update to 0.5.0
 - patch for gtk-2.4; There is no gtk_combo_box_get_active_text for gtk-2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Dec 2005 15:15:59 -0000	1.4
+++ sources	17 Dec 2005 10:19:39 -0000	1.5
@@ -1 +1 @@
-37467db3142c5ae980a1bf67c6f422e9  scim-skk-0.5.0.tar.gz
+b2371a62949667f8f2d92b69a65b213d  scim-skk-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 17 10:53:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 17 Dec 2005 05:53:50 -0500
Subject: rpms/perl-Net-IP/devel .cvsignore, 1.6, NONE Makefile, 1.2,
	NONE perl-Net-IP.spec, 1.9, NONE sources, 1.6, NONE
Message-ID: <200512171053.jBHAro2H022491@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Net-IP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22481/devel

Removed Files:
	.cvsignore Makefile perl-Net-IP.spec sources 
Log Message:
Remove devel branch, included in FC5.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-Net-IP.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Dec 17 16:26:25 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 17 Dec 2005 11:26:25 -0500
Subject: owners owners.list,1.463,1.464
Message-ID: <200512171626.jBHGQtWb000723@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv702

Modified Files:
	owners.list 
Log Message:
Changing ownership of perl-Class-ErrorHandler


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -r1.463 -r1.464
--- owners.list	17 Dec 2005 09:24:17 -0000	1.463
+++ owners.list	17 Dec 2005 16:26:23 -0000	1.464
@@ -719,7 +719,7 @@
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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|extras-orphan at fedoraproject.org|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-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



From fedora-extras-commits at redhat.com  Sun Dec 18 01:38:18 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sat, 17 Dec 2005 20:38:18 -0500
Subject: rpms/glibmm24/devel .cvsignore, 1.5, 1.6 glibmm.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200512180138.jBI1cmbO016640@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glibmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16618

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to 2.8.3, fixed g++ 4.1 compile.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Nov 2005 09:16:53 -0000	1.5
+++ .cvsignore	18 Dec 2005 01:38:16 -0000	1.6
@@ -1 +1 @@
-glibmm-2.8.2.tar.bz2
+glibmm-2.8.3.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- glibmm.spec	26 Nov 2005 09:16:53 -0000	1.8
+++ glibmm.spec	18 Dec 2005 01:38:16 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           glibmm24
-Version:        2.8.2
+Version:        2.8.3
 Release:        1
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -76,6 +76,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Sat Dec 17 2005 Denis Leroy  - 2.8.3-1
+- Update to 2.8.3
+
 * Fri Nov 25 2005 Denis Leroy  - 2.8.2-1
 - Update to 2.8.2
 - Disabled static libraries


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glibmm24/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Nov 2005 09:16:53 -0000	1.6
+++ sources	18 Dec 2005 01:38:16 -0000	1.7
@@ -1 +1 @@
-063102917d424b420725586efb62491b  glibmm-2.8.2.tar.bz2
+6a915615fb1158a2d761d5777dcd16dc  glibmm-2.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 18 03:00:17 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sat, 17 Dec 2005 22:00:17 -0500
Subject: rpms/inkscape/devel inkscape-0.43-null-conversion.patch, NONE,
	1.1 inkscape-0.43-qualification.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 inkscape.spec, 1.23, 1.24 sources, 1.7,
	1.8 inkscape-0.42-gettext-x86_64.patch, 1.1, NONE
Message-ID: <200512180300.jBI30HuC018583@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/inkscape/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18562

Modified Files:
	.cvsignore inkscape.spec sources 
Added Files:
	inkscape-0.43-null-conversion.patch 
	inkscape-0.43-qualification.patch 
Removed Files:
	inkscape-0.42-gettext-x86_64.patch 
Log Message:
- Update to 0.43
- Added 2 patches to fix g++ 4.1 compilation issues
- Enabled new jabber/loudmouth-based inkboard feature


inkscape-0.43-null-conversion.patch:

--- NEW FILE inkscape-0.43-null-conversion.patch ---
--- src/ui/dialog/align-and-distribute.cpp
+++ src/ui/dialog/align-and-distribute.cpp
@@ -955,7 +955,7 @@
         break;
 
     } // end of switch statement
-    return NULL;
+    return (std::list::iterator)NULL;
 }
 
 AlignAndDistribute::AlignTarget AlignAndDistribute::getAlignTarget()const {

inkscape-0.43-qualification.patch:

--- NEW FILE inkscape-0.43-qualification.patch ---
--- src/dialogs/tiledialog.h
+++ src/dialogs/tiledialog.h
@@ -58,7 +58,7 @@
     /**
      * Respond to selection change
      */
-    void TileDialog::updateSelection();
+    void updateSelection();
 
 
     /**
--- src/extension/internal/ps.h
+++ src/extension/internal/ps.h
@@ -36,10 +36,10 @@
 
 	void print_bpath (SVGOStringStream &os, const NArtBpath *bp);
 
-	void PrintPS::print_fill_style (SVGOStringStream &os, const SPStyle *style, const NRRect *pbox);
-	void PrintPS::print_stroke_style (SVGOStringStream &os, const SPStyle *style);
+	void print_fill_style (SVGOStringStream &os, const SPStyle *style, const NRRect *pbox);
+	void print_stroke_style (SVGOStringStream &os, const SPStyle *style);
 
-	const char* PrintPS::PSFontName (const SPStyle *style);
+	const char* PSFontName (const SPStyle *style);
 
 	unsigned int print_image (FILE *ofp, guchar *px, unsigned int width, unsigned int height, unsigned int rs,
 				       const NRMatrix *transform);
--- src/jabber_whiteboard/pedroxmpp.cpp
+++ src/jabber_whiteboard/pedroxmpp.cpp
@@ -614,7 +614,7 @@
     static void hash(unsigned char *dataIn,
                      unsigned long len, unsigned char *digest);
 
-    static DOMString Md5::hashHex(unsigned char *dataIn, unsigned long len);
+    static DOMString hashHex(unsigned char *dataIn, unsigned long len);
 
     /**
      *  Initialize the context (also zeroizes contents)
--- src/jabber_whiteboard/pedroxmpp.h
+++ src/jabber_whiteboard/pedroxmpp.h
@@ -746,7 +746,7 @@
      *
      */
     virtual std::vector
-          XmppClient::groupChatGetUserList(const DOMString &groupJid);
+          groupChatGetUserList(const DOMString &groupJid);
 
     /**
      *
--- src/libavoid/connector.h
+++ src/libavoid/connector.h
@@ -59,7 +59,7 @@
         bool isInitialised(void);
         void unInitialise(void);
         void setCallback(void (*cb)(void *), void *ptr);
-        void ConnRef::handleInvalid(void);
+        void handleInvalid(void);
         int generatePath(Point p0, Point p1);
         void makePathInvalid(void);
         
--- src/livarot/Path.h
+++ src/livarot/Path.h
@@ -198,7 +198,7 @@
   cut_position*    CurvilignToPosition(int nbCv,double* cvAbs,int &nbCut);
   cut_position    PointToCurvilignPosition(NR::Point const &pos) const;
   //Should this take a cut_position as a param?
-  double           Path::PositionToLength(int piece, double t);
+  double           PositionToLength(int piece, double t);
   
   // caution: not tested on quadratic b-splines, most certainly buggy
   void             ConvertPositionsToMoveTo(int nbPos,cut_position* poss);
--- src/ui/dialog/aboutbox.h
+++ src/ui/dialog/aboutbox.h
@@ -28,7 +28,7 @@
 class AboutBoxChild: public Gtk::Dialog
 {
 public:
-    AboutBoxChild::AboutBoxChild(Gtk::Window& parent, gchar * title)
+    AboutBoxChild(Gtk::Window& parent, gchar * title)
         : Gtk::Dialog(title,parent) {};
 protected:
     virtual void         on_response(int response_id);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Sep 2005 10:46:13 -0000	1.7
+++ .cvsignore	18 Dec 2005 03:00:15 -0000	1.8
@@ -1,2 +1 @@
-inkscape-0.42.2.tar.bz2
-inkscape-0.42.2.tar.bz2.sig
+inkscape-0.43.tar.bz2


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- inkscape.spec	26 Sep 2005 20:22:14 -0000	1.23
+++ inkscape.spec	18 Dec 2005 03:00:15 -0000	1.24
@@ -1,14 +1,15 @@
 Name:           inkscape
-Version:        0.42.2
-Release:        2%{?dist}
+Version:        0.43
+Release:        1%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://inkscape.sourceforge.net/
 Source0:        http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2
-Patch0:         inkscape-0.42-gettext-x86_64.patch
-Patch1:         inkscape-0.42-GC-check.patch
+Patch0:         inkscape-0.42-GC-check.patch
+Patch1:         inkscape-0.43-null-conversion.patch
+Patch2:         inkscape-0.43-qualification.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  atk-devel
@@ -28,6 +29,7 @@
 BuildRequires:  perl-XML-Parser
 BuildRequires:  pkgconfig
 BuildRequires:  python-devel
+BuildRequires:  loudmouth-devel
 Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -51,19 +53,19 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dgettext
-%patch1 -p1 -b .GC-check
+%patch0 -p1 -b .GC-check
+%patch1 -p0 -b .nullconv
+%patch2 -p0 -b .qualif
 
 
 %build
-%configure                     \
---disable-dependency-tracking  \
---with-xinerama                \
---enable-static=no             \
---with-python                  \
---with-inkjar
-#temporarily disabled until I can look into it further
-#--with-gnome-print             \
+%configure		\
+--enable-static=no	\
+--with-python		\
+--with-perl		\
+--with-inkjar		\
+--with-gnome-vfs	\
+--enable-inkboard
 
 make %{?_smp_mflags}
 
@@ -94,7 +96,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README HACKING
+%doc AUTHORS COPYING ChangeLog NEWS README
 %doc %{_mandir}/man1/*
 %{_bindir}/*
 %{_datadir}/%{name}/
@@ -104,6 +106,11 @@
 
 
 %changelog
+* Sat Dec 17 2005 Denis Leroy  - 0.43-1
+- Update to 0.43
+- Added 2 patches to fix g++ 4.1 compilation issues
+- Enabled new jabber/loudmouth-based inkboard feature
+
 * Mon Sep 26 2005 Denis Leroy  - 0.42.2-2
 - rebuilt with newer glibmm
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Sep 2005 10:46:13 -0000	1.7
+++ sources	18 Dec 2005 03:00:15 -0000	1.8
@@ -1,2 +1 @@
-a27172087018e850e92e97e52b5dad08  inkscape-0.42.2.tar.bz2
-40858e2f3f205525929076c9cb3ea075  inkscape-0.42.2.tar.bz2.sig
+97c606182f5e177eef70c1e8a55efc1f  inkscape-0.43.tar.bz2


--- inkscape-0.42-gettext-x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Dec 18 03:16:39 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 17 Dec 2005 22:16:39 -0500
Subject: rpms/qps/devel qps-1.9.11.gcc41.patch,NONE,1.1 qps.spec,1.2,1.3
Message-ID: <200512180317.jBI3HAK9020273@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/qps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20252

Modified Files:
	qps.spec 
Added Files:
	qps-1.9.11.gcc41.patch 
Log Message:
Fix compilation with GCC 4.1 and add COPYING file.


qps-1.9.11.gcc41.patch:

--- NEW FILE qps-1.9.11.gcc41.patch ---
diff -Nurp qps-1.9.11.orig/htable.h qps-1.9.11/htable.h
--- qps-1.9.11.orig/htable.h	2005-11-12 07:32:30.000000000 +0100
+++ qps-1.9.11/htable.h	2005-12-18 03:43:55.000000000 +0100
@@ -76,7 +76,7 @@ class TableBody : public QtTableView
     Q_OBJECT
 public:
     TableBody(HeadedTable *parent = 0);
-    void TableBody::drawGhostCol(int x, int w);
+    void drawGhostCol(int x, int w);
 //DEL	void setProcview(Procview *p) { procview = p ; }
 
 protected slots:
diff -Nurp qps-1.9.11.orig/infobar.h qps-1.9.11/infobar.h
--- qps-1.9.11.orig/infobar.h	2005-05-07 12:51:42.000000000 +0200
+++ qps-1.9.11/infobar.h	2005-12-18 03:44:35.000000000 +0100
@@ -85,7 +85,7 @@ class CpuLabel : public QFrame
 {
     Q_OBJECT
 public:
-    CpuLabel::CpuLabel(QWidget *parent, int cpus);
+    CpuLabel(QWidget *parent, int cpus);
 
     void setValue(int cpu, int field, unsigned long value)
         { values(cpu, field) = value; }
diff -Nurp qps-1.9.11.orig/qps.h qps-1.9.11/qps.h
--- qps-1.9.11.orig/qps.h	2005-11-12 07:32:30.000000000 +0100
+++ qps-1.9.11/qps.h	2005-12-18 03:45:24.000000000 +0100
@@ -34,7 +34,7 @@ class ControlBar : public QFrame
 {
 	Q_OBJECT
 	public:
-		ControlBar::ControlBar(QWidget *parent);
+		ControlBar(QWidget *parent);
 		QPushButton *updateButton() { return b_update; }
 		void setMode(bool treemode);
 	
@@ -60,7 +60,7 @@ class StatusBar : public QStatusBar
 {
 	Q_OBJECT
 	public:
-		StatusBar::StatusBar(QWidget *parent);
+		StatusBar(QWidget *parent);
     		void refresh();
     		void update(int n);
 


Index: qps.spec
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/qps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qps.spec	12 Nov 2005 11:06:54 -0000	1.2
+++ qps.spec	18 Dec 2005 03:16:37 -0000	1.3
@@ -1,13 +1,14 @@
 Name:           qps
 Version:        1.9.11
-Release:        1%{?dist}
+Release:        2.1%{?dist}
 Summary:        Visual process status monitor
 
 Group:          Applications/System
 License:        GPL
 URL:            http://qps.kldp.net/
-Source0:        http://kldp.net/frs/download.php/2930/qps-1.9.11.tar.gz
+Source0:        http://kldp.net/frs/download.php/2935/qps-1.9.11-2.tar.gz
 Source1:        qps.desktop
+Patch0:         qps-1.9.11.gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -46,7 +48,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES
+%doc CHANGES COPYING
 %{_bindir}/qps
 %{_datadir}/applications/*qps.desktop
 %{_datadir}/pixmaps/qps.xpm
@@ -54,6 +56,14 @@
 
 
 %changelog
+* Sun Dec 18 2005 Dawid Gajownik  - 1.9.11-2.1
+- Fix compilation with GCC 4.1
+- Use funny release tag because tarball name contains `-' character
+- Add COPYING file
+
+* Sat Nov 12 2005 Dawid Gajownik  - 1.9.11-2
+- Increase release tag (always do `cvs ci' before `make tag' ;) )
+
 * Sat Nov 12 2005 Dawid Gajownik  - 1.9.11-1
 - Update to 1.9.11.
 



From fedora-extras-commits at redhat.com  Sun Dec 18 03:23:11 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 17 Dec 2005 22:23:11 -0500
Subject: rpms/qps/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200512180323.jBI3NgMn020416@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/qps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20368

Modified Files:
	.cvsignore sources 
Log Message:
New release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Nov 2005 11:06:53 -0000	1.3
+++ .cvsignore	18 Dec 2005 03:23:09 -0000	1.4
@@ -1 +1 @@
-qps-1.9.11.tar.gz
+qps-1.9.11-2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Nov 2005 11:06:54 -0000	1.3
+++ sources	18 Dec 2005 03:23:09 -0000	1.4
@@ -1 +1 @@
-c094cd755ebe5f1c923f5ede5e96affc  qps-1.9.11.tar.gz
+6cfb346a51a8dd8cff62cac754387d93  qps-1.9.11-2.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 18 06:15:37 2005
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Sun, 18 Dec 2005 01:15:37 -0500
Subject: rpms/monotone/devel monotone-0.24-gcc41.patch, NONE,
	1.1 monotone.spec, 1.7, 1.8
Message-ID: <200512180616.jBI6G7P6025687@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25666

Modified Files:
	monotone.spec 
Added Files:
	monotone-0.24-gcc41.patch 
Log Message:
Patched to work with gcc 4.1.

monotone-0.24-gcc41.patch:

--- NEW FILE monotone-0.24-gcc41.patch ---
2005-12-17  Roland McGrath  

	* work.hh (struct file_itemizer): Remove extraneous qualifier on
	visit_file declaration.
	* app_state.hh (class app_state): Remove extraneous qualifier on
	set_restriction declaration.

--- monotone-0.24/app_state.hh
+++ monotone-0.24/app_state.hh
@@ -88,9 +88,9 @@ public:
   void require_working_copy(std::string const & explanation = "");
   void create_working_copy(system_path const & dir);
 
-  void app_state::set_restriction(path_set const & valid_paths, 
-                             std::vector const & paths,
-                             bool respect_ignore = true);
+  void set_restriction(path_set const & valid_paths,
+		       std::vector const & paths,
+		       bool respect_ignore = true);
   bool restriction_includes(file_path const & path);
 
   // Set the branch name.  If you only invoke set_branch, the branch
--- monotone-0.24/work.hh
+++ monotone-0.24/work.hh
@@ -56,7 +56,7 @@ struct file_itemizer : public tree_walke
   path_set & ignored;
   file_itemizer(app_state & a, path_set & k, path_set & u, path_set & i) 
     : app(a), known(k), unknown(u), ignored(i) {}
-  virtual void file_itemizer::visit_file(file_path const & path);
+  virtual void visit_file(file_path const & path);
 };
 
 void 


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- monotone.spec	13 Dec 2005 07:35:07 -0000	1.7
+++ monotone.spec	18 Dec 2005 06:15:35 -0000	1.8
@@ -1,6 +1,6 @@
 Name: monotone
 Version: 0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -12,6 +12,8 @@
 Source2: monotone.sysconfig
 Source3: README.monotone-server
 
+Patch1: monotone-0.24-gcc41.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
@@ -59,6 +61,8 @@
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
 	   --with-bundled-sqlite=%{bundled_sqlite}
@@ -162,6 +166,9 @@
 
 
 %changelog
+* Sat Dec 17 2005 Roland McGrath  - 0.24-2
+- Patched to work with gcc 4.1.
+
 * Sun Dec 11 2005 Roland McGrath  - 0.24-1
 - Updated for 0.24 release.
 



From fedora-extras-commits at redhat.com  Sun Dec 18 09:10:58 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 04:10:58 -0500
Subject: rpms/inkscape/FC-3 .cvsignore, 1.6, 1.7 inkscape.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200512180911.jBI9BZeM031239@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/inkscape/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31215

Modified Files:
	.cvsignore inkscape.spec sources 
Log Message:
Update to 0.43


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jul 2005 13:51:35 -0000	1.6
+++ .cvsignore	18 Dec 2005 09:10:54 -0000	1.7
@@ -1,2 +1 @@
-inkscape-0.42.tar.bz2
-inkscape-0.42.tar.bz2.sig
+inkscape-0.43.tar.bz2


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-3/inkscape.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- inkscape.spec	29 Jul 2005 13:51:35 -0000	1.6
+++ inkscape.spec	18 Dec 2005 09:10:54 -0000	1.7
@@ -1,13 +1,12 @@
 Name:           inkscape
-Version:        0.42
-Release:        2%{?dist}
+Version:        0.43
+Release:        1%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://inkscape.sourceforge.net/
 Source0:        http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2
-Patch0:         inkscape-0.42-gettext-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  atk-devel
@@ -50,7 +49,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dgettext
 
 
 %build
@@ -92,7 +90,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README HACKING
+%doc AUTHORS COPYING ChangeLog NEWS README
 %doc %{_mandir}/man1/*
 %{_bindir}/*
 %{_datadir}/%{name}/
@@ -102,6 +100,10 @@
 
 
 %changelog
+* Sat Dec 17 2005 Denis Leroy  - 0.43-1
+- Update to 0.43
+- Remove obsolete x86_64 patch
+
 * Fri Jul 29 2005 Michael Schwendt  - 0.42-2
 - Extend ngettext/dgettext patch for x86_64 build.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jul 2005 13:51:35 -0000	1.6
+++ sources	18 Dec 2005 09:10:54 -0000	1.7
@@ -1,2 +1 @@
-4af587b942647bf9e27861e2238844c8  inkscape-0.42.tar.bz2
-e0a299ff70044fd9a424961bd3ad8c13  inkscape-0.42.tar.bz2.sig
+97c606182f5e177eef70c1e8a55efc1f  inkscape-0.43.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 18 10:10:52 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sun, 18 Dec 2005 05:10:52 -0500
Subject: rpms/gdesklets/devel gdesklets.spec,1.2,1.3
Message-ID: <200512181011.jBIABNqN004288@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4267

Modified Files:
	gdesklets.spec 
Log Message:

updated spec



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdesklets.spec	14 Dec 2005 09:51:47 -0000	1.2
+++ gdesklets.spec	18 Dec 2005 10:10:50 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.2
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -18,7 +18,7 @@
 #							    #
 #############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0
+BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0, libXau-devel
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
@@ -99,7 +99,11 @@
 
 
 %changelog
-* Wed Dec 14 2005 Luya Tshimbalanga  - 0.35.2-22
+* Sun Dec 18 2005 Luya Tshimbalanga  - 0.35.2-23.fc5
+- Added libXau on BuildRequires
+
+* Wed Dec 14 2005 Luya Tshimbalanga
+  - 0.35.2-22
 - Added desktop-file-utils for build requirement
 - Clean up
 



From fedora-extras-commits at redhat.com  Sun Dec 18 10:32:13 2005
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sun, 18 Dec 2005 05:32:13 -0500
Subject: rpms/gdesklets/devel gdesklets.spec,1.3,1.4
Message-ID: <200512181032.jBIAWhWQ004452@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4434

Modified Files:
	gdesklets.spec 
Log Message:

spec updated: added libXdmcp-devel to support modular X



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdesklets.spec	18 Dec 2005 10:10:50 -0000	1.3
+++ gdesklets.spec	18 Dec 2005 10:32:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.2
-Release:        23%{?dist}
+Release:        24%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -15,11 +15,13 @@
 #############################################################
 #							    #
 # Starting from 0.35.x, gDesklets no longer requires GConf. #
+# Added some X development package to support modular X     #
 #							    #
 #############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0, libXau-devel
+BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
+BuildRequires: libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -100,7 +102,10 @@
 
 %changelog
 * Sun Dec 18 2005 Luya Tshimbalanga  - 0.35.2-23.fc5
-- Added libXau on BuildRequires
+- Added libXdmcp-devel on BuildRequires
+
+* Sun Dec 18 2005 Luya Tshimbalanga  - 0.35.2-23.fc5
+- Added libXau-devel on BuildRequires
 
 * Wed Dec 14 2005 Luya Tshimbalanga
   - 0.35.2-22



From fedora-extras-commits at redhat.com  Sun Dec 18 16:25:06 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 18 Dec 2005 11:25:06 -0500
Subject: rpms/jpgraph/FC-4 .cvsignore, 1.4, 1.5 jpgraph.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512181625.jBIGPa2v014989@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/jpgraph/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14948/FC-4

Modified Files:
	.cvsignore jpgraph.spec sources 
Log Message:
- version 2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jpgraph/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Aug 2005 10:04:45 -0000	1.4
+++ .cvsignore	18 Dec 2005 16:25:04 -0000	1.5
@@ -1 +1 @@
-jpgraph-1.19.tar.gz
+jpgraph-2.0.tar.gz


Index: jpgraph.spec
===================================================================
RCS file: /cvs/extras/rpms/jpgraph/FC-4/jpgraph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jpgraph.spec	23 Aug 2005 10:04:51 -0000	1.6
+++ jpgraph.spec	18 Dec 2005 16:25:04 -0000	1.7
@@ -1,9 +1,9 @@
 Name:           jpgraph
 Summary:        Object oriented graph drawing class library for PHP
-Version:        1.19
+Version:        2.0
 Release:        1%{?dist}
 
-Source0:        http://members.chello.se/jpgraph/jpgdownloads/jpgraph-1.19.tar.gz
+Source0:        http://members.chello.se/jpgraph/jpgdownloads/jpgraph-2.0.tar.gz
 License:        QPL
 URL:            http://www.aditus.nu/jpgraph/
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 %doc docs/* src/Examples
 
 %changelog
+* Sun Dec 18 2005 Aurelien Bompard  2.0-1
+- version 2.0
+
 * Tue Aug 09 2005 Aurelien Bompard  1.19-1
 - version 1.19
 - fix requires


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jpgraph/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Aug 2005 10:04:51 -0000	1.4
+++ sources	18 Dec 2005 16:25:04 -0000	1.5
@@ -1 +1 @@
-fc364e1b56dea32bdace47411085cd72  jpgraph-1.19.tar.gz
+343c355a5c50cdbae49706cba20083ea  jpgraph-2.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 18 16:25:13 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 18 Dec 2005 11:25:13 -0500
Subject: rpms/jpgraph/devel .cvsignore, 1.4, 1.5 jpgraph.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512181625.jBIGPhDG014994@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/jpgraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14948/devel

Modified Files:
	.cvsignore jpgraph.spec sources 
Log Message:
- version 2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jpgraph/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Aug 2005 10:04:52 -0000	1.4
+++ .cvsignore	18 Dec 2005 16:25:10 -0000	1.5
@@ -1 +1 @@
-jpgraph-1.19.tar.gz
+jpgraph-2.0.tar.gz


Index: jpgraph.spec
===================================================================
RCS file: /cvs/extras/rpms/jpgraph/devel/jpgraph.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jpgraph.spec	23 Aug 2005 10:04:52 -0000	1.6
+++ jpgraph.spec	18 Dec 2005 16:25:10 -0000	1.7
@@ -1,9 +1,9 @@
 Name:           jpgraph
 Summary:        Object oriented graph drawing class library for PHP
-Version:        1.19
+Version:        2.0
 Release:        1%{?dist}
 
-Source0:        http://members.chello.se/jpgraph/jpgdownloads/jpgraph-1.19.tar.gz
+Source0:        http://members.chello.se/jpgraph/jpgdownloads/jpgraph-2.0.tar.gz
 License:        QPL
 URL:            http://www.aditus.nu/jpgraph/
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 %doc docs/* src/Examples
 
 %changelog
+* Sun Dec 18 2005 Aurelien Bompard  2.0-1
+- version 2.0
+
 * Tue Aug 09 2005 Aurelien Bompard  1.19-1
 - version 1.19
 - fix requires


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jpgraph/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Aug 2005 10:04:52 -0000	1.4
+++ sources	18 Dec 2005 16:25:10 -0000	1.5
@@ -1 +1 @@
-fc364e1b56dea32bdace47411085cd72  jpgraph-1.19.tar.gz
+343c355a5c50cdbae49706cba20083ea  jpgraph-2.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Dec 18 18:13:41 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:13:41 -0500
Subject: rpms/xmlrpc-c - New directory
Message-ID: <200512181813.jBIIDfbb018561@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/xmlrpc-c

Log Message:
Directory /cvs/extras/rpms/xmlrpc-c added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 18 18:13:46 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:13:46 -0500
Subject: rpms/xmlrpc-c/devel - New directory
Message-ID: <200512181813.jBIIDkMI018577@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18552/xmlrpc-c/devel

Log Message:
Directory /cvs/extras/rpms/xmlrpc-c/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 18 18:14:08 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:14:08 -0500
Subject: rpms/xmlrpc-c Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512181814.jBIIE8nZ018612@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18599

Added Files:
	Makefile import.log 
Log Message:
Setup of module xmlrpc-c


--- NEW FILE Makefile ---
# Top level Makefile for module xmlrpc-c
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 18 18:14:14 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:14:14 -0500
Subject: rpms/xmlrpc-c/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512181814.jBIIEEsO018631@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18599/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xmlrpc-c


--- NEW 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 Dec 18 18:15:58 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:15:58 -0500
Subject: rpms/xmlrpc-c import.log,1.1,1.2
Message-ID: <200512181816.jBIIGSSQ018720@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18677

Modified Files:
	import.log 
Log Message:
auto-import xmlrpc-c-1.04-1 on branch devel from xmlrpc-c-1.04-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Dec 2005 18:14:06 -0000	1.1
+++ import.log	18 Dec 2005 18:15:56 -0000	1.2
@@ -0,0 +1 @@
+xmlrpc-c-1_04-1:HEAD:xmlrpc-c-1.04-1.src.rpm:1134929746



From fedora-extras-commits at redhat.com  Sun Dec 18 18:16:04 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:16:04 -0500
Subject: rpms/xmlrpc-c/devel xmlrpc-c-1.04-libxml2.patch, NONE,
	1.1 xmlrpc-c-1.04-namespace.patch, NONE, 1.1 xmlrpc-c.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512181816.jBIIG40B018713@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18677/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xmlrpc-c-1.04-libxml2.patch xmlrpc-c-1.04-namespace.patch 
	xmlrpc-c.spec 
Log Message:
auto-import xmlrpc-c-1.04-1 on branch devel from xmlrpc-c-1.04-1.src.rpm

xmlrpc-c-1.04-libxml2.patch:

--- NEW FILE xmlrpc-c-1.04-libxml2.patch ---
--- xmlrpc-c-1.04/src/xmlrpc_libxml2.c.builderr	2005-12-12 10:05:46.000000000 +0100
+++ xmlrpc-c-1.04/src/xmlrpc_libxml2.c	2005-12-12 10:11:57.000000000 +0100
@@ -147,7 +147,7 @@
 **  documentation on each function works.
 */
 
-char *xml_element_name (xml_element *elem)
+char const *xml_element_name (xml_element const * const elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return elem->_name;
@@ -167,13 +167,13 @@
     return XMLRPC_TYPED_MEM_BLOCK_CONTENTS(char, &elem->_cdata);
 }
 
-size_t xml_element_children_size (xml_element *elem)
+size_t xml_element_children_size (xml_element const *elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return XMLRPC_TYPED_MEM_BLOCK_SIZE(xml_element*, &elem->_children);
 }
 
-xml_element **xml_element_children (xml_element *elem)
+xml_element **xml_element_children (xml_element const *elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return XMLRPC_TYPED_MEM_BLOCK_CONTENTS(xml_element*, &elem->_children);
@@ -410,13 +410,13 @@
     XMLRPC_ASSERT(context.root != NULL);
     XMLRPC_ASSERT(context.current == NULL);
 
-    *resultP = context.root;
+    *resultPP = context.root;
 
  cleanup:
     if (parser)
         xmlFreeParserCtxt(parser);
 
-    if (env->fault_occurred) {
+    if (envP->fault_occurred) {
         if (context.root)
             xml_element_free(context.root);
     }

xmlrpc-c-1.04-namespace.patch:

--- NEW FILE xmlrpc-c-1.04-namespace.patch ---
--- xmlrpc-c-1.04/src/cpp/libwww.cpp.namespace	2005-11-10 03:24:26.000000000 +0100
+++ xmlrpc-c-1.04/src/cpp/libwww.cpp	2005-12-15 21:03:48.000000000 +0100
@@ -32,7 +32,7 @@
 using namespace xmlrpc_c;
 
 
-namespace {
+namespace xmlrpc_c {
 
 carriageParm_libwww0::carriageParm_libwww0(
     string const serverUrl
--- xmlrpc-c-1.04/src/cpp/wininet.cpp.namespace	2005-11-10 03:24:26.000000000 +0100
+++ xmlrpc-c-1.04/src/cpp/wininet.cpp	2005-12-15 21:04:01.000000000 +0100
@@ -32,7 +32,7 @@
 using namespace xmlrpc_c;
 
 
-namespace {
+namespace xmlrpc_c {
 
 carriageParm_wininet0::carriageParm_wininet0(
     string const serverUrl


--- NEW FILE xmlrpc-c.spec ---
%global _includedir		%_includedir/%name

%{!?release_func:%global release_func() %1%{?dist}}

Summary:	A lightweight RPC library based on XML and HTTP
Name:		xmlrpc-c
Version:	1.04
Release:	%release_func 1
License:	BSD/PSF -- see COPYING
Group:		System Environment/Libraries
URL:	 	http://xmlrpc-c.sourceforge.net/
Source0:	http://dl.sourceforge.net/sourceforge/xmlrpc-c/%name-%version.tgz
Patch0:		xmlrpc-c-1.04-libxml2.patch
Patch1:		xmlrpc-c-1.04-namespace.patch
BuildRoot:	%_tmppath/%name-%version-%release-root
#BuildRequires:	w3c-libwww-devel
BuildRequires:	curl-devel libxml2-devel

%package devel
Summary:	Development files for xmlrpc-c based programs
Group:		Development/Libraries
Requires:	%name = %version-%release
Requires:	libxml2-devel curl-devel

%package apps
Summary:	Sample XML-RPC applications
Group:		Applications/Internet


%description
XML-RPC is a quick-and-easy way to make procedure calls over the
Internet. It converts the procedure call into XML document, sends it
to a remote server using HTTP, and gets back the response as XML.

This library provides a modular implementation of XML-RPC for C and
C++.


%description devel
Static libraries and header files for writing XML-RPC applications in
C and C++.


%description apps
XML-RPC is a quick-and-easy way to make procedure calls over the
Internet. It converts the procedure call into XML document, sends it
to a remote server using HTTP, and gets back the response as XML.

This package contains some handy XML-RPC demo applications.


%prep
%setup -q
%patch0 -p1 -b .libxml2
%patch1 -p1 -b .namespace

## workaround bugs in the buildsystem
rm -f src/cpp/srcdir transport_config.h

## not needed...
rm doc/{INSTALL,configure_doc}


%build
%configure --enable-libxml2-backend --disable-libwww-client

sed -i -e 's!-L/usr/%_lib\s\s*!!g;
	   s!-L/usr/%_lib"!"!g;
	   s!\(the_\S*rpath=\)\"..*\"!\1!g' xmlrpc-c-config

%__make \
	CFLAGS_COMMON="-DNDEBUG -fno-common $RPM_OPT_FLAGS"	\
	CXXFLAGS_COMMON="-DNDEBUG $RPM_OPT_FLAGS"		\
	#%{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
%__make DESTDIR="$RPM_BUILD_ROOT" install

%__install -d -m0755 $RPM_BUILD_ROOT%_mandir/man1

F=tools/xml-rpc-api2cpp/xml-rpc-api2cpp
./libtool --mode=install %__install -p -m755 $F $RPM_BUILD_ROOT/%_bindir/
%__install -p -m0644 $F.1 $RPM_BUILD_ROOT%_mandir/man1/

for i in $RPM_BUILD_ROOT%_libdir/*.a; do
	test ! -e "${i%%.a}.so" || rm -f $i
done

rm -f $RPM_BUILD_ROOT%_libdir/*.la


%clean
rm -rf $RPM_BUILD_ROOT


%post   -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc doc/*
%_libdir/*.so.*


%files devel
%defattr(-,root,root,-)
%_bindir/xmlrpc-c-config
%_includedir
%_libdir/*.so
%_libdir/*.a


%files apps
%defattr(-,root,root,-)
%doc tools/xmlrpc/xmlrpc.html
%doc tools/xmlrpc_transport/xmlrpc_transport.html
%_mandir/man1/*
%_bindir/xmlrpc
%_bindir/xmlrpc_transport
%_bindir/xml-rpc-api2cpp


%changelog
* Sun Dec 18 2005 Enrico Scholz  - 1.04-1
- added libxml2-devel and openssl-devel Requires: for the -devel
  subpackage
- ship doc/* instead of doc
- initial Fedora Extras package (review 175840)

* Thu Dec 15 2005 Enrico Scholz  - 1.04-0.1
- disabled w3c-libwww because it does not exist anymore in FC5 and
  seems to be unmaintained upstream
- added missing libxml2-devel
- cleaned up list of %%doc files
- fixed gcc4.1 build issues
- removed static libraries when there exists a corresponding dynamic one


* Tue Aug  2 2005 Enrico Scholz  - 1.03.02-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2005 18:14:12 -0000	1.1
+++ .cvsignore	18 Dec 2005 18:16:01 -0000	1.2
@@ -0,0 +1 @@
+xmlrpc-c-1.04.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2005 18:14:12 -0000	1.1
+++ sources	18 Dec 2005 18:16:01 -0000	1.2
@@ -0,0 +1 @@
+fc96628803ca72ebd86527039e4155df  xmlrpc-c-1.04.tgz



From fedora-extras-commits at redhat.com  Sun Dec 18 18:20:09 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:20:09 -0500
Subject: owners owners.list,1.464,1.465
Message-ID: <200512181820.jBIIKdRb018791@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18770

Modified Files:
	owners.list 
Log Message:
added xmlrpc-c


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -r1.464 -r1.465
--- owners.list	17 Dec 2005 16:26:23 -0000	1.464
+++ owners.list	18 Dec 2005 18:20:07 -0000	1.465
@@ -1311,3 +1311,4 @@
 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|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|
+Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP!enrico.scholz at informatik.tu-chemnitz.de!extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Dec 18 18:25:50 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:25:50 -0500
Subject: rpms/xmlrpc-c/FC-4 - New directory
Message-ID: <200512181825.jBIIPooL018819@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18810/FC-4

Log Message:
Directory /cvs/extras/rpms/xmlrpc-c/FC-4 added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 18 18:28:21 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:28:21 -0500
Subject: rpms/xmlrpc-c/FC-4 xmlrpc-c.spec, NONE,
	1.1 xmlrpc-c-1.04-namespace.patch, NONE,
	1.1 xmlrpc-c-1.04-libxml2.patch, NONE, 1.1 sources, NONE,
	1.1 Makefile, NONE, 1.1 .cvsignore, NONE, 1.1
Message-ID: <200512181828.jBIISLQ5018883@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18866/FC-4

Added Files:
	xmlrpc-c.spec xmlrpc-c-1.04-namespace.patch 
	xmlrpc-c-1.04-libxml2.patch sources Makefile .cvsignore 
Log Message:
added FC-4 branch (copied from devel/)



--- NEW FILE xmlrpc-c.spec ---
%global _includedir		%_includedir/%name

%{!?release_func:%global release_func() %1%{?dist}}

Summary:	A lightweight RPC library based on XML and HTTP
Name:		xmlrpc-c
Version:	1.04
Release:	%release_func 1
License:	BSD/PSF -- see COPYING
Group:		System Environment/Libraries
URL:	 	http://xmlrpc-c.sourceforge.net/
Source0:	http://dl.sourceforge.net/sourceforge/xmlrpc-c/%name-%version.tgz
Patch0:		xmlrpc-c-1.04-libxml2.patch
Patch1:		xmlrpc-c-1.04-namespace.patch
BuildRoot:	%_tmppath/%name-%version-%release-root
#BuildRequires:	w3c-libwww-devel
BuildRequires:	curl-devel libxml2-devel

%package devel
Summary:	Development files for xmlrpc-c based programs
Group:		Development/Libraries
Requires:	%name = %version-%release
Requires:	libxml2-devel curl-devel

%package apps
Summary:	Sample XML-RPC applications
Group:		Applications/Internet


%description
XML-RPC is a quick-and-easy way to make procedure calls over the
Internet. It converts the procedure call into XML document, sends it
to a remote server using HTTP, and gets back the response as XML.

This library provides a modular implementation of XML-RPC for C and
C++.


%description devel
Static libraries and header files for writing XML-RPC applications in
C and C++.


%description apps
XML-RPC is a quick-and-easy way to make procedure calls over the
Internet. It converts the procedure call into XML document, sends it
to a remote server using HTTP, and gets back the response as XML.

This package contains some handy XML-RPC demo applications.


%prep
%setup -q
%patch0 -p1 -b .libxml2
%patch1 -p1 -b .namespace

## workaround bugs in the buildsystem
rm -f src/cpp/srcdir transport_config.h

## not needed...
rm doc/{INSTALL,configure_doc}


%build
%configure --enable-libxml2-backend --disable-libwww-client

sed -i -e 's!-L/usr/%_lib\s\s*!!g;
	   s!-L/usr/%_lib"!"!g;
	   s!\(the_\S*rpath=\)\"..*\"!\1!g' xmlrpc-c-config

%__make \
	CFLAGS_COMMON="-DNDEBUG -fno-common $RPM_OPT_FLAGS"	\
	CXXFLAGS_COMMON="-DNDEBUG $RPM_OPT_FLAGS"		\
	#%{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
%__make DESTDIR="$RPM_BUILD_ROOT" install

%__install -d -m0755 $RPM_BUILD_ROOT%_mandir/man1

F=tools/xml-rpc-api2cpp/xml-rpc-api2cpp
./libtool --mode=install %__install -p -m755 $F $RPM_BUILD_ROOT/%_bindir/
%__install -p -m0644 $F.1 $RPM_BUILD_ROOT%_mandir/man1/

for i in $RPM_BUILD_ROOT%_libdir/*.a; do
	test ! -e "${i%%.a}.so" || rm -f $i
done

rm -f $RPM_BUILD_ROOT%_libdir/*.la


%clean
rm -rf $RPM_BUILD_ROOT


%post   -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc doc/*
%_libdir/*.so.*


%files devel
%defattr(-,root,root,-)
%_bindir/xmlrpc-c-config
%_includedir
%_libdir/*.so
%_libdir/*.a


%files apps
%defattr(-,root,root,-)
%doc tools/xmlrpc/xmlrpc.html
%doc tools/xmlrpc_transport/xmlrpc_transport.html
%_mandir/man1/*
%_bindir/xmlrpc
%_bindir/xmlrpc_transport
%_bindir/xml-rpc-api2cpp


%changelog
* Sun Dec 18 2005 Enrico Scholz  - 1.04-1
- added libxml2-devel and openssl-devel Requires: for the -devel
  subpackage
- ship doc/* instead of doc
- initial Fedora Extras package (review 175840)

* Thu Dec 15 2005 Enrico Scholz  - 1.04-0.1
- disabled w3c-libwww because it does not exist anymore in FC5 and
  seems to be unmaintained upstream
- added missing libxml2-devel
- cleaned up list of %%doc files
- fixed gcc4.1 build issues
- removed static libraries when there exists a corresponding dynamic one


* Tue Aug  2 2005 Enrico Scholz  - 1.03.02-1
- Initial build.

xmlrpc-c-1.04-namespace.patch:

--- NEW FILE xmlrpc-c-1.04-namespace.patch ---
--- xmlrpc-c-1.04/src/cpp/libwww.cpp.namespace	2005-11-10 03:24:26.000000000 +0100
+++ xmlrpc-c-1.04/src/cpp/libwww.cpp	2005-12-15 21:03:48.000000000 +0100
@@ -32,7 +32,7 @@
 using namespace xmlrpc_c;
 
 
-namespace {
+namespace xmlrpc_c {
 
 carriageParm_libwww0::carriageParm_libwww0(
     string const serverUrl
--- xmlrpc-c-1.04/src/cpp/wininet.cpp.namespace	2005-11-10 03:24:26.000000000 +0100
+++ xmlrpc-c-1.04/src/cpp/wininet.cpp	2005-12-15 21:04:01.000000000 +0100
@@ -32,7 +32,7 @@
 using namespace xmlrpc_c;
 
 
-namespace {
+namespace xmlrpc_c {
 
 carriageParm_wininet0::carriageParm_wininet0(
     string const serverUrl

xmlrpc-c-1.04-libxml2.patch:

--- NEW FILE xmlrpc-c-1.04-libxml2.patch ---
--- xmlrpc-c-1.04/src/xmlrpc_libxml2.c.builderr	2005-12-12 10:05:46.000000000 +0100
+++ xmlrpc-c-1.04/src/xmlrpc_libxml2.c	2005-12-12 10:11:57.000000000 +0100
@@ -147,7 +147,7 @@
 **  documentation on each function works.
 */
 
-char *xml_element_name (xml_element *elem)
+char const *xml_element_name (xml_element const * const elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return elem->_name;
@@ -167,13 +167,13 @@
     return XMLRPC_TYPED_MEM_BLOCK_CONTENTS(char, &elem->_cdata);
 }
 
-size_t xml_element_children_size (xml_element *elem)
+size_t xml_element_children_size (xml_element const *elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return XMLRPC_TYPED_MEM_BLOCK_SIZE(xml_element*, &elem->_children);
 }
 
-xml_element **xml_element_children (xml_element *elem)
+xml_element **xml_element_children (xml_element const *elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return XMLRPC_TYPED_MEM_BLOCK_CONTENTS(xml_element*, &elem->_children);
@@ -410,13 +410,13 @@
     XMLRPC_ASSERT(context.root != NULL);
     XMLRPC_ASSERT(context.current == NULL);
 
-    *resultP = context.root;
+    *resultPP = context.root;
 
  cleanup:
     if (parser)
         xmlFreeParserCtxt(parser);
 
-    if (env->fault_occurred) {
+    if (envP->fault_occurred) {
         if (context.root)
             xml_element_free(context.root);
     }


--- NEW FILE sources ---
fc96628803ca72ebd86527039e4155df  xmlrpc-c-1.04.tgz


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE .cvsignore ---
xmlrpc-c-*.tgz



From fedora-extras-commits at redhat.com  Sun Dec 18 18:59:18 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 18 Dec 2005 13:59:18 -0500
Subject: rpms/xmlrpc-c/FC-4 branch,NONE,1.1
Message-ID: <200512181859.jBIIxIP6019145@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19134/FC-4

Added Files:
	branch 
Log Message:
initial checkin



--- NEW FILE branch ---
FC-4



From fedora-extras-commits at redhat.com  Sun Dec 18 19:07:41 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 14:07:41 -0500
Subject: rpms/inkscape/FC-3 inkscape-0.42-gettext-x86_64.patch,1.1,NONE
Message-ID: <200512181907.jBIJ7fW4020892@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/inkscape/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20882

Removed Files:
	inkscape-0.42-gettext-x86_64.patch 
Log Message:
Removed unused patch


--- inkscape-0.42-gettext-x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Dec 18 20:10:53 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 15:10:53 -0500
Subject: rpms/gcdmaster/devel - New directory
Message-ID: <200512182010.jBIKArkX022778@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22754/gcdmaster/devel

Log Message:
Directory /cvs/extras/rpms/gcdmaster/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 18 20:10:53 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 15:10:53 -0500
Subject: rpms/gcdmaster - New directory
Message-ID: <200512182010.jBIKArrU022782@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22754/gcdmaster

Log Message:
Directory /cvs/extras/rpms/gcdmaster added to the repository




From fedora-extras-commits at redhat.com  Sun Dec 18 20:11:39 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 15:11:39 -0500
Subject: rpms/gcdmaster Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512182011.jBIKBdMG022836@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22815

Added Files:
	Makefile import.log 
Log Message:
Setup of module gcdmaster


--- NEW FILE Makefile ---
# Top level Makefile for module gcdmaster
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 18 20:11:56 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 15:11:56 -0500
Subject: rpms/gcdmaster/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512182011.jBIKBu8J022861@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22815/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gcdmaster


--- NEW 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 Dec 18 20:12:49 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 15:12:49 -0500
Subject: rpms/gcdmaster import.log,1.1,1.2
Message-ID: <200512182013.jBIKDJs2022960@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22905

Modified Files:
	import.log 
Log Message:
auto-import gcdmaster-1.2.1-3 on branch devel from gcdmaster-1.2.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Dec 2005 20:11:37 -0000	1.1
+++ import.log	18 Dec 2005 20:12:47 -0000	1.2
@@ -0,0 +1 @@
+gcdmaster-1_2_1-3:HEAD:gcdmaster-1.2.1-3.src.rpm:1134936764



From fedora-extras-commits at redhat.com  Sun Dec 18 20:12:54 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 18 Dec 2005 15:12:54 -0500
Subject: rpms/tinyerp/FC-4 tinyerp-server.logrotate, NONE, 1.1 tinyerp-server,
	1.1, 1.2 tinyerp.spec, 1.10, 1.11
Message-ID: <200512182013.jBIKDO3L022964@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22840

Modified Files:
	tinyerp-server tinyerp.spec 
Added Files:
	tinyerp-server.logrotate 
Log Message:
 - reverted shell change
 - improved startup script, suggested by Enrico Scholz
 - added log rotation



--- NEW FILE tinyerp-server.logrotate ---
/var/log/tinyerp/*.log {
    copytruncate
    missingok
    notifempty
}


Index: tinyerp-server
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-server	20 Nov 2005 18:40:53 -0000	1.1
+++ tinyerp-server	18 Dec 2005 20:12:51 -0000	1.2
@@ -29,38 +29,22 @@
 RETVAL=0
 
 start() {
-    # create temporary startup script to get pid of the server process
-    cat > /tmp/tinyerp-server.run << EOF
-/usr/bin/tinyerp-server $OPTS >> /var/log/tinyerp/tinyerp-server.log 2>&1 &
-echo \$! > /tmp/tinyerp-server.pid
-EOF
-    chmod 0755 /tmp/tinyerp-server.run
-    
     echo -n $"Starting $prog: "
-    su -l tinyerp -c "/tmp/tinyerp-server.run"
+    daemon --user tinyerp --check tinyerp-server "/usr/bin/setsid /usr/bin/tinyerp-server $OPTS &"
+
     RETVAL=$?
-    
-    if [ $RETVAL -eq 0 ]; then
-        mv /tmp/tinyerp-server.pid /var/run
-	
-        touch /var/lock/subsys/tinyerp-server
-        echo_success
-        echo
-    else
-	echo_failure
-	echo
-    fi
-    rm -f /tmp/tinyerp-server.run
+    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tinyerp-server
+    echo
     return $RETVAL
 }
 
 stop() {
     echo -n  $"Stopping $prog: "
-    kill -TERM `cat /var/run/tinyerp-server.pid` > /dev/null 2>&1
+    kill -TERM `cat /var/spool/tinyerp/tinyerp-server.pid` > /dev/null 2>&1
     RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
     	rm -f /var/lock/subsys/tinyerp-server
-    	rm -f /var/run/tinyerp-server.pid
+    	rm -f /var/spool/tinyerp/tinyerp-server.pid
 
 	echo_success
 	echo 


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tinyerp.spec	14 Dec 2005 14:26:17 -0000	1.10
+++ tinyerp.spec	18 Dec 2005 20:12:51 -0000	1.11
@@ -13,6 +13,7 @@
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
+Source5:	tinyerp-server.logrotate
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
@@ -79,6 +80,7 @@
 
 install -m 644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tinyerp-server.conf
 install -m 755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/tinyerp-server
+install -m 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tinyerp-server
 mkdir -p $RPM_BUILD_ROOT/var/log/tinyerp
 mkdir -p $RPM_BUILD_ROOT/var/spool/tinyerp
 
@@ -100,6 +102,7 @@
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
 %config(noreplace) %{_sysconfdir}/tinyerp-server.conf
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
+%{_sysconfdir}/logrotate.d/tinyerp-server
 %{_bindir}/tinyerp-server
 %{python_sitelib}/tinyerp-server/   
 %{_defaultdocdir}/%{name}-server-%{version}/
@@ -107,7 +110,7 @@
 
 %pre server
 /usr/sbin/fedora-groupadd 13 -r tinyerp &>/dev/null || :
-/usr/sbin/fedora-useradd 13 -r -s /bin/bash -d /var/spool/tinyerp -M \
+/usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
 exit 0
@@ -131,9 +134,10 @@
 
 
 %changelog
-* Wed Dec 14 2005 Dan Horak  3.1.1-5
+* Sun Dec 18 2005 Dan Horak  3.1.1-5
 - added Requires(postun) to the -server package (Ville Skytt??)
-- tinyerp user requires a real shell
+- improved startup script, suggested by Enrico Scholz
+- added log rotation
 
 * Sun Dec 11 2005 Dan Horak  3.1.1-4
 - moved Requires(pre) to the -server package (Ville Skytt??)



From fedora-extras-commits at redhat.com  Sun Dec 18 20:12:54 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 15:12:54 -0500
Subject: rpms/gcdmaster/devel gcdmaster.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512182013.jBIKDP87022968@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gcdmaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22905/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gcdmaster.spec 
Log Message:
auto-import gcdmaster-1.2.1-3 on branch devel from gcdmaster-1.2.1-3.src.rpm


--- NEW FILE gcdmaster.spec ---
Name:		gcdmaster
Version:	1.2.1
Release:        3%{?dist}
Summary:	A Gnome2 Disk-At-Once (DAO) Audio CD writer

Group:		Applications/Multimedia
License:	GPL
URL:            http://cdrdao.sourceforge.net/
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:	http://easynews.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.bz2
Requires:       cdrdao
BuildRequires:	gtkmm24-devel
BuildRequires:	libgnomeuimm26-devel
BuildRequires:  libsigc++20-devel
BuildRequires:  libvorbis-devel >= 1.0
BuildRequires:  desktop-file-utils
BuildRequires:  cdrecord-devel
BuildRequires:  libao-devel
Requires(post):   shared-mime-info desktop-file-utils
Requires(postun): shared-mime-info desktop-file-utils

%description
Gcdmaster is a GNOME2 GUI front-end to cdrdao that makes it easy to
visualize and manipulate audio information before burning it onto
CD. Its features include: cut/copy/paste of sound samples, track marks
edition and silence insertion.


%prep
%setup -q -n cdrdao-%{version}


%build
%configure --with-scglib=sys %{!?_with_mp3: --without-mp3-support}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
rm -f $RPM_BUILD_ROOT%{_bindir}/cdrdao
rm -f $RPM_BUILD_ROOT%{_bindir}/*toc*
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/cdrdao*
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/cue2toc*
rm -fr $RPM_BUILD_ROOT%{_datadir}/cdrdao 
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

desktop-file-install \
  --vendor fedora \
  --mode 644 \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --delete-original \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :


%postun
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING CREDITS ChangeLog README README.PlexDAE
%{_bindir}/gcdmaster
%{_datadir}/gcdmaster
%{_datadir}/applications/*.desktop
%{_datadir}/mime-info/gcdmaster*
%{_datadir}/mime/packages/gcdmaster.xml
%{_datadir}/application-registry/gcdmaster.applications
%{_datadir}/pixmaps/*
%{_mandir}/man1/gcdmaster*

%changelog
* Sat Dec 17 2005 Denis Leroy  - 1.2.1-3
- Added user macro to enable mp3 support

* Sat Dec 17 2005 Denis Leroy  - 1.2.1-2
- Removed unneeded doc entries
- Leave mp3 support in auto-detection

* Sat Nov 26 2005 Denis Leroy  - 1.2.1-1
- Initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2005 20:11:53 -0000	1.1
+++ .cvsignore	18 Dec 2005 20:12:52 -0000	1.2
@@ -0,0 +1 @@
+cdrdao-1.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2005 20:11:53 -0000	1.1
+++ sources	18 Dec 2005 20:12:52 -0000	1.2
@@ -0,0 +1 @@
+f93f3e68ec5b53ec1a776df73a1def60  cdrdao-1.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 18 20:14:39 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 18 Dec 2005 15:14:39 -0500
Subject: rpms/tinyerp/FC-4 tinyerp-server.patch,1.2,1.3
Message-ID: <200512182015.jBIKF9J5023024@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23000

Modified Files:
	tinyerp-server.patch 
Log Message:
 - new server patch with improved startup script


tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-server.patch	28 Nov 2005 14:43:00 -0000	1.2
+++ tinyerp-server.patch	18 Dec 2005 20:14:37 -0000	1.3
@@ -11,7 +11,7 @@
  Maintainer: Tiny.be
 diff -Nru tinyerp-server-3.1.1.orig/setup.py tinyerp-server-3.1.1/setup.py
 --- tinyerp-server-3.1.1.orig/setup.py	2005-09-18 16:16:19.000000000 +0200
-+++ tinyerp-server-3.1.1/setup.py	2005-11-28 15:30:50.000000000 +0100
++++ tinyerp-server-3.1.1/setup.py	2005-12-18 20:51:56.000000000 +0100
 @@ -21,7 +21,7 @@
  opj = os.path.join
  
@@ -33,3 +33,14 @@
                glob.glob('doc/i18n/*')),
               (opj('lib', 'python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'addons', 'custom'),
                glob.glob('bin/addons/custom/*xml') + 
+@@ -104,8 +104,9 @@
+ # create startup script
+ start_script = \
+ "#!/bin/sh\n\
++echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\
+ cd %s/lib/python%s/site-packages/tinyerp-server\n\
+-exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable)
++exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable)
+ # write script
+ f = open('tinyerp-server', 'w')
+ f.write(start_script)



From fedora-extras-commits at redhat.com  Sun Dec 18 20:19:14 2005
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 18 Dec 2005 15:19:14 -0500
Subject: rpms/tinyerp/FC-3 tinyerp-server.logrotate, NONE, 1.1 tinyerp-server,
	1.1, 1.2 tinyerp-server.patch, 1.2, 1.3 tinyerp.spec, 1.8, 1.9
Message-ID: <200512182019.jBIKJjb1023125@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23099

Modified Files:
	tinyerp-server tinyerp-server.patch tinyerp.spec 
Added Files:
	tinyerp-server.logrotate 
Log Message:
 - reverted shell change
 - improved init.d script, suggested by Enrico Scholz
 - added log rotation
 - new server patch with improved startup script



--- NEW FILE tinyerp-server.logrotate ---
/var/log/tinyerp/*.log {
    copytruncate
    missingok
    notifempty
}


Index: tinyerp-server
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-server	27 Nov 2005 09:26:58 -0000	1.1
+++ tinyerp-server	18 Dec 2005 20:19:12 -0000	1.2
@@ -29,38 +29,22 @@
 RETVAL=0
 
 start() {
-    # create temporary startup script to get pid of the server process
-    cat > /tmp/tinyerp-server.run << EOF
-/usr/bin/tinyerp-server $OPTS >> /var/log/tinyerp/tinyerp-server.log 2>&1 &
-echo \$! > /tmp/tinyerp-server.pid
-EOF
-    chmod 0755 /tmp/tinyerp-server.run
-    
     echo -n $"Starting $prog: "
-    su -l tinyerp -c "/tmp/tinyerp-server.run"
+    daemon --user tinyerp --check tinyerp-server "/usr/bin/setsid /usr/bin/tinyerp-server $OPTS &"
+
     RETVAL=$?
-    
-    if [ $RETVAL -eq 0 ]; then
-        mv /tmp/tinyerp-server.pid /var/run
-	
-        touch /var/lock/subsys/tinyerp-server
-        echo_success
-        echo
-    else
-	echo_failure
-	echo
-    fi
-    rm -f /tmp/tinyerp-server.run
+    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tinyerp-server
+    echo
     return $RETVAL
 }
 
 stop() {
     echo -n  $"Stopping $prog: "
-    kill -TERM `cat /var/run/tinyerp-server.pid` > /dev/null 2>&1
+    kill -TERM `cat /var/spool/tinyerp/tinyerp-server.pid` > /dev/null 2>&1
     RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
     	rm -f /var/lock/subsys/tinyerp-server
-    	rm -f /var/run/tinyerp-server.pid
+    	rm -f /var/spool/tinyerp/tinyerp-server.pid
 
 	echo_success
 	echo 

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-server.patch	28 Nov 2005 14:40:32 -0000	1.2
+++ tinyerp-server.patch	18 Dec 2005 20:19:12 -0000	1.3
@@ -11,7 +11,7 @@
  Maintainer: Tiny.be
 diff -Nru tinyerp-server-3.1.1.orig/setup.py tinyerp-server-3.1.1/setup.py
 --- tinyerp-server-3.1.1.orig/setup.py	2005-09-18 16:16:19.000000000 +0200
-+++ tinyerp-server-3.1.1/setup.py	2005-11-28 15:30:50.000000000 +0100
++++ tinyerp-server-3.1.1/setup.py	2005-12-18 20:51:56.000000000 +0100
 @@ -21,7 +21,7 @@
  opj = os.path.join
  
@@ -33,3 +33,14 @@
                glob.glob('doc/i18n/*')),
               (opj('lib', 'python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'addons', 'custom'),
                glob.glob('bin/addons/custom/*xml') + 
+@@ -104,8 +104,9 @@
+ # create startup script
+ start_script = \
+ "#!/bin/sh\n\
++echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\
+ cd %s/lib/python%s/site-packages/tinyerp-server\n\
+-exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable)
++exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable)
+ # write script
+ f = open('tinyerp-server', 'w')
+ f.write(start_script)


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tinyerp.spec	14 Dec 2005 14:24:27 -0000	1.8
+++ tinyerp.spec	18 Dec 2005 20:19:12 -0000	1.9
@@ -13,6 +13,7 @@
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
+Source5:	tinyerp-server.logrotate
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
@@ -79,6 +80,7 @@
 
 install -m 644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tinyerp-server.conf
 install -m 755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/tinyerp-server
+install -m 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tinyerp-server
 mkdir -p $RPM_BUILD_ROOT/var/log/tinyerp
 mkdir -p $RPM_BUILD_ROOT/var/spool/tinyerp
 
@@ -100,6 +102,7 @@
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
 %config(noreplace) %{_sysconfdir}/tinyerp-server.conf
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
+%{_sysconfdir}/logrotate.d/tinyerp-server
 %{_bindir}/tinyerp-server
 %{python_sitelib}/tinyerp-server/   
 %{_defaultdocdir}/%{name}-server-%{version}/
@@ -107,7 +110,7 @@
 
 %pre server
 /usr/sbin/fedora-groupadd 13 -r tinyerp &>/dev/null || :
-/usr/sbin/fedora-useradd 13 -r -s /bin/bash -d /var/spool/tinyerp -M \
+/usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
 exit 0
@@ -131,9 +134,10 @@
 
 
 %changelog
-* Wed Dec 14 2005 Dan Horak  3.1.1-5
+* Sun Dec 18 2005 Dan Horak  3.1.1-5
 - added Requires(postun) to the -server package (Ville Skytt??)
-- tinyerp user requires a real shell
+- improved startup script, suggested by Enrico Scholz
+- added log rotation
 
 * Sun Dec 11 2005 Dan Horak  3.1.1-4
 - moved Requires(pre) to the -server package (Ville Skytt??)



From fedora-extras-commits at redhat.com  Sun Dec 18 20:26:50 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Sun, 18 Dec 2005 15:26:50 -0500
Subject: owners owners.list,1.465,1.466
Message-ID: <200512182027.jBIKRKM4023265@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23247

Modified Files:
	owners.list 
Log Message:
Imported gcdmaster


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -r1.465 -r1.466
--- owners.list	18 Dec 2005 18:20:07 -0000	1.465
+++ owners.list	18 Dec 2005 20:26:48 -0000	1.466
@@ -240,6 +240,7 @@
 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|
 Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gcfilms|Movies collections management|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gcl|GNU Common Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Dec 18 20:37:18 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 18 Dec 2005 15:37:18 -0500
Subject: rpms/cvsgraph/devel cvsgraph-1.6.0-config.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 cvsgraph.spec, 1.9, 1.10 sources, 1.5,
	1.6 cvsgraph-config.patch, 1.2, NONE
Message-ID: <200512182037.jBIKbmSl023335@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cvsgraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23310

Modified Files:
	.cvsignore cvsgraph.spec sources 
Added Files:
	cvsgraph-1.6.0-config.patch 
Removed Files:
	cvsgraph-config.patch 
Log Message:
* Sun Dec 18 2005 Ville Skytt??  - 1.6.0-1
- 1.6.0.


cvsgraph-1.6.0-config.patch:

--- NEW FILE cvsgraph-1.6.0-config.patch ---
--- cvsgraph.conf.orig	2005-12-18 03:07:47.000000000 +0200
+++ cvsgraph.conf	2005-12-18 22:30:41.000000000 +0200
@@ -124,8 +124,8 @@
 #	CVS/RCS repository can be found
 # cvsmodule 
 #
-cvsroot		= "/home/bertho/tmp/cvstest";
-cvsmodule	= "ttt";
+cvsroot		= "/var/cvs";
+cvsmodule	= "";
 
 # color_bg 
 #	The background color of the image
@@ -175,7 +175,7 @@
 #	Sets the error/warning message font
 msg_color	= "#800000";
 msg_font	= medium;
-msg_ttfont	= "/dos/windows/fonts/ariali.ttf";
+msg_ttfont	= "/usr/share/fonts/bitstream-vera/VeraIt.ttf";
 msg_ttsize	= 11.0;
 
 # parse_logs 
@@ -206,7 +206,7 @@
 #	tags will be shown.
 #	Note: tags matched with merge_from/merge_to will still be displayed.
 tag_font	= medium;
-tag_ttfont	= "/dos/windows/fonts/ariali.ttf";
+tag_ttfont	= "/usr/share/fonts/bitstream-vera/VeraIt.ttf";
 tag_ttsize	= 11.0;
 tag_color	= "#007000";
 #tag_ignore	= "(test|alpha)_release";
@@ -245,7 +245,7 @@
 #
 #rev_hidenumber = false;
 rev_font	= giant;
-rev_ttfont	= "/dos/windows/fonts/arial.ttf";
+rev_ttfont	= "/usr/share/fonts/bitstream-vera/Vera.ttf";
 rev_ttsize	= 12.0;
 rev_idtext	= [ "state" == "dead" "(Dead %R)" "%R" ];
 #rev_color	= "#000000";
@@ -262,7 +262,7 @@
 #rev_text	= "%d";	# or "%d\n%a, %s" for author and state too
 rev_text	= [ "state" == "dead" "Died %d\nMaybe alive in other branch" "%d" ];
 rev_text_font	= tiny;
-rev_text_ttfont	= "/dos/windows/fonts/times.ttf";
+rev_text_ttfont	= "/usr/share/fonts/bitstream-vera/VeraSe.ttf";
 rev_text_ttsize	= 9.0;
 rev_text_color	= "#500020";
 rev_maxtags	= 25;
@@ -373,11 +373,11 @@
 #	tag. This option you would normally want to set from the
 #	command line with the -O option.
 branch_font	= medium;
-branch_ttfont	= "/dos/windows/fonts/arialbd.ttf";
+branch_ttfont	= "/usr/share/fonts/bitstream-vera/VeraBd.ttf";
 branch_ttsize	= 18.0;
 branch_tag_color= "#000080";
 branch_tag_font	= medium;
-branch_tag_ttfont = "/dos/windows/fonts/arialbi.ttf";
+branch_tag_ttfont = "/usr/share/fonts/bitstream-vera/VeraBI.ttf";
 branch_tag_ttsize = 14.0;
 branch_color	= "#0000c0";
 branch_bgcolor	= "#ffffc0";
@@ -408,7 +408,7 @@
 title_x		= 10;
 title_y		= 5;
 title_font	= small;
-title_ttfont	= "/dos/windows/fonts/times.ttf";
+title_ttfont	= "/usr/share/fonts/bitstream-vera/VeraSe.ttf";
 title_ttsize	= 10.0;
 title_align	= left;
 title_color	= "#800000";


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cvsgraph/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Aug 2005 16:24:05 -0000	1.5
+++ .cvsignore	18 Dec 2005 20:37:16 -0000	1.6
@@ -1 +1 @@
-cvsgraph-1.5.2.tar.gz
+cvsgraph-1.6.0.tar.gz


Index: cvsgraph.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsgraph/devel/cvsgraph.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cvsgraph.spec	30 Aug 2005 16:24:05 -0000	1.9
+++ cvsgraph.spec	18 Dec 2005 20:37:16 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           cvsgraph
-Version:        1.5.2
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        CVS/RCS repository grapher
 
@@ -8,7 +8,7 @@
 URL:            http://www.akhphd.au.dk/~bertho/cvsgraph/
 Source0:        http://www.akhphd.au.dk/~bertho/cvsgraph/release/%{name}-%{version}.tar.gz
 Source1:        %{name}-httpd.conf
-Patch0:         %{name}-config.patch
+Patch0:         %{name}-1.6.0-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gd-devel
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Sun Dec 18 2005 Ville Skytt??  - 1.6.0-1
+- 1.6.0.
+
 * Tue Aug 30 2005 Ville Skytt??  - 1.5.2-1
 - 1.5.2.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cvsgraph/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Aug 2005 16:24:05 -0000	1.5
+++ sources	18 Dec 2005 20:37:16 -0000	1.6
@@ -1 +1 @@
-095a779d7977ae0c12f456ed119af6f6  cvsgraph-1.5.2.tar.gz
+d8919dc9617ab4cf8bf658b7fbd1df0e  cvsgraph-1.6.0.tar.gz


--- cvsgraph-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Dec 18 21:53:49 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 18 Dec 2005 16:53:49 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.4, 1.5 rxvt-unicode.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512182154.jBILsJ9j025268@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-serv25208/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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Oct 2005 21:53:19 -0000	1.4
+++ .cvsignore	18 Dec 2005 21:53:46 -0000	1.5
@@ -1 +1 @@
-rxvt-unicode-5.8.tar.bz2
+rxvt-unicode-5.9.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rxvt-unicode.spec	25 Oct 2005 21:53:19 -0000	1.6
+++ rxvt-unicode.spec	18 Dec 2005 21:53:46 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        5.8
+Version:        5.9
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sun Dec 18 2005 Andreas Bierfert 
+5.9-1
+- version upgrade
+
 * Tue Oct 25 2005 Andreas Bierfert 
 5.8-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Oct 2005 21:53:19 -0000	1.4
+++ sources	18 Dec 2005 21:53:46 -0000	1.5
@@ -1 +1 @@
-cb650f9f5c195f01da0834d0bc9f6ade  rxvt-unicode-5.8.tar.bz2
+c160e8199d71324d789657c6d1092a4e  rxvt-unicode-5.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 18 21:53:54 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 18 Dec 2005 16:53:54 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.4, 1.5 rxvt-unicode.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512182154.jBILsOsd025273@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-serv25208/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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Oct 2005 21:53:20 -0000	1.4
+++ .cvsignore	18 Dec 2005 21:53:52 -0000	1.5
@@ -1 +1 @@
-rxvt-unicode-5.8.tar.bz2
+rxvt-unicode-5.9.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rxvt-unicode.spec	25 Oct 2005 21:53:20 -0000	1.6
+++ rxvt-unicode.spec	18 Dec 2005 21:53:52 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        5.8
+Version:        5.9
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sun Dec 18 2005 Andreas Bierfert 
+5.9-1
+- version upgrade
+
 * Tue Oct 25 2005 Andreas Bierfert 
 5.8-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Oct 2005 21:53:20 -0000	1.4
+++ sources	18 Dec 2005 21:53:52 -0000	1.5
@@ -1 +1 @@
-cb650f9f5c195f01da0834d0bc9f6ade  rxvt-unicode-5.8.tar.bz2
+c160e8199d71324d789657c6d1092a4e  rxvt-unicode-5.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 18 21:54:00 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 18 Dec 2005 16:54:00 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.4, 1.5 rxvt-unicode.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <200512182154.jBILsUcj025278@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25208/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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Oct 2005 21:53:20 -0000	1.4
+++ .cvsignore	18 Dec 2005 21:53:58 -0000	1.5
@@ -1 +1 @@
-rxvt-unicode-5.8.tar.bz2
+rxvt-unicode-5.9.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rxvt-unicode.spec	28 Nov 2005 21:45:52 -0000	1.9
+++ rxvt-unicode.spec	18 Dec 2005 21:53:58 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
-Version:        5.8
-Release:        2%{?dist}
+Version:        5.9
+Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -70,6 +70,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sun Dec 18 2005 Andreas Bierfert 
+5.9-1
+- version upgrade
+
 * Fri Nov 25 2005 Andreas Bierfert 
 5.8-2
 - modular xorg integration


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Oct 2005 21:53:20 -0000	1.4
+++ sources	18 Dec 2005 21:53:58 -0000	1.5
@@ -1 +1 @@
-cb650f9f5c195f01da0834d0bc9f6ade  rxvt-unicode-5.8.tar.bz2
+c160e8199d71324d789657c6d1092a4e  rxvt-unicode-5.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 18 22:47:41 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Sun, 18 Dec 2005 17:47:41 -0500
Subject: rpms/ghdl/devel .cvsignore, 1.3, 1.4 ghdl.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200512182248.jBIMmCPV027152@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27130

Modified Files:
	.cvsignore ghdl.spec sources 
Log Message:
update to 0.21



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Dec 2005 13:35:42 -0000	1.3
+++ .cvsignore	18 Dec 2005 22:47:39 -0000	1.4
@@ -3,3 +3,4 @@
 ghdl-0.20-svn35.patch
 ghdl-imagef64fix.patch
 ghdl-0.20.tar.bz2
+ghdl-0.21.tar.bz2


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ghdl.spec	15 Dec 2005 13:35:42 -0000	1.4
+++ ghdl.spec	18 Dec 2005 22:47:39 -0000	1.5
@@ -1,10 +1,10 @@
 %define gccver 4.0.2
-%define ghdlver 0.20
+%define ghdlver 0.21
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.21
-Release: 0.35svn.1%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -14,9 +14,7 @@
 # ./dist.sh sources
 Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
-Patch0: ghdl-0.20-svn35.patch
-Patch1: ghdl-0.21-infodirentry.patch
-Patch2: ghdl-imagef64fix.patch
+Patch0: ghdl-0.21-infodirentry.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo
 Requires(post): /sbin/install-info
@@ -54,11 +52,9 @@
 %prep
 %setup -q -n gcc-%{gccver} -T -b 1 -a 0
 pushd ghdl-%{ghdlver}
-%patch0 -p1
-%patch2 -p0 -b .imgf64
 %{__mv} vhdl ../gcc/
 popd
-%patch1 -p0
+%patch0 -p0
 
 %build
 %{__mkdir} obj-%{gcc_target_platform}
@@ -118,8 +114,8 @@
 	--host=%{gcc_target_platform}
 %endif
 
-%{__mkdir} -p gcc/vhdl
-%{__cp} ../gcc/vhdl/grt/grt.ver gcc/vhdl
+#{__mkdir} -p gcc/vhdl
+#{__cp} ../gcc/vhdl/grt/grt.ver gcc/vhdl
 # Parallel make doesn't work, so not using %{?_smp_mflags}
 %{__make}
 
@@ -221,6 +217,9 @@
 %{_libexecdir}/gcc/
 
 %changelog
+* Sun Dec 18 2005 Thomas Sailer  - 0.21-1
+- update to 0.21
+
 * Thu Dec 15 2005 Thomas Sailer  - 0.21-0.35svn.1
 - update to svn35 for more x86_64 "Ada cannot portably call C vararg functions"
   fixes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Dec 2005 13:35:42 -0000	1.3
+++ sources	18 Dec 2005 22:47:39 -0000	1.4
@@ -1,5 +1,2 @@
 f7781398ada62ba255486673e6274b26  gcc-core-4.0.2.tar.bz2
-93d0d169eaca9119fa2eb3302f1a7ecc  ghdl-0.21dev.tar.bz2
-9903c648fb586c3abed0d3c9d574a1bb  ghdl-0.20-svn35.patch
-d7302c5e11b51ffec0ada78ee5f3764f  ghdl-imagef64fix.patch
-7d761a9469115e05dc965d68d9760f5b  ghdl-0.20.tar.bz2
+a0ebb9b4ea9d33e67e6ae9768d10eb3a  ghdl-0.21.tar.bz2



From fedora-extras-commits at redhat.com  Sun Dec 18 23:07:00 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Sun, 18 Dec 2005 18:07:00 -0500
Subject: rpms/ghdl/FC-4 .cvsignore, 1.2, 1.3 ghdl.spec, 1.4, 1.5 sources, 1.2,
	1.3
Message-ID: <200512182307.jBIN7pNA028878@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28853

Modified Files:
	.cvsignore ghdl.spec sources 
Log Message:
update to 0.21



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghdl/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Nov 2005 11:19:29 -0000	1.2
+++ .cvsignore	18 Dec 2005 23:06:54 -0000	1.3
@@ -1,2 +1,3 @@
 gcc-core-4.0.2.tar.bz2
 ghdl-0.21dev.tar.bz2
+ghdl-0.21.tar.bz2


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/FC-4/ghdl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ghdl.spec	5 Dec 2005 21:11:11 -0000	1.4
+++ ghdl.spec	18 Dec 2005 23:06:54 -0000	1.5
@@ -1,10 +1,10 @@
 %define gccver 4.0.2
-%define versuffix dev
+%define ghdlver 0.21
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.21
-Release: 0.24svn.3%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -12,15 +12,15 @@
 # check out the SVN repo
 # cd translate/gcc/
 # ./dist.sh sources
-Source0: http://ghdl.free.fr/ghdl-%{version}%{versuffix}.tar.bz2
+Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
 Patch0: ghdl-0.21-infodirentry.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+Requires: gcc
 # gcc-gnat missing on ppc: Bug 174720
-# mock does not install glibc-devel.i386 on x86_64, therefore
 ExcludeArch: ppc
 
 # Make sure we don't use clashing namespaces
@@ -51,7 +51,9 @@
 
 %prep
 %setup -q -n gcc-%{gccver} -T -b 1 -a 0
-%{__mv} ghdl-%{version}%{versuffix}/vhdl gcc/
+pushd ghdl-%{ghdlver}
+%{__mv} vhdl ../gcc/
+popd
 %patch0 -p0
 
 %build
@@ -95,7 +97,7 @@
 	--mandir=%{_mandir} \
 	--infodir=%{_infodir} \
 	--enable-languages=vhdl \
-	--disable-multilib \
+	%{!?_without_mock:--disable-multilib} \
 %ifarch sparc
 	--host=%{gcc_target_platform} \
 	--build=%{gcc_target_platform} \
@@ -121,6 +123,37 @@
 %{__rm} -rf %{buildroot}
 %{__make} -C obj-%{gcc_target_platform} DESTDIR=%{buildroot} install
 
+%ifarch x86_64
+pushd obj-%{gcc_target_platform}/gcc/vhdl
+P32=%{buildroot}/%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/vhdl/lib/32/
+%{__install} -d -o 0 -g 0 ${P32}
+make ghdllibs-clean
+%if %{!?_without_mock:0}%{?_without_mock:1}
+make grt-clean
+make GRT_FLAGS=-m32 GRT_TARGET_OBJS="i386.o linux.o times.o" ghdllib
+make grt.lst
+%{__install} -m 644 libgrt.a ${P32}/libgrt.a
+%{__install} -m 644 grt.lst ${P32}/grt.lst
+%{__install} -m 644 grt.ver ${P32}/grt.ver
+%endif
+PDIR=`pwd`
+pushd ${P32}/../..
+%{__install} -d -o 0 -g 0 lib/32/v93
+%{__install} -d -o 0 -g 0 lib/32/v87
+%{__make} -f ${PDIR}/Makefile REL_DIR=../../../.. \
+         LIBSRC_DIR="src" LIB93_DIR=lib/32/v93 LIB87_DIR=lib/32/v87 \
+         ANALYZE="${PDIR}/../ghdl -a -m32 --GHDL1=${PDIR}/../ghdl1 --ieee=none" \
+         std.v93 std.v87 ieee.v93 ieee.v87 synopsys.v93 synopsys.v87 mentor.v93
+popd
+../ghdl1 -m32 --std=87 -quiet -o std_standard.s --compile-standard
+../xgcc -m32 -c -o std_standard.o std_standard.s
+%{__mv} std_standard.o ${P32}/v87/std/std_standard.o
+../ghdl1 -m32 --std=93 -quiet -o std_standard.s --compile-standard
+../xgcc -m32 -c -o std_standard.o std_standard.s
+%{__mv} std_standard.o ${P32}/v93/std/std_standard.o
+popd
+%endif
+
 # Add additional libraries to link
 (
 echo "-lm"
@@ -145,6 +178,11 @@
 	.%{_exec_prefix}/lib/libmudflap.* \
 	.%{_exec_prefix}/lib/libmudflapth.* \
 	.%{_libdir}/32/libiberty.a
+# Remove crt/libgcc, as ghdl invokes the native gcc to perform the linking
+%{__rm} -f \
+	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/crt* \
+	.%{_libdir}/gcc/%{gcc_target_platform}/%{gccver}/libgc* \
+	.%{_libexecdir}/gcc/%{gcc_target_platform}/%{gccver}/{cc1,collect2}
 
 # Remove directory hierarchies not to be packaged
 %{__rm} -rf \
@@ -166,7 +204,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ghdl-%{version}%{versuffix}/COPYING
+%doc ghdl-%{ghdlver}/COPYING
 %{_bindir}/ghdl
 %{_infodir}/ghdl.info.gz
 # Need to own directory %{_libdir}/gcc even though we only want the
@@ -177,6 +215,18 @@
 %{_libexecdir}/gcc/
 
 %changelog
+* Sun Dec 18 2005 Thomas Sailer  - 0.21-1
+- update to 0.21
+
+* Thu Dec 15 2005 Thomas Sailer  - 0.21-0.35svn.1
+- update to svn35 for more x86_64 "Ada cannot portably call C vararg functions"
+  fixes
+- first stab at -m32 library building
+
+* Sat Dec 10 2005 Thomas Sailer  - 0.21-0.33svn.1
+- update to svn33, to fix x86_64 issues (real'image, -m32)
+- rpmbuild option --without mock enables multilib builds
+
 * Mon Dec  5 2005 Thomas Sailer  - 0.21-0.24svn.3
 - disable multilib and remove exclude of x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghdl/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Nov 2005 11:19:29 -0000	1.2
+++ sources	18 Dec 2005 23:06:54 -0000	1.3
@@ -1,2 +1,2 @@
 f7781398ada62ba255486673e6274b26  gcc-core-4.0.2.tar.bz2
-93d0d169eaca9119fa2eb3302f1a7ecc  ghdl-0.21dev.tar.bz2
+a0ebb9b4ea9d33e67e6ae9768d10eb3a  ghdl-0.21.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 19 02:12:31 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 18 Dec 2005 21:12:31 -0500
Subject: rpms/xchat-gnome/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xchat-gnome.spec, 1.8, 1.9
Message-ID: <200512190213.jBJ2D1CN001702@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1680

Modified Files:
	.cvsignore sources xchat-gnome.spec 
Log Message:
* Sun Dec 18 2005 Brian Pepple  - 0.8-01.rc1
- Update to 0.8rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Dec 2005 21:54:05 -0000	1.4
+++ .cvsignore	19 Dec 2005 02:12:29 -0000	1.5
@@ -1 +1 @@
-xchat-gnome-0.8rc1.tar.bz2
+xchat-gnome-0.8rc2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Dec 2005 21:54:05 -0000	1.4
+++ sources	19 Dec 2005 02:12:29 -0000	1.5
@@ -1 +1 @@
-9e43be1379796baf270e417202ef6c95  xchat-gnome-0.8rc1.tar.bz2
+46b06c1b88fbf20799568e0c10af8ed5  xchat-gnome-0.8rc2.tar.bz2


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xchat-gnome.spec	15 Dec 2005 21:54:05 -0000	1.8
+++ xchat-gnome.spec	19 Dec 2005 02:12:29 -0000	1.9
@@ -6,13 +6,13 @@
 
 Name:           xchat-gnome
 Version:        0.8
-Release:        0.1.rc1%{?dist}
+Release:        0.1.rc2%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://%{name}.navi.cx/
-Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}rc1.tar.bz2
+Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}rc2.tar.bz2
 Patch0:		%{name}-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -49,7 +49,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 %patch0 -p1 -b .config
 
 
@@ -132,6 +132,9 @@
 
 
 %changelog
+* Sun Dec 18 2005 Brian Pepple  - 0.8-01.rc1
+- Update to 0.8rc2.
+
 * Thu Dec 15 2005 Brian Pepple  - 0.8-01.rc1
 - Update to 0.8rc1.
 - Drop documentation removed from upstream tarball.



From fedora-extras-commits at redhat.com  Mon Dec 19 02:14:42 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun, 18 Dec 2005 21:14:42 -0500
Subject: rpms/ldns/devel ldns.spec,1.3,1.4
Message-ID: <200512190215.jBJ2FC6R001735@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1713

Modified Files:
	ldns.spec 
Log Message:
* Sun Dec 18 2005 Paul Wouters  1.0.0-7
- Patched 'make clean' target to get rid of object files shipped with 1.0.0



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ldns.spec	13 Dec 2005 16:25:46 -0000	1.3
+++ ldns.spec	19 Dec 2005 02:14:40 -0000	1.4
@@ -5,6 +5,7 @@
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
+Patch0: %{name}-clean.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, autoconf, automake, gcc-c++, openssl-devel, doxygen
@@ -25,21 +26,25 @@
 
 %prep
 %setup -q 
+
+%patch0 -b .clean
+
 rm config.sub config.guess
 libtoolize
 autoreconf
-# only for 2.3.3, since upstream left .o files in release
+# only for 1.0.0, since upstream left .o files in release
 make clean
 
 %configure
 
 
 %build
-%{__make} %{?_smp_mflags} allautoconf
-%{__make} %{?_smp_mflags}
-%{__make} %{?_smp_mflags} drill
-%{__make} %{?_smp_mflags} examples
-%{__make} %{?_smp_mflags} doc
+make %{?_smp_mflags} clean
+make %{?_smp_mflags} allautoconf
+make %{?_smp_mflags}
+make %{?_smp_mflags} drill
+make %{?_smp_mflags} examples
+make %{?_smp_mflags} doc
 
 %install
 rm -rf %{buildroot}
@@ -78,8 +83,11 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Dec 18 2005 Paul Wouters  1.0.0-7
+- Patched 'make clean' target to get rid of object files shipped with 1.0.0
+
 * Sun Dec 13 2005 Paul Wouters  1.0.0-6
-- added a make clean for 1.0.0 since .o files were left behind upstream,
+- added a make clean for 2.3.3 since .o files were left behind upstream,
   causing failure on ppc platform
 
 * Sun Dec 11 2005 Tom "spot" Callaway  1.0.0-5



From fedora-extras-commits at redhat.com  Mon Dec 19 02:37:29 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun, 18 Dec 2005 21:37:29 -0500
Subject: rpms/ldns/devel ldns.spec,1.4,1.5
Message-ID: <200512190238.jBJ2c00g001810@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1792

Modified Files:
	ldns.spec 
Log Message:
* Sun Dec 18 2005 Paul Wouters  1.0.0-8
- Cannot use make clean because there are no Makefiles. Use hardcoded rm.



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ldns.spec	19 Dec 2005 02:14:40 -0000	1.4
+++ ldns.spec	19 Dec 2005 02:37:27 -0000	1.5
@@ -5,7 +5,6 @@
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
-Patch0: %{name}-clean.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, autoconf, automake, gcc-c++, openssl-devel, doxygen
@@ -26,14 +25,13 @@
 
 %prep
 %setup -q 
-
-%patch0 -b .clean
+# only for 1.0.0, since upstream left .o files in release and 'make clean'
+# won't work without the Makefile.
+rm drill/*.o
 
 rm config.sub config.guess
 libtoolize
 autoreconf
-# only for 1.0.0, since upstream left .o files in release
-make clean
 
 %configure
 
@@ -83,6 +81,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Dec 18 2005 Paul Wouters  1.0.0-8
+- Cannot use make clean because there are no Makefiles. Use hardcoded rm.
+
 * Sun Dec 18 2005 Paul Wouters  1.0.0-7
 - Patched 'make clean' target to get rid of object files shipped with 1.0.0
 



From fedora-extras-commits at redhat.com  Mon Dec 19 02:39:16 2005
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun, 18 Dec 2005 21:39:16 -0500
Subject: rpms/ldns/devel ldns.spec,1.5,1.6
Message-ID: <200512190239.jBJ2dkt4002138@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1917

Modified Files:
	ldns.spec 
Log Message:
Forgot to increase release number



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ldns.spec	19 Dec 2005 02:37:27 -0000	1.5
+++ ldns.spec	19 Dec 2005 02:39:14 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.0.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 19 09:14:15 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 19 Dec 2005 04:14:15 -0500
Subject: rpms/moin/FC-4 moin-1.3.5-xml_newline.patch, NONE, 1.1 moin.spec,
	1.4, 1.5
Message-ID: <200512190915.jBJ9FEEQ015752@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/moin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15661/FC-4

Modified Files:
	moin.spec 
Added Files:
	moin-1.3.5-xml_newline.patch 
Log Message:
Include fix for XML output from Tommy Reynolds.


moin-1.3.5-xml_newline.patch:

--- NEW FILE moin-1.3.5-xml_newline.patch ---
diff -Naupr moin-1.3.5.orig/MoinMoin/formatter/xml_docbook.py moin-1.3.5/MoinMoin/formatter/xml_docbook.py
--- moin-1.3.5.orig/MoinMoin/formatter/xml_docbook.py	2005-07-26 20:46:50.000000000 +0200
+++ moin-1.3.5/MoinMoin/formatter/xml_docbook.py	2005-12-19 10:06:34.000000000 +0100
@@ -98,7 +98,7 @@ class Formatter(FormatterBase):
 
     def linebreak(self, preformatted=1):
         if preformatted:
-            self.text('\\n')
+            self.text('\n')
         else:
             #this should not happen
             #self.text('CRAP') 


Index: moin.spec
===================================================================
RCS file: /cvs/extras/rpms/moin/FC-4/moin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moin.spec	16 Aug 2005 14:25:26 -0000	1.4
+++ moin.spec	19 Dec 2005 09:14:11 -0000	1.5
@@ -1,16 +1,17 @@
 Summary: MoinMoin is a Python clone of WikiWiki
 Name:    moin
 Version: 1.3.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:   Applications/Internet
 URL:     http://moinmoin.wikiwikiweb.de/
 Source0: http://dl.sf.net/moin/moin-%{version}.tar.gz
 Source1: README-rpm
-Patch:   moin-1.3.5-config.patch
+Patch0:  moin-1.3.5-config.patch
+Patch1:  moin-1.3.5-xml_newline.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
-BuildRequires: python
+BuildRequires: python, dos2unix
 
 %description
 A WikiWikiWeb is a collaborative hypertext environment, with an emphasis on
@@ -21,7 +22,10 @@
 
 %prep
 %setup -q
-%patch -p1 -b .config
+%patch0 -p1 -b .config
+# This is required, as patch gets confused by the ^Ms otherwise
+dos2unix MoinMoin/formatter/xml_docbook.py
+%patch1 -p1 -b .xml_newline
 
 
 %build
@@ -48,6 +52,10 @@
 
 
 %changelog
+* 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.
+
 * Mon Aug 15 2005 Matthias Saou  1.3.5-2
 - Fix python modules path from _libdir to _prefix/lib so that build works on
   64bit systems too.



From fedora-extras-commits at redhat.com  Mon Dec 19 09:14:42 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 19 Dec 2005 04:14:42 -0500
Subject: rpms/moin/devel moin-1.3.5-xml_newline.patch, NONE, 1.1 moin.spec,
	1.4, 1.5
Message-ID: <200512190915.jBJ9Fg5G015924@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/moin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15661/devel

Modified Files:
	moin.spec 
Added Files:
	moin-1.3.5-xml_newline.patch 
Log Message:
Include fix for XML output from Tommy Reynolds.


moin-1.3.5-xml_newline.patch:

--- NEW FILE moin-1.3.5-xml_newline.patch ---
diff -Naupr moin-1.3.5.orig/MoinMoin/formatter/xml_docbook.py moin-1.3.5/MoinMoin/formatter/xml_docbook.py
--- moin-1.3.5.orig/MoinMoin/formatter/xml_docbook.py	2005-07-26 20:46:50.000000000 +0200
+++ moin-1.3.5/MoinMoin/formatter/xml_docbook.py	2005-12-19 10:06:34.000000000 +0100
@@ -98,7 +98,7 @@ class Formatter(FormatterBase):
 
     def linebreak(self, preformatted=1):
         if preformatted:
-            self.text('\\n')
+            self.text('\n')
         else:
             #this should not happen
             #self.text('CRAP') 


Index: moin.spec
===================================================================
RCS file: /cvs/extras/rpms/moin/devel/moin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moin.spec	16 Aug 2005 14:44:54 -0000	1.4
+++ moin.spec	19 Dec 2005 09:14:40 -0000	1.5
@@ -1,16 +1,17 @@
 Summary: MoinMoin is a Python clone of WikiWiki
 Name:    moin
 Version: 1.3.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:   Applications/Internet
 URL:     http://moinmoin.wikiwikiweb.de/
 Source0: http://dl.sf.net/moin/moin-%{version}.tar.gz
 Source1: README-rpm
-Patch:   moin-1.3.5-config.patch
+Patch0:  moin-1.3.5-config.patch
+Patch1:  moin-1.3.5-xml_newline.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
-BuildRequires: python
+BuildRequires: python, dos2unix
 
 %description
 A WikiWikiWeb is a collaborative hypertext environment, with an emphasis on
@@ -21,7 +22,10 @@
 
 %prep
 %setup -q
-%patch -p1 -b .config
+%patch0 -p1 -b .config
+# This is required, as patch gets confused by the ^Ms otherwise
+dos2unix MoinMoin/formatter/xml_docbook.py
+%patch1 -p1 -b .xml_newline
 
 
 %build
@@ -48,6 +52,10 @@
 
 
 %changelog
+* 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.
+
 * Mon Aug 15 2005 Matthias Saou  1.3.5-2
 - Fix python modules path from _libdir to _prefix/lib so that build works on
   64bit systems too.



From fedora-extras-commits at redhat.com  Mon Dec 19 09:17:29 2005
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Mon, 19 Dec 2005 04:17:29 -0500
Subject: rpms/dia/devel dia.spec,1.3,1.4
Message-ID: <200512190917.jBJ9HxLY015957@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15938

Modified Files:
	dia.spec 
Log Message:
rh#176003# pre/post


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dia.spec	20 Oct 2005 15:33:51 -0000	1.3
+++ dia.spec	19 Dec 2005 09:17:27 -0000	1.4
@@ -5,7 +5,7 @@
 Name: 		dia
 Summary:	A diagram drawing program.
 Version:	0.94
-Release:	16
+Release:	17
 Epoch:		1
 Source:		ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
 Group:		Applications/Multimedia
@@ -16,7 +16,8 @@
 Requires:	glib2, gtk2, libgnome, libgnomeui, libart_lgpl, libxslt
 Requires:	scrollkeeper, freetype >= %{freetype_version}
 Requires:       /usr/share/desktop-menu-patches/redhat-diagrams.desktop
-Prereq:         /usr/bin/scrollkeeper-update
+Requires(post): /usr/bin/scrollkeeper-update
+Requires(postun): /usr/bin/scrollkeeper-update
 
 BuildRequires:	libxml2-devel >= %{libxml2_version}, intltool > 0.21
 BuildRequires:	pango-devel >= %{pango_version}
@@ -112,6 +113,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon Dec 19 2005 Caolan McNamara  1:0.94-17
+- rh#176003# rejig Pre/Post
+
 * Thu Oct 20 2005 Caolan McNamara  1:0.94-16
 
 * Mon Oct 17 2005 Caolan McNamara 



From fedora-extras-commits at redhat.com  Mon Dec 19 09:44:53 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 19 Dec 2005 04:44:53 -0500
Subject: fedora-security/audit fc4,1.109,1.110
Message-ID: <200512190945.jBJ9jNcW016229@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16209

Modified Files:
	fc4 
Log Message:
Weekend updates



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- fc4	16 Dec 2005 09:00:46 -0000	1.109
+++ fc4	19 Dec 2005 09:44:50 -0000	1.110
@@ -1,28 +1,28 @@
-Up to date CVE as of CVE email 20051214
-Up to date FC4 as of 20051214
+Up to date CVE as of CVE email 20051218
+Up to date FC4 as of 20051218
 
 ** are items that need attention
 
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
-CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
+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-4077 backport (curl) [since FEDORA-2005-1137]
 CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
 CVE-2005-3193 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3193 VULNERABLE (xpdf)
-CVE-2005-3193 VULNERABLE (kdegraphics)
+CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3193 backport (poppler) [since FEDORA-2005-1132]
 CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3192 VULNERABLE (xpdf)
-CVE-2005-3192 VULNERABLE (kdegraphics)
+CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3192 backport (poppler) [since FEDORA-2005-1132]
 CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3191 VULNERABLE (xpdf)
-CVE-2005-3191 VULNERABLE (kdegraphics)
+CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3191 backport (poppler) [since FEDORA-2005-1132]
 CVE-2005-3964 VULNERABLE (openmotif) bz#174815
@@ -190,7 +190,7 @@
 CVE-2005-2498 version (php xml_rpc, fixed 1.4.0) [since FEDORA-2005-810]
 CVE-2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch
 CVE-2005-2495 backport (xorg-x11) [since FEDORA-2005-894]
-CVE-2005-2494 VULNERABLE (kdebase, fixed after 3.4.2) bz#166997
+CVE-2005-2494 version (kdebase, fixed after 3.4.2) [since FEDORA-2005-1152]
 CVE-2005-2491 ignore (python, fc4 python does not contain pcre)
 CVE-2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803]
 CVE-2005-2491 ignore (httpd, pcre uses system pcre)
@@ -254,7 +254,7 @@
 CVE-2005-2104 version (sysreport, fixed 1.4.1-5) [since FEDORA-2005-1071]
 CVE-2005-2103 version (gaim, fixed 1.5.0) [since FEDORA-2005-751]
 CVE-2005-2102 version (gaim, fixed 1.5.0) [since FEDORA-2005-751]
-CVE-2005-2101 backport (kdeedu) [since FEDORA-2005-744]
+CVE-2005-2101 version (kdeedu, fixed after 3.4.2) [since FEDORA-2005-1158] was backport since FEDORA-2005-744
 CVE-2005-2100 version (kernel, not upstream) only RHEL4
 CVE-2005-2099 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820]
 CVE-2005-2098 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820]



From fedora-extras-commits at redhat.com  Mon Dec 19 09:52:32 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 19 Dec 2005 04:52:32 -0500
Subject: rpms/gtkmm24/FC-4 gtkmm-2.6.5-devhelp.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 gtkmm.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200512190953.jBJ9r2Ce016273@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/gtkmm24/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16248

Modified Files:
	.cvsignore gtkmm.spec sources 
Added Files:
	gtkmm-2.6.5-devhelp.patch 
Log Message:
Update to 2.6.5, fixed devhelp documentation pashs

gtkmm-2.6.5-devhelp.patch:

--- NEW FILE gtkmm-2.6.5-devhelp.patch ---
--- gtkmm-2.6.5.origt/docs/reference/doxygen_to_devhelp.xsl	2005-12-18 23:38:23.000000000 -0800
+++ gtkmm-2.6.5/docs/reference/doxygen_to_devhelp.xsl	2004-01-02 01:56:46.000000000 -0800
@@ -5,7 +5,7 @@
 
 
 
-../../../doc/gtkmm-2.4/docs/reference/html/
+reference/html/
 
 
    - 2.6.5-1
+- Update to 2.6.5
+- Fixed devhelp documentation paths
+
 * Fri Apr 29 2005 Denis Leroy  - 2.6.2-2
 - Disabled building of demo and examples
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmm24/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Apr 2005 22:36:05 -0000	1.5
+++ sources	19 Dec 2005 09:52:29 -0000	1.6
@@ -1 +1 @@
-c1ffa447172b16d1ee787b1c69379c30  gtkmm-2.6.2.tar.bz2
+b7c3e15de77c58c309adb68aff51b34c  gtkmm-2.6.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 19 09:53:48 2005
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 19 Dec 2005 04:53:48 -0500
Subject: rpms/libsigc++20/FC-4 .cvsignore, 1.3, 1.4 libsigc++.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200512190954.jBJ9sIgv016321@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/libsigc++20/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16299

Modified Files:
	.cvsignore libsigc++.spec sources 
Log Message:
Update to 2.0.16


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsigc++20/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Apr 2005 21:39:37 -0000	1.3
+++ .cvsignore	19 Dec 2005 09:53:46 -0000	1.4
@@ -1 +1 @@
-libsigc++-2.0.11.tar.bz2
+libsigc++-2.0.16.tar.bz2


Index: libsigc++.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigc++20/FC-4/libsigc++.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsigc++.spec	28 Apr 2005 21:39:37 -0000	1.6
+++ libsigc++.spec	19 Dec 2005 09:53:46 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           libsigc++20
-Version:        2.0.11
+Version:        2.0.16
 Release:        1
 
 Summary:        Typesafe signal framework for C++
@@ -81,6 +81,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Sun Dec 18 2005 Denis Leroy  - 2.0.16-1
+- Update to 2.0.16
+
 * Sat Apr  9 2005 Denis Leroy  - 2.0.11-1
 - Upgrade to version 2.0.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsigc++20/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Apr 2005 21:39:37 -0000	1.4
+++ sources	19 Dec 2005 09:53:46 -0000	1.5
@@ -1 +1 @@
-9e28167ebe664593c9222092e2a51d06  libsigc++-2.0.11.tar.bz2
+bd997b35a420861259a68d5f27a7592e  libsigc++-2.0.16.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 19 10:06:14 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 19 Dec 2005 05:06:14 -0500
Subject: rpms/bittorrent/devel bittorrent.spec, 1.32, 1.33 sources, 1.15,
	1.16 .cvsignore, 1.15, 1.16
Message-ID: <200512191006.jBJA6n7E018044@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18019

Modified Files:
	bittorrent.spec sources .cvsignore 
Log Message:
Update to 4.2.2



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- bittorrent.spec	6 Dec 2005 11:51:49 -0000	1.32
+++ bittorrent.spec	19 Dec 2005 10:06:12 -0000	1.33
@@ -3,7 +3,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        4.2.1
+Version:        4.2.2
 Release:        1%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
@@ -217,6 +217,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Mon Dec 19 2005 Paul Howarth  4.2.2-1
+- Update to 4.2.2
+
 * Tue Dec  6 2005 Paul Howarth  4.2.1-1
 - Update to 4.2.1
 - Source now at www.bittorrent.com rather than sourceforge


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Dec 2005 11:51:49 -0000	1.15
+++ sources	19 Dec 2005 10:06:12 -0000	1.16
@@ -1 +1 @@
-0deb2e083e95206a9e601ff6ca35b826  BitTorrent-4.2.1.tar.gz
+2a85715b8ef0335ecc9e8ad91860231b  BitTorrent-4.2.2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	6 Dec 2005 11:51:49 -0000	1.15
+++ .cvsignore	19 Dec 2005 10:06:12 -0000	1.16
@@ -1 +1 @@
-BitTorrent-4.2.1.tar.gz
+BitTorrent-4.2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 19 10:09:11 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 19 Dec 2005 05:09:11 -0500
Subject: rpms/bittorrent/FC-4 bittorrent.spec, 1.17, 1.18 sources, 1.9,
	1.10 .cvsignore, 1.9, 1.10
Message-ID: <200512191009.jBJA9BaR018118@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18096

Modified Files:
	bittorrent.spec sources .cvsignore 
Log Message:
resync with devel



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-4/bittorrent.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bittorrent.spec	6 Dec 2005 11:54:20 -0000	1.17
+++ bittorrent.spec	19 Dec 2005 10:08:56 -0000	1.18
@@ -3,7 +3,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        4.2.1
+Version:        4.2.2
 Release:        1%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
@@ -217,6 +217,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Mon Dec 19 2005 Paul Howarth  4.2.2-1
+- Update to 4.2.2
+
 * Tue Dec  6 2005 Paul Howarth  4.2.1-1
 - Update to 4.2.1
 - Source now at www.bittorrent.com rather than sourceforge


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 Dec 2005 11:54:20 -0000	1.9
+++ sources	19 Dec 2005 10:08:56 -0000	1.10
@@ -1 +1 @@
-0deb2e083e95206a9e601ff6ca35b826  BitTorrent-4.2.1.tar.gz
+2a85715b8ef0335ecc9e8ad91860231b  BitTorrent-4.2.2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	6 Dec 2005 11:54:20 -0000	1.9
+++ .cvsignore	19 Dec 2005 10:08:56 -0000	1.10
@@ -1 +1 @@
-BitTorrent-4.2.1.tar.gz
+BitTorrent-4.2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 19 10:11:58 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 19 Dec 2005 05:11:58 -0500
Subject: rpms/bittorrent/FC-3 bittorrent.spec, 1.12, 1.13 sources, 1.9,
	1.10 .cvsignore, 1.9, 1.10
Message-ID: <200512191012.jBJACSuo018217@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18187

Modified Files:
	bittorrent.spec sources .cvsignore 
Log Message:
resync with devel



Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/bittorrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bittorrent.spec	6 Dec 2005 11:58:36 -0000	1.12
+++ bittorrent.spec	19 Dec 2005 10:11:55 -0000	1.13
@@ -3,7 +3,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bittorrent
-Version:        4.2.1
+Version:        4.2.2
 Release:        1%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
@@ -217,6 +217,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Mon Dec 19 2005 Paul Howarth  4.2.2-1
+- Update to 4.2.2
+
 * Tue Dec  6 2005 Paul Howarth  4.2.1-1
 - Update to 4.2.1
 - Source now at www.bittorrent.com rather than sourceforge


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 Dec 2005 11:56:32 -0000	1.9
+++ sources	19 Dec 2005 10:11:55 -0000	1.10
@@ -1 +1 @@
-0deb2e083e95206a9e601ff6ca35b826  BitTorrent-4.2.1.tar.gz
+2a85715b8ef0335ecc9e8ad91860231b  BitTorrent-4.2.2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	6 Dec 2005 11:56:32 -0000	1.9
+++ .cvsignore	19 Dec 2005 10:11:55 -0000	1.10
@@ -1 +1 @@
-BitTorrent-4.2.1.tar.gz
+BitTorrent-4.2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 19 15:24:51 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Mon, 19 Dec 2005 10:24:51 -0500
Subject: rpms/x3270/devel x3270.spec,1.16,1.17
Message-ID: <200512191525.jBJFPMP8027985@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/x3270/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27963

Modified Files:
	x3270.spec 
Log Message:
- test build without modular-X patch


Index: x3270.spec
===================================================================
RCS file: /cvs/extras/rpms/x3270/devel/x3270.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- x3270.spec	23 Nov 2005 14:45:12 -0000	1.16
+++ x3270.spec	19 Dec 2005 15:24:48 -0000	1.17
@@ -5,7 +5,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.4p6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -86,7 +86,7 @@
 chmod +x gccmakedep
 export PATH="$PATH:`pwd`"
 xmkmf
-patch -p1 < %{PATCH5}
+#patch -p1 < %{PATCH5}
 make Makefiles
 make includes
 make depend
@@ -203,6 +203,9 @@
 %{_mandir}/man1/c3270*
 
 %changelog
+* Mon Dec 19 2005 Karsten Hopp  3.3.4p6-4
+- test build without modular-X patch
+
 * Wed Nov 23 2005 Karsten Hopp  3.3.4p6-3
 - update release again
 



From fedora-extras-commits at redhat.com  Mon Dec 19 15:57:24 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 19 Dec 2005 10:57:24 -0500
Subject: rpms/enca/devel .cvsignore, 1.3, 1.4 enca.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200512191557.jBJFvs86028200@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28174

Modified Files:
	.cvsignore enca.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enca/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Nov 2005 14:51:57 -0000	1.3
+++ .cvsignore	19 Dec 2005 15:57:22 -0000	1.4
@@ -1 +1 @@
-enca-1.8.tar.bz2
+enca-1.9.tar.bz2


Index: enca.spec
===================================================================
RCS file: /cvs/extras/rpms/enca/devel/enca.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- enca.spec	28 Nov 2005 14:51:57 -0000	1.2
+++ enca.spec	19 Dec 2005 15:57:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name: enca
 Summary: Character set analyzer and detector
-Version: 1.8
+Version: 1.9
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Text
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Dmitry Butskoy  - 1.9-1
+- upgrade to 1.9
+
 * Mon Nov 28 2005 Dmitry Butskoy  - 1.8-1
 - upgrade to 1.8
 - update description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enca/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Nov 2005 14:51:57 -0000	1.3
+++ sources	19 Dec 2005 15:57:22 -0000	1.4
@@ -1 +1 @@
-c7ca49601dd80d0300bbb80d5121cf75  enca-1.8.tar.bz2
+b3581e28d68d452286fb0bfe58bed3b3  enca-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 19 16:15:09 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 19 Dec 2005 11:15:09 -0500
Subject: rpms/enca/FC-4 enca.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200512191615.jBJGFdDM029908@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29887

Modified Files:
	enca.spec sources 
Log Message:



Index: enca.spec
===================================================================
RCS file: /cvs/extras/rpms/enca/FC-4/enca.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- enca.spec	28 Nov 2005 15:11:54 -0000	1.2
+++ enca.spec	19 Dec 2005 16:15:06 -0000	1.3
@@ -1,6 +1,6 @@
 Name: enca
 Summary: Character set analyzer and detector
-Version: 1.8
+Version: 1.9
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Text
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Dmitry Butskoy  - 1.9-1
+- upgrade to 1.9
+
 * Mon Nov 28 2005 Dmitry Butskoy  - 1.8-1
 - upgrade to 1.8
 - update description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enca/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Nov 2005 15:11:54 -0000	1.3
+++ sources	19 Dec 2005 16:15:06 -0000	1.4
@@ -1 +1 @@
-c7ca49601dd80d0300bbb80d5121cf75  enca-1.8.tar.bz2
+b3581e28d68d452286fb0bfe58bed3b3  enca-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 19 16:16:02 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 19 Dec 2005 11:16:02 -0500
Subject: rpms/kdesvn/devel kdesvn.spec,1.8,1.9
Message-ID: <200512191616.jBJGGWYf029992@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29918

Modified Files:
	kdesvn.spec 
Log Message:
- Add missing files not detected by mock
- Add patch to fix gcc41 compile error



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdesvn.spec	14 Dec 2005 23:07:40 -0000	1.8
+++ kdesvn.spec	19 Dec 2005 16:16:00 -0000	1.9
@@ -2,14 +2,15 @@
 
 Name:           kdesvn
 Version:        0.7.1
-Release:        2%{?dist}
-Summary:        A subversion client for KDE
+Release:        3%{?dist}
+Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://www.alwins-world.de/programs/kdesvn/
 Source0:        http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{srcver}.tar.gz
 Patch0:         kdesvn-0.7.1-x.patch
+Patch1:         kdesvn-0.7.1-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs-devel, neon-devel
@@ -32,6 +33,7 @@
 %prep
 %setup -q -n %{name}-%{srcver}
 %patch -p1 -b .x11
+%patch1 -p1 -b .gcc41
 
 
 %build
@@ -56,6 +58,8 @@
 %find_lang %{name} || touch %{name}.lang
 #Fix doc link
 ln -sf ../common $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/en/%{name}
+#Don't conflict with kdebase
+rm $RPM_BUILD_ROOT%{_datadir}/services/svn*.protocol
 
 
 %clean
@@ -84,19 +88,24 @@
 %doc AUTHORS ChangeLog COPYING GPL.txt
 %{_bindir}/kdesvn
 %{_bindir}/kdesvnaskpass
-%{_libdir}/kde3/libkdesvnpart.*
+%{_libdir}/kde3/*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/kdesvn/
 %{_datadir}/apps/kdesvnpart/
+%{_datadir}/apps/konqueror/servicemenus/kdesvn*.desktop
 %{_datadir}/config.kcfg/kdesvn_part.kcfg
 %{_datadir}/doc/HTML/en/kdesvn/
-%{_datadir}/icons/hicolor/16x16/apps/kdesvn.png
-%{_datadir}/icons/hicolor/32x32/apps/kdesvn.png
-%{_datadir}/icons/hicolor/48x48/apps/kdesvn.png
-%{_datadir}/icons/hicolor/64x64/apps/kdesvn.png
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/hicolor/*/*/*.svgz
+%{_datadir}/services/kded/kdesvnd.desktop
+%{_datadir}/services/ksvn*.protocol
 
 
 %changelog
+* Fri Dec 16 2005 - Orion Poplawski  - 0.7.1-3
+- Add missing files not detected by mock
+- Add patch to fix gcc41 compile error
+
 * Tue Dec 13 2005 - Orion Poplawski  - 0.7.1-2
 - Specify apr-1-config and apu-1-config to configure
 



From fedora-extras-commits at redhat.com  Mon Dec 19 16:16:22 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 19 Dec 2005 11:16:22 -0500
Subject: rpms/enca/FC-3 enca.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200512191616.jBJGGqL8030034@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/enca/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29973

Modified Files:
	enca.spec sources 
Log Message:



Index: enca.spec
===================================================================
RCS file: /cvs/extras/rpms/enca/FC-3/enca.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- enca.spec	28 Nov 2005 15:13:23 -0000	1.2
+++ enca.spec	19 Dec 2005 16:16:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name: enca
 Summary: Character set analyzer and detector
-Version: 1.8
+Version: 1.9
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Text
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Dmitry Butskoy  - 1.9-1
+- upgrade to 1.9
+
 * Mon Nov 28 2005 Dmitry Butskoy  - 1.8-1
 - upgrade to 1.8
 - update description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enca/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Nov 2005 15:13:23 -0000	1.3
+++ sources	19 Dec 2005 16:16:20 -0000	1.4
@@ -1 +1 @@
-c7ca49601dd80d0300bbb80d5121cf75  enca-1.8.tar.bz2
+b3581e28d68d452286fb0bfe58bed3b3  enca-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Dec 19 16:20:39 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 19 Dec 2005 11:20:39 -0500
Subject: rpms/kdesvn/devel kdesvn-0.7.1-gcc41.patch,NONE,1.1
Message-ID: <200512191620.jBJGKdJ7030101@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30088

Added Files:
	kdesvn-0.7.1-gcc41.patch 
Log Message:
patch to fix gcc41 compile error


kdesvn-0.7.1-gcc41.patch:

--- NEW FILE kdesvn-0.7.1-gcc41.patch ---
--- kdesvn-0.7.1/src/svncpp/targets.hpp.orig	2005-12-14 16:09:29.000000000 -0700
+++ kdesvn-0.7.1/src/svncpp/targets.hpp	2005-12-14 16:13:21.000000000 -0700
@@ -78,7 +78,7 @@
      * Constructor. Convert stringlist into target list.
      * @param targets
      */
-    Targets::Targets(const QStringList&targets);
+    Targets (const QStringList & targets);
 
     /**
      * Copy Constructor



From fedora-extras-commits at redhat.com  Mon Dec 19 17:22:39 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Mon, 19 Dec 2005 12:22:39 -0500
Subject: owners owners.list,1.466,1.467
Message-ID: <200512191723.jBJHN9ra032064@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32044

Modified Files:
	owners.list 
Log Message:
s,!,|,


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -r1.466 -r1.467
--- owners.list	18 Dec 2005 20:26:48 -0000	1.466
+++ owners.list	19 Dec 2005 17:22:37 -0000	1.467
@@ -1312,4 +1312,4 @@
 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|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|
-Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP!enrico.scholz at informatik.tu-chemnitz.de!extras-qa at fedoraproject.org|
+Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 19 17:48:45 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 12:48:45 -0500
Subject: rpms/lapack/FC-4 lapack.spec,1.8,1.9
Message-ID: <200512191749.jBJHnFEE000886@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lapack/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv847/FC-4

Modified Files:
	lapack.spec 
Log Message:

Bump for gcc4.1.



Index: lapack.spec
===================================================================
RCS file: /cvs/extras/rpms/lapack/FC-4/lapack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lapack.spec	15 Nov 2005 15:45:38 -0000	1.8
+++ lapack.spec	19 Dec 2005 17:48:43 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: The LAPACK libraries for numerical linear algebra.
 Name: lapack
 Version: 3.0
-Release: 35%{?dist}
+Release: 36%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
@@ -164,6 +164,9 @@
 %{_libdir}/libblas*.a
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  3.0-36
+- bump for gcc4.1
+
 * Tue Nov 15 2005 Tom "spot" Callaway  3.0-35
 - try not to patch files that do not exist
 



From fedora-extras-commits at redhat.com  Mon Dec 19 17:48:50 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 12:48:50 -0500
Subject: rpms/lapack/devel lapack.spec,1.8,1.9
Message-ID: <200512191749.jBJHnLqD000891@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lapack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv847/devel

Modified Files:
	lapack.spec 
Log Message:

Bump for gcc4.1.



Index: lapack.spec
===================================================================
RCS file: /cvs/extras/rpms/lapack/devel/lapack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lapack.spec	15 Nov 2005 15:45:43 -0000	1.8
+++ lapack.spec	19 Dec 2005 17:48:48 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: The LAPACK libraries for numerical linear algebra.
 Name: lapack
 Version: 3.0
-Release: 35%{?dist}
+Release: 36%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
@@ -164,6 +164,9 @@
 %{_libdir}/libblas*.a
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  3.0-36
+- bump for gcc4.1
+
 * Tue Nov 15 2005 Tom "spot" Callaway  3.0-35
 - try not to patch files that do not exist
 



From fedora-extras-commits at redhat.com  Mon Dec 19 18:06:17 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:06:17 -0500
Subject: rpms/openslp/FC-4 openslp.spec,1.9,1.10
Message-ID: <200512191808.jBJI88i4002754@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/openslp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2698/FC-4

Modified Files:
	openslp.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  1.2.1-4
- make %postun safer



Index: openslp.spec
===================================================================
RCS file: /cvs/extras/rpms/openslp/FC-4/openslp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openslp.spec	16 Nov 2005 17:02:24 -0000	1.9
+++ openslp.spec	19 Dec 2005 18:06:13 -0000	1.10
@@ -1,9 +1,8 @@
-# $Id$
 
 Summary: Open implementation of Service Location Protocol V2
 Name:    openslp
 Version: 1.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   System Environment/Libraries
 License: BSD
@@ -141,8 +140,12 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  1.2.1-4
+- make %%postun safer
+
 * Wed Nov 16 2005 Rex Dieter  1.2.1-3
-- rebuild for new openssl
+- rebuild (for new openssl)
+- make %%postun safer
 
 * Fri Oct 21 2005 Rex Dieter  1.2.1-2
 - -fPIC (for x86_64)



From fedora-extras-commits at redhat.com  Mon Dec 19 18:05:56 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:05:56 -0500
Subject: rpms/openslp/FC-3 openslp.spec,1.6,1.7
Message-ID: <200512191807.jBJI7o3i002750@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/openslp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2698/FC-3

Modified Files:
	openslp.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  1.2.1-4
- make %postun safer



Index: openslp.spec
===================================================================
RCS file: /cvs/extras/rpms/openslp/FC-3/openslp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openslp.spec	16 Nov 2005 17:02:01 -0000	1.6
+++ openslp.spec	19 Dec 2005 18:05:54 -0000	1.7
@@ -1,9 +1,8 @@
-# $Id$
 
 Summary: Open implementation of Service Location Protocol V2
 Name:    openslp
 Version: 1.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   System Environment/Libraries
 License: BSD
@@ -141,8 +140,12 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  1.2.1-4
+- make %%postun safer
+
 * Wed Nov 16 2005 Rex Dieter  1.2.1-3
-- rebuild for new openssl
+- rebuild (for new openssl)
+- make %%postun safer
 
 * Fri Oct 21 2005 Rex Dieter  1.2.1-2
 - -fPIC (for x86_64)



From fedora-extras-commits at redhat.com  Mon Dec 19 18:06:53 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:06:53 -0500
Subject: rpms/openslp/devel openslp.spec,1.10,1.11
Message-ID: <200512191808.jBJI88TZ002753@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/openslp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2698/devel

Modified Files:
	openslp.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  1.2.1-4
- make %postun safer



Index: openslp.spec
===================================================================
RCS file: /cvs/extras/rpms/openslp/devel/openslp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openslp.spec	16 Nov 2005 17:02:49 -0000	1.10
+++ openslp.spec	19 Dec 2005 18:06:51 -0000	1.11
@@ -1,9 +1,8 @@
-# $Id$
 
 Summary: Open implementation of Service Location Protocol V2
 Name:    openslp
 Version: 1.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   System Environment/Libraries
 License: BSD
@@ -141,8 +140,12 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  1.2.1-4
+- make %%postun safer
+
 * Wed Nov 16 2005 Rex Dieter  1.2.1-3
-- rebuild for new openssl
+- rebuild (for new openssl)
+- make %%postun safer
 
 * Fri Oct 21 2005 Rex Dieter  1.2.1-2
 - -fPIC (for x86_64)



From fedora-extras-commits at redhat.com  Mon Dec 19 18:09:04 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:09:04 -0500
Subject: rpms/libtunepimp/devel libtunepimp.spec,1.2,1.3
Message-ID: <200512191809.jBJI9cW1002809@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2762/devel

Modified Files:
	libtunepimp.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0-4
- -tools: fix Req: %name dependancy



Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtunepimp.spec	28 Nov 2005 16:08:37 -0000	1.2
+++ libtunepimp.spec	19 Dec 2005 18:09:02 -0000	1.3
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp 
 Version: 0.4.0 
-Release: 3%{?dist}
+Release: 4%{?dist}
 # README.LGPL implies that it's not completely lgpl, yet.
 License: GPL
 Group: 	 System Environment/Libraries
@@ -32,7 +32,7 @@
 %package tools
 Summary: MusicBrainz tagging tools 
 Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{version}
+Requires: %{name} = %{version}-%{release}
 Obsoletes: trm < %{version}-%{release}
 Provides:  trm = %{version}-%{release}
 %description tools
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0-4
+- -tools: fix Req: %%name dependancy
+
 * Mon Nov 28 2005 Rex Dieter  0.4.0-3
 - -tools: split out %%_bindir bits (to be multi-arch friendly)
 



From fedora-extras-commits at redhat.com  Mon Dec 19 18:08:44 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:08:44 -0500
Subject: rpms/libtunepimp/FC-4 libtunepimp.spec,1.2,1.3
Message-ID: <200512191809.jBJI9nbh002813@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2762/FC-4

Modified Files:
	libtunepimp.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0-4
- -tools: fix Req: %name dependancy



Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-4/libtunepimp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtunepimp.spec	28 Nov 2005 16:08:11 -0000	1.2
+++ libtunepimp.spec	19 Dec 2005 18:08:42 -0000	1.3
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp 
 Version: 0.4.0 
-Release: 3%{?dist}
+Release: 4%{?dist}
 # README.LGPL implies that it's not completely lgpl, yet.
 License: GPL
 Group: 	 System Environment/Libraries
@@ -32,7 +32,7 @@
 %package tools
 Summary: MusicBrainz tagging tools 
 Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{version}
+Requires: %{name} = %{version}-%{release}
 Obsoletes: trm < %{version}-%{release}
 Provides:  trm = %{version}-%{release}
 %description tools
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0-4
+- -tools: fix Req: %%name dependancy
+
 * Mon Nov 28 2005 Rex Dieter  0.4.0-3
 - -tools: split out %%_bindir bits (to be multi-arch friendly)
 



From fedora-extras-commits at redhat.com  Mon Dec 19 18:10:32 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 19 Dec 2005 13:10:32 -0500
Subject: rpms/atlas/devel atlas.spec,1.4,1.5
Message-ID: <200512191811.jBJIB4wG002956@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/atlas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2900

Modified Files:
	atlas.spec 
Log Message:
Rebuild for gcc 4.1.


Index: atlas.spec
===================================================================
RCS file: /cvs/extras/rpms/atlas/devel/atlas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- atlas.spec	10 Oct 2005 15:19:06 -0000	1.4
+++ atlas.spec	19 Dec 2005 18:10:30 -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
@@ -537,6 +537,9 @@
 %endif
 
 %changelog
+* Mon Dec 19 2005 Quentin Spencer  3.6.0-9
+- Rebuild for gcc 4.1.
+
 * 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  Mon Dec 19 18:14:27 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:14:27 -0500
Subject: rpms/kasablanca/FC-3 kasablanca.spec,1.7,1.8
Message-ID: <200512191814.jBJIEv5L003146@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3096/FC-3

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
- %post/%postun: nicer icon bits



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-3/kasablanca.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kasablanca.spec	16 Nov 2005 17:09:01 -0000	1.7
+++ kasablanca.spec	19 Dec 2005 18:14:25 -0000	1.8
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -81,12 +81,17 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-  
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 %postun 
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 
 
 %files -f %{name}.lang
@@ -100,8 +105,11 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
+- %%post/%%postun: nicer icon bits
+
 * Wed Nov 16 2005 Rex Dieter  0.4.0.2-4 
-- rebuild for new openssl
+- rebuild for new openssl (fc5)
 
 * Thu Nov 10 2005 Rex Dieter  0.4.0.2-3
 - abs->relative symlinks



From fedora-extras-commits at redhat.com  Mon Dec 19 18:14:32 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:14:32 -0500
Subject: rpms/kasablanca/FC-4 kasablanca.spec,1.7,1.8
Message-ID: <200512191815.jBJIF3l2003151@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3096/FC-4

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
- %post/%postun: nicer icon bits



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-4/kasablanca.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kasablanca.spec	16 Nov 2005 17:09:08 -0000	1.7
+++ kasablanca.spec	19 Dec 2005 18:14:30 -0000	1.8
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -81,12 +81,17 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-  
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 %postun 
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 
 
 %files -f %{name}.lang
@@ -100,8 +105,11 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
+- %%post/%%postun: nicer icon bits
+
 * Wed Nov 16 2005 Rex Dieter  0.4.0.2-4 
-- rebuild for new openssl
+- rebuild for new openssl (fc5)
 
 * Thu Nov 10 2005 Rex Dieter  0.4.0.2-3
 - abs->relative symlinks



From fedora-extras-commits at redhat.com  Mon Dec 19 18:14:38 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 13:14:38 -0500
Subject: rpms/kasablanca/devel kasablanca.spec,1.7,1.8
Message-ID: <200512191815.jBJIF8Zh003154@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3096/devel

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
- %post/%postun: nicer icon bits



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kasablanca.spec	16 Nov 2005 17:09:25 -0000	1.7
+++ kasablanca.spec	19 Dec 2005 18:14:36 -0000	1.8
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -81,12 +81,17 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-  
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 %postun 
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 
 
 %files -f %{name}.lang
@@ -100,8 +105,11 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
+- %%post/%%postun: nicer icon bits
+
 * Wed Nov 16 2005 Rex Dieter  0.4.0.2-4 
-- rebuild for new openssl
+- rebuild for new openssl (fc5)
 
 * Thu Nov 10 2005 Rex Dieter  0.4.0.2-3
 - abs->relative symlinks



From fedora-extras-commits at redhat.com  Mon Dec 19 18:29:20 2005
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Mon, 19 Dec 2005 13:29:20 -0500
Subject: owners owners.list,1.467,1.468
Message-ID: <200512191829.jBJITonv003490@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3465

Modified Files:
	owners.list 
Log Message:
Changing owners for fwbuilder and libfwbuilder



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- owners.list	19 Dec 2005 17:22:37 -0000	1.467
+++ owners.list	19 Dec 2005 18:29:18 -0000	1.468
@@ -225,7 +225,7 @@
 Fedora Extras|fuse|File System in Userspace|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|fwbuilder|Firewall Builder|sgrubb at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|fyre|A tool for creating artwork from chaotic functions|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org|
@@ -477,7 +477,7 @@
 Fedora Extras|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|libeXosip2|A library that hides the complexity of using the SIP protocol|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org|
 Fedora Extras|libfac|An extension to Singular-factory|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|libfwbuilder|Firewall Builder API|sgrubb at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|libfwbuilder|Firewall Builder API|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 19 18:30:35 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 19 Dec 2005 13:30:35 -0500
Subject: rpms/syslog-ng/devel syslog-ng.spec,1.9,1.10
Message-ID: <200512191831.jBJIV52D003524@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/syslog-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3502

Modified Files:
	syslog-ng.spec 
Log Message:
Provides syslog instead of sysklogd (#172885).


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- syslog-ng.spec	30 Nov 2005 15:57:02 -0000	1.9
+++ syslog-ng.spec	19 Dec 2005 18:30:33 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:             syslog-ng
 Version:          1.6.9
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Syslog replacement daemon
 
 Group:            System Environment/Daemons
@@ -25,12 +25,7 @@
 #
 # Keep initscripts and vixie-cron happy
 #
-# rpm -e sysklogd
-# error: removing these packages would break dependencies:
-#        sysklogd >= 1.3.31 is needed by initscripts-6.67-1
-#        sysklogd >= 1.3.33-6 is needed by vixie-cron-3.0.1-64
-#
-Provides:         sysklogd = 1.4.1-99
+Provides:         syslog
 
 %description
 syslog-ng, as the name shows, is a syslogd replacement, but with new 
@@ -119,6 +114,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Jose Pedro Oliveira  - 1.6.9-2
+- Provides syslog instead of sysklogd (#172885).
+
 * Wed Nov 30 2005 Jose Pedro Oliveira  - 1.6.9-1
 - Build conflict statement
   (see: https://lists.balabit.hu/pipermail/syslog-ng/2005-June/007630.html)
@@ -260,4 +258,4 @@
 * Sun Dec 08 2002 Richard E. Perlotto II  1.5.23-1
 - Updated file with notes and PGP signatures
 
-# vim:set ai ts=4 sw=4:
+# vim:set ai ts=4 sw=4 sts=4:



From fedora-extras-commits at redhat.com  Mon Dec 19 19:34:44 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 14:34:44 -0500
Subject: rpms/xforms/devel xforms.spec,1.11,1.12
Message-ID: <200512191935.jBJJZEr3005508@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xforms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5486

Modified Files:
	xforms.spec 
Log Message:
modular X fixes



Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xforms.spec	17 Oct 2005 19:26:33 -0000	1.11
+++ xforms.spec	19 Dec 2005 19:34:41 -0000	1.12
@@ -1,4 +1,3 @@
-# $Id$
 
 Name:    xforms
 Summary: XForms toolkit library
@@ -14,8 +13,10 @@
 
 BuildRequires: libjpeg-devel
 BuildRequires: libGL-devel
-# coming soon
-# BuildRequires: libXpm-devel
+%if "%{?fedora}" > "4"
+BuildRequires: libXpm-devel
+%define x_deps libX11-devel
+%endif
 
 # import/export: png, sgi (optional?)
 Requires: netpbm-progs
@@ -36,6 +37,7 @@
 Summary: Development files for the XForms toolkit library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: %{?x_deps}%{!?x_deps:XFree86-devel}
 %description devel
 %{summary}.
 
@@ -86,6 +88,10 @@
 
 
 %changelog 
+* Mon Dec 19 2005 Rex Dieter  1.0.90-4
+- BR: libXpm-devel
+- -devel: Req: libX11-devel 
+
 * Mon Oct 17 2005 Rex Dieter  1.0.90-3
 - BR: libGL-devel
 - #BR: libXpm-devel (coming soon)



From fedora-extras-commits at redhat.com  Mon Dec 19 20:26:21 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 19 Dec 2005 15:26:21 -0500
Subject: rpms/nautilus-sendto/devel Makefile, 1.1, NONE nautilus-sendto.spec,
	1.1, NONE sources, 1.2, NONE
Message-ID: <200512192026.jBJKQLrk007757@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/nautilus-sendto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7737

Removed Files:
	Makefile nautilus-sendto.spec sources 
Log Message:
nautilus-sendto has been sent to FC5.



--- Makefile DELETED ---


--- nautilus-sendto.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Dec 19 20:32:38 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 19 Dec 2005 15:32:38 -0500
Subject: rpms/ufsparse/devel ufsparse-0.92-Makefile-patch, NONE,
	1.1 ufsparse.spec, 1.7, 1.8
Message-ID: <200512192033.jBJKX82w007852@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ufsparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7833

Modified Files:
	ufsparse.spec 
Added Files:
	ufsparse-0.92-Makefile-patch 
Log Message:
Add patch0. Fails on x86_64 without it.


--- NEW FILE ufsparse-0.92-Makefile-patch ---
--- LDL/Makefile.~1~	2005-11-15 12:35:51.000000000 -0600
+++ LDL/Makefile	2005-12-19 14:22:39.000000000 -0600
@@ -6,6 +6,8 @@
 
 include ../UFconfig/UFconfig.mk
 
+C = $(CC) $(CFLAGS)
+
 all: intro libldl.a ldlsimple ldlmain ldlamd
 
 intro:
@@ -24,7 +26,7 @@
 #-------------------------------------------------------------------------------
 
 libldl.a: ldl.c ldl.h
-	$(CC) -c -O ldl.c -o ldl.o
+	$(C) -c ldl.c -o ldl.o
 	$(AR) libldl.a ldl.o
 	- $(RANLIB) libldl.a
 
@@ -33,18 +35,18 @@
 #-------------------------------------------------------------------------------
 
 ldlmain:  ldlmain.c libldl.a
-	$(CC) -O ldlmain.c libldl.a -o ldlmain -lm
+	$(C)  ldlmain.c libldl.a -o ldlmain -lm
 	- ./ldlmain > my_ldlmain.out
 	- diff ldlmain.out my_ldlmain.out
 
 ldlsimple:  ldlsimple.c libldl.a
-	$(CC) -O ldlsimple.c libldl.a -o ldlsimple -lm
+	$(C) ldlsimple.c libldl.a -o ldlsimple -lm
 	- ./ldlsimple > my_ldlsimple.out
 	- diff ldlsimple.out my_ldlsimple.out
 
 ldlamd:  ldlmain.c libldl.a
 	- make -C ../AMD
-	- $(CC) -O -I../AMD/Include -L../AMD/Lib -DUSE_AMD ldlmain.c -lamd libldl.a -o ldlamd -lm
+	- $(C) -I../AMD/Include -L../AMD/Lib -DUSE_AMD ldlmain.c -lamd libldl.a -o ldlamd -lm
 	- ./ldlamd > my_ldlamd.out
 	- diff ldlamd.out my_ldlamd.out
 


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ufsparse.spec	14 Dec 2005 15:56:07 -0000	1.7
+++ ufsparse.spec	19 Dec 2005 20:32:36 -0000	1.8
@@ -1,12 +1,13 @@
 Name:           ufsparse
 Version:        0.92
-Release:        1%{?dist}
+Release:        2%{?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
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q -n UFsparse
+%patch -p0
 chmod -R a+r *
 
 %build
@@ -233,6 +235,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Wed Dec 14 2005 Quentin Spencer  0.92-2
+- Add patch0--fixes LDL/Makefile so CFLAGS are used when compiling ldl.a.
+
 * Wed Dec 14 2005 Quentin Spencer  0.92-1
 - Update to Dec 8 2005 version.
 



From fedora-extras-commits at redhat.com  Mon Dec 19 21:17:15 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 16:17:15 -0500
Subject: rpms/xforms/devel xforms.spec,1.12,1.13
Message-ID: <200512192117.jBJLHkq6009728@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xforms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9710

Modified Files:
	xforms.spec 
Log Message:
Release++



Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xforms.spec	19 Dec 2005 19:34:41 -0000	1.12
+++ xforms.spec	19 Dec 2005 21:17:13 -0000	1.13
@@ -2,7 +2,7 @@
 Name:    xforms
 Summary: XForms toolkit library
 Version: 1.0.90
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: LGPL
 Group:   System Environment/Libraries



From fedora-extras-commits at redhat.com  Mon Dec 19 21:21:37 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 19 Dec 2005 16:21:37 -0500
Subject: rpms/plt-scheme/FC-4 .cvsignore, 1.4, 1.5 plt-scheme.spec, 1.12,
	1.13 sources, 1.4, 1.5
Message-ID: <200512192122.jBJLM7Wg009804@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9782

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version 300


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Nov 2005 01:39:52 -0000	1.4
+++ .cvsignore	19 Dec 2005 21:21:34 -0000	1.5
@@ -1 +1 @@
-plt-299.400-src-unix.tgz
+plt-300-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-4/plt-scheme.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plt-scheme.spec	26 Nov 2005 01:39:52 -0000	1.12
+++ plt-scheme.spec	19 Dec 2005 21:21:34 -0000	1.13
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        299.400
+Version:        300
 Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/299.400/plt/plt-299.400-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/300/plt/plt-300-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,8 +55,6 @@
 %build
 cd src
 %configure --enable-gl --enable-xrender --enable-xft
-# increase default font size
-#sed -i -e "s|fsize = 10|fsize = 12|" wxxt/src/Application/AppMain.cc
 make %{?_smp_mflags}
 
 
@@ -86,6 +84,9 @@
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes
 
+# get-base.ss causes error during install
+find $RPM_BUILD_ROOT%{_libdir}/plt -name get-base\* | xargs rm -f
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
@@ -129,6 +130,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Gerard Milmeister  - 300-1
+- New Version 300
+
 * Sat Nov 26 2005 Gerard Milmeister  - 299.400-1
 - New Version 299.400
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Nov 2005 01:39:52 -0000	1.4
+++ sources	19 Dec 2005 21:21:34 -0000	1.5
@@ -1 +1 @@
-fb79312397d11c456d6ee32b695f7fbb  plt-299.400-src-unix.tgz
+0e1d7d5dd06b3c290faa2d609e3df43f  plt-300-src-unix.tgz



From fedora-extras-commits at redhat.com  Mon Dec 19 21:25:13 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 16:25:13 -0500
Subject: rpms/kasablanca/FC-4 kasablanca.spec,1.8,1.9
Message-ID: <200512192126.jBJLQDIC009927@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9856/FC-4

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0.2-6
- fix for modular X
- workaround kdelibs-devel missing deps (#176159)



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-4/kasablanca.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kasablanca.spec	19 Dec 2005 18:14:30 -0000	1.8
+++ kasablanca.spec	19 Dec 2005 21:25:11 -0000	1.9
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 5%{?dist}
+Release: 5%{?dist}.1
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -14,6 +14,11 @@
 BuildRequires: desktop-file-utils
 BuildRequires: openssl-devel
 BuildRequires: kdelibs-devel >= 6:3.3
+# Workaround for kdelibs-devel missing deps:
+# http://bugzilla.redhat.com/bugzilla/176159
+%if "%{?fedora}" > "4"
+BuildRequires: xorg-x11-proto-devel libXt-devel
+%endif
 
 %description
 Kasablanca is an ftp client for KDE, among its features are currently 
@@ -105,6 +110,10 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0.2-6
+- fix for modular X
+- workaround kdelibs-devel missing deps (#176159)
+
 * Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
 - %%post/%%postun: nicer icon bits
 



From fedora-extras-commits at redhat.com  Mon Dec 19 21:25:44 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 16:25:44 -0500
Subject: rpms/kasablanca/FC-4 kasablanca.spec,1.9,1.10
Message-ID: <200512192126.jBJLQE46009930@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9893/FC-4

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0.2-6
- fix for modular X
- workaround kdelibs-devel missing deps (#176159)



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-4/kasablanca.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kasablanca.spec	19 Dec 2005 21:25:11 -0000	1.9
+++ kasablanca.spec	19 Dec 2005 21:25:42 -0000	1.10
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 5%{?dist}.1
+Release: 6%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 



From fedora-extras-commits at redhat.com  Mon Dec 19 21:25:18 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 16:25:18 -0500
Subject: rpms/kasablanca/devel kasablanca.spec,1.8,1.9
Message-ID: <200512192126.jBJLQI1P009933@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9856/devel

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0.2-6
- fix for modular X
- workaround kdelibs-devel missing deps (#176159)



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kasablanca.spec	19 Dec 2005 18:14:36 -0000	1.8
+++ kasablanca.spec	19 Dec 2005 21:25:16 -0000	1.9
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 5%{?dist}
+Release: 5%{?dist}.1
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -14,6 +14,11 @@
 BuildRequires: desktop-file-utils
 BuildRequires: openssl-devel
 BuildRequires: kdelibs-devel >= 6:3.3
+# Workaround for kdelibs-devel missing deps:
+# http://bugzilla.redhat.com/bugzilla/176159
+%if "%{?fedora}" > "4"
+BuildRequires: xorg-x11-proto-devel libXt-devel
+%endif
 
 %description
 Kasablanca is an ftp client for KDE, among its features are currently 
@@ -105,6 +110,10 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0.2-6
+- fix for modular X
+- workaround kdelibs-devel missing deps (#176159)
+
 * Mon Dec 19 2005 Rex Dieter  0.4.0.2-5
 - %%post/%%postun: nicer icon bits
 



From fedora-extras-commits at redhat.com  Mon Dec 19 21:25:49 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 16:25:49 -0500
Subject: rpms/kasablanca/devel kasablanca.spec,1.9,1.10
Message-ID: <200512192126.jBJLQJBF009936@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9893/devel

Modified Files:
	kasablanca.spec 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0.2-6
- fix for modular X
- workaround kdelibs-devel missing deps (#176159)



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kasablanca.spec	19 Dec 2005 21:25:16 -0000	1.9
+++ kasablanca.spec	19 Dec 2005 21:25:47 -0000	1.10
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 5%{?dist}.1
+Release: 6%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 



From fedora-extras-commits at redhat.com  Mon Dec 19 21:28:37 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 19 Dec 2005 16:28:37 -0500
Subject: rpms/plt-scheme/FC-3 .cvsignore, 1.3, 1.4 plt-scheme.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200512192129.jBJLT79w010178@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10138/FC-3

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version 300


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Nov 2005 01:39:46 -0000	1.3
+++ .cvsignore	19 Dec 2005 21:28:35 -0000	1.4
@@ -1 +1 @@
-plt-299.400-src-unix.tgz
+plt-300-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-3/plt-scheme.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plt-scheme.spec	26 Nov 2005 01:42:50 -0000	1.7
+++ plt-scheme.spec	19 Dec 2005 21:28:35 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        299.400
-Release:        2%{?dist}
+Version:        300
+Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/299.400/plt/plt-299.400-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/300/plt/plt-300-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,8 +54,6 @@
 %build
 cd src
 %configure --enable-gl --enable-xrender --enable-xft
-# increase default font size
-#sed -i -e "s|fsize = 10|fsize = 12|" wxxt/src/Application/AppMain.cc
 make %{?_smp_mflags}
 
 %install
@@ -83,6 +81,8 @@
 
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes
+# get-base.ss causes error during install
+find $RPM_BUILD_ROOT%{_libdir}/plt -name get-base\* | xargs rm -f
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Gerard Milmeister  - 300-1
+- New Version 300
+
 * Sat Nov 26 2005 Gerard Milmeister  - 299.400-1
 - New Version 299.400
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Nov 2005 01:39:46 -0000	1.4
+++ sources	19 Dec 2005 21:28:35 -0000	1.5
@@ -1 +1 @@
-fb79312397d11c456d6ee32b695f7fbb  plt-299.400-src-unix.tgz
+0e1d7d5dd06b3c290faa2d609e3df43f  plt-300-src-unix.tgz



From fedora-extras-commits at redhat.com  Mon Dec 19 21:28:43 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 19 Dec 2005 16:28:43 -0500
Subject: rpms/plt-scheme/devel .cvsignore, 1.3, 1.4 plt-scheme.spec, 1.18,
	1.19 sources, 1.4, 1.5
Message-ID: <200512192129.jBJLTDdi010183@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10138/devel

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version 300


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Nov 2005 01:39:57 -0000	1.3
+++ .cvsignore	19 Dec 2005 21:28:40 -0000	1.4
@@ -1 +1 @@
-plt-299.400-src-unix.tgz
+plt-300-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plt-scheme.spec	26 Nov 2005 01:39:57 -0000	1.18
+++ plt-scheme.spec	19 Dec 2005 21:28:40 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        299.400
+Version:        300
 Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/299.400/plt/plt-299.400-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/300/plt/plt-300-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 Patch1:		plt-xft.patch
@@ -68,8 +68,6 @@
 %build
 cd src
 %configure --enable-gl --enable-xrender --enable-xft
-# increase default font size
-#sed -i -e "s|fsize = 10|fsize = 12|" wxxt/src/Application/AppMain.cc
 make %{?_smp_mflags}
 
 
@@ -98,6 +96,8 @@
 
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes
+# get-base.ss causes error during install
+find $RPM_BUILD_ROOT%{_libdir}/plt -name get-base\* | xargs rm -f
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Gerard Milmeister  - 300-1
+- New Version 300
+
 * Sat Nov 26 2005 Gerard Milmeister  - 299.400-1
 - New Version 299.400
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Nov 2005 01:39:57 -0000	1.4
+++ sources	19 Dec 2005 21:28:40 -0000	1.5
@@ -1 +1 @@
-fb79312397d11c456d6ee32b695f7fbb  plt-299.400-src-unix.tgz
+0e1d7d5dd06b3c290faa2d609e3df43f  plt-300-src-unix.tgz



From fedora-extras-commits at redhat.com  Mon Dec 19 21:36:25 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 19 Dec 2005 16:36:25 -0500
Subject: rpms/libtunepimp/devel libtunepimp-0.4.0-gcc41.patch, NONE,
	1.1 libtunepimp.spec, 1.3, 1.4 libtunepimp-0.3.0-gcc4.patch,
	1.1, NONE
Message-ID: <200512192136.jBJLatSY010399@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10374

Modified Files:
	libtunepimp.spec 
Added Files:
	libtunepimp-0.4.0-gcc41.patch 
Removed Files:
	libtunepimp-0.3.0-gcc4.patch 
Log Message:
* Mon Dec 19 2005 Rex Dieter  0.4.0-5
- update gcc4 patch


libtunepimp-0.4.0-gcc41.patch:

--- NEW FILE libtunepimp-0.4.0-gcc41.patch ---
--- libtunepimp-0.4.0/include/tunepimp/metadata.h.gcc41	2005-11-11 17:45:45.000000000 -0600
+++ libtunepimp-0.4.0/include/tunepimp/metadata.h	2005-12-19 15:32:25.000000000 -0600
@@ -59,7 +59,7 @@
     // This is only used in case of TRM collision
     int           numTRMIds;
 
-    Metadata::Metadata(void) 
+    Metadata(void) 
     { 
         trackNum = 0; 
         duration = 0; 
@@ -72,11 +72,11 @@
         totalInSet = 0;
     };
 
-    Metadata::~Metadata(void) 
+    ~Metadata(void) 
     {
     }
 
-    Metadata &Metadata::operator=(const Metadata &other)
+    Metadata &operator=(const Metadata &other)
     {
         artist = other.artist;
         sortName = other.sortName;
@@ -104,7 +104,7 @@
         return *this;
     };
 
-    bool Metadata::isEmpty(void)
+    bool isEmpty(void)
     {
         return (artist.empty() && album.empty() && track.empty() &&
             trackNum == 0 && duration == 0 && fileTrm.empty() &&
@@ -112,7 +112,7 @@
             sortName.empty() && fileFormat.empty());
     }
 
-    bool Metadata::operator==(const Metadata &other)
+    bool operator==(const Metadata &other)
     {
         if (artist == other.artist &&
             album == other.album &&
@@ -140,7 +140,7 @@
         return false;
     };
 
-    void Metadata::clear(void)
+    void clear(void)
     {
         artist = "";
         album = "";
@@ -164,7 +164,7 @@
         totalInSet = 0;
     }
 
-    void Metadata::readFromC(const metadata_t *mdata)
+    void readFromC(const metadata_t *mdata)
     {
         artist = mdata->artist;
         sortName = mdata->sortName;
@@ -190,7 +190,7 @@
         totalInSet = mdata->totalInSet;
     }
 
-    void Metadata::writeToC(metadata_t *mdata) const
+    void writeToC(metadata_t *mdata) const
     {
         memset(mdata, 0, sizeof(metadata_t));
 
@@ -218,7 +218,7 @@
         mdata->totalInSet = totalInSet;
     }
 
-    void Metadata::print(void)
+    void print(void)
     {
         printf("artist: '%s'\n", artist.c_str());
         printf("sortName: '%s'\n", sortName.c_str());


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libtunepimp.spec	19 Dec 2005 18:09:02 -0000	1.3
+++ libtunepimp.spec	19 Dec 2005 21:36:23 -0000	1.4
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp 
 Version: 0.4.0 
-Release: 4%{?dist}
+Release: 5%{?dist}
 # README.LGPL implies that it's not completely lgpl, yet.
 License: GPL
 Group: 	 System Environment/Libraries
@@ -10,7 +10,7 @@
 Source:	 http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-0.4.0.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: libtunepimp-0.3.0-gcc4.patch
+Patch1:  libtunepimp-0.4.0-gcc41.patch
 
 BuildRequires: readline-devel
 BuildRequires: libvorbis-devel
@@ -42,7 +42,7 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .gcc4
+%patch1 -p1 -b .gcc41
 
 
 %build
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter  0.4.0-5
+- update gcc4 patch
+
 * Mon Dec 19 2005 Rex Dieter  0.4.0-4
 - -tools: fix Req: %%name dependancy
 


--- libtunepimp-0.3.0-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Dec 19 22:23:07 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 19 Dec 2005 17:23:07 -0500
Subject: rpms/octave/devel octave.spec,1.26,1.27
Message-ID: <200512192223.jBJMNidF012226@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12207

Modified Files:
	octave.spec 
Log Message:
Rebuild for gcc 4.1.


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- octave.spec	1 Dec 2005 14:57:44 -0000	1.26
+++ octave.spec	19 Dec 2005 22:23:04 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           octave
 Version:        2.9.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Quentin Spencer  2.9.4-4
+- Rebuild for gcc 4.1.
+
 * Thu Dec  1 2005 Quentin Spencer  2.9.4-3
 - Make sure patch applies correctly before building!
 



From fedora-extras-commits at redhat.com  Mon Dec 19 22:29:07 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 19 Dec 2005 17:29:07 -0500
Subject: rpms/new - New directory
Message-ID: <200512192229.jBJMT7q3012305@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/new
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12296/new

Log Message:
Directory /cvs/extras/rpms/new added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 19 22:29:13 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 19 Dec 2005 17:29:13 -0500
Subject: rpms/new/devel - New directory
Message-ID: <200512192229.jBJMTDwL012321@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12296/new/devel

Log Message:
Directory /cvs/extras/rpms/new/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Dec 19 22:29:27 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 19 Dec 2005 17:29:27 -0500
Subject: rpms/new Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512192229.jBJMTRjc012356@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/new
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12343

Added Files:
	Makefile import.log 
Log Message:
Setup of module new


--- NEW FILE Makefile ---
# Top level Makefile for module new
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 19 22:29:36 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 19 Dec 2005 17:29:36 -0500
Subject: rpms/new/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512192229.jBJMTaHc012375@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12343/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module new


--- NEW 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 Dec 19 22:30:14 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 19 Dec 2005 17:30:14 -0500
Subject: rpms/new import.log,1.1,1.2
Message-ID: <200512192230.jBJMUiMS012445@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/new
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12409

Modified Files:
	import.log 
Log Message:
auto-import new-1.3.5-2 on branch devel from new-1.3.5-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/new/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Dec 2005 22:29:25 -0000	1.1
+++ import.log	19 Dec 2005 22:30:12 -0000	1.2
@@ -0,0 +1 @@
+new-1_3_5-2:HEAD:new-1.3.5-2.src.rpm:1135031407



From fedora-extras-commits at redhat.com  Mon Dec 19 22:30:20 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 19 Dec 2005 17:30:20 -0500
Subject: rpms/new/devel new.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200512192230.jBJMUouN012449@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12409/devel

Modified Files:
	.cvsignore sources 
Added Files:
	new.spec 
Log Message:
auto-import new-1.3.5-2 on branch devel from new-1.3.5-2.src.rpm


--- NEW FILE new.spec ---
Summary: A simple template system
Name: new
Version: 1.3.5
Release: 2
License: GPL
Group: Development/Tools
Source: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://www.flyn.org
Requires: zlib
BuildRequires: glib2-devel, zlib-devel

%description
New is a template system, especially useful in conjunction with a 
simple text editor such as vi. The user maintains templates which 
may contain format strings. At run time, new replaces the format 
strings in a template with appropriate values to create a new file.

For example, given the following template:


//   FILE: %%(FILE)
// AUTHOR: %%(FULLNAME)
//   DATE: %%(DATE)

// Copyright (C) 1999 %(FULLNAME) %(EMAIL)
// All rights reserved.
new will create:


//   FILE: foo.cpp
// AUTHOR: W. Michael Petullo
//   DATE: 11 September 1999

// Copyright (C) 1999 W. Michael Petullo new at flyn.org
// All rights reserved.
on my computer.

The program understands plaintext or gziped template files.

Building new also creates a shared library, libnewtemplate, which 
allows the programmer access to new's functionality.

%package devel
Summary: Files needed to develop applications using new's libraries
Group: Development/Libraries
Requires: new = %{version}-%{release}
Requires: glib2-devel, zlib-devel

%description devel
New is a template system, especially useful in conjunction with a
simple text editor such as vi. The user maintains templates which may
contain format strings. At run time, new replaces the format strings in
a template with appropriate values to create a new file.  This package
provides the libraries, include files, and other resources needed for
developing applications using new's API.

%prep


%setup


%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
rm -f ${RPM_BUILD_ROOT}/usr/lib/libnewfmt_ptrn.a
rm -f ${RPM_BUILD_ROOT}/usr/lib/libnewfmt_ptrn.la
rm -f ${RPM_BUILD_ROOT}/usr/lib/libnewtemplate.a
rm -f ${RPM_BUILD_ROOT}/usr/lib/libnewtemplate.la



%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%{_bindir}/*
%{_libdir}/lib*.so.*
%{_datadir}/new
%{_mandir}/*/*
%doc	AUTHORS COPYING ChangeLog INSTALL README

%files devel
%{_libdir}/pkgconfig/new.pc
%{_includedir}/new
%{_libdir}/lib*.so


%changelog
* Tue Dec 13 2005 W. Michael Petullo  - 1.3.5-2
   - Broke out -devel package.
   - Simplifies %files block.
   - Don't use %doc %{_mandir}.
   - No empty NEWS or FAQ.

* Sun Dec 11 2005 W. Michael Petullo  - 1.3.5-1
   - Updated to new 1.3.5.






Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/new/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Dec 2005 22:29:34 -0000	1.1
+++ .cvsignore	19 Dec 2005 22:30:18 -0000	1.2
@@ -0,0 +1 @@
+new-1.3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/new/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Dec 2005 22:29:34 -0000	1.1
+++ sources	19 Dec 2005 22:30:18 -0000	1.2
@@ -0,0 +1 @@
+916a0ccdc842f11a15e3c4e2bf9048f8  new-1.3.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Dec 19 22:33:13 2005
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon, 19 Dec 2005 17:33:13 -0500
Subject: owners owners.list,1.468,1.469
Message-ID: <200512192233.jBJMXhWq012512@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12494

Modified Files:
	owners.list 
Log Message:
Added entry for new.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- owners.list	19 Dec 2005 18:29:18 -0000	1.468
+++ owners.list	19 Dec 2005 22:33:11 -0000	1.469
@@ -629,6 +629,7 @@
 Fedora Extras|netmask|Utility for determining network masks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|NetworkManager-vpnc|NetworkManager VPN integration for vpnc|davidz at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|neverball|Roll a ball through an obstacle course|nos at utelsystems.com|extras-qa at fedoraproject.org|
+Fedora Extras|new|A simple template system|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|newpg|Temporary project to work on GnuPG extensions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|newscache|Free cache server for USENET News|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Dec 19 23:49:07 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 18:49:07 -0500
Subject: rpms/scalapack/FC-3 scalapack.spec,1.6,1.7
Message-ID: <200512192349.jBJNnbta014505@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/scalapack/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14455/FC-3

Modified Files:
	scalapack.spec 
Log Message:

gcc4.1



Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scalapack.spec	15 May 2005 18:40:34 -0000	1.6
+++ scalapack.spec	19 Dec 2005 23:49:05 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
@@ -72,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  1.7-8
+- rebuild for gcc4.1
+
 * Sun May 15 2005 Tom "spot" Callaway  1.7-7
 - 64 bit library fix
 



From fedora-extras-commits at redhat.com  Mon Dec 19 23:49:13 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 18:49:13 -0500
Subject: rpms/scalapack/FC-4 scalapack.spec,1.8,1.9
Message-ID: <200512192349.jBJNnhID014508@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/scalapack/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14455/FC-4

Modified Files:
	scalapack.spec 
Log Message:

gcc4.1



Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scalapack.spec	15 May 2005 18:40:34 -0000	1.8
+++ scalapack.spec	19 Dec 2005 23:49:11 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
@@ -72,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  1.7-8
+- rebuild for gcc4.1
+
 * Sun May 15 2005 Tom "spot" Callaway  1.7-7
 - 64 bit library fix
 



From fedora-extras-commits at redhat.com  Mon Dec 19 23:49:18 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 18:49:18 -0500
Subject: rpms/scalapack/devel scalapack.spec,1.8,1.9
Message-ID: <200512192349.jBJNnm9b014511@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/scalapack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14455/devel

Modified Files:
	scalapack.spec 
Log Message:

gcc4.1



Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scalapack.spec	15 May 2005 18:40:34 -0000	1.8
+++ scalapack.spec	19 Dec 2005 23:49:16 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
@@ -72,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  1.7-8
+- rebuild for gcc4.1
+
 * Sun May 15 2005 Tom "spot" Callaway  1.7-7
 - 64 bit library fix
 



From fedora-extras-commits at redhat.com  Tue Dec 20 00:05:51 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 19:05:51 -0500
Subject: rpms/blacs/FC-4 blacs.spec,1.14,1.15
Message-ID: <200512200007.jBK07BPM016344@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16273/FC-4

Modified Files:
	blacs.spec 
Log Message:

gcc4.1 rebuild



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- blacs.spec	31 Jul 2005 13:51:39 -0000	1.14
+++ blacs.spec	20 Dec 2005 00:05:49 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -107,6 +107,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  1.1-18
+- rebuild for gcc4.1
+
 * Sun Jul 31 2005 Tom "spot" Callaway  1.1-17
 - fix g77 for FC-3 spec
 



From fedora-extras-commits at redhat.com  Tue Dec 20 00:05:24 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 19:05:24 -0500
Subject: rpms/blacs/FC-3 blacs.spec,1.14,1.15
Message-ID: <200512200007.jBK07Bmn016343@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16273/FC-3

Modified Files:
	blacs.spec 
Log Message:

gcc4.1 rebuild



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- blacs.spec	31 Jul 2005 13:51:39 -0000	1.14
+++ blacs.spec	20 Dec 2005 00:05:22 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -107,6 +107,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  1.1-18
+- rebuild for gcc4.1
+
 * Sun Jul 31 2005 Tom "spot" Callaway  1.1-17
 - fix g77 for FC-3 spec
 



From fedora-extras-commits at redhat.com  Tue Dec 20 00:06:19 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 19 Dec 2005 19:06:19 -0500
Subject: rpms/blacs/devel blacs.spec,1.14,1.15
Message-ID: <200512200008.jBK07cxI016359@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16273/devel

Modified Files:
	blacs.spec 
Log Message:

gcc4.1 rebuild



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- blacs.spec	31 Jul 2005 13:51:40 -0000	1.14
+++ blacs.spec	20 Dec 2005 00:06:17 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -107,6 +107,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Mon Dec 19 2005 Tom "spot" Callaway  1.1-18
+- rebuild for gcc4.1
+
 * Sun Jul 31 2005 Tom "spot" Callaway  1.1-17
 - fix g77 for FC-3 spec
 



From fedora-extras-commits at redhat.com  Tue Dec 20 03:14:59 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 19 Dec 2005 22:14:59 -0500
Subject: rpms/scim-fcitx/devel - New directory
Message-ID: <200512200314.jBK3Exh6021889@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21866/scim-fcitx/devel

Log Message:
Directory /cvs/extras/rpms/scim-fcitx/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 03:14:56 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 19 Dec 2005 22:14:56 -0500
Subject: rpms/scim-fcitx - New directory
Message-ID: <200512200315.jBK3Euc3021876@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21866/scim-fcitx

Log Message:
Directory /cvs/extras/rpms/scim-fcitx added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 03:15:33 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 19 Dec 2005 22:15:33 -0500
Subject: rpms/scim-fcitx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512200315.jBK3FXOY021949@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21927

Added Files:
	Makefile import.log 
Log Message:
Setup of module scim-fcitx


--- NEW FILE Makefile ---
# Top level Makefile for module scim-fcitx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 20 03:15:54 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 19 Dec 2005 22:15:54 -0500
Subject: rpms/scim-fcitx/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512200315.jBK3Fshq021979@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21927/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module scim-fcitx


--- NEW 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 Dec 20 03:16:44 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 19 Dec 2005 22:16:44 -0500
Subject: rpms/scim-fcitx import.log,1.1,1.2
Message-ID: <200512200317.jBK3HFxm022050@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22014

Modified Files:
	import.log 
Log Message:
auto-import scim-fcitx-3.1.1-2 on branch devel from scim-fcitx-3.1.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Dec 2005 03:15:30 -0000	1.1
+++ import.log	20 Dec 2005 03:16:42 -0000	1.2
@@ -0,0 +1 @@
+scim-fcitx-3_1_1-2:HEAD:scim-fcitx-3.1.1-2.src.rpm:1135048595



From fedora-extras-commits at redhat.com  Tue Dec 20 03:16:50 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 19 Dec 2005 22:16:50 -0500
Subject: rpms/scim-fcitx/devel scim-fcitx.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512200317.jBK3HKGO022054@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22014/devel

Modified Files:
	.cvsignore sources 
Added Files:
	scim-fcitx.spec 
Log Message:
auto-import scim-fcitx-3.1.1-2 on branch devel from scim-fcitx-3.1.1-2.src.rpm


--- NEW FILE scim-fcitx.spec ---
Name:           scim-fcitx
Version:        3.1.1
Release:        2%{?dist}
Summary:        FCITX Input Method Engine for SCIM

Group:          System Environment/Libraries
License:        GPL
URL:            http://www.scim-im.org/projects/imengines/
Source0:        http://dl.sourceforge.net/scim/%{name}.%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  scim-devel
Requires:	scim

%description
scim-fcitx is a port of the fcitx Chinese input method for the SCIM input
method platform.  It provides Wubi, Erbi, Cangjie, and Pinyin styles of input.


%package tools
Summary:    Fcitx tables tools
Group:      Development/Libraries

%description tools
This package contains input table tools from fcitx.


%prep
%setup -q -n fcitx


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=${RPM_BUILD_ROOT} install

rm $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/IMEngine/fcitx.la


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING README ChangeLog
%{_libdir}/scim-1.0/IMEngine/fcitx.so
%{_datadir}/scim/fcitx
%{_datadir}/scim/icons/fcitx


%files tools
%defattr(-, root, root)
%{_bindir}/*


%changelog
* Tue Dec 20 2005 Jens Petersen  - 3.1.1-2
- package cleanup (John Mahowald)

* Wed Oct  5 2005 Jens Petersen  - 3.1.1-1
- initial packaging for Fedora Extras.

* Mon Jun 20 2005 Jens Petersen 
- rebuild against scim-1.3.1

* Tue Jun 14 2005 Jens Petersen 
- initial build

* Thu May  5 2005 Haojun Bao 
- first release of scim-fcitx.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Dec 2005 03:15:39 -0000	1.1
+++ .cvsignore	20 Dec 2005 03:16:48 -0000	1.2
@@ -0,0 +1 @@
+scim-fcitx.3.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Dec 2005 03:15:39 -0000	1.1
+++ sources	20 Dec 2005 03:16:48 -0000	1.2
@@ -0,0 +1 @@
+781dc96ebce31e2949ecb0c3c1c769f6  scim-fcitx.3.1.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Dec 20 03:24:41 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 19 Dec 2005 22:24:41 -0500
Subject: owners owners.list,1.469,1.470
Message-ID: <200512200325.jBK3PBRc022175@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22157

Modified Files:
	owners.list 
Log Message:
add scim-fcitx



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -r1.469 -r1.470
--- owners.list	19 Dec 2005 22:33:11 -0000	1.469
+++ owners.list	20 Dec 2005 03:24:39 -0000	1.470
@@ -1065,6 +1065,7 @@
 Fedora Extras|scim|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-chewing|SCIM IMEngine for Traditional Chinese|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|scim-fcitx|fcitx SCIM IMEngine for Simplified Chinese|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-hangul|SCIM IMEngine for Korean Hangul|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-input-pad|SCIM On-screen Input Pad|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|scim-m17n|m17n-lib input method for SCIM|petersen at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 20 10:12:31 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 20 Dec 2005 05:12:31 -0500
Subject: fedora-security/audit fc4,1.110,1.111 fc5,1.20,1.21
Message-ID: <200512201012.jBKACVvw002730@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2707

Modified Files:
	fc4 fc5 
Log Message:
More fc4 releases and CVE feed entries



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- fc4	19 Dec 2005 09:44:50 -0000	1.110
+++ fc4	20 Dec 2005 10:12:13 -0000	1.111
@@ -1,12 +1,17 @@
-Up to date CVE as of CVE email 20051218
-Up to date FC4 as of 20051218
+Up to date CVE as of CVE email 20051219
+Up to date FC4 as of 20051219
 
 ** are items that need attention
 
+CVE-2005-4348 VULNERABLE (fetchmail)
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 backport (sudo) [since FEDORA-2005-1147] was ignore only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
+CVE-2005-4153 VULNERABLE (mailman)
+CVE-2005-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-4077 backport (curl) [since FEDORA-2005-1137]
+CVE-2005-3896 ignore (mozilla) recoverable DoS only
 CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
@@ -14,17 +19,17 @@
 CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169]
 CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3193 backport (poppler) [since FEDORA-2005-1132]
+CVE-2005-3193 backport (poppler) [since FEDORA-2005-1171]
 CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169]
 CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3192 backport (poppler) [since FEDORA-2005-1132]
+CVE-2005-3192 backport (poppler) [since FEDORA-2005-1171]
 CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169]
 CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3191 backport (poppler) [since FEDORA-2005-1132]
+CVE-2005-3191 backport (poppler) [since FEDORA-2005-1171]
 CVE-2005-3964 VULNERABLE (openmotif) bz#174815
 CVE-2005-3962 backport (perl) [since FEDORA-2005-1144]
 CVE-2005-3912 backport (perl) [since FEDORA-2005-1144]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fc5	16 Dec 2005 09:00:46 -0000	1.20
+++ fc5	20 Dec 2005 10:12:13 -0000	1.21
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20051214
+Up to date CVE as of CVE email 20051219
 Up to date FC5 as of FC5-Test1-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -12,10 +12,15 @@
 
 ** are items that need attention
 
+CVE-2005-4348 VULNERABLE (fetchmail, fixed 6.2.5.5, fixed 6.3.1)
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
+CVE-2005-4153 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-4077 VULNERABLE (curl)
+CVE-2005-3896 ignore (mozilla) recoverable DoS only
 CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)



From fedora-extras-commits at redhat.com  Tue Dec 20 12:10:52 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:10:52 -0500
Subject: rpms/grads - New directory
Message-ID: <200512201210.jBKCAq9I006382@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6364/grads

Log Message:
Directory /cvs/extras/rpms/grads added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 12:11:16 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:11:16 -0500
Subject: rpms/grads/devel - New directory
Message-ID: <200512201211.jBKCBGmH006406@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6364/grads/devel

Log Message:
Directory /cvs/extras/rpms/grads/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 12:11:38 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:11:38 -0500
Subject: rpms/grads Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512201211.jBKCBcMj006443@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6430

Added Files:
	Makefile import.log 
Log Message:
Setup of module grads


--- NEW FILE Makefile ---
# Top level Makefile for module grads
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 20 12:11:44 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:11:44 -0500
Subject: rpms/grads/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512201211.jBKCBiwr006462@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6430/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module grads


--- NEW 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 Dec 20 12:16:23 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:16:23 -0500
Subject: rpms/grads import.log,1.1,1.2
Message-ID: <200512201216.jBKCGrpQ006603@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6550

Modified Files:
	import.log 
Log Message:
auto-import grads-1.9b4-4 on branch devel from grads-1.9b4-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/grads/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Dec 2005 12:11:36 -0000	1.1
+++ import.log	20 Dec 2005 12:16:21 -0000	1.2
@@ -0,0 +1 @@
+grads-1_9b4-4:HEAD:grads-1.9b4-4.src.rpm:1135080969



From fedora-extras-commits at redhat.com  Tue Dec 20 12:16:29 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:16:29 -0500
Subject: rpms/grads/devel NOTICE.wgrib, NONE, 1.1 grads-README.xorg, NONE,
	1.1 grads-build_fixes.diff, NONE,
	1.1 grads-conditionnal_lats.diff, NONE,
	1.1 grads-copyright_summary, NONE, 1.1 grads-remove-files,
	NONE, 1.1 grads-removed-files-list, NONE, 1.1 grads.spec, NONE,
	1.1 grads_dap-no_lats.patch, NONE, 1.1 libdap.m4, NONE,
	1.1 libnc-dap.m4, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512201216.jBKCGT5a006591@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6550/devel

Modified Files:
	.cvsignore sources 
Added Files:
	NOTICE.wgrib grads-README.xorg grads-build_fixes.diff 
	grads-conditionnal_lats.diff grads-copyright_summary 
	grads-remove-files grads-removed-files-list grads.spec 
	grads_dap-no_lats.patch libdap.m4 libnc-dap.m4 
Log Message:
auto-import grads-1.9b4-4 on branch devel from grads-1.9b4-4.src.rpm


--- NEW FILE NOTICE.wgrib ---
The following files are placed into the public domain.  While
you could legally do anything you want with the code, telling
the world that you wrote it would be uncool.  Selling it would
be really uncool.  The code was written for NMC/NCAR Reanalysis 
and may not work GRIB files from other sources.  The code,
as usual, is not warranteed to be fit for any purpose what so ever.
Use at your own risk.


	Wesley Ebisuzaki November 25, 1995



BDS_unpack.c
bds.h
bms.h
cnames.c
cnames.h
gds.h
grib.h
ibm2flt.c
intpower.c
pds3.h
readgrib.c
seekgrib.c
testbin.c
wgrib.c




--- NEW FILE grads-README.xorg ---
You should enable the BackingStore capability of your X server if you want 
to avoid that windows on top of the grads window erase the grads window
content. With xorg, you should put the following in the Device section of
xorg.conf:

	Option      "BackingStore" "True"

With this option, xorg will use more CPU.

grads-build_fixes.diff:

--- NEW FILE grads-build_fixes.diff ---
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/acinclude.m4 grads-1.9b4/acinclude.m4
--- grads-1.9b4-orig/acinclude.m4	2003-10-02 16:01:15.000000000 +0200
+++ grads-1.9b4/acinclude.m4	2005-08-16 12:08:41.000000000 +0200
@@ -165,10 +165,10 @@
 dnl 		   enabled, just calls AC_CHECK_LIB. If not, checks for the presence
 dnl		   of a file "libname.a" in the supplibs directory. 
 dnl  args:	   library-name, extra-libs, action-if-found, action-if-not-found
-AC_DEFUN(GA_CHECK_LIB,
+AC_DEFUN([GA_CHECK_LIB],
 [
   if test "${ga_dyn_supplibs}" = "yes" ; then
-     AC_CHECK_LIB($1, $2, $3, $4)
+     AC_CHECK_LIB([$1], [$2], [$3], [$4], [$5])
   else 
      AC_MSG_CHECKING([for lib$1.a in supplibs])
      if test -f "${ga_supplib_dir}/lib/lib$1.a" ; then
@@ -249,7 +249,39 @@
   GA_UNSET_FLAGS
 ])
 
+dnl GA_CHECK_NEW_GUI : Checks whether GrADS can be built with GUI features 
+dnl  		      	enabled. Check libsx without freq.
+dnl  args : 		action-if-yes, action-if-no
+AC_DEFUN([GA_CHECK_NEW_GUI],
+[
+  # Check libs and headers for GUI widgets
+  GA_SET_FLAGS([$X_CFLAGS], [$X_LIBS])
 
+  ga_check_new_gui="no"
+  AC_CHECK_HEADER([libsx.h],
+  [ AC_CHECK_LIB([Xt],[main],
+    [ AC_CHECK_LIB([Xaw],[main],
+      [ AC_CHECK_LIB([Xmu],[main],
+	  [ GA_CHECK_LIB([sx],[GetFile],
+	    [ ga_check_new_gui="yes"
+            ],
+	    [ ga_check_new_gui="no"
+            ],
+            [-lXaw -lXmu -lXt])
+        ])
+      ])
+    ])
+  ])
+  if test $ga_check_new_gui = "yes" ; then
+    $1 
+    true #dummy command
+  else
+    $2
+    true #dummy command
+  fi
+
+  GA_UNSET_FLAGS
+])
 
 dnl GA_CHECK_GD : Checks whether GrADS can be built with printim command 
 dnl  		      	enabled.
@@ -324,7 +356,7 @@
 AC_DEFUN(GA_CHECK_NC,
 [
   # Check libs and headers for netCDF support
-  GA_SET_FLAGS([-I{ga_supplib_dir}/include/nc])
+  GA_SET_FLAGS([-I${ga_supplib_dir}/include/nc])
 
   ga_check_nc="no"
   AC_CHECK_HEADER(udunits.h,
@@ -356,7 +388,7 @@
 AC_DEFUN(GA_CHECK_HDF,
 [
   # Check libs and headers for HDF support
-  GA_SET_FLAGS([-I{ga_supplib_dir}/include/hdf])
+  GA_SET_FLAGS([-I${ga_supplib_dir}/include/hdf])
 
   ga_check_hdf="no"
   AC_CHECK_HEADER(udunits.h,
@@ -394,7 +426,7 @@
 AC_DEFUN(GA_CHECK_DODS,
 [
   # Check libs and headers for DODS support
-  GA_SET_FLAGS([-I{ga_supplib_dir}/include/dods])
+  GA_SET_FLAGS([-I${ga_supplib_dir}/include/dods])
 
   ga_check_dods="no"
   AC_CHECK_HEADER(udunits.h,
Seulement dans grads-1.9b4: autom4te.cache
Seulement dans grads-1.9b4: autoscan.log
Seulement dans grads-1.9b4: config.h.in
Seulement dans grads-1.9b4: config.log
Seulement dans grads-1.9b4: config.status
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/configure.in grads-1.9b4/configure.in
--- grads-1.9b4-orig/configure.in	2005-05-23 17:04:40.000000000 +0200
+++ grads-1.9b4/configure.in	2005-08-16 12:05:01.000000000 +0200
@@ -274,14 +274,24 @@
 
 
 use_gui=no
+use_new_gui=no
 if test "$with_gui" != "no" ; then
    echo "Check GrADS GUI support..."
    GA_CHECK_GUI([use_gui=yes])
+   if test $use_gui = no; then
+      GA_CHECK_NEW_GUI([use_new_gui=yes; use_gui=yes])
+   fi
 fi
 if test $use_gui = "yes" ; then
   AC_DEFINE(USEGUI, 1, [Enable GUI widgets]) 
   echo "+ GUI enabled"
-  GA_SET_LIB_VAR(gui_libs, [sx freq])
+  if test $use_new_gui = no; then
+    GA_SET_LIB_VAR(gui_libs, [sx freq])
+    AC_DEFINE(USEFREQ, 1, [Use GetFile from freq])
+  else
+    GA_SET_LIB_VAR([gui_libs], [sx])
+    AC_DEFINE(USEFREQ, 0, [Use GetFile from freq])
+  fi
   gui_libs="$gui_libs -lXaw -lXmu -lXt $guilibadd"
   AC_SUBST(gui_libs)
 else
@@ -383,15 +393,25 @@
 
 
 use_dods=no
+dods_ncdap=no
 if test "$with_dods" != "no" ; then
   GA_CHECK_DODS([use_dods=yes])
+  if test "z$use_dods" = "zno" -a "${ga_dyn_supplibs}" = "yes" ; then
+  AC_CHECK_HEADER([udunits.h],
+  [ AC_CHECK_HEADER([netcdf.h],
+    [ GA_CHECK_LIB([udunits], [utInit],
+       [AC_CHECK_NC_DODS([dods_ncdap=yes; use_dods=yes])])
+    ])
+  ])
+  fi
 fi
 
 if test $use_dods = "yes" ; then
 
     extra_bins="$extra_bins gradsdods"
-    GA_SET_LIB_VAR(dods_libs, [udunits www rx z])
-
+    if test "z$dods_ncdap" = "zno" ; then
+       GA_SET_LIB_VAR(dods_libs, [udunits www rx z])
+    fi
 
     GA_CHECK_LIB(gadods, main, [use_gadods=yes], [use_gadods=no])
     if test $use_gadods = "yes" ; then	
@@ -404,7 +424,11 @@
        echo "+ gradsdods (OPeNDAP/netCDF) build enabled - gridded interface only"
     fi
 
-    dods_libs="$dods_rep_libs $dods_rep_libs $dods_libs"
+    if test "z$dods_ncdap" = "zyes" ; then
+       dods_libs="$NC_DAP_LIBS -ludunits"
+    else
+       dods_libs="$dods_rep_libs $dods_rep_libs $dods_libs"
+    fi
     AC_SUBST(dods_libs)
     AC_SUBST(gadods_def)
 else
Seulement dans grads-1.9b4: configure.scan
Seulement dans grads-1.9b4: grads-1.9b4.tar.gz
Seulement dans grads-1.9b4: grads.spec
Seulement dans grads-1.9b4: libdap.m4
Seulement dans grads-1.9b4: libnc-dap.m4
Seulement dans grads-1.9b4: Makefile
Seulement dans grads-1.9b4/src: bufrscan
Seulement dans grads-1.9b4/src: bufrscan.o
Seulement dans grads-1.9b4/src: bufrstn.o
Seulement dans grads-1.9b4/src: buildinfo.h
Seulement dans grads-1.9b4/src: config.h
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/config.h.in grads-1.9b4/src/config.h.in
--- grads-1.9b4-orig/src/config.h.in	2004-12-15 22:00:03.000000000 +0100
+++ grads-1.9b4/src/config.h.in	2005-08-16 12:05:39.000000000 +0200
@@ -88,6 +88,9 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Use GetFile from freq */
+#undef USEFREQ
+
 /* Enable GUI widgets */
 #undef USEGUI
 
Seulement dans grads-1.9b4/src: config.h.in~
Seulement dans grads-1.9b4/src: fgbds.o
Seulement dans grads-1.9b4/src: fgutil.o
Seulement dans grads-1.9b4/src: gabufr.o
Seulement dans grads-1.9b4/src: gabufrtbl.o
Seulement dans grads-1.9b4/src: gacfg-c.o
Seulement dans grads-1.9b4/src: gacfg-dods.o
Seulement dans grads-1.9b4/src: gacfg-hdf.o
Seulement dans grads-1.9b4/src: gacfg-nc.o
Seulement dans grads-1.9b4/src: gaddes-c.o
Seulement dans grads-1.9b4/src: gaddes-dods.o
Seulement dans grads-1.9b4/src: gaddes-hdf.o
Seulement dans grads-1.9b4/src: gaddes-nc.o
Seulement dans grads-1.9b4/src: gaddes.sa.o
Seulement dans grads-1.9b4/src: gaexpr.o
Seulement dans grads-1.9b4/src: gafunc.o
Seulement dans grads-1.9b4/src: gagmap.o
Seulement dans grads-1.9b4/src: gagui.o
Seulement dans grads-1.9b4/src: gagx.o
Seulement dans grads-1.9b4/src: gaio-c.o
Seulement dans grads-1.9b4/src: gaio-dods.o
Seulement dans grads-1.9b4/src: gaio-hdf.o
Seulement dans grads-1.9b4/src: gaio-nc.o
Seulement dans grads-1.9b4/src: galats.o
Seulement dans grads-1.9b4/src: gamach.o
Seulement dans grads-1.9b4/src: gasdf-dods.o
Seulement dans grads-1.9b4/src: gasdf-hdf.o
Seulement dans grads-1.9b4/src: gasdf-nc.o
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gauser.c grads-1.9b4/src/gauser.c
--- grads-1.9b4-orig/src/gauser.c	2005-05-18 20:51:01.000000000 +0200
+++ grads-1.9b4/src/gauser.c	2005-08-16 11:33:49.000000000 +0200
@@ -42,6 +42,7 @@
 #endif
 
 /* int gxhpng (char *, int, int, int, int); */
+int gxhpng (char *, int, int, int, int, char *, char *, int) ;
 
 /*mf 971022 --- expose Mike Fiorino's global struct to these routines for warning level setting mf*/
 extern struct gamfcmn mfcmn;
Seulement dans grads-1.9b4/src: gauser-c.o
Seulement dans grads-1.9b4/src: gauser-dods.o
Seulement dans grads-1.9b4/src: gauser-hdf.o
Seulement dans grads-1.9b4/src: gauser-nc.o
Seulement dans grads-1.9b4/src: gautil.o
Seulement dans grads-1.9b4/src: gautil.sa.o
Seulement dans grads-1.9b4/src: gd13gif.o
Seulement dans grads-1.9b4/src: gradsc
Seulement dans grads-1.9b4/src: gradsdods
Seulement dans grads-1.9b4/src: gradshdf
Seulement dans grads-1.9b4/src: gradsnc
Seulement dans grads-1.9b4/src: grads.o
Seulement dans grads-1.9b4/src: gribmap
Seulement dans grads-1.9b4/src: gribmap.o
Seulement dans grads-1.9b4/src: gribscan
Seulement dans grads-1.9b4/src: gribscan.o
Seulement dans grads-1.9b4/src: gscrpt.o
Seulement dans grads-1.9b4/src: gsgui.o
Seulement dans grads-1.9b4/src: gxchpl.o
Seulement dans grads-1.9b4/src: gxcntr.o
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gxdxwd.c grads-1.9b4/src/gxdxwd.c
--- grads-1.9b4-orig/src/gxdxwd.c	2002-10-28 20:08:33.000000000 +0100
+++ grads-1.9b4/src/gxdxwd.c	2005-08-16 11:33:49.000000000 +0200
@@ -6,6 +6,7 @@
 #include 
 #endif
 
+#include 
 #include 
 #include 
 
@@ -22,7 +23,7 @@
  *              writting.
  */
 
-char *calloc();
+/* char *calloc(); */
 
 #include "X11/XWDFile.h"
 
Seulement dans grads-1.9b4/src: gxdxwd.o
Seulement dans grads-1.9b4/src: gxeps
Seulement dans grads-1.9b4/src: gxeps.o
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gxhpng.c grads-1.9b4/src/gxhpng.c
--- grads-1.9b4-orig/src/gxhpng.c	2004-03-12 17:14:04.000000000 +0100
+++ grads-1.9b4/src/gxhpng.c	2005-08-16 11:33:49.000000000 +0200
@@ -379,6 +379,11 @@
 	
 int gdCompareInt(const void *a, const void *b);
 
+int gdCompareInt(const void *a, const void *b)
+{
+	return (*(const int *)a) - (*(const int *)b);
+}
+
 /* Version of gdImageFilledPolygon to invoke my local 
    version of gdImageLne.  Nothing else changed... B.Doty 5/31/01 */
 
Seulement dans grads-1.9b4/src: gxmeta.o
Seulement dans grads-1.9b4/src: gxmeta.sa.o
Seulement dans grads-1.9b4/src: gxps
Seulement dans grads-1.9b4/src: gxps.o
Seulement dans grads-1.9b4/src: gxshad.o
Seulement dans grads-1.9b4/src: gxstrm.o
Seulement dans grads-1.9b4/src: gxsubs.o
Seulement dans grads-1.9b4/src: gxtran
Seulement dans grads-1.9b4/src: gxtran.o
Seulement dans grads-1.9b4/src: gxwmap.o
Seulement dans grads-1.9b4/src: gxX.o
Seulement dans grads-1.9b4/src: latsgribmap.o
Seulement dans grads-1.9b4/src: latsgrib.o
Seulement dans grads-1.9b4/src: latsint.o
Seulement dans grads-1.9b4/src: latsnc-nc.o
Seulement dans grads-1.9b4/src: latsnc.o
Seulement dans grads-1.9b4/src: lats.o
Seulement dans grads-1.9b4/src: latsstat.o
Seulement dans grads-1.9b4/src: latstime.o
Seulement dans grads-1.9b4/src: Makefile
Seulement dans grads-1.9b4/src: stamp-h
Seulement dans grads-1.9b4/src: stamp-h1
Seulement dans grads-1.9b4/src: stnmap
Seulement dans grads-1.9b4/src: stnmap.o
Seulement dans grads-1.9b4/src: wgrib
Seulement dans grads-1.9b4/src: wgrib.o

grads-conditionnal_lats.diff:

--- NEW FILE grads-conditionnal_lats.diff ---
--- grads-1.9b4/src/Makefile.am.old	2005-12-13 00:02:38.000000000 +0100
+++ grads-1.9b4/src/Makefile.am	2005-12-13 00:02:10.000000000 +0100
@@ -63,7 +67,7 @@
 hdr_lats            = lats.h latsint.h latsparm.h latstime.h \
                       fgrib.h fgrib_init.h 
 noinst_HEADERS	    = $(hdr_core) $(hdr_x11) $(hdr_sdf) $(hdr_png) $(hdr_gui) \
-                      $(hdr_lats) $(hdr_img) $(hdr_pc) $(hdr_bufr)
+                      $(hdr_pc) $(hdr_bufr)
 
 # Get rid of buildinfo.h on "make distclean"
 DISTCLEANFILES	       = buildinfo.h
@@ -198,10 +198,13 @@
 
 # Object files that should not be reused by the other GrADS binaries,
 # plus libraries needed by this GrADS binary
-gradsnc_LDADD	       = latsnc-nc.o gaddes-nc.o gacfg-nc.o gaio-nc.o \
+gradsnc_LDADD	       = gaddes-nc.o gacfg-nc.o gaio-nc.o \
 			gauser-nc.o gasdf-nc.o \
 			$(common_ldadd) \
 			$(nc_libs)
+if USELATS
+gradsnc_LDADD        += latsnc-nc.o
+endif
 
 # Custom compilation for object files specific to this GrADS binary
 COMPILE_NC 		= $(COMPILE) -I$(supp_include_dir)/nc \
@@ -296,11 +299,14 @@
 
 # Object files that should not be reused by the other GrADS binaries,
 # plus libraries needed by this GrADS binary
-gradsdods_LDADD	       = latsnc-nc.o gaddes-dods.o gacfg-dods.o gaio-dods.o \
+gradsdods_LDADD	       = gaddes-dods.o gacfg-dods.o gaio-dods.o \
 			gauser-dods.o gasdf-dods.o \
 			$(common_ldadd) \
 			$(dods_libs) \
 			$(dods_darwin_libs)
+if USELATS
+gradsdods_LDADD        += latsnc-nc.o
+endif
 
 # Custom compilation for object files specific to this GrADS binary
 COMPILE_DODS 		= $(COMPILE) -I$(supp_include_dir)/dods \


--- NEW FILE grads-copyright_summary ---
Here is an analysis of grads copyrights and licences.

Free software licences (complying with the OSI definition of Open Source)
and files.

A: the GPL

B: the most common netpbm licence (similar with BSD/MIT)

** Permission to use, copy, modify, and distribute this software and its
** documentation for any purpose and without fee is hereby granted, provided
** that the above copyright notice appear in all copies and that both that
** copyright notice and this permission notice appear in supporting
** documentation.  This software is provided "as is" without express or
** implied warranty.

C: miGIF licence (similar with BSD/MIT)

 * Permission to use, copy, modify, and distribute this software and its
 * documentation for any purpose and without fee is hereby granted, provided
 * that the above copyright notice appear in all copies and that both that
 * copyright notice and this permission notice appear in supporting
 * documentation.  This software is provided "AS IS." The Hutchison Avenue 
 * Software Corporation disclaims all warranties, either express or implied, 
 * including but not limited to implied warranties of merchantability and 
 * fitness for a particular purpose, with respect to this code and accompanying
 * documentation. 

D: gd.h permissive licence

        Permission granted to use this code in any fashion provided
        that this notice is retained and any alterations are
        labeled as such. It is requested, but not required, that
        you share extensions to this module with us so that we
        can incorporate them into new versions. */

E: gd licence like of gxeps

 * * Permission has been granted to copy and distribute gxeps in any 
 * context, including a commercial application, provided that this notice 
 * is present in user-accessible supporting documentation.
 * 
 * This does not affect your ownership of the derived work itself, and 
 * the intent
 * is to assure proper credit for the authors of gxeps, not to interfere
 * with your productive use of gxeps. If you have questions, ask. 
 * "Derived works" includes all programs that utilize gxeps.
 * Credit must be given in user-accessible documentation.
 * 
 * Permission to use, copy, modify, and distribute this software and its 
 * documentation for any purpose and without fee is hereby granted, provided 
 * that the above copyright notice appear in all copies and that both that 
 * copyright notice and this permission notice appear in supporting 
 * documentation.  This software is provided "as is" without express or 
 * implied warranty.

F: public domain, as said in a mail by Matthias Munnich

G: permissive licence (like BSD/MIT)

/* |   Permission to use, copy, modify, and distribute this software   | */
/* |   and its documentation for any purpose and without fee is hereby | */
/* |   granted, provided that the above copyright notice appear in all | */
/* |   copies and that both that copyright notice and this permission  | */
/* |   notice appear in supporting documentation.  This software is    | */
/* |   provided "as is" without express or implied warranty.           | */

H: public domain for wgrib

The following files are placed into the public domain.  While
you could legally do anything you want with the code, telling
the world that you wrote it would be uncool.  Selling it would
be really uncool.  The code was written for NMC/NCAR Reanalysis 
and may not work GRIB files from other sources.  The code,
as usual, is not warranteed to be fit for any purpose what so ever.
Use at your own risk.

I: public domain. From a mail sent by Don Hooper:

    Julia Collins and I are University of Colorado employees stationed 
    at NOAA, a U.S. federal government agency.  Thus, we do our work on 
    federal government computers.  Thus, all of our work is in the public 
    domain. [...] I've no idea why there is no notation to this effect in 
    gasdf.c, gasdf.h, or gasdf_std_time.h. In any case, it's the same as 
    with wgrib.c, written by another person affilliated with NOAA. U.S. 
    federal government stuff is public domain, period.

IGES means Brian Doty and IGES for most if not all files (haven't verified).

bufrscan.c      (A)             IGES
bufrstn.c       (A)             IGES
dodstn.c        (A)             IGES
gabufr.c        (A)             IGES
gabufrtbl.c     (A)             IGES
gaddes.c        (A)             IGES
gaexpr.c        (A)             IGES
gafunc.c        (A)             IGES
gagmap.c        (A)             IGES
gagmap.h        (A)             IGES
gagx.c          (A)             IGES
gaio.c          (A)             IGES
gamach.c        (A)             IGES
gasdf.c         (I)             Don Hooper
gasdf.h         (I)             Julia Collins and Don Hooper
gasdf_std_time.h (I)             Julia Collins
gauser.c        (A)             IGES
gautil.c        (A)             IGES
gd13gif.c       (B)             Jef Poskanzer
                (C)             Hutchison Avenue Software Corporation
gd13gif.h       (D)             Cold Spring Harbor Labs
grads.c         (A)             IGES
grads.h         (A)             IGES
gribmap.c       (A)             IGES
gscrpt.c        (A)             IGES
gs.h            (A)             IGES
gxchpl.c        (A)             IGES
gxcntr.c        (A)             IGES
gxeps.c         (E)             Matthias Munnich 
gxgif.c         (F)             Matthias Munnich
                (D)             Cold Spring Harbor Labs
                (B)             Jef Poskanzer
                (G)             David Koblas
gx.h            (A)             IGES
gxhpng.c        (A)             Matthias Munnich and Brian Doty
gxmeta.c        (A)             IGES
gxps.c          (A)             IGES
gxshad.c        (A)             IGES
gxstrm.c        (A)             IGES
gxsubs.c        (A)             IGES
gxtran.c        (A)             IGES
gxwmap.c        (A)             IGES
gxX.c           (A)             IGES
wgrib.c         (H)             public domain
wx.h            (A)             IGES  
gs-mode.el      (A)             Joe Wielgosz
ctl-mode.el     (A)             Joe Wielgosz
doc/*           (A)             IGES           haven't checked all the files!


========================================================================

??:  no copyright and no licence

fgrib.h         (??)
fgrib_init.h    (??)
galats.c        (??)
gribscan.c      (??)
gvt.h           (??)
gxdxwd.c        (??)
gxmap.h         (??)    small file
latsgribmap.c   (??)
mtable.c        (??)    small file
pcx11e.h        (??)    small file


=======================================================================

The following are non free licences and non free files. Some parts of the
files may be under a free licence described above, though.

?:  no licence. The file isn't free because there is no licence.

Z: cannot be sold for profit

 *   Permission is granted to any individual or institution to use,
 *   copy, or redistribute this software so long as it is not sold for
 *   profit, and provided this notice is retained. 

Y: cannot be redistributed

 *              This software may not be distributed to others without
 *              permission of the author.


fgbds.c            (?)             Mike Fiorino 
fgutil.c           (?)             Wesley Ebisuzaki
gacfg.c            (A)             IGES
                   (Z)             Arlindo da Silva
gagui.c            (Z)             Arlindo da Silva
gaimg.c            (Z)             Arlindo da Silva
gaimg.h            (Z)             Arlindo da Silva      small file
gsgui.c            (Z)             Arlindo da Silva
gstmp.c            (?)             Mike Fiorino and ?
lats.c             (Y)             Regents of the University of California
latsgrib.c         (Y)             Regents of the University of California
lats.h             (Y)             Regents of the University of California
latsint.c          (Y)             Regents of the University of California
latsint.h          (Y)             Regents of the University of California
latsnc.c           (Y)             Regents of the University of California
latsparm.h         (Y)             Regents of the University of California 
latsstat.c         (Y)             Regents of the University of California
latstime.c         (Y)             Regents of the University of California
latstime.h         (Y)             Regents of the University of California
pcx11e.c           (?)             Arlindo da Silva based on Xlibemu



--- NEW FILE grads-remove-files ---
#!/bin/bash

set -e
cd .

name=grads
ver=1.9b4
package=$name-$ver
tar_file=$name-src-$ver.tar.gz

echo Unpacking compressed source from $tar_file
tar xzf $tar_file
for bad_file in `cat grads-removed-files-list`; do
	rm -f $package/src/$bad_file
done

echo Repacking $tar_file
tar czf $tar_file $package
rm -rf $package

exit 0



--- NEW FILE grads-removed-files-list ---
fgbds.c  
fgutil.c
gagui.c  
gaimg.c 
gaimg.h 
gsgui.c 
gstmp.c 
lats.c    
latsgrib.c 
lats.h    
latsint.c
latsint.h  
latsnc.c   
latsparm.h 
latsstat.c 
latstime.c 
latstime.h 
pcx11e.c   



--- NEW FILE grads.spec ---
Name:           grads
Version:        1.9b4
Release:        4
Summary:        Tool for easy acces, manipulation, and visualization of data

Group:          Applications/Engineering
License:        GPL
URL:            http://grads.iges.org/grads/grads.html
Source0:        ftp://grads.iges.org/grads/1.9/grads-src-%{version}.tar.gz
# opendap/DODS detection
Source3:        libdap.m4
Source4:        libnc-dap.m4
# the copyright notice for wgrib
Source2:        NOTICE.wgrib
# Copyrights explanation
Source6:        grads-copyright_summary
# README telling to turn BackingStore true
Source5:        grads-README.xorg
# Use these files to remove files with GPL incompatible licences. In the
# SOURCES directory with grads tarball and grads-removed-files-list, do
# sh grads-remove-files
Source100:      grads-remove-files
Source101:      grads-removed-files-list

Patch:          grads-build_fixes.diff
Patch1:         grads_dap-no_lats.patch
Patch2:         grads-conditionnal_lats.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  hdf-devel udunits-devel netcdf-devel 
#BuildRequires:  opendap-devel
BuildRequires:  libdap-devel libnc-dap-devel
BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
BuildRequires:  ncurses-devel libpng-devel
#Requires:       

%description
The Grid Analysis and Display System (GrADS) is an interactive desktop tool
that is used for easy access, manipulation, and visualization of earth science
data. The format of the data may be either binary, GRIB, NetCDF, or HDF-SDS
(Scientific Data Sets). GrADS has been implemented worldwide on a variety of
commonly used operating systems and is freely distributed over the Internet.

%prep
%setup -q
%patch -p1
%patch -P 1 -p1
%patch -P 2 -p1
# change path to datas to %{_datadir}/%{name}
sed -i -e 's@/usr/local/lib/grads@%{_datadir}/%{name}@' src/gx.h
# copy grib notice
cp %{SOURCE2} .
cp %{SOURCE6} .
# concatenate autoconf m4 files
cat %{SOURCE3} %{SOURCE4} acinclude.m4 > acinclude.m4.new
cp acinclude.m4.new acinclude.m4
# README for use with xorg
cp %{SOURCE5} README.xorg
# fix perms
chmod a-x src/*.c src/*.h
chmod a-x COPYRIGHT
find doc -type f -exec chmod a-x \{\} \;
find data -type f -exec chmod a-x \{\} \;


%build
./bootstrap
%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs

make %{?_smp_mflags}
cp -r doc html

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%{__install} -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__install} -m644 data/*.dat data/*res $RPM_BUILD_ROOT%{_datadir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/bufrscan
%{_bindir}/gradsc
%{_bindir}/gradsdods
%{_bindir}/gradshdf
%{_bindir}/gradsnc
%{_bindir}/gribmap
%{_bindir}/gribscan
%{_bindir}/gxeps
%{_bindir}/gxps
%{_bindir}/gxtran
%{_bindir}/stnmap
%{_bindir}/wgrib
%{_datadir}/grads/

%doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary

%changelog
* Tue Dec 13 2005 Patrice Dumas  1.9b4-4
- simplify handling of data, as they are in the tarball

* Tue Dec 13 2005 Patrice Dumas  1.9b4-3
- remove files with GPL incompatible licences

* Tue Aug 16 2005 Patrice Dumas  1.9b4-2
- use libsx without freq

* Fri Aug 12 2005 Patrice Dumas  1.9b4-1
- initial release

grads_dap-no_lats.patch:

--- NEW FILE grads_dap-no_lats.patch ---
diff -Naur grads-1.9b4/src/gacfg.c grads-1.9b4_new/src/gacfg.c
--- grads-1.9b4/src/gacfg.c   2005-05-18 14:29:17.000000000 +0000
+++ grads-1.9b4_new/src/gacfg.c 2005-11-03 13:18:45.000000000 +0000
@@ -32,6 +32,7 @@
  */
 
 #include 
+#include 
 #include "grads.h"
 #include "buildinfo.h"
 
diff -Naur grads-1.9b4/src/gaexpr.c grads-1.9b4_new/src/gaexpr.c
--- grads-1.9b4/src/gaexpr.c  2005-05-18 14:48:36.000000000 +0000
+++ grads-1.9b4_new/src/gaexpr.c        2005-11-03 11:22:27.000000000 +0000
@@ -13,6 +13,7 @@
 #endif
 
 #include 
+#include 
 #include 
 #include "grads.h"
 
diff -Naur grads-1.9b4/src/gaio.c grads-1.9b4_new/src/gaio.c
--- grads-1.9b4/src/gaio.c    2005-05-23 17:59:01.000000000 +0000
+++ grads-1.9b4_new/src/gaio.c  2005-11-03 11:37:35.000000000 +0000
@@ -22,6 +22,7 @@
 #include "grads.h"
 #include 
 #include 
+#include 
 #if USESDF == 1
 #include 
 #if USEHDF == 1
diff -Naur grads-1.9b4/src/gasdf.c grads-1.9b4_new/src/gasdf.c
--- grads-1.9b4/src/gasdf.c   2005-05-18 14:29:17.000000000 +0000
+++ grads-1.9b4_new/src/gasdf.c 2005-11-04 10:02:05.000000000 +0000
@@ -5785,7 +5785,11 @@
   /* Turn off automatic error handling. */
   ncopts = 0;
 
+#if USEHDF == 1
   if (ncattname (cdfid, varid, attnum, name) == -1) {
+#else
+  if (nc_inq_attname(cdfid, varid, attnum, name) == -1) {
+#endif
     ncopts = oldncopts ;
     return Failure;
   }
@@ -5813,10 +5817,23 @@
   /* Turn off automatic error handling. */
   ncopts = 0;
 
+#if USEHDF == 1
   if (ncattinq (cdfid, varid, aname, atype, alen) == -1) {
     ncopts = oldncopts ;
     return Failure;
   }
+#else
+  if (nc_inq_atttype(cdfid, varid, aname, atype) != NC_NOERR) {
+    ncopts = oldncopts ;
+    return Failure;
+  }
+  size_t templen;
+  if (nc_inq_attlen(cdfid, varid, aname, &templen) != NC_NOERR) {
+    ncopts = oldncopts ;
+    return Failure;
+  }
+  *alen = (int) templen;
+#endif
 
   /* Allocate space for values. */
   if ((*atype == NC_BYTE) || (*atype == NC_CHAR))  {
@@ -5831,6 +5848,7 @@
     *adata = (double *) malloc (sizeof (double) * *alen);
   }  else {
     ncopts = oldncopts ;
+    printf("UNKNOWN TYPE HERE !\n");
     return Failure;
   }
 
@@ -5840,10 +5858,65 @@
   }
 
   /* Retrieve values. */
+#if USEHDF == 1
   if (ncattget (cdfid, varid, aname, (void *) (*adata)) == -1) {
     ncopts = oldncopts ;
     return Failure;
   }
+#else
+  switch (*atype)
+  {
+     case NC_BYTE:
+       if (nc_get_att_uchar(cdfid, varid, aname, (unsigned char *) *adata) != NC_NOERR)
+       {
+         ncopts = oldncopts ;
+         return Failure;
+       }
+       break;
+     case NC_CHAR:
+       if (nc_get_att_text(cdfid, varid, aname, (char *) *adata) != NC_NOERR)
+       {
+         ncopts = oldncopts ;
+         return Failure;
+       }
+       break;
+     case NC_SHORT:
+       if (nc_get_att_short(cdfid, varid, aname, (short *) *adata) != NC_NOERR)
+       {
+         ncopts = oldncopts ;
+         return Failure;
+       }
+       break;
+     case NC_LONG:
+       if (nc_get_att_int(cdfid, varid, aname, (int *) *adata) != NC_NOERR)
+       {
+         ncopts = oldncopts ;
+         return Failure;
+       }
+       break;
+     case NC_FLOAT:
+       if (nc_get_att_float(cdfid, varid, aname, (float *) *adata) != NC_NOERR)
+       {
+         ncopts = oldncopts ;
+         return Failure;
+       }
+       break;
+     case NC_DOUBLE:
+       if (nc_get_att_double(cdfid, varid, aname, (double *) *adata) != NC_NOERR)
+       {
+         ncopts = oldncopts ;
+         return Failure;
+       }
+       break;
+     default:
+       if (nc_get_att_text(cdfid, varid, aname, (char *) *adata) != NC_NOERR)
+       {
+         ncopts = oldncopts ;
+         return Failure;
+       }
+       break;
+  }
+#endif
 
   /* If character, set last byte to null. */
   if (*atype == NC_CHAR)  {
diff -Naur grads-1.9b4/src/gxdxwd.c grads-1.9b4_new/src/gxdxwd.c
--- grads-1.9b4/src/gxdxwd.c  2002-10-28 19:08:33.000000000 +0000
+++ grads-1.9b4_new/src/gxdxwd.c        2005-11-03 13:37:45.000000000 +0000
@@ -7,6 +7,7 @@
 #endif
 
 #include 
+#include 
 #include 
 
 #include 
@@ -92,6 +91,7 @@
     int bw;
     Window dummywin;
     XWDFileHeader header;
+    char mytmp[64];
 
     
     /*
@@ -232,7 +232,8 @@
      * Write out the color maps, if any
      */
 
-    if (debug) outl("xwd: Dumping %d colors.\n", ncolors);
+    sprintf(mytmp, "xwd: Dumping %d colors.\n", ncolors);
+    if (debug) outl(mytmp);
 /*
     {
     int icineca=0;
diff -Naur grads-1.9b4/src/gxeps.c grads-1.9b4_new/src/gxeps.c
--- grads-1.9b4/src/gxeps.c   2004-02-27 14:42:11.000000000 +0000
+++ grads-1.9b4_new/src/gxeps.c 2005-11-03 14:45:16.000000000 +0000
@@ -6,6 +6,8 @@
 #include 
 #endif
 
+#include 
+
 /***********************************************************
  * GXEPS a grads metafile to PostScript converter
  * Copyright (c) 1999 - 2001 Matthias Munnich
diff -Naur grads-1.9b4/src/gxhpng.c grads-1.9b4_new/src/gxhpng.c
--- grads-1.9b4/src/gxhpng.c  2004-03-12 16:14:04.000000000 +0000
+++ grads-1.9b4_new/src/gxhpng.c        2005-11-03 11:56:53.000000000 +0000
@@ -6,7 +6,6 @@
 #include 
 #endif
 
-
 /* Rasterize current metafile buffer via gd library.  Loosly based
    on the gxpng utility:
 
@@ -455,7 +452,7 @@
                                im->polyInts[ints++] = (y-y1) * (x2-x1) / (y2-y1) + x1;
			}
		}
-		qsort(im->polyInts, ints, sizeof(int), gdCompareInt);
+		qsort(im->polyInts, ints, sizeof(int), (void *) gdCompareInt);

		for (i=0; (i < (ints)); i+=2) {
                        gdImageLne(im, im->polyInts[i], y,
diff -Naur grads-1.9b4/src/gxX.c grads-1.9b4_new/src/gxX.c
--- grads-1.9b4/src/gxX.c     2005-05-18 14:29:17.000000000 +0000
+++ grads-1.9b4_new/src/gxX.c   2005-11-03 11:28:15.000000000 +0000
@@ -270,7 +270,7 @@
 
   /* Set up icon pixmap */
 
-  icon_pixmap = XCreateBitmapFromData(display, win, icon_bitmap_bits,
+  icon_pixmap = XCreateBitmapFromData(display, win, (char *) icon_bitmap_bits,
                 icon_bitmap_width, icon_bitmap_height);
 
   /* Set standard properties */
@@ -402,7 +402,7 @@
   if (xfnam) flist = XListFonts (display, xfnam, 1, &i);
   else flist = NULL;
   if (flist==NULL) {
-    flist = XListFonts (display, "-adobe-helvetica-bold-r-normal--??-100*", 1, &i);
+    flist = XListFonts (display, "-adobe-helvetica-bold-r-normal-*-100*", 1, &i);
   }
   if (flist==NULL) {
     flist = XListFonts (display, "-adobe-helvetica-bold-r-normal-*-120*", 1, &i);
@@ -418,7 +418,7 @@
   if (xfnam) flist = XListFonts (display, xfnam, 1, &i);
   else flist = NULL;
   if (flist==NULL) {
-    flist = XListFonts (display, "-adobe-helvetica-bold-o-normal--??-100*", 1, &i);
+    flist = XListFonts (display, "-adobe-helvetica-bold-o-normal-*-100*", 1, &i);
   }
   if (flist==NULL) {
     flist = XListFonts (display, "-adobe-helvetica-bold-o-normal-*-120*", 1, &i);
@@ -3267,7 +3267,7 @@
   }
 
   if (typ>1) {
-    stipple_pixmap = XCreateBitmapFromData(display, win, bitmap_bits,
+    stipple_pixmap = XCreateBitmapFromData(display, win, (char *) bitmap_bits,
		     bitmap_width, bitmap_height);
     XSetStipple(display, gc, stipple_pixmap);
     XSetFillStyle(display, gc, FillStippled);


--- NEW FILE libdap.m4 ---
# Configure macros for Libdap
# Patrice Dumas 2005 based on freetype2.m4 from Marcelo Magallon 2001-10-26, 
# based on gtk.m4 by Owen Taylor
# AC_CHECK_DODS is also based on code from gdal configure.in

# AC_CHECK_LIBDAP([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libdap and define DAP_CFLAGS and DAP_LIBS.
# Check that the version is above MINIMUM-VERSION 
# use when linking with a c++ aware linker, with a c linker you may also
# need -lstdc++

AC_DEFUN([AC_CHECK_LIBDAP],
[
  AC_PATH_PROG([DAP_CONFIG], [dap-config], [no])
  dap_min_version=m4_if([$1], [], [3.5.0], [$1])
  AC_MSG_CHECKING([for libdap version >= $dap_min_version])
  dap_no=""
  if test "$DAP_CONFIG" = "no" ; then
     dap_no=yes
  else
     dap_config_major_version=`$DAP_CONFIG --version | sed 's/^libdap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\1/'`
     dap_config_minor_version=`$DAP_CONFIG --version | sed 's/^libdap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\2/'`
     dap_config_micro_version=`$DAP_CONFIG --version | sed 's/^libdap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\2/'`
     dap_min_major_version=`echo $dap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
     dap_min_minor_version=`echo $dap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
     dap_min_micro_version=`echo $dap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`

     dap_config_is_lt=""
     if test $dap_config_major_version -lt $dap_min_major_version ; then
       dap_config_is_lt=yes
     else
       if test $dap_config_major_version -eq $dap_min_major_version ; then
         if test $dap_config_minor_version -lt $dap_min_minor_version ; then
           dap_config_is_lt=yes
         else
           if test $dap_config_minor_version -eq $dap_min_minor_version ; then
             if test $dap_config_micro_version -lt $dap_min_micro_version ; then
               dap_config_is_lt=yes
             fi
           fi
         fi
       fi
     fi
     if test x$dap_config_is_lt = xyes ; then
       dap_no=yes
     else
       DAP_LIBS="`$DAP_CONFIG --libs`"
       DAP_CFLAGS="`$DAP_CONFIG --cflags`"
     fi
   fi
   if test x$dap_no = x ; then
     AC_MSG_RESULT([yes])
     m4_if([$2], [], [:], [$2])
   else
     AC_MSG_RESULT([no])
     if test "$DAP_CONFIG" = "no" ; then
     AC_MSG_NOTICE([The dap-config script could not be found.])
     else
       if test x$dap_config_is_lt = xyes ; then
         AC_MSG_NOTICE([the installed libdap library is too old.])
       fi
     fi
     DAP_LIBS=""
     DAP_CFLAGS=""
     m4_if([$3], [], [:], [$3])
   fi
   AC_SUBST([DAP_CFLAGS])
   AC_SUBST([DAP_LIBS])
]) 

# AC_CHECK_DODS([ ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libdap or older versions. Define DAP_CFLAGS and DAP_LIBS and
# optionnaly DAP_ROOT

AC_DEFUN([AC_CHECK_DODS],
[
  AC_ARG_WITH(dods_root,
    [  --with-dods-root[=ARG] DODS root fallback ],
    ,,)

  ac_dods_ok='no'
  AC_CHECK_LIBDAP([],[ac_dods_ok='yes'],[ac_dods_ok='no'])
  if test "z$ac_dods_ok" = "zno" ; then
     AC_PATH_PROG([OPENDAP_CONFIG], [opendap-config], [no])
     AC_MSG_CHECKING([for libdap with opendap-config])
     if test "$OPENDAP_CONFIG" = "no" ; then
       ac_dods_ok='no'
        AC_MSG_RESULT([no])
     else
       DAP_LIBS="`$OPENDAP_CONFIG --libs`"
       DAP_CFLAGS="`$OPENDAP_CONFIG --cflags`"
       ac_dods_ok='yes'
        AC_MSG_RESULT([yes])
     fi
  fi 
  DAP_ROOT=
  if test "z$ac_dods_ok" = "zno" ; then
    AC_MSG_CHECKING(DODS specific root)
    if test -z "$with_dods_root" -o "$with_dods_root" = "no"; then
      AC_MSG_RESULT(disabled)
    else
      AC_MSG_RESULT([$with_dods_root])
      DODS_ROOT=$with_dods_root
      DODS_LIB=$with_dods_root/lib
      DODS_INC=$with_dods_root/include
      DODS_BIN=$with_dods_root/bin

      dnl Add the DODS libraries to LIBS
      if test -x $DODS_BIN/opendap-config ; then 
        dnl OPeNDAP 3.4 and earlier lack opendap-config, but use it if avail.
        DAP_LIBS="`$DODS_BIN/opendap-config --libs`"
        DAP_CFLAGS="`$DODS_BIN/opendap-config --cflags`"
        ac_dods_ok='yes'
      else
        dnl Otherwise try to put things together in a more primitive way.
        DAP_LIBS="-L$DODS_LIB -ldap++ -lpthread"
        DAP_CFLAGS="-I$DODS_INC"
      
        ac_dods_curl='yes'
        dnl Add curl to LIBS; it might be local to DODS or generally installed
        AC_MSG_CHECKING([For curl and libxml2])
        if test -x $DODS_BIN/curl-config; then
            DAP_LIBS="$DAP_LIBS  `$DODS_BIN/curl-config --libs`"
        elif which curl-config > /dev/null 2>&1; then
            DAP_LIBS="$DAP_LIBS  `curl-config --libs`"
        else
            AC_MSG_WARN([You gave a dods root, but I can't find curl!])
            ac_dods_curl='no'
        fi
        
        ac_dods_xml2='yes'
        if test -x $DODS_BIN/xml2-config; then
            DAP_LIBS="$DAP_LIBS `$DODS_BIN/xml2-config --libs`"
        elif which xml2-config > /dev/null 2>&1; then
            DAP_LIBS="$DAP_LIBS  `xml2-config --libs`"
        else
            AC_MSG_WARN([You gave a dods root, but I can't find xml2!])
            ac_dods_xml2='no'
        fi
        AC_LANG_PUSH([C++])
        if test $ac_dods_xml2 = 'yes' -a $ac_dods_curl = 'yes'; then
          AC_MSG_RESULT([yes]) 
          dnl We check that linking is succesfull
          ac_save_LIBS="$LIBS"
          ac_save_CFLAGS="$CFLAGS"
          LIBS="$LIBS $DAP_LIBS"
          CFLAGS="$CFLAGS $DAP_CFLAGS"
          AC_MSG_NOTICE([Checking for DODS with curl and libxml2])
          AC_CHECK_LIB([dap++],[main],[ac_dods_ok='yes'],[ac_dods_ok='no'])
          LIBS=$ac_save_LIBS
          CFLAGS=$ac_save_CFLAGS
          if test "z$ac_dods_ok" = "zno"; then
            DAP_LIBS="$DAP_LIBS -lrx"
            ac_save_LIBS="$LIBS"
            ac_save_CFLAGS="$CFLAGS"
            LIBS="$LIBS $DAP_LIBS"
            CFLAGS="$CFLAGS $DAP_CFLAGS"
            AC_MSG_NOTICE([Checking for DODS with curl, libxml2 and librx])
            AC_CHECK_LIB([dap++],[main],[ac_dods_ok='yes'],[ac_dods_ok='no'])
            LIBS=$ac_save_LIBS
            CFLAGS=$ac_save_CFLAGS
          fi
        else
           AC_MSG_RESULT([no]) 
        fi
        if test $ac_dods_ok = 'no'; then
           dnl assume it is an old version of DODS
           AC_MSG_NOTICE([Checking for DODS with libwww and librx])
           DAP_LIBS="-L$DODS_LIB -lwww -ldap++ -lpthread -lrx"
           DAP_CFLAGS="-I$DODS_INC"
           ac_save_LIBS="$LIBS"
           ac_save_CFLAGS="$CFLAGS"
           LIBS="$LIBS $DAP_LIBS"
           CFLAGS="$CFLAGS $DAP_CFLAGS"
           AC_CHECK_LIB([dap++],[main],[ac_dods_ok='yes'],[ac_dods_ok='no'])
           LIBS=$ac_save_LIBS
           CFLAGS=$ac_save_CFLAGS
        fi
        AC_LANG_POP
      fi
      
      AC_MSG_CHECKING([for DODS in a specific root])
      if test "z$ac_dods_ok" = "zyes"; then
        AC_MSG_RESULT([yes])
        AC_MSG_NOTICE([setting DAP_ROOT directory to $DODS_ROOT])
        DAP_ROOT="$DODS_ROOT"
      else
        AC_MSG_RESULT([no])
      fi
    fi
  fi
  if test "x$ac_dods_ok" = "xyes" ; then
     m4_if([$1], [], [:], [$1])
  else
     DAP_LIBS=""
     DAP_CFLAGS=""
     m4_if([$2], [], [:], [$2])
  fi
  AC_SUBST([DAP_CFLAGS])
  AC_SUBST([DAP_LIBS])
  AC_SUBST([DAP_ROOT])
])


--- NEW FILE libnc-dap.m4 ---
# Configure macro for Libnc-dap
# Patrice Dumas 2005 based on freetype2.m4 from Marcelo Magallon 2001-10-26, 
# based on gtk.m4 by Owen Taylor

# AC_CHECK_LIBNC_DAP([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libnc-dap and define NC_DAP_CFLAGS and NC_DAP_LIBS.
# Check that the version is above MINIMUM-VERSION 

AC_DEFUN([AC_CHECK_LIBNC_DAP],
[
  AC_PATH_PROG([NC_DAP_CONFIG], [ncdap-config], [no])
  ncdap_min_version=m4_if([$1], [], [3.5.0], [$1])
  AC_MSG_CHECKING([for libnc-dap version >= $ncdap_min_version])
  ncdap_no=""
  if test "$NC_DAP_CONFIG" = "no" ; then
     ncdap_no=yes
  else
     ncdap_config_major_version=`$NC_DAP_CONFIG --version | sed 's/^libnc-dap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\1/'`
     ncdap_config_minor_version=`$NC_DAP_CONFIG --version | sed 's/^libnc-dap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\2/'`
     ncdap_config_micro_version=`$NC_DAP_CONFIG --version | sed 's/^libnc-dap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\2/'`
     ncdap_min_major_version=`echo $ncdap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
     ncdap_min_minor_version=`echo $ncdap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
     ncdap_min_micro_version=`echo $ncdap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`

     ncdap_config_is_lt=""
     if test $ncdap_config_major_version -lt $ncdap_min_major_version ; then
       ncdap_config_is_lt=yes
     else
       if test $ncdap_config_major_version -eq $ncdap_min_major_version ; then
         if test $ncdap_config_minor_version -lt $ncdap_min_minor_version ; then
           ncdap_config_is_lt=yes
         else
           if test $ncdap_config_minor_version -eq $ncdap_min_minor_version ; then
             if test $ncdap_config_micro_version -lt $ncdap_min_micro_version ; then
               ncdap_config_is_lt=yes
             fi
           fi
         fi
       fi
     fi
     if test x$ncdap_config_is_lt = xyes ; then
       ncdap_no=yes
     else
       NC_DAP_LIBS="`$NC_DAP_CONFIG --libs`"
       NC_DAP_CFLAGS="`$NC_DAP_CONFIG --cflags`"
     fi
   fi
   if test x$ncdap_no = x ; then
     AC_MSG_RESULT([yes])
     m4_if([$2], [], [:], [$2])
   else
     AC_MSG_RESULT([no])
     if test "$NC_DAP_CONFIG" = "no" ; then
     AC_MSG_NOTICE([The ncdap-config script could not be found.])
     else
       if test x$ncdap_config_is_lt = xyes ; then
         AC_MSG_NOTICE([the installed libnc-dap library is too old.])
       fi
     fi
     NC_DAP_LIBS=""
     NC_DAP_CFLAGS=""
     m4_if([$3], [], [:], [$3])
     
   fi
   AC_SUBST([NC_DAP_CFLAGS])
   AC_SUBST([NC_DAP_LIBS])
]) 


# AC_FC_CHECK_LIBNC_DAP([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libnc-dap and define NC_DAP_FFLAGS and NC_DAP_FLIBS with flags
# for fortran.
# Check that the version is above MINIMUM-VERSION 

AC_DEFUN([AC_FC_CHECK_LIBNC_DAP],
[
  libnc_fc_dap_ok="no"
  AC_CHECK_LIBNC_DAP([$1],[libnc_fc_dap_ok="yes"],[libnc_fc_dap_ok="no"])
  if test $libnc_fc_dap_ok = "yes"; then
     NC_DAP_FLIBS="`$NC_DAP_CONFIG --flibs`"
     NC_DAP_FFLAGS="$NC_DAP_CFLAGS"
     m4_if([$2], [], [:], [$2])
  else
     m4_if([$3], [], [:], [$3])
     NC_DAP_FLIBS=""
     NC_DAP_FFLAGS=""
  fi
  AC_SUBST([NC_DAP_FFLAGS])
  AC_SUBST([NC_DAP_FLIBS])
])


# AC_CHECK_NC_DODS([ ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libnc-dap or older versions. Define NC_DAP_CFLAGS and NC_DAP_LIBS.
# use AC_CHECK_DODS if the flags cannot be found easily

AC_DEFUN([AC_CHECK_NC_DODS],
[
  ac_ncdods_ok='no'
  AC_CHECK_LIBNC_DAP([],[ac_ncdods_ok='yes'],[ac_ncdods_ok='no'])
  if test "z$ac_ncdods_ok" = "zno" ; then
     AC_PATH_PROG([OPENNC_DAP_CONFIG], [opendap-config], [no])
     AC_MSG_CHECKING([for libnc-dap with opendap-config])
     if test "$OPENNC_DAP_CONFIG" = "no" ; then
       ac_ncdods_ok='no'
       AC_MSG_RESULT([no])
     else
       NC_DAP_LIBS="`$OPENNC_DAP_CONFIG --libs-nc`"
       NC_DAP_CFLAGS="`$OPENNC_DAP_CONFIG --cflags`"
       ac_ncdods_ok='yes'
       AC_MSG_RESULT([yes])
     fi
  fi 
  if test "z$ac_ncdods_ok" = "zno" ; then
     ac_ncdods_dap_ok='no'
     AC_CHECK_DODS([ac_ncdods_dap_ok='yes'],[ac_ncdods_dap_ok='no'])
     if test "z$ac_ncdods_dap_ok" = 'zyes'; then
        NC_DAP_LIBS="$DAP_LIBS -lnc-dods -ldap++"
        NC_DAP_CFLAGS="$DAP_CFLAGS"
        AC_LANG_PUSH([C++])
        dnl We check that linking is succesfull
        ac_save_LIBS="$LIBS"
        ac_save_CFLAGS="$CFLAGS"
        LIBS="$LIBS $NC_DAP_LIBS"
        CFLAGS="$CFLAGS $NC_DAP_CFLAGS"
        AC_CHECK_FUNC([nc_open],[ac_ncdods_ok='yes'],[ac_ncdods_ok='no'])
        LIBS=$ac_save_LIBS
        CFLAGS=$ac_save_CFLAGS
        AC_LANG_POP
     fi
  fi
  if test "x$ac_ncdods_ok" = "xyes" ; then
     m4_if([$1], [], [:], [$1])
  else
     NC_DAP_LIBS=""
     NC_DAP_CFLAGS=""
     m4_if([$2], [], [:], [$2])
  fi
  AC_SUBST([NC_DAP_CFLAGS])
  AC_SUBST([NC_DAP_LIBS])
])


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Dec 2005 12:11:41 -0000	1.1
+++ .cvsignore	20 Dec 2005 12:16:26 -0000	1.2
@@ -0,0 +1 @@
+grads-src-1.9b4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Dec 2005 12:11:41 -0000	1.1
+++ sources	20 Dec 2005 12:16:26 -0000	1.2
@@ -0,0 +1 @@
+22e04f84df73d4aa72fe468c7f43b1c3  grads-src-1.9b4.tar.gz



From fedora-extras-commits at redhat.com  Tue Dec 20 12:26:21 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:26:21 -0500
Subject: rpms/grads/devel grads.spec,1.1,1.2
Message-ID: <200512201226.jBKCQpB5006685@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6662

Modified Files:
	grads.spec 
Log Message:
add dist tag



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grads.spec	20 Dec 2005 12:16:26 -0000	1.1
+++ grads.spec	20 Dec 2005 12:26:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        4
+Release:        4%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering



From fedora-extras-commits at redhat.com  Tue Dec 20 12:31:10 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 07:31:10 -0500
Subject: owners owners.list,1.470,1.471
Message-ID: <200512201231.jBKCVe2K006790@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6760

Modified Files:
	owners.list 
Log Message:
add grads



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -r1.470 -r1.471
--- owners.list	20 Dec 2005 03:24:39 -0000	1.470
+++ owners.list	20 Dec 2005 12:31:08 -0000	1.471
@@ -321,6 +321,7 @@
 Fedora Extras|gputils|Development utilities for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gquilt|A PyGTK wrapper for quilt|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|gqview|Image browser and viewer|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
+Fedora Extras|grads|Tool for easy acces, manipulation, and visualization of data|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gramps|Genealogical Research and Analysis Management Programming System|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|graphviz|Graph Visualization Tools|oliver at linux-kernel.at|extras-qa at fedoraproject.org|ellson at research.att.com
 Fedora Extras|graveman|A frontend for cdrtools, dvd+rw-tools and sox|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 20 13:32:55 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 08:32:55 -0500
Subject: rpms/gnupg2/devel .cvsignore, 1.7, 1.8 gnupg2.spec, 1.29,
	1.30 sources, 1.8, 1.9
Message-ID: <200512201333.jBKDXP7P008618@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8596

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Tue Dec 20 2005 Rex Dieter  1.9.20-1
- 1.9.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Oct 2005 15:35:58 -0000	1.7
+++ .cvsignore	20 Dec 2005 13:32:53 -0000	1.8
@@ -1,2 +1,2 @@
-gnupg-1.9.19.tar.bz2
-gnupg-1.9.19.tar.bz2.sig
+gnupg-1.9.20.tar.bz2
+gnupg-1.9.20.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnupg2.spec	1 Dec 2005 21:01:48 -0000	1.29
+++ gnupg2.spec	20 Dec 2005 13:32:53 -0000	1.30
@@ -4,10 +4,11 @@
 # it can use other implementations too (including non-pcsc ones).
 %define pcsc_lib libpcsclite.so.0
 
-Summary: GNU utility for secure communication and data storage
+Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.19
-Release: 8%{?dist}
+Version: 1.9.20
+Release: 1%{?dist}
+
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
@@ -36,7 +37,7 @@
 # Hard-code libksba-0.9.11 for now (x86_64 'make check' fails)
 #BuildRequires: libksba-devel = 0.9.11
 #else
-BuildRequires: libksba-devel >= 0.9.12
+BuildRequires: libksba-devel >= 0.9.13
 #endif
 
 BuildRequires: gettext
@@ -74,9 +75,9 @@
 %patch1 -p1 -b .lvalue
 %patch2 -p1 -b .testverbose
 
-%ifarch x86_64
-sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
-%endif
+#ifarch x86_64
+#sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
+#endif
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
@@ -84,9 +85,9 @@
 %build
 
 %configure \
-  --disable-dependency-tracking \
   --disable-rpath \
-  --enable-gpg
+  --disable-dependency-tracking \
+  --enable-gpg 
 
 make %{?_smp_mflags}
 
@@ -95,7 +96,7 @@
 ## Allows for better debugability (doesn't work, fixme)
 # echo "debug-allow-core-dumps" >> tests/gpgsm.conf
 # (sometimes?) expect one failure (reported upstream)
-#make check ||:
+make check ||:
 
 
 %install
@@ -104,6 +105,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # enable auto-startup/shutdown of gpg-agent 
+# Keep an eye on http://bugzilla.redhat.com/bugzilla/175744, in case these dirs go away or change
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
 install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/env/
 install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{_prefix}/shutdown/
@@ -124,7 +126,7 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 #docs say to install suid root, but we won't, for now.
 #attr(4755,root,root) %{_bindir}/gpg2
@@ -134,6 +136,7 @@
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
 %{_bindir}/gpgkey2ssh
+%{_bindir}/gpgparsemail
 %{_bindir}/gpgsm*
 %{_bindir}/kbxutil
 %{_bindir}/scdaemon
@@ -153,6 +156,9 @@
 
 
 %changelog
+* Tue Dec 20 2005 Rex Dieter  1.9.20-1
+- 1.9.20
+
 * Thu Dec 01 2005 Rex Dieter  1.9.19-8
 - include gpg-agent-(startup|shutdown) scripts (#136533)
 - BR: libksba-devel >= 1.9.12 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Oct 2005 15:35:58 -0000	1.8
+++ sources	20 Dec 2005 13:32:53 -0000	1.9
@@ -1,2 +1,2 @@
-8084256a61aa90e0173d436bf1e6f82b  gnupg-1.9.19.tar.bz2
-9646e2b0f68474c5b1c8d37a09fb56d1  gnupg-1.9.19.tar.bz2.sig
+93899203fc0530f03e146d49b65c1e28  gnupg-1.9.20.tar.bz2
+76e3a5c1ac153c24a4fd3e0e83b0e9f6  gnupg-1.9.20.tar.bz2.sig



From fedora-extras-commits at redhat.com  Tue Dec 20 14:11:15 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Tue, 20 Dec 2005 09:11:15 -0500
Subject: rpms/pybliographer/FC-4 gnome-python.patch, NONE,
	1.1 pybliographer.patch, 1.1, 1.2 pybliographer.spec, 1.9, 1.10
Message-ID: <200512201411.jBKEBFSA010415@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10347/FC-4

Modified Files:
	pybliographer.patch pybliographer.spec 
Added Files:
	gnome-python.patch 
Log Message:
Applying patches from upstream


gnome-python.patch:

--- NEW FILE gnome-python.patch ---
--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/Editor.py	2005-10-13 18:11:13.000000000 +0200
+++ pybliographer-1.2.7/Pyblio/GnomeUI/Editor.py	2005-12-19 13:36:35.000000000 +0100
@@ -352,24 +352,24 @@
         if text != '':
             try: day = int (text)
             except ValueError:
-                ui.gnome_error_dialog_parented (_("Invalid day field in date"),
-                                                self.day.get_toplevel ())
+                ui.error_dialog_parented (_("Invalid day field in date"),
+                                          self.day.get_toplevel ())
                 return -1
         
         text = string.strip (self.month.get_chars (0, -1)).encode ('latin-1')
         if text != '':
             try: month = int (text)
             except ValueError, err:
-                ui.gnome_error_dialog_parented (_("Invalid month field in date"),
-                                                self.day.get_toplevel ())
+                ui.error_dialog_parented (_("Invalid month field in date"),
+                                          self.day.get_toplevel ())
                 return -1
         
         text = string.strip (self.year.get_chars (0, -1)).encode ('latin-1')
         if text != '':
             try: year = int (text)
             except ValueError: 
-                ui.gnome_error_dialog_parented (_("Invalid year field in date"),
-                                                self.day.get_toplevel ())
+                ui.error_dialog_parented (_("Invalid year field in date"),
+                                          self.day.get_toplevel ())
                 return -1
         
         if self.initial == (day, month, year): return 0
@@ -381,8 +381,8 @@
         try:
             entry [self.field] = Fields.Date ((year, month, day))
         except Exceptions.DateError, error:
-            ui.gnome_error_dialog_parented (str (error),
-                                            self.day.get_toplevel ())
+            ui.error_dialog_parented (str (error),
+                                      self.day.get_toplevel ())
             return -1
         return 1
 
@@ -903,7 +903,7 @@
             modified = True
         else:
             if not key_re.match (key):
-                ui.gnome_error_dialog_parented (
+                ui.error_dialog_parented (
                     _("Invalid key format"), self.w.get_toplevel ())
                 return None
 
@@ -911,7 +911,7 @@
 
             if key != self.entry.key:
                 if database.has_key (key):
-                     ui.gnome_error_dialog_parented (
+                     ui.error_dialog_parented (
                          _("Key `%s' already exists") % str (key.key),
                          self.w.get_toplevel ())
                      return None
@@ -928,7 +928,7 @@
             except UnicodeError:
                 f = Types.get_field (item.field)
                 
-                ui.gnome_error_dialog_parented (
+                ui.error_dialog_parented (
                     _("The `%s' field contains a non Latin-1 symbol") %
                     f.name, self.w.get_toplevel ())
                 return None
@@ -998,7 +998,7 @@
             text = text.encode ('latin-1')
 
         except UnicodeError:
-            ui.gnome_error_dialog_parented (
+            ui.error_dialog_parented (
                 _("Your text contains non Latin-1 symbols"),
                 self.w.get_toplevel ())
             return None

pybliographer.patch:

Index: pybliographer.patch
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-4/pybliographer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pybliographer.patch	15 Oct 2005 21:56:03 -0000	1.1
+++ pybliographer.patch	20 Dec 2005 14:11:13 -0000	1.2
@@ -1,13 +1,112 @@
+--- pybliographer-1.2.7-orig/Pyblio/Format/BibTeX.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/Format/BibTeX.py	2005-12-09 13:33:04.000000000 +0100
+@@ -425,7 +425,7 @@
+             else:
+                 if self.dict.has_key (entry.key):
+                     errors.append (_("%s:%d: key `%s' already defined") % (
+-                        str (self.key), entry.line, entry.key.key))
++                        repr (self.key), entry.line, repr (entry.key.key)))
+                 else:
+                     self.dict [entry.key] = entry
+ 
+--- pybliographer-1.2.7-orig/Pyblio/Format/Medline.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/Format/Medline.py	2005-12-09 13:33:04.000000000 +0100
+@@ -111,7 +111,7 @@
+                 first, last, lineage = [], [], []
+                 
+                 for part in string.split (au, ' '):
+-                    if part == string.upper (part):
++		    if part.isupper ():
+                         # in upper-case, this is a first name
+                         if len (last) > 0:
+                             first.append (part)
+@@ -130,7 +130,7 @@
+                     first = first [0:1]
+ 
+                 if len (first) > 0:
+-                    first = string.join (first [0], '.') + '.'
++                    first = string.join (first [0], '. ') + '.'
+                 else:
+                     first = None
+ 
+@@ -158,8 +158,6 @@
+         for f in table.keys ():
+             f_mapped = one_to_one.get(f, 'medline-%s' %(f.lower()))
+             text_type = Types.get_field(f_mapped).type
+-            print 'MEDLINE: field name %s has type %s' %(
+-                f_mapped, text_type)
+             norm [f_mapped] = text_type (string.join (table [f], " ; "))
+         
+         return Base.Entry (None, type, norm)
+@@ -302,3 +300,8 @@
+ Autoload.register ('format', 'Medline', {'open'  : opener,
+                                          'write' : writer,
+                                          'iter'  : iterator})
++
++### Local Variables:
++### Mode: python
++### py-master-file : "ut_medline.py"
++### End:
+--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/Document.py	2005-10-13 18:11:17.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/GnomeUI/Document.py	2005-12-09 13:33:04.000000000 +0100
+@@ -1052,7 +1052,6 @@
+             try:
+                 self.lyx = LyX.LyXClient ()
+             except IOError, msg:
+-                msg = msg [1].decode (enc)
+                 self.w.error (_("Can't connect to LyX:\n%s") % msg)
+                 return
+ 
+--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/FileSelector.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/GnomeUI/FileSelector.py	2005-12-19 11:58:43.000000000 +0100
+@@ -87,11 +87,13 @@
+ 	    liste = Autoload.available ('format')
+ 	    liste.sort ()
+ 
+-	    self.formats = [ None ]
++	    self.formats = []
+ 
+ 	    if has_auto:
+ 		self.menu.append_text (_(' - According to file suffix - '))
+ 		self.ftype = None
++                self.formats.append(None)
++                
+ 	    else:
+ 		self.ftype = liste [0]
+ 
+--- pybliographer-1.2.7-orig/Pyblio/LyX.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/LyX.py	2005-12-09 13:33:05.000000000 +0100
+@@ -33,14 +33,14 @@
+         pin = os.path.expanduser (base + '.in')
+         try:
+             ans = os.stat (pin)
+-        except os.error:
+-            raise IOError, (-1, _("no input pipe `%s'") % pin)
++        except OSError, msg:
++            raise IOError (_("no input pipe `%s'") % pin)
+         
+         pout = os.path.expanduser (base + '.out')
+         try:
+             ans = os.stat (pout)
+         except os.error:
+-            raise IOError, (-1, _("no output pipe `%s'") % pout)
++            raise IOError (_("no output pipe `%s'") % pout)
+ 
+         def noaction (* arg): return
+         
 --- pybliographer-1.2.7-orig/setup-check.py	2005-10-13 18:11:19.000000000 +0200
-+++ pybliographer-1.2.7/setup-check.py	2005-10-15 23:27:16.000000000 +0200
-@@ -86,8 +86,8 @@
++++ pybliographer-1.2.7/setup-check.py	2005-10-18 12:04:58.000000000 +0200
+@@ -86,9 +86,10 @@
  
      error ('unexpected error')
  
 -if gtk.pygtk_version < (2,4,0):
 -    error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
-+#if gtk.pygtk_version < (2,4,0):
-+#    error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
-     
+-    
++else:
++    if gtk.pygtk_version < (2,4,0):
++        error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
++
  
  try:
+     import _recode


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-4/pybliographer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pybliographer.spec	15 Oct 2005 21:56:03 -0000	1.9
+++ pybliographer.spec	20 Dec 2005 14:11:13 -0000	1.10
@@ -1,11 +1,12 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
 Version: 1.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.7.tar.gz
 Patch0: pybliographer.patch
+Patch1: gnome-python.patch
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -44,6 +45,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -154,6 +156,9 @@
 
 
 %changelog
+* Tue Dec 20 2005 Zoltan Kota  - 1.2.7-2
+- add patches for fixing different bugs
+
 * Fri Oct 15 2005 Zoltan Kota  - 1.2.7-1
 - update to 1.2.7
 - drop gnome-help.patch, fixed upstream



From fedora-extras-commits at redhat.com  Tue Dec 20 14:11:09 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Tue, 20 Dec 2005 09:11:09 -0500
Subject: rpms/pybliographer/FC-3 pybliographer.patch, 1.1,
	1.2 pybliographer.spec, 1.6, 1.7
Message-ID: <200512201411.jBKEBeSW010449@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10347/FC-3

Modified Files:
	pybliographer.patch pybliographer.spec 
Log Message:
Applying patches from upstream


pybliographer.patch:

Index: pybliographer.patch
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-3/pybliographer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pybliographer.patch	15 Oct 2005 21:56:03 -0000	1.1
+++ pybliographer.patch	20 Dec 2005 14:11:07 -0000	1.2
@@ -1,13 +1,112 @@
+--- pybliographer-1.2.7-orig/Pyblio/Format/BibTeX.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/Format/BibTeX.py	2005-12-09 13:33:04.000000000 +0100
+@@ -425,7 +425,7 @@
+             else:
+                 if self.dict.has_key (entry.key):
+                     errors.append (_("%s:%d: key `%s' already defined") % (
+-                        str (self.key), entry.line, entry.key.key))
++                        repr (self.key), entry.line, repr (entry.key.key)))
+                 else:
+                     self.dict [entry.key] = entry
+ 
+--- pybliographer-1.2.7-orig/Pyblio/Format/Medline.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/Format/Medline.py	2005-12-09 13:33:04.000000000 +0100
+@@ -111,7 +111,7 @@
+                 first, last, lineage = [], [], []
+                 
+                 for part in string.split (au, ' '):
+-                    if part == string.upper (part):
++		    if part.isupper ():
+                         # in upper-case, this is a first name
+                         if len (last) > 0:
+                             first.append (part)
+@@ -130,7 +130,7 @@
+                     first = first [0:1]
+ 
+                 if len (first) > 0:
+-                    first = string.join (first [0], '.') + '.'
++                    first = string.join (first [0], '. ') + '.'
+                 else:
+                     first = None
+ 
+@@ -158,8 +158,6 @@
+         for f in table.keys ():
+             f_mapped = one_to_one.get(f, 'medline-%s' %(f.lower()))
+             text_type = Types.get_field(f_mapped).type
+-            print 'MEDLINE: field name %s has type %s' %(
+-                f_mapped, text_type)
+             norm [f_mapped] = text_type (string.join (table [f], " ; "))
+         
+         return Base.Entry (None, type, norm)
+@@ -302,3 +300,8 @@
+ Autoload.register ('format', 'Medline', {'open'  : opener,
+                                          'write' : writer,
+                                          'iter'  : iterator})
++
++### Local Variables:
++### Mode: python
++### py-master-file : "ut_medline.py"
++### End:
+--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/Document.py	2005-10-13 18:11:17.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/GnomeUI/Document.py	2005-12-09 13:33:04.000000000 +0100
+@@ -1052,7 +1052,6 @@
+             try:
+                 self.lyx = LyX.LyXClient ()
+             except IOError, msg:
+-                msg = msg [1].decode (enc)
+                 self.w.error (_("Can't connect to LyX:\n%s") % msg)
+                 return
+ 
+--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/FileSelector.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/GnomeUI/FileSelector.py	2005-12-19 11:58:43.000000000 +0100
+@@ -87,11 +87,13 @@
+ 	    liste = Autoload.available ('format')
+ 	    liste.sort ()
+ 
+-	    self.formats = [ None ]
++	    self.formats = []
+ 
+ 	    if has_auto:
+ 		self.menu.append_text (_(' - According to file suffix - '))
+ 		self.ftype = None
++                self.formats.append(None)
++                
+ 	    else:
+ 		self.ftype = liste [0]
+ 
+--- pybliographer-1.2.7-orig/Pyblio/LyX.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/LyX.py	2005-12-09 13:33:05.000000000 +0100
+@@ -33,14 +33,14 @@
+         pin = os.path.expanduser (base + '.in')
+         try:
+             ans = os.stat (pin)
+-        except os.error:
+-            raise IOError, (-1, _("no input pipe `%s'") % pin)
++        except OSError, msg:
++            raise IOError (_("no input pipe `%s'") % pin)
+         
+         pout = os.path.expanduser (base + '.out')
+         try:
+             ans = os.stat (pout)
+         except os.error:
+-            raise IOError, (-1, _("no output pipe `%s'") % pout)
++            raise IOError (_("no output pipe `%s'") % pout)
+ 
+         def noaction (* arg): return
+         
 --- pybliographer-1.2.7-orig/setup-check.py	2005-10-13 18:11:19.000000000 +0200
-+++ pybliographer-1.2.7/setup-check.py	2005-10-15 23:27:16.000000000 +0200
-@@ -86,8 +86,8 @@
++++ pybliographer-1.2.7/setup-check.py	2005-10-18 12:04:58.000000000 +0200
+@@ -86,9 +86,10 @@
  
      error ('unexpected error')
  
 -if gtk.pygtk_version < (2,4,0):
 -    error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
-+#if gtk.pygtk_version < (2,4,0):
-+#    error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
-     
+-    
++else:
++    if gtk.pygtk_version < (2,4,0):
++        error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
++
  
  try:
+     import _recode


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-3/pybliographer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pybliographer.spec	15 Oct 2005 21:56:03 -0000	1.6
+++ pybliographer.spec	20 Dec 2005 14:11:07 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
 Version: 1.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.7.tar.gz
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Tue Dec 20 2005 Zoltan Kota  - 1.2.7-2
+- add patch for fixing different bugs
+
 * Fri Oct 15 2005 Zoltan Kota  - 1.2.7-1
 - update to 1.2.7
 - drop gnome-help.patch, fixed upstream



From fedora-extras-commits at redhat.com  Tue Dec 20 14:11:20 2005
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Tue, 20 Dec 2005 09:11:20 -0500
Subject: rpms/pybliographer/devel gnome-python.patch, NONE,
	1.1 pybliographer.patch, 1.1, 1.2 pybliographer.spec, 1.10, 1.11
Message-ID: <200512201411.jBKEBK7i010438@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10347/devel

Modified Files:
	pybliographer.patch pybliographer.spec 
Added Files:
	gnome-python.patch 
Log Message:
Applying patches from upstream


gnome-python.patch:

--- NEW FILE gnome-python.patch ---
--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/Editor.py	2005-10-13 18:11:13.000000000 +0200
+++ pybliographer-1.2.7/Pyblio/GnomeUI/Editor.py	2005-12-19 13:36:35.000000000 +0100
@@ -352,24 +352,24 @@
         if text != '':
             try: day = int (text)
             except ValueError:
-                ui.gnome_error_dialog_parented (_("Invalid day field in date"),
-                                                self.day.get_toplevel ())
+                ui.error_dialog_parented (_("Invalid day field in date"),
+                                          self.day.get_toplevel ())
                 return -1
         
         text = string.strip (self.month.get_chars (0, -1)).encode ('latin-1')
         if text != '':
             try: month = int (text)
             except ValueError, err:
-                ui.gnome_error_dialog_parented (_("Invalid month field in date"),
-                                                self.day.get_toplevel ())
+                ui.error_dialog_parented (_("Invalid month field in date"),
+                                          self.day.get_toplevel ())
                 return -1
         
         text = string.strip (self.year.get_chars (0, -1)).encode ('latin-1')
         if text != '':
             try: year = int (text)
             except ValueError: 
-                ui.gnome_error_dialog_parented (_("Invalid year field in date"),
-                                                self.day.get_toplevel ())
+                ui.error_dialog_parented (_("Invalid year field in date"),
+                                          self.day.get_toplevel ())
                 return -1
         
         if self.initial == (day, month, year): return 0
@@ -381,8 +381,8 @@
         try:
             entry [self.field] = Fields.Date ((year, month, day))
         except Exceptions.DateError, error:
-            ui.gnome_error_dialog_parented (str (error),
-                                            self.day.get_toplevel ())
+            ui.error_dialog_parented (str (error),
+                                      self.day.get_toplevel ())
             return -1
         return 1
 
@@ -903,7 +903,7 @@
             modified = True
         else:
             if not key_re.match (key):
-                ui.gnome_error_dialog_parented (
+                ui.error_dialog_parented (
                     _("Invalid key format"), self.w.get_toplevel ())
                 return None
 
@@ -911,7 +911,7 @@
 
             if key != self.entry.key:
                 if database.has_key (key):
-                     ui.gnome_error_dialog_parented (
+                     ui.error_dialog_parented (
                          _("Key `%s' already exists") % str (key.key),
                          self.w.get_toplevel ())
                      return None
@@ -928,7 +928,7 @@
             except UnicodeError:
                 f = Types.get_field (item.field)
                 
-                ui.gnome_error_dialog_parented (
+                ui.error_dialog_parented (
                     _("The `%s' field contains a non Latin-1 symbol") %
                     f.name, self.w.get_toplevel ())
                 return None
@@ -998,7 +998,7 @@
             text = text.encode ('latin-1')
 
         except UnicodeError:
-            ui.gnome_error_dialog_parented (
+            ui.error_dialog_parented (
                 _("Your text contains non Latin-1 symbols"),
                 self.w.get_toplevel ())
             return None

pybliographer.patch:

Index: pybliographer.patch
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pybliographer.patch	15 Oct 2005 21:56:04 -0000	1.1
+++ pybliographer.patch	20 Dec 2005 14:11:18 -0000	1.2
@@ -1,13 +1,112 @@
+--- pybliographer-1.2.7-orig/Pyblio/Format/BibTeX.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/Format/BibTeX.py	2005-12-09 13:33:04.000000000 +0100
+@@ -425,7 +425,7 @@
+             else:
+                 if self.dict.has_key (entry.key):
+                     errors.append (_("%s:%d: key `%s' already defined") % (
+-                        str (self.key), entry.line, entry.key.key))
++                        repr (self.key), entry.line, repr (entry.key.key)))
+                 else:
+                     self.dict [entry.key] = entry
+ 
+--- pybliographer-1.2.7-orig/Pyblio/Format/Medline.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/Format/Medline.py	2005-12-09 13:33:04.000000000 +0100
+@@ -111,7 +111,7 @@
+                 first, last, lineage = [], [], []
+                 
+                 for part in string.split (au, ' '):
+-                    if part == string.upper (part):
++		    if part.isupper ():
+                         # in upper-case, this is a first name
+                         if len (last) > 0:
+                             first.append (part)
+@@ -130,7 +130,7 @@
+                     first = first [0:1]
+ 
+                 if len (first) > 0:
+-                    first = string.join (first [0], '.') + '.'
++                    first = string.join (first [0], '. ') + '.'
+                 else:
+                     first = None
+ 
+@@ -158,8 +158,6 @@
+         for f in table.keys ():
+             f_mapped = one_to_one.get(f, 'medline-%s' %(f.lower()))
+             text_type = Types.get_field(f_mapped).type
+-            print 'MEDLINE: field name %s has type %s' %(
+-                f_mapped, text_type)
+             norm [f_mapped] = text_type (string.join (table [f], " ; "))
+         
+         return Base.Entry (None, type, norm)
+@@ -302,3 +300,8 @@
+ Autoload.register ('format', 'Medline', {'open'  : opener,
+                                          'write' : writer,
+                                          'iter'  : iterator})
++
++### Local Variables:
++### Mode: python
++### py-master-file : "ut_medline.py"
++### End:
+--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/Document.py	2005-10-13 18:11:17.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/GnomeUI/Document.py	2005-12-09 13:33:04.000000000 +0100
+@@ -1052,7 +1052,6 @@
+             try:
+                 self.lyx = LyX.LyXClient ()
+             except IOError, msg:
+-                msg = msg [1].decode (enc)
+                 self.w.error (_("Can't connect to LyX:\n%s") % msg)
+                 return
+ 
+--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/FileSelector.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/GnomeUI/FileSelector.py	2005-12-19 11:58:43.000000000 +0100
+@@ -87,11 +87,13 @@
+ 	    liste = Autoload.available ('format')
+ 	    liste.sort ()
+ 
+-	    self.formats = [ None ]
++	    self.formats = []
+ 
+ 	    if has_auto:
+ 		self.menu.append_text (_(' - According to file suffix - '))
+ 		self.ftype = None
++                self.formats.append(None)
++                
+ 	    else:
+ 		self.ftype = liste [0]
+ 
+--- pybliographer-1.2.7-orig/Pyblio/LyX.py	2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/LyX.py	2005-12-09 13:33:05.000000000 +0100
+@@ -33,14 +33,14 @@
+         pin = os.path.expanduser (base + '.in')
+         try:
+             ans = os.stat (pin)
+-        except os.error:
+-            raise IOError, (-1, _("no input pipe `%s'") % pin)
++        except OSError, msg:
++            raise IOError (_("no input pipe `%s'") % pin)
+         
+         pout = os.path.expanduser (base + '.out')
+         try:
+             ans = os.stat (pout)
+         except os.error:
+-            raise IOError, (-1, _("no output pipe `%s'") % pout)
++            raise IOError (_("no output pipe `%s'") % pout)
+ 
+         def noaction (* arg): return
+         
 --- pybliographer-1.2.7-orig/setup-check.py	2005-10-13 18:11:19.000000000 +0200
-+++ pybliographer-1.2.7/setup-check.py	2005-10-15 23:27:16.000000000 +0200
-@@ -86,8 +86,8 @@
++++ pybliographer-1.2.7/setup-check.py	2005-10-18 12:04:58.000000000 +0200
+@@ -86,9 +86,10 @@
  
      error ('unexpected error')
  
 -if gtk.pygtk_version < (2,4,0):
 -    error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
-+#if gtk.pygtk_version < (2,4,0):
-+#    error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
-     
+-    
++else:
++    if gtk.pygtk_version < (2,4,0):
++        error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
++
  
  try:
+     import _recode


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pybliographer.spec	15 Oct 2005 21:56:04 -0000	1.10
+++ pybliographer.spec	20 Dec 2005 14:11:18 -0000	1.11
@@ -1,11 +1,12 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
 Version: 1.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Publishing
 Source: http://dl.sf.net/pybliographer/pybliographer-1.2.7.tar.gz
 Patch0: pybliographer.patch
+Patch1: gnome-python.patch
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -44,6 +45,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -154,6 +156,9 @@
 
 
 %changelog
+* Tue Dec 20 2005 Zoltan Kota  - 1.2.7-2
+- add patches for fixing different bugs
+
 * Fri Oct 15 2005 Zoltan Kota  - 1.2.7-1
 - update to 1.2.7
 - drop gnome-help.patch, fixed upstream



From fedora-extras-commits at redhat.com  Tue Dec 20 14:22:40 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:22:40 -0500
Subject: rpms/gift - New directory
Message-ID: <200512201422.jBKEMeLb010633@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10623/gift

Log Message:
Directory /cvs/extras/rpms/gift added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 14:22:46 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:22:46 -0500
Subject: rpms/gift/devel - New directory
Message-ID: <200512201422.jBKEMkAn010649@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10623/gift/devel

Log Message:
Directory /cvs/extras/rpms/gift/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 14:22:57 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:22:57 -0500
Subject: rpms/gift Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512201422.jBKEMv2I010684@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10671

Added Files:
	Makefile import.log 
Log Message:
Setup of module gift


--- NEW FILE Makefile ---
# Top level Makefile for module gift
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 20 14:23:05 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:23:05 -0500
Subject: rpms/gift/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512201423.jBKEN57H010707@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10671/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gift


--- NEW 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 Dec 20 14:24:37 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:24:37 -0500
Subject: rpms/gift import.log,1.1,1.2
Message-ID: <200512201425.jBKEP7MH010825@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10784

Modified Files:
	import.log 
Log Message:
auto-import gift-0.11.8.1-3 on branch devel from gift-0.11.8.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gift/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Dec 2005 14:22:55 -0000	1.1
+++ import.log	20 Dec 2005 14:24:34 -0000	1.2
@@ -0,0 +1 @@
+gift-0_11_8_1-3:HEAD:gift-0.11.8.1-3.src.rpm:1135088659



From fedora-extras-commits at redhat.com  Tue Dec 20 14:24:42 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:24:42 -0500
Subject: rpms/gift/devel gift-0.11.8.1-gcc4.patch, NONE, 1.1 gift.spec, NONE,
	1.1 giftd.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512201424.jBKEOgKL010818@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10784/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gift-0.11.8.1-gcc4.patch gift.spec giftd.sh 
Log Message:
auto-import gift-0.11.8.1-3 on branch devel from gift-0.11.8.1-3.src.rpm

gift-0.11.8.1-gcc4.patch:

--- NEW FILE gift-0.11.8.1-gcc4.patch ---
--- gift-0.11.8.1/src/plugin.c.gcc4	2004-11-11 20:52:16.000000000 -0600
+++ gift-0.11.8.1/src/plugin.c	2005-06-27 13:56:32.000000000 -0500
@@ -128,11 +128,11 @@
 	size_t  msgwr = 0;                                                     \
 	va_list args;                                                          \
 	if (pfx1)                                                              \
-		msgwr += snprintf (APPENDMSG, "%s: ", STRING_NOTNULL(pfx1));       \
+		msgwr += snprintf (msg + msgwr, sizeof (msg) - msgwr - 1, "%s: ", STRING_NOTNULL(pfx1));       \
 	if (pfx2)                                                              \
-		msgwr += snprintf (APPENDMSG, "[%s]: ", STRING_NOTNULL(pfx2));     \
+		msgwr += snprintf (msg + msgwr, sizeof (msg) - msgwr - 1, "[%s]: ", STRING_NOTNULL(pfx2));     \
 	va_start (args, fmt);                                                  \
-	vsnprintf (APPENDMSG, fmt, args);                                      \
+	vsnprintf (msg + msgwr, sizeof (msg) - msgwr - 1, fmt, args);                                      \
 	va_end (args);
 
 static int wrapper_dbg (Protocol *p, char *fmt, ...)


--- NEW FILE gift.spec ---

%if "%{?fedora}" > "2"
%define _enable_libmagic --enable-libmagic
%endif

%if "%{?rhel}" > "3"
%define _enable_libmagic --enable-libmagic
%endif

Name:	 gift
Summary: Daemon for communicating with filesharing protocols
Version: 0.11.8.1
Release: 3%{?dist} 

License: GPL
Group:	 System Environment/Daemons
URL: 	 http://gift.sourceforge.net/
Source:	 http://dl.sourceforge.net/sourceforge/gift/gift-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch1: gift-0.11.8.1-gcc4.patch

# Wrapper for auto-launch gift-setup for first-time users 
Source1: giftd.sh

BuildRequires: libtool
%if "%{?fedora}" >= "4"
BuildRequires: libtool-ltdl-devel
%endif
BuildRequires: libvorbis-devel
BuildRequires: ImageMagick-devel 
%{?_enable_libmagic:BuildRequires: file > 4.0 }

%description
giFT is a modular daemon capable of abstracting the communication between
the end user and specific filesharing protocols (peer-to-peer or otherwise).

%package devel
Summary: Headers and library files for %{name} 
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
%{summary}.


%prep
%setup -q

%patch1 -p1 -b .gcc4


%build
%configure %{?_enable_libmagic} 

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT
 
## Move giftd out of the way, replace with wrapper
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mv $RPM_BUILD_ROOT%{_bindir}/giftd $RPM_BUILD_ROOT%{_sbindir}/
install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/giftd


## Create/own plugin dir
mkdir -p $RPM_BUILD_ROOT%{_libdir}/giFT

## Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc README AUTHORS COPYING HACKING INSTALL QUICKSTART TODO
%{_bindir}/gift*
%{_sbindir}/giftd
%{_datadir}/giFT/
%{_libdir}/giFT/
%{_libdir}/lib*.so.*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Wed Dec 14 2005 Rex Dieter  0.11.8.1-3
- --enable-libmagic (on platforms where file > 4 available)

* Tue Dec 13 2005 Rex Dieter  0.11.8.1-2
- Summary: Capitalize
- BR: file (libmagic)

* Thu Dec 08 2005 Rex Dieter  0.11.8.1-1
- cleanup for Fedora Extras

* Mon Nov 07 2005 Rex Dieter  0.11.8.1-0.lvn.2
- -devel: BR: pkgconfig

* Mon Nov 29 2004 Rex Dieter  0.11.8.1-0.lvn.1
- 0.11.8.1

* Wed Nov 17 2004 Rex Dieter  0.11.8-0.lvn.1
- 0.11.8

* Mon Nov 1 2004 Rex Dieter  0.11.7-0.lvn.3
- fix linking (libgiftproto).  Ugly, ugly hack... proper fix pending

* Wed Oct 27 2004 Rex Dieter  0.11.7-0.lvn.2
- BR: libtool

* Tue Sep 28 2004 Rex Dieter  0.11.7-0.lvn.1
- 0.11.7

* Thu Jul 29 2004 Rex Dieter  0.11.6-0.lvn.2
- use giftd wrapper to auto-launch gift-setup for first-time users

* Thu Jul 29 2004 Rex Dieter  0.11.6-0.lvn.1
- adjust Release tag for livna.org submission

* Fri Jul 23 2004 Rex Dieter  0.11.6-0.fdr.3
- remove include files from main pkg
- create/own plugindir: %%_libdir/giFT

* Thu Jul 22 2004 Rex Dieter  0.11.6-0.fdr.2
- Group: System Environment/Daemons

* Thu Jul 22 2004 Rex Dieter  0.11.6-0.fdr.1
- 0.11.6
- fedora'ize
- -devel sup-pkg

* Mon Dec 29 2003 Dries Verachtert  0.11.5-1.dries
- first packaging for Fedora Core 1



--- NEW FILE giftd.sh ---
#!/bin/bash

GIFTD=/usr/sbin/giftd

# Try first using X(term)
if [ ! -d ~/.giFT ]; then
  # naive attempt to run only run one instance per user (hopefully).
  LOCKFILE=/var/tmp/gift-setup.${UID}.lock
  echo $$ > $LOCKFILE ||:
  # Try first using X(term), then fallback to console
  if [ ! -z "${DISPLAY}" ]; then 
    xterm -e gift-setup || gift-setup
  else
    gift-setup
  fi
  rm -f $LOCKFILE
fi

# Hopefully we're good to go now
exec ${GIFTD} 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Dec 2005 14:23:01 -0000	1.1
+++ .cvsignore	20 Dec 2005 14:24:40 -0000	1.2
@@ -0,0 +1 @@
+gift-0.11.8.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Dec 2005 14:23:01 -0000	1.1
+++ sources	20 Dec 2005 14:24:40 -0000	1.2
@@ -0,0 +1 @@
+1c70477af403af142359d07ee4a03348  gift-0.11.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Dec 20 14:25:50 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:25:50 -0500
Subject: rpms/gift-openft - New directory
Message-ID: <200512201425.jBKEPo8n010919@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10910/gift-openft

Log Message:
Directory /cvs/extras/rpms/gift-openft added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 14:25:56 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:25:56 -0500
Subject: rpms/gift-openft/devel - New directory
Message-ID: <200512201425.jBKEPuGX010935@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10910/gift-openft/devel

Log Message:
Directory /cvs/extras/rpms/gift-openft/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 14:26:17 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:26:17 -0500
Subject: rpms/gift-openft Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512201426.jBKEQHEH010970@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957

Added Files:
	Makefile import.log 
Log Message:
Setup of module gift-openft


--- NEW FILE Makefile ---
# Top level Makefile for module gift-openft
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 20 14:26:22 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:26:22 -0500
Subject: rpms/gift-openft/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512201426.jBKEQMfY010991@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gift-openft


--- NEW 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 Dec 20 14:26:42 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:26:42 -0500
Subject: rpms/gift-openft import.log,1.1,1.2
Message-ID: <200512201427.jBKERCtc011070@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11030

Modified Files:
	import.log 
Log Message:
auto-import gift-openft-0.2.1.6-2 on branch devel from gift-openft-0.2.1.6-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gift-openft/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Dec 2005 14:26:15 -0000	1.1
+++ import.log	20 Dec 2005 14:26:40 -0000	1.2
@@ -0,0 +1 @@
+gift-openft-0_2_1_6-2:HEAD:gift-openft-0.2.1.6-2.src.rpm:1135088786



From fedora-extras-commits at redhat.com  Tue Dec 20 14:26:47 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:26:47 -0500
Subject: rpms/gift-openft/devel gift-openft-0.2.1.6-lib64.patch, NONE,
	1.1 gift-openft.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200512201427.jBKERIvk011075@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11030/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gift-openft-0.2.1.6-lib64.patch gift-openft.spec 
Log Message:
auto-import gift-openft-0.2.1.6-2 on branch devel from gift-openft-0.2.1.6-2.src.rpm

gift-openft-0.2.1.6-lib64.patch:

--- NEW FILE gift-openft-0.2.1.6-lib64.patch ---
--- gift-openft-0.2.1.6/configure.lib64	2005-04-30 19:05:57.000000000 -0500
+++ gift-openft-0.2.1.6/configure	2005-11-09 09:14:58.000000000 -0600
@@ -20198,7 +20198,7 @@
 
    fi
 
-   plugindir=${prefix}/lib/giFT
+   plugindir=${libdir}/giFT
 
 
    datadir=${prefix}/share/giFT


--- NEW FILE gift-openft.spec ---

Summary: Openft plugin for giFT 
Name:	 gift-openft	
Version: 0.2.1.6
Release: 2%{?dist}

License: GPL
Group:	 System Environment/Libraries
URL: 	 http://gift.sourceforge.net/
Source:	 http://dl.sourceforge.net/sourceforge/gift/gift-openft-0.2.1.6.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch1: gift-openft-0.2.1.6-lib64.patch

BuildRequires: gift-devel
BuildRequires: zlib-devel
BuildRequires: db4-devel

%description
%{summary}.


%prep
%setup -q

%patch1 -p1 -b .lib64


%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 README AUTHORS ChangeLog COPYING NEWS TODO
%{_libdir}/giFT/libOpenFT.*
%{_datadir}/giFT/OpenFT/


%changelog
* Mon Dec 19 2005 Rex Dieter  0.2.1.6-1
- cleanup for Fedora Extras

* Wed Nov 09 2005 Rex Dieter  0.2.1.6-0.lvn.2
- lib64 patch

* Mon Jun 27 2005 Rex Dieter  0.2.1.6-0.lvn.1
- 0.2.1.6

* Tue Dec 07 2004 Rex Dieter  0.2.1.5-0.lvn.1
- 0.2.1.5

* Mon Aug 02 2004 Rex Dieter  0.2.1.4-0.lvn.1
- 0.2.1.4

* Thu Jul 29 2004 Rex Dieter  0.2.1.3-0.lvn.1
- fdr -> lvn

* Thu Jul 22 2004 Rex Dieter  0.2.1.3-0.fdr.1
- 0.2.1.3
- fedora'ize

* Mon Dec 29 2003 Dries Verachtert  0.2.1.2-1.dries
- first packaging for Fedora Core 1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gift-openft/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Dec 2005 14:26:20 -0000	1.1
+++ .cvsignore	20 Dec 2005 14:26:45 -0000	1.2
@@ -0,0 +1 @@
+gift-openft-0.2.1.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gift-openft/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Dec 2005 14:26:20 -0000	1.1
+++ sources	20 Dec 2005 14:26:45 -0000	1.2
@@ -0,0 +1 @@
+6661f01304246a29aeabda113691ca93  gift-openft-0.2.1.6.tar.bz2



From fedora-extras-commits at redhat.com  Tue Dec 20 14:29:15 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 09:29:15 -0500
Subject: owners owners.list,1.471,1.472
Message-ID: <200512201429.jBKETj53011156@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11132

Modified Files:
	owners.list 
Log Message:
+gift,gift-openft



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -r1.471 -r1.472
--- owners.list	20 Dec 2005 12:31:08 -0000	1.471
+++ owners.list	20 Dec 2005 14:29:13 -0000	1.472
@@ -261,6 +261,8 @@
 Fedora Extras|ghex|A binary editor for GNOME|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|giblib|Simple library and a wrapper for imlib2|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gif2png|A GIF to PNG converter|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+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 osdl.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 20 14:47:57 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 20 Dec 2005 09:47:57 -0500
Subject: rpms/xmms/devel xmms-1.2.10-gcc4.patch,1.1,1.2 xmms.spec,1.11,1.12
Message-ID: <200512201448.jBKEmSak011250@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/xmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11227

Modified Files:
	xmms-1.2.10-gcc4.patch xmms.spec 
Log Message:
Update gcc4 fix patch.


xmms-1.2.10-gcc4.patch:

Index: xmms-1.2.10-gcc4.patch
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms-1.2.10-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmms-1.2.10-gcc4.patch	6 Apr 2005 04:57:33 -0000	1.1
+++ xmms-1.2.10-gcc4.patch	20 Dec 2005 14:47:55 -0000	1.2
@@ -9,3 +9,16 @@
  extern irConfig ircfg;
  extern gboolean irconf_is_going;
  
+--- xmms-1.2.10/xmms/sm.c.orig	2004-01-11 18:33:00.000000000 +0100
++++ xmms-1.2.10/xmms/sm.c	2004-04-12 22:44:28.000000000 +0200
+@@ -147,8 +147,9 @@
+ 
+ #else
+ 
+-void sm_init(int argc, char **argv, const char *previous_session_id)
++const char * sm_init(int argc, char **argv, const char *previous_session_id)
+ {
++	return NULL;
+ }
+ 
+ void sm_cleanup(void)


Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xmms.spec	7 Dec 2005 12:00:03 -0000	1.11
+++ xmms.spec	20 Dec 2005 14:47:55 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: The X MultiMedia System, a media player
 Name: xmms
 Version: 1.2.10
-Release: 18%{?dist}
+Release: 18.1%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -147,6 +147,9 @@
 %{_datadir}/aclocal/xmms.m4
 
 %changelog
+* Tue Dec 20 2005 Matthias Saou  1:1.2.10-18.1
+- Update gcc4 patch to include fix for xmms.org bug #1730, fixes FC5 build.
+
 * Sat May 28 2005 Matthias Saou  1:1.2.10-18
 - Build with explicit --with-pic to fix compilation of flac plugin on
   x86_64.



From fedora-extras-commits at redhat.com  Tue Dec 20 15:13:09 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 10:13:09 -0500
Subject: rpms/apollon - New directory
Message-ID: <200512201513.jBKFD98h013036@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/apollon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13027/apollon

Log Message:
Directory /cvs/extras/rpms/apollon added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 15:13:15 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 10:13:15 -0500
Subject: rpms/apollon/devel - New directory
Message-ID: <200512201513.jBKFDFrJ013052@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/apollon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13027/apollon/devel

Log Message:
Directory /cvs/extras/rpms/apollon/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Dec 20 15:13:33 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 10:13:33 -0500
Subject: rpms/apollon Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512201513.jBKFDXWH013087@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/apollon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13074

Added Files:
	Makefile import.log 
Log Message:
Setup of module apollon


--- NEW FILE Makefile ---
# Top level Makefile for module apollon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 20 15:13:39 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 10:13:39 -0500
Subject: rpms/apollon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512201513.jBKFDdBW013108@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/apollon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13074/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module apollon


--- NEW 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 Dec 20 15:14:03 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 10:14:03 -0500
Subject: rpms/apollon import.log,1.1,1.2
Message-ID: <200512201514.jBKFEXRi013190@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/apollon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13147

Modified Files:
	import.log 
Log Message:
auto-import apollon-1.0.1-3 on branch devel from apollon-1.0.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/apollon/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Dec 2005 15:13:31 -0000	1.1
+++ import.log	20 Dec 2005 15:14:01 -0000	1.2
@@ -0,0 +1 @@
+apollon-1_0_1-3:HEAD:apollon-1.0.1-3.src.rpm:1135091627



From fedora-extras-commits at redhat.com  Tue Dec 20 15:14:08 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 10:14:08 -0500
Subject: rpms/apollon/devel apollon-1.0.1-dtfix.patch, NONE, 1.1 apollon.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512201514.jBKFE8Ua013181@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/apollon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13147/devel

Modified Files:
	.cvsignore sources 
Added Files:
	apollon-1.0.1-dtfix.patch apollon.spec 
Log Message:
auto-import apollon-1.0.1-3 on branch devel from apollon-1.0.1-3.src.rpm

apollon-1.0.1-dtfix.patch:

--- NEW FILE apollon-1.0.1-dtfix.patch ---
--- apollon-1.0.1/apollon/Apollon.desktop.dtfix	2004-10-13 11:33:15.000000000 -0500
+++ apollon-1.0.1/apollon/Apollon.desktop	2004-10-14 07:06:42.225421680 -0500
@@ -1,16 +1,13 @@
 [Desktop Entry]
-Name=Apollon File Sharing Client
-Name[de]=Apollon, Tauschb??rse
+Name=Apollon
 Comment=The ultimate file sharing program for Linux - OpenFT, Gnutella, FastTrack (Kazaa)
-Comment[de]=Das ultimative Tauschb?rsenprogramm f?r Linux - OpenFT, Gnutella, Fasttrack (Kazaa)
-GenericName=Apollon File Sharing Client
-GenericName[de]=Apollon, Tauschb??rse
+GenericName=File Sharing Client
 Exec=apollon
 Type=Application
 Encoding=UTF-8
 Terminal=false
 Icon=apollon
-Categories=Application;Qt;KDE;Network;FileTransfer
+Categories=Application;Qt;KDE;Network;FileTransfer;
 StartupNotify=true
 StartupWMClass=apollon
 


--- NEW FILE apollon.spec ---

Summary: Filesharing client
Name:	 apollon
Version: 1.0.1
Release: 3%{?dist}

License: GPL
Group: 	 Applications/Internet
URL: 	 http://apollon.sourceforge.net/
Source:	 http://dl.sourceforge.net/sourceforge/apollon/apollon-1.0.1.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Fix Name/GenericName, append ; to Categories, 
# remove lines containing non UTF-8 chars ([de] entries)
Patch1: apollon-1.0.1-dtfix.patch 

BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: gift-devel

BuildRequires: qt-devel >= 1:3.3
BuildRequires: kdelibs-devel >= 6:3.3
# Hack/woraround kdelibs-devel bug: https://bugzilla.redhat.com/bugzilla/170602
BuildRequires: libacl-devel

%description
A filesharing client which uses giFT.


%prep
%setup -q 

%patch1 -p1 -b .dtfix



%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include

%configure \
  --disable-rpath \
  --disable-debug --disable-warnings \
  --disable-dependency-tracking --enable-final

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --delete-original --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category Application \
  --add-category X-Fedora \
  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop

## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
  if [ -d $lang_dir ]; then
    lang=$(basename $lang_dir)
    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
    # replace absolute symlinks with relative ones
    pushd $lang_dir
      for i in *; do
        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
      done
    popd
  fi
done
fi

## Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/ldconfig
for icon_theme in crystalsvg hicolor ; do
  touch --no-create %{_datadir}/icons/${icon_theme} ||:
  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done

%postun
/sbin/ldconfig
for icon_theme in crystalsvg hicolor ; do
  touch --no-create %{_datadir}/icons/${icon_theme} ||:
  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done


%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/apollon
%{_libdir}/libapollon.*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/crystalsvg/*/*/*
%{_datadir}/icons/hicolor/*/*/*


%changelog
* Tue Dec 20 2005 Rex Dieter  1.0.1-3
- BR: libacl-devel (workaround kdelibs bug #170602)

* Mon Dec 19 2005 Rex Dieter  1.0.1-2 
- more %%doc's: AUTHORS ChangeLog COPYING TODO 
- drop %%_libdir/lib*.la

* Thu Dec 08 2005 Rex Dieter  1.0.1-1 
- cleanup for Fedora Extras

* Wed Oct 13 2004 Rex Dieter  1.0.1-0.lvn.1
- 1.0.1

* Tue Sep 28 2004 Rex Dieter  1.0-0.lvn.1
- 1.0
- .desktop: touchup Name/GenericName

* Thu Jul 29 2004 Rex Dieter  0.9.4-0.lvn.1
- fdr -> lvn

* Thu Jul 22 2004 Rex Dieter  0.9.4-0.fdr.1
- 0.9.4(-1)
- fedora'ize

* Thu Feb 25 2004 Dries Verachtert  0.9.2-3
- moved the apollon menu entry to 'more internet applications'
  bug found by Sindre Pedersen Bj??rda, thanks!

* Wed Feb 25 2004 Dries Verachtert  0.9.2-2
- removed the dependencies on gift plugins
  bug found by Sindre Pedersen Bj??rda, thanks!

* Wed Feb 4 2004 Dries Verachtert  0.9.2-1
- update to version 0.9.2

* Sat Jan 10 2004 Dries Verachtert  0.9.1-2
- spec file cleanup
- other desktop file

* Mon Dec 29 2003 Dries Verachtert  0.9.1-1
- first packaging for Fedora Core 1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apollon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Dec 2005 15:13:36 -0000	1.1
+++ .cvsignore	20 Dec 2005 15:14:06 -0000	1.2
@@ -0,0 +1 @@
+apollon-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apollon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Dec 2005 15:13:36 -0000	1.1
+++ sources	20 Dec 2005 15:14:06 -0000	1.2
@@ -0,0 +1 @@
+835d783691b1c75cf772042d72d51d82  apollon-1.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Dec 20 15:22:03 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 20 Dec 2005 10:22:03 -0500
Subject: owners owners.list,1.472,1.473
Message-ID: <200512201522.jBKFMXNM013292@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13274

Modified Files:
	owners.list 
Log Message:
+apollon



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -r1.472 -r1.473
--- owners.list	20 Dec 2005 14:29:13 -0000	1.472
+++ owners.list	20 Dec 2005 15:22:01 -0000	1.473
@@ -34,6 +34,7 @@
 Fedora Extras|apel|A Portable Emacs Library|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|apg|Automated Password Generator for random password generation|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|apmud|Power Management daemon for Apple laptops|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|apollon|Filesharing client|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Dec 20 15:24:28 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Tue, 20 Dec 2005 10:24:28 -0500
Subject: rpms/ghdl/devel ghdl-svn38.patch,NONE,1.1 ghdl.spec,1.5,1.6
Message-ID: <200512201524.jBKFOSKo013315@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13301

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-svn38.patch 
Log Message:
update to SVN38, to fix ghw writer bug


ghdl-svn38.patch:

--- NEW FILE ghdl-svn38.patch ---
diff -urN ghdl-0.21/vhdl/ghdl.texi ghdl-0.22dev/vhdl/ghdl.texi
--- ghdl-0.21/vhdl/ghdl.texi	2005-12-12 03:21:55.000000000 +0100
+++ ghdl-0.22dev/vhdl/ghdl.texi	2005-12-20 16:18:45.000000000 +0100
@@ -4,10 +4,14 @@
 @settitle GHDL guide
 @c %**end of header
 
+ at direntry
+* ghdl: (ghdl).         VHDL compiler.
+ at end direntry
+
 @titlepage
 @title GHDL guide
 @subtitle GHDL, a VHDL compiler
- at subtitle For GHDL version 0.21 (Sokcho edition)
+ at subtitle For GHDL version 0.22 (Sokcho edition)
 @author Tristan Gingold
 @c The following two commands start the copyright page.
 @page
diff -urN ghdl-0.21/vhdl/grt/config/win32.c ghdl-0.22dev/vhdl/grt/config/win32.c
--- ghdl-0.21/vhdl/grt/config/win32.c	2005-12-12 03:39:16.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/config/win32.c	2005-12-20 16:18:50.000000000 +0100
@@ -1,5 +1,5 @@
-/*  GRT stack implementation for Win32
-    Copyright (C) 2004, 2005 Felix Bertram.
+/*  GRT stack implementation for Win32 using fibers.
+    Copyright (C) 2005 Tristan Gingold.
 
     GHDL 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
@@ -16,139 +16,74 @@
     Software Foundation, 59 Temple Place - Suite 330, Boston, MA
     02111-1307, USA.
 */
-//-----------------------------------------------------------------------------
-// Project:     GHDL - VHDL Simulator
-// Description: Win32 port of stacks package
-// Note:        Tristan's original i386/Linux used assembly-code 
-//              to manually switch stacks for performance reasons.
-// History:     2004feb09, FB, created.
-//-----------------------------------------------------------------------------
 
 #include 
-//#include 
-//#include 
-//#include 
-
-
-//#define INFO printf
-#define INFO (void)
-
-// GHDL names an endless loop calling FUNC with ARG a 'stack'
-// at a given time, only one stack may be 'executed'
-typedef struct 
-{	HANDLE              thread;         // stack's thread
-	HANDLE              mutex;          // mutex to suspend/resume thread
-	void                (*Func)(void*); // stack's FUNC
-	void*               Arg;            // ARG passed to FUNC
-} Stack_Type_t, *Stack_Type;
+#include 
 
-Stack_Type_t      main_stack_context;
-extern Stack_Type grt_stack_main_stack;
+struct stack_type
+{
+  LPVOID fiber; //  Win fiber.
+  void (*func)(void *);  // Function
+  void *arg; //  Function argument.
+};
+
+static struct stack_type  main_stack_context;
+extern void grt_set_main_stack (struct stack_type *stack);
 
-//------------------------------------------------------------------------------
 void grt_stack_init(void)
-// Initialize the stacks package.
-// This may adjust stack sizes.
-// Must be called after grt.options.decode.
-// => procedure Stack_Init;
-{	INFO("grt_stack_init\n");
-	INFO("  main_stack_context=0x%08x\n", &main_stack_context);
-
-	// create event. reset event, as we are currently running
-	main_stack_context.mutex = CreateEvent(NULL,  // lpsa
-	                                       FALSE, // fManualReset
-	                                       FALSE, // fInitialState
-	                                       NULL); // lpszEventName
-
-	grt_stack_main_stack= &main_stack_context;
-}
-
-//------------------------------------------------------------------------------
-static unsigned long __stdcall grt_stack_loop(void* pv_myStack)
-{
-	Stack_Type myStack= (Stack_Type)pv_myStack;
-
-	INFO("grt_stack_loop\n");
-	
-	INFO("  myStack=0x%08x\n", myStack);
-
-	// block until event becomes set again.
-	// this happens when this stack is enabled for the first time
-	WaitForSingleObject(myStack->mutex, INFINITE);
-	
-	// run stack's function in endless loop
-	while(1)
-	{	INFO("  call 0x%08x with 0x%08x\n", myStack->Func, myStack->Arg);
-		myStack->Func(myStack->Arg);
-	}
-	
-	// we never get here...
-	return 0;
-}
-
-//------------------------------------------------------------------------------
-Stack_Type grt_stack_create(void* Func, void* Arg) 
-// Create a new stack, which on first execution will call FUNC with
-// an argument ARG.
-// => function Stack_Create (Func : Address; Arg : Address) return Stack_Type;
-{  	Stack_Type newStack;
-	DWORD      m_IDThread; // Thread's ID (dummy)
-
-	INFO("grt_stack_create\n");
-	INFO("  call 0x%08x with 0x%08x\n", Func, Arg);
-			
-	newStack= malloc(sizeof(Stack_Type_t));
-	
-	// init function and argument
-	newStack->Func= Func;
-	newStack->Arg=  Arg;
-	
-	// create event. reset event, so that thread will blocked in grt_stack_loop
-	newStack->mutex= CreateEvent(NULL,  // lpsa
-	                             FALSE, // fManualReset
-	                             FALSE, // fInitialState
-	                             NULL); // lpszEventName
-	
-	INFO("  newStack=0x%08x\n", newStack);
-	
-	// create thread, which executes grt_stack_loop
-	newStack->thread= CreateThread(NULL,           // lpsa
-	                               0,              // cbStack
-	                               grt_stack_loop, // lpStartAddr
-	                               newStack,       // lpvThreadParm
-	                               0,              // fdwCreate
-	                               &m_IDThread);   // lpIDThread
-	
-	return newStack;
-}
-
-//------------------------------------------------------------------------------
-void grt_stack_switch(Stack_Type To, Stack_Type From)
-// Resume stack TO and save the current context to the stack pointed by
-// CUR.
-// => procedure Stack_Switch (To : Stack_Type; From : Stack_Type);
-{	INFO("grt_stack_switch\n");
-	INFO("  from 0x%08x to 0x%08x\n", From, To);
-	
-	// set 'To' event. this will make the other thread either
-	// - start for first time in grt_stack_loop
-	// - resume at WaitForSingleObject below
-	SetEvent(To->mutex);
-		
-	// block until 'From' event becomes set again
-	// as we are running, our event is reset and we block here
-	// when stacks are switched, with above SetEvent, we may proceed
-	WaitForSingleObject(From->mutex, INFINITE);
-}
-
-//------------------------------------------------------------------------------
-void grt_stack_delete(Stack_Type Stack)
-// Delete stack STACK, which must not be currently executed.
-// => procedure Stack_Delete (Stack : Stack_Type);
-{	INFO("grt_stack_delete\n");
+{
+  main_stack_context.fiber = ConvertThreadToFiber (NULL);
+  if (main_stack_context.fiber == NULL)
+    {
+      fprintf (stderr, "convertThreadToFiber failed (err=%lu)\n",
+	       GetLastError ());
+      abort ();
+    }
+  grt_set_main_stack (&main_stack_context);
+}
+
+static VOID __stdcall
+grt_stack_loop (void *v_stack)
+{
+  struct stack_type *stack = (struct stack_type *)v_stack;
+  while (1)
+    {
+      (*stack->func)(stack->arg);
+    }
+}
+
+struct stack_type *
+grt_stack_create (void (*func)(void *), void *arg) 
+{
+  struct stack_type *res;
+
+  res = malloc (sizeof (struct stack_type));
+  if (res == NULL)
+    return NULL;
+  res->func = func;
+  res->arg = arg;
+  res->fiber = CreateFiber (0, &grt_stack_loop, res);
+  if (res->fiber == NULL)
+    {
+      free (res);
+      return NULL;
+    }
+  return res;
+}
+
+void
+grt_stack_switch (struct stack_type *to, struct stack_type *from)
+{
+  SwitchToFiber (to->fiber);
+}
+
+void
+grt_stack_delete (struct stack_type *stack)
+{
+  DeleteFiber (stack->fiber);
+  stack->fiber = NULL;
 }
 
-//----------------------------------------------------------------------------
 #ifndef WITH_GNAT_RUN_TIME
 void __gnat_raise_storage_error(void)
 {
@@ -161,6 +96,3 @@
 }
 #endif
 
-//----------------------------------------------------------------------------
-// end of file
-
diff -urN ghdl-0.21/vhdl/grt/ghwlib.c ghdl-0.22dev/vhdl/grt/ghwlib.c
--- ghdl-0.21/vhdl/grt/ghwlib.c	2005-12-07 06:29:04.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/ghwlib.c	2005-12-20 16:18:50.000000000 +0100
@@ -1214,16 +1214,31 @@
   return 0;
 }
 
+static const char *
+ghw_get_lit (union ghw_type *type, int e)
+{
+  if (e >= type->en.nbr || e < 0)
+    return "??";
+  else
+    return type->en.lits[e];
+}
+
+static void
+ghw_disp_lit (union ghw_type *type, int e)
+{
+  printf ("%s (%d)", ghw_get_lit (type, e), e);
+}
+
 void
 ghw_disp_value (union ghw_val *val, union ghw_type *type)
 {
   switch (ghw_get_base_type (type)->kind)
     {
     case ghdl_rtik_type_b2:
-      printf ("%s (%d)", type->en.lits[val->b2], val->b2);
+      ghw_disp_lit (type, val->b2);
       break;
     case ghdl_rtik_type_e8:
-      printf ("%s (%d)", type->en.lits[val->e8], val->e8);
+      ghw_disp_lit (type, val->e8);
       break;
     case ghdl_rtik_type_i32:
       printf ("%d", val->i32);
@@ -1582,10 +1597,14 @@
 }
 
 void
-ghw_disp_range (union ghw_range *rng)
+ghw_disp_range (union ghw_type *type, union ghw_range *rng)
 {
   switch (rng->kind)
     {
+    case ghdl_rtik_type_e8:
+      printf ("%s %s %s", ghw_get_lit (type, rng->e8.left),
+	      ghw_get_dir (rng->e8.dir), ghw_get_lit (type, rng->e8.right));
+      break;
     case ghdl_rtik_type_i32:
     case ghdl_rtik_type_p32:
       printf ("%d %s %d",
@@ -1657,7 +1676,7 @@
 	printf ("subtype %s is ", s->name);
 	ghw_disp_typename (h, s->base);
 	printf (" range ");
-	ghw_disp_range (s->rng);
+	ghw_disp_range (s->base, s->rng);
 	printf (";\n");
       }
       break;
@@ -1692,7 +1711,7 @@
 	  {
 	    if (i != 0)
 	      printf (", ");
-	    ghw_disp_range (a->rngs[i]);
+	    ghw_disp_range ((union ghw_type *)a->base, a->rngs[i]);
 	  }
 	printf (");\n");
       }
diff -urN ghdl-0.21/vhdl/grt/ghwlib.h ghdl-0.22dev/vhdl/grt/ghwlib.h
--- ghdl-0.21/vhdl/grt/ghwlib.h	2005-12-07 06:27:09.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/ghwlib.h	2005-12-20 16:18:50.000000000 +0100
@@ -390,7 +390,8 @@
 
 const char *ghw_get_dir (int is_downto);
 
-void ghw_disp_range (union ghw_range *rng);
+/* Note: TYPE must be a base type (used only to display literals).  */
+void ghw_disp_range (union ghw_type *type, union ghw_range *rng);
 
 void ghw_disp_type (struct ghw_handler *h, union ghw_type *t);
 
diff -urN ghdl-0.21/vhdl/grt/grt-signals.adb ghdl-0.22dev/vhdl/grt/grt-signals.adb
--- ghdl-0.21/vhdl/grt/grt-signals.adb	2005-11-18 03:13:36.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/grt-signals.adb	2005-12-20 16:18:50.000000000 +0100
@@ -1095,15 +1095,6 @@
          when others =>
             Internal_Error ("ghdl_create_signal_attribute");
       end case;
---       Sig_Instance_Name := new Ghdl_Instance_Name_Type'
---         (Kind => Ghdl_Name_Signal,
---          Name => null,
---          Parent => null,
---          Brother => null,
---          Sig_Mode => Mode,
---          Sig_Kind => Kind_Signal_No,
---        Sig_Indexes => (First => Sig_Table.Last + 1, Last => Sig_Table.Last),
---          Sig_Type_Desc => Sig_Type);
       --  Note: bit and boolean are both mode_b2.
       Res := Create_Signal
         (Mode_B2, Value_Union'(Mode => Mode_B2, B2 => True),
diff -urN ghdl-0.21/vhdl/grt/grt-waves.adb ghdl-0.22dev/vhdl/grt/grt-waves.adb
--- ghdl-0.21/vhdl/grt/grt-waves.adb	2005-12-07 05:50:07.000000000 +0100
+++ ghdl-0.22dev/vhdl/grt/grt-waves.adb	2005-12-20 16:18:50.000000000 +0100
@@ -785,6 +785,15 @@
    Nbr_Scope_Signals : Natural := 0;
    Nbr_Dumped_Signals : Natural := 0;
 
+   --  This is only valid during write_hierarchy.
+   function Get_Signal_Number (Sig : Ghdl_Signal_Ptr) return Natural
+   is
+      function To_Integer_Address is new Ada.Unchecked_Conversion
+        (Ghdl_Signal_Ptr, Integer_Address);
+   begin
+      return Natural (To_Integer_Address (Sig.Alink));
+   end Get_Signal_Number;
+
    procedure Write_Signal_Number (Val_Addr : Address;
                                   Val_Name : Vstring;
                                   Val_Type : Ghdl_Rti_Access)
@@ -792,20 +801,28 @@
       pragma Unreferenced (Val_Name);
       pragma Unreferenced (Val_Type);
 
-      function To_Integer_Address is new Ada.Unchecked_Conversion
-        (Ghdl_Signal_Ptr, Integer_Address);
+      Num : Natural;
+
       function To_Ghdl_Signal_Ptr is new Ada.Unchecked_Conversion
         (Source => Integer_Address, Target => Ghdl_Signal_Ptr);
       Sig : Ghdl_Signal_Ptr;
    begin
+      --  Convert to signal.
       Sig := To_Ghdl_Signal_Ptr (To_Addr_Acc (Val_Addr).all);
-      if not Sig.Flags.Is_Dumped then
-         Sig.Flags.Is_Dumped := True;
+
+      --  Get signal number.
+      Num := Get_Signal_Number (Sig);
+
+      --  If the signal number is 0, then assign a valid signal number.
+      if Num = 0 then
          Nbr_Dumped_Signals := Nbr_Dumped_Signals + 1;
-         Sig.Flink := To_Ghdl_Signal_Ptr
+         Sig.Alink := To_Ghdl_Signal_Ptr
            (Integer_Address (Nbr_Dumped_Signals));
+         Num := Nbr_Dumped_Signals;
       end if;
-      Wave_Put_ULEB128 (Ghdl_E32 (To_Integer_Address (Sig.Flink)));
+
+      --  Do the real job: write the signal number.
+      Wave_Put_ULEB128 (Ghdl_E32 (Num));
    end Write_Signal_Number;
 
    procedure Foreach_Scalar_Signal_Number is new
@@ -1370,13 +1387,18 @@
       Table_Initial => 32,
       Table_Increment => 100);
 
+   function Get_Dump_Entry (N : Natural) return Ghdl_Signal_Ptr is
+   begin
+      return Dump_Table.Table (N);
+   end Get_Dump_Entry;
+
    procedure Write_Hierarchy (Root : VhpiHandleT)
    is
       N : Natural;
    begin
-      --  Check Flink is 0.
+      --  Check Alink is 0.
       for I in Sig_Table.First .. Sig_Table.Last loop
-         if Sig_Table.Table (I).Flink /= null then
+         if Sig_Table.Table (I).Alink /= null then
             Internal_Error ("wave.write_hierarchy");
          end if;
       end loop;
@@ -1393,15 +1415,20 @@
       Wave_Put_Byte (0);
 
       Dump_Table.Set_Last (Nbr_Dumped_Signals);
+      for I in Dump_Table.First .. Dump_Table.Last loop
+         Dump_Table.Table (I) := null;
+      end loop;
 
       --  Save and clear.
-      N := 0;
       for I in Sig_Table.First .. Sig_Table.Last loop
-         if Sig_Table.Table (I).Flags.Is_Dumped then
-            N := N + 1;
+         N := Get_Signal_Number (Sig_Table.Table (I));
+         if N /= 0 then
+            if Dump_Table.Table (N) /= null then
+               Internal_Error ("wave.write_hierarchy(2)");
+            end if;
             Dump_Table.Table (N) := Sig_Table.Table (I);
+            Sig_Table.Table (I).Alink := null;
          end if;
-         Sig_Table.Table (I).Flink := null;
       end loop;
    end Write_Hierarchy;
 
diff -urN ghdl-0.21/vhdl/version.ads ghdl-0.22dev/vhdl/version.ads
--- ghdl-0.21/vhdl/version.ads	2005-12-18 14:07:38.000000000 +0100
+++ ghdl-0.22dev/vhdl/version.ads	2005-12-20 16:18:55.000000000 +0100
@@ -1,4 +1,4 @@
 package Version is
    Ghdl_Version : constant String :=
-      "GHDL 0.21 (20051218) [Sokcho edition]";
+      "GHDL 0.22dev (20051220) [Sokcho edition]";
 end Version;


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ghdl.spec	18 Dec 2005 22:47:39 -0000	1.5
+++ ghdl.spec	20 Dec 2005 15:24:26 -0000	1.6
@@ -3,8 +3,8 @@
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
-Version: 0.21
-Release: 1%{?dist}
+Version: 0.22
+Release: 0.svn38.0%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/
@@ -14,7 +14,7 @@
 # ./dist.sh sources
 Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2
 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2
-Patch0: ghdl-0.21-infodirentry.patch
+Patch0: ghdl-svn38.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo
 Requires(post): /sbin/install-info
@@ -52,9 +52,9 @@
 %prep
 %setup -q -n gcc-%{gccver} -T -b 1 -a 0
 pushd ghdl-%{ghdlver}
+%patch0 -p1
 %{__mv} vhdl ../gcc/
 popd
-%patch0 -p0
 
 %build
 %{__mkdir} obj-%{gcc_target_platform}
@@ -114,8 +114,6 @@
 	--host=%{gcc_target_platform}
 %endif
 
-#{__mkdir} -p gcc/vhdl
-#{__cp} ../gcc/vhdl/grt/grt.ver gcc/vhdl
 # Parallel make doesn't work, so not using %{?_smp_mflags}
 %{__make}
 



From fedora-extras-commits at redhat.com  Tue Dec 20 16:42:06 2005
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Tue, 20 Dec 2005 11:42:06 -0500
Subject: rpms/ghdl/devel ghdl.spec, 1.6, 1.7 ghdl-0.21-infodirentry.patch,
	1.1, NONE
Message-ID: <200512201642.jBKGga0d015137@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15119

Modified Files:
	ghdl.spec 
Removed Files:
	ghdl-0.21-infodirentry.patch 
Log Message:
remove local patch now in upstream repo



Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ghdl.spec	20 Dec 2005 15:24:26 -0000	1.6
+++ ghdl.spec	20 Dec 2005 16:42:04 -0000	1.7
@@ -4,7 +4,7 @@
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
 Version: 0.22
-Release: 0.svn38.0%{?dist}
+Release: 0.38svn.0%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://ghdl.free.fr/


--- ghdl-0.21-infodirentry.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Dec 20 16:56:26 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 20 Dec 2005 11:56:26 -0500
Subject: rpms/bittorrent/devel bittorrent-4.2.2-no-version-check.patch, NONE,
	1.1 bittorrent.spec, 1.33, 1.34
Message-ID: <200512201656.jBKGuvti015244@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15223

Modified Files:
	bittorrent.spec 
Added Files:
	bittorrent-4.2.2-no-version-check.patch 
Log Message:
Add patch to prevent phoning home for new version checks


bittorrent-4.2.2-no-version-check.patch:

--- NEW FILE bittorrent-4.2.2-no-version-check.patch ---
--- BitTorrent-4.2.2/BitTorrent/NewVersion.py	2005-12-20 11:44:41.737788953 +0000
+++ BitTorrent-4.2.2/BitTorrent/NewVersion.py	2005-12-20 11:49:49.318965734 +0000
@@ -101,6 +101,9 @@
 
 
     def get(self):
+        self.debug('Version check skipped for RPM package')
+        return
+
         try:
             self.get_available()
         except BTFailure, e:


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- bittorrent.spec	19 Dec 2005 10:06:12 -0000	1.33
+++ bittorrent.spec	20 Dec 2005 16:56:24 -0000	1.34
@@ -4,7 +4,7 @@
 
 Name:           bittorrent
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
@@ -15,6 +15,7 @@
 Source2:        bittorrent.png
 Source3:	btseed.init
 Source4:	bttrack.init
+Patch0:		bittorrent-4.2.2-no-version-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q -n BitTorrent-%{version}
+%patch0 -p1
 %{__sed} -i "s#appdir = .*#appdir = '%{name}-%{version}'#" \
 	BitTorrent/platform.py
 %{__sed} -i "s#public_key_file = .*#public_key_file = open('%{pkidir}/bittorrent/public.key', 'rb')#" \
@@ -217,6 +219,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Tue Dec 20 2005 Paul Howarth  4.2.2-2
+- Add patch to prevent phoning home for new version checks
+
 * Mon Dec 19 2005 Paul Howarth  4.2.2-1
 - Update to 4.2.2
 



From fedora-extras-commits at redhat.com  Tue Dec 20 17:03:15 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 20 Dec 2005 12:03:15 -0500
Subject: rpms/bittorrent/FC-4 bittorrent-4.2.2-no-version-check.patch, NONE,
	1.1 bittorrent.spec, 1.18, 1.19
Message-ID: <200512201703.jBKH3o4S016925@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904

Modified Files:
	bittorrent.spec 
Added Files:
	bittorrent-4.2.2-no-version-check.patch 
Log Message:
resync with devel


bittorrent-4.2.2-no-version-check.patch:

--- NEW FILE bittorrent-4.2.2-no-version-check.patch ---
--- BitTorrent-4.2.2/BitTorrent/NewVersion.py	2005-12-20 11:44:41.737788953 +0000
+++ BitTorrent-4.2.2/BitTorrent/NewVersion.py	2005-12-20 11:49:49.318965734 +0000
@@ -101,6 +101,9 @@
 
 
     def get(self):
+        self.debug('Version check skipped for RPM package')
+        return
+
         try:
             self.get_available()
         except BTFailure, e:


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-4/bittorrent.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bittorrent.spec	19 Dec 2005 10:08:56 -0000	1.18
+++ bittorrent.spec	20 Dec 2005 17:03:08 -0000	1.19
@@ -4,7 +4,7 @@
 
 Name:           bittorrent
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
@@ -15,6 +15,7 @@
 Source2:        bittorrent.png
 Source3:	btseed.init
 Source4:	bttrack.init
+Patch0:		bittorrent-4.2.2-no-version-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q -n BitTorrent-%{version}
+%patch0 -p1
 %{__sed} -i "s#appdir = .*#appdir = '%{name}-%{version}'#" \
 	BitTorrent/platform.py
 %{__sed} -i "s#public_key_file = .*#public_key_file = open('%{pkidir}/bittorrent/public.key', 'rb')#" \
@@ -217,6 +219,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Tue Dec 20 2005 Paul Howarth  4.2.2-2
+- Add patch to prevent phoning home for new version checks
+
 * Mon Dec 19 2005 Paul Howarth  4.2.2-1
 - Update to 4.2.2
 



From fedora-extras-commits at redhat.com  Tue Dec 20 17:09:00 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 20 Dec 2005 12:09:00 -0500
Subject: rpms/bittorrent/FC-3 bittorrent-4.2.2-no-version-check.patch, NONE,
	1.1 bittorrent.spec, 1.13, 1.14
Message-ID: <200512201709.jBKH9Yvl017002@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bittorrent/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16978

Modified Files:
	bittorrent.spec 
Added Files:
	bittorrent-4.2.2-no-version-check.patch 
Log Message:
resync with devel


bittorrent-4.2.2-no-version-check.patch:

--- NEW FILE bittorrent-4.2.2-no-version-check.patch ---
--- BitTorrent-4.2.2/BitTorrent/NewVersion.py	2005-12-20 11:44:41.737788953 +0000
+++ BitTorrent-4.2.2/BitTorrent/NewVersion.py	2005-12-20 11:49:49.318965734 +0000
@@ -101,6 +101,9 @@
 
 
     def get(self):
+        self.debug('Version check skipped for RPM package')
+        return
+
         try:
             self.get_available()
         except BTFailure, e:


Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/bittorrent.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bittorrent.spec	19 Dec 2005 10:11:55 -0000	1.13
+++ bittorrent.spec	20 Dec 2005 17:08:58 -0000	1.14
@@ -4,7 +4,7 @@
 
 Name:           bittorrent
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        BitTorrent swarming network file transfer tool
 
 Group:          Applications/Internet
@@ -15,6 +15,7 @@
 Source2:        bittorrent.png
 Source3:	btseed.init
 Source4:	bttrack.init
+Patch0:		bittorrent-4.2.2-no-version-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q -n BitTorrent-%{version}
+%patch0 -p1
 %{__sed} -i "s#appdir = .*#appdir = '%{name}-%{version}'#" \
 	BitTorrent/platform.py
 %{__sed} -i "s#public_key_file = .*#public_key_file = open('%{pkidir}/bittorrent/public.key', 'rb')#" \
@@ -217,6 +219,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png
 
 %changelog
+* Tue Dec 20 2005 Paul Howarth  4.2.2-2
+- Add patch to prevent phoning home for new version checks
+
 * Mon Dec 19 2005 Paul Howarth  4.2.2-1
 - Update to 4.2.2
 



From fedora-extras-commits at redhat.com  Tue Dec 20 17:15:21 2005
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Tue, 20 Dec 2005 12:15:21 -0500
Subject: rpms/yumex/devel .cvsignore, 1.6, 1.7 sources, 1.9, 1.10 yumex.spec,
	1.9, 1.10
Message-ID: <200512201715.jBKHFpFu017121@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17097

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 0.45-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Oct 2005 08:08:45 -0000	1.6
+++ .cvsignore	20 Dec 2005 17:15:19 -0000	1.7
@@ -1 +1 @@
-yumex-0.42-9.tar.gz
+yumex-0.45-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	31 Oct 2005 08:08:45 -0000	1.9
+++ sources	20 Dec 2005 17:15:19 -0000	1.10
@@ -1 +1 @@
-362336685b1d6114df22e805a1511f60  yumex-0.42-9.tar.gz
+ada14317266254793e180a4e32c5408a  yumex-0.45-1.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- yumex.spec	31 Oct 2005 08:08:45 -0000	1.9
+++ yumex.spec	20 Dec 2005 17:15:19 -0000	1.10
@@ -1,8 +1,8 @@
-%define   build_v 9
+%define   build_v 1
 
 Name:     yumex
-Version:  0.42
-Release:  9.0%{?dist}
+Version:  0.45
+Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -16,7 +16,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 
-Requires: yum >= 2.4
+Requires: yum >= 2.5
 Requires: pygtk2
 Requires: usermode
 Requires: pygtk2-libglade
@@ -67,14 +67,36 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Mon Oct 31 2005 Tim Lauridsen  - 0.42-8.0
-- Release 0.42-9.0
-- Removed syntax error in yumbase.py.
-* Mon Oct 31 2005 Tim Lauridsen  - 0.42-8.0
+* Tue Dec 20 2005 Tim Lauridsen  - 0.44-1.0
+- Development Release 0.45-1.0
+- Changed to work with yum 2.5.0
+- Requires: yum >= 2.5
+- Same features as 0.44-1.0, but uses yum 2.5.0 API 
+* Thu Dec 15 2005 Tim Lauridsen  - 0.44-1.0
+- Public Release 0.44-1.0
+* Sun Dec 11 2005 Tim Lauridsen  - 0.43-10.0
+- Release 0.43-10.0
+* Sat Dec 10 2005 Tim Lauridsen  - 0.43-9.0
+- Release 0.43-9.0
+* Wed Nov 23 2005 Tim Lauridsen  - 0.43-8.0
+- Release 0.43-8.0
+* Wed Nov 23 2005 Tim Lauridsen  - 0.43-7.0
+- Release 0.43-7.0
+* Fri Nov 18 2005 Tim Lauridsen  - 0.43-6.0
+- Release 0.43-6.0
+* Thu Nov 17 2005 Tim Lauridsen  - 0.43-5.0
+- Release 0.43-5.0
+* Wed Nov 16 2005 Tim Lauridsen  - 0.43-4.0
+- Release 0.43-4.0
+* Thu Nov 8 2005 Tim Lauridsen  - 0.43-3.0
+- Release 0.43-3.0
+* Thu Nov 7 2005 Tim Lauridsen  - 0.43-2.0
+- Release 0.43-2.0
+* Thu Nov 7 2005 Tim Lauridsen  - 0.43-1.0
+- Release 0.43-1.0
+- Lot of changes, check the ChangeLog
+* Thu Oct 13 2005 Tim Lauridsen  - 0.42-8.0
 - Release 0.42-8.0
-- Updated french traslation
-- Added Italien translation.
-- Added ETA truncation fix patches (Thanks to Dennis Cranston)
 * Thu Oct 13 2005 Tim Lauridsen  - 0.42-7.0
 - Release 0.42-7.0
 - Changed Requires: yum to >= 2.4



From fedora-extras-commits at redhat.com  Tue Dec 20 19:10:03 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue, 20 Dec 2005 14:10:03 -0500
Subject: CVSROOT avail,1.20,1.21
Message-ID: <200512201911.jBKJB4DK020843@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20820

Modified Files:
	avail 
Log Message:
Adding ender.


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- avail	14 Dec 2005 17:02:35 -0000	1.20
+++ avail	20 Dec 2005 19:10:01 -0000	1.21
@@ -21,7 +21,7 @@
 # Fedora Web site
 unavail | | web
 avail | tfox,notting,sopwith,gdk,katzj,kwade | web
-avail | havill,hp,nman64,ivazquez | web
+avail | havill,hp,nman64,ivazquez,jkeating | web
 avail | katzj | web/html/About/Projects/anaconda-installer
 #avail | bfox | web/html/projects/config-tools
 avail | blizzard,krh | web/html/About/Projects/desktop



From fedora-extras-commits at redhat.com  Tue Dec 20 21:50:45 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Tue, 20 Dec 2005 16:50:45 -0500
Subject: CVSROOT avail,1.21,1.22
Message-ID: <200512202151.jBKLpFQg025653@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25605/CVSROOT

Modified Files:
	avail 
Log Message:
Adding tchung to edit the News area.


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- avail	20 Dec 2005 19:10:01 -0000	1.21
+++ avail	20 Dec 2005 21:50:42 -0000	1.22
@@ -52,5 +52,6 @@
 avail | pfrields | web/html/participate/documentation-guide
 avail | pfrields,mjohnson | web/html/participate/documentation-quick-start
 avail | pfrields | web/html/participate/developers-guide
+avail | tchung | web/html/News
 
 



From fedora-extras-commits at redhat.com  Tue Dec 20 21:50:56 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 16:50:56 -0500
Subject: rpms/cernlib/devel cernlib.spec,1.10,1.11
Message-ID: <200512202151.jBKLpS13025656@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25634

Modified Files:
	cernlib.spec 
Log Message:
* Tue Dec 20 2005 Patrice Dumas  - 2005-10
- add file in /etc/ld.so.conf.d required for dynamic linking



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cernlib.spec	14 Dec 2005 18:18:45 -0000	1.10
+++ cernlib.spec	20 Dec 2005 21:50:55 -0000	1.11
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       9%{?dist}.1
+Release:       10%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -625,6 +625,9 @@
 	cp -Rp $dir $base_include/
 done
 
+%{__install} -d -m755 $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo %{_libdir}/cernlib/%{version}/lib > $RPM_BUILD_ROOT/etc/ld.so.conf.d/cernlib-%{version}-%{_arch}.conf
+
 find $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} -name Imakefile -exec rm -f \{\} \;
 rm -f $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/ntuple/*.c
 
@@ -637,6 +640,7 @@
 
 %files
 %defattr(-,root,root,-)
+/etc/ld.so.conf.d/*
 %dir %{_libdir}/cernlib/
 %dir %{_libdir}/cernlib/%{version}
 %dir %{_libdir}/cernlib/%{version}/lib
@@ -699,6 +703,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Dec 20 2005 Patrice Dumas  - 2005-10
+- add file in /etc/ld.so.conf.d required for dynamic linking
+
 * Wed Dec 14 2005 Patrice Dumas  - 2005-9.1
 - use new debian patchset
 



From fedora-extras-commits at redhat.com  Tue Dec 20 21:54:01 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 16:54:01 -0500
Subject: rpms/cernlib/FC-4 cernlib.spec,1.17,1.18
Message-ID: <200512202154.jBKLsYYO025725@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25703

Modified Files:
	cernlib.spec 
Log Message:
* Tue Dec 20 2005 Patrice Dumas  - 2005-10
- add file in /etc/ld.so.conf.d required for dynamic linking



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cernlib.spec	14 Dec 2005 16:32:30 -0000	1.17
+++ cernlib.spec	20 Dec 2005 21:54:01 -0000	1.18
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       9%{?dist}.2
+Release:       10%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -623,6 +623,9 @@
 	cp -Rp $dir $base_include/
 done
 
+%{__install} -d -m755 $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo %{_libdir}/cernlib/%{version}/lib > $RPM_BUILD_ROOT/etc/ld.so.conf.d/cernlib-%{version}-%{_arch}.conf
+
 find $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} -name Imakefile -exec rm -f \{\} \;
 rm -f $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/ntuple/*.c
 
@@ -635,6 +638,7 @@
 
 %files
 %defattr(-,root,root,-)
+/etc/ld.so.conf.d/*
 %dir %{_libdir}/cernlib/
 %dir %{_libdir}/cernlib/%{version}
 %dir %{_libdir}/cernlib/%{version}/lib
@@ -697,6 +701,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Dec 20 2005 Patrice Dumas  - 2005-10
+- add file in /etc/ld.so.conf.d required for dynamic linking
+
 * Wed Dec 14 2005 Patrice Dumas  - 2005-9.2
 - use new debian patchset
 



From fedora-extras-commits at redhat.com  Tue Dec 20 21:54:45 2005
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 20 Dec 2005 16:54:45 -0500
Subject: rpms/cernlib/FC-3 cernlib.spec,1.12,1.13
Message-ID: <200512202155.jBKLtHnB025794@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25731

Modified Files:
	cernlib.spec 
Log Message:
* Tue Dec 20 2005 Patrice Dumas  - 2005-10
- add file in /etc/ld.so.conf.d required for dynamic linking



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cernlib.spec	15 Dec 2005 12:07:03 -0000	1.12
+++ cernlib.spec	20 Dec 2005 21:54:45 -0000	1.13
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -622,6 +622,9 @@
 	cp -Rp $dir $base_include/
 done
 
+%{__install} -d -m755 $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo %{_libdir}/cernlib/%{version}/lib > $RPM_BUILD_ROOT/etc/ld.so.conf.d/cernlib-%{version}-%{_arch}.conf
+
 find $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} -name Imakefile -exec rm -f \{\} \;
 rm -f $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/ntuple/*.c
 
@@ -634,6 +637,7 @@
 
 %files
 %defattr(-,root,root,-)
+/etc/ld.so.conf.d/*
 %dir %{_libdir}/cernlib/
 %dir %{_libdir}/cernlib/%{version}
 %dir %{_libdir}/cernlib/%{version}/lib
@@ -696,6 +700,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Dec 20 2005 Patrice Dumas  - 2005-10
+- add file in /etc/ld.so.conf.d required for dynamic linking
+
 * Wed Dec 14 2005 Patrice Dumas  - 2005-9
 - use new debian patchset
 



From fedora-extras-commits at redhat.com  Tue Dec 20 22:27:24 2005
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 20 Dec 2005 17:27:24 -0500
Subject: fedora-security/audit fc4,1.111,1.112 fc5,1.21,1.22
Message-ID: <200512202227.jBKMRsOn027596@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27576

Modified Files:
	fc4 fc5 
Log Message:
Deal with the fetchmail update.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- fc4	20 Dec 2005 10:12:13 -0000	1.111
+++ fc4	20 Dec 2005 22:27:22 -0000	1.112
@@ -3,7 +3,7 @@
 
 ** are items that need attention
 
-CVE-2005-4348 VULNERABLE (fetchmail)
+CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187]
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 backport (sudo) [since FEDORA-2005-1147] was ignore only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fc5	20 Dec 2005 10:12:13 -0000	1.21
+++ fc5	20 Dec 2005 22:27:22 -0000	1.22
@@ -12,7 +12,7 @@
 
 ** are items that need attention
 
-CVE-2005-4348 VULNERABLE (fetchmail, fixed 6.2.5.5, fixed 6.3.1)
+CVE-2005-4348 version (fetchmail, fixed 6.3.1)
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages



From fedora-extras-commits at redhat.com  Tue Dec 20 22:46:50 2005
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Tue, 20 Dec 2005 17:46:50 -0500
Subject: web/html/About/schedule index.php,1.2,1.3
Message-ID: <200512202247.jBKMlKpH027686@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/web/html/About/schedule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27662

Modified Files:
	index.php 
Log Message:
Adjusted schedule to show latest slip.



Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/About/schedule/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.php	6 Dec 2005 06:53:30 -0000	1.2
+++ index.php	20 Dec 2005 22:46:47 -0000	1.3
@@ -45,26 +45,26 @@
      		test1 release
 
    
 
    19December9January 2006
  test2 devel freeze, String change deadline (data provided)
    
      		
 
    
 
    23December16January 2006
  test2 release, string build freeze (builds completed)
 
    
 
    16January 20066February 2006
  Translation deadline (data provided)
    
      test3 devel freeze
      		
 
    
 
    23January 200613February 2006
  test3 release, translation build freeze (builds completed)
 
    
 
    Continual freeze, only critical bugs fixed until release
 
    
 
    13February 20066March 2006
  Absolute devel freeze
 
    
 
    27February 200615March 2006
  Release open, announced
 
    
 
    Revision 0.37.22005-12-28PaulWFrields
    
+	  
    
+	    Minor revision updating entity names and incorporating
+	    variablelist.
+	  
    
 	
    
 
 /etc/yum.repos.d and end with the suffix
       .repo.  Below is an example configuration
       file.
-    
    +    
     [mirror]
 name=Fedora Core $releasever - $basearch - Base
 baseurl=http://server.mydomain.net/mirror/fedora/linux/core/$releasever/$basearch


Index: sn-planning-and-setup.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/mirror/sn-planning-and-setup.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sn-planning-and-setup.php	27 Nov 2005 17:18:38 -0000	1.1
+++ sn-planning-and-setup.php	28 Dec 2005 18:54:16 -0000	1.2
@@ -8,7 +8,7 @@
 ?>
 
 
    2. Planning and Setup
    Prev   Next
    2. Planning and Setup
    2.1. The Distribution Structure
    
-	The Fedora distribution, which is the collection of all Fedora-related
+	The Fedora distribution, which is the collection of all Fedora-related
 	files, uses the directory tree in Example 1, “Fedora directory tree”. It may include multiple
 	versions of Fedora Core. The tree design makes it easier to "trim"
 	unnecessary or undesired files.  When you set up a mirror,
@@ -73,7 +73,7 @@
 	folder contains images of the CD-ROM version of the
 	distribution.
       
    [Note]RPM packages
    
-	  RPM, originally the Red Hat Package Manager and now
+	  RPM, originally the Red Hat Package Manager and now
 	  the RPM Package Manager, is not just a file format. RPM is
 	  also a system that tracks and interconnects software and
 	  version information. The RPM system is quite popular, and many
@@ -111,8 +111,8 @@
 cd /var/www/mirror/fedora/linux/core/4/i386/os/Fedora
 ln ../../SRPMS SRPMS
 
    
-	The documentation for anaconda, the Fedora Core installation program, calls this directory
-	structure an exploded tree. This is because the package data on each CD is extracted,
+	The documentation for anaconda, the Fedora Core installation program, calls this directory
+	structure an exploded tree. This is because the package data on each CD is extracted,
 	or exploded, to a large directory tree with a predetermined structure.
 	The anaconda installer expects this structure
 	to some extent.
@@ -301,19 +301,19 @@
 	  use some of the command line switches to improve performance and
 	  feedback. The switches -PHav enable the following
 	  rsync features:
-	
    • 
-	      -P — recover partially-downloaded files,
-	      and show a progress meter
-	    
    • 
-	      -H — preserve hard links
-	    
    • 
-	      -a — recurse all directories, and preserve
-	      as much file information as possible, including timestamps,
-	      ownership, permissions, device files (if you are running as root),
-	      and soft links
-	    
    • 
-	      -v — give verbose feedback to the screen
-	    
    
+	
    -P
    
+		recover partially-downloaded files, and show a progress
+		meter
+	      
    -H
    
+		preserve hard links
+	      
    -a
    
+		recurse all directories, and preserve as much file
+		information as possible, including timestamps,
+		ownership, permissions, device files (if you are running
+		as root), and soft links
+	      
    -v
    
+		give verbose feedback to the screen
+	      
    
 	  Remove the -v switch if you run this mirroring
 	  process as part of a script, or have no need to monitor progress. The
 	  following example mirrors all available versions of Fedora Core from an


Index: sn-server-config.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/mirror/sn-server-config.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sn-server-config.php	27 Nov 2005 17:18:38 -0000	1.1
+++ sn-server-config.php	28 Dec 2005 18:54:16 -0000	1.2
@@ -66,7 +66,7 @@
         create the configuration file
         /etc/httpd/conf.d/mirror.conf. The
         following listing is an example:
-       
    +       
     # The name at which the mirror will be shared, 
 # followed by the name of the root directory of that tree.
 Alias /mirror /var/www/mirror
@@ -103,12 +103,12 @@
           you build your mirror in another directory, you may need to
           modify the SELinux policy.
         
    3.3. Solving Dependencies
    
-	Every RPM package has a header that contains all
+	Every RPM package has a header that contains all
 	the vital information about that package. This information
 	includes name, version and release, contents, the capabilities
 	provided by the package, and any prerequisites. These
 	prerequisites may include
-	dependencies. A dependency is a requirement for one or more
+	dependencies. A dependency is a requirement for one or more
 	additional packages.
       
    
 	Packages installed without satisfying their dependencies may not
@@ -119,7 +119,7 @@
 	automatically, providing an improved user experience.
       
    
       The Yellow Dog Updater Modified, or
-	yum, is a Python-based system for computing and solving
+	yum, is a Python-based system for computing and solving
 	RPM dependencies. A yum client retrieves a
 	cache of headers from its repository server, as well as a list
 	of available RPM packages and their exact locations on the
@@ -144,7 +144,7 @@
 	to http://fedora.redhat.com/docs/yum/.
       
    3.4. Configuring Repositories
    
       A yum
-	repository is a collection of packages on a server which
+	repository is a collection of packages on a server which
 	supports yum clients. Repositories can serve
 	both types of clients if desired.
       
    



From fedora-extras-commits at redhat.com  Wed Dec 28 19:12:41 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 28 Dec 2005 14:12:41 -0500
Subject: fedora-rpmdevtools fedora-rpmdevtools.spec,1.80,1.81
Message-ID: <200512281913.jBSJDBiO003829@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3811

Modified Files:
	fedora-rpmdevtools.spec 
Log Message:
Update spectool to 1.0.5.


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- fedora-rpmdevtools.spec	26 Oct 2005 21:20:12 -0000	1.80
+++ fedora-rpmdevtools.spec	28 Dec 2005 19:12:39 -0000	1.81
@@ -1,6 +1,6 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.4
+%define spectool_version   1.0.5
 
 Name:           fedora-rpmdevtools
 Version:        1.3
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Ville Skytt?? 
+- Update spectool to 1.0.5.
+
 * Thu Oct 27 2005 Ville Skytt??  - 1.3-1
 - check-rpaths-worker: detect when RPATH references the parent directory
   of an absolute path (#169298, Enrico Scholz).



From fedora-extras-commits at redhat.com  Wed Dec 28 19:13:56 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 28 Dec 2005 14:13:56 -0500
Subject: fedora-rpmdevtools fedora-rpmdevtools.spec,1.81,1.82
Message-ID: <200512281914.jBSJEQx5003858@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3840

Modified Files:
	fedora-rpmdevtools.spec 
Log Message:
Add bugzilla reference for spectool update.


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- fedora-rpmdevtools.spec	28 Dec 2005 19:12:39 -0000	1.81
+++ fedora-rpmdevtools.spec	28 Dec 2005 19:13:54 -0000	1.82
@@ -128,7 +128,7 @@
 
 %changelog
 * Wed Dec 28 2005 Ville Skytt?? 
-- Update spectool to 1.0.5.
+- Update spectool to 1.0.5 (#162253).
 
 * Thu Oct 27 2005 Ville Skytt??  - 1.3-1
 - check-rpaths-worker: detect when RPATH references the parent directory



From fedora-extras-commits at redhat.com  Wed Dec 28 19:16:31 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 28 Dec 2005 14:16:31 -0500
Subject: fedora-rpmdevtools fedora-rpmdevtools.spec, 1.82,
	1.83 spectemplate-minimal.spec, 1.5,
	1.6 spectemplate-perl.spec, 1.11,
	1.12 spectemplate-python.spec, 1.6, 1.7
Message-ID: <200512281917.jBSJH177003914@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3890

Modified Files:
	fedora-rpmdevtools.spec spectemplate-minimal.spec 
	spectemplate-perl.spec spectemplate-python.spec 
Log Message:
Add disttags to spec templates.


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- fedora-rpmdevtools.spec	28 Dec 2005 19:13:54 -0000	1.82
+++ fedora-rpmdevtools.spec	28 Dec 2005 19:16:29 -0000	1.83
@@ -129,6 +129,7 @@
 %changelog
 * Wed Dec 28 2005 Ville Skytt?? 
 - Update spectool to 1.0.5 (#162253).
+- Add disttags to spec templates.
 
 * Thu Oct 27 2005 Ville Skytt??  - 1.3-1
 - check-rpaths-worker: detect when RPATH references the parent directory


Index: spectemplate-minimal.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/spectemplate-minimal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- spectemplate-minimal.spec	14 Dec 2004 23:26:46 -0000	1.5
+++ spectemplate-minimal.spec	28 Dec 2005 19:16:29 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           
 Version:        
-Release:        1
+Release:        1%{?dist}
 Summary:        
 
 Group:          


Index: spectemplate-perl.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/spectemplate-perl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- spectemplate-perl.spec	6 Oct 2005 15:59:38 -0000	1.11
+++ spectemplate-perl.spec	28 Dec 2005 19:16:29 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           
 Version:        
-Release:        1
+Release:        1%{?dist}
 Summary:        
 
 Group:          Development/Libraries


Index: spectemplate-python.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/spectemplate-python.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- spectemplate-python.spec	14 Dec 2004 23:26:46 -0000	1.6
+++ spectemplate-python.spec	28 Dec 2005 19:16:29 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           
 Version:        
-Release:        1
+Release:        1%{?dist}
 Summary:        
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Wed Dec 28 19:19:58 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 28 Dec 2005 14:19:58 -0500
Subject: fedora-rpmdevtools fedora-rpmdevtools.spec,1.83,1.84
Message-ID: <200512281920.jBSJKTbS003953@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3935

Modified Files:
	fedora-rpmdevtools.spec 
Log Message:
spectool requires wget.


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- fedora-rpmdevtools.spec	28 Dec 2005 19:16:29 -0000	1.83
+++ fedora-rpmdevtools.spec	28 Dec 2005 19:19:56 -0000	1.84
@@ -20,7 +20,7 @@
 Provides:       spectool = %{spectool_version}
 Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
-Requires:       rpm-python, python, cpio, sed, perl
+Requires:       rpm-python, python, cpio, sed, perl, wget
 # Minimal RPM build requirements
 Requires:       rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch
 Requires:       diffutils, gzip, bzip2, unzip
@@ -128,7 +128,7 @@
 
 %changelog
 * Wed Dec 28 2005 Ville Skytt?? 
-- Update spectool to 1.0.5 (#162253).
+- Update spectool to 1.0.5 (#162253), require wget for it.
 - Add disttags to spec templates.
 
 * Thu Oct 27 2005 Ville Skytt??  - 1.3-1



From fedora-extras-commits at redhat.com  Wed Dec 28 19:49:58 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 14:49:58 -0500
Subject: rpms/clisp/devel .cvsignore, 1.2, 1.3 clisp.spec, 1.4, 1.5 sources, 
	1.3, 1.4
Message-ID: <200512281950.jBSJofql004079@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4056

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.36


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2005 18:26:10 -0000	1.2
+++ .cvsignore	28 Dec 2005 19:49:58 -0000	1.3
@@ -1 +1 @@
-clisp-2.34.tar.bz2
+clisp-2.36.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- clisp.spec	29 Aug 2005 23:12:18 -0000	1.4
+++ clisp.spec	28 Dec 2005 19:49:58 -0000	1.5
@@ -1,16 +1,16 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.35
+Version:	2.36
 Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.35.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.36.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, XFree86-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
-ExcludeArch:	ppc ppc64
+#ExcludeArch:	ppc ppc64
 
 
 %description
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Gerard Milmeister  - 2.36-1
+- New Version 2.36
+
 * Tue Aug 30 2005 Gerard Milmeister  - 2.35-1
 - New Version 2.35
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2005 23:12:18 -0000	1.3
+++ sources	28 Dec 2005 19:49:58 -0000	1.4
@@ -1 +1 @@
-a8e3136c4ecfb5deb65fe53e22ca2c07  clisp-2.35.tar.bz2
+b6b5f6b7e6d0ce9f42bc07d59fbddc09  clisp-2.36.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 28 19:54:33 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 14:54:33 -0500
Subject: rpms/abcm2ps/devel .cvsignore, 1.7, 1.8 abcm2ps.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200512281955.jBSJt6cP004200@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4162

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Nov 2005 19:52:03 -0000	1.7
+++ .cvsignore	28 Dec 2005 19:54:33 -0000	1.8
@@ -1,2 +1,2 @@
-abcm2ps-4.12.2.tar.gz
+abcm2ps-4.12.3.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- abcm2ps.spec	30 Nov 2005 19:52:03 -0000	1.7
+++ abcm2ps.spec	28 Dec 2005 19:54:33 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.2
+Version:        4.12.3
 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.2.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.3.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
+* Wed Dec 28 2005 Gerard Milmeister  - 4.12.3-1
+- New Version 4.12.3
+
 * Wed Nov 30 2005 Gerard Milmeister  - 4.12.2-1
 - New Version 4.12.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Nov 2005 19:52:03 -0000	1.7
+++ sources	28 Dec 2005 19:54:33 -0000	1.8
@@ -1,2 +1,2 @@
-906cfebc1255a4db39e93c8bf213f37c  abcm2ps-4.12.2.tar.gz
+dce1d84f6da39e7e95e2873d598f94b9  abcm2ps-4.12.3.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Wed Dec 28 20:00:37 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 28 Dec 2005 15:00:37 -0500
Subject: rpms/htop/devel .cvsignore, 1.2, 1.3 htop.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200512282001.jBSK19Mg005895@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/htop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4261/devel

Modified Files:
	.cvsignore htop.spec sources 
Log Message:
Update to version 0.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2005 17:12:07 -0000	1.2
+++ .cvsignore	28 Dec 2005 20:00:37 -0000	1.3
@@ -1 +1 @@
-htop-0.5.4.tar.gz
+htop-0.6.tar.gz


Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/htop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- htop.spec	11 Nov 2005 17:12:07 -0000	1.1
+++ htop.spec	28 Dec 2005 20:00:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           htop
-Version:        0.5.4
-Release:        2%{?dist}
+Version:        0.6
+Release:        1%{?dist}
 Summary:        Interactive process viewer
 
 Group:          Applications/System
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Dawid Gajownik  - 0.6-1
+- Version 0.6
+
 * Fri Nov 11 2005 Dawid Gajownik  - 0.5.4-2
 - Don't use superflous CFLAGS variable (Dmitry Butskoy)
 - Don't include AUTHORS and NEWS files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2005 17:12:07 -0000	1.2
+++ sources	28 Dec 2005 20:00:37 -0000	1.3
@@ -1 +1 @@
-9bd650ea78418227b9661a58889a4c2a  htop-0.5.4.tar.gz
+f4aeafa0111805a92d4d2ead907bc8e5  htop-0.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 20:00:31 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 28 Dec 2005 15:00:31 -0500
Subject: rpms/htop/FC-4 .cvsignore, 1.2, 1.3 htop.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <200512282001.jBSK13XJ005767@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/htop/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4261/FC-4

Modified Files:
	.cvsignore htop.spec sources 
Log Message:
Update to version 0.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2005 17:12:07 -0000	1.2
+++ .cvsignore	28 Dec 2005 20:00:31 -0000	1.3
@@ -1 +1 @@
-htop-0.5.4.tar.gz
+htop-0.6.tar.gz


Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-4/htop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- htop.spec	11 Nov 2005 17:12:07 -0000	1.1
+++ htop.spec	28 Dec 2005 20:00:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           htop
-Version:        0.5.4
-Release:        2%{?dist}
+Version:        0.6
+Release:        1%{?dist}
 Summary:        Interactive process viewer
 
 Group:          Applications/System
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Dawid Gajownik  - 0.6-1
+- Version 0.6
+
 * Fri Nov 11 2005 Dawid Gajownik  - 0.5.4-2
 - Don't use superflous CFLAGS variable (Dmitry Butskoy)
 - Don't include AUTHORS and NEWS files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2005 17:12:07 -0000	1.2
+++ sources	28 Dec 2005 20:00:31 -0000	1.3
@@ -1 +1 @@
-9bd650ea78418227b9661a58889a4c2a  htop-0.5.4.tar.gz
+f4aeafa0111805a92d4d2ead907bc8e5  htop-0.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 20:23:33 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 15:23:33 -0500
Subject: rpms/clisp/devel clisp.spec,1.5,1.6
Message-ID: <200512282024.jBSKO6AF006191@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6173

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- clisp.spec	28 Dec 2005 19:49:58 -0000	1.5
+++ clisp.spec	28 Dec 2005 20:23:33 -0000	1.6
@@ -1,15 +1,16 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
 Source:		http://download.sourceforge.net/clisp/clisp-2.36.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	readline-devel, XFree86-devel, gettext, pcre-devel, postgresql-devel
+BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
+BuildRequires:	libSM-devel, libICE-devel, libX11-devel, libXext-devel, libXpm-devel
 #ExcludeArch:	ppc ppc64
 
 



From fedora-extras-commits at redhat.com  Wed Dec 28 20:41:57 2005
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Wed, 28 Dec 2005 15:41:57 -0500
Subject: rpms/dejavu-fonts import.log,1.19,1.20
Message-ID: <200512282042.jBSKgTbn006317@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6283

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.1-1.fc5 on branch devel from dejavu-fonts-2.1-1.fc5.src.rpm
2.1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- import.log	13 Nov 2005 16:22:18 -0000	1.19
+++ import.log	28 Dec 2005 20:41:56 -0000	1.20
@@ -16,3 +16,4 @@
 dejavu-fonts-2_0-1_fc3:FC-3:dejavu-fonts-2.0-1.fc3.src.rpm:1131898093
 dejavu-fonts-2_0-1_fc4:FC-4:dejavu-fonts-2.0-1.fc4.src.rpm:1131898337
 dejavu-fonts-2_0-1_fc5:HEAD:dejavu-fonts-2.0-1.fc5.src.rpm:1131898927
+dejavu-fonts-2_1-1_fc5:HEAD:dejavu-fonts-2.1-1.fc5.src.rpm:1135802501



From fedora-extras-commits at redhat.com  Wed Dec 28 20:42:02 2005
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Wed, 28 Dec 2005 15:42:02 -0500
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.6, 1.7 dejavu-fonts.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200512282042.jBSKgZbM006322@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6283/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.1-1.fc5 on branch devel from dejavu-fonts-2.1-1.fc5.src.rpm
2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Nov 2005 16:03:01 -0000	1.6
+++ .cvsignore	28 Dec 2005 20:42:02 -0000	1.7
@@ -1 +1 @@
-dejavu-ttf-2.0.tar.gz
+dejavu-ttf-2.1.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dejavu-fonts.spec	13 Nov 2005 16:03:01 -0000	1.6
+++ dejavu-fonts.spec	28 Dec 2005 20:42:02 -0000	1.7
@@ -2,7 +2,7 @@
 %define fontdir         %{_datadir}/fonts/dejavu
 
 Name:      dejavu-fonts
-Version:   2.0
+Version:   2.1
 Release:   1%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
@@ -56,12 +56,16 @@
 %defattr(0644,root,root,0755)
 %doc *.txt AUTHORS BUGS LICENSE NEWS README
 
+
 %dir %{fontdir}
 %{fontdir}/*.ttf
 %ghost %{fontdir}/fonts.cache-1
 %ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Wed Dec 28 2005 Nicolas Mailhot  2.1-1
+- 2.1
+
 * Sun Nov 13 2005 Nicolas Mailhot  2.0-1
 - 2.0!
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Nov 2005 16:03:01 -0000	1.6
+++ sources	28 Dec 2005 20:42:02 -0000	1.7
@@ -1 +1 @@
-3982b3eed3f03054349f6640d407045c  dejavu-ttf-2.0.tar.gz
+3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 20:43:49 2005
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Wed, 28 Dec 2005 15:43:49 -0500
Subject: rpms/dejavu-fonts import.log,1.20,1.21
Message-ID: <200512282044.jBSKiMvP006424@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6390

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.1-1.fc4 on branch FC-4 from dejavu-fonts-2.1-1.fc4.src.rpm
2.1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- import.log	28 Dec 2005 20:41:56 -0000	1.20
+++ import.log	28 Dec 2005 20:43:49 -0000	1.21
@@ -17,3 +17,4 @@
 dejavu-fonts-2_0-1_fc4:FC-4:dejavu-fonts-2.0-1.fc4.src.rpm:1131898337
 dejavu-fonts-2_0-1_fc5:HEAD:dejavu-fonts-2.0-1.fc5.src.rpm:1131898927
 dejavu-fonts-2_1-1_fc5:HEAD:dejavu-fonts-2.1-1.fc5.src.rpm:1135802501
+dejavu-fonts-2_1-1_fc4:FC-4:dejavu-fonts-2.1-1.fc4.src.rpm:1135802614



From fedora-extras-commits at redhat.com  Wed Dec 28 20:43:55 2005
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Wed, 28 Dec 2005 15:43:55 -0500
Subject: rpms/dejavu-fonts/FC-4 .cvsignore, 1.6, 1.7 dejavu-fonts.spec, 1.5, 
	1.6 sources, 1.6, 1.7
Message-ID: <200512282044.jBSKiRPP006429@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6390/FC-4

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.1-1.fc4 on branch FC-4 from dejavu-fonts-2.1-1.fc4.src.rpm
2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Nov 2005 16:12:32 -0000	1.6
+++ .cvsignore	28 Dec 2005 20:43:55 -0000	1.7
@@ -1 +1 @@
-dejavu-ttf-2.0.tar.gz
+dejavu-ttf-2.1.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dejavu-fonts.spec	13 Nov 2005 16:12:32 -0000	1.5
+++ dejavu-fonts.spec	28 Dec 2005 20:43:55 -0000	1.6
@@ -2,7 +2,7 @@
 %define fontdir         %{_datadir}/fonts/dejavu
 
 Name:      dejavu-fonts
-Version:   2.0
+Version:   2.1
 Release:   1%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
@@ -56,12 +56,16 @@
 %defattr(0644,root,root,0755)
 %doc *.txt AUTHORS BUGS LICENSE NEWS README
 
+
 %dir %{fontdir}
 %{fontdir}/*.ttf
 %ghost %{fontdir}/fonts.cache-1
 %ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Wed Dec 28 2005 Nicolas Mailhot  2.1-1
+- 2.1
+
 * Sun Nov 13 2005 Nicolas Mailhot  2.0-1
 - 2.0!
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Nov 2005 16:12:32 -0000	1.6
+++ sources	28 Dec 2005 20:43:55 -0000	1.7
@@ -1 +1 @@
-3982b3eed3f03054349f6640d407045c  dejavu-ttf-2.0.tar.gz
+3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 20:44:36 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 15:44:36 -0500
Subject: rpms/clisp/devel clisp.spec,1.6,1.7
Message-ID: <200512282045.jBSKj8u3006495@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6464

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- clisp.spec	28 Dec 2005 20:23:33 -0000	1.6
+++ clisp.spec	28 Dec 2005 20:44:36 -0000	1.7
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -10,7 +10,17 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
-BuildRequires:	libSM-devel, libICE-devel, libX11-devel, libXext-devel, libXpm-devel
+BuildRequires:  libICE-devel
+BuildRequires:  libSM-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXaw-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXft-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libXrender-devel
+BuildRequires:  libXt-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libGLU-devel
 #ExcludeArch:	ppc ppc64
 
 



From fedora-extras-commits at redhat.com  Wed Dec 28 20:45:48 2005
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Wed, 28 Dec 2005 15:45:48 -0500
Subject: rpms/dejavu-fonts import.log,1.21,1.22
Message-ID: <200512282046.jBSKkKpN006592@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6558

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.1-1.fc3 on branch FC-3 from dejavu-fonts-2.1-1.fc3.src.rpm
2.1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- import.log	28 Dec 2005 20:43:49 -0000	1.21
+++ import.log	28 Dec 2005 20:45:48 -0000	1.22
@@ -18,3 +18,4 @@
 dejavu-fonts-2_0-1_fc5:HEAD:dejavu-fonts-2.0-1.fc5.src.rpm:1131898927
 dejavu-fonts-2_1-1_fc5:HEAD:dejavu-fonts-2.1-1.fc5.src.rpm:1135802501
 dejavu-fonts-2_1-1_fc4:FC-4:dejavu-fonts-2.1-1.fc4.src.rpm:1135802614
+dejavu-fonts-2_1-1_fc3:FC-3:dejavu-fonts-2.1-1.fc3.src.rpm:1135802732



From fedora-extras-commits at redhat.com  Wed Dec 28 20:45:54 2005
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Wed, 28 Dec 2005 15:45:54 -0500
Subject: rpms/dejavu-fonts/FC-3 .cvsignore, 1.6, 1.7 dejavu-fonts.spec, 1.5, 
	1.6 sources, 1.6, 1.7
Message-ID: <200512282046.jBSKkQYl006597@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6558/FC-3

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.1-1.fc3 on branch FC-3 from dejavu-fonts-2.1-1.fc3.src.rpm
2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Nov 2005 16:09:02 -0000	1.6
+++ .cvsignore	28 Dec 2005 20:45:53 -0000	1.7
@@ -1 +1 @@
-dejavu-ttf-2.0.tar.gz
+dejavu-ttf-2.1.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/dejavu-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dejavu-fonts.spec	13 Nov 2005 16:09:02 -0000	1.5
+++ dejavu-fonts.spec	28 Dec 2005 20:45:53 -0000	1.6
@@ -2,7 +2,7 @@
 %define fontdir         %{_datadir}/fonts/dejavu
 
 Name:      dejavu-fonts
-Version:   2.0
+Version:   2.1
 Release:   1%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
@@ -56,12 +56,16 @@
 %defattr(0644,root,root,0755)
 %doc *.txt AUTHORS BUGS LICENSE NEWS README
 
+
 %dir %{fontdir}
 %{fontdir}/*.ttf
 %ghost %{fontdir}/fonts.cache-1
 %ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Wed Dec 28 2005 Nicolas Mailhot  2.1-1
+- 2.1
+
 * Sun Nov 13 2005 Nicolas Mailhot  2.0-1
 - 2.0!
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Nov 2005 16:09:02 -0000	1.6
+++ sources	28 Dec 2005 20:45:53 -0000	1.7
@@ -1 +1 @@
-3982b3eed3f03054349f6640d407045c  dejavu-ttf-2.0.tar.gz
+3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 22:28:22 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 28 Dec 2005 17:28:22 -0500
Subject: rpms/htop/FC-4 htop.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200512282228.jBSMSsod010567@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/htop/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10523/FC-4

Modified Files:
	htop.spec sources 
Log Message:
Upstream updated tarball with a small bug fix without increasing
release number. We'll need to rebuild it once again. Lesson for
today: don't try to be faster than the light ;)



Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-4/htop.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- htop.spec	28 Dec 2005 20:00:31 -0000	1.2
+++ htop.spec	28 Dec 2005 22:28:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           htop
 Version:        0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interactive process viewer
 
 Group:          Applications/System
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Dawid Gajownik  - 0.6-2
+- Rebuild with updated tarball
+
 * Wed Dec 28 2005 Dawid Gajownik  - 0.6-1
 - Version 0.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/htop/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Dec 2005 20:00:31 -0000	1.3
+++ sources	28 Dec 2005 22:28:22 -0000	1.4
@@ -1 +1 @@
-f4aeafa0111805a92d4d2ead907bc8e5  htop-0.6.tar.gz
+c00b1dba101569a055ed260e06a25596  htop-0.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 22:28:28 2005
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 28 Dec 2005 17:28:28 -0500
Subject: rpms/htop/devel htop.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200512282229.jBSMT0U4010571@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/htop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10523/devel

Modified Files:
	htop.spec sources 
Log Message:
Upstream updated tarball with a small bug fix without increasing
release number. We'll need to rebuild it once again. Lesson for
today: don't try to be faster than the light ;)



Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/htop.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- htop.spec	28 Dec 2005 20:00:37 -0000	1.2
+++ htop.spec	28 Dec 2005 22:28:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           htop
 Version:        0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interactive process viewer
 
 Group:          Applications/System
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Dawid Gajownik  - 0.6-2
+- Rebuild with updated tarball
+
 * Wed Dec 28 2005 Dawid Gajownik  - 0.6-1
 - Version 0.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/htop/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Dec 2005 20:00:37 -0000	1.3
+++ sources	28 Dec 2005 22:28:28 -0000	1.4
@@ -1 +1 @@
-f4aeafa0111805a92d4d2ead907bc8e5  htop-0.6.tar.gz
+c00b1dba101569a055ed260e06a25596  htop-0.6.tar.gz



From fedora-extras-commits at redhat.com  Wed Dec 28 22:34:07 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 17:34:07 -0500
Subject: rpms/clisp/devel clisp.spec,1.7,1.8
Message-ID: <200512282234.jBSMYdrj010673@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10654

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- clisp.spec	28 Dec 2005 20:44:36 -0000	1.7
+++ clisp.spec	28 Dec 2005 22:34:06 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -19,8 +19,7 @@
 BuildRequires:  libXmu-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  libXt-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:  mesa-libGLU-devel
+BuildRequires:	imake
 #ExcludeArch:	ppc ppc64
 
 



From fedora-extras-commits at redhat.com  Wed Dec 28 22:38:04 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 17:38:04 -0500
Subject: rpms/clisp/FC-3 .cvsignore,1.2,1.3 clisp.spec,1.6,1.7
Message-ID: <200512282238.jBSMca44010736@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10717

Modified Files:
	.cvsignore clisp.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2005 18:26:10 -0000	1.2
+++ .cvsignore	28 Dec 2005 22:38:04 -0000	1.3
@@ -1 +1 @@
-clisp-2.34.tar.bz2
+clisp-2.36.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- clisp.spec	29 Aug 2005 23:11:53 -0000	1.6
+++ clisp.spec	28 Dec 2005 22:38:04 -0000	1.7
@@ -1,14 +1,14 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.35
-Release: 	1%{?dist}
+Version:	2.36
+Release: 	4%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.35.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.36.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	readline-devel, XFree86-devel, gettext, pcre-devel
+BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 
 %description
@@ -109,6 +109,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Gerard Milmeister  - 2.36-1
+- New Version 2.36
+
 * Tue Aug 30 2005 Gerard Milmeister  - 2.35-1
 - New Version 2.35
 



From fedora-extras-commits at redhat.com  Wed Dec 28 22:41:01 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 17:41:01 -0500
Subject: rpms/clisp/FC-3 clisp.spec,1.7,1.8 sources,1.3,1.4
Message-ID: <200512282241.jBSMfXc2010823@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10780

Modified Files:
	clisp.spec sources 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- clisp.spec	28 Dec 2005 22:38:04 -0000	1.7
+++ clisp.spec	28 Dec 2005 22:41:01 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 
 Group:		Development/Languages
 License:	GPL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2005 23:11:53 -0000	1.3
+++ sources	28 Dec 2005 22:41:01 -0000	1.4
@@ -1 +1 @@
-a8e3136c4ecfb5deb65fe53e22ca2c07  clisp-2.35.tar.bz2
+b6b5f6b7e6d0ce9f42bc07d59fbddc09  clisp-2.36.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 28 22:48:56 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 17:48:56 -0500
Subject: rpms/clisp/FC-4 .cvsignore, 1.3, 1.4 clisp.spec, 1.9, 1.10 sources, 
	1.3, 1.4
Message-ID: <200512282249.jBSMnSg9010919@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10898

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Aug 2005 22:54:14 -0000	1.3
+++ .cvsignore	28 Dec 2005 22:48:56 -0000	1.4
@@ -1 +1 @@
-clisp-2.35.tar.bz2
+clisp-2.36.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- clisp.spec	29 Aug 2005 23:09:11 -0000	1.9
+++ clisp.spec	28 Dec 2005 22:48:56 -0000	1.10
@@ -1,14 +1,14 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.35
-Release: 	3%{?dist}
+Version:	2.36
+Release: 	4%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.35.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.36.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	readline-devel, XFree86-devel, gettext, pcre-devel, postgresql-devel
+BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 ExcludeArch:	ppc ppc64
 
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Wed Dec 28 2005 Gerard Milmeister  - 2.36-1
+- New Version 2.36
+
 * Tue Aug 30 2005 Gerard Milmeister  - 2.35-1
 - New Version 2.35
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2005 22:54:14 -0000	1.3
+++ sources	28 Dec 2005 22:48:56 -0000	1.4
@@ -1 +1 @@
-a8e3136c4ecfb5deb65fe53e22ca2c07  clisp-2.35.tar.bz2
+b6b5f6b7e6d0ce9f42bc07d59fbddc09  clisp-2.36.tar.bz2



From fedora-extras-commits at redhat.com  Wed Dec 28 22:52:17 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 17:52:17 -0500
Subject: rpms/clisp/FC-4 clisp.spec,1.10,1.11
Message-ID: <200512282252.jBSMqnP7010982@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10965

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- clisp.spec	28 Dec 2005 22:48:56 -0000	1.10
+++ clisp.spec	28 Dec 2005 22:52:17 -0000	1.11
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -10,7 +10,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
-ExcludeArch:	ppc ppc64
+BuildRequires:  xorg-x11-devel
+#ExcludeArch:	ppc ppc64
 
 
 %description



From fedora-extras-commits at redhat.com  Wed Dec 28 22:53:13 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 17:53:13 -0500
Subject: rpms/clisp/FC-3 clisp.spec,1.8,1.9
Message-ID: <200512282253.jBSMrjQ4011047@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11026

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- clisp.spec	28 Dec 2005 22:41:01 -0000	1.8
+++ clisp.spec	28 Dec 2005 22:53:12 -0000	1.9
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -10,6 +10,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
+BuildRequires:	XFree86-devel
 
 %description
 ANSI Common Lisp is a high-level, general-purpose programming



From fedora-extras-commits at redhat.com  Wed Dec 28 23:04:27 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 18:04:27 -0500
Subject: rpms/clisp/FC-4 clisp.spec,1.11,1.12
Message-ID: <200512282305.jBSN5LFG012750@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12733

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- clisp.spec	28 Dec 2005 22:52:17 -0000	1.11
+++ clisp.spec	28 Dec 2005 23:04:04 -0000	1.12
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -11,7 +11,7 @@
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 BuildRequires:  xorg-x11-devel
-#ExcludeArch:	ppc ppc64
+ExcludeArch:	ppc ppc64
 
 
 %description



From fedora-extras-commits at redhat.com  Wed Dec 28 23:06:20 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 18:06:20 -0500
Subject: rpms/clisp/FC-3 clisp.spec,1.9,1.10
Message-ID: <200512282306.jBSN6i5t012809@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12790

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- clisp.spec	28 Dec 2005 22:53:12 -0000	1.9
+++ clisp.spec	28 Dec 2005 23:06:20 -0000	1.10
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -11,6 +11,7 @@
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 BuildRequires:	XFree86-devel
+ExcludeArch:	x86_64
 
 %description
 ANSI Common Lisp is a high-level, general-purpose programming



From fedora-extras-commits at redhat.com  Wed Dec 28 23:07:47 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 18:07:47 -0500
Subject: rpms/clisp/devel clisp.spec,1.8,1.9
Message-ID: <200512282308.jBSN8aar012872@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12851

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- clisp.spec	28 Dec 2005 22:34:06 -0000	1.8
+++ clisp.spec	28 Dec 2005 23:07:47 -0000	1.9
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	4%{?dist}
+Release: 	7%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -20,7 +20,7 @@
 BuildRequires:  libXrender-devel
 BuildRequires:  libXt-devel
 BuildRequires:	imake
-#ExcludeArch:	ppc ppc64
+ExcludeArch:	x86_64 ppc ppc64
 
 
 %description



From fedora-extras-commits at redhat.com  Wed Dec 28 23:15:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 28 Dec 2005 18:15:09 -0500
Subject: owners owners.list,1.486,1.487
Message-ID: <200512282315.jBSNFfPc012989@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12970

Modified Files:
	owners.list 
Log Message:
Transfer ownership of python-sqlobject


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -r1.486 -r1.487
--- owners.list	28 Dec 2005 10:27:09 -0000	1.486
+++ owners.list	28 Dec 2005 23:15:09 -0000	1.487
@@ -1019,7 +1019,7 @@
 Fedora Extras|python-simpletal|Alternative implementation of Zope Page Templates|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-simpy|Python simulation framework|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|python-sqlite|Python bindings for SQLite|thomas at apestaart.org|extras-qa at fedoraproject.org|
-Fedora Extras|python-sqlobject|SQLObject is an object-relational mapper for python|oliver.andrich 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-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  Wed Dec 28 23:29:12 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 18:29:12 -0500
Subject: rpms/clisp/FC-4 clisp.spec,1.12,1.13
Message-ID: <200512282329.jBSNTi95013043@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13006

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- clisp.spec	28 Dec 2005 23:04:04 -0000	1.12
+++ clisp.spec	28 Dec 2005 23:29:11 -0000	1.13
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.36
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -11,7 +11,7 @@
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 BuildRequires:  xorg-x11-devel
-ExcludeArch:	ppc ppc64
+ExcludeArch:	ppc ppc64 x86_64
 
 
 %description



From fedora-extras-commits at redhat.com  Wed Dec 28 23:29:25 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Wed, 28 Dec 2005 18:29:25 -0500
Subject: rpms/buoh/devel buoh.spec,1.2,1.3
Message-ID: <200512282329.jBSNTwDI013077@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13026

Modified Files:
	buoh.spec 
Log Message:
Thats Wed and not Web :-)



Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buoh.spec	28 Dec 2005 09:46:16 -0000	1.2
+++ buoh.spec	28 Dec 2005 23:29:25 -0000	1.3
@@ -76,7 +76,7 @@
 %{_datadir}/pixmaps/buoh*.png
 
 %changelog
-* Web Dec 28 2005 - Chris Chabot  - 0.8.1-4
+* Wed Dec 28 2005 - Chris Chabot  - 0.8.1-4
 - Changed desktop entry vendor to fedora
 
 * Mon Dec 27 2005 - Chris Chabot  - 0.8.1-3



From fedora-extras-commits at redhat.com  Wed Dec 28 23:47:23 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Wed, 28 Dec 2005 18:47:23 -0500
Subject: rpms/buoh/devel buoh.spec,1.3,1.4
Message-ID: <200512282347.jBSNltWO013453@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13426

Modified Files:
	buoh.spec 
Log Message:
Fixed typo in desktop file


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buoh.spec	28 Dec 2005 23:29:25 -0000	1.3
+++ buoh.spec	28 Dec 2005 23:47:23 -0000	1.4
@@ -69,7 +69,7 @@
 %dir %{_datadir}/buoh/ui
 %{_bindir}/buoh
 %{_sysconfdir}/gconf/schemas/buoh.schemas
-%{_datadir}/applications/gnome-buoh.desktop
+%{_datadir}/applications/fedora-buoh.desktop
 %{_datadir}/buoh/comics/comics.xml
 %{_datadir}/buoh/ui/buoh-ui.xml
 %{_datadir}/buoh/pixmaps/buoh*.png



From fedora-extras-commits at redhat.com  Wed Dec 28 23:48:12 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 18:48:12 -0500
Subject: rpms/perl-AppConfig/devel perl-AppConfig.spec,1.7,1.8
Message-ID: <200512282348.jBSNmjGh013478@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-AppConfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13461

Modified Files:
	perl-AppConfig.spec 
Log Message:
Dist tag.


Index: perl-AppConfig.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-AppConfig/devel/perl-AppConfig.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-AppConfig.spec	6 Apr 2005 22:12:43 -0000	1.7
+++ perl-AppConfig.spec	28 Dec 2005 23:48:12 -0000	1.8
@@ -1,20 +1,16 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-AppConfig
 Version:        1.56
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Perl module for reading configuration files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/AppConfig/
-Source0:        http://www.cpan.org/authors/id/A/AB/ABW/AppConfig-1.56.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AB/ABW/AppConfig-%{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))
 
 %description
@@ -44,7 +40,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -60,7 +56,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Wed Dec 28 2005 Jose Pedro Oliveira  - 1.56-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.56-2
 - rebuilt
 
 * Sun May 23 2004 Jose Pedro Oliveira  - 0:1.56-0.fdr.1



From fedora-extras-commits at redhat.com  Wed Dec 28 23:49:22 2005
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Wed, 28 Dec 2005 18:49:22 -0500
Subject: rpms/buoh/devel buoh.spec,1.4,1.5
Message-ID: <200512282349.jBSNnsMi013515@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13487

Modified Files:
	buoh.spec 
Log Message:
Bumbed release version


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buoh.spec	28 Dec 2005 23:47:23 -0000	1.4
+++ buoh.spec	28 Dec 2005 23:49:21 -0000	1.5
@@ -2,7 +2,7 @@
 License:          GPL
 Group:            Applications/Internet
 Version:          0.8.1
-Release:          4
+Release:          5
 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
+* Wed Dec 28 2005 - Chris Chabot  - 0.8.1-5
+- And changed %files entry too
+
 * Wed Dec 28 2005 - Chris Chabot  - 0.8.1-4
 - Changed desktop entry vendor to fedora
 



From fedora-extras-commits at redhat.com  Thu Dec 29 00:13:18 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 19:13:18 -0500
Subject: rpms/perl-Cache-Cache/devel perl-Cache-Cache.spec,1.7,1.8
Message-ID: <200512290014.jBT0EV1b015354@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cache-Cache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15316

Modified Files:
	perl-Cache-Cache.spec 
Log Message:
Dist tag.


Index: perl-Cache-Cache.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/perl-Cache-Cache.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Cache-Cache.spec	6 Apr 2005 22:12:43 -0000	1.7
+++ perl-Cache-Cache.spec	29 Dec 2005 00:12:59 -0000	1.8
@@ -1,19 +1,16 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Cache-Cache
 Version:        1.04
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Generic cache interface and implementations
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Cache-Cache/
-Source0:   http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-1.04.tar.gz
+Source0:        http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(Storable)
+BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Digest::SHA1), perl(Error), perl(IPC::ShareLite)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -45,7 +42,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -61,7 +58,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 1.04-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.04-2
 - rebuilt
 
 * Fri Mar 18 2005 Jose Pedro Oliveira  - 1.04-1



From fedora-extras-commits at redhat.com  Thu Dec 29 00:23:37 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 19:23:37 -0500
Subject: rpms/perl-ExtUtils-Depends/devel perl-ExtUtils-Depends.spec, 1.7,
	1.8
Message-ID: <200512290024.jBT0OAnf015481@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-serv15462

Modified Files:
	perl-ExtUtils-Depends.spec 
Log Message:
Dist tag.


Index: perl-ExtUtils-Depends.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-Depends/devel/perl-ExtUtils-Depends.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-ExtUtils-Depends.spec	6 Apr 2005 22:12:44 -0000	1.7
+++ perl-ExtUtils-Depends.spec	29 Dec 2005 00:23:37 -0000	1.8
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-ExtUtils-Depends
 Version:        0.205
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Easily build XS extensions that depend on XS extensions
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-Depends/
-Source0:        http://www.cpan.org/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-Depends-0.205.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-Depends-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -40,7 +37,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -56,7 +53,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.205-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.205-2
 - rebuilt
 
 * Tue Feb 15 2005 Jose Pedro Oliveira  - 0:0.205-1



From fedora-extras-commits at redhat.com  Thu Dec 29 00:30:15 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 19:30:15 -0500
Subject: rpms/perl-Error/devel perl-Error.spec,1.4,1.5
Message-ID: <200512290030.jBT0UlvA015555@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15536

Modified Files:
	perl-Error.spec 
Log Message:
Dist tag.


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Error.spec	6 Apr 2005 22:12:44 -0000	1.4
+++ perl-Error.spec	29 Dec 2005 00:30:15 -0000	1.5
@@ -1,15 +1,14 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Error
 Version:        0.15
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Error Perl module
+
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Error/
-Source0:        http://www.cpan.org/modules/by-module/Error/Error-0.15.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/Error/Error-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -19,6 +18,7 @@
 for errors/exceptions that can either be thrown, for subsequent catch, or
 can simply be recorded.
 
+
 %prep
 %setup -q -n Error-%{version}
 
@@ -36,20 +36,25 @@
 
 chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
 
-%check || :
+%check
 make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README example
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
+
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.15-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.15-2
 - rebuilt
 
 * Fri Jun 11 2004 Steven Pritchard  0:0.15-1



From fedora-extras-commits at redhat.com  Thu Dec 29 00:34:59 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed, 28 Dec 2005 19:34:59 -0500
Subject: rpms/erlang/FC-4 otp-sslrpath.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 erlang.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200512290035.jBT0ZV1d015694@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15650

Modified Files:
	.cvsignore erlang.spec sources 
Added Files:
	otp-sslrpath.patch 
Log Message:
new version R10B-9

otp-sslrpath.patch:

--- NEW FILE otp-sslrpath.patch ---
--- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath	2005-12-29 00:49:17.000000000 +0100
+++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in	2005-12-29 00:50:15.000000000 +0100
@@ -95,7 +95,7 @@
 endif
 endif
 
-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@
+CC_R_FLAG=
 ifeq ($(findstring @,$(CC_R_FLAG)),@)
 # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;
 # we try our best here instead...


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Oct 2005 22:34:39 -0000	1.3
+++ .cvsignore	29 Dec 2005 00:34:58 -0000	1.4
@@ -1,3 +1,3 @@
-otp_doc_html_R10B-8.tar.gz
-otp_doc_man_R10B-8.tar.gz
-otp_src_R10B-8.tar.gz
+otp_doc_html_R10B-9.tar.gz
+otp_doc_man_R10B-9.tar.gz
+otp_src_R10B-9.tar.gz


Index: erlang.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-4/erlang.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- erlang.spec	29 Oct 2005 22:34:39 -0000	1.4
+++ erlang.spec	29 Dec 2005 00:34:58 -0000	1.5
@@ -1,17 +1,18 @@
 Name:           erlang
 Version:        R10B
-Release:        8.2%{?dist}
+Release:        9.1%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
 License:        Erlang Public License
 URL:            http://www.erlang.org
-Source:         http://www.erlang.org/download/otp_src_R10B-8.tar.gz
-Source1:	http://www.erlang.org/download/otp_doc_html_R10B-8.tar.gz
-Source2:	http://www.erlang.org/download/otp_doc_man_R10B-8.tar.gz
+Source:         http://www.erlang.org/download/otp_src_R10B-9.tar.gz
+Source1:	http://www.erlang.org/download/otp_doc_html_R10B-9.tar.gz
+Source2:	http://www.erlang.org/download/otp_doc_man_R10B-9.tar.gz
 Patch:		otp-links.patch
 Patch1:		otp-install.patch
 Patch2:		otp-rpath.patch
+Patch3:         otp-sslrpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, openssl-devel, flex, unixODBC-devel
 BuildRequires:	tcl-devel, tk-devel
@@ -35,10 +36,11 @@
 
 
 %prep
-%setup -q -n otp_src_R10B-8
+%setup -q -n otp_src_R10B-9
 %patch -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -88,10 +90,13 @@
 
 
 %post
-%{_libdir}/erlang/Install -minimal %{_libdir}/erlang > /dev/null
+%{_libdir}/erlang/Install -minimal %{_libdir}/erlang >/dev/null 2>/dev/null
 
 
 %changelog
+* Thu Dec 29 2005 Gerard Milmeister  - R10B-9.1
+- New Version R10B-9
+
 * Sat Oct 29 2005 Gerard Milmeister  - R10B-8.2
 - updated rpath patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2005 22:34:39 -0000	1.3
+++ sources	29 Dec 2005 00:34:58 -0000	1.4
@@ -1,3 +1,3 @@
-d4d3f448c311cd3fc3a44e06e4145bcb  otp_doc_html_R10B-8.tar.gz
-c0760f24ae789fda248e978430aefe38  otp_doc_man_R10B-8.tar.gz
-75cd5ad53b66baad9ebc802b8a1f6043  otp_src_R10B-8.tar.gz
+108bc01be67aaa2edde9a0331ef9bc71  otp_doc_html_R10B-9.tar.gz
+051cd9893b36313f20a420bc2491905c  otp_doc_man_R10B-9.tar.gz
+05791e9097f36202eb705df2a1db6500  otp_src_R10B-9.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 00:35:11 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 19:35:11 -0500
Subject: rpms/perl-ExtUtils-PkgConfig/devel perl-ExtUtils-PkgConfig.spec, 1.7,
	1.8
Message-ID: <200512290035.jBT0ZheQ015697@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-PkgConfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15675

Modified Files:
	perl-ExtUtils-PkgConfig.spec 
Log Message:
Dist tag.


Index: perl-ExtUtils-PkgConfig.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-PkgConfig/devel/perl-ExtUtils-PkgConfig.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-ExtUtils-PkgConfig.spec	6 Apr 2005 22:12:44 -0000	1.7
+++ perl-ExtUtils-PkgConfig.spec	29 Dec 2005 00:35:11 -0000	1.8
@@ -1,20 +1,17 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-ExtUtils-PkgConfig
 Version:        1.07
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Simplistic interface to pkg-config
 
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://search.cpan.org/dist/ExtUtils-PkgConfig/
-Source0:        http://www.cpan.org/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-PkgConfig-1.07.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-PkgConfig-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  pkgconfig, perl(Test::More)
+BuildRequires:  pkgconfig
 Requires:       pkgconfig
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -45,7 +42,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -61,7 +58,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 1.07-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.07-2
 - rebuilt
 
 * Tue Feb 15 2005 Jose Pedro Oliveira  - 0:1.07-1



From fedora-extras-commits at redhat.com  Thu Dec 29 00:43:04 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 19:43:04 -0500
Subject: rpms/perl-FreezeThaw/devel perl-FreezeThaw.spec,1.4,1.5
Message-ID: <200512290043.jBT0hakv015821@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-FreezeThaw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15804

Modified Files:
	perl-FreezeThaw.spec 
Log Message:
Dist tag.


Index: perl-FreezeThaw.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-FreezeThaw/devel/perl-FreezeThaw.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-FreezeThaw.spec	6 Apr 2005 22:12:45 -0000	1.4
+++ perl-FreezeThaw.spec	29 Dec 2005 00:43:04 -0000	1.5
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-FreezeThaw
 Version:        0.43
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Convert Perl structures to strings and back
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/FreezeThaw/
-Source0:        http://www.cpan.org/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.43.tar.gz
+Source0:        http://www.cpan.org/authors/id/I/IL/ILYAZ/modules/FreezeThaw-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -39,7 +36,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -55,7 +52,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.43-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.43-2
 - rebuilt
 
 * Sun Oct 31 2004 Jose Pedro Oliveira  - 0:0.43-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Dec 29 01:02:59 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 20:02:59 -0500
Subject: rpms/perl-HTML-Template/FC-4 .cvsignore, 1.2,
	1.3 perl-HTML-Template.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <200512290103.jBT13VdI017620@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTML-Template/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17582/FC-4

Modified Files:
	.cvsignore perl-HTML-Template.spec sources 
Log Message:
Update to 2.8.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:01:29 -0000	1.2
+++ .cvsignore	29 Dec 2005 01:02:59 -0000	1.3
@@ -1 +1 @@
-HTML-Template-2.7.tar.gz
+HTML-Template-2.8.tar.gz


Index: perl-HTML-Template.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template/FC-4/perl-HTML-Template.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-HTML-Template.spec	13 Aug 2005 11:37:31 -0000	1.7
+++ perl-HTML-Template.spec	29 Dec 2005 01:02:59 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Template
-Version:        2.7
-Release:        4%{?dist}
+Version:        2.8
+Release:        1%{?dist}
 Summary:        Perl module to use HTML Templates
 
 Group:          Development/Libraries
@@ -44,7 +44,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 TEST_SHARED_MEMORY=1 make test
 
 
@@ -55,11 +55,14 @@
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE ARTISTIC Changes FAQ GPL README
+%{perl_vendorlib}/HTML/
 %{_mandir}/man3/*.3*
-%{perl_vendorlib}/*
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 2.8-1
+- Update to 2.8.
+
 * Sat Aug 13 2005 Jose Pedro Oliveira  - 2.7-4
 - README file: corrected the end-of-line encoding (#165874).
 - Bring up to date with Fedora Extras template.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:01:29 -0000	1.2
+++ sources	29 Dec 2005 01:02:59 -0000	1.3
@@ -1 +1 @@
-376f572659b4c0c40a9dd68823a0dd6b  HTML-Template-2.7.tar.gz
+3f1d6f4b3ab3ef7f0fd8864d2ec56e59  HTML-Template-2.8.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 01:03:07 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 20:03:07 -0500
Subject: rpms/perl-HTML-Template/devel .cvsignore, 1.2,
	1.3 perl-HTML-Template.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <200512290104.jBT149LK017625@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTML-Template/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17582/devel

Modified Files:
	.cvsignore perl-HTML-Template.spec sources 
Log Message:
Update to 2.8.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:01:29 -0000	1.2
+++ .cvsignore	29 Dec 2005 01:03:06 -0000	1.3
@@ -1 +1 @@
-HTML-Template-2.7.tar.gz
+HTML-Template-2.8.tar.gz


Index: perl-HTML-Template.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template/devel/perl-HTML-Template.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-HTML-Template.spec	13 Aug 2005 11:37:31 -0000	1.7
+++ perl-HTML-Template.spec	29 Dec 2005 01:03:06 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Template
-Version:        2.7
-Release:        4%{?dist}
+Version:        2.8
+Release:        1%{?dist}
 Summary:        Perl module to use HTML Templates
 
 Group:          Development/Libraries
@@ -44,7 +44,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 TEST_SHARED_MEMORY=1 make test
 
 
@@ -55,11 +55,14 @@
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE ARTISTIC Changes FAQ GPL README
+%{perl_vendorlib}/HTML/
 %{_mandir}/man3/*.3*
-%{perl_vendorlib}/*
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 2.8-1
+- Update to 2.8.
+
 * Sat Aug 13 2005 Jose Pedro Oliveira  - 2.7-4
 - README file: corrected the end-of-line encoding (#165874).
 - Bring up to date with Fedora Extras template.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:01:29 -0000	1.2
+++ sources	29 Dec 2005 01:03:06 -0000	1.3
@@ -1 +1 @@
-376f572659b4c0c40a9dd68823a0dd6b  HTML-Template-2.7.tar.gz
+3f1d6f4b3ab3ef7f0fd8864d2ec56e59  HTML-Template-2.8.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 01:51:10 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 20:51:10 -0500
Subject: rpms/perl-SNMP_Session/FC-3 .cvsignore, 1.2,
	1.3 perl-SNMP_Session.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512290151.jBT1phhJ017925@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SNMP_Session/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17870/FC-3

Modified Files:
	.cvsignore perl-SNMP_Session.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 18:27:59 -0000	1.2
+++ .cvsignore	29 Dec 2005 01:51:10 -0000	1.3
@@ -1 +1 @@
-SNMP_Session-1.07.tar.gz
+SNMP_Session-1.08.tar.gz


Index: perl-SNMP_Session.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/FC-3/perl-SNMP_Session.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-SNMP_Session.spec	13 Sep 2005 18:32:06 -0000	1.2
+++ perl-SNMP_Session.spec	29 Dec 2005 01:51:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-SNMP_Session
-Version:        1.07
-Release:        2%{?dist}
+Version:        1.08
+Release:        1%{?dist}
 Summary:        SNMP support for Perl 5
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 1.08-1
+- Update to 1.08.
+
 * Tue Sep 13 2005 Jose Pedro Oliveira  - 1.07-2
 - Removed superfluous perl BR.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 18:27:59 -0000	1.2
+++ sources	29 Dec 2005 01:51:10 -0000	1.3
@@ -1 +1 @@
-496725e254c98cf1863703c4184f783e  SNMP_Session-1.07.tar.gz
+91ab58bd2c170145436f68578a2705ab  SNMP_Session-1.08.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 01:51:16 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 20:51:16 -0500
Subject: rpms/perl-SNMP_Session/FC-4 .cvsignore, 1.2,
	1.3 perl-SNMP_Session.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512290151.jBT1pmVR017930@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SNMP_Session/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17870/FC-4

Modified Files:
	.cvsignore perl-SNMP_Session.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 18:27:59 -0000	1.2
+++ .cvsignore	29 Dec 2005 01:51:16 -0000	1.3
@@ -1 +1 @@
-SNMP_Session-1.07.tar.gz
+SNMP_Session-1.08.tar.gz


Index: perl-SNMP_Session.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/FC-4/perl-SNMP_Session.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-SNMP_Session.spec	13 Sep 2005 18:32:06 -0000	1.2
+++ perl-SNMP_Session.spec	29 Dec 2005 01:51:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-SNMP_Session
-Version:        1.07
-Release:        2%{?dist}
+Version:        1.08
+Release:        1%{?dist}
 Summary:        SNMP support for Perl 5
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 1.08-1
+- Update to 1.08.
+
 * Tue Sep 13 2005 Jose Pedro Oliveira  - 1.07-2
 - Removed superfluous perl BR.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 18:27:59 -0000	1.2
+++ sources	29 Dec 2005 01:51:16 -0000	1.3
@@ -1 +1 @@
-496725e254c98cf1863703c4184f783e  SNMP_Session-1.07.tar.gz
+91ab58bd2c170145436f68578a2705ab  SNMP_Session-1.08.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 01:51:22 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 20:51:22 -0500
Subject: rpms/perl-SNMP_Session/devel .cvsignore, 1.2,
	1.3 perl-SNMP_Session.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200512290151.jBT1psgT017935@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SNMP_Session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17870/devel

Modified Files:
	.cvsignore perl-SNMP_Session.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 18:27:59 -0000	1.2
+++ .cvsignore	29 Dec 2005 01:51:22 -0000	1.3
@@ -1 +1 @@
-SNMP_Session-1.07.tar.gz
+SNMP_Session-1.08.tar.gz


Index: perl-SNMP_Session.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/devel/perl-SNMP_Session.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-SNMP_Session.spec	13 Sep 2005 18:32:06 -0000	1.2
+++ perl-SNMP_Session.spec	29 Dec 2005 01:51:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-SNMP_Session
-Version:        1.07
-Release:        2%{?dist}
+Version:        1.08
+Release:        1%{?dist}
 Summary:        SNMP support for Perl 5
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 1.08-1
+- Update to 1.08.
+
 * Tue Sep 13 2005 Jose Pedro Oliveira  - 1.07-2
 - Removed superfluous perl BR.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SNMP_Session/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 18:27:59 -0000	1.2
+++ sources	29 Dec 2005 01:51:22 -0000	1.3
@@ -1 +1 @@
-496725e254c98cf1863703c4184f783e  SNMP_Session-1.07.tar.gz
+91ab58bd2c170145436f68578a2705ab  SNMP_Session-1.08.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 02:02:38 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 28 Dec 2005 21:02:38 -0500
Subject: rpms/Inventor/devel Inventor-redhat-bugs.diff,1.1,NONE
Message-ID: <200512290202.jBT22eBZ019755@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19746

Removed Files:
	Inventor-redhat-bugs.diff 
Log Message:
Remove.


--- Inventor-redhat-bugs.diff DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec 29 02:08:34 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 21:08:34 -0500
Subject: rpms/perl-Text-WikiFormat/devel .cvsignore, 1.2,
	1.3 perl-Text-WikiFormat.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200512290209.jBT296OQ019898@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-WikiFormat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19823/devel

Modified Files:
	.cvsignore perl-Text-WikiFormat.spec sources 
Log Message:
Update to 0.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2005 12:09:42 -0000	1.2
+++ .cvsignore	29 Dec 2005 02:08:34 -0000	1.3
@@ -1 +1 @@
-Text-WikiFormat-0.76.tar.gz
+Text-WikiFormat-0.77.tar.gz


Index: perl-Text-WikiFormat.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/perl-Text-WikiFormat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Text-WikiFormat.spec	1 Sep 2005 12:09:42 -0000	1.1
+++ perl-Text-WikiFormat.spec	29 Dec 2005 02:08:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Text-WikiFormat
-Version:        0.76
-Release:        2%{?dist}
+Version:        0.77
+Release:        1%{?dist}
 Summary:        Translate Wiki formatted text into other formats
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.77-1
+- Update to 0.77.
+
 * Thu Sep  1 2005 Jose Pedro Oliveira  - 0.76-2
 - Disabled the signature test.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2005 12:09:42 -0000	1.2
+++ sources	29 Dec 2005 02:08:34 -0000	1.3
@@ -1 +1 @@
-70bc20c8d058bf64df24e384d36748d1  Text-WikiFormat-0.76.tar.gz
+1264c90c76320a51ba61089b6a201e03  Text-WikiFormat-0.77.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 02:08:10 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 21:08:10 -0500
Subject: rpms/perl-Text-WikiFormat/FC-4 .cvsignore, 1.2,
	1.3 perl-Text-WikiFormat.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200512290209.jBT293EY019888@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-WikiFormat/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19823/FC-4

Modified Files:
	.cvsignore perl-Text-WikiFormat.spec sources 
Log Message:
Update to 0.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2005 12:09:42 -0000	1.2
+++ .cvsignore	29 Dec 2005 02:08:10 -0000	1.3
@@ -1 +1 @@
-Text-WikiFormat-0.76.tar.gz
+Text-WikiFormat-0.77.tar.gz


Index: perl-Text-WikiFormat.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-4/perl-Text-WikiFormat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Text-WikiFormat.spec	1 Sep 2005 12:09:42 -0000	1.1
+++ perl-Text-WikiFormat.spec	29 Dec 2005 02:08:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Text-WikiFormat
-Version:        0.76
-Release:        2%{?dist}
+Version:        0.77
+Release:        1%{?dist}
 Summary:        Translate Wiki formatted text into other formats
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.77-1
+- Update to 0.77.
+
 * Thu Sep  1 2005 Jose Pedro Oliveira  - 0.76-2
 - Disabled the signature test.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2005 12:09:42 -0000	1.2
+++ sources	29 Dec 2005 02:08:10 -0000	1.3
@@ -1 +1 @@
-70bc20c8d058bf64df24e384d36748d1  Text-WikiFormat-0.76.tar.gz
+1264c90c76320a51ba61089b6a201e03  Text-WikiFormat-0.77.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 02:08:02 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 21:08:02 -0500
Subject: rpms/perl-Text-WikiFormat/FC-3 .cvsignore, 1.2,
	1.3 perl-Text-WikiFormat.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200512290209.jBT29444019893@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-WikiFormat/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19823/FC-3

Modified Files:
	.cvsignore perl-Text-WikiFormat.spec sources 
Log Message:
Update to 0.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2005 12:09:42 -0000	1.2
+++ .cvsignore	29 Dec 2005 02:08:02 -0000	1.3
@@ -1 +1 @@
-Text-WikiFormat-0.76.tar.gz
+Text-WikiFormat-0.77.tar.gz


Index: perl-Text-WikiFormat.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-3/perl-Text-WikiFormat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Text-WikiFormat.spec	1 Sep 2005 12:09:42 -0000	1.1
+++ perl-Text-WikiFormat.spec	29 Dec 2005 02:08:02 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Text-WikiFormat
-Version:        0.76
-Release:        2%{?dist}
+Version:        0.77
+Release:        1%{?dist}
 Summary:        Translate Wiki formatted text into other formats
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.77-1
+- Update to 0.77.
+
 * Thu Sep  1 2005 Jose Pedro Oliveira  - 0.76-2
 - Disabled the signature test.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2005 12:09:42 -0000	1.2
+++ sources	29 Dec 2005 02:08:02 -0000	1.3
@@ -1 +1 @@
-70bc20c8d058bf64df24e384d36748d1  Text-WikiFormat-0.76.tar.gz
+1264c90c76320a51ba61089b6a201e03  Text-WikiFormat-0.77.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 02:21:07 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 21:21:07 -0500
Subject: rpms/perl-Pod-Escapes/devel perl-Pod-Escapes.spec,1.6,1.7
Message-ID: <200512290221.jBT2Ldiv020147@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-serv20128

Modified Files:
	perl-Pod-Escapes.spec 
Log Message:
Dist tag.


Index: perl-Pod-Escapes.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Escapes/devel/perl-Pod-Escapes.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Pod-Escapes.spec	6 Apr 2005 22:13:07 -0000	1.6
+++ perl-Pod-Escapes.spec	29 Dec 2005 02:21:06 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Pod-Escapes
 Version:        1.04
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Perl module for resolving POD escape sequences
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Pod-Escapes/
-Source0:     http://www.cpan.org/authors/id/S/SB/SBURKE/Pod-Escapes-1.04.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SB/SBURKE/Pod-Escapes-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -39,7 +36,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -50,12 +47,15 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README
-%{perl_vendorlib}/Pod
+%{perl_vendorlib}/Pod/
 %{_mandir}/man3/*.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 1.04-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.04-2
 - rebuilt
 
 * Sun May  9 2004 Jose Pedro Oliveira  - 0:1.04-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Dec 29 02:31:27 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 21:31:27 -0500
Subject: rpms/perl-TeX-Hyphen/devel perl-TeX-Hyphen.spec,1.6,1.7
Message-ID: <200512290231.jBT2VxPp020311@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-TeX-Hyphen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20294

Modified Files:
	perl-TeX-Hyphen.spec 
Log Message:
Dist tag.


Index: perl-TeX-Hyphen.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-TeX-Hyphen/devel/perl-TeX-Hyphen.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-TeX-Hyphen.spec	6 Apr 2005 22:13:08 -0000	1.6
+++ perl-TeX-Hyphen.spec	29 Dec 2005 02:31:26 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-TeX-Hyphen
 Version:        0.140
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Hyphenate words using TeX's patterns
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/TeX-Hyphen/
-Source0:    http://www.cpan.org/authors/id/J/JA/JANPAZ/TeX-Hyphen-0.140.tar.gz
+Source0:        http://www.cpan.org/authors/id/J/JA/JANPAZ/TeX-Hyphen-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -37,7 +34,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -53,7 +50,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.140-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.140-2
 - rebuilt
 
 * Fri Jun 11 2004 Jose Pedro Oliveira  - 0:0.140-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Dec 29 02:36:20 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 21:36:20 -0500
Subject: rpms/perl-Tie-IxHash/devel perl-Tie-IxHash.spec,1.6,1.7
Message-ID: <200512290236.jBT2arp2020395@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Tie-IxHash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20374

Modified Files:
	perl-Tie-IxHash.spec 
Log Message:
Dist tag.


Index: perl-Tie-IxHash.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Tie-IxHash/devel/perl-Tie-IxHash.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Tie-IxHash.spec	6 Apr 2005 22:13:09 -0000	1.6
+++ perl-Tie-IxHash.spec	29 Dec 2005 02:36:20 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Tie-IxHash
 Version:        1.21
-Release:        3
-
+Release:        4%{?dist}
 Summary:        Ordered associative arrays for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Tie-IxHash/
-Source0:     http://www.cpan.org/authors/id/G/GS/GSAR/Tie-IxHash-1.21.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GS/GSAR/Tie-IxHash-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -42,7 +39,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -53,12 +50,15 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorlib}/Tie
+%{perl_vendorlib}/Tie/
 %{_mandir}/man3/*.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 1.21-4
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.21-3
 - rebuilt
 
 * Sun May  9 2004 Jose Pedro Oliveira  - 0:1.21-0.fdr.2



From fedora-extras-commits at redhat.com  Thu Dec 29 02:40:47 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 28 Dec 2005 21:40:47 -0500
Subject: rpms/perl-Sub-Uplevel/devel perl-Sub-Uplevel.spec,1.4,1.5
Message-ID: <200512290241.jBT2fKpF020477@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20452

Modified Files:
	perl-Sub-Uplevel.spec 
Log Message:
Dist tag.


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/perl-Sub-Uplevel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Sub-Uplevel.spec	6 Apr 2005 22:13:08 -0000	1.4
+++ perl-Sub-Uplevel.spec	29 Dec 2005 02:40:47 -0000	1.5
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Sub-Uplevel
 Version:        0.09
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Run a perl function in an upper stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Sub-Uplevel/
-Source0:   http://www.cpan.org/authors/id/M/MS/MSCHWERN/Sub-Uplevel-0.09.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/MS/MSCHWERN/Sub-Uplevel-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -39,7 +36,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -55,7 +52,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Thu Dec 29 2005 Jose Pedro Oliveira  - 0.09-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 0.09-2
 - rebuilt
 
 * Thu Jul  8 2004 Jose Pedro Oliveira  - 0.09-1



From fedora-extras-commits at redhat.com  Thu Dec 29 04:24:11 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 28 Dec 2005 23:24:11 -0500
Subject: rpms/python-setuptools/FC-4 - New directory
Message-ID: <200512290424.jBT4ODt5024378@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24370/FC-4

Log Message:
Directory /cvs/extras/rpms/python-setuptools/FC-4 added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 29 04:24:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 28 Dec 2005 23:24:59 -0500
Subject: rpms/python-setuptools/FC-4 .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512290425.jBT4P1og024412@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24400/FC-4

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of branch FC-4 of python-setuptools


--- NEW 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 Dec 29 05:12:05 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 29 Dec 2005 00:12:05 -0500
Subject: rpms/python-setuptools import.log,1.2,1.3
Message-ID: <200512290513.jBT5D0gg026217@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26171

Modified Files:
	import.log 
Log Message:
auto-import python-setuptools-0.6a8-1.fc4 on branch FC-4 from python-setuptools-0.6a8-1.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	27 Dec 2005 11:38:50 -0000	1.2
+++ import.log	29 Dec 2005 05:12:04 -0000	1.3
@@ -1 +1,2 @@
 python-setuptools-0_6a8-1:HEAD:python-setuptools-0.6a8-1.src.rpm:1135683502
+python-setuptools-0_6a8-1_fc4:FC-4:python-setuptools-0.6a8-1.fc4.src.rpm:1135833054



From fedora-extras-commits at redhat.com  Thu Dec 29 05:12:32 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 29 Dec 2005 00:12:32 -0500
Subject: rpms/python-setuptools/FC-4 python-setuptools.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512290513.jBT5D7Qp026221@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26171/FC-4

Modified Files:
	.cvsignore sources 
Added Files:
	python-setuptools.spec 
Log Message:
auto-import python-setuptools-0.6a8-1.fc4 on branch FC-4 from python-setuptools-0.6a8-1.fc4.src.rpm


--- NEW FILE python-setuptools.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-setuptools
Version:        0.6a8
Release:        1%{?dist}
Summary:        Download, build, install, upgrade, and uninstall Python packages

Group:          Development/Languages
License:        PSFL/ZPL
URL:            http://peak.telecommunity.com/DevCenter/setuptools
Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       python-abi = %{pyver}

%description
setuptools is a collection of enhancements to the Python distutils that allow
you to more easily build and distribute Python packages, especially ones that
have dependencies on other packages.

%prep
%setup -q -n setuptools-%{version}
sed -i '1s@#!python@#!/usr/bin/python@' easy_install.py

%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
find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; -print | while read file ; do sed -i '1d' $file ; done
#find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; | while read file ; do grep -q '^#!' $file && sed -i '1d' $file ; done
echo "setuptools-%{version}-py%{pyver}.egg" > $RPM_BUILD_ROOT%{python_sitelib}/setuptools.pth

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc api_tests.txt EasyInstall.txt pkg_resources.txt setuptools.txt
%{_bindir}/*
%{python_sitelib}/setuptools.pth
%{python_sitelib}/setuptools-%{version}-py%{pyver}.egg

%changelog
* Sat Dec 24 2005 Ignacio Vazquez-Abrams  0.6a8-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Dec 2005 04:24:58 -0000	1.1
+++ .cvsignore	29 Dec 2005 05:12:31 -0000	1.2
@@ -0,0 +1 @@
+setuptools-0.6a8.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Dec 2005 04:24:58 -0000	1.1
+++ sources	29 Dec 2005 05:12:31 -0000	1.2
@@ -0,0 +1 @@
+3eecdf66c1a2cf8a6556bc00b69d572a  setuptools-0.6a8.zip



From fedora-extras-commits at redhat.com  Thu Dec 29 05:40:08 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 29 Dec 2005 00:40:08 -0500
Subject: rpms/python-setuptools/FC-4 branch,NONE,1.1
Message-ID: <200512290540.jBT5eAk3026388@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26378

Added Files:
	branch 
Log Message:
Whoops


--- NEW FILE branch ---
FC-4



From fedora-extras-commits at redhat.com  Thu Dec 29 07:00:59 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 29 Dec 2005 02:00:59 -0500
Subject: rpms/python-formencode/FC-4 .cvsignore, 1.2,
	1.3 python-formencode.spec, 1.3, 1.4 sources, 1.2,
	1.3 python-formencode-setup.patch, 1.1, NONE
Message-ID: <200512290701.jBT71Vu7030005@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-formencode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28375/FC-4

Modified Files:
	.cvsignore python-formencode.spec sources 
Removed Files:
	python-formencode-setup.patch 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Oct 2005 09:33:55 -0000	1.2
+++ .cvsignore	29 Dec 2005 07:00:59 -0000	1.3
@@ -1 +1 @@
-FormEncode-0.2.2.tar.gz
+FormEncode-0.4.tar.gz


Index: python-formencode.spec
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/FC-4/python-formencode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-formencode.spec	23 Oct 2005 20:18:43 -0000	1.3
+++ python-formencode.spec	29 Dec 2005 07:00:59 -0000	1.4
@@ -1,20 +1,21 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-formencode
-Version:        0.2.2
-Release:        3%{?dist}
+Version:        0.4
+Release:        1%{?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  
-Patch0:         python-formencode-setup.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+BuildRequires:  python-setuptools
+Requires:       python-abi = %{pyver}
 
 
 %description
@@ -24,8 +25,6 @@
 
 %prep
 %setup -q -n FormEncode-%{version}
-rm -rf ez_setup
-%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -34,6 +33,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
 
 
 %clean
@@ -43,21 +43,13 @@
 %files
 %defattr(-,root,root,-)
 %doc PKG-INFO docs
-
-%dir %{python_sitelib}/formencode
-%{python_sitelib}/formencode/*.py
-%{python_sitelib}/formencode/*.pyc
-%ghost %{python_sitelib}/formencode/*.pyo
-
-%dir %{python_sitelib}/formencode/util
-%{python_sitelib}/formencode/util/*.py
-%{python_sitelib}/formencode/util/*.pyc
-%ghost %{python_sitelib}/formencode/util/*.pyo
-
-%dir %{python_sitelib}/formencode/javascript
-%{python_sitelib}/formencode/javascript/*.js
+%{python_sitelib}/FormEncode.pth
+%{python_sitelib}/FormEncode-%{version}-py%{pyver}.egg
 
 %changelog
+* Thu Dec 29 2005 Ignacio Vazquez-Abrams  0.4-1
+- Upstream update
+
 * Sun Oct 23 2005 Oliver Andrich  0.2.2-3
 - fixed some minor packaging issues
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Oct 2005 09:33:55 -0000	1.2
+++ sources	29 Dec 2005 07:00:59 -0000	1.3
@@ -1 +1 @@
-56bb04a6ce9a3dcb187b3db6091ec5d9  FormEncode-0.2.2.tar.gz
+797852a19505f7d919db96dd994d0484  FormEncode-0.4.tar.gz


--- python-formencode-setup.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec 29 07:01:05 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 29 Dec 2005 02:01:05 -0500
Subject: rpms/python-formencode/devel .cvsignore, 1.2,
	1.3 python-formencode.spec, 1.3, 1.4 sources, 1.2,
	1.3 python-formencode-setup.patch, 1.1, NONE
Message-ID: <200512290701.jBT71sIo030022@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-formencode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28375/devel

Modified Files:
	.cvsignore python-formencode.spec sources 
Removed Files:
	python-formencode-setup.patch 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Oct 2005 09:33:55 -0000	1.2
+++ .cvsignore	29 Dec 2005 07:01:04 -0000	1.3
@@ -1 +1 @@
-FormEncode-0.2.2.tar.gz
+FormEncode-0.4.tar.gz


Index: python-formencode.spec
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/devel/python-formencode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-formencode.spec	23 Oct 2005 20:18:44 -0000	1.3
+++ python-formencode.spec	29 Dec 2005 07:01:04 -0000	1.4
@@ -1,20 +1,21 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-formencode
-Version:        0.2.2
-Release:        3%{?dist}
+Version:        0.4
+Release:        1%{?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  
-Patch0:         python-formencode-setup.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+BuildRequires:  python-setuptools
+Requires:       python-abi = %{pyver}
 
 
 %description
@@ -24,8 +25,6 @@
 
 %prep
 %setup -q -n FormEncode-%{version}
-rm -rf ez_setup
-%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -34,6 +33,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
 
 
 %clean
@@ -43,21 +43,13 @@
 %files
 %defattr(-,root,root,-)
 %doc PKG-INFO docs
-
-%dir %{python_sitelib}/formencode
-%{python_sitelib}/formencode/*.py
-%{python_sitelib}/formencode/*.pyc
-%ghost %{python_sitelib}/formencode/*.pyo
-
-%dir %{python_sitelib}/formencode/util
-%{python_sitelib}/formencode/util/*.py
-%{python_sitelib}/formencode/util/*.pyc
-%ghost %{python_sitelib}/formencode/util/*.pyo
-
-%dir %{python_sitelib}/formencode/javascript
-%{python_sitelib}/formencode/javascript/*.js
+%{python_sitelib}/FormEncode.pth
+%{python_sitelib}/FormEncode-%{version}-py%{pyver}.egg
 
 %changelog
+* Thu Dec 29 2005 Ignacio Vazquez-Abrams  0.4-1
+- Upstream update
+
 * Sun Oct 23 2005 Oliver Andrich  0.2.2-3
 - fixed some minor packaging issues
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Oct 2005 09:33:55 -0000	1.2
+++ sources	29 Dec 2005 07:01:04 -0000	1.3
@@ -1 +1 @@
-56bb04a6ce9a3dcb187b3db6091ec5d9  FormEncode-0.2.2.tar.gz
+797852a19505f7d919db96dd994d0484  FormEncode-0.4.tar.gz


--- python-formencode-setup.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Dec 29 12:53:36 2005
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 29 Dec 2005 07:53:36 -0500
Subject: owners owners.list,1.487,1.488
Message-ID: <200512291254.jBTCs839007490@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5530

Modified Files:
	owners.list 
Log Message:
Added myself to CC for a few orphaned packages.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -r1.487 -r1.488
--- owners.list	28 Dec 2005 23:15:09 -0000	1.487
+++ owners.list	29 Dec 2005 12:53:35 -0000	1.488
@@ -45,7 +45,7 @@
 Fedora Extras|atlas|Automatically Tuned Linear Algebra Software|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|autossh|Utility to autorestart SSH tunnels|kaboom at oobleck.net|extras-qa at fedoraproject.org|
-Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|awstats|Advanced Web Statistics|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|banner|Prints a short string to the console in very large letters|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
@@ -352,7 +352,7 @@
 Fedora Extras|gtkwave|Waveform viewer|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|gtorrentviewer|A GTK2-based viewer and editor for BitTorrent meta files|paul at city-fan.org|extras-qa at fedoraproject.org|
-Fedora Extras|gtranslator|A gettext po file editor for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtranslator|A gettext po file editor for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gurlchecker|A GNOME link validity checker|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gv|A X front-end for the Ghostscript PostScript(TM) interpreter|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -1152,8 +1152,8 @@
 Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|system-config-control|Centralized tool for Fedora configuration utilities|ankit644 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|system-switch-im|A utility for switching default IIIMF to XIM servers|llch at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|t1lib|PostScript Type 1 font rasterizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|t1lib|PostScript Type 1 font rasterizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|taarich|Display Hebrew date|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
@@ -1199,7 +1199,7 @@
 Fedora Extras|tpctl|IBM ThinkPad configuration tools|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|treecc|Tree Compiler Compiler|compton at pcompton.com|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|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|tuxpaint|Drawing program designed for young children|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|tuxtype2|Tux Typing is an educational typing tutor for children|steve at silug.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 29 12:56:24 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 29 Dec 2005 07:56:24 -0500
Subject: rpms/pam_usb - New directory
Message-ID: <200512291256.jBTCuQ5X007567@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/pam_usb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7559/pam_usb

Log Message:
Directory /cvs/extras/rpms/pam_usb added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 29 12:56:30 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 29 Dec 2005 07:56:30 -0500
Subject: rpms/pam_usb/devel - New directory
Message-ID: <200512291256.jBTCuWQh007582@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/pam_usb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7559/pam_usb/devel

Log Message:
Directory /cvs/extras/rpms/pam_usb/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 29 12:56:49 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 29 Dec 2005 07:56:49 -0500
Subject: rpms/pam_usb Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512291256.jBTCupHU007620@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/pam_usb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7608

Added Files:
	Makefile import.log 
Log Message:
Setup of module pam_usb


--- NEW FILE Makefile ---
# Top level Makefile for module pam_usb
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 29 12:56:55 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 29 Dec 2005 07:56:55 -0500
Subject: rpms/pam_usb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512291256.jBTCuviL007640@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/pam_usb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7608/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pam_usb


--- NEW 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 Dec 29 12:57:58 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 29 Dec 2005 07:57:58 -0500
Subject: rpms/pam_usb import.log,1.1,1.2
Message-ID: <200512291258.jBTCwUci007750@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/pam_usb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7706

Modified Files:
	import.log 
Log Message:
auto-import pam_usb-0.3.3-2 on branch devel from pam_usb-0.3.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pam_usb/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Dec 2005 12:56:49 -0000	1.1
+++ import.log	29 Dec 2005 12:57:58 -0000	1.2
@@ -0,0 +1 @@
+pam_usb-0_3_3-2:HEAD:pam_usb-0.3.3-2.src.rpm:1135861068



From fedora-extras-commits at redhat.com  Thu Dec 29 12:58:04 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 29 Dec 2005 07:58:04 -0500
Subject: rpms/pam_usb/devel pam_usb-0.3.3-Makefile.patch, NONE,
	1.1 pam_usb-options.html, NONE, 1.1 pam_usb-pam.d-gdm.example,
	NONE, 1.1 pam_usb-pam.d-login.example, NONE,
	1.1 pam_usb-quickstart.html, NONE, 1.1 pam_usb.spec, NONE,
	1.1 pam_usb.udev, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512291258.jBTCwajw007754@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/pam_usb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7706/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pam_usb-0.3.3-Makefile.patch pam_usb-options.html 
	pam_usb-pam.d-gdm.example pam_usb-pam.d-login.example 
	pam_usb-quickstart.html pam_usb.spec pam_usb.udev 
Log Message:
auto-import pam_usb-0.3.3-2 on branch devel from pam_usb-0.3.3-2.src.rpm

pam_usb-0.3.3-Makefile.patch:

--- NEW FILE pam_usb-0.3.3-Makefile.patch ---
diff -Nrbu pam_usb-0.3.3/src/Makefile pam_usb-0.3.3-OK/src/Makefile
--- pam_usb-0.3.3/src/Makefile	2005-10-18 19:03:33.000000000 +0400
+++ pam_usb-0.3.3-OK/src/Makefile	2005-12-20 14:48:19.000000000 +0300
@@ -4,7 +4,8 @@
 SO		:= pam_usb.so
 SOURCES		:= $(wildcard *.c)
 OBJS		:= $(patsubst %.c,%.o,$(SOURCES))
-PAM_MODULES	:= $(DESTDIR)/lib/security
+LIB		:= lib
+PAM_MODULES	:= $(DESTDIR)/$(LIB)/security
 
 all: $(SO)
 
@@ -18,7 +19,8 @@
 	rm -f $(OBJS) $(SO)
 
 install: all
-	install -m644 $(SO) $(PAM_MODULES)
+	install -d $(PAM_MODULES)
+	install -m755 $(SO) $(PAM_MODULES)
 
 deinstall:
 	rm -f $(PAM_MODULES)/$(SO)
diff -Nrbu pam_usb-0.3.3/tools/usbadm/Makefile pam_usb-0.3.3-OK/tools/usbadm/Makefile
--- pam_usb-0.3.3/tools/usbadm/Makefile	2005-10-18 19:03:33.000000000 +0400
+++ pam_usb-0.3.3-OK/tools/usbadm/Makefile	2005-12-20 14:49:21.000000000 +0300
@@ -19,7 +19,9 @@
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 install: all
+	install -d $(DEST)
 	install -m755 $(BIN) $(DEST)
+	install -d $(MANDIR)/man1
 	install usbadm.1.gz $(MANDIR)/man1/
 
 deinstall:
diff -Nrbu pam_usb-0.3.3/tools/usbhotplug/Makefile pam_usb-0.3.3-OK/tools/usbhotplug/Makefile
--- pam_usb-0.3.3/tools/usbhotplug/Makefile	2005-10-18 19:03:33.000000000 +0400
+++ pam_usb-0.3.3-OK/tools/usbhotplug/Makefile	2005-12-20 14:50:34.000000000 +0300
@@ -21,12 +21,14 @@
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 install: all
+	install -d $(DEST)
 	install -m755 $(BIN) $(DEST)
 	install -d $(HOTPLUGDIR)/
 	install -m755 files/pamusb.hotplug $(HOTPLUGDIR)/
 	install -d $(PAMUSBCONF)/handlers/
 	install -m644 files/hotplug.conf $(PAMUSBCONF)/
 	install -m755 files/xlock.sh $(PAMUSBCONF)/handlers/
+	install -d $(PAMDIR)/usbhotplug
 	install -m644 files/usbhotplug.pam $(PAMDIR)/usbhotplug
 
 deinstall:


--- NEW FILE pam_usb-options.html ---


As third argument of a pam.d file, it's possible to specify some
arguments.
    
The following is a list of recognized options:
    

    

    

    
name
type
description
default value
    


    
mntpoint

string

Tells pam_usb the form of the temporary directory. XXXXXX (6 times) will be replaced by a temporary value.

 /tmp/pam_usbXXXXXX

    


    
proc_basename

string

the device's procfile. You usually don't have to change this, it's where pam_usb searches for devices.

/proc/scsi/usb-storage-%d/%d

    


    
pwfile

string

The path pam_usb will search for public and private keys (~user/ and mntpoint/)

 /.auth/

    


    
pubkey

string

The name of the public key located in the user's home

 id_pub

    


    
snfile

string

the serial number file contains the allowed SN. If it doesn't exists, the default behaviour is to grant everything.

 /etc/pam_usb/serials.conf

    


    
fs

string

comma-separated list of filesystems used to mount the device

 ext2,vfat

    


    
utmp

string

location of the utmp file

/var/run/utmp
 
    
 

    
mount_opts

string

comma-separated list of mount options (including: ro,bind,sync,remount,nosuid,noexec,nodev)


 
    


    
log_file

string

print debug messages to that file instead of stdout


 
    
 

    
local_consoles

string

comma-separated list of consoles which be able to login when allow_remote=-1

 /dev/vc/,/dev/tty,:
 
    


    
direct_open

boolean

Attempt to open the private key using O_DIRECT to avoid disk caching: will
work only on devices that support this feature.

    

 
    
 local_hosts
 
 string
 
 comma-separated list of hosts that will be able to login when allow_remote=-1
 
  :
  
    
  
 

    
force_device

string

Using this option, you can force pam_usb to use a specified device. If 
it fails mounting, it'll switch back to auto guess mode



    


    
allow_remote

boolean

When set to false (!allow_remote) it will allow only local_hosts and 
local_consoles to login.

 false
 
    
 

    
check_device

boolean

If unset (!check_device), pam_usb will not check neither if the device is 
attached, nor 
its serial number.

true

    


    
check_if_mounted

boolean

if the usb device is already mounted pam_usb will use its mountpoint (avoid using it)

 false

    


    
keep_mounted

boolean

When set to true, it'll keep mntpoint mounted. Useful if combined
with check_if_mounted.

 false
 
    
 


    
sign_times

integer

Number of times pam_usb will do the sign/check challenge.

 3

    


    
debug

boolean

enable debug mode

 false

    

    

    
Boolean variables can be set true by putting them as is (e.g. option), and to false by adding ! in front of them (e.g. !option).

    

    
The syntax is of the name=value form for string and integer options,
for example the following will
tell pam_usb to use either ext3 or reiserfs as filesystem, to enable
debug mode, to disable device checking and that the serial number file
is located at /etc/serials:
    

    auth    requisite       pam_usb.so      fs=ext3,reiserfs debug !check_device snfile=/etc/serials

    

    


    
        Copyright ? 2003,2004 Andrea Luzzardi <scox at gentoo.org>          

    
  


--- NEW FILE pam_usb-pam.d-gdm.example ---
#%PAM-1.0
auth       sufficient	pam_usb.so check_if_mounted mount_opts=ro allow_remote
auth       required	pam_env.so
auth       required	pam_stack.so service=system-auth
auth       required	pam_nologin.so
account    required	pam_stack.so service=system-auth
password   required	pam_stack.so service=system-auth
session    required	pam_stack.so service=system-auth
session    optional     pam_console.so


--- NEW FILE pam_usb-pam.d-login.example ---
#%PAM-1.0
auth       sufficient	pam_usb.so check_if_mounted mount_opts=ro quiet
auth       required	pam_securetty.so
auth       required	pam_stack.so service=system-auth
auth       required	pam_nologin.so
account    required	pam_stack.so service=system-auth
password   required	pam_stack.so service=system-auth
session    required	pam_stack.so service=system-auth
session    optional	pam_console.so


--- NEW FILE pam_usb-quickstart.html ---




    
Installing pam_usb
    

    % tar -zxvf pam_usb-VERSION.tar.gz
% cd pam_usb-VERSION
% make
# make install

    
Replace VERSION with the version number you downloaded.
    
This will unpack, compile and install the pam_usb module and its 
tools usbadm and usbhotplug.
    


    Setup
    

Now pam_usb can be enabled for your login applications.
    
A list of applications using PAM is avaible at /etc/pam.d/
(you may want to edit /etc/pam.d/login, and /etc/pam.d/xdm).
    
pam_usb can work in 3 different modes:

    Unique: You can login using your USB pen, if it's
not present, it isn't possible to login.

    
This mode can be enabled by commenting the line auth required 
pam_unix.so (by adding a # at the beginning of the line), and add
the following line:
    

    auth       required        pam_usb.so

    

    

    Alternative: Plugging in the USB device is enough to
login.
If it's not present, the system prompts for password.
    
To use such, add the following line before the auth required 
pam_unix.so line:
    

    auth       sufficient      pam_usb.so

    

    

    Additional: To login, you have to put the USB device and type
your password.
    
If you want to use this mode, add the following line before the auth 
required pam_unix.so line:
    

    auth       required        pam_usb.so

    

    

Please note that the /etc/pam.d/ directory name, and the pam_unix.so 
module name are mostly the same in every distro, but could be different 
(mandrake uses pam_stack.so instead of pam_unix.so).
    
For a first usage, you should use a alternative mode, and enable the
debug mode.
    
More info are avaible at the PAM 
documentation website.
    


    Workarounds
    

    2.6 kernel
    

    As the proc format has changed, a workaround is avaible to 
use it under a 2.6 kernel.
    
Add the !check_device option 
in order to make it work.
    

    Non USB-Storage devices
    

    
Since the 0.2_rc2 version, it is possible to use a floppy, a cdrom or 
another mountable device.
To use a floppy add the following options:
    
!check_device !check_if_mounted force_device=/dev/fd0
    
Replace /dev/fd0 by the device you're using, as /dev/cdrom if you want 
to store your private key on such support.
    
CD-ROMs mounting will require to be read-only. To do so, add the option mount_opts=ro.

    

    

    Key setup
    


    Now that we told PAM to use pam_usb for authentication, we have to create a 
couple of private and public keys that will be used for authentication.
We will use the fresh installed usbadm tool:

First you have to mount the USB device on your favourite mountpoint.
- If you didn't create a mountpoint for the usb pen then do so :

# mkdir /mnt/usb

Replace /mnt/usb with any other inexistent directory (or leave it alone).
- Mount the usb pen:

# mount /dev/sda1 /mnt/usb

Replace /dev/sda1 and /mnt/usb with the correct device name and mountpoint.
If you don't have any clue of what your device entry is, just plug the pen 
and type dmesg. Usually, if you don't have any SCSI device it should be 
/dev/sda1. Use an empty directory for mountpoint (the one you just created, 
for example).

Ok, now the device is mounted and we can access it's content via /mnt/usb
- Now we can create a couple of private/public keys by using the usbadm tool:
The syntax is the following: usbadm keygen <mntpoint> <user> <bits>

For example this will generate a private and public key for the user root using 
a pair of 2048 bits DSA keys.


# usbadm keygen /mnt/usb root 1024
[!] Directory /root/.auth/ not found, creating one...
[!] Directory /mnt/usb/.auth/ not found, creating one...
[!] Generating 1024 DSA key pair for root at host
[!] Extracting private key...
[+] Private key extracted.
[+] Private key successfully written.
[!] Writing public key...
[+] Public key successfully written.

That's it. This will check the directories needed by pam_usb, generate, extract 
and write private/public keys for the chosen user for the local host.

You can try with any configured application, like login or GDM.
For a first test, you may want to use su as you can test it without switching to 
a console.



    

    

    
        Copyright ? 2003,2004 Andrea Luzzardi <scox at gentoo.org>          
      
    
    
  


--- NEW FILE pam_usb.spec ---
Name:	pam_usb
Summary: PAM module for use with DSA key pairs and removable devices
Version: 0.3.3
Release: 2%{?dist}
License: GPL
Group: System Environment/Base
URL:  http://www.pamusb.org
Source0:  http://dl.sourceforge.net/pamusb/%{name}-%{version}.tar.gz
# lynx -source http://www.pamusb.org/quickstart.html >pam_usb-quickstart.html
Source1:  pam_usb-quickstart.html
# lynx -source http://www.pamusb.org/options.html >pam_usb-options.html
Source2:  pam_usb-options.html
Source3:  pam_usb.udev
Source4:  pam_usb-pam.d-login.example
Source5:  pam_usb-pam.d-gdm.example
Patch0:   pam_usb-0.3.3-Makefile.patch

BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pam-devel, openssl-devel, readline-devel, ncurses-devel


%description
This PAM module provides authentication through DSA private/public keys.
Public keys placed on the target computer, whereas private keys are stored
on some removable device, including USB storages/flash drives, cdroms,
floppies, etc.

Any kind of mountable devices (not removable only) can be used.

Due to using of DSA key pairs, the passwordless authentication can be organized
(if a private key is stored not crypted on the media).


%package hotplug
Summary: Hotplug agent to use with USB flash 
Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
Requires: hotplug

%description hotplug
Hotplug agent to use with USB flash.


%prep
%setup -q
%patch0 -p1

cp -p %{SOURCE1} quickstart.html
cp -p %{SOURCE2} options.html

mkdir pam.d-examples
cp -p %{SOURCE4} pam.d-examples/login
cp -p %{SOURCE5} pam.d-examples/gdm


%build
# Note: we may not overwrite CFLAGS, so use CC instead...
make CC="%__cc $RPM_OPT_FLAGS" LIB=%{_lib} %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install LIB=%{_lib} DESTDIR=$RPM_BUILD_ROOT

#  use new "udev" style instead of obsoleted "hotplug" ...
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d/default/*
install -D -m644 %{SOURCE3} \
	$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-%{name}.rules

pushd $RPM_BUILD_ROOT/etc/pam.d
rm -rf usbhotplug
cat >usbhotplug < - 0.3.3-2
- accepted for Fedora Extras (review by Wart )

* Thu Dec 22 2005 Dmitry Butskoy  - 0.3.3-2
- Use /etc/udev/rules.d instead of /etc/hotplug.d
- Add some pam.d examples (Wart at kobold.org)

* Tue Dec 20 2005 Dmitry Butskoy  - 0.3.3-1
- upgrade to 0.3.3
- always build hotplug package
- add Makefile patch (directory creation, permissions etc.)
- create usbhotplug pam file own way

* Wed Sep  7 2005 Dmitry Butskoy  - 0.3.2-1
- initial release
- copy quckstart.html and options.html from web-site to package
- separate hotplug stuff as an additional package, build it
  when "--with hotplug" is specified only


--- NEW FILE pam_usb.udev ---
ACTION!="add", ACTION!="remove", GOTO="pam_usb_end"
SUBSYSTEM=="usb", ENV{PRODUCT}=="?*",  \
	RUN+="/usr/bin/usbhotplug block"

LABEL="pam_usb_end"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pam_usb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Dec 2005 12:56:55 -0000	1.1
+++ .cvsignore	29 Dec 2005 12:58:04 -0000	1.2
@@ -0,0 +1 @@
+pam_usb-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pam_usb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Dec 2005 12:56:55 -0000	1.1
+++ sources	29 Dec 2005 12:58:04 -0000	1.2
@@ -0,0 +1 @@
+45e73035b706ff6dd20d002210bf0cb3  pam_usb-0.3.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 13:02:24 2005
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Thu, 29 Dec 2005 08:02:24 -0500
Subject: owners owners.list,1.488,1.489
Message-ID: <200512291302.jBTD2v1q009475@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9454

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -r1.488 -r1.489
--- owners.list	29 Dec 2005 12:53:35 -0000	1.488
+++ owners.list	29 Dec 2005 13:02:08 -0000	1.489
@@ -684,6 +684,7 @@
 Fedora Extras|pam_mysql| PAM module for auth UNIX users using MySQL data base|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|pam_pkcs11|PKCS #11 PAM login module|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|pam_ssh|PAM module for use with SSH keys and ssh-agent|pertusus at free.fr|extras-qa at fedoraproject.org|dmitry at butskoy.name
+Fedora Extras|pam_usb|PAM module for use with DSA key pairs and removable devices|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|pan|A GNOME/GTK+ news reader for X|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Dec 29 17:22:14 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 29 Dec 2005 12:22:14 -0500
Subject: rpms/tkcon - New directory
Message-ID: <200512291722.jBTHMGMb017545@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tkcon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17537/tkcon

Log Message:
Directory /cvs/extras/rpms/tkcon added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 29 17:22:19 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 29 Dec 2005 12:22:19 -0500
Subject: rpms/tkcon/devel - New directory
Message-ID: <200512291722.jBTHMLoG017564@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tkcon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17537/tkcon/devel

Log Message:
Directory /cvs/extras/rpms/tkcon/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Dec 29 17:22:31 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 29 Dec 2005 12:22:31 -0500
Subject: rpms/tkcon Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512291722.jBTHMY8b017603@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tkcon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17591

Added Files:
	Makefile import.log 
Log Message:
Setup of module tkcon


--- NEW FILE Makefile ---
# Top level Makefile for module tkcon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 29 17:22:37 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 29 Dec 2005 12:22:37 -0500
Subject: rpms/tkcon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200512291722.jBTHMd6L017623@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tkcon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17591/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tkcon


--- NEW 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 Dec 29 17:22:59 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 29 Dec 2005 12:22:59 -0500
Subject: rpms/tkcon import.log,1.1,1.2
Message-ID: <200512291723.jBTHNVj0017702@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tkcon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17662

Modified Files:
	import.log 
Log Message:
auto-import tkcon-2.4-2 on branch devel from tkcon-2.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tkcon/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Dec 2005 17:22:31 -0000	1.1
+++ import.log	29 Dec 2005 17:22:59 -0000	1.2
@@ -0,0 +1 @@
+tkcon-2_4-2:HEAD:tkcon-2.4-2.src.rpm:1135876975



From fedora-extras-commits at redhat.com  Thu Dec 29 17:23:05 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 29 Dec 2005 12:23:05 -0500
Subject: rpms/tkcon/devel tkcon.desktop, NONE, 1.1 tkcon.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512291723.jBTHNdKA017706@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tkcon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17662/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tkcon.desktop tkcon.spec 
Log Message:
auto-import tkcon-2.4-2 on branch devel from tkcon-2.4-2.src.rpm


--- NEW FILE tkcon.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Tkcon
GenericName=Tkcon
Comment=Tcl console shell
Exec=tkcon
Icon=
Terminal=false
Type=Application
Categories=Application;Programming;Development;
Version=2.4


--- NEW FILE tkcon.spec ---
Name:           tkcon
Version:        2.4
Release:        2%{?dist}
Summary:        Tcl GUI console

Group:		Development/Tools
License:        BSD-like
URL:            http://tkcon.sourceforge.net/
Source0:        http://download.sourceforge.net/tkcon/tkcon-2.4.tar.gz
Source1:        tkcon.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch
BuildRequires: desktop-file-utils
Requires:  tk

%description
tkcon is a replacement for the standard Tk console with many more features.
It works on all platforms where Tcl/Tk is available.
It is meant primarily to aid one when working with the little details
inside tcl and tk, giving Unix users the GUI console provided by default
in the Mac and Windows Tk.

%prep
%setup -q
rm docs/*.txt
mv docs/license.terms .

sed -i 's,\r$,,' release.txt

%install
rm -rf $RPM_BUILD_ROOT
install -pD -m 0755 tkcon.tcl $RPM_BUILD_ROOT/%{_bindir}/tkcon

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/applications/*.desktop
%doc license.terms README.txt release.txt index.html docs

%changelog
* Wed Dec 28 2005 Wart  - 2.4-2
- Better description and installed documentation layout.
* Fri Dec 9 2005 Wart  - 2.4-1
- Initial Fedora spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Dec 2005 17:22:37 -0000	1.1
+++ .cvsignore	29 Dec 2005 17:23:04 -0000	1.2
@@ -0,0 +1 @@
+tkcon-2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Dec 2005 17:22:37 -0000	1.1
+++ sources	29 Dec 2005 17:23:04 -0000	1.2
@@ -0,0 +1 @@
+415905fe3d81aa957f9c4424c219784e  tkcon-2.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Dec 29 17:29:48 2005
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 29 Dec 2005 12:29:48 -0500
Subject: owners owners.list,1.489,1.490
Message-ID: <200512291730.jBTHULws017820@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17803

Modified Files:
	owners.list 
Log Message:
Added tkcon



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -r1.489 -r1.490
--- owners.list	29 Dec 2005 13:02:08 -0000	1.489
+++ owners.list	29 Dec 2005 17:29:48 -0000	1.490
@@ -1189,6 +1189,7 @@
 Fedora Extras|tin|A basic Internet news reader|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|tinyerp|Open Source ERP Client|dan at danny.cz|extras-qa at fedoraproject.org|tcallawa at redhat.com
 Fedora Extras|tiobench|Threaded I/O benchmark|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|tkcon|Tcl console|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Thu Dec 29 21:06:46 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 29 Dec 2005 16:06:46 -0500
Subject: rpms/emelfm2/devel emelfm2.spec,1.5,1.6
Message-ID: <200512292107.jBTL7pF1025034@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/emelfm2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25017

Modified Files:
	emelfm2.spec 
Log Message:
update to 0.1.4


Index: emelfm2.spec
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/devel/emelfm2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emelfm2.spec	21 Nov 2005 19:19:03 -0000	1.5
+++ emelfm2.spec	29 Dec 2005 21:06:19 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           emelfm2
-Version:        0.1.3
-Release:        2%{?dist}
+Version:        0.1.4
+Release:        1%{?dist}
 Summary:        A file manager that implements the popular two-pane design
 
 Group:          Applications/File
@@ -63,6 +63,9 @@
 
 	
 %changelog
+* Thu Dec 29 2005 Christoph Wickert  - 0.1.4-1
+- Update to 0.1.4.
+
 * Mon Nov 21 2005 Christoph Wickert  - 0.1.3-2
 - Removed nonexistant ROADMAP from %doc.
 



From fedora-extras-commits at redhat.com  Thu Dec 29 21:19:31 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 29 Dec 2005 16:19:31 -0500
Subject: rpms/emelfm2/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200512292120.jBTLK35H025147@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/emelfm2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25128

Modified Files:
	.cvsignore sources 
Log Message:
update sources and cvsignore for 0.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2005 18:16:55 -0000	1.3
+++ .cvsignore	29 Dec 2005 21:19:30 -0000	1.4
@@ -1 +1 @@
-emelfm2-0.1.3.tar.gz
+emelfm2-0.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2005 18:16:55 -0000	1.3
+++ sources	29 Dec 2005 21:19:30 -0000	1.4
@@ -1 +1 @@
-0f1412c28211aa4afa66cbd297eb9abd  emelfm2-0.1.3.tar.gz
+da39b1d017366fb41700c5d40365a1ae  emelfm2-0.1.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 30 12:23:25 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 30 Dec 2005 07:23:25 -0500
Subject: rpms/xfce4-xkb-plugin/devel xfce4-xkb-plugin.spec,1.1,1.2
Message-ID: <200512301223.jBUCNwU8021335@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21318

Modified Files:
	xfce4-xkb-plugin.spec 
Log Message:
Changes for modular X: Add libXext-devel and libXpm-devel to builddeps


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-xkb-plugin.spec	16 Dec 2005 22:28:33 -0000	1.1
+++ xfce4-xkb-plugin.spec	30 Dec 2005 12:23:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
 Version:	0.3.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
+BuildRequires:	libXext-devel, libXpm-devel
 
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
@@ -42,6 +43,9 @@
 %{_datadir}/xfce4/xkb/flags/*.png
 
 %changelog
+* Fri Dec 30 2005 Christoph Wickert  - 0.3.2-5
+- Changes for modular X: Add libXext-devel and libXpm-devel BuildReqs.
+
 * Thu Dec 01 2005 Christoph Wickert  - 0.3.2-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Fri Dec 30 13:06:51 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 30 Dec 2005 08:06:51 -0500
Subject: rpms/xfce4-battery-plugin/devel xfce4-battery-plugin.spec,1.1,1.2
Message-ID: <200512301307.jBUD7ixE023126@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23099

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
add libxfcegui4-devel buildreq and fix %defattr


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/xfce4-battery-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-battery-plugin.spec	15 Dec 2005 03:10:03 -0000	1.1
+++ xfce4-battery-plugin.spec	30 Dec 2005 13:06:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-battery-plugin
 Version:	0.3.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -8,9 +8,9 @@
 URL:		http://xfce-goodies.berlios.de/
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
 Source1:	GPL
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.2, libxml2-devel
+BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -34,11 +34,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Fri Dec 30 2005 Christoph Wickert  - 0.3.0-4
+- Add libxfcegui4-devel BuildReqs.
+- Fix %defattr.
+
 * Sat Nov 19 2005 Christoph Wickert  - 0.3.0-3
 - Use %{?_smp_mflags}.
 - Replace wrong BSD license with a copy of the GPL (#173105).



From fedora-extras-commits at redhat.com  Fri Dec 30 13:11:51 2005
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Fri, 30 Dec 2005 08:11:51 -0500
Subject: rpms/cfengine/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 cfengine.spec, 1.13, 1.14
Message-ID: <200512301312.jBUDCNW3023243@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23215

Modified Files:
	.cvsignore sources cfengine.spec 
Log Message:
update to upstream 2.1.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Oct 2005 12:54:09 -0000	1.8
+++ .cvsignore	30 Dec 2005 13:11:50 -0000	1.9
@@ -1,5 +1,4 @@
-cfengine-2.1.16.tar.gz
-cfengine-2.1.16-CAN-2005-2960.patch
+cfengine-2.1.18.tar.gz
 cfenvd
 cfexecd
 cfservd


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Oct 2005 12:54:09 -0000	1.8
+++ sources	30 Dec 2005 13:11:50 -0000	1.9
@@ -1,5 +1,4 @@
-1b009dcc2ab27c205e72b536c67ae173  cfengine-2.1.16.tar.gz
-2e8f500862bcf1b94f8108f258e39297  cfengine-2.1.16-CAN-2005-2960.patch
+7703780f987facc537cf239b04d2b2e8  cfengine-2.1.18.tar.gz
 37c565f98d2b252c9c6cf1c88d654e02  cfenvd
 19f07f0d576abf8bf8cb875ab6ad66c6  cfexecd
 fe6c086a41f428d47bde30646e0310c4  cfservd


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cfengine.spec	13 Nov 2005 10:47:36 -0000	1.13
+++ cfengine.spec	30 Dec 2005 13:11:50 -0000	1.14
@@ -1,14 +1,13 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 2.1.16
-Release: 3%{?dist}
+Version: 2.1.18
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.16.tar.gz
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.18.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
-Patch1: cfengine-2.1.16-CAN-2005-2960.patch
 URL: http://www.cfengine.org/
 BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel
 Requires(post): /sbin/chkconfig, /sbin/install-info
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 
 %build
@@ -120,6 +118,9 @@
 
 
 %changelog
+* Fri Dec 30 2005 Jeff Sheltren  - 2.1.18-1
+- Update to upstream 2.1.18
+
 * Mon Oct 17 2005 Jeff Sheltren  - 2.1.16-2
 - Patch insecure temp file, CAN-2005-2960 (#170896)
 



From fedora-extras-commits at redhat.com  Fri Dec 30 13:12:56 2005
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Fri, 30 Dec 2005 08:12:56 -0500
Subject: rpms/cfengine/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 cfengine.spec, 1.12, 1.13
Message-ID: <200512301313.jBUDDTP2023274@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23249

Modified Files:
	.cvsignore sources cfengine.spec 
Log Message:
update to upstream 2.1.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Oct 2005 12:57:36 -0000	1.8
+++ .cvsignore	30 Dec 2005 13:12:56 -0000	1.9
@@ -1,5 +1,4 @@
-cfengine-2.1.16.tar.gz
-cfengine-2.1.16-CAN-2005-2960.patch
+cfengine-2.1.18.tar.gz
 cfenvd
 cfexecd
 cfservd


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Oct 2005 12:57:36 -0000	1.8
+++ sources	30 Dec 2005 13:12:56 -0000	1.9
@@ -1,5 +1,4 @@
-1b009dcc2ab27c205e72b536c67ae173  cfengine-2.1.16.tar.gz
-2e8f500862bcf1b94f8108f258e39297  cfengine-2.1.16-CAN-2005-2960.patch
+7703780f987facc537cf239b04d2b2e8  cfengine-2.1.18.tar.gz
 37c565f98d2b252c9c6cf1c88d654e02  cfenvd
 19f07f0d576abf8bf8cb875ab6ad66c6  cfexecd
 fe6c086a41f428d47bde30646e0310c4  cfservd


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-4/cfengine.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cfengine.spec	18 Oct 2005 12:57:36 -0000	1.12
+++ cfengine.spec	30 Dec 2005 13:12:56 -0000	1.13
@@ -1,14 +1,13 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 2.1.16
-Release: 2%{?dist}
+Version: 2.1.18
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.16.tar.gz
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.18.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
-Patch1: cfengine-2.1.16-CAN-2005-2960.patch
 URL: http://www.cfengine.org/
 BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel
 Requires(post): /sbin/chkconfig, /sbin/install-info
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 
 %build
@@ -120,6 +118,9 @@
 
 
 %changelog
+* Fri Dec 30 2005 Jeff Sheltren  - 2.1.18-1
+- Update to upstream 2.1.18
+
 * Mon Oct 17 2005 Jeff Sheltren  - 2.1.16-2
 - Patch insecure temp file, CAN-2005-2960 (#170896)
 



From fedora-extras-commits at redhat.com  Fri Dec 30 13:13:38 2005
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Fri, 30 Dec 2005 08:13:38 -0500
Subject: rpms/cfengine/FC-3 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 cfengine.spec, 1.11, 1.12
Message-ID: <200512301314.jBUDEBmd023303@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23280

Modified Files:
	.cvsignore sources cfengine.spec 
Log Message:
update to upstream 2.1.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	18 Oct 2005 12:59:43 -0000	1.9
+++ .cvsignore	30 Dec 2005 13:13:38 -0000	1.10
@@ -1,5 +1,4 @@
-cfengine-2.1.16.tar.gz
-cfengine-2.1.16-CAN-2005-2960.patch
+cfengine-2.1.18.tar.gz
 cfenvd
 cfexecd
 cfservd


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	18 Oct 2005 12:59:43 -0000	1.9
+++ sources	30 Dec 2005 13:13:38 -0000	1.10
@@ -1,5 +1,4 @@
-1b009dcc2ab27c205e72b536c67ae173  cfengine-2.1.16.tar.gz
-2e8f500862bcf1b94f8108f258e39297  cfengine-2.1.16-CAN-2005-2960.patch
+7703780f987facc537cf239b04d2b2e8  cfengine-2.1.18.tar.gz
 37c565f98d2b252c9c6cf1c88d654e02  cfenvd
 19f07f0d576abf8bf8cb875ab6ad66c6  cfexecd
 fe6c086a41f428d47bde30646e0310c4  cfservd


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/cfengine.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cfengine.spec	18 Oct 2005 12:59:43 -0000	1.11
+++ cfengine.spec	30 Dec 2005 13:13:38 -0000	1.12
@@ -1,14 +1,13 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 2.1.16
-Release: 2%{?dist}
+Version: 2.1.18
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.16.tar.gz
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.18.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
-Patch1: cfengine-2.1.16-CAN-2005-2960.patch
 URL: http://www.cfengine.org/
 BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel
 Requires(post): /sbin/chkconfig, /sbin/install-info
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 
 %build
@@ -120,6 +118,9 @@
 
 
 %changelog
+* Fri Dec 30 2005 Jeff Sheltren  - 2.1.18-1
+- Update to upstream 2.1.18
+
 * Mon Oct 17 2005 Jeff Sheltren  - 2.1.16-2
 - Patch insecure temp file, CAN-2005-2960 (#170896)
 



From fedora-extras-commits at redhat.com  Fri Dec 30 13:45:26 2005
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 30 Dec 2005 08:45:26 -0500
Subject: rpms/xfce4-modemlights-plugin/devel xfce4-modemlights-plugin.spec,
	1.1, 1.2
Message-ID: <200512301345.jBUDjwuh023558@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23541

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
change for modular X: add libX11-devel buildreq


Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/devel/xfce4-modemlights-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-modemlights-plugin.spec	15 Dec 2005 03:49:55 -0000	1.1
+++ xfce4-modemlights-plugin.spec	30 Dec 2005 13:45:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-modemlights-plugin
 Version: 	0.1.1
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Modemlights for the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
+BuildRequires:	libX11-devel
 
 %description
 A Xfce4 panel applet intended to simplify establishing a ppp connection via 
@@ -38,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Fri Dec 30 2005 Christoph Wickert  - 0.1.1-4
+- Add libX11-devel BuildReqs for modular X.
+
 * Thu Dec 01 2005 Christoph Wickert  - 0.1.1-3
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Fri Dec 30 16:25:25 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:25:25 -0500
Subject: rpms/perl-Config-Tiny/FC-3 .cvsignore, 1.4,
	1.5 perl-Config-Tiny.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200512301625.jBUGPwrY029206@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29141/FC-3

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.03.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Jun 2005 15:28:00 -0000	1.4
+++ .cvsignore	30 Dec 2005 16:25:25 -0000	1.5
@@ -1 +1 @@
-Config-Tiny-2.02.tar.gz
+Config-Tiny-2.03.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-3/perl-Config-Tiny.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Config-Tiny.spec	27 Jun 2005 15:28:00 -0000	1.6
+++ perl-Config-Tiny.spec	30 Dec 2005 16:25:25 -0000	1.7
@@ -1,19 +1,17 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Config-Tiny
-Version:        2.02
+Version:        2.03
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Config-Tiny/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.02.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(Test::More), perl(Test::Pod)
+BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -39,7 +37,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -50,14 +48,20 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
-%{perl_vendorlib}/Config
+%{perl_vendorlib}/Config/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 2.03-1
+- Updated to 2.03.
+
 * Mon Jun 27 2005 Jose Pedro Oliveira  - 2.02-1
 - Updated to 2.02.
 
+* Fri Apr  7 2005 Michael Schwendt  - 2.01-2
+- rebuilt
+
 * Thu Mar 24 2005 Jose Pedro Oliveira  - 2.01-1
 - Updated to 2.01.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Jun 2005 15:28:00 -0000	1.4
+++ sources	30 Dec 2005 16:25:25 -0000	1.5
@@ -1 +1 @@
-b5adfbf8561a4be3c898eb236ad3af01  Config-Tiny-2.02.tar.gz
+14b7c75fec38fd59fdf6390093946d7d  Config-Tiny-2.03.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 30 16:25:32 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:25:32 -0500
Subject: rpms/perl-Config-Tiny/FC-4 .cvsignore, 1.4,
	1.5 perl-Config-Tiny.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <200512301626.jBUGQ4Oh029211@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29141/FC-4

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.03.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Jun 2005 15:28:00 -0000	1.4
+++ .cvsignore	30 Dec 2005 16:25:31 -0000	1.5
@@ -1 +1 @@
-Config-Tiny-2.02.tar.gz
+Config-Tiny-2.03.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/perl-Config-Tiny.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Config-Tiny.spec	27 Jun 2005 15:28:00 -0000	1.8
+++ perl-Config-Tiny.spec	30 Dec 2005 16:25:31 -0000	1.9
@@ -1,17 +1,17 @@
 Name:           perl-Config-Tiny
-Version:        2.02
+Version:        2.03
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Config-Tiny/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.02.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(Test::More), perl(Test::Pod)
+BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -37,7 +37,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -48,11 +48,14 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
-%{perl_vendorlib}/Config
+%{perl_vendorlib}/Config/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 2.03-1
+- Updated to 2.03.
+
 * Mon Jun 27 2005 Jose Pedro Oliveira  - 2.02-1
 - Updated to 2.02.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Jun 2005 15:28:00 -0000	1.4
+++ sources	30 Dec 2005 16:25:31 -0000	1.5
@@ -1 +1 @@
-b5adfbf8561a4be3c898eb236ad3af01  Config-Tiny-2.02.tar.gz
+14b7c75fec38fd59fdf6390093946d7d  Config-Tiny-2.03.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 30 16:25:37 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:25:37 -0500
Subject: rpms/perl-Config-Tiny/devel .cvsignore, 1.4,
	1.5 perl-Config-Tiny.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <200512301626.jBUGQAvw029216@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29141/devel

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.03.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Jun 2005 15:28:06 -0000	1.4
+++ .cvsignore	30 Dec 2005 16:25:37 -0000	1.5
@@ -1 +1 @@
-Config-Tiny-2.02.tar.gz
+Config-Tiny-2.03.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Config-Tiny.spec	27 Jun 2005 15:28:06 -0000	1.8
+++ perl-Config-Tiny.spec	30 Dec 2005 16:25:37 -0000	1.9
@@ -1,17 +1,17 @@
 Name:           perl-Config-Tiny
-Version:        2.02
+Version:        2.03
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Config-Tiny/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.02.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(Test::More), perl(Test::Pod)
+BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -37,7 +37,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -48,11 +48,14 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
-%{perl_vendorlib}/Config
+%{perl_vendorlib}/Config/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 2.03-1
+- Updated to 2.03.
+
 * Mon Jun 27 2005 Jose Pedro Oliveira  - 2.02-1
 - Updated to 2.02.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Jun 2005 15:28:06 -0000	1.4
+++ sources	30 Dec 2005 16:25:37 -0000	1.5
@@ -1 +1 @@
-b5adfbf8561a4be3c898eb236ad3af01  Config-Tiny-2.02.tar.gz
+14b7c75fec38fd59fdf6390093946d7d  Config-Tiny-2.03.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 30 16:33:14 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:33:14 -0500
Subject: rpms/perl-Image-Size/devel perl-Image-Size.spec,1.6,1.7
Message-ID: <200512301633.jBUGXlEY029416@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Image-Size/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29399

Modified Files:
	perl-Image-Size.spec 
Log Message:
Dist tag.


Index: perl-Image-Size.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Size/devel/perl-Image-Size.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Image-Size.spec	6 Apr 2005 22:13:06 -0000	1.6
+++ perl-Image-Size.spec	30 Dec 2005 16:33:14 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Image-Size
 Version:        2.992
-Release:        3
-
+Release:        4%{?dist}
 Summary:        Determine the size of images in several common formats in Perl
 
 Group:          Development/Libraries
 License:        Artistic
 URL:            http://search.cpan.org/dist/Image-Size/
-Source0:      http://www.cpan.org/authors/id/R/RJ/RJRAY/Image-Size-2.992.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RJ/RJRAY/Image-Size-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -45,7 +42,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -63,7 +60,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 2.992-4
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 2.992-3
 - rebuilt
 
 * Thu Jun  3 2004 Jose Pedro Oliveira  - 0:2.992-0.fdr.2



From fedora-extras-commits at redhat.com  Fri Dec 30 16:34:35 2005
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 30 Dec 2005 11:34:35 -0500
Subject: rpms/Inventor/devel Inventor.spec,1.29,1.30
Message-ID: <200512301635.jBUGZ8Xg029477@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29460

Modified Files:
	Inventor.spec 
Log Message:
Don't BR: libXau-devel (#176313 reported to be fixed)


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Inventor.spec	28 Dec 2005 18:12:31 -0000	1.29
+++ Inventor.spec	30 Dec 2005 16:34:35 -0000	1.30
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        18%{?dist}
+Release:        19%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -37,8 +37,6 @@
 
 BuildRequires:  libGLU-devel
 BuildRequires:	libGLw-devel
-# Work around to xorg-x11-proto-devel missing to require X11/Xauth.h
-BuildRequires:	libXau-devel
 # FIXME: Why is libXi required?
 BuildRequires: 	libXi-devel
 
@@ -300,6 +298,9 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Fri Dec 30 2005 Ralf Cors??pius  - 2.1.5-19
+- Don't BR: libXau-devel (#176313 reported to be fixed).
+
 * Wed Dec 28 2005 Ralf Cors??pius  - 2.1.5-18
 - Remove patch10 (#173879, #175251 are reported to be fixed).
 



From fedora-extras-commits at redhat.com  Fri Dec 30 16:40:17 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:40:17 -0500
Subject: rpms/perl-Image-Base/devel perl-Image-Base.spec,1.6,1.7
Message-ID: <200512301640.jBUGenUh029551@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Image-Base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29531

Modified Files:
	perl-Image-Base.spec 
Log Message:
Dist tag.


Index: perl-Image-Base.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Base/devel/perl-Image-Base.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Image-Base.spec	6 Apr 2005 22:13:06 -0000	1.6
+++ perl-Image-Base.spec	30 Dec 2005 16:40:17 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Image-Base
 Version:        1.07
-Release:        4
-
+Release:        5%{?dist}
 Summary:        Base class for loading, manipulating and saving images in Perl
 
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://search.cpan.org/dist/Image-Base/
-Source0:      http://www.cpan.org/authors/id/S/SU/SUMMER/Image-Base-1.07.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SU/SUMMER/Image-Base-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -37,7 +34,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -53,7 +50,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 1.07-5
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.07-4
 - rebuilt
 
 * Thu Jun  3 2004 Jose Pedro Oliveira  - 0:1.07-0.fdr.3



From fedora-extras-commits at redhat.com  Fri Dec 30 16:48:00 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:48:00 -0500
Subject: rpms/perl-MLDBM/devel perl-MLDBM.spec,1.4,1.5
Message-ID: <200512301648.jBUGmWtK029651@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-MLDBM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29634

Modified Files:
	perl-MLDBM.spec 
Log Message:
Dist tag.


Index: perl-MLDBM.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MLDBM/devel/perl-MLDBM.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-MLDBM.spec	6 Apr 2005 22:13:06 -0000	1.4
+++ perl-MLDBM.spec	30 Dec 2005 16:48:00 -0000	1.5
@@ -1,20 +1,17 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-MLDBM
 Version:        2.01
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Store multi-level hash structure in single level tied hash
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/MLDBM/
-Source0:        http://www.cpan.org/authors/id/C/CH/CHAMAS/MLDBM-2.01.tar.gz
+Source0:        http://www.cpan.org/authors/id/C/CH/CHAMAS/MLDBM-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(FreezeThaw), perl(Storable)
+BuildRequires:  perl(FreezeThaw)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -41,7 +38,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -57,7 +54,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 2.01-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 2.01-2
 - rebuilt
 
 * Sun Oct 31 2004 Jose Pedro Oliveira  - 0:2.01-0.fdr.1



From fedora-extras-commits at redhat.com  Fri Dec 30 16:54:27 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:54:27 -0500
Subject: rpms/perl-Image-Xbm/devel perl-Image-Xbm.spec,1.6,1.7
Message-ID: <200512301654.jBUGsxFb029782@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Image-Xbm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29754

Modified Files:
	perl-Image-Xbm.spec 
Log Message:
Dist tag.


Index: perl-Image-Xbm.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Xbm/devel/perl-Image-Xbm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Image-Xbm.spec	6 Apr 2005 22:13:06 -0000	1.6
+++ perl-Image-Xbm.spec	30 Dec 2005 16:54:27 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Image-Xbm
 Version:        1.08
-Release:        3
-
+Release:        4%{?dist}
 Summary:        Load, create, manipulate and save xbm image files in Perl
 
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://search.cpan.org/dist/Image-Xbm/
-Source0:       http://www.cpan.org/authors/id/S/SU/SUMMER/Image-Xbm-1.08.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SU/SUMMER/Image-Xbm-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -40,7 +37,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -56,7 +53,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 1.08-4
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.08-3
 - rebuilt
 
 * Thu Jun  3 2004 Jose Pedro Oliveira  - 0:1.08-0.fdr.2



From fedora-extras-commits at redhat.com  Fri Dec 30 16:57:14 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 30 Dec 2005 11:57:14 -0500
Subject: rpms/perl-Image-Xpm/devel perl-Image-Xpm.spec,1.6,1.7
Message-ID: <200512301657.jBUGvkDV029907@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Image-Xpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29890

Modified Files:
	perl-Image-Xpm.spec 
Log Message:
Dist tag.


Index: perl-Image-Xpm.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Xpm/devel/perl-Image-Xpm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Image-Xpm.spec	6 Apr 2005 22:13:06 -0000	1.6
+++ perl-Image-Xpm.spec	30 Dec 2005 16:57:13 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Image-Xpm
 Version:        1.09
-Release:        3
-
+Release:        4%{?dist}
 Summary:        Load, create, manipulate and save xpm image files in Perl
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://search.cpan.org/dist/Image-Xpm/
-Source0:       http://www.cpan.org/authors/id/S/SU/SUMMER/Image-Xpm-1.09.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SU/SUMMER/Image-Xpm-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -40,7 +37,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -56,7 +53,10 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt 
+* Fri Dec 30 2005 Jose Pedro Oliveira  - 1.09-4
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt  - 1.09-3
 - rebuilt
 
 * Thu Jun  3 2004 Jose Pedro Oliveira  - 0:1.09-0.fdr.2



From fedora-extras-commits at redhat.com  Fri Dec 30 17:24:07 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 30 Dec 2005 12:24:07 -0500
Subject: owners owners.list,1.490,1.491
Message-ID: <200512301724.jBUHOePv031728@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31711

Modified Files:
	owners.list 
Log Message:
bochs, freedroidrpg, and gpa are now more than potentially unmaintained.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -r1.490 -r1.491
--- owners.list	29 Dec 2005 17:29:48 -0000	1.490
+++ owners.list	30 Dec 2005 17:24:07 -0000	1.491
@@ -69,7 +69,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|ville.skytta at iki.fi|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|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|
@@ -218,7 +218,7 @@
 Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|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|
@@ -316,7 +316,7 @@
 Fedora Extras|gonvert|Units conversion utility|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gossip|Gnome Jabber Client|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gourmet|PyGTK Recipe Manager|mpeters at mac.com|extras-qa at fedoraproject.org|
-Fedora Extras|gpa|Graphical user interface for GnuPG|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gpa|Graphical user interface for GnuPG|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gparted|Gnome Partition Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gperiodic|Program for browsing the periodic table|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at ausil.us|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Dec 30 17:32:59 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 30 Dec 2005 12:32:59 -0500
Subject: fedora-rpmdevtools fedora-rpmdevtools.spec,1.84,1.85
Message-ID: <200512301733.jBUHXTxe031779@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31761

Modified Files:
	fedora-rpmdevtools.spec 
Log Message:
* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
- Update spectool to 1.0.6 (#176521).



Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- fedora-rpmdevtools.spec	28 Dec 2005 19:19:56 -0000	1.84
+++ fedora-rpmdevtools.spec	30 Dec 2005 17:32:57 -0000	1.85
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.5
+%define spectool_version   1.0.6
 
 Name:           fedora-rpmdevtools
-Version:        1.3
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Fedora RPM Development Tools
 
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
+- Update spectool to 1.0.6 (#176521).
+
 * Wed Dec 28 2005 Ville Skytt?? 
 - Update spectool to 1.0.5 (#162253), require wget for it.
 - Add disttags to spec templates.



From fedora-extras-commits at redhat.com  Fri Dec 30 17:47:21 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 30 Dec 2005 12:47:21 -0500
Subject: rpms/fedora-rpmdevtools/FC-4 .cvsignore, 1.10,
	1.11 fedora-rpmdevtools.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <200512301747.jBUHlrIT031894@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fedora-rpmdevtools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31856/FC-4

Modified Files:
	.cvsignore fedora-rpmdevtools.spec sources 
Log Message:
* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
- Update spectool to 1.0.6 (#176521).

* Wed Dec 28 2005 Ville Skytt?? 
- Update spectool to 1.0.5 (#162253), require wget for it.
- Add disttags to spec templates.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Oct 2005 21:24:23 -0000	1.10
+++ .cvsignore	30 Dec 2005 17:47:21 -0000	1.11
@@ -1,2 +1,2 @@
-spectool-1.0.4.tar.bz2
-fedora-rpmdevtools-1.3.tar.bz2
+spectool-1.0.6.tar.bz2
+fedora-rpmdevtools-1.4.tar.bz2


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/fedora-rpmdevtools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fedora-rpmdevtools.spec	26 Oct 2005 21:24:23 -0000	1.13
+++ fedora-rpmdevtools.spec	30 Dec 2005 17:47:21 -0000	1.14
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.4
+%define spectool_version   1.0.6
 
 Name:           fedora-rpmdevtools
-Version:        1.3
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Fedora RPM Development Tools
 
@@ -20,7 +20,7 @@
 Provides:       spectool = %{spectool_version}
 Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
-Requires:       rpm-python, python, cpio, sed, perl
+Requires:       rpm-python, python, cpio, sed, perl, wget
 # Minimal RPM build requirements
 Requires:       rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch
 Requires:       diffutils, gzip, bzip2, unzip
@@ -127,6 +127,13 @@
 
 
 %changelog
+* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
+- Update spectool to 1.0.6 (#176521).
+
+* Wed Dec 28 2005 Ville Skytt?? 
+- Update spectool to 1.0.5 (#162253), require wget for it.
+- Add disttags to spec templates.
+
 * Thu Oct 27 2005 Ville Skytt??  - 1.3-1
 - check-rpaths-worker: detect when RPATH references the parent directory
   of an absolute path (#169298, Enrico Scholz).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Oct 2005 21:24:23 -0000	1.10
+++ sources	30 Dec 2005 17:47:21 -0000	1.11
@@ -1,2 +1,2 @@
-f88484ff2a2d83f0cc1d37bc71300f7a  spectool-1.0.4.tar.bz2
-07a4788dc9abb36f273cfa3f7f21a97c  fedora-rpmdevtools-1.3.tar.bz2
+9a12bd585ba3911e34da861edc7557da  spectool-1.0.6.tar.bz2
+27d6ae54bc2db4d836fdd443842cd3fe  fedora-rpmdevtools-1.4.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec 30 17:47:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 30 Dec 2005 12:47:27 -0500
Subject: rpms/fedora-rpmdevtools/devel .cvsignore, 1.10,
	1.11 fedora-rpmdevtools.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <200512301747.jBUHlxG3031899@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fedora-rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31856/devel

Modified Files:
	.cvsignore fedora-rpmdevtools.spec sources 
Log Message:
* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
- Update spectool to 1.0.6 (#176521).

* Wed Dec 28 2005 Ville Skytt?? 
- Update spectool to 1.0.5 (#162253), require wget for it.
- Add disttags to spec templates.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Oct 2005 21:24:24 -0000	1.10
+++ .cvsignore	30 Dec 2005 17:47:27 -0000	1.11
@@ -1,2 +1,2 @@
-spectool-1.0.4.tar.bz2
-fedora-rpmdevtools-1.3.tar.bz2
+spectool-1.0.6.tar.bz2
+fedora-rpmdevtools-1.4.tar.bz2


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fedora-rpmdevtools.spec	26 Oct 2005 21:24:24 -0000	1.13
+++ fedora-rpmdevtools.spec	30 Dec 2005 17:47:27 -0000	1.14
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.4
+%define spectool_version   1.0.6
 
 Name:           fedora-rpmdevtools
-Version:        1.3
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Fedora RPM Development Tools
 
@@ -20,7 +20,7 @@
 Provides:       spectool = %{spectool_version}
 Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
-Requires:       rpm-python, python, cpio, sed, perl
+Requires:       rpm-python, python, cpio, sed, perl, wget
 # Minimal RPM build requirements
 Requires:       rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch
 Requires:       diffutils, gzip, bzip2, unzip
@@ -127,6 +127,13 @@
 
 
 %changelog
+* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
+- Update spectool to 1.0.6 (#176521).
+
+* Wed Dec 28 2005 Ville Skytt?? 
+- Update spectool to 1.0.5 (#162253), require wget for it.
+- Add disttags to spec templates.
+
 * Thu Oct 27 2005 Ville Skytt??  - 1.3-1
 - check-rpaths-worker: detect when RPATH references the parent directory
   of an absolute path (#169298, Enrico Scholz).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Oct 2005 21:24:24 -0000	1.10
+++ sources	30 Dec 2005 17:47:27 -0000	1.11
@@ -1,2 +1,2 @@
-f88484ff2a2d83f0cc1d37bc71300f7a  spectool-1.0.4.tar.bz2
-07a4788dc9abb36f273cfa3f7f21a97c  fedora-rpmdevtools-1.3.tar.bz2
+9a12bd585ba3911e34da861edc7557da  spectool-1.0.6.tar.bz2
+27d6ae54bc2db4d836fdd443842cd3fe  fedora-rpmdevtools-1.4.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec 30 17:53:20 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 30 Dec 2005 12:53:20 -0500
Subject: rpms/xchat-gnome/devel xchat-gnome-certificates.patch, NONE,
	1.1 xchat-gnome.spec, 1.10, 1.11
Message-ID: <200512301753.jBUHrqoh031959@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31925

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-gnome-certificates.patch 
Log Message:
* Fri Dec 30 2005 Brian Pepple  - 0.8-2
- add patch for self-signed certificate acceptance. (#174591)


xchat-gnome-certificates.patch:

--- NEW FILE xchat-gnome-certificates.patch ---
Index: src/fe-gnome/irc-network.c
===================================================================
--- src/fe-gnome/irc-network.c	(r??vision 9974)
+++ src/fe-gnome/irc-network.c	(copie de travail)
@@ -126,6 +126,7 @@
 	n->name        = g_strdup (net->name);
 	n->autoconnect = net->flags & FLAG_AUTO_CONNECT;
 	n->use_ssl     = net->flags & FLAG_USE_SSL;
+	n->allow_invalid = net->flags & FLAG_ALLOW_INVALID;
 	n->cycle       = net->flags & FLAG_CYCLE;
 
 	for (s1 = net->servlist; s1; s1 = g_slist_next (s1)) {
@@ -185,6 +186,7 @@
 
 	if (network->autoconnect) flags |= FLAG_AUTO_CONNECT;
 	if (network->use_ssl)     flags |= FLAG_USE_SSL;
+	if (network->allow_invalid) flags |= FLAG_ALLOW_INVALID;
 	if (network->cycle)       flags |= FLAG_CYCLE;
 	if (network->use_global)  flags |= FLAG_USE_GLOBAL;
 	net->flags = flags;
Index: src/fe-gnome/irc-network.h
===================================================================
--- src/fe-gnome/irc-network.h	(r??vision 9974)
+++ src/fe-gnome/irc-network.h	(copie de travail)
@@ -44,6 +44,7 @@
 	gchar *name;
 	gboolean autoconnect;
 	gboolean use_ssl;
+	gboolean allow_invalid;
 	gboolean cycle;
 	gboolean reconnect;
 	gboolean nogiveup_reconnect;
Index: src/fe-gnome/irc-network-editor.c
===================================================================
--- src/fe-gnome/irc-network-editor.c	(r??vision 9974)
+++ src/fe-gnome/irc-network-editor.c	(copie de travail)
@@ -233,6 +233,7 @@
 
 	GW(autoconnect);
 	GW(use_ssl);
+	GW(allow_invalid);
 	GW(cycle);
 
 	GW(nickserv_password);
@@ -399,6 +400,7 @@
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (e->autoconnect),      e->network->autoconnect);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (e->use_ssl),          e->network->use_ssl);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (e->allow_invalid),    e->network->allow_invalid);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (e->cycle),            e->network->cycle);
 
 	if (e->network->use_global) {
@@ -468,6 +470,7 @@
 
 	net->autoconnect        = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->autoconnect));
 	net->use_ssl            = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->use_ssl));
+	net->allow_invalid      = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->allow_invalid));
 	net->cycle              = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->cycle));
 	net->use_global         = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->use_globals));
 	net->encoding           = gtk_combo_box_get_active (GTK_COMBO_BOX (e->encoding));
Index: src/fe-gnome/irc-network-editor.h
===================================================================
--- src/fe-gnome/irc-network-editor.h	(r??vision 9974)
+++ src/fe-gnome/irc-network-editor.h	(copie de travail)
@@ -51,6 +51,7 @@
 
 	GtkWidget *autoconnect;
 	GtkWidget *use_ssl;
+	GtkWidget *allow_invalid;
 	GtkWidget *cycle;
 
 	GtkWidget *password;
Index: data/irc-network-editor.glade
===================================================================
--- data/irc-network-editor.glade	(r??vision 9974)
+++ data/irc-network-editor.glade	(copie de travail)
@@ -243,6 +243,25 @@
 		      
 
 		      
+			
+			  True
+			  True
+			  Accept _invalid SSL certificate
+			  True
+			  GTK_RELIEF_NORMAL
+			  True
+			  False
+			  False
+			  True
+			
+			
+			  0
+			  False
+			  False
+			
+		      
+
+		      
 			
 			  True
 			  True


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xchat-gnome.spec	20 Dec 2005 21:16:11 -0000	1.10
+++ xchat-gnome.spec	30 Dec 2005 17:53:20 -0000	1.11
@@ -6,7 +6,7 @@
 
 Name:           xchat-gnome
 Version:        0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -14,6 +14,7 @@
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-config.patch
+Patch1:		%{name}-certificates.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -51,6 +52,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
+%patch1 -p0 -b .certificates
 
 
 %build
@@ -132,10 +134,13 @@
 
 
 %changelog
+* Fri Dec 30 2005 Brian Pepple  - 0.8-2
+- add patch for self-signed certificate acceptance. (#174591)
+
 * Tue Dec 20 2005 Brian Pepple  - 0.8-1
 - Udate to 0.8.
 
-* Sun Dec 18 2005 Brian Pepple  - 0.8-01.rc1
+* Sun Dec 18 2005 Brian Pepple  - 0.8-01.rc2
 - Update to 0.8rc2.
 
 * Thu Dec 15 2005 Brian Pepple  - 0.8-01.rc1



From fedora-extras-commits at redhat.com  Fri Dec 30 17:54:39 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 30 Dec 2005 12:54:39 -0500
Subject: rpms/fedora-rpmdevtools/FC-3 .cvsignore, 1.9,
	1.10 fedora-rpmdevtools.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <200512301755.jBUHtBoJ032050@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/fedora-rpmdevtools/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32016/FC-3

Modified Files:
	.cvsignore fedora-rpmdevtools.spec sources 
Log Message:
* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
- Update spectool to 1.0.6 (#176521).

* Wed Dec 28 2005 Ville Skytt?? 
- Update spectool to 1.0.5 (#162253), require wget for it.
- Add disttags to spec templates.

* Thu Oct 27 2005 Ville Skytt??  - 1.3-1
- check-rpaths-worker: detect when RPATH references the parent directory
  of an absolute path (#169298, Enrico Scholz).
- Add regression test for check-rpaths* (#169298, Enrico Scholz).
- Honor user's indent-tabs-mode setting in fedora-init.el (#170902).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Oct 2005 17:58:41 -0000	1.9
+++ .cvsignore	30 Dec 2005 17:54:39 -0000	1.10
@@ -1,2 +1,2 @@
-fedora-rpmdevtools-1.2.tar.bz2
-spectool-1.0.4.tar.bz2
+spectool-1.0.6.tar.bz2
+fedora-rpmdevtools-1.4.tar.bz2


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/fedora-rpmdevtools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-rpmdevtools.spec	7 Oct 2005 17:58:41 -0000	1.9
+++ fedora-rpmdevtools.spec	30 Dec 2005 17:54:39 -0000	1.10
@@ -1,9 +1,9 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.4
+%define spectool_version   1.0.6
 
 Name:           fedora-rpmdevtools
-Version:        1.2
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Fedora RPM Development Tools
 
@@ -20,7 +20,7 @@
 Provides:       spectool = %{spectool_version}
 Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
-Requires:       rpm-python, python, cpio, sed, perl
+Requires:       rpm-python, python, cpio, sed, perl, wget
 # Minimal RPM build requirements
 Requires:       rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch
 Requires:       diffutils, gzip, bzip2, unzip
@@ -91,8 +91,9 @@
 install -pm 644 rmdevelrpms.conf $RPM_BUILD_ROOT%{_sysconfdir}/fedora
 
 
-%check || :
+%check
 env PATH="$RPM_BUILD_ROOT%{_bindir}:$PATH" sh test/fedora-kmodhelper-test.sh
+/bin/bash test/rpathtest.sh
 
 
 %clean
@@ -126,6 +127,19 @@
 
 
 %changelog
+* Fri Dec 30 2005 Ville Skytt??  - 1.4-1
+- Update spectool to 1.0.6 (#176521).
+
+* Wed Dec 28 2005 Ville Skytt?? 
+- Update spectool to 1.0.5 (#162253), require wget for it.
+- Add disttags to spec templates.
+
+* Thu Oct 27 2005 Ville Skytt??  - 1.3-1
+- check-rpaths-worker: detect when RPATH references the parent directory
+  of an absolute path (#169298, Enrico Scholz).
+- Add regression test for check-rpaths* (#169298, Enrico Scholz).
+- Honor user's indent-tabs-mode setting in fedora-init.el (#170902).
+
 * Fri Oct  7 2005 Ville Skytt??  - 1.2-1
 - check-buildroot: grep for buildroot as a fixed string, not a regexp.
 - Update FSF's address in copyright notices.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Oct 2005 17:58:41 -0000	1.9
+++ sources	30 Dec 2005 17:54:39 -0000	1.10
@@ -1,2 +1,2 @@
-81129d10b7f5bbc86b44db5a8070dc6e  fedora-rpmdevtools-1.2.tar.bz2
-f88484ff2a2d83f0cc1d37bc71300f7a  spectool-1.0.4.tar.bz2
+9a12bd585ba3911e34da861edc7557da  spectool-1.0.6.tar.bz2
+27d6ae54bc2db4d836fdd443842cd3fe  fedora-rpmdevtools-1.4.tar.bz2



From fedora-extras-commits at redhat.com  Fri Dec 30 19:59:44 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Fri, 30 Dec 2005 14:59:44 -0500
Subject: rpms/abiword/FC-4 abiword.spec,1.17,1.18
Message-ID: <200512302000.jBUK0G9O003259@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3242

Modified Files:
	abiword.spec 
Log Message:
Expand BuildRequires for plugins




Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- abiword.spec	9 Nov 2005 11:06:49 -0000	1.17
+++ abiword.spec	30 Dec 2005 19:59:44 -0000	1.18
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -27,6 +27,8 @@
 BuildRequires: libgnomeprintui22-devel
 
 # some plugin build deps
+BuildRequires: bzip2-devel
+BuildRequires: poppler-devel >= 0.4.0
 BuildRequires: ots-devel >= 0.4.2
 BuildRequires: libwpd-devel >= 0.8.0
 BuildRequires: librsvg2-devel
@@ -138,6 +140,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Fri Dec 30 2005 Marc Maurer  - 1:2.4.1-4.fc4
+- Add BuildRequires bzip2-devel and poppler-devel for plugins
+
 * Wed Nov 09 2005 Marc Maurer  - 1:2.4.1-3.fc4
 - Fix bug 171928
 



From fedora-extras-commits at redhat.com  Fri Dec 30 20:33:45 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Fri, 30 Dec 2005 15:33:45 -0500
Subject: rpms/abiword/FC-3 abiword.spec,1.29,1.30
Message-ID: <200512302034.jBUKYHqZ005047@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5025

Modified Files:
	abiword.spec 
Log Message:
Expand BuildRequires for plugins




Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/abiword.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- abiword.spec	9 Nov 2005 11:08:51 -0000	1.29
+++ abiword.spec	30 Dec 2005 20:33:44 -0000	1.30
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -27,6 +27,7 @@
 BuildRequires: libgnomeprintui22-devel
 
 # some plugin build deps
+BuildRequires: bzip2-devel
 BuildRequires: ots-devel >= 0.4.2
 BuildRequires: libwpd-devel >= 0.8.0
 BuildRequires: librsvg2-devel
@@ -138,6 +139,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Fri Dec 30 2005 Marc Maurer  - 1:2.4.1-7.fc3
+- Add BuildRequires bzip2-devel for plugins
+
 * Wed Nov 09 2005 Marc Maurer  - 1:2.4.1-6.fc3
 - Fix bug 171928
 



From fedora-extras-commits at redhat.com  Fri Dec 30 21:31:51 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Fri, 30 Dec 2005 16:31:51 -0500
Subject: rpms/abiword/FC-3 abiword.spec,1.30,1.31
Message-ID: <200512302132.jBULWNsm007002@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6981

Modified Files:
	abiword.spec 
Log Message:
Add readline-devel requirement for the AbiCommand plugin




Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/abiword.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- abiword.spec	30 Dec 2005 20:33:44 -0000	1.30
+++ abiword.spec	30 Dec 2005 21:31:50 -0000	1.31
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -27,6 +27,7 @@
 BuildRequires: libgnomeprintui22-devel
 
 # some plugin build deps
+BuildRequires: readline-devel
 BuildRequires: bzip2-devel
 BuildRequires: ots-devel >= 0.4.2
 BuildRequires: libwpd-devel >= 0.8.0
@@ -139,6 +140,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Fri Dec 30 2005 Marc Maurer  - 1:2.4.1-8.fc3
+- Add BuildRequires readline-devel for the AbiCommand plugin
+
 * Fri Dec 30 2005 Marc Maurer  - 1:2.4.1-7.fc3
 - Add BuildRequires bzip2-devel for plugins
 



From fedora-extras-commits at redhat.com  Fri Dec 30 21:32:37 2005
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Fri, 30 Dec 2005 16:32:37 -0500
Subject: rpms/abiword/FC-4 abiword.spec,1.18,1.19
Message-ID: <200512302133.jBULX9aR007054@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7001

Modified Files:
	abiword.spec 
Log Message:
Add readline-devel requirement for the AbiCommand plugin




Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- abiword.spec	30 Dec 2005 19:59:44 -0000	1.18
+++ abiword.spec	30 Dec 2005 21:32:37 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -27,6 +27,7 @@
 BuildRequires: libgnomeprintui22-devel
 
 # some plugin build deps
+BuildRequires: readline-devel
 BuildRequires: bzip2-devel
 BuildRequires: poppler-devel >= 0.4.0
 BuildRequires: ots-devel >= 0.4.2
@@ -140,6 +141,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Fri Dec 30 2005 Marc Maurer  - 1:2.4.1-5.fc4
+- Add BuildRequires readline-devel for the AbiCommand plugin
+
 * Fri Dec 30 2005 Marc Maurer  - 1:2.4.1-4.fc4
 - Add BuildRequires bzip2-devel and poppler-devel for plugins
 



From fedora-extras-commits at redhat.com  Fri Dec 30 22:59:03 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 17:59:03 -0500
Subject: rpms/alltray - New directory
Message-ID: <200512302259.jBUMx5En008906@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8898/alltray

Log Message:
Directory /cvs/extras/rpms/alltray added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 30 22:59:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 17:59:09 -0500
Subject: rpms/alltray/devel - New directory
Message-ID: <200512302259.jBUMxBIk008921@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8898/alltray/devel

Log Message:
Directory /cvs/extras/rpms/alltray/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 30 22:59:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 17:59:33 -0500
Subject: rpms/alltray Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512302259.jBUMxZNA008955@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8943

Added Files:
	Makefile import.log 
Log Message:
Setup of module alltray


--- NEW FILE Makefile ---
# Top level Makefile for module alltray
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Dec 30 22:59:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 17:59:39 -0500
Subject: rpms/alltray/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200512302259.jBUMxfX1008975@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8943/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module alltray


--- NEW 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 Dec 30 23:02:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 18:02:30 -0500
Subject: rpms/alltray import.log,1.1,1.2
Message-ID: <200512302303.jBUN32ZK010656@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10622

Modified Files:
	import.log 
Log Message:
auto-import alltray-0.65-1 on branch devel from alltray-0.65-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/alltray/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Dec 2005 22:59:33 -0000	1.1
+++ import.log	30 Dec 2005 23:02:30 -0000	1.2
@@ -0,0 +1 @@
+alltray-0_65-1:HEAD:alltray-0.65-1.src.rpm:1135983703



From fedora-extras-commits at redhat.com  Fri Dec 30 23:02:37 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 18:02:37 -0500
Subject: rpms/alltray/devel alltray.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512302303.jBUN3U4b010660@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10622/devel

Modified Files:
	.cvsignore sources 
Added Files:
	alltray.spec 
Log Message:
auto-import alltray-0.65-1 on branch devel from alltray-0.65-1.src.rpm


--- NEW FILE alltray.spec ---
Name:           alltray
Version:        0.65
Release:        1
Summary:        Dock any application in the tray

Group:          User Interface/Desktops
License:        GPL
URL:            http://alltray.sourceforge.net/
Source0:        http://dl.sourceforge.net/alltray/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel desktop-file-utils
#Requires:       

%description
With AllTray you can dock any application without a native tray icon into the
system tray. It works well with GNOME, KDE, XFCE 4, Fluxbox, and WindowMaker.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
rm $RPM_BUILD_ROOT%{_libdir}/*.so*
desktop-file-install --vendor=fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category Utility \
  --add-category GTK \
  --delete-original \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_mandir}/man1/%{name}.1*
%{_datadir}/pixmaps/%{name}.png

%changelog
* Thu Dec 23 2005 Ignacio Vazquez-Abrams  0.65-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Dec 2005 22:59:38 -0000	1.1
+++ .cvsignore	30 Dec 2005 23:02:37 -0000	1.2
@@ -0,0 +1 @@
+alltray-0.65.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Dec 2005 22:59:38 -0000	1.1
+++ sources	30 Dec 2005 23:02:37 -0000	1.2
@@ -0,0 +1 @@
+c3b86dab94dbea416174d6e4dd82a173  alltray-0.65.tar.gz



From fedora-extras-commits at redhat.com  Fri Dec 30 23:47:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 18:47:30 -0500
Subject: rpms/alltray/devel alltray.spec,1.1,1.2
Message-ID: <200512302348.jBUNm3b8010843@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10826

Modified Files:
	alltray.spec 
Log Message:
disttag


Index: alltray.spec
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/alltray.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alltray.spec	30 Dec 2005 23:02:37 -0000	1.1
+++ alltray.spec	30 Dec 2005 23:47:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           alltray
 Version:        0.65
-Release:        1
+Release:        1%{?dist}
 Summary:        Dock any application in the tray
 
 Group:          User Interface/Desktops



From fedora-extras-commits at redhat.com  Fri Dec 30 23:55:46 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 18:55:46 -0500
Subject: rpms/alltray/FC-4 - New directory
Message-ID: <200512302355.jBUNtncQ010934@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10926/FC-4

Log Message:
Directory /cvs/extras/rpms/alltray/FC-4 added to the repository




From fedora-extras-commits at redhat.com  Fri Dec 30 23:56:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 18:56:09 -0500
Subject: rpms/alltray/FC-4 .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 branch, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512302356.jBUNuBj4010969@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10956/FC-4

Added Files:
	.cvsignore Makefile branch sources 
Log Message:
Setup of branch FC-4 of alltray


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE branch ---
FC-4


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Dec 30 23:57:05 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 18:57:05 -0500
Subject: rpms/alltray import.log,1.2,1.3
Message-ID: <200512302357.jBUNvdLd011038@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11004

Modified Files:
	import.log 
Log Message:
auto-import alltray-0.65-1.fc4 on branch FC-4 from alltray-0.65-1.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/alltray/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	30 Dec 2005 23:02:30 -0000	1.2
+++ import.log	30 Dec 2005 23:57:05 -0000	1.3
@@ -1 +1,2 @@
 alltray-0_65-1:HEAD:alltray-0.65-1.src.rpm:1135983703
+alltray-0_65-1_fc4:FC-4:alltray-0.65-1.fc4.src.rpm:1135987007



From fedora-extras-commits at redhat.com  Fri Dec 30 23:57:11 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 18:57:11 -0500
Subject: rpms/alltray/FC-4 alltray.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200512302357.jBUNviqg011042@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11004/FC-4

Modified Files:
	.cvsignore sources 
Added Files:
	alltray.spec 
Log Message:
auto-import alltray-0.65-1.fc4 on branch FC-4 from alltray-0.65-1.fc4.src.rpm


--- NEW FILE alltray.spec ---
Name:           alltray
Version:        0.65
Release:        1%{?dist}
Summary:        Dock any application in the tray

Group:          User Interface/Desktops
License:        GPL
URL:            http://alltray.sourceforge.net/
Source0:        http://dl.sourceforge.net/alltray/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel desktop-file-utils
#Requires:       

%description
With AllTray you can dock any application without a native tray icon into the
system tray. It works well with GNOME, KDE, XFCE 4, Fluxbox, and WindowMaker.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
rm $RPM_BUILD_ROOT%{_libdir}/*.so*
desktop-file-install --vendor=fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora \
  --add-category Application \
  --add-category Utility \
  --add-category GTK \
  --delete-original \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_datadir}/applications/*%{name}.desktop
%{_mandir}/man1/%{name}.1*
%{_datadir}/pixmaps/%{name}.png

%changelog
* Thu Dec 23 2005 Ignacio Vazquez-Abrams  0.65-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alltray/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Dec 2005 23:56:09 -0000	1.1
+++ .cvsignore	30 Dec 2005 23:57:11 -0000	1.2
@@ -0,0 +1 @@
+alltray-0.65.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alltray/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Dec 2005 23:56:09 -0000	1.1
+++ sources	30 Dec 2005 23:57:11 -0000	1.2
@@ -0,0 +1 @@
+c3b86dab94dbea416174d6e4dd82a173  alltray-0.65.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 04:24:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 30 Dec 2005 23:24:33 -0500
Subject: owners owners.list,1.491,1.492
Message-ID: <200512310425.jBV4P51i020035@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20018

Modified Files:
	owners.list 
Log Message:
alltray


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -r1.491 -r1.492
--- owners.list	30 Dec 2005 17:24:07 -0000	1.491
+++ owners.list	31 Dec 2005 04:24:32 -0000	1.492
@@ -22,6 +22,7 @@
 Fedora Extras|airsnort|Wireless LAN (WLAN) tool which recovers encryption keys|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|alacarte|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net
 Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|alltray|Dock any application in the tray|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|amarok|Media player for KDE|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 31 11:23:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:23:39 -0500
Subject: rpms/php-json - New directory
Message-ID: <200512311123.jBVBNf1E001933@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1925/php-json

Log Message:
Directory /cvs/extras/rpms/php-json added to the repository




From fedora-extras-commits at redhat.com  Sat Dec 31 11:23:45 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:23:45 -0500
Subject: rpms/php-json/devel - New directory
Message-ID: <200512311123.jBVBNlph001948@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1925/php-json/devel

Log Message:
Directory /cvs/extras/rpms/php-json/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Dec 31 11:24:08 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:24:08 -0500
Subject: rpms/php-json Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512311124.jBVBOASq001982@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1970

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-json


--- NEW FILE Makefile ---
# Top level Makefile for module php-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 Dec 31 11:24:13 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:24:13 -0500
Subject: rpms/php-json/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200512311124.jBVBOGoT002002@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1970/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-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 Dec 31 11:25:27 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:25:27 -0500
Subject: rpms/php-json import.log,1.1,1.2
Message-ID: <200512311125.jBVBPxe0002076@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2041

Modified Files:
	import.log 
Log Message:
auto-import php-json-1.1.0-1 on branch devel from php-json-1.1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-json/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Dec 2005 11:24:07 -0000	1.1
+++ import.log	31 Dec 2005 11:25:27 -0000	1.2
@@ -0,0 +1 @@
+php-json-1_1_0-1:HEAD:php-json-1.1.0-1.src.rpm:1136028317



From fedora-extras-commits at redhat.com  Sat Dec 31 11:25:33 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:25:33 -0500
Subject: rpms/php-json/devel php-json.html, NONE, 1.1 php-json.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512311126.jBVBQ5Y0002080@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2041/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-json.html php-json.spec 
Log Message:
auto-import php-json-1.1.0-1 on branch devel from php-json-1.1.0-1.src.rpm


--- NEW FILE php-json.html ---





omar kilani - projects - php-json







    


    

    

    
	           
	
	omar kilani

    
	home | projects
    
	
    libical | php-js | php-json | postfix_memcached
    
	
    
	    		
	           

    

    
	
	
	
    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.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.
    
        
    Version 1.0.6 - Released 2005-08-05 - Fixed issues with exporting private and protected class members (Thanks to Marek Lewczuk for the report.)
    
        
    Version 1.0.5 - Released 2005-06-16 - Changed spacing in json-c encoding, added optional assoc (boolean) parameter to json_decode to decode as associative array instead of object (Thanks to James Jones for the patch and Oscar F. Dur?n for the discussion), fixed issues with escaping /.
    
        
    Version 1.0.3 - Released 2005-06-15 - Fixed json-c string corruption issues under Mac OS X (thanks to Brett Stimmerman for the report) and FreeBSD (thanks to Robert S Wojciechowski for the report.)
    
        
    Version 1.0.2 - Released 2005-06-11 - Fixed issues with object reference counts under PHP4. Thanks to James Jones for the report.
    
        
    Version 1.0.1 - Released 2005-06-10 - Fixed non-linear and mixed type array index issues, fixed issues with escaping \\, forked json-c and added Unicode support.
    
        
    Version 1.0.0 - Released 2005-04-01 - Initial release.
    
        
    Mailing List 
    

    
  
     
    
     Google Groups
    
    Subscribe to php-json
  
    
  
    
  
     
    Email: 
    
      
    
      
    
        
         
        
      
    
      
    
        		
  
    
   
  
    
   Browse Archives at groups.google.com
  
    

    
        
    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.
    
        
    Then, just use json_encode to encode your PHP values into JSON, and json_decode to decode JSON into a PHP value.
    
        
    For example:
    
        
    $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 }
        
    
        
    While:
    
        
    $input = '{ "abc": 12, "foo": "bar", "bool0": false, "bool1": true, "arr": [ 1, 2, 3, null, 5 ], "float": 1.2345 }';
$val = json_decode($input);
echo $val->abc."\n";
        
    
        
    Would produce:
    
        
    12
        
    
        
    As of version 1.0.5, json_decode takes an optional parameter, assoc (boolean), that returns an associative array instead of an object.
    
        
    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"];
alert("result is " + result);
        
    
        
    This should display an alert box with the value of result, i.e., 14.814.
    
	
    Performance
    
        
    Following are some performance metrics for the php-json C extension in comparison to a native PHP implementation of JSON. The C extension is 86 times faster than the native PHP implementation in this test. More complex examples generally show the C extension in even better light, where a speed increase of 270 times is not uncommon.
    
        
    Test string is:
{ "abc": 12, "foo": "bar", "bool0": false, "bool1": true, "arr": [ 1, 2, 3, null, 5 ], "float": 1.2345 }

Initial C output is:
object(stdClass)#1 (6) refcount(1){
  ["abc"]=>
  long(12) refcount(1)
  ["foo"]=>
  string(3) "bar" refcount(1)
  ["bool0"]=>
  bool(false) refcount(1)
  ["bool1"]=>
  bool(true) refcount(1)
  ["arr"]=>
  array(5) refcount(1){
    [0]=>
    long(1) refcount(1)
    [1]=>
    long(2) refcount(1)
    [2]=>
    long(3) refcount(1)
    [3]=>
    NULL refcount(1)
    [4]=>
    long(5) refcount(1)
  }
  ["float"]=>
  double(1.2345) refcount(1)
}
Timing 1000 iterations with C
0.027885913848877 seconds elapsed


Initial PHP output is:
object(ObjectFromJSON)#3 (6) refcount(2){
  ["abc"]=>
  long(12) refcount(1)
  ["foo"]=>
  string(3) "bar" refcount(1)
  ["bool0"]=>
  bool(false) refcount(1)
  ["bool1"]=>
  bool(true) refcount(1)
  ["arr"]=>
  array(5) refcount(1){
    [0]=>
    long(1) refcount(1)
    [1]=>
    long(2) refcount(1)
    [2]=>
    long(3) refcount(1)
    [3]=>
    NULL refcount(1)
    [4]=>
    long(5) refcount(1)
  }
  ["float"]=>
  double(1.2345) refcount(1)
}
Timing 1000 iterations with PHP
2.3223311901093 seconds elapsed

    
	
	

    
	    		

    

    


    






--- NEW FILE php-json.spec ---
%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)}

Name:           php-json
Version:        1.1.0
Release:        1
Summary:        An extremely fast PHP extension for JSON

Group:          Development/Languages
License:        LGPL
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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  php-devel
Requires:       php = %{php_version}

%description
php-json is an extremely fast PHP C extension for JSON (JavaScript Object
Notation) serialisation.

%prep
%setup -q -n php-json-ext-%{version}
install -p -m 0644 %{SOURCE1} .
phpize --clean
phpize

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{php_extdir}
install -p -m 0755 modules/json.so $RPM_BUILD_ROOT%{php_extdir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/php.d
cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/json.ini << EOF
; Enable json extension module
extension=json.so
EOF

%check ||:
cat > test.ini << EOF
open_basedir=
safe_mode=0
output_buffering=0
extension_dir=${PWD}/modules
extension=json.so
EOF
php -m -c test.ini 2> /dev/null | grep -q json || {
  echo "JSON extension not loadable!"
  exit 1
}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc php-json.html
%config(noreplace) %{_sysconfdir}/php.d/json.ini
%{php_extdir}/json.so

%changelog
* Fri Dec 30 2005 Ignacio Vazquez-Abrams  1.1.0-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Dec 2005 11:24:13 -0000	1.1
+++ .cvsignore	31 Dec 2005 11:25:32 -0000	1.2
@@ -0,0 +1 @@
+php-json-ext-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Dec 2005 11:24:13 -0000	1.1
+++ sources	31 Dec 2005 11:25:32 -0000	1.2
@@ -0,0 +1 @@
+4a1a41fafabf866784868af59bf30510  php-json-ext-1.1.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Dec 31 11:28:39 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:28:39 -0500
Subject: rpms/php-json/devel php-json.spec,1.1,1.2
Message-ID: <200512311129.jBVBTC2M002139@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2122

Modified Files:
	php-json.spec 
Log Message:
disttag


Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/php-json.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-json.spec	31 Dec 2005 11:25:32 -0000	1.1
+++ php-json.spec	31 Dec 2005 11:28:39 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           php-json
 Version:        1.1.0
-Release:        1
+Release:        1%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
 Group:          Development/Languages



From fedora-extras-commits at redhat.com  Sat Dec 31 11:30:46 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:30:46 -0500
Subject: rpms/php-json/FC-4 - New directory
Message-ID: <200512311130.jBVBUmsE002201@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2193/FC-4

Log Message:
Directory /cvs/extras/rpms/php-json/FC-4 added to the repository




From fedora-extras-commits at redhat.com  Sat Dec 31 11:31:10 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:31:10 -0500
Subject: rpms/php-json/FC-4 .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 branch,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512311131.jBVBVCT0002238@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2225/FC-4

Added Files:
	.cvsignore Makefile branch sources 
Log Message:
Setup of branch FC-4 of php-json


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE branch ---
FC-4


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Dec 31 11:32:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:32:02 -0500
Subject: rpms/php-json import.log,1.2,1.3
Message-ID: <200512311132.jBVBWYCi002313@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2278

Modified Files:
	import.log 
Log Message:
auto-import php-json-1.1.0-1.fc4 on branch FC-4 from php-json-1.1.0-1.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-json/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	31 Dec 2005 11:25:27 -0000	1.2
+++ import.log	31 Dec 2005 11:32:02 -0000	1.3
@@ -1 +1,2 @@
 php-json-1_1_0-1:HEAD:php-json-1.1.0-1.src.rpm:1136028317
+php-json-1_1_0-1_fc4:FC-4:php-json-1.1.0-1.fc4.src.rpm:1136028706



From fedora-extras-commits at redhat.com  Sat Dec 31 11:32:08 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:32:08 -0500
Subject: rpms/php-json/FC-4 php-json.html, NONE, 1.1 php-json.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512311132.jBVBWeph002317@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2278/FC-4

Modified Files:
	.cvsignore sources 
Added Files:
	php-json.html php-json.spec 
Log Message:
auto-import php-json-1.1.0-1.fc4 on branch FC-4 from php-json-1.1.0-1.fc4.src.rpm


--- NEW FILE php-json.html ---





omar kilani - projects - php-json







    


    

    

    
	           
	
	omar kilani

    
	home | projects
    
	
    libical | php-js | php-json | postfix_memcached
    
	
    
	    		
	           

    

    
	
	
	
    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.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.
    
        
    Version 1.0.6 - Released 2005-08-05 - Fixed issues with exporting private and protected class members (Thanks to Marek Lewczuk for the report.)
    
        
    Version 1.0.5 - Released 2005-06-16 - Changed spacing in json-c encoding, added optional assoc (boolean) parameter to json_decode to decode as associative array instead of object (Thanks to James Jones for the patch and Oscar F. Dur?n for the discussion), fixed issues with escaping /.
    
        
    Version 1.0.3 - Released 2005-06-15 - Fixed json-c string corruption issues under Mac OS X (thanks to Brett Stimmerman for the report) and FreeBSD (thanks to Robert S Wojciechowski for the report.)
    
        
    Version 1.0.2 - Released 2005-06-11 - Fixed issues with object reference counts under PHP4. Thanks to James Jones for the report.
    
        
    Version 1.0.1 - Released 2005-06-10 - Fixed non-linear and mixed type array index issues, fixed issues with escaping \\, forked json-c and added Unicode support.
    
        
    Version 1.0.0 - Released 2005-04-01 - Initial release.
    
        
    Mailing List 
    

    
  
     
    
     Google Groups
    
    Subscribe to php-json
  
    
  
    
  
     
    Email: 
    
      
    
      
    
        
         
        
      
    
      
    
        		
  
    
   
  
    
   Browse Archives at groups.google.com
  
    

    
        
    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.
    
        
    Then, just use json_encode to encode your PHP values into JSON, and json_decode to decode JSON into a PHP value.
    
        
    For example:
    
        
    $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 }
        
    
        
    While:
    
        
    $input = '{ "abc": 12, "foo": "bar", "bool0": false, "bool1": true, "arr": [ 1, 2, 3, null, 5 ], "float": 1.2345 }';
$val = json_decode($input);
echo $val->abc."\n";
        
    
        
    Would produce:
    
        
    12
        
    
        
    As of version 1.0.5, json_decode takes an optional parameter, assoc (boolean), that returns an associative array instead of an object.
    
        
    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"];
alert("result is " + result);
        
    
        
    This should display an alert box with the value of result, i.e., 14.814.
    
	
    Performance
    
        
    Following are some performance metrics for the php-json C extension in comparison to a native PHP implementation of JSON. The C extension is 86 times faster than the native PHP implementation in this test. More complex examples generally show the C extension in even better light, where a speed increase of 270 times is not uncommon.
    
        
    Test string is:
{ "abc": 12, "foo": "bar", "bool0": false, "bool1": true, "arr": [ 1, 2, 3, null, 5 ], "float": 1.2345 }

Initial C output is:
object(stdClass)#1 (6) refcount(1){
  ["abc"]=>
  long(12) refcount(1)
  ["foo"]=>
  string(3) "bar" refcount(1)
  ["bool0"]=>
  bool(false) refcount(1)
  ["bool1"]=>
  bool(true) refcount(1)
  ["arr"]=>
  array(5) refcount(1){
    [0]=>
    long(1) refcount(1)
    [1]=>
    long(2) refcount(1)
    [2]=>
    long(3) refcount(1)
    [3]=>
    NULL refcount(1)
    [4]=>
    long(5) refcount(1)
  }
  ["float"]=>
  double(1.2345) refcount(1)
}
Timing 1000 iterations with C
0.027885913848877 seconds elapsed


Initial PHP output is:
object(ObjectFromJSON)#3 (6) refcount(2){
  ["abc"]=>
  long(12) refcount(1)
  ["foo"]=>
  string(3) "bar" refcount(1)
  ["bool0"]=>
  bool(false) refcount(1)
  ["bool1"]=>
  bool(true) refcount(1)
  ["arr"]=>
  array(5) refcount(1){
    [0]=>
    long(1) refcount(1)
    [1]=>
    long(2) refcount(1)
    [2]=>
    long(3) refcount(1)
    [3]=>
    NULL refcount(1)
    [4]=>
    long(5) refcount(1)
  }
  ["float"]=>
  double(1.2345) refcount(1)
}
Timing 1000 iterations with PHP
2.3223311901093 seconds elapsed

    
	
	

    
	    		

    

    


    






--- NEW FILE php-json.spec ---
%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)}

Name:           php-json
Version:        1.1.0
Release:        1%{?dist}
Summary:        An extremely fast PHP extension for JSON

Group:          Development/Languages
License:        LGPL
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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  php-devel
Requires:       php = %{php_version}

%description
php-json is an extremely fast PHP C extension for JSON (JavaScript Object
Notation) serialisation.

%prep
%setup -q -n php-json-ext-%{version}
install -p -m 0644 %{SOURCE1} .
phpize --clean
phpize

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{php_extdir}
install -p -m 0755 modules/json.so $RPM_BUILD_ROOT%{php_extdir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/php.d
cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/json.ini << EOF
; Enable json extension module
extension=json.so
EOF

%check ||:
cat > test.ini << EOF
open_basedir=
safe_mode=0
output_buffering=0
extension_dir=${PWD}/modules
extension=json.so
EOF
php -m -c test.ini 2> /dev/null | grep -q json || {
  echo "JSON extension not loadable!"
  exit 1
}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc php-json.html
%config(noreplace) %{_sysconfdir}/php.d/json.ini
%{php_extdir}/json.so

%changelog
* Fri Dec 30 2005 Ignacio Vazquez-Abrams  1.1.0-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-json/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Dec 2005 11:31:10 -0000	1.1
+++ .cvsignore	31 Dec 2005 11:32:07 -0000	1.2
@@ -0,0 +1 @@
+php-json-ext-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-json/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Dec 2005 11:31:10 -0000	1.1
+++ sources	31 Dec 2005 11:32:07 -0000	1.2
@@ -0,0 +1 @@
+4a1a41fafabf866784868af59bf30510  php-json-ext-1.1.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Dec 31 11:47:02 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 31 Dec 2005 06:47:02 -0500
Subject: owners owners.list,1.492,1.493
Message-ID: <200512311147.jBVBlY6R002566@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2549

Modified Files:
	owners.list 
Log Message:
php-json


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -r1.492 -r1.493
--- owners.list	31 Dec 2005 04:24:32 -0000	1.492
+++ owners.list	31 Dec 2005 11:47:02 -0000	1.493
@@ -945,6 +945,7 @@
 Fedora Extras|pgp-tools|Collection of several utilities related to OpenPGP|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-adodb|Active Data Objects Data Base|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|php-eaccelerator|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|php-json|An extremely fast PHP extension for JSON|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|phpldapadmin|Web-based tool for managing LDAP servers|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|php-mmcache|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-mailparse|PECL package for parsing and working with email messages|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 31 14:49:21 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 31 Dec 2005 09:49:21 -0500
Subject: rpms/artwiz-aleczapka-fonts - New directory
Message-ID: <200512311449.jBVEnNW7007840@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/artwiz-aleczapka-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7832/artwiz-aleczapka-fonts

Log Message:
Directory /cvs/extras/rpms/artwiz-aleczapka-fonts added to the repository




From fedora-extras-commits at redhat.com  Sat Dec 31 14:49:27 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 31 Dec 2005 09:49:27 -0500
Subject: rpms/artwiz-aleczapka-fonts/devel - New directory
Message-ID: <200512311449.jBVEnTKo007855@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-serv7832/artwiz-aleczapka-fonts/devel

Log Message:
Directory /cvs/extras/rpms/artwiz-aleczapka-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Dec 31 14:50:18 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 31 Dec 2005 09:50:18 -0500
Subject: rpms/artwiz-aleczapka-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200512311450.jBVEoKRD007891@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/artwiz-aleczapka-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7879

Added Files:
	Makefile import.log 
Log Message:
Setup of module artwiz-aleczapka-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module artwiz-aleczapka-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Dec 31 14:50:24 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 31 Dec 2005 09:50:24 -0500
Subject: rpms/artwiz-aleczapka-fonts/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200512311450.jBVEoQQw007911@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-serv7879/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module artwiz-aleczapka-fonts


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Dec 31 14:51:38 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 31 Dec 2005 09:51:38 -0500
Subject: rpms/artwiz-aleczapka-fonts import.log,1.1,1.2
Message-ID: <200512311452.jBVEqBUH007989@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/artwiz-aleczapka-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7955

Modified Files:
	import.log 
Log Message:
auto-import artwiz-aleczapka-fonts-1.3-3 on branch devel from artwiz-aleczapka-fonts-1.3-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/artwiz-aleczapka-fonts/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Dec 2005 14:50:18 -0000	1.1
+++ import.log	31 Dec 2005 14:51:38 -0000	1.2
@@ -0,0 +1 @@
+artwiz-aleczapka-fonts-1_3-3:HEAD:artwiz-aleczapka-fonts-1.3-3.src.rpm:1136040662



From fedora-extras-commits at redhat.com  Sat Dec 31 14:51:44 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 31 Dec 2005 09:51:44 -0500
Subject: rpms/artwiz-aleczapka-fonts/devel artwiz-aleczapka-fonts.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200512311452.jBVEqGUx007993@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-serv7955/devel

Modified Files:
	.cvsignore sources 
Added Files:
	artwiz-aleczapka-fonts.spec 
Log Message:
auto-import artwiz-aleczapka-fonts-1.3-3 on branch devel from artwiz-aleczapka-fonts-1.3-3.src.rpm


--- NEW FILE artwiz-aleczapka-fonts.spec ---
%define         fontdir %{_datadir}/fonts/artwiz-aleczapka

Name:           artwiz-aleczapka-fonts
Version:        1.3
Release:        3%{?dist}
Summary:        Set of (improved) artwiz fonts

Group:          User Interface/X
License:        GPL
URL:            http://artwizaleczapka.sourceforge.net/
Source0:        http://dl.sf.net/artwizaleczapka/artwiz-aleczapka-en-sources-1.3.tar.bz2
Source1:        http://dl.sf.net/artwizaleczapka/artwiz-aleczapka-de-sources-1.3.tar.bz2
Source2:        http://dl.sf.net/artwizaleczapka/artwiz-aleczapka-se-sources-1.3.tar.bz2

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  xorg-x11-font-utils

%description
This is set of (improved) artwiz fonts.
The ultimate solution to your all problems with artwiz fonts.
Screenshots: http://artwizaleczapka.sourceforge.net/images/shots/


%prep
%setup -q -c %{name}-%{version} -a1 -a2


%build
for lang in de en se; do
    pushd %{_builddir}/%{name}-%{version}/artwiz-aleczapka-$lang-sources-%{version}
    sh makepcf.sh
    popd
done


%install
%{__rm} -rf %{buildroot}
for lang in de en se; do
    %{__install} -d -m 0755 %{buildroot}%{fontdir}/artwiz-aleczapka-$lang-%{version}
    %{__install} -p -m 0644 %{_builddir}/%{name}-%{version}/artwiz-aleczapka-$lang-sources-%{version}/*.pcf \
	%{buildroot}%{fontdir}/artwiz-aleczapka-$lang-%{version}
done

# "touch" all files we've got flagged as %ghost but which are not
# present in the %{buildroot} when RPM looks for files
/bin/touch %{buildroot}%{fontdir}/fonts.cache-{1,2}
/bin/touch %{buildroot}%{fontdir}/artwiz-aleczapka-{de,en,se}-%{version}/fonts.cache-{1,2}


%clean
%{__rm} -rf %{buildroot}


%post
if [ -x %{_bindir}/fc-cache ]; then
  %{_bindir}/fc-cache %{_datadir}/fonts
fi

%postun
if [ "$1" = "0" ]; then
  if [ -x %{_bindir}/fc-cache ]; then
    %{_bindir}/fc-cache %{_datadir}/fonts
  fi
fi


%files
%defattr(-,root,root,-)
# generic docs are the same for every lang (AUHTORS has all info in german dir
# so use it from german font dir)
%doc artwiz-aleczapka-de-sources-1.3/{AUTHORS,COPYING,README,VERSION}
%doc artwiz-aleczapka-de-sources-1.3/README.DE
%doc artwiz-aleczapka-se-sources-1.3/README.SE
%dir %{fontdir}
%dir %{fontdir}/artwiz-aleczapka-de-%{version}
%dir %{fontdir}/artwiz-aleczapka-en-%{version}
%dir %{fontdir}/artwiz-aleczapka-se-%{version}
%{fontdir}/*/*.pcf
%ghost %{fontdir}/fonts.cache-1
%ghost %{fontdir}/fonts.cache-2
%ghost %{fontdir}/artwiz-aleczapka-de-%{version}/fonts.cache-1
%ghost %{fontdir}/artwiz-aleczapka-de-%{version}/fonts.cache-2
%ghost %{fontdir}/artwiz-aleczapka-en-%{version}/fonts.cache-1
%ghost %{fontdir}/artwiz-aleczapka-en-%{version}/fonts.cache-2
%ghost %{fontdir}/artwiz-aleczapka-se-%{version}/fonts.cache-1
%ghost %{fontdir}/artwiz-aleczapka-se-%{version}/fonts.cache-2


%changelog
* Sat Dec 31 2005 Andreas Bierfert 
1.3-3
- apply fixes from Dawid Gajownik
- add documentation

* Tue Nov 29 2005 Andreas Bierfert 
1.3-2
- package name with -fonts
- use fc-cache in post/postun

* Sat Nov 26 2005 Andreas Bierfert 
1.3-1
- split from fluxbox package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/artwiz-aleczapka-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Dec 2005 14:50:23 -0000	1.1
+++ .cvsignore	31 Dec 2005 14:51:44 -0000	1.2
@@ -0,0 +1,3 @@
+artwiz-aleczapka-de-sources-1.3.tar.bz2
+artwiz-aleczapka-en-sources-1.3.tar.bz2
+artwiz-aleczapka-se-sources-1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/artwiz-aleczapka-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Dec 2005 14:50:23 -0000	1.1
+++ sources	31 Dec 2005 14:51:44 -0000	1.2
@@ -0,0 +1,3 @@
+92e676c8ce70e20cb00026ffac49cca6  artwiz-aleczapka-de-sources-1.3.tar.bz2
+3de7de7aa635eb6160fac01d678f8b72  artwiz-aleczapka-en-sources-1.3.tar.bz2
+92923ff1066a0f95c955941cd089430f  artwiz-aleczapka-se-sources-1.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Dec 31 15:12:32 2005
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 31 Dec 2005 10:12:32 -0500
Subject: owners owners.list,1.493,1.494
Message-ID: <200512311513.jBVFDKYB009968@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9921

Modified Files:
	owners.list 
Log Message:
- add artwiz-aleczapka-fonts



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -r1.493 -r1.494
--- owners.list	31 Dec 2005 11:47:02 -0000	1.493
+++ owners.list	31 Dec 2005 15:12:32 -0000	1.494
@@ -39,6 +39,7 @@
 Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at osdl.org|extras-qa at fedoraproject.org|
 Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Dec 31 18:25:44 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 13:25:44 -0500
Subject: rpms/abcm2ps/FC-3 .cvsignore, 1.7, 1.8 abcm2ps.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200512311826.jBVIQGuI015422@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15384/FC-3

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Nov 2005 19:51:52 -0000	1.7
+++ .cvsignore	31 Dec 2005 18:25:43 -0000	1.8
@@ -1,2 +1,2 @@
-abcm2ps-4.12.2.tar.gz
+abcm2ps-4.12.3.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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- abcm2ps.spec	30 Nov 2005 19:51:52 -0000	1.7
+++ abcm2ps.spec	31 Dec 2005 18:25:43 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.2
+Version:        4.12.3
 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.2.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.3.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
+* Wed Dec 28 2005 Gerard Milmeister  - 4.12.3-1
+- New Version 4.12.3
+
 * Wed Nov 30 2005 Gerard Milmeister  - 4.12.2-1
 - New Version 4.12.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Nov 2005 19:51:52 -0000	1.7
+++ sources	31 Dec 2005 18:25:43 -0000	1.8
@@ -1,2 +1,2 @@
-906cfebc1255a4db39e93c8bf213f37c  abcm2ps-4.12.2.tar.gz
+dce1d84f6da39e7e95e2873d598f94b9  abcm2ps-4.12.3.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Sat Dec 31 18:25:50 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 13:25:50 -0500
Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.7, 1.8 abcm2ps.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200512311826.jBVIQN7n015427@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15384/FC-4

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Nov 2005 19:51:57 -0000	1.7
+++ .cvsignore	31 Dec 2005 18:25:50 -0000	1.8
@@ -1,2 +1,2 @@
-abcm2ps-4.12.2.tar.gz
+abcm2ps-4.12.3.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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- abcm2ps.spec	30 Nov 2005 19:51:57 -0000	1.7
+++ abcm2ps.spec	31 Dec 2005 18:25:50 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.2
+Version:        4.12.3
 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.2.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.3.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
+* Wed Dec 28 2005 Gerard Milmeister  - 4.12.3-1
+- New Version 4.12.3
+
 * Wed Nov 30 2005 Gerard Milmeister  - 4.12.2-1
 - New Version 4.12.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Nov 2005 19:51:57 -0000	1.7
+++ sources	31 Dec 2005 18:25:50 -0000	1.8
@@ -1,2 +1,2 @@
-906cfebc1255a4db39e93c8bf213f37c  abcm2ps-4.12.2.tar.gz
+dce1d84f6da39e7e95e2873d598f94b9  abcm2ps-4.12.3.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Sat Dec 31 18:49:35 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 13:49:35 -0500
Subject: rpms/TeXmacs/FC-4 .cvsignore, 1.16, 1.17 TeXmacs.spec, 1.25,
	1.26 sources, 1.18, 1.19
Message-ID: <200512311850.jBVIo782015566@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/TeXmacs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15545

Modified Files:
	.cvsignore TeXmacs.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	7 Nov 2005 16:17:21 -0000	1.16
+++ .cvsignore	31 Dec 2005 18:49:34 -0000	1.17
@@ -1 +1 @@
-TeXmacs-1.0.5.12-src.tar.gz
+TeXmacs-1.0.6-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TeXmacs.spec	7 Nov 2005 16:17:21 -0000	1.25
+++ TeXmacs.spec	31 Dec 2005 18:49:34 -0000	1.26
@@ -1,16 +1,17 @@
 Name:		TeXmacs
-Version:	1.0.5.12
-Release:	2%{?dist}
+Version:	1.0.6
+Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.texmacs.org
-Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.12-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6-src.tar.gz
 Patch0:		TeXmacs-maxima.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex, tetex-fonts, ghostscript
-Buildrequires:	guile-devel, desktop-file-utils, tetex, freetype-devel, xorg-x11-devel
+Buildrequires:	guile-devel, desktop-file-utils, tetex, freetype-devel
+Buildrequires:  xorg-x11-devel
 Requires:	fig2ps
 Requires(post): shared-mime-info, desktop-file-utils
 Requires(postun): shared-mime-info, desktop-file-utils
@@ -138,6 +139,9 @@
 
 
 %changelog
+* Sat Dec 31 2005 Gerard Milmeister  - 1.0.6-1
+- New Version 1.0.6
+
 * Mon Nov  7 2005 Gerard Milmeister  - 1.0.5.12-1
 - New Version 1.0.5.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	7 Nov 2005 16:17:21 -0000	1.18
+++ sources	31 Dec 2005 18:49:34 -0000	1.19
@@ -1 +1 @@
-9a4075df4d120d9c834ac78b6c964341  TeXmacs-1.0.5.12-src.tar.gz
+7b0a3896fd17cf2e993aa77d15bb6240  TeXmacs-1.0.6-src.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 18:52:17 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 13:52:17 -0500
Subject: rpms/TeXmacs/devel .cvsignore, 1.17, 1.18 TeXmacs.spec, 1.26,
	1.27 sources, 1.18, 1.19
Message-ID: <200512311852.jBVIqne9015631@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/TeXmacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15610

Modified Files:
	.cvsignore TeXmacs.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	7 Nov 2005 16:14:47 -0000	1.17
+++ .cvsignore	31 Dec 2005 18:52:17 -0000	1.18
@@ -1 +1 @@
-TeXmacs-1.0.5.12-src.tar.gz
+TeXmacs-1.0.6-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- TeXmacs.spec	7 Nov 2005 16:14:47 -0000	1.26
+++ TeXmacs.spec	31 Dec 2005 18:52:17 -0000	1.27
@@ -1,16 +1,26 @@
 Name:		TeXmacs
-Version:	1.0.5.12
-Release:	2%{?dist}
+Version:	1.0.6
+Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.texmacs.org
-Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.12-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6-src.tar.gz
 Patch0:		TeXmacs-maxima.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex, tetex-fonts, ghostscript
-Buildrequires:	guile-devel, desktop-file-utils, tetex, freetype-devel, xorg-x11-devel
+Buildrequires:	guile-devel, desktop-file-utils, tetex
+Buildrequires:  freetype-devel
+BuildRequires:  libICE-devel
+BuildRequires:  libSM-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXaw-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXft-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libXrender-devel
+BuildRequires:  libXt-devel
 Requires:	fig2ps
 Requires(post): shared-mime-info, desktop-file-utils
 Requires(postun): shared-mime-info, desktop-file-utils
@@ -138,6 +148,9 @@
 
 
 %changelog
+* Sat Dec 31 2005 Gerard Milmeister  - 1.0.6-1
+- New Version 1.0.6
+
 * Mon Nov  7 2005 Gerard Milmeister  - 1.0.5.12-1
 - New Version 1.0.5.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	7 Nov 2005 16:14:47 -0000	1.18
+++ sources	31 Dec 2005 18:52:17 -0000	1.19
@@ -1 +1 @@
-9a4075df4d120d9c834ac78b6c964341  TeXmacs-1.0.5.12-src.tar.gz
+7b0a3896fd17cf2e993aa77d15bb6240  TeXmacs-1.0.6-src.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 18:53:46 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 13:53:46 -0500
Subject: rpms/TeXmacs/FC-3 .cvsignore, 1.11, 1.12 TeXmacs.spec, 1.15,
	1.16 sources, 1.14, 1.15
Message-ID: <200512311854.jBVIsJ10015717@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/TeXmacs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15687

Modified Files:
	.cvsignore TeXmacs.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Nov 2005 16:17:16 -0000	1.11
+++ .cvsignore	31 Dec 2005 18:53:46 -0000	1.12
@@ -1 +1 @@
-TeXmacs-1.0.5.12-src.tar.gz
+TeXmacs-1.0.6-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-3/TeXmacs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TeXmacs.spec	7 Nov 2005 16:17:16 -0000	1.15
+++ TeXmacs.spec	31 Dec 2005 18:53:46 -0000	1.16
@@ -1,16 +1,17 @@
 Name:		TeXmacs
-Version:	1.0.5.12
-Release:	2%{?dist}
+Version:	1.0.6
+Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.texmacs.org
-Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.12-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6-src.tar.gz
 Patch0:		TeXmacs-maxima.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex, tetex-fonts, ghostscript
-Buildrequires:	guile-devel, desktop-file-utils, tetex, freetype-devel, XFree86-devel
+Buildrequires:	guile-devel, desktop-file-utils, tetex, freetype-devel
+Buildrequires:  xorg-x11-devel
 Requires:	fig2ps
 Requires(post): shared-mime-info, desktop-file-utils
 Requires(postun): shared-mime-info, desktop-file-utils
@@ -138,6 +139,9 @@
 
 
 %changelog
+* Sat Dec 31 2005 Gerard Milmeister  - 1.0.6-1
+- New Version 1.0.6
+
 * Mon Nov  7 2005 Gerard Milmeister  - 1.0.5.12-1
 - New Version 1.0.5.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-3/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	7 Nov 2005 16:17:16 -0000	1.14
+++ sources	31 Dec 2005 18:53:46 -0000	1.15
@@ -1 +1 @@
-9a4075df4d120d9c834ac78b6c964341  TeXmacs-1.0.5.12-src.tar.gz
+7b0a3896fd17cf2e993aa77d15bb6240  TeXmacs-1.0.6-src.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 19:13:06 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 14:13:06 -0500
Subject: rpms/TeXmacs/devel TeXmacs-inline.patch, NONE, 1.1 TeXmacs.spec,
	1.27, 1.28
Message-ID: <200512311913.jBVJDcE5017447@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/TeXmacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17427

Modified Files:
	TeXmacs.spec 
Added Files:
	TeXmacs-inline.patch 
Log Message:


TeXmacs-inline.patch:

--- NEW FILE TeXmacs-inline.patch ---
--- TeXmacs-1.0.6-src/src/System/Classes/url.hpp.inline	2005-12-31 20:11:32.000000000 +0100
+++ TeXmacs-1.0.6-src/src/System/Classes/url.hpp	2005-12-31 20:11:54.000000000 +0100
@@ -38,10 +38,13 @@
   inline bool operator == (url u) { return rep->t == u->t; }
   inline bool operator != (url u) { return rep->t != u->t; }
   inline url  operator [] (int i) { return url (rep->t[i]); }
-  inline friend url as_url (tree t) { return url (t); }
+  friend url as_url (tree t);
 };
 CONCRETE_CODE(url);
 
+inline url as_url (tree t) { return url (t); }
+
+
 ostream& operator << (ostream& out, url u);
 string as_string (url u, int type= URL_SYSTEM);
 


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- TeXmacs.spec	31 Dec 2005 18:52:17 -0000	1.27
+++ TeXmacs.spec	31 Dec 2005 19:13:05 -0000	1.28
@@ -1,6 +1,6 @@
 Name:		TeXmacs
 Version:	1.0.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
@@ -8,6 +8,7 @@
 URL:		http://www.texmacs.org
 Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6-src.tar.gz
 Patch0:		TeXmacs-maxima.patch
+Patch1:		TeXmacs-inline.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tetex, tetex-fonts, ghostscript
 Buildrequires:	guile-devel, desktop-file-utils, tetex
@@ -47,6 +48,7 @@
 %prep
 %setup -q -n TeXmacs-%{version}-src
 %patch0 -p1
+%patch1 -p1
 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
 
 



From fedora-extras-commits at redhat.com  Sat Dec 31 20:27:36 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 31 Dec 2005 15:27:36 -0500
Subject: rpms/R/FC-3 R.spec,1.10,1.11 sources,1.5,1.6
Message-ID: <200512312028.jBVKS8FN019284@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19232/FC-3

Modified Files:
	R.spec sources 
Log Message:

Bump to 2.2.1



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-3/R.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- R.spec	7 Oct 2005 05:46:54 -0000	1.10
+++ R.spec	31 Dec 2005 20:27:36 -0000	1.11
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.2.0
-Release: 2%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -218,6 +218,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Dec 20 2005 Tom "spot" Callaway  2.2.1-1
+- bump to 2.2.1
+
 * Thu Oct  6 2005 Tom "spot" Callaway  2.2.0-2
 - use fixed system lapack for FC-4 and devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Oct 2005 14:22:07 -0000	1.5
+++ sources	31 Dec 2005 20:27:36 -0000	1.6
@@ -1 +1 @@
-6bddf439ae417a48bd31892996ea111c  R-2.2.0.tar.gz
+42542290c6d1585af7ded330f811385c  R-2.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 20:27:49 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 31 Dec 2005 15:27:49 -0500
Subject: rpms/R/devel .cvsignore,1.5,1.6 R.spec,1.9,1.10 sources,1.6,1.7
Message-ID: <200512312028.jBVKSOew019289@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19232/devel

Modified Files:
	.cvsignore R.spec sources 
Log Message:

Bump to 2.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/R/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Oct 2005 14:22:12 -0000	1.5
+++ .cvsignore	31 Dec 2005 20:27:49 -0000	1.6
@@ -2,3 +2,4 @@
 R-2.1.0.tar.gz
 R-2.1.1.tar.gz
 R-2.2.0.tar.gz
+R-2.2.1.tar.gz


Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- R.spec	7 Oct 2005 05:47:00 -0000	1.9
+++ R.spec	31 Dec 2005 20:27:49 -0000	1.10
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.2.0
-Release: 2%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -10,10 +10,10 @@
 BuildRequires: gcc-gfortran
 BuildRequires: gcc-c++, tetex-latex, texinfo 
 BuildRequires: libpng-devel, libjpeg-devel, readline-devel, libtermcap-devel
-BuildRequires: XFree86-devel
 BuildRequires: tcl-devel, tk-devel
 BuildRequires: blas >= 3.0, pcre-devel, zlib-devel
 BuildRequires: java-1.4.2-gcj-compat, lapack-devel
+BuildRequires: libSM-devel, libX11-devel, libICE-devel
 Requires: evince, cups, firefox
 
 # These are the submodules that R provides. Sometimes R modules say they
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Dec 20 2005 Tom "spot" Callaway  2.2.1-1
+- bump to 2.2.1
+
 * Thu Oct  6 2005 Tom "spot" Callaway  2.2.0-2
 - use fixed system lapack for FC-4 and devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Oct 2005 14:22:12 -0000	1.6
+++ sources	31 Dec 2005 20:27:49 -0000	1.7
@@ -1 +1 @@
-6bddf439ae417a48bd31892996ea111c  R-2.2.0.tar.gz
+42542290c6d1585af7ded330f811385c  R-2.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 20:27:43 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 31 Dec 2005 15:27:43 -0500
Subject: rpms/R/FC-4 R.spec,1.9,1.10 sources,1.6,1.7
Message-ID: <200512312028.jBVKSQtQ019293@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19232/FC-4

Modified Files:
	R.spec sources 
Log Message:

Bump to 2.2.1



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- R.spec	7 Oct 2005 05:46:55 -0000	1.9
+++ R.spec	31 Dec 2005 20:27:43 -0000	1.10
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.2.0
-Release: 2%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Dec 20 2005 Tom "spot" Callaway  2.2.1-1
+- bump to 2.2.1
+
 * Thu Oct  6 2005 Tom "spot" Callaway  2.2.0-2
 - use fixed system lapack for FC-4 and devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Oct 2005 14:22:07 -0000	1.6
+++ sources	31 Dec 2005 20:27:43 -0000	1.7
@@ -1 +1 @@
-6bddf439ae417a48bd31892996ea111c  R-2.2.0.tar.gz
+42542290c6d1585af7ded330f811385c  R-2.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 21:03:01 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 31 Dec 2005 16:03:01 -0500
Subject: rpms/sbcl/devel .cvsignore, 1.7, 1.8 sbcl.spec, 1.31, 1.32 sources, 
	1.7, 1.8
Message-ID: <200512312103.jBVL3XFE021137@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21116

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Sat Dec 31 2005 Rex Dieter  0.9.8-1
- 0.9.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Dec 2005 14:59:39 -0000	1.7
+++ .cvsignore	31 Dec 2005 21:03:00 -0000	1.8
@@ -1,6 +1,4 @@
 sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-sbcl-0.9.4-x86-64-linux-binary.tar.bz2
-sbcl-0.9.5-source.tar.bz2
-sbcl-0.9.5-x86-linux-binary.tar.bz2
-sbcl-0.9.6-source.tar.bz2
-sbcl-0.9.7-source.tar.bz2
+sbcl-0.9.8-source.tar.bz2
+sbcl-0.9.8-x86-64-linux-binary.tar.bz2
+sbcl-0.9.8-x86-linux-binary.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sbcl.spec	5 Dec 2005 14:59:39 -0000	1.31
+++ sbcl.spec	31 Dec 2005 21:03:00 -0000	1.32
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.7
+Version: 0.9.8
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Sat Dec 31 2005 Rex Dieter  0.9.8-1
+- 0.9.8
+
 * Mon Nov 28 2005 Rex Dieter  0.9.7-1
 - 0.9.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Dec 2005 14:59:39 -0000	1.7
+++ sources	31 Dec 2005 21:03:00 -0000	1.8
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-67ec41e624a3f2ad7f6f3cde1bd001d3  sbcl-0.9.4-x86-64-linux-binary.tar.bz2
-cb01b462b517889723eeaf63b5474c70  sbcl-0.9.5-x86-linux-binary.tar.bz2
-d5e5e4ae500f12b7523989222cb4cc88  sbcl-0.9.7-source.tar.bz2
+4a8a3de71aff073b4e23e5bc2e432b27  sbcl-0.9.8-source.tar.bz2
+294b9133aa3d0195a0ad8d562bf9c7d5  sbcl-0.9.8-x86-64-linux-binary.tar.bz2
+900ae4d2353fd9371d6ebaef40180038  sbcl-0.9.8-x86-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Sat Dec 31 21:14:55 2005
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 31 Dec 2005 16:14:55 -0500
Subject: rpms/kmymoney2/devel .cvsignore, 1.2, 1.3 kmymoney2.spec, 1.8,
	1.9 sources, 1.2, 1.3
Message-ID: <200512312115.jBVLFScG021590@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21567

Modified Files:
	.cvsignore kmymoney2.spec sources 
Log Message:
* Sat Dec 31 2005 Rex Dieter  0.8.2-1
- 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Nov 2005 20:23:11 -0000	1.2
+++ .cvsignore	31 Dec 2005 21:14:55 -0000	1.3
@@ -1 +1 @@
-kmymoney2-0.8.1.tar.bz2
+kmymoney2-0.8.2.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kmymoney2.spec	23 Dec 2005 21:28:14 -0000	1.8
+++ kmymoney2.spec	31 Dec 2005 21:14:55 -0000	1.9
@@ -16,19 +16,15 @@
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 0.8.1
-Release: 7%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
 Group:	 Applications/Productivity
-Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-0.8.1.tar.bz2
+Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-# inspired by http://article.gmane.org/gmane.comp.kde.kmymoney2.devel/3467
-Patch1: kmymoney2-0.8.1-qt335.patch
-Patch2: kmymoney2-0.8.1-gcc41.patch
-
 BuildRequires: desktop-file-utils
 BuildRequires: automake
 BuildRequires: libxml2-devel
@@ -56,9 +52,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .qt335
-%patch2 -p1 -b .gcc41
-
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -161,6 +154,9 @@
 
 
 %changelog
+* Sat Dec 31 2005 Rex Dieter  0.8.2-1
+- 0.8.2
+
 * Fri Dec 23 2005 Rex Dieter  0.8.1-7
 - gcc41 patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Nov 2005 20:23:11 -0000	1.2
+++ sources	31 Dec 2005 21:14:55 -0000	1.3
@@ -1 +1 @@
-266fd411098cdce53d7db202960f07d5  kmymoney2-0.8.1.tar.bz2
+ffb09eaba4f93cd47e9600a2cb6b02c5  kmymoney2-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Dec 31 21:29:41 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 31 Dec 2005 16:29:41 -0500
Subject: rpms/R/FC-3 R.spec,1.11,1.12
Message-ID: <200512312130.jBVLUDev021687@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21640/FC-3

Modified Files:
	R.spec 
Log Message:

* Sat Dec 31 2005 Tom "spot" Callaway  2.2.1-2
- missing BR: libXt-devel for FC-5



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-3/R.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- R.spec	31 Dec 2005 20:27:36 -0000	1.11
+++ R.spec	31 Dec 2005 21:29:40 -0000	1.12
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -218,6 +218,9 @@
 /sbin/ldconfig
 
 %changelog
+* Sat Dec 31 2005 Tom "spot" Callaway  2.2.1-2
+- missing BR: libXt-devel for FC-5
+
 * Tue Dec 20 2005 Tom "spot" Callaway  2.2.1-1
 - bump to 2.2.1
 



From fedora-extras-commits at redhat.com  Sat Dec 31 21:29:46 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 31 Dec 2005 16:29:46 -0500
Subject: rpms/R/FC-4 R.spec,1.10,1.11
Message-ID: <200512312130.jBVLUJ1l021690@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21640/FC-4

Modified Files:
	R.spec 
Log Message:

* Sat Dec 31 2005 Tom "spot" Callaway  2.2.1-2
- missing BR: libXt-devel for FC-5



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- R.spec	31 Dec 2005 20:27:43 -0000	1.10
+++ R.spec	31 Dec 2005 21:29:46 -0000	1.11
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Sat Dec 31 2005 Tom "spot" Callaway  2.2.1-2
+- missing BR: libXt-devel for FC-5
+
 * Tue Dec 20 2005 Tom "spot" Callaway  2.2.1-1
 - bump to 2.2.1
 



From fedora-extras-commits at redhat.com  Sat Dec 31 21:29:52 2005
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sat, 31 Dec 2005 16:29:52 -0500
Subject: rpms/R/devel R.spec,1.10,1.11
Message-ID: <200512312130.jBVLUOP6021693@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21640/devel

Modified Files:
	R.spec 
Log Message:

* Sat Dec 31 2005 Tom "spot" Callaway  2.2.1-2
- missing BR: libXt-devel for FC-5



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- R.spec	31 Dec 2005 20:27:49 -0000	1.10
+++ R.spec	31 Dec 2005 21:29:52 -0000	1.11
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -13,7 +13,7 @@
 BuildRequires: tcl-devel, tk-devel
 BuildRequires: blas >= 3.0, pcre-devel, zlib-devel
 BuildRequires: java-1.4.2-gcj-compat, lapack-devel
-BuildRequires: libSM-devel, libX11-devel, libICE-devel
+BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
 Requires: evince, cups, firefox
 
 # These are the submodules that R provides. Sometimes R modules say they
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Sat Dec 31 2005 Tom "spot" Callaway  2.2.1-2
+- missing BR: libXt-devel for FC-5
+
 * Tue Dec 20 2005 Tom "spot" Callaway  2.2.1-1
 - bump to 2.2.1
 



From fedora-extras-commits at redhat.com  Sat Dec 31 23:40:31 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 18:40:31 -0500
Subject: rpms/lablgtk/FC-4 .cvsignore, 1.3, 1.4 lablgtk.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200512312341.jBVNf3Vb026315@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/lablgtk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26294

Modified Files:
	.cvsignore lablgtk.spec sources 
Log Message:
new version 2.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:55:06 -0000	1.3
+++ .cvsignore	31 Dec 2005 23:40:30 -0000	1.4
@@ -1 +1 @@
-lablgtk-2.4.0.tar.gz
+lablgtk-2.6.0.tar.gz


Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-4/lablgtk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lablgtk.spec	10 Sep 2005 19:26:29 -0000	1.10
+++ lablgtk.spec	31 Dec 2005 23:40:30 -0000	1.11
@@ -1,26 +1,34 @@
 Name:           lablgtk
-Version:        2.4.0
-Release:	6%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
-Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
-Patch0:		lablgtk-gcc4.patch
+Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.6.0.tar.gz
+#Patch0:        lablgtk-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ocaml >= 3.08
-%{?_with_gl:Requires: lablgl >= 1.00}
+
 BuildRequires:  ocaml >= 3.08, camlp4 >= 3.08
 # lablgtk can generate quite extensive documentation.
 # Probably should enable this and create a subpackage for it.
-#BuildRequires:  ocaml-ocamldoc
-%{?_with_gl:BuildRequires: lablgl >= 1.00, gtkglarea2-devel}
+BuildRequires:  ocaml-ocamldoc
+BuildRequires:  lablgl >= 1.02
+BuildRequires:  gtkglarea2-devel
+BuildRequires:  zlib-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  librsvg2-devel
-BuildRequires:  libgnomeui-devel, libgnomecanvas-devel, gnome-panel-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  libgnomecanvas-devel
+BuildRequires:  gnome-panel-devel
+BuildRequires:  gtkspell-devel
+
+Requires:       ocaml >= 3.08
+Requires:       lablgl >= 1.02
+
 
 %description
 LablGTK is is an Objective Caml interface to gtk+.
@@ -30,16 +38,29 @@
 is not that easy if you know the dynamic typing approach taken by
 gtk+.
 
+
+%package doc
+Group:          System Environment/Libraries
+Summary:        Documentation for LablGTK
+Requires:	lablgtk = %{version}-%{release}
+
+%description doc
+Documentation for LablGTK.
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
+#%patch0 -p1 -b .gcc4
 # version information in META file is wrong
-perl -pi -e 's|version="1.3.1"|version="2.4.0"|' META
+perl -pi -e 's|version="1.3.1"|version="2.6.0"|' META
+
 
 %build
-%configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
+%configure --with-gl --enable-debug
 perl -pi -e "s|-O|$RPM_OPT_FLAGS|" src/Makefile
 make world
+make doc
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -54,22 +75,35 @@
      DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
 cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/*
 %{_libdir}/ocaml/lablgtk2
 %{_libdir}/ocaml/stublibs/*
 %doc README COPYING CHANGES
 %doc examples
 
+
+%files doc
+%defattr(-,root,root,-)
+%doc doc/html
+
+
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister  - 2.6.0-1
+- new version 2.6.0
+
 * Sat Sep 10 2005 Gerard Milmeister  - 2.4.0-6
 - include META file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:55:06 -0000	1.3
+++ sources	31 Dec 2005 23:40:30 -0000	1.4
@@ -1 +1 @@
-faa7b28c3ad97a1a76d983d24f26f567  lablgtk-2.4.0.tar.gz
+47319aacbbb761323bdfab67513829df  lablgtk-2.6.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 23:45:56 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 18:45:56 -0500
Subject: rpms/lablgtk/devel .cvsignore, 1.3, 1.4 lablgtk.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200512312346.jBVNkSQ3026388@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/lablgtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26367

Modified Files:
	.cvsignore lablgtk.spec sources 
Log Message:
new version 2.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:55:06 -0000	1.3
+++ .cvsignore	31 Dec 2005 23:45:56 -0000	1.4
@@ -1 +1 @@
-lablgtk-2.4.0.tar.gz
+lablgtk-2.6.0.tar.gz


Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/devel/lablgtk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lablgtk.spec	10 Sep 2005 19:27:23 -0000	1.10
+++ lablgtk.spec	31 Dec 2005 23:45:56 -0000	1.11
@@ -1,26 +1,33 @@
 Name:           lablgtk
-Version:        2.4.0
-Release:	6%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
-Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
-Patch0:		lablgtk-gcc4.patch
+Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.6.0.tar.gz
+#Patch0:        lablgtk-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ocaml >= 3.08
-%{?_with_gl:Requires: lablgl >= 1.00}
 BuildRequires:  ocaml >= 3.08, camlp4 >= 3.08
 # lablgtk can generate quite extensive documentation.
 # Probably should enable this and create a subpackage for it.
-#BuildRequires:  ocaml-ocamldoc
-%{?_with_gl:BuildRequires: lablgl >= 1.00, gtkglarea2-devel}
+BuildRequires:  ocaml-ocamldoc
+BuildRequires:  lablgl >= 1.02
+BuildRequires:  gtkglarea2-devel
+BuildRequires:  zlib-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  librsvg2-devel
-BuildRequires:  libgnomeui-devel, libgnomecanvas-devel, gnome-panel-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  libgnomecanvas-devel
+BuildRequires:  gnome-panel-devel
+BuildRequires:  gtkspell-devel
+
+Requires:       ocaml >= 3.08
+Requires:       lablgl >= 1.02
+
 
 %description
 LablGTK is is an Objective Caml interface to gtk+.
@@ -30,16 +37,28 @@
 is not that easy if you know the dynamic typing approach taken by
 gtk+.
 
+%package doc
+Group:          System Environment/Libraries
+Summary:        Documentation for LablGTK
+Requires:	lablgtk = %{version}-%{release}
+
+%description doc
+Documentation for LablGTK.
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
+#%patch0 -p1 -b .gcc4
 # version information in META file is wrong
-perl -pi -e 's|version="1.3.1"|version="2.4.0"|' META
+perl -pi -e 's|version="1.3.1"|version="2.6.0"|' META
+
 
 %build
-%configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
+%configure --with-gl --enable-debug
 perl -pi -e "s|-O|$RPM_OPT_FLAGS|" src/Makefile
 make world
+make doc
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,14 +81,22 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/*
 %{_libdir}/ocaml/lablgtk2
 %{_libdir}/ocaml/stublibs/*
 %doc README COPYING CHANGES
 %doc examples
 
+%files doc
+%defattr(-,root,root,-)
+%doc doc/html
+
+
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister  - 2.6.0-1
+- new version 2.6.0
+
 * Sat Sep 10 2005 Gerard Milmeister  - 2.4.0-6
 - include META file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:55:06 -0000	1.3
+++ sources	31 Dec 2005 23:45:56 -0000	1.4
@@ -1 +1 @@
-faa7b28c3ad97a1a76d983d24f26f567  lablgtk-2.4.0.tar.gz
+47319aacbbb761323bdfab67513829df  lablgtk-2.6.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 23:49:33 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 18:49:33 -0500
Subject: rpms/lablgtk/FC-3 .cvsignore, 1.3, 1.4 lablgtk.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200512312350.jBVNo5gU026455@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/lablgtk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26434

Modified Files:
	.cvsignore lablgtk.spec sources 
Log Message:
new version 2.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:55:06 -0000	1.3
+++ .cvsignore	31 Dec 2005 23:49:32 -0000	1.4
@@ -1 +1 @@
-lablgtk-2.4.0.tar.gz
+lablgtk-2.6.0.tar.gz


Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-3/lablgtk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lablgtk.spec	10 Sep 2005 19:28:04 -0000	1.6
+++ lablgtk.spec	31 Dec 2005 23:49:32 -0000	1.7
@@ -1,25 +1,32 @@
 Name:           lablgtk
-Version:        2.4.0
-Release:	6%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
-Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
+Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.6.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ocaml >= 3.08
-%{?_with_gl:Requires: lablgl >= 1.00}
 BuildRequires:  ocaml >= 3.08, camlp4 >= 3.08
 # lablgtk can generate quite extensive documentation.
 # Probably should enable this and create a subpackage for it.
-#BuildRequires:  ocaml-ocamldoc
-%{?_with_gl:BuildRequires: lablgl >= 1.00, gtkglarea2-devel}
+BuildRequires:  ocaml-ocamldoc
+BuildRequires:  lablgl >= 1.02
+BuildRequires:  gtkglarea2-devel
+BuildRequires:  zlib-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  librsvg2-devel
-BuildRequires:  libgnomeui-devel, libgnomecanvas-devel, gnome-panel-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  libgnomecanvas-devel
+BuildRequires:  gnome-panel-devel
+BuildRequires:  gtkspell-devel
+
+Requires:       ocaml >= 3.08
+Requires:       lablgl >= 1.02
+
 
 %description
 LablGTK is is an Objective Caml interface to gtk+.
@@ -29,15 +36,27 @@
 is not that easy if you know the dynamic typing approach taken by
 gtk+.
 
+%package doc
+Group:          System Environment/Libraries
+Summary:        Documentation for LablGTK
+Requires:	lablgtk = %{version}-%{release}
+
+%description doc
+Documentation for LablGTK.
+
+
 %prep
 %setup -q
 # version information in META file is wrong
-perl -pi -e 's|version="1.3.1"|version="2.4.0"|' META
+perl -pi -e 's|version="1.3.1"|version="2.6.0"|' META
+
 
 %build
-%configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
+%configure --with-gl --enable-debug
 perl -pi -e "s|-O|$RPM_OPT_FLAGS|" src/Makefile
 make world
+make doc
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,14 +79,22 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/*
 %{_libdir}/ocaml/lablgtk2
 %{_libdir}/ocaml/stublibs/*
 %doc README COPYING CHANGES
 %doc examples
 
+%files doc
+%defattr(-,root,root,-)
+%doc doc/html
+
+
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister  - 2.6.0-1
+- new version 2.6.0
+
 * Sat Sep 10 2005 Gerard Milmeister  - 2.4.0-6
 - include META file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:55:06 -0000	1.3
+++ sources	31 Dec 2005 23:49:32 -0000	1.4
@@ -1 +1 @@
-faa7b28c3ad97a1a76d983d24f26f567  lablgtk-2.4.0.tar.gz
+47319aacbbb761323bdfab67513829df  lablgtk-2.6.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Dec 31 23:56:19 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 18:56:19 -0500
Subject: rpms/gtkglarea2/FC-3 gtkglarea2.spec,1.7,1.8
Message-ID: <200512312356.jBVNupk6026544@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gtkglarea2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26527

Modified Files:
	gtkglarea2.spec 
Log Message:



Index: gtkglarea2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglarea2/FC-3/gtkglarea2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkglarea2.spec	3 Mar 2005 23:13:54 -0000	1.7
+++ gtkglarea2.spec	31 Dec 2005 23:56:18 -0000	1.8
@@ -1,13 +1,14 @@
-Summary:	An OpenGL GTK widget
-Name: 		gtkglarea2
+Summary:	OpenGL GTK widget
+Name:		gtkglarea2
 Version:	1.99.0
-Release: 	1
+Release:	2
+
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea
 # ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/
-Source0: 	ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/1.99/gtkglarea-1.99.0.tar.bz2
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/1.99/gtkglarea-1.99.0.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	pkgconfig, xorg-x11-devel
 BuildRequires:	gtk2-devel
 
@@ -15,7 +16,7 @@
 Summary:	Development package for gtkglarea2
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	xorg-x11-devel
+Requires:	XFree86-devel
 Requires:	gtk2-devel
 
 %description



From fedora-extras-commits at redhat.com  Sat Dec 31 23:57:15 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 18:57:15 -0500
Subject: rpms/gtkglarea2/FC-3 gtkglarea2.spec,1.8,1.9
Message-ID: <200512312357.jBVNvlCu026597@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gtkglarea2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26580

Modified Files:
	gtkglarea2.spec 
Log Message:



Index: gtkglarea2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglarea2/FC-3/gtkglarea2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtkglarea2.spec	31 Dec 2005 23:56:18 -0000	1.8
+++ gtkglarea2.spec	31 Dec 2005 23:57:15 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	OpenGL GTK widget
 Name:		gtkglarea2
 Version:	1.99.0
-Release:	2
+Release:	2%{?dist}
 
 License:	LGPL
 Group:		System Environment/Libraries



From fedora-extras-commits at redhat.com  Sat Dec 31 23:58:15 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 18:58:15 -0500
Subject: rpms/gtkglarea2/devel gtkglarea2.spec,1.9,1.10
Message-ID: <200512312358.jBVNwlU1026658@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gtkglarea2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26641

Modified Files:
	gtkglarea2.spec 
Log Message:



Index: gtkglarea2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglarea2/devel/gtkglarea2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtkglarea2.spec	6 Apr 2005 22:11:39 -0000	1.9
+++ gtkglarea2.spec	31 Dec 2005 23:58:15 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	OpenGL GTK widget
 Name:		gtkglarea2
 Version:	1.99.0
-Release:	2
+Release:	3%{?dist}
 
 License:	LGPL
 Group:		System Environment/Libraries
@@ -9,8 +9,10 @@
 # ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/1.99/gtkglarea-1.99.0.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	pkgconfig, xorg-x11-devel
+BuildRequires:	pkgconfig
 BuildRequires:	gtk2-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libGLU-devel
 
 %package devel
 Summary:	Development package for gtkglarea2
@@ -18,6 +20,8 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	xorg-x11-devel
 Requires:	gtk2-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libGLU-devel
 
 %description
 GtkGLArea is a GTK widget that makes it easy to use OpenGL or Mesa
@@ -60,6 +64,9 @@
 %{_libdir}/pkgconfig/gtkgl-2.0.pc
 
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister  - 1.99.0-3
+- adapted for modular xorg
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt