Accepting request 417388 from home:computersalat:devel:php

update spec, simplify deps

OBS-URL: https://build.opensuse.org/request/show/417388
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/nextcloud?expand=0&rev=3

nextcloud.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Aug  7 16:52:22 UTC 2016 - chris@computersalat.de
+
+- update spec file
+  * osc service localrun format_spec_file
+  * update Source with full URL
+  * simplify deps mainly for openSUSE
+
 -------------------------------------------------------------------
 Sat Jul 23 12:33:00 UTC 2016 - ecsos@opensuse.org
 
@@ -10,7 +18,6 @@ Thu Jul 21 15:17:28 CEST 2016 - asemen@suse.de
 
 - upstream update to version 9.0.53 (bsc#989998)
 
-
 -------------------------------------------------------------------
 Fri Jul  8 17:31:32 UTC 2016 - ecsos@opensuse.org
 

nextcloud.spec

@@ -1,7 +1,20 @@
 #
 # spec file for package nextcloud
 #
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
 
 #
 %if 0%{?suse_version}
@@ -41,44 +54,61 @@ Name:           nextcloud
 %define base_version 9.0.53
 Version:        %{base_version}
 Release:        0
-Source0:        nextcloud-%{version}.tar.bz2
+Summary:        A safe home for all your data, community-driven, free & open source
+License:        AGPL-3.0
+Group:          Productivity/Networking/Web/Utilities
+Url:            http://www.nextcloud.com
+Source0:        https://download.nextcloud.com/server/releases/%{name}-%{version}.tar.bz2
 Source1:        apache_secure_data
 Source2:        README
 Source3:        README.SELinux
 Source4:        robots.txt
-Url:            http://www.nextcloud.com
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-Summary:        A safe home for all your data, community-driven, free & open source
-License:        AGPL-3.0
-Group:          Productivity/Networking/Web/Utilities
 
 %if 0%{?suse_version}
+BuildRequires:  apache2
+%if 0%{?suse_version} > 1020
 BuildRequires:  fdupes
-%if 0%{?suse_version} != 1110
-# For all SUSEs except SLES 11
-Requires:       apache2 apache2-mod_php5 php5 >= 5.3.3 sqlite3 php5-sqlite php5-mbstring php5-zip php5-json php5-posix curl php5-curl php5-gd php5-ctype php5-xmlreader php5-xmlwriter php5-zlib php5-pear php5-iconv
-BuildRequires:  apache2 unzip
-%else
-# SLES 11 requires
-# require mysql directly for SLES 11
-Requires:       apache2 apache2-mod_php53 php53 >= 5.3.3 mysql php53-sqlite php53-mbstring php53-zip php53-json php53-posix curl php53-curl php53-gd php53-ctype php53-xmlreader php53-xmlwriter php53-zlib php53-pear php53-iconv
-BuildRequires:  apache2 unzip
 %endif
+BuildRequires:  unzip
 %endif
-
+#
-#Requires:       curl %{name}-3rdparty
+Requires:       curl
+Requires:       mysql
+Requires:       php-gd
+Requires:       php-json
+Requires:       php-mbstring
+Requires:       php-mysql
+Requires:       php-posix
+Requires:       php-zip
+#
+%if 0%{?fedora_version} || 0%{?rhel} || 0%{?rhel_version} || 0%{?centos_version}
+Requires:       php >= 5.4.0
+Requires:       php-process
+Requires:       php-xml
+#
+Recommends:     sqlite
+%endif
+#
 %if 0%{?suse_version}
+Requires:       apache2
+Requires:       mod_php_any >= 5.4.0
+Requires:       php-ctype
+Requires:       php-curl
 # SUSE does not include the fileinfo module in php-common.
 Requires:       php-fileinfo
-%if 0%{?suse_version} != 1110
+Requires:       php-iconv
-Recommends:     php5-mysql mysql php5-imagick 
+Requires:       php-pear
-%else
+Requires:       php-xmlreader
-Recommends:     php53-mysql mysql php53-imagick
+Requires:       php-xmlwriter
-%endif
+Requires:       php-zlib
-%else
+#
-Requires:       mysql
+Recommends:     sqlite3
 %endif
+#
+Recommends:     php-imagick 
+Recommends:     php-sqlite
 
 %description
 A safe home for all your data, community-driven, free & open source
@@ -166,7 +196,6 @@ if [ -x %{ocphp_bin}/php -a -f %{oc_dir}/occ ]; then
   echo yes > %{statedir}/occ_maintenance_mode_during_nextcloud_install
 fi
 
-
 %post
 if [ $1 -eq 1 ]; then
     echo "%{name} First install complete"
@@ -174,7 +203,6 @@ else
     echo "%{name} Upgrade complete"
 fi
 
-
 %if 0%{?suse_version}
 # make sure php5 is not in APACHE_MODULES, so that we don't create dups.
 perl -pani -e 's@^(APACHE_MODULES=".*)\bphp5\b@$1@' /etc/sysconfig/apache2
@@ -213,5 +241,4 @@ rm -rf $RPM_BUILD_ROOT
 %{apache_serverroot}/%{name}
 %config %attr(0644,root,root) %{apache_confdir}/nextcloud.conf
 
-
 %changelog