rpms/wordnet/devel wordnet-3.0-error_message.patch, NONE, 1.1 wordnet.spec, 1.3, 1.4

Petr Pisar ppisar at fedoraproject.org
Mon Apr 26 07:42:16 UTC 2010


Author: ppisar

Update of /cvs/pkgs/rpms/wordnet/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11740

Modified Files:
	wordnet.spec 
Added Files:
	wordnet-3.0-error_message.patch 
Log Message:
Resolves: #585206, fixes Source URL, Summary and BuildRequires

wordnet-3.0-error_message.patch:
 wn.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE wordnet-3.0-error_message.patch ---
diff --git a/src/wn.c b/src/wn.c
index ddb27aa..b160392 100644
--- a/src/wn.c
+++ b/src/wn.c
@@ -344,7 +344,7 @@ static int getoptidx(char *searchtype)

 static int error_message(char *msg)
 {
-    fprintf(stderr, msg);
+    fprintf(stderr, "%s", msg);
     return(0);
 }


Index: wordnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wordnet/devel/wordnet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- wordnet.spec	27 Jul 2009 07:22:12 -0000	1.3
+++ wordnet.spec	26 Apr 2010 07:42:15 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           wordnet
 Version:        3.0
-Release:        10%{?dist}
-Summary:        A lexical database for the english language
+Release:        11%{?dist}
+Summary:        A lexical database for the English language
 
 Group:          Applications/Text
 License:        MIT
 URL:            http://wordnet.princeton.edu
-Source0:        http://wordnet.princeton.edu/%{version}/WordNet-%{version}.tar.bz2
+Source0:        http://wordnetcode.princeton.edu/%{version}/WordNet-%{version}.tar.bz2
 Patch0:         wordnet-3.0-CVE-2008-2149.patch
 Patch1:         wordnet-3.0-CVE-2008-3908.patch
 Patch2:         wordnet-3.0-fix_man.patch
@@ -15,13 +15,13 @@ Patch4:         wordnet-3.0-src_stubs_c.
 Patch5:         wordnet-3.0-wishwn_manpage.patch
 Patch6:         wordnet-3.0-use_system_tk_headers.patch
 Patch7:         wordnet-3.0-libtool.patch
+# Bug #585206
+Patch8:         wordnet-3.0-error_message.patch
 Requires:       tcl, tk
 BuildRequires:  automake >= 1.8
 BuildRequires:  libtool
 BuildRequires:  tcl-devel
 BuildRequires:  tk-devel
-BuildRequires:  libX11-devel
-BuildRequires:  libXft-devel
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
@@ -53,6 +53,7 @@ applications based on WordNet.
 %patch5 -p1 -b .wishwn_manpage
 %patch6 -p1 -b .use_system_tk_headers
 %patch7 -p1 -b .libtool
+%patch8 -p1 -b .error_message
 # delete the include/tk dir, since we do not use the included tk headers
 rm -rf include/tk
 
@@ -101,6 +102,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 26 2010 Petr Pisar <ppisar at redhat.com> - 3.0-11
+- Fix error message printing (#585206)
+- Fix Source0 URL and Summary typo
+- Remove libX11-devel and libXft-devel BuildRequires as they are inherited
+  from tk-devel. Keep tcl-devel as tcl.h is included directly.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



More information about the scm-commits mailing list