rpms/snownews/devel snownews-1.5.7-charset.patch, NONE, 1.1 snownews-1.5.7-manpath.patch, NONE, 1.1 snownews-1.5.7-softlink.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 snownews.spec, 1.5, 1.6 sources, 1.3, 1.4 snownews-1.5.6.1-destdir.patch, 1.1, NONE snownews-1.5.6.1-manpath.patch, 1.1, NONE

Zing Zing Shishak (shishz) fedora-extras-commits at redhat.com
Sun Aug 7 02:37:49 UTC 2005


Author: shishz

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

Modified Files:
	.cvsignore snownews.spec sources 
Added Files:
	snownews-1.5.7-charset.patch snownews-1.5.7-manpath.patch 
	snownews-1.5.7-softlink.patch 
Removed Files:
	snownews-1.5.6.1-destdir.patch snownews-1.5.6.1-manpath.patch 
Log Message:
* Mon Aug  6 2005 Zing <shishz at hotpop.com> - 1.5.7-2
- add runtime charset detection, #155073
- use dist macro

* Fri Jul 29 2005 Zing <shishz at hotpop.com> - 1.5.7-1
- update to 1.5.7
- drop destdir patch, fixed upstream
- fixup softlink for snow2opml


snownews-1.5.7-charset.patch:

--- NEW FILE snownews-1.5.7-charset.patch ---
--- 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 <libintl.h>
 #	include <locale.h>
+#ifndef TARGET_CHARSET
+#       include <langinfo.h>
+#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, "...");
 			

snownews-1.5.7-manpath.patch:

--- NEW FILE snownews-1.5.7-manpath.patch ---
--- snownews-1.5.7/Makefile.orig	2005-07-29 10:09:33.000000000 -0400
+++ snownews-1.5.7/Makefile	2005-07-29 10:14:02.000000000 -0400
@@ -75,17 +75,17 @@
 	done
 
 install-man: manpages
-	if [ ! -d "$(DESTDIR)$(PREFIX)/man/man1" ]; then \
-		mkdir -p $(DESTDIR)$(PREFIX)/man/man1; \
+	if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/man1" ]; then \
+		mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1; \
 	fi
-	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/man/man1
-	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/man/man1
+	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/share/man/man1
+	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/share/man/man1
 	
 	for L in $(LANGS); do \
-		if [ ! -d "$(DESTDIR)$(PREFIX)/man/$$L/man1" ]; then \
-			mkdir -p $(DESTDIR)$(PREFIX)/man/$$L/man1; \
+		if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/$$L/man1" ]; then \
+			mkdir -p $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \
 		fi; \
-		$(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(PREFIX)/man/$$L/man1; \
+		$(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \
 	done
 
 ### Cleanup ###

snownews-1.5.7-softlink.patch:

--- NEW FILE snownews-1.5.7-softlink.patch ---
--- snownews-1.5.7/Makefile.orig	2005-07-29 10:09:33.000000000 -0400
+++ snownews-1.5.7/Makefile	2005-07-29 10:27:07.000000000 -0400
@@ -62,7 +62,7 @@
 	$(INSTALL) -s snownews $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL) opml2snow $(DESTDIR)$(PREFIX)/bin
 	if [ ! -f "$(DESTDIR)$(PREFIX)/bin/snow2opml" ]; then \
-		ln -sf $(DESTDIR)$(PREFIX)/bin/opml2snow $(DESTDIR)$(PREFIX)/bin/snow2opml; \
+		ln -sf opml2snow $(DESTDIR)$(PREFIX)/bin/snow2opml; \
 	fi;
 	$(INSTALL) snowsync $(DESTDIR)$(PREFIX)/bin
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/snownews/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Mar 2005 10:17:52 -0000	1.3
+++ .cvsignore	7 Aug 2005 02:37:47 -0000	1.4
@@ -1,2 +1,2 @@
-snownews-1.5.3.tar.gz
-snownews-1.5.6.1.tar.gz
+snownews-1.5.7.tar.gz
+clog


Index: snownews.spec
===================================================================
RCS file: /cvs/extras/rpms/snownews/devel/snownews.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- snownews.spec	25 Mar 2005 10:18:18 -0000	1.5
+++ snownews.spec	7 Aug 2005 02:37:47 -0000	1.6
@@ -1,15 +1,16 @@
 Name: 		snownews
-Version: 	1.5.6.1
-Release: 	3.FC4
+Version: 	1.5.7
+Release: 	2%{?dist}
 Summary: 	A text mode RSS/RDF newsreader
 Group: 		Applications/Internet
 License: 	GPL
 Url:		http://home.kcore.de/~kiza/software/snownews
-Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.6.1.tar.gz
+Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.7.tar.gz
 Patch0:		snownews-1.5.3-nocheck.patch
-Patch1:		snownews-1.5.6.1-manpath.patch
+Patch1:		snownews-1.5.7-manpath.patch
 Patch2:		snownews-1.5.6.1-nostrip.patch
-Patch3:		snownews-1.5.6.1-destdir.patch
+Patch3:		snownews-1.5.7-softlink.patch
+Patch4:		snownews-1.5.7-charset.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
@@ -29,6 +30,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 ./configure --prefix=%{_prefix} --charset=UTF-8
@@ -46,12 +48,22 @@
 %defattr(-,root,root)
 %doc README* AUTHOR COPYING CREDITS Changelog
 %{_bindir}/opml2snow
+%{_bindir}/snow2opml
 %{_bindir}/snownews
 %{_bindir}/snowsync
 %{_mandir}/man1/*
 %{_mandir}/*/man1/*
 
 %changelog
+* Mon Aug  6 2005 Zing <shishz at hotpop.com> - 1.5.7-2
+- add runtime charset detection, #155073
+- use dist macro
+
+* Fri Jul 29 2005 Zing <shishz at hotpop.com> - 1.5.7-1
+- update to 1.5.7
+- drop destdir patch, fixed upstream
+- fixup softlink for snow2opml
+
 * Thu Mar 24 2005 Warren Togami <wtogami at redhat.com> - 1.5.6.1-3
 - macroize dirs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snownews/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Mar 2005 10:17:52 -0000	1.3
+++ sources	7 Aug 2005 02:37:47 -0000	1.4
@@ -1 +1 @@
-466ca82e8df03d6126d6cc0f20772025  snownews-1.5.6.1.tar.gz
+75ffa004e755a233f49b1cdfcd9e3d85  snownews-1.5.7.tar.gz


--- snownews-1.5.6.1-destdir.patch DELETED ---


--- snownews-1.5.6.1-manpath.patch DELETED ---




More information about the fedora-extras-commits mailing list