rpms/namazu/devel namazu.spec,1.12,1.13

[Akira Tagoh (tagoh)]

Author: tagoh

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

Modified Files:
	namazu.spec 
Log Message:
* Thu Nov 29 2007 Akira TAGOH <tagoh at redhat.com> - 2.0.17-6
- Correct a timestamp for nmz-config.
- Add "replase" to %%config.
- Move %%post and %%postun to -libs.


Index: namazu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/devel/namazu.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- namazu.spec	25 Nov 2007 06:13:21 -0000	1.12
+++ namazu.spec	29 Nov 2007 13:04:49 -0000	1.13
@@ -4,14 +4,13 @@
 
 Name:		namazu
 Version:	2.0.17
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 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)
 
-## recompressed with bzip instead of gzip
 Source:		http://www.namazu.org/stable/%{name}-%{version}.tar.gz
 Source1:        filter-requires-namazu.sh
 
@@ -53,7 +52,7 @@
 
 
 %package cgi
-Summary:	a CGI interface for Namazu
+Summary:	A CGI interface for Namazu
 Group:		Applications/Text
 Requires:	%{name} = %{version}-%{release}
 Requires:	webserver
@@ -82,7 +81,7 @@
 sed -i -e "s/\(\$ADDRESS = 'webmaster@\).*\(';\)/\1localhost\2/" $RPM_BUILD_ROOT%{_datadir}/namazu/pl/conf.pl
 
 # correct timestamp
-touch -r nmz-config.in $RPM_BUILD_ROOT%{_bindir}/nmz-config
+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
@@ -110,22 +109,22 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-, root, root, -)
-%doc AUTHORS ChangeLog ChangeLog.1 CREDITS COPYING HACKING
-%doc INSTALL README NEWS THANKS TODO
+%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
@@ -143,12 +142,13 @@
 
 %files libs
 %defattr(-, root, root, -)
-%doc CREDITS COPYING HACKING
+%doc CREDITS COPYING
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-, root, root, -)
 %doc CREDITS COPYING HACKING
+%lang(ja) %doc HACKING-ja
 %dir %{_includedir}/namazu
 %{_bindir}/nmz-config
 %{_includedir}/namazu/*.h
@@ -161,6 +161,11 @@
 
 
 %changelog
+* Thu Nov 29 2007 Akira TAGOH <tagoh at redhat.com> - 2.0.17-6
+- Correct a timestamp for nmz-config.
+- Add "replase" to %%config.
+- Move %%post and %%postun to -libs.
+
 * Sun Nov 25 2007 Akira TAGOH <tagoh at redhat.com> - 2.0.17-5
 - Move namazu.cgi from /var/www/cgi-bin to /usr/lib/namazu/ (#383521)