move seaf-daemon to seafile and add requirements to work as client installed alone [release 3.1.4-5mamba;Wed Aug 27 2014]

seafile-seahub.service

@@ -10,6 +10,7 @@ User=seafile
 Group=seafile
 Type=oneshot
 RemainAfterExit=yes
+WorkingDirectory=/usr/share/seafile
 
 [Install]
 WantedBy=multi-user.target

seafile.spec

@@ -2,7 +2,7 @@
 %define seafile_userid  65435
 Name:          seafile
 Version:       3.1.4
-Release:       3mamba
+Release:       5mamba
 Summary:       A next-generation open source cloud storage system with advanced support for file syncing
 Group:         Applications/Web
 Vendor:        openmamba
@@ -32,7 +32,10 @@ BuildRequires: libz-devel
 ## AUTOBUILDREQ-END
 BuildRequires: libzdb-devel
 BuildRequires: libevhtp-devel
+Requires:      ccnet
 Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      python-ccnet
+Requires:      python-%{name} = %{?epoch:%epoch:}%{version}-%{release}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -43,7 +46,6 @@ Seafile allows users to create groups with file syncing, wiki, and discussion to
 %package server
 Group:         System/Servers
 Summary:       Server package for %{name}
-Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 Requires:      python-%{name} = %{?epoch:%epoch:}%{version}-%{release}
 Requires:      ccnet
 Requires:      seahub
@@ -113,8 +115,13 @@ setup-seafile.sh} \
    
 install -d -m0755 %{buildroot}%{_datadir}/seafile/seafile-server/seafile/bin
 install -d -m0755 %{buildroot}%{_datadir}/seafile/seafile-server/seafile/%{_lib}
-for f in ccnet-init fileserver seaf-fuse seaf-server seafile-controller seafserv-tool \
+for f in fileserver seaf-fuse seaf-server seafile-controller seafserv-tool \
-         ccnet-server seaf-fsck seaf-migrate seaf-server-init seafserv-gc; do
+         seaf-fsck seaf-migrate seaf-server-init seafserv-gc; do
+   mv %{buildroot}%{_bindir}/$f %{buildroot}%{_datadir}/seafile/seafile-server/seafile/bin/
+   ln -s %{_datadir}/seafile/seafile-server/seafile/bin/$f %{buildroot}%{_bindir}/$f
+done
+
+for f in ccnet-init ccnet-server; do
    ln -s %{_bindir}/$f %{buildroot}%{_datadir}/seafile/seafile-server/seafile/bin/$f
 done
 
@@ -159,6 +166,7 @@ fi
 %files
 %defattr(-,root,root)
 %{_bindir}/seaf-cli
+%{_bindir}/seaf-daemon
 %{_bindir}/seafile
 %{_unitdir}/seafile-client.service
 %{_mandir}/man1/ccnet.1*
@@ -177,12 +185,11 @@ fi
 %{_bindir}/seafile-controller
 %{_bindir}/seafserv-gc
 %{_bindir}/seafserv-tool
-%{_bindir}/seaf-daemon
 %attr(-,seafile,seafile) %dir %{_datadir}/seafile
 %dir %{_datadir}/seafile/seafile-server
 %{_datadir}/seafile/seafile-server/*.sh
 %{_datadir}/seafile/seafile-server/*.py
-%dir %{_datadir}/seafile/seafile-server/runtime
+%attr(-,seafile,seafile) %dir %{_datadir}/seafile/seafile-server/runtime
 %{_datadir}/seafile/seafile-server/runtime/seahub.conf
 %dir %{_datadir}/seafile/seafile-server/seafile
 %dir %{_datadir}/seafile/seafile-server/seafile/bin
@@ -217,6 +224,14 @@ fi
 %{python_sitearch}/seaserv/*.py*
 
 %changelog
+* Wed Aug 27 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 3.1.4-5mamba
+- move seaf-daemon to seafile and add requirements to work as client installed alone
+
+* Wed Aug 27 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 3.1.4-4mamba
+- move server bin files from %{_bindir} to seafile-server/seafile/bin dir for seafile-controller to work
+- fix permissions of %{_datadir}/seafile/seafile-server/runtime for seahub.sh to work
+- seahub.service: set working directory
+
 * Sat Aug 09 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 3.1.4-3mamba
 - rebuild with --enable-server and other options
 - organize %{datadir}/seafile and add requirements to make server basically work