rpms/namazu/devel namazu-multilib.patch, NONE, 1.1 namazu.spec, 1.9, 1.10
Akira Tagoh (tagoh)
fedora-extras-commits at redhat.com
Tue Nov 20 02:57:57 UTC 2007
Author: tagoh
Update of /cvs/pkgs/rpms/namazu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30163
Modified Files:
namazu.spec
Added Files:
namazu-multilib.patch
Log Message:
* Tue Nov 20 2007 Akira TAGOH <tagoh at redhat.com> - 2.0.17-3
- Get rid of -L at libdir@ from nmz-config because it's a standard library
directory. (#342641)
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: namazu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/devel/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 20 Nov 2007 02:57:24 -0000 1.10
@@ -1,44 +1,52 @@
-%define _use_internal_dependency_generator 0
+#%%define _use_internal_dependency_generator 0
+%define nmz_localstatedir %{_localstatedir}/lib
+%define nmz_libexecdir %{_localstatedir}/www/cgi-bin
-# XXX is this right - it was /var/lib before FHS macros
-%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}
+Release: 3%{?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
+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}
+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.
Not only it works as CGI program for small or medium scale WWW
search engine, but also works as personal use such as search system
for local HDD.
+%package libs
+Summary: Libraries for Namazu
+Group: Development/Libraries
+Obsoletes: %{name} < 2.0.17-3%{?dist}
+
+%description libs
+Namazu is a full-text search engine software intended for easy use.
+
+This package contains the namazu library.
%package devel
Summary: Libraries and include files of Namazu
Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name}-libs = %{version}-%{release}
%description devel
Libraries and include files of Namazu.
@@ -47,7 +55,7 @@
%package cgi
Summary: a CGI interface for Namazu
Group: Applications/Text
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
Requires: webserver
%description cgi
@@ -59,22 +67,34 @@
%patch0 -p1 -b .linguas
%patch1 -p1 -b .newgettext
%patch2 -p1 -b .fixinutf8
+%patch3 -p1 -b .multilib
%build
-%configure
+%configure --localstatedir=%{nmz_localstatedir} --libexecdir=%{nmz_libexecdir} --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 $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
+
+chmod 755 -R $RPM_BUILD_ROOT%{nmz_localstatedir}/namazu
+chmod 755 -R $RPM_BUILD_ROOT%{nmz_localstatedir}/namazu/index
# don't ship ja.po for sjis.
rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/ja_JP.SJIS
@@ -94,7 +114,7 @@
%postun -p /sbin/ldconfig
%files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-, root, root, -)
%doc AUTHORS ChangeLog ChangeLog.1 CREDITS COPYING HACKING
%doc INSTALL README NEWS THANKS TODO
%doc etc/namazu.png doc/en doc/namazu.css
@@ -114,29 +134,42 @@
%{_bindir}/nmzmerge
%{_bindir}/nmzcat
%{_bindir}/nmzegrep
-%{_libdir}/*.so.*
%{_mandir}/man1/*
%{_datadir}/namazu/filter/*
%{_datadir}/namazu/pl/*
%{_datadir}/namazu/template/*
-%dir %{_localstatedir}/namazu
-%dir %{_localstatedir}/namazu/index
+%dir %{nmz_localstatedir}/namazu
+%dir %{nmz_localstatedir}/namazu/index
+
+%files libs
+%defattr(-, root, root, -)
+%doc CREDITS COPYING HACKING
+%{_libdir}/*.so.*
%files devel
-%defattr(-, root, root)
+%defattr(-, root, root, -)
+%doc CREDITS COPYING HACKING
%dir %{_includedir}/namazu
%{_bindir}/nmz-config
%{_includedir}/namazu/*.h
%{_libdir}/*.so
-%{_libdir}/*a
%files cgi
-%defattr(-, root, root)
-%{_libexecdir}/namazu.cgi
+%defattr(-, root, root, -)
+%doc CREDITS COPYING
+%{nmz_libexecdir}/namazu.cgi
%changelog
-* Thu Aug 23 2007 Alira TAGOH <tagoh at redhat.com> - 2.0.17-2
+* Tue Nov 20 2007 Akira TAGOH <tagoh at redhat.com> - 2.0.17-3
+- Get rid of -L at libdir@ from nmz-config because it's a standard library
+ directory. (#342641)
+
+* Mon Nov 19 2007 Akira TAGOH <tagoh at redhat.com>
+- Clean up spec file. (#383521)
+- Separate the shared library to namazu-libs package.
+
+* 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
More information about the fedora-extras-commits
mailing list