rpms/git-bugzilla/F-12 0001-Do-not-default-to-GNOME-bugzilla.patch, NONE, 1.1 0002-Fix-a-warning-about-uninitialized-value.patch, NONE, 1.1 git-bugzilla.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Lubomir Rintel lkundrak at fedoraproject.org
Mon Jan 4 21:37:21 UTC 2010


Author: lkundrak

Update of /cvs/pkgs/rpms/git-bugzilla/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5869/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	0001-Do-not-default-to-GNOME-bugzilla.patch 
	0002-Fix-a-warning-about-uninitialized-value.patch 
	git-bugzilla.spec 
Log Message:
Import git-bugzilla

0001-Do-not-default-to-GNOME-bugzilla.patch:
 git-send-bugzilla.pl |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Do-not-default-to-GNOME-bugzilla.patch ---
>From be0337f39091a91b780d55ef4baece05b25a3211 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Sat, 19 Dec 2009 17:22:28 +0100
Subject: [PATCH 1/2] Do not default to GNOME bugzilla

---
 git-send-bugzilla.pl |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/git-send-bugzilla.pl b/git-send-bugzilla.pl
index c26af96..8f30460 100755
--- a/git-send-bugzilla.pl
+++ b/git-send-bugzilla.pl
@@ -37,7 +37,7 @@ sub authenticate {
 	}
 
 	print STDERR "Logging in as $username...\n";
-	$mech->get("$url/index.cgi?GoAheadAndLogIn=1");
+	$mech->get("$url?GoAheadAndLogIn=1");
 	die "Can't fetch login form: ", $mech->res->status_line
 		unless $mech->success;
 
@@ -106,7 +106,7 @@ sub add_attachment {
 		unless $mech->success;
 
 	die "Error while attaching patch. Aborting\n"
-		unless $mech->title =~ /Changes Submitted/i;
+		unless $mech->title =~ /(Changes Submitted|Attachment \d+ added)/i;
 }
 
 sub read_repo_config {
@@ -131,7 +131,14 @@ sub usage {
 	exit $exitcode;
 }
 
-$url = read_repo_config 'url', 'str', 'http://bugzilla.gnome.org';
+$url = read_repo_config 'url';
+die <<ERROR unless $url;
+URL of your bugzilla instance is not configured,
+Please configure your bugzilla instance like:
+
+   git config bugzilla.url http://bugzilla.gnome.org
+   git config bugzilla.url http://bugzilla.redhat.com
+ERROR
 my $username = read_repo_config 'username';
 my $password = read_repo_config 'password';
 my $numbered = read_repo_config 'numbered', 'bool', 0;
-- 
1.6.5.5


0002-Fix-a-warning-about-uninitialized-value.patch:
 git-send-bugzilla.pl |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0002-Fix-a-warning-about-uninitialized-value.patch ---
>From 2bdc1072ec9adb0886732bd7d58da91625c5fe9a Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Sat, 19 Dec 2009 17:23:27 +0100
Subject: [PATCH 2/2] Fix a warning about uninitialized value

---
 git-send-bugzilla.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-send-bugzilla.pl b/git-send-bugzilla.pl
index 8f30460..e40402e 100755
--- a/git-send-bugzilla.pl
+++ b/git-send-bugzilla.pl
@@ -51,7 +51,7 @@ sub authenticate {
 
 sub get_patch_info {
 	my $rev1 = shift;
-	my $rev2 = shift | '';
+	my $rev2 = shift || '';
 
 	my $description;
 	my $comment = '';
-- 
1.6.5.5



--- NEW FILE git-bugzilla.spec ---
Name:           git-bugzilla
Version:        0
Release:        0.2.20091211git%{?dist}
Summary:        Attach patches to a bugzilla bug

Group:          Development/Tools
License:        GPLv2+
URL:            http://git.collabora.co.uk/?p=user/cassidy/git-bugzilla
# wget -O git-bugzilla-fc2be92.tar.gz \
# 'http://git.collabora.co.uk/?p=user/cassidy/git-bugzilla;a=snapshot;h=fc2be92;sf=tgz'
Source0:        %{name}-fc2be92.tar.gz
Patch0:         0001-Do-not-default-to-GNOME-bugzilla.patch
Patch1:         0002-Fix-a-warning-about-uninitialized-value.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  asciidoc
BuildRequires:  xmlto
Requires:       git-core
Requires:       perl(WWW::Mechanize)
BuildArch:      noarch

%description
Add commits as attachments to a Bugzilla bug.


%prep
%setup -q -n %{name}
%patch0 -p1 -b .gnome
%patch1 -p1 -b .warn


%build
make %{?_smp_mflags} all doc


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix}
make -C docs install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/git-send-bugzilla
%{_mandir}/man1/git-send-bugzilla.1*


%changelog
* Sat Dec 19 2009 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 0-0.2.20091211git
- Add missing Require
- Do not default to GNOME bugzilla
- Fix a subtle warning
- Use upstream generated tarball

* Fri Dec 11 2009 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 0-0.1.20091211git
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git-bugzilla/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	4 Jan 2010 20:26:59 -0000	1.1
+++ .cvsignore	4 Jan 2010 21:37:21 -0000	1.2
@@ -0,0 +1 @@
+git-bugzilla-fc2be92.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git-bugzilla/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Jan 2010 20:26:59 -0000	1.1
+++ sources	4 Jan 2010 21:37:21 -0000	1.2
@@ -0,0 +1 @@
+7f6e26869118c60b0cdd0b258400fe67  git-bugzilla-fc2be92.tar.gz




More information about the fedora-extras-commits mailing list