rpms/namazu/devel namazu-newgettext3.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 namazu.spec, 1.5, 1.6 sources, 1.3, 1.4 namazu-2.0.6-newgettext3.patch, 1.1, NONE needs.rebuild, 1.1, NONE

[Akira Tagoh (tagoh)]

Author: tagoh

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

Modified Files:
	.cvsignore namazu.spec sources 
Added Files:
	namazu-newgettext3.patch 
Removed Files:
	namazu-2.0.6-newgettext3.patch needs.rebuild 
Log Message:
* Thu Sep 14 2006 Akira TAGOH <tagoh at redhat.com> - 2.0.16-1
- New upstream release.
- namazu-newgettext3.patch: updated.

namazu-newgettext3.patch:

--- NEW FILE namazu-newgettext3.patch ---
diff -pruN namazu-2.0.16.orig/nmz/i18n.c namazu-2.0.16/nmz/i18n.c
--- namazu-2.0.16.orig/nmz/i18n.c	2006-02-06 03:53:30.000000000 +0900
+++ namazu-2.0.16/nmz/i18n.c	2006-09-14 20:55:17.000000000 +0900
@@ -50,7 +50,6 @@
  */
 
 static const char *guess_category_value ( const char *categoryname );
-static char *get_lang_by_category ( const char *categoryname );
 static int _purification_lang( char *lang, size_t n );
 
 
@@ -60,57 +59,40 @@ static int _purification_lang( char *lan
 static const char *
 guess_category_value (const char *categoryname)
 {
+    const char *language;
     const char *retval;
 
     if (!strcmp(categoryname, "LC_MESSAGES")) {
 
 	/* The highest priority value is the `LANGUAGE' environment
-	   variable.  This is a GNU extension.  */
-	retval = getenv ("LANGUAGE");
-	if (retval != NULL && retval[0] != '\0')
-	    return retval;
+	   variable.  But we don't use the value if the currently selected
+           locale is the C locale.  This is a GNU extension.  */
+	language = getenv ("LANGUAGE");
+	if (language != NULL && language[0] != '\0')
+            language = NULL;
+    } else {
+        language = NULL;
     }
 
-    /* `LANGUAGE' is not set.  So we have to proceed with the POSIX
-       methods of looking to `LC_ALL', `LC_xxx', and `LANG'.  On some
-       systems this can be done by the `setlocale' function itself.  */
+    /* We have to proceed with the POSIX methods of looking to `LC_ALL',
+       `LC_xxx', and `LANG'.  On some systems this can be done by the
+       `setlocale' function itself.  */
 
     /* Setting of LC_ALL overwrites all other.  */
     retval = getenv ("LC_ALL");  
-    if (retval != NULL && retval[0] != '\0')
-	return retval;
-
-    /* Next comes the name of the desired category.  */
-    retval = getenv (categoryname);
-    if (retval != NULL && retval[0] != '\0')
-	return retval;
-
-    /* Last possibility is the LANG environment variable.  */
-    retval = getenv ("LANG");
-    if (retval != NULL && retval[0] != '\0')
-	return retval;
-
-    return NULL;
-}
-
-static char *
-get_lang_by_category(const char *categoryname) 
-{
-    static char lang[BUFSIZE] = "";
-    char *value;
-
-    value = (char *)guess_category_value(categoryname);
-    if (value == NULL) {
-        return "C";
-    } else {
-        strncpy(lang, value, BUFSIZE - 1);
-        lang[BUFSIZE - 1] = '\0';
-        _purification_lang(lang, BUFSIZE);
-        if (lang[0] == '\0') {
-            return "C";
+    if (retval == NULL || retval[0] == '\0') {
+        /* Next comes the name of the desired category.  */
+        retval = getenv (categoryname);
+        if (retval == NULL || retval[0] == '\0') {
+            /* Last possibility is the LANG environment variable.  */
+            retval = getenv ("LANG");
+            if (retval == NULL || retval[0] == '\0')
+                /* We use C as the default domain.  POSIX says this is
+                   implementation defined.  */
+                return "C";
         }
-        return lang;
     }
+    return language != NULL && strcmp (retval, "C") != 0 ? language : retval;
 }
 
 /*
@@ -129,7 +111,7 @@ nmz_set_lang(const char *value)
     _purification_lang(lang, BUFSIZE);
 
     env = guess_category_value("LC_MESSAGES");
-    if (env == NULL && *lang != '\0') {
+    if (env == "C" && lang[0] != '\0') {
 #ifdef HAVE_SETENV
 	setenv("LANG", lang, 1);
 #else
@@ -161,13 +143,13 @@ nmz_set_lang(const char *value)
 char *
 nmz_get_lang(void)
 {
-    return get_lang_by_category("LC_MESSAGES");
+    return (char *)guess_category_value("LC_MESSAGES");
 }
 
 char *
 nmz_get_lang_ctype(void)
 {
-    return get_lang_by_category("LC_CTYPE");
+    return (char *)guess_category_value("LC_CTYPE");
 }
 
 /*
diff -pruN namazu-2.0.16.orig/pl/util.pl namazu-2.0.16/pl/util.pl
--- namazu-2.0.16.orig/pl/util.pl	2006-02-06 03:53:30.000000000 +0900
+++ namazu-2.0.16/pl/util.pl	2006-09-14 20:56:31.000000000 +0900
@@ -263,12 +263,17 @@ sub remove_tmpfiles () {
 }
 
 sub set_lang () {
-    for my $cand (("LANGUAGE", "LC_ALL", "LC_MESSAGES", "LANG")) {
+    for my $cand (("LC_ALL", "LC_MESSAGES", "LANG")) {
 	if (defined($ENV{$cand})) {
 	    $util::LANG_MSG = $ENV{$cand};
 	    last;
 	}
     }
+
+    if ($util::LANG_MSG ne "C" && defined($ENV{"LANGUAGE"})) {
+        $util::LANG_MSG = $ENV{"LANGUAGE"};
+    }
+
     for my $cand (("LC_ALL", "LC_CTYPE", "LANG")) {
 	if (defined($ENV{$cand})) {
 	    $util::LANG = $ENV{$cand};


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/namazu/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Mar 2006 06:56:42 -0000	1.3
+++ .cvsignore	14 Sep 2006 12:01:58 -0000	1.4
@@ -1,2 +1,6 @@
+*.rpm
+*.gz
+*.bz2
 namazu-2.0.14.tar.gz
 namazu-2.0.15.tar.gz
+namazu-2.0.16.tar.gz


Index: namazu.spec
===================================================================
RCS file: /cvs/extras/rpms/namazu/devel/namazu.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- namazu.spec	8 Mar 2006 06:10:31 -0000	1.5
+++ namazu.spec	14 Sep 2006 12:01:58 -0000	1.6
@@ -6,8 +6,8 @@
 
 Summary:	Namazu is a full-text search engine
 Name:		namazu
-Version:	2.0.15
-Release:	3%{?dist}
+Version:	2.0.16
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Text
 URL:		http://www.namazu.org/
@@ -22,7 +22,7 @@
 Source:		http://www.namazu.org/stable/%{name}-%{version}.tar.gz
 
 Patch0:		namazu-linguas.patch
-Patch1:		namazu-2.0.6-newgettext3.patch
+Patch1:		namazu-newgettext3.patch
 Patch2:		namazu-fixinutf8.patch
 
 Source1:        filter-requires-namazu.sh
@@ -62,17 +62,12 @@
 
 %build
 %configure
-
-if [ "$SMP" != "" ]; then
-  make -j$SMP "MAKE=make -j$SMP"
-else
-  make
-fi
+make %{?_smp_flags}
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 mv $RPM_BUILD_ROOT%{_sysconfdir}/namazu/namazurc-sample \
 	$RPM_BUILD_ROOT%{_sysconfdir}/namazu/namazurc
@@ -91,7 +86,7 @@
 %find_lang %{name}
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -139,6 +134,10 @@
 
 
 %changelog
+* Thu Sep 14 2006 Akira TAGOH <tagoh at redhat.com> - 2.0.16-1
+- New upstream release.
+- namazu-newgettext3.patch: updated.
+
 * Wed Mar  8 2006 Akira TAGOH <tagoh at redhat.com> - 2.0.15-3
 - filter-requires-namazu.sh: updated to fix much more self-dependencies. (#184149)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/namazu/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2006 06:56:42 -0000	1.3
+++ sources	14 Sep 2006 12:01:58 -0000	1.4
@@ -1 +1 @@
-8093ad48dfa5ec2d314881d6ff6d88a9  namazu-2.0.15.tar.gz
+8a66627a321cc1b1e39e42fff2736fd9  namazu-2.0.16.tar.gz


--- namazu-2.0.6-newgettext3.patch DELETED ---


--- needs.rebuild DELETED ---