rpms/bazaar/devel bazaar-1.4.2-macropen.patch, NONE, 1.1 bazaar-1.4.2-neon026.patch, NONE, 1.1 bazaar.spec, 1.15, 1.16

[Zoltan Kota (zkota)]

Author: zkota

Update of /cvs/pkgs/rpms/bazaar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26737

Modified Files:
	bazaar.spec 
Added Files:
	bazaar-1.4.2-macropen.patch bazaar-1.4.2-neon026.patch 
Log Message:
* Sat Aug 25 2007 Zoltan Kota <z.kota at gmx.net> 1.4.2-9
- Update license tag
- Add awk to BuildRequires
- Add patches to fix issues related to glibc open() changes
  and neon 0.27 API changes (Joe Orton)


bazaar-1.4.2-macropen.patch:

--- NEW FILE bazaar-1.4.2-macropen.patch ---
--- thelove at canonical.com---dists--bazaar--1.4/src/hackerlab/vu/vu.c.macropen	2005-06-20 23:00:03.000000000 +0100
+++ thelove at canonical.com---dists--bazaar--1.4/src/hackerlab/vu/vu.c	2007-08-09 09:21:27.000000000 +0100
@@ -939,7 +939,7 @@
   int fd;
 
   handler = vu_path_dispatch (path);
-  fd = handler->vtable->open(errn, path, flags, mode, handler->closure);
+  fd = (handler->vtable->open)(errn, path, flags, mode, handler->closure);
   if (fd >= 0)
     {
       if ((ar_size (fd_handlers.void_ptr) <= fd) || !fd_handlers.hp [fd].vtable)

bazaar-1.4.2-neon026.patch:

--- NEW FILE bazaar-1.4.2-neon026.patch ---
--- thelove at canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs-sftp.c.neon026	2005-06-20 22:59:37.000000000 +0100
+++ thelove at canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs-sftp.c	2007-08-22 16:15:27.000000000 +0100
@@ -1496,7 +1496,7 @@
    */
   arch_uri_heuristics (&parsed_uri);
 
-  *user = str_save (0, parsed_uri.authinfo);
+  *user = str_save (0, parsed_uri.userinfo);
   *hostname = str_save (0, parsed_uri.host);
   if (parsed_uri.port)
     {
--- thelove at canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs.c.neon026	2007-08-22 16:15:27.000000000 +0100
+++ thelove at canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs.c	2007-08-22 16:15:51.000000000 +0100
@@ -513,10 +513,10 @@
     char *at_pos = str_chr_index (parsed_uri->host, '@');
     if (!at_pos)
         return;
-    parsed_uri->authinfo = str_replace (parsed_uri->authinfo, 
-					str_alloc_cat (0, parsed_uri->authinfo, "@"));
-    parsed_uri->authinfo = str_replace (parsed_uri->authinfo, 
-					str_alloc_cat_n (0, parsed_uri->authinfo, parsed_uri->host, at_pos - parsed_uri->host));
+    parsed_uri->userinfo = str_replace (parsed_uri->userinfo, 
+					str_alloc_cat (0, parsed_uri->userinfo, "@"));
+    parsed_uri->userinfo = str_replace (parsed_uri->userinfo, 
+					str_alloc_cat_n (0, parsed_uri->userinfo, parsed_uri->host, at_pos - parsed_uri->host));
     parsed_uri->host = str_replace (parsed_uri->host, str_save (0, at_pos + 1));
 }
 
--- thelove at canonical.com---dists--bazaar--1.4/src/baz/libarch/tests/unit-sftp.c.neon026	2005-06-20 22:59:37.000000000 +0100
+++ thelove at canonical.com---dists--bazaar--1.4/src/baz/libarch/tests/unit-sftp.c	2007-08-22 16:15:27.000000000 +0100
@@ -44,7 +44,7 @@
   invariant_str_cmp (parsed_uri.host, "email.com at host.phwoar");
   arch_uri_heuristics (&parsed_uri);
   invariant_str_cmp (parsed_uri.host, "host.phwoar");
-  invariant_str_cmp (parsed_uri.authinfo, "user at email.com");
+  invariant_str_cmp (parsed_uri.userinfo, "user at email.com");
   invariant_int_cmp (parsed_uri.port, 0);
   ne_uri_free(&parsed_uri);
 


Index: bazaar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bazaar/devel/bazaar.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bazaar.spec	16 Sep 2006 18:25:39 -0000	1.15
+++ bazaar.spec	25 Aug 2007 21:59:28 -0000	1.16
@@ -1,15 +1,17 @@
 Name:       bazaar
 Version:    1.4.2
 Summary:    A distributed revision control system
-Release:    8%{?dist}
-License:    GPL
+Release:    9%{?dist}
+License:    GPLv2
 Group:      Development/Tools
 Source:     http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz
 Source1:    http://bazaar.canonical.com/releases/src/bazaar-doc_1.4.tar.gz
 Patch0:     bazaar-neon-escape.patch
+Patch1:     bazaar-1.4.2-macropen.patch
+Patch2:     bazaar-1.4.2-neon026.patch
 URL:        http://bazaar.canonical.com/
 
-BuildRequires: automake which gettext python-docutils tetex-latex
+BuildRequires: automake which gettext python-docutils tetex-latex gawk
 BuildRequires: neon-devel gpgme-devel
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,6 +30,8 @@
 # unpack the source
 %setup -q -n thelove at canonical.com---dists--bazaar--1.4
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 # unpack the documentation
 %setup -q -n thelove at canonical.com---dists--bazaar--1.4 -D -T -a 1
 
@@ -85,6 +89,12 @@
 %{_mandir}/*/*
 
 %changelog
+* Sat Aug 25 2007 Zoltan Kota <z.kota at gmx.net> 1.4.2-9
+- Update license tag
+- Add awk to BuildRequires
+- Add patches to fix issues related to glibc open() changes
+  and neon 0.27 API changes (Joe Orton)
+
 * Sat Sep 16 2006 Shahms E. King <shahms at shahms.com> 1.4.2-8
 - Rebuild for FC6