rpms/namazu/F-7 namazu-multilib.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 filter-requires-namazu.sh, 1.2, 1.3 namazu.spec, 1.7, 1.8 sources, 1.4, 1.5 namazu-linguas.patch, 1.1, NONE
Akira Tagoh (tagoh)
fedora-extras-commits at redhat.com
Mon Mar 24 13:02:32 UTC 2008
- Previous message (by thread): rpms/python-paramiko/EL-5 .cvsignore, 1.9, 1.10 python-paramiko.spec, 1.12, 1.13 sources, 1.9, 1.10
- Next message (by thread): rpms/cups-pdf/F-7 cups-pdf.spec, 1.9, 1.10 cups_pdf.te, 1.2, 1.3 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tagoh
Update of /cvs/pkgs/rpms/namazu/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22030
Modified Files:
.cvsignore filter-requires-namazu.sh namazu.spec sources
Added Files:
namazu-multilib.patch
Removed Files:
namazu-linguas.patch
Log Message:
* Mon Mar 24 2008 Akira TAGOH <tagoh at redhat.com> - 2.0.18-1
- security fix (#438664)
namazu-multilib.patch:
--- NEW FILE namazu-multilib.patch ---
diff -ruN namazu-2.0.17.orig/nmz-config.in namazu-2.0.17/nmz-config.in
--- namazu-2.0.17.orig/nmz-config.in 1999-12-30 20:45:13.000000000 +0900
+++ namazu-2.0.17/nmz-config.in 2007-11-20 11:37:27.000000000 +0900
@@ -72,7 +72,7 @@
;;
--libs)
- echo -L at libdir@ -lnmz
+ echo -lnmz
;;
*)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 14 Sep 2006 12:01:58 -0000 1.4
+++ .cvsignore 24 Mar 2008 13:01:50 -0000 1.5
@@ -4,3 +4,4 @@
namazu-2.0.14.tar.gz
namazu-2.0.15.tar.gz
namazu-2.0.16.tar.gz
+namazu-2.0.18.tar.gz
Index: filter-requires-namazu.sh
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/F-7/filter-requires-namazu.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- filter-requires-namazu.sh 8 Mar 2006 06:10:31 -0000 1.2
+++ filter-requires-namazu.sh 24 Mar 2008 13:01:50 -0000 1.3
@@ -1,3 +1,3 @@
#!/bin/sh
-/usr/lib/rpm/find-requires $* | egrep -v 'perl\((nmzidx.pl|conf.pl|document.pl|time.pl|util.pl|var.pl)\)'
+/usr/lib/rpm/perl.req $* | egrep -v 'perl\((nmzidx.pl|conf.pl|document.pl|time.pl|util.pl|var.pl)\)'
Index: namazu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/F-7/namazu.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- namazu.spec 17 Jan 2007 03:59:22 -0000 1.7
+++ namazu.spec 24 Mar 2008 13:01:50 -0000 1.8
@@ -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.16
-Release: 2%{?dist}
-License: GPL
-Group: Applications/Text
+Version: 2.0.18
+Release: 1%{?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)
-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,19 +132,24 @@
%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
+* Mon Mar 24 2008 Akira TAGOH <tagoh at redhat.com> - 2.0.18-1
+- security fix (#438664)
+
* Wed Jan 17 2007 Akira TAGOH <tagoh at redhat.com> - 2.0.16-2
- remove .la (#222796)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 14 Sep 2006 12:01:58 -0000 1.4
+++ sources 24 Mar 2008 13:01:50 -0000 1.5
@@ -1 +1 @@
-8a66627a321cc1b1e39e42fff2736fd9 namazu-2.0.16.tar.gz
+340c6a4d2571b042c2fc3e5a5f9c5f5b namazu-2.0.18.tar.gz
--- namazu-linguas.patch DELETED ---
- Previous message (by thread): rpms/python-paramiko/EL-5 .cvsignore, 1.9, 1.10 python-paramiko.spec, 1.12, 1.13 sources, 1.9, 1.10
- Next message (by thread): rpms/cups-pdf/F-7 cups-pdf.spec, 1.9, 1.10 cups_pdf.te, 1.2, 1.3 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list