From ee063b0716276346f632735e481e0b1568123af4 Mon Sep 17 00:00:00 2001 From: Zing Zing Shishak Date: Aug 03 2008 01:02:40 +0000 Subject: - update to 1.5.10 - drop charset patch (upstream) --- diff --git a/snownews-1.5.7-charset.patch b/snownews-1.5.7-charset.patch deleted file mode 100644 index 18f9a33..0000000 --- a/snownews-1.5.7-charset.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- snownews-1.5.7/config.h.orig 2005-06-05 05:50:22.000000000 -0400 -+++ snownews-1.5.7/config.h 2005-08-01 21:44:51.000000000 -0400 -@@ -27,10 +27,9 @@ - #include "version.h" - #include "netio.h" - --/* Set your charset here. ISO-8859-1 is default. */ --#ifndef TARGET_CHARSET --#define TARGET_CHARSET "ISO-8859-1" --#endif -+/* Set your charset here. This overrides the CODESET setting -+ as reported by nl_langinfo() */ -+/* #define TARGET_CHARSET "UTF-8" */ - - struct feed { - char *feedurl; /* Non hashified URL */ -@@ -126,10 +125,16 @@ - #ifdef LOCALEPATH - # include - # include -+#ifndef TARGET_CHARSET -+# include -+#endif - #endif - - #ifdef LOCALEPATH - # define _(String) gettext (String) -+#ifndef TARGET_CHARSET -+# define TARGET_CHARSET nl_langinfo(CODESET) -+#endif - #else - # define _(String) (String) - # define ngettext(Singular, Plural, n) (Plural) ---- snownews-1.5.7/interface.c.orig 2005-06-05 05:50:22.000000000 -0400 -+++ snownews-1.5.7/interface.c 2005-08-01 21:46:30.000000000 -0400 -@@ -1151,7 +1151,8 @@ - else - columns = COLS-9-strlen(_("new")); - -- mvaddnstr (ypos, 1, cur_ptr->title, columns); -+ localized_msg = iconvert(cur_ptr->title); -+ mvaddnstr (ypos, 1, localized_msg, columns); - if (xmlStrlen((xmlChar *)cur_ptr->title) > columns) - mvaddstr (ypos, columns+1, "..."); - diff --git a/snownews-1.5.7-manpage.patch b/snownews-1.5.7-manpage.patch deleted file mode 100644 index 1dc42be..0000000 --- a/snownews-1.5.7-manpage.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- snownews-1.5.7/doc/man/snownews.1.in.orig 2006-03-20 21:17:01.000000000 -0500 -+++ snownews-1.5.7/doc/man/snownews.1.in 2006-03-20 21:17:52.000000000 -0500 -@@ -184,19 +184,6 @@ - .I http://your_proxy.org:PORT/ - (http://proxy.your_isp.com:8080/). - .P --.B Automatic update checking --.P --Once a week the program will automatically check for a new version when it exits. --It will request a file named "version" from my webserver and compare --the returned value with the local program version. If they differ it --notifies the user of a new version. It is done on exit to be least --annoying I hope. This way you can easily ignore it if you don't want --to upgrade for some reason or can't, because you're using a package --that came with your distribution, etc. To disable this check, put the value ---1 into the file ~/.snownews/updatecheck. Snownews will --not transfer anything to my server. It will just download a file --containing the version number and compare it locally. --.P - .B Plugins - .P - Snownews has a plugin architecture that allows to load feeds from external diff --git a/snownews.spec b/snownews.spec index 91c504e..d591ae5 100644 --- a/snownews.spec +++ b/snownews.spec @@ -1,15 +1,14 @@ Name: snownews -Version: 1.5.9 +Version: 1.5.10 Release: 1%{?dist} Summary: A text mode RSS/RDF newsreader Group: Applications/Internet License: GPLv2 Url: http://home.kcore.de/~kiza/software/snownews -Source0: http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.9.tar.gz +Source0: http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.10.tar.gz Patch0: snownews-1.5.3-nocheck.patch Patch2: snownews-1.5.6.1-nostrip.patch -Patch4: snownews-1.5.7-charset.patch -Patch5: snownews-1.5.7-manpage.patch +Patch5: snownews-1.5.10-manpage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel BuildRequires: ncurses-devel @@ -27,11 +26,10 @@ with any version of libxml2. %setup -q %patch0 -p1 %patch2 -p1 -%patch4 -p1 %patch5 -p1 %build -./configure --prefix=%{_prefix} --charset=UTF-8 +./configure --prefix=%{_prefix} EXTRA_CFLAGS="$RPM_OPT_FLAGS -fpie" EXTRA_LDFLAGS="-pie" make %{?_smp_mflags} %install @@ -52,6 +50,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/*/man1/* %changelog +* Sat Aug 2 2008 Zing - 1.5.10-1 +- update to 1.5.10 +- drop charset patch (upstream) + * Thu Apr 17 2008 Zing - 1.5.9-1 - update to 1.5.9