Hello community, here is the log from the commit of package sphinx for openSUSE:Factory checked in at 2019-03-24 15:01:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sphinx (Old) and /work/SRC/openSUSE:Factory/.sphinx.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sphinx" Sun Mar 24 15:01:21 2019 rev:4 rq:687886 version:2.2.11 Changes: -------- --- /work/SRC/openSUSE:Factory/sphinx/sphinx.changes 2018-08-10 09:49:49.286274144 +0200 +++ /work/SRC/openSUSE:Factory/.sphinx.new.25356/sphinx.changes 2019-03-24 15:01:24.735168440 +0100 @@ -1,0 +2,13 @@ +Sat Mar 23 08:45:23 UTC 2019 - Jan Engelhardt <[email protected]> + +- Reduce scriptlets' hard dependency on systemd. +- Remove wrong "exit 0" from %pre that precluded %service_* to run. + +------------------------------------------------------------------- +Fri Mar 22 06:54:37 UTC 2019 - Bruno Friedmann <[email protected]> + +- spec-cleaner minimal https, date, use now pkg-config for deps. +- Fix build failure due to lack of pg_config in postgresql11-devel + use pkg-config libpq in all case. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sphinx.spec ++++++ --- /var/tmp/diff_new_pack.jAXywr/_old 2019-03-24 15:01:27.243168119 +0100 +++ /var/tmp/diff_new_pack.jAXywr/_new 2019-03-24 15:01:27.275168115 +0100 @@ -1,7 +1,7 @@ # # spec file for package sphinx # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,16 +22,22 @@ %global sphinx_home %{_localstatedir}/lib/sphinx %global soname 0_0_1 # For being able to build for SLE_11 -%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} - +%{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d} +%if 0%{?suse_version} > 1210 +%define has_systemd 1 +BuildRequires: systemd-rpm-macros +%{?systemd_ordering} +%else +Requires(pre): %insserv_prereq +%endif Name: sphinx Version: 2.2.11 Release: 0 Summary: SQL full-text search engine License: GPL-2.0-only Group: Productivity/Databases/Servers -Url: http://sphinxsearch.com/ -Source0: http://sphinxsearch.com/files/%{name}-%{version}-release.tar.gz +URL: https://sphinxsearch.com/ +Source0: https://sphinxsearch.com/files/%{name}-%{version}-release.tar.gz Source1: %{daemon}.service Source2: %{daemon}.init Patch0: obs.patch @@ -40,34 +46,27 @@ # for fix-ups BuildRequires: dos2unix BuildRequires: gcc-c++ -BuildRequires: libexpat-devel BuildRequires: mysql-devel -BuildRequires: postgresql-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(libecpg) >= 9.6 +BuildRequires: pkgconfig(libecpg_compat) >= 9.6 +BuildRequires: pkgconfig(libpgtypes) >= 9.6 +BuildRequires: pkgconfig(libpq) >= 9.6 +Requires: logrotate +Provides: %{daemon} +Requires(pre): %{_bindir}/getent +Requires(pre): /usr/sbin/useradd %if 0%{?suse_version} Requires(post): %fillup_prereq -Requires(pre): %{_bindir}/getent #Requires(pre): permissions >= 2014.11 -Requires(pre): pwdutils %else -Requires(pre): shadow-utils Requires(post): /sbin/chkconfig -Requires(preun): /sbin/service /sbin/chkconfig Requires(postun): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service %endif - -%if 0%{?suse_version} > 1210 -BuildRequires: systemd -BuildRequires: systemd-rpm-macros -Requires(pre): systemd -%define has_systemd 1 -%else -Requires(pre): %insserv_prereq -%endif -Requires: logrotate -Provides: %{daemon} - # -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Sphinx is a standalone search engine providing size-efficient and @@ -91,7 +90,6 @@ Pure C searchd client API library Sphinx search engine, http://sphinxsearch.com/ - %package -n libsphinxclient-devel Summary: Development libraries and header files for libsphinxclient Group: Development/Libraries/Other @@ -115,7 +113,17 @@ find -type d -name CVS -exec rm -Rf {} + %build -%configure --sysconfdir=%{_sysconfdir}/%{name}/ --with-mysql --with-pgsql --enable-id64 +#@todo we should move it to cmake +set -x +export pg_includes="$(pkg-config --cflags --libs libpq | sed 's,^-I,,g')" + +%configure --sysconfdir=%{_sysconfdir}/%{name}/ \ + --enable-id64 \ + --with-mysql \ + --with-pgsql \ + --with-pgsql-includes="${pg_includes}" \ + --with-pgsql-libs="%{_libdir}" + make %{?_smp_mflags} VERBOSE=1 pushd api/libsphinxclient @@ -147,13 +155,13 @@ %{buildroot}%{_sysconfdir}/%{name}/%{name}-min.conf.dist; do - sed -i 's|/var/log/%{daemon}.log|%{_localstatedir}/log/%{name}/%{daemon}.log|g' ${CONF} + sed -i 's|%{_localstatedir}/log/%{daemon}.log|%{_localstatedir}/log/%{name}/%{daemon}.log|g' ${CONF} - sed -i 's|/var/log/query.log|%{_localstatedir}/log/%{name}/query.log|g' ${CONF} + sed -i 's|%{_localstatedir}/log/query.log|%{_localstatedir}/log/%{name}/query.log|g' ${CONF} - sed -i 's|/var/log/%{daemon}.pid|/run/%{name}/%{daemon}.pid|g' ${CONF} + sed -i 's|%{_localstatedir}/log/%{daemon}.pid|/run/%{name}/%{daemon}.pid|g' ${CONF} - sed -i 's|/var/data|%{_localstatedir}/lib/%{name}/data|g' ${CONF} + sed -i 's|%{_localstatedir}/data|%{_localstatedir}/lib/%{name}/data|g' ${CONF} done cp -v %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf{.dist,} @@ -199,7 +207,6 @@ getent passwd %{sphinx_user} >/dev/null || \ useradd -r -g %{sphinx_group} -d %{sphinx_home} -s /bin/sh \ -c "Sphinx Searchd daemon" %{sphinx_user} -exit 0 %if 0%{?has_systemd} %service_add_pre %{daemon}.service %endif @@ -207,7 +214,7 @@ %post %if 0%{?has_systemd} %service_add_post %{daemon}.service -/usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf || true +%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf || true %else %if 0%{?suse_version} %{fillup_and_insserv -n "%{daemon}"} @@ -229,7 +236,7 @@ %preun %if 0%{?has_systemd} %service_del_preun %{daemon}.service -/usr/bin/systemd-tmpfiles --remove %{_tmpfilesdir}/%{name}.conf || true +%{_bindir}/systemd-tmpfiles --remove %{_tmpfilesdir}/%{name}.conf || true %else %if 0%{?suse_version} %stop_on_removal %{daemon} @@ -260,7 +267,6 @@ chown -R %{sphinx_user}:%{sphinx_group} %{_localstatedir}/lib/%{name}/ %post -n libsphinxclient-%{soname} -p /sbin/ldconfig - %postun -n libsphinxclient-%{soname} -p /sbin/ldconfig %files @@ -272,7 +278,6 @@ %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config %{_sysconfdir}/%{name}/%{name}.conf.dist %config %{_sysconfdir}/%{name}/%{name}-min.conf.dist -%defattr(-,root,root,-) %if 0%{?has_systemd} %{_unitdir}/%{daemon}.service %{_tmpfilesdir}/%{name}.conf @@ -282,12 +287,13 @@ %endif %{_sbindir}/rc%{daemon} %config %{_sysconfdir}/logrotate.d/%{name} -%{_bindir}/spelldump -%{_bindir}/indexer -%{_bindir}/searchd -%{_bindir}/indextool -%{_bindir}/wordbreaker -%doc COPYING contrib/ +%attr(755,root,root) %{_bindir}/spelldump +%attr(755,root,root) %{_bindir}/indexer +%attr(755,root,root) %{_bindir}/searchd +%attr(755,root,root) %{_bindir}/indextool +%attr(755,root,root) %{_bindir}/wordbreaker +%license COPYING +%doc contrib/ %doc doc/*.html doc/*.css doc/*.txt %doc %attr(644, root, man) %{_mandir}/man1/indexer.1* %doc %attr(644, root, man) %{_mandir}/man1/indextool.1* @@ -304,13 +310,11 @@ %dir %attr(0755, %{sphinx_user}, %{sphinx_group}) %{_localstatedir}/lib/%{name}/data/index %files -n libsphinxclient-%{soname} -%defattr(-,root,root,-) -%doc COPYING +%license COPYING %attr(755, root, root) %{_libdir}/libsphinxclient-0.0.1.so %files -n libsphinxclient-devel -%defattr(-,root,root,-) -%doc COPYING +%license COPYING %{_includedir}/sphinxclient.h %{_libdir}/libsphinxclient.so
