rpms/elinks/devel .cvsignore, 1.23, 1.24 elinks-0.10.1-utf_8_io-default.patch, 1.1, 1.2 elinks-0.11.0-getaddrinfo.patch, 1.1, 1.2 elinks-0.11.0-union.patch, 1.1, 1.2 elinks.spec, 1.53, 1.54 sources, 1.23, 1.24 elinks-0.11.1-negotiate.patch, 1.3, NONE elinks-0.11.4rc0-chunkedgzip.patch, 1.1, NONE

Ondrej Vasik (ovasik) fedora-extras-commits at redhat.com
Wed Jul 2 08:49:34 UTC 2008 

Author: ovasik

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

Modified Files:
	.cvsignore elinks-0.10.1-utf_8_io-default.patch 
	elinks-0.11.0-getaddrinfo.patch elinks-0.11.0-union.patch 
	elinks.spec sources 
Removed Files:
	elinks-0.11.1-negotiate.patch 
	elinks-0.11.4rc0-chunkedgzip.patch 
Log Message:
Upgrade to new upstream pre-release, in general better than stable 0.11.4, solves several long-term elinks issues


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	21 Jun 2008 15:58:51 -0000	1.23
+++ .cvsignore	2 Jul 2008 08:48:38 -0000	1.24
@@ -1 +1 @@
-elinks-0.11.4.tar.bz2
+elinks-0.12pre1.tar.bz2

elinks-0.10.1-utf_8_io-default.patch:

Index: elinks-0.10.1-utf_8_io-default.patch
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks-0.10.1-utf_8_io-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- elinks-0.10.1-utf_8_io-default.patch	28 Jan 2005 18:11:50 -0000	1.1
+++ elinks-0.10.1-utf_8_io-default.patch	2 Jul 2008 08:48:38 -0000	1.2
@@ -1,11 +1,12 @@
---- elinks-0.10.1/src/config/options.inc.utf_8_io-default	2005-01-04 01:42:56.000000000 +0100
-+++ elinks-0.10.1/src/config/options.inc	2005-01-28 17:54:42.568968720 +0100
-@@ -747,7 +747,7 @@
- 		"terminal.")),
- 
+diff -urNp elinks-0.12pre1-orig/src/config/options.inc elinks-0.12pre1/src/config/options.inc
+--- elinks-0.12pre1-orig/src/config/options.inc	2008-07-01 02:11:44.000000000 +0200
++++ elinks-0.12pre1/src/config/options.inc	2008-07-01 16:00:34.000000000 +0200
+@@ -859,7 +859,7 @@ static struct option_info config_options
+ 	 * not defined, it should not be possible to set UTF-8 as "codepage";
+ 	 * please report any such possibilities as bugs.)  */
  	INIT_OPT_BOOL("terminal._template_", N_("UTF-8 I/O"),
 -		"utf_8_io", 0, 0,
 +		"utf_8_io", 0, 1,
- 		N_("Enable I/O in UTF8 for Unicode terminals. Note that currently,\n"
- 		"only the subset of UTF8 according to terminal codepage is used.")),
- 
+ 		N_("Enable I/O in UTF-8 for Unicode terminals. Note that currently,\n"
+ 		"only the subset of UTF-8 according to terminal codepage is used.\n"
+ 		"ELinks ignores this option if the terminal codepage is UTF-8.")),

elinks-0.11.0-getaddrinfo.patch:

Index: elinks-0.11.0-getaddrinfo.patch
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks-0.11.0-getaddrinfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- elinks-0.11.0-getaddrinfo.patch	10 Jan 2006 09:53:49 -0000	1.1
+++ elinks-0.11.0-getaddrinfo.patch	2 Jul 2008 08:48:38 -0000	1.2
@@ -7,7 +7,7 @@
 +	hint.ai_flags = AI_ADDRCONFIG;
  	hint.ai_family = AF_UNSPEC;
  	hint.ai_socktype = SOCK_STREAM;
--	if (getaddrinfo(name, NULL, &hint, &ai) != 0) return -1;
+-	if (getaddrinfo(name, NULL, &hint, &ai) != 0) return DNS_ERROR;
 +	switch (getaddrinfo(name, NULL, &hint, &ai))
 +	{
 +	case 0:
@@ -18,7 +18,7 @@
 +			break;
 +		/* fall through */
 +	default:
-+		return -1;
++		return DNS_ERROR;
 +	}
  
  #else

elinks-0.11.0-union.patch:

Index: elinks-0.11.0-union.patch
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks-0.11.0-union.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- elinks-0.11.0-union.patch	10 Jan 2006 09:53:49 -0000	1.1
+++ elinks-0.11.0-union.patch	2 Jul 2008 08:48:38 -0000	1.2
@@ -4,7 +4,7 @@
  };
  
  #define INIT_OPTION(name, flags, type, min, max, value, desc, capt) \
--	{ NULL_LIST_HEAD, INIT_OBJECT("option"), name, flags, type, min, max, { (struct list_head *) (value) }, desc, capt }
+-	{ NULL_LIST_HEAD, INIT_OBJECT("option"), name, flags, type, min, max, { (LIST_OF(struct option) *) (value) }, desc, capt }
 +	{ NULL_LIST_HEAD, INIT_OBJECT("option"), name, flags, type, min, max, { value }, desc, capt }
  
  extern struct option *config_options;


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- elinks.spec	21 Jun 2008 15:58:51 -0000	1.53
+++ elinks.spec	2 Jul 2008 08:48:38 -0000	1.54
@@ -1,11 +1,11 @@
 Name:      elinks
 Summary:   A text-mode Web browser
-Version:   0.11.4
-Release:   1%{?dist}
+Version:   0.12
+Release:   0.1.pre1%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
-Source:    http://elinks.or.cz/download/elinks-%{version}.tar.bz2
+Source:    http://elinks.or.cz/download/elinks-%{version}pre1.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: automake
@@ -13,6 +13,7 @@
 BuildRequires: bzip2-devel
 BuildRequires: expat-devel
 BuildRequires: libidn-devel
+Requires: zlib >= 1.2.0.2
 
 Provides:  webclient
 Obsoletes: links
@@ -26,9 +27,7 @@
 Patch4: elinks-0.11.0-sysname.patch
 Patch5: elinks-0.10.1-xterm.patch
 Patch6: elinks-0.11.0-union.patch
-Patch7: elinks-0.11.1-negotiate.patch
-Patch8: elinks-0.11.3-macropen.patch
-Patch9: elinks-0.11.4rc0-chunkedgzip.patch
+Patch7: elinks-0.11.3-macropen.patch
 
 %description
 Links is a text-based Web browser. Links does not display any images,
@@ -37,7 +36,7 @@
 quickly and swiftly displays Web pages.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}pre1
 
 # Prevent crash when HOME is unset (bug #90663).
 %patch0 -p1
@@ -52,12 +51,8 @@
 %patch5 -p1
 # Fix #157300 - Strange behavior on ppc64
 %patch6 -p1
-# Fix #194096 – elinks should support negotiate-auth
-%patch7 -p1
 # fix for open macro in new glibc 
-%patch8 -p1
-# fix for broken gzip compression for chunked pages
-%patch9 -p1
+%patch7 -p1
 
 %build
 ./autogen.sh
@@ -88,6 +83,13 @@
 %{_mandir}/man5/*
 
 %changelog
+* Tue Jul  1 2008 Ondrej Vasik <ovasik at redhat.com> 0.12-0.1.pre1
+- unstable elinks-0.12 pre1, solves several long-term issues 
+  unsolvable (or very hard to solve) in 0.11.4 (like #173411),
+  in general is elinks-0.12pre1 considered better than 0.11.4
+- dropped patches negotiate-auth, chunkedgzip - included in 0.12pre1,
+  modified few others due source code changes
+
 * Sat Jun 21 2008 Ondrej Vasik <ovasik at redhat.com> 0.11.4-1
 - new stable upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	21 Jun 2008 15:58:51 -0000	1.23
+++ sources	2 Jul 2008 08:48:38 -0000	1.24
@@ -1 +1 @@
-88036a518ebc4f1150a7e14b29f9d8db  elinks-0.11.4.tar.bz2
+23f745c33ea91f91ef5b2db385efdfff  elinks-0.12pre1.tar.bz2


--- elinks-0.11.1-negotiate.patch DELETED ---


--- elinks-0.11.4rc0-chunkedgzip.patch DELETED ---

More information about the scm-commits mailing list