diff --git a/seafile-3.1.12-delay-start-after-mysql.patch b/seafile-3.1.12-delay-start-after-mysql.patch new file mode 100644 index 0000000..abae34a --- /dev/null +++ b/seafile-3.1.12-delay-start-after-mysql.patch @@ -0,0 +1,19 @@ +--- seafile-3.1.12/scripts/seafile.sh.orig 2015-01-01 22:17:54.549863094 +0100 ++++ seafile-3.1.12/scripts/seafile.sh 2015-01-01 22:18:16.363850459 +0100 +@@ -98,14 +98,14 @@ + validate_already_running; + validate_ccnet_conf_dir; + read_seafile_data_dir; ++ ++ sleep 3 + test_config; + + echo "Starting seafile server, please wait ..." + + LD_LIBRARY_PATH=$SEAFILE_LD_LIBRARY_PATH ${seaf_controller} -c "${default_ccnet_conf_dir}" -d "${seafile_data_dir}" + +- sleep 3 +- + # check if seafile server started successfully + if ! pgrep -f "seafile-controller -c ${default_ccnet_conf_dir}" 2>/dev/null 1>&2; then + echo "Failed to start seafile server" diff --git a/seafile-seafile.service b/seafile-seafile.service index 377b9b3..669e73e 100644 --- a/seafile-seafile.service +++ b/seafile-seafile.service @@ -1,7 +1,7 @@ [Unit] Description=Seafile # add mysql.service or postgresql.service depending on your database to the line below -After=network.target +After=network.target mysql.target [Service] Type=oneshot diff --git a/seafile.spec b/seafile.spec index a5659a8..03838a7 100644 --- a/seafile.spec +++ b/seafile.spec @@ -1,7 +1,7 @@ %define seafile_groupid 65435 %define seafile_userid 65435 Name: seafile -Version: 3.1.11 +Version: 3.1.12 Release: 1mamba Summary: A next-generation open source cloud storage system with advanced support for file syncing Group: Applications/Web @@ -14,23 +14,36 @@ Source: https://github.com/haiwen/seafile.git/v%{version}/seafile-%{versi Source1: seafile-seafile.service Source2: seafile-seahub.service Source3: seafile-client.service +Patch0: seafile-3.1.12-delay-start-after-mysql.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libacl-devel +BuildRequires: libarchive-devel +BuildRequires: libattr-devel +BuildRequires: libbzip2-devel BuildRequires: libccnet-devel BuildRequires: libevent-devel BuildRequires: libffi-devel +BuildRequires: libfuse-devel BuildRequires: libglib-devel BuildRequires: libjansson-devel +BuildRequires: liblzma-devel +BuildRequires: liblzo-devel +BuildRequires: libmysql5-devel +BuildRequires: libnettle-devel BuildRequires: libopenssl-devel +BuildRequires: libpostgresql-devel BuildRequires: libpython-devel BuildRequires: libsearpc-devel BuildRequires: libselinux-devel BuildRequires: libsqlite-devel +BuildRequires: libstdc++6-devel BuildRequires: libuuid-devel +BuildRequires: libxml2-devel BuildRequires: libz-devel -## AUTOBUILDREQ-END BuildRequires: libzdb-devel +## AUTOBUILDREQ-END BuildRequires: libevhtp-devel Requires: ccnet Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} @@ -90,6 +103,7 @@ This package contains python bindings to %{name}. %prep %setup -q #-D -T +%patch0 -p1 %build #:<< ___EOF @@ -224,6 +238,9 @@ fi %{python_sitearch}/seaserv/*.py* %changelog +* Thu Jan 01 2015 Silvan Calarco 3.1.12-1mamba +- update to 3.1.12 + * Sat Dec 06 2014 Silvan Calarco 3.1.11-1mamba - update to 3.1.11