- Update to snapshot 1.0.6

OBS-URL: https://build.opensuse.org/package/show/server:mail/grommunio-index?expand=0&rev=6
This commit is contained in:
Jan Engelhardt 2024-06-07 12:34:11 +00:00 committed by Git OBS Bridge
parent 9c0a96971e
commit 21057829ea
9 changed files with 73 additions and 29 deletions

View File

@ -1,15 +1,14 @@
<services> <services>
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="manual">
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">https://github.com/grommunio/grommunio-index</param> <param name="url">https://github.com/grommunio/grommunio-index</param>
<param name="filename">grommunio-index</param> <param name="filename">grommunio-index</param>
<param name="revision">master</param> <param name="revision">master</param>
<param name="parent-tag">0.1</param>
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param> <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="manual">
<param name="file">*.tar</param> <param name="file">*.tar</param>
<param name="compression">xz</param> <param name="compression">xz</param>
</service> </service>
<service name="set_version" mode="disabled"/> <service name="set_version" mode="manual"/>
</services> </services>

View File

@ -1,4 +1,4 @@
grommunio-index (0.1.18.6a0f73a) unstable; urgency=low grommunio-index (1.0.6.f40d25b) unstable; urgency=low
* Initial package. * Initial package.

View File

@ -10,5 +10,7 @@ Standards-Version: 4.5.1
Package: grommunio-index Package: grommunio-index
Architecture: any Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends} Depends: ${misc:Depends}, ${shlibs:Depends}
Requires: system-user-groindex,
system-group-groweb, system-group-gromoxcf
Description: Generator for grommunio-web search indexes Description: Generator for grommunio-web search indexes
. .

View File

@ -0,0 +1,3 @@
usermod grommunio -aG groweb || :
find /var/lib/grommunio-web/sqlite-index/ -mindepth 1 "(" -type d -o -type f ")" -exec chmod g+w,o-w {} + || :
find /var/lib/grommunio-web/sqlite-index/ -mindepth 1 "(" -type d -o -type f ")" -exec chgrp -h groweb {} + || :

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ab81dc53c13ad6482f006856a85f7772ab644bb52e1d4ca7f7fae677ce7eb6f4
size 21092

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:809b060d222309c6c5be5abe539f2765dc26a4ac011271f084f03087829a55b8
size 22748

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 7 12:32:59 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Update to snapshot 1.0.6
* Switch to user identity groindex/groweb+gromoxcf
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 17 12:59:53 UTC 2023 - Jan Engelhardt <jengelh@inai.de> Tue Jan 17 12:59:53 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
Format: 1.0 Format: 1.0
Source: grommunio-index Source: grommunio-index
Architecture: any Architecture: any
Version: 0.1.18.6a0f73a Version: 1.0.6.f40d25b
DEBTRANSFORM-RELEASE: 1 DEBTRANSFORM-RELEASE: 1
Maintainer: Grommunio <null@grommunio.com> Maintainer: Grommunio <null@grommunio.com>
Homepage: https://grommunio.com/ Homepage: https://grommunio.com/

View File

@ -1,7 +1,7 @@
# #
# spec file for package grommunio-index # spec file for package grommunio-index
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: grommunio-index Name: grommunio-index
Version: 0.1.18.6a0f73a Version: 1.0.6.f40d25b
Release: 0 Release: 0
Summary: Generator for grommunio-web search indexes Summary: Generator for grommunio-web search indexes
License: AGPL-3.0-or-later License: AGPL-3.0-or-later
@ -30,12 +30,29 @@ BuildRequires: gcc11-c++
%else %else
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%endif %endif
%if 0%{?suse_version}
BuildRequires: libmysqlclient-devel >= 5.6
%else
BuildRequires: mariadb-devel >= 5.6
%endif
BuildRequires: libexmdbpp-devel >= 1.8.0 BuildRequires: libexmdbpp-devel >= 1.8.0
BuildRequires: libexmdbpp0 >= 1.8.0 BuildRequires: libexmdbpp0 >= 1.8.0
BuildRequires: pkgconfig(libHX) >= 3.27
BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
Requires: libexmdbpp0 >= 1.8.0 Requires: libexmdbpp0 >= 1.8.0
Requires: user(groweb) %if 0%{?suse_version} >= 1500
BuildRequires: sysuser-tools
%sysusers_requires
%else
Requires(pre): %_sbindir/groupadd
Requires(pre): %_sbindir/useradd
%endif
Requires(pre): group(groweb)
Requires(pre): group(gromoxcf)
Requires: group(gromoxcf)
Requires: group(groweb)
Requires: user(groindex)
%define services grommunio-index.service grommunio-index.timer %define services grommunio-index.service grommunio-index.timer
%description %description
@ -45,48 +62,65 @@ A C++17 program for the generation of grommunio-web fulltext search indexes.
%autosetup -p1 %autosetup -p1
%build %build
>user.pre
%if 0%{?suse_version} >= 1500
%sysusers_generate_pre %_sourcedir/system-user-groindex.conf user system-user-groindex.conf
%endif
pushd .
%if 0%{?suse_version} && 0%{?suse_version} < 1550 %if 0%{?suse_version} && 0%{?suse_version} < 1550
%cmake -DCMAKE_CXX_COMPILER=%_bindir/g++-11 %cmake -DCMAKE_CXX_COMPILER=%_bindir/g++-11
%else %else
%if 0%{?centos_version} == 800
echo '#!/bin/sh -ex' >cxx
echo 'exec g++ "$@" -lstdc++fs' >>cxx
ls -al cxx
chmod a+x cxx
export CXX="$PWD/cxx"
%cmake %cmake
%else
%cmake
%endif
%endif %endif
%cmake_build %cmake_build
popd
%install %install
%if 0%{?centos_version} == 800 pushd .
export CXX="$PWD/cxx"
%endif
%cmake_install %cmake_install
popd
mkdir -p "%buildroot/%_datadir/%name" mkdir -p "%buildroot/%_datadir/%name"
%pre %pre -f user.pre
%if 0%{?rhel} || 0%{?fedora_version}
getent group groindex >/dev/null || %_sbindir/groupadd -r groindex
getent passwd groindex >/dev/null || %_sbindir/useradd -g groindex -s /bin/false \
-r -c "user for %name" -d / groindex
usermod groindex -aG groweb
usermod groindex -aG gromoxcf
%endif
%if 0%{?service_add_pre:1}
%service_add_pre %services %service_add_pre %services
%endif
%post %post
find /var/lib/grommunio-web/sqlite-index/ -mindepth 1 "(" -type d -o -type f ")" -exec chmod g+w,o-w {} + || :
find /var/lib/grommunio-web/sqlite-index/ -mindepth 1 "(" -type d -o -type f ")" -exec chgrp -h groweb {} + || :
%if 0%{?service_add_post:1}
%service_add_post %services %service_add_post %services
if test -x /bin/systemctl; then %else
systemctl enable --now grommunio-index.timer || : %systemd_post %services
fi %endif
%preun %preun
%if 0%{?service_del_preun:1}
%service_del_preun %services %service_del_preun %services
%else
%systemd_preun %services
%endif
%postun %postun
%if 0%{?service_del_postun:1}
%service_del_postun %services %service_del_postun %services
%else
%systemd_postun_with_restart %services
%endif
%files %files
%_bindir/grommunio-index* %_bindir/grommunio-index*
%_sbindir/grommunio-index*
%_datadir/%name/ %_datadir/%name/
%_sysusersdir/*.conf
%_unitdir/* %_unitdir/*
%license LICENSE.txt %license LICENSE.txt