commit sphinx for openSUSE:Factory
Hello community,
here is the log from the commit of package sphinx for openSUSE:Factory checked
in at 2020-07-27 17:47:55
Comparing /work/SRC/openSUSE:Factory/sphinx (Old)
and /work/SRC/openSUSE:Factory/.sphinx.new.3592 (New)
Package is "sphinx"
Mon Jul 27 17:47:55 2020 rev:5 rq:822940 version:2.2.11
Changes:
--- /work/SRC/openSUSE:Factory/sphinx/sphinx.changes2019-03-24
15:01:24.735168440 +0100
+++ /work/SRC/openSUSE:Factory/.sphinx.new.3592/sphinx.changes 2020-07-27
17:49:26.335524991 +0200
@@ -1,0 +2,11 @@
+Sun Jul 26 14:31:08 UTC 2020 - Bruno Friedmann
+
+- Spec cleaner minimal update date
+- Minor cosmetic changes
+- Close boo#1157590
+ + Remove posttrans section with chown
+On systems with fs.protected_hardlinks=0 this allows sphinx
+to escalate to root.
+ + Add log directory and files to files section
+
+---
Other differences:
--
++ sphinx.spec ++
--- /var/tmp/diff_new_pack.zr6sSo/_old 2020-07-27 17:49:30.699529799 +0200
+++ /var/tmp/diff_new_pack.zr6sSo/_new 2020-07-27 17:49:30.703529803 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sphinx
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -54,9 +54,9 @@
BuildRequires: pkgconfig(libpgtypes) >= 9.6
BuildRequires: pkgconfig(libpq) >= 9.6
Requires: logrotate
-Provides: %{daemon}
Requires(pre): %{_bindir}/getent
-Requires(pre): /usr/sbin/useradd
+Requires(pre): %{_sbindir}/useradd
+Provides: %{daemon}
%if 0%{?suse_version}
Requires(post): %fillup_prereq
#Requires(pre): permissions >= 2014.11
@@ -142,6 +142,8 @@
# Create /var/log/sphinx
mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
+touch %{buildroot}%{_localstatedir}/log/%{name}/query.log
+touch %{buildroot}%{_localstatedir}/log/%{name}/%{daemon}.log
# Create /var/run/sphinx
mkdir -p %{buildroot}/run/%{name}
@@ -154,13 +156,9 @@
for CONF in %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf.dist\
%{buildroot}%{_sysconfdir}/%{name}/%{name}-min.conf.dist;
do
-
sed -i
's|%{_localstatedir}/log/%{daemon}.log|%{_localstatedir}/log/%{name}/%{daemon}.log|g'
${CONF}
-
sed -i
's|%{_localstatedir}/log/query.log|%{_localstatedir}/log/%{name}/query.log|g'
${CONF}
-
sed -i 's|%{_localstatedir}/log/%{daemon}.pid|/run/%{name}/%{daemon}.pid|g'
${CONF}
-
sed -i 's|%{_localstatedir}/data|%{_localstatedir}/lib/%{name}/data|g' ${CONF}
done
@@ -222,16 +220,6 @@
/sbin/chkconfig --add %{daemon}
%endif
%endif
-# Create empty log files with correct rights if not exist
-for LOG in %{_localstatedir}/log/%{name}/%{daemon}.log\
- %{_localstatedir}/log/%{name}/query.log;
-do
- if [ ! -f ${LOG} ];then
- touch ${LOG}
- chmod 0640 ${LOG}
- chown %{sphinx_user}:root ${LOG}
- fi
-done
%preun
%if 0%{?has_systemd}
@@ -262,10 +250,6 @@
%endif
%endif
-%posttrans
-# chown -R %%{sphinx_user}:root %%{_localstatedir}/log/sphinx/
-chown -R %{sphinx_user}:%{sphinx_group} %{_localstatedir}/lib/%{name}/
-
%post -n libsphinxclient-%{soname} -p /sbin/ldconfig
%postun -n libsphinxclient-%{soname} -p /sbin/ldconfig
@@ -308,6 +292,9 @@
%dir %attr(0755, %{sphinx_user}, %{sphinx_group}) %{_localstatedir}/lib/%{name}
%dir %attr(0755, %{sphinx_user}, %{sphinx_group})
%{_localstatedir}/lib/%{name}/data
%dir %attr(0755, %{sphinx_user}, %{sphinx_group})
%{_localstatedir}/lib/%{name}/data/index
+%dir %attr(0750, root, root) %{_localstatedir}/log/%{name}
+%attr(0640, %{sphinx_user}, root) %{_localstatedir}/log/%{name}/%{daemon}.log
+%attr(0640, %{sphinx_user}, root) %{_localstatedir}/log/%{name}/query.log
%files -n libsphinxclient-%{soname}
%license COPYING
commit sphinx for openSUSE:Factory
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.changes2018-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
+
+- 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
+
+- 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 \
+
commit sphinx for openSUSE:Factory
Hello community,
here is the log from the commit of package sphinx for openSUSE:Factory checked
in at 2018-08-10 09:49:48
Comparing /work/SRC/openSUSE:Factory/sphinx (Old)
and /work/SRC/openSUSE:Factory/.sphinx.new (New)
Package is "sphinx"
Fri Aug 10 09:49:48 2018 rev:3 rq:628235 version:2.2.11
Changes:
--- /work/SRC/openSUSE:Factory/sphinx/sphinx.changes2018-07-23
18:03:05.312775920 +0200
+++ /work/SRC/openSUSE:Factory/.sphinx.new/sphinx.changes 2018-08-10
09:49:49.286274144 +0200
@@ -1,0 +2,6 @@
+Wed Aug 8 15:58:30 UTC 2018 - jeng...@inai.de
+
+- Trim redundancies and bias from description.
+- Fix RPM groups. Use more efficient find calls in .spec.
+
+---
Other differences:
--
++ sphinx.spec ++
--- /var/tmp/diff_new_pack.dzzowU/_old 2018-08-10 09:49:50.326275819 +0200
+++ /var/tmp/diff_new_pack.dzzowU/_new 2018-08-10 09:49:50.330275826 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sphinx
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%global sphinx_user sphinx
%global sphinx_group sphinx
%global daemon searchd
@@ -26,8 +27,8 @@
Name: sphinx
Version:2.2.11
Release:0
-Summary:Free open-source SQL full-text search engine
-License:GPL-2.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
@@ -55,8 +56,8 @@
%endif
%if 0%{?suse_version} > 1210
-BuildRequires: systemd-rpm-macros
BuildRequires: systemd
+BuildRequires: systemd-rpm-macros
Requires(pre): systemd
%define has_systemd 1
%else
@@ -69,30 +70,22 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-Sphinx is a full-text search engine, distributed under GPL version 2.
-Commercial licensing (e.g. for embedded use) is also available upon request.
+Sphinx is a standalone search engine providing size-efficient and
+relevant full-text search functions to other applications. Sphinx
+integrates with SQL databases and scripting languages.
+
+Data source drivers support fetching data either via direct
+connection to MySQL, PostgreSQL, or from a pipe in a custom XML
+format.
-Generally, it's a standalone search engine, meant to provide fast,
-size-efficient and relevant full-text search functions to other
-applications. Sphinx was specially designed to integrate well with SQL
-databases and scripting languages.
-
-Currently built-in data source drivers support fetching data either via
-direct connection to MySQL, or PostgreSQL, or from a pipe in a custom XML
-format. Adding new drivers (e.g. to natively support some other DBMSes) is
-designed to be as easy as possible.
-
-Search API is natively ported to PHP, Python, Perl, Ruby, Java, and also
-available as a pluggable MySQL storage engine. API is very lightweight so
-porting it to new language is known to take a few hours.
+The Search API is natively ported to PHP, Python, Perl, Ruby, Java,
+and also available as a pluggable MySQL storage engine.
-As for the name, Sphinx is an acronym which is officially decoded as SQL
-Phrase Index. Yes, I know about CMU's Sphinx project.
+Sphinx is an acronym which is officially decoded as SQL Phrase Index.
%package -n libsphinxclient-%{soname}
-Group: Development/Libraries/Other
Summary:Pure C searchd client API library
-
+Group: System/Libraries
%description -n libsphinxclient-%{soname}
Pure C searchd client API library
@@ -104,7 +97,6 @@
Group: Development/Libraries/Other
Requires: libsphinxclient-%{soname} = %{version}-%{release}
-
%description -n libsphinxclient-devel
Provides necessary development files for sphinx api and shared libs for sphinx
client.
Pure C searchd client API library
@@ -120,7 +112,7 @@
%patch2 -p1
%patch3 -p1
-find -type d -name CVS -print0 | xargs -r0 rm -rf
+find -type d -name CVS -exec rm -Rf {} +
%build
%configure --sysconfdir=%{_sysconfdir}/%{name}/ --with-mysql --with-pgsql
--enable-id64
@@ -132,16 +124,13 @@
popd
%install
-make VERBOSE=1 DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install VERBOSE=1 %{?_smp_mflags}
pushd api/libsphinxclient
- make VERBOSE=1 DESTDIR=%{buildroot} install %{?_smp_mflags}
+ %make_install VERBOSE=1
commit sphinx for openSUSE:Factory
Hello community,
here is the log from the commit of package sphinx for openSUSE:Factory checked
in at 2018-07-23 18:02:17
Comparing /work/SRC/openSUSE:Factory/sphinx (Old)
and /work/SRC/openSUSE:Factory/.sphinx.new (New)
Package is "sphinx"
Mon Jul 23 18:02:17 2018 rev:2 rq:624657 version:2.2.11
Changes:
--- /work/SRC/openSUSE:Factory/sphinx/sphinx.changes2018-06-29
22:26:37.834473170 +0200
+++ /work/SRC/openSUSE:Factory/.sphinx.new/sphinx.changes 2018-07-23
18:03:05.312775920 +0200
@@ -1,0 +2,6 @@
+Mon Jul 23 06:51:35 UTC 2018 - bwiedem...@suse.com
+
+- Add reproducible.patch to drop hostname and kernel version
+ from package build result (boo#1084909, boo#1101107)
+
+---
New:
reproducible.patch
Other differences:
--
++ sphinx.spec ++
--- /var/tmp/diff_new_pack.irQYYJ/_old 2018-07-23 18:03:05.828775282 +0200
+++ /var/tmp/diff_new_pack.irQYYJ/_new 2018-07-23 18:03:05.832775277 +0200
@@ -35,6 +35,7 @@
Source2:%{daemon}.init
Patch0: obs.patch
Patch2: sphinx-default_listen.patch
+Patch3: reproducible.patch
# for fix-ups
BuildRequires: dos2unix
BuildRequires: gcc-c++
@@ -117,6 +118,7 @@
%setup -q -n "%{name}-%{version}-release"
%patch0 -p1
%patch2 -p1
+%patch3 -p1
find -type d -name CVS -print0 | xargs -r0 rm -rf
++ reproducible.patch ++
Index: sphinx-2.2.11-release/configure.ac
===
--- sphinx-2.2.11-release.orig/configure.ac
+++ sphinx-2.2.11-release/configure.ac
@@ -79,7 +79,7 @@ syntax error
])], [], [AC_MSG_ERROR([Gcc version error. Minspec is 3.4])])
AC_DEFINE_UNQUOTED([COMPILER],"$CC `$CC -dumpversion`",[Define to be the name
of the compiler.])
-AC_DEFINE_UNQUOTED([OS_UNAME],"`uname -a`",[Full name OS])
+AC_DEFINE_UNQUOTED([OS_UNAME],"`uname -smo`",[Full name OS])
AC_DEFINE_UNQUOTED([CONFIGURE_FLAGS],"$ac_configure_args",[Flags used to
configure me])
dnl --
Index: sphinx-2.2.11-release/configure
===
--- sphinx-2.2.11-release.orig/configure
+++ sphinx-2.2.11-release/configure
@@ -4454,7 +4454,7 @@ _ACEOF
cat >>confdefs.h <<_ACEOF
-#define OS_UNAME "`uname -a`"
+#define OS_UNAME "`uname -smo`"
_ACEOF
