rpms/namazu/devel .cvsignore, 1.2, 1.3 namazu-fixinutf8.patch, 1.1, 1.2 namazu.spec, 1.2, 1.3 sources, 1.2, 1.3 namazu-2.0.13-de.patch, 1.1, NONE

Akira Tagoh (tagoh) fedora-extras-commits at redhat.com
Thu Mar 2 06:56:42 UTC 2006


Author: tagoh

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

Modified Files:
	.cvsignore namazu-fixinutf8.patch namazu.spec sources 
Removed Files:
	namazu-2.0.13-de.patch 
Log Message:
* Thu Mar  2 2006 Akira TAGOH <tagoh at redhat.com> - 2.0.15-1
- New upstream release.
- namazu-2.0.13-de.patch: removed.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/namazu/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 May 2005 02:23:25 -0000	1.2
+++ .cvsignore	2 Mar 2006 06:56:42 -0000	1.3
@@ -1 +1,2 @@
 namazu-2.0.14.tar.gz
+namazu-2.0.15.tar.gz

namazu-fixinutf8.patch:

Index: namazu-fixinutf8.patch
===================================================================
RCS file: /cvs/extras/rpms/namazu/devel/namazu-fixinutf8.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- namazu-fixinutf8.patch	30 May 2005 02:23:25 -0000	1.1
+++ namazu-fixinutf8.patch	2 Mar 2006 06:56:42 -0000	1.2
@@ -1,6 +1,6 @@
-diff -uNr namazu-2.0.13/filter/Makefile.am utf8.namazu-2.0.13/filter/Makefile.am
---- namazu-2.0.13/filter/Makefile.am	2003-08-24 19:41:55.000000000 +0900
-+++ utf8.namazu-2.0.13/filter/Makefile.am	2004-04-15 16:12:10.000000000 +0900
+diff -ruN namazu-2.0.15.orig/filter/Makefile.am namazu-2.0.15/filter/Makefile.am
+--- namazu-2.0.15.orig/filter/Makefile.am	2004-09-18 14:03:02.000000000 +0900
++++ namazu-2.0.15/filter/Makefile.am	2006-03-02 15:40:59.000000000 +0900
 @@ -20,6 +20,8 @@
  	      hnf.pl \
  	      html.pl \
@@ -10,24 +10,10 @@
  	      man.pl \
  	      mhonarc.pl \
  	      msword.pl \
-diff -uNr namazu-2.0.13/filter/Makefile.in utf8.namazu-2.0.13/filter/Makefile.in
---- namazu-2.0.13/filter/Makefile.in	2004-04-14 03:09:02.000000000 +0900
-+++ utf8.namazu-2.0.13/filter/Makefile.in	2004-04-15 16:13:32.000000000 +0900
-@@ -167,7 +167,9 @@
-               rtf.pl \
-               apachecache.pl \
-               macbinary.pl \
--              mp3.pl
-+              mp3.pl \
-+	      langspec.txt \
-+	      langspec.txt.utf8
- 
- 
- EXTRA_DIST = $(filter_DATA)
-diff -uNr namazu-2.0.13/filter/hnf.pl utf8.namazu-2.0.13/filter/hnf.pl
---- namazu-2.0.13/filter/hnf.pl	2001-11-29 18:31:43.000000000 +0900
-+++ utf8.namazu-2.0.13/filter/hnf.pl	2004-04-15 16:12:10.000000000 +0900
-@@ -69,8 +69,10 @@
+diff -ruN namazu-2.0.15.orig/filter/hnf.pl namazu-2.0.15/filter/hnf.pl
+--- namazu-2.0.15.orig/filter/hnf.pl	2005-06-06 15:13:35.000000000 +0900
++++ namazu-2.0.15/filter/hnf.pl	2006-03-02 15:40:59.000000000 +0900
+@@ -72,8 +72,10 @@
  
      my $mark = "# ";
      my $end  = "--";
@@ -40,9 +26,9 @@
  
      get_uri($cfile, $fields);
      hnf_filter($contref, $weighted_str, $fields, $headings, $cfile, 
-diff -uNr namazu-2.0.13/filter/langspec.txt utf8.namazu-2.0.13/filter/langspec.txt
---- namazu-2.0.13/filter/langspec.txt	1970-01-01 09:00:00.000000000 +0900
-+++ utf8.namazu-2.0.13/filter/langspec.txt	2004-04-15 16:12:10.000000000 +0900
+diff -ruN namazu-2.0.15.orig/filter/langspec.txt namazu-2.0.15/filter/langspec.txt
+--- namazu-2.0.15.orig/filter/langspec.txt	1970-01-01 09:00:00.000000000 +0900
++++ namazu-2.0.15/filter/langspec.txt	2006-03-02 15:40:59.000000000 +0900
 @@ -0,0 +1,8 @@
 +mailnews.pl_mailnews_citation_filter_1: (^\s*((([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(¡£|¡¥|\.|¡¤|,|¡¢|\@|¡÷|¤Î)\s*){0,2}\s*(([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(¤Ç¤¹|¤È¿½¤·¤Þ¤¹|¤È¤â¤¦¤·¤Þ¤¹|¤È¤¤¤¤¤Þ¤¹)(.{0,2})?\s*$)
 +mailnews.pl_mailnews_citation_filter_2: (^\s*(Date:|Subject:|Message-ID:|From:|·ï̾|º¹½Ð¿Í|Æü»þ))|(^.+(ÊÖ»ö¤Ç¤¹|reply\s*¤Ç¤¹|Û©¤¯|¤¤¤ï¤¯|½ñ¤­¤Þ¤·¤¿|¸À¤¤¤Þ¤·¤¿|ÏäÇ|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>)
@@ -52,9 +38,9 @@
 +hnf.pl_filter_2: ¢§
 +gfilter.pl_line_adjust_filter: (¡£|¡¢)$
 +wakati.pl_wakatize_japanese: (.+ )̾»ì
-diff -uNr namazu-2.0.13/filter/langspec.txt.utf8 utf8.namazu-2.0.13/filter/langspec.txt.utf8
---- namazu-2.0.13/filter/langspec.txt.utf8	1970-01-01 09:00:00.000000000 +0900
-+++ utf8.namazu-2.0.13/filter/langspec.txt.utf8	2004-04-15 16:12:10.000000000 +0900
+diff -ruN namazu-2.0.15.orig/filter/langspec.txt.utf8 namazu-2.0.15/filter/langspec.txt.utf8
+--- namazu-2.0.15.orig/filter/langspec.txt.utf8	1970-01-01 09:00:00.000000000 +0900
++++ namazu-2.0.15/filter/langspec.txt.utf8	2006-03-02 15:40:59.000000000 +0900
 @@ -0,0 +1,8 @@
 +mailnews.pl_mailnews_citation_filter_1: (^\s*((([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(。|.|\.|,|,|、|\@|@|の)\s*){0,2}\s*(([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(です|と申します|ともうします|といいます)(.{0,2})?\s*$)
 +mailnews.pl_mailnews_citation_filter_2: (^\s*(Date:|Subject:|Message-ID:|From:|件名|差出人|日時))|(^.+(返事です|reply\s*です|曰く|いわく|書きました|言いました|話で|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>)
@@ -64,10 +50,10 @@
 +hnf.pl_filter_2: â–¼
 +gfilter.pl_line_adjust_filter: (。|、)$
 +wakati.pl_wakatize_japanese: (.+ )名詞
-diff -uNr namazu-2.0.13/filter/mailnews.pl utf8.namazu-2.0.13/filter/mailnews.pl
---- namazu-2.0.13/filter/mailnews.pl	2004-03-21 00:48:30.000000000 +0900
-+++ utf8.namazu-2.0.13/filter/mailnews.pl	2004-04-15 16:12:10.000000000 +0900
-@@ -182,13 +182,23 @@
+diff -ruN namazu-2.0.15.orig/filter/mailnews.pl namazu-2.0.15/filter/mailnews.pl
+--- namazu-2.0.15.orig/filter/mailnews.pl	2006-01-29 22:26:44.000000000 +0900
++++ namazu-2.0.15/filter/mailnews.pl	2006-03-02 15:46:33.000000000 +0900
+@@ -246,13 +246,23 @@
      $$contref = "";
  
      # Greeting at the beginning (first one or two lines)
@@ -97,11 +83,11 @@
      }
  
      # Isolate citation parts.
-@@ -213,11 +223,22 @@
+@@ -277,11 +287,22 @@
          # Process only first five paragrahs.
  	# And don't handle the paragrah which has five or longer lines.
  	# Hmm, this regex looks very hairly.
--	if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /(^\s*(Date:|Subject:|Message-ID:|From:|·ï̾|º¹½Ð¿Í|Æü»þ))|(^.+(ÊÖ»ö¤Ç¤¹|reply\s*¤Ç¤¹|Û©¤¯|¤¤¤ï¤¯|½ñ¤­¤Þ¤·¤¿|¸À¤¤¤Þ¤·¤¿|ÏäÇ|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>)/im) {
+-	if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /(^\s*(Date:|Subject:|Message-ID:|From:|·ï̾|º¹½Ð¿Í|Æü»þ))|(^.+(ÊÖ»ö¤Ç¤¹|reply\s*¤Ç¤¹|Û©¤¯|¤¤¤ï¤¯|½ñ¤­¤Þ¤·¤¿|¸À¤¤¤Þ¤·¤¿|ÏäÇ|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|<\S+\@[\w\-\.]+?\.\w+>/im) {
 -	    util::dprint("\n\n<<<<$line>>>>\n\n");
 -	    $omake .= $line . "\n";
 -	    $line = "";
@@ -109,13 +95,13 @@
 +	$regexp = util::read_langspec_char_from_file ("./langspec.txt", "mailnews.pl_mailnews_citation_filter_2");
 +
 +	if ($regexp eq "") {
-+	    if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /(^\s*(Date:|Subject:|Message-ID:|From:))|(^.+(wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>)/im) {
++	    if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /(^\s*(Date:|Subject:|Message-ID:|From:))|(^.+(wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|<\S+\@[\w\-\.]+?\.\w+>/im) {
 +		util::dprint("\n\n<<<<$line>>>>\n\n");
 +		$omake .= $line . "\n";
 +		$line = "";
 +		next;
 +	    }
-+        } else {
++	} else {
 +	    if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /$regexp/im) {
 +		util::dprint("\n\n<<<<$line>>>>\n\n");
 +		$omake .= $line . "\n";
@@ -125,10 +111,10 @@
  	}
  	$$contref .= $line. "\n\n";
          $i++;
-diff -uNr namazu-2.0.13/filter/man.pl utf8.namazu-2.0.13/filter/man.pl
---- namazu-2.0.13/filter/man.pl	2002-02-13 16:39:14.000000000 +0900
-+++ utf8.namazu-2.0.13/filter/man.pl	2004-04-15 16:12:10.000000000 +0900
-@@ -140,17 +140,36 @@
+diff -ruN namazu-2.0.15.orig/filter/man.pl namazu-2.0.15/filter/man.pl
+--- namazu-2.0.15.orig/filter/man.pl	2005-06-06 15:13:35.000000000 +0900
++++ namazu-2.0.15/filter/man.pl	2006-03-02 15:40:59.000000000 +0900
+@@ -171,17 +171,36 @@
      my $weight = $conf::Weight{'html'}->{'title'};
      $$weighted_str .= "\x7f$weight\x7f$title\x7f/$weight\x7f\n";
  
@@ -174,10 +160,10 @@
      }
  }
  
-diff -uNr namazu-2.0.13/pl/gfilter.pl utf8.namazu-2.0.13/pl/gfilter.pl
---- namazu-2.0.13/pl/gfilter.pl	2004-01-31 03:28:19.000000000 +0900
-+++ utf8.namazu-2.0.13/pl/gfilter.pl	2004-04-15 16:12:10.000000000 +0900
-@@ -90,13 +90,14 @@
+diff -ruN namazu-2.0.15.orig/pl/gfilter.pl namazu-2.0.15/pl/gfilter.pl
+--- namazu-2.0.15.orig/pl/gfilter.pl	2004-11-01 21:56:44.000000000 +0900
++++ namazu-2.0.15/pl/gfilter.pl	2006-03-02 15:40:59.000000000 +0900
+@@ -92,13 +92,14 @@
      return undef unless defined($$text);
  
      my @tmp = split(/\n/, $$text);
@@ -193,10 +179,10 @@
  	$line =~ s/([a-z])-\n/$1/;  # for hyphenation.
      }
      $$text = join('', @tmp);
-diff -uNr namazu-2.0.13/pl/util.pl utf8.namazu-2.0.13/pl/util.pl
---- namazu-2.0.13/pl/util.pl	2004-03-19 00:54:09.000000000 +0900
-+++ utf8.namazu-2.0.13/pl/util.pl	2004-04-15 16:12:10.000000000 +0900
-@@ -331,4 +331,36 @@
+diff -ruN namazu-2.0.15.orig/pl/util.pl namazu-2.0.15/pl/util.pl
+--- namazu-2.0.15.orig/pl/util.pl	2006-03-02 15:38:01.000000000 +0900
++++ namazu-2.0.15/pl/util.pl	2006-03-02 15:40:59.000000000 +0900
+@@ -562,4 +562,36 @@
      }
  }
  
@@ -233,9 +219,9 @@
 +}
 +
  1;
-diff -uNr namazu-2.0.13/pl/wakati.pl utf8.namazu-2.0.13/pl/wakati.pl
---- namazu-2.0.13/pl/wakati.pl	2004-03-04 16:25:57.000000000 +0900
-+++ utf8.namazu-2.0.13/pl/wakati.pl	2004-04-15 16:12:48.000000000 +0900
+diff -ruN namazu-2.0.15.orig/pl/wakati.pl namazu-2.0.15/pl/wakati.pl
+--- namazu-2.0.15.orig/pl/wakati.pl	2006-01-23 18:18:24.000000000 +0900
++++ namazu-2.0.15/pl/wakati.pl	2006-03-02 15:40:59.000000000 +0900
 @@ -53,8 +53,10 @@
      # Collect only noun words when -m option is specified.
      if ($var::Opt{'noun'}) {


Index: namazu.spec
===================================================================
RCS file: /cvs/extras/rpms/namazu/devel/namazu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- namazu.spec	30 May 2005 02:51:38 -0000	1.2
+++ namazu.spec	2 Mar 2006 06:56:42 -0000	1.3
@@ -6,14 +6,14 @@
 
 Summary:	Namazu is a full-text search engine
 Name:		namazu
-Version:	2.0.14
-Release: 3
+Version:	2.0.15
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Text
 URL:		http://www.namazu.org/
 BuildRequires:	perl >= 5.6.0, perl-NKF >= 1.70, perl-Text-Kakasi >= 1.00
 BuildPreReq:	perl-File-MMagic >= 1.12
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	perl >= 5.6.0, perl-File-MMagic >= 1.12, perl-NKF >= 1.70
 Requires:	kakasi >= 2.3.0, perl-Text-Kakasi >= 1.00
@@ -24,7 +24,6 @@
 Patch0:		namazu-linguas.patch
 Patch1:		namazu-2.0.6-newgettext3.patch
 Patch2:		namazu-fixinutf8.patch
-Patch3:		namazu-2.0.13-de.patch
 
 Source1:        filter-requires-namazu.sh
 %define __find_requires %{SOURCE1}
@@ -60,7 +59,6 @@
 %patch0 -p1 -b .linguas
 %patch1 -p1 -b .newgettext
 %patch2 -p1 -b .fixinutf8
-%patch3 -p1 -b .fixde
 
 %build
 %configure
@@ -117,6 +115,8 @@
 %{_bindir}/mailutime
 %{_bindir}/nmzgrep
 %{_bindir}/nmzmerge
+%{_bindir}/nmzcat
+%{_bindir}/nmzegrep
 %{_libdir}/*.so.*
 %{_mandir}/man1/*
 %{_datadir}/namazu/filter/*
@@ -139,6 +139,10 @@
 
 
 %changelog
+* Thu Mar  2 2006 Akira TAGOH <tagoh at redhat.com> - 2.0.15-1
+- New upstream release.
+- namazu-2.0.13-de.patch: removed.
+
 * Mon May 30 2005 Akira TAGOH <tagoh at redhat.com> - 2.0.14-3
 - rebuilt to import into Extras.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/namazu/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 May 2005 02:23:25 -0000	1.2
+++ sources	2 Mar 2006 06:56:42 -0000	1.3
@@ -1 +1 @@
-17d7253ec58241a95c0b80d469be63b2  namazu-2.0.14.tar.gz
+8093ad48dfa5ec2d314881d6ff6d88a9  namazu-2.0.15.tar.gz


--- namazu-2.0.13-de.patch DELETED ---




More information about the fedora-extras-commits mailing list