--- rpms/nextcloud/contribs10/nextcloud.spec 2020/11/08 23:00:09 1.2 +++ rpms/nextcloud/contribs10/nextcloud.spec 2022/07/08 15:17:33 1.7 @@ -1,9 +1,9 @@ -%define version 20.0.1 -%define release 1 +%define version 24.0.2 +%define release 3 %define apache_serverroot /usr/share %define apache_confdir /etc/httpd/conf.d -%define nc_dir %{apache_serverroot}/nextcloud +%define nc_dir %{apache_serverroot}/nextcloud-src %define nc_config_dir %{nc_dir}/config %define nc_data_dir %{nc_dir}/data @@ -57,85 +57,27 @@ nc_dir: %{nc_dir} nc_data_dir: %{nc_data_dir} nc_config_dir: %{nc_config_dir} + +%package src +Summary: Webtatic Repository +%description src +Nextcloud files and configuration. + +This package installs as follows: +nc_dir: %{nc_dir} +nc_data_dir: %{nc_data_dir} +nc_config_dir: %{nc_config_dir} + %pre -# true if $1 is greater than or equal $2 -verlte() { - [ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ] -} - -verlt() { - [ "$1" = "$2" ] && return 1 || verlte $1 $2 -} -# if there is already an installed version -if [ -f /usr/share/nextcloud/version.php ] -then - echo "version.php found, already installed" - # get version number - installedver=`php -r 'require("/usr/share/nextcloud/version.php"); print "$OC_VersionString";'`; - majvers=`echo %{version} | cut -d. -f1` - majcurvers=`echo $installedver | cut -d. -f1` - # we should fail with exit 1 if - # installed version > rpm version - if ( verlte %{version} $installedver ) - then - echo "Installed version has $installedver been upgraded and is most recent than this rpm %{version} version" -# echo "backup current install to /usr/share/nextcloud_back" -# mkdir /usr/share/nextcloud_back -# rsync -ar /usr/share/nextcloud/ /usr/share/nextcloud_back - exit 1 - elif [ $(($majvers-1)) -gt $majcurvers ] - then # installed version < rpm version -1 - echo "can not upgrade from $installedver to %{version}, please do a manual or web update with intermediate version" -# echo "backup current install to /usr/share/nextcloud_back" -# mkdir /usr/share/nextcloud_back -# rsync -ar /usr/share/nextcloud/ /usr/share/nextcloud_back - exit 1 - fi -fi %postun -# true if $1 is greater than or equal $2 -verlte() { - [ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ] -} - -verlt() { - [ "$1" = "$2" ] && return 1 || verlte $1 $2 -} - -if [ $1 == 1 ]; then -# if there is already an installed version -if [ -f /usr/share/nextcloud/version.php ] -then -# echo "version.php found, already installed" - # get version number - installedver=`php -r 'require("/usr/share/nextcloud/version.php"); print "$OC_VersionString";'`; - majvers=`echo %{version} | cut -d. -f1` - majcurvers=`echo $installedver | cut -d. -f1` -# echo "and the version is $installedver" - # we should fail with exit 1 if - # installed version > rpm version - if ( verlte %{version} $installedver ) - then -# echo "reverting content" -# rsync -ar /usr/share/nextcloud_back/ /usr/share/nextcloud_back -# rm -rf /usr/share/nextcloud_back - exit 0 - elif [ $(($majvers-1)) -gt $majcurvers ] - then # installed version < rpm version -1 -# echo "reverting content" -# rsync -ar /usr/share/nextcloud_back/ /usr/share/nextcloud_back -# rm -rf /usr/share/nextcloud_back - exit 0 - fi -fi -fi %install rm -rf %{buildroot} mkdir -p %{buildroot}/%{nc_data_dir} -mkdir -p %{buildroot}/usr/share -tar xf %{SOURCE0} -C %{buildroot}/usr/share +mkdir -p %{buildroot}/usr/share/nextcloud-src +tar xf %{SOURCE0} -C %{buildroot}/usr/share/nextcloud-src --strip-components 1 +#mv %{buildroot}/usr/share/nextcloud %{buildroot}/usr/share/nextcloud-src mkdir -p %{buildroot}/%{nc_dir} mkdir -p %{buildroot}/%{nc_dir}/etc @@ -148,7 +90,7 @@ mkdir -p %{buildroot}/etc/httpd/conf.d cp %{SOURCE1} %{buildroot}/etc/httpd/conf.d -%files +%files src %defattr(0640,root,%{nc_group},0750) %dir %attr(0775,root,%{nc_group}) %{nc_dir} %attr(0755,%{nc_user},%{nc_group}) %{nc_dir}/occ @@ -160,7 +102,7 @@ cp %{SOURCE1} %{buildroot}/etc/httpd/con %attr(0755,%{nc_user},%{nc_group}) %{nc_dir}/lib %attr(0755,%{nc_user},%{nc_group}) %{nc_dir}/ocm-provider %attr(0755,%{nc_user},%{nc_group}) %{nc_dir}/core -%attr(0755,%{nc_user},%{nc_group}) %{nc_dir}/settings +#%attr(0755,%{nc_user},%{nc_group}) %{nc_dir}/settings %attr(0755,%{nc_user},%{nc_group}) %{nc_dir}/3rdparty %attr(0755,%{nc_user},%{nc_group}) %{nc_dir}/resources %attr(0755,%{nc_user},%{nc_group}) %{nc_dir}/themes @@ -171,6 +113,7 @@ cp %{SOURCE1} %{buildroot}/etc/httpd/con %attr(0755,%{nc_user},%{nc_group}) %{nc_dir}/index.html %attr(0755,%{nc_user},%{nc_group}) %{nc_dir}/robots.txt %attr(0644,%{nc_user},%{nc_group}) %{nc_dir}/.htaccess +%attr(0755,%{nc_user},%{nc_group}) %{nc_dir}/dist %config(noreplace) %attr(0644,%{nc_user},%{nc_group}) %{nc_dir}/.user.ini %config(noreplace) %attr(0644,root,root) /etc/httpd/conf.d/nextcloud.conf @@ -179,7 +122,15 @@ cp %{SOURCE1} %{buildroot}/etc/httpd/con %changelog -* Sun Nov 08 2020 Jean-Philipe Pialasse 17.0.1-2.sme +* Fri Jul 08 2022 Jean-Philippe Pialasse 24.0.2-3.sme +- removing pre and postun scripts +- fix dist permissions + +* Fri Jul 08 2022 Jean-Philippe Pialasse 24.0.2-2.sme +- update to release 24.0.2 +- make rpm a -src to avoid conflict between webupdates and rpm + +* Sun Nov 08 2020 Jean-Philipe Pialasse 20.0.1-2.sme - first import in SME10 [SME: 11086] - update to release 20.0.1