Kolab Groupware OBS

phabricator.spec Changed

@@ -1,21 +1,24 @@
-%global revision_date 20161126
-%global git_short_version_hash cfcc3b8
-%global git_full_version_hash cfcc3b834d1df721ca40ad436930ddde3cba430f
+%global revision_date 20161211
+%global git_short_version_hash 3cd0001
+%global git_full_version_hash 3cd0001d8b95897d5efafa0c391a9e870fd35471
 
 Summary:            An open software engineering platform
 Name:               phabricator
 Version:            0.%{revision_date}.git%{git_short_version_hash}
-Release:            5%{?dist}
+Release:            1%{?dist}
 License:            ASL 2.0
 Group:              Applications/Productivity
 URL:                http://www.phabricator.org/
 
-Source0:            https://github.com/phacility/phabricator/archive/%{git_full_version_hash}.tar.gz#/phabricator-%{git_full_version_hash}.tar.gz
+Source0:            https://github.com/phacility/%{name}/archive/%{git_full_version_hash}.tar.gz#/%{name}-%{git_full_version_hash}.tar.gz
 Source1:            aphlict.service
 Source2:            phd.service
 Source3:            sshd-phab.service
 Source4:            phabricator.tmpfiles.conf
 Source5:            sshd_config_phab
+Source6:            phabricator.sysconfig
+Source7:            aphlict.config.json
+Source8:            phabricator.config.json
 
 Source998:          README.fedora
 Source999:          README.rhel
@@ -80,14 +83,20 @@
 Requires:           figlet
 Requires:           php-PHPMailer
 
-Requires:           arcanist >= 0.20160825
-Requires:           arcanist <= 0.20170227
+Requires:           arcanist >= 0.20160909
+Requires:           arcanist <= 0.20170314
 Requires:           git-core
 Requires:           httpd
 Requires:           nodejs
 Requires:           nodejs-ws
-Requires:           phabricator(libphutil) >= 0.20160825
-Requires:           phabricator(libphutil) <= 0.20170227
+Requires:           phabricator(libphutil) >= 0.20160909
+Requires:           phabricator(libphutil) <= 0.20170314
+Requires:           php(language) >= 5
+# See:
+# * https://pagure.io/phabphourphedora/issue/7
+# * https://secure.phabricator.com/T9640#184099
+# * https://secure.phabricator.com/T11270
+Requires:           php(language) < 7
 Requires:           php-curl
 Requires:           php-iconv
 Requires:           php-pecl-mailparse
@@ -108,7 +117,7 @@
 software companies build better software.
 
 %prep
-%setup -q -n phabricator-%{git_full_version_hash}
+%setup -q -n %{name}-%{git_full_version_hash}
 
 # Shipping is sorted in %files
 cp -a %{SOURCE998} .
@@ -155,13 +164,13 @@
 %patch0015 -p1
 
 grep -rlE '/usr/local/bin|bin/env' . | xargs sed -i -e ' 1 {
-	s,/usr/local/bin/php,/usr/bin/php,
-	s,/usr/bin/env .*php,/usr/bin/php,
+	s,/usr/local/bin/php,%{_bindir}/php,
+	s,/usr/bin/env .*php,%{_bindir}/php,
 }'
 
 sed -r -i \
-    -e 's|/var/log/aphlict.log|/var/log/phabricator/aphlict.log|g' \
-    -e 's|/var/tmp/aphlict/pid/aphlict.pid|/var/run/phabricator/aphlict.pid|g' \
+    -e 's|/var/log/aphlict.log|/var/log/%{name}/aphlict.log|g' \
+    -e 's|/var/tmp/aphlict/pid/aphlict.pid|/var/run/%{name}/aphlict.pid|g' \
     conf/aphlict/aphlict.default.json
 
 %build
@@ -171,12 +180,14 @@
 rm -rf %{buildroot}
 install -d %{buildroot}%{_libexecdir}/%{name}
 install -d %{buildroot}%{_datadir}/%{name}
+install -d %{buildroot}%{_sysconfdir}/%{name}/
 install -d %{buildroot}%{_sysconfdir}/ssh/
+install -d %{buildroot}%{_sysconfdir}/sysconfig/
 install -d %{buildroot}%{_sysconfdir}/tmpfiles.d/
-install -d %{buildroot}%{_var}/lib/phabricator
-install -d %{buildroot}%{_var}/lib/phabricator/files
-install -d %{buildroot}%{_var}/lib/phabricator/repos
-install -d %{buildroot}%{_var}/log/phabricator
+install -d %{buildroot}%{_var}/lib/%{name}
+install -d %{buildroot}%{_var}/lib/%{name}/files
+install -d %{buildroot}%{_var}/lib/%{name}/repos
+install -d %{buildroot}%{_var}/log/%{name}
 install -d %{buildroot}%{_unitdir}
 
 cp -a \
@@ -200,16 +211,31 @@
 chmod a+x %{buildroot}%{_libexecdir}/%{name}/ssh-hook
 sed -r -i \
     -e 's|^VCSUSER=.*$|VCSUSER="git"|g' \
-    -e 's|^ROOT=.*$|ROOT="/usr/share/phabricator"|g' \
+    -e 's|^ROOT=.*$|ROOT="/usr/share/%{name}"|g' \
     %{buildroot}%{_libexecdir}/%{name}/ssh-hook
 
 install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/aphlict.service
 install -p -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/phd.service
 install -p -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/sshd-phab.service
 
-install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/tmpfiles.d/phabricator.conf
+install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
 install -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/ssh/sshd_config_phab
 
+install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+
+pushd %{buildroot}%{_datadir}/%{name}/conf/aphlict/
+mv aphlict.default.json ../../../../..%{_sysconfdir}/%{name}/aphlict.config.json
+ln -s ../../../../..%{_sysconfdir}/%{name}/aphlict.config.json aphlict.default.json
+popd
+
+install -p -m 640 %{SOURCE7} %{buildroot}%{_sysconfdir}/%{name}/aphlict.config.json
+
+pushd %{buildroot}%{_datadir}/%{name}/conf/local/
+ln -s ../../../../..%{_sysconfdir}/%{name}/%{name}.config.json local.json
+popd
+
+install -p -m 640 %{SOURCE8} %{buildroot}%{_sysconfdir}/%{name}/%{name}.config.json
+
 ##install -d %{buildroot}%{_sysconfdir}/sudoers.d/
 
 # Very probably not allowed
@@ -225,6 +251,35 @@
 %clean
 rm -rf %{buildroot}
 
+%pretrans
+if [ -f %{_datadir}/%{name}/conf/local/local.json ]; then
+    if [ ! -L %{_datadir}/%{name}/conf/local/local.json ]; then
+        mkdir -p %{_sysconfdir}/%{name}
+        chown phabricator:apache %{_sysconfdir}/%{name}
+        chmod 750 %{_sysconfdir}/%{name}
+        mv %{_datadir}/%{name}/conf/local/local.json \
+            %{_sysconfdir}/%{name}/%{name}.config.json
+        chmod 640 %{_sysconfdir}/%{name}/%{name}.config.json
+        chown phabricator:apache %{_sysconfdir}/%{name}/%{name}.config.json
+        ln -s ../../../../..%{_sysconfdir}/%{name}/%{name}.config.json \
+            %{_datadir}/%{name}/conf/local/local.json
+    fi
+fi
+
+if [ -f %{_datadir}/%{name}/conf/aphlict/aphlict.default.json ]; then
+    if [ ! -L %{_datadir}/%{name}/conf/aphlict/aphlict.default.json ]; then
+        mkdir -p %{_sysconfdir}/%{name}
+        chown phabricator:apache %{_sysconfdir}/%{name}
+        chmod 750 %{_sysconfdir}/%{name}
+        mv %{_datadir}/%{name}/conf/aphlict/aphlict.default.json \
+            %{_sysconfdir}/%{name}/aphlict.config.json
+        chmod 640 %{_sysconfdir}/%{name}/aphlict.config.json
+        chown phabricator:apache %{_sysconfdir}/%{name}/aphlict.config.json
+        ln -s ../../../../..%{_sysconfdir}/%{name}/aphlict.config.json \
+            %{_sysconfdir}/%{name}/aphlict.config.json
+    fi
+fi
+
 %pre
 getent group phabricator >/dev/null || \
     groupadd -r phabricator >/dev/null 2>&1 || :
@@ -249,6 +304,16 @@
 getent group phabricator | grep -q apache || \
     gpasswd -a apache phabricator >/dev/null 2>&1 || :
 
+# Only execute on upgrade, not install/uninstall
+if [ $1 -gt 1 -a -f /etc/sysconfig/%{name} ]; then
+    . /etc/sysconfig/%{name} || exit 0
+
+    if [ "${AUTO_DUMP_STORAGE}" == "1" ]; then
+        %{_datadir}/%{name}/bin/storage dump | \
+            gzip -c > %{_var}/lib/%{name}/pre-%{version}-%{release}.sql.gz || :
+    fi
+fi
+
 %post
 # Very probably not allowed
 #sed -i -e '/requiretty/d' /etc/sudoers >/dev/null 2>&1 || :
@@ -257,6 +322,16 @@
 %systemd_post aphlict.service
 %systemd_post phd.service
 
+# Only execute on upgrade
+if [ $1 -gt 1 -a -f /etc/sysconfig/%{name} ]; then
+    . /etc/sysconfig/%{name} || exit 0
+
+    if [ "${AUTO_UPGRADE_STORAGE}" == "1" ]; then
+        %{_datadir}/%{name}/bin/storage upgrade --force > \
+            %{_var}/log/%{name}/upgrade-%{version}-%{release}.log 2>&1 || :
+    fi

README.fedora Changed

README.rhel Changed

aphlict.config.json Added

phabricator-3cd0001d8b95897d5efafa0c391a9e870fd35471.tar.gz Added

phabricator-cfcc3b834d1df721ca40ad436930ddde3cba430f.tar.gz Deleted

phabricator.config.json Added

phabricator.sysconfig Added

Changes of Revision 43