From 6f2cf3f10c992ae2b5989bcaa17aa7356417a933 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 1 Aug 2010 17:14:53 +0800 Subject: link to gitweb, fixes #65 --- zoom.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zoom.php b/zoom.php index a7ec090..a353c77 100644 --- a/zoom.php +++ b/zoom.php @@ -164,8 +164,8 @@ if ( !isset($name) || !$name ) { '?bug_status=NEW&bug_status=ASSIGNED&bug_status=ON_QA' . '&component=' . $name; } - $summary['ViewVC'] = 'http://cvs.fedoraproject.org/viewvc/rpms/' . - $name . '/'; + $summary['ViewVC'] + = 'http://pkgs.fedoraproject.org/gitweb/?p=' . $name . '.git'; $summary['PkgDB'] = $fedcli->getPackageURL($name); -- cgit From 2091997e6d1f10b2ea0093483678541c5bec35f3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 1 Aug 2010 17:28:11 +0800 Subject: Add link to src.rpm, fixes #64 --- smarty/templates/rpmphp/zoom.tpl | 4 ++-- zoom.php | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/smarty/templates/rpmphp/zoom.tpl b/smarty/templates/rpmphp/zoom.tpl index 5841478..c2a5659 100644 --- a/smarty/templates/rpmphp/zoom.tpl +++ b/smarty/templates/rpmphp/zoom.tpl @@ -70,9 +70,9 @@ {if $p->repo_main neq $prev}{$p->repo_main}{/if} {$p->repo_sub} - + {if $p->epoch}{$p->epoch}:{/if} - {$p->ver}-{$p->rel} + {$p->ver}-{$p->rel} repo_main neq $prev} id="pkgdb_{$p->repo_main}_owner"{/if}> {if $p->repo_main neq $prev} diff --git a/zoom.php b/zoom.php index a353c77..55f2920 100644 --- a/zoom.php +++ b/zoom.php @@ -63,6 +63,8 @@ $smarty->assign('page_title', 'Package: ' . $name); function getBranchPeople($params) { global $fedpkg; + + $branch = $people = null; // avoid IDE warning extract($params); $ret = null; if ($branch == 'rawhide' && isset($fedpkg['devel']['owner']) ) { @@ -96,7 +98,8 @@ if ( !isset($name) || !$name ) { try { $db = new PDO ("mysql:dbname=" . MYBASE . ";host=" . MYHOST, MYUSER, MYPASS); - $sql = "SELECT rpm.* + $sql = "SELECT rpm.*, + CONCAT(repo.url,rpm.name,'-',rpm.ver,'-',rpm.rel,'.src.rpm') as rpmurl FROM rpm INNER JOIN repo ON (repo.main=rpm.repo_main AND repo.sub=rpm.repo_sub) WHERE rpm.name='$name' -- cgit From 7ed7a3829a298742cc40c83f8c898a0f23c4b10e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 1 Aug 2010 17:39:57 +0800 Subject: don't display empty date --- index.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index 0c163b1..24d4fbd 100644 --- a/index.php +++ b/index.php @@ -58,7 +58,9 @@ try { ), 'sub_name' => $repo->sub, 'url' => $repo->url, - 'date' => date("r", $repo->stamp) + 'date' => ($repo->stamp + ? date("r", $repo->stamp) + : '') ); } $smarty->assign('repositories', $repositories); -- cgit From 14c9846503dfe5dce78205001bae82a75c557116 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 1 Aug 2010 18:15:03 +0800 Subject: rename link from ViewVC to GitWeb --- zoom.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zoom.php b/zoom.php index 55f2920..0a1c2e1 100644 --- a/zoom.php +++ b/zoom.php @@ -167,7 +167,7 @@ if ( !isset($name) || !$name ) { '?bug_status=NEW&bug_status=ASSIGNED&bug_status=ON_QA' . '&component=' . $name; } - $summary['ViewVC'] + $summary['GitWeb'] = 'http://pkgs.fedoraproject.org/gitweb/?p=' . $name . '.git'; $summary['PkgDB'] = $fedcli->getPackageURL($name); -- cgit From 10f084bb32721f81c07292af92f5cd39e681ee08 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 1 Aug 2010 18:15:18 +0800 Subject: rename link from ViewVC to GitWeb --- smarty/templates/rpmphp/zoom.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smarty/templates/rpmphp/zoom.tpl b/smarty/templates/rpmphp/zoom.tpl index c2a5659..d8416ac 100644 --- a/smarty/templates/rpmphp/zoom.tpl +++ b/smarty/templates/rpmphp/zoom.tpl @@ -43,7 +43,7 @@ {if $k eq 'Bugzilla'} Active bugs - {elseif $k eq 'URL' or $k eq 'ViewVC' or $k eq 'PkgDB'} + {elseif $k eq 'URL' or $k eq 'GitWeb' or $k eq 'PkgDB'} {$v} {else} {$v} -- cgit From 8aebf3179ed6b21d638218985922dc96fdcbb3c3 Mon Sep 17 00:00:00 2001 From: "Johan \"Papa\" Cwiklinski" Date: Sun, 1 Aug 2010 13:18:39 +0200 Subject: Remove hack that renames devel branch to rawhide --- all.php | 2 +- install.txt | 2 +- scripts/rpmphp.js | 3 --- zoom.php | 8 +------- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/all.php b/all.php index 8e42e46..6976dc5 100644 --- a/all.php +++ b/all.php @@ -110,7 +110,7 @@ function report ($db) if (isset($rpms[$repo->main."-".$repo->sub])) { $rpm=$rpms[$repo->main."-".$repo->sub]; - $maxver = (isset($rpms["rawhide-"]) ? $rpms["rawhide-"]->ver : ""); + $maxver = (isset($rpms["devel-"]) ? $rpms["devel-"]->ver : ""); switch ($repo->sub) { case "base": diff --git a/install.txt b/install.txt index 65a6a67..a9a1fe4 100644 --- a/install.txt +++ b/install.txt @@ -84,7 +84,7 @@ $distros=array( array("main"=>"F-9", "sub"=>"updates", "repo"=>"http://download.fedora.redhat.com/pub/fedora/linux/updates/9/x86_64/"), array("main"=>"F-9", "sub"=>"testing", "repo"=>"http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/9/x86_64/"), - array("main"=>"rawhide", "sub"=>"", "repo"=>"http://download.fedora.redhat.com/pub/fedora/linux/development/x86_64/os/") + array("main"=>"devel", "sub"=>"", "repo"=>"http://download.fedora.redhat.com/pub/fedora/linux/development/x86_64/os/") ); Action("CREATE TABLE `repo` ( diff --git a/scripts/rpmphp.js b/scripts/rpmphp.js index 6723438..91f4fb9 100644 --- a/scripts/rpmphp.js +++ b/scripts/rpmphp.js @@ -35,9 +35,6 @@ function initZoomJS(name) data, function(k, v){ _data = data[k]; - if ( k === 'devel' ) { - k = 'rawhide'; - } _owner_cell = $('#pkgdb_' + k + '_owner'); if ( _owner_cell ) { _owner_cell.empty().text(_data.owner); diff --git a/zoom.php b/zoom.php index 0a1c2e1..11bf489 100644 --- a/zoom.php +++ b/zoom.php @@ -67,13 +67,7 @@ function getBranchPeople($params) $branch = $people = null; // avoid IDE warning extract($params); $ret = null; - if ($branch == 'rawhide' && isset($fedpkg['devel']['owner']) ) { - if ( !$people || $people == '' || $people == 'owner' ) { - $ret = $fedpkg['devel']['owner']; - } else if ( $people == 'people') { - $ret_tmp = $fedpkg['devel']['people']; - } - } else if (isset($fedpkg[$branch]['owner'])) { + if (isset($fedpkg[$branch]['owner'])) { if ( !$people || $people == '' || $people == 'owner' ) { $ret = $fedpkg[$branch]['owner']; } else if ( $people == 'people') { -- cgit