diff --git a/seafile-seafile@.service b/seafile-seafile@.service deleted file mode 100644 index 19824dc..0000000 --- a/seafile-seafile@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Next-generation open source cloud storage system -# add mysql.service or postgresql.service depending on your database to the line below -After=syslog.target network.target - -[Service] -Type=forking -User=seafile -WorkingDirectory=/srv/seafile/%i -ExecStart=/usr/bin/seafile-admin start --fastcgi -ExecStop=/usr/bin/seafile-admin stop -PIDFile=/srv/seafile/%i/seafile-data/pids/seaf-server.pid - -[Install] -WantedBy=multi-user.target diff --git a/seafile-seahub.service b/seafile-seahub.service deleted file mode 100644 index e3b72bc..0000000 --- a/seafile-seahub.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Seafile hub -After=network.target seafile.service - -[Service] -# change start to start-fastcgi if you want to run fastcgi -ExecStart=/usr/share/seafile/seafile-server/seahub.sh start-fastcgi -ExecStop=/usr/share/seafile/seafile-server/seahub.sh stop -User=seafile -Group=seafile -Type=oneshot -RemainAfterExit=yes -WorkingDirectory=/usr/share/seafile - -[Install] -WantedBy=multi-user.target diff --git a/seafile.spec b/seafile.spec index f3e63f0..206e5dc 100644 --- a/seafile.spec +++ b/seafile.spec @@ -5,7 +5,7 @@ %define MAJver %(echo %version | cut -d. -f1) Name: seafile Version: 6.0.7 -Release: 1mamba +Release: 2mamba Summary: A next-generation open source cloud storage system with advanced support for file syncing Group: Applications/Web Vendor: openmamba @@ -14,8 +14,6 @@ Packager: Silvan Calarco URL: http://seafile.com/ ## GITSOURCE https://github.com/haiwen/seafile.git v3.1.4 Source: https://github.com/haiwen/seafile.git/v%{version}/seafile-%{version}.tar.bz2 -Source1: seafile-seafile@.service -Source2: seafile-seahub.service Source3: seafile-client.service Patch0: seafile-3.1.12-delay-start-after-mysql.patch Patch1: seafile-3.1.12-setup-fix-avatars.patch @@ -61,21 +59,6 @@ Seafile is a next-generation open source cloud storage system with advanced supp Collections of files are called libraries, and each library can be synced separately. A library can be encrypted with a user chosen password. This password is not stored on the server, so even the server admin cannot view a file's contents. Seafile allows users to create groups with file syncing, wiki, and discussion to enable easy collaboration around documents within a team. -%package server -Group: System/Servers -Summary: Server package for %{name} -Requires: python-%{name} = %{?epoch:%epoch:}%{version}-%{release} -Requires: ccnet >= %{maj2_version} -Requires: seahub >= %{maj2_version} -Requires(post): seafile = %{?epoch:%epoch:}%{version}-%{release} -Requires: python-seafdav - -%description server -Seafile is a next-generation open source cloud storage system with advanced support for file syncing, privacy protection and teamwork. -Collections of files are called libraries, and each library can be synced separately. A library can be encrypted with a user chosen password. This password is not stored on the server, so even the server admin cannot view a file's contents. -Seafile allows users to create groups with file syncing, wiki, and discussion to enable easy collaboration around documents within a team. -This is the server package. - %package -n lib%{name} Group: System/Libraries Summary: Shared libraries for %{name} @@ -129,50 +112,11 @@ This package contains python bindings to %{name}. [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -install -d -m0755 %{buildroot}%{_datadir}/seafile-server - -install -d -m0755 %{buildroot}%{_datadir}/seafile-server/scripts - -cp -a scripts/* %{buildroot}%{_datadir}/seafile-server/scripts/ - -rm -rf %{buildroot}%{_datadir}/seafile-server/scripts/build -rm -rf %{buildroot}%{_datadir}/seafile-server/scripts/upgrade/win32 - -#for f in ccnet-init ccnet-server; do -# ln -s %{_bindir}/$f %{buildroot}%{_datadir}/seafile/seafile-%{MAJver}-server/seafile/bin/$f -#done - -install -D -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/seafile-server@.service -#install -D -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/seahub.service install -D -m0644 %{SOURCE3} %{buildroot}%{_unitdir}/seafile-client.service -install -d -m0755 %{buildroot}/srv/seafile - %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%pre server -if [ $1 -ge 1 ]; then - /usr/sbin/groupadd seafile -g %{seafile_groupid} 2>/dev/null - /usr/sbin/useradd -u %{seafile_userid} -c 'Seafile user' -d /srv/seafile -g seafile \ - -s /bin/false seafile 2>/dev/null -fi -: - -%post server -if [ $1 -ge 1 ]; then - systemctl -q daemon-reload -fi -: - -%preun server -if [ $1 -eq 0 ]; then - systemctl -q daemon-reload - /usr/sbin/userdel seafile 2>/dev/null - /usr/sbin/groupdel seafile 2>/dev/null -fi -: - %post -n lib%{name} -p /sbin/ldconfig %postun -n lib%{name} -p /sbin/ldconfig @@ -180,31 +124,9 @@ fi %defattr(-,root,root) %{_bindir}/seaf-cli %{_bindir}/seaf-daemon -#%{_bindir}/seafile %{_unitdir}/seafile-client.service -#%{_mandir}/man1/ccnet.1* %{_mandir}/man1/seaf-cli.1* -#%{_mandir}/man1/seafile-applet.1* - -%files server -%defattr(-,root,root) -#%{_bindir}/fileserver -#%{_bindir}/seaf-fsck -#%{_bindir}/seaf-fuse -#%{_bindir}/seaf-migrate -#%{_bindir}/seaf-server -#%{_bindir}/seaf-server-init -#%{_bindir}/seafile-admin -#%{_bindir}/seafile-controller -#%{_bindir}/seafserv-gc -#%{_bindir}/seafserv-tool -%dir %{_datadir}/seafile-server -%dir %{_datadir}/seafile-server/scripts -%{_datadir}/seafile-server/scripts/* -%{_unitdir}/seafile-server@.service -#%{_unitdir}/seahub.service %{_mandir}/man1/seaf-daemon.1* -%attr(0775,seafile,seafile) %dir /srv/seafile %files -n lib%{name} %defattr(-,root,root) @@ -224,10 +146,11 @@ fi %defattr(-,root,root) %dir %{python_sitearch}/seafile %{python_sitearch}/seafile/*.py* -#%dir %{python_sitearch}/seaserv -#%{python_sitearch}/seaserv/*.py* %changelog +* Thu Jul 13 2017 Silvan Calarco 6.0.7-2mamba +- remove seafile-server now distributed apart + * Wed Jul 12 2017 Silvan Calarco 6.0.7-1mamba - update to 6.0.7