[packages/owncloud-client] - rename

Tue Apr 12 11:57:05 CEST 2016

commit 69b59edf0d0898bb9fb1a7bc80865618c6daf670
Author: Paweł Gołaszewski <blues at pld-linux.org>
Date:   Tue Apr 12 11:56:48 2016 +0200

    - rename

 .gitignore                                  |   1 +
 owncloud-client.spec => owncloudclient.spec | 141 +---------------------------
 2 files changed, 5 insertions(+), 137 deletions(-)
---

diff --git a/owncloud-client.spec b/owncloudclient.spec
similarity index 68%
rename from owncloud-client.spec
rename to owncloudclient.spec
index 9db8621..2233f85 100644
--- a/owncloud-client.spec
+++ b/owncloudclient.spec
@@ -1,59 +1,25 @@
 
 Summary:	The ownCloud client
-Name:		owncloud-client
+Name:		owncloudclient
 Version:	2.1.1
-Release:	2.5
+Release:	0.1
 License:	GPL-2.0+
 Group:		X11/Applications
 URL:		https://www.owncloud.com
-Source0:	owncloudclient-%{version}.tar.bz2
+Source0:	https://download.owncloud.com/desktop/stable/%{name}-%{version}.tar.xz
+# Source0-md5:  ee08ccedccd4c49f1464957146e14d26
 Source1:	owncloud.sh
 Source2:	owncloudcmd.sh
-
-%if 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600 || 0%{?suse_version} == 1110
-%if 0%{?suse_version} == 1110
-# SLES 11 calls make_install makeinstall
-%define make_install %{makeinstall}
-%endif
-# We need a more recent, prefixed Qt for SLE11
-%define opt_hack 1
-%define qtprefix opt-
-%if 0%{?rhel_version} == 600 || 0%{?centos_version} == 600
-%define optdir /opt/qt-4.8
-%else
-%define optdir /opt/qt-5.4
-%endif
-
-# Must be all in one line:
-%define cmake_args -DCMAKE_INCLUDE_PATH=%{_prefix}/include -DCMAKE_LIBRARY_PATH=%{_prefix}/%{_lib} -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
-%else
-%define cmake_args -DSYSCONF_INSTALL_DIR=%{_sysconfdir}
-%endif
-
 BuildRequires:	cmake >= 2.8.11
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
-%if %use_qt5
-BuildRequires:	%{qtprefix}qt5-qtbase
-BuildRequires:	%{qtprefix}qt5-qtbase-devel
-BuildRequires:	%{qtprefix}qt5-qtbase-gui
-BuildRequires:	%{qtprefix}qt5-qttools-devel
-BuildRequires:	%{qtprefix}qt5-qtwebkit-devel
-
-%else # no qt5
 BuildRequires:	qt4
 BuildRequires:	qt4-devel >= 4.7
 BuildRequires:	qtwebkit >= 2.2
 BuildRequires:	qtwebkit-devel >= 2.2
-%endif
-
 BuildRequires:	inetd
 BuildRequires:	desktop-file-utils
 BuildRequires:	openssl-devel
-%else
-# This is for all SUSE and RHEL6 and CentOS 6
-%if %use_qt5
-
 BuildRequires:	libQt5Concurrent-devel
 BuildRequires:	libQt5Core-devel
 BuildRequires:	libQt5DBus-devel
@@ -63,77 +29,20 @@ BuildRequires:	libQt5PrintSupport-devel
 BuildRequires:	libQt5WebKitWidgets-devel
 BuildRequires:	libQt5Xml-devel
 BuildRequires:	libqt5-linguist-devel
-
-%else # no qt5
-
-BuildRequires:	%{qtprefix}libQtWebKit-devel
-BuildRequires:	%{qtprefix}libQtWebKit4
-BuildRequires:	%{qtprefix}libqt4-devel >= 4.7
-
-%endif
-
-%endif
-
-# Version independant package name mapping between suse and fedora/centos
-%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
 BuildRequires:	inetd
 BuildRequires:	desktop-file-utils
 BuildRequires:	sqlite-devel
-%if 0%{?fedora_version} || 0%{?rhel_version} > 600 || 0%{?centos_version} > 600
 BuildRequires:	sphinx-pdg
-%endif
-%else
-%if 0%{have_doc}
 BuildRequires:	python-Sphinx
-%endif
 BuildRequires:	sqlite3-devel
 BuildRequires:	update-desktop-files
-%endif
-
-
-######################################################################### Requires only below here.
-
-%if %use_qt5 && 0%{?suse_version} == 0
-# suse finds the libs via autoreqprov
-# https://github.com/owncloud/client/issues/4431
 Requires:	%{qtprefix}qt5-qtbase
 Requires:	%{qtprefix}qt5-qtbase-gui
-# libQtWebKit4 is implicitly pulled by libowncloudsync0
 Requires:	%{qtprefix}qt5-qtwebkit
-# libqt4-sql is implicitly pulled by libqt4-sql-sqlite
-%endif
-
-%if 0%{?fedora_version} > 20 || 0%{?centos_version} > 700 || 0%{?suse_version} || 0%{?rhel_version} > 700
-# Fedora-19 and -20, CentOS-6, CentOS-7, RHEL_6,7 don't have Suggests.
 Suggests:	%{name}-nautilus
 Suggests:	%{name}-nemo
-%endif
-
-%if 0%{?rhel_version} == 600 || 0%{?centos_version} == 600
-# https://github.com/owncloud/client/issues/4400#issuecomment-176686729
-Requires:	%{qtprefix}libqt4-sql
-%endif
-
 Requires:	%{name}-l10n
 Requires:	libowncloudsync0 = %{version}
-
-######################################################################### Obsoletes only below here.
-
-Obsoletes:	libocsync-devel
-Obsoletes:	libocsync-devel-doc
-Obsoletes:	libocsync-doc
-Obsoletes:	libocsync-plugin-owncloud
-Obsoletes:	libocsync-plugin-owncloud
-Obsoletes:	libocsync0
-Obsoletes:	opt-owncloud-client
-
-# Obsolete the experimental Qt5 packages if this is the unbranded client.
-%if %{is_owncloud_client}
-Obsoletes:	libowncloudqt5sync0 Obsoletes: libowncloudqt5sync-devel Obsoletes: owncloud-client-qt5 Obsoletes: owncloud-client-qt5-doc Obsoletes: owncloud-client-qt5-l10n
-%endif
-
-######################################################################### Package Descriptions start here.
-
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -155,7 +64,6 @@ from the community, or that you build yourself to meet the
 requirements of your infrastructure and business.
 
 %package -n %{name}-doc
-######		/home/users/blues/rpm/packages/../rpm-build-tools/rpm.groups: no such file
 Summary:	Documentation for ownCloud
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
@@ -165,7 +73,6 @@ Obsoletes:	opt-owncloud-client-doc
 Documentation about the ownCloud desktop application.
 
 %package -n %{name}-l10n
-######		/home/users/blues/rpm/packages/../rpm-build-tools/rpm.groups: no such file
 Summary:	Localization for ownCloud
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
@@ -175,16 +82,6 @@ Obsoletes:	opt-owncloud-client-l10n
 Localization files for the ownCloud desktop application.
 
 %package -n libowncloudsync0
-%if %use_qt5
-Requires:	%{qtprefix}libqt5keychain0
-%else
-Requires:	%{qtprefix}libqtkeychain0 >= 0.3
-%endif
-Obsoletes:	opt-libowncloudsync0
-# https://github.com/owncloud/client/issues/4506
-Obsoletes:	owncloud-client-libs <= %{version}
-
-######		/home/users/blues/rpm/packages/../rpm-build-tools/rpm.groups: no such file
 Summary:	The ownCloud sync library
 Group:		Development/Libraries
 
@@ -192,44 +89,32 @@ Group:		Development/Libraries
 The ownCloud sync library.
 
 %package -n libowncloudsync-devel
-######		/home/users/blues/rpm/packages/../rpm-build-tools/rpm.groups: no such file
 Summary:	Development files for the ownCloud sync library
 Group:		Development/Libraries
 Requires:	libowncloudsync0 = %{version}
-Obsoletes:	opt-libowncloudsync-devel
 
 %description -n libowncloudsync-devel
 Development files for the ownCloud sync library.
 
 %package -n %{name}-nautilus
-######		/home/users/blues/rpm/packages/../rpm-build-tools/rpm.groups: no such file
 Summary:	Nautilus overlay icons
 Group:		Productivity/Networking/Other
 Requires:	nautilus
-%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
 Requires:	nautilus-python
-%else
 Requires:	python-nautilus
-%endif
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	opt-owncloud-client-nautilus
 
 %description -n %{name}-nautilus
 This package provides overlay icons to visualize the sync state in the
 nautilus file manager.
 
 %package -n %{name}-nemo
-######		/home/users/blues/rpm/packages/../rpm-build-tools/rpm.groups: no such file
 Summary:	Nemo overlay icons
 Group:		Productivity/Networking/Other
 Requires:	nemo
-%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
 Requires:	nemo-python
-%else
 Requires:	python-nemo
-%endif
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	opt-owncloud-client-nemo
 
 %description -n %{name}-nemo
 This package provides overlay icons to visualize the sync state in the
@@ -242,18 +127,7 @@ nemo file manager.
 %patch1 -p1
 %endif
 
-%if 0%{?rhel_version} == 600 || 0%{?centos_version} == 600
-sed -i -e 's/OVERRIDE=override/OVERRIDE=/' cmake/modules/QtVersionAbstraction.cmake
-%endif
-
 %build
-echo centos_version 0%{?centos_version}
-echo rhel_version   0%{?rhel_version}
-echo fedora_version 0%{?fedora_version}
-echo suse_version   0%{?suse_version}
-
-%if %opt_hack
-%endif
 export LD_LIBRARY_PATH=%{optdir}/%{_lib}
 export PATH=%{optdir}/bin:$PATH
 
@@ -383,24 +257,17 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/owncloud
 %attr(755,root,root) %{_bindir}/owncloudcmd
-
-%if %{opt_hack}
 %{optdir}/bin/owncloud
 %{optdir}/bin/owncloudcmd
-%endif
 
 %{_desktopdir}/owncloud.desktop
 %{_iconsdir}/hicolor
-%if 0%{have_doc}
 %{_mandir}/man1/owncloud*
-%endif
 
-%if %opt_hack
 %{_iconsdir}/hicolor
 %{_desktopdir}/owncloud.desktop
 %attr(755,root,root) %{_bindir}/owncloud
 %attr(755,root,root) %{_bindir}/owncloudcmd
-%endif
 %config %{_sysconfdir}/ownCloud
 %dir %{_sysconfdir}
 
diff --git a/.gitignore b/.gitignore
index b25c15b..2c04e2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *~
+.gitignore
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/owncloud-client.git/commitdiff/69b59edf0d0898bb9fb1a7bc80865618c6daf670

