rpms/namazu/F-8 .cvsignore, 1.5, 1.6 namazu.spec, 1.9, 1.10 sources, 1.5, 1.6

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/pkgs/rpms/namazu/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22637

Modified Files:
	.cvsignore namazu.spec sources 
Log Message:
* Mon Mar 24 2008 Akira TAGOH <tagoh at redhat.com> - 2.0.18-1
- security fix (#438664)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Aug 2007 10:56:20 -0000	1.5
+++ .cvsignore	24 Mar 2008 13:14:21 -0000	1.6
@@ -5,3 +5,4 @@
 namazu-2.0.15.tar.gz
 namazu-2.0.16.tar.gz
 namazu-2.0.17.tar.gz
+namazu-2.0.18.tar.gz


Index: namazu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/F-8/namazu.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- namazu.spec	23 Aug 2007 12:44:55 -0000	1.9
+++ namazu.spec	24 Mar 2008 13:14:21 -0000	1.10
@@ -4,29 +4,28 @@
 %define _localstatedir	/var/lib
 %define _libexecdir	/var/www/cgi-bin
 
-Summary:	Namazu is a full-text search engine
 Name:		namazu
-Version:	2.0.17
-Release:	2%{?dist}
+Version:	2.0.18
+Release:	1%{?dist}
 License:	GPLv2+
-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}-%{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
-
-## recompressed with bzip instead of gzip
 Source:		http://www.namazu.org/stable/%{name}-%{version}.tar.gz
+Source1:        filter-requires-namazu.sh
 
-Patch0:		namazu-linguas.patch
 Patch1:		namazu-newgettext3.patch
 Patch2:		namazu-fixinutf8.patch
+Patch3:		namazu-multilib.patch
 
-Source1:        filter-requires-namazu.sh
-%define __find_requires %{SOURCE1}
+%define __perl_requires %{SOURCE1}
+
+Summary:	Namazu is a full-text search engine
+Requires:	perl >= 5.6.0, perl-File-MMagic >= 1.12, perl-NKF >= 1.70
+Requires:	kakasi >= 2.3.0, perl-Text-Kakasi >= 1.00
+Group:		Applications/Text
 
 %description
 Namazu is a full-text search engine software intended for easy use.
@@ -38,16 +37,16 @@
 %package devel
 Summary:	Libraries and include files of Namazu
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 Libraries and include files of Namazu.
 
 
 %package cgi
-Summary:	a CGI interface for Namazu
+Summary:	A CGI interface for Namazu
 Group:		Applications/Text
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Requires:	webserver
 
 %description cgi
@@ -56,22 +55,32 @@
 
 %prep 
 %setup -q
-%patch0 -p1 -b .linguas
 %patch1 -p1 -b .newgettext
 %patch2 -p1 -b .fixinutf8
+%patch3 -p1 -b .multilib
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_flags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 
+# correct email address
+sed -i -e "s/\(\$ADDRESS = 'webmaster@\).*\(';\)/\1localhost\2/" $RPM_BUILD_ROOT%{_datadir}/namazu/pl/conf.pl
+
+# correct timestamp
+touch -r nmz-config.in.multilib $RPM_BUILD_ROOT%{_bindir}/nmz-config
+touch -r pl/conf.pl.in $RPM_BUILD_ROOT%{_datadir}/namazu/pl/conf.pl
+
+# namazurc
 mv $RPM_BUILD_ROOT%{_sysconfdir}/namazu/namazurc-sample \
 	$RPM_BUILD_ROOT%{_sysconfdir}/namazu/namazurc
+# mknmzrc
 sed -e "s/\(\$ADDRESS = 'webmaster@\).*\(';\)/\1\2/" $RPM_BUILD_ROOT%{_sysconfdir}/namazu/mknmzrc-sample > $RPM_BUILD_ROOT%{_sysconfdir}/namazu/mknmzrc
+touch -r $RPM_BUILD_ROOT%{_sysconfdir}/namazu/mknmzrc-sample $RPM_BUILD_ROOT%{_sysconfdir}/namazu/mknmzrc
 rm $RPM_BUILD_ROOT%{_sysconfdir}/namazu/mknmzrc-sample
 chmod 755 -R $RPM_BUILD_ROOT%{_localstatedir}/namazu
 chmod 755 -R $RPM_BUILD_ROOT%{_localstatedir}/namazu/index
@@ -94,18 +103,18 @@
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-, root, root)
-%doc AUTHORS ChangeLog ChangeLog.1 CREDITS COPYING HACKING
-%doc INSTALL README NEWS THANKS TODO
+%defattr(-, root, root, -)
+%doc AUTHORS ChangeLog ChangeLog.1 CREDITS COPYING
+%doc README NEWS THANKS TODO
 %doc etc/namazu.png doc/en doc/namazu.css
 %lang(es) %doc README-es
-%lang(ja) %doc HACKING-ja INSTALL-ja README-ja doc/ja
+%lang(ja) %doc README-ja doc/ja
 %dir %{_sysconfdir}/namazu
 %dir %{_datadir}/namazu
 %dir %{_datadir}/namazu/filter
 %dir %{_datadir}/namazu/pl
 %dir %{_datadir}/namazu/template
-%config %{_sysconfdir}/namazu/*
+%config(noreplace) %{_sysconfdir}/namazu/*
 %{_bindir}/namazu
 %{_bindir}/bnamazu
 %{_bindir}/*nmz
@@ -123,20 +132,25 @@
 %dir %{_localstatedir}/namazu/index
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root, -)
+%doc CREDITS COPYING HACKING
+%lang(ja) %doc HACKING-ja
 %dir %{_includedir}/namazu
 %{_bindir}/nmz-config
 %{_includedir}/namazu/*.h
 %{_libdir}/*.so
-%{_libdir}/*a
 
 %files cgi
-%defattr(-, root, root)
+%defattr(-, root, root, -)
+%doc CREDITS COPYING HACKING
 %{_libexecdir}/namazu.cgi
 
 
 %changelog
-* Thu Aug 23 2007 Alira TAGOH <tagoh at redhat.com> - 2.0.17-2
+* Mon Mar 24 2008 Akira TAGOH <tagoh at redhat.com> - 2.0.18-1
+- security fix (#438664)
+
+* Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 2.0.17-2
 - Rebuild
 
 * Fri Aug 10 2007 Akira TAGOH <tagoh at redhat.com> - 2.0.17-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Aug 2007 10:56:20 -0000	1.5
+++ sources	24 Mar 2008 13:14:21 -0000	1.6
@@ -1 +1 @@
-83a62ae5f8a915dcc2745de1950e4a96  namazu-2.0.17.tar.gz
+340c6a4d2571b042c2fc3e5a5f9c5f5b  namazu-2.0.18.tar.gz