rpms/hunspell/F-11 hunspell-1.2.8-2784983.defaultlanguage.patch, 1.3, 1.4 hunspell.spec, 1.62, 1.63

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21831/F-11

Modified Files:
	hunspell-1.2.8-2784983.defaultlanguage.patch hunspell.spec 
Log Message:
fix up warnings

hunspell-1.2.8-2784983.defaultlanguage.patch:

Index: hunspell-1.2.8-2784983.defaultlanguage.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/F-11/hunspell-1.2.8-2784983.defaultlanguage.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hunspell-1.2.8-2784983.defaultlanguage.patch	7 Jul 2009 14:04:27 -0000	1.3
+++ hunspell-1.2.8-2784983.defaultlanguage.patch	9 Jul 2009 08:13:52 -0000	1.4
@@ -9,7 +9,7 @@ diff -ru hunspell-1.2.8.orig/man/hunspel
 -Without locale support, the default personal dictionary is
 -the $HOME/.hunspell_default.
 +The default dictionary depends on the locale settings. The
-+following environment variables are searched: LANGUAGE, LC_ALL,
++following environment variables are searched: LC_ALL,
 +LC_MESSAGES, and LANG. If none are set then the default personal
 +dictionary is $HOME/.hunspell_default.
  
@@ -20,7 +20,7 @@ diff -ru hunspell-1.2.8.orig/man/hunspel
  .I \-p.
  .SH FILES
 +The default dictionary depends on the locale settings. The
-+following environment variables are searched: LANGUAGE, LC_ALL,
++following environment variables are searched: LC_ALL,
 +LC_MESSAGES, and LANG. If none are set then the following
 +fallbacks are used:
 +
@@ -59,10 +59,10 @@ diff -ru hunspell-1.2.8.orig/src/tools/h
 -			    if (at) *at = '\0';
 -			} else {
 +			/*
-+			 * Search in order of LANGUAGE, LC_ALL, LC_MESSAGES &
++			 * Search in order of LC_ALL, LC_MESSAGES &
 +			 * LANG
 +			*/
-+			const char *tests[] = { "LANGUAGE", "LC_ALL", "LC_MESSAGES", "LANG" };
++			const char *tests[] = { "LC_ALL", "LC_MESSAGES", "LANG" };
 +			for (size_t i = 0; i < sizeof(tests) / sizeof(const char*); ++i) {
 +				if ((dicname=getenv(tests[i])) && strcmp(dicname, "") != 0) {
 +					dicname = mystrdup(dicname);


Index: hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/F-11/hunspell.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- hunspell.spec	7 Jul 2009 14:04:27 -0000	1.62
+++ hunspell.spec	9 Jul 2009 08:13:52 -0000	1.63
@@ -1,7 +1,7 @@
 Name:      hunspell
 Summary:   A spell checker and morphological analyzer library
 Version:   1.2.8
-Release:   6%{?dist}
+Release:   7%{?dist}
 Source0:   http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz
 Source1:   http://people.debian.org/~agmartin/misc/ispellaff2myspell
 Source2:   http://people.redhat.com/caolanm/hunspell/wordlist2hunspell
@@ -42,13 +42,15 @@ EOF
 chmod +x %{__perl_requires}
 
 %build
-libtoolize --automake --force
 aclocal -I m4
+libtoolize --force --copy
+automake --add-missing --copy
 autoconf
-automake
-%configure --disable-static  --with-ui --with-readline
-for i in man/*.? man/hu/*.?; do
-    iconv -f ISO-8859-2 -t UTF-8 $i > $i.new
+%configure --disable-rpath --disable-static  --with-ui --with-readline
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+for i in AUTHORS.myspell; do
+    iconv -f ISO-8859-1 -t UTF-8 $i > $i.new
     mv -f $i.new $i
 done
 make %{?_smp_mflags}
@@ -56,7 +58,6 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-%find_lang %{name}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_bindir}/example
@@ -67,6 +68,7 @@ install -m 755 src/tools/makealias $RPM_
 install -m 755 src/tools/wordforms $RPM_BUILD_ROOT/%{_bindir}/wordforms
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/ispellaff2myspell
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/wordlist2hunspell
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/hunspell.3.gz
 
 %changelog
+* Thu Jul 09 2009 Caolan McNamara <caolanm at redhat.com> - 1.2.8-7
+- fix up rpmlint warnings
+
 * Tue Jul 07 2009 Caolan McNamara <caolanm at redhat.com> - 1.2.8-6
 - Resolves: rhbz#509882 ignore an empty LANGUAGE variable