diff --git a/Makefile b/Makefile index 565a69226c..d43003ee0e 100644 --- a/Makefile +++ b/Makefile @@ -67,10 +67,10 @@ rpm: cp ZenTaoPMS.${VERSION}.zip ~/rpmbuild/SOURCES mkdir ~/rpmbuild/SOURCES/etc/httpd/conf.d/ -p cp build/debian/zentaopms.conf ~/rpmbuild/SOURCES/etc/httpd/conf.d/ - mkdir ~/rpmbuild/SOURCES/var/www/ -p - cd ~/rpmbuild/SOURCES; unzip ZenTaoPMS.${VERSION}.zip; mv zentaopms var/www/zentao; - sed -i 's/index.php/\/zentao\/index.php/' ~/rpmbuild/SOURCES/var/www/zentao/www/.htaccess - cd ~/rpmbuild/SOURCES; tar -czvf zentaopms-${VERSION}.tar.gz etc var; rm -rf ZenTaoPMS.${VERSION}.zip etc var; + mkdir ~/rpmbuild/SOURCES/opt/ -p + cd ~/rpmbuild/SOURCES; unzip ZenTaoPMS.${VERSION}.zip; mv zentaopms opt/zentao; + sed -i 's/index.php/\/zentao\/index.php/' ~/rpmbuild/SOURCES/opt/zentao/www/.htaccess + cd ~/rpmbuild/SOURCES; tar -czvf zentaopms-${VERSION}.tar.gz etc opt; rm -rf ZenTaoPMS.${VERSION}.zip etc opt; rpmbuild -ba ~/rpmbuild/SPECS/zentaopms.spec cp ~/rpmbuild/RPMS/noarch/zentaopms-${VERSION}-1.noarch.rpm ./ rm -rf ~/rpmbuild diff --git a/build/rpm/zentaopms.spec b/build/rpm/zentaopms.spec index d4e6ccebef..ca1e466642 100644 --- a/build/rpm/zentaopms.spec +++ b/build/rpm/zentaopms.spec @@ -18,12 +18,12 @@ Requires:httpd,php-cli, php-common,php-pdo,php-mysql,php-json,php-ldap,mysql %install mkdir -p $RPM_BUILD_ROOT -chmod 777 -R %{_builddir}/%{name}-%{version}/var/www/zentao/tmp/ -chmod 777 -R %{_builddir}/%{name}-%{version}/var/www/zentao/www/data -chmod 777 -R %{_builddir}/%{name}-%{version}/var/www/zentao/config -chmod 777 %{_builddir}/%{name}-%{version}/var/www/zentao/module -chmod a+rx %{_builddir}/%{name}-%{version}/var/www/zentao/bin/* -find %{_builddir}/%{name}-%{version}/var/www/zentao/ -name ext |xargs chmod -R 777 +chmod 777 -R %{_builddir}/%{name}-%{version}/opt/zentao/tmp/ +chmod 777 -R %{_builddir}/%{name}-%{version}/opt/zentao/www/data +chmod 777 -R %{_builddir}/%{name}-%{version}/opt/zentao/config +chmod 777 %{_builddir}/%{name}-%{version}/opt/zentao/module +chmod a+rx %{_builddir}/%{name}-%{version}/opt/zentao/bin/* +find %{_builddir}/%{name}-%{version}/opt/zentao/ -name ext |xargs chmod -R 777 cp -a %{_builddir}/%{name}-%{version}/* $RPM_BUILD_ROOT %clean @@ -33,6 +33,7 @@ rm -rf $RPM_BUILD_ROOT / %post +chcon -R --reference=/var/www/html/ /opt/zentao/ lowVersion=`httpd -v|awk '$3~/Apache/{print $3}'|awk -F '/' '{print ($2<2.4) ? 1 : 0}'` if [ $lowVersion == 1 ]; then sed -i '/Require all granted/d' /etc/httpd/conf.d/zentaopms.conf