--- rpms/nextcloud/contribs10/nextcloud.spec	2020/11/08 22:53:33	1.1
+++ rpms/nextcloud/contribs10/nextcloud.spec	2022/07/08 04:58:47	1.4
@@ -1,9 +1,9 @@
-%define version 17.0.1
+%define version 24.0.2
 %define release 1
 
 %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
 
@@ -28,23 +28,23 @@ BuildRequires: httpd
 
 Requires: httpd
 # Required php packages
-Requires: php71
-Requires: php71-php-fpm
-Requires: php71-php-gd
-Requires: php71-php-pdo
-Requires: php71-php-mbstring
-Requires: php71-php-pecl-zip
-Requires: php71-php-imagick
+Requires: php74
+Requires: php74-php-fpm
+Requires: php74-php-gd
+Requires: php74-php-pdo
+Requires: php74-php-mbstring
+Requires: php74-php-pecl-zip
+Requires: php74-php-imagick
 
 # Recommended php packages
-Requires: php71-php-intl
-Requires: php71-php-mcrypt
+Requires: php74-php-intl
+Requires: php74-php-mcrypt
 
 # Required php packages for specific apps
-Requires: php71-php-ldap
+Requires: php74-php-ldap
 
 # Required php packages for MariaDB
-Requires: php71-php-mysqlnd 
+Requires: php74-php-mysqlnd 
 #rh-php71-php-pdo_mysql
 
 # Conflicts: nextcloud < 15
@@ -57,6 +57,19 @@ 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() {
@@ -134,8 +147,9 @@ 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 +162,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 +174,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
@@ -179,6 +193,14 @@ cp %{SOURCE1} %{buildroot}/etc/httpd/con
 
 
 %changelog
+* Fri Jul 08 2022 Jean-Philippe Pialasse <tests@pialasse.com> 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 <tests@pialasse.com> 20.0.1-2.sme
+- first import in SME10 [SME: 11086]
+- update to release 20.0.1 
+
 * Sun Dec 15 2019 Jean-Philipe Pialasse <tests@pialasse.com> 17.0.1-1.sme
 - update to release 17.0.1